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.eo.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.eo.yml')
-rw-r--r-- | config/locales/doorkeeper.eo.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml index ce39f3bd1..8c5845392 100644 --- a/config/locales/doorkeeper.eo.yml +++ b/config/locales/doorkeeper.eo.yml @@ -5,6 +5,7 @@ eo: doorkeeper/application: name: Nomo redirect_uri: URI de plusendo + website: Aplikaĵa retejo errors: models: doorkeeper/application: @@ -33,9 +34,12 @@ eo: redirect_uri: Uzu unu linion por ĉiu URI scopes: Apartigu ampleksojn per spacetoj. Lasu malplena por uzi la senŝanĝajn ampleksojn. index: + application: Aplikaĵo callback_url: URL vokita per referenco + delete: Forviŝi name: Nomo new: Nova Aplikaĵo + show: Montri title: Viaj aplikaĵoj new: title: Nova aplikaĵo |