diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
| commit | 0ad919b19257b7d8eb447f7955030927d26cdbe6 (patch) | |
| tree | d78bd5ba447da166bb7d97a3df3e6d97902a5cdb /config/locales/kab.yml | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 5187e4e758b0636432d984d1a95a310cac536205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
Diffstat (limited to 'config/locales/kab.yml')
| -rw-r--r-- | config/locales/kab.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/locales/kab.yml b/config/locales/kab.yml index a4ea1f211..1cd5d72d6 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -598,11 +598,13 @@ kab: setup: Sbadu pagination: newer: Amaynut - next: Wayed + next: Γer zdat older: Aqbuṛ prev: Win iɛeddan preferences: other: Wiyaḍ + privacy_policy: + title: Tasertit tabaḍnit relationships: activity: Armud n umiḍan followers: Imeḍfaṛen @@ -670,6 +672,7 @@ kab: preferences: Imenyafen profile: Ameγnu relationships: Imeḍfaṛen akked wid i teṭṭafaṛeḍ + statuses_cleanup: Tukksa tawurmant n tsuffaɣ two_factor_authentication: Asesteb s snat n tarrayin webauthn_authentication: Tisura n teɣlist statuses: |