diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-17 18:37:09 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-17 18:37:09 -0600 |
| commit | 201e82686f86d06e10afb62184a091417b09d5ad (patch) | |
| tree | 419565a2dae93e2fa5bd06726265ff1c457dbaa1 /config/locales/devise.gl.yml | |
| parent | aa2bf07281ba1e41c9e32a760684c15081524a7c (diff) | |
| parent | 7badad7797b487b411a2ab34e0f7413741974bb4 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'config/locales/devise.gl.yml')
| -rw-r--r-- | config/locales/devise.gl.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml index 8a2b5d563..c0fc53834 100644 --- a/config/locales/devise.gl.yml +++ b/config/locales/devise.gl.yml @@ -18,8 +18,12 @@ gl: mailer: confirmation_instructions: subject: 'Mastodon: Instruccións de confirmación para %{instance}' + email_changed: + subject: 'Mastodon: email cambiado' password_change: subject: 'Mastodon: contrasinal cambiado' + reconfirmation_instructions: + subject: 'Mastodon: Confirme email para %{instance}' reset_password_instructions: subject: 'Mastodon: Instruccións para restablecer o contrasinal' unlock_instructions: |