diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-09 17:43:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-10 00:03:28 +0200 |
| commit | 1c9c0167b7ea7dd03ef233a085adc0a6ef1b2527 (patch) | |
| tree | ccfcb53c4ddb61d7ef3158d29403ff7cd6516e55 /config/locales/simple_form.oc.yml | |
| parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
| parent | ac788ad47e32a3cf84a46ac87f84f376185cdad4 (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
Diffstat (limited to 'config/locales/simple_form.oc.yml')
| -rw-r--r-- | config/locales/simple_form.oc.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 4ca58c102..c80f85cce 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -41,7 +41,7 @@ oc: header: Bandièra locale: Lenga locked: Far venir lo compte privat - max_uses: Limit d’utilizacion + max_uses: Limit d’utilizacions new_password: Nòu senhal note: Bio otp_attempt: Còdi Two-factor |