10.62.0

✌️
Resolve #3519
2018-12-06 16:35:06 +09:00 · 2018-12-06 16:33:35 +09:00 · 2018-12-06 16:30:28 +09:00 · 2018-12-06 16:19:12 +09:00 · 2018-12-06 16:09:33 +09:00 · 2018-12-06 11:18:13 +09:00
162 changed files with 1664 additions and 1326 deletions
@@ -116,7 +116,7 @@ Please see [Contribution guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Tue, 27 Nov 2018 06:24:05 UTC
+**Last updated:** Sat, 01 Dec 2018 22:05:05 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
  volume: "ボリューム"
  test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
  cache: "キャッシュ"
  clean-cache: "クリーンアップ"
  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "Spiel einen Ton ab beim Erhalten eines Beitrags bzw. einer Nachricht. Diese Einstellung wird im Browser gespeichert."
  volume: "Lautstärke"
  test: "Test"
-  language: "Sprache"
-  pick-language: "Sprache auswählen"
-  recommended: "Empfohlen"
-  auto: "Automatisch"
-  specify-language: "Sprache auswählen"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
  cache: "キャッシュ"
  clean-cache: "クリーンアップ"
  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."
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "Sprache auswählen"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -26,7 +26,7 @@ common:
  close: "Close"
  do-not-copy-paste: "Please do not enter or paste the code here. Account may be compromised."
  load-more: "Load more"
-  enter-password: "パスワードを入力してください"
+  enter-password: "Please enter the Password"
  got-it: "Got it!"
  customization-tips:
    title: "Customization tips"
@@ -268,7 +268,7 @@ common/views/components/theme.vue:
  install: "Install"
  installed: "\"{}\" has been installed"
  create-a-theme: "Create a theme"
-  save-created-theme: "Save a theme"
+  save-created-theme: "Save theme"
  primary-color: "Primary color"
  secondary-color: "Secondary color"
  text-color: "Text color"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{} users mentioned"
  empty: "No popular hashtag trends"
+common/views/components/language-settings.vue:
+  title: "Display Language"
+  pick-language: "Select a language"
+  recommended: "Recommended"
+  auto: "Auto"
+  specify-language: "Specify language"
+  info: "You need to reload the page for the changes to take effect."
 common/views/components/profile-editor.vue:
  title: "Profile"
  name: "Name"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "Play a sound when you receive a post/message. This setting is stored in the browser."
  volume: "Volume"
  test: "Test"
-  language: "Language"
-  pick-language: "Select a language"
-  recommended: "Recommended"
-  auto: "Automatic"
-  specify-language: "Specify language"
-  language-desc: "You need to reload the page for the changes to take effect."
  cache: "Cache"
  clean-cache: "Clear cache"
  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."
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "Used to confirm email and password reset etc."
  enable-email: "Enable email delivery"
  email: "Email Address"
-  smtp-use-ssl: "Use SSL for SMTP server"
+  smtp-secure: "Use implicit SSL/TLS in the SMTP connection"
+  smtp-secure-info: "Turn off STARTTLS when used that."
  smtp-host: "SMTP Host"
  smtp-port: "SMTP Port"
  smtp-user: "SMTP User"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "Choose files"
 mobile/views/pages/settings.vue:
  signed-in-as: "Signed in as {}"
-  lang: "Language"
-  lang-tip: "You will need to reload the page for the changes to take effect."
-  recommended: "Recommended"
-  auto: "Auto"
-  specify-language: "Select your language"
  design: "Design and display"
  dark-mode: "Dark Mode"
  i-am-under-limited-internet: "I'm in limited bandwidth"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "Block"
  unblock: "Unblock"
  years-old: "{age} years old"
+  push-to-list: "Add to list"
+  select-list: "Select a list"
+  list-pushed: "Successfully added {user} to {list}."
 mobile/views/pages/user/home.vue:
  recent-notes: "Recent notes"
  images: "Images"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
  volume: "ボリューム"
  test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
  cache: "キャッシュ"
  clean-cache: "クリーンアップ"
  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -26,7 +26,7 @@ common:
  close: "Fermer"
  do-not-copy-paste: "Veuillez ne pas entrer ou coller le code ici. Le compte peut être compromis."
  load-more: "Charger plus"
-  enter-password: "パスワードを入力してください"
+  enter-password: "Veuillez entrer le mot de passe"
  got-it: "J’ai compris !"
  customization-tips:
    title: "Conseils de personnalisation"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{} utilisateurs·rices mentionnés·es"
  empty: "Aucune tendance"
+common/views/components/language-settings.vue:
+  title: "Langue "
+  pick-language: "Sélectionner une langue"
+  recommended: "Recommandé"
+  auto: "Automatique"
+  specify-language: "Spécifier la langue"
+  info: "Le rechargement de la page est requis afin d'appliquer les modifications."
 common/views/components/profile-editor.vue:
  title: "Profil"
  name: "Nom"
@@ -458,10 +465,10 @@ common/views/components/profile-editor.vue:
  saved: "Profil mis à jour avec succès"
  uploading: "En cours d'envoi …"
  upload-failed: "Échec de l'envoi"
-  email: "メール設定"
-  email-address: "メールアドレス"
-  email-verified: "メールアドレスが確認されました"
-  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  email: "Paramètres de messagerie"
+  email-address: "Adresse de courrier électronique"
+  email-verified: "L’adresse du courrier électronique a été vérifiée."
+  email-not-verified: "Adresse de courriel n’est pas confirmée. Veuillez vérifier votre boite de réception."
 common/views/widgets/broadcast.vue:
  fetching: "Récupération"
  no-broadcasts: "Aucune annonce"
@@ -736,8 +743,8 @@ desktop/views/components/settings.vue:
  note-visibility: "Visibilité de la publication"
  default-note-visibility: "Visibilité par défaut"
  remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+  web-search-engine: "Moteur de recherche Web"
+  web-search-engine-desc: "Exemple : https://www.google.com/?#q={{query}}"
  auto-popout: "Fenêtre contextuelle automatique"
  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
  advanced: "Paramètres avancés"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "Jouer un son lorsque vous recevez un message. Ce paramètre est sauvegardé dans le navigateur."
  volume: "Volume"
  test: "Test"
-  language: "Langue"
-  pick-language: "Sélectionner une langue"
-  recommended: "Recommandé"
-  auto: "Automatique"
-  specify-language: "Spécifier la langue"
-  language-desc: "Le rechargement de la page est requis afin d'appliquer les modifications."
  cache: "Cache"
  clean-cache: "Nettoyage"
  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."
@@ -1004,15 +1005,16 @@ admin/views/instance.vue:
  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"
  external-user-recommendation-timeout-desc: "En millisecondes (par exemple : 300000)"
-  email-config: "メールサーバーの設定"
-  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
-  enable-email: "メール配信を有効にする"
-  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
-  smtp-host: "SMTPホスト"
-  smtp-port: "SMTPポート"
-  smtp-user: "SMTPユーザー"
-  smtp-pass: "SMTPパスワード"
+  email-config: "Paramètres du serveur de messagerie"
+  email-config-info: "Utilisé pour confirmer votre adresse de courrier électronique et la réinitialisation de votre mot de passe."
+  enable-email: "Activation de la distribution du courrier"
+  email: "Adresse de courrier électronique"
+  smtp-secure: "Utiliser SSL/TLS implicitement dans la connexion SMTP"
+  smtp-secure-info: "Désactiver STARTTLS lorsque celui-ci est utilisé."
+  smtp-host: "Hôte SMTP"
+  smtp-port: "Port SMTP"
+  smtp-user: "Utilisateur SMTP"
+  smtp-pass: "Mot de passe SMTP"
 admin/views/charts.vue:
  title: "Graph"
  per-day: "par jour"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "Choisissez un fichier"
 mobile/views/pages/settings.vue:
  signed-in-as: "Connecté·e en tant que {}"
-  lang: "Langue"
-  lang-tip: "Le rechargement de la page est requis afin d'appliquer les modifications."
-  recommended: "Recommandé"
-  auto: "Automatique"
-  specify-language: "Sélectionnez votre langue"
  design: "Affichage et design"
  dark-mode: "Mode nuit"
  i-am-under-limited-internet: "J'ai un accès Internet limité"
@@ -1387,8 +1384,8 @@ mobile/views/pages/settings.vue:
  note-visibility: "Visibilité de la publication"
  default-note-visibility: "Visibilité par défaut"
  remember-note-visibility: "Se souvenir du mode de visibilité de la publication"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+  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'"
  load-raw-images: "Afficher les photos jointes en haute qualité"
  load-remote-media: "Afficher les médias sur le serveur distant"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "Bloquer"
  unblock: "Débloquer"
  years-old: "{age} ans"
+  push-to-list: "Ajouter à la liste"
+  select-list: "Sélectionnez une liste"
+  list-pushed: "Vous avez ajouté {user} à la liste {list} avec succès."
 mobile/views/pages/user/home.vue:
  recent-notes: "Notes récentes"
  images: "Images"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
  volume: "ボリューム"
  test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
  cache: "キャッシュ"
  clean-cache: "クリーンアップ"
  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -118,9 +118,11 @@ common:
  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
  use-contrast-reversi-stones: "リバーシのアイコンにコントラストを付ける"
  verified-user: "公式アカウント"
  disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
+  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
  always-show-nsfw: "常に閲覧注意のメディアを表示する"
  always-mark-nsfw: "常にメディアを閲覧注意として投稿"
  show-full-acct: "ユーザー名のホストを省略しない"
@@ -171,7 +173,6 @@ common:
    polls: "アンケート"
    post-form: "投稿フォーム"
    server: "サーバー情報"
-    donation: "寄付のお願い"
    nav: "ナビゲーション"
    tips: "ヒント"
    hashtags: "ハッシュタグ"
@@ -440,13 +441,11 @@ common/views/components/stream-indicator.vue:
  reconnecting: "再接続中"
  connected: "接続完了"

-common/views/components/twitter-setting.vue:
-  description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
-  connected-to: "次のTwitterアカウントに接続されています"
-  detail: "詳細..."
-  reconnect: "再接続する"
-  connect: "Twitterと接続する"
+common/views/components/integration-settings.vue:
+  title: "サービス連携"
+  connect: "接続する"
  disconnect: "切断する"
+  connected-to: "次のアカウントに接続されています"

 common/views/components/github-setting.vue:
  description: "お使いのGitHubアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでGitHubアカウント情報が表示されるようになったり、GitHubを用いた便利なサインインを利用できるようになります。"
@@ -485,12 +484,21 @@ common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"

+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
+
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
  account: "アカウント"
  location: "場所"
  description: "自己紹介"
+  language: "言語"
  birthday: "誕生日"
  avatar: "アイコン"
  banner: "バナー"
@@ -523,10 +531,6 @@ common/views/widgets/calendar.vue:
  this-month: "今月:"
  this-year: "今年:"

-common/views/widgets/donation.vue:
-  title: "寄付のお願い"
-  text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
-
 common/views/widgets/photo-stream.vue:
  title: "フォトストリーム"
  no-photos: "写真はありません"
@@ -851,7 +855,6 @@ desktop/views/components/settings.vue:
  circle-icons: "円形のアイコンを使用"
  contrasted-acct: "ユーザー名にコントラストを付ける"
  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
-  suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
  show-clock-on-header: "右上に時計を表示する"
  show-reply-target: "リプライ先を表示する"
  timeline: "タイムライン"
@@ -860,9 +863,16 @@ desktop/views/components/settings.vue:
  show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
  show-maps: "マップの自動展開"
  remain-deleted-note: "削除された投稿を表示し続ける"
-  deck-column-align: "デッキのカラムの位置"
+  deck-column-align: "デッキのカラムの配置"
  deck-column-align-center: "中央"
  deck-column-align-left: "左"
+  deck-column-align-flexible: "フレキシブル"
+  deck-column-width: "デッキのカラムの幅"
+  deck-column-width-narrow: "狭"
+  deck-column-width-narrower: "やや狭"
+  deck-column-width-normal: "普通"
+  deck-column-width-wider: "やや広"
+  deck-column-width-wide: "広"

  sound: "サウンド"
  enable-sounds: "サウンドを有効にする"
@@ -870,13 +880,6 @@ desktop/views/components/settings.vue:
  volume: "ボリューム"
  test: "テスト"

-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
-
  cache: "キャッシュ"
  clean-cache: "クリーンアップ"
  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -1554,11 +1557,6 @@ mobile/views/pages/selectdrive.vue:

 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -1586,18 +1584,6 @@ mobile/views/pages/settings.vue:
  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
  load-raw-images: "添付された画像を高画質で表示する"
  load-remote-media: "リモートサーバーのメディアを表示する"
-  twitter: "Twitter連携"
-  twitter-connect: "Twitterアカウントに接続する"
-  twitter-reconnect: "再接続する"
-  twitter-disconnect: "切断する"
-  github: "GitHub連携"
-  github-connect: "GitHubアカウントに接続する"
-  github-reconnect: "再接続する"
-  github-disconnect: "切断する"
-  discord: "Discord連携"
-  discord-connect: "Discordアカウントに接続する"
-  discord-reconnect: "再接続する"
-  discord-disconnect: "切断する"
  update: "Misskey Update"
  version: "バージョン:"
  latest-version: "最新のバージョン:"
@@ -1628,6 +1614,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"

 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "流行は自分で作るんや"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "投稿やメッセージもろたとき、音鳴らしたるわ。大丈夫や、この設定はブラウザが覚えてくれとる。"
  volume: "ボリューム"
  test: "テスト"
-  language: "言語"
-  pick-language: "言語選んでや"
-  recommended: "おすすめ"
-  auto: "自動"
-  specify-language: "言語選んでくれ"
-  language-desc: "変更はページの再度読み込み後に反映されんで。"
  cache: "キャッシュ"
  clean-cache: "お掃除"
  cache-warn: "お掃除するとな、ブラウザが覚えてくれとるアカウントのあれこれや書きかけの投稿・返信・メッセージや設定情報なんかのデータが全部飛んでいくんや。これやったらページ再読込しといてな。"
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "ファイル選んでや"
 mobile/views/pages/settings.vue:
  signed-in-as: "あんたは橋の下で拾った{}や！"
-  lang: "言語"
-  lang-tip: "ページもっぺん読み込んだら反映したるで。"
-  recommended: "これええで"
-  auto: "勝手にやる"
-  specify-language: "言語選びや"
  design: "見た感じ"
  dark-mode: "ナイトゲームや！"
  i-am-under-limited-internet: "電波と阪神がザコいんや"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロックやめたる"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近儲かりまっか？"
  images: "画像"
@@ -26,7 +26,7 @@ common:
  close: "닫기"
  do-not-copy-paste: "여기에 코드를 입력하거나 붙여넣지 마십시오. 계정이 무단으로 사용될 수 있습니다."
  load-more: "더보기"
-  enter-password: "パスワードを入力してください"
+  enter-password: "비밀번호를 입력하여 주십시오"
  got-it: "알겠습니다"
  customization-tips:
    title: "커스터마이징 도움말"
@@ -124,7 +124,7 @@ common:
  is-remote-user: "이 유저 정보는 복사본입니다."
  is-remote-post: "이 글 정보는 복사본입니다."
  view-on-remote: "정확한 정보 보기"
-  renoted-by: "{user}가 Renote"
+  renoted-by: "{user}이(가) Renote"
  error:
    title: '오류가 발생했습니다'
    retry: '다시 시도'
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}명이 언급함"
  empty: "트렌드 없음"
+common/views/components/language-settings.vue:
+  title: "표시 언어"
+  pick-language: "언어 설정"
+  recommended: "추천"
+  auto: "자동"
+  specify-language: "언어 지정"
+  info: "변경사항은 페이지를 새로고침한 뒤에 반영됩니다."
 common/views/components/profile-editor.vue:
  title: "프로필"
  name: "이름"
@@ -458,10 +465,10 @@ common/views/components/profile-editor.vue:
  saved: "프로필을 저장하였습니다"
  uploading: "업로드 중"
  upload-failed: "업로드에 실패하였습니다"
-  email: "メール設定"
-  email-address: "メールアドレス"
-  email-verified: "メールアドレスが確認されました"
-  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  email: "메일 설정"
+  email-address: "메일 주소"
+  email-verified: "매일 주소가 확인되었습니다"
+  email-not-verified: "메일 주소가 확인되지 않았습니다. 받은 편지함을 확인하여 주시기 바랍니다."
 common/views/widgets/broadcast.vue:
  fetching: "확인중"
  no-broadcasts: "공지사항이 없습니다"
@@ -736,8 +743,8 @@ desktop/views/components/settings.vue:
  note-visibility: "게시물의 공개 범위"
  default-note-visibility: "기본 공개 범위"
  remember-note-visibility: "글의 공개 범위를 기억하기"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+  web-search-engine: "웹 검색엔진"
+  web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
  auto-popout: "창 자동 팝아웃"
  auto-popout-desc: "창이 열릴 때 팝아웃 (브라우저 밖으로 분리) 이 가능한 경우 자동으로 팝아웃합니다. 이 설정은 브라우저에 저장됩니다."
  advanced: "고급 설정"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "글이나 메시지를 송수신하였을 때 소리를 재생합니다. 이 설정은 브라우저에 저장됩니다."
  volume: "음량"
  test: "테스트"
-  language: "언어"
-  pick-language: "언어 설정"
-  recommended: "추천"
-  auto: "자동"
-  specify-language: "언어 지정"
-  language-desc: "변경사항은 페이지를 새로고침한 뒤에 반영됩니다."
  cache: "캐시"
  clean-cache: "지우기"
  cache-warn: "지우기를 실행하면 브라우저에 저장된 계정 정보 캐시, 글이나 답글 및 메시지의 임시 저장, 그 외 데이터 (설정 정보 포함) 가 삭제 됩니다. 지우기 작업을 수행한 후 페이지를 다시 로드해야 합니다."
@@ -1004,15 +1005,16 @@ admin/views/instance.vue:
  external-user-recommendation-engine-desc: "예: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
  external-user-recommendation-timeout: "타임 아웃"
  external-user-recommendation-timeout-desc: "밀리초 (예: 300000)"
-  email-config: "メールサーバーの設定"
-  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
-  enable-email: "メール配信を有効にする"
-  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
-  smtp-host: "SMTPホスト"
-  smtp-port: "SMTPポート"
-  smtp-user: "SMTPユーザー"
-  smtp-pass: "SMTPパスワード"
+  email-config: "메일 서버 설정"
+  email-config-info: "메일 주소 확인 혹은 암호 재설정에 사용 됩니다."
+  enable-email: "메일 발신 활성화"
+  email: "메일 주소"
+  smtp-secure: "SMTP 연결에 암시적으로 SSL/TLS를 사용"
+  smtp-secure-info: "STARTTLS를 사용 시 ON으로 합니다."
+  smtp-host: "SMTP 호스트"
+  smtp-port: "SMTP 포트"
+  smtp-user: "SMTP 사용자"
+  smtp-pass: "SMTP 비밀번호"
 admin/views/charts.vue:
  title: "차트"
  per-day: "1일마다"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "파일 선택"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}(으)로 로그인"
-  lang: "언어"
-  lang-tip: "변경사항은 페이지를 새로고침한 뒤에 반영됩니다."
-  recommended: "추천"
-  auto: "자동"
-  specify-language: "언어 지정"
  design: "디자인 및 표시"
  dark-mode: "다크 모드"
  i-am-under-limited-internet: "저는 통신 대역폭이 제한되어 있습니다"
@@ -1387,8 +1384,8 @@ mobile/views/pages/settings.vue:
  note-visibility: "게시물의 공개 범위"
  default-note-visibility: "기본 공개 범위"
  remember-note-visibility: "글의 공개 범위를 기억하기"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+  web-search-engine: "웹 검색엔진"
+  web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
  disable-via-mobile: "작성하는 글에 \"모바일에서 작성함\" 을 붙이지 않음"
  load-raw-images: "첨부 이미지를 고품질로 표시"
  load-remote-media: "원격 서버의 미디어를 표시"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "차단"
  unblock: "차단 해제"
  years-old: "{age}세"
+  push-to-list: "리스트에 추가"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "최근 글"
  images: "이미지"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "Een geluid afspelen bij het ontvangen van een bericht. Deze instelling wordt opgeslagen in je browser."
  volume: "Volume"
  test: "Testen"
-  language: "Taal"
-  pick-language: "Selecteer een taal"
-  recommended: "Aanbevolen"
-  auto: "Automatisch"
-  specify-language: "Taal opgeven"
-  language-desc: "Je moet de pagina herladen om de wijzigingen toe te passen."
  cache: "Cache"
  clean-cache: "Opschonen"
  cache-warn: "De cache van je accountinformatie/berichten/antwoorden/instellingen wordt verwijderd. Je moet de pagina herladen na het opschonen."
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "Kies een bestand"
 mobile/views/pages/settings.vue:
  signed-in-as: "Ingelogd als {}"
-  lang: "Taal"
-  lang-tip: "Je moet de pagina herladen om de wijzigingen toe te passen."
-  recommended: "Aanbevolen"
-  auto: "Automatisch"
-  specify-language: "Taal opgeven"
  design: "Ontwerp en weergave"
  dark-mode: "Donkere modus"
  i-am-under-limited-internet: "Ik heb beperkt internet"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "Recente notities"
  images: "Afbeeldingen"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
  volume: "Volum"
  test: "Test"
-  language: "Språk"
-  pick-language: "Velg språk"
-  recommended: "Anbefalt"
-  auto: "Automatisk"
-  specify-language: "Angi språk"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
  cache: "Hurtiglager"
  clean-cache: "クリーンアップ"
  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"
-  lang: "Språk"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "Anbefalt"
-  auto: "Automatisk"
-  specify-language: "Angi språk"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "Nylige innlegg"
  images: "Bilder"
@@ -16,7 +16,7 @@ common:
    reaction-desc: "あなたの気持ちを伝える最も簡単な方法です。Misskeyは、他のユーザーの投稿に様々なリアクションを付けることができます。いちどMisskeyのリアクション機能を体験してしまうと、もう「いいね」の概念しか存在しないSNSには戻れなくなるかもしれません。"
    ui: "Interfejs"
    ui-desc: "どのようなUIが使いやすいかは人それぞれです。だから、Misskeyは自由度の高いUIを持っています。レイアウトやデザインを調整したり、カスタマイズ可能な様々なウィジェットを配置したりして、自分だけのホームを作ってください。"
-    drive: "ドライブ"
+    drive: "Dysk"
    drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
    outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
  adblock:
@@ -53,7 +53,7 @@ common:
    years_ago: "{} lat temu"
  month-and-day: "{month}-{day}"
  trash: "Kosz"
-  drive: "ドライブ"
+  drive: "Dysk"
  messaging: "トーク"
  weekday-short:
    sunday: "N"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "Odtwarzaj dźwięk przy wstawianiu wpisów, wysyłaniu lub otrzymywaniu wiadomości. Opcja ta jest zapamiętywana przez przeglądarkę."
  volume: "Głośność"
  test: "Test"
-  language: "Język"
-  pick-language: "Wybierz język"
-  recommended: "Zalecane"
-  auto: "Automatycznie"
-  specify-language: "Wybierz język"
-  language-desc: "Aby zmiany zostały uwzględnione, odśwież stronę."
  cache: "Pamięć podręczna"
  clean-cache: "Wyczyść"
  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."
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "Wybierz plik"
 mobile/views/pages/settings.vue:
  signed-in-as: "Zalogowany jako {}"
-  lang: "Język"
-  lang-tip: "Aby zmiany zostały uwzględnione, odśwież stronę."
-  recommended: "Zalecany"
-  auto: "Automatycznie"
-  specify-language: "Wybierz język"
  design: "Wygląd i wyświetlanie"
  dark-mode: "Tryb ciemny"
  i-am-under-limited-internet: "Ograniczaj zużycie transferu"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age} lat"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "Ostatnie wpisy"
  images: "Zdjęcia"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
  volume: "ボリューム"
  test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
  cache: "キャッシュ"
  clean-cache: "クリーンアップ"
  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "Notas recentes"
  images: "Imagens"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{}人が投稿"
  empty: "トレンドなし"
+common/views/components/language-settings.vue:
+  title: "表示言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  info: "変更はページの再度読み込み後に反映されます。"
 common/views/components/profile-editor.vue:
  title: "プロフィール"
  name: "名前"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
  volume: "ボリューム"
  test: "テスト"
-  language: "言語"
-  pick-language: "言語を選択"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
  cache: "キャッシュ"
  clean-cache: "クリーンアップ"
  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -1008,7 +1009,8 @@ admin/views/instance.vue:
  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
  enable-email: "メール配信を有効にする"
  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
+  smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
+  smtp-secure-info: "STARTTLS使用時はオフにします。"
  smtp-host: "SMTPホスト"
  smtp-port: "SMTPポート"
  smtp-user: "SMTPユーザー"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "ファイルを選択"
 mobile/views/pages/settings.vue:
  signed-in-as: "{}としてサインイン中"
-  lang: "言語"
-  lang-tip: "変更はページの再読み込み後に反映されます。"
-  recommended: "推奨"
-  auto: "自動"
-  specify-language: "言語を指定"
  design: "デザインと表示"
  dark-mode: "ダークモード"
  i-am-under-limited-internet: "私は通信を制限されている"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "ブロック"
  unblock: "ブロック解除"
  years-old: "{age}歳"
+  push-to-list: "リストに追加"
+  select-list: "リストを選択してください"
+  list-pushed: "{user}を{list}に追加しました"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近の投稿"
  images: "画像"
@@ -26,7 +26,7 @@ common:
  close: "关闭"
  do-not-copy-paste: "请不要在这里输入或粘贴代码。您帐户可能会受到损害。"
  load-more: "加载更多"
-  enter-password: "パスワードを入力してください"
+  enter-password: "请输入您的密码"
  got-it: "没问题"
  customization-tips:
    title: "客制化提示"
@@ -439,6 +439,13 @@ common/views/components/visibility-chooser.vue:
 common/views/components/trends.vue:
  count: "{} 被提到"
  empty: "没有流行的标签"
+common/views/components/language-settings.vue:
+  title: "显示语言"
+  pick-language: "选择一个语言"
+  recommended: "推荐"
+  auto: "自动"
+  specify-language: "指定语言"
+  info: "你需要刷新这个页面来应用更改。"
 common/views/components/profile-editor.vue:
  title: "简况"
  name: "名称"
@@ -458,10 +465,10 @@ common/views/components/profile-editor.vue:
  saved: "更新配置文件成功"
  uploading: "正在上传"
  upload-failed: "上传失败"
-  email: "メール設定"
-  email-address: "メールアドレス"
-  email-verified: "メールアドレスが確認されました"
-  email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。"
+  email: "邮件设置"
+  email-address: "电子邮件地址"
+  email-verified: "电子邮件地址已验证"
+  email-not-verified: "电子邮件地址还没有验证哦, 请检查一下收信箱吧~"
 common/views/widgets/broadcast.vue:
  fetching: "确认中"
  no-broadcasts: "没有公告"
@@ -736,8 +743,8 @@ desktop/views/components/settings.vue:
  note-visibility: "帖子可见性"
  default-note-visibility: "默认可见性"
  remember-note-visibility: "记住帖子可见性"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+  web-search-engine: "搜索引擎"
+  web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
  auto-popout: "自动弹出窗口"
  auto-popout-desc: "如果可用，将使用弹出显示而不是打开新窗口。 此设置存储在浏览器中。"
  advanced: "更多设置"
@@ -774,12 +781,6 @@ desktop/views/components/settings.vue:
  enable-sounds-desc: "收到帖子/留言时播放声音。 此设置将被存储在浏览器中。"
  volume: "音量"
  test: "测试"
-  language: "语言"
-  pick-language: "选择一个语言"
-  recommended: "推荐"
-  auto: "自动"
-  specify-language: "指定语言"
-  language-desc: "你需要刷新这个页面来应用更改。"
  cache: "缓存"
  clean-cache: "清除缓存"
  cache-warn: "将删除存储在浏览器中的帐户信息/帖子/回复/消息/设置的缓存。 清理完毕后需要刷新页面。"
@@ -1004,15 +1005,16 @@ admin/views/instance.vue:
  external-user-recommendation-engine-desc: "例如: https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}"
  external-user-recommendation-timeout: "超时"
  external-user-recommendation-timeout-desc: "单位为毫秒 (例如：300000)"
-  email-config: "メールサーバーの設定"
-  email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
-  enable-email: "メール配信を有効にする"
-  email: "メールアドレス"
-  smtp-use-ssl: "SMTPサーバーはSSLを使用"
-  smtp-host: "SMTPホスト"
-  smtp-port: "SMTPポート"
-  smtp-user: "SMTPユーザー"
-  smtp-pass: "SMTPパスワード"
+  email-config: "电子邮件服务器设置"
+  email-config-info: "用于确认电子邮件和密码重置等。"
+  enable-email: "启用电子邮件送递"
+  email: "电子邮件地址"
+  smtp-secure: "在 SMTP 连接中使用隐式 SSL / TLS"
+  smtp-secure-info: "使用时关闭 STARTTLS。"
+  smtp-host: "SMTP 服务器地址 (主机名)"
+  smtp-port: "SMTP 端口"
+  smtp-user: "SMTP 用户名"
+  smtp-pass: "SMTP 密码"
 admin/views/charts.vue:
  title: "历史记录"
  per-day: "每天"
@@ -1360,11 +1362,6 @@ mobile/views/pages/selectdrive.vue:
  select-file: "选择文件"
 mobile/views/pages/settings.vue:
  signed-in-as: "以{}登录"
-  lang: "语言"
-  lang-tip: "你需要刷新这个页面来应用更改。"
-  recommended: "推荐"
-  auto: "自动"
-  specify-language: "选择语言"
  design: "设计与展示"
  dark-mode: "夜间模式"
  i-am-under-limited-internet: "我的带宽有限"
@@ -1387,8 +1384,8 @@ mobile/views/pages/settings.vue:
  note-visibility: "帖子可见性"
  default-note-visibility: "默认可见性"
  remember-note-visibility: "记住帖子可见性"
-  web-search-engine: "ウェブ検索エンジン"
-  web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+  web-search-engine: "搜索引擎"
+  web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
  disable-via-mobile: "不要将帖子标记为“来自手机”"
  load-raw-images: "以原始质量显示附加图像"
  load-remote-media: "显示来自远程服务器的媒体"
@@ -1433,6 +1430,9 @@ mobile/views/pages/user.vue:
  block: "屏蔽"
  unblock: "取消屏蔽"
  years-old: "{age}岁"
+  push-to-list: "添加至列表"
+  select-list: "选择一个列表"
+  list-pushed: "成功添加{user}到{list}"
 mobile/views/pages/user/home.vue:
  recent-notes: "最近的帖子"
  images: "图片"
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.59.2",
-	"clientVersion": "2.0.12277",
+	"version": "10.62.0",
+	"clientVersion": "2.0.12431",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -34,8 +34,8 @@
 		"@types/debug": "0.0.31",
 		"@types/deep-equal": "1.0.1",
 		"@types/double-ended-queue": "2.1.0",
-		"@types/elasticsearch": "5.0.28",
-		"@types/file-type": "5.2.1",
+		"@types/elasticsearch": "5.0.29",
+		"@types/file-type": "5.2.2",
 		"@types/gulp": "3.8.36",
 		"@types/gulp-htmlmin": "1.3.32",
 		"@types/gulp-mocha": "0.0.32",
@@ -88,7 +88,7 @@
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
 		"animejs": "2.2.0",
-		"apexcharts": "2.2.3",
+		"apexcharts": "2.2.4",
 		"autobind-decorator": "2.3.1",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -156,6 +156,7 @@
 		"koa-send": "5.0.0",
 		"koa-slow": "2.1.0",
 		"koa-views": "6.1.4",
+		"langmap": "0.0.16",
 		"loader-utils": "1.1.0",
 		"minio": "7.0.1",
 		"mkdirp": "0.5.1",
@@ -213,7 +214,7 @@
 		"ts-node": "7.0.1",
 		"tslint": "5.10.0",
 		"typescript": "3.1.6",
-		"typescript-eslint-parser": "21.0.1",
+		"typescript-eslint-parser": "21.0.2",
 		"uglify-es": "3.3.9",
 		"url-loader": "1.1.2",
 		"uuid": "3.3.2",
@@ -223,20 +224,20 @@
 		"vue-content-loading": "1.5.3",
 		"vue-cropperjs": "2.2.2",
 		"vue-i18n": "8.3.2",
-		"vue-js-modal": "1.3.26",
+		"vue-js-modal": "1.3.27",
 		"vue-loader": "15.4.2",
 		"vue-marquee-text-component": "1.1.0",
 		"vue-router": "3.0.2",
 		"vue-style-loader": "4.1.2",
-		"vue-svg-inline-loader": "1.2.2",
+		"vue-svg-inline-loader": "1.2.4",
 		"vue-template-compiler": "2.5.17",
-		"vuedraggable": "2.16.0",
+		"vuedraggable": "2.17.0",
 		"vuewordcloud": "18.7.11",
 		"vuex": "3.0.1",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
 		"webfinger.js": "2.7.0",
-		"webpack": "4.26.0",
+		"webpack": "4.26.1",
 		"webpack-cli": "3.1.2",
 		"websocket": "1.0.28",
 		"ws": "6.1.2",
@@ -48,15 +48,15 @@ export default Vue.extend({
 		},

 		remove(i) {
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'warning',
 				text: this.$t('_remove.are-you-sure').replace('$1', this.announcements.find((_, j) => j == i).title),
 				showCancelButton: true
-			}).then(res => {
-				if (!res) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;
 				this.announcements = this.announcements.filter((_, j) => j !== i);
 				this.save(true);
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('_remove.removed')
 				});
@@ -68,13 +68,13 @@ export default Vue.extend({
 				broadcasts: this.announcements
 			}).then(() => {
 				if (!silent) {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'success',
 						text: this.$t('saved')
 					});
 				}
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -75,13 +75,13 @@ export default Vue.extend({
 				url: this.url,
 				aliases: this.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('add-emoji.added')
 				});
 				this.fetchEmojis();
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -103,12 +103,12 @@ export default Vue.extend({
 				url: emoji.url,
 				aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('updated')
 				});
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -116,23 +116,23 @@ export default Vue.extend({
 		},

 		removeEmoji(emoji) {
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'warning',
 				text: this.$t('remove-emoji.are-you-sure').replace('$1', emoji.name),
 				showCancelButton: true
-			}).then(res => {
-				if (!res) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;

 				this.$root.api('admin/emoji/remove', {
 					id: emoji.id
 				}).then(() => {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'success',
 						text: this.$t('remove-emoji.removed')
 					});
 					this.fetchEmojis();
 				}).catch(e => {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'error',
 						text: e
 					});
@@ -212,7 +212,7 @@ export default Vue.extend({
 			this.$root.api('admin/invite').then(x => {
 				this.inviteCode = x.code;
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -258,12 +258,12 @@ export default Vue.extend({
 				smtpUser: this.smtpUser,
 				smtpPass: this.smtpPass
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('saved')
 				});
 			}).catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e
 				});
@@ -34,14 +34,14 @@ export default Vue.extend({
 			const process = async () => {
 				const user = await this.$root.api('users/show', parseAcct(this.username));
 				await this.$root.api('admin/moderators/add', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('add-moderator.added')
 				});
 			};

 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
@@ -115,12 +115,12 @@ export default Vue.extend({
 				return await this.$root.api('users/show', this.target.startsWith('@') ? parseAcct(this.target) : { userId: this.target });
 			} catch (e) {
 				if (e == 'user not found') {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'error',
 						text: this.$t('user-not-found')
 					});
 				} else {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'error',
 						text: e.toString()
 					});
@@ -138,7 +138,7 @@ export default Vue.extend({
 		async resetPassword() {
 			const user = await this.fetchUser();
 			this.$root.api('admin/reset-password', { userId: user.id }).then(res => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('password-updated', { password: res.password })
 				});
@@ -151,14 +151,14 @@ export default Vue.extend({
 			const process = async () => {
 				const user = await this.fetchUser();
 				await this.$root.api('admin/verify-user', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('verified')
 				});
 			};

 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
@@ -173,14 +173,14 @@ export default Vue.extend({
 			const process = async () => {
 				const user = await this.fetchUser();
 				await this.$root.api('admin/unverify-user', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('unverified')
 				});
 			};

 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
@@ -195,14 +195,14 @@ export default Vue.extend({
 			const process = async () => {
 				const user = await this.fetchUser();
 				await this.$root.api('admin/suspend-user', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('suspended')
 				});
 			};

 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
@@ -217,14 +217,14 @@ export default Vue.extend({
 			const process = async () => {
 				const user = await this.fetchUser();
 				await this.$root.api('admin/unsuspend-user', { userId: user.id });
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					text: this.$t('unsuspended')
 				});
 			};

 			await process().catch(e => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: e.toString()
 				});
@@ -21,12 +21,12 @@ export default async function($root: any, force = false, silent = false) {
 			console.error(e);
 		}

-		if (!silent) {
-			$root.alert({
+		/*if (!silent) {
+			$root.dialog({
 				title: $root.$t('@.update-available-title'),
 				text: $root.$t('@.update-available', { newer, current })
 			});
-		}
+		}*/

 		return newer;
 	} else {
@@ -4,7 +4,7 @@ export default ($root: any) => {
 	require('fuckadblock');

 	function adBlockDetected() {
-		$root.alert({
+		$root.dialog({
 			title: $root.$t('@.adblock.detected'),
 			text: $root.$t('@.adblock.warning')
 		});
@@ -142,7 +142,7 @@ export default (opts: Opts = {}) => ({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.appearNote.id
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					splash: true
 				});
@@ -50,10 +50,13 @@ export default Vue.extend({

 	methods: {
 		regenerateToken() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('enter-password'),
-				type: 'password'
-			}).then(password => {
+				input: {
+					type: 'password'
+				}
+			}).then(({ canceled, result: password }) => {
+				if (canceled) return;
 				this.$root.api('i/regenerate_token', {
 					password: password
 				});
@@ -3,7 +3,9 @@
 	<ol class="users" ref="suggests" v-if="users.length > 0">
 		<li v-for="user in users" @click="complete(type, user)" @keydown="onKeydown" tabindex="-1">
 			<img class="avatar" :src="user.avatarUrl" alt=""/>
-			<span class="name">{{ user | userName }}</span>
+			<span class="name">
+				<mk-user-name :user="user"/>
+			</span>
 			<span class="username">@{{ user | acct }}</span>
 		</li>
 	</ol>
@@ -187,7 +189,8 @@ export default Vue.extend({
 				} else {
 					this.$root.api('users/search', {
 						query: this.q,
-						limit: 30
+						limit: 10,
+						detail: false
 					}).then(users => {
 						this.users = users;
 						this.fetching = false;
@@ -2,12 +2,17 @@
 <div class="felqjxyj" :class="{ splash }">
 	<div class="bg" ref="bg" @click="onBgClick"></div>
 	<div class="main" ref="main">
-		<div class="icon" :class="type"><fa :icon="icon"/></div>
+		<div class="icon" v-if="!input && !select && !user" :class="type"><fa :icon="icon"/></div>
 		<header v-if="title" v-html="title"></header>
 		<div class="body" v-if="text" v-html="text"></div>
+		<ui-input v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"></ui-input>
+		<ui-input v-if="user" v-model="userInputValue" autofocus @keydown="onInputKeydown"><span slot="prefix">@</span></ui-input>
+		<ui-select v-if="select" v-model="selectedValue">
+			<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
+		</ui-select>
 		<ui-horizon-group no-grow class="buttons fit-bottom" v-if="!splash">
-			<ui-button @click="ok" primary autofocus>OK</ui-button>
-			<ui-button @click="cancel" v-if="showCancelButton">Cancel</ui-button>
+			<ui-button @click="ok" primary :autofocus="!input && !select && !user">OK</ui-button>
+			<ui-button @click="cancel" v-if="showCancelButton || input || select || user">Cancel</ui-button>
 		</ui-horizon-group>
 	</div>
 </div>
@@ -17,6 +22,7 @@
 import Vue from 'vue';
 import * as anime from 'animejs';
 import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-icons';
+import parseAcct from "../../../../../misc/acct/parse";

 export default Vue.extend({
 	props: {
@@ -33,6 +39,15 @@ export default Vue.extend({
 			type: String,
 			required: false
 		},
+		input: {
+			required: false
+		},
+		select: {
+			required: false
+		},
+		user: {
+			required: false
+		},
 		showCancelButton: {
 			type: Boolean,
 			default: false
@@ -43,6 +58,14 @@ export default Vue.extend({
 		}
 	},

+	data() {
+		return {
+			inputValue: this.input && this.input.default ? this.input.default : null,
+			userInputValue: null,
+			selectedValue: null
+		};
+	},
+
 	computed: {
 		icon(): any {
 			switch (this.type) {
@@ -82,9 +105,21 @@ export default Vue.extend({
 	},

 	methods: {
-		ok() {
-			this.$emit('ok');
-			this.close();
+		async ok() {
+			if (this.user) {
+				const user = await this.$root.api('users/show', parseAcct(this.userInputValue));
+				if (user) {
+					this.$emit('ok', user);
+					this.close();
+				}
+			} else {
+				const result =
+					this.input ? this.inputValue :
+					this.select ? this.selectedValue :
+					true;
+				this.$emit('ok', result);
+				this.close();
+			}
 		},

 		cancel() {
@@ -114,6 +149,14 @@ export default Vue.extend({

 		onBgClick() {
 			this.cancel();
+		},
+
+		onInputKeydown(e) {
+			if (e.which == 13) { // Enter
+				e.preventDefault();
+				e.stopPropagation();
+				this.ok();
+			}
 		}
 	}
 });
@@ -180,8 +223,11 @@ export default Vue.extend({
 				display block
 				margin 0 auto

+			& + header
+				margin-top 16px
+
 		> header
-			margin 16px 0 8px 0
+			margin 0 0 8px 0
 			font-weight bold
 			font-size 20px

@@ -1,64 +0,0 @@
-<template>
-<div class="mk-discord-setting">
-	<p>{{ $t('description') }}</p>
-	<p class="account" v-if="$store.state.i.discord" :title="`Discord ID: ${$store.state.i.discord.id}`">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
-	<p>
-		<a :href="`${apiUrl}/connect/discord`" target="_blank" @click.prevent="connect">{{ $store.state.i.discord ? this.$t('reconnect') : this.$t('connect') }}</a>
-		<span v-if="$store.state.i.discord"> or </span>
-		<a :href="`${apiUrl}/disconnect/discord`" target="_blank" v-if="$store.state.i.discord" @click.prevent="disconnect">{{ $t('disconnect') }}</a>
-	</p>
-	<p class="id" v-if="$store.state.i.discord">Discord ID: {{ $store.state.i.discord.id }}</p>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../i18n';
-import { apiUrl } from '../../../config';
-
-export default Vue.extend({
-	i18n: i18n('common/views/components/discord-setting.vue'),
-	data() {
-		return {
-			form: null,
-			apiUrl
-		};
-	},
-	mounted() {
-		this.$watch('$store.state.i', () => {
-			if (this.$store.state.i.discord && this.form)
-				this.form.close();
-		}, {
-			deep: true
-		});
-	},
-	methods: {
-		connect() {
-			this.form = window.open(apiUrl + '/connect/discord',
-				'discord_connect_window',
-				'height=570, width=520');
-		},
-
-		disconnect() {
-			window.open(apiUrl + '/disconnect/discord',
-				'discord_disconnect_window',
-				'height=570, width=520');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-discord-setting
-	.account
-		border solid 1px #e1e8ed
-		border-radius 4px
-		padding 16px
-
-		a
-			font-weight bold
-			color inherit
-
-	.id
-		color #8899a6
-</style>
@@ -1,5 +1,5 @@
 <template>
-<img v-if="customEmoji" class="fvgwvorwhxigeolkkrcderjzcawqrscl custom" :src="url" :alt="alt" :title="alt"/>
+<img v-if="customEmoji" class="fvgwvorwhxigeolkkrcderjzcawqrscl custom" :class="{ normal: normal }" :src="url" :alt="alt" :title="alt"/>
 <img v-else-if="char && !useOsDefaultEmojis" class="fvgwvorwhxigeolkkrcderjzcawqrscl" :src="url" :alt="alt" :title="alt"/>
 <span v-else-if="char && useOsDefaultEmojis">{{ char }}</span>
 <span v-else>:{{ name }}:</span>
@@ -20,6 +20,11 @@ export default Vue.extend({
 			type: String,
 			required: false
 		},
+		normal: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 		customEmojis: {
 			required: false,
 			default: () => []
@@ -83,4 +88,11 @@ export default Vue.extend({
 		&:hover
 			transform scale(1.2)

+		&.normal
+			height 1.25em
+			vertical-align -0.25em
+
+			&:hover
+				transform none
+
 </style>
@@ -30,8 +30,14 @@
 						: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}`">
-					<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
-					<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
+					<template v-if="!$store.state.settings.games.reversi.useWhiteBlackStones">
+						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
+						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white" :class="{ contrast: $store.state.settings.games.reversi.useContrastStones }">
+					</template>
+					<template v-if="$store.state.settings.games.reversi.useWhiteBlackStones">
+						<fa v-if="stone === true" :icon="fasCircle"/>
+						<fa v-if="stone === false" :icon="farCircle"/>
+					</template>
 				</div>
 			</div>
 			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
@@ -74,6 +80,8 @@ import * as CRC32 from 'crc-32';
 import Reversi, { Color } from '../../../../../../../games/reversi/core';
 import { url } from '../../../../../config';
 import { faAngleDoubleLeft, faAngleLeft, faAngleRight, faAngleDoubleRight } from '@fortawesome/free-solid-svg-icons';
+import { faCircle as fasCircle } from '@fortawesome/free-solid-svg-icons';
+import { faCircle as farCircle } from '@fortawesome/free-regular-svg-icons';

 export default Vue.extend({
 	i18n: i18n('common/views/components/games/reversi/reversi.game.vue'),
@@ -99,7 +107,7 @@ export default Vue.extend({
 			logs: [],
 			logPos: 0,
 			pollingClock: null,
-			faAngleDoubleLeft, faAngleLeft, faAngleRight, faAngleDoubleRight
+			faAngleDoubleLeft, faAngleLeft, faAngleRight, faAngleDoubleRight, fasCircle, farCircle
 		};
 	},

@@ -412,6 +420,11 @@ export default Vue.extend({
 					&.none
 						border-color transparent !important

+					> svg
+						display block
+						width 100%
+						height 100%
+
 					> img
 						display block
 						width 100%
@@ -99,23 +99,22 @@ export default Vue.extend({
 			this.$emit('go', game);
 		},

-		match() {
-			this.$input({
-				title: this.$t('enter-username')
-			}).then(username => {
-				this.$root.api('users/show', {
-					username
-				}).then(user => {
-					this.$root.api('games/reversi/match', {
-						userId: user.id
-					}).then(res => {
-						if (res == null) {
-							this.$emit('matching', user);
-						} else {
-							this.$emit('go', res);
-						}
-					});
-				});
+		async match() {
+			const { result: user } = await this.$root.dialog({
+				title: this.$t('enter-username'),
+				user: {
+					local: true
+				}
+			});
+			if (user == null) return;
+			this.$root.api('games/reversi/match', {
+				userId: user.id
+			}).then(res => {
+				if (res == null) {
+					this.$emit('matching', user);
+				} else {
+					this.$emit('go', res);
+				}
 			});
 		},

@@ -1,64 +0,0 @@
-<template>
-<div class="mk-github-setting">
-	<p>{{ $t('description') }}</p>
-	<p class="account" v-if="$store.state.i.github" :title="`GitHub ID: ${$store.state.i.github.id}`">{{ $t('connected-to') }}: <a :href="`https://github.com/${$store.state.i.github.login}`" target="_blank">@{{ $store.state.i.github.login }}</a></p>
-	<p>
-		<a :href="`${apiUrl}/connect/github`" target="_blank" @click.prevent="connect">{{ $store.state.i.github ? this.$t('reconnect') : this.$t('connect') }}</a>
-		<span v-if="$store.state.i.github"> or </span>
-		<a :href="`${apiUrl}/disconnect/github`" target="_blank" v-if="$store.state.i.github" @click.prevent="disconnect">{{ $t('disconnect') }}</a>
-	</p>
-	<p class="id" v-if="$store.state.i.github">GitHub ID: {{ $store.state.i.github.id }}</p>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../i18n';
-import { apiUrl } from '../../../config';
-
-export default Vue.extend({
-	i18n: i18n('common/views/components/github-setting.vue'),
-	data() {
-		return {
-			form: null,
-			apiUrl
-		};
-	},
-	mounted() {
-		this.$watch('$store.state.i', () => {
-			if (this.$store.state.i.github && this.form)
-				this.form.close();
-		}, {
-			deep: true
-		});
-	},
-	methods: {
-		connect() {
-			this.form = window.open(apiUrl + '/connect/github',
-				'github_connect_window',
-				'height=570, width=520');
-		},
-
-		disconnect() {
-			window.open(apiUrl + '/disconnect/github',
-				'github_disconnect_window',
-				'height=570, width=520');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-github-setting
-	.account
-		border solid 1px #e1e8ed
-		border-radius 4px
-		padding 16px
-
-		a
-			font-weight bold
-			color inherit
-
-	.id
-		color #8899a6
-</style>
@@ -1,5 +1,6 @@
 import Vue from 'vue';

+import userName from './user-name.vue';
 import followButton from './follow-button.vue';
 import error from './error.vue';
 import noteSkeleton from './note-skeleton.vue';
@@ -44,6 +45,7 @@ import uiInfo from './ui/info.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';

+Vue.component('mk-user-name', userName);
 Vue.component('mk-follow-button', followButton);
 Vue.component('mk-error', error);
 Vue.component('mk-note-skeleton', noteSkeleton);
@@ -0,0 +1,96 @@
+<template>
+<ui-card>
+	<div slot="title"><fa icon="share-alt"/> {{ $t('title') }}</div>
+
+	<section>
+		<header><fa :icon="['fab', 'twitter']"/> Twitter</header>
+		<p v-if="$store.state.i.twitter">{{ $t('connected-to') }}: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
+		<ui-button v-if="$store.state.i.twitter" @click="disconnectTwitter">{{ $t('disconnect') }}</ui-button>
+		<ui-button v-else @click="connectTwitter">{{ $t('connect') }}</ui-button>
+	</section>
+
+	<section>
+		<header><fa :icon="['fab', 'discord']"/> Discord</header>
+		<p v-if="$store.state.i.discord">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
+		<ui-button v-if="$store.state.i.discord" @click="disconnectDiscord">{{ $t('disconnect') }}</ui-button>
+		<ui-button v-else @click="connectDiscord">{{ $t('connect') }}</ui-button>
+	</section>
+
+	<section>
+		<header><fa :icon="['fab', 'github']"/> GitHub</header>
+		<p v-if="$store.state.i.github">{{ $t('connected-to') }}: <a :href="`https://github.com/${$store.state.i.github.login}`" target="_blank">@{{ $store.state.i.github.login }}</a></p>
+		<ui-button v-if="$store.state.i.github" @click="disconnectGithub">{{ $t('disconnect') }}</ui-button>
+		<ui-button v-else @click="connectGithub">{{ $t('connect') }}</ui-button>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+import { apiUrl } from '../../../config';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/integration-settings.vue'),
+
+	data() {
+		return {
+			apiUrl,
+			twitterForm: null,
+			discordForm: null,
+			githubForm: null,
+		};
+	},
+
+	mounted() {
+		this.$watch('$store.state.i', () => {
+			if (this.$store.state.i.twitter) {
+				if (this.twitterForm) this.twitterForm.close();
+			}
+		}, {
+			deep: true
+		});
+	},
+
+	methods: {
+		connectTwitter() {
+			this.twitterForm = window.open(apiUrl + '/connect/twitter',
+				'twitter_connect_window',
+				'height=570, width=520');
+		},
+
+		disconnectTwitter() {
+			window.open(apiUrl + '/disconnect/twitter',
+				'twitter_disconnect_window',
+				'height=570, width=520');
+		},
+
+		connectDiscord() {
+			this.discordForm = window.open(apiUrl + '/connect/discord',
+				'discord_connect_window',
+				'height=570, width=520');
+		},
+
+		disconnectDiscord() {
+			window.open(apiUrl + '/disconnect/discord',
+				'discord_disconnect_window',
+				'height=570, width=520');
+		},
+
+		connectGithub() {
+			this.githubForm = window.open(apiUrl + '/connect/github',
+				'github_connect_window',
+				'height=570, width=520');
+		},
+
+		disconnectGithub() {
+			window.open(apiUrl + '/disconnect/github',
+				'github_disconnect_window',
+				'height=570, width=520');
+		},
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+</style>
@@ -0,0 +1,54 @@
+<template>
+<ui-card>
+	<div slot="title"><fa icon="language"/> {{ $t('title') }}</div>
+
+	<section class="fit-top">
+		<ui-select v-model="lang" :placeholder="$t('pick-language')">
+			<optgroup :label="$t('recommended')">
+				<option value="">{{ $t('auto') }}</option>
+			</optgroup>
+
+			<optgroup :label="$t('specify-language')">
+				<option v-for="x in langs" :value="x[0]" :key="x[0]">{{ x[1] }}</option>
+			</optgroup>
+		</ui-select>
+		<ui-info>Current: <i>{{ currentLanguage }}</i></ui-info>
+		<ui-info warn>{{ $t('info') }}</ui-info>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../i18n';
+import { langs } from '../../../config';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/language-settings.vue'),
+
+	data() {
+		return {
+			langs,
+			currentLanguage: 'Unknown',
+		};
+	},
+
+	computed: {
+		lang: {
+			get() { return this.$store.state.device.lang; },
+			set(value) { this.$store.commit('device/set', { key: 'lang', value }); }
+		},
+	},
+
+	created() {
+		try {
+			const locale = JSON.parse(localStorage.getItem('locale') || "{}");
+			const localeKey = localStorage.getItem('localeKey');
+			this.currentLanguage = `${locale.meta.lang} (${localeKey})`;
+		} catch { }
+	},
+
+	methods: {
+	}
+});
+</script>
@@ -1,5 +1,5 @@
 <template>
-<div class="onchrpzrvnoruiaenfcqvccjfuupzzwv">
+<div class="onchrpzrvnoruiaenfcqvccjfuupzzwv" :class="{ big: $root.isMobile }">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
 	<div class="popover" :class="{ hukidasi }" ref="popover">
 		<template v-for="item, i in items">
@@ -125,6 +125,11 @@ export default Vue.extend({

 	position initial

+	&.big
+		> .popover
+			> button
+				font-size 15px
+
 	> .backdrop
 		position fixed
 		top 0
@@ -115,9 +115,11 @@ export default Vue.extend({
 			}
 			this.$root.api('users/search', {
 				query: this.q,
-				max: 5
+				localOnly: true,
+				limit: 10,
+				detail: false
 			}).then(users => {
-				this.result = users;
+				this.result = users.filter(user => user.id != this.$store.state.i.id);
 			});
 		},
 		navigate(user) {
@@ -49,6 +49,10 @@ export default Vue.component('misskey-flavored-markdown', {
 			type: Boolean,
 			default: true
 		},
+		plainText: {
+			type: Boolean,
+			default: false
+		},
 		author: {
 			type: Object,
 			default: null
@@ -69,7 +73,7 @@ export default Vue.component('misskey-flavored-markdown', {

 		if (this.ast == null) {
 			// Parse text to ast
-			ast = parse(this.text);
+			ast = parse(this.text, this.plainText);
 		} else {
 			ast = this.ast as Node[];
 		}
@@ -96,6 +100,18 @@ export default Vue.component('misskey-flavored-markdown', {
 					return [createElement('b', genEl(token.children))];
 				}

+				case 'strike': {
+					return [createElement('del', genEl(token.children))];
+				}
+
+				case 'italic': {
+					return (createElement as any)('i', {
+						attrs: {
+							style: 'font-style: oblique;'
+						},
+					}, genEl(token.children));
+				}
+
 				case 'big': {
 					bigCount++;
 					const isLong = getTextCount(token.children) > 10 || getChildrenCount(token.children) > 5;
@@ -111,6 +127,10 @@ export default Vue.component('misskey-flavored-markdown', {
 					}, genEl(token.children));
 				}

+				case 'small': {
+					return [createElement('small', genEl(token.children))];
+				}
+
 				case 'center': {
 					return [createElement('div', {
 						attrs: {
@@ -238,7 +258,8 @@ export default Vue.component('misskey-flavored-markdown', {
 							name: token.props.name
 						},
 						props: {
-							customEmojis: this.customEmojis || customEmojis
+							customEmojis: this.customEmojis || customEmojis,
+							normal: this.plainText
 						}
 					})];
 				}
@@ -1,7 +1,9 @@
 <template>
 <header class="bvonvjxbwzaiskogyhbwgyxvcgserpmu">
 	<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle == 'smart'"/>
-	<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">{{ note.user | userName }}</router-link>
+	<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">
+		<mk-user-name :user="note.user"/>
+	</router-link>
 	<span class="is-admin" v-if="note.user.isAdmin">admin</span>
 	<span class="is-bot" v-if="note.user.isBot">bot</span>
 	<span class="is-cat" v-if="note.user.isCat">cat</span>
@@ -78,7 +78,7 @@ export default Vue.extend({
 			this.$root.api('i/pin', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					splash: true
 				});
@@ -95,12 +95,12 @@ export default Vue.extend({
 		},

 		del() {
-			this.$root.alert({
+			this.$root.dialog({
 				type: 'warning',
 				text: this.$t('delete-confirm'),
 				showCancelButton: true
-			}).then(res => {
-				if (!res) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;

 				this.$root.api('notes/delete', {
 					noteId: this.note.id
@@ -114,7 +114,7 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/create', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					splash: true
 				});
@@ -126,7 +126,7 @@ export default Vue.extend({
 			this.$root.api('notes/favorites/delete', {
 				noteId: this.note.id
 			}).then(() => {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'success',
 					splash: true
 				});
@@ -11,34 +11,43 @@ import i18n from '../../../i18n';
 export default Vue.extend({
 	i18n: i18n('common/views/components/password-settings.vue'),
 	methods: {
-		reset() {
-			this.$input({
+		async reset() {
+			const { canceled: canceled1, result: currentPassword } = await this.$root.dialog({
 				title: this.$t('enter-current-password'),
-				type: 'password'
-			}).then(currentPassword => {
-				this.$input({
-					title: this.$t('enter-new-password'),
+				input: {
 					type: 'password'
-				}).then(newPassword => {
-					this.$input({
-						title: this.$t('enter-new-password-again'),
-						type: 'password'
-					}).then(newPassword2 => {
-						if (newPassword !== newPassword2) {
-							this.$root.alert({
-								title: null,
-								text: this.$t('not-match')
-							});
-							return;
-						}
-						this.$root.api('i/change_password', {
-							currentPasword: currentPassword,
-							newPassword: newPassword
-						}).then(() => {
-							this.$notify(this.$t('changed'));
-						});
-					});
+				}
+			});
+			if (canceled1) return;
+
+			const { canceled: canceled2, result: newPassword } = await this.$root.dialog({
+				title: this.$t('enter-new-password'),
+				input: {
+					type: 'password'
+				}
+			});
+			if (canceled2) return;
+
+			const { canceled: canceled3, result: newPassword2 } = await this.$root.dialog({
+				title: this.$t('enter-new-password-again'),
+				input: {
+					type: 'password'
+				}
+			});
+			if (canceled3) return;
+
+			if (newPassword !== newPassword2) {
+				this.$root.dialog({
+					title: null,
+					text: this.$t('not-match')
 				});
+				return;
+			}
+			this.$root.api('i/change_password', {
+				currentPasword: currentPassword,
+				newPassword: newPassword
+			}).then(() => {
+				this.$notify(this.$t('changed'));
 			});
 		}
 	}
@@ -32,6 +32,12 @@
 				<span>{{ $t('description') }}</span>
 			</ui-textarea>

+			<ui-select v-model="lang">
+				<span slot="label">{{ $t('language') }}</span>
+				<span slot="icon"><fa icon="language"/></span>
+				<option v-for="lang in unique(Object.values(langmap).map(x => x.nativeName)).map(name => Object.keys(langmap).find(k => langmap[k].nativeName == name))" :value="lang" :key="lang">{{ langmap[lang].nativeName }}</option>
+			</ui-select>
+
 			<ui-input type="file" @change="onAvatarChange">
 				<span>{{ $t('avatar') }}</span>
 				<span slot="icon"><fa icon="image"/></span>
@@ -87,12 +93,16 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import { apiUrl, host } from '../../../config';
 import { toUnicode } from 'punycode';
+import langmap from 'langmap';
+import { unique } from '../../../../../prelude/array';

 export default Vue.extend({
 	i18n: i18n('common/views/components/profile-editor.vue'),

 	data() {
 		return {
+			unique,
+			langmap,
 			host: toUnicode(host),
 			enableEmail: false,
 			email: null,
@@ -100,6 +110,7 @@ export default Vue.extend({
 			username: null,
 			location: null,
 			description: null,
+			lang: null,
 			birthday: null,
 			avatarId: null,
 			bannerId: null,
@@ -137,6 +148,7 @@ export default Vue.extend({
 		this.username = this.$store.state.i.username;
 		this.location = this.$store.state.i.profile.location;
 		this.description = this.$store.state.i.description;
+		this.lang = this.$store.state.i.lang;
 		this.birthday = this.$store.state.i.profile.birthday;
 		this.avatarId = this.$store.state.i.avatarId;
 		this.bannerId = this.$store.state.i.bannerId;
@@ -198,6 +210,7 @@ export default Vue.extend({
 				name: this.name || null,
 				location: this.location || null,
 				description: this.description || null,
+				lang: this.lang,
 				birthday: this.birthday || null,
 				avatarId: this.avatarId || undefined,
 				bannerId: this.bannerId || undefined,
@@ -213,7 +226,7 @@ export default Vue.extend({
 				this.$store.state.i.bannerUrl = i.bannerUrl;

 				if (notify) {
-					this.$root.alert({
+					this.$root.dialog({
 						type: 'success',
 						text: this.$t('saved')
 					});
@@ -222,10 +235,13 @@ export default Vue.extend({
 		},

 		updateEmail() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('@.enter-password'),
-				type: 'password'
-			}).then(password => {
+				input: {
+					type: 'password'
+				}
+			}).then(({ canceled, result: password }) => {
+				if (canceled) return;
 				this.$root.api('i/update_email', {
 					password: password,
 					email: this.email == '' ? null : this.email
@@ -3,7 +3,9 @@
 	<mk-avatar class="avatar" :user="note.user"/>
 	<fa icon="retweet"/>
 	<i18n path="@.renoted-by" tag="span">
-		<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId" place="user">{{ note.user | userName }}</router-link>
+		<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId" place="user">
+			<mk-user-name :user="note.user"/>
+		</router-link>
 	</i18n>
 	<div class="info">
 		<span class="mobile" v-if="note.viaMobile"><fa icon="mobile-alt"/></span>
@@ -223,7 +223,7 @@ export default Vue.extend({
 			try {
 				theme = JSON5.parse(code);
 			} catch (e) {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: this.$t('invalid-theme')
 				});
@@ -236,7 +236,7 @@ export default Vue.extend({
 			}

 			if (theme.id == null) {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'error',
 					text: this.$t('invalid-theme')
 				});
@@ -244,7 +244,7 @@ export default Vue.extend({
 			}

 			if (this.$store.state.device.themes.some(t => t.id == theme.id)) {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'info',
 					text: this.$t('already-installed')
 				});
@@ -256,7 +256,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});

-			this.$root.alert({
+			this.$root.dialog({
 				type: 'success',
 				text: this.$t('installed').replace('{}', theme.name)
 			});
@@ -269,7 +269,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});

-			this.$root.alert({
+			this.$root.dialog({
 				type: 'info',
 				text: this.$t('uninstalled').replace('{}', theme.name)
 			});
@@ -306,7 +306,7 @@ export default Vue.extend({
 			const theme = this.myTheme;

 			if (theme.name == null || theme.name.trim() == '') {
-				this.$root.alert({
+				this.$root.dialog({
 					type: 'warning',
 					text: this.$t('theme-name-required')
 				});
@@ -320,7 +320,7 @@ export default Vue.extend({
 				key: 'themes', value: themes
 			});

-			this.$root.alert({
+			this.$root.dialog({
 				type: 'success',
 				text: this.$t('saved')
 			});
@@ -1,65 +0,0 @@
-<template>
-<div class="mk-twitter-setting">
-	<p>{{ $t('description') }}</p>
-	<p class="account" v-if="$store.state.i.twitter" :title="`Twitter ID: ${$store.state.i.twitter.userId}`">{{ $t('connected-to') }}: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
-	<p>
-		<a :href="`${apiUrl}/connect/twitter`" target="_blank" @click.prevent="connect">{{ $store.state.i.twitter ? this.$t('reconnect') : this.$t('connect') }}</a>
-		<span v-if="$store.state.i.twitter"> or </span>
-		<a :href="`${apiUrl}/disconnect/twitter`" target="_blank" v-if="$store.state.i.twitter" @click.prevent="disconnect">{{ $t('disconnect') }}</a>
-	</p>
-	<p class="id" v-if="$store.state.i.twitter">Twitter ID: {{ $store.state.i.twitter.userId }}</p>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../i18n';
-import { apiUrl } from '../../../config';
-
-export default Vue.extend({
-	i18n: i18n('common/views/components/twitter-setting.vue'),
-	data() {
-		return {
-			form: null,
-			apiUrl
-		};
-	},
-	mounted() {
-		this.$watch('$store.state.i', () => {
-			if (this.$store.state.i.twitter) {
-				if (this.form) this.form.close();
-			}
-		}, {
-			deep: true
-		});
-	},
-	methods: {
-		connect() {
-			this.form = window.open(apiUrl + '/connect/twitter',
-				'twitter_connect_window',
-				'height=570, width=520');
-		},
-
-		disconnect() {
-			window.open(apiUrl + '/disconnect/twitter',
-				'twitter_disconnect_window',
-				'height=570, width=520');
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mk-twitter-setting
-	.account
-		border solid 1px #e1e8ed
-		border-radius 4px
-		padding 16px
-
-		a
-			font-weight bold
-			color inherit
-
-	.id
-		color #8899a6
-</style>
@@ -4,8 +4,12 @@
 	:class="[styl, { inline, primary }]"
 	:type="type"
 	@click="$emit('click')"
+	@mousedown="onMousedown"
 >
-	<slot></slot>
+	<div ref="ripples" class="ripples"></div>
+	<div class="content">
+		<slot></slot>
+	</div>
 </component>
 </template>

@@ -56,6 +60,47 @@ export default Vue.extend({
 				this.$el.focus();
 			});
 		}
+	},
+	methods: {
+		onMousedown(e: MouseEvent) {
+			function distance(p, q) {
+				const sqrt = Math.sqrt, pow = Math.pow;
+				return sqrt(pow(p.x - q.x, 2) + pow(p.y - q.y, 2));
+			}
+
+			function calcCircleScale(boxW, boxH, circleCenterX, circleCenterY) {
+				const origin = {x: circleCenterX, y: circleCenterY};
+				const dist1 = distance({x: 0, y: 0}, origin);
+				const dist2 = distance({x: boxW, y: 0}, origin);
+				const dist3 = distance({x: 0, y: boxH}, origin);
+				const dist4 = distance({x: boxW, y: boxH }, origin);
+				return Math.max(dist1, dist2, dist3, dist4) * 2;
+			}
+
+			const rect = e.target.getBoundingClientRect();
+
+			const ripple = document.createElement('div');
+			ripple.style.top = (e.clientY - rect.top - 1).toString() + 'px';
+			ripple.style.left = (e.clientX - rect.left - 1).toString() + 'px';
+
+			this.$refs.ripples.appendChild(ripple);
+
+			const circleCenterX = e.clientX - rect.left;
+			const circleCenterY = e.clientY - rect.top;
+
+			const scale = calcCircleScale(e.target.clientWidth, e.target.clientHeight, circleCenterX, circleCenterY);
+
+			setTimeout(() => {
+				ripple.style.transform = 'scale(' + (scale / 2) + ')';
+			}, 1);
+			setTimeout(() => {
+				ripple.style.transition = 'all 1s ease';
+				ripple.style.opacity = '0';
+			}, 1000);
+			setTimeout(() => {
+				if (this.$refs.ripples) this.$refs.ripples.removeChild(ripple);
+			}, 2000);
+		}
 	}
 });
 </script>
@@ -137,4 +182,30 @@ export default Vue.extend({
 		&:not(:disabled):active
 			background var(--primaryAlpha03)

+	> .ripples
+		position absolute
+		z-index 0
+		top 0
+		left 0
+		width 100%
+		height 100%
+		border-radius 6px
+		overflow hidden
+
+		>>> div
+			position absolute
+			width 2px
+			height 2px
+			border-radius 100%
+			background rgba(0, 0, 0, 0.1)
+			opacity 1
+			transform scale(1)
+			transition all 0.5s cubic-bezier(0, .5, .5, 1)
+
+	&.primary > .ripples >>> div
+		background rgba(0, 0, 0, 0.15)
+
+	> .content
+		z-index 1
+
 </style>
@@ -43,6 +43,7 @@ export default Vue.extend({

 		> *
 			flex 1
+			min-width 0 !important

 	> *:not(:last-child)
 		margin-right 16px !important
@@ -14,17 +14,19 @@
 				:disabled="disabled"
 				:required="required"
 				:readonly="readonly"
+				:placeholder="placeholder"
 				:pattern="pattern"
 				:autocomplete="autocomplete"
 				:spellcheck="spellcheck"
 				@focus="focused = true"
 				@blur="focused = false"
+				@keydown="$emit('keydown', $event)"
 			>
 		</template>
 		<template v-else>
 			<input ref="input"
 				type="text"
-				:value="placeholder"
+				:value="filePlaceholder"
 				readonly
 				@click="chooseFile"
 			>
@@ -74,6 +76,15 @@ export default Vue.extend({
 			type: String,
 			required: false
 		},
+		placeholder: {
+			type: String,
+			required: false
+		},
+		autofocus: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 		autocomplete: {
 			required: false
 		},
@@ -109,7 +120,7 @@ export default Vue.extend({
 		filled(): boolean {
 			return this.v != '' && this.v != null;
 		},
-		placeholder(): string {
+		filePlaceholder(): string {
 			if (this.type != 'file') return null;
 			if (this.v == null) return null;

@@ -142,6 +153,12 @@ export default Vue.extend({
 		}
 	},
 	mounted() {
+		if (this.autofocus) {
+			this.$nextTick(() => {
+				this.$refs.input.focus();
+			});
+		}
+
 		this.$nextTick(() => {
 			if (this.$refs.prefix) {
 				this.$refs.label.style.left = (this.$refs.prefix.offsetLeft + this.$refs.prefix.offsetWidth) + 'px';
@@ -94,7 +94,7 @@ root(fill)
 		width 24px
 		text-align center
 		line-height 32px
-		color rgba(#000, 0.54)
+		color var(--inputLabel)

 		&:not(:empty) + .input
 			margin-left 28px
@@ -0,0 +1,16 @@
+<template>
+<misskey-flavored-markdown :text="user.name || user.username" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		user: {
+			type: Object,
+			required: true
+		}
+	}
+});
+</script>
@@ -5,7 +5,9 @@
 			<mk-avatar class="avatar" :user="note.user" target="_blank"/>
 			<div class="body">
 				<header>
-					<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">{{ note.user | userName }}</router-link>
+					<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">
+						<mk-user-name :user="note.user"/>
+					</router-link>
 					<span class="username">@{{ note.user | acct }}</span>
 					<div class="info">
 						<router-link class="created-at" :to="note | notePage">
@@ -6,10 +6,12 @@
 		<div class="banner" :style="bannerStyle"></div>
 		<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
 		<div class="body">
-			<router-link :to="user | userPage" class="name">{{ user | userName }}</router-link>
+			<router-link :to="user | userPage" class="name">
+				<mk-user-name :user="user"/>
+			</router-link>
 			<span class="username">@{{ user | acct }}</span>
 			<div class="description">
-				<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i"/>
+				<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
 			</div>
 		</div>
 	</main>
@@ -1,56 +0,0 @@
-<template>
-<div>
-	<mk-widget-container :show-header="false">
-		<article class="dolfvtibguprpxxhfndqaosjitixjohx">
-			<h1><fa icon="heart"/>{{ $t('title') }}</h1>
-			<p v-if="meta">
-				{{ this.$t('text').substr(0, this.$t('text').indexOf('{')) }}
-				<a :href="'mailto:' + meta.maintainer.email">{{ meta.maintainer.name }}</a>
-				{{ this.$t('text').substr(this.$t('text').indexOf('}') + 1) }}
-			</p>
-		</article>
-	</mk-widget-container>
-</div>
-</template>
-
-<script lang="ts">
-import define from '../../../common/define-widget';
-import i18n from '../../../i18n';
-
-export default define({
-	name: 'donation'
-}).extend({
-	i18n: i18n('common/views/widgets/donation.vue'),
-	data() {
-		return {
-			meta: null
-		};
-	},
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.dolfvtibguprpxxhfndqaosjitixjohx
-	padding 20px
-	background var(--donationBg)
-	color var(--donationFg)
-
-	> h1
-		margin 0 0 5px 0
-		font-size 1em
-
-		> [data-icon]
-			margin-right 0.25em
-
-	> p
-		display block
-		z-index 1
-		margin 0
-		font-size 0.8em
-
-</style>
@@ -11,7 +11,6 @@ import wCalendar from './calendar.vue';
 import wPhotoStream from './photo-stream.vue';
 import wSlideshow from './slideshow.vue';
 import wTips from './tips.vue';
-import wDonation from './donation.vue';
 import wNav from './nav.vue';
 import wHashtags from './hashtags.vue';

@@ -21,7 +20,6 @@ Vue.component('mkw-calendar', wCalendar);
 Vue.component('mkw-photo-stream', wPhotoStream);
 Vue.component('mkw-slideshow', wSlideshow);
 Vue.component('mkw-tips', wTips);
-Vue.component('mkw-donation', wDonation);
 Vue.component('mkw-broadcast', wBroadcast);
 Vue.component('mkw-server', wServer);
 Vue.component('mkw-posts-monitor', wPostsMonitor);
@@ -10,7 +10,6 @@
 				:style="`background-image: url(${image.thumbnailUrl || image.url})`"
 				draggable="true"
 				@dragstart="onDragstart(image, $event)"
-				@dragend="onDragend"
 			></div>
 		</div>
 		<p :class="$style.empty" v-if="!fetching && images.length == 0">{{ $t('no-photos') }}</p>
@@ -78,10 +77,6 @@ export default define({
 			e.dataTransfer.effectAllowed = 'move';
 			e.dataTransfer.setData('mk_drive_file', JSON.stringify(file));
 		},
-
-		onDragend(e) {
-			this.browser.isDragSource = false;
-		},
 	}
 });
 </script>
@@ -8,7 +8,7 @@ export default ($root: any) => {

 		const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
 		if (!regex.test(file.name) ) {
-			$root.alert({
+			$root.dialog({
 				title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
 				text: null
 			});
@@ -87,7 +87,7 @@ export default ($root: any) => {
 				value: i.avatarUrl
 			});

-			$root.alert({
+			$root.dialog({
 				title: '%fa:info-circle% %i18n:desktop.avatar-updated%',
 				text: null
 			});
@@ -87,7 +87,7 @@ export default ($root: any) => {
 				value: i.bannerUrl
 			});

-			$root.alert({
+			$root.dialog({
 				title: '%fa:info-circle% %i18n:desktop.banner-updated%',
 				text: null
 			});
@@ -34,7 +34,6 @@ import PostFormWindow from './views/components/post-form-window.vue';
 import RenoteFormWindow from './views/components/renote-form-window.vue';
 import MkChooseFileFromDriveWindow from './views/components/choose-file-from-drive-window.vue';
 import MkChooseFolderFromDriveWindow from './views/components/choose-folder-from-drive-window.vue';
-import InputDialog from './views/components/input-dialog.vue';
 import Notification from './views/components/ui-notification.vue';

 import { url } from '../config';
@@ -113,22 +112,6 @@ init(async (launch) => {
 				});
 			},

-			$input(opts) {
-				return new Promise<string>((res, rej) => {
-					const o = opts || {};
-					const d = this.$root.new(InputDialog, {
-						title: o.title,
-						placeholder: o.placeholder,
-						default: o.default,
-						type: o.type || 'text',
-						allowEmpty: o.allowEmpty
-					});
-					d.$once('done', text => {
-						res(text);
-					});
-				});
-			},
-
 			$notify(message) {
 				this.$root.new(Notification, {
 					message
@@ -148,12 +148,15 @@ export default Vue.extend({
 		},

 		rename() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('contextmenu.rename-file'),
-				placeholder: this.$t('contextmenu.input-new-file-name'),
-				default: this.file.name,
-				allowEmpty: false
-			}).then(name => {
+				input: {
+					placeholder: this.$t('contextmenu.input-new-file-name'),
+					default: this.file.name,
+					allowEmpty: false
+				}
+			}).then(({ canceled, result: name }) => {
+				if (canceled) return;
 				this.$root.api('drive/files/update', {
 					fileId: this.file.id,
 					name: name
@@ -170,7 +173,7 @@ export default Vue.extend({

 		copyUrl() {
 			copyToClipboard(this.file.url);
-			this.$root.alert({
+			this.$root.dialog({
 				title: this.$t('contextmenu.copied'),
 				text: this.$t('contextmenu.copied-url-to-clipboard')
 			});
@@ -155,7 +155,7 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$root.alert({
+							this.$root.dialog({
 								title: this.$t('unable-to-process'),
 								text: this.$t('circular-reference-detected')
 							});
@@ -192,11 +192,14 @@ export default Vue.extend({
 		},

 		rename() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('contextmenu.rename-folder'),
-				placeholder: this.$t('contextmenu.input-new-folder-name'),
-				default: this.folder.name
-			}).then(name => {
+				input: {
+					placeholder: this.$t('contextmenu.input-new-folder-name'),
+					default: this.folder.name
+				}
+			}).then(({ canceled, result: name }) => {
+				if (canceled) return;
 				this.$root.api('drive/folders/update', {
 					folderId: this.folder.id,
 					name: name
@@ -313,7 +313,7 @@ export default Vue.extend({
 				}).catch(err => {
 					switch (err) {
 						case 'detected-circular-definition':
-							this.$root.alert({
+							this.$root.dialog({
 								title: this.$t('unable-to-process'),
 								text: this.$t('circular-reference-detected')
 							});
@@ -331,16 +331,19 @@ export default Vue.extend({
 		},

 		urlUpload() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('url-upload'),
-				placeholder: this.$t('url-of-file')
-			}).then(url => {
+				input: {
+					placeholder: this.$t('url-of-file')
+				}
+			}).then(({ canceled, result: url }) => {
+				if (canceled) return;
 				this.$root.api('drive/files/upload_from_url', {
 					url: url,
 					folderId: this.folder ? this.folder.id : undefined
 				});

-				this.$root.alert({
+				this.$root.dialog({
 					title: this.$t('url-upload-requested'),
 					text: this.$t('may-take-time')
 				});
@@ -348,10 +351,13 @@ export default Vue.extend({
 		},

 		createFolder() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('create-folder'),
-				placeholder: this.$t('folder-name')
-			}).then(name => {
+				input: {
+					placeholder: this.$t('folder-name')
+				}
+			}).then(({ canceled, result: name }) => {
+				if (canceled) return;
 				this.$root.api('drive/folders/create', {
 					name: name,
 					parentId: this.folder ? this.folder.id : undefined
@@ -5,7 +5,9 @@
 		<div class="user" v-for="user in users" :key="user.id">
 			<mk-avatar class="avatar" :user="user" target="_blank"/>
 			<div class="body">
-				<router-link class="name" :to="user | userPage" v-user-preview="user.id">{{ user | userName }}</router-link>
+				<router-link class="name" :to="user | userPage" v-user-preview="user.id">
+					<mk-user-name :user="user"/>
+				</router-link>
 				<p class="username">@{{ user | acct }}</p>
 			</div>
 		</div>
@@ -26,7 +26,6 @@
 					<option value="hashtags">{{ $t('@.widgets.hashtags') }}</option>
 					<option value="posts-monitor">{{ $t('@.widgets.posts-monitor') }}</option>
 					<option value="server">{{ $t('@.widgets.server') }}</option>
-					<option value="donation">{{ $t('@.widgets.donation') }}</option>
 					<option value="nav">{{ $t('@.widgets.nav') }}</option>
 					<option value="tips">{{ $t('@.widgets.tips') }}</option>
 				</select>
@@ -95,7 +94,6 @@ const defaultDesktopHomeWidgets = {
 		'users',
 		'polls',
 		'server',
-		'donation',
 		'nav',
 		'tips'
 	]
@@ -186,7 +184,7 @@ export default Vue.extend({

 	methods: {
 		hint() {
-			this.$root.alert({
+			this.$root.dialog({
 				title: this.$t('@.customization-tips.title'),
 				text: this.$t('@.customization-tips.paragraph')
 			});
@@ -1,180 +0,0 @@
-<template>
-<mk-window ref="window" is-modal width="500px" @before-close="beforeClose" @closed="destroyDom">
-	<span slot="header" :class="$style.header">
-		<fa icon="i-cursor"/>{{ title }}
-	</span>
-
-	<div :class="$style.body">
-		<input ref="text" v-model="text" :type="type" @keydown="onKeydown" :placeholder="placeholder"/>
-	</div>
-	<div :class="$style.actions">
-		<button :class="$style.cancel" @click="cancel">{{ $t('cancel') }}</button>
-		<button :class="$style.ok" :disabled="!allowEmpty && text.length == 0" @click="ok">{{ $t('ok') }}</button>
-	</div>
-</mk-window>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../i18n';
-export default Vue.extend({
-	i18n: i18n('desktop/views/input-dialog.vue'),
-	props: {
-		title: {
-			type: String
-		},
-		placeholder: {
-			type: String
-		},
-		default: {
-			type: String
-		},
-		allowEmpty: {
-			default: true
-		},
-		type: {
-			default: 'text'
-		}
-	},
-	data() {
-		return {
-			done: false,
-			text: ''
-		};
-	},
-	mounted() {
-		if (this.default) this.text = this.default;
-		this.$nextTick(() => {
-			(this.$refs.text as any).focus();
-		});
-	},
-	methods: {
-		ok() {
-			if (!this.allowEmpty && this.text == '') return;
-			this.done = true;
-			(this.$refs.window as any).close();
-		},
-		cancel() {
-			this.done = false;
-			(this.$refs.window as any).close();
-		},
-		beforeClose() {
-			if (this.done) {
-				this.$emit('done', this.text);
-			} else {
-				this.$emit('canceled');
-			}
-		},
-		onKeydown(e) {
-			if (e.which == 13) { // Enter
-				e.preventDefault();
-				e.stopPropagation();
-				this.ok();
-			}
-		}
-	}
-});
-</script>
-
-
-<style lang="stylus" module>
-.header
-	> [data-icon]
-		margin-right 4px
-
-.body
-	padding 16px
-
-	> input
-		display block
-		padding 8px
-		margin 0
-		width 100%
-		max-width 100%
-		min-width 100%
-		font-size 1em
-		color #333
-		background #fff
-		outline none
-		border solid 1px var(--primaryAlpha01)
-		border-radius 4px
-		transition border-color .3s ease
-
-		&:hover
-			border-color var(--primaryAlpha02)
-			transition border-color .1s ease
-
-		&:focus
-			color var(--primary)
-			border-color var(--primaryAlpha05)
-			transition border-color 0s ease
-
-		&::-webkit-input-placeholder
-			color var(--primaryAlpha03)
-
-.actions
-	height 72px
-	background var(--primaryLighten95)
-
-.ok
-.cancel
-	display block
-	position absolute
-	bottom 16px
-	cursor pointer
-	padding 0
-	margin 0
-	width 120px
-	height 40px
-	font-size 1em
-	outline none
-	border-radius 4px
-
-	&:focus
-		&:after
-			content ""
-			pointer-events none
-			position absolute
-			top -5px
-			right -5px
-			bottom -5px
-			left -5px
-			border 2px solid var(--primaryAlpha03)
-			border-radius 8px
-
-	&:disabled
-		opacity 0.7
-		cursor default
-
-.ok
-	right 16px
-	color var(--primaryForeground)
-	background linear-gradient(to bottom, var(--primaryLighten25) 0%, var(--primaryLighten10) 100%)
-	border solid 1px var(--primaryLighten15)
-
-	&:not(:disabled)
-		font-weight bold
-
-	&:hover:not(:disabled)
-		background linear-gradient(to bottom, var(--primaryLighten8) 0%, var(--primaryDarken8) 100%)
-		border-color var(--primary)
-
-	&:active:not(:disabled)
-		background var(--primary)
-		border-color var(--primary)
-
-.cancel
-	right 148px
-	color #888
-	background linear-gradient(to bottom, #ffffff 0%, #f5f5f5 100%)
-	border solid 1px #e2e2e2
-
-	&:hover
-		background linear-gradient(to bottom, #f9f9f9 0%, #ececec 100%)
-		border-color #dcdcdc
-
-	&:active
-		background #ececec
-		border-color #dcdcdc
-
-</style>
@@ -1,5 +1,5 @@
 <template>
-<div class="uofhebxjdgksfmltszlxurtjnjjsvioh" v-if="video.isSensitive && hide" @click="hide = false">
+<div class="uofhebxjdgksfmltszlxurtjnjjsvioh" v-if="video.isSensitive && hide && !$store.state.device.alwaysShowNsfw" @click="hide = false">
 	<div>
 		<b><fa icon="exclamation-triangle"/> {{ $t('sensitive') }}</b>
 		<span>{{ $t('click-to-show') }}</span>
@@ -20,7 +20,9 @@
 	<article>
 		<mk-avatar class="avatar" :user="appearNote.user"/>
 		<header>
-			<router-link class="name" :to="appearNote.user | userPage" v-user-preview="appearNote.user.id">{{ appearNote.user | userName }}</router-link>
+			<router-link class="name" :to="appearNote.user | userPage" v-user-preview="appearNote.user.id">
+				<mk-user-name :user="appearNote.user"/>
+			</router-link>
 			<span class="username"><mk-acct :user="appearNote.user"/></span>
 			<div class="info">
 				<router-link class="time" :to="appearNote | notePage">
@@ -39,7 +41,7 @@
 		</header>
 		<div class="body">
 			<p v-if="appearNote.cw != null" class="cw">
-				<span class="text" v-if="appearNote.cw != ''">{{ appearNote.cw }}</span>
+				<misskey-flavored-markdown v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 				<mk-cw-button v-model="showContent"/>
 			</p>
 			<div class="content" v-show="appearNote.cw == null || showContent">
@@ -68,9 +70,12 @@
 				<template v-else><fa icon="reply"/></template>
 				<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 			</button>
-			<button class="renoteButton" @click="renote()" :title="$t('renote')">
-				<fa icon="retweet"/><p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</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>
@@ -324,6 +329,9 @@ export default Vue.extend({
 				&.reactionButton:hover
 					color var(--noteActionsReactionHover)

+				&.inhibitedButton
+					cursor not-allowed
+
 				> .count
 					display inline
 					margin 0 0 0 8px
@@ -5,7 +5,7 @@
 		<mk-note-header class="header" :note="note" :mini="true"/>
 		<div class="body">
 			<p v-if="note.cw != null" class="cw">
-				<span class="text" v-if="note.cw != ''">{{ note.cw }}</span>
+				<misskey-flavored-markdown v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
 				<mk-cw-button v-model="showContent"/>
 			</p>
 			<div class="content" v-show="note.cw == null || showContent">
@@ -5,7 +5,7 @@
 		<mk-note-header class="header" :note="note"/>
 		<div class="body">
 			<p v-if="note.cw != null" class="cw">
-				<span class="text" v-if="note.cw != ''">{{ note.cw }}</span>
+				<misskey-flavored-markdown v-if="note.cw != ''" class="text" :text="note.cw" :author="note.user" :i="$store.state.i" :custom-emojis="note.emojis" />
 				<mk-cw-button v-model="showContent"/>
 			</p>
 			<div class="content" v-show="note.cw == null || showContent">
@@ -20,7 +20,7 @@
 			<mk-note-header class="header" :note="appearNote" :mini="mini"/>
 			<div class="body" v-if="appearNote.deletedAt == null">
 				<p v-if="appearNote.cw != null" class="cw">
-					<span class="text" v-if="appearNote.cw != ''">{{ appearNote.cw }}</span>
+					<misskey-flavored-markdown v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 					<mk-cw-button v-model="showContent"/>
 				</p>
 				<div class="content" v-show="appearNote.cw == null || showContent">
@@ -47,9 +47,12 @@
 					<template v-else><fa icon="reply"/></template>
 					<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 				</button>
-				<button class="renoteButton" @click="renote()" :title="$t('renote')">
+				<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>
@@ -291,6 +294,9 @@ export default Vue.extend({
 					&.reactionButton:hover
 						color var(--noteActionsReactionHover)

+					&.inhibitedButton
+						cursor not-allowed
+
 					> .count
 						display inline
 						margin 0 0 0 8px
@@ -18,9 +18,11 @@
 						<div class="text">
 							<p>
 								<mk-reaction-icon :reaction="notification.reaction"/>
-								<router-link :to="notification.user | userPage" v-user-preview="notification.user.id">{{ notification.user | userName }}</router-link>
+								<router-link :to="notification.user | userPage" v-user-preview="notification.user.id">
+									<mk-user-name :user="notification.user"/>
+								</router-link>
 							</p>
-							<router-link class="note-ref" :to="notification.note | notePage">
+							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 								<fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}<fa icon="quote-right"/>
 							</router-link>
 						</div>
@@ -30,9 +32,11 @@
 						<mk-avatar class="avatar" :user="notification.note.user"/>
 						<div class="text">
 							<p><fa icon="retweet"/>
-								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">{{ notification.note.user | userName }}</router-link>
+								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">
+									<mk-user-name :user="notification.note.user"/>
+								</router-link>
 							</p>
-							<router-link class="note-ref" :to="notification.note | notePage">
+							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
 								<fa icon="quote-left"/>{{ getNoteSummary(notification.note.renote) }}<fa icon="quote-right"/>
 							</router-link>
 						</div>
@@ -42,9 +46,11 @@
 						<mk-avatar class="avatar" :user="notification.note.user"/>
 						<div class="text">
 							<p><fa icon="quote-left"/>
-								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">{{ notification.note.user | userName }}</router-link>
+								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">
+									<mk-user-name :user="notification.note.user"/>
+								</router-link>
 							</p>
-							<router-link class="note-preview" :to="notification.note | notePage">{{ getNoteSummary(notification.note) }}</router-link>
+							<router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">{{ getNoteSummary(notification.note) }}</router-link>
 						</div>
 					</template>

@@ -52,7 +58,9 @@
 						<mk-avatar class="avatar" :user="notification.user"/>
 						<div class="text">
 							<p><fa icon="user-plus"/>
-								<router-link :to="notification.user | userPage" v-user-preview="notification.user.id">{{ notification.user | userName }}</router-link>
+								<router-link :to="notification.user | userPage" v-user-preview="notification.user.id">
+									<mk-user-name :user="notification.user"/>
+								</router-link>
 							</p>
 						</div>
 					</template>
@@ -61,7 +69,9 @@
 						<mk-avatar class="avatar" :user="notification.user"/>
 						<div class="text">
 							<p><fa icon="user-clock"/>
-								<router-link :to="notification.user | userPage" v-user-preview="notification.user.id">{{ notification.user | userName }}</router-link>
+								<router-link :to="notification.user | userPage" v-user-preview="notification.user.id">
+									<mk-user-name :user="notification.user"/>
+								</router-link>
 							</p>
 						</div>
 					</template>
@@ -70,9 +80,11 @@
 						<mk-avatar class="avatar" :user="notification.note.user"/>
 						<div class="text">
 							<p><fa icon="reply"/>
-								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">{{ notification.note.user | userName }}</router-link>
+								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">
+									<mk-user-name :user="notification.note.user"/>
+								</router-link>
 							</p>
-							<router-link class="note-preview" :to="notification.note | notePage">{{ getNoteSummary(notification.note) }}</router-link>
+							<router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">{{ getNoteSummary(notification.note) }}</router-link>
 						</div>
 					</template>

@@ -80,17 +92,21 @@
 						<mk-avatar class="avatar" :user="notification.note.user"/>
 						<div class="text">
 							<p><fa icon="at"/>
-								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">{{ notification.note.user | userName }}</router-link>
+								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">
+									<mk-user-name :user="notification.note.user"/>
+								</router-link>
 							</p>
-							<a class="note-preview" :href="notification.note | notePage">{{ getNoteSummary(notification.note) }}</a>
+							<a class="note-preview" :href="notification.note | notePage" :title="getNoteSummary(notification.note)">{{ getNoteSummary(notification.note) }}</a>
 						</div>
 					</template>

 					<template v-if="notification.type == 'poll_vote'">
 						<mk-avatar class="avatar" :user="notification.user"/>
 						<div class="text">
-							<p><fa icon="chart-pie"/><a :href="notification.user | userPage" v-user-preview="notification.user.id">{{ notification.user | userName }}</a></p>
-							<router-link class="note-ref" :to="notification.note | notePage">
+							<p><fa icon="chart-pie"/><a :href="notification.user | userPage" v-user-preview="notification.user.id">
+								<mk-user-name :user="notification.user"/>
+							</a></p>
+							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 								<fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}<fa icon="quote-right"/>
 							</router-link>
 						</div>
@@ -219,7 +235,7 @@ export default Vue.extend({
 				margin 0
 				padding 16px
 				overflow-wrap break-word
-				font-size 13px
+				font-size 12px
 				border-bottom solid 1px var(--faceDivider)

 				&:last-child
@@ -262,9 +278,18 @@ export default Vue.extend({

 				.note-preview
 					color var(--noteText)
+					display inline-block
+					overflow hidden
+					max-height 48px
+					word-break break-all

 				.note-ref
 					color var(--noteText)
+					display inline-block
+					width: 100%
+					overflow hidden
+					white-space nowrap
+					text-overflow ellipsis

 					[data-icon]
 						font-size 1em
@@ -7,7 +7,9 @@
 >
 	<div class="content">
 		<div v-if="visibility == 'specified'" class="visibleUsers">
-			<span v-for="u in visibleUsers">{{ u | userName }}<a @click="removeVisibleUser(u)">[x]</a></span>
+			<span v-for="u in visibleUsers">
+				<mk-user-name :user="u"/><a @click="removeVisibleUser(u)">[x]</a>
+			</span>
 			<a @click="addVisibleUser">{{ $t('add-visible-user') }}</a>
 		</div>
 		<div class="hashtags" v-if="recentHashtags.length > 0 && $store.state.settings.suggestRecentHashtags">
@@ -15,7 +17,7 @@
 			<a v-for="tag in recentHashtags.slice(0, 5)" @click="addTag(tag)" :title="$t('click-to-tagging')">#{{ tag }}</a>
 		</div>
 		<div class="local-only" v-if="this.localOnly == true">{{ $t('local-only-message') }}</div>
-		<input v-show="useCw" v-model="cw" :placeholder="$t('annotations')">
+		<input v-show="useCw" ref="cw" v-model="cw" :placeholder="$t('annotations')" v-autocomplete="'cw'">
 		<div class="textarea">
 			<textarea :class="{ with: (files.length != 0 || poll) }"
 				ref="text" v-model="text" :disabled="posting"
@@ -71,7 +73,6 @@ import parse from '../../../../../mfm/parse';
 import { host } from '../../../config';
 import { erase, unique } from '../../../../../prelude/array';
 import { length } from 'stringz';
-import parseAcct from '../../../../../misc/acct/parse';
 import { toASCII } from 'punycode';

 export default Vue.extend({
@@ -384,13 +385,12 @@ export default Vue.extend({
 		},

 		addVisibleUser() {
-			this.$input({
-				title: this.$t('enter-username')
-			}).then(acct => {
-				if (acct.startsWith('@')) acct = acct.substr(1);
-				this.$root.api('users/show', parseAcct(acct)).then(user => {
-					this.visibleUsers.push(user);
-				});
+			this.$root.dialog({
+				title: this.$t('enter-username'),
+				user: true
+			}).then(({ canceled, result: user }) => {
+				if (canceled) return;
+				this.visibleUsers.push(user);
 			});
 		},

@@ -4,7 +4,9 @@

 	<div class="slpqaxdoxhvglersgjukmvizkqbmbokc">
 		<div v-for="req in requests">
-			<router-link :key="req.id" :to="req.follower | userPage">{{ req.follower | userName }}</router-link>
+			<router-link :key="req.id" :to="req.follower | userPage">
+				<mk-user-name :user="req.follower"/>
+			</router-link>
 			<span>
 				<a @click="accept(req.follower)">{{ $t('accept') }}</a>|<a @click="reject(req.follower)">{{ $t('reject') }}</a>
 			</span>
@@ -35,10 +35,13 @@ export default Vue.extend({
 	},
 	methods: {
 		register() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('enter-password'),
-				type: 'password'
-			}).then(password => {
+				input: {
+					type: 'password'
+				}
+			}).then(({ canceled, result: password }) => {
+				if (canceled) return;
 				this.$root.api('i/2fa/register', {
 					password: password
 				}).then(data => {
@@ -48,10 +51,13 @@ export default Vue.extend({
 		},

 		unregister() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('enter-password'),
-				type: 'password'
-			}).then(password => {
+				input: {
+					type: 'password'
+				}
+			}).then(({ canceled, result: password }) => {
+				if (canceled) return;
 				this.$root.api('i/2fa/unregister', {
 					password: password
 				}).then(() => {
@@ -16,27 +16,7 @@
 	<div class="pages">
 		<div class="profile" v-show="page == 'profile'">
 			<x-profile-editor/>
-
-			<ui-card>
-				<div slot="title"><fa :icon="['fab', 'twitter']"/> {{ $t('twitter') }}</div>
-				<section>
-					<x-twitter-setting/>
-				</section>
-			</ui-card>
-
-			<ui-card>
-				<div slot="title"><fa :icon="['fab', 'github']"/> {{ $t('github') }}</div>
-				<section>
-					<x-github-setting/>
-				</section>
-			</ui-card>
-
-			<ui-card>
-				<div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord') }}</div>
-				<section>
-					<x-discord-setting/>
-				</section>
-			</ui-card>
+			<x-integration-settings/>
 		</div>

 		<ui-card class="theme" v-show="page == 'theme'">
@@ -132,7 +112,7 @@
 				<ui-switch v-model="iLikeSushi">{{ $t('@.i-like-sushi') }}</ui-switch>
 			</section>
 			<section>
-				<ui-switch v-model="suggestRecentHashtags">{{ $t('suggest-recent-hashtags') }}</ui-switch>
+				<ui-switch v-model="suggestRecentHashtags">{{ $t('@.suggest-recent-hashtags') }}</ui-switch>
 				<ui-switch v-model="showClockOnHeader">{{ $t('show-clock-on-header') }}</ui-switch>
 				<ui-switch v-model="alwaysShowNsfw">{{ $t('@.always-show-nsfw') }}</ui-switch>
 				<ui-switch v-model="showReplyTarget">{{ $t('show-reply-target') }}</ui-switch>
@@ -144,9 +124,19 @@
 				<header>{{ $t('deck-column-align') }}</header>
 				<ui-radio v-model="deckColumnAlign" value="center">{{ $t('deck-column-align-center') }}</ui-radio>
 				<ui-radio v-model="deckColumnAlign" value="left">{{ $t('deck-column-align-left') }}</ui-radio>
+				<ui-radio v-model="deckColumnAlign" value="flexible">{{ $t('deck-column-align-flexible') }}</ui-radio>
+			</section>
+			<section>
+				<header>{{ $t('deck-column-width') }}</header>
+				<ui-radio v-model="deckColumnWidth" value="narrow">{{ $t('deck-column-width-narrow') }}</ui-radio>
+				<ui-radio v-model="deckColumnWidth" value="narrower">{{ $t('deck-column-width-narrower') }}</ui-radio>
+				<ui-radio v-model="deckColumnWidth" value="normal">{{ $t('deck-column-width-normal') }}</ui-radio>
+				<ui-radio v-model="deckColumnWidth" value="wider">{{ $t('deck-column-width-wider') }}</ui-radio>
+				<ui-radio v-model="deckColumnWidth" value="wide">{{ $t('deck-column-width-wide') }}</ui-radio>
 			</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_useContrastStones">{{ $t('@.use-contrast-reversi-stones') }}</ui-switch>
 			</section>
 		</ui-card>
@@ -169,24 +159,7 @@
 			</section>
 		</ui-card>

-		<ui-card class="web" v-show="page == 'web'">
-			<div slot="title"><fa icon="language"/> {{ $t('language') }}</div>
-			<section class="fit-top">
-				<ui-select v-model="lang" :placeholder="$t('pick-language')">
-					<optgroup :label="$t('recommended')">
-						<option value="">{{ $t('auto') }}</option>
-					</optgroup>
-
-					<optgroup :label="$t('specify-language')">
-						<option v-for="x in langs" :value="x[0]" :key="x[0]">{{ x[1] }}</option>
-					</optgroup>
-				</ui-select>
-				<div class="none ui info">
-					<div>Current: <i>{{ this.currentLanguage }}</i></div>
-					<p><fa icon="info-circle"/>{{ $t('language-desc') }}</p>
-				</div>
-			</section>
-		</ui-card>
+		<x-language-settings v-show="page == 'web'"/>

 		<ui-card class="web" v-show="page == 'web'">
 			<div slot="title"><fa :icon="['far', 'trash-alt']"/> {{ $t('cache') }}</div>
@@ -309,17 +282,16 @@ import X2fa from './settings.2fa.vue';
 import XApps from './settings.apps.vue';
 import XSignins from './settings.signins.vue';
 import XTags from './settings.tags.vue';
-import XTwitterSetting from '../../../common/views/components/twitter-setting.vue';
-import XGithubSetting from '../../../common/views/components/github-setting.vue';
-import XDiscordSetting from '../../../common/views/components/discord-setting.vue';
+import XIntegrationSettings from '../../../common/views/components/integration-settings.vue';
 import XTheme from '../../../common/views/components/theme.vue';
 import XDriveSettings from '../../../common/views/components/drive-settings.vue';
 import XMuteAndBlock from '../../../common/views/components/mute-and-block.vue';
 import XPasswordSettings from '../../../common/views/components/password-settings.vue';
 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 { url, langs, clientVersion as version } from '../../../config';
+import { url, clientVersion as version } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';

 export default Vue.extend({
@@ -329,15 +301,14 @@ export default Vue.extend({
 		XApps,
 		XSignins,
 		XTags,
-		XTwitterSetting,
-		XGithubSetting,
-		XDiscordSetting,
+		XIntegrationSettings,
 		XTheme,
 		XDriveSettings,
 		XMuteAndBlock,
 		XPasswordSettings,
 		XProfileEditor,
 		XApiSettings,
+		XLanguageSettings,
 	},
 	props: {
 		initialPage: {
@@ -350,8 +321,6 @@ export default Vue.extend({
 			page: this.initialPage || 'profile',
 			meta: null,
 			version,
-			langs,
-			currentLanguage: 'Unknown',
 			latestVersion: undefined,
 			checkingForUpdate: false
 		};
@@ -397,6 +366,11 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'deckColumnAlign', value }); }
 		},

+		deckColumnWidth: {
+			get() { return this.$store.state.device.deckColumnWidth; },
+			set(value) { this.$store.commit('device/set', { key: 'deckColumnWidth', value }); }
+		},
+
 		deckDefault: {
 			get() { return this.$store.state.device.deckDefault; },
 			set(value) { this.$store.commit('device/set', { key: 'deckDefault', value }); }
@@ -412,11 +386,6 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'soundVolume', value }); }
 		},

-		lang: {
-			get() { return this.$store.state.device.lang; },
-			set(value) { this.$store.commit('device/set', { key: 'lang', value }); }
-		},
-
 		preventUpdate: {
 			get() { return this.$store.state.device.preventUpdate; },
 			set(value) { this.$store.commit('device/set', { key: 'preventUpdate', value }); }
@@ -537,6 +506,11 @@ 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_useContrastStones: {
 			get() { return this.$store.state.settings.games.reversi.useContrastStones; },
 			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useContrastStones', value }); }
@@ -556,12 +530,6 @@ export default Vue.extend({
 		this.$root.getMeta().then(meta => {
 			this.meta = meta;
 		});
-
-		try {
-			const locale = JSON.parse(localStorage.getItem('locale') || "{}");
-			const localeKey = localStorage.getItem('localeKey');
-			this.currentLanguage = `${locale.meta.lang} (${localeKey})`;
-		} catch { }
 	},
 	methods: {
 		readAllUnreadNotes() {
@@ -596,12 +564,12 @@ export default Vue.extend({
 				this.checkingForUpdate = false;
 				this.latestVersion = newer;
 				if (newer == null) {
-					this.$root.alert({
+					this.$root.dialog({
 						title: this.$t('no-updates'),
 						text: this.$t('no-updates-desc')
 					});
 				} else {
-					this.$root.alert({
+					this.$root.dialog({
 						title: this.$t('update-available'),
 						text: this.$t('update-available-desc')
 					});
@@ -610,7 +578,7 @@ export default Vue.extend({
 		},
 		clean() {
 			localStorage.clear();
-			this.$root.alert({
+			this.$root.dialog({
 				title: this.$t('cache-cleared'),
 				text: this.$t('cache-cleared-desc')
 			});
@@ -109,9 +109,11 @@ export default Vue.extend({
 				icon: 'plus',
 				text: this.$t('add-list'),
 				action: () => {
-					this.$input({
+					this.$root.dialog({
 						title: this.$t('list-name'),
-					}).then(async title => {
+						input: true
+					}).then(async ({ canceled, result: title }) => {
+						if (canceled) return;
 						const list = await this.$root.api('users/lists/create', {
 							title
 						});
@@ -4,10 +4,12 @@
 	<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
 	<mk-follow-button :user="user" class="follow" mini/>
 	<div class="body">
-		<router-link :to="user | userPage" class="name">{{ user | userName }}</router-link>
+		<router-link :to="user | userPage" class="name">
+			<mk-user-name :user="user"/>
+		</router-link>
 		<span class="username">@{{ user | acct }}</span>
 		<div class="description">
-			<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i"/>
+			<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
 		</div>
 	</div>
 </div>
@@ -29,9 +29,11 @@ export default Vue.extend({
 	},
 	methods: {
 		add() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('list-name'),
-			}).then(async title => {
+				input: true
+			}).then(async ({ canceled, result: title }) => {
+				if (canceled) return;
 				const list = await this.$root.api('users/lists/create', {
 					title
 				});
@@ -4,10 +4,12 @@
 		<div class="banner" :style="u.bannerUrl ? `background-image: url(${u.bannerUrl})` : ''"></div>
 		<mk-avatar class="avatar" :user="u" :disable-preview="true"/>
 		<div class="title">
-			<router-link class="name" :to="u | userPage">{{ u | userName }}</router-link>
+			<router-link class="name" :to="u | userPage"><mk-user-name :user="u"/></router-link>
 			<p class="username"><mk-acct :user="u"/></p>
 		</div>
-		<div class="description">{{ u.description }}</div>
+		<div class="description">
+			<misskey-flavored-markdown v-if="u.description" :text="u.description" :author="u" :i="$store.state.i" :custom-emojis="u.emojis"/>
+		</div>
 		<div class="status">
 			<div>
 				<p>{{ $t('notes') }}</p><span>{{ u.notesCount }}</span>
@@ -156,7 +158,7 @@ export default Vue.extend({

 	> .follow-button
 		position absolute
-		top 92px
+		top 8px
 		right 8px

 </style>
@@ -167,11 +167,14 @@ export default Vue.extend({
 				icon: 'pencil-alt',
 				text: this.$t('rename'),
 				action: () => {
-					this.$input({
+					this.$root.dialog({
 						title: this.$t('rename'),
-						default: this.name,
-						allowEmpty: false
-					}).then(name => {
+						input: {
+							default: this.name,
+							allowEmpty: false
+						}
+					}).then(({ canceled, result: name }) => {
+						if (canceled) return;
 						this.$store.dispatch('settings/renameDeckColumn', { id: this.column.id, name });
 					});
 				}
@@ -315,8 +318,6 @@ export default Vue.extend({
 .dnpfarvgbnfmyzbdquhhzyxcmstpdqzs
 	$header-height = 42px

-	width 330px
-	min-width 330px
 	height 100%
 	background var(--face)
 	border-radius var(--round)
@@ -351,6 +352,7 @@ export default Vue.extend({
 	&:not(.isStacked).narrow
 		width 285px
 		min-width 285px
+		flex-grow 0 !important

 	&.naked
 		background var(--deckAcrylicColumnBg)
@@ -11,8 +11,7 @@
 	<mk-error v-if="!fetching && requestInitPromise != null" @retry="resolveInitPromise"/>

 	<!-- トランジションを有効にするとなぜかメモリリークする -->
-	<!--<transition-group name="mk-notes" class="transition" ref="notes">-->
-	<div class="notes" ref="notes">
+	<transition-group name="mk-notes" class="transition notes" ref="notes">
 		<template v-for="(note, i) in _notes">
 			<x-note
 				:note="note"
@@ -25,8 +24,7 @@
 				<span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span>
 			</p>
 		</template>
-	</div>
-	<!--</transition-group>-->
+	</transition-group>

 	<footer v-if="more">
 		<button @click="loadMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
@@ -5,10 +5,12 @@
 		<div>
 			<header>
 				<mk-reaction-icon :reaction="notification.reaction"/>
-				<router-link :to="notification.user | userPage">{{ notification.user | userName }}</router-link>
+				<router-link :to="notification.user | userPage">
+					<mk-user-name :user="notification.user"/>
+				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
-			<router-link class="note-ref" :to="notification.note | notePage">
+			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 				<fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}
 				<fa icon="quote-right"/>
 			</router-link>
@@ -20,10 +22,12 @@
 		<div>
 			<header>
 				<fa icon="retweet"/>
-				<router-link :to="notification.user | userPage">{{ notification.user | userName }}</router-link>
+				<router-link :to="notification.user | userPage">
+					<mk-user-name :user="notification.user"/>
+				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
-			<router-link class="note-ref" :to="notification.note | notePage">
+			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
 				<fa icon="quote-left"/>{{ getNoteSummary(notification.note.renote) }}<fa icon="quote-right"/>
 			</router-link>
 		</div>
@@ -34,7 +38,9 @@
 		<div>
 			<header>
 				<fa icon="user-plus"/>
-				<router-link :to="notification.user | userPage">{{ notification.user | userName }}</router-link>
+				<router-link :to="notification.user | userPage">
+					<mk-user-name :user="notification.user"/>
+				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
 		</div>
@@ -45,7 +51,9 @@
 		<div>
 			<header>
 				<fa icon="user-clock"/>
-				<router-link :to="notification.user | userPage">{{ notification.user | userName }}</router-link>
+				<router-link :to="notification.user | userPage">
+					<mk-user-name :user="notification.user"/>
+				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
 		</div>
@@ -56,10 +64,12 @@
 		<div>
 			<header>
 				<fa icon="chart-pie"/>
-				<router-link :to="notification.user | userPage">{{ notification.user | userName }}</router-link>
+				<router-link :to="notification.user | userPage">
+					<mk-user-name :user="notification.user"/>
+				</router-link>
 				<mk-time :time="notification.createdAt"/>
 			</header>
-			<router-link class="note-ref" :to="notification.note | notePage">
+			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 				<fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}<fa icon="quote-right"/>
 			</router-link>
 		</div>
@@ -112,7 +122,7 @@ export default Vue.extend({
 .dsfykdcjpuwfvpefwufddclpjhzktmpw
 	> .notification
 		padding 16px
-		font-size 13px
+		font-size 12px
 		overflow-wrap break-word

 		&:after
@@ -150,6 +160,11 @@ export default Vue.extend({

 			> .note-ref
 				color var(--noteText)
+				display inline-block
+				width: 100%
+				overflow hidden
+				white-space nowrap
+				text-overflow ellipsis

 				[data-icon]
 					font-size 1em
@@ -16,13 +16,15 @@
 				<button class="menu" @click="menu" ref="menu"><fa icon="ellipsis-h"/></button>
 				<mk-follow-button v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" class="follow" mini/>
 				<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
-				<span class="name">{{ user | userName }}</span>
+				<span class="name">
+					<mk-user-name :user="user"/>
+				</span>
 				<span class="acct">@{{ user | acct }}</span>
 			</div>
 		</header>
 		<div class="info">
 			<div class="description">
-				<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i"/>
+				<misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
 			</div>
 			<div class="counts">
 				<div>
@@ -307,7 +309,7 @@ export default Vue.extend({
 							listId: list.id,
 							userId: this.user.id
 						});
-						this.$root.alert({
+						this.$root.dialog({
 							type: 'success',
 							splash: true
 						});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
syuilo	86d4f1981c	10.62.0	2018-12-06 16:35:06 +09:00
syuilo	7a8e97972c	✌️	2018-12-06 16:33:35 +09:00
syuilo	3555213155	Resolve #3519	2018-12-06 16:30:28 +09:00
syuilo	5d3d8dffd6	Update photo-stream.vue	2018-12-06 16:19:12 +09:00
syuilo	dea8688c9d	Refactor Use mk-user-name	2018-12-06 16:09:33 +09:00
syuilo	a235869cfa	Refactor Make mk-user-name component	2018-12-06 11:18:13 +09:00
tamaina	31b30e3dd2	Resolve #3347 , #3349 (#3513 ) * Resolve #3347 , #3349 Make deck columns' width be selectable and flexible * deckColumnMinwidth --> deckColumnMinWidth * w-default --> normal * ✌️	2018-12-06 11:11:46 +09:00
Aya Morisawa	58b3be438a	Resolve #1872 (#3516 )	2018-12-06 10:21:41 +09:00
MeiMei	4522568749	Emoji support in profile (#3514 ) * Emoji in profile * Add emojis to fields	2018-12-06 10:02:04 +09:00
Acid Chicken (硫酸鶏)	fe891da886	外部サービス連携情報をPersonのfieldsに乗せて配信する (#3499 ) * Update person.ts * Update person.ts refs: https://github.com/syuilo/misskey/pull/3499#issuecomment-444484557 * Update person.ts refs: https://github.com/syuilo/misskey/pull/3499#pullrequestreview-181755475	2018-12-06 00:37:59 +09:00
Aya Morisawa	66836836ab	Add small syntax (#3506 )	2018-12-05 20:11:54 +09:00
Aya Morisawa	dc8f4c8d6a	Fix #3341 (#3502 )	2018-12-05 18:44:57 +09:00
syuilo	ed4860dfd9	[MFM] Add italic syntax Resolve #3486	2018-12-05 17:39:26 +09:00
syuilo	20c0690352	[Client] Resolve #3500	2018-12-05 17:27:27 +09:00
dependabot[bot]	65d0dbb7d8	Update apexcharts requirement from 2.2.3 to 2.2.4 (#3497 ) Updates the requirements on [apexcharts](https://github.com/apexcharts/apexcharts.js) to permit the latest version. - [Release notes](https://github.com/apexcharts/apexcharts.js/releases) - [Changelog](https://github.com/apexcharts/apexcharts.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/apexcharts/apexcharts.js/commits/v2.2.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-05 08:33:54 +09:00
syuilo	a105faeaae	Update home.photos.vue	2018-12-04 11:02:51 +09:00
syuilo	13404310a7	Revert "Update switch.vue" This reverts commit `40520f3997`.	2018-12-04 09:42:55 +09:00
dependabot[bot]	2373b114bf	Update vue-svg-inline-loader requirement from 1.2.2 to 1.2.4 (#3493 ) Updates the requirements on [vue-svg-inline-loader](https://github.com/oliverfindl/vue-svg-inline-loader) to permit the latest version. - [Release notes](https://github.com/oliverfindl/vue-svg-inline-loader/releases) - [Commits](https://github.com/oliverfindl/vue-svg-inline-loader/commits/v1.2.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-04 08:29:09 +09:00
dependabot[bot]	5bfc6b6547	Update typescript-eslint-parser requirement from 21.0.1 to 21.0.2 (#3492 ) Updates the requirements on [typescript-eslint-parser](https://github.com/eslint/typescript-eslint-parser) to permit the latest version. - [Release notes](https://github.com/eslint/typescript-eslint-parser/releases) - [Changelog](https://github.com/eslint/typescript-eslint-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/typescript-eslint-parser/commits/v21.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-04 08:29:00 +09:00
dependabot[bot]	8026a609bb	Update vuedraggable requirement from 2.16.0 to 2.17.0 (#3491 ) Updates the requirements on [vuedraggable](https://github.com/David-Desmaisons/Vue.Draggable) to permit the latest version. - [Release notes](https://github.com/David-Desmaisons/Vue.Draggable/releases) - [Commits](https://github.com/David-Desmaisons/Vue.Draggable/commits/v2.17.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-04 08:28:52 +09:00
dependabot[bot]	10db61a0d2	Update @types/elasticsearch requirement from 5.0.28 to 5.0.29 (#3490 ) Updates the requirements on [@types/elasticsearch](https://github.com/DefinitelyTyped/DefinitelyTyped) to permit the latest version. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-04 08:28:42 +09:00
syuilo	40520f3997	Update switch.vue	2018-12-04 03:50:07 +09:00
MeiMei	c1d59716d1	Remove unnecessary Renote check code (#3489 )	2018-12-04 03:22:41 +09:00
MeiMei	d8698743a1	Do not show Renote button when inhibited (#3488 )	2018-12-04 03:22:08 +09:00
syuilo	ade5055bc3	10.61.0	2018-12-04 01:37:05 +09:00
syuilo	6e343d50f1	[MFM] Implement strike syntax Resolve #3485	2018-12-04 01:28:21 +09:00
syuilo	ce3f735654	Fix bug	2018-12-04 01:07:26 +09:00
syuilo	9b5e623130	🎨	2018-12-04 01:04:53 +09:00
syuilo	f0b0c5b540	🎨 Add ripple effect	2018-12-04 01:02:19 +09:00
MeiMei	227798300f	Improve widget paging looks (#3482 ) * Improve widget paging looks * rewind when error	2018-12-03 23:14:10 +09:00
syuilo	2ab8a5bc0a	10.60.4	2018-12-03 20:27:47 +09:00
syuilo	c222b9ae94	Update init.ts	2018-12-03 20:26:46 +09:00
syuilo	53a0f3c794	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2018-12-03 20:26:38 +09:00
syuilo	9ff349c548	Update post-form.vue	2018-12-03 20:21:05 +09:00
Aya Morisawa	0935bd4bd4	Resolve #3281 (#3479 )	2018-12-03 20:11:18 +09:00
syuilo	45bee7cc2f	Resolve #327	2018-12-03 20:08:18 +09:00
syuilo	1c86a4bc26	Refactor	2018-12-03 19:44:03 +09:00
syuilo	b385cf2a9f	10.60.3	2018-12-03 09:54:14 +09:00
syuilo	40d3dc454d	Merge pull request #3480 from syuilo/l10n_develop New Crowdin translations	2018-12-03 09:53:40 +09:00
syuilo	8e92848495	New translations ja-JP.yml (Korean)	2018-12-03 09:52:19 +09:00
syuilo	2d94a22a30	New translations ja-JP.yml (French)	2018-12-03 09:52:15 +09:00
syuilo	7a5a091c25	New translations ja-JP.yml (English)	2018-12-03 09:52:08 +09:00
syuilo	2baf810c71	New translations ja-JP.yml (Chinese Simplified)	2018-12-03 09:52:01 +09:00
syuilo	d1ecef13ef	New translations ja-JP.yml (Norwegian)	2018-12-03 09:43:22 +09:00
syuilo	495fa553ad	New translations ja-JP.yml (Dutch)	2018-12-03 09:43:16 +09:00
syuilo	854e649ea6	New translations ja-JP.yml (Japanese, Kansai)	2018-12-03 09:43:11 +09:00
syuilo	c047324b42	🎨	2018-12-03 09:43:07 +09:00
syuilo	daac865c72	New translations ja-JP.yml (Spanish)	2018-12-03 09:43:07 +09:00
syuilo	63d059b8d1	New translations ja-JP.yml (Russian)	2018-12-03 09:43:01 +09:00
syuilo	e3075a0dc7	New translations ja-JP.yml (Portuguese)	2018-12-03 09:42:57 +09:00
syuilo	6b6e597b95	New translations ja-JP.yml (Polish)	2018-12-03 09:42:51 +09:00
syuilo	eb0eadad5e	New translations ja-JP.yml (Korean)	2018-12-03 09:42:46 +09:00
syuilo	f600fee16d	New translations ja-JP.yml (Italian)	2018-12-03 09:42:40 +09:00
syuilo	7b88c54aa6	New translations ja-JP.yml (German)	2018-12-03 09:42:34 +09:00
syuilo	623dd57cc3	New translations ja-JP.yml (French)	2018-12-03 09:42:27 +09:00
syuilo	f6edd33adb	New translations ja-JP.yml (English)	2018-12-03 09:42:23 +09:00
syuilo	ac20d73222	New translations ja-JP.yml (Chinese Simplified)	2018-12-03 09:42:19 +09:00
syuilo	c59374d79d	New translations ja-JP.yml (Catalan)	2018-12-03 09:42:13 +09:00
syuilo	0d478046de	Improve usability	2018-12-03 09:41:22 +09:00
syuilo	f3479d1b98	Refactor	2018-12-03 09:38:43 +09:00
syuilo	2fdecb8a38	🎨	2018-12-03 09:14:17 +09:00
syuilo	a95c3ee557	New translations ja-JP.yml (Korean)	2018-12-03 08:12:01 +09:00
syuilo	67c439c70a	New translations ja-JP.yml (French)	2018-12-03 03:01:46 +09:00
syuilo	b96037cffa	New translations ja-JP.yml (Chinese Simplified)	2018-12-03 00:23:03 +09:00
syuilo	ebd8d34552	New translations ja-JP.yml (Chinese Simplified)	2018-12-03 00:13:13 +09:00
syuilo	a653d9a83e	New translations ja-JP.yml (Chinese Simplified)	2018-12-03 00:11:54 +09:00
syuilo	07d6894c42	Clean up	2018-12-02 23:00:06 +09:00
Aya Morisawa	03588b3fd6	Merge if-statements (#3478 )	2018-12-02 22:32:09 +09:00
syuilo	2e83440e70	10.60.2	2018-12-02 21:20:36 +09:00
nico	2633873fcc	Fix syntax error (#3477 ) src/remote/activitypub/models/person.ts(326,4): error TS1005: ',' expected.	2018-12-02 21:19:28 +09:00
syuilo	5f33713f53	10.60.1	2018-12-02 21:08:20 +09:00
syuilo	fe84c5010c	Merge pull request #3458 from syuilo/l10n_develop New Crowdin translations	2018-12-02 20:43:52 +09:00
syuilo	7f39df0713	New translations ja-JP.yml (English)	2018-12-02 20:43:12 +09:00
Aya Morisawa	928d359dd2	Use takeWhile instead of some (#3475 )	2018-12-02 20:28:22 +09:00
Aya Morisawa	184eb00133	Remove self-assignment (#3476 )	2018-12-02 20:26:15 +09:00
syuilo	e264a49b08	[Client] Resolve #2596	2018-12-02 20:24:38 +09:00
syuilo	8caf853c80	Merge branches 'develop', 'develop' and 'develop' of https://github.com/syuilo/misskey into develop	2018-12-02 20:11:03 +09:00
Aya Morisawa	b451c04787	Use primitive type boolean (#3474 )	2018-12-02 20:10:56 +09:00
syuilo	1653977392	Improve input dialog	2018-12-02 20:10:53 +09:00
Aya Morisawa	a0d9def98a	Simplify expressions (#3473 )	2018-12-02 19:35:41 +09:00
Aya Morisawa	92701e5cec	Fix #3445 (#3471 )	2018-12-02 19:24:57 +09:00
Aya Morisawa	0b6b6a4f2f	Remove unneccesary casts	2018-12-02 19:05:08 +09:00
MeiMei	3a2dc95850	No MFM parsing when remote note (#3470 ) * Use tag for hashtag detection of remote note * No MFM parsing when remote note	2018-12-02 18:05:33 +09:00
syuilo	163cf49f16	10.60.0	2018-12-02 15:39:46 +09:00
syuilo	37fc3103f6	New translations ja-JP.yml (Norwegian)	2018-12-02 15:33:32 +09:00
syuilo	b7bd1ff69f	New translations ja-JP.yml (Dutch)	2018-12-02 15:33:28 +09:00
syuilo	dc36134f10	New translations ja-JP.yml (Japanese, Kansai)	2018-12-02 15:33:22 +09:00
syuilo	fea8821091	New translations ja-JP.yml (Spanish)	2018-12-02 15:33:17 +09:00
syuilo	33faf40aca	New translations ja-JP.yml (Russian)	2018-12-02 15:33:12 +09:00
syuilo	4410f8d7f7	New translations ja-JP.yml (Portuguese)	2018-12-02 15:33:08 +09:00
syuilo	3e6029e69d	New translations ja-JP.yml (Polish)	2018-12-02 15:33:04 +09:00
syuilo	96c7707e6c	New translations ja-JP.yml (Korean)	2018-12-02 15:32:59 +09:00
syuilo	d8e545db3c	New translations ja-JP.yml (Italian)	2018-12-02 15:32:54 +09:00
syuilo	a9a6ba0aed	New translations ja-JP.yml (German)	2018-12-02 15:32:50 +09:00
syuilo	a898c6ceab	New translations ja-JP.yml (French)	2018-12-02 15:32:44 +09:00
syuilo	0205c5c2d7	New translations ja-JP.yml (English)	2018-12-02 15:32:38 +09:00
syuilo	f8074ab74b	New translations ja-JP.yml (Chinese Simplified)	2018-12-02 15:32:34 +09:00
syuilo	f15c491d5f	New translations ja-JP.yml (Catalan)	2018-12-02 15:32:29 +09:00
syuilo	c38a32dee9	🎨	2018-12-02 15:31:24 +09:00
syuilo	4f5abed70d	Fix	2018-12-02 15:30:48 +09:00
syuilo	c9ac9923df	Refactor: rename alert to dialog	2018-12-02 15:28:52 +09:00
syuilo	bb14895fd8	[Client] Resolve #2225	2018-12-02 15:26:56 +09:00
syuilo	6f92d601ec	🎨	2018-12-02 14:26:30 +09:00
MeiMei	345143b0c1	Suggest in CW (#3467 )	2018-12-02 07:33:03 +09:00
syuilo	dc80d5d376	10.59.4	2018-12-02 07:08:26 +09:00
Acid Chicken (硫酸鶏)	d3544f9637	Update README.md [AUTOGEN] (#3466 )	2018-12-02 07:05:22 +09:00
syuilo	864b6ad1bd	Resolve #1826	2018-12-02 07:02:08 +09:00
syuilo	c58027e521	[MFM] Better hashtag detection	2018-12-02 06:53:57 +09:00
syuilo	10fb399588	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2018-12-02 06:44:25 +09:00
syuilo	10f466c895	Improve performance	2018-12-02 06:44:18 +09:00
Acid Chicken (硫酸鶏)	32068b4bcc	Update README.md [AUTOGEN] (#3465 )	2018-12-02 06:16:24 +09:00
syuilo	381f2b7fdf	New translations ja-JP.yml (French)	2018-12-02 05:12:02 +09:00
syuilo	1c3c733c6b	New translations ja-JP.yml (French)	2018-12-02 05:02:46 +09:00
MeiMei	8bc5febe66	[Client] Add missing icon (#3464 )	2018-12-02 03:43:05 +09:00
MeiMei	20335e23f9	Resolve external recommended users (#3462 ) * Resolve external recommended users * Skip unresolvable users * Fix indent * Use original for unresolvable users	2018-12-02 03:42:45 +09:00
syuilo	9dbc9115c9	New translations ja-JP.yml (English)	2018-12-01 12:51:44 +09:00
syuilo	fe707f88a4	[MFM] Better MFM parsing	2018-12-01 10:40:09 +09:00
syuilo	9b23ebd4a3	🎨	2018-12-01 09:45:48 +09:00
syuilo	bea450cc2c	10.59.3	2018-12-01 08:00:25 +09:00
syuilo	e80709f7aa	Disable update notification	2018-12-01 07:59:15 +09:00
imgbot[bot]	cb71f92f42	[ImgBot] Optimize images (#3455 ) *Total -- 1,383.25kb -> 1,231.27kb (10.99%) /assets/apple-touch-icon.png -- 4.72kb -> 2.51kb (46.79%) /assets/icons/256.png -- 4.72kb -> 2.51kb (46.79%) /assets/title.png -- 6.63kb -> 3.80kb (42.73%) /assets/favicon/favicon.png -- 6.83kb -> 3.93kb (42.45%) /assets/icons/192.png -- 3.49kb -> 2.02kb (42.08%) /assets/icons/128.png -- 2.29kb -> 1.50kb (34.81%) /assets/about/ui.png -- 125.21kb -> 94.85kb (24.25%) /assets/ai-orig.png -- 255.55kb -> 199.67kb (21.86%) /assets/icons/64.png -- 1.21kb -> 0.99kb (18.34%) /assets/about/drive.png -- 110.33kb -> 94.20kb (14.62%) /assets/about/post.png -- 344.52kb -> 316.57kb (8.11%) /assets/ai.png -- 243.43kb -> 234.93kb (3.49%) /src/client/assets/pointer.png -- 274.33kb -> 273.80kb (0.19%)	2018-12-01 07:55:34 +09:00
tamaina	2ca5348560	Fix "Mi"/"Misskey" logos (#3400 ) * Fix mi.svg * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload	2018-12-01 07:52:15 +09:00
dependabot[bot]	c8e98fdf8e	Update vue-js-modal requirement from 1.3.26 to 1.3.27 (#3425 ) Updates the requirements on [vue-js-modal](https://github.com/euvl/vue-js-modal) to permit the latest version. - [Release notes](https://github.com/euvl/vue-js-modal/releases) - [Commits](https://github.com/euvl/vue-js-modal/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-01 07:44:30 +09:00
syuilo	0bfa041026	Merge pull request #3435 from syuilo/l10n_develop New Crowdin translations	2018-12-01 07:20:03 +09:00
dependabot[bot]	33bf474a1e	Update @types/file-type requirement from 5.2.1 to 5.2.2 (#3450 ) Updates the requirements on [@types/file-type](https://github.com/DefinitelyTyped/DefinitelyTyped) to permit the latest version. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-01 07:19:39 +09:00
Acid Chicken (硫酸鶏)	53c559c001	Allow hyphens in the middle of remote usernames (#3440 ) * Allow hyphens in the middle of remote usernames refs: d797c29db462de4a3d69a5077a1ae4d03195b6f2 * Make options fallback better * Make options flat	2018-12-01 07:19:17 +09:00
dependabot[bot]	1c99ef454b	Update webpack requirement from 4.26.0 to 4.26.1 (#3453 ) Updates the requirements on [webpack](https://github.com/webpack/webpack) to permit the latest version. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/commits/v4.26.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-01 07:16:53 +09:00
MeiMei	cf4cecd4df	Fix media video (#3452 ) * Fix: Always show nsfw * [Client] Add missing video play icon	2018-12-01 07:16:28 +09:00
MeiMei	6a8835b923	Exclude remote user or myself from talk user suggestions (#3449 )	2018-12-01 07:15:55 +09:00
MeiMei	f2b1cf92e1	AP CW (#3448 )	2018-12-01 07:15:10 +09:00
syuilo	6b79618e74	New translations ja-JP.yml (Polish)	2018-12-01 02:22:34 +09:00
Aya Morisawa	3db414add4	Use for-of instead of map return values are not being used	2018-11-30 23:30:28 +09:00
Aya Morisawa	9ef641b403	Remove consecutive blank line	2018-11-30 23:07:21 +09:00
MeiMei	6fa7819a44	Fix #3442 (#3443 )	2018-11-30 18:13:55 +09:00
MeiMei	59a1b9adbe	Trim notifications text (#3438 ) * Trim notifications * Remove needless colons * Use single quote * 🎨	2018-11-30 09:34:37 +09:00
syuilo	3fbc7094f6	New translations ja-JP.yml (Korean)	2018-11-30 07:52:03 +09:00
syuilo	56c6227bc2	New translations ja-JP.yml (English)	2018-11-30 05:02:18 +09:00
syuilo	ee82f99f5a	Better limit	2018-11-30 00:45:02 +09:00
syuilo	789de130a2	New translations ja-JP.yml (Norwegian)	2018-11-30 00:14:31 +09:00
syuilo	46c026ce70	New translations ja-JP.yml (Dutch)	2018-11-30 00:14:24 +09:00
syuilo	82290f6e4e	New translations ja-JP.yml (Japanese, Kansai)	2018-11-30 00:14:17 +09:00
syuilo	8729525f95	New translations ja-JP.yml (Spanish)	2018-11-30 00:14:09 +09:00
syuilo	df0115ffe8	New translations ja-JP.yml (Russian)	2018-11-30 00:14:04 +09:00
syuilo	0275b4fc9e	New translations ja-JP.yml (Portuguese)	2018-11-30 00:13:57 +09:00
syuilo	9982fd71ba	New translations ja-JP.yml (Polish)	2018-11-30 00:13:49 +09:00
syuilo	081060b7db	New translations ja-JP.yml (Korean)	2018-11-30 00:13:45 +09:00
syuilo	0de64f1fc7	New translations ja-JP.yml (Italian)	2018-11-30 00:13:37 +09:00
syuilo	f0508c0a90	New translations ja-JP.yml (German)	2018-11-30 00:13:32 +09:00
syuilo	b51ae1dfaa	New translations ja-JP.yml (French)	2018-11-30 00:13:24 +09:00
syuilo	6e7233d41b	New translations ja-JP.yml (English)	2018-11-30 00:13:19 +09:00
syuilo	418041a56e	New translations ja-JP.yml (Chinese Simplified)	2018-11-30 00:13:13 +09:00
syuilo	17d20f5a18	New translations ja-JP.yml (Catalan)	2018-11-30 00:13:07 +09:00