about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authormayaeh <mayaeh@marimo-net.org>2019-02-10 21:04:59 +0900
committerYamagishi Kazutoshi <ykzts@desire.sh>2019-02-10 21:04:59 +0900
commitfb90ec894ed3ebaf31b860991bd2a79d21c45e13 (patch)
tree9cd1a35832ee4c8eba8f9b7972f4cd53d98e59c0 /app/javascript
parent016ad37bc8c9ca8bf8f872b8fee704a0388f575e (diff)
i18n: add Japanese translations (#10000)
* Add Japanese translations.

* Probably change to more general "統合" than "マージ" .
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/locales/ja.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 81b21a94a..92f9b0eff 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -342,6 +342,7 @@
   "ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
   "upload_area.title": "ドラッグ&ドロップでアップロード",
   "upload_button.label": "メディアを追加 (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_error.limit": "アップロードできる上限を超えています。",
   "upload_form.description": "視覚障害者のための説明",
   "upload_form.focus": "焦点",
   "upload_form.undo": "削除",