diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
| commit | 659b8a12ece7110608ee84748e57647c08d1dbda (patch) | |
| tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /config/locales/nl.yml | |
| parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
| parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes
Diffstat (limited to 'config/locales/nl.yml')
| -rw-r--r-- | config/locales/nl.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 6eb96c32c..1fe3b5472 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -283,7 +283,7 @@ nl: create_and_resolve: Oplossen met opmerking create_and_unresolve: Heropenen met opmerking delete: Verwijderen - placeholder: Beschrijf welke acties zijn ondernomen of andere opmerkingen over deze gerapporteerde toot… + placeholder: Beschrijf welke acties zijn ondernomen of andere gerelateerde opmerkingen… reopen: Gerapporteerde toot heropenen report: 'Gerapporteerde toot #%{id}' report_contents: Inhoud @@ -550,7 +550,7 @@ nl: subject: one: "1 nieuwe melding sinds jouw laatste bezoek \U0001F418" other: "%{count} nieuwe meldingen sinds jouw laatste bezoek \U0001F418" - title: Tijdens jouw afwezigheid… + title: Tijdens jouw afwezigheid... favourite: body: 'Jouw toot werd door %{name} als favoriet gemarkeerd:' subject: "%{name} markeerde jouw toot als favoriet" @@ -760,9 +760,13 @@ nl: <hr class="spacer" /> - <h3 id="coppa">Children's Online Privacy Protection Act Compliance</h3> + <h3 id="children">Site usage by children</h3> - <p>Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p> + <p>If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">General Data Protection Regulation</a>) do not use this site.</p> + + <p>If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p> + + <p>Law requirements can be different if this server is in another jurisdiction.</p> <hr class="spacer" /> |