tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
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
This commit is contained in:
Thibaut Girka
2018-05-27 13:20:15 +02:00
parent c2e528916c 63c7b91572
commit 659b8a12ec
51 changed files with 716 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/locales/nl.yml
View File

@ -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" />