kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

Merge branch 'develop' into merge/2024-02-03

Browse Source 
# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/entities/UserEntityService.ts
#	packages/frontend/src/_dev_boot_.ts
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml
This commit is contained in:
Hazelnoot
2025-02-07 11:54:29 -05:00
parent 0d1c993dd2 d6c4b728df
commit f36029f795
24 changed files with 512 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharkey-locales/en-US.yml
+10
View File
@@ -438,4 +438,14 @@ _permissions:
robotsTxt: "Custom robots.txt"
robotsTxtDescription: "Adding entries here will override the default robots.txt packaged with Sharkey."
defaultCW: "Default content warning for new posts"
defaultCWDescription: "The value here will be auto-filled as the content warning for all new posts and replies."
defaultCWPriority: "Automatic CW priority"
defaultCWPriorityDescription: "Select preferred action when default CW and keep CW settings are both enabled at the same time."
_defaultCWPriority:
default: "Use Default (use the default CW, ignoring the inherited CW)"
parent: "Use Parent (use the inherited CW, ignoring the default CW)"
defaultParent: "Use Default, then Parent (use the default CW, and append the inherited CW)"
parentDefault: "Use Parent, then Default (use the inherited CW, and append the default CW)"
id: "ID"