Merge commit '9e04007020' into upstream-20240725

This commit is contained in:
KMY 2024-07-25 13:06:26 +09:00
commit a99f174d98
322 changed files with 8093 additions and 1586 deletions

View file

@ -235,6 +235,7 @@ en:
update_custom_emoji: Update Custom Emoji
update_domain_block: Update Domain Block
update_ip_block: Update IP rule
update_report: Update Report
update_status: Update Post
update_user_role: Update Role
actions:
@ -549,6 +550,9 @@ en:
status: Status
title: Friend server
instances:
audit_log:
title: Recent Audit Logs
view_all: View full audit logs
availability:
description_html:
one: If delivering to the domain fails <strong>%{count} day</strong> without succeeding, no further delivery attempts will be made unless a delivery <em>from</em> the domain is received.
@ -868,6 +872,7 @@ en:
report: 'Report #%{id}'
reported_account: Reported account
reported_by: Reported by
reported_with_application: Reported with application
resolved: Resolved
resolved_msg: Report successfully resolved!
skip_to_actions: Skip to actions