diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
| commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
| tree | 0b8c7011810b4a97523c2c63816735e519f0682c /config/locales/simple_form.kab.yml | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.
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 06b4cfa69..d76af2c57 100644 --- a/config/locales/simple_form.kab.yml +++ b/config/locales/simple_form.kab.yml @@ -33,6 +33,8 @@ kab: value: Agbur account_migration: acct: Tansa n umiḍan amaynut + account_warning_preset: + title: Azwel admin_account_action: send_email_notification: Sileɣ aseqdac s imaylen type: Tigawt @@ -42,6 +44,7 @@ kab: silence: Sgugem announcement: ends_at: Tagara n tedyant + text: Alɣu defaults: avatar: Avaṭar bot: Wagi d amiḍan aṛubut @@ -58,6 +61,7 @@ kab: locked: Rgel amiḍan max_uses: Amḍan afellay n iseqdacen new_password: Awal uffir amaynut + note: Tameddurt otp_attempt: Tangalt n snat n tarayin password: Awal uffir setting_default_language: Tutlayt n tira |