From a9d1d8f034ef253bfa45d49a932e311811b959bc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 20:23:12 +0900
Subject: [PATCH 01/25] New translations ja.yml (English)

---
 locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 9bd1a1f024..d62ffd7709 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -227,7 +227,7 @@ common/views/widgets/broadcast.vue:
   have-a-nice-day: "Have a nice day!"
   next: "Next"
 common/views/widgets/donation.vue:
-  title: "Request for dnations"
+  title: "Request for donations"
   text: "To keep Misskey up and running, we have to spend money on our domain name, the server costs and so on. Since we don't receive money from advertisements, we count on donations from all of you. If you're interested contact {}. Thank you for your contribution!"
 common/views/widgets/photo-stream.vue:
   title: "Photostream"
@@ -703,7 +703,7 @@ mobile/views/components/drive.vue:
   root-rename-alert: "You're in the root; it can't be renamed because it's not a folder. Navigate to a folder you want to rename and try again."
   root-move-alert: "You're in the root; it can't be moved because it's not a folder. Navigate to a folder you want to move and try again."
   url-prompt: "URL of file you want to upload"
-  uploading: "Upload requested. It may take some time for the upload to complete."
+  uploading: "Upload requested. It may take a while for the upload to finish."
 mobile/views/components/drive-file-detail.vue:
   rename: "Rename"
 mobile/views/components/drive-file-chooser.vue:

From 5b92ebfabdca516e4dcc91606e4c70e91c0a823c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 20:36:23 +0900
Subject: [PATCH 02/25] New translations ja.yml (English)

---
 locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index d62ffd7709..ee4eaf9e19 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -314,7 +314,7 @@ desktop/views/components/drive.vue:
   search: "Search"
   load-more: "Load more"
   empty-draghover: "Drop here, don't I look cute?"
-  empty-drive: "Your drive is empty"
+  empty-drive: "Your media storage is empty"
   empty-drive-description: "You can also upload by right clicking and selecting \"Upload file\", or you can drag and drop a file onto the window."
   empty-folder: "This folder is empty"
   unable-to-process: "The operation could not be completed."
@@ -556,7 +556,7 @@ desktop/views/components/ui.header.vue:
   welcome-back: "Welcome back,"
 desktop/views/components/ui.header.account.vue:
   profile: "Your profile"
-  drive: "Drive"
+  drive: "Media storage"
   favorites: "Favorites"
   lists: "Lists"
   follow-requests: "Follow requests"

From d3d21be588d797ae149c3ddd5437d3d9f88e568a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 20:42:22 +0900
Subject: [PATCH 03/25] New translations ja.yml (Catalan)

---
 locales/ca.yml | 934 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 934 insertions(+)
 create mode 100644 locales/ca.yml

diff --git a/locales/ca.yml b/locales/ca.yml
new file mode 100644
index 0000000000..23dba18883
--- /dev/null
+++ b/locales/ca.yml
@@ -0,0 +1,934 @@
+---
+meta:
+  lang: "日本語"
+  divider: ""
+common:
+  misskey: "A ⭐ of fediverse"
+  about-title: "A ⭐ of fediverse."
+  about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  time:
+    unknown: "なぞのじかん"
+    future: "未来"
+    just_now: "たった今"
+    seconds_ago: "{}秒前"
+    minutes_ago: "{}分前"
+    hours_ago: "{}時間前"
+    days_ago: "{}日前"
+    weeks_ago: "{}週間前"
+    months_ago: "{}ヶ月前"
+    years_ago: "{}年前"
+  weekday-short:
+    sunday: "日"
+    monday: "月"
+    tuesday: "火"
+    wednesday: "水"
+    thursday: "木"
+    friday: "金"
+    saturday: "土"
+  reactions:
+    like: "いいね"
+    love: "しゅき"
+    laugh: "笑"
+    hmm: "ふぅ～む"
+    surprise: "わお"
+    congrats: "おめでとう"
+    angry: "おこ"
+    confused: "こまこまのこまり"
+    pudding: "Pudding"
+  note-placeholders:
+    a: "今どうしてる？"
+    b: "何かありましたか？"
+    c: "何をお考えですか？"
+    d: "言いたいことは？"
+    e: "ここに書いてください"
+    f: "あなたが書くのを待っています..."
+  search: "検索"
+  delete: "削除"
+  loading: "読み込み中"
+  ok: "わかった"
+  update-available-title: "更新があります"
+  update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
+  my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
+  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  reversi:
+    drawn: "引き分け"
+    my-turn: "あなたのターンです"
+    opponent-turn: "相手のターンです"
+    turn-of: "{}のターンです"
+    past-turn-of: "{}のターン"
+  widgets:
+    analog-clock: "アナログ時計"
+    profile: "プロフィール"
+    calendar: "カレンダー"
+    timemachine: "カレンダー(タイムマシン)"
+    activity: "アクティビティ"
+    rss: "RSSリーダー"
+    memo: "付箋"
+    trends: "トレンド"
+    photo-stream: "フォトストリーム"
+    posts-monitor: "投稿チャート"
+    slideshow: "スライドショー"
+    version: "バージョン"
+    broadcast: "ブロードキャスト"
+    notifications: "通知"
+    users: "おすすめユーザー"
+    polls: "アンケート"
+    post-form: "投稿フォーム"
+    messaging: "メッセージ"
+    server: "サーバー情報"
+    donation: "寄付のお願い"
+    nav: "ナビゲーション"
+    tips: "ヒント"
+    hashtags: "ハッシュタグ"
+  deck:
+    widgets: "ウィジェット"
+    home: "ホーム"
+    local: "ローカル"
+    global: "グローバル"
+    notifications: "通知"
+    list: "リスト"
+    swap-left: "左に移動"
+    swap-right: "右に移動"
+    swap-up: "上に移動"
+    swap-down: "下に移動"
+    remove: "カラムを削除"
+    add-column: "カラムを追加"
+    rename: "名前を変更"
+    stack-left: "左に重ねる"
+    pop-right: "右に出す"
+common/views/components/connect-failed.vue:
+  title: "サーバーに接続できません"
+  description: "インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから{再度お試し}ください。"
+  thanks: "いつもMisskeyをご利用いただきありがとうございます。"
+  troubleshoot: "トラブルシュート"
+common/views/components/connect-failed.troubleshooter.vue:
+  title: "トラブルシューティング"
+  network: "ネットワーク接続"
+  checking-network: "ネットワーク接続を確認中"
+  internet: "インターネット接続"
+  checking-internet: "インターネット接続を確認中"
+  server: "サーバー接続"
+  checking-server: "サーバー接続を確認中"
+  finding: "問題を調べています"
+  no-network: "ネットワークに接続されていません"
+  no-network-desc: "お使いのPCのネットワーク接続が正常か確認してください。"
+  no-internet: "インターネットに接続されていません"
+  no-internet-desc: "ネットワークには接続されていますが、インターネットには接続されていないようです。お使いのPCのインターネット接続が正常か確認してください。"
+  no-server: "Misskeyのサーバーに接続できません"
+  no-server-desc: "お使いのPCのインターネット接続は正常ですが、Misskeyのサーバーには接続できませんでした。サーバーがダウンまたはメンテナンスしている可能性があるので、しばらくしてから再度御アクセスください。"
+  success: "Misskeyのサーバーに接続できました"
+  success-desc: "正常に接続できるようです。ページを再度読み込みしてください。"
+  flush: "キャッシュの削除"
+  set-version: "バージョン指定"
+common/views/components/messaging.vue:
+  search-user: "ユーザーを探す"
+  you: "あなた"
+  no-history: "履歴はありません"
+common/views/components/messaging-room.vue:
+  empty: "このユーザーと話したことはありません"
+  more: "もっと読む"
+  no-history: "これより過去の履歴はありません"
+  resize-form: "ドラッグしてフォームの広さを調整"
+  new-message: "新しいメッセージがあります"
+common/views/components/messaging-room.form.vue:
+  input-message-here: "ここにメッセージを入力"
+  send: "送信"
+  attach-from-local: "PCからファイルを添付する"
+  attach-from-drive: "ドライブからファイルを添付する"
+common/views/components/messaging-room.message.vue:
+  is-read: "既読"
+  deleted: "このメッセージは削除されました"
+common/views/components/nav.vue:
+  about: "Misskeyについて"
+  stats: "統計"
+  status: "ステータス"
+  wiki: "Wiki"
+  donors: "ドナー"
+  repository: "リポジトリ"
+  develop: "開発者"
+  feedback: "フィードバック"
+common/views/components/note-menu.vue:
+  favorite: "お気に入り"
+  pin: "ピン留め"
+  delete: "削除"
+  delete-confirm: "この投稿を削除しますか？"
+  remote: "投稿元で見る"
+common/views/components/poll.vue:
+  vote-to: "「{}」に投票する"
+  vote-count: "{}票"
+  total-users: "{}人が投票"
+  vote: "投票する"
+  show-result: "結果を見る"
+  voted: "投票済み"
+common/views/components/poll-editor.vue:
+  no-only-one-choice: "アンケートには、選択肢が最低2つ必要です"
+  choice-n: "選択肢{}"
+  remove: "この選択肢を削除"
+  add: "+選択肢を追加"
+  destroy: "アンケートを破棄"
+common/views/components/reaction-picker.vue:
+  choose-reaction: "リアクションを選択"
+common/views/components/signin.vue:
+  username: "ユーザー名"
+  password: "パスワード"
+  token: "トークン"
+  signing-in: "やってます..."
+  signin: "サインイン"
+common/views/components/signup.vue:
+  username: "ユーザー名"
+  checking: "確認しています..."
+  available: "利用できます"
+  unavailable: "既に利用されています"
+  error: "通信エラー"
+  invalid-format: "a~z、A~Z、0~9、_が使えます"
+  too-short: "1文字以上でお願いします！"
+  too-long: "20文字以内でお願いします"
+  password: "パスワード"
+  password-placeholder: "8文字以上を推奨します"
+  weak-password: "弱いパスワード"
+  normal-password: "まあまあのパスワード"
+  strong-password: "強いパスワード"
+  retype: "再入力"
+  retype-placeholder: "確認のため再入力してください"
+  password-matched: "確認されました"
+  password-not-matched: "一致していません"
+  recaptcha: "認証"
+  create: "アカウント作成"
+  some-error: "何らかの原因によりアカウントの作成に失敗しました。再度お試しください。"
+common/views/components/special-message.vue:
+  new-year: "Happy New Year!"
+  christmas: "Merry Christmas!"
+common/views/components/stream-indicator.vue:
+  connecting: "接続中"
+  reconnecting: "再接続中"
+  connected: "接続完了"
+common/views/components/twitter-setting.vue:
+  description: "お使いのTwitterアカウントをお使いのMisskeyアカウントに接続しておくと、プロフィールでTwitterアカウント情報が表示されるようになったり、Twitterを用いた便利なサインインを利用できるようになります。"
+  connected-to: "次のTwitterアカウントに接続されています"
+  detail: "詳細..."
+  reconnect: "再接続する"
+  connect: "Twitterと接続する"
+  disconnect: "切断する"
+common/views/components/uploader.vue:
+  waiting: "待機中"
+common/views/components/visibility-chooser.vue:
+  public: "公開"
+  home: "ホーム"
+  home-desc: "ホームタイムラインにのみ公開"
+  followers: "フォロワー"
+  followers-desc: "自分のフォロワーにのみ公開"
+  specified: "ダイレクト"
+  specified-desc: "指定したユーザーにのみ公開"
+  private: "非公開"
+common/views/widgets/broadcast.vue:
+  fetching: "確認中"
+  no-broadcasts: "お知らせはありません"
+  have-a-nice-day: "良い一日を！"
+  next: "次"
+common/views/widgets/donation.vue:
+  title: "寄付のお願い"
+  text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
+common/views/widgets/photo-stream.vue:
+  title: "フォトストリーム"
+  no-photos: "写真はありません"
+common/views/widgets/posts-monitor.vue:
+  title: "投稿チャート"
+  toggle: "表示を切り替え"
+common/views/widgets/hashtags.vue:
+  title: "ハッシュタグ"
+  count: "{}人が投稿"
+  empty: "トレンドなし"
+common/views/widgets/server.vue:
+  title: "サーバー情報"
+  toggle: "表示を切り替え"
+common/views/widgets/memo.vue:
+  title: "付箋"
+  memo: "ここに書いて！"
+  save: "保存"
+common/views/pages/follow.vue:
+  signed-in-as: "{}としてサインイン中"
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+desktop/views/components/activity.chart.vue:
+  total: "Black ... Total"
+  notes: "Blue ... Notes"
+  replies: "Red ... Replies"
+  renotes: "Green ... Renotes"
+desktop/views/components/activity.vue:
+  title: "アクティビティ"
+  toggle: "表示を切り替え"
+desktop/views/components/calendar.vue:
+  title: "{1}年 {2}月"
+  prev: "前の月"
+  next: "次の月"
+  go: "クリックして時間遡行"
+desktop/views/components/choose-file-from-drive-window.vue:
+  choose-file: "ファイル選択中"
+  upload: "PCからドライブにファイルをアップロード"
+  cancel: "キャンセル"
+  ok: "決定"
+  choose-prompt: "ファイルを選択"
+desktop/views/components/choose-folder-from-drive-window.vue:
+  cancel: "キャンセル"
+  ok: "決定"
+  choose-prompt: "フォルダを選択"
+desktop/views/components/crop-window.vue:
+  skip: "クロップをスキップ"
+  cancel: "キャンセル"
+  ok: "決定"
+desktop/views/components/drive-window.vue:
+  used: "使用中"
+  drive: "ドライブ"
+desktop/views/components/drive.file.vue:
+  avatar: "アイコン"
+  banner: "バナー"
+  contextmenu:
+    rename: "名前を変更"
+    copy-url: "URLをコピー"
+    download: "ダウンロード"
+    else-files: "その他..."
+    set-as-avatar: "アイコンに設定"
+    set-as-banner: "バナーに設定"
+    open-in-app: "アプリで開く"
+    add-app: "アプリを追加"
+    rename-file: "ファイル名の変更"
+    input-new-file-name: "新しいファイル名を入力してください"
+    copied: "コピー完了"
+    copied-url-to-clipboard: "URLをクリップボードにコピーしました"
+desktop/views/components/drive.folder.vue:
+  unable-to-process: "操作を完了できません"
+  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  unhandled-error: "不明なエラー"
+  contextmenu:
+    move-to-this-folder: "このフォルダへ移動"
+    show-in-new-window: "新しいウィンドウで表示"
+    rename: "名前を変更"
+    rename-folder: "フォルダ名の変更"
+    input-new-folder-name: "新しいフォルダ名を入力してください"
+desktop/views/components/drive.nav-folder.vue:
+  drive: "ドライブ"
+desktop/views/components/drive.vue:
+  search: "検索"
+  load-more: "もっと読み込む"
+  empty-draghover: "ドロップですか？いいですよ、ボクはカワイイですからね"
+  empty-drive: "ドライブには何もありません。"
+  empty-drive-description: "右クリックして「ファイルをアップロード」を選んだり、ファイルをドラッグ&ドロップすることでもアップロードできます。"
+  empty-folder: "このフォルダーは空です"
+  unable-to-process: "操作を完了できません"
+  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
+  unhandled-error: "不明なエラー"
+  url-upload: "URLアップロード"
+  url-of-file: "アップロードしたいファイルのURL"
+  url-upload-requested: "アップロードをリクエストしました"
+  may-take-time: "アップロードが完了するまで時間がかかる場合があります。"
+  create-folder: "フォルダー作成"
+  folder-name: "フォルダー名"
+  contextmenu:
+    create-folder: "フォルダーを作成"
+    upload: "ファイルをアップロード"
+    url-upload: "URLからアップロード"
+desktop/views/components/follow-button.vue:
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+desktop/views/components/followers-window.vue:
+  followers: "{} のフォロワー"
+desktop/views/components/followers.vue:
+  empty: "フォロワーはいないようです。"
+desktop/views/components/following-window.vue:
+  following: "{} のフォロー"
+desktop/views/components/following.vue:
+  empty: "フォロー中のユーザーはいないようです。"
+desktop/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー:"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
+desktop/views/components/game-window.vue:
+  game: "リバーシ"
+desktop/views/components/home.vue:
+  done: "完了"
+  add-widget: "ウィジェットを追加:"
+  add: "追加"
+desktop/views/input-dialog.vue:
+  cancel: "キャンセル"
+  ok: "決定"
+desktop/views/components/messaging-room-window.vue:
+  title: "メッセージ:"
+desktop/views/components/messaging-window.vue:
+  title: "メッセージ"
+desktop/views/components/note-detail.vue:
+  more: "会話をもっと読み込む"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  reposted-by: "{}がRenote"
+  location: "位置情報"
+  renote: "Renote"
+  add-reaction: "リアクション"
+desktop/views/components/notes.note.vue:
+  reposted-by: "{}がRenote"
+  reply: "返信"
+  renote: "Renote"
+  add-reaction: "リアクション"
+  detail: "詳細"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+desktop/views/components/notes.vue:
+  error: "読み込みに失敗しました。"
+  retry: "リトライ"
+desktop/views/components/notifications.vue:
+  more: "もっと見る"
+  empty: "ありません！"
+desktop/views/components/post-form.vue:
+  reply-placeholder: "この投稿への返信..."
+  quote-placeholder: "この投稿を引用..."
+  submit: "投稿"
+  reply: "返信"
+  renote: "Renote"
+  posted: "投稿しました！"
+  replied: "返信しました！"
+  reposted: "Renoteしました！"
+  note-failed: "投稿に失敗しました"
+  reply-failed: "返信に失敗しました"
+  renote-failed: "Renoteに失敗しました"
+  posting: "投稿中"
+  attach-media-from-local: "PCからメディアを添付"
+  attach-media-from-drive: "ドライブからメディアを添付"
+  attach-cancel: "添付取り消し"
+  insert-a-kao: "v('ω')v"
+  create-poll: "アンケートを作成"
+  text-remain: "残り{}文字"
+desktop/views/components/post-form-window.vue:
+  note: "新規投稿"
+  reply: "返信"
+  attaches: "添付: {}メディア"
+  uploading-media: "{}個のメディアをアップロード中"
+desktop/views/components/progress-dialog.vue:
+  waiting: "待機中"
+desktop/views/components/renote-form.vue:
+  quote: "引用する..."
+  cancel: "キャンセル"
+  renote: "Renote"
+  reposting: "しています..."
+  success: "Renoteしました！"
+  failure: "Renoteに失敗しました"
+desktop/views/components/renote-form-window.vue:
+  title: "この投稿をRenoteしますか？"
+desktop/views/components/settings-window.vue:
+  settings: "設定"
+desktop/views/components/settings.vue:
+  profile: "プロフィール"
+  notification: "通知"
+  apps: "アプリ"
+  mute: "ミュート"
+  drive: "ドライブ"
+  security: "セキュリティ"
+  signin: "サインイン履歴"
+  password: "パスワード"
+  2fa: "二段階認証"
+  other: "その他"
+  license: "ライセンス"
+  behaviour: "動作"
+  fetch-on-scroll: "スクロールで自動読み込み"
+  fetch-on-scroll-desc: "ページを下までスクロールしたときに自動で追加のコンテンツを読み込みます。"
+  auto-popout: "ウィンドウの自動ポップアウト"
+  auto-popout-desc: "ウィンドウが開かれるとき、ポップアウト(ブラウザ外に切り離す)可能なら自動でポップアウトします。この設定はブラウザに記憶されます。"
+  advanced: "詳細設定"
+  api-via-stream: "ストリームを経由したAPIリクエスト"
+  api-via-stream-desc: "この設定をオンにすると、websocket接続を経由してAPIリクエストが行われます(パフォーマンス向上が期待できます)。オフにすると、ネイティブの fetch APIが利用されます。この設定はこのデバイスのみ有効です。"
+  display: "デザインと表示"
+  customize: "ホームをカスタマイズ"
+  dark-mode: "ダークモード"
+  circle-icons: "円形のアイコンを使用"
+  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
+  post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
+  show-reply-target: "リプライ先を表示する"
+  show-my-renotes: "自分の行ったRenoteをタイムラインに表示する"
+  show-renoted-my-notes: "Renoteされた自分の投稿をタイムラインに表示する"
+  show-maps: "マップの自動展開"
+  show-maps-desc: "位置情報が添付された投稿のマップを自動的に展開します。"
+  sound: "サウンド"
+  enable-sounds: "サウンドを有効にする"
+  enable-sounds-desc: "投稿やメッセージを送受信したときなどにサウンドを再生します。この設定はブラウザに記憶されます。"
+  volume: "ボリューム"
+  test: "テスト"
+  mobile: "モバイル"
+  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  language: "言語"
+  pick-language: "言語を選択"
+  recommended: "推奨"
+  auto: "自動"
+  specify-language: "言語を指定"
+  language-desc: "変更はページの再度読み込み後に反映されます。"
+  cache: "キャッシュ"
+  clean-cache: "クリーンアップ"
+  cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
+  cache-cleared: "キャッシュを削除しました"
+  cache-cleared-desc: "ページを再度読み込みしてください。"
+  auto-watch: "投稿の自動ウォッチ"
+  auto-watch-desc: "リアクションしたり返信したりした投稿に関する通知を自動的に受け取るようにします。"
+  about: "Misskeyについて"
+  operator: "このサーバーの運営者"
+  update: "Misskey Update"
+  version: "バージョン:"
+  latest-version: "最新のバージョン:"
+  update-checking: "アップデートを確認中"
+  do-update: "アップデートを確認"
+  update-settings: "詳細設定"
+  prevent-update: "アップデートを延期する(非推奨)"
+  prevent-update-desc: "この設定をオンにしてもアップデートが反映される場合があります。この設定はこのデバイスのみ有効です。"
+  no-updates: "利用可能な更新はありません"
+  no-updates-desc: "お使いのMisskeyは最新です。"
+  update-available: "新しいバージョンが利用可能です"
+  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  advanced-settings: "高度な設定"
+  debug-mode: "デバッグモードを有効にする"
+  debug-mode-desc: "この設定はブラウザに記憶されます。"
+  experimental: "実験的機能を有効にする"
+  experimental-desc: "実験的機能を有効にするとMisskeyの動作が不安定になる可能性があります。この設定はブラウザに記憶されます。"
+  tools: "ツール"
+  task-manager: "タスクマネージャ"
+  third-parties: "サードパーティ"
+desktop/views/components/settings.2fa.vue:
+  intro: "二段階認証を設定すると、サインイン時にパスワードだけでなく、予め登録しておいた物理的なデバイス(例えばあなたのスマートフォンなど)も必要になり、よりセキュリティが向上します。"
+  detail: "詳細..."
+  url: "https://www.google.co.jp/intl/ja/landing/2step/"
+  caution: "登録したデバイスを紛失するなどした場合、Misskeyにサインインできなくなりますのでご注意ください。"
+  register: "デバイスを登録する"
+  already-registered: "既に設定は完了しています。"
+  unregister: "設定を解除"
+  unregistered: "二段階認証が無効になりました。"
+  enter-password: "パスワードを入力してください"
+  authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
+  howtoinstall: "インストール方法はこちら"
+  scan: "次に、表示されているQRコードをスキャンします:"
+  done: "お使いのデバイスに表示されているトークンを入力して完了します:"
+  submit: "完了"
+  success: "設定が完了しました！"
+  failed: "設定に失敗しました。トークンに誤りがないかご確認ください。"
+  info: "次回サインインからは、同様にパスワードに加えてデバイスに表示されているトークンを入力します。"
+desktop/views/components/settings.api.vue:
+  intro: "APIを利用するには、上記のトークンを「i」というキーでパラメータに付加してリクエストします。"
+  caution: "アカウントを不正利用される可能性があるため、このトークンは第三者に教えないでください(アプリなどにも入力しないでください)。"
+  regeneration-of-token: "万が一このトークンが漏れたりその可能性がある場合はトークンを再生成できます。"
+  regenerate-token: "トークンを再生成"
+  token: "Token:"
+  enter-password: "パスワードを入力してください"
+desktop/views/components/settings.apps.vue:
+  no-apps: "連携しているアプリケーションはありません"
+desktop/views/components/settings.mute.vue:
+  no-users: "ミュートしているユーザーはいません"
+desktop/views/components/settings.password.vue:
+  reset: "パスワードを変更する"
+  enter-current-password: "現在のパスワードを入力してください"
+  enter-new-password: "新しいパスワードを入力してください"
+  enter-new-password-again: "もう一度新しいパスワードを入力してください"
+  not-match: "新しいパスワードが一致しません"
+  changed: "パスワードを変更しました"
+desktop/views/components/settings.profile.vue:
+  avatar: "アイコン"
+  choice-avatar: "画像を選択"
+  name: "名前"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  save: "保存"
+  is-bot: "このアカウントはBotです"
+  is-cat: "このアカウントはCatです"
+desktop/views/components/sub-note-content.vue:
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
+desktop/views/components/taskmanager.vue:
+  title: "タスクマネージャ"
+desktop/views/components/timeline.vue:
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
+  list: "リスト"
+desktop/views/components/ui.header.vue:
+  welcome-back: "おかえりなさい、"
+desktop/views/components/ui.header.account.vue:
+  profile: "プロフィール"
+  drive: "ドライブ"
+  favorites: "お気に入り"
+  lists: "リスト"
+  follow-requests: "フォロー申請"
+  customize: "カスタマイズ"
+  settings: "設定"
+  signout: "サインアウト"
+  dark: "闇に飲まれる"
+desktop/views/components/ui.header.nav.vue:
+  home: "ホーム"
+  deck: "デッキ"
+  messaging: "メッセージ"
+  game: "ゲーム"
+desktop/views/components/ui.header.notifications.vue:
+  title: "通知"
+desktop/views/components/ui.header.post.vue:
+  post: "新規投稿"
+desktop/views/components/ui.header.search.vue:
+  placeholder: "検索"
+desktop/views/components/received-follow-requests-window.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+desktop/views/components/user-lists-window.vue:
+  title: "リスト"
+  create-list: "リストを作成"
+desktop/views/components/user-preview.vue:
+  notes: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+desktop/views/components/users-list.vue:
+  all: "すべて"
+  iknow: "知り合い"
+  load-more: "もっと"
+  fetching: "読み込んでいます"
+desktop/views/components/users-list-item.vue:
+  followed: "フォローされています"
+desktop/views/components/window.vue:
+  popout: "ポップアウト"
+  close: "閉じる"
+desktop/views/pages/deck/deck.tl-column.vue:
+  is-media-only: "メディア投稿のみ"
+  is-media-view: "メディアビュー"
+desktop/views/pages/deck/deck.note.vue:
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+desktop/views/pages/welcome.vue:
+  about: "詳しく..."
+  gotit: "わかった"
+  signin: "ログイン"
+  signup: "新規登録"
+  signin-button: "やってる"
+  signup-button: "やる"
+  timeline: "タイムライン"
+desktop/views/pages/drive.vue:
+  title: "Misskey Drive"
+desktop/views/pages/favorites.vue:
+  more: "さらに読み込む"
+desktop/views/pages/home-customize.vue:
+  title: "ホームのカスタマイズ"
+desktop/views/pages/note.vue:
+  prev: "前の投稿"
+  next: "次の投稿"
+desktop/views/pages/selectdrive.vue:
+  title: "ファイルを選択してください"
+  ok: "決定"
+  cancel: "キャンセル"
+  upload: "PCからドライブにファイルをアップロード"
+desktop/views/pages/user-list.users.vue:
+  users: "ユーザー"
+  add-user: "ユーザーを追加"
+  username: "ユーザー名"
+desktop/views/pages/user/user.followers-you-know.vue:
+  title: "知り合いのフォロワー"
+  loading: "読み込み中"
+  no-users: "知り合いのフォロワーはいません"
+desktop/views/pages/user/user.friends.vue:
+  title: "よく話すユーザー"
+  loading: "読み込み中"
+  no-users: "よく話すユーザーはいません"
+desktop/views/pages/user/user.vue:
+  is-suspended: "このユーザーは凍結されています。"
+  is-remote: "このユーザーはリモートユーザーです。"
+  view-remote: "正確な情報を見る"
+desktop/views/pages/user/user.home.vue:
+  last-used-at: "最終アクセス"
+desktop/views/pages/user/user.photos.vue:
+  title: "フォト"
+  loading: "読み込み中"
+  no-photos: "写真はありません"
+desktop/views/pages/user/user.profile.vue:
+  follows-you: "フォローされています"
+  stalk: "ストークする"
+  stalking: "ストーキングしています"
+  unstalk: "ストーク解除"
+  mute: "ミュートする"
+  muted: "ミュートしています"
+  unmute: "ミュート解除"
+desktop/views/pages/user/user.header.vue:
+  posts: "投稿"
+  following: "フォロー"
+  followers: "フォロワー"
+  is-bot: "このアカウントはBotです"
+desktop/views/pages/user/user.timeline.vue:
+  default: "投稿"
+  with-replies: "投稿と返信"
+  with-media: "メディア"
+  empty: "このユーザーはまだ何も投稿していないようです。"
+desktop/views/widgets/messaging.vue:
+  title: "メッセージ"
+desktop/views/widgets/notifications.vue:
+  title: "通知"
+  settings: "通知の設定"
+desktop/views/widgets/polls.vue:
+  title: "アンケート"
+  refresh: "他を見る"
+  nothing: "ありません！"
+desktop/views/widgets/post-form.vue:
+  title: "投稿"
+  note: "投稿"
+desktop/views/widgets/profile.vue:
+  update-banner: "クリックでバナー編集"
+  update-avatar: "クリックでアバター編集"
+desktop/views/widgets/trends.vue:
+  title: "トレンド"
+  refresh: "他を見る"
+  nothing: "ありません！"
+desktop/views/widgets/users.vue:
+  title: "おすすめユーザー"
+  refresh: "他を見る"
+  no-one: "いません！"
+mobile/views/components/drive.vue:
+  drive: "ドライブ"
+  used: "使用中"
+  folder-count: "フォルダ"
+  count-separator: "、"
+  file-count: "ファイル"
+  load-more: "もっと読み込む"
+  nothing-in-drive: "ドライブには何もありません"
+  folder-is-empty: "このフォルダは空です"
+  prompt: "何をしますか？(数字を入力してください): <1 → ファイルをアップロード | 2 → ファイルをURLでアップロード | 3 → フォルダ作成 | 4 → このフォルダ名を変更 | 5 → このフォルダを移動 | 6 → このフォルダを削除>"
+  deletion-alert: "ごめんなさい！フォルダの削除は未実装です...。"
+  folder-name: "フォルダー名"
+  root-rename-alert: "現在いる場所はルートで、フォルダではないため名前の変更はできません。名前を変更したいフォルダに移動してからやってください。"
+  root-move-alert: "現在いる場所はルートで、フォルダではないため移動はできません。移動したいフォルダに移動してからやってください。"
+  url-prompt: "アップロードしたいファイルのURL"
+  uploading: "アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。"
+mobile/views/components/drive-file-detail.vue:
+  rename: "名前を変更"
+mobile/views/components/drive-file-chooser.vue:
+  select-file: "ファイルを選択"
+mobile/views/components/drive-folder-chooser.vue:
+  select-folder: "フォルダーを選択"
+mobile/views/components/drive.file-detail.vue:
+  download: "ダウンロード"
+  rename: "名前を変更"
+  move: "移動"
+  hash: "ハッシュ (md5)"
+  exif: "EXIF"
+mobile/views/components/follow-button.vue:
+  following: "フォロー中"
+  follow: "フォロー"
+  request-pending: "フォロー許可待ち"
+  follow-request: "フォロー申請"
+mobile/views/components/friends-maker.vue:
+  title: "気になるユーザーをフォロー"
+  empty: "おすすめのユーザーは見つかりませんでした。"
+  fetching: "読み込んでいます"
+  refresh: "もっと見る"
+  close: "閉じる"
+mobile/views/components/note.vue:
+  reposted-by: "{}がRenote"
+  more: "もっと見る"
+  less: "隠す"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-detail.vue:
+  reply: "返信"
+  reaction: "リアクション"
+  reposted-by: "{}がRenote"
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  location: "位置情報"
+mobile/views/components/note-preview.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/note-sub.vue:
+  admin: "admin"
+  bot: "bot"
+  cat: "cat"
+mobile/views/components/notes.vue:
+  failed: "読み込みに失敗しました。"
+  retry: "リトライ"
+mobile/views/components/notifications.vue:
+  more: "もっと見る"
+  empty: "ありません！"
+mobile/views/components/post-form.vue:
+  add-visible-user: "ユーザーを追加"
+  submit: "投稿"
+  reply: "返信"
+  renote: "Renote"
+  quote-placeholder: "この投稿を引用... (オプション)"
+  reply-placeholder: "この投稿への返信..."
+  cw-placeholder: "内容への注釈 (オプション)"
+  location-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  username-prompt: "ユーザー名を入力してください"
+mobile/views/components/sub-note-content.vue:
+  private: "この投稿は非公開です"
+  deleted: "この投稿は削除されました"
+  media-count: "{}つのメディア"
+  poll: "アンケート"
+mobile/views/components/timeline.vue:
+  empty: "投稿がありません"
+  load-more: "もっと"
+mobile/views/components/ui.nav.vue:
+  timeline: "タイムライン"
+  notifications: "通知"
+  messaging: "メッセージ"
+  follow-requests: "フォロー申請"
+  search: "検索"
+  drive: "ドライブ"
+  favorites: "お気に入り"
+  user-lists: "リスト"
+  widgets: "ウィジェット"
+  game: "ゲーム"
+  darkmode: "ダークモード"
+  settings: "設定"
+  about: "Misskeyについて"
+mobile/views/components/user-timeline.vue:
+  no-notes: "このユーザーは投稿していないようです。"
+  no-notes-with-media: "メディア付き投稿はありません。"
+  load-more: "もっと"
+mobile/views/components/users-list.vue:
+  all: "すべて"
+  known: "知り合い"
+  load-more: "もっと"
+mobile/views/pages/favorites.vue:
+  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
+mobile/views/pages/drive.vue:
+  drive: "ドライブ"
+  more: "もっと見る"
+mobile/views/pages/followers.vue:
+  followers-of: "{}のフォロワー"
+mobile/views/pages/following.vue:
+  following-of: "{}のフォロー"
+mobile/views/pages/home.vue:
+  home: "ホーム"
+  local: "ローカル"
+  global: "グローバル"
+mobile/views/pages/messaging.vue:
+  messaging: "メッセージ"
+mobile/views/pages/messaging-room.vue:
+  messaging: "メッセージ"
+mobile/views/pages/received-follow-requests.vue:
+  title: "フォロー申請"
+  accept: "承認"
+  reject: "拒否"
+mobile/views/pages/note.vue:
+  title: "投稿"
+  prev: "前の投稿"
+  next: "次の投稿"
+mobile/views/pages/notifications.vue:
+  notifications: "通知"
+  read-all: "すべての通知を既読にしますか？"
+mobile/views/pages/settings/settings.profile.vue:
+  title: "プロフィール"
+  name: "名前"
+  account: "アカウント"
+  location: "場所"
+  description: "自己紹介"
+  birthday: "誕生日"
+  avatar: "アイコン"
+  banner: "バナー"
+  is-cat: "このアカウントはCatです"
+  save: "保存"
+  saved: "プロフィールを保存しました"
+  uploading: "アップロード中"
+  upload-failed: "アップロードに失敗しました"
+mobile/views/pages/search.vue:
+  search: "検索"
+  empty: "「{}」に関する投稿は見つかりませんでした。"
+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: "私は通信を制限されている"
+  circle-icons: "円形のアイコンを使用"
+  timeline: "タイムライン"
+  show-reply-target: "リプライ先を表示する"
+  show-my-renotes: "自分の行ったRenoteを表示する"
+  show-renoted-my-notes: "Renoteされた自分の投稿を表示する"
+  post-style: "投稿の表示スタイル"
+  post-style-standard: "標準"
+  post-style-smart: "スマート"
+  behavior: "動作"
+  fetch-on-scroll: "スクロールで自動読み込み"
+  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  load-raw-images: "添付された画像を高画質で表示する"
+  load-remote-media: "リモートサーバーのメディアを表示する"
+  twitter: "Twitter連携"
+  twitter-connect: "Twitterアカウントに接続する"
+  twitter-reconnect: "再接続する"
+  twitter-disconnect: "切断する"
+  update: "Misskey Update"
+  version: "バージョン:"
+  latest-version: "最新のバージョン:"
+  update-checking: "アップデートを確認中"
+  check-for-updates: "アップデートを確認"
+  no-updates: "利用可能な更新はありません"
+  no-updates-desc: "お使いのMisskeyは最新です。"
+  update-available: "新しいバージョンが利用可能です"
+  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  settings: "設定"
+  signout: "サインアウト"
+mobile/views/pages/user.vue:
+  follows-you: "フォローされています"
+  following: "フォロー"
+  followers: "フォロワー"
+  notes: "投稿"
+  overview: "概要"
+  timeline: "タイムライン"
+  media: "メディア"
+  is-suspended: "このユーザーは凍結されています。"
+  is-remote: "このユーザーはリモートユーザーです。"
+  view-remote: "正確な情報を見る"
+mobile/views/pages/user/home.vue:
+  recent-notes: "最近の投稿"
+  images: "画像"
+  activity: "アクティビティ"
+  keywords: "キーワード"
+  domains: "頻出ドメイン"
+  frequently-replied-users: "よく会話するユーザー"
+  followers-you-know: "知り合いのフォロワー"
+  last-used-at: "最終ログイン"
+mobile/views/pages/user/home.followers-you-know.vue:
+  loading: "読み込み中"
+  no-users: "知り合いのユーザーはいません"
+mobile/views/pages/user/home.friends.vue:
+  loading: "読み込み中"
+  no-users: "よく会話するユーザーはいません"
+mobile/views/pages/user/home.notes.vue:
+  loading: "読み込み中"
+  no-notes: "投稿はありません"
+mobile/views/pages/user/home.photos.vue:
+  loading: "読み込み中"
+  no-photos: "写真はありません"
+docs:
+  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
+  edit-this-page-on-github-link: "このページをGitHubで編集"
+  api:
+    entities:
+      properties: "プロパティ"
+    endpoints:
+      params: "パラメータ"
+      res: "レスポンス"
+    props:
+      name: "名前"
+      type: "型"
+      optional: "オプション"
+      description: "説明"
+      yes: "はい"
+      no: "いいえ"

From 87df50b7e7a9f744a583e4502ac126dd41710ac7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 20:51:54 +0900
Subject: [PATCH 04/25] New translations ja.yml (English)

---
 locales/en.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index ee4eaf9e19..eaa2989277 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -116,7 +116,7 @@ common/views/components/connect-failed.troubleshooter.vue:
   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 Misskey server"
-  no-server-desc: "The network connection of your PC is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down or under maintenance, please try again later."
+  no-server-desc: "The network connection of your computer is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down or under maintenance, please try again later."
   success: "Successfully connected to the Misskey server"
   success-desc: "It seems to be able to connect. Please reload the page."
   flush: "Clean cache"
@@ -134,7 +134,7 @@ common/views/components/messaging-room.vue:
 common/views/components/messaging-room.form.vue:
   input-message-here: "Enter message here"
   send: "Send"
-  attach-from-local: "Attach files from your PC"
+  attach-from-local: "Attach files from your computer"
   attach-from-drive: "Attach files from your Drive"
 common/views/components/messaging-room.message.vue:
   is-read: "Read"
@@ -267,7 +267,7 @@ desktop/views/components/calendar.vue:
   go: "Click to navigate"
 desktop/views/components/choose-file-from-drive-window.vue:
   choose-file: "Choose files"
-  upload: "Upload files from your PC"
+  upload: "Upload files from your computer"
   cancel: "Cancel"
   ok: "OK"
   choose-prompt: "Choose a file"
@@ -624,7 +624,7 @@ desktop/views/pages/selectdrive.vue:
   title: "Choose file(s)"
   ok: "OK"
   cancel: "Cancel"
-  upload: "Upload files from your PC"
+  upload: "Upload files from your computer"
 desktop/views/pages/user-list.users.vue:
   users: "User"
   add-user: "Add a user"

From b0ff4533e26523e0eeb6c341a4c978d552527cfb Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 22:04:55 +0900
Subject: [PATCH 05/25] New translations ja.yml (English)

---
 locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.yml b/locales/en.yml
index eaa2989277..640a927661 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -581,7 +581,7 @@ desktop/views/components/received-follow-requests-window.vue:
   reject: "Reject"
 desktop/views/components/user-lists-window.vue:
   title: "User lists"
-  create-list: "Create a list"
+  create-list: "Create new list"
 desktop/views/components/user-preview.vue:
   notes: "Posts"
   following: "Following"

From 772b9d0ae73da97f9f2879a22532aa5fb0924a87 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 22:11:41 +0900
Subject: [PATCH 06/25] New translations ja.yml (English)

---
 locales/en.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 640a927661..0163f51c0d 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -87,7 +87,7 @@ common:
     local: "Local"
     global: "Global"
     notifications: "Notifications"
-    list: "List"
+    list: "Lists"
     swap-left: "Move left"
     swap-right: "Move right"
     swap-up: "Move upward"
@@ -95,8 +95,8 @@ common:
     remove: "Remove"
     add-column: "Add a column"
     rename: "Rename"
-    stack-left: "Stack to left"
-    pop-right: "Stack to right"
+    stack-left: "Stack to the left"
+    pop-right: "Stack to the right"
 common/views/components/connect-failed.vue:
   title: "Unable to connect to the server"
   description: "There is a problem with your Internet connection, or the server may be down or under maintenance. Please try again later."
@@ -128,7 +128,7 @@ common/views/components/messaging.vue:
 common/views/components/messaging-room.vue:
   empty: "No conversations"
   more: "Read more"
-  no-history: "There is no more history"
+  no-history: "There is no further history"
   resize-form: "Drag to resize"
   new-message: "New message"
 common/views/components/messaging-room.form.vue:

From bdb5081c0583168d61c23c2fa23cfe571e713a7f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 22:43:31 +0900
Subject: [PATCH 07/25] New translations ja.yml (English)

---
 locales/en.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 0163f51c0d..68d649246b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -39,8 +39,8 @@ common:
     a: "What are you doing?"
     b: "What's happening?"
     c: "What’s on your mind?"
-    d: "What do you want to talk about?"
-    e: "Write here!"
+    d: "What do you wish to say?"
+    e: "Write here"
     f: "Waiting for your writing..."
   search: "Search"
   delete: "Delete"
@@ -48,8 +48,8 @@ common:
   ok: "OK"
   update-available-title: "Update available"
   update-available: "A new version of Misskey, ({newer}, is now available. You are currently using {current}). Reloading the page will apply the update."
-  my-token-regenerated: "Your token has been regenerated so you will be signed out."
-  i-like-sushi: "I like sushi rather than pudding"
+  my-token-regenerated: "Your token has been regenerated, so you will be signed out."
+  i-like-sushi: "I like sushi, rather than pudding"
   show-reversi-board-labels: "Show row and column labels in Reversi"
   reversi:
     drawn: "Draw"
@@ -112,7 +112,7 @@ common/views/components/connect-failed.troubleshooter.vue:
   checking-server: "Checking server connection"
   finding: "Searching for issues"
   no-network: "No connection"
-  no-network-desc: "Please make sure you are connected to the network."
+  no-network-desc: "Please make sure that you have a network connection."
   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 Misskey server"
@@ -124,7 +124,7 @@ common/views/components/connect-failed.troubleshooter.vue:
 common/views/components/messaging.vue:
   search-user: "Find a user"
   you: "You"
-  no-history: "No history"
+  no-history: "Without history"
 common/views/components/messaging-room.vue:
   empty: "No conversations"
   more: "Read more"

From edeb09eee253f5b29335366f36beed0f3fd3feaf Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 22:53:32 +0900
Subject: [PATCH 08/25] New translations ja.yml (English)

---
 locales/en.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 68d649246b..c62ee6a379 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -77,7 +77,7 @@ common:
     post-form: "Post form"
     messaging: "Messages"
     server: "Server info"
-    donation: "Donation"
+    donation: "Request for donations"
     nav: "Navigation"
     tips: "Tips"
     hashtags: "Hashtags"
@@ -560,7 +560,7 @@ desktop/views/components/ui.header.account.vue:
   favorites: "Favorites"
   lists: "Lists"
   follow-requests: "Follow requests"
-  customize: "Customize Layout"
+  customize: "Customize layout"
   settings: "Settings"
   signout: "Sign out"
   dark: "Fall into dark"
@@ -702,7 +702,7 @@ mobile/views/components/drive.vue:
   folder-name: "Folder name"
   root-rename-alert: "You're in the root; it can't be renamed because it's not a folder. Navigate to a folder you want to rename and try again."
   root-move-alert: "You're in the root; it can't be moved because it's not a folder. Navigate to a folder you want to move and try again."
-  url-prompt: "URL of file you want to upload"
+  url-prompt: "URL of the file you want to upload"
   uploading: "Upload requested. It may take a while for the upload to finish."
 mobile/views/components/drive-file-detail.vue:
   rename: "Rename"

From c1d767b0ae8658172be47397824a8a865b96831a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 23:01:42 +0900
Subject: [PATCH 09/25] New translations ja.yml (English)

---
 locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.yml b/locales/en.yml
index c62ee6a379..ecbb4c60e7 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -315,7 +315,7 @@ desktop/views/components/drive.vue:
   load-more: "Load more"
   empty-draghover: "Drop here, don't I look cute?"
   empty-drive: "Your media storage is empty"
-  empty-drive-description: "You can also upload by right clicking and selecting \"Upload file\", or you can drag and drop a file onto the window."
+  empty-drive-description: "Right-click to open the context menu, or drag and drop a file onto the window for uploading."
   empty-folder: "This folder is empty"
   unable-to-process: "The operation could not be completed."
   circular-reference-detected: "The destination folder is a subfolder of the folder you wish to move."

From 64d80f8f48fddb5bf91f7fe67de81dabc6ecb469 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 28 Jun 2018 23:11:57 +0900
Subject: [PATCH 10/25] New translations ja.yml (English)

---
 locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.yml b/locales/en.yml
index ecbb4c60e7..a834a85c74 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -315,7 +315,7 @@ desktop/views/components/drive.vue:
   load-more: "Load more"
   empty-draghover: "Drop here, don't I look cute?"
   empty-drive: "Your media storage is empty"
-  empty-drive-description: "Right-click to open the context menu, or drag and drop a file onto the window for uploading."
+  empty-drive-description: "Right-click to open the menu, or drag and drop a file onto here for uploading."
   empty-folder: "This folder is empty"
   unable-to-process: "The operation could not be completed."
   circular-reference-detected: "The destination folder is a subfolder of the folder you wish to move."

From c426748fe2c64a59471890ef5d7a1219983bcc06 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 29 Jun 2018 04:31:25 +0900
Subject: [PATCH 11/25] New translations ja.yml (English)

---
 locales/en.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index a834a85c74..0084f34b06 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -281,7 +281,7 @@ desktop/views/components/crop-window.vue:
   ok: "OK"
 desktop/views/components/drive-window.vue:
   used: "used"
-  drive: "Drive"
+  drive: "Media storage"
 desktop/views/components/drive.file.vue:
   avatar: "Avatar"
   banner: "Banner"
@@ -309,11 +309,11 @@ desktop/views/components/drive.folder.vue:
     rename-folder: "Rename folder"
     input-new-folder-name: "Enter new name"
 desktop/views/components/drive.nav-folder.vue:
-  drive: "Drive"
+  drive: "Media storage"
 desktop/views/components/drive.vue:
   search: "Search"
   load-more: "Load more"
-  empty-draghover: "Drop here, don't I look cute?"
+  empty-draghover: "Drop it here, don't I look cute?"
   empty-drive: "Your media storage is empty"
   empty-drive-description: "Right-click to open the menu, or drag and drop a file onto here for uploading."
   empty-folder: "This folder is empty"
@@ -563,7 +563,7 @@ desktop/views/components/ui.header.account.vue:
   customize: "Customize layout"
   settings: "Settings"
   signout: "Sign out"
-  dark: "Fall into dark"
+  dark: "Submerge in dark"
 desktop/views/components/ui.header.nav.vue:
   home: "Home"
   deck: "Deck"
@@ -612,7 +612,7 @@ desktop/views/pages/welcome.vue:
   signup-button: "Sign up"
   timeline: "Timeline"
 desktop/views/pages/drive.vue:
-  title: "Misskey Drive"
+  title: "Misskey storage"
 desktop/views/pages/favorites.vue:
   more: "Load more"
 desktop/views/pages/home-customize.vue:

From d912cd3b7536eeeecb75baddab7381b10d7c9a88 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 29 Jun 2018 04:41:15 +0900
Subject: [PATCH 12/25] New translations ja.yml (English)

---
 locales/en.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 0084f34b06..fd07b0e54f 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -274,7 +274,7 @@ desktop/views/components/choose-file-from-drive-window.vue:
 desktop/views/components/choose-folder-from-drive-window.vue:
   cancel: "Cancel"
   ok: "OK"
-  choose-prompt: "Choose a Folder"
+  choose-prompt: "Choose a folder"
 desktop/views/components/crop-window.vue:
   skip: "Skip cropping"
   cancel: "Cancel"
@@ -634,7 +634,7 @@ desktop/views/pages/user/user.followers-you-know.vue:
   loading: "Loading"
   no-users: "No followers you know"
 desktop/views/pages/user/user.friends.vue:
-  title: "Frequently replied"
+  title: "Frequent mentions"
   loading: "Loading"
   no-users: "No users"
 desktop/views/pages/user/user.vue:
@@ -689,7 +689,7 @@ desktop/views/widgets/users.vue:
   refresh: "Show others"
   no-one: "No one"
 mobile/views/components/drive.vue:
-  drive: "Drive"
+  drive: "Media storage"
   used: "used"
   folder-count: "Folder(s)"
   count-separator: ", "
@@ -763,7 +763,7 @@ mobile/views/components/post-form.vue:
   quote-placeholder: "Quote this post... (optional)"
   reply-placeholder: "Reply to this note..."
   cw-placeholder: "Comments about content (optional)"
-  location-alert: "Your device does not support location services"
+  location-alert: "Your device does not provide location services"
   error: "Error"
   username-prompt: "Enter user name"
 mobile/views/components/sub-note-content.vue:
@@ -789,8 +789,8 @@ mobile/views/components/ui.nav.vue:
   settings: "Settings"
   about: "About Misskey"
 mobile/views/components/user-timeline.vue:
-  no-notes: "It seems this user hasn't posted yet"
-  no-notes-with-media: "There is no notes with attached media"
+  no-notes: "It seems this user hasn't posted anything yet."
+  no-notes-with-media: "There are no notes with media attachments"
   load-more: "More"
 mobile/views/components/users-list.vue:
   all: "All"
@@ -901,7 +901,7 @@ mobile/views/pages/user/home.vue:
   activity: "Activity"
   keywords: "Keywords"
   domains: "Domains"
-  frequently-replied-users: "Frequently talking users"
+  frequently-replied-users: "Frequently mentioned users"
   followers-you-know: "Followers you know"
   last-used-at: "Last active:"
 mobile/views/pages/user/home.followers-you-know.vue:

From b57a43b26cde92ad455356de7dc6f5a2e35c85e6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 30 Jun 2018 22:10:49 +0900
Subject: [PATCH 13/25] New translations ja.yml (English)

---
 locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.yml b/locales/en.yml
index fd07b0e54f..67f52dbe9f 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -162,7 +162,7 @@ common/views/components/poll.vue:
   show-result: "Show results"
   voted: "Voted"
 common/views/components/poll-editor.vue:
-  no-only-one-choice: "At least two choices are required"
+  no-only-one-choice: "At least two choices are required for this survey."
   choice-n: "Choice {}"
   remove: "Delete this choice"
   add: "+ Add a choice"

From 212db199e8d8b45de64a18d204f35abec48a55f3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 1 Jul 2018 01:50:43 +0900
Subject: [PATCH 14/25] New translations ja.yml (English)

---
 locales/en.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 67f52dbe9f..f857ff4c19 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -256,7 +256,7 @@ desktop/views/components/activity.chart.vue:
   total: "Black ... Total"
   notes: "Blue ... Notes"
   replies: "Red ... Replies"
-  renotes: "Green ... Renotes"
+  renotes: "Green ... Repost"
 desktop/views/components/activity.vue:
   title: "Activity"
   toggle: "Toggle views"
@@ -490,7 +490,7 @@ desktop/views/components/settings.vue:
   debug-mode: "Enable the debug mode"
   debug-mode-desc: "This setting is stored in the browser."
   experimental: "Enable experimental features"
-  experimental-desc: "It would make Misskey client unstable. This setting is stored in the browser."
+  experimental-desc: "Activating this experimental feature might make the Misskey client unstable. This setting is stored in the browser."
   tools: "Tools"
   task-manager: "Task Manager"
   third-parties: "Third-parties"
@@ -504,7 +504,7 @@ desktop/views/components/settings.2fa.vue:
   unregister: "Disable"
   unregistered: "Two-factor authentication has been disabled."
   enter-password: "Enter the password"
-  authenticator: "First, you need install Google Authenticator on your device:"
+  authenticator: "First, you need to install Google Authenticator on your device:"
   howtoinstall: "How to install"
   scan: "And then, scan the QR code:"
   done: "Please enter the token displaying on your device:"
@@ -695,7 +695,7 @@ mobile/views/components/drive.vue:
   count-separator: ", "
   file-count: "File(s)"
   load-more: "Load more"
-  nothing-in-drive: "Nothing"
+  nothing-in-drive: "There's nothing stored."
   folder-is-empty: "This folder is empty"
   prompt: "What do you want to do? (Please enter a number): <1 → Upload a file | 2 → Upload a file from a URL | 3 → Create a folder | 4 → Change this folder's name | 5 → Move this folder | 6 → Delete this folder>"
   deletion-alert: "Sorry! Deleting a folder is not yet implemented."

From 4a1ed5a3caa29f3f1bf5b92e88f4c47c9468909f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 1 Jul 2018 02:00:47 +0900
Subject: [PATCH 15/25] New translations ja.yml (English)

---
 locales/en.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index f857ff4c19..7c0edd6e2b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -377,7 +377,7 @@ desktop/views/components/notes.note.vue:
   add-reaction: "Add a reaction"
   detail: "Show details"
   private: "This post is private"
-  deleted: "This post has been deleted"
+  deleted: "The post has been deleted"
 desktop/views/components/notes.vue:
   error: "Loading failed."
   retry: "Retry"
@@ -528,7 +528,7 @@ desktop/views/components/settings.password.vue:
   enter-current-password: "Enter the current password"
   enter-new-password: "Enter the new password"
   enter-new-password-again: "Enter new password again"
-  not-match: "New password doesn't match"
+  not-match: "The new passwords do not match"
   changed: "Password updated"
 desktop/views/components/settings.profile.vue:
   avatar: "Avatar"
@@ -826,7 +826,7 @@ mobile/views/pages/note.vue:
   next: "Next note"
 mobile/views/pages/notifications.vue:
   notifications: "Notifications"
-  read-all: "Are you sure you want to mark all unread notifications as read?"
+  read-all: "Do you wish to mark all unread notifications as read?"
 mobile/views/pages/settings/settings.profile.vue:
   title: "Profile"
   name: "Name"

From 3b1b8e9493f3c9abf9ff87392ae7ad27c98a79a8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 1 Jul 2018 02:51:01 +0900
Subject: [PATCH 16/25] New translations ja.yml (English)

---
 locales/en.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 7c0edd6e2b..0526efad09 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -47,7 +47,7 @@ common:
   loading: "Loading"
   ok: "OK"
   update-available-title: "Update available"
-  update-available: "A new version of Misskey, ({newer}, is now available. You are currently using {current}). Reloading the page will apply the update."
+  update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
   my-token-regenerated: "Your token has been regenerated, so you will be signed out."
   i-like-sushi: "I like sushi, rather than pudding"
   show-reversi-board-labels: "Show row and column labels in Reversi"
@@ -639,7 +639,7 @@ desktop/views/pages/user/user.friends.vue:
   no-users: "No users"
 desktop/views/pages/user/user.vue:
   is-suspended: "This account has been suspended."
-  is-remote: "This user is a remote user, so the information about them that you see here is not complete."
+  is-remote: "This user is a remote user, so the information about them that you see here is not complete. "
   view-remote: "See their complete profile"
 desktop/views/pages/user/user.home.vue:
   last-used-at: "Last active:"
@@ -868,7 +868,7 @@ mobile/views/pages/settings.vue:
   fetch-on-scroll: "Endless loading on scroll"
   disable-via-mobile: "Don't mark the post as 'from mobile'"
   load-raw-images: "Show attached images in high-quality"
-  load-remote-media: "Show media on a remote server"
+  load-remote-media: "Show media from a remote server"
   twitter: "Twitter integration"
   twitter-connect: "Connect to your Twitter account"
   twitter-reconnect: "Reconnect"

From be90e179c62fd8c7ef74b172985460660ebe9eb4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 1 Jul 2018 03:10:54 +0900
Subject: [PATCH 17/25] New translations ja.yml (English)

---
 locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 0526efad09..f4916802f1 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -490,12 +490,12 @@ desktop/views/components/settings.vue:
   debug-mode: "Enable the debug mode"
   debug-mode-desc: "This setting is stored in the browser."
   experimental: "Enable experimental features"
-  experimental-desc: "Activating this experimental feature might make the Misskey client unstable. This setting is stored in the browser."
+  experimental-desc: "Activating this might make the Misskey client unstable. This setting is stored in the browser."
   tools: "Tools"
   task-manager: "Task Manager"
   third-parties: "Third-parties"
 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. "
+  intro: "If you set up 2-step verification, you will not only need a password at sign-in, but also a pre-registered physical device (such as your smartphone), which will improve security."
   detail: "See details..."
   url: "https://www.google.com/landing/2step/"
   caution: "If you lose access to your device, you won't be able to connect to Misskey anymore!"

From 91db7174858babb6e4a7f970b5f646e4021d8b4f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 1 Jul 2018 07:51:22 +0900
Subject: [PATCH 18/25] New translations ja.yml (English)

---
 locales/en.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index f4916802f1..d3da663074 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -88,8 +88,8 @@ common:
     global: "Global"
     notifications: "Notifications"
     list: "Lists"
-    swap-left: "Move left"
-    swap-right: "Move right"
+    swap-left: "Move to the left"
+    swap-right: "Move to the right"
     swap-up: "Move upward"
     swap-down: "Move downward"
     remove: "Remove"
@@ -153,7 +153,7 @@ common/views/components/note-menu.vue:
   pin: "Pin to your profile page"
   delete: "Delete"
   delete-confirm: "Delete this post for sure?"
-  remote: "Show original note"
+  remote: "Show the originating note"
 common/views/components/poll.vue:
   vote-to: "Vote for '{}'"
   vote-count: "{} votes"
@@ -195,7 +195,7 @@ common/views/components/signup.vue:
   password-not-matched: "Doesn't match"
   recaptcha: "Verification"
   create: "Create an Account"
-  some-error: "Account creation has failed for some reason. Please try again."
+  some-error: "An attempt at account creation has failed for some reason. Please try again."
 common/views/components/special-message.vue:
   new-year: "Happy New Year!"
   christmas: "Merry Christmas!"
@@ -228,7 +228,7 @@ common/views/widgets/broadcast.vue:
   next: "Next"
 common/views/widgets/donation.vue:
   title: "Request for donations"
-  text: "To keep Misskey up and running, we have to spend money on our domain name, the server costs and so on. Since we don't receive money from advertisements, we count on donations from all of you. If you're interested contact {}. Thank you for your contribution!"
+  text: "To keep Misskey up and running, we have to spend money on our domain name, the server costs and so on. Since we don't receive money from advertisements, we count on donations from all of you. If you're interested in helping, contact {}. Thank you for your contribution!"
 common/views/widgets/photo-stream.vue:
   title: "Photostream"
   no-photos: "No photos"

From fe3d95f3949451b30871923b574aa6ffa1f1f6e8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 1 Jul 2018 20:10:48 +0900
Subject: [PATCH 19/25] New translations ja.yml (English)

---
 locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index d3da663074..7a67bb7e76 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -116,7 +116,7 @@ common/views/components/connect-failed.troubleshooter.vue:
   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 Misskey server"
-  no-server-desc: "The network connection of your computer is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down or under maintenance, please try again later."
+  no-server-desc: "The network connection of your computer is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down, or under maintenance, please try again later."
   success: "Successfully connected to the Misskey server"
   success-desc: "It seems to be able to connect. Please reload the page."
   flush: "Clean cache"
@@ -893,7 +893,7 @@ mobile/views/pages/user.vue:
   timeline: "Timeline"
   media: "Media"
   is-suspended: "This account has been suspended."
-  is-remote: "This user is a remote user, so the information about them that you see here is not complete."
+  is-remote: "This user is a remote user, so the information you see here is not complete."
   view-remote: "See their complete profile"
 mobile/views/pages/user/home.vue:
   recent-notes: "Recent notes"

From f934fb171ac7cecf43f2acda43bb13c48c635d2a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 1 Jul 2018 20:11:54 +0900
Subject: [PATCH 20/25] New translations ja.yml (English)

---
 locales/en.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 7a67bb7e76..2eecd7cc1c 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -116,7 +116,7 @@ common/views/components/connect-failed.troubleshooter.vue:
   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 Misskey server"
-  no-server-desc: "The network connection of your computer is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down, or under maintenance, please try again later."
+  no-server-desc: "The network connection of your device is normal, but you could not connect to the Misskey server. There is a possibility that the server is either down, or under maintenance, please try again later."
   success: "Successfully connected to the Misskey server"
   success-desc: "It seems to be able to connect. Please reload the page."
   flush: "Clean cache"
@@ -134,7 +134,7 @@ common/views/components/messaging-room.vue:
 common/views/components/messaging-room.form.vue:
   input-message-here: "Enter message here"
   send: "Send"
-  attach-from-local: "Attach files from your computer"
+  attach-from-local: "Attach files from your device"
   attach-from-drive: "Attach files from your Drive"
 common/views/components/messaging-room.message.vue:
   is-read: "Read"
@@ -267,7 +267,7 @@ desktop/views/components/calendar.vue:
   go: "Click to navigate"
 desktop/views/components/choose-file-from-drive-window.vue:
   choose-file: "Choose files"
-  upload: "Upload files from your computer"
+  upload: "Upload files from your device"
   cancel: "Cancel"
   ok: "OK"
   choose-prompt: "Choose a file"
@@ -397,7 +397,7 @@ desktop/views/components/post-form.vue:
   reply-failed: "Failed to reply"
   renote-failed: "Failed to repost"
   posting: "Posting"
-  attach-media-from-local: "Attach media from your computer"
+  attach-media-from-local: "Attach media from your device"
   attach-media-from-drive: "Attach media from your Drive"
   attach-cancel: "Cancel attachment"
   insert-a-kao: "v('ω')v"
@@ -624,7 +624,7 @@ desktop/views/pages/selectdrive.vue:
   title: "Choose file(s)"
   ok: "OK"
   cancel: "Cancel"
-  upload: "Upload files from your computer"
+  upload: "Upload files from your device"
 desktop/views/pages/user-list.users.vue:
   users: "User"
   add-user: "Add a user"

From 83eab954f1b59bddaa45d1f60e867a4818cbbac3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 1 Jul 2018 20:30:53 +0900
Subject: [PATCH 21/25] New translations ja.yml (English)

---
 locales/en.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 2eecd7cc1c..7d41a9434a 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -4,12 +4,12 @@ meta:
   divider: ""
 common:
   misskey: "A ⭐ of the fediverse"
-  about-title: "A ⭐ of fediverse."
+  about-title: "A ⭐ of the fediverse."
   about: "Thanks for finding Misskey. Misskey is a <b>decentralized microblogging platform</b> born on Earth. Since it exists within the Fediverse (a universe where various social media platforms are organized), it is mutually linked with other social media platforms. Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet?"
   time:
     unknown: "unknown"
     future: "future"
-    just_now: "just now"
+    just_now: "now"
     seconds_ago: "{}s ago"
     minutes_ago: "{}m ago"
     hours_ago: "{}h ago"
@@ -96,7 +96,7 @@ common:
     add-column: "Add a column"
     rename: "Rename"
     stack-left: "Stack to the left"
-    pop-right: "Stack to the right"
+    pop-right: "Dock on the right"
 common/views/components/connect-failed.vue:
   title: "Unable to connect to the server"
   description: "There is a problem with your Internet connection, or the server may be down or under maintenance. Please try again later."
@@ -168,7 +168,7 @@ common/views/components/poll-editor.vue:
   add: "+ Add a choice"
   destroy: "Discard the poll"
 common/views/components/reaction-picker.vue:
-  choose-reaction: "Choose a reaction"
+  choose-reaction: "Express a reaction"
 common/views/components/signin.vue:
   username: "Username"
   password: "Password"
@@ -352,7 +352,7 @@ desktop/views/components/friends-maker.vue:
 desktop/views/components/game-window.vue:
   game: "Reversi"
 desktop/views/components/home.vue:
-  done: "Submit"
+  done: "Done"
   add-widget: "Add widget:"
   add: "Add"
 desktop/views/input-dialog.vue:
@@ -672,7 +672,7 @@ desktop/views/widgets/notifications.vue:
   settings: "Settings"
 desktop/views/widgets/polls.vue:
   title: "Polls"
-  refresh: "Show others"
+  refresh: "refresh"
   nothing: "Nothing"
 desktop/views/widgets/post-form.vue:
   title: "Post"
@@ -682,11 +682,11 @@ desktop/views/widgets/profile.vue:
   update-avatar: "Click to edit your avatar"
 desktop/views/widgets/trends.vue:
   title: "Trend"
-  refresh: "Show others"
+  refresh: "refresh"
   nothing: "Nothing"
 desktop/views/widgets/users.vue:
   title: "Recommended users"
-  refresh: "Show others"
+  refresh: "refresh"
   no-one: "No one"
 mobile/views/components/drive.vue:
   drive: "Media storage"

From a4d62c7c7a2897c29bbaaab2519eede9bb083ce9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 2 Jul 2018 00:31:30 +0900
Subject: [PATCH 22/25] New translations ja.yml (English)

---
 locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.yml b/locales/en.yml
index 7d41a9434a..9190caa81b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -49,7 +49,7 @@ common:
   update-available-title: "Update available"
   update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates."
   my-token-regenerated: "Your token has been regenerated, so you will be signed out."
-  i-like-sushi: "I like sushi, rather than pudding"
+  i-like-sushi: "I prefer sushi rather than pudding"
   show-reversi-board-labels: "Show row and column labels in Reversi"
   reversi:
     drawn: "Draw"

From 168f73e9889e76f36f8f9ece8637401251e0e14a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 2 Jul 2018 03:20:51 +0900
Subject: [PATCH 23/25] New translations ja.yml (French)

---
 locales/fr.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/fr.yml b/locales/fr.yml
index 6512a0c079..249b0178aa 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -49,10 +49,10 @@ common:
   update-available-title: "Mise à jour disponible"
   update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
   my-token-regenerated: "Votre token vient d'être généré, vous allez maintenant être déconnecté."
-  i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
+  i-like-sushi: "Je préfère les sushis (au pudding)"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
   reversi:
-    drawn: "引き分け"
+    drawn: "Partie nulle"
     my-turn: "C’est votre tour"
     opponent-turn: "Tour de l’adversaire"
     turn-of: "C’est le tour de {}"
@@ -249,7 +249,7 @@ common/views/widgets/memo.vue:
 common/views/pages/follow.vue:
   signed-in-as: "Connecté en tant que {}"
   following: "Suit"
-  follow: "フォロー"
+  follow: "Suivre"
   request-pending: "Demande d'abonnement en attente"
   follow-request: "Demande d'abonnement"
 desktop/views/components/activity.chart.vue:

From be8624250d01bba05b8cb069b08724036567d8d1 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 2 Jul 2018 03:31:05 +0900
Subject: [PATCH 24/25] New translations ja.yml (French)

---
 locales/fr.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/locales/fr.yml b/locales/fr.yml
index 249b0178aa..ec859e1565 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -50,13 +50,13 @@ common:
   update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
   my-token-regenerated: "Votre token vient d'être généré, vous allez maintenant être déconnecté."
   i-like-sushi: "Je préfère les sushis (au pudding)"
-  show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
+  show-reversi-board-labels: "Afficher les étiquettes des lignes et colonnes dans Reversi"
   reversi:
     drawn: "Partie nulle"
     my-turn: "C’est votre tour"
     opponent-turn: "Tour de l’adversaire"
     turn-of: "C’est le tour de {}"
-    past-turn-of: "{}のターン"
+    past-turn-of: "C'est au tour de {}"
   widgets:
     analog-clock: "Horloge analogique"
     profile: "Profil"
@@ -253,7 +253,7 @@ common/views/pages/follow.vue:
   request-pending: "Demande d'abonnement en attente"
   follow-request: "Demande d'abonnement"
 desktop/views/components/activity.chart.vue:
-  total: "Black ... Total"
+  total: "Noir ... Total"
   notes: "Bleu ... Notes"
   replies: "Rouge ... Réponses"
   renotes: "Vert ... Partages"
@@ -445,7 +445,7 @@ desktop/views/components/settings.vue:
   customize: "Personnaliser l'Accueil"
   dark-mode: "Mode nuit"
   circle-icons: "Utiliser des icônes circulaires"
-  gradient-window-header: "ウィンドウのタイトルバーにグラデーションを使用"
+  gradient-window-header: "Utiliser les dégradés sur la barre de titre de la fenêtre"
   post-form-on-timeline: "タイムライン上部に投稿フォームを表示する"
   show-reply-target: "リプライ先を表示する"
   show-my-renotes: "Afficher mes republications dans le fil"
@@ -458,13 +458,13 @@ desktop/views/components/settings.vue:
   volume: "Volume"
   test: "Test"
   mobile: "Mobile"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  disable-via-mobile: "Enlever la mention publié via 'un périphérique mobile'"
   language: "Langue"
   pick-language: "Sélectionner une langue"
   recommended: "Recommandé"
   auto: "Automatique"
   specify-language: "Spécifier la langue"
-  language-desc: "変更はページの再度読み込み後に反映されます。"
+  language-desc: "Le rechargement de la page est requis afin d'appliquer les modifications."
   cache: "Cache"
   clean-cache: "Nettoyage"
   cache-warn: "クリーンアップを行うと、ブラウザに記憶されたアカウント情報のキャッシュ、書きかけの投稿・返信・メッセージ、およびその他のデータ(設定情報含む)が削除されます。クリーンアップを行った後はページを再度読み込みする必要があります。"
@@ -485,7 +485,7 @@ desktop/views/components/settings.vue:
   no-updates: "Aucune mise à jour disponible"
   no-updates-desc: "Votre Misskey est à jour."
   update-available: "Nouvelle version disponible !"
-  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  update-available-desc: "Les mises à jour seront appliquées une fois la page est rechargée."
   advanced-settings: "Réglages avancés"
   debug-mode: "Activer le mode debug"
   debug-mode-desc: "Ce paramètre est stocké dans le navigateur."
@@ -598,7 +598,7 @@ desktop/views/components/window.vue:
   close: "Fermer"
 desktop/views/pages/deck/deck.tl-column.vue:
   is-media-only: "Les publications médias uniquement"
-  is-media-view: "メディアビュー"
+  is-media-view: "Vue média"
 desktop/views/pages/deck/deck.note.vue:
   reposted-by: "Reposté par {}"
   private: "cette publication est privée"
@@ -657,8 +657,8 @@ desktop/views/pages/user/user.profile.vue:
   unmute: "Enlever la sourdine"
 desktop/views/pages/user/user.header.vue:
   posts: "投稿"
-  following: "フォロー"
-  followers: "フォロワー"
+  following: "Suit"
+  followers: "Abonnés"
   is-bot: "Ce compte est un Bot"
 desktop/views/pages/user/user.timeline.vue:
   default: "Publications"
@@ -723,7 +723,7 @@ mobile/views/components/follow-button.vue:
   follow-request: "Demande d'abonnement"
 mobile/views/components/friends-maker.vue:
   title: "Abonnez-vous aux utilisateurs"
-  empty: "おすすめのユーザーは見つかりませんでした。"
+  empty: "Impossible de trouver des utilisateurs à recommander."
   fetching: "Chargement"
   refresh: "Voir plus"
   close: "Fermer"
@@ -866,7 +866,7 @@ mobile/views/pages/settings.vue:
   post-style-smart: "Intelligent"
   behavior: "Comportement"
   fetch-on-scroll: "Chargement lors du défilement"
-  disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
+  disable-via-mobile: "Ne pas mentionner que ma publication provient d'un 'périphérique mobile'"
   load-raw-images: "Afficher les photos jointes en haute qualité"
   load-remote-media: "Afficher les médias sur le serveur distant"
   twitter: "Intégration à Twitter"
@@ -881,7 +881,7 @@ mobile/views/pages/settings.vue:
   no-updates: "Aucune mise à jour disponible"
   no-updates-desc: "Votre Misskey est à jour."
   update-available: "Nouvelle version disponible !"
-  update-available-desc: "ページを再度読み込みすると更新が適用されます。"
+  update-available-desc: "Les mises à jour seront appliquées une fois la page est rechargée."
   settings: "Réglages"
   signout: "Déconnexion"
 mobile/views/pages/user.vue:

From 48354ece42adfa04c47274680660b43878889dd2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 2 Jul 2018 03:51:04 +0900
Subject: [PATCH 25/25] New translations ja.yml (English)

---
 locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.yml b/locales/en.yml
index 9190caa81b..18db1d2b72 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -826,7 +826,7 @@ mobile/views/pages/note.vue:
   next: "Next note"
 mobile/views/pages/notifications.vue:
   notifications: "Notifications"
-  read-all: "Do you wish to mark all unread notifications as read?"
+  read-all: "Do you wish to mark all notifications as read?"
 mobile/views/pages/settings/settings.profile.vue:
   title: "Profile"
   name: "Name"