diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /config/locales/devise.eu.yml | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'config/locales/devise.eu.yml')
| -rw-r--r-- | config/locales/devise.eu.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/locales/devise.eu.yml b/config/locales/devise.eu.yml index 2160f2243..473246d8a 100644 --- a/config/locales/devise.eu.yml +++ b/config/locales/devise.eu.yml @@ -47,9 +47,17 @@ eu: subject: 'Mastodon: Pasahitza berrezartzeko argibideak' title: Pasahitza berrezartzea two_factor_disabled: + explanation: Bi faktoreetako autentifikazioa desgaitu da zure kontuan. Orain saioa hasi daiteke e-mail helbidea eta pasahitza bakarrik erabilita. + subject: 'Mastodon: Bi faktoreetako autentifikazioa desgaituta' title: 2FA desgaituta two_factor_enabled: + explanation: Bi faktoreetako autentifikazioa gaitu da zure kontuan. Token bat sortu du lotutako TOTP aplikazioak eta saioa hasteko eskatuko da. + subject: 'Mastodon: Bi faktoreetako autentifikazioa gaituta' title: 2FA gaituta + two_factor_recovery_codes_changed: + explanation: Aurreko kodeak baliogabetu dira eta berriak sortu dira. + subject: 'Mastodon: Bi faktoreetako berreskuratze kodeak birsortuta' + title: 2FA berreskuratze kodeak aldatuta unlock_instructions: subject: 'Mastodon: Desblokeatzeko argibideak' omniauth_callbacks: |