Merge branch 'master' into community--change-from-taiga-to-git

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.

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).

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)

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.*
 

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.
 

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).

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>
 
 
 ---

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>

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>
 
 
 ---

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>

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>

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>
 
 
 ---

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.
 
 
 ---

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>
 
 
 ---

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>
 
 
 ---

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>

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>

pages/06.donate/_overview/fullbar.de.md

@@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)
 
 
-Unterstützt von <button class="button button4">230</button>
+Unterstützt von <button class="button button4">219</button>
 _(Click the number for an overview)_
 
 

pages/06.donate/_overview/fullbar.en.md

@@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)
 
 
-Supported by <button class="button button4">230</button> Disrooters
+Supported by <button class="button button4">219</button> Disrooters
 _(Click the number for an overview)_
 
 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

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">219</button> Disrooters
 _(Click sobre el número para una vista general)_
 
 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

pages/06.donate/_overview/fullbar.fr.md

@@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)
 
 
-Soutenu par <button class="button button4">230</button> Disrooters
+Soutenu par <button class="button button4">219</button> Disrooters
 _(Cliquez sur le numéro pour un aperçu)_
 
 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

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">219</button> Disrooters
 _(Clicca sul numero per una panoramica)_
 
 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

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">219</button> дизрутера(ов)
 _(Щелкните номер для обзора)_
 
 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

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/)

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/)

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

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

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

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

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

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

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

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

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

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>

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

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

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

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
         -

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

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

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

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

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

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

vagrant/README.md

@@ -16,10 +16,6 @@
 	```
 
 2. virtuabox  
-	for install on Debian Jessie run command:
-	```
-	sudo apt install virtualbox-6.0
-	```
 
 	for install on Debian Buster run command:
 	```
@@ -70,12 +66,15 @@
 	```
 	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
+	```
+	git clone https://git.disroot.org/Disroot/CHANGELOG.git ~/Disroot/Disroot-Privacy-Policy
+	```
+8. Add the local domain name for the hub to your host machine's `/etc/hosts` file.
 	```
 	echo "192.168.33.12 disroot.lan" >> /etc/hosts
 	```
-8. Launch Vagrant to build the virtual machine (VM). This will take several minutes.
+9. Launch Vagrant to build the virtual machine (VM). This will take several minutes.
 	```
 	cd ~/Disroot/disroot-website/vagrant
 	vagrant up disroot_lan