diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-26 13:52:12 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-26 14:23:24 +0200 |
commit | 36393e1d2b1ce82916bd43ca1068e34cea6f6e39 (patch) | |
tree | a18d7f5e7753ff40355d2a6d4ab9fb765ad4c263 /config/locales/doorkeeper.da.yml | |
parent | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff) | |
parent | f37fafe30b5f6ff85ebf87fb622293a855877ee1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.
Diffstat (limited to 'config/locales/doorkeeper.da.yml')
-rw-r--r-- | config/locales/doorkeeper.da.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml index dd45a5078..df964e4b1 100644 --- a/config/locales/doorkeeper.da.yml +++ b/config/locales/doorkeeper.da.yml @@ -91,7 +91,9 @@ da: unknown: Adgangs-beviset er ugyldigt resource_owner_authenticator_not_configured: Ressource ejeren kunne ikke blive fundet grundet Doorkeeper.configure.resource_owner_authenticator ikke er konfigureret. server_error: Autoriserings serveren blev mødt med en uventet betingelse der forhindrede den i at færdiggøre anmodningen. + temporarily_unavailable: Autoriserings serveren er på nuværende tidspunkt ikke i stand til at håndtere anmodningen grundet midlertidig overlast eller serveren er ved at blive opdateret. unauthorized_client: Klienten er ikke godkendt til at udføre denne anmodning ved at bruge denne metode. + unsupported_grant_type: Autoriserings typen understøttes ikke af autoriserings serveren. unsupported_response_type: Godkendelses serveren understøtter ikke denne type respons. flash: applications: |