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

Merge branch 'develop' into feature/2024.9.0

Browse Source 
# Conflicts:
#	locales/en-US.yml
#	locales/ja-JP.yml
#	packages/backend/src/core/NoteCreateService.ts
#	packages/backend/src/core/NoteDeleteService.ts
#	packages/backend/src/core/NoteEditService.ts
#	packages/frontend-shared/js/config.ts
#	packages/frontend/src/boot/common.ts
#	packages/frontend/src/pages/following-feed.vue
#	packages/misskey-js/src/autogen/endpoint.ts
This commit is contained in:
Hazelnoot
2024-10-15 18:01:57 -04:00
parent d04e44b552 68b90df00b
commit 8a34d8e9d2
52 changed files with 1073 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharkey-locales/en-US.yml
+4
View File
@@ -142,6 +142,10 @@ sensitiveMediaRevealConfirm: "This media might be sensitive. Are you sure you wa
severAllFollowRelations: "Break following relationships"
severAllFollowRelationsConfirm: "Really break all follow relationships? This is irreversible! This will break {followingCount} following and {followersCount} follower relations on {instanceName}!"
severAllFollowRelationsQueued: "Severing all follow relations with {host} queued."
pendingFollowRequests: "Pending follow requests"
showQuotes: "Show quotes"
showReplies: "Show replies"
showNonPublicNotes: "Show non-public"
_delivery:
stop: "Suspend delivery"
resume: "Resume delivery"