about summary refs log tree commit diff
path: root/config/locales/doorkeeper.cy.yml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-01-21 21:28:13 +0100
committerGitHub <noreply@github.com>2023-01-21 21:28:13 +0100
commit368d6fe54f94ad2ecd2a1c1e7e5a2359dc37ad30 (patch)
tree716c7c9a4e7f5717e982de3c67a462aa75d3aae4 /config/locales/doorkeeper.cy.yml
parentc4a5e0ca0e89b2f8abd69ed9b8a4da3f82d0ccaf (diff)
parent3c76f1f6c2a95e80a02419b83478b89714a9d430 (diff)
Merge pull request #2092 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/doorkeeper.cy.yml')
-rw-r--r--config/locales/doorkeeper.cy.yml14
1 files changed, 12 insertions, 2 deletions
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index 609826f51..f3da378cf 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -122,14 +122,14 @@ cy:
         admin/accounts: Gweinyddu cyfrifon
         admin/all: Pob swyddogaeth weinyddol
         admin/reports: Gweinyddu adroddiadau
-        all: Popeth
+        all: Mynediad llawn i'ch cyfrif Mastodon
         blocks: Blociau
         bookmarks: Nodau Tudalen
         conversations: Sgyrsiau
         crypto: Amgryptio o ben i ben
         favourites: Ffefrynnau
         filters: Hidlyddion
-        follow: Perthnasau
+        follow: Yn dilyn, Wedi Tewi a Blociau
         follows: Yn dilyn
         lists: Rhestrau
         media: Atodiadau cyfryngau
@@ -149,9 +149,19 @@ cy:
     scopes:
       admin:read: darllen yr holl ddata ar y gweinydd
       admin:read:accounts: darllen gwybodaeth sensitif o bob cyfrif
+      admin:read:canonical_email_blocks: darllen gwybodaeth sensitif pob bloc e-bost canonaidd
+      admin:read:domain_allows: darllen gwybodaeth sensitif pob caniatád parth
+      admin:read:domain_blocks: darllen gwybodaeth sensitif pob bloc parth
+      admin:read:email_domain_blocks: darllen gwybodaeth sensitif pob bloc parth ebost
+      admin:read:ip_blocks: darllen gwybodaeth sensitif pob bloc IP
       admin:read:reports: darllen gwybodaeth sensitif o'r holl adroddiadau a'r cyfrifon a adroddwyd
       admin:write: addasu'r holl ddata ar y gweinydd
       admin:write:accounts: cyflawni camau cymedroli ar gyfrifon
+      admin:write:canonical_email_blocks: cyflawni cymedroli ar gyfer pob bloc e-bost canonaidd
+      admin:write:domain_allows: cyflawni cymedroli ar gyfer pob caniatád parth
+      admin:write:domain_blocks: cyflawni cymedroli ar gyfer pob bloc parth
+      admin:write:email_domain_blocks: cyflawni cymedroli ar gyfer pob bloc parth ebost
+      admin:write:ip_blocks: cyflawni cymedroli ar gyfer pob bloc IP
       admin:write:reports: cyflawni camau cymedroli ar adroddiadau
       crypto: defnyddio amgryptio ben i ben
       follow: addasu perthnasau cyfrif