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.nl.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.nl.yml')
-rw-r--r-- | config/locales/devise.nl.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml index 8c2c7b6a1..57e85a7b5 100644 --- a/config/locales/devise.nl.yml +++ b/config/locales/devise.nl.yml @@ -19,8 +19,12 @@ nl: mailer: confirmation_instructions: subject: 'Mastodon: E-mail bevestigen voor %{instance}' + email_changed: + subject: 'Mastodon: E-mailadres is veranderd' password_change: subject: 'Mastodon: Wachtwoord veranderd' + reconfirmation_instructions: + subject: 'Mastodon: Bevestig het e-mailadres voor %{instance}' reset_password_instructions: subject: 'Mastodon: Wachtwoord opnieuw instellen' unlock_instructions: |