Merge branch 'develop' into hazelnoot/following-timeline

locales/en-US.yml

@@ -144,8 +144,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"
@@ -185,7 +187,7 @@ flagAsBotDescription: "Enable this option if this account is controlled by a pro
 flagAsCat: "Mark this account as a cat"
 flagAsCatDescription: "Enable this option to mark this account as a cat."
 flagSpeakAsCat: "Speak as a cat"
-flagSpeakAsCatDescription: "Your posts will get nyanified when in cat mode."
+flagSpeakAsCatDescription: "Your posts will get nyanified when in cat mode. If this isn't working, then please check that you dont have 'Disable cat speak' on under General/Note Display"
 flagShowTimelineReplies: "Show replies in timeline"
 flagShowTimelineRepliesDescription: "Shows replies of users to notes of other users in the timeline if turned on."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
@@ -780,6 +782,7 @@ lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", yo
 alwaysMarkSensitive: "Mark as sensitive by default"
 loadRawImages: "Load original images instead of showing thumbnails"
 showTickerOnReplies: "Show instance ticker on replies"
+disableCatSpeak: "Disable cat speak"
 searchEngine: "Search Engine For Search MFM"
 searchEngineOther: "Other"
 searchEngineCustomURIDescription: "The custom URI must be input in the format like \"https://www.google.com/search?q=\\{query}\" or \"https://www.google.com/search?q=%s\"."
@@ -1280,6 +1283,7 @@ detach: "Remove"
 detachAll: "Remove All"
 angle: "Angle"
 flip: "Flip"
+showBelowAvatar: "Show Below Avatar"
 showAvatarDecorations: "Show avatar decorations"
 releaseToRefresh: "Release to refresh"
 refreshing: "Refreshing..."