diff options
author | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
commit | f9d000ebaec7732d5fcd46aa6685108a2619966b (patch) | |
tree | 9593841cf520b117ca4c3d5b68b19e9124c852da /config/locales/oc.yml | |
parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
parent | c6598b17d9212c2d48395da73fa9529025d704cc (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
Diffstat (limited to 'config/locales/oc.yml')
-rw-r--r-- | config/locales/oc.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 18d81bae3..763a59fbb 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -953,6 +953,7 @@ oc: trillion: T otp_authentication: enable: Activar + setup: Parametrar pagination: newer: Mai recents next: Seguent @@ -1077,6 +1078,7 @@ oc: profile: Perfil relationships: Abonaments e seguidors two_factor_authentication: Autentificacion en dos temps + webauthn_authentication: Claus de seguretat spam_check: spam_detected: Aquò es un senhalament automatic. D’spam es estat detectat. statuses: @@ -1220,7 +1222,9 @@ oc: default: Lo %e %B de %Y a %Ho%M month: "%B de %Y" two_factor_authentication: + add: Ajustar disable: Desactivar + edit: Modificar enabled: Autentificacion en dos temps activada enabled_success: L’autentificacion en dos temps es ben activada generate_recovery_codes: Generar los còdis de recuperacion @@ -1279,3 +1283,5 @@ oc: verification: explanation_html: 'Podètz <strong>verificar vosautres meteisses coma proprietari dels ligams per las metadonadas de vòstre perfil</strong>. Per aquò far, lo site Web ligat deu conténer un ligam cap a vòstre perfil Mastodon. Lo ligam <strong>deu</strong> aver un atribut <code>rel="me"</code>. Lo contengut tèxte del ligam impòrta pas. Vaquí un exemple :' verification: Verificacion + webauthn_credentials: + registered_on: Inscripcion del %{date} |