Merge commit '741f166407a79b666475aae662339c127f182e24' into glitch-soc/merge-upstream

app/javascript/mastodon/locales/cy.json

@@ -29,6 +29,7 @@
   "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
   "account.endorse": "Dangos ar fy mhroffil",
   "account.featured": "Nodwedd",
+  "account.featured.accounts": "Proffilau",
   "account.featured.hashtags": "Hashnodau",
   "account.featured.posts": "Postiadau",
   "account.featured_tags.last_status_at": "Y postiad olaf ar {date}",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} cyfranogwr} other {{counter} cyfranogwr}}",
   "hashtag.counter_by_uses": "{count, plural, one {postiad {counter}} other {postiad {counter}}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postiad} other {{counter} postiad}} heddiw",
+  "hashtag.feature": "Nodwedd ar y proffil",
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.mute": "Tewi #{hashtag}",
+  "hashtag.unfeature": "Peidio a'i gynnwys ar y proffil",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "hashtags.and_other": "…a {count, plural, other {# arall}}",
   "hints.profiles.followers_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",

app/javascript/mastodon/locales/ko.json

@@ -58,7 +58,7 @@
   "account.mute_short": "뮤트",
   "account.muted": "뮤트됨",
   "account.muting": "뮤트함",
-  "account.mutual": "서로 팔로우",
+  "account.mutual": "맞팔로우 중입니다",
   "account.no_bio": "제공된 설명이 없습니다.",
   "account.open_original_page": "원본 페이지 열기",
   "account.posts": "게시물",