mirror of
https://iceshrimp.dev/limepotato/jormungandr-patches.git
synced 2024-11-21 10:37:25 -07:00
observers
This commit is contained in:
parent
804e1d6bf3
commit
e75ae7a018
3 changed files with 370 additions and 1 deletions
|
|
@ -10,7 +10,7 @@ To apply a patch ``git am --keep-cr --signoff < {patch}``
|
|||
|
||||
### Explanations
|
||||
|
||||
- [Beep/Rebeeps/Creatures](./patches/beeps/): Renames Posts and Boosts to Beeps and Rebeeps respectively, as well as Users to Creatures
|
||||
- [Beep/Rebeeps/Creatures/Observers](./patches/beeps/): Renames Posts and Boosts to Beeps and Rebeeps respectively, as well as Users to Creatures, and Followers/Following to Observers/Observing
|
||||
- [Builtin Catppuccin Themes](./patches/builtin-catppuccin-themes.patch): All catppuccin themes (and accents), built-in
|
||||
- [Configurable Pinned Post Limit](./patches/configurable-pinLimit.patch): Allows admin to configure pinned post limit in config file
|
||||
- [Fix Find Server Link](./patches/fix-findserver-link.patch): the link for "Find servers" on the signup page for locked registration instances leads to a dead page, so this replaces the link with fedidb.org
|
||||
|
|
|
|||
|
|
@ -3,3 +3,5 @@
|
|||
If you are using iceshrimp-bite, please use the patches inside of the [iceshrimp-bite](./iceshrimp-bite) folder, otherwise use the patches in [iceshrimp](./iceshrimp).
|
||||
|
||||
If you apply the rebeeps patch, im assuming you applied the beep patch beforehand, and if you use the creatures patch, i assume you applied the rebeeps patch before hand. (it will not work otherwise) :3
|
||||
|
||||
If you apply the observers patch, it assumes youve applied all previous patches beforehand.
|
||||
367
patches/beeps/iceshrimp-bite/observers.patch
Normal file
367
patches/beeps/iceshrimp-bite/observers.patch
Normal file
|
|
@ -0,0 +1,367 @@
|
|||
From 49d06d016ba78cdf06cded9dada3270bcddfb1e1 Mon Sep 17 00:00:00 2001
|
||||
From: limepotato <limepot@protonmail.ch>
|
||||
Date: Thu, 11 Jul 2024 02:55:56 -0600
|
||||
Subject: [PATCH] The Observers
|
||||
|
||||
---
|
||||
locales/en-US.yml | 126 +++++++++++++++++++++++-----------------------
|
||||
1 file changed, 63 insertions(+), 63 deletions(-)
|
||||
|
||||
diff --git a/locales/en-US.yml b/locales/en-US.yml
|
||||
index 8ea9961ea..3fd04d50e 100644
|
||||
--- a/locales/en-US.yml
|
||||
+++ b/locales/en-US.yml
|
||||
@@ -64,9 +64,9 @@ older: "older"
|
||||
expandAllCws: "Show content for all replies"
|
||||
collapseAllCws: "Hide content for all replies"
|
||||
showLess: "Show less"
|
||||
-youGotNewFollower: "followed you"
|
||||
-receiveFollowRequest: "Follow request received"
|
||||
-followRequestAccepted: "Follow request accepted"
|
||||
+youGotNewFollower: "started observing you"
|
||||
+receiveFollowRequest: "Observe request received"
|
||||
+followRequestAccepted: "Observe request accepted"
|
||||
mention: "Mention"
|
||||
mentions: "Mentions"
|
||||
directNotes: "Direct messages"
|
||||
@@ -78,7 +78,7 @@ files: "Files"
|
||||
download: "Download"
|
||||
driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? It will
|
||||
be removed from all beeps that contain it as an attachment."
|
||||
-unfollowConfirm: "Are you sure that you want to unfollow {name}?"
|
||||
+unfollowConfirm: "Are you sure that you want to unobserve {name}?"
|
||||
exportRequested: "You've requested an export. This may take a while. It will be added
|
||||
to your Drive once completed."
|
||||
importRequested: "You've requested an import. This may take a while."
|
||||
@@ -88,9 +88,9 @@ listsDesc: "Lists let you create timelines with specified creatures. They can be
|
||||
noLists: "You don't have any lists"
|
||||
note: "Beep"
|
||||
notes: "Beeps"
|
||||
-following: "Following"
|
||||
-followers: "Followers"
|
||||
-followsYou: "Follows you"
|
||||
+following: "Observing"
|
||||
+followers: "Observers"
|
||||
+followsYou: "Observes you"
|
||||
createList: "Create list"
|
||||
manageLists: "Manage lists"
|
||||
error: "Error"
|
||||
@@ -103,13 +103,13 @@ serverIsDead: "This server is not responding. Please wait for a while and try ag
|
||||
youShouldUpgradeClient: "To view this page, please refresh to update your client."
|
||||
enterListName: "Enter a name for the list"
|
||||
privacy: "Privacy"
|
||||
-makeFollowManuallyApprove: "Follow requests require approval"
|
||||
+makeFollowManuallyApprove: "Observe requests require approval"
|
||||
defaultNoteVisibility: "Default visibility"
|
||||
-follow: "Follow"
|
||||
-followRequest: "Follow Request"
|
||||
-followRequests: "Follow requests"
|
||||
-unfollow: "Unfollow"
|
||||
-followRequestPending: "Follow request pending"
|
||||
+follow: "Observe"
|
||||
+followRequest: "Observe Request"
|
||||
+followRequests: "Observe requests"
|
||||
+unfollow: "Unobserve"
|
||||
+followRequestPending: "Observe request pending"
|
||||
enterEmoji: "Enter an emoji"
|
||||
renote: "Rebeep"
|
||||
unrenote: "Take back rebeep"
|
||||
@@ -175,7 +175,7 @@ flagSpeakAsCatDescription: "Your beeps will get nyanified when in cat mode"
|
||||
flagShowTimelineReplies: "Show replies in timeline"
|
||||
flagShowTimelineRepliesDescription: "Shows replies of creatures to beeps of other creatures
|
||||
in the timeline if turned on."
|
||||
-autoAcceptFollowed: "Automatically approve follow requests from creatures you're following"
|
||||
+autoAcceptFollowed: "Automatically approve observe requests from creatures you're observing"
|
||||
addAccount: "Add account"
|
||||
loginFailed: "Failed to sign in"
|
||||
showOnRemote: "Open original page"
|
||||
@@ -186,12 +186,12 @@ setWallpaper: "Set wallpaper"
|
||||
removeWallpaper: "Remove wallpaper"
|
||||
searchWith: "Search: {q}"
|
||||
youHaveNoLists: "You don't have any lists"
|
||||
-followConfirm: "Are you sure that you want to follow {name}?"
|
||||
+followConfirm: "Are you sure that you want to observe {name}?"
|
||||
proxyAccount: "Proxy Account"
|
||||
-proxyAccountDescription: "A proxy account is an account that acts as a remote follower
|
||||
+proxyAccountDescription: "A proxy account is an account that acts as a remote observer
|
||||
for creatures under certain conditions. For example, when a creature adds a remote creature
|
||||
to the list, the remote creature's activity will not be delivered to the server if no
|
||||
- local creature is following that creature, so the proxy account will follow instead."
|
||||
+ local creature is observing that creature, so the proxy account will observe instead."
|
||||
host: "Host"
|
||||
selectUser: "Select a creature"
|
||||
selectInstance: "Select an server"
|
||||
@@ -233,7 +233,7 @@ blockedInstancesDescription: "List the hostnames of the servers that you want to
|
||||
silencedInstances: "Silenced Servers"
|
||||
silencedInstancesDescription: "List the hostnames of the servers that you want to
|
||||
silence. Accounts in the listed servers are treated as \"Silenced\", can only make
|
||||
- follow requests, and cannot mention local accounts if not followed. This will not
|
||||
+ observe requests, and cannot mention local accounts if not observing. This will not
|
||||
affect the blocked servers."
|
||||
hiddenTags: "Hidden Hashtags"
|
||||
hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish
|
||||
@@ -263,8 +263,8 @@ all: "All"
|
||||
subscribing: "Subscribing"
|
||||
publishing: "Publishing"
|
||||
notResponding: "Not responding"
|
||||
-instanceFollowing: "Following on server"
|
||||
-instanceFollowers: "Followers of server"
|
||||
+instanceFollowing: "Observing on server"
|
||||
+instanceFollowers: "Observers of server"
|
||||
instanceUsers: "Creatures of this server"
|
||||
changePassword: "Change password"
|
||||
security: "Security"
|
||||
@@ -426,7 +426,7 @@ antennaTimelineHint: "Antennas display matching beeps in order they have been re
|
||||
in, which is not necessarily chronological."
|
||||
caseSensitive: "Case sensitive"
|
||||
withReplies: "Include replies"
|
||||
-connectedTo: "Following account(s) are connected"
|
||||
+connectedTo: "Observing account(s) are connected"
|
||||
notesAndReplies: "Beeps and replies"
|
||||
withFiles: "With attachments"
|
||||
silence: "Silence"
|
||||
@@ -529,7 +529,7 @@ createAccount: "Create account"
|
||||
existingAccount: "Existing account"
|
||||
regenerate: "Regenerate"
|
||||
fontSize: "Font size"
|
||||
-noFollowRequests: "You don't have any pending follow requests"
|
||||
+noFollowRequests: "You don't have any pending observe requests"
|
||||
openImageInNewTab: "Open images in new tab"
|
||||
dashboard: "Dashboard"
|
||||
local: "Local"
|
||||
@@ -608,8 +608,8 @@ expandOnNoteClickDesc: "If disabled, you can still open beeps in the right-click
|
||||
updateRemoteUser: "Update remote creature information"
|
||||
deleteAllFiles: "Delete all files"
|
||||
deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
|
||||
-removeAllFollowing: "Unfollow all followed creatures"
|
||||
-removeAllFollowingDescription: "Executing this unfollows all accounts from {host}.
|
||||
+removeAllFollowing: "Unfollow all observing creatures"
|
||||
+removeAllFollowingDescription: "Executing this unobserves all accounts from {host}.
|
||||
Please run this if the server e.g. no longer exists."
|
||||
userSuspended: "This creature has been suspended."
|
||||
userSilenced: "This creature is silenced."
|
||||
@@ -754,8 +754,8 @@ repliesCount: "Number of replies sent"
|
||||
renotesCount: "Number of rebeeps sent"
|
||||
repliedCount: "Number of replies received"
|
||||
renotedCount: "Number of rebeeps received"
|
||||
-followingCount: "Number of followed accounts"
|
||||
-followersCount: "Number of followers"
|
||||
+followingCount: "Number of observing accounts"
|
||||
+followersCount: "Number of observers"
|
||||
sentReactionsCount: "Number of sent reactions"
|
||||
receivedReactionsCount: "Number of received reactions"
|
||||
pollVotesCount: "Number of sent poll votes"
|
||||
@@ -767,12 +767,12 @@ driveUsage: "Drive space usage"
|
||||
noCrawle: "Reject crawler indexing"
|
||||
noCrawleDescription: "Ask search engines to not index your profile page, beeps, Pages,
|
||||
etc."
|
||||
-lockedAccountInfo: "Unless you set your beep visiblity to \"Followers only\", your
|
||||
- beeps will be visible to anyone, even if you require followers to be manually approved."
|
||||
+lockedAccountInfo: "Unless you set your beep visiblity to \"Observers only\", your
|
||||
+ beeps will be visible to anyone, even if you require observers to be manually approved."
|
||||
alwaysMarkSensitive: "Mark as sensitive by default"
|
||||
loadRawImages: "Load original images instead of showing thumbnails"
|
||||
disableShowingAnimatedImages: "Don't play animated images"
|
||||
-verificationEmailSent: "A verification email has been sent. Please follow the included
|
||||
+verificationEmailSent: "A verification email has been sent. Please observe the included
|
||||
link to complete verification."
|
||||
notSet: "Not set"
|
||||
emailVerified: "Email has been verified"
|
||||
@@ -926,8 +926,8 @@ pubSub: "Pub/Sub Accounts"
|
||||
lastCommunication: "Last communication"
|
||||
resolved: "Resolved"
|
||||
unresolved: "Unresolved"
|
||||
-breakFollow: "Remove follower"
|
||||
-breakFollowConfirm: "Are you sure want to remove follower?"
|
||||
+breakFollow: "Remove observer"
|
||||
+breakFollowConfirm: "Are you sure want to remove observer?"
|
||||
itsOn: "Enabled"
|
||||
itsOff: "Disabled"
|
||||
emailRequiredForSignup: "Require email address for sign-up"
|
||||
@@ -941,9 +941,9 @@ makeReactionsPublicDescription: "This will make the list of all your past reacti
|
||||
classic: "Centered"
|
||||
muteThread: "Mute thread"
|
||||
unmuteThread: "Unmute thread"
|
||||
-ffVisibility: "Follows/Followers Visibility"
|
||||
-ffVisibilityDescription: "Allows you to configure who can see who you follow and who
|
||||
- follows you."
|
||||
+ffVisibility: "Observing/Observers Visibility"
|
||||
+ffVisibilityDescription: "Allows you to configure who can see who you observe and who
|
||||
+ observes you."
|
||||
continueThread: "Continue thread"
|
||||
deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
|
||||
incorrectPassword: "Incorrect password."
|
||||
@@ -1109,7 +1109,7 @@ noGraze: "Please disable the \"Graze for Mastodon\" browser extension, as it int
|
||||
silencedWarning: "This page is showing because these creatures are from servers your admin
|
||||
silenced, so they may potentially be spam."
|
||||
isBot: "This account is a bot"
|
||||
-isLocked: "This account has follow approvals"
|
||||
+isLocked: "This account has observe approvals"
|
||||
isModerator: "Moderator"
|
||||
isAdmin: "Administrator"
|
||||
isPatron: "Jörmungandr Patron"
|
||||
@@ -1158,7 +1158,7 @@ _emailUnavailable:
|
||||
smtp: "This email server is not responding"
|
||||
_ffVisibility:
|
||||
public: "Public"
|
||||
- followers: "Visible to followers only"
|
||||
+ followers: "Visible to observers only"
|
||||
private: "Private"
|
||||
_signup:
|
||||
almostThere: "Almost there"
|
||||
@@ -1192,9 +1192,9 @@ _gallery:
|
||||
unlike: "Remove like"
|
||||
_email:
|
||||
_follow:
|
||||
- title: "You've got a new follower"
|
||||
+ title: "You've got a new observer"
|
||||
_receiveFollowRequest:
|
||||
- title: "You've received a follow request"
|
||||
+ title: "You've received a observe request"
|
||||
_plugin:
|
||||
install: "Install plugins"
|
||||
installWarn: "Please do not install untrustworthy plugins."
|
||||
@@ -1359,7 +1359,7 @@ _channel:
|
||||
removeBanner: "Remove banner"
|
||||
featured: "Trending"
|
||||
owned: "Owned"
|
||||
- following: "Followed"
|
||||
+ following: "Observed"
|
||||
usersCount: "{n} Participants"
|
||||
notesCount: "{n} Beeps"
|
||||
nameAndDescription: "Name and description"
|
||||
@@ -1493,7 +1493,7 @@ _filters:
|
||||
learnMore: "View filter syntax"
|
||||
wordFilters: "Filter by beep text"
|
||||
inFilters: "Filter by bookmark and/or favorite status"
|
||||
- miscFilters: "Filter by following relationship and/or note type"
|
||||
+ miscFilters: "Filter by observing relationship and/or note type"
|
||||
userDomain: "Filter by author, mentioned creatures, reply creature or instance domain"
|
||||
postDate: "Filter by beep date"
|
||||
exclusivity: "Note that the before: filter is exclusive, while the after: filter
|
||||
@@ -1519,8 +1519,8 @@ _filters:
|
||||
fromDomain: "Specific instance only"
|
||||
notesBefore: "Beeps before"
|
||||
notesAfter: "Beeps after"
|
||||
- followingOnly: "Following only"
|
||||
- followersOnly: "Followers only"
|
||||
+ followingOnly: "Observing only"
|
||||
+ followersOnly: "Observers only"
|
||||
repliesOnly: "Replies only"
|
||||
excludeReplies: "Exclude replies"
|
||||
excludeRenotes: "Exclude rebeeps"
|
||||
@@ -1532,18 +1532,18 @@ _tutorial:
|
||||
step1_2: "Let's get you set up. You'll be up and running in no time!"
|
||||
step2_1: "First, please fill out your profile."
|
||||
step2_2: "Providing some information about who you are will make it easier for others
|
||||
- to tell if they want to see your beeps or follow you."
|
||||
- step3_1: "Now it's time to follow some people!"
|
||||
- step3_2: "Your home and social timelines are based off of who you follow, so try
|
||||
- following a couple accounts to get started.\nClick the plus circle on the top
|
||||
- right of a profile to follow them."
|
||||
+ to tell if they want to see your beeps or observe you."
|
||||
+ step3_1: "Now it's time to observe some people!"
|
||||
+ step3_2: "Your home and social timelines are based off of who you observe, so try
|
||||
+ observing a couple accounts to get started.\nClick the plus circle on the top
|
||||
+ right of a profile to observe them."
|
||||
step4_1: "Let's get you out there."
|
||||
step4_2: "For your first beep, some people like to make an {introduction} beep or
|
||||
a simple \"Hello world!\""
|
||||
step5_1: "Timelines, timelines everywhere!"
|
||||
step5_2: "Your server has {timelines} different timelines enabled."
|
||||
step5_3: "The Home {icon} timeline is where you can see beeps from the accounts
|
||||
- you follow."
|
||||
+ you observe."
|
||||
step5_4: "The Local {icon} timeline is where you can see beeps from everyone else
|
||||
on this server."
|
||||
step5_5: "The Social {icon} timeline is a combination of the Home and Local timelines."
|
||||
@@ -1598,8 +1598,8 @@ _permissions:
|
||||
"write:drive": "Edit or delete your Drive files and folders"
|
||||
"read:favorites": "View your list of bookmarks"
|
||||
"write:favorites": "Edit your list of bookmarks"
|
||||
- "read:following": "View information on who you follow"
|
||||
- "write:following": "Follow or unfollow other accounts"
|
||||
+ "read:following": "View information on who you observe"
|
||||
+ "write:following": "Observe or unobserve other accounts"
|
||||
"read:messaging": "View your chats"
|
||||
"write:messaging": "Compose or delete chat messages"
|
||||
"read:mutes": "View your list of muted creatures"
|
||||
@@ -1636,7 +1636,7 @@ _auth:
|
||||
authRequired: "Authorization required"
|
||||
_antennaSources:
|
||||
all: "All beeps"
|
||||
- homeTimeline: "Beeps from followed creatures"
|
||||
+ homeTimeline: "Beeps from observing creatures"
|
||||
users: "Beeps from specific creatures"
|
||||
userList: "Beeps from a specified list of creatures"
|
||||
userGroup: "Beeps from creatures in a specified group"
|
||||
@@ -1711,8 +1711,8 @@ _visibility:
|
||||
publicDescription: "Your beep will be visible in all public timelines"
|
||||
home: "Unlisted"
|
||||
homeDescription: "Beep to home timeline only"
|
||||
- followers: "Followers"
|
||||
- followersDescription: "Make visible to your followers and mentioned creatures only"
|
||||
+ followers: "Observers"
|
||||
+ followersDescription: "Make visible to your observers and mentioned creatures only"
|
||||
specified: "Direct"
|
||||
specifiedDescription: "Make visible for specified creatures only"
|
||||
localOnly: "Local only"
|
||||
@@ -1746,7 +1746,7 @@ _profile:
|
||||
to other creatures."
|
||||
_exportOrImport:
|
||||
allNotes: "All beeps"
|
||||
- followingList: "Followed creatures"
|
||||
+ followingList: "Observed creatures"
|
||||
muteList: "Muted creatures"
|
||||
blockingList: "Blocked creatures"
|
||||
userLists: "Creature lists"
|
||||
@@ -1772,8 +1772,8 @@ _instanceCharts:
|
||||
usersTotal: "Cumulative number of creatures"
|
||||
notes: "Difference in the number of beeps"
|
||||
notesTotal: "Cumulative number of beeps"
|
||||
- ff: "Difference in the number of followed creatures / followers "
|
||||
- ffTotal: "Cumulative number of followed creatures / followers"
|
||||
+ ff: "Difference in the number of observing creatures / observers "
|
||||
+ ffTotal: "Cumulative number of observing creatures / observers"
|
||||
cacheSize: "Difference in cache size"
|
||||
cacheSizeTotal: "Cumulative total cache size"
|
||||
files: "Difference in the number of files"
|
||||
@@ -2087,9 +2087,9 @@ _notification:
|
||||
youGotPoll: "{name} voted on your poll"
|
||||
youGotMessagingMessageFromUser: "{name} sent you a chat message"
|
||||
youGotMessagingMessageFromGroup: "A chat message was sent to the {name} group"
|
||||
- youWereFollowed: "followed you"
|
||||
- youReceivedFollowRequest: "You've received a follow request"
|
||||
- yourFollowRequestAccepted: "Your follow request was accepted"
|
||||
+ youWereFollowed: "started observing you"
|
||||
+ youReceivedFollowRequest: "You've received a observe request"
|
||||
+ yourFollowRequestAccepted: "Your observe request was accepted"
|
||||
youWereInvitedToGroup: "{userName} invited you to a group"
|
||||
pollEnded: "Poll results have become available"
|
||||
emptyPushNotificationMessage: "Push notifications have been updated"
|
||||
@@ -2098,7 +2098,7 @@ _notification:
|
||||
voted: "voted on your poll"
|
||||
_types:
|
||||
all: "All"
|
||||
- follow: "New followers"
|
||||
+ follow: "New observers"
|
||||
mention: "Mentions"
|
||||
reply: "Replies"
|
||||
renote: "Rebeeps"
|
||||
@@ -2106,13 +2106,13 @@ _notification:
|
||||
reaction: "Reactions"
|
||||
pollVote: "Votes on polls"
|
||||
pollEnded: "Polls ending"
|
||||
- receiveFollowRequest: "Received follow requests"
|
||||
- followRequestAccepted: "Accepted follow requests"
|
||||
+ receiveFollowRequest: "Received observing requests"
|
||||
+ followRequestAccepted: "Accepted observing requests"
|
||||
groupInvited: "Group invitations"
|
||||
app: "Notifications from linked apps"
|
||||
bite: "Bites"
|
||||
_actions:
|
||||
- followBack: "followed you back"
|
||||
+ followBack: "is observing you back"
|
||||
reply: "Reply"
|
||||
renote: "Rebeeps"
|
||||
_deck:
|
||||
Loading…
Reference in a new issue