diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
commit | dae5e446fe7294dba0e14311ef3da4dc8fff6a3a (patch) | |
tree | 33a76386b1e8bc9c968bfc49409f72000b7ec410 /config/locales/doorkeeper.kab.yml | |
parent | a2cfe3daaadabfaad71969a44c460bd76b8405ff (diff) | |
parent | 57c42c20c01b46f0d7cad5a357d56190274a3fa1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.
Diffstat (limited to 'config/locales/doorkeeper.kab.yml')
-rw-r--r-- | config/locales/doorkeeper.kab.yml | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml index 9cd506488..b384b76b1 100644 --- a/config/locales/doorkeeper.kab.yml +++ b/config/locales/doorkeeper.kab.yml @@ -12,7 +12,7 @@ kab: attributes: redirect_uri: fragment_present: ur yezmir ad yegber afrur. - invalid_uri: ilaq ad tili d tansa URL tameɣtut. + invalid_uri: ilaq ad tili d tansa URL tameγtut. relative_uri: ilaq ad yili d URI amagdaz. secured_uri: ilaq URI ad yili HTTPS/SSL. doorkeeper: @@ -56,19 +56,23 @@ kab: title: Tella-d tuccḍa new: able_to: Asnas-agi yezmer - prompt: Eǧǧ i %{client_name} ad yekcem ɣer umiḍan-ik + prompt: Eǧǧ i %{client_name} ad yekcem γer umiḍan-ik + title: Tlaq tsiregt show: - title: Nɣel tangalt n wurag sakkin senteḍ-itt deg usnas. + title: Nγel tangalt n wurag sakkin senteḍ-itt deg usnas. authorized_applications: + buttons: + revoke: Ḥwi confirmations: revoke: Tetḥeqqeḍ? index: application: Asnas created_at: Yettussireg date_format: "%d-%m-%Y %H:%M:%S" + title: Isnasen-ik·im yettusirgen errors: messages: - invalid_redirect_uri: URI n uwelleh mačči d ameɣtu. + invalid_redirect_uri: URI n uwelleh mačči d ameγtu. flash: applications: create: @@ -77,16 +81,21 @@ kab: notice: Asnan yettwakkes. update: notice: Asnan yettwalqem. + authorized_applications: + destroy: + notice: Yettwaḥwi wesnas. layouts: admin: nav: applications: Isnasen + application: + title: Tlaq tsiregt n OAuth scopes: - admin:read: ɣeṛ akk isefka ɣef uqeddac - admin:write: ẓreg akk isefka ɣef uqeddac - follow: beddel assaɣen n umiḍan - push: ṭṭef-d tilɣa-ik yettwademren - read: ɣeṛ akk isefka n umiḍan-ik + admin:read: γeṛ akk isefka γef uqeddac + admin:write: ẓreg akk isefka γef uqeddac + follow: beddel assaγen n umiḍan + push: ṭṭef-d tilγa-ik yettwademren + read: γeṛ akk isefka n umiḍan-ik read:accounts: ẓer isallen n yimiḍanen read:blocks: ẓer imiḍanen i tesḥebseḍ read:bookmarks: ẓer ticraḍ-ik @@ -95,12 +104,13 @@ kab: read:follows: ẓer imeḍfaṛen-ik read:lists: ẓer tibdarin-ik read:mutes: ẓer wid i tesgugmeḍ - read:notifications: ẓer tilɣa-ik - read:statuses: ẓer meṛṛa tisuffaɣ + read:notifications: ẓer tilγa-ik + read:statuses: ẓer meṛṛa tisuffaγ write: beddel meṛṛa isefka n umiḍan-ik - write:accounts: ẓreg amaɣnu-ik - write:blocks: seḥbes imiḍanen d tɣula + write:accounts: ẓreg amaγnu-ik + write:blocks: seḥbes imiḍanen d tγula write:bookmarks: ad yernu tisuffγin γer ticraḍ write:filters: rnu-d imsizedgen write:follows: ḍfeṛ imdanen write:lists: rnu-d tibdarin + write:media: ad yessali ifayluyen n teγwalt |