diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 16:19:32 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 18:36:16 +0200 |
commit | 356e9150dfec5bbb8a56b128c1d3372cd5731ec6 (patch) | |
tree | b5270b3fe3c38ef2d94670f06613c4bdf71d0631 /config/locales/doorkeeper.cy.yml | |
parent | f4b008906dcfc3333ec533884aa10b65f8ae41a2 (diff) | |
parent | ede0be5dba6836606db772a007ad9be5d60c7b99 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock
Diffstat (limited to 'config/locales/doorkeeper.cy.yml')
-rw-r--r-- | config/locales/doorkeeper.cy.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml index f51e1b464..19798c4d9 100644 --- a/config/locales/doorkeeper.cy.yml +++ b/config/locales/doorkeeper.cy.yml @@ -72,6 +72,7 @@ cy: index: application: Rhaglen created_at: Awdurdodedig + date_format: "%Y-%m-%d% %H:%M:%S" scopes: Rhinweddau title: Eich rhaglenni awdurdodedig errors: @@ -114,7 +115,7 @@ cy: title: Mae awdurdodiad OAuth yn ofynnol scopes: follow: addasu perthnasau cyfrif - push: derbyn eich hysbysiadau PUSH + push: derbyn eich hysbysiadau gwthiadwy read: darllen holl ddata eich cyfrif read:accounts: gweld gwybodaeth y cyfrif read:blocks: gweld eich blociau |