Merge remote-tracking branch 'upstream/pull/4200'

This commit is contained in:
Tom Hughes 2024-12-10 19:03:55 +00:00
commit edda4af515
4 changed files with 62 additions and 11 deletions

View file

@ -2898,6 +2898,15 @@ en:
years:
one: "%{count} year"
other: "%{count} years"
short:
ended: "ended"
revoked_html: "revoked by %{name}"
active: "active"
active_unread: "active unread"
expired_unread: "expired unread"
read_html: "read at %{time}"
time_in_future_title: "%{time_absolute}; in %{time_relative}"
time_in_past_title: "%{time_absolute}; %{time_relative}"
blocks_on:
title: "Blocks on %{name}"
heading_html: "List of Blocks on %{name}"
@ -2916,15 +2925,15 @@ en:
reason: "Reason for block:"
revoker: "Revoker:"
block:
not_revoked: "(not revoked)"
show: "Show"
edit: "Edit"
page:
display_name: "Blocked User"
creator_name: "Creator"
reason: "Reason for block"
start: "Start"
end: "End"
status: "Status"
revoker_name: "Revoked by"
navigation:
all_blocks: "All Blocks"
blocks_on_me: "Blocks on Me"