Merge 5c28d35d70 into fa7fa4f1b8

app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx

@@ -11,6 +11,10 @@ import { useAppSelector } from 'mastodon/store';
 
 // This needs to be kept in sync with app/models/report.rb
 const messages = defineMessages({
+  dislike: {
+    id: 'report_notification.categories.dislike_sentence',
+    defaultMessage: 'dislike',
+  },
   other: {
     id: 'report_notification.categories.other_sentence',
     defaultMessage: 'other',

app/javascript/mastodon/locales/en-GB.json

@@ -830,6 +830,8 @@
   "report.unfollow": "Unfollow @{name}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.dislike": "I don't like it",
+  "report_notification.categories.dislike_sentence": "content they disliked",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.legal_sentence": "illegal content",
   "report_notification.categories.other": "Other",

app/javascript/mastodon/locales/en.json

@@ -835,6 +835,8 @@
   "report.unfollow": "Unfollow @{name}",
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.categories.dislike": "I don't like it",
+  "report_notification.categories.dislike_sentence": "content they disliked",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.legal_sentence": "illegal content",
   "report_notification.categories.other": "Other",

lib/mastodon/version.rb

@@ -29,7 +29,7 @@ module Mastodon
     end
 
     def hometown_version
-      'hometown-1.2.0'
+      'hometown-1.2.1'
     end
 
     def to_a