merge conflicts

lektura
max.mehl 2017-09-08 16:02:17 +02:00
commit 3b440024f6
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@ If you opted-in to having your name added to the public list, your name will app
## Next Steps ## Next Steps
Please help us by giving your signature a huge impact and [share this campaign](../../#spread) it with your friends. Together we will encourage decision makers in politics and public administrations to make Free and Open Source Software licenses for newly funded software the standard setting in the public sector all over Europe. Please help us by giving your signature a huge impact and [share this campaign](../../#spread) with your friends. Together we will encourage decision makers in politics and public administrations to make Free and Open Source Software licenses for newly funded software the standard setting in the public sector all over Europe.
You can also [order stickers and informational material](https://fsfe.org/promo#pmpc) from the Free Software Foundation Europe. You can also [order stickers and informational material](https://fsfe.org/promo#pmpc) from the Free Software Foundation Europe.

View File

@ -86,7 +86,7 @@
# Action section # Action section
[Languages.nl.action] [Languages.nl.action]
# headline = "Tell Your Representatives!" # headline = "Tell Your Representatives!"
# subheadline = "This is our demand: **“Implement legislation requiring that publicly financed software developed for the public sector be made publicly available under a [Free and Open Source Software](https://fsfe.org/freesoftware/basics/summary.html 'Free Software gives everybody the rights to use, study, share and improve software. These rights help support other fundamental freedoms like freedom of speech, press and privacy.') licence.”**" # subheadline = "This is our demand: **“Implement legislation requiring that publicly financed software developed for the public sector be made publicly available under a [Free and Open Source Software](https://fsfe.org/about/mission.html 'Free Software gives everybody the rights to use, study, share and improve software. These rights help support other fundamental freedoms like freedom of speech, press and privacy.') licence.”**"
# description = "**$ORGS organisations** and **$INDS individuals** support this call for action by signing our [open letter](openletter/). You can help us make a much bigger impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." # description = "**$ORGS organisations** and **$INDS individuals** support this call for action by signing our [open letter](openletter/). You can help us make a much bigger impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration."
headline = "TODO: Tell Your Representatives!" headline = "TODO: Tell Your Representatives!"
# In "subheadline", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark # In "subheadline", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark