Merge branch 'main' into glitch-soc/merge-upstream

2023-01-12 17:47:42 +01:00
parent a36dfbb2aa f4a6365f55
commit cef87ba86c
4 changed files with 5 additions and 5 deletions
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -122,14 +122,14 @@ en:
        admin/accounts: Administration of accounts
        admin/all: All administrative functions
        admin/reports: Administration of reports
-        all: Everything
+        all: Full access to your Mastodon account
        blocks: Blocks
        bookmarks: Bookmarks
        conversations: Conversations
        crypto: End-to-end encryption
        favourites: Favourites
        filters: Filters
-        follow: Relationships
+        follow: Follows, Mutes and Blocks
        follows: Follows
        lists: Lists
        media: Media attachments