diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
tree | ef366f436ed5180489cc9377268e10328fe9a932 /config/locales/doorkeeper.kab.yml | |
parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Diffstat (limited to 'config/locales/doorkeeper.kab.yml')
-rw-r--r-- | config/locales/doorkeeper.kab.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml index b384b76b1..dd141a10e 100644 --- a/config/locales/doorkeeper.kab.yml +++ b/config/locales/doorkeeper.kab.yml @@ -51,12 +51,12 @@ kab: authorizations: buttons: authorize: Ssireg - deny: Ggami + deny: Aggi error: title: Tella-d tuccḍa new: - able_to: Asnas-agi yezmer - prompt: Eǧǧ i %{client_name} ad yekcem γer umiḍan-ik + able_to: Asnas-agi yezmer ad + prompt: Yessutred wesnan n %{client_name} akečum γer umiḍan-ik title: Tlaq tsiregt show: title: Nγel tangalt n wurag sakkin senteḍ-itt deg usnas. @@ -102,7 +102,7 @@ kab: read:favourites: ẓer ismenyifen-ik read:filters: ẓer imsizedgen-ik read:follows: ẓer imeḍfaṛen-ik - read:lists: ẓer tibdarin-ik + read:lists: ẓer umuγen-ik·im read:mutes: ẓer wid i tesgugmeḍ read:notifications: ẓer tilγa-ik read:statuses: ẓer meṛṛa tisuffaγ @@ -112,5 +112,5 @@ kab: write:bookmarks: ad yernu tisuffγin γer ticraḍ write:filters: rnu-d imsizedgen write:follows: ḍfeṛ imdanen - write:lists: rnu-d tibdarin + write:lists: yesnulfu umuγen write:media: ad yessali ifayluyen n teγwalt |