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

Merge branch 'develop' into hazelnoot/579-reject-reports

Browse Source 
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
This commit is contained in:
Hazel K
2024-10-06 12:26:25 -04:00
parent 7dd296017b 6d7c7357ab
commit 047563bdde
19 changed files with 121 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locales/en-US.yml
+5
View File
@@ -143,8 +143,10 @@ markAsSensitive: "Mark as sensitive"
unmarkAsSensitive: "Unmark as sensitive"
enterFileName: "Enter filename"
mute: "Mute"
muted: "Muted"
unmute: "Unmute"
renoteMute: "Mute Boosts"
renoteMuted: "Boosts muted"
renoteUnmute: "Unmute Boosts"
block: "Block"
unblock: "Unblock"
@@ -265,6 +267,9 @@ noCustomEmojis: "There are no emoji"
noJobs: "There are no jobs"
federating: "Federating"
blocked: "Blocked"
blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)."
silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)."
mediaSilencedByBase: "This host's media is silenced implicitly because a base domain's media is silenced. To un-silence this host, first un-silence the base domain(s)."
suspended: "Suspended"
all: "All"
subscribing: "Subscribing"