Merge commit '7e98fa9b476fdaed235519f1d527eb956004ba0c' into glitch-soc/merge-upstream

app/javascript/mastodon/locales/da.json

@@ -172,7 +172,7 @@
   "column.domain_blocks": "Blokerede domæner",
   "column.edit_list": "Redigér liste",
   "column.favourites": "Favoritter",
-  "column.firehose": "Live feeds",
+  "column.firehose": "Aktuelt",
   "column.follow_requests": "Følgeanmodninger",
   "column.home": "Hjem",
   "column.list_members": "Håndtér listemedlemmer",
@@ -574,8 +574,8 @@
   "navigation_bar.follows_and_followers": "Følges og følgere",
   "navigation_bar.import_export": "Import og eksport",
   "navigation_bar.lists": "Lister",
-  "navigation_bar.live_feed_local": "Live feed (lokalt)",
-  "navigation_bar.live_feed_public": "Live feed (offentligt)",
+  "navigation_bar.live_feed_local": "Aktuelt (lokalt)",
+  "navigation_bar.live_feed_public": "Aktuelt (offentligt)",
   "navigation_bar.logout": "Log af",
   "navigation_bar.moderation": "Moderering",
   "navigation_bar.more": "Mere",

app/javascript/mastodon/locales/de.json

@@ -257,8 +257,8 @@
   "confirmations.revoke_quote.confirm": "Beitrag entfernen",
   "confirmations.revoke_quote.message": "Diese Aktion kann nicht rückgängig gemacht werden.",
   "confirmations.revoke_quote.title": "Beitrag entfernen?",
-  "confirmations.unblock.confirm": "Nicht mehr blockieren",
-  "confirmations.unblock.title": "{name} nicht mehr blockieren?",
+  "confirmations.unblock.confirm": "Entsperren",
+  "confirmations.unblock.title": "{name} entsperren?",
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.title": "{name} entfolgen?",
   "confirmations.withdraw_request.confirm": "Anfrage zurückziehen",

app/javascript/mastodon/locales/ku.json

@@ -27,6 +27,7 @@
   "account.direct": "Bi taybetî qale @{name} bike",
   "account.disable_notifications": "Êdî min agahdar neke gava @{name} diweşîne",
   "account.edit_profile": "Profîlê serrast bike",
+  "account.edit_profile_short": "Serrast bike",
   "account.enable_notifications": "Min agahdar bike gava @{name} diweşîne",
   "account.endorse": "Taybetiyên li ser profîl",
   "account.featured.accounts": "Profîl",

app/javascript/mastodon/locales/nan.json

@@ -922,6 +922,7 @@
   "status.quotes": "{count, plural, other {# 篇引用ê PO文}}",
   "status.quotes.empty": "Iáu無lâng引用tsit篇PO文。Nā是有lâng引用，ē佇tsia顯示。.",
   "status.quotes.local_other_disclaimer": "Hōo作者拒絕引用ê引文bē當顯示。",
+  "status.quotes.remote_other_disclaimer": "Kan-ta tuì {domain} 來ê引文tsiah保證佇tsia顯示。Hōo作者拒絕ê引文buē顯示。",
   "status.read_more": "讀詳細",
   "status.reblog": "轉送",
   "status.reblog_or_quote": "轉送á是引用",

app/javascript/mastodon/locales/sk.json

@@ -243,6 +243,9 @@
   "confirmations.redraft.message": "Určite chcete tento príspevok vymazať a prepísať? Prídete o jeho zdieľania a ohviezdičkovania a odpovede na pôvodný príspevok budú odlúčené.",
   "confirmations.redraft.title": "Vymazať a prepísať príspevok?",
   "confirmations.remove_from_followers.confirm": "Odstrániť nasledovateľa",
+  "confirmations.revoke_quote.title": "Vymazať príspevok?",
+  "confirmations.unblock.confirm": "Odblokovať",
+  "confirmations.unblock.title": "Odblokovať {name}?",
   "confirmations.unfollow.confirm": "Zrušiť sledovanie",
   "content_warning.hide": "Skryť príspevok",
   "content_warning.show": "Aj tak zobraziť",

app/javascript/mastodon/locales/zh-TW.json

@@ -42,7 +42,7 @@
   "account.follow": "跟隨",
   "account.follow_back": "跟隨回去",
   "account.follow_back_short": "跟隨回去",
-  "account.follow_request": "要求跟隨您",
+  "account.follow_request": "要求跟隨",
   "account.follow_request_cancel": "取消跟隨請求",
   "account.follow_request_cancel_short": "取消",
   "account.follow_request_short": "跟隨請求",