diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
| commit | e855df149bd2f19729af48cd5f452fa3972273f8 (patch) | |
| tree | 4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /config/locales/simple_form.kab.yml | |
| parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
| parent | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
Diffstat (limited to 'config/locales/simple_form.kab.yml')
| -rw-r--r-- | config/locales/simple_form.kab.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml index a6242951f..4327fcc8e 100644 --- a/config/locales/simple_form.kab.yml +++ b/config/locales/simple_form.kab.yml @@ -78,6 +78,7 @@ kab: setting_theme: Asental n wesmel setting_use_pending_items: Askar aleγwayan sign_in_token_attempt: Tangalt n tɣellist + type: Anaw n uktar username: Isem n useqdac username_or_email: Isem n useqdac neγ imal whole_word: Awal akk @@ -89,12 +90,15 @@ kab: text: Acimi tebγiḍ ad ternuḍ iman-ik? ip_block: comment: Awennit + ip: IP severities: no_access: Sewḥel anekcum severity: Alugen notification_emails: mention: Yuder-ik·em-id walbɛaḍ reblog: Yella win yesselhan adda-dik·im + rule: + text: Alugen tag: name: Ahacṭag 'no': Ala |