diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
| commit | 0158937fc2345a83f8ee5a64e85b14cabfe4b1e7 (patch) | |
| tree | 79872e72c27d6371620c0dd8f04700aa0094020c /config/locales/doorkeeper.tr.yml | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
| parent | a5e7ada62fa2824be158f0b3bed7f3c39ce9c0fa (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.
Diffstat (limited to 'config/locales/doorkeeper.tr.yml')
| -rw-r--r-- | config/locales/doorkeeper.tr.yml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml new file mode 100644 index 000000000..686a018e0 --- /dev/null +++ b/config/locales/doorkeeper.tr.yml @@ -0,0 +1,19 @@ +--- +tr: + activerecord: + attributes: + doorkeeper/application: + name: Uygulama adı + website: Uygulama web sitesi + doorkeeper: + applications: + buttons: + authorize: Yetki ver + cancel: İptal et + destroy: Yok et + edit: Düzenle + submit: Gönder + confirmations: + destroy: Emin misiniz? + edit: + title: Uygulamayı düzenle |