diff --git a/patches/beeps/README.md b/patches/beeps/README.md index f95b649..e2d15bf 100644 --- a/patches/beeps/README.md +++ b/patches/beeps/README.md @@ -2,4 +2,4 @@ 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. (it will not work otherwise) :3 +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 diff --git a/patches/beeps/creatures.patch b/patches/beeps/creatures.patch new file mode 100644 index 0000000..9313bb4 --- /dev/null +++ b/patches/beeps/creatures.patch @@ -0,0 +1,525 @@ +From 5c9ada71a91057dd9211835012d24ecf77dec58a Mon Sep 17 00:00:00 2001 +From: limepotato +Date: Fri, 5 Jul 2024 23:26:27 -0600 +Subject: [PATCH] Users -> Creatures + +--- + locales/en-US.yml | 182 +++++++++++++++++++++++++------------------------- + 1 file changed, 91 insertions(+), 91 deletions(-) + +diff --git a/locales/en-US.yml b/locales/en-US.yml +index 11d33cdae..e2ddad089 100644 +--- a/locales/en-US.yml ++++ b/locales/en-US.yml +@@ -26,15 +26,15 @@ otherSettings: "Other Settings" + openInWindow: "Open in window" + profile: "Profile" + timeline: "Timeline" +-noAccountDescription: "This user has not written their bio yet." ++noAccountDescription: "This creature has not written their bio yet." + login: "Sign In" + loggingIn: "Signing In" + logout: "Sign Out" + signup: "Sign Up" + uploading: "Uploading…" + save: "Save" +-users: "Users" +-addUser: "Add a user" ++users: "Creatures" ++addUser: "Add a creature" + addInstance: "Add a server" + favorite: "Add to bookmarks" + favorites: "Bookmarks" +@@ -56,7 +56,7 @@ edited: "Edited at {date} {time}" + addToList: "Add to list" + sendMessage: "Send a message" + copyUsername: "Copy username" +-searchUser: "Search for a user" ++searchUser: "Search for a creature" + reply: "Reply" + jumpToPrevious: "Jump to previous" + loadMore: "Load more" +@@ -85,7 +85,7 @@ exportRequested: "You've requested an export. This may take a while. It will be + to your Drive once completed." + importRequested: "You've requested an import. This may take a while." + lists: "Lists" +-listsDesc: "Lists let you create timelines with specified users. They can be accessed ++listsDesc: "Lists let you create timelines with specified creatures. They can be accessed + from the timelines page." + noLists: "You don't have any lists" + note: "Beep" +@@ -175,14 +175,14 @@ flagAsCatDescription: "You'll get cat ears and speak like a cat!" + flagSpeakAsCat: "Speak as a cat" + flagSpeakAsCatDescription: "Your beeps will get nyanified when in cat mode" + flagShowTimelineReplies: "Show replies in timeline" +-flagShowTimelineRepliesDescription: "Shows replies of users to beeps of other users ++flagShowTimelineRepliesDescription: "Shows replies of creatures to beeps of other creatures + in the timeline if turned on." +-autoAcceptFollowed: "Automatically approve follow requests from users you're following" ++autoAcceptFollowed: "Automatically approve follow requests from creatures you're following" + addAccount: "Add account" + loginFailed: "Failed to sign in" + showOnRemote: "Open original page" + general: "General" +-accountMoved: "User has moved to a new account:" ++accountMoved: "Creature has moved to a new account:" + wallpaper: "Wallpaper" + setWallpaper: "Set wallpaper" + removeWallpaper: "Remove wallpaper" +@@ -191,11 +191,11 @@ youHaveNoLists: "You don't have any lists" + followConfirm: "Are you sure that you want to follow {name}?" + proxyAccount: "Proxy Account" + proxyAccountDescription: "A proxy account is an account that acts as a remote follower +- for users under certain conditions. For example, when a user adds a remote user +- to the list, the remote user's activity will not be delivered to the server if no +- local user is following that user, so the proxy account will follow instead." ++ 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." + host: "Host" +-selectUser: "Select a user" ++selectUser: "Select a creature" + selectInstance: "Select an server" + recipient: "Recipient(s)" + annotation: "Comments" +@@ -242,14 +242,14 @@ hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wi + to hide from trending and explore. Hidden hashtags are still discoverable via other + means." + muteAndBlock: "Mutes and Blocks" +-mutedUsers: "Muted users" +-blockedUsers: "Blocked users" +-noUsers: "There are no users" ++mutedUsers: "Muted creatures" ++blockedUsers: "Blocked creatures" ++noUsers: "There are no creatures" + noInstances: "There are no servers" + editProfile: "Edit profile" + noteDeleteConfirm: "Are you sure you want to delete this beep?" + pinLimitExceeded: "You cannot pin any more beeps" +-intro: "Installation of Jörmungandr has been finished! Please create an admin user." ++intro: "Installation of Jörmungandr has been finished! Please create an admin creature." + done: "Done" + processing: "Processing…" + preview: "Preview" +@@ -267,7 +267,7 @@ publishing: "Publishing" + notResponding: "Not responding" + instanceFollowing: "Following on server" + instanceFollowers: "Followers of server" +-instanceUsers: "Users of this server" ++instanceUsers: "Creatures of this server" + changePassword: "Change password" + security: "Security" + retypedNotMatch: "The inputs do not match." +@@ -277,8 +277,8 @@ newPasswordRetype: "Retype new password" + attachFile: "Attach files" + more: "More" + featured: "Featured" +-usernameOrUserId: "Username or user id" +-noSuchUser: "User not found" ++usernameOrUserId: "Username or creature id" ++noSuchUser: "Creature not found" + lookup: "Lookup" + announcements: "Announcements" + imageUrl: "Image URL" +@@ -309,7 +309,7 @@ agreeTo: "I agree to {0}" + tos: "Terms of Service" + start: "Begin" + home: "Home" +-remoteUserCaution: "Information from remote users may be incomplete." ++remoteUserCaution: "Information from remote creatures may be incomplete." + activity: "Activity" + images: "Images" + birthday: "Birthday" +@@ -381,16 +381,16 @@ enableRecommendedTimeline: "Enable recommended timeline" + disablingTimelinesInfo: "Adminstrators and Moderators will always have access to all + timelines, even if they are not enabled." + registration: "Register" +-enableRegistration: "Enable new user registration" ++enableRegistration: "Enable new creature registration" + invite: "Invite" +-driveCapacityPerLocalAccount: "Drive capacity per local user" +-driveCapacityPerRemoteAccount: "Drive capacity per remote user" ++driveCapacityPerLocalAccount: "Drive capacity per local creature" ++driveCapacityPerRemoteAccount: "Drive capacity per remote creature" + inMb: "In megabytes" + iconUrl: "Icon URL" + bannerUrl: "Banner image URL" + backgroundImageUrl: "Background image URL" + basicInfo: "Basic info" +-pinnedUsers: "Pinned users" ++pinnedUsers: "Pinned creatures" + pinnedUsersDescription: "List usernames separated by line breaks to be pinned in the + \"Explore\" tab." + pinnedPages: "Pinned Pages" +@@ -432,14 +432,14 @@ connectedTo: "Following account(s) are connected" + notesAndReplies: "Beeps and replies" + withFiles: "With attachments" + silence: "Silence" +-silenceConfirm: "Are you sure that you want to silence this user?" ++silenceConfirm: "Are you sure that you want to silence this creature?" + unsilence: "Undo silencing" +-unsilenceConfirm: "Are you sure that you want to undo the silencing of this user?" +-popularUsers: "Popular users" +-recentlyUpdatedUsers: "Recently active users" +-recentlyRegisteredUsers: "Newly joined users" +-recentlyDiscoveredUsers: "Newly discovered users" +-exploreUsersCount: "There are {count} users" ++unsilenceConfirm: "Are you sure that you want to undo the silencing of this creature?" ++popularUsers: "Popular creatures" ++recentlyUpdatedUsers: "Recently active creatures" ++recentlyRegisteredUsers: "Newly joined creatures" ++recentlyDiscoveredUsers: "Newly discovered creatures" ++exploreUsersCount: "There are {count} creatures" + exploreFediverse: "Explore the Fediverse" + popularTags: "Popular tags" + userList: "Lists" +@@ -450,7 +450,7 @@ token: "Token" + twoStepAuthentication: "Two-factor authentication" + moderator: "Moderator" + moderation: "Moderation" +-nUsersMentioned: "Mentioned by {n} users" ++nUsersMentioned: "Mentioned by {n} creatures" + securityKey: "Security key" + securityKeyName: "Key name" + registerSecurityKey: "Register a security key" +@@ -513,7 +513,7 @@ signinFailed: "Unable to sign in. The entered username or password is incorrect. + tapSecurityKey: "Tap your security key" + or: "Or" + language: "Language" +-uiLanguage: "User interface language" ++uiLanguage: "Creature interface language" + groupInvited: "You've been invited to a group" + aboutX: "About {x}" + useOsNativeEmojis: "Use OS native Emoji" +@@ -607,14 +607,14 @@ disablePagesScript: "Disable AiScript on Pages" + expandOnNoteClick: "Open beep on click" + expandOnNoteClickDesc: "If disabled, you can still open beeps in the right-click menu + or by clicking the timestamp." +-updateRemoteUser: "Update remote user information" ++updateRemoteUser: "Update remote creature information" + deleteAllFiles: "Delete all files" + deleteAllFilesConfirm: "Are you sure that you want to delete all files?" +-removeAllFollowing: "Unfollow all followed users" ++removeAllFollowing: "Unfollow all followed creatures" + removeAllFollowingDescription: "Executing this unfollows all accounts from {host}. + Please run this if the server e.g. no longer exists." +-userSuspended: "This user has been suspended." +-userSilenced: "This user is silenced." ++userSuspended: "This creature has been suspended." ++userSilenced: "This creature is silenced." + yourAccountSuspendedTitle: "This account is suspended" + yourAccountSuspendedDescription: "This account has been suspended due to breaking + the server's terms of services or similar. Contact the administrator if you would +@@ -801,8 +801,8 @@ reloadToApplySetting: "This setting will only apply after a page reload. Reload + needReloadToApply: "A reload is required for this to be reflected." + showTitlebar: "Show title bar" + clearCache: "Clear cache" +-onlineUsersCount: "{n} users are online" +-nUsers: "{n} Users" ++onlinecreaturesCount: "{n} users are online" ++nUsers: "{n} Creatures" + nNotes: "{n} Beeps" + sendErrorReports: "Send error reports" + sendErrorReportsDescription: "When turned on, detailed error information will be shared +@@ -849,10 +849,10 @@ quitFullView: "Exit full view" + addDescription: "Add description" + userPagePinTip: "You can display beeps here by selecting \"Pin to profile\" from the + menu of individual beeps." +-notSpecifiedMentionWarning: "This beep contains mentions of users not included as ++notSpecifiedMentionWarning: "This beep contains mentions of creatures not included as + recipients" + info: "About" +-userInfo: "User information" ++userInfo: "Creature information" + unknown: "Unknown" + onlineStatus: "Online status" + hideOnlineStatus: "Hide online status" +@@ -869,7 +869,7 @@ switchAccount: "Switch account" + enabled: "Enabled" + disabled: "Disabled" + quickAction: "Quick actions" +-user: "User" ++user: "Creature" + administration: "Management" + accounts: "Accounts" + switch: "Switch" +@@ -987,7 +987,7 @@ recentNDays: "Last {n} days" + noEmailServerWarning: "Email server not configured." + thereIsUnresolvedAbuseReportWarning: "There are unsolved reports." + check: "Check" +-driveCapOverrideLabel: "Change the drive capacity for this user" ++driveCapOverrideLabel: "Change the drive capacity for this creature" + driveCapOverrideCaption: "Reset the capacity to default by inputting a value of 0 + or lower." + requireAdminForView: "You must log in with an administrator account to view this." +@@ -1047,13 +1047,13 @@ showAds: "Show ads" + enterSendsMessage: "Press Return in Messaging to send message (off is Ctrl + Return)" + adminCustomCssWarn: "This setting should only be used if you know what it does. Entering + improper values may cause EVERYONE'S clients to stop functioning normally. Please +- ensure your CSS works properly by testing it in your user settings." ++ ensure your CSS works properly by testing it in your creature settings." + customMOTD: "Custom MOTD (splash screen messages)" + customMOTDDescription: "Custom messages for the MOTD (splash screen) separated by +- line breaks to be shown randomly every time a user loads/reloads the page." ++ line breaks to be shown randomly every time a creature loads/reloads the page." + customSplashIcons: "Custom splash screen icons (urls)" + customSplashIconsDescription: "URLs for custom splash screen icons separated by line +- breaks to be shown randomly every time a user loads/reloads the page. Please make ++ breaks to be shown randomly every time a creature loads/reloads the page. Please make + sure the images are on a static URL, preferably all resized to 192x192." + showUpdates: "Show a popup when Jörmungandr updates" + recommendedInstances: "Recommended servers" +@@ -1108,7 +1108,7 @@ preventAiLearningDescription: "Request third-party AI language models not to stu + content you upload, such as beeps and images." + noGraze: "Please disable the \"Graze for Mastodon\" browser extension, as it interferes + with Jörmungandr." +-silencedWarning: "This page is showing because these users are from servers your admin ++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" +@@ -1118,7 +1118,7 @@ isPatron: "Jörmungandr Patron" + reactionPickerSkinTone: "Preferred emoji skin tone" + enableServerMachineStats: "Enable server hardware statistics" + enableIdenticonGeneration: "Enable Identicon generation" +-showPopup: "Notify users with popup" ++showPopup: "Notify creatures with popup" + showWithSparkles: "Show with sparkles" + youHaveUnreadAnnouncements: "You have unread announcements" + donationLink: "Link to donation page" +@@ -1130,7 +1130,7 @@ removeMember: "Remove member" + verifiedLink: "Verified link" + openInMainColumn: "Open in main column" + searchNotLoggedIn_1: "You have to be authenticated in order to use full text search." +-searchNotLoggedIn_2: "However, you can search using hashtags, and search users." ++searchNotLoggedIn_2: "However, you can search using hashtags, and search creatures." + searchEmptyQuery: "Please enter a search term." + bite: "Bite" + biteBack: "Bite back" +@@ -1269,7 +1269,7 @@ _mfm: + advancedDescription: "If disabled, only allows for basic markup unless animated + MFM is playing" + mention: "Mention" +- mentionDescription: "You can specify a user by using an At-Symbol and a username." ++ mentionDescription: "You can specify a creature by using an At-Symbol and a username." + hashtag: "Hashtag" + hashtagDescription: "You can specify a hashtag using a number sign and text." + url: "URL" +@@ -1347,7 +1347,7 @@ _mfm: + effect." + _instanceTicker: + none: "Never show" +- remote: "Show for remote users" ++ remote: "Show for remote creatures" + always: "Always show" + _serverDisconnectedBehavior: + reload: "Automatically reload" +@@ -1388,7 +1388,7 @@ _wordMute: + mutedNotes: "Muted beeps" + _instanceMute: + instanceMuteDescription: "This will mute any beeps/rebeeps from the listed servers, +- including those of users replying to a user from a muted server." ++ including those of creatures replying to a creature from a muted server." + instanceMuteDescription2: "Separate with newlines" + title: "Hides beeps from listed servers." + heading: "List of servers to be muted" +@@ -1496,7 +1496,7 @@ _filters: + wordFilters: "Filter by beep text" + inFilters: "Filter by bookmark and/or favorite status" + miscFilters: "Filter by following relationship and/or note type" +- userDomain: "Filter by author, mentioned users, reply user or instance domain" ++ 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 + is inclusive." +@@ -1512,7 +1512,7 @@ _filters: + infoEnd: "Filter aliases" + infoEnd1: "For convenience and typo-prevention, some filters have aliases, which + are listed below." +- fromUser: "From user" ++ fromUser: "From creature" + replyTo: "Replying to" + mentioning: "Mentioning" + inFavorites: "Favorited" +@@ -1594,8 +1594,8 @@ _2fa: + _permissions: + "read:account": "View your account information" + "write:account": "Edit your account information" +- "read:blocks": "View your list of blocked users" +- "write:blocks": "Edit your list of blocked users" ++ "read:blocks": "View your list of blocked creatures" ++ "write:blocks": "Edit your list of blocked creatures" + "read:drive": "Access your Drive files and folders" + "write:drive": "Edit or delete your Drive files and folders" + "read:favorites": "View your list of bookmarks" +@@ -1604,8 +1604,8 @@ _permissions: + "write:following": "Follow or unfollow other accounts" + "read:messaging": "View your chats" + "write:messaging": "Compose or delete chat messages" +- "read:mutes": "View your list of muted users" +- "write:mutes": "Edit your list of muted users" ++ "read:mutes": "View your list of muted creatures" ++ "write:mutes": "Edit your list of muted creatures" + "write:notes": "Compose or delete beeps" + "read:notifications": "View your notifications" + "write:notifications": "Manage your notifications" +@@ -1616,8 +1616,8 @@ _permissions: + "write:pages": "Edit or delete your page" + "read:page-likes": "View your likes on page" + "write:page-likes": "Edit your likes on page" +- "read:user-groups": "View your user groups" +- "write:user-groups": "Edit or delete your user groups" ++ "read:user-groups": "View your creature groups" ++ "write:user-groups": "Edit or delete your creature groups" + "read:channels": "View your channels" + "write:channels": "Edit your channels" + "read:gallery": "View your gallery" +@@ -1638,11 +1638,11 @@ _auth: + authRequired: "Authorization required" + _antennaSources: + all: "All beeps" +- homeTimeline: "Beeps from followed users" +- users: "Beeps from specific users" +- userList: "Beeps from a specified list of users" +- userGroup: "Beeps from users in a specified group" +- instances: "Beeps from all users on an server" ++ homeTimeline: "Beeps from followed creatures" ++ users: "Beeps from specific creatures" ++ userList: "Beeps from a specified list of creatures" ++ userGroup: "Beeps from creatures in a specified group" ++ instances: "Beeps from all creatures on an server" + _weekday: + sunday: "Sunday" + monday: "Monday" +@@ -1669,11 +1669,11 @@ _widgets: + postForm: "Beeping Form" + slideshow: "Slideshow" + button: "Button" +- onlineUsers: "Online Users" ++ onlineUsers: "Online Creatures" + jobQueue: "Job Queue" + serverMetric: "Server Metrics" + aiscript: "AiScript Console" +- userList: "User List" ++ userList: "Creature List" + serverInfo: "Server Info" + _userList: + chooseList: "Select a list" +@@ -1714,11 +1714,11 @@ _visibility: + home: "Unlisted" + homeDescription: "Beep to home timeline only" + followers: "Followers" +- followersDescription: "Make visible to your followers and mentioned users only" ++ followersDescription: "Make visible to your followers and mentioned creatures only" + specified: "Direct" +- specifiedDescription: "Make visible for specified users only" ++ specifiedDescription: "Make visible for specified creatures only" + localOnly: "Local only" +- localOnlyDescription: "Not visible to remote users" ++ localOnlyDescription: "Not visible to remote creatures" + _postForm: + replyPlaceholder: "Reply to this beep…" + quotePlaceholder: "Quote this beep…" +@@ -1745,21 +1745,21 @@ _profile: + changeAvatar: "Change avatar" + changeBanner: "Change banner" + locationDescription: "If you enter your city first, it will display your local time +- to other users." ++ to other creatures." + _exportOrImport: + allNotes: "All beeps" +- followingList: "Followed users" +- muteList: "Muted users" +- blockingList: "Blocked users" +- userLists: "User lists" +- excludeMutingUsers: "Exclude muted users" +- excludeInactiveUsers: "Exclude inactive users" ++ followingList: "Followed creatures" ++ muteList: "Muted creatures" ++ blockingList: "Blocked creatures" ++ userLists: "Creature lists" ++ excludeMutingUsers: "Exclude muted creatures" ++ excludeInactiveUsers: "Exclude inactive creatures" + _charts: + federation: "Federation" + apRequest: "Requests" +- usersIncDec: "Difference in the number of users" +- usersTotal: "Total number of users" +- activeUsers: "Active users" ++ usersIncDec: "Difference in the number of creatures" ++ usersTotal: "Total number of creatures" ++ activeUsers: "Active creatures" + notesIncDec: "Difference in the number of beeps" + localNotesIncDec: "Difference in the number of local beeps" + remoteNotesIncDec: "Difference in the number of remote beeps" +@@ -1770,12 +1770,12 @@ _charts: + storageUsageTotal: "Total storage usage" + _instanceCharts: + requests: "Requests" +- users: "Difference in the number of users" +- usersTotal: "Cumulative number of users" ++ users: "Difference in the number of creatures" ++ usersTotal: "Cumulative number of creatures" + notes: "Difference in the number of beeps" + notesTotal: "Cumulative number of beeps" +- ff: "Difference in the number of followed users / followers " +- ffTotal: "Cumulative number of followed users / followers" ++ ff: "Difference in the number of followed creatures / followers " ++ ffTotal: "Cumulative number of followed creatures / followers" + cacheSize: "Difference in cache size" + cacheSizeTotal: "Cumulative total cache size" + files: "Difference in the number of files" +@@ -2009,14 +2009,14 @@ _pages: + randomPick: "Randomly choose from list" + _randomPick: + arg1: "List" +- dailyRandom: "Random (Changes once a day for each user)" ++ dailyRandom: "Random (Changes once a day for each creature)" + _dailyRandom: + arg1: "Probability" +- dailyRannum: "Random number (Changes once a day for each user)" ++ dailyRannum: "Random number (Changes once a day for each creature)" + _dailyRannum: + arg1: "Minimum value" + arg2: "Maximum value" +- dailyRandomPick: "Randomly choose from a list (Changes once a day for each user)" ++ dailyRandomPick: "Randomly choose from a list (Changes once a day for each creature)" + _dailyRandomPick: + arg1: "List" + seedRandom: "Random (with seed)" +@@ -2032,7 +2032,7 @@ _pages: + _seedRandomPick: + arg1: "Seed" + arg2: "List" +- DRPWPM: "Randomly choose from weighted list (Changes once a day for each user)" ++ DRPWPM: "Randomly choose from weighted list (Changes once a day for each creature)" + _DRPWPM: + arg1: "Text list" + pick: "Select from list" +@@ -2151,7 +2151,7 @@ _deck: + _experiments: + title: "Experiments" + enablePostImports: "Enable beep imports" +- postImportsCaption: "Allows users to import their beeps from past Jörmungandr, Misskey, ++ postImportsCaption: "Allows creatures to import their beeps from past Jörmungandr, Misskey, + Mastodon, Akkoma, and Pleroma accounts. It may cause slowdowns during load if + your queue is bottlenecked." + _dialog: +@@ -799,7 +799,7 @@ reloadToApplySetting: "This setting will only apply after a page reload. Reload + needReloadToApply: "A reload is required for this to be reflected." + showTitlebar: "Show title bar" + clearCache: "Clear cache" +-onlinecreaturesCount: "{n} users are online" ++onlinecreaturesCount: "{n} creatures are online" + nUsers: "{n} Creatures" + nNotes: "{n} Beeps" + sendErrorReports: "Send error reports" +@@ -997,7 +997,7 @@ deleteAccount: "Delete account" + document: "Documentation" + numberOfPageCache: "Number of cached pages" + numberOfPageCacheDescription: "Increasing this number will improve convenience for +- users but cause more server load as well as more memory to be used." ++ creatures but cause more server load as well as more memory to be used." + logoutConfirm: "Really log out?" + lastActiveDate: "Last used at" + statusbar: "Status bar" \ No newline at end of file