Merge branch 'master' into pl-pr

Merge pull request 'remove covid kit' (#245 ) from kill_covid into master
Reviewed-on: Disroot/Website#245 Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-07-28 09:55:52 +00:00 · 2021-07-28 08:10:17 +00:00 · 2021-07-27 22:13:24 +02:00 · 2021-07-17 19:18:22 +00:00 · 2021-07-17 21:17:15 +02:00 · 2021-07-17 19:13:48 +00:00
97 changed files with 404 additions and 516 deletions
--- a/pages/03.services/02.email/_email-alias/2col.de.md
+++ b/pages/03.services/02.email/_email-alias/2col.de.md
@ -21,7 +21,7 @@ Mehr Aliase sind verfügbar für regelmäßige Unterstützer. Mit regelmäßigen
 Es ist jetzt nicht so, dass wir hier Kaffee anpreisen wollen. Auf der anderen Seite ist Kaffee jedoch eine sehr griffige Analogie für Ausbeutung und [Ungleichheit](http://www.foodispower.org/coffee/)). Wir denken, dies ist eine gute Möglichkeit, jeden selbst bestimmen zu lassen, wie viel er geben kann.
 Wir haben diese [Liste](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) gefunden mit Kaffeepreisen rund um die Welt. Die Liste ist vielleicht nicht hundertprozentig korrekt oder gar tagesaktuell, aber Du hast in ihr einen guten Indikator für die verschiedenen Preise. Nimm Dir ruhig Zeit, die Höhe Deines Beitrags abzuwägen. Wenn Du uns einen **Rio de Janeiro**-Kaffee im Monat "kaufen" kannst, ist das OK. Wenn Du Dir jedoch einen *doppelten entkoffeinierten Soja Frappuccino mit einem extra Shot und Sahne* im Monat leisten kannst, dann hilfst Du uns wirklich, die **Disroot**-Plattform am Laufen zu halten und sicherzugehen, dass sie frei zugänglich bleibt für andere Menschen mit weniger Mitteln.

-Um ein Alias zu beantragen, fülle bitte dieses [Formular](https://disroot.org/de/forms/alias-request-form) aus.<br>
-Wenn Du Deine eigene Domain nutzen willst, brauchst Du dieses [Formular](https://disroot.org/de/forms/domain-linking-form).
+Um ein Alias zu beantragen, fülle bitte dieses [Formular](/forms/alias-request-form) aus.<br>
+Wenn Du Deine eigene Domain nutzen willst, brauchst Du dieses [Formular](/forms/domain-linking-form).

 Für weitere Informationen, z.B. wie Du Deine neuen Email-Aliase einrichtest, schau Dir unsere [Tutorials](https://howto.disroot.org/de/tutorials/email/alias) an.
--- a/pages/03.services/02.email/_email-alias/2col.en.md
+++ b/pages/03.services/02.email/_email-alias/2col.en.md
@ -20,7 +20,7 @@ More aliases are available for our regular supporters. By regular supporters we
 We found this [list of coffee cup prices](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) around the world, it might not be very accurate, but it gives a good indication of the different fares. Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the **Disroot** platform running and make sure it is available for free for other people with less means.


-To request aliases you need to fill in this [form](https://disroot.org/en/forms/alias-request-form).<br>
-If you would like to use your own domain use this [form](https://disroot.org/en/forms/domain-linking-form).
+To request aliases you need to fill in this [form](/forms/alias-request-form).<br>
+If you would like to use your own domain use this [form](/forms/domain-linking-form).

 For information on howto to setup your new email aliases check our [howto section](https://howto.disroot.org/en/tutorials/email/alias).
--- a/pages/03.services/02.email/_email-alias/2col.es.md
+++ b/pages/03.services/02.email/_email-alias/2col.es.md
@ -21,7 +21,7 @@ No estamos promoviendo el café, al contrario, pensamos que es, de hecho, un cla
 Encontramos esta [lista](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) de precios de tazas de café alrededor del mundo, podría no ser muy precisa, pero da un buen indicio de los diferentes costos.
 Por favor, tómate el tiempo para considerar tu contribución. Si puedes 'comprarnos' una taza de café al mes en Río De Janeiro, eso está muy bien. Pero si puedes permitirte pagar un _Café Doble Descafeinado Con Crema extra_ al mes, entonces puedes ayudarnos en serio a mantener funcionando la plataforma **Disroot** y asegurar que esté disponible de manera gratuita para otras personas con menos recursos.

-Para solicitar Alias necesitas completar este [formulario](https://disroot.org/es/forms/alias-request-form).<br>
-Si deseas utilizar tu propio dominio, usa este [formulario](https://disroot.org/es/forms/domain-linking-form).
+Para solicitar Alias necesitas completar este [formulario](/forms/alias-request-form).<br>
+Si deseas utilizar tu propio dominio, usa este [formulario](/forms/domain-linking-form).

 Para más información sobre cómo configurar tu nuevo alias de correo, mira en nuestra [sección de manuales](https://howto.disroot.org/es/tutorials/email/alias)
--- a/pages/03.services/02.email/_email-alias/2col.fr.md
+++ b/pages/03.services/02.email/_email-alias/2col.fr.md
@ -21,8 +21,8 @@ Ce n'est pas que nous faisons la promotion du café, bien au contraire - le caf
 Nous avons trouvé cette [liste](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) des prix des tasses de café à travers le monde, elle n'est peut-être pas très précise, mais elle donne une bonne indication des différents tarifs.
 Veuillez prendre le temps de réfléchir à votre contribution. Si vous pouvez nous "acheter" une tasse de café Rio De Janeiro par mois, c'est correct, mais si vous avez les moyens d'acheter un double décaféiné Frappuccino au soja avec un extra Shot And Cream par mois, alors vous pouvez vraiment nous aider à maintenir la plateforme **Disroot** en fonctionnement et vous assurer qu'elle est disponible gratuitement pour d'autres personnes avec moins de moyens.

-Pour demander des alias vous devez remplir ce [formulaire](https://disroot.org/fr/forms/alias-request-form).<br>
-Si vous souhaitez utiliser votre propre domaine, utilisez ce [formulaire](https://disroot.org/fr/forms/domain-linking-form).
+Pour demander des alias vous devez remplir ce [formulaire](/forms/alias-request-form).<br>
+Si vous souhaitez utiliser votre propre domaine, utilisez ce [formulaire](/forms/domain-linking-form).

 *Si vous avez déjà fait un don pour **Disroot** dans le passé et que vous souhaitez toujours obtenir des alias, veuillez nous contacter.*

--- a/pages/03.services/02.email/_email-alias/2col.it.md
+++ b/pages/03.services/02.email/_email-alias/2col.it.md
@ -23,8 +23,8 @@ Abbiamo trovato [la lista dei prezzi](https://www.numbeo.com/cost-of-living/pric

 Ti chiediamo quindi di valutare quanto donare. Se ti puoi permettere una tazza di caffé a Rio De Janeiro al mese, per noi va bene, ma se ti puoi permettere un Frapuccino doppio decaffeinato di soia con doppia panna al mese, sappi che in questo modo potresti aiutarci in modo importante a far funzionare la piattaforma Disroot ed assicurare il buon funzionamento del progetto anche per chi non ha le tue stesse disponibilità economiche.

-Per richiedere un alias compila questa [form](https://disroot.org/en/forms/alias-request-form).<br>
-Se invece desideri utilizzare un tuo dominio compila questa [form](https://disroot.org/en/forms/domain-linking-form).
+Per richiedere un alias compila questa [form](/forms/alias-request-form).<br>
+Se invece desideri utilizzare un tuo dominio compila questa [form](/forms/domain-linking-form).

 Nel caso avessi già donato in passato a **Disroot** e ti piacerebbe comunque avere degli alias contattaci direttamente.

--- a/pages/03.services/02.email/_email-alias/2col.ru.md
+++ b/pages/03.services/02.email/_email-alias/2col.ru.md
@ -19,7 +19,7 @@ section_id: alias
 Для наших постоянных сторонников доступны альтернативные почтовые псевдонимы. Под постоянными сторонниками мы понимаем тех, кто жертвует хотя бы одну чашку кофе в месяц. Дело не в том, что мы продвигаем кофе, наоборот - кофе на самом деле является символом эксплуатации и [неравенства](http://www.foodispower.org/coffee/ ), поэтому мы подумали, что это хороший способ дать людям возможность измерить сами, сколько они могут дать.
 Мы нашли этот [список цен на кофейные чашки](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) по всему миру, он может быть не очень точным, но дает хорошее представление о различных тарифах. Пожалуйста, найдите время, чтобы обдумать ваш вклад. Если вы можете «купить» нам одну чашку кофе Рио-де-Жанейро в месяц, это нормально, но если вы можете позволить себе двойной соевый фраппучино без кофеина с дополнительной порцией и сливками в месяц, то вы действительно можете помочь нам сохранить платформу **Disroot** работоспособным и быть уверенным, что она бесплатно доступна для других людей с меньшими средствами.

-Чтобы запросить псевдонимы, вам необходимо заполнить эту [форму](https://disroot.org/en/forms/alias-request-form). <br>
-Если вы хотите использовать свой собственный домен, используйте эту [форму](https://disroot.org/en/forms/domain-linking-form).
+Чтобы запросить псевдонимы, вам необходимо заполнить эту [форму](/forms/alias-request-form). <br>
+Если вы хотите использовать свой собственный домен, используйте эту [форму](/forms/domain-linking-form).

 Информацию о том, как настроить новые псевдонимы электронной почты, можно найти в нашем [разделе с инструкциями](https://howto.disroot.org/ru/tutorials/email/alias).
--- a/pages/03.services/02.email/_email-x-storage/2col.de.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.de.md
@ -8,7 +8,7 @@ wider_column: left

 Wenngleich eine Postfachgröße von 1 GB nicht so klein ist, kann es natürlich sein, dass Du mehr Speicher benötigst. Es ist daher möglich, Deinen Email-Speicher von 1 GB auf bis zu 10 GB zu erweitern für monatlich 0,15 €/GB, jährlich zu zahlen.

-Um zusätzlichen Speicher zu beantragen, fülle dieses [Formular](https://disroot.org/de/forms/extra-storage-mailbox) aus.<br>
+Um zusätzlichen Speicher zu beantragen, fülle dieses [Formular](/forms/extra-storage-mailbox) aus.<br>


 ---
--- a/pages/03.services/02.email/_email-x-storage/2col.en.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.en.md
@ -10,11 +10,11 @@ section_id: storage

 It is possible to extend your E-mail storage from 1GB to 10GB for the cost of 0.15 euro per GB per month, paid yearly.

-To request extra storage you need to fill in this [form](https://disroot.org/en/forms/extra-storage-mailbox).<br>
+To request extra storage you need to fill in this [form](/forms/extra-storage-mailbox).<br>


 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/en/forms/extra-storage-mailbox">Request Extra Mailbox Storage</a>
+<a class="button button1" href="/forms/extra-storage-mailbox">Request Extra Mailbox Storage</a>
--- a/pages/03.services/02.email/_email-x-storage/2col.es.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.es.md
@ -10,7 +10,7 @@ section_id: storage

 Es posible aumentar el espacio de almacenamiento de tu E-mail hasta 10 GB por 0.15 euro por GB mensual, abonado anualmente.

-Para solicitar espacio extra necesitas completar [este formulario](https://disroot.org/es/forms/extra-storage-mailbox).<br>
+Para solicitar espacio extra necesitas completar [este formulario](/forms/extra-storage-mailbox).<br>


 ---
--- a/pages/03.services/02.email/_email-x-storage/2col.fr.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.fr.md
@ -9,11 +9,11 @@ wider_column: left

 Il est possible d'étendre la capacité de stockage de votre messagerie jusqu'à 10 Go pour le coût de 0,15 euro par Go et par mois, à payer annuellement.

-Pour demander de l'espace de stockage supplémentaire, vous devez remplir ce  [formulaire](https://disroot.org/fr/forms/extra-storage-mailbox).<br>
+Pour demander de l'espace de stockage supplémentaire, vous devez remplir ce  [formulaire](/forms/extra-storage-mailbox).<br>


 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/fr/forms/extra-storage-mailbox">Demander plus d'espace de stockage pour la messagerie</a>
+<a class="button button1" href="/forms/extra-storage-mailbox">Demander plus d'espace de stockage pour la messagerie</a>
--- a/pages/03.services/02.email/_email-x-storage/2col.it.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.it.md
@ -9,11 +9,11 @@ wider_column: left

 È possibile estendere l'archiviazione della posta elettronica fino a 10 GB al costo di 0,15 euro al GB al mese.

-Per richiedere ulteriore spazio di archiviazione è necessario compilare questa [form](https://disroot.org/en/forms/extra-storage-mailbox).<br>
+Per richiedere ulteriore spazio di archiviazione è necessario compilare questa [form](/forms/extra-storage-mailbox).<br>


 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/en/forms/extra-storage-mailbox">Richiedi ulteriore spazio di archiviazione per la posta elettronica</a>
+<a class="button button1" href="https://disroot.org/it/forms/extra-storage-mailbox">Richiedi ulteriore spazio di archiviazione per la posta elettronica</a>
--- a/pages/03.services/02.email/_email-x-storage/2col.ru.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.ru.md
@ -10,7 +10,7 @@ section_id: storage

 Вы можете расширить хранилище электронной почты с 1 ГБ до 10 ГБ по цене 0,15 евро за гигабайт в месяц при оплате за год.

-Чтобы запросить дополнительное пространство для хранения, вам необходимо заполнить эту [форму](https://disroot.org/ru/forms/extra-storage-mailbox).<br>
+Чтобы запросить дополнительное пространство для хранения, вам необходимо заполнить эту [форму](/forms/extra-storage-mailbox).<br>


 ---
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.de.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.de.md
@ -11,7 +11,7 @@ section_id: storage
 Mit Deinem **Disroot**-Account erhältst Du 2 GB FREIEN Speicher.
 Du kannst diesen Speicherplatz von 2 GB auf 14, 29 oder 54 GB erhöhen für nur 0,15 €/Monat. Hier kannst Du dann sogar wählen, ob Du einen Teil oder den ganzen zusätzlichen Speicher für Dein Mailpostfach nutzen willst.

-Um Extraspeicher zu beantragen, fülle bitte dieses [Formular](https://disroot.org/de/forms/extra-storage-space) aus.<br>Wenn Du einen Teil des Extraspeichers oder alles für Dein Mailpostfach nutzen willst, vermerke das bitte im Kommentarfeld des Formulars.
+Um Extraspeicher zu beantragen, fülle bitte dieses [Formular](/forms/extra-storage-space) aus.<br>Wenn Du einen Teil des Extraspeichers oder alles für Dein Mailpostfach nutzen willst, vermerke das bitte im Kommentarfeld des Formulars.


 ---
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.en.md
@ -11,7 +11,7 @@ section_id: storage
 With your **Disroot** account, you get 2GB FREE storage.
 It is possible to extend your cloud storage from 2GB to 14, 29 or 54GB for the cost of 0.15 euro per GB per month. You can also choose to use some or all of the additional space for mail storage, please specify that in the comment section in the request form.

-To request extra storage you need to fill in this [form](https://disroot.org/en/forms/extra-storage-space).<br>
+To request extra storage you need to fill in this [form](/forms/extra-storage-space).<br>


 ---
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.es.md
@ -10,7 +10,7 @@ section_id: storage

 Con tu cuenta de **Disroot**, obtienes 2GB GRATIS de almacenamiento. Es posible ampliarlo a 14, 29 o 54 GB a 0.15 euro mensual por GB. También puedes elegir utilizar algo de todo el espacio adicional para almacenar correos. Por favor, especifica eso en la sección de comentarios en el formulario de solicitud.

-Para solicitar almacenamiento extra necesitas completar este [formulario](https://disroot.org/es/forms/extra-storage-space).<br>
+Para solicitar almacenamiento extra necesitas completar este [formulario](/forms/extra-storage-space).<br>


 ---
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.fr.md
@ -10,11 +10,11 @@ section_id: storage

 Il est possible d'étendre votre stockage cloud à 14, 29 ou 54 Go pour un coût de 0,15 euro par Go et par mois. Vous pouvez également choisir d'utiliser une partie de l'espace supplémentaire pour le stockage du courrier électronique, veuillez le spécifier dans la section commentaire du formulaire de demande.

-Pour demander un espace de stockage supplémentaire, vous devez remplir ce  [formulaire](https://disroot.org/en/forms/extra-storage-space).<br>
+Pour demander un espace de stockage supplémentaire, vous devez remplir ce  [formulaire](/forms/extra-storage-space).<br>


 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/en/forms/extra-storage-space">Demande de stockage supplémentaire</a>
+<a class="button button1" href="https://disroot.org/fr/forms/extra-storage-space">Demande de stockage supplémentaire</a>
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.it.md
@ -10,11 +10,11 @@ section_id: storage

 È possibile estendere lo spazio di archiviazione a 14,29 o 54 GB al costo di 0.15 Euro per GB per mese. È possibile utilizzare lo spazio extra pure per i tuoi messaggi di posta elettronica. Se fossi interessato a questa opzione, ti chiediamo di specificarlo nella sezione commenti della form da compilare.

-Per richiedere spazio aggiuntivo compliare questa [form](https://disroot.org/en/forms/extra-storage-space).<br>
+Per richiedere spazio aggiuntivo compliare questa [form](/forms/extra-storage-space).<br>


 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/en/forms/extra-storage-space">Richiedi spazio extra</a>
+<a class="button button1" href="https://disroot.org/it/forms/extra-storage-space">Richiedi spazio extra</a>
--- a/pages/03.services/06.cryptpad/_cryptpad-info/fullbar.en.md
+++ b/pages/03.services/06.cryptpad/_cryptpad-info/fullbar.en.md
@ -6,7 +6,7 @@ text_align: center
 ---

 <br><br>
-Every user gets **50MB storage space** for files.
+Every user gets **250MB storage space** for files.

 ---

--- a/pages/03.services/06.cryptpad/_cryptpad-info/fullbar.es.md
+++ b/pages/03.services/06.cryptpad/_cryptpad-info/fullbar.es.md
@ -6,7 +6,7 @@ text_align: center
 ---

 <br><br>
-Cada usuarix obtiene **50MB de espacio de almacenamiento** para archivos.
+Cada usuarix obtiene **250MB de espacio de almacenamiento** para archivos.

 ---

--- a/pages/03.services/06.cryptpad/_cryptpad-info/fullbar.fr.md
+++ b/pages/03.services/06.cryptpad/_cryptpad-info/fullbar.fr.md
@ -6,7 +6,7 @@ text_align: center
 ---

 <br><br>
-Chaque utilisateur dispose de **50Mo d'espace de stockage** pour les fichiers.
+Chaque utilisateur dispose de **250Mo d'espace de stockage** pour les fichiers.

 ---

--- a/pages/04.contact/_links/2col.de.md
+++ b/pages/04.contact/_links/2col.de.md
@ -19,7 +19,7 @@ twig_first: false

 ---

-![](irc.png?classes=contact) IRC: #disroot auf irc.freenode.net
+![](irc.png?classes=contact) IRC: #disroot auf irc.libera.chat

 [![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) XMPP: [disroot@chat.disroot.org](xmpp:disroot@chat.disroot.org?join)

--- a/pages/04.contact/_links/2col.en.md
+++ b/pages/04.contact/_links/2col.en.md
@ -19,7 +19,7 @@ twig_first: false

 ---

-![](irc.png?classes=contact) IRC: #disroot on irc.freenode.net
+![](irc.png?classes=contact) IRC: #disroot on irc.libera.chat

 [![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) Xmpp: [disroot@chat.disroot.org](xmpp:disroot@chat.disroot.org?join)

--- a/pages/04.contact/_links/2col.es.md
+++ b/pages/04.contact/_links/2col.es.md
@ -18,7 +18,7 @@ twig_first: false

 ---

-![](irc.png?classes=contact) IRC: #disroot sobre irc.freenode.net
+![](irc.png?classes=contact) IRC: #disroot sobre irc.libera.chat

 [![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) XMPP: [disroot@chat.disroot.org](xmpp:disroot@chat.disroot.org?join)

--- a/pages/04.contact/_links/2col.fr.md
+++ b/pages/04.contact/_links/2col.fr.md
@ -18,7 +18,7 @@ twig_first: false

 ---

-![](irc.png?classes=contact) IRC: #disroot sur irc.freenode.net
+![](irc.png?classes=contact) IRC: #disroot sur irc.libera.chat

 [![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) Xmpp: [disroot@chat.disroot.org](xmpp:disroot@chat.disroot.org?join)

--- a/pages/04.contact/_links/2col.it.md
+++ b/pages/04.contact/_links/2col.it.md
@ -18,7 +18,7 @@ twig_first: false

 ---

-![](irc.png?classes=contact) IRC: #disroot sul irc.freenode.net
+![](irc.png?classes=contact) IRC: #disroot sul irc.libera.chat

 [![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) Xmpp: [disroot@chat.disroot.org](xmpp:disroot@chat.disroot.org?join)

--- a/pages/04.contact/_links/2col.ru.md
+++ b/pages/04.contact/_links/2col.ru.md
@ -19,7 +19,7 @@ twig_first: false

 ---

-![](irc.png?classes=contact) IRC: #disroot on irc.freenode.net
+![](irc.png?classes=contact) IRC: #disroot on irc.libera.chat

 [![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) Xmpp: [disroot@chat.disroot.org](xmpp:disroot@chat.disroot.org?join)

--- a/pages/06.donate/_donate/2col.de.md
+++ b/pages/06.donate/_donate/2col.de.md
@ -28,8 +28,8 @@ wider_column: right

 #### Banküberweisung:
 <span style="color:#8EB726; font-size:1.8em;"> Stichting Disroot.org <br>
-IBAN NL19 TRIO 0338 7622 05<br>
-BIC TRIONL2U
+IBAN: NL19 TRIO 0338 7622 05<br>
+BIC: TRIONL2U
 </span>
 *(Eine Stichting ist eine niederländische Gesellschaftsform ähnlich einer deutschen Stiftung. Kernpunkt einer Stichting ist die Maßgabe, dass sie keinen Gewinn erwirtschaften darf.)
 Kreditkarte:<br><span style="color:#8EB726;"> Du kannst den blauen Paypal-Button nutzen, um per Kreditkarte zu spenden. Ein Paypal-Account ist nicht notwendig. </span>
--- a/pages/06.donate/_donate/2col.en.md
+++ b/pages/06.donate/_donate/2col.en.md
@ -28,8 +28,8 @@ wider_column: right

 #### Bank transfer:
 <span style="color:#8EB726; font-size:1.8em;"> Stichting Disroot.org <br>
-IBAN NL19 TRIO 0338 7622 05<br>
-BIC TRIONL2U
+IBAN: NL19 TRIO 0338 7622 05<br>
+BIC: TRIONL2U
 </span>

 Credit cards:<br><span style="color:#8EB726;"> You can use the blue Paypal button for credit card donations, A Paypal account is not needed. </span>
--- a/pages/06.donate/_donate/2col.es.md
+++ b/pages/06.donate/_donate/2col.es.md
@ -28,8 +28,8 @@ wider_column: right

 #### Transferencia bancaria:
 <span style="color:#8EB726; font-size:1.8em;"> Stichting Disroot.org <br>
-IBAN NL19 TRIO 0338 7622 05<br>
-BIC TRIONL2U
+IBAN: NL19 TRIO 0338 7622 05<br>
+BIC: TRIONL2U
 </span>

 Tarjetas de crédito: <br><span style ="color:#8EB726;"> Puede usar el botón azul de Paypal para donaciones con tarjetas de crédito, no se necesita una cuenta de Paypal. </span>
--- a/pages/06.donate/_donate/2col.fr.md
+++ b/pages/06.donate/_donate/2col.fr.md
@ -28,8 +28,8 @@ wider_column: right

 #### Virement bancaire:
 <span style="color:#8EB726; font-size:1.8em;"> Stichting Disroot.org <br>
-IBAN NL19 TRIO 0338 7622 05<br>
-BIC TRIONL2U
+IBAN: NL19 TRIO 0338 7622 05<br>
+BIC: TRIONL2U
 </span>

 Cartes de crédit: <br><span style ="color:#8EB726;">
--- a/pages/06.donate/_donate/2col.it.md
+++ b/pages/06.donate/_donate/2col.it.md
@ -28,8 +28,8 @@ wider_column: right

 #### Riferimenti bancari:
 <span style="color:#8EB726; font-size:1.8em;"> Stichting Disroot.org <br>
-IBAN NL19 TRIO 0338 7622 05<br>
-BIC TRIONL2U
+IBAN: NL19 TRIO 0338 7622 05<br>
+BIC: TRIONL2U
 </span>

 Carte di credito: <br><span style ="color:#8EB726;">
--- a/pages/06.donate/_donate/2col.ru.md
+++ b/pages/06.donate/_donate/2col.ru.md
@ -28,8 +28,8 @@ wider_column: right

 #### Банковский перевод:
 <span style="color:#8EB726; font-size:1.8em;"> Stichting Disroot.org <br>
-IBAN NL19 TRIO 0338 7622 05<br>
-BIC TRIONL2U
+IBAN: NL19 TRIO 0338 7622 05<br>
+BIC: TRIONL2U
 </span>

 Кредитные карты:<br><span style="color:#8EB726;"> Вы можете использовать синюю кнопку Paypal для пожертвований с кредитной карты. Учетная запись Paypal не требуется. </span>
--- a/pages/06.donate/_overview/donated.png
+++ b/pages/06.donate/_overview/donated.png
--- a/pages/06.donate/_overview/fullbar.de.md
+++ b/pages/06.donate/_overview/fullbar.de.md
@ -10,8 +10,11 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Unterstützt von <button class="button button4">230</button>
+Unterstützt von <button class="button button4">208</button>
 _(Click the number for an overview)_


 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
+
+## FOSS Donations
+![](donated.png?lightbox=1024&resize=70%)
--- a/pages/06.donate/_overview/fullbar.en.md
+++ b/pages/06.donate/_overview/fullbar.en.md
@ -10,10 +10,10 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Supported by <button class="button button4">230</button> Disrooters
+Supported by <button class="button button4">208</button> Disrooters
 _(Click the number for an overview)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

-## FOSS Donations Overview
+## FOSS Donations
 ![](donated.png?lightbox=1024&resize=70%)
--- a/pages/06.donate/_overview/fullbar.es.md
+++ b/pages/06.donate/_overview/fullbar.es.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Apoyado por <button class="button button4">230</button> Disrooters
+Apoyado por <button class="button button4">208</button> Disrooters
 _(Click sobre el número para una vista general)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
--- a/pages/06.donate/_overview/fullbar.fr.md
+++ b/pages/06.donate/_overview/fullbar.fr.md
@ -10,7 +10,10 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Soutenu par <button class="button button4">230</button> Disrooters
+Soutenu par <button class="button button4">208</button> Disrooters
 _(Cliquez sur le numéro pour un aperçu)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
+
+## FOSS Donations
+![](donated.png?lightbox=1024&resize=70%)
--- a/pages/06.donate/_overview/fullbar.it.md
+++ b/pages/06.donate/_overview/fullbar.it.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Supporto di <button class="button4">230</button> Disrooters
+Supporto di <button class="button4">208</button> Disrooters
 _(Clicca sul numero per una panoramica)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
--- a/pages/06.donate/_overview/fullbar.ru.md
+++ b/pages/06.donate/_overview/fullbar.ru.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Вклад внесли <button class="button button4">230</button> дизрутера(ов)
+Вклад внесли <button class="button button4">208</button> дизрутера(ов)
 _(Щелкните номер для обзора)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
--- a/pages/06.donate/_overview/graph.png
+++ b/pages/06.donate/_overview/graph.png
--- a/pages/06.donate/_overview/graph_support.png
+++ b/pages/06.donate/_overview/graph_support.png
--- a/pages/06.donate/_reports/3col.de.md
+++ b/pages/06.donate/_reports/3col.de.md
@ -8,18 +8,20 @@ text_align: center

 # Jahresberichte:

-**Jahresbericht 2019** <br>
+**Jahresbericht 2020**
+[Bericht 2020](/annual_reports/AnnualReport2020.pdf?target=_blank)
+
+**Jahresbericht 2019**
 [Bericht 2019](/annual_reports/AnnualReport2019.pdf?target=_blank)

-**Jahresbericht 2018** <br>
-[Bericht 2018](https://disroot.org/annual_reports/AnnualReport2018.pdf)
+**Jahresbericht 2018**
+[Bericht 2018](/annual_reports/AnnualReport2018.pdf?target=_blank)

-**Aug 2016 - Aug 2017** <br>
-[Bericht 2016-2017](https://disroot.org/annual_reports/2017.pdf)
+**Aug 2016 - Aug 2017**
+[Bericht 2016-2017](/annual_reports/2017.pdf?target=_blank)

-**2015 - Aug 2016** <br>
-Kosten: €1569.76 <br>
-Spenden: €264.52
+**2015 - Aug 2016**
+Kosten: €1569.76 / Spenden: €264.52

 ---

--- a/pages/06.donate/_reports/3col.en.md
+++ b/pages/06.donate/_reports/3col.en.md
@ -8,6 +8,9 @@ text_align: center

 #Annual reports:

+**Annual Report 2020**
+[Report 2020](/annual_reports/AnnualReport2020.pdf?target=_blank)
+
 **Annual Report 2019**
 [Report 2019](/annual_reports/AnnualReport2019.pdf?target=_blank)

--- a/pages/06.donate/_reports/3col.es.md
+++ b/pages/06.donate/_reports/3col.es.md
@ -8,14 +8,17 @@ text_align: center

 #Reportes anuales:

+**Reporte Anual 2020**
+[Reporte 2020](/annual_reports/AnnualReport2020.pdf?target=_blank)
+
 **Reporte Anual 2019**
 [Reporte 2019](/annual_reports/AnnualReport2019.pdf?target=_blank)

 **Reporte Anual 2018**
-[Reporte 2018](https://disroot.org/annual_reports/AnnualReport2018.pdf)
+[Reporte 2018](/annual_reports/AnnualReport2018.pdf?target=_blank)

 **Agosto 2016 - Agosto 2017**
-[Reporte 2016-2017](https://disroot.org/annual_reports/2017.pdf)
+[Reporte 2016-2017](/annual_reports/2017.pdf?target=_blank)

 **2015 - Agosto 2016**
 Costos: €1569.76 / Donaciones: €264.52
--- a/pages/06.donate/_reports/3col.fr.md
+++ b/pages/06.donate/_reports/3col.fr.md
@ -8,15 +8,20 @@ text_align: center

 # Rapports annuels:

-**Rapport annuel 2018** <br>
-[Repport 2018](https://disroot.org/annual_reports/AnnualReport2018.pdf)
+**Rapport annuel 2020**
+[Repport 2020](/annual_reports/AnnualReport2020.pdf?target=_blank)

-**Août 2016 - Août 2017** <br>
-[Rapport 2016-2017](https://disroot.org/annual_reports/2017.pdf)
+**Rapport annuel 2019**
+[Repport 2019](/annual_reports/AnnualReport2019.pdf?target=_blank)

-**2015 - Août 2016** <br>
-Coûts: €1569.76 <br>
-Dons: €264.52
+**Rapport annuel 2018**
+[Repport 2018](/annual_reports/AnnualReport2018.pdf?target=_blank)
+
+**Août 2016 - Août 2017**
+[Rapport 2016-2017](/annual_reports/2017.pdf?target=_blank)
+
+**2015 - Août 2016**
+Coûts: €1569.76 / Dons: €264.52

 ---

--- a/pages/06.donate/_reports/3col.it.md
+++ b/pages/06.donate/_reports/3col.it.md
@ -8,24 +8,20 @@ text_align: center

 #Report annuale:

+**Annual Report 2020**
+[Report 2020](/annual_reports/AnnualReport2020.pdf?target=_blank)
+
 **Annual Report 2019**
 [Report 2019](/annual_reports/AnnualReport2019.pdf?target=_blank)

+**Report annuale 2018**
+[Report 2018](/annual_reports/AnnualReport2018.pdf?target=_blank)

-**Report annuale 2018** <br>
-[Report 2018](https://disroot.org/annual_reports/AnnualReport2018.pdf)
+**Agosto 2016 - Agosot 2017**
+[Report 2016-2017](/annual_reports/2017.pdf?target=_blank)

-
-**Agosto 2016 - Agosot 2017** <br>
-Costi: €1707.82 <br>
-Donazioni: €1380.45 <br>
-[Report 2017](https://disroot.org/annual_reports/2017.pdf)
-
-<br>
-
-**2015 - Agosto 2016** <br>
-Costi: €1569.76 <br>
-Donazioni: €264.52
+**2015 - Agosto 2016**
+Costi: €1569.76 / Donazioni: €264.52

 ---

--- a/pages/06.donate/_reports/3col.ru.md
+++ b/pages/06.donate/_reports/3col.ru.md
@ -8,6 +8,9 @@ text_align: center

 #Ежегодные отчеты:

+**Annual Report 2020**
+[Report 2020](/annual_reports/AnnualReport2020.pdf?target=_blank)
+
 **Annual Report 2019**
 [Report 2019](/annual_reports/AnnualReport2019.pdf?target=_blank)

--- a/pages/07.blog/disnews-2/israestine.jpg
+++ b/pages/07.blog/disnews-2/israestine.jpg
--- a/pages/07.blog/disnews-2/item.en.md
+++ b/pages/07.blog/disnews-2/item.en.md
@ -0,0 +1,38 @@
+---
+title: 'DisNews #2 - Yearly report; Moving to gitea; lacre.io; Ansible and gitea;'
+date: '27-05-2021 0:10'
+media_order: israestine.jpg
+taxonomy:
+  category: news
+  tag: [disroot, news, yearly_report, report, gitea, lacre, ansible]
+body_classes: 'single single-post'
+
+---
+
+Two months has passed since our last newsletter. As always, ton of things to share with all of you.
+
+## Yearly report
+
+Something we wanted to avoid this year but looks like it's a new tradition. Seems like January was just last week, but we are at the end of May. Here, our last year's report published in the middle of this year. Better later then never some say. And yet, let's hope we do a better job from now on and publish these year reports in January. Nonetheless, here it is, a short summary of the craziness the year 2020 has been for everyone. Enjoy! Let's all try to forget about 2020 as soon as we can. you can read the report [here](https://disroot.org/en/annual_reports/AnnualReport2020.pdf)
+
+
+## Disroot - Project board. Moving everything to Gitea
+
+During the last months we have been using our git instance more and more. To the point we have come to realize we should move all our work coordination there to have everything in one place. And so, we have also decided to move the main Project-Board from Deck to Gitea. We currently coordinate all the work through Gitea anyway and keeping all things in one place makes much more sense for us internally. This will also give a better picture for everyone, adding to the transparency and openness we wanted to focus on this year.
+
+
+[Disroot Project](https://git.disroot.org/Disroot/Disroot-Project) board works as a general board where we, and all Disrooters, submit issues, feedback, discussions, feature requests etc. We then distribute those issues, across all the projects we host (website, themes, ansible roles, changelogs etc). It's a central point of coordination and central point for Disrooters to submit feedback. Our [Changelog](https://git.disroot.org/Disroot/CHANGELOG) repository is meant for our internal use in terms of creating and coordinating works for our bi-weekly maintenance windows as well as a way for all of you to see what is on the plate currently. All changes from changelog are now also published on our [website](https://disroot.org/en/changelog) so that you can follow past changes on the platform.
+
+## Ansible roles
+
+Since the beginning of the year we have been working on finishing ansible roles and publishing them. It's been a hell of a work for the last year or so, and now finally we are moving forward. Seeing the results of all the work so far is very satisfying. Not only it could help others to set things up easily, but also added tremendous improvements in regards to stability of the platform. It also helps a lot to test upgrades prior to any work on production, workout new features and changes before they hit the servers and serves a better way to coordinate the work between us internally. You can find repositories [here](https://git.disroot.org/Disroot-Ansible)
+
+## Lacre
+
+We are starting with the work on the mailbox encryption. We have decided to rename the project from just gpg mailgate to "Lacre". Lacre stands for letter wax seal in Portuguese and Spanish. We really like the new name and ideas for logos/art work that comes with it. Currently we are starting slowly by assesing the work and preparing the test environment. [https://lacre.io](https://lacre.io)
+
+
+We want to send our shoutout to **@pfm** who volounteered to help with the development part of the project. We are very grateful for the offer and we are looking forward to getting the mailbox encryption landing on Disroot. It is still long way ahead of us, but we are very happy and excited that we have started moving forward.
+
+
+We wish you all a great June but remember to still keep distance and take care of yourself and others. To all our friends who are struggling with the pandemic and devastating conflicts around the world, stay strong, stay safe.
--- a/pages/07.blog/disnews-2/item.es.md
+++ b/pages/07.blog/disnews-2/item.es.md
@ -0,0 +1,37 @@
+---
+title: 'DisNews #2 - Reporte anual; Mudanza a Gitea; lacre.io; Ansible;'
+date: '27-05-2021 0:10'
+media_order: israestine.jpg
+taxonomy:
+  category: news
+  tag: [disroot, novedades, reporte_anual, gitea, lacre, ansible]
+body_classes: 'single single-post'
+
+---
+
+Dos meses han pasado desde nuestro último boletín. Como siempre, un montón de cosas para compartir con ustedes.
+
+## Reporte Anual
+
+Algo que queríamos evitar este año, pero que es como una nueva tradición... Parece que enero fue la semana pasada, aunque ya estamos a finales de mayo. Y aquí, nuestro reporte del año pasado (publicado a mediados de este año). Más vale tarde que nunca dicen algunos. Y sin embargo, esperamos hacer un mejor trabajo a partir de ahora y publicar estos informes anuales en enero. A pesar de todo, aquí está, un breve resumen de la locura que ha sido el año 2020 para todxs. ¡Que lo disfruten! E intentemos olvidar ese año lo antes posible. El reporte puede leerse [aquí](https://disroot.org/en/annual_reports/AnnualReport2020.pdf).
+
+
+## Tablero de proyectos de Disroot. Moviendo todo a Gitea
+
+Durante los últimos meses hemos estado utilizando nuestra instancia de git cada vez más. Hasta el punto en que nos dimos cuenta de que deberíamos mover completamente la coordinación de nuestro trabajo allí y tener todo en un solo lugar, lo cual tiene mucho más sentido para nosotros internamente. Así que también hemos decidido trasladar el tablero de proyecto principal de Deck a Gitea, desde donde ya estamos coordinando muchas cosas. Esto también nos dará a todxs un mejor panorama y más transparencia y apertura, dos de los temas en los que queríamos enfocarnos este año.
+
+El tablero del [Proyecto Disroot](https://git.disroot.org/disroot/Disroot-Project) funciona como una pizarra general en la que nosotros, y lxs Disrooters, presentamos problemas, comentarios, discusiones, solicitudes de mejoras, etc, para luego distribuirlos entre los proyectos que alojamos (el sitio web, los temas, los roles de ansible, el registro de cambios, etc). Es un punto central de coordinación para nosotros y el lugar para que ustedes envíen sus comentarios y sugerencias. Nuestro repositorio de [Registro de cambios](https://git.disroot.org/Disroot/CHANGELOG) es para crear y coordinar de modo interno las tareas que conforman los trabajos de mantenimiento quincenales, y también una manera de ver en qué andamos. Todas las actualizaciones de este Registro ahora se publican en nuestro [sitio web](https://disroot.org/en/changelog) para que puedan también seguir los cambios anteriores en la plataforma.
+
+
+## Roles de Ansible
+
+Desde principios de 2021 hemos estado trabajando para terminar los roles de Ansible y publicarlos. Ha sido un trabajo infernal durante el último año, más o menos, y ahora finalmente estamos avanzando. Ver los resultados de todo el trabajo realizado hasta ahora es muy satisfactorio. Esto no solo puede ayudar a otras personas a configurar las cosas con facilidad, sino que también ha añadido enormes mejoras en cuanto a la estabilidad de la plataforma. También ayuda mucho para probar las actualizaciones antes de cualquier trabajo en producción, preparar nuevas características y cambios antes de que lleguen a los servidores y es un mejor modo de coordinar el trabajo entre nosotros internamente. Puedes encontrar el repositorio [aquí](https://git.disroot.org/Disroot-Ansible).
+
+
+## Lacre
+
+Estamos comenzando a trabajar en el cifrado del buzón. Hemos decidido cambiar el nombre del proyecto de "gpg mailgate" a "Lacre". Lacre, en portugués y español, es el nombre de un tipo de pasta sólida que, derretida, se utiliza para sellar cartas. Nos gustan mucho el nuevo nombre y las ideas para los logos/arte que surgen de él. Estamos comenzando lentamente, evaluando el trabajo y preparando el entorno de pruebas. El sitio del proyecto es: [https://lacre.io](https://lacre.io)
+
+Queremos enviar nuestro reconocimiento a **@pfm** que se ofreció para ayudar con la parte de desarrollo del proyecto. Estamos muy agradecidos por la oferta y también ansiosos por lograr que el cifrado del buzón aterrice en Disroot. Todavía nos queda mucho camino por delante, pero estamos muy contentos y emocionados de haber empezado a avanzar.
+
+Les deseamos a todxs un gran mes de junio, pero recuerden mantener las distancias todavía y cuidarse ustedes y a lxs demás. A todas nuestras amigas y amigos que están luchando contra la pandemia y los conflictos devastadores alrededor del mundo, les decimos: manténganse fuertes, cuídense.
--- a/pages/07.blog/disnews-2/item.it.md
+++ b/pages/07.blog/disnews-2/item.it.md
@ -0,0 +1,36 @@
+---
+title: 'DisNews #2 - Rapporto annuale; project board su Gitea; lacre.io; Ansible e Gitea;'
+date: '27-05-2021 0:10'
+media_order: israestine.jpg
+taxonomy:
+  category: news
+  tag: [disroot, news, yearly_report, report, gitea, lacre, ansible]
+body_classes: 'single single-post'
+
+---
+
+Sono passati due mesi dalla nostra ultima newsletter. Come sempre ci sono tantissime cose da condividere con tutti voi. 
+
+## Rapporto annuale
+Un ritardo, quello della pubblicazione del rapporto annuale, che avremmo voluto evitare, ma ormai sembra una consolidata tradizione. Gennaio sembra ieri, mentre invece siamo a fine maggio. Quindi, anche se con un po' di ritardo, ecco il nostro rapporto del 2020. Per il prossimo anno ci siamo ripromessi maggior puntualità. Comunque meglio tardi che mai. Il rapporto di questo folle anno è disponibile [qui](https://disroot.org/en/annual_reports/AnnualReport2020.pdf).
+
+
+## Disroot - Project board trasferito su Gitea
+
+Negli ultimi mesi abbiamo utilizzato sempre di più la nostra istanza git al punto che ci siamo resi conto che era utile spostare nello stesso luogo tutti i documenti di coordinamento. E così, abbiamo deciso di spostare pure il Project-Board principale da Deck a Gitea. Attualmente quindi coordiniamo tutto il lavoro tramite Gitea. Troviamo che questa scelta incrementi l'apertura verso chi vuole affacciarsi a Disroot e maggior trasparenza sui progetti e il loro stato di avanzamento.
+
+[Disroot Project](https://git.disroot.org/Disroot/Disroot-Project) è il nostro repository generale dove è possibile segnalare i problemi riscontrati, feedback, richieste di funzionalità ecc. È il punto centrale di coordinamento e di segnalazione di eventuali malfunzionamenti. 
+
+[Changelog](https://git.disroot.org/Disroot/CHANGELOG) è pensato come repository per l'uso interno in termini di creazione e coordinamento dei lavori per le finestre di manutenzione bisettimanali, nonché un modo per tutti per vedere cosa c'è attualmente sul piatto. Tutti i changelog sono inoltre visibili pure al [seguente indirizzo](https://disroot.org/en/changelog).
+
+## Ansible roles
+
+Dall'inizio dell'anno stiamo lavorando intensamente per finire e pubblicare i nostri Ansible roles. È stato un lavoro faticoso ma ora, finalmente, iniziamo a vederne i frutti. Questo lavoro non solo è utile per aiutare gli altri per configurare facilmente i vari servizi, ma ha anche aggiunto enormi miglioramenti per quanto riguarda la stabilità della nostra piattaforma. Risulta inoltre utile per testare gli aggiornamenti e coordinare il lavoro internamente. Puoi trovare il repository [qui](https://git.disroot.org/Disroot-Ansible).
+
+## Lacre
+
+Abbiamo iniziato il progetto per crittografare le caselle di posta elettronica. Abbiamo deciso di rinominare il progetto da gpg mailgate a "Lacre". Lacre sta per "sigillo" in portoghese e spagnolo. Ci piace molto il nuovo nome e le possibili idee per i loghi o disegni che ne potrebbero scaturire. Attualmente stiamo iniziando a preparare l'ambiente di test. [https://lacre.io](https://lacre.io).
+
+Legato a questo progetto, vogliamo ringraziare **pfm** che si è offerto come volontario per aiutare con la parte di sviluppo di Lacre. Lo ringraziamo e non vediamo l'ora di veder implementata la crittografia delle caselle di posta su Disroot. Siamo solo all'inizio, ma siamo molto felici ed entusiasti di avere dato il là al progetto. 
+
+E per finire, a tutti i compagni che stanno lottando contro pandemia e conflitti devastanti in tutto il mondo: restate forti e non mollate!
--- a/pages/07.blog/flisol-2021/flisol_2021.jpg
+++ b/pages/07.blog/flisol-2021/flisol_2021.jpg
--- a/pages/07.blog/flisol-2021/item.en.md
+++ b/pages/07.blog/flisol-2021/item.en.md
@ -0,0 +1,26 @@
+---
+title: 'FLISoL 2021'
+media_order: flisol_2021.jpg
+published: true
+date: '17-04-2021 00:30'
+taxonomy:
+    category:
+        - news
+    tag:
+        - flisol
+body_classes: 'single single-post'
+
+---
+# FLISoL Online 2021
+
+The **Comunidad Latina de Tecnologías Libres** (Latin American Community of Free Technologies), the **Club de Software Libre** (Free Software Club) and **Libera Tu Radio** (Free Your Radio) organize and invite you to a new online edition of the **FLISoL**, **Festival Latinoamericano de Instalación de Software Libre** (Latin American Free Software Installation Festival), one of the biggest Free/Libre Software installation and promotion events in the world.
+
+The festival starts on **Sunday, April 18, at 6 PM (UTC -3)** and will run until Saturday, April 24.
+
+#### **This year's transmission will be the first one made entirely with Free Software**
+
+The event is focused on all the people interested in knowing more about free/libre software and culture. During the meeting there are talks, lectures and workshops related to Free/Libre Software, in all its range of expressions: artistic, academic, business and social.
+
+More information about the event (talks, schedules, etc) at:
+
+## [**caminoalflisollibre2021.softlibre.com.ar**](https://caminoalflisollibre2021.softlibre.com.ar/)
--- a/pages/07.blog/flisol-2021/item.es.md
+++ b/pages/07.blog/flisol-2021/item.es.md
@ -0,0 +1,26 @@
+---
+title: 'FLISoL 2021'
+media_order: flisol_2021.jpg
+published: true
+date: '17-04-2021 00:30'
+taxonomy:
+    category:
+        - noticias
+    tag:
+        - flisol
+body_classes: 'single single-post'
+
+---
+# FLISoL Online 2021
+
+La **Comunidad Latina de Tecnologías Libres**, el **Club de Software Libre** y **Libera Tu Radio** organizan e invitan a una nueva edición online del **FLISoL**, **Festival Latinoamericano de Instalación de Software Libre**, uno de los mayores eventos de instalación y difusión del software libre del mundo.
+
+El festival comienza el **domingo 18 de Abril, a las 6 PM (UTC -3)** y se extenderá hasta el sábado 24.
+
+#### **Este año la emisión será la primera realizada íntegramente con software libre**
+
+El evento está dirigido a todas las personas interesadas en conocer más acerca del software y la cultura libre. En el encuentro hay charlas, ponencias y talleres en torno al Software Libre, en toda su gama de expresiones: artística, académica, empresarial y social.
+
+Más información sobre el evento (charlas, horarios, etc) en:
+
+## [**caminoalflisollibre2021.softlibre.com.ar**](https://caminoalflisollibre2021.softlibre.com.ar/)
--- a/pages/10.faq/_services/faq.de.md
+++ b/pages/10.faq/_services/faq.de.md
@ -35,7 +35,6 @@ faq:
        <li>Folge <b>disroot_state@hub.disroot.org</b> via Hubzilla, Diaspora*, Mastodon, Pleroma, Pixelfed, etc. (das Fediverse...)</li>
        <li>Folge <b>disroot@social.weho.st</b> (das Fediverse schon wieder...)</li>
        <li>Betritt <b>state@chat.disroot.org</b> (XMPP)</li>
-        <li>Betritt <b>@state:disroot.org</b> (Matrix)</li>
        <li>Installiere die <b>DisApp</b>, <b>Disroot</b>'s Android-App, durch die Du Echtzeit-Benachrichtigungen erhältst</li>
        </ul>"
 ---
--- a/pages/10.faq/_services/faq.en.md
+++ b/pages/10.faq/_services/faq.en.md
@ -35,7 +35,6 @@ faq:
        <li>Follow <b>disroot_state@hub.disroot.org</b> via Hubzilla, Diaspora*, Mastodon, Pleroma, Pixelfed, etc. (the fediverse...)</li>
        <li>Follow <b>disroot@social.weho.st</b> (the fediverse again...)</li>
        <li>Join <b>state@chat.disroot.org</b> (XMPP)</li>
-        <li>Join <b>@state:disroot.org</b> (Matrix)</li>
        <li>Install <b>DisApp</b>, <b>Disroot</b>'s Android app where you will get realtime notifications</li>
        </ul>"
 ---
--- a/pages/10.faq/_services/faq.es.md
+++ b/pages/10.faq/_services/faq.es.md
@ -35,7 +35,6 @@ faq:
        <li>Sigue a <b>disroot_state@hub.disroot.org</b> via Hubzilla, Diaspora*, Mastodon, Pleroma, Pixelfed, etc. (el fediverso...)</li>
        <li>Sigue a <b>disroot@social.weho.st</b> (el fediverso, de nuevo...)</li>
        <li>Únete a <b>state@chat.disroot.org</b> (XMPP)</li>
-        <li>Únete a <b>@state:disroot.org</b> (Matrix)</li>
        <li>Instala <b>DisApp</b>, la aplicación de <b>Disroot</b> para Android en la que recibirás notificaciones en tiempo real</li>
        </ul>"
 ---
--- a/pages/10.faq/_services/faq.fr.md
+++ b/pages/10.faq/_services/faq.fr.md
@ -35,7 +35,6 @@ faq:
        <li>Suivez <b>disroot_state@hub.disroot.org</b> via Hubzilla, Diaspora*, Mastodon, Pleroma, Pixelfed, etc. (le fediverse...)</li>
        <li>Suivez <b>disroot@social.weho.st</b> (le fediverse à nouveau...)</li>
        <li>Rejoignez <b>state@chat.disroot.org</b> (XMPP)</li>
-        <li>Rejoignez <b>@state:disroot.org</b> (Matrix)</li>
        <li>Installez <b>DisApp</b>, l'application Android de <b>Disroot</b>qui vous permettra de recevoir des notifications en temps réel</li>
        </ul>"
 ---
--- a/pages/10.faq/_services/faq.it.md
+++ b/pages/10.faq/_services/faq.it.md
@ -35,7 +35,6 @@ faq:
        <li>Segui <b>disroot_state@hub.disroot.org</b> via Hubzilla, Diaspora*, Mastodon, Pleroma, Pixelfed, etc. (il fediverso...)</li>
        <li>Segui <b>disroot@social.weho.st</b> (il fediverso...)</li>
        <li>Accedi a <b>state@chat.disroot.org</b> (XMPP)</li>
-        <li>Accedi a <b>@state:disroot.org</b> (Matrix)</li>
        <li>Installa <b>DisApp</b>, <b>Disroot</b>app dove ottieni le lo stato attraverso delle notifiche in tempo reale</li>
        </ul>"
 ---
--- a/pages/10.faq/_services/faq.ru.md
+++ b/pages/10.faq/_services/faq.ru.md
@ -35,7 +35,6 @@ faq:
        <li>Следите за <b>disroot_state@hub.disroot.org</b> в Hubzilla, Diaspora*, Mastodon, Pleroma, Pixelfed, etc. (the fediverse...)</li>
        <li>Читайте <b>disroot@social.weho.st</b> (the fediverse again...)</li>
        <li>Присоединяйтесь <b>state@chat.disroot.org</b> (XMPP)</li>
-        <li>Присоединяйтесь <b>@state:disroot.org</b> (Matrix)</li>
        <li>Установите <b>DisApp</b> - <b>Disroot</b> приложение для Android с уведомлениями в реальном времени.</li>
        </ul>"
 ---
--- a/pages/11.covid19/_about/fullbar.en.md
+++ b/pages/11.covid19/_about/fullbar.en.md
@ -1,15 +0,0 @@
---
-title: Covid-19 Kit
-bgcolor: '#1F5C60'
-fontcolor: '#FFFFFF'
-text_align: center
-body_classes: modular
---
-
-<br>
-## Coronavirus outbreak !
-The Coronavirus outbreak has put us all in a unique situation. A large majority of the world's population must remain in their homes as a measure to prevent the disease from spreading further. This has generated a collapse in a number of services that depend on the Internet and that is why, here in Disroot, we decided to collaborate by making available to all some useful tools so that everyone can communicate, work and share: the Disroot Covid-19 Kit.
-
-## These services do not require registration.
-
-We also want to help other organizations and small companies by providing customized private instances for a fee that is affordable.
--- a/pages/11.covid19/_about/fullbar.es.md
+++ b/pages/11.covid19/_about/fullbar.es.md
@ -1,15 +0,0 @@
---
-title: Kit Covid19
-bgcolor: '#1F5C60'
-fontcolor: '#FFFFFF'
-text_align: center
-body_classes: modular
---
-
-<br>
-## ¡Brote de Coronavirus!
-El brote de Coronavirus nos ha puesto a todxs en una situación singular. Una gran mayoría de la población del planeta debe permanecer en sus casas como medida de prevención para que la enfermedad no se siga expandiendo. Esto ha generado un colapso en un número de servicios que dependen de la internet y por eso, aquí en **Disroot**, decidimos colaborar poniendo a disposición algunas herramientas muy útiles así todxs pueden comunicarse, trabajar y compartir: el **Kit para el Covid-19 de Disroot**.
-
-## Estos servicios no requieren registrarse
-
-También queremos ayudar a otras organizaciones o pequeñas empresas proporcionando instancias privadas personalizadas por un costo accesible.
--- a/pages/11.covid19/_about/fullbar.fr.md
+++ b/pages/11.covid19/_about/fullbar.fr.md
@ -1,15 +0,0 @@
---
-title: Kit Covid19
-bgcolor: '#1F5C60'
-fontcolor: '#FFFFFF'
-text_align: center
-body_classes: modular
---
-
-<br>
-## Epidémie de coronavirus !
-L'épidémie de coronavirus nous a tous mis dans une situation unique. Une grande majorité de la population mondiale doit rester chez elle pour éviter que la maladie ne se propage davantage. Cela a entraîné l'effondrement d'un certain nombre de services qui dépendent d'Internet et c'est pourquoi, ici au sein de Disroot, nous avons décidé de collaborer en mettant à la disposition de tous quelques outils utiles pour que chacun puisse communiquer, travailler et partager : le kit Disroot Covid-19.
-
-## Ces services ne nécessitent pas d'inscription.
-
-Nous voulons également aider d'autres organisations et petites entreprises en fournissant des instances privées personnalisées pour un prix abordable.
--- a/pages/11.covid19/_about/fullbar.it.md
+++ b/pages/11.covid19/_about/fullbar.it.md
@ -1,14 +0,0 @@
---
-title: Covid-19 Kit
-bgcolor: '#1F5C60'
-fontcolor: '#FFFFFF'
-text_align: center
-body_classes: modular
---
-
-<br>
-## Coronavirus - pandemia!
-La pandemia legata al Coronavirus ci ha messo tutti in una situazione unica. Una larga maggioranza della popolazione mondiale deve rimanere nelle proprie case come misura per impedire che la malattia si diffonda ulteriormente. Ciò ha generato un collasso in una serie di servizi che dipendono da Internet. È per questo motivo che, qui in Disroot, abbiamo deciso di collaborare mettendo a disposizione alcuni strumenti utili in modo che tutti possano comunicare, lavorare e condividere. Abbiamo chiamato questi servizi il "Disroot Covid- 19 Kit".
-
-## Questi servizi non richiedono registrazione.
-Vogliamo aiutare altre organizzazioni o piccole aziende fornendo istanze private personalizzate ad un costo accessibile.
--- a/pages/11.covid19/_services/services.en.md
+++ b/pages/11.covid19/_services/services.en.md
@ -1,73 +0,0 @@
---
-title: Services
-section_id: services
-bgcolor: '#FFF'
-fontcolor: '#555'
-text_align: left
-services:
-    -
-        title: Pads
-        icon: pads.png
-        link: 'https://disroot.org/services/pads'
-        text: "Create and edit documents collaboratively in real-time directly in the web browser."
-        button: 'https://pad.disroot.org'
-        buttontext: "Start a pad"
-    -
-        title: Calc
-        icon: calc.png
-        link: 'https://disroot.org/services/pads'
-        text: "Create and edit spreadsheets collaboratively in real-time directly in the web browser."
-        button: 'https://calc.disroot.org'
-        buttontext: "Start a calc"
-    -
-        title: 'Paste Bin'
-        icon: pastebin.png
-        link: 'https://disroot.org/services/privatebin'
-        text: "Encrypted online paste-bin/discussion board."
-        button: 'https://bin.disroot.org'
-        buttontext: "Share a pastebin"
-    -
-        title: Upload
-        icon: upload.png
-        link: 'https://disroot.org/services/upload'
-        text: "Encrypted, temporary file hosting and sharing software."
-        button: 'https://upload.disroot.org'
-        buttontext: "Share a file"
-    -
-        title: Polls
-        icon: polls.png
-        link: 'https://disroot.org/services/polls'
-        text: "Online service for planning an appointment or making decisions quickly and easily."
-        button: 'https://poll.disroot.org'
-        buttontext: "Start a poll"
-    -
-        title: 'Calls'
-        icon: calls.png
-        link: 'https://disroot.org/services/calls'
-        text: "A videoconferencing tool."
-        button: 'https://calls.disroot.org'
-        buttontext: "Start a call"
-    -
-        title: 'Audio'
-        icon: mumble.png
-        link: 'https://disroot.org/services/audio'
-        text: "A low latency, high quality voice chat application."
-        button: 'https://mumble.disroot.org'
-        buttontext: "Create a channel"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Cryptpad'
-        icon: cryptpad.png
-        link: 'https://disroot.org/services/cryptpad'
-        text: "A private-by-design alternative to popular office tools."
-        button: 'https://cryptpad.disroot.org'
-        buttontext: "Access"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Games'
-        icon: game.png
-        link: 'https://disroot.org/en/quarantine'
-        text: "A game server to have some fun!"
-        button: 'https://disroot.org/en/quarantine'
-        buttontext: "More info"
----
--- a/pages/11.covid19/_services/services.es.md
+++ b/pages/11.covid19/_services/services.es.md
@ -1,73 +0,0 @@
---
-title: Servicios
-section_id: services
-bgcolor: '#FFF'
-fontcolor: '#555'
-text_align: left
-services:
-    -
-        title: Pads
-        icon: pads.png
-        link: 'https://disroot.org/services/pads'
-        text: "Crea y edita documentos en tiempo real y colaborativamente desde el navegador"
-        button: 'https://pad.disroot.org'
-        buttontext: "Abre un pad"
-    -
-        title: Calc
-        icon: calc.png
-        link: 'https://disroot.org/services/pads'
-        text: "Crea y edita planillas en tiempo real y colaborativamente desde el navegador"
-        button: 'https://calc.disroot.org'
-        buttontext: "Crea una planilla"
-    -
-        title: 'Paste Bin'
-        icon: pastebin.png
-        link: 'https://disroot.org/services/privatebin'
-        text: "Pastebin/tablero de discusión en línea cifrado"
-        button: 'https://bin.disroot.org'
-        buttontext: "Comparte un pastebin"
-    -
-        title: Subida
-        icon: upload.png
-        link: 'https://disroot.org/services/upload'
-        text: "Software para alojar y compartir de manera cifrada y temporalmente archivos"
-        button: 'https://upload.disroot.org'
-        buttontext: "Comparte un archivo"
-    -
-        title: Encuestas
-        icon: polls.png
-        link: 'https://disroot.org/services/polls'
-        text: "Servicio en línea para planificar eventos o tomar decisiones fácil y rápidamente"
-        button: 'https://poll.disroot.org'
-        buttontext: "Inicia una encuesta"
-    -
-        title: 'Llamadas'
-        icon: calls.png
-        link: 'https://disroot.org/services/calls'
-        text: "Herramienta para video-conferencia"
-        button: 'https://calls.disroot.org'
-        buttontext: "Inicia un llamada"
-    -
-        title: 'Audio'
-        icon: mumble.png
-        link: 'https://disroot.org/services/audio'
-        text: "Aplicación de audio chat con alta calidad de sonido y baja latencia"
-        button: 'https://mumble.disroot.org'
-        buttontext: "Crea un canal"
-        #badge: EXPERIMENTAL
-    -
-        title: 'CryptPad'
-        icon: cryptpad.png
-        link: 'https://disroot.org/services/cryptpad'
-        text: "Alternativa privada-por-defecto a herramientas ofimáticas populares"
-        button: 'https://cryptpad.disroot.org'
-        buttontext: "Access"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Juegos'
-        icon: game.png
-        link: 'https://disroot.org/quarantine'
-        text: "Un servidor de juegos para divertirnos un rato"
-        button: 'https://disroot.org/quarantine'
-        buttontext: "Más info"
----
--- a/pages/11.covid19/_services/services.fr.md
+++ b/pages/11.covid19/_services/services.fr.md
@ -1,73 +0,0 @@
---
-title: Services
-section_id: services
-bgcolor: '#FFF'
-fontcolor: '#555'
-text_align: left
-services:
-    -
-        title: Pads
-        icon: pads.png
-        link: 'https://disroot.org/services/pads'
-        text: "Créez et modifiez des documents en collaboration et en temps réel."
-        button: 'https://pad.disroot.org'
-        buttontext: "Commencer"
-    -
-        title: Calc
-        icon: calc.png
-        link: 'https://disroot.org/services/pads'
-        text: "Créez et modifiez des feuilles de calcul en collaboration et en temps réel."
-        button: 'https://calc.disroot.org'
-        buttontext: "Commencer"
-    -
-        title: 'Paste Bin'
-        icon: pastebin.png
-        link: 'https://disroot.org/services/privatebin'
-        text: "Créez et modifiez des feuilles de calcul en collaboration et en temps réel."
-        button: 'https://bin.disroot.org'
-        buttontext: "Partager"
-    -
-        title: Upload
-        icon: upload.png
-        link: 'https://disroot.org/services/upload'
-        text: "Logiciel d'hébergement et de partage de fichiers temporaires et chiffrés."
-        button: 'https://upload.disroot.org'
-        buttontext: "Partager"
-    -
-        title: Polls
-        icon: polls.png
-        link: 'https://disroot.org/services/polls'
-        text: "Service en ligne pour planifier un rendez-vous ou prendre des décisions rapidement et facilement."
-        button: 'https://poll.disroot.org'
-        buttontext: "Sonder"
-    -
-        title: 'Calls'
-        icon: calls.png
-        link: 'https://disroot.org/services/calls'
-        text: "Un outil de vidéo conférence."
-        button: 'https://calls.disroot.org'
-        buttontext: "Appeler"
-    -
-        title: 'Audio'
-        icon: mumble.png
-        link: 'https://disroot.org/services/audio'
-        text: "Une application de chat vocal à faible latence et de haute qualité."
-        button: 'https://mumble.disroot.org'
-        buttontext: "Créer une chaîne"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Cryptpad'
-        icon: cryptpad.png
-        link: 'https://disroot.org/services/cryptpad'
-        text: "Une alternative privée aux outils de bureautique populaires."
-        button: 'https://cryptpad.disroot.org'
-        buttontext: "Accès"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Games'
-        icon: game.png
-        link: 'https://disroot.org/en/quarantine'
-        text: "Un serveur de jeu pour s'amuser!"
-        button: 'https://disroot.org/en/quarantine'
-        buttontext: "Plus d'info"
---
--- a/pages/11.covid19/_services/services.it.md
+++ b/pages/11.covid19/_services/services.it.md
@ -1,73 +0,0 @@
---
-title: Services
-section_id: services
-bgcolor: '#FFF'
-fontcolor: '#555'
-text_align: left
-services:
-    -
-        title: Pads
-        icon: pads.png
-        link: 'https://disroot.org/services/pads'
-        text: "Crea e modifica documenti direttamente nel browser in collaborazione con altri e in modo sincrono."
-        button: 'https://pad.disroot.org'
-        buttontext: "Apri un pad"
-    -
-        title: Calc
-        icon: calc.png
-        link: 'https://disroot.org/services/pads'
-        text: "Crea e modifica fogli di calcolo direttamente nel browser."
-        button: 'https://calc.disroot.org'
-        buttontext: "Apri un file Calc"
-    -
-        title: 'Paste Bin'
-        icon: pastebin.png
-        link: 'https://disroot.org/services/privatebin'
-        text: "Paste Bin crittografata."
-        button: 'https://bin.disroot.org'
-        buttontext: "Condividi dei contenuti"
-    -
-        title: Upload
-        icon: upload.png
-        link: 'https://disroot.org/services/upload'
-        text: "Condividi i tuoi file in modo temporaneo."
-        button: 'https://upload.disroot.org'
-        buttontext: "Condividi un file"
-    -
-        title: Polls
-        icon: polls.png
-        link: 'https://disroot.org/services/polls'
-        text: "Servizio online per pianificare appuntamenti e prendere decisioni in modo facile."
-        button: 'https://poll.disroot.org'
-        buttontext: "Apri un poll"
-    -
-        title: 'Calls'
-        icon: calls.png
-        link: 'https://disroot.org/services/calls'
-        text: "Uno strumento di videoconferenza"
-        button: 'https://calls.disroot.org'
-        buttontext: "Inizia una videoconferenza"
-    -
-        title: 'Audio'
-        icon: mumble.png
-        link: 'https://disroot.org/services/audio'
-        text: "Una applicazione per audio chat"
-        button: 'https://mumble.disroot.org'
-        buttontext: "Crea un canale"
-        #badge: SPERIMENTALE
-    -
-        title: 'Cryptpad'
-        icon: cryptpad.png
-        link: 'https://disroot.org/services/cryptpad'
-        text: "Uno strumento alternativo e private oriented della famosa suite di Office."
-        button: 'https://cryptpad.disroot.org'
-        buttontext: "Accedi"
-        #badge: SPERIMENTALE
-    -
-        title: 'Games'
-        icon: game.png
-        link: 'https://disroot.org/en/quarantine'
-        text: "Un game server dove divertirsi!"
-        button: 'https://disroot.org/en/quarantine'
-        buttontext: "Maggiori informazioni"
----
--- a/pages/11.covid19/coronavirus.jpg
+++ b/pages/11.covid19/coronavirus.jpg
--- a/pages/11.covid19/modular.en.md
+++ b/pages/11.covid19/modular.en.md
@ -1,14 +0,0 @@
---
-title: Covid19Kit
-bgcolor: '#1F5C60'
-content:
-    items: '@self.modular'
-    order:
-        by: default
-        dir: asc
-        custom:
-            - _about
-            - _services
-body_classes: modular
-header_image: coronavirus.jpg
---
--- a/pages/11.covid19/modular.es.md
+++ b/pages/11.covid19/modular.es.md
@ -1,14 +0,0 @@
---
-title: KitCovid19
-bgcolor: '#1F5C60'
-content:
-    items: '@self.modular'
-    order:
-        by: default
-        dir: asc
-        custom:
-            - _about
-            - _services
-body_classes: modular
-header_image: coronavirus.jpg
---
--- a/pages/11.covid19/modular.fr.md
+++ b/pages/11.covid19/modular.fr.md
@ -1,14 +0,0 @@
---
-title: Kit Covid19
-bgcolor: '#1F5C60'
-content:
-    items: '@self.modular'
-    order:
-        by: default
-        dir: asc
-        custom:
-            - _about
-            - _services
-body_classes: modular
-header_image: coronavirus.jpg
---
--- a/pages/11.covid19/modular.it.md
+++ b/pages/11.covid19/modular.it.md
@ -1,14 +0,0 @@
---
-title: Covid19Kit
-bgcolor: '#1F5C60'
-content:
-    items: '@self.modular'
-    order:
-        by: default
-        dir: asc
-        custom:
-            - _about
-            - _services
-body_classes: modular
-header_image: coronavirus.jpg
---
--- a/pages/annual_reports/AnnualReport2020.pdf
+++ b/pages/annual_reports/AnnualReport2020.pdf
--- a/pages/forms/alias-request-form/form.de.md.bak
+++ b/pages/forms/alias-request-form/form.de.md.bak
@ -62,6 +62,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: Banküberweisung
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/alias-request-form/form.en.md.bak
+++ b/pages/forms/alias-request-form/form.en.md.bak
@ -62,6 +62,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Bank transfer'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/alias-request-form/form.es.md.bak
+++ b/pages/forms/alias-request-form/form.es.md.bak
@ -62,6 +62,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Transferencia bancaria'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/alias-request-form/form.fr.md.bak
+++ b/pages/forms/alias-request-form/form.fr.md.bak
@ -62,6 +62,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (Carte de crédit)'
                bank: 'Virement bancaire'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/alias-request-form/form.it.md.bak
+++ b/pages/forms/alias-request-form/form.it.md.bak
@ -62,6 +62,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Bonifico bancario'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/domain-linking-form/form.de.md.bak
+++ b/pages/forms/domain-linking-form/form.de.md.bak
@ -70,6 +70,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: Banküberweisung
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/domain-linking-form/form.en.md.bak
+++ b/pages/forms/domain-linking-form/form.en.md.bak
@ -69,6 +69,7 @@ form:
            type: select
            options:
                patreon: Patreon
+                stripe: 'Stripe (creditcard)'
                paypal: Paypal
                bank: 'Bank transfer'
                faircoin: Faircoin
--- a/pages/forms/domain-linking-form/form.es.md.bak
+++ b/pages/forms/domain-linking-form/form.es.md.bak
@ -70,6 +70,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Transferencia bancaria'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/domain-linking-form/form.fr.md.bak
+++ b/pages/forms/domain-linking-form/form.fr.md.bak
@ -70,6 +70,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (Carte de crédit)'
                bank: 'Virement bancaire'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/domain-linking-form/form.it.md.bak
+++ b/pages/forms/domain-linking-form/form.it.md.bak
@ -70,6 +70,7 @@ form:
            options:
                patreon: Patreon
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Bonifico bancario'
                faircoin: Faircoin
                bitcoin: Bitcoin
@ -142,7 +143,7 @@ form:
 <h1 class="form-title"> Richiesta di collegamento di dominio </h1>
 <p class="form-text"><strong> Compila questo modulo se desideri utilizzare il tuo dominio per gli alias e-mail.</strong>
 <br><br>
-Segui questi passi per puntare il tuo dominio al nostro server prima di procedere con la richiesta: 
+Segui questi passi per puntare il tuo dominio al nostro server prima di procedere con la richiesta:

 <br><strong> (Questo servirà per verificare che il dominio sia veramente di tua proprietà. Senza questo step non procederemo alla tua richiesta) </strong><br></p>
 <h4 class="form-text"> 1. Vai nelle impostazioni DNS records del tuo dominio</h4>
--- a/pages/forms/extra-storage-mailbox/form.de.md
+++ b/pages/forms/extra-storage-mailbox/form.de.md
@ -59,6 +59,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Banküberweisung (SEPA countries only)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/extra-storage-mailbox/form.en.md
+++ b/pages/forms/extra-storage-mailbox/form.en.md
@ -58,6 +58,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Bank transfer (SEPA countries only)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/extra-storage-mailbox/form.es.md
+++ b/pages/forms/extra-storage-mailbox/form.es.md
@ -56,6 +56,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Transferencia bancaria (SEPA countries only)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/extra-storage-mailbox/form.fr.md
+++ b/pages/forms/extra-storage-mailbox/form.fr.md
@ -56,9 +56,11 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (Carte de crédit)'
                bank: 'Virement bancaire (pays SEPA uniquement)'
                faircoin: Faircoin
                bitcoin: Bitcoin
+                patreon: Patreon
            validate:
                required: true
        -
--- a/pages/forms/extra-storage-mailbox/form.it.md
+++ b/pages/forms/extra-storage-mailbox/form.it.md
@ -56,6 +56,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Bonifico bancario (Solo paesi area SEPA)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/extra-storage-space/form.de.md
+++ b/pages/forms/extra-storage-space/form.de.md
@ -58,6 +58,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Banküberweisung (SEPA countries only)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/extra-storage-space/form.en.md
+++ b/pages/forms/extra-storage-space/form.en.md
@ -57,6 +57,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Bank transfer (SEPA countries only)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/extra-storage-space/form.es.md
+++ b/pages/forms/extra-storage-space/form.es.md
@ -57,6 +57,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Transferencia bancaria (SEPA countries only)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/extra-storage-space/form.fr.md
+++ b/pages/forms/extra-storage-space/form.fr.md
@ -57,6 +57,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (Carte de crédit)'
                bank: 'Virement bancaire (pays SEPA uniquement)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/pages/forms/extra-storage-space/form.it.md
+++ b/pages/forms/extra-storage-space/form.it.md
@ -57,6 +57,7 @@ form:
            type: select
            options:
                paypal: Paypal
+                stripe: 'Stripe (creditcard)'
                bank: 'Bonifico bancario (SEPA countries only)'
                faircoin: Faircoin
                bitcoin: Bitcoin
--- a/vagrant/README.md
+++ b/vagrant/README.md
@ -2,24 +2,22 @@

 # Disroot Website Development Environment using Vagrant

+If you prefer the easy way, just execute the vagrant.sh script provided. Make sure your user is in sudoers first. ⚠️ It has been tested with Debian Buster only. ⚠️
+
 ## requirements
-1. vagrant 2.2.10
+1. vagrant 2.2.17
 	for install on Debian run commands:
 	```
-	wget https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb
+	wget https://releases.hashicorp.com/vagrant/2.2.17/vagrant_2.2.17_x86_64.deb
 	```
 	```
-	sudo dpkg -i vagrant_2.2.10_x86_64.deb
+	sudo dpkg -i vagrant_2.2.17_x86_64.deb
 	```
 	```
 	sudo apt install -f
 	```

 2. virtuabox  
-	for install on Debian Jessie run command:
-	```
-	sudo apt install virtualbox-6.0
-	```

 	for install on Debian Buster run command:
 	```
@ -30,7 +28,7 @@
 	wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add -
 	```
 	```
-	sudo apt-get update ; sudo apt-get install virtualbox-6.0
+	sudo apt-get update ; sudo apt-get install virtualbox-6.1
 	```

 3. vagrant plugins vagrant-vbguest:  
@ -70,20 +68,23 @@
 	```
 	git clone https://git.disroot.org/Disroot/Disroot-Privacy-Policy.git ~/Disroot/Disroot-Privacy-Policy
 	```
-7. Add the local domain name for the hub to your host machine's `/etc/hosts` file.
-
+7. Clone Disroot Changelog repo to Disroot folder
 	```
-	echo "192.168.33.12 disroot.lan" >> /etc/hosts
+	git clone https://git.disroot.org/Disroot/CHANGELOG.git ~/Disroot/Disroot-Changelog
 	```
-8. Launch Vagrant to build the virtual machine (VM). This will take several minutes.
+8. Add the local domain name for the hub to your host machine's `/etc/hosts` file.
 	```
-	cd ~/Disroot/disroot-website/vagrant
+	sudo echo "192.168.33.12 disroot.lan" >> /etc/hosts
+	```
+9. Launch Vagrant to build the virtual machine (VM). This will take several minutes.
+	```
+	cd ~/Disroot/Website/vagrant
 	vagrant up disroot_lan
 	```

 Congratulations, you should now have a fully functioning apache+GRAV server running locally in a Virtualbox-hosted VM managed by Vagrant. Next time you want to run vagrant simply run command
 	```
-	cd ~/Disroot/disroot-website/vagrant
+	cd ~/Disroot/Website/vagrant
 	vagrant up disroot_lan
 	vagrant provision
 	```
@ -99,7 +100,7 @@ To make your development workflow more efficient, you may wish to use an SSH con
 	```
 2. Use `vagrant ssh disroot_lan` to log in to the virtual machine.
 	```
-	user@host:~$ cd ~/Disroot/disroot-website/vagrant
+	user@host:~$ cd ~/Disroot/Website/vagrant
 	user@host:hubzilla-vagrant$ vagrant ssh disroot_lan
 	```
 3. Switch to root and add your host user public key.
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@ -22,6 +22,6 @@ Vagrant.configure("2") do |config|
 	disroot_lan.vm.synced_folder "../../grav-theme-disrootblog/", "/var/www/grav-theme-disrootblog", owner: "www-data", group: "www-data"
 	disroot_lan.vm.synced_folder "../../grav-plugin-language-selector/", "/var/www/grav-plugin-language-selector", owner: "www-data", group: "www-data"
 	disroot_lan.vm.synced_folder "../../Disroot-Privacy-Policy/", "/var/www/privacy_policy/", owner: "www-data", group: "www-data"
-	disroot_lan.vm.synced_folder "../../CHANGELOG/", "/var/www/changelog/", owner: "www-data", group: "www-data"
+	disroot_lan.vm.synced_folder "../../Disroot-Changelog/", "/var/www/changelog/", owner: "www-data", group: "www-data"
 end
 end
--- a/vagrant/vagrant.sh
+++ b/vagrant/vagrant.sh
@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+# Disroot Website Development Environment using Vagrant on DEBIAN
+
+# !! Make sure your user is in sudoers !!
+
+sudo apt update ; sudo apt -y dist-upgrade ; sudo apt -y install wget
+
+## Requirements
+### Vagrant 2.2.17
+
+dpkg -s vagrant | grep "install ok installed" &> /dev/null  ## INSTALL AGAIN even when already installed!!
+
+if [ $? -eq 0 ]; then
+    echo "====> Vagrant is installed!"
+else
+    wget https://releases.hashicorp.com/vagrant/2.2.17/vagrant_2.2.17_x86_64.deb
+    sudo dpkg -i vagrant_2.2.17_x86_64.deb
+    sudo apt install -f -y
+fi
+
+
+### Virtuabox 
+
+dpkg -s virtualbox-6.1 | grep "install ok installed" &> /dev/null
+
+if [ $? -eq 0 ]; then
+    echo "====> Virtualbox is installed!"
+else
+    echo 'deb http://download.virtualbox.org/virtualbox/debian buster contrib' | sudo tee /etc/apt/sources.list.d/virtualbox.list
+    wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key add -
+    wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add -
+    sudo apt-get update ; sudo apt-get install -y virtualbox-6.1
+fi
+
+
+### Vagrant plugins vagrant-vbguest:
+vagrant plugin list | grep vbguest &> /dev/null
+
+if [ $? -eq 0 ]; then
+    echo "====> vagrant-vbguest is installed!"
+else
+    vagrant plugin install vagrant-vbguest
+fi
+
+
+
+### Git
+sudo apt install -y git
+
+
+## Installation
+echo "====> Downloading all needed Disroot repos..."
+
+if [ ! -d ~/Disroot ]; then
+  mkdir ~/Disroot;
+fi
+
+if [ ! -d ~/Disroot/Website ]; then
+    git clone https://git.disroot.org/Disroot/Website.git ~/Disroot/Website
+fi
+
+if [ ! -d ~/Disroot/grav-theme-disroot ]; then
+    git clone https://git.disroot.org/Disroot/grav-theme-disroot.git ~/Disroot/grav-theme-disroot
+fi
+
+if [ ! -d ~/Disroot/grav-theme-disrootblog ]; then
+    git clone https://git.disroot.org/Disroot/grav-theme-disrootblog.git ~/Disroot/grav-theme-disrootblog
+fi
+
+if [ ! -d ~/Disroot/grav-plugin-language-selector ]; then
+    git clone https://git.disroot.org/Disroot/grav-plugin-language-selector.git ~/Disroot/grav-plugin-language-selector
+fi
+
+if [ ! -d ~/Disroot/Disroot-Privacy-Policy ]; then
+    git clone https://git.disroot.org/Disroot/Disroot-Privacy-Policy.git ~/Disroot/Disroot-Privacy-Policy
+fi
+
+if [ ! -d ~/Disroot/Disroot-Changelog ]; then
+    git clone https://git.disroot.org/Disroot/CHANGELOG.git ~/Disroot/Disroot-Changelog
+fi
+
+
+cat /etc/hosts | grep '192.168.33.12'
+
+if [ $? -eq 0 ]; then
+    echo "====> Disroot Website Host is already set!"
+else
+    echo '192.168.33.12 disroot.lan' | sudo tee -a /etc/hosts
+fi
+
+echo "====> Booting Disroot Website Virtual Environment..."
+cd ~/Disroot/Website/vagrant
+vagrant up disroot_lan
+vagrant provision
+
+
+echo "====> You can now access Disroot Website VE with your browser at http://disroot.lan"
Author	SHA1	Message	Date
meaz	ba1f79644e	Merge branch 'master' into pl-pr	2021-07-28 09:55:52 +00:00
meaz	f9b25c7000	Merge pull request 'remove covid kit' (#245 ) from kill_covid into master Reviewed-on: Disroot/Website#245 Reviewed-by: antilopa <antilopa@no-reply@disroot.org>	2021-07-28 08:10:17 +00:00
meaz	c939ce8825	remove covid kit	2021-07-27 22:13:24 +02:00
meaz	6114824888	Merge pull request 'Add a script to deploy Website easily on Debian.' (#244 ) from debian_script into master Reviewed-on: Disroot/Website#244 Reviewed-by: muppeth <muppeth@no-reply@disroot.org>	2021-07-17 19:18:22 +00:00
meaz	427a1c5800	Merge branch 'master' of https://git.disroot.org/Disroot/Website into debian_script	2021-07-17 21:17:15 +02:00
meaz	e7ef74d4a8	Merge pull request 'vagrant_fix' (#243 ) from vagrant_fix into master Reviewed-on: Disroot/Website#243 Reviewed-by: Fede.- <fede@no-reply@disroot.org>	2021-07-17 19:13:48 +00:00
meaz	b329cb08ed	Add a script to deploy Website easily on Debian.	2021-07-16 11:08:04 +02:00
meaz	29d3dc0046	fix more errors + update on vagrant and virtualbox	2021-07-16 10:27:31 +02:00
meaz	494235686c	Fix some errors with vagrant	2021-07-16 10:13:55 +02:00
meaz	1b958c5da6	Merge pull request 'remove matrix in FAQ' (#242 ) from faq_matrix into master Reviewed-on: Disroot/Website#242 Reviewed-by: antilopa <antilopa@no-reply@disroot.org>	2021-07-13 21:11:19 +00:00
meaz	4f79c42d04	remove matrix in FAQ	2021-07-13 22:15:51 +02:00
antilopa	34ace715a3	Merge pull request 'The way the bank account details were set was causing confusion, adding a ':' to make it clearer' (#240 ) from fix_bank_details into master Reviewed-on: Disroot/Website#240 Reviewed-by: meaz <meaz@no-reply@disroot.org> Reviewed-by: muppeth <muppeth@no-reply@disroot.org>	2021-06-21 07:40:08 +00:00
antilopa	f0ea35ffc3	The way the bank account details were set was causing confusion, adding a ':' to make it clearer	2021-06-18 11:17:16 +02:00
antilopa	28ad8e2593	Merge pull request 'overview update april ,may' (#239 ) from overview_may_2021 into master Reviewed-on: Disroot/Website#239 Reviewed-by: meaz <meaz@no-reply@disroot.org> Reviewed-by: muppeth <muppeth@no-reply@disroot.org>	2021-06-16 08:38:13 +00:00
meaz	5607daa442	Merge branch 'master' into overview_may_2021	2021-06-15 04:32:43 +00:00
antilopa	4b8a972f16	overview update april ,may	2021-06-13 13:46:50 +02:00
numnum	4158420d2c	Cryptpad storage space should be 250MB (#238 ) Co-authored-by: ltGuillaume <ltguillaume@users.noreply.github.com> Reviewed-on: Disroot/Website#238 Reviewed-by: muppeth <muppeth@no-reply@disroot.org> Co-authored-by: numnum <numnum@no-reply@disroot.org> Co-committed-by: numnum <numnum@no-reply@disroot.org>	2021-06-10 17:40:25 +00:00
muppeth	e9688aeb14	changed IRC channel info to liberachat on contact page (#236 ) Co-authored-by: muppeth <muppeth@disroot.org> Co-authored-by: meaz <meaz@no-reply@disroot.org> Reviewed-on: Disroot/Website#236 Reviewed-by: meaz <meaz@no-reply@disroot.org> Co-authored-by: muppeth <muppeth@no-reply@disroot.org> Co-committed-by: muppeth <muppeth@no-reply@disroot.org>	2021-06-04 11:20:38 +00:00
Fede.-	ae6e0b4323	Merge pull request 'BLOG_Disnews_ES' (#235 ) from BLOG_Disnews_ES into master Reviewed-on: Disroot/Website#235 Reviewed-by: muppeth <muppeth@no-reply@disroot.org>	2021-06-02 16:27:46 +00:00
Fede.-	8dc9ffbd0a	DisNews-2 Spanish translation / Small fixes	2021-06-02 00:15:17 -03:00
Fede.-	ceee7da9fa	DisNews-2 Spanish Translation	2021-06-01 23:48:35 -03:00
meaz	2ea5dd1a0a	Merge pull request 'it-disnews-2' (#234 ) from it-disnews-2 into master Reviewed-on: Disroot/Website#234	2021-06-01 12:19:55 +00:00
l3o	9153c1ec69	Corrected small translation error in Italian	2021-05-31 22:04:49 +02:00
l3o	7938db5b0d	Translated into italian post disnews 2	2021-05-31 22:01:30 +02:00
muppeth	8b2fefa94f	disnews #2 (#233 ) Co-authored-by: muppeth <muppeth@disroot.org> Co-authored-by: meaz <meaz@no-reply@disroot.org> Reviewed-on: Disroot/Website#233 Reviewed-by: Fede.- <fede@no-reply@disroot.org> Reviewed-by: meaz <meaz@no-reply@disroot.org> Reviewed-by: antilopa <antilopa@no-reply@disroot.org> Co-authored-by: muppeth <muppeth@no-reply@disroot.org> Co-committed-by: muppeth <muppeth@no-reply@disroot.org>	2021-05-31 06:57:32 +00:00
Fede.-	c2f5e56e0b	Merge pull request 'add the new yearly report and foos donations in 2020' (#232 ) from yearly_rapport_2020 into master Reviewed-on: Disroot/Website#232 Reviewed-by: muppeth <muppeth@no-reply@disroot.org> Reviewed-by: Fede.- <fede@no-reply@disroot.org>	2021-05-27 19:48:37 +00:00
antilopa	512bb3dc80	add the new yearly report and foos donations in 2020	2021-05-27 20:17:46 +02:00
meaz	7869b17f7c	Merge pull request 'add info about changelog repo in readme file' (#227 ) from changelog_readme into master Reviewed-on: Disroot/Website#227 Reviewed-by: Fede.- <fede@no-reply@disroot.org> Reviewed-by: muppeth <muppeth@no-reply@disroot.org>	2021-04-18 05:43:06 +00:00
meaz	a95aa8befd	Merge branch 'master' into changelog_readme	2021-04-17 07:23:17 +00:00
Fede.-	a001d259a3	Merge pull request 'Blogpost about FLISoL 2021' (#226 ) from flisol_2021 into master Reviewed-on: Disroot/Website#226 Reviewed-by: meaz <meaz@no-reply@disroot.org>	2021-04-17 07:00:12 +00:00
meaz	43fc0bdb9e	add info about changelog repo in readme file	2021-04-17 07:32:53 +02:00
Fede.-	577dac562d	Blogpost about FLISoL 2021	2021-04-16 23:13:26 -03:00
meaz	eff3677a11	Merge pull request 'fix a bit links to forms so that it works better in vagrant' (#224 ) from forms_language into master Reviewed-on: Disroot/Website#224 Reviewed-by: antilopa <antilopa@no-reply@disroot.org>	2021-04-13 18:35:30 +00:00
meaz	a5544c0443	Merge branch 'master' into forms_language	2021-04-13 18:35:05 +00:00
meaz	ce95533a35	Merge pull request 'add stripe in forms' (#223 ) from stripe into master Reviewed-on: Disroot/Website#223 Reviewed-by: antilopa <antilopa@no-reply@disroot.org>	2021-04-13 18:34:39 +00:00
meaz	a5eb8de102	set grav version back to 1.6.18	2021-04-13 10:23:57 +02:00
meaz	de114b0d1b	fix a bit links to forms so that it works better in vagrant	2021-04-13 10:22:35 +02:00
meaz	8b28928854	Merge branch 'master' into stripe	2021-04-13 08:20:50 +00:00
meaz	6c285178ff	add stripe in forms	2021-04-13 10:17:39 +02:00
antilopa	26b3c4ea42	Merge pull request 'updated monthly overview' (#222 ) from overview_march_2021 into master Reviewed-on: Disroot/Website#222 Reviewed-by: meaz <meaz@no-reply@disroot.org>	2021-04-12 10:26:01 +00:00
antilopa	8d072460e3	updated monthly overview	2021-04-11 21:27:04 +02:00