1 files changed, 30 insertions, 13 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index fb6181e1a..4ba23963b 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -356,19 +356,6 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Not found",
-        "id": "missing_indicator.label"
-      },
-      {
-        "defaultMessage": "This resource could not be found",
-        "id": "missing_indicator.sublabel"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/missing_indicator.json"
-  },
-  {
-    "descriptors": [
-      {
         "defaultMessage": "You need to sign in to access this resource.",
         "id": "not_signed_in_indicator.not_signed_in"
       }
@@ -963,6 +950,15 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "In Memoriam.",
+        "id": "account.in_memoriam"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/account_timeline/components/memorial_note.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "{name} has indicated that their new account is now:",
         "id": "account.moved_to"
       },
@@ -3737,6 +3733,10 @@
         "id": "status.show_less_all"
       },
       {
+        "defaultMessage": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
+        "id": "status.title.with_attachments"
+      },
+      {
         "defaultMessage": "Detailed conversation view",
         "id": "status.detailed_status"
       },
@@ -4358,5 +4358,22 @@
       }
     ],
     "path": "app/javascript/mastodon/features/video/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "That username is taken. Try another",
+        "id": "username.taken"
+      },
+      {
+        "defaultMessage": "Password confirmation exceeds the maximum password length",
+        "id": "password_confirmation.exceeds_maxlength"
+      },
+      {
+        "defaultMessage": "Password confirmation does not match",
+        "id": "password_confirmation.mismatching"
+      }
+    ],
+    "path": "app/javascript/packs/public.json"
   }
 ]
\ No newline at end of file