From eb97bd8af6c9a06a52cc8b12d05ac9ea1aa5370a Mon Sep 17 00:00:00 2001 From: Quenty31 <33203663+Quenty31@users.noreply.github.com> Date: Wed, 8 Nov 2017 15:19:49 +0100 Subject: [PATCH] i10n OC: Memorial (#5615) + #5467 (#5623) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615) --- .../user_mailer/reset_password_instructions.oc.html.erb | 2 +- .../user_mailer/reset_password_instructions.oc.text.erb | 2 +- config/locales/oc.yml | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/user_mailer/reset_password_instructions.oc.html.erb b/app/views/user_mailer/reset_password_instructions.oc.html.erb index 6c775b3a16..92e4b8f8b7 100644 --- a/app/views/user_mailer/reset_password_instructions.oc.html.erb +++ b/app/views/user_mailer/reset_password_instructions.oc.html.erb @@ -1,6 +1,6 @@

Bonjorn <%= @resource.email %> !

-

Qualqu’un a demandat la reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.

+

Qualqu’un a demandat la reïnicializacion de vòstre senhal per Mastodon. Podètz realizar la reïnicializacion en clicant sul ligam çai-jos.

<%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %>

diff --git a/app/views/user_mailer/reset_password_instructions.oc.text.erb b/app/views/user_mailer/reset_password_instructions.oc.text.erb index 26432d2df5..5a5219589b 100644 --- a/app/views/user_mailer/reset_password_instructions.oc.text.erb +++ b/app/views/user_mailer/reset_password_instructions.oc.text.erb @@ -1,6 +1,6 @@ Bonjorn <%= @resource.email %> ! -Qualqu’un a demandat la reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.

+Qualqu’un a demandat la reïnicializacion de vòstre senhal per Mastodon. Podètz realizar la reïnicializacion en clicant sul ligam çai-jos.

<%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %> diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 8e7602106b..914cc7e9d6 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -62,11 +62,15 @@ oc: by_domain: Domeni confirm: Confirmar confirmed: Confirmat + disable: Desactivar disable_two_factor_authentication: Desactivar 2FA + disabled: Desactivat display_name: Escais-nom domain: Domeni edit: Modificar email: Corrièl + enable: Activar + enabled: Activat feed_url: Flux URL followers: Seguidors followers_url: URL dels seguidors @@ -78,7 +82,9 @@ oc: local: Locals remote: Alonhats title: Emplaçament + login_status: Estat formulari de connexion media_attachments: Mèdias ajustats + memorialize: Passar en memorial moderation: all: Tot silenced: Rescondut @@ -134,6 +140,7 @@ oc: listed: Listat new: title: Ajustar un nòu emoji personal + overwrite: Remplaçar shortcode: Acorchi shortcode_hint: Almens 2 caractèrs, solament alfanumerics e jonhent bas title: Emojis personals @@ -456,6 +463,7 @@ oc: following: Lista de mond que seguètz muting: Lista de mond que volètz pas legir upload: Importar + in_memoriam_html: En Memòria. landing_strip_html: "%{name} utiliza %{link_to_root_path}. Podètz lo/la sègre o interagir amb el o ela s’avètz un compte ont que siasque sul fediverse." landing_strip_signup_html: S’es pas lo cas, podètz vos marcar aquí. media_attachments: