diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-13 23:53:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 23:53:21 +0200 |
| commit | c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f (patch) | |
| tree | cf6ad8df684977b10ffd0d4a313d6dccb42ac15a /config/locales/simple_form.sl.yml | |
| parent | 80849812d2a03ff9da671a2204bacf0c85f6ab0d (diff) | |
| parent | 0fd7a8b63d6247ff1fe1d305ec712c0a519a52f1 (diff) | |
Merge pull request #1111 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.sl.yml')
| -rw-r--r-- | config/locales/simple_form.sl.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml index 6e07d9b00..2e0495551 100644 --- a/config/locales/simple_form.sl.yml +++ b/config/locales/simple_form.sl.yml @@ -57,7 +57,6 @@ sl: locked: Zaklenjen račun max_uses: Največje število uporabnikov new_password: Novo geslo - note: Bio otp_attempt: Dvofaktorska koda password: Geslo phrase: Ključna beseda ali fraza @@ -97,6 +96,5 @@ sl: report: Pošlji e-pošto, ko je oddana nova prijava 'no': Ne required: - mark: "*" text: zahtevano 'yes': Da |