Merge branch 'stable' of https://github.com/transfem-org/Sharkey into stable

locales/en-US.yml

@@ -49,7 +49,7 @@ copyLink: "Copy link"
 copyLinkRenote: "Copy renote link"
 delete: "Delete"
 deleteAndEdit: "Delete and edit"
-deleteAndEditConfirm: "Are you sure you want to redraft this note? This means you will lose all reactions, renotes, and replies to it."
+deleteAndEditConfirm: "Are you sure you want to redraft this note? This means you will lose all reactions, boosts, and replies to it."
 addToList: "Add to list"
 addToAntenna: "Add to antenna"
 sendMessage: "Send a message"
@@ -710,7 +710,7 @@ manageAccessTokens: "Manage access tokens"
 accountInfo: "Account Info"
 notesCount: "Number of notes"
 repliesCount: "Number of replies sent"
-renotesCount: "Number of renotes sent"
+renotesCount: "Number of boosts sent"
 repliedCount: "Number of replies received"
 renotedCount: "Number of boosts received"
 followingCount: "Number of followed accounts"
@@ -1019,7 +1019,7 @@ thisPostMayBeAnnoying: "This note may annoy others."
 thisPostMayBeAnnoyingHome: "Post to home timeline"
 thisPostMayBeAnnoyingCancel: "Cancel"
 thisPostMayBeAnnoyingIgnore: "Post anyway"
-collapseRenotes: "Collapse renotes you've already seen"
+collapseRenotes: "Collapse boosts you've already seen"
 collapseFiles: "Collapse files"
 autoloadConversation: "Load conversation on replies"
 internalServerError: "Internal Server Error"
@@ -1070,7 +1070,7 @@ forceShowAds: "Always show ads"
 addMemo: "Add memo"
 editMemo: "Edit memo"
 reactionsList: "Reactions"
-renotesList: "Renotes"
+renotesList: "Boosts"
 notificationDisplay: "Notifications"
 leftTop: "Top left"
 rightTop: "Top right"
@@ -1145,7 +1145,7 @@ pastAnnouncements: "Past announcements"
 youHaveUnreadAnnouncements: "There are unread announcements."
 useSecurityKey: "Please follow your browser's or device's instructions to use your security- or passkey."
 replies: "Replies"
-renotes: "Renotes"
+renotes: "Boosts"
 loadReplies: "Show replies"
 loadConversation: "Show conversation"
 pinnedList: "Pinned list"
@@ -1158,7 +1158,7 @@ unnotifyNotes: "Stop notifying about new notes"
 authentication: "Authentication"
 authenticationRequiredToContinue: "Please authenticate to continue"
 dateAndTime: "Timestamp"
-showRenotes: "Show renotes"
+showRenotes: "Show boosts"
 edited: "Edited"
 notificationRecieveConfig: "Notification Settings"
 mutualFollow: "Mutual follow"
@@ -1201,6 +1201,8 @@ _announcement:
   readConfirmText: "This will mark the contents of \"{title}\" as read."
   shouldNotBeUsedToPresentPermanentInfo: "As it may significantly impact the user experience for new users, it is recommended to use notifications in the flow information rather than stock information."
   dialogAnnouncementUxWarn: "Having two or more dialog-style notifications simultaneously can significantly impact the user experience, so please use them carefully."
+  silence: "No notification"
+  silenceDescription: "Turning this on will skip the notification of this announcement and the user won't need to read it."
 _initialAccountSetting:
   accountCreated: "Your account was successfully created!"
   letsStartAccountSetup: "For starters, let's set up your profile."
@@ -1296,6 +1298,8 @@ _serverSettings:
   shortName: "Short name"
   shortNameDescription: "A shorthand for the instance's name that can be displayed if the full official name is long."
   fanoutTimelineDescription: "Greatly increases performance of timeline retrieval and reduces load on the database when enabled. In exchange, memory usage of Redis will increase. Consider disabling this in case of low server memory or server instability."
+  fanoutTimelineDbFallback: "Fallback to database"
+  fanoutTimelineDbFallbackDescription: "When enabled, fallback processing is performed by making an additional query to the DB if the timeline is not cached. Disabling it further reduces the server load by not performing fallback processing, but limits the range of timelines that can be retrieved."
 _accountMigration:
   moveFrom: "Migrate another account to this one"
   moveFromSub: "Create alias to another account"
@@ -1594,6 +1598,7 @@ _role:
     gtlAvailable: "Can view the global timeline"
     ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
+    canImportNotes: "Can import notes"
     canInvite: "Can create instance invite codes"
     inviteLimit: "Invite limit"
     inviteLimitCycle: "Invite limit cooldown"
@@ -1734,6 +1739,7 @@ _serverDisconnectedBehavior:
   reload: "Automatically reload"
   dialog: "Show warning dialog"
   quiet: "Show unobtrusive warning"
+  disabled: "Disable warning"
 _channel:
   create: "Create channel"
   edit: "Edit channel"
@@ -1757,7 +1763,7 @@ _wordMute:
   muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
   muteWordsDescription2: "Surround keywords with slashes to use regular expressions."
 _instanceMute:
-  instanceMuteDescription: "This will mute any notes/renotes from the listed instances, including those of users replying to a user from a muted instance."
+  instanceMuteDescription: "This will mute any notes/boosts from the listed instances, including those of users replying to a user from a muted instance."
   instanceMuteDescription2: "Separate with newlines"
   title: "Hides notes from listed instances."
   heading: "List of instances to be muted"