diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-28 22:45:17 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-28 22:45:17 -0600 |
commit | f4b2478af11bd5e2125eb245bda4fda7577817d1 (patch) | |
tree | 6a09934546f4e2ad8db8d43372ac3192834a42f1 /config/locales/doorkeeper.sv.yml | |
parent | 00ce2be148a06ddd7e692ce963dfab356e331629 (diff) | |
parent | e14c20582f9f455ade989307016e6726cb8ff959 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml
Diffstat (limited to 'config/locales/doorkeeper.sv.yml')
-rw-r--r-- | config/locales/doorkeeper.sv.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml index 19a457427..342198bd3 100644 --- a/config/locales/doorkeeper.sv.yml +++ b/config/locales/doorkeeper.sv.yml @@ -36,7 +36,7 @@ sv: scopes: Separera omfattningen med mellanslag. Lämna tomt för att använda standardomfattning. index: application: Applikation - callback_url: Callback URL + callback_url: Återkalls URL delete: Ta bort name: Namn new: Ny applikation @@ -48,10 +48,10 @@ sv: show: actions: Handlingar application_id: Klientnyckel - callback_urls: Callback URLs + callback_urls: Återkalls URLs scopes: Omfattning secret: Kundhemlighet - title: 'Application: %{name}' + title: 'Program: %{name}' authorizations: buttons: authorize: Godkänna @@ -110,7 +110,7 @@ sv: admin: nav: applications: Applikationer - oauth2_provider: OAuth2 Provider + oauth2_provider: OAuth2 leverantör application: title: OAuth-behörighet krävs scopes: |