diff options
author | David Yip <yipdw@member.fsf.org> | 2018-06-02 16:15:36 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-06-02 16:15:36 -0500 |
commit | 3550470c18425e80a322e6fe56245c9ede3d0689 (patch) | |
tree | 10c7539e0bf80a9a5d20aa2c8acf227803d3789b /config/locales/devise.nl.yml | |
parent | a641d1b5b8e9f20104ab16e5419e6dee4e5af37f (diff) | |
parent | 00512ecf87e1098f5632eeec2cd116344a787523 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.
Diffstat (limited to 'config/locales/devise.nl.yml')
-rw-r--r-- | config/locales/devise.nl.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml index ce87c393f..b21798deb 100644 --- a/config/locales/devise.nl.yml +++ b/config/locales/devise.nl.yml @@ -20,7 +20,7 @@ nl: confirmation_instructions: action: E-mailadres verifiëren explanation: Je hebt een account op %{host} aangemaakt en met één klik kun je deze activeren. Wanneer jij dit account niet hebt aangemaakt, mag je deze e-mail negeren. - extra_html: Bekijk ook de <a href="%{terms_path}">regels van de Mastodonserver</a> en <a href="%{policy_path}">onze gebruikersvoorwaarden</a>. + extra_html: Bekijk ook de <a href="%{terms_path}">regels van de Mastodonserver</a> en <a href="%{policy_path}">onze gebruiksvoorwaarden</a>. subject: 'Mastodon: E-mail bevestigen voor %{instance}' title: E-mailadres verifiëren email_changed: |