about summary refs log tree commit diff
path: root/app/javascript/mastodon/locales/defaultMessages.json
diff options
context:
space:
mode:
Diffstat (limited to 'app/javascript/mastodon/locales/defaultMessages.json')
-rw-r--r--app/javascript/mastodon/locales/defaultMessages.json49
1 files changed, 47 insertions, 2 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index d1ed52832..513f50c3b 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -290,7 +290,11 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+        "defaultMessage": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+        "id": "hashtag.total_volume"
+      },
+      {
+        "defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
         "id": "trends.counter_by_accounts"
       }
     ],
@@ -613,6 +617,10 @@
         "id": "status.copy"
       },
       {
+        "defaultMessage": "Hide toot",
+        "id": "status.hide"
+      },
+      {
         "defaultMessage": "Block domain {domain}",
         "id": "account.block_domain"
       },
@@ -679,6 +687,10 @@
         "id": "status.filtered"
       },
       {
+        "defaultMessage": "Show anyway",
+        "id": "status.show_filter_reason"
+      },
+      {
         "defaultMessage": "Pinned post",
         "id": "status.pinned"
       },
@@ -2532,6 +2544,10 @@
       {
         "defaultMessage": "New sign-ups:",
         "id": "notifications.column_settings.admin.sign_up"
+      },
+      {
+        "defaultMessage": "New reports:",
+        "id": "notifications.column_settings.admin.report"
       }
     ],
     "path": "app/javascript/mastodon/features/notifications/components/column_settings.json"
@@ -2626,6 +2642,10 @@
         "id": "notification.admin.sign_up"
       },
       {
+        "defaultMessage": "{name} reported {target}",
+        "id": "notification.admin.report"
+      },
+      {
         "defaultMessage": "{name} has requested to follow you",
         "id": "notification.follow_request"
       }
@@ -2656,6 +2676,31 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "Open report",
+        "id": "report_notification.open"
+      },
+      {
+        "defaultMessage": "Other",
+        "id": "report_notification.categories.other"
+      },
+      {
+        "defaultMessage": "Spam",
+        "id": "report_notification.categories.spam"
+      },
+      {
+        "defaultMessage": "Rule violation",
+        "id": "report_notification.categories.violation"
+      },
+      {
+        "defaultMessage": "{count, plural, one {{count} post} other {{count} posts}} attached",
+        "id": "report_notification.attached_statuses"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/notifications/components/report.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "Are you sure you want to permanently clear all your notifications?",
         "id": "notifications.clear_confirmation"
       },
@@ -3724,4 +3769,4 @@
     ],
     "path": "app/javascript/mastodon/features/video/index.json"
   }
-]
\ No newline at end of file
+]