Merge remote-tracking branch 'parent/main' into upstream-20240308

This commit is contained in:
KMY 2024-03-12 09:27:01 +09:00
commit 8e94ed2cec
204 changed files with 5112 additions and 1998 deletions

View file

@ -136,6 +136,7 @@ en:
sign_up_requires_approval: New sign-ups will require your approval
severity: Choose what will happen with requests from this IP
rule:
hint: Optional. Provide more details about the rule
text: Describe a rule or requirement for users on this server. Try to keep it short and simple
sessions:
otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
@ -416,6 +417,7 @@ en:
patch: Notify on bugfix updates
trending_tag: New trend requires review
rule:
hint: Additional information
text: Rule
settings:
indexable: Include profile page in search engines