about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authormayaeh <mayaeh@marimo-net.org>2018-04-03 18:21:33 +0900
committerYamagishi Kazutoshi <ykzts@desire.sh>2018-04-03 18:21:33 +0900
commit1c293086a16fce465d5bdc123809f2d28b3e2ab6 (patch)
treebd2364f09b1527c772c238b899ed9ee9536822df /app
parente85cffb2362f914c0f2f7ced4112430b30bc7997 (diff)
i18n: Add Japanese translations for #7000 (#7022)
* run yarn manage:translations.

* run i18n-tasks add-missing ja.

* Update Japanese translations.
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/locales/defaultMessages.json13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 4c9401deb..5059fc67b 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -2,6 +2,19 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "Oops!",
+        "id": "alert.unexpected.title"
+      },
+      {
+        "defaultMessage": "An unexpected error occurred.",
+        "id": "alert.unexpected.message"
+      }
+    ],
+    "path": "app/javascript/mastodon/actions/alerts.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "{name} mentioned you",
         "id": "notification.mention"
       }