wip

4 files changed, 495 insertions, 584 deletions

diff --git a/locales/en.yml b/locales/en.yml
index 900571124f..f24d403652 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -1,5 +1,5 @@
 common:
-  misskey: "Note everything and share it others using Misskey."
+  misskey: "Share everything others using Misskey."
 
   time:
     unknown: "unknown"
@@ -33,679 +33,590 @@ common:
     confused: "Confused"
     pudding: "Pudding"
 
-  note_categories:
-    music: "Music"
-    game: "Video Game"
-    anime: "Anime"
-    it: "IT"
-    gadgets: "Gadgets"
-    photography: "Photography"
-
-  input-message-here: "Enter message here"
-  send: "Send"
   delete: "Delete"
   loading: "Loading"
   ok: "OK"
   update-available: "New version of Misskey is now available({newer}, current is {current}). Reload page to apply update."
   my-token-regenerated: "Your token is just regenerated, so you will signout."
 
-  tags:
-    mk-nav-links:
-      about: "About"
-      stats: "Stats"
-      status: "Status"
-      wiki: "Wiki"
-      donors: "Donors"
-      repository: "Repository"
-      develop: "Developers"
-
-    mk-messaging-form:
-      attach-from-local: "Attach file from your pc"
-      attach-from-drive: "Attach file from the drive"
-
-    mk-messaging:
-      search-user: "Find a user"
-      you: "You"
-      no-history: "No history"
-
-    mk-messaging-message:
-      is-read: "Read"
-      deleted: "This message has been deleted"
-
-    mk-messaging-room:
-      empty: "No conversations"
-      more: "More"
-      no-history: "There is no more history"
-      resize-form: "Drag to resize"
-      new-message: "New message"
-
-    mk-authorized-apps:
-      no-apps: "No apps"
-
-    mk-error:
-      title: "Unable to connect to the server"
-      description: "There is a problem with Internet connection, or the server may be down or maintaining. Please {try again} later."
-      thanks: "Thank you for using Misskey."
-      troubleshoot: "Troubleshoot"
-
-      troubleshooter:
-        title: "TroubleShooting"
-        network: "Network connection"
-        checking-network: "Checking network connection"
-        internet: "Internet connection"
-        checking-internet: "Checking internet connection"
-        server: "Server connection"
-        checking-server: "Checking server connection"
-        finding: "Finding a problem"
-        no-network: "There is no Network connection"
-        no-network-desc: "Please make sure you are connected to the Network."
-        no-internet: "There is no Internet connection"
-        no-internet-desc: "Please make sure you are connected to the Internet."
-        no-server: "Unable to connect to the server"
-        no-server-desc: "The network connection of your PC is normal, but you could not connect to Misskey's server. There is a possibility that the server is down or maintaining, please try to access it again after a while."
-        success: "Successfully connect to the Misskey's server"
-        success-desc: "It seems to be able to connect normally. Please reload the page."
-
-    mk-forkit:
-      open-github-link: "View source on Github"
-
-    mk-poll-editor:
-      no-only-one-choice: "You need to enter two or more choice."
-      choice-n: "Choice {}"
-      remove: "Remove this choice"
-      add: "+ Add a choice"
-      destroy: "Destroy this poll"
-
-    mk-poll:
-      vote-to: "Vote to 「{}」"
-      vote-count: "{} votes"
-      total-users: "{} users voted"
-      vote: "Vote"
-      show-result: "Show result"
-      voted: "Voted"
-
-    mk-note-menu:
-      pin: "Pin"
-      pinned: "Pinned"
-      select: "Select category"
-      categorize: "Accept"
-      categorized: "Category reported. Thank you!"
-
-    mk-reaction-picker:
-      choose-reaction: "Pick your reaction"
-
-    mk-signin:
-      username: "Username"
-      password: "Password"
-      token: "Token"
-      signing-in: "Signing in..."
-      signin: "Sign in"
-
-    mk-signup:
-      username: "Username"
-      checking: "Checking..."
-      available: "Available"
-      unavailable: "Unavailable"
-      error: "Network error"
-      invalid-format: "Only use letters, numbers and -."
-      too-short: "Please enter at least 3 letters！"
-      too-long: "Please enter within 20 letters."
-      password: "Password"
-      password-placeholder: "We recommend more than 8 letters."
-      weak-password: "Weak"
-      normal-password: "So so"
-      strong-password: "Strong"
-      retype: "Type again"
-      retype-placeholder: "Confirm your password"
-      password-matched: "OK"
-      password-not-matched: "Not matched"
-      recaptcha: "Verify"
-      create: "Create an Account"
-      some-error: "Account creation failed for some reason. Please try again."
-
-    mk-special-message:
-      new-year: "Happy New Year!"
-      christmas: "Merry Christmas!"
-
-    mk-stream-indicator:
-      connecting: "Connecting"
-      reconnecting: "Reconnecting"
-      connected: "Connected"
-
-    mk-twitter-setting:
-      description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
-      connected-to: "You to connected this Twitter account"
-      detail: "Detail..."
-      reconnect: "Reconnect"
-      connect: "Connect to Twitter"
-      disconnect: "Disconnect"
-
-    mk-uploader:
-      waiting: "Waiting"
-
-docs:
-  edit-this-page-on-github: "Caught a mistake or want to contribute to the documentation? "
-  edit-this-page-on-github-link: "Edit this page on Github!"
-
-  api:
-    entities:
-      properties: "Properties"
-    endpoints:
-      params: "Parameters"
-      res: "Response"
-    props:
-      name: "Name"
-      type: "Type"
-      optional: "Optional"
-      description: "Description"
-      yes: "Yes"
-      no: "No"
-
-ch:
-  tags:
-    mk-index:
-      new: "Create new channel"
-      channel-title: "Channel title"
-
-    mk-channel-form:
-      textarea: "Write here"
-      upload: "Upload"
-      drive: "Drive"
-      note: "Do"
-      posting: "Doing"
+common/views/components/connect-failed.vue:
+  title: "Unable to connect to the server"
+  description: "There is a problem with Internet connection, or the server may be down or maintaining. Please {try again} later."
+  thanks: "Thank you for using Misskey."
+  troubleshoot: "Troubleshoot"
 
-desktop:
-  tags:
-    mk-api-info:
-      intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
-      caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
-      regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
-      regenerate-token: "Regenerate the token"
-      enter-password: "Please enter the password"
+common/views/components/connect-failed.troubleshooter.vue:
+  title: "TroubleShooting"
+  network: "Network connection"
+  checking-network: "Checking network connection"
+  internet: "Internet connection"
+  checking-internet: "Checking internet connection"
+  server: "Server connection"
+  checking-server: "Checking server connection"
+  finding: "Finding a problem"
+  no-network: "There is no Network connection"
+  no-network-desc: "Please make sure you are connected to the Network."
+  no-internet: "There is no Internet connection"
+  no-internet-desc: "Please make sure you are connected to the Internet."
+  no-server: "Unable to connect to the server"
+  no-server-desc: "The network connection of your PC is normal, but you could not connect to Misskey's server. There is a possibility that the server is down or maintaining, please try to access it again after a while."
+  success: "Successfully connect to the Misskey's server"
+  success-desc: "It seems to be able to connect normally. Please reload the page."
 
-    mk-drive-browser-base-contextmenu:
-      create-folder: "Create a folder"
-      upload: "Upload a file"
-      url-upload: "Upload from a URL"
+common/views/components/messaging.vue:
+  search-user: "Find a user"
+  you: "You"
+  no-history: "No history"
 
-    mk-drive-browser-window:
-      used: "used"
-      drive: "Drive"
+common/views/components/messaging-room.vue:
+  empty: "No conversations"
+  more: "More"
+  no-history: "There is no more history"
+  resize-form: "Drag to resize"
+  new-message: "New message"
 
-    mk-drive-browser:
-      search: "Search"
-      load-more: "Load more"
-      empty-draghover: "Drop Welcome!"
-      empty-drive: "Your drive is empty"
-      empty-drive-description: "右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。"
-      empty-folder: "This folder is empty"
-      unable-to-process: "操作を完了できません"
-      circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
-      unhandled-error: "Unknown error"
-      url-upload: "Upload from a URL"
-      url-of-file: "URL of file you want to upload"
-      url-upload-requested: "Upload requested"
-      may-take-time: "アップロードが完了するまで時間がかかる場合があります。"
-      create-folder: "Create a folder"
-      folder-name: "Folder name"
-
-    mk-drive-browser-file-contextmenu:
-      rename: "Rename"
-      copy-url: "Copy URL"
-      download: "Download"
-      else-files: "その他..."
-      set-as-avatar: "Set as avatar"
-      set-as-banner: "Set as banner"
-      open-in-app: "Open in app"
-      add-app: "Add app"
-      rename-file: "Rename file"
-      input-new-file-name: "Enter new name"
-      copied: "Copied"
-      copied-url-to-clipboard: "Copied URL to clipboard"
+common/views/components/messaging-room.form.vue:
+  input-message-here: "Enter message here"
+  send: "Send"
+  attach-from-local: "Attach file from your pc"
+  attach-from-drive: "Attach file from the drive"
 
-    mk-drive-browser-file:
-      avatar: "Avatar"
-      banner: "Banner"
+common/views/components/messaging-room.message.vue:
+  is-read: "Read"
+  deleted: "This message has been deleted"
 
-    mk-drive-browser-folder-contextmenu:
-      move-to-this-folder: "Move to this folder"
-      show-in-new-window: "Open in new window"
-      rename: "Rename"
-      rename-folder: "Rename folder"
-      input-new-folder-name: "Enter new name"
+common/views/components/nav.vue:
+  about: "About"
+  stats: "Stats"
+  status: "Status"
+  wiki: "Wiki"
+  donors: "Donors"
+  repository: "Repository"
+  develop: "Developers"
 
-    mk-drive-browser-folder:
-      unable-to-process: "操作を完了できません"
-      circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
-      unhandled-error: "Unknown error"
+common/views/components/note-menu.vue:
+  pin: "Pin to profile page"
 
-    mk-drive-browser-nav-folder:
-      drive: "Drive"
+common/views/components/poll.vue:
+  vote-to: "Vote to 「{}」"
+  vote-count: "{} votes"
+  total-users: "{} users voted"
+  vote: "Vote"
+  show-result: "Show result"
+  voted: "Voted"
 
-    mk-selectdrive-page:
-      title: "Choose a file(s)"
-      ok: "OK"
-      cancel: "Cancel"
-      upload: "Upload a file(s) from you PC"
+common/views/components/poll-editor.vue:
+  no-only-one-choice: "You need to enter two or more choice."
+  choice-n: "Choice {}"
+  remove: "Remove this choice"
+  add: "+ Add a choice"
+  destroy: "Destroy this poll"
 
-    mk-ui-header-nav:
-      home: "Home"
-      messaging: "Messages"
-      ch: "Channels"
-      info: "News"
+common/views/components/reaction-picker.vue:
+  choose-reaction: "Pick your reaction"
 
-    mk-ui-header-search:
-      placeholder: "Search"
+common/views/components/signin.vue:
+  username: "Username"
+  password: "Password"
+  token: "Token"
+  signing-in: "Signing in..."
+  signin: "Sign in"
 
-    mk-ui-header-account:
-      profile: "Your profile"
-      drive: "Drive"
-      mentions: "Mentions"
-      settings: "Settings"
-      signout: "Sign out"
+common/views/components/signup.vue:
+  username: "Username"
+  checking: "Checking..."
+  available: "Available"
+  unavailable: "Unavailable"
+  error: "Network error"
+  invalid-format: "Only use letters, numbers and -."
+  too-short: "Please enter at least 1 letters！"
+  too-long: "Please enter within 20 letters."
+  password: "Password"
+  password-placeholder: "We recommend more than 8 letters."
+  weak-password: "Weak"
+  normal-password: "So so"
+  strong-password: "Strong"
+  retype: "Type again"
+  retype-placeholder: "Confirm your password"
+  password-matched: "OK"
+  password-not-matched: "Not matched"
+  recaptcha: "Verify"
+  create: "Create an Account"
+  some-error: "Account creation failed for some reason. Please try again."
 
-    mk-ui-header-note-button:
-      note: "Compose new Post"
+common/views/components/special-message.vue:
+  new-year: "Happy New Year!"
+  christmas: "Merry Christmas!"
 
-    mk-ui-header-notifications:
-      title: "Notifications"
+common/views/components/stream-indicator.vue:
+  connecting: "Connecting"
+  reconnecting: "Reconnecting"
+  connected: "Connected"
 
-    mk-profile-setting:
-      avatar: "Avatar"
-      choice-avatar: "Choice an image"
-      name: "Name"
-      location: "Location"
-      description: "Description"
-      birthday: "Birthday"
-      save: "Update profile"
+common/views/components/twitter-setting.vue:
+  description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
+  connected-to: "You to connected this Twitter account"
+  detail: "Detail..."
+  reconnect: "Reconnect"
+  connect: "Connect to Twitter"
+  disconnect: "Disconnect"
 
-    mk-password-setting:
-      reset: "Change your password"
-      enter-current-password: "Enter the current password"
-      enter-new-password: "Enter the new password"
-      enter-new-password-again: "Enter the new password again"
-      not-match: "New password not matched"
-      changed: "Password updated successfully"
+common/views/components/uploader.vue:
+  waiting: "Waiting"
 
-    mk-2fa-setting:
-      intro: "If you set up 2-step verification, you will need not only a password at sign-in but also a pre-registered physical device (such as your smartphone), which will improve security. "
-      detail: "See details..."
-      url: "https://www.google.com/landing/2step/"
-      caution: "As a caveat, security improves, but you can not sign in to Misskey if you lose a registered device, etc."
-      register: "Register a device"
-      already-registered: "The setting has already been completed."
-      unregister: "Disable"
-      unregistered: "Two-step authentication has been disabled."
-      enter-password: "Enter the password"
-      authenticator: "First, you need install Google Authenticator to your device:"
-      howtoinstall: "How to install"
-      scan: "Next, please scan displayed QR code:"
-      done: "Please enter the token displaying in your device:"
-      submit: "Submit"
-      success: "Setup completed successfully!"
-      failed: "Failed to setup. please ensure that the token is correct."
-      info: "From the next sign in, enter the token that is displayed on the device in addition to the password."
+common/views/widgets/broadcast.vue:
+  fetching: "Fetching"
+  no-broadcasts: "No broadcasts"
+  have-a-nice-day: "Have a nice day!"
+  next: "Next"
 
-    mk-mute-setting:
-      no-users: "No muted users"
+common/views/widgets/donation.vue:
+  title: "Donation"
+  text: "To manage Misskey we spend money for our domain server etc.. There's no incomes for us so we need your tip. If you're interested contact {}. Thank you for your contribution!"
 
-    mk-post-form:
-      note-placeholder: "What's happening?"
-      reply-placeholder: "Reply to this note..."
-      quote-placeholder: "Quote this note..."
-      note: "Post"
-      reply: "Reply"
-      renote: "Renote"
-      posted: "Posted!"
-      replied: "Replied!"
-      reposted: "Reposted!"
-      note-failed: "Failed to note"
-      reply-failed: "Failed to reply"
-      renote-failed: "Failed to renote"
-      posting: "Posting"
-      attach-media-from-local: "Attach media from your pc"
-      attach-media-from-drive: "Attach media from the drive"
-      attach-cancel: "Cancel attachment"
-      insert-a-kao: "v(‘ω’)v"
-      create-poll: "Create a poll"
-      text-remain: "{} chars remaining"
+common/views/widgets/photo-stream.vue:
+  title: "Photostream"
+  no-photos: "No photos"
 
-    mk-post-form-window:
-      note: "New note"
-      reply: "Reply"
-      attaches: "{} media attached"
-      uploading-media: "Uploading {} media"
+common/views/widgets/server.vue:
+  title: "Server info"
+  toggle: "Toggle views"
 
-    mk-note-page:
-      prev: "Previous note"
-      next: "Next note"
+desktop/views/components/activity.vue:
+  title: "Activity"
+  toggle: "Toggle views"
 
-    mk-settings:
-      profile: "Profile"
-      mute: "Mute"
-      drive: "Drive"
-      security: "Security"
-      password: "Password"
-      2fa: "Two-factor authentication"
-      other: "Other"
-      license: "License"
+desktop/views/components/calendar.vue:
+  title: "{1} / {2}"
+  prev: "Previous month"
+  next: "Next month"
+  go: "Click to travel"
 
-    mk-timeline-note:
-      reposted-by: "Reposted by {}"
-      reply: "Reply"
-      renote: "Renote"
-      add-reaction: "Add your reaction"
-      detail: "Show detail"
+desktop/views/components/drive-window.vue:
+  used: "used"
+  drive: "Drive"
 
-    mk-notifications:
-      more: "More"
+desktop/views/components/drive.file.vue:
+  avatar: "Avatar"
+  banner: "Banner"
+  contextmenu:
+    rename: "Rename"
+    copy-url: "Copy URL"
+    download: "Download"
+    else-files: "その他..."
+    set-as-avatar: "Set as avatar"
+    set-as-banner: "Set as banner"
+    open-in-app: "Open in app"
+    add-app: "Add app"
+    rename-file: "Rename file"
+    input-new-file-name: "Enter new name"
+    copied: "Copied"
+    copied-url-to-clipboard: "Copied URL to clipboard"
 
-    mk-notifications-home-widget:
-      title: "Notifications"
-      settings: "Notification settings"
+desktop/views/components/drive.folder.vue:
+  unable-to-process: "操作を完了できません"
+  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  unhandled-error: "Unknown error"
+  contextmenu:
+    move-to-this-folder: "Move to this folder"
+    show-in-new-window: "Open in new window"
+    rename: "Rename"
+    rename-folder: "Rename folder"
+    input-new-folder-name: "Enter new name"
 
-    mk-server-home-widget:
-      title: "Server info"
-      toggle: "Toggle views"
+desktop/views/components/drive.nav-folder.vue:
+  drive: "Drive"
 
-    mk-activity-widget:
-      title: "Activity"
-      toggle: "Toggle views"
+desktop/views/components/drive.vue:
+  search: "Search"
+  load-more: "Load more"
+  empty-draghover: "Drop Welcome!"
+  empty-drive: "Your drive is empty"
+  empty-drive-description: "右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。"
+  empty-folder: "This folder is empty"
+  unable-to-process: "操作を完了できません"
+  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  unhandled-error: "Unknown error"
+  url-upload: "Upload from a URL"
+  url-of-file: "URL of file you want to upload"
+  url-upload-requested: "Upload requested"
+  may-take-time: "アップロードが完了するまで時間がかかる場合があります。"
+  create-folder: "Create a folder"
+  folder-name: "Folder name"
+  contextmenu:
+    create-folder: "Create a folder"
+    upload: "Upload a file"
+    url-upload: "Upload from a URL"
 
-    mk-user-recommendation-home-widget:
-      title: "Recommended users"
-      refresh: "Show others"
-      no-one: "No one"
+desktop/views/components/notes.note.vue:
+  reposted-by: "Reposted by {}"
+  reply: "Reply"
+  renote: "Renote"
+  add-reaction: "Add your reaction"
+  detail: "Show detail"
 
-    mk-recommended-polls-home-widget:
-      title: "Polls"
-      refresh: "Show others"
-      nothing: "Nothing"
+desktop/views/components/notifications.vue:
+  more: "More"
 
-    mk-trends-home-widget:
-      title: "Trend"
-      refresh: "Show others"
-      nothing: "Nothing"
+desktop/views/components/post-form.vue:
+  note-placeholder: "What's happening?"
+  reply-placeholder: "Reply to this note..."
+  quote-placeholder: "Quote this note..."
+  note: "Post"
+  reply: "Reply"
+  renote: "Renote"
+  posted: "Posted!"
+  replied: "Replied!"
+  reposted: "Reposted!"
+  note-failed: "Failed to note"
+  reply-failed: "Failed to reply"
+  renote-failed: "Failed to renote"
+  posting: "Posting"
+  attach-media-from-local: "Attach media from your pc"
+  attach-media-from-drive: "Attach media from the drive"
+  attach-cancel: "Cancel attachment"
+  insert-a-kao: "v(‘ω’)v"
+  create-poll: "Create a poll"
+  text-remain: "{} chars remaining"
 
-    mk-photo-stream-home-widget:
-      title: "Photostream"
-      no-photos: "No photos"
+desktop/views/components/post-form-window.vue:
+  note: "New note"
+  reply: "Reply"
+  attaches: "{} media attached"
+  uploading-media: "Uploading {} media"
 
-    mk-donation-home-widget:
-      title: "Donation"
-      text: "To manage Misskey we spend money for our domain server etc.. There's no incomes for us so we need your tip. If you're interested contact {}. Thank you for your contribution!"
+desktop/views/components/renote-form.vue:
+  quote: "Quote..."
+  cancel: "Cancel"
+  renote: "Renote"
+  reposting: "Reposting..."
+  success: "Reposted!"
+  failure: "Failed to Renote"
 
-    mk-channel-home-widget:
-      title: "Channel"
-      settings: "Widget settings"
-      get-started: "Please click the cog in the upper right to specify the channel to receive"
+desktop/views/components/renote-form-window.vue:
+  title: "Are you sure you want to renote this note?"
 
-    mk-calendar-widget:
-      title: "{1} / {2}"
-      prev: "Previous month"
-      next: "Next month"
-      go: "Click to travel"
+desktop/views/components/settings.vue:
+  profile: "Profile"
+  mute: "Mute"
+  drive: "Drive"
+  security: "Security"
+  password: "Password"
+  2fa: "Two-factor authentication"
+  other: "Other"
+  license: "License"
 
-    mk-post-form-home-widget:
-      title: "Post"
-      note: "Post"
-      placeholder: "What's happening?"
+desktop/views/components/settings.2fa.vue:
+  intro: "If you set up 2-step verification, you will need not only a password at sign-in but also a pre-registered physical device (such as your smartphone), which will improve security. "
+  detail: "See details..."
+  url: "https://www.google.com/landing/2step/"
+  caution: "As a caveat, security improves, but you can not sign in to Misskey if you lose a registered device, etc."
+  register: "Register a device"
+  already-registered: "The setting has already been completed."
+  unregister: "Disable"
+  unregistered: "Two-step authentication has been disabled."
+  enter-password: "Enter the password"
+  authenticator: "First, you need install Google Authenticator to your device:"
+  howtoinstall: "How to install"
+  scan: "Next, please scan displayed QR code:"
+  done: "Please enter the token displaying in your device:"
+  submit: "Submit"
+  success: "Setup completed successfully!"
+  failed: "Failed to setup. please ensure that the token is correct."
+  info: "From the next sign in, enter the token that is displayed on the device in addition to the password."
 
-    mk-access-log-home-widget:
-      title: "Access log"
+desktop/views/components/settings.api.vue:
+  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regenerate-token: "Regenerate the token"
+  enter-password: "Please enter the password"
 
-    mk-messaging-home-widget:
-      title: "Messaging"
+desktop/views/components/settings.app.vue:
+  no-apps: "No authorized apps"
 
-    mk-broadcast-home-widget:
-      fetching: "Fetching"
-      no-broadcasts: "No broadcasts"
-      have-a-nice-day: "Have a nice day!"
-      next: "Next"
+desktop/views/components/settings.mute.vue:
+  no-users: "No muted users"
 
-    mk-renote-form:
-      quote: "Quote..."
-      cancel: "Cancel"
-      renote: "Renote"
-      reposting: "Reposting..."
-      success: "Reposted!"
-      failure: "Failed to Renote"
+desktop/views/components/settings.password.vue:
+  reset: "Change your password"
+  enter-current-password: "Enter the current password"
+  enter-new-password: "Enter the new password"
+  enter-new-password-again: "Enter the new password again"
+  not-match: "New password not matched"
+  changed: "Password updated successfully"
 
-    mk-renote-form-window:
-      title: "Are you sure you want to renote this note?"
+desktop/views/components/settings.profile.vue:
+  avatar: "Avatar"
+  choice-avatar: "Choice an image"
+  name: "Name"
+  location: "Location"
+  description: "Description"
+  birthday: "Birthday"
+  save: "Update profile"
 
-    mk-user:
-      last-used-at: "Last used at"
+desktop/views/components/ui.header.account.vue:
+  profile: "Your profile"
+  drive: "Drive"
+  mentions: "Mentions"
+  customize: "Customize"
+  settings: "Settings"
+  signout: "Sign out"
 
-      follows-you: "Follows you"
-      mute: "Mute"
-      muted: "Muting"
-      unmute: "Unmute"
+desktop/views/components/ui.header.nav.vue:
+  home: "Home"
+  messaging: "Messages"
+  game: "Game"
 
-      photos:
-        title: "Photos"
-        loading: "Loading"
-        no-photos: "No photos"
+desktop/views/components/ui.header.notifications.vue:
+  title: "Notifications"
 
-      frequently-replied-users:
-        title: "Frequently replied"
-        loading: "Loading"
-        no-users: "No users"
+desktop/views/components/ui.header.post.vue:
+  post: "Compose new Post"
 
-      followers-you-know:
-        title: "Followers you know"
-        loading: "Loading"
-        no-users: "No users"
+desktop/views/components/ui.header.search.vue:
+  placeholder: "Search"
 
-mobile:
-  tags:
-    mk-selectdrive-page:
-      select-file: "Select file(s)"
+desktop/views/pages/note.vue:
+  prev: "Previous note"
+  next: "Next note"
 
-    mk-drive-file-viewer:
-      download: "Download"
-      rename: "Rename"
-      move: "Move"
-      hash: "Hash (md5)"
-      exif: "EXIF"
+desktop/views/pages/selectdrive.vue:
+  title: "Choose a file(s)"
+  ok: "OK"
+  cancel: "Cancel"
+  upload: "Upload a file(s) from you PC"
 
-    mk-entrance-signin:
-      signup: "Sign up"
-      about: "About Misskey"
+desktop/views/pages/user/user.followers-you-know.vue:
+  title: "Followers you know"
+  loading: "Loading"
+  no-users: "No users"
 
-    mk-entrance-signup:
-      cancel: "Cancel"
+desktop/views/pages/user/user.friends.vue:
+  title: "Frequently replied"
+  loading: "Loading"
+  no-users: "No users"
 
-    mk-authorized-apps-page:
-      application: "Applications"
+desktop/views/pages/user/user.home.vue:
+  last-used-at: "Last used at"
 
-    mk-signin-history-page:
-      signin-history: "Sign in history"
+desktop/views/pages/user/user.photos.vue:
+  title: "Photos"
+  loading: "Loading"
+  no-photos: "No photos"
 
-    mk-twitter-setting-page:
-      twitter-integration: "Twitter integration"
+desktop/views/pages/user/user.profile.vue:
+  follows-you: "Follows you"
+  mute: "Mute"
+  muted: "Muting"
+  unmute: "Unmute"
 
-    mk-drive-page:
-      drive: "Drive"
+desktop/views/widgets/messaging.vue:
+  title: "Messaging"
 
-    mk-home:
-      home: "Home"
+desktop/views/widgets/notifications.vue:
+  title: "Notifications"
+  settings: "Settings"
 
-    mk-messaging-room-page:
-      message: "Messaging"
+desktop/views/widgets/polls.vue:
+  title: "Polls"
+  refresh: "Show others"
+  nothing: "Nothing"
 
-    mk-messaging-page:
-      message: "Messaging"
+desktop/views/widgets/post-form.vue:
+  title: "Post"
+  note: "Post"
+  placeholder: "What's happening?"
 
-    mk-notifications-page:
-      notifications: "Notifications"
-      read-all: "Are you sure you want to mark all unread notifications as read?"
+desktop/views/widgets/trends.vue:
+  title: "Trend"
+  refresh: "Show others"
+  nothing: "Nothing"
 
-    mk-note-page:
-      title: "Post"
-      prev: "Previous note"
-      next: "Next note"
+desktop/views/widgets/users.vue:
+  title: "Recommended users"
+  refresh: "Show others"
+  no-one: "No one"
 
-    mk-search-page:
-      search: "Search"
+desktop/views/widgets/channel.vue:
+  title: "Channel"
+  settings: "Widget settings"
+  get-started: "Please click the cog in the upper right to specify the channel to receive"
 
-    mk-settings:
-      signed-in-as: "Signed in as {}"
+mobile/views/components/drive.vue:
+  drive: "Drive"
+  used: "used"
+  folder-count: "Folder(s)"
+  count-separator: ", "
+  file-count: "File(s)"
+  load-more: "Load more"
+  nothing-in-drive: "Nothing"
+  folder-is-empty: "This folder is empty"
 
-    mk-settings-page:
-      profile: "Profile"
-      applications: "Applications"
-      twitter-integration: "Twitter integration"
-      signin-history: "Sign in history"
-      link: "MisskeyLink"
-      settings: "Settings"
-      signout: "Sign out"
+mobile/views/components/drive-file-chooser.vue:
+  select-file: "Choose a file"
 
-    mk-profile-setting-page:
-      title: "Profile Settings"
+mobile/views/components/drive-folder-chooser.vue:
+  select-folder: "Choose a folder"
 
-    mk-profile-setting:
-      will-be-published: "These profiles will be published."
-      name: "Name"
-      location: "Location"
-      description: "Description"
-      birthday: "Birthday"
-      avatar: "Avatar"
-      banner: "Banner"
-      avatar-saved: "Avatar updated successfully"
-      banner-saved: "Banner updated successfully"
-      set-avatar: "Choose an avatar"
-      set-banner: "Choose a banner"
-      save: "Save"
-      saved: "Profile updated successfully"
+mobile/views/components/drive.file-detail.vue:
+  download: "Download"
+  rename: "Rename"
+  move: "Move"
+  hash: "Hash (md5)"
+  exif: "EXIF"
 
-    mk-user-followers-page:
-      followers-of: "Followers of {}"
+mobile/views/components/follow-button.vue:
+  follow: "Follow"
+  unfollow: "Unfollow"
 
-    mk-user-following-page:
-      following-of: "Following of {}"
+mobile/views/components/note.vue:
+  reposted-by: "Renoted by {}"
 
-    mk-drive-folder-selector:
-      select-folder: "Choose a folder"
+mobile/views/components/note-detail.vue:
+  reply: "Reply"
+  reaction: "Reaction"
 
-    mk-drive-selector:
-      select-file: "Choose a file"
+mobile/views/components/notifications.vue:
+  more: "More"
+  empty: "No notifications"
 
-    mk-drive:
-      drive: "Drive"
-      used: "used"
-      folder-count: "Folder(s)"
-      count-separator: ", "
-      file-count: "File(s)"
-      load-more: "Load more"
-      nothing-in-drive: "Nothing"
-      folder-is-empty: "This folder is empty"
+mobile/views/components/post-form.vue:
+  submit: "Post"
+  reply-placeholder: "Reply to this note..."
+  note-placeholder: "What's happening?"
 
-    mk-follow-button:
-      follow: "Follow"
-      unfollow: "Unfollow"
+mobile/views/components/sub-note-content.vue:
+  media-count: "{} media"
+  poll: "Poll"
 
-    mk-home-timeline:
-      empty-timeline: "There is no notes"
+mobile/views/components/timeline.vue:
+  empty: "No notes"
+  load-more: "More"
 
-    mk-notifications:
-      more: "More"
-      empty: "No notifications"
+mobile/views/components/ui.nav.vue:
+  home: "Home"
+  notifications: "Notifications"
+  messaging: "Messages"
+  drive: "Drive"
+  settings: "Settings"
+  about: "About Misskey"
+  search: "Search"
 
-    mk-note-detail:
-      reply: "Reply"
-      reaction: "Reaction"
+mobile/views/components/user-timeline.vue:
+  no-notes: "This user seems never note"
+  no-notes-with-media: "There is no notes with media"
+  load-more: "More"
 
-    mk-post-form:
-      submit: "Post"
-      reply-placeholder: "Reply to this note..."
-      note-placeholder: "What's happening?"
+mobile/views/components/users-list.vue:
+  all: "All"
+  known: "You know"
+  load-more: "More"
 
-    mk-search-notes:
-      empty: "There is no note related to the 「{}」"
+mobile/views/pages/drive.vue:
+  drive: "Drive"
 
-    mk-sub-note-content:
-      media-count: "{} media"
-      poll: "Poll"
+mobile/views/pages/followers.vue:
+  followers-of: "Followers of {}"
 
-    mk-timeline-note:
-      reposted-by: "Reposted by {}"
+mobile/views/pages/following.vue:
+  following-of: "Following of {}"
 
-    mk-timeline:
-      empty: "No notes"
-      load-more: "More"
+mobile/views/pages/messaging.vue:
+  messaging: "Messaging"
 
-    mk-ui-nav:
-      home: "Home"
-      notifications: "Notifications"
-      messaging: "Messages"
-      ch: "Channels"
-      drive: "Drive"
-      settings: "Settings"
-      about: "About Misskey"
-      search: "Search"
+mobile/views/pages/messaging-room.vue:
+  messaging: "Messaging"
 
-    mk-user-followers:
-      no-users: "No followers."
+mobile/views/pages/note.vue:
+  title: "Post"
+  prev: "Previous note"
+  next: "Next note"
 
-    mk-user-following:
-      no-users: "No following."
+mobile/views/pages/notifications.vue:
+  notifications: "Notifications"
+  read-all: "Are you sure you want to mark all unread notifications as read?"
 
-    mk-user-timeline:
-      no-notes: "This user seems never note"
-      no-notes-with-media: "There is no notes with media"
-      load-more: "More"
+mobile/views/pages/profile-setting.vue:
+  title: "Profile settings"
+  will-be-published: "These profiles will be published."
+  name: "Name"
+  location: "Location"
+  description: "Description"
+  birthday: "Birthday"
+  avatar: "Avatar"
+  banner: "Banner"
+  avatar-saved: "Avatar updated successfully"
+  banner-saved: "Banner updated successfully"
+  set-avatar: "Choose an avatar"
+  set-banner: "Choose a banner"
+  save: "Save"
+  saved: "Profile updated successfully"
 
-    mk-user:
-      follows-you: "Follows you"
-      following: "Following"
-      followers: "Followers"
-      notes: "Posts"
-      overview: "Overview"
-      timeline: "Timeline"
-      media: "Media"
+mobile/views/pages/search.vue:
+  search: "Search"
+  empty: "「{}」に関する投稿は見つかりませんでした。"
 
-    mk-user-overview:
-      recent-notes: "Recent notes"
-      images: "Images"
-      activity: "Activity"
-      keywords: "Keywords"
-      domains: "Domains"
-      frequently-replied-users: "Frequently talking users"
-      followers-you-know: "Followers you know"
-      last-used-at: "Last used at"
+mobile/views/pages/selectdrive.vue:
+  select-file: "Choose a file"
 
-    mk-user-overview-notes:
-      loading: "Loading"
-      no-notes: "No notes"
+mobile/views/pages/settings.vue:
+  signed-in-as: "Signed in as {}"
+  profile: "Profile"
+  twitter-integration: "Twitter integration"
+  signin-history: "Sign in history"
+  settings: "Settings"
+  signout: "Sign out"
 
-    mk-user-overview-photos:
-      loading: "Loading"
-      no-photos: "No photos"
+mobile/views/pages/user.vue:
+  follows-you: "Follows you"
+  following: "Following"
+  followers: "Followers"
+  notes: "Posts"
+  overview: "Overview"
+  timeline: "Timeline"
+  media: "Media"
 
-    mk-user-overview-keywords:
-      no-keywords: "No keywords"
+mobile/views/pages/user/home.vue:
+  recent-notes: "Recent notes"
+  images: "Images"
+  activity: "Activity"
+  keywords: "Keywords"
+  domains: "Domains"
+  frequently-replied-users: "Frequently talking users"
+  followers-you-know: "Followers you know"
+  last-used-at: "Last used at"
 
-    mk-user-overview-domains:
-      no-domains: "No domains"
+mobile/views/pages/user/home.followers-you-know.vue:
+  loading: "Loading"
+  no-users: "No users"
 
-    mk-user-overview-frequently-replied-users:
-      loading: "Loading"
-      no-users: "No users"
+mobile/views/pages/user/home.friends.vue:
+  loading: "Loading"
+  no-users: "No users"
 
-    mk-user-overview-followers-you-know:
-      loading: "Loading"
-      no-users: "No users"
+mobile/views/pages/user/home.notes.vue:
+  loading: "Loading"
+  no-notes: "No notes"
 
-    mk-users-list:
-      all: "All"
-      known: "You know"
-      load-more: "More"
+mobile/views/pages/user/home.photos.vue:
+  loading: "Loading"
+  no-photos: "No photos"
 
-stats:
-  notes-count: "Number of all notes"
-  users-count: "Number of all users"
+docs:
+  edit-this-page-on-github: "Caught a mistake or want to contribute to the documentation? "
+  edit-this-page-on-github-link: "Edit this page on Github!"
 
-status:
-  all-systems-maybe-operational: "All systems maybe operational"
-  what-is-this-site: ""
+  api:
+    entities:
+      properties: "Properties"
+    endpoints:
+      params: "Parameters"
+      res: "Response"
+    props:
+      name: "Name"
+      type: "Type"
+      optional: "Optional"
+      description: "Description"
+      yes: "Yes"
+      no: "No"
diff --git a/locales/index.ts b/locales/index.ts
index ced3b4cb32..0593af366c 100644
--- a/locales/index.ts
+++ b/locales/index.ts
@@ -11,7 +11,7 @@ const loadLang = lang => yaml.safeLoad(
 const native = loadLang('ja');
 
 const langs = {
-	//'en': loadLang('en'),
+	'en': loadLang('en'),
 	'ja': native
 };
 
diff --git a/locales/ja.yml b/locales/ja.yml
index 597b0f47ec..7e253d3688 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -33,8 +33,6 @@ common:
     confused: "こまこまのこまり"
     pudding: "Pudding"
 
-  input-message-here: "ここにメッセージを入力"
-  send: "送信"
   delete: "削除"
   loading: "読み込み中"
   ok: "わかった"
@@ -78,6 +76,8 @@ common/views/components/messaging-room.vue:
   new-message: "新しいメッセージがあります"
 
 common/views/components/messaging-room.form.vue:
+  input-message-here: "ここにメッセージを入力"
+  send: "送信"
   attach-from-local: "PCからファイルを添付する"
   attach-from-drive: "ドライブからファイルを添付する"
 
diff --git a/src/client/app/common/views/components/messaging-room.form.vue b/src/client/app/common/views/components/messaging-room.form.vue
index 1c7b68a266..32a43ace57 100644
--- a/src/client/app/common/views/components/messaging-room.form.vue
+++ b/src/client/app/common/views/components/messaging-room.form.vue
@@ -8,12 +8,12 @@
 		ref="textarea"
 		@keypress="onKeypress"
 		@paste="onPaste"
-		placeholder="%i18n:common.input-message-here%"
+		placeholder="%i18n:@input-message-here%"
 		v-autocomplete="'text'"
 	></textarea>
 	<div class="file" @click="file = null" v-if="file">{{ file.name }}</div>
 	<mk-uploader ref="uploader" @uploaded="onUploaded"/>
-	<button class="send" @click="send" :disabled="!canSend || sending" title="%i18n:common.send%">
+	<button class="send" @click="send" :disabled="!canSend || sending" title="%i18n:@send%">
 		<template v-if="!sending">%fa:paper-plane%</template><template v-if="sending">%fa:spinner .spin%</template>
 	</button>
 	<button class="attach-from-local" @click="chooseFile" title="%i18n:@attach-from-local%">