From f67904c6ec83877b72b8f79ce6abc540fe84e91f Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 12:07:54 +0200 Subject: [PATCH 01/34] make instructions clearer --- README.md | 33 ++++++++++++++++++++++----------- TRANSLATE.md | 30 +++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 10c89d2..af9978e 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ relevant for our build process (Drone, Ansible, Docker, Apache). Visit [TRANSLATE.md](https://git.fsfe.org/pmpc/website/src/master/TRANSLATE.md) for detailed instructions how to translate publiccode.eu. -### Build locally +### Build To see a preview of the website you need to have Hugo installed and be able to execute Bash scripts in your command line. @@ -70,17 +70,28 @@ execute Bash scripts in your command line. computer only. Open [localhost:1313](localhost:1313) in your web browser to see it. -If you want to make changes to the official website, please read [our -Git guides](https://wiki.fsfe.org/TechDocs/Git). There you'll find out -about the necessary commands pull, status, add, commit, or push. +If you want to make changes to the official website, please read [our +Git guides](https://wiki.fsfe.org/TechDocs/Git). There you'll find out +about the necessary commands `pull`, `status`, `add`, `commit`, and +`push`. -Beginners can directly commit to the repository which saves them some -steps, but they have to ask @max.mehl or @jonas in advance to give them -the necessary permission. For more experienced Git users we recommend -the Fork & Pull Request workflow, which you'll also find in the [wiki's -Git Guides -section](https://wiki.fsfe.org/TechDocs/Git#Guides_on_specific_actions) -(not available yet). +There are three ways to upload/edit files in the Git repository, sorted +by preference and complexity: +1. For more experienced Git users we recommend the Fork & Pull Request + workflow, which you'll also find in the [wiki's Git Guides + section](https://wiki.fsfe.org/TechDocs/Git#Guides_on_specific_actions) + (not available yet). +2. Advanced and interested beginners can directly commit to the + repository ("push to master") which saves them some steps, but they + have to ask @max.mehl or @jonas in advance to give them the necessary + permissions. You'll find guides in the [Wiki's Git + section](https://wiki.fsfe.org/TechDocs/Git#Guides_on_specific_actions). +3. Beginners can work directly in the [web + interface](https://git.fsfe.org/pmpc/website) of git.fsfe.org. As + soon as you have given write permissions by @max.mehl or @jonas, you + can edit opened text files and upload/create new files. This is the + least preferred option because it may cause conflicts, but it is easy + and may give you some first experience with the system. ## Important file paths diff --git a/TRANSLATE.md b/TRANSLATE.md index 10ea6cd..1f743f1 100644 --- a/TRANSLATE.md +++ b/TRANSLATE.md @@ -15,7 +15,10 @@ to be a programmer to get Git working for you :) What you should have: - An account on git.fsfe.org -- Know how to clone, pull, commit, and push with Git (read the [general Git guides](https://wiki.fsfe.org/TechDocs/Git) and/or the [typical Git workflow](https://wiki.fsfe.org/TechDocs/Mainpage/Editing#Edit_and_push_files_to_the_website)) +- Know how to clone, pull, commit, and push with Git (read the [general + Git guides](https://wiki.fsfe.org/TechDocs/Git) and/or the [typical + Git + workflow](https://wiki.fsfe.org/TechDocs/Mainpage/Editing#Edit_and_push_files_to_the_website)) - Optional: Hugo installed on your computer - Optional: The ability to run Bash scripts from command line @@ -78,16 +81,25 @@ logos, and other communication is using this brand. So if you can, just stick to the English term. -## Finished? What's next +## Where to upload the translations? -Before submitting the translations you can test them locally if you have Hugo -installed and are able to execute Bash scripts on your command line. Please -refer to README.me for instructions. +**Before submitting** the translations you can test them locally if you +have Hugo installed and are able to execute Bash scripts on your command +line. Please refer to [build section in +README.me](https://git.fsfe.org/pmpc/website/src/master/README.md#build) +for instructions. -You're welcome to work with the Git repository to upload your translations. If -you feel confident enough with Git, please open a pull request of a separate -branch in this repository or your fork. @max.mehl can help you if you have -questions or lack permissions. +You're welcome to work with the Git repository to upload your +translations. If you feel confident enough with Git, please open a pull +request of a separate branch in this repository or your fork. @max.mehl +can help you if you have questions or lack permissions. + +For Git, there are three ways which are explained in the aforementioned +build README section: +1. Git Pull Requests from your repository forks +2. Git pushes to the central master branch (requires write access) +3. Edit the files directly in the git.fsfe.org web interface (requires + write access) If you are unsure, you can also send the translations to [FSFE's translators list](https://lists.fsfe.org/mailman/listinfo/translators) to let them From 74543f1be81f754e886d53cabf744d02b082dedc Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 12:14:50 +0200 Subject: [PATCH 02/34] remove gitignore --- site/data/signatures/.gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 site/data/signatures/.gitignore diff --git a/site/data/signatures/.gitignore b/site/data/signatures/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/site/data/signatures/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore From 7eeeea6675ac91b5e668fea5fc5efaca9e4fb1cc Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 12:15:17 +0200 Subject: [PATCH 03/34] signature file with test data for syntax check --- site/data/signatures/signatures.json | 236 +++++++++++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 site/data/signatures/signatures.json diff --git a/site/data/signatures/signatures.json b/site/data/signatures/signatures.json new file mode 100644 index 0000000..3345868 --- /dev/null +++ b/site/data/signatures/signatures.json @@ -0,0 +1,236 @@ +[{ + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nHey Max! Lets see if this works.\n\nThank you,\n\nTest Testson\nSweden" + }, + "reply-to": null, + "include_vars": { + "name": "Test Testson", + "confirm": "jonas@example.com", + "country": "Sweden", + "zip": "64632", + "comment": "Hey Max! Lets see if this works.", + "permissionPriv": "yes", + "permissionNews": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}, { + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nHey Max! Lets see if this works, AGAIN!\n\nThank you,\n\nTest Testson 2\nSweden" + }, + "reply-to": null, + "include_vars": { + "name": "Test Testson 2", + "confirm": "jonas@example.com", + "country": "Sweden", + "zip": "64632", + "comment": "Hey Max! Lets see if this works, AGAIN!", + "permissionPriv": "yes", + "permissionNews": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}, { + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nHey Max! Lets see if this works, AGAIN! With timestamp.\n\nThank you,\n\nTest Testson 2\nSweden" + }, + "reply-to": null, + "include_vars": { + "name": "Test Testson 2", + "confirm": "jonas@example.com", + "country": "Sweden", + "zip": "64632", + "comment": "Hey Max! Lets see if this works, AGAIN! With timestamp.", + "permissionPriv": "yes", + "permissionNews": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}, { + "timestamp": 1504267755.763549, + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nHey Max! Lets see if this works, AGAIN! With timestamp.\n\nThank you,\n\nTest Testson 2\nSweden" + }, + "reply-to": null, + "include_vars": { + "name": "Test Testson 2", + "confirm": "jonas@example.com", + "country": "Sweden", + "zip": "64632", + "comment": "Hey Max! Lets see if this works, AGAIN! With timestamp.", + "permissionPriv": "yes", + "permissionNews": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}, { + "timestamp": 1504523661.6949115, + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\n\n\nThank you,\n\nMax1\nBelgium" + }, + "reply-to": null, + "include_vars": { + "name": "Max1", + "confirm": "mail@example.org", + "country": "Belgium", + "zip": "12345", + "comment": "", + "permissionPriv": "yes", + "permissionNews": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}, { + "timestamp": 1504525516.8869548, + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nmail with + and not appear in list\n\nThank you,\n\nMax3\nNetherlands" + }, + "reply-to": null, + "include_vars": { + "name": "Max3", + "confirm": "tech+blah@example.org", + "country": "Netherlands", + "zip": "66816", + "comment": "mail with + and not appear in list", + "permissionPriv": "yes", + "permissionNews": "yes", + "url": "", + "action": "sign" + } +}, { + "timestamp": 1504525520.145522, + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nThis is the same email as Max1\n\nThank you,\n\nMax2\nBulgaria" + }, + "reply-to": null, + "include_vars": { + "name": "Max2", + "confirm": "mail@example.org", + "country": "Bulgaria", + "zip": "68168", + "comment": "This is the same email as Max1", + "permissionPriv": "yes", + "permissionNews": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}, { + "timestamp": 1504601254.3506515, + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nYeah\n\nThank you,\n\nFan\nCzech Republic" + }, + "reply-to": null, + "include_vars": { + "name": "Fan", + "confirm": "tech@example.org", + "country": "Czech Republic", + "zip": "26168", + "comment": "Yeah", + "permissionPriv": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}, { + "timestamp": 1504601626.4398348, + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nTest again\n\nThank you,\n\nTest2\nPortugal" + }, + "reply-to": null, + "include_vars": { + "name": "Test2", + "confirm": "tech+2@example.org", + "country": "Portugal", + "zip": "6168", + "comment": "Test again", + "permissionPriv": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}, { + "timestamp": 1504601726.8100023, + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\nCrazy <3 \"\" symbols ' // %$ \\\n\nThank you,\n\nEdge case\nLuxembourg" + }, + "reply-to": null, + "include_vars": { + "name": "HIDDEN", + "confirm": "tech@example.org", + "country": "Luxembourg", + "zip": "51684168", + "comment": "Crazy <3 \"\" symbols ' // %$ \\", + "permissionPriv": "yes", + "permissionNews": "yes", + "url": "", + "action": "sign" + } +}, { + "timestamp": 1504601815.3437912, + "from": "admin@example.com", + "to": ["tech@example.org"], + "subject": "New signature to PMPC", + "content": { + "html": null, + "plain": "Dear FSFE,\n\nI agree to sign the open letter, calling for implementing legislation\nrequiring that, as a default setting, publicly financed software must\nbe made publicly available under a Free Software licence.\n\n\u00d1\u0081\u00d1\u0082\u00d1\u0080\u00d0\u00b0\u00d0\u00bd\u00d0\u00b8\u00d1\u0086\u00d1\u008b \u00d0\u00bc\u00d0\u00be\u00d0\u00b3 \u00e5\u009f\u009f\u00e5\u0090\u008d\u00e7\u009a\u0084\u00e7\u0094\u00a8\u00e6\u0088\u00b6\u00e4\u00b8\u008d\u00e5\u008f\u0097\u00e9\u0099\u0090\u00e5\u0088\u00b6\n\nThank you,\n\n \u00ce\u0091\u00cf\u0085\u00cf\u0084\u00ce\u00ae \u00ce\u00b7 \u00cf\u0083\u00ce\u00b5\u00ce\u00bb\u00ce\u00af\u00ce\u00b4\u00ce\u00b1\n" + }, + "reply-to": null, + "include_vars": { + "name": " \u00ce\u0091\u00cf\u0085\u00cf\u0084\u00ce\u00ae \u00ce\u00b7 \u00cf\u0083\u00ce\u00b5\u00ce\u00bb\u00ce\u00af\u00ce\u00b4\u00ce\u00b1", + "confirm": "mail@example.org", + "country": "", + "zip": "56165", + "comment": "\u00d1\u0081\u00d1\u0082\u00d1\u0080\u00d0\u00b0\u00d0\u00bd\u00d0\u00b8\u00d1\u0086\u00d1\u008b \u00d0\u00bc\u00d0\u00be\u00d0\u00b3 \u00e5\u009f\u009f\u00e5\u0090\u008d\u00e7\u009a\u0084\u00e7\u0094\u00a8\u00e6\u0088\u00b6\u00e4\u00b8\u008d\u00e5\u008f\u0097\u00e9\u0099\u0090\u00e5\u0088\u00b6", + "permissionPriv": "yes", + "permissionNews": "yes", + "permissionPub": "yes", + "url": "", + "action": "sign" + } +}] From 929b3a297dbec3d2f17ea7f9d0f707a6e0553424 Mon Sep 17 00:00:00 2001 From: "erik.ds" Date: Fri, 8 Sep 2017 12:23:20 +0200 Subject: [PATCH 04/34] Added Open Letter in French --- site/content/openletter.fr.md | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 site/content/openletter.fr.md diff --git a/site/content/openletter.fr.md b/site/content/openletter.fr.md new file mode 100644 index 0000000..8fe5a98 --- /dev/null +++ b/site/content/openletter.fr.md @@ -0,0 +1,41 @@ +--- +title: Lettre ouverte +type: page +layout: subpage +sigtable: true +tableName: Nom +tableCountry: Pays +tableComment: Commentaire +--- + +Les logiciels financés par les fonds publics doivent être des [Logiciels Libres/Open Source][fs]. Bien que de nombreuses raisons puissent le justifier, beaucoup de responsables politiques ne sont pas encore conscients de l'intérêt des logiciels. + +{{< fsdefinition type="box">}} + + + +C'est là que vous pouvez nous aider ! Signez la lettre ouverte pour donner plus de poids à notre message, comme **{{< count type="signatures" >}} personnes** et **{{< count type="organisations" >}} organisations** l'ont fait avant vous. Nous la remettrons signée à vos élus et nous veillerons à ce qu'ils puissent comprendre que : Argent public ? Code Public ! + +> ## Argent Public ? Code Public ! +> +> Les services numériques offerts et utilisés par nos administrations publiques sont les infrastructures critiques du 21e siècle des nations démocratiques. Afin d’établir des systèmes fiables, les institutions publiques doivent faire en sorte d’avoir le contrôle entier du logiciel et des systèmes informatiques au cœur de notre infrastructure numérique d’État. Ce n’est pourtant pas le cas actuellement pour des raisons de licences logicielles restrictives qui: +> +> * Interdisent le partage et l’échange du code financé par le contribuable. Cela empêche la coopération entre les administrations publiques et ralentit tout développement ultérieur. +> * Soutiennent des monopoles et sont une entrave à la concurrence. En conséquence, de nombreuses administrations deviennent dépendantes d’une poignée d’entreprises. +> * Le Logiciel Libre et Open Source garantit que le code source reste accessible afin que les portes dérobées et les failles de sécurité puissent être réparées sans dépendre d’un unique prestataire de services. + +> Nous avons besoin de logiciels qui favorisent l’échange de bonnes idées et de solutions. C’est ainsi que nous pourrons améliorer les services informatiques pour tous en Europe. Nous avons besoin de logiciels qui aident les administrations publiques à reprendre le plein contrôle de leur infrastructure numérique et stratégique, leur permettant de devenir et rester indépendant d’une poignée d’entreprises. C’est pourquoi nous appelons nos élus à soutenir le Logiciel Libre et Open Source dans les administrations publiques car: +> +> * Le Logiciel Libre et Open Source est un bien public moderne qui permet à chacun d'utiliser, d'étudier, de partager et d'améliorer librement les applications que nous utilisons quotidiennement. +> * Les licences du Logiciel Libre et Open Source offrent des garanties pour ne pas subir le cloisonnement captif des entreprises spécifiques qui utilisent des licences restrictives pour entraver la concurrence. +> * Le Logiciel Libre et Open Source garantit que le code source reste accessible afin que les portes dérobées et les failles de sécurité puissent être réparées sans dépendre d’un unique prestataire de services. +> +> Les institutions publiques sont financées par l’impôt. Elles doivent s’assurer de dépenser les fonds le plus efficacement possible. S’il s’agit d’argent public, le code devrait être également public. +> +> C'est pourquoi nous, les soussignés, appelons nos représentants à : +> +> **“Mettre en œuvre une législation qui requiert que le logiciel financé par le contribuable pour le secteur public soit disponible publiquement sous une licence de Logiciel Libre et Open Source.”** + +[fs]: https://fsfe.org/freesoftware/basics/summary.fr.html "Les Logiciels Libres donnent à tous les droits d'utiliser, comprendre, modifier et partager les logiciels. Ces droits permettent de soutenir d'autres droits fondamentaux tels que la liberté d'expression, la liberté de la presse et la vie privée." + + \ No newline at end of file From 8d05cc1ffaf41ae463d80928ba51979f70c55d8d Mon Sep 17 00:00:00 2001 From: "erik.ds" Date: Fri, 8 Sep 2017 12:26:33 +0200 Subject: [PATCH 05/34] Edited Open Letter in French --- site/content/openletter.fr.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/site/content/openletter.fr.md b/site/content/openletter.fr.md index 8fe5a98..ac525a2 100644 --- a/site/content/openletter.fr.md +++ b/site/content/openletter.fr.md @@ -3,9 +3,7 @@ title: Lettre ouverte type: page layout: subpage sigtable: true -tableName: Nom -tableCountry: Pays -tableComment: Commentaire + --- Les logiciels financés par les fonds publics doivent être des [Logiciels Libres/Open Source][fs]. Bien que de nombreuses raisons puissent le justifier, beaucoup de responsables politiques ne sont pas encore conscients de l'intérêt des logiciels. From 7d876017f6a5ef652eae1a9e5486171ca6a30cbe Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 12:28:22 +0200 Subject: [PATCH 06/34] purposefully breaking the build --- site/config-static.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/config-static.toml b/site/config-static.toml index 0f0d3bf..6aba6a3 100644 --- a/site/config-static.toml +++ b/site/config-static.toml @@ -1,3 +1,4 @@ +breakingdasystem = " baseurl = "/" title = "Public Money, Public Code" theme = "hugo-creative-theme" From 52b8d69d5b9306d03c64856213d022c315419325 Mon Sep 17 00:00:00 2001 From: "erik.ds" Date: Fri, 8 Sep 2017 12:29:11 +0200 Subject: [PATCH 07/34] Edited for Appearance --- site/content/openletter.fr.md | 1 - 1 file changed, 1 deletion(-) diff --git a/site/content/openletter.fr.md b/site/content/openletter.fr.md index ac525a2..783dcf4 100644 --- a/site/content/openletter.fr.md +++ b/site/content/openletter.fr.md @@ -3,7 +3,6 @@ title: Lettre ouverte type: page layout: subpage sigtable: true - --- Les logiciels financés par les fonds publics doivent être des [Logiciels Libres/Open Source][fs]. Bien que de nombreuses raisons puissent le justifier, beaucoup de responsables politiques ne sont pas encore conscients de l'intérêt des logiciels. From 0afa7026d5f57c28fe6d6e4ca9022c2849cd1016 Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 12:34:42 +0200 Subject: [PATCH 08/34] revert 7d87601 and make build work again --- site/config-static.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/site/config-static.toml b/site/config-static.toml index 6aba6a3..0f0d3bf 100644 --- a/site/config-static.toml +++ b/site/config-static.toml @@ -1,4 +1,3 @@ -breakingdasystem = " baseurl = "/" title = "Public Money, Public Code" theme = "hugo-creative-theme" From 8dbc333b5cfb7c6a066d6a87b21278ff766535b9 Mon Sep 17 00:00:00 2001 From: suhrj Date: Fri, 8 Sep 2017 12:43:45 +0200 Subject: [PATCH 09/34] Fix spelling of Free Software/Open Source --- site/content/openletter.de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/openletter.de.md b/site/content/openletter.de.md index cb34718..8316f18 100644 --- a/site/content/openletter.de.md +++ b/site/content/openletter.de.md @@ -25,7 +25,7 @@ Hier kannst du helfen! Unterzeichne den offenen Brief, um unserer Botschaft mehr > > * Freie Software/Open Source ein modernes öffentliches Gut ist, das es jedermann erlaubt, Anwendungen, die wir täglich verwenden, frei zu verwenden, zu verstehen, zu teilen und zu verbessern. > * Freie-Software- und Open-Source-Lizenzen Schutz vor einer Beschränkung auf Dienstleistungen bestimmter Unternehmen bieten, welche restriktive Lizenzen verwenden, um den Wettbewerb zu behindern. -> * Freie Software Open Source sicherstellt, dass der Quellcode zugänglich ist, so dass Hintertüren und Sicherheitslücken behoben werden können, ohne von einem bestimmten Dienstleister abhängig zu sein. +> * Freie Software/Open Source sicherstellt, dass der Quellcode zugänglich ist, so dass Hintertüren und Sicherheitslücken behoben werden können, ohne von einem bestimmten Dienstleister abhängig zu sein. > > Öffentliche Einrichtungen werden durch Steuern finanziert. Sie müssen sicherstellen, dass sie die Mittel so effizient wie möglich ausgeben. Wenn es sich um öffentliche Gelder handelt, sollte auch der Code öffentlich sein! > From f55f6d75294a12753a613017ed2f8de369541a0c Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 12:46:46 +0200 Subject: [PATCH 10/34] link to carmen's Git guide --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index af9978e..6b3c0a1 100644 --- a/README.md +++ b/README.md @@ -78,9 +78,8 @@ about the necessary commands `pull`, `status`, `add`, `commit`, and There are three ways to upload/edit files in the Git repository, sorted by preference and complexity: 1. For more experienced Git users we recommend the Fork & Pull Request - workflow, which you'll also find in the [wiki's Git Guides - section](https://wiki.fsfe.org/TechDocs/Git#Guides_on_specific_actions) - (not available yet). + workflow, which you'll also find a detailed [wiki's Git + Guide](https://wiki.fsfe.org/TechDocs/Git/Guide:Workflow) for. 2. Advanced and interested beginners can directly commit to the repository ("push to master") which saves them some steps, but they have to ask @max.mehl or @jonas in advance to give them the necessary From 6a37716468197482bc8c830b9074ceb88564bfdd Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 12:55:43 +0200 Subject: [PATCH 11/34] note that adding translations to build file is necessary --- README.md | 5 ++++- site/build/build.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b3c0a1..b6eba4e 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,10 @@ execute Bash scripts in your command line. 2. In the terminal, execute `cd site/` to navigate in the right directory for hugo's website build. You are now in `~/FSFE/PMPC/website/site/` -3. In your terminal, execute `./build/build.sh server`. This command +3. Only if you added a new languages which doesn't exist on the website yet: + Add you 2-letter language code in line 4 of the [build.sh + file](https://git.fsfe.org/pmpc/website/src/master/site/build/build.sh#L4). +4. In your terminal, execute `./build/build.sh server`. This command will build the website and enable you to browse the result on your computer only. Open [localhost:1313](localhost:1313) in your web browser to see it. diff --git a/site/build/build.sh b/site/build/build.sh index e7e9047..68b4a06 100755 --- a/site/build/build.sh +++ b/site/build/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # Put all available languages here, except "en". Separated by spaces -TRANSLATIONS="de" +TRANSLATIONS="de fr" basedir="${0%/*}/.." cd "$basedir" From 06aad04eff1136151048f80f9bc64fd74704a691 Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 13:22:40 +0200 Subject: [PATCH 12/34] sync with EN version --- site/languages/strings.XY.toml.sample | 70 +++++++++++++-------------- site/languages/strings.en.toml | 10 ++-- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/site/languages/strings.XY.toml.sample b/site/languages/strings.XY.toml.sample index d1b2c6a..b941965 100644 --- a/site/languages/strings.XY.toml.sample +++ b/site/languages/strings.XY.toml.sample @@ -5,66 +5,66 @@ languageCode = "xy" # 2-letter code of language (ISO 639-1) languageName = "English" # verbose name of language (e.g. "Français" or "Русский") description = "Public Money, Public Code - A campaign for releasing publicly financed software as Free Software" - fsdefinition = "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." # https://fsfe.org/about/mission.html may help you with translations + fsdefinition = "Free Software gives everybody the right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy." # Navigation -[Languages.XY.navigation] -[Languages.XY.navigation.links] +[Languages.en.navigation] +[Languages.en.navigation.links] start = "Start" about = "About" - arguments = "Arguments" + arguments = "Reasons" action = "Take Action" - spread = "Spread" + spread = "Spread the Word" # Start banner -[Languages.XY.start] - subtitle1 = "Why is software that is programmed with taxpayers' money not released as Free Software?" - subtitle2 = "We want legislation requiring that publicly financed software developed for public sector must 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. If it is public money, it should be public code as well." - subtitle3 = "**Code paid by all people should be available to all people!**" +[Languages.en.start] + subtitle1 = "Why is software created using taxpayers' money not released as Free Software?" + subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." + subtitle3 = "**Code paid by the people should be available to the people!**" # About section -[Languages.XY.about] - headline = "Sounds complex? No, it's super easy!" +[Languages.en.about] + headline = "Sound complicated? It's not. It's super easy!" buttonText = "More advantages" # Arguments section -[Languages.XY.arguments] +[Languages.en.arguments] headline = "Reasons for Public Code" - followup = "Do you believe that Free Software must be the default option for publicly financed software? **Then let's convince your political representatives!**" + followup = "Do you believe that Free Software should be the default option for publicly financed software? **Let's convince your political representatives!**" buttonText = "Sign the Open Letter" -[[Languages.XY.arguments.list]] +[[Languages.en.arguments.list]] icon = "fa-eur" # <-- do not translate this title = "Tax savings" description = "Similar applications don't have to be programmed from scratch every time." -[[Languages.XY.arguments.list]] +[[Languages.en.arguments.list]] icon = "fa-handshake-o" # <-- do not translate this title = "Collaboration" - description = "Efforts on major projects can be joint to share expertise and costs." -[[Languages.XY.arguments.list]] + description = "Efforts on major projects can share expertise and costs." +[[Languages.en.arguments.list]] icon = "fa-users" # <-- do not translate this title = "Serving the public" description = "Applications paid by the public should be available for everyone." -[[Languages.XY.arguments.list]] +[[Languages.en.arguments.list]] icon = "fa-lightbulb-o" # <-- do not translate this title = "Fostering innovation" - description = "With transparent processes others don't have to reinvent the wheel." + description = "With transparent processes, others don't have to reinvent the wheel." # Action section -[Languages.XY.action] +[Languages.en.action] headline = "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 - subheadline = "We demand: **„Implement legislation requiring that publicly financed software developed for public sector must 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.“**" - description = "**$ORGS organisations** and **$INDS individuals** support this call for action by signing our [Open Letter](openletter/). Help us to make an impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." + 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 right to use, study, share and improve software. This right helps 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." -[Languages.XY.action.box] - text = "Already **$INDS SIGNATURES** – sign the Open Letter now!" +[Languages.en.action.box] + text = "Already **$INDS SIGNATURES** – sign the open letter now!" -[Languages.XY.action.form] +[Languages.en.action.form] name = "Name (required)" email = "Email (required)" country = "Your Country" @@ -77,13 +77,13 @@ # Organisations section -[Languages.XY.organisations] +[Languages.en.organisations] headline = "Supporting Organisations" - text = "Following organisations support our [Open Letter](openletter/). If your organisation is also interested in joining the call for Public Code, please [contact us](mailto:contact@fsfe.org)." + text = "The following organisations support our [open letter](openletter/). If your organisation is also interested in joining the call for Public Code, please [contact us](mailto:contact@fsfe.org)." # Spread the word section -[Languages.XY.spread] +[Languages.en.spread] headline = "Spread the word!" promoText = "Order the latest stickers and flyers from FSFE" promoButtonText = "Get promo material" @@ -92,7 +92,7 @@ # Legal Section -[Languages.XY.legal] +[Languages.en.legal] by = "This is a campaign by Free Software Foundation Europe" imprint = "Imprint" privacy = "Privacy" @@ -103,23 +103,23 @@ # Language selection -[Languages.XY.language] +[Languages.en.language] description = "Read this page in another language" # 404 Error Page -[Languages.XY.error] +[Languages.en.error] headline = "Error 404 - Page not found" description = "The page you're looking for does not exist." button = "Back to start page" # Specific sub-pages -[Languages.XY.subpage] -[Languages.XY.subpage.signatures] +[Languages.en.subpage] +[Languages.en.subpage.signatures] headline = "Individual Open Letter Signatures" - description = "Below you find the recent signatures of people who agreed to have their signature be public. Will you be the next?" - allSignatures = "Have a look at [all public signatures](all-signatures/)." + description = "Below are the signatures of the signees who agreed to have their names made public. Be the next one!" + allSignatures = "See [all public signatures](all-signatures/)." tableName = "Name" tableCountry = "Country" tableComment = "Comment" diff --git a/site/languages/strings.en.toml b/site/languages/strings.en.toml index 426b256..b355506 100644 --- a/site/languages/strings.en.toml +++ b/site/languages/strings.en.toml @@ -37,19 +37,19 @@ followup = "Do you believe that Free Software should be the default option for publicly financed software? **Let's convince your political representatives!**" buttonText = "Sign the Open Letter" [[Languages.en.arguments.list]] - icon = "fa-eur" + icon = "fa-eur" # <-- do not translate this title = "Tax savings" description = "Similar applications don't have to be programmed from scratch every time." [[Languages.en.arguments.list]] - icon = "fa-handshake-o" + icon = "fa-handshake-o" # <-- do not translate this title = "Collaboration" description = "Efforts on major projects can share expertise and costs." [[Languages.en.arguments.list]] - icon = "fa-users" + icon = "fa-users" # <-- do not translate this title = "Serving the public" description = "Applications paid by the public should be available for everyone." [[Languages.en.arguments.list]] - icon = "fa-lightbulb-o" + icon = "fa-lightbulb-o" # <-- do not translate this title = "Fostering innovation" description = "With transparent processes, others don't have to reinvent the wheel." @@ -57,6 +57,7 @@ # Action section [Languages.en.action] headline = "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 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 right to use, study, share and improve software. This right helps 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." @@ -74,6 +75,7 @@ permPub = "I want my signature to appear in the [list of signatures](openletter/all-signatures)" submit = "Sign Now!" + # Organisations section [Languages.en.organisations] headline = "Supporting Organisations" From d958cc844c2eebb9c6d332bb1b3010a7d881761f Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 14:51:52 +0200 Subject: [PATCH 13/34] Good portion of Dutch translations --- site/data/share/nl/1-diaspora.yaml | 7 + site/data/share/nl/2-gnusocial.yaml | 10 ++ site/data/share/nl/3-reddit.yaml | 7 + site/data/share/nl/4-twitter.yaml | 8 ++ site/data/share/nl/5-facebook.yaml | 6 + site/data/share/nl/6-support.yaml | 6 + site/languages/strings.nl.toml | 191 ++++++++++++++++++++++++++++ 7 files changed, 235 insertions(+) create mode 100644 site/data/share/nl/1-diaspora.yaml create mode 100644 site/data/share/nl/2-gnusocial.yaml create mode 100644 site/data/share/nl/3-reddit.yaml create mode 100644 site/data/share/nl/4-twitter.yaml create mode 100644 site/data/share/nl/5-facebook.yaml create mode 100644 site/data/share/nl/6-support.yaml create mode 100644 site/languages/strings.nl.toml diff --git a/site/data/share/nl/1-diaspora.yaml b/site/data/share/nl/1-diaspora.yaml new file mode 100644 index 0000000..885755d --- /dev/null +++ b/site/data/share/nl/1-diaspora.yaml @@ -0,0 +1,7 @@ +titleBefore: Deel op +titleAfter: + +# Do not translate below here +id: diaspora +name: Diaspora +userinput: true diff --git a/site/data/share/nl/2-gnusocial.yaml b/site/data/share/nl/2-gnusocial.yaml new file mode 100644 index 0000000..3673f0b --- /dev/null +++ b/site/data/share/nl/2-gnusocial.yaml @@ -0,0 +1,10 @@ +titleBefore: Deel op +titleAfter: +# This "customText" shouldn't have more than 115 characters! +customText: "Als het publiek geld is, dan moet het ook publieke code zijn! Ik steun @fsfe@quitter.no's eis voor #publiccode: " + +# Do not translate below here +id: gnusocial +name: GNU Social +userinput: true + diff --git a/site/data/share/nl/3-reddit.yaml b/site/data/share/nl/3-reddit.yaml new file mode 100644 index 0000000..e70cca7 --- /dev/null +++ b/site/data/share/nl/3-reddit.yaml @@ -0,0 +1,7 @@ +titleBefore: Deel op +titleAfter: + +# Do not translate below here +id: reddit +name: Reddit + diff --git a/site/data/share/nl/4-twitter.yaml b/site/data/share/nl/4-twitter.yaml new file mode 100644 index 0000000..3cff2bd --- /dev/null +++ b/site/data/share/nl/4-twitter.yaml @@ -0,0 +1,8 @@ +titleBefore: Deel op +titleAfter: +# This "customText" must not have more than 115 characters! +customText: "Als het publiek geld is, dan moet het ook publieke code zijn! Ik steun @fsfe's eis voor #publiccode: " + +# Do not translate below here +id: twitter +name: Twitter diff --git a/site/data/share/nl/5-facebook.yaml b/site/data/share/nl/5-facebook.yaml new file mode 100644 index 0000000..190b0a9 --- /dev/null +++ b/site/data/share/nl/5-facebook.yaml @@ -0,0 +1,6 @@ +titleBefore: Deel op +titleAfter: + +# Do not translate below here +id: facebook +name: Facebook diff --git a/site/data/share/nl/6-support.yaml b/site/data/share/nl/6-support.yaml new file mode 100644 index 0000000..7d99c63 --- /dev/null +++ b/site/data/share/nl/6-support.yaml @@ -0,0 +1,6 @@ +name: Word een FSFE supporter! + +# Do not translate below here +id: support +titleBefore: +titleAfter: diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml new file mode 100644 index 0000000..770e79a --- /dev/null +++ b/site/languages/strings.nl.toml @@ -0,0 +1,191 @@ +# == NEDERLANDS == + +# General strings +[Languages.nl] + # languageCode = "en" + # languageName = "English" + # description = "Public Money, Public Code - A campaign for releasing publicly financed software as Free Software" + # fsdefinition = "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." + languageCode = "nl" # 2-letter code of language (ISO 639-1) + languageName = "Nederlands" # verbose name of language (e.g. "Français" or "Русский") + description = "Public Geld, Publieke Code - Een campagne om publiek gefinancieerde software uit te brengen als Vrije Software" + fsdefinition = "Vrije Software geeft iedereen het recht om software te gebruiken, te begrijpen, aan te passen en te delen. Deze rechten helpen het ondersteunen van andere fundamentele vrijheden zoals de vrijheid van meningsuiting, pers en privacy." + + +# Navigation +[Languages.nl.navigation] +[Languages.nl.navigation.links] + # start = "Start" + # about = "About" + # arguments = "Reasons" + # action = "Take Action" + # spread = "Spread the Word" + start = "Begin" + about = "Over" + arguments = "Stellingen" + action = "Onderneem Actie" + spread = "Deel" + + +# Start banner +[Languages.nl.start] + # subtitle1 = "Why is software created using taxpayers' money not released as Free Software?" + # subtitle2 = "We want 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. If it is public money, it should be public code as well." + # subtitle3 = "**Code paid by the people should be available to the people!**" + subtitle1 = "Waarom is software die geschreven is met belastinggeld niet beschikbaar als Vrije Software?" + subtitle2 = "TODO: We want legislation requiring that publicly financed software developed for public sector must 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. If it is public money, it should be public code as well." + subtitle3 = "**Code betaald door iedereen moet beschikbaar zijn voor iedereen!**" + + +# About section +[Languages.nl.about] + # headline = "Sound complicated? It's not. It's super easy!" + # buttonText = "More advantages" + headline = "Klinkt ingewikkeld? Nee, het is heel simpel!" "Sounds complex? No, it's super easy!" + buttonText = "Meer voordelen" + + +# Arguments section +[Languages.nl.arguments] + # headline = "Reasons for Public Code" + # followup = "Do you believe that Free Software should be the default option for publicly financed software? **Let's convince your political representatives!**" + # buttonText = "Sign the Open Letter" + headline = "Redenen voor Publieke Code" + followup = "TODO: Do you believe that Free Software must be the default option for publicly financed software? **Then let's convince your political representatives!**" + buttonText = "Onderteken de Open Brief" +[[Languages.nl.arguments.list]] + # icon = "fa-eur" + # title = "Tax savings" + # description = "Similar applications don't have to be programmed from scratch every time." + icon = "fa-eur" # <-- do not translate this + title = "Besparen op belastingen" + description = "Soortgelijke toepassingen hoeven niet opnieuw van de grond af ontwikkeld te worden." +[[Languages.nl.arguments.list]] + # icon = "fa-handshake-o" + # title = "Collaboration" + # description = "Efforts on major projects can share expertise and costs." + icon = "fa-handshake-o" # <-- do not translate this + title = "Samenwerking" + description = "Grote projecten kunnen samenwerken om expertise en kosten te delen." +[[Languages.nl.arguments.list]] + # icon = "fa-users" + # title = "Serving the public" + # description = "Applications paid by the public should be available for everyone." + icon = "fa-users" # <-- do not translate this + title = "Algemeen belang" + description = "Programma's betaald door het publiek zouden voor iedereen beschikbaar moeten zijn." +[[Languages.nl.arguments.list]] + # icon = "fa-lightbulb-o" + # title = "Fostering innovation" + # description = "With transparent processes, others don't have to reinvent the wheel." + icon = "fa-lightbulb-o" # <-- do not translate this + title = "Innovatie bevorderen" + description = "Met transparante processen hoeft het wiel niet opnieuw uitgevonden te worden." + + +# Action section +[Languages.nl.action] + # 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.”**" + # 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!" + # In "subheadline", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark + subheadline = "TODO (copy from open letter). We demand: **„Implement legislation requiring that publicly financed software developed for public sector must 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.“**" + description = "TODO: **$ORGS organisations** and **$INDS individuals** support this call for action by signing our [Open Letter](openletter/). Help us to make an impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." + +[Languages.nl.action.box] + # text = "Already **$INDS SIGNATURES** – sign the open letter now!" + text = "TODO: Already **$INDS SIGNATURES** – sign the Open Letter now!" + +[Languages.nl.action.form] + # name = "Name (required)" + # email = "Email (required)" + # country = "Your Country" + # zip = "Zip Code" + # comment = "Your comment (max. 140 characters)" + # permPriv = "I have read and accepted the [privacy statement](privacy/)" + # permNews = "I want to stay informed about the future of this campaign" + # permPub = "I want my signature to appear in the [list of signatures](openletter/all-signatures)" + # submit = "Sign Now!" + name = "Naam (verplicht)" + email = "E-mail (verplicht)" + country = "Jouw land" + zip = "Postcode" + comment = "Jouw commentaar (max. 140 karakters)" + permPriv = "Ik heb het [privacybeleid](privacy/) gelezen en geaccepteerd" + permNews = "TODO: I want to stay informed about the future of this campaign" + permPub = "TODO: I want my signature to appear in the [list of signatures](openletter/all-signatures)" + submit = "TODO: Sign Now!" + + +# Organisations section +[Languages.nl.organisations] + # headline = "Supporting Organisations" + # text = "The following organisations support our [open letter](openletter/). If your organisation is also interested in joining the call for Public Code, please [contact us](mailto:contact@fsfe.org)." + headline = "Ondersteunende organisaties" + text = "De volgende organisaties ondersteunen onze [Open Brief](openletter/). Als uw organisatie ook geïnteresseerd is om mee te doen aan de eis voor Publieke Code, neem dan [contact](mailto:contact@fsfe.org) met ons op." + + +# Spread the word section +[Languages.nl.spread] + # headline = "Spread the word!" + # promoText = "Order the latest stickers and flyers from FSFE" + # promoButtonText = "Get promo material" + # shareText = "Tell your friends and followers about Public Code:" + # defaultSocialText = "If it is public money, it should be public code as well. I support this call for more public code under a Free Software license: " + headline = "TODO: Spread the word!" + promoText = "TODO: Order the latest stickers and flyers from FSFE" + promoButtonText = "TODO: Get promo material" + shareText = "TODO: Tell your friends and followers about Public Code:" + defaultSocialText = "Als het publiek geld is, dan moet het ook publieke code zijn! Ik steun de eis voor meer publieke code onder een Vrije Softwarelicentie: " + + +# Legal Section +[Languages.nl.legal] + # by = "This is a campaign by Free Software Foundation Europe" + # imprint = "Imprint" + # privacy = "Privacy" + # transparency = "Transparency" + # contribute1 = "The code of this website is Free Software." + # contribute2 = "You're welcome to contribute!" + # license = "This work is licensed under a [Creative Commons BY-SA 4.0 License](http://creativecommons.org/licenses/by-sa/4.0/)." + by = "Dit is een compagne door Free Software Foundation Europe" + imprint = "TODO: Imprint" + privacy = "Privacy" + transparency = "Openheid" + contribute1 = "De code van deze website is Vrije Software." + contribute2 = "TODO: You're welcome to contribute!" + license = "TODO: This work is licensed under a [Creative Commons BY-SA 4.0 License](http://creativecommons.org/licenses/by-sa/4.0/)." + + +# Language selection +[Languages.nl.language] + # description = "Read this page in another language" + description = "Lees deze pagina in een andere taal" + + +# 404 Error Page +[Languages.nl.error] + # headline = "Error 404 - Page not found" + # description = "The page you're looking for does not exist." + # button = "Back to start page" + headline = "TODO: Error 404 - Page not found" + description = "TODO: The page you're looking for does not exist." + button = "TODO: Back to start page" + + +# Specific sub-pages +[Languages.nl.subpage] +[Languages.nl.subpage.signatures] + # headline = "Individual Open Letter Signatures" + # description = "Below are the signatures of the signees who agreed to have their names made public. Be the next one!" + # allSignatures = "See [all public signatures](all-signatures/)." + # tableName = "Name" + # tableCountry = "Country" + # tableComment = "Comment" + headline = "Individuele handtekeningen voor de Open Brief" + description = "TODO: Below you find the recent signatures of people who agreed to have their signature be public. Will you be the next?" + allSignatures = "Bekijke [alle publieke handtekeningen](all-signatures/)." + tableName = "Naam" + tableCountry = "Land" + tableComment = "Commentaar" From 1e9287c5489339c72bacfd6185eaa049267d5a81 Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 15:00:43 +0200 Subject: [PATCH 14/34] Start of privacy.nl.md - NOT COMPLETE --- site/content/privacy.nl.md | 56 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 site/content/privacy.nl.md diff --git a/site/content/privacy.nl.md b/site/content/privacy.nl.md new file mode 100644 index 0000000..7c00ee8 --- /dev/null +++ b/site/content/privacy.nl.md @@ -0,0 +1,56 @@ +--- +title: "Privacybeleid" +type: "page" +layout: "subpage" +--- + +**publiccode.eu** wordt beheerd door de +[FSFE e.V.](https://fsfe.org/about/legal/imprint.html) +Wanneer dit beleid naar "wij" verwijst, betekent dit de FSFE. + +## Wat wij verzamelen en waarom + +Wanneer je de website gebruikt om onze open brief te ondertekenen, verzamelen en +bewaren wij informatie over jouw naam, e-mailadres en land -- welke jij +aangeleverd hebt met jouw toestemming -- en wij zullen jouw naam publiek +tentoonstellen in de [lijst van handtekeningen](/openletter/all-signatures). +Wij zullen ook jouw naam en land aanleveren aan de ontvangers van de open brief +(leden van het Europees Parlement en nationale of regionele parlementen). Wij +zullen jouw e-mailadres niet delen. Wij slaan deze informatie op in een +database gedurende de looptijd van de Publiek Geld - Publieke Code campagne, en +wij zullen de informatie achteraf verwijderen. + +Als je toestemming hebt gegeven om benaderd te worden over de campagne, dan +zullen wij, tijdens en direct na de campagne, jouw e-mailadres gebruiken om jou +informatie te versturen over de campagne. + +## Wie heeft toegang tot de opgeslagen data + +Alle informatie die ingezend wordt mede de website is beschikbaar voor FSFE +medewerkers en stagiairs, opgeslagen op de webserver of in ons issue-systeem. +De informatie is ook beschikbaar voor FSFE's systeembeheerteam. Informatie +wordt onversleuteld opgeslagen op onze servers. Dit betekent dat de informatie +ook beschikbaar is voor de medewerkers van PlusServer GmbH, waar onze servers +gehost worden. + + +## Wat jouw rechten zijn + +Je hebt het recht om jouw persoonlijke data die wij opgeslagen hebben te +ontvangen, zowel als het recht om ... TODO: De rest. + +You have the right to receive the personal data we have stored +about you, as well as the right to instruct us to rectify it if +it's incorrect. You also have the right to object to our storing +of information, in which case we will remove personal data about +you, and the right to remove your consent to processing of your +personal data in line with this policy, in which case we will +also take steps to remove personal data about you. + +## Who to contact + +If you have questions about our use of your data, would like to +request a copy of all information we have stored about you, or +would like to talk to our Data Protection Officer for any other +purpose, our appointed Data Protection Officer is the FSFE's +executive director, whom you can contact at [executive-director@fsfe.org](mailto:executive-director@fsfe.org). From 29b8b344b9c80d3aef4c3f646e8ae856faf06f8f Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 15:02:36 +0200 Subject: [PATCH 15/34] Fix typo --- site/content/openletter/confirm.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/openletter/confirm.en.md b/site/content/openletter/confirm.en.md index c23d3eb..161ab05 100644 --- a/site/content/openletter/confirm.en.md +++ b/site/content/openletter/confirm.en.md @@ -6,6 +6,6 @@ layout: subpage ## Check your email inbox now -Your are almost finished! You will receive an email with a link for the final confirmation of your signature soon. Please check your spam folder if you do not receive the mail within the next 15 minutes. +You are almost finished! You will receive an email with a link for the final confirmation of your signature soon. Please check your spam folder if you do not receive the mail within the next 15 minutes. Thank you for signing the open letter for **Public Money, Public Code**. From 3da620da4461d11cf4c278398b82317e478aaef8 Mon Sep 17 00:00:00 2001 From: "erik.ds" Date: Fri, 8 Sep 2017 15:15:08 +0200 Subject: [PATCH 16/34] Added openSUSE logo --- site/static/img/organisations/OpenSUSE.png | Bin 0 -> 12019 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 site/static/img/organisations/OpenSUSE.png diff --git a/site/static/img/organisations/OpenSUSE.png b/site/static/img/organisations/OpenSUSE.png new file mode 100644 index 0000000000000000000000000000000000000000..68dcfe5150a5f5d38eefdab2c4c28e2884cc86b7 GIT binary patch literal 12019 zcmZvCb8ubV_xHWYjcr>^W7~G4#%LPbHrm)$qb7Oc#?Fn6#ip37$jUcMT0cOSVg z=Cr^>bX*J|a9A-ouQ{-^84xx`9;w0Ls%~ST_og}oyS%rcy3!gi_vKive%@LS=gtBL zCQ%eRk`juN5-I~hK^tT`EZvylF?kUunPqH#Z9WbT0$uFz8?qMt=){gtwzM8D_7ipBtVfV@E1 zkWx&5Xeq1H+$q}a&3I(_`c0Xx=$YRDx~MhJWlNtu&nM>h zN((t55SL0+5GpVwD1TOQ)l&j1Pzd>y(wHvL0C~NC%AJODE=|PSpx^0E6Q^56D<(TW z?{63*E3RT1z!xFV6|jx%Jq`_M1T2niGR2!H$TxUpx$MsuYYX}gm{^9W+mQu(^57e> z*C??%D3r-FMrjgZcdKBT`f-*L&AF4o4atEr;f*-~H&%-{hJj5Xhc1baAaHBZ=h0$I z^obTz(TB`XQo7}qUFdvb#jJ=c0#E>Rd;8PXf4P2jH9vfgZ_b6E0cIC^)0m#ZSmM;_|IVoKey3LPs=?V!E`A70>q0HZQG^p~&keeh ze3eVWv%yoo(_jex#a!eru3?nQog3N=1HJ=1ml{SO-UBs87_~B7v5DA9ZsdR7ry1U8 zVc7pf-E;w5aBM;6_}b*Ax1YpQKGOfl#+k=pbm9oIhjnZ`PDtND3XGBs-;>jwAw1|? zL)pln#QB}0ME%(WoK0f<9vC!dNEV5!eCJyUzYfFpa29PUq}l~TZ4c*Jf1L0LfOeDA zSIqNRlvL2i8jS^r&PU#U6LeLo=|#^n z6qF%okKds>&apbRz6*J1K}Dx_%=D3Zuu`Q3c9+Ru7l2qem|%wStbHEz8!gAAt0_IP z*-Bh3%Puo6u%efcv-5XVD1PvQio2{@eLrVTaF@_@>ouy?0$!m+BNMs8CT5QT>*$F$ z2P#*-W$>i1wW)EZN<9K;;4X0&?9^cK*T6r)8O}(>$#!2sXizOuh2E@OW3aqvqGgHH zVfejpVAGn4iA@WTN0-RP)f0l$CBTuH)apOwyLGAPjo{|4M2;}aUX$a_wfU3Ukngas zc?a>ig|O}%4~pDTefB7w$HyUbf^hd5{_eJComz*oYq?0!dI{}e8PzBYEbqxQp6;s8 zXc3PXpEexB@X42^EoPLcNQ)CJ6g#J6pJ0uY#xWmue)-o1T=kD-pAMR`q|p)@@&0Gq zMfu3H{}>sq8hos0rFwEISvo~L2(ze}eA)!?$?TO;Bk-yID zbOx(wK6f58sViLDgdT$iyhQ?JCJKaEN>I7bilCUKJkS3*Ew&Ycbz5E^-`7LEbxTWHZ@th`w8 zTl63+>dH6GGXfq;W=MlYCAR@T}V9M zJ&!~{xUkV`V=_2b+O=U~oW9lo z4CC0dPWN^7>tk!35AD5?$S1R1Q2=X1Xee!m{ml7@%1>XdsF|mbVv?7ewCWHQK9pQN z&N3P0gflsGc`;e_g5oIxd;!Pel?peTqzUh>XEM^m@KxN(l?b3*uLrG;H<>_2W3|JJ zowwUge(%OBD-F{LyI3*wnTE^6reWhzcm2XF4nJ2l?+#)_D;_{zi?VnsB0g#2Ns5Tz z^>$N$sEi0L?#iP#?5%pmbEXB2hB`BG0-6;WKz;HufBN<^K_fug7TFEjpAE1d)_WUe zW4VI{D5WzU`BgbOh}3$E3KT!v0)F7FZ0m+>bbPDlYg#-`jK5%TW^m=kRH8S!mlrIL zDQ3PGJi4hqb9mm}zd>TQr0}re2$-4+ap-!!k9x0t&e|A>3lJQjBO=mWJ7Ix8K5jQz z2{XvubV<{NqaiET>Cdyx)`f%qN+nX;v8%X*UE{y?CbcML;o8v zQZLJ5{DHf&ZJxkn^E9;1Rd7WH(l3;hqaam1D7P)_Zp-k7oh^v*Hb6T#9%bS0GTJX@ zgLWw6FMKg}(R};15nFhXC9?Q3jc?%1R5@xh>%NdFdy_RShrWTh*}yDz$v64~4X410 zK(sdnpT3U)vZ_rKp4IlyFL``s&Y}vQqg#nljl|4HHScwalXkr_)waAdMmn(U7XcoQ z)v?MhXRcU6kbFxhJ|Y8t+5H-BLoEEK4h86wuI@u)xwe*2_VMa}AGGoM654dln+{Dw z$L7P7da~_}nyYT&hHl9fSeN|xsZRiPzO@qBo#KVK2QqEcV&t<}G zud)VGM2SX1y9YZHX9C|eWs6&68Apj8472V^v>GQ2&}zC}*L~Gj(FNOh--H2S^7GjI z(2R~3uVXp6yJ(}dAy2}9{Ol(?fBzX0ALaL}*eG13X4|Pat=_l?9UoaGL7O*+YX6UD zN%iX{^ZUQgk#E1qJ`>t_E{iss&#T!4cb%{y;f>QPcO`)*KaE#TMH~v)Yh5(NtvZd> z-IEQ@8@cOkq(wO42HpfGjPg6oEunaizYzFUSz}G}ZAV8)$lPbu`>ZUKj}YB0zrSOb z%4xeR%Vpi{RpK#1%C6hXJk|sQ(J|S}(4P%DA~-@jB%parsp*+W?Aeuz5bkc{I@DCu z7vVj`9F(56D#eHTd67LPl`eTie@t+g*zD|W(#?%XSM$f+nRKEi7cqam`v-%WPkGZ& z*$;_g`(o@4BQ?UfBax1cso5xwa7iL&R)wd*_kw ze(O|_s4z(xJS;zl1i3QK^`G&Oh78SuFT9(_#hmY>uKAfQ2C2IPa?Jpew zMV0b5x&?3Qs^_-tK|QqFJK~s*|G5tB^;;~0N6(Nuv+CX=kjLH~IZLSB!sLTP;B)86 z;}5%!SIX+v+HW6=tX`#9g{&Lrxk%6UpG!*7S6e)be$zHs(F8K2Fw*z^N7^-N#^Tdi zsOH5`X{A=O0rf~9{bV;pt#C0p;~iH?ob1}^B|376Ek-!UNn%x6Au`o`caq|4G@cgH zJG;1HT%PRevz1({^2)*|3FM<`>4RWM`sl1SRytf zlz9n!^-MxTW6D0ZLgtN@3R=frj2UEJ?2&#|BD!y%Wo3B;QdgP@I)QKg8F3c= zj(cfg>^-&j>BS=+THMs};m6kmba$CJQ z-tQcg=_)+1r@20k_%RzxhzJH4bE{W`?AP%UUa=e*(7C$Ca3WDS(Aiv-_wI|*=7C?U z)mE@g;|1#de#dlbCaO$voizpBU2PXBj- zGYh{3pawit(|yKKUh-!A44S0>BZNHQF!!Lv8*_;RUCm)NiDz!Vff)riVUU`zHS>4? z>O>N~_?jl{zOjj1J zkkmwf?))Z$bj%}}?`;m_>sL)On>c!BhU^LBDSXxeS?L8kDZM`JC8~TYKcCJm z65T#X)WxT7gpw5@ z`&9C={tj)TfS%FEPGAybGOdi*Gp&Jn^19EKihf12KM`@MXdVSA^-(vo$$z9VF}Kkf zTbIOhHqRiaN|=Z#4l9*X$dR!>O2GRfY@bc_ZJ8pM-ZpKr`SkNyWaguMC+XD&%PZoA zSXJof+y z0X=FVY0RQyLpWjdb^Wz(*Wf3B7^NOKiIYPE2awF6mKab2ciL5by3A#`{Ex% zrGp zq%30jzD=)c`5vVtoJ$g|XUw_zZ~2tOr-{)ws!`3pghR`k>p~sI;qi`$AbKmp7dw6( zzPy1s$)Xaps5HAggK?icxtc9slCrYEiYNgnspVyI8buTA{7akh}=*ncbTJ z)*7K)lD=%G{X6z#$<^}cQvZBb#G%#iaU7FSc|a6rI2~!z1uuG|rbGQEG{cVvtHfs@ zAa$r6?joo-&O>Rrfo|PL(BU_iQd+%sSkGrk1mptEv1=G*YtK5z)y`*GOLGHE$EAO@ZVnr8Qu6zza-*M;1otLr zpsUK1WW5u*Ig$lGOZI@^Y7oI)zoiur=~B+(1|*PeF0)Pa=mQZjJk3Kwo6Dv;ze~uP zGUphV&7mpAGgbp;c%hhKrxqqx=2$NY@Uukg6Wngv-V5xbW9#_(j{=~s-sFXGf>V5G zE9i{5sMqOSUxsA0EfwK~|Hsmes4z={*f$QGJ#$g-8~vwItM-Qp|rv}Ii4lrsDbs2hNGJA{Vk48#x7 z-egRi{n;%fb{Mg*{X?TZ){J~Ma2W0q0g!@RMfrs$uorMH1so82jd-sL`zE|sSZk3zVV?G_cLo;+iA=%P zJaq<uOHwxkufzf1>8g!JIWaPM%gCyBe~wZ(K0H|dE5^zGj!S%JWnbkw8BXeY z`!)^GNfX<7ga9xKtjQ47qaKy$(~uKwV6Nwn@s%?^W)kz09T7&(R*)>5YES(ZD??$H z7d*zf%=PCqyudaTVLdVNKg_NESO*nuG{KD_V$**pNC&GLIz_zL})73k^bu@@UB;dEo?K3Cb6NUdbi69brt#-m6PH&o|s@og!v z!G_PRqkO}ZeW%X;$$CQqgF1->`@?#KUM>J#ddEQi}4gJ%M$tTU6Da6cCjI+F#L%^qH96L(<)7c9hCYJAq6me$nM zJvjqu*!-J5{E-Jlu$2ns9F0BG$qx5oCsd#U|M4EstHbKp3w%q9RHFz!(}i;~6ZGRz zdVS1QH7%KuCU1Wo*Yf1&p<7$$rL_fxOG!?Lm%e4ukGKLWP6TCHq?4N(ed|)^nlEM`AEXtZ8Lg}&H* z(&jWTYyzMAr{iluEfR#x#Y6v@Kyu{IJbddZ4Y(;_BkF*KO~{_=6!{FV4-UojVHFgMZum_8{LLk;uc74jIZZt##W6_GUIK z1o$dU^+5x&f2`|a@iFevO5XO#dDBdLHT8B=B{h+C`1Bsq%MDuRQe2Y!W&0)jIZ|3D z#0B4LlBTqx_qoGap4G(xs_|&rHDPq?sRU!PuE*)+*xMPbq%JV=TI?@5+}0)o;3VRz70hx$%`ik%nn6K z-DVc9;?lk5r=E0&2SL~ZIRGjgldY%+S=0u>h0ZfHWn)91-YW_7!c!Esv6i_GcL-^e z_}OO!bL9O^3OG-AF%ol0nw}x@GJWEzyf*gHdD&@NXjegyRVR&&*|TV&F0rUnXy;6# zCtgwTSS=j5>%YFznd3W4mVI%W2vAa#oiYTm&y@^xI&~;Nlyh z0VPHM&+NrzjqK+%5n!LsYY#wAs^A9QvMNQgGD|`OtPb{F2WCkY=z1>SzIfbVtFyFS z_epE0ckJ6dn9jM(>S3=cNtSjo3{+zu z$tcfyv=1ZVIBbKQ_Pa)DKC+5dBTT)KlnPh9 z8~a_D`&%R=QMf!kCt&diKGiXWV|+JPR$V@nbrXD&AK>qbrMd z^ctwvT$2d61E1aCH~tQ#c9?j!7FZ|4qskeDvb`E|es_{7zpQ5qM;s@=GW`0-&DRI- zAO-m(qpio=%g|{6$3^~UG2tvaa=4UO=VI7IKNZu!3EF5~Y50N)p44_s&-v@yKza|vQ!@o%J6Zq3>lI|bNCt=g z-dr{MEsIi%5&%MX-N%8V$@$!~KjLb^c37QHkLYg7)D)|c4EX}!lQJ*bUyw73Z?_M6 zU#@3-jW#1C)g}3Ww<8o?2xac*x&PO4JPEN^QC7V;WUmo)V$iytjyqbQmPAWd=#bjK zXQ&gNd<~TlhTTYSnkICdICf69qwDcg^-(uK!}l6cTnol-%99`<`_)-EkaFaOy?RC* z=p1v3#S!oP89~3UX$7pOJLYB-zthX4Gdfcd*@!{g?6Mrx%GyiD^`?A9y#sG0Y~7X+JaEq;*QJaSOmb|8AA zL*R)y-m;3KV@- z{t*Z(&?SW9FGk~wc$?EjqrBx;4U6+ zw=Dva%A-%AqL)wiBxJ!?Ug;`&hY(oX7W8zC)z^#&uDVR&`AVnL4%}(B@q4L~yeyx? z5IA?+(oiXcgt)QTL!O^w0|=fub{4mHS|%u|MHl|(2&Apud{Ntp$Y1r9{F>+MKn-eB zo)fE{fnR4&Lv;{{N>I&;H~nPJyRl`su)BkV;E6A)39nLaG4(x0*qxW|9Mw`;p_nK* z*X2>NPaU3xu#aO?UjA5CeD+dzI$6ua7^pm1e6$+Nv94&Zvqg=4h<2~542E)U+u-G_)Y z<0Q&`GQ|8qjn^}IL8$waBo751-28>TC?xh%?H>v6Er?)4_DUts?v5s;yuzt7R8`e{ z*QqHQWs(mFjQGGdEnymOYOB`V#uC_NYBFTx8iScpdUQz5=h1h6K%Nu8p#Dd@Tw3g~ z;0t?b_%J>=MP}-n>kR!TYPTe~ls2Hq>4ywoQW$1BzC@^;CNxm`r5o=CJ{&_AiKwmR!IIItVTdK5^xyQkvbg{frc?{G9!WN&z3 zBq7|N>>0^0qh2H_vz1KC3)sb7Vm9lsmSo+IKp>0n>t$~9kt&MFZ4!L@O#es#$cJV6 z2b1s^{;2XY!LQqvt(;SAE`6%EW55#mo#E>+{;OHwwq6x^#NZprB-obKPo!dk^4;IR z_`r^a8?gkX8%SQ#cdx}-u;&Q|a0h+?4QBzbq-xCq2O)Ms^&8(3NZqWrTP*W3=37B| zxRYJ840%(%N!aMtga&1y<1&WtKTO*n+5~8&l|GvX5<9$0Fd?~2Lw#WZykR`K3=mN~ zZZ``F%ZgECg5UrL+X<PHXfF3S&#mKTEzuMD7FVMP%5`Wu%3*M+QPu{iEo zvSc6H`xA&Xw1|{tEV-8ozTHmX%z{Ypx8Iuy3a5c2Gee=bhkSw^zBTBv&mvg{Vk96kgI!W zfWh+6a_8^vI`XB+)Cc(EMjeE$`GumnUXOd4Tvti_@wK0q32BX3?h_0&2ObiI<@+Wu z%-9_s?qr*skO80XYD+k(cG1Aq`djx&$K z=^7u+k(T?X3JBu_w07mZB+-~kQXXRZ!8H*>0RX73|9Syp_|D>q#=E#)N2bU%lHWQ0 zo55r9dKgbQXNGDGIkKWMb35#cC1?Q#Hh0NAl7av(Oqv|SDhPsxqNH@GIAfe5CDd#5 zV$~7a4a0kmX+uTNH{rZUU@a%F-};g7^i|1WOk0kLM1g(t8($ zt5)#~DJ#iwGS2zGhXWZQKI@aKUD<;!>;~*+re(UW|GpNEe1^8j9wA0TLbmF?WwSKm!n- zoJ#D!@mbj0L0#eoHaSD|U*NV3Id8fn4*oEP|0)~cf^}!SL-X7$heYJmReUz^yW4sy zT3;7K`u6&2%2SS}NeAIL-;+tuoA@<}6aQ2t7sA^^Wx&WJqm7^UN$~!Lpu^xeshfgy zEFDnri1DAO@nF!SrU)8VMXtp#Mhd<)M0XGVlY(Fq)(0n-8btI4Q|bz9&C+B5wON5W za1@tr$|i^Ltns5++VXYyRW8@r)d?PR2IG!>`!;dGqQ>z?yRE zlm(2P&@YF1nxb|ttE2b+X9hun?xgQGmOK*1LgVWbuGepgmzQ>g5YF!Z#J@U~O*Cb{S;`y4t9Hjx?Cz!S@uAW~9HM4>u zePxykCcORAuGwuOka*CEIvLJ4q-2%%0Hcz^z?9jmT``Q+q}S?7JNo)Typ|pD2@SkH zI?Oz>FCFN~#TswF;j8lU;H%K#EIH-e?!U4ctJOk?k<867DikK?uRXyz1-g~3_eoQW z?JW-60H5s$ainDf)2xQs%xMYkh83M`~y9eCEHLdPM@WfhC zG0DY$D5daj3ZpvwoPV}LPxmjpw|_)_F4RMI*_e<$@3b032-v$=XI;*Au6IZ8UC?9a z0w5Uu6Kuz(hUBkpQ0qqqwBxn-Z(D0Hm2<6^Ww#vznTfpJt)Iy(7@1#UMiSP|?FtC^ zq^t_Xwif`z0B=`EBWUn%WAE8L$F7Ssa)rteS1dcg6k6VbL5A4|t;!IS{K;U^8p5Rt zFq-#hUKhQqB!pBy{%C#vuR^_K#W?ikcYuY*7k#*z7=!>7Hm{GSjhDO%p0agXAnEBK}8yE@NM0L_57e znq&BS6k3Obzf*(R1-ETtrw<@)dM3YUR1^PSszuif?ifJ?RjxH~=EzgHN+31g`2q9k%}kIG5;z<>3HO5Vr1k zq>TbSl#C#LJo13x5WX#_8XHg0Na%r zEj(QNR0OdE|C!kcEws`j7oSAqr~@>`TjXycWMV}LCry!Ok{G~ zEDSi%imU6`V$7LZdZ)yiI5$J0FX@sK6?UA~*Jr=v7B%yq=lc$sEp4a7QeIjXAZ6&wH*P<JmMC2Y;zfN_(vb8OG z3kB)sTz038>sl+Z#@m-R@aSipX9Oiu zLqM#OEbBLvkj|Kx`Os{5a`JA1SJ|Mon-kQr6&ul4!}5lhZ#oP!aJb5!S2hfv!qkOg zZsdO$oS2=3z~^4g2U!J0Lom<-z+gt583Ojx)NR{PzzX3BbhJUW2h0t^Z;u+2ofF;; zuw0>>tboHcZzqN)s!0)n*8jlgUT~r(zGmWB`|Gf|4*@VqZ%IU!_YxLzak-q4_cjl| zVIG9N)>l+vXaBu*>``lF;)In{&)d(lzA(*&ZzPrNn|c<8#zCN)NNP)6&&duOc{>q@ zRl*}%D=P$EGZ-t1pZX?ZxpJ&cMO2TCJ(qn!Sohw^Up~ae#JAfnW$KCl{v)3wdt8l_ z_eiH_a|J)@odQEY8GS4CZ(&TtUuivsRFd;?=IrCA<&>jb*n;x(Cq8s{)-QNcDV*G> z`zc!qt6TmeEz|7T@J&s~u`fVL7TtKZswBfXxPcGce;$DqDr(px#`0J#7obO%Cif5i z@|4EP6Q(E0`;4fS+j{kLe$$IvlPCASbZ>P%NP=MqlO18r@vbs%!(tjmoUTpRdV9R_PO zF5COp*L!&SI#!rd@s}Nc&;A@pB)#b>fnuS_ASb2RaptFJIo*R0T0X~Y<{^U~#FRsWo zSuq4i$9eO&wb%tQIa1V6PTf`DSgD6%y8w!$Y?+OMHR|sUU#r|?;pt1-LA1NrE0h_v zx=^3e#F;;3>vyigcekXlQU{6sKy9Zhs(*J#!X{bo%@dYh7hQmOOxH&ahC_5JyQUXa z;^%z7CDi>4?NE@VOQf{FKjjSY(p6pWB`>ancI-onVs?oijoqxTtv^!bp1I=feBZt= zTCf-WN5+M=+Do}gSRUV#pl8y?EHd+E2nOC1!6YT0nyfUC%;jp@lAz_eg%{8Men<~W z>tM6k zx+w@XfO`8w?0{ITqXlf($-QnGo^ioZ(7gfY_?;oKJ;A`#PY!)#h0N3nAHS*o%<|cD zOQR_$WTgeK=%_zC@m8tt`ilS-*j|6k9i7?X<{JT7(@S@Tyx42`*O(W7|Y{!Bqbsj9Y zeNokHG<7UHL#mG{=>+wqJ!9&6&p5`W^M!G4l3!Xo^8YVyl1L$wcqq{=Md;`5O zs1I!ep@jWo?dY2y;6?wExNeW9QM&tQ#Y5vvV6m|P@0#cVSL4e?>|al{kNSXWxd1fL z(?-K^qjH`sI{a}CSO84Mxd`Sr!UDYHX-MX)DMEKW-1b#Akc^@YPE-7c3uZxL7eXV9 zKjq;M+vtlDpymZYdhd`Tq-X;*1M}NeFu{X;zJ8r+Z(RdSi0f()MP;+rhc?Ix6pje2 z$D`kY{?gN@g|jI10k2U4Q56j`Sz*B&F%v`)M>Nn>3w4zvB4)27SCoONo4)Upxn>E zw-HumsPXZ)F8h^1CYC<8nx18p#CXJd^ zDw35xdB#)APlIJt(wTC Date: Fri, 8 Sep 2017 15:19:51 +0200 Subject: [PATCH 17/34] Added openSUSE to list --- site/data/organisations/organisations.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/site/data/organisations/organisations.json b/site/data/organisations/organisations.json index 89b5662..4d00e2f 100644 --- a/site/data/organisations/organisations.json +++ b/site/data/organisations/organisations.json @@ -80,6 +80,11 @@ "url": "http://osb-alliance.de" }, { + "name": "OpenSUSE", + "img": "OpenSUSE.png", + "url": "https://www.opensuse.org/" + }, + { "name": "Open Source Initiative", "img": "OpenSourceInitiative.png", "url": "https://opensource.org/" @@ -87,7 +92,7 @@ { "name": "Quintessenz - Verein zur Wiederherstellung der Bürgerrechte im Informationszeitalter", "img": "quintessenz.png", - "url": "http://quintessenz.at" + "url": "http://quintessenz.at" }, { "name": "Software Liberty Association Taiwan", From dc02709abda47e35cb20158d375a7b7c5c0600b5 Mon Sep 17 00:00:00 2001 From: suhrj Date: Fri, 8 Sep 2017 15:44:30 +0200 Subject: [PATCH 18/34] Update link to newer page --- site/languages/strings.en.toml | 88 +++++++++++++++++----------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/site/languages/strings.en.toml b/site/languages/strings.en.toml index b355506..80c6362 100644 --- a/site/languages/strings.en.toml +++ b/site/languages/strings.en.toml @@ -1,70 +1,70 @@ -# == ENGLISH == +# == GERMAN == # General strings -[Languages.en] - languageCode = "en" - languageName = "English" - description = "Public Money, Public Code - A campaign for releasing publicly financed software as Free Software" - fsdefinition = "Free Software gives everybody the right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy." +[Languages.de] + languageCode = "de" # 2-letter code of language (ISO 639-1) + languageName = "Deutsch" # verbose name of language (e.g. "Français" or "Русский") + description = "Public Money, Public Code - Eine Kampagne, damit öffentlich finanzierte Software als Freie Software veröffentlicht wird" + fsdefinition = "Freie Software gibt allen das Recht, Programme für jeden Zweck zu verwenden, zu verstehen, zu verbreiten und zu verbessern. Diese Freiheiten stärken andere Grundrechte wie die Redefreiheit, die Pressefreiheit und das Recht auf Privatsphäre." # https://fsfe.org/about/mission.html may help you with translations # Navigation -[Languages.en.navigation] -[Languages.en.navigation.links] +[Languages.de.navigation] +[Languages.de.navigation.links] start = "Start" - about = "About" - arguments = "Reasons" - action = "Take Action" - spread = "Spread the Word" + about = "Über" + arguments = "Argumente" + action = "Werde aktiv" + spread = "Weitersagen" # Start banner -[Languages.en.start] - subtitle1 = "Why is software created using taxpayers' money not released as Free Software?" - subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." - subtitle3 = "**Code paid by the people should be available to the people!**" +[Languages.de.start] + subtitle1 = "Warum wird durch Steuergelder finanzierte Software nicht als Freie Software veröffentlicht?" + subtitle2 = "We want legislation requiring that publicly financed software developed for public sector must 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. If it is public money, it should be public code as well." + subtitle3 = "**Code paid by all people should be available to all people!**" # About section -[Languages.en.about] - headline = "Sound complicated? It's not. It's super easy!" +[Languages.de.about] + headline = "Sounds complex? No, it's super easy!" buttonText = "More advantages" # Arguments section -[Languages.en.arguments] +[Languages.de.arguments] headline = "Reasons for Public Code" - followup = "Do you believe that Free Software should be the default option for publicly financed software? **Let's convince your political representatives!**" + followup = "Do you believe that Free Software must be the default option for publicly financed software? **Then let's convince your political representatives!**" buttonText = "Sign the Open Letter" -[[Languages.en.arguments.list]] +[[Languages.de.arguments.list]] icon = "fa-eur" # <-- do not translate this title = "Tax savings" description = "Similar applications don't have to be programmed from scratch every time." -[[Languages.en.arguments.list]] +[[Languages.de.arguments.list]] icon = "fa-handshake-o" # <-- do not translate this title = "Collaboration" - description = "Efforts on major projects can share expertise and costs." -[[Languages.en.arguments.list]] + description = "Efforts on major projects can be joint to share expertise and costs." +[[Languages.de.arguments.list]] icon = "fa-users" # <-- do not translate this title = "Serving the public" description = "Applications paid by the public should be available for everyone." -[[Languages.en.arguments.list]] +[[Languages.de.arguments.list]] icon = "fa-lightbulb-o" # <-- do not translate this title = "Fostering innovation" - description = "With transparent processes, others don't have to reinvent the wheel." + description = "With transparent processes others don't have to reinvent the wheel." # Action section -[Languages.en.action] +[Languages.de.action] headline = "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 - 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 right to use, study, share and improve software. This right helps 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." + subheadline = "We demand: **„Implement legislation requiring that publicly financed software developed for public sector must 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.“**" + description = "**$ORGS organisations** and **$INDS individuals** support this call for action by signing our [Open Letter](openletter/). Help us to make an impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." -[Languages.en.action.box] - text = "Already **$INDS SIGNATURES** – sign the open letter now!" +[Languages.de.action.box] + text = "Already **$INDS SIGNATURES** – sign the Open Letter now!" -[Languages.en.action.form] +[Languages.de.action.form] name = "Name (required)" email = "Email (required)" country = "Your Country" @@ -77,13 +77,13 @@ # Organisations section -[Languages.en.organisations] +[Languages.de.organisations] headline = "Supporting Organisations" - text = "The following organisations support our [open letter](openletter/). If your organisation is also interested in joining the call for Public Code, please [contact us](mailto:contact@fsfe.org)." + text = "Following organisations support our [Open Letter](openletter/). If your organisation is also interested in joining the call for Public Code, please [contact us](mailto:contact@fsfe.org)." # Spread the word section -[Languages.en.spread] +[Languages.de.spread] headline = "Spread the word!" promoText = "Order the latest stickers and flyers from FSFE" promoButtonText = "Get promo material" @@ -92,7 +92,7 @@ # Legal Section -[Languages.en.legal] +[Languages.de.legal] by = "This is a campaign by Free Software Foundation Europe" imprint = "Imprint" privacy = "Privacy" @@ -103,23 +103,23 @@ # Language selection -[Languages.en.language] +[Languages.de.language] description = "Read this page in another language" # 404 Error Page -[Languages.en.error] +[Languages.de.error] headline = "Error 404 - Page not found" description = "The page you're looking for does not exist." button = "Back to start page" # Specific sub-pages -[Languages.en.subpage] -[Languages.en.subpage.signatures] +[Languages.de.subpage] +[Languages.de.subpage.signatures] headline = "Individual Open Letter Signatures" - description = "Below are the signatures of the signees who agreed to have their names made public. Be the next one!" - allSignatures = "See [all public signatures](all-signatures/)." + description = "Below you find the recent signatures of people who agreed to have their signature be public. Will you be the next?" + allSignatures = "Have a look at [all public signatures](all-signatures/)." tableName = "Name" - tableCountry = "Country" - tableComment = "Comment" + tableCountry = "Land" + tableComment = "Kommentar" \ No newline at end of file From bd4dbcc7485e0c4e6e7f057e1b814e5ba47823be Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Fri, 8 Sep 2017 15:47:19 +0200 Subject: [PATCH 19/34] small wording improvement --- site/languages/strings.XY.toml.sample | 2 +- site/languages/strings.en.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/languages/strings.XY.toml.sample b/site/languages/strings.XY.toml.sample index b941965..af37bde 100644 --- a/site/languages/strings.XY.toml.sample +++ b/site/languages/strings.XY.toml.sample @@ -59,7 +59,7 @@ headline = "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 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 right to use, study, share and improve software. This right helps 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** already 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." [Languages.en.action.box] text = "Already **$INDS SIGNATURES** – sign the open letter now!" diff --git a/site/languages/strings.en.toml b/site/languages/strings.en.toml index b355506..a0198ec 100644 --- a/site/languages/strings.en.toml +++ b/site/languages/strings.en.toml @@ -59,7 +59,7 @@ headline = "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 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 right to use, study, share and improve software. This right helps 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** already 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." [Languages.en.action.box] text = "Already **$INDS SIGNATURES** – sign the open letter now!" From e224b82a7db12a5e1cc053a6506aba5a8af81f79 Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 15:50:37 +0200 Subject: [PATCH 20/34] Revert "Update link to newer page" This reverts commit dc02709abda47e35cb20158d375a7b7c5c0600b5. --- site/languages/strings.en.toml | 88 +++++++++++++++++----------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/site/languages/strings.en.toml b/site/languages/strings.en.toml index 80c6362..b355506 100644 --- a/site/languages/strings.en.toml +++ b/site/languages/strings.en.toml @@ -1,70 +1,70 @@ -# == GERMAN == +# == ENGLISH == # General strings -[Languages.de] - languageCode = "de" # 2-letter code of language (ISO 639-1) - languageName = "Deutsch" # verbose name of language (e.g. "Français" or "Русский") - description = "Public Money, Public Code - Eine Kampagne, damit öffentlich finanzierte Software als Freie Software veröffentlicht wird" - fsdefinition = "Freie Software gibt allen das Recht, Programme für jeden Zweck zu verwenden, zu verstehen, zu verbreiten und zu verbessern. Diese Freiheiten stärken andere Grundrechte wie die Redefreiheit, die Pressefreiheit und das Recht auf Privatsphäre." # https://fsfe.org/about/mission.html may help you with translations +[Languages.en] + languageCode = "en" + languageName = "English" + description = "Public Money, Public Code - A campaign for releasing publicly financed software as Free Software" + fsdefinition = "Free Software gives everybody the right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy." # Navigation -[Languages.de.navigation] -[Languages.de.navigation.links] +[Languages.en.navigation] +[Languages.en.navigation.links] start = "Start" - about = "Über" - arguments = "Argumente" - action = "Werde aktiv" - spread = "Weitersagen" + about = "About" + arguments = "Reasons" + action = "Take Action" + spread = "Spread the Word" # Start banner -[Languages.de.start] - subtitle1 = "Warum wird durch Steuergelder finanzierte Software nicht als Freie Software veröffentlicht?" - subtitle2 = "We want legislation requiring that publicly financed software developed for public sector must 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. If it is public money, it should be public code as well." - subtitle3 = "**Code paid by all people should be available to all people!**" +[Languages.en.start] + subtitle1 = "Why is software created using taxpayers' money not released as Free Software?" + subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." + subtitle3 = "**Code paid by the people should be available to the people!**" # About section -[Languages.de.about] - headline = "Sounds complex? No, it's super easy!" +[Languages.en.about] + headline = "Sound complicated? It's not. It's super easy!" buttonText = "More advantages" # Arguments section -[Languages.de.arguments] +[Languages.en.arguments] headline = "Reasons for Public Code" - followup = "Do you believe that Free Software must be the default option for publicly financed software? **Then let's convince your political representatives!**" + followup = "Do you believe that Free Software should be the default option for publicly financed software? **Let's convince your political representatives!**" buttonText = "Sign the Open Letter" -[[Languages.de.arguments.list]] +[[Languages.en.arguments.list]] icon = "fa-eur" # <-- do not translate this title = "Tax savings" description = "Similar applications don't have to be programmed from scratch every time." -[[Languages.de.arguments.list]] +[[Languages.en.arguments.list]] icon = "fa-handshake-o" # <-- do not translate this title = "Collaboration" - description = "Efforts on major projects can be joint to share expertise and costs." -[[Languages.de.arguments.list]] + description = "Efforts on major projects can share expertise and costs." +[[Languages.en.arguments.list]] icon = "fa-users" # <-- do not translate this title = "Serving the public" description = "Applications paid by the public should be available for everyone." -[[Languages.de.arguments.list]] +[[Languages.en.arguments.list]] icon = "fa-lightbulb-o" # <-- do not translate this title = "Fostering innovation" - description = "With transparent processes others don't have to reinvent the wheel." + description = "With transparent processes, others don't have to reinvent the wheel." # Action section -[Languages.de.action] +[Languages.en.action] headline = "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 - subheadline = "We demand: **„Implement legislation requiring that publicly financed software developed for public sector must 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.“**" - description = "**$ORGS organisations** and **$INDS individuals** support this call for action by signing our [Open Letter](openletter/). Help us to make an impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." + 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 right to use, study, share and improve software. This right helps 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." -[Languages.de.action.box] - text = "Already **$INDS SIGNATURES** – sign the Open Letter now!" +[Languages.en.action.box] + text = "Already **$INDS SIGNATURES** – sign the open letter now!" -[Languages.de.action.form] +[Languages.en.action.form] name = "Name (required)" email = "Email (required)" country = "Your Country" @@ -77,13 +77,13 @@ # Organisations section -[Languages.de.organisations] +[Languages.en.organisations] headline = "Supporting Organisations" - text = "Following organisations support our [Open Letter](openletter/). If your organisation is also interested in joining the call for Public Code, please [contact us](mailto:contact@fsfe.org)." + text = "The following organisations support our [open letter](openletter/). If your organisation is also interested in joining the call for Public Code, please [contact us](mailto:contact@fsfe.org)." # Spread the word section -[Languages.de.spread] +[Languages.en.spread] headline = "Spread the word!" promoText = "Order the latest stickers and flyers from FSFE" promoButtonText = "Get promo material" @@ -92,7 +92,7 @@ # Legal Section -[Languages.de.legal] +[Languages.en.legal] by = "This is a campaign by Free Software Foundation Europe" imprint = "Imprint" privacy = "Privacy" @@ -103,23 +103,23 @@ # Language selection -[Languages.de.language] +[Languages.en.language] description = "Read this page in another language" # 404 Error Page -[Languages.de.error] +[Languages.en.error] headline = "Error 404 - Page not found" description = "The page you're looking for does not exist." button = "Back to start page" # Specific sub-pages -[Languages.de.subpage] -[Languages.de.subpage.signatures] +[Languages.en.subpage] +[Languages.en.subpage.signatures] headline = "Individual Open Letter Signatures" - description = "Below you find the recent signatures of people who agreed to have their signature be public. Will you be the next?" - allSignatures = "Have a look at [all public signatures](all-signatures/)." + description = "Below are the signatures of the signees who agreed to have their names made public. Be the next one!" + allSignatures = "See [all public signatures](all-signatures/)." tableName = "Name" - tableCountry = "Land" - tableComment = "Kommentar" \ No newline at end of file + tableCountry = "Country" + tableComment = "Comment" From 99fa3874ca800b8f2bb3da6595f534e46c57eca3 Mon Sep 17 00:00:00 2001 From: suhrj Date: Fri, 8 Sep 2017 15:52:44 +0200 Subject: [PATCH 21/34] Update link to newer page --- site/languages/strings.en.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.en.toml b/site/languages/strings.en.toml index b355506..addb7af 100644 --- a/site/languages/strings.en.toml +++ b/site/languages/strings.en.toml @@ -21,7 +21,7 @@ # Start banner [Languages.en.start] subtitle1 = "Why is software created using taxpayers' money not released as Free Software?" - subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." + subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." subtitle3 = "**Code paid by the people should be available to the people!**" From 82f31d683d739e90d5a467ebf24ee419e6ef1f4e Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 15:54:07 +0200 Subject: [PATCH 22/34] Fix typo --- site/content/openletter/success.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/openletter/success.en.md b/site/content/openletter/success.en.md index 27e9b5a..2648806 100644 --- a/site/content/openletter/success.en.md +++ b/site/content/openletter/success.en.md @@ -12,7 +12,7 @@ If you opted-in to having your name added to the public list, your name will app ## 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. From 954648b925c94d449d3185cc93ecfa082ce0bcb3 Mon Sep 17 00:00:00 2001 From: suhrj Date: Fri, 8 Sep 2017 15:54:24 +0200 Subject: [PATCH 23/34] Update 'site/languages/strings.nl.toml' Update link to newer page (NL) --- site/languages/strings.nl.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml index 770e79a..9c04096 100644 --- a/site/languages/strings.nl.toml +++ b/site/languages/strings.nl.toml @@ -86,7 +86,7 @@ # Action section [Languages.nl.action] # 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." 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 From af75c79363c2a9eb5bd6994e93de565c487bafd0 Mon Sep 17 00:00:00 2001 From: "erik.ds" Date: Fri, 8 Sep 2017 16:02:19 +0200 Subject: [PATCH 24/34] Corrected typo in Open Letter in French --- site/content/openletter.fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/openletter.fr.md b/site/content/openletter.fr.md index 783dcf4..8e7799e 100644 --- a/site/content/openletter.fr.md +++ b/site/content/openletter.fr.md @@ -15,7 +15,7 @@ C'est là que vous pouvez nous aider ! Signez la lettre ouverte pour donner plus > ## Argent Public ? Code Public ! > -> Les services numériques offerts et utilisés par nos administrations publiques sont les infrastructures critiques du 21e siècle des nations démocratiques. Afin d’établir des systèmes fiables, les institutions publiques doivent faire en sorte d’avoir le contrôle entier du logiciel et des systèmes informatiques au cœur de notre infrastructure numérique d’État. Ce n’est pourtant pas le cas actuellement pour des raisons de licences logicielles restrictives qui: +> Les services numériques offerts et utilisés par nos administrations publiques sont les infrastructures critiques du 21e siècle des nations démocratiques. Afin d’établir des systèmes fiables, les institutions publiques doivent faire en sorte d’avoir le contrôle entier du logiciel et des systèmes informatiques au cœur de notre infrastructure numérique étatiques. Ce n’est pourtant pas le cas actuellement pour des raisons de licences logicielles restrictives qui: > > * Interdisent le partage et l’échange du code financé par le contribuable. Cela empêche la coopération entre les administrations publiques et ralentit tout développement ultérieur. > * Soutiennent des monopoles et sont une entrave à la concurrence. En conséquence, de nombreuses administrations deviennent dépendantes d’une poignée d’entreprises. From dddcb6eb6b3ec704c742aa6a3e381fed69a14e17 Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 16:03:47 +0200 Subject: [PATCH 25/34] Some more Dutch translations --- site/content/openletter/confirm.nl.md | 11 +++++++++++ site/content/openletter/success.nl.md | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 site/content/openletter/confirm.nl.md create mode 100644 site/content/openletter/success.nl.md diff --git a/site/content/openletter/confirm.nl.md b/site/content/openletter/confirm.nl.md new file mode 100644 index 0000000..fdca337 --- /dev/null +++ b/site/content/openletter/confirm.nl.md @@ -0,0 +1,11 @@ +--- +title: "Bijna klaar..." +type: page +layout: subpage +--- + +## Bekijk uw e-mail nu + +U bent bijna klaar! Binnenkort ontvangt u een e-mail met een link naar de definitieve bevestiging voor uw handtekening. Controlleer uw spam-map als u de link niet ontvangt binnen de komende 15 minuten. + +Bedankt voor het ondertekenen van de open brief van **Publiek Geld, Publieke Code**. diff --git a/site/content/openletter/success.nl.md b/site/content/openletter/success.nl.md new file mode 100644 index 0000000..4365162 --- /dev/null +++ b/site/content/openletter/success.nl.md @@ -0,0 +1,23 @@ +--- +title: "Bedankt voor uw handtekening!" +type: page +layout: subpage +--- + +## Uw handtekening is bevestigd + +Bedankt voor het ondertekenen van de open brief "Publiek Geld, Publieke Code". Uw steun betekent veel voor ons + +Als u koos om uw naam toe te voegen aan de openbare lijst, dan zal uw naam verschijnen op de [lijst van handtekeningen](../all-signatures) binnen het uur. Als u koos om meer informatie te ontvangen, dan houden wij u op de hoogte via e-mail over nieuws omtrent deze campagne. + +## Volgende stappen + +Help ons door uw handtekening een enorm effect te geven en [deel deze campagne](../../#spread). Samen zullen we politieke besluitvormers overhalen om het gebruik van Vrije en Open Bron Softwarelicenties standaard te maken in de publieke sector in heel Europa. + +You can also [order stickers and informational material](https://fsfe.org/promo#pmpc) from the Free Software Foundation Europe. + +U kunt ook [stickers en voorlichtingsmaterial bestellen](https://fsfe.org/promo#pmpc) van de Free Software Foundation Europe. + +Maak Vrije Software in Europa sterker en overweeg om [de FSFE](https://fsfe.org/donate/?pmpc) of één van de andere [ondersteunende organisaties](../../#organisations) te steunen. + +Met uw steun zullen besluitvormers in heel Europe begrijpen dat het gebruiken van Vrije en Open Source Softwarelicenties de beste oplossing is voor hen, andere openbare besturen, bedrijven, en voornamelijk het algemeen publiek. From 6d5f45d342c113cf31424b565872082b3cc3484f Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 16:08:55 +0200 Subject: [PATCH 26/34] Create all-signatures.nl.md --- site/content/openletter/all-signatures.nl.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 site/content/openletter/all-signatures.nl.md diff --git a/site/content/openletter/all-signatures.nl.md b/site/content/openletter/all-signatures.nl.md new file mode 100644 index 0000000..9b78c0e --- /dev/null +++ b/site/content/openletter/all-signatures.nl.md @@ -0,0 +1,12 @@ +--- +title: "Alle openbare handtekeningen" +type: page +layout: subpage +--- + +Dit is de volledige lijst van alle mensen die de open brief ondertekend hebben, en die toestemming gegeven hebben om hun naam openbaar te maken. {{< count type="signatures" >}} mensen hebben hun steun al betuigd – ben jij één van hen? + +Deze lijst wordt elk uur ververst. + +{{< show_signatures >}} + From f98e6c17bdf9b44ba0efe7480ce52bdf735cbcc8 Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 16:21:22 +0200 Subject: [PATCH 27/34] Mimic changes in bd4dbcc748 --- site/languages/strings.nl.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml index 9c04096..8154be9 100644 --- a/site/languages/strings.nl.toml +++ b/site/languages/strings.nl.toml @@ -87,11 +87,11 @@ [Languages.nl.action] # 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/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** already 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!" # In "subheadline", please use curly quotation marks for the demand. Otherwise the build might fail: https://en.wikipedia.org/wiki/Quotation_mark subheadline = "TODO (copy from open letter). We demand: **„Implement legislation requiring that publicly financed software developed for public sector must 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.“**" - description = "TODO: **$ORGS organisations** and **$INDS individuals** support this call for action by signing our [Open Letter](openletter/). Help us to make an 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 = "TODO: **$ORGS organisations** and **$INDS individuals** already support this call for action by signing our [Open Letter](openletter/). Help us to make an impact by signing it, too! We will hand over all signatures to representatives all over Europe that are debating software freedom in public administration." [Languages.nl.action.box] # text = "Already **$INDS SIGNATURES** – sign the open letter now!" From d98e56a9339ec5fae866268b18b115ba70cbe8e0 Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 16:33:10 +0200 Subject: [PATCH 28/34] Remove English line from Dutch strings --- site/languages/strings.nl.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml index 8154be9..e7bfaf2 100644 --- a/site/languages/strings.nl.toml +++ b/site/languages/strings.nl.toml @@ -41,7 +41,7 @@ [Languages.nl.about] # headline = "Sound complicated? It's not. It's super easy!" # buttonText = "More advantages" - headline = "Klinkt ingewikkeld? Nee, het is heel simpel!" "Sounds complex? No, it's super easy!" + headline = "Klinkt ingewikkeld? Nee, het is heel simpel!" buttonText = "Meer voordelen" From f5e1777fbcef171b953b11353482343df6db9e4d Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 16:34:29 +0200 Subject: [PATCH 29/34] Typo --- site/languages/strings.nl.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml index e7bfaf2..a3eaef7 100644 --- a/site/languages/strings.nl.toml +++ b/site/languages/strings.nl.toml @@ -185,7 +185,7 @@ # tableComment = "Comment" headline = "Individuele handtekeningen voor de Open Brief" description = "TODO: Below you find the recent signatures of people who agreed to have their signature be public. Will you be the next?" - allSignatures = "Bekijke [alle publieke handtekeningen](all-signatures/)." + allSignatures = "Bekijk [alle publieke handtekeningen](all-signatures/)." tableName = "Naam" tableCountry = "Land" tableComment = "Commentaar" From 28b766c87171432a1131e0edecec451df9601702 Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 16:34:52 +0200 Subject: [PATCH 30/34] =?UTF-8?q?publiek=20=E2=86=92=20openbaar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site/languages/strings.nl.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml index a3eaef7..bd5094c 100644 --- a/site/languages/strings.nl.toml +++ b/site/languages/strings.nl.toml @@ -185,7 +185,7 @@ # tableComment = "Comment" headline = "Individuele handtekeningen voor de Open Brief" description = "TODO: Below you find the recent signatures of people who agreed to have their signature be public. Will you be the next?" - allSignatures = "Bekijk [alle publieke handtekeningen](all-signatures/)." + allSignatures = "Bekijk [alle openbare handtekeningen](all-signatures/)." tableName = "Naam" tableCountry = "Land" tableComment = "Commentaar" From b73a5a9c87a63e48bcf702a7a84de445668103d8 Mon Sep 17 00:00:00 2001 From: Carmen Bianca Bakker Date: Fri, 8 Sep 2017 16:35:40 +0200 Subject: [PATCH 31/34] Use correct English text to translate --- site/languages/strings.nl.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml index bd5094c..89a04c1 100644 --- a/site/languages/strings.nl.toml +++ b/site/languages/strings.nl.toml @@ -184,7 +184,7 @@ # tableCountry = "Country" # tableComment = "Comment" headline = "Individuele handtekeningen voor de Open Brief" - description = "TODO: Below you find the recent signatures of people who agreed to have their signature be public. Will you be the next?" + description = "TODO: Below are the signatures of the signees who agreed to have their names made public. Be the next one!" allSignatures = "Bekijk [alle openbare handtekeningen](all-signatures/)." tableName = "Naam" tableCountry = "Land" From 5ff8afe31bb638d4c569062866cfe8eca546d4df Mon Sep 17 00:00:00 2001 From: suhrj Date: Fri, 8 Sep 2017 17:01:07 +0200 Subject: [PATCH 32/34] Update link to newer page --- site/languages/strings.XY.toml.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.XY.toml.sample b/site/languages/strings.XY.toml.sample index af37bde..81974d3 100644 --- a/site/languages/strings.XY.toml.sample +++ b/site/languages/strings.XY.toml.sample @@ -21,7 +21,7 @@ # Start banner [Languages.en.start] subtitle1 = "Why is software created using taxpayers' money not released as Free Software?" - subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." + subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." subtitle3 = "**Code paid by the people should be available to the people!**" From b5997c0f01bc9a6a39e93b01aeb77b1e9b44322a Mon Sep 17 00:00:00 2001 From: suhrj Date: Fri, 8 Sep 2017 17:02:04 +0200 Subject: [PATCH 33/34] Update link to newer page --- site/languages/strings.en.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.en.toml b/site/languages/strings.en.toml index a0198ec..6de70de 100644 --- a/site/languages/strings.en.toml +++ b/site/languages/strings.en.toml @@ -21,7 +21,7 @@ # Start banner [Languages.en.start] subtitle1 = "Why is software created using taxpayers' money not released as Free Software?" - subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." + subtitle2 = "We want 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 right to use, study, share and improve software. This right helps support other fundamental freedoms like freedom of speech, press and privacy.') licence. If it is public money, it should be public code as well." subtitle3 = "**Code paid by the people should be available to the people!**" From 5131a55bb0b8a3c411bd0e3bacf4edda12d89d7e Mon Sep 17 00:00:00 2001 From: suhrj Date: Fri, 8 Sep 2017 17:02:30 +0200 Subject: [PATCH 34/34] Update link to newer page --- site/languages/strings.nl.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/languages/strings.nl.toml b/site/languages/strings.nl.toml index 89a04c1..731fb68 100644 --- a/site/languages/strings.nl.toml +++ b/site/languages/strings.nl.toml @@ -30,7 +30,7 @@ # Start banner [Languages.nl.start] # subtitle1 = "Why is software created using taxpayers' money not released as Free Software?" - # subtitle2 = "We want 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. If it is public money, it should be public code as well." + # subtitle2 = "We want 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. If it is public money, it should be public code as well." # subtitle3 = "**Code paid by the people should be available to the people!**" subtitle1 = "Waarom is software die geschreven is met belastinggeld niet beschikbaar als Vrije Software?" subtitle2 = "TODO: We want legislation requiring that publicly financed software developed for public sector must 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. If it is public money, it should be public code as well."