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/activerecord.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/activerecord.kab.yml')
| -rw-r--r-- | config/locales/activerecord.kab.yml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/locales/activerecord.kab.yml b/config/locales/activerecord.kab.yml index d6b3c40e4..5b3d06634 100644 --- a/config/locales/activerecord.kab.yml +++ b/config/locales/activerecord.kab.yml @@ -5,12 +5,22 @@ kab: poll: expires_at: Azemz n taggara options: Tifranin + user: + agreement: Amtawa n umeẓlu + email: Tansa imayl + locale: Tutlayt + password: Awal uffir + user/account: + username: Isem n useqdac + user/invite_request: + text: Taɣzent errors: models: account: attributes: username: invalid: isekkilen, uṭṭunen d yijerriden n wadda kan + reserved: yettwaṭṭef status: attributes: reblog: |