+
+Esperamos que les gusten las aplicaciones adicionales y las encuentren útiles en su vida diaria. Nosotros ya las estamos usando internamente y las estamos disfrutando bastante. Vendrán algunos tutoriales detallados, sin embargo si quieren darnos una mano, pueden unirse a la comunidad **Howto** en howto@chat.disroot.org
+
+
+# Performance crítica de Nextcloud
+
+Como probablemente habrán notado, las últimas semanas experimentamos algunos inconvenientes con ciertos servicios. Desafortunadamente, el origen de esto es **Nextcloud**. Parece que estamos chocando con algún problema del que aún no hemos encontrado la causa principal. Por ahora hemos movido los servicios afectados por la caída de rendimiento de **Nextcloud** a otra "caja", lo que significa que por lo menos esos funcionarán correctamente. En los próximos días intentaremos centrarnos en el problema y encontrar qué lo causa. Disculpen por esta turbulencia.
diff --git a/pages/09.tutorials/external.ru.md b/pages/09.tutorials/external.ru.md
new file mode 100644
index 00000000..9ceeda25
--- /dev/null
+++ b/pages/09.tutorials/external.ru.md
@@ -0,0 +1,4 @@
+---
+title: 'Инструкции'
+external_url: 'https://howto.disroot.org'
+---
diff --git a/pages/10.faq/_communication/faq.de.md b/pages/10.faq/_communication/faq.de.md
index dc08ff21..ea5b25fa 100644
--- a/pages/10.faq/_communication/faq.de.md
+++ b/pages/10.faq/_communication/faq.de.md
@@ -6,10 +6,6 @@ text_align: left
part: "KOMMUNIKATION"
section_number: "100"
faq:
- -
- question: "Ich kann nicht auf Matrix zugreifen. Warum?"
- answer: "Wir haben im September 2018 entschieden Matrix nicht mehr zu betreiben. Die Gründe kannst Du hier.
- Mehr Informationen über die Datenschutzproblematik bei Matrix findest Du hier
"
-
question: "Wie kann ich Disroot's IRC in XMPP-Räumen nutzen?"
answer: "Disroot bietet ein sogenanntes IRC-Gateway. Das heißt, Du kannst jeden IRC-Raum auf jedem IRC-Server betreten. Das grundsätzliche Adress-Schema sieht folgendermaßen aus:
@@ -18,8 +14,5 @@ faq:
Um einen IRC-Kontakt hinzuzufügen: Kontaktname%irc.domain.tld@irc.disroot.org
Dabei ist #Raum der IRC-Raum, den Du betreten willst, und irc.domain.tld ist die IRC-Serveradresse, auf der der Raum gehostet wird. Achte darauf, dass Deine Adresse @irc.disroot.org enthält, da dies die Adresse des IRC-Gateways ist.
"
- -
- question: "Ich kann mich mit Disroot-Account nicht bei Diaspora* anmelden."
- answer: "Da Diaspora* leider LDAP (das Software-Protokoll, das wir für den gemeinsamen Zugriff auf Dienste mit einem einzigen Account nutzen) nicht unterstützt, kannst Du Dich nicht mit Deinen Disroot-Zugangsdaten anmelden. Du musst Dir einen eigenständigen here. However, registrations are currently closed.
"
---
diff --git a/pages/10.faq/_communication/faq.en.md b/pages/10.faq/_communication/faq.en.md
index f5c1ac0b..af213108 100644
--- a/pages/10.faq/_communication/faq.en.md
+++ b/pages/10.faq/_communication/faq.en.md
@@ -6,10 +6,6 @@ text_align: left
part: "COMMUNICATION"
section_number: "100"
faq:
- -
- question: "I can't connect to Matrix. Why?"
- answer: "We decided to discontinue Matrix since September, 2018. You can read the reasons here.
- You can also find more information about the privacy impact of Matrix here
"
-
question: "How do I use Disroot's IRC in XMPP rooms?"
answer: "Disroot provides so-called IRC gateway. This means you can join any IRC room hosted on any IRC server. This is the basic address schema:
@@ -18,8 +14,5 @@ faq:
To add an IRC contact: contactname%irc.domain.tld@irc.disroot.org
Where #room is the IRC room you want to join and irc.domain.tld is the irc server address you want to join. Make sure to leave @irc.disroot.org as it is because it's the IRC gateways address.
"
- -
- question: "I can’t connect to Diaspora* with my Disroot account."
- answer: "Since Diaspora* doesn’t support LDAP (the software protocol we use to access services with a single account) it is not possible to login with Disroot credentials. You need to create a different account here. However, registrations are currently closed.
"
---
diff --git a/pages/10.faq/_communication/faq.es.md b/pages/10.faq/_communication/faq.es.md
index b7a4f646..dfbd3f5f 100644
--- a/pages/10.faq/_communication/faq.es.md
+++ b/pages/10.faq/_communication/faq.es.md
@@ -6,10 +6,6 @@ text_align: left
part: "SOBRE COMUNICACIÓN"
section_number: "100"
faq:
- -
- question: "No puedo conectarme a Matrix. ¿Por qué?"
- answer: "En septiembre de 2018 decidimos discontinuar Matrix. Puedes leer las razones aqui.
- Puedes encontrar más información sobre el impacto en la privacidad de Matrix aqui
"
-
question: "¿Cómo puedo utilizar el IRC de Disroot en las salas XMPP?"
answer: "Disroot proporciona la llamada puerta de enlace IRC. Esto significa que puedes unirte a cualquier sala IRC hospedada en cualquier servidor IRC. Este es el esquema de dirección básico:
@@ -18,8 +14,5 @@ faq:
Para agregar un contacto IRC: nombre_del_contacto%irc.domain.tld@irc.disroot.org
Donde #sala es la sala IRC a la que quieres unirte y irc.domain.tld es la dirección del servidor. Asegúrate de dejar @irc.disroot.org como está porque es la dirección del enlace IRC.
"
- -
- question: "No puedo conectarme a Diaspora* con mi cuenta dey Disroot."
- answer: "Como Diaspora* no soporta LDAP (el software de protocolo que utilizamos para acceder a los servicios con una sola cuenta) no es posible iniciar sesión con las credenciales de Disroot. Necesitas crear una cuenta diferente aquí. However, registrations are currently closed.
"
---
diff --git a/pages/10.faq/_communication/faq.fr.md b/pages/10.faq/_communication/faq.fr.md
index 3cb0c1b3..f8f95779 100644
--- a/pages/10.faq/_communication/faq.fr.md
+++ b/pages/10.faq/_communication/faq.fr.md
@@ -6,10 +6,6 @@ text_align: left
part: "COMMUNICATION"
section_number: "100"
faq:
- -
- question: "Je n'arrive pas à me connecter à Matrix. Pourquoi ?"
- answer: "Nous avons décidé d'arrêter Matrix depuis septembre 2018. Vous pouvez lire les raisons ici.
- Vous pouvez également trouver plus d'informations sur l'impact de Matrix sur la vie privée ici
"
-
question: "Comment utiliser l'IRC de Disroot dans les salles XMPP ?"
answer: "Disroot fournit ce qu'on appelle une passerelle IRC. Cela signifie que vous pouvez rejoindre n'importe quelle salle IRC hébergée sur n'importe quel serveur IRC. Il s'agit du schéma d'adresse de base :
@@ -18,8 +14,5 @@ faq:
Pour ajouter un contact IRC: nomducontact%irc.domain.tld@irc.disroot.org
Où #salle est la salle IRC que vous voulez rejoindre et irc.domain.tld est l'adresse du serveur irc que vous voulez rejoindre. Assurez-vous de laisser @irc.disroot.org tel quel car c'est l'adresse des passerelles IRC.
"
- -
- question: "Je n'arrive pas à me connecter à Diaspora* avec mon compte Disroot."
- answer: "Comme Diaspora* n'est pas compatible avec LDAP (le protocole logiciel que nous utilisons pour accéder aux services avec un seul compte), il n'est pas possible de se connecter avec les identifiants Disroot. Vous devez créer un compte différent ici. Cependant, les inscriptions sont actuellement fermées.
"
---
diff --git a/pages/10.faq/_communication/faq.it.md b/pages/10.faq/_communication/faq.it.md
index 1d7ac8af..f3cb9a81 100644
--- a/pages/10.faq/_communication/faq.it.md
+++ b/pages/10.faq/_communication/faq.it.md
@@ -6,10 +6,6 @@ text_align: left
part: "COMUNICAZIONE"
section_number: "100"
faq:
- -
- question: "Non riesco a connettermi a Matrix. Perché?"
- answer: "Da settembre 2018 abbiamo deciso di interrompere Matrix. Puoi leggere le motivazioni qui.
- Puoi trovare ulteriori informazioni sull'impatto sulla privacy di Matrix qui
"
-
question: "Come posso usare l'IRC di Disroot nelle stanze XMPP?"
answer: "Disroot offre un servizio di IRC gateway. Questo significa che dal protocollo XMPP puoi accedere a qualsiasi stanza su server IRC. Per poter accedere ti basta utilizzare il seguente schema:
@@ -18,8 +14,5 @@ faq:
Per aggiungere un contatto IRC: contactname%irc.domain.tld@irc.disroot.org
Dove #room è la stanza irc alla quale si vuole accedere e irc.domain.tld è l'indirizzo del server sul quale la stanza è ospitata. Ricordati di non modificare @irc.disroot.org in quanto è l'indirizzo dell'IRC gateway.
"
- -
- question: "Non riesco a connettermi a Diaspora* con il mio account Disroot."
- answer: "Visto che Diaspora* non supporta LDAP (il protocollo che utilizziamo per accedere ai vari servizi con un unico account) non è possibile loggarsi utilizzando le credenziali di Disroot. Necessiti quindi di creare delle altre credenziali qui. However, registrations are currently closed.
"
---
diff --git a/pages/10.faq/_communication/faq.ru.md b/pages/10.faq/_communication/faq.ru.md
new file mode 100644
index 00000000..6c4bc402
--- /dev/null
+++ b/pages/10.faq/_communication/faq.ru.md
@@ -0,0 +1,18 @@
+---
+title: 'FAQ'
+bgcolor: '#FFF'
+fontcolor: '#327E82'
+text_align: left
+part: "КОММУНИКАЦИИ"
+section_number: "100"
+faq:
+ -
+ question: "Как использовать IRC Disroot через XMPP?"
+ answer: "Disroot предоставляет так называемый шлюз IRC. Это означает, что вы можете присоединиться к любой комнате IRC, размещенной на любом сервере IRC. Это основная схема адреса:
+
+ - Войти в IRC-комнату: #room%irc.domain.tld@irc.disroot.org
+ - Добавить IRC-контакт: contactname%irc.domain.tld@irc.disroot.org
+
+ Где #room является комнатой IRC, в которую вы хотите войти, irc.domain.tld это адрес IRC-сервера, к которому вы хотите присоединиться. Не забудьте оставить @irc.disroot.org без изменений, потому что это адрес шлюза IRC.
"
+
+---
diff --git a/pages/10.faq/_encryption/faq.de.md b/pages/10.faq/_encryption/faq.de.md
index 9def7ddb..7ead5a66 100644
--- a/pages/10.faq/_encryption/faq.de.md
+++ b/pages/10.faq/_encryption/faq.de.md
@@ -8,7 +8,7 @@ section_number: "200"
faq:
-
question: "Kann ich 2FA benutzen ?"
- answer: "Ja, Du kannst die 2-Faktor-Autorisierung (2FA) für die Cloud nutzen. Aber, bevor Du sie aktivierst, stell sicher, dass Du vollständig verstanden hast, wie sie funktioniert und wie sie zu benutzen ist. Weitere Informationen findest Du hier
"
+ answer: "Ja, Du kannst die 2-Faktor-Autorisierung (2FA) für die Cloud nutzen. Aber, bevor Du sie aktivierst, stell sicher, dass Du vollständig verstanden hast, wie sie funktioniert und wie sie zu benutzen ist. Weitere Informationen findest Du hier
"
-
question: "Kann ich Ende-zu-Ende-Verschlüsselung in der Cloud nutzen?"
answer: "Aktuell ist die Ende-zu-Ende-Verschlüsselung aufgrund eines Langzeit-Bugs in der Nextcloud-Desktop-App deaktiviert.
"
diff --git a/pages/10.faq/_encryption/faq.en.md b/pages/10.faq/_encryption/faq.en.md
index 0b9ca1de..673596f7 100644
--- a/pages/10.faq/_encryption/faq.en.md
+++ b/pages/10.faq/_encryption/faq.en.md
@@ -8,7 +8,7 @@ section_number: "200"
faq:
-
question: "Can I use 2FA?"
- answer: "Yes, you can use it for the Cloud. But, before you enable it, make sure you fully understand how it works and how to use it. For more information, go here
"
+ answer: "Yes, you can use it for the Cloud. But, before you enable it, make sure you fully understand how it works and how to use it. For more information, go here
"
-
question: "Can I use end-to-end encryption in the cloud?"
answer: "Currently, end-to-end encryption is disabled due to long standing bug with Nextcloud desktop app.
"
diff --git a/pages/10.faq/_encryption/faq.es.md b/pages/10.faq/_encryption/faq.es.md
index da6558ca..eaaf36b3 100644
--- a/pages/10.faq/_encryption/faq.es.md
+++ b/pages/10.faq/_encryption/faq.es.md
@@ -8,7 +8,7 @@ section_number: "200"
faq:
-
question: "¿Puedo utilizar 2FA (Autenticación de dos factores)?"
- answer: "Sí, puedes usarlo para la Nube. Pero, antes de habilitarlo, asegúrate que entiendes plenamente cómo funciona y cómo usarlo. Para más información, ve aquí
"
+ answer: "Sí, puedes usarlo para la Nube. Pero, antes de habilitarlo, asegúrate que entiendes plenamente cómo funciona y cómo usarlo. Para más información, ve aquí
"
-
question: "¿Puedo usar cifrado de extremo a extremo (E2EE) en la Nube?"
diff --git a/pages/10.faq/_encryption/faq.fr.md b/pages/10.faq/_encryption/faq.fr.md
index c27ed1a9..b560833b 100644
--- a/pages/10.faq/_encryption/faq.fr.md
+++ b/pages/10.faq/_encryption/faq.fr.md
@@ -8,7 +8,7 @@ section_number: "200"
faq:
-
question: "Puis-je utiliser la 2FA?"
- answer: "Oui, vous pouvez l'utiliser pour le Cloud. Mais avant de l'activer, assurez-vous de bien comprendre comment cela fonctionne et comment l'utiliser. Pour plus d'informations, rendez-vous ici
"
+ answer: "Oui, vous pouvez l'utiliser pour le Cloud. Mais avant de l'activer, assurez-vous de bien comprendre comment cela fonctionne et comment l'utiliser. Pour plus d'informations, rendez-vous ici
"
-
question: "Puis-je utiliser le chiffrement de bout en bout dans le cloud?"
answer: "Actuellement, le chiffrement de bout en bout est désactivé en raison d'un bogue de longue date avec l'application de bureau Nextcloud.
"
diff --git a/pages/10.faq/_encryption/faq.it.md b/pages/10.faq/_encryption/faq.it.md
index 7d53b30f..bf482e68 100644
--- a/pages/10.faq/_encryption/faq.it.md
+++ b/pages/10.faq/_encryption/faq.it.md
@@ -8,7 +8,7 @@ section_number: "200"
faq:
-
question: "Posso utilizzare il sistema di autentificazione a due fattori (2FA)?"
- answer: "Sì, puoi utilizzarlo per il Cloud. Attenzione, prima di abilitarlo, assicurati di comprenderne appieno il funzionamento. Per maggiori informazioni leggi qui
"
+ answer: "Sì, puoi utilizzarlo per il Cloud. Attenzione, prima di abilitarlo, assicurati di comprenderne appieno il funzionamento. Per maggiori informazioni leggi qui
"
-
question: "Posso utilizzare la cifratura end-to-end nel cloud?"
answer: "Attualmente la cifratura end-to-end è disabilitata a causa di un bug di vecchia data con l'app desktop Nextcloud.
"
diff --git a/pages/10.faq/_encryption/faq.ru.md b/pages/10.faq/_encryption/faq.ru.md
new file mode 100644
index 00000000..f2a124f6
--- /dev/null
+++ b/pages/10.faq/_encryption/faq.ru.md
@@ -0,0 +1,17 @@
+---
+title: 'FAQ'
+bgcolor: '#FFF'
+fontcolor: '#327E82'
+text_align: left
+part: "ШИФРОВАНИЕ"
+section_number: "200"
+faq:
+ -
+ question: "Я могу использовать двухфакторную авторизацию (2FA)?"
+ answer: "Да, вы можете использовать ее для Облака. Но перед тем, как включить его, убедитесь, что вы полностью понимаете, как он работает и как его использовать. Для получения дополнительной информации перейдите сюда.
"
+ -
+ question: "Могу ли я использовать сквозное шифрование в облаке?"
+ answer: "В настоящее время сквозное шифрование отключено из-за давней ошибки с приложением Nextcloud.
"
+
+
+---
diff --git a/pages/10.faq/_faq/2col.ru.md b/pages/10.faq/_faq/2col.ru.md
new file mode 100644
index 00000000..91464d8f
--- /dev/null
+++ b/pages/10.faq/_faq/2col.ru.md
@@ -0,0 +1,11 @@
+---
+title: FAQ
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+process:
+ markdown: true
+ twig: true
+twig_first: false
+---
+
+# Часто задаваемые вопросы
diff --git a/pages/10.faq/_general/faq.es.md b/pages/10.faq/_general/faq.es.md
index 8f11a942..dc9fd218 100644
--- a/pages/10.faq/_general/faq.es.md
+++ b/pages/10.faq/_general/faq.es.md
@@ -7,8 +7,8 @@ part: "GENERALES"
section_number: "300"
faq:
-
- question: "What does Disroot mean?"
- answer: "Dis'root': To tear up the roots of, or by the roots; hence, to tear from a foundation; to uproot.
"
+ question: "¿Qué significa Disroot?"
+ answer: "Des'raizar': Arrancar desde o por las raíces; por consiguiente, arrancar desde los cimientos; desarraigar.
"
-
question: "¿Disroot durará?"
answer: "Los administradores y mantenedores de Disroot usan la plataforma a diario y dependen de ella como su principal herramienta de comunicación. Pretendemos mantenerla andando por mucho tiempo. Puedes mirar en el Foro la respuesta completa
"
diff --git a/pages/10.faq/_general/faq.ru.md b/pages/10.faq/_general/faq.ru.md
new file mode 100644
index 00000000..03c65683
--- /dev/null
+++ b/pages/10.faq/_general/faq.ru.md
@@ -0,0 +1,19 @@
+---
+title: 'FAQ'
+bgcolor: '#FFF'
+fontcolor: '#327E82'
+text_align: left
+part: "ОСНОВНЫЕ"
+section_number: "300"
+faq:
+ -
+ question: "Что значит Disroot?"
+ answer: "Dis'root' (англ. 'root' - корень, 'dis' - приставка отрицания): вырвать с корнем или оторвать от корней; следовательно, оторвать от основания.
"
+ -
+ question: "Долго ли просуществует Disroot?"
+ answer: "Администраторы и волонтеры по сопровождению Disroot используют его ежедневно и полагаются на него как на свой основной инструмент коммуникации. Мы намерены продолжать его работу в течение очень долгого времени. Найдите на форуме более развернутый ответ (на английском языке)
"
+ -
+ question: "Сколько людей используют Disroot?"
+ answer: "Мы не отслеживаем активных пользователей, поэтому не можем ответить на вопрос. Кроме того, мы считаем, что это ни в коем случае не способ измерить актуальность платформы. Число пользователей может меняться по многим причинам, например, мода на приватность, огласка в социальных сетях, или наоборот, какие-то трудности отталкивают новичков и т.д. Поскольку цели платформы не имеют к популярности никакого отношения, мы не видим смысла давать ложную или подтасованную статистику по этому поводу.
"
+
+---
diff --git a/pages/10.faq/_services/faq.ru.md b/pages/10.faq/_services/faq.ru.md
new file mode 100644
index 00000000..a7594609
--- /dev/null
+++ b/pages/10.faq/_services/faq.ru.md
@@ -0,0 +1,41 @@
+---
+title: 'FAQ'
+bgcolor: '#FFF'
+fontcolor: '#327E82'
+text_align: left
+part: "СЕРВИСЫ"
+section_number: "400"
+faq:
+ -
+ question: "Какие сервисы я могу использовать с моей учетной записью Disroot?"
+ answer: "Ваша учетная запись позволяет вам использовать следующие службы с тем же именем пользователя и паролем:
+
+ - Почта
+ - Облако
+ - Форум
+ - Чат
+ - Доска проектов
+
+ Остальные услуги (Pads, PasteBin, Upload, Search, Polls) не требуют регистрации.
"
+ -
+ question: "Что я могу использовать для своей учетной записи электронной почты?"
+ answer: "Вы можете использовать его как хотите, кроме коммерческих целей или для рассылки спама. Чтобы лучше понять, что вы можете и чего не можете с этим делать, прочитайте параграфы 10 и 11 наших правил.
"
+ -
+ question: "Каков размер почтового ящика и облака?"
+ answer: "Размер почтового хранилища ограничен 1GB и размером вложений до 50MB.
+ Дисковое пространство облака по умолчанию равно 2GB.
+ Есть возможность расширить ваше облако и почтовое хранилище. Посмотрите варианты здесь
"
+ -
+ question: "Могу ли я увидеть статус сервисов, например, время безотказной работы, плановое обслуживание и т.д.?"
+ answer: "Да. Есть несколько способов быть в курсе всех проблем, перерывов на обслуживание и общей информации о состоянии здоровья платформы.
+
+ - Посетите https://state.disroot.org
+ - Подпишитесь на RSS ленту https://state.disroot.org
+ - Подпишитесь на почтовую рассылку https://state.disroot.org
+ - Следите за disroot_state@hub.disroot.org в Hubzilla, Diaspora*, Mastodon, Pleroma, Pixelfed, etc. (the fediverse...)
+ - Читайте disroot@social.weho.st (the fediverse again...)
+ - Присоединяйтесь state@chat.disroot.org (XMPP)
+ - Присоединяйтесь @state:disroot.org (Matrix)
+ - Установите DisApp - Disroot приложение для Android с уведомлениями в реальном времени.
+
"
+---
diff --git a/pages/10.faq/_user/faq.de.md b/pages/10.faq/_user/faq.de.md
index bafbb1a5..ba51522a 100644
--- a/pages/10.faq/_user/faq.de.md
+++ b/pages/10.faq/_user/faq.de.md
@@ -8,7 +8,7 @@ section_number: "500"
faq:
-
question: "Ich habe mein Passwort vergessen. Wie kann ich es zurücksetzen?"
- answer: "Um Dein Passwort zurückzusetzen musst Du Sicherheitsfragen und/oder eine Wiederherstellungs-Emailadresse eingerichtet haben. Wenn das der Fall ist, gehe in die Benutzerverwaltung und wähle die Option "Passwort vergessen".
+ answer: "Um Dein Passwort zurückzusetzen musst Du Sicherheitsfragen und/oder eine Wiederherstellungs-Emailadresse eingerichtet haben. Wenn das der Fall ist, gehe in die Benutzerverwaltung und wähle die Option "Passwort vergessen".
Wenn Du keine dieser Optionen eingerichtet hast, kannst Du nichts anderes tun als einen neuen Account einzurichten.
"
-
diff --git a/pages/10.faq/_user/faq.en.md b/pages/10.faq/_user/faq.en.md
index 2a7f264f..ddbace85 100644
--- a/pages/10.faq/_user/faq.en.md
+++ b/pages/10.faq/_user/faq.en.md
@@ -8,7 +8,7 @@ section_number: "500"
faq:
-
question: "I forgot my password. How can I reset it?"
- answer: "In order to reset your password, you need to have security questions and/or a recovery email set up. If this is the case, then go here and click on 'Forgotten password'.
+ answer: "In order to reset your password, you need to have security questions and/or a recovery email set up. If this is the case, then go here and click on 'Forgotten password'.
If you haven't set any of these options, then there's nothing else you can do, but register a new account.
"
-
@@ -30,14 +30,13 @@ faq:
After login out and back into the cloud again you should see your files and the message should have disappeared.
- If you don't remember your old password, it's still possible to reset the account but it won't be possible to recover any files on the cloud as they are encrypted with the old key.
"
+ If you don't remember your old password, it's still possible to reset the account but it won't be possible to recover any files on the cloud as they are encrypted with the old key. What you have to do is to remove all files from Nextcloud (this does not include calendars, contacts, etc., just files), and to contact us (support@disroot.org). We will then proceed wiping the key so the new key pair based on your current password can be re-generated automatically upon new login.
"
-
question: "Does my Disroot account expire?"
answer: " No. We do not to expire unused accounts. However we appreciate when people take responsibility for their account, and its impact on the Disroot resources, and request account deletion when they decide not to use our services any longer.
"
-
question: "How can I delete my Disroot account?"
- answer: "To delete your Disroot account log in to https://user.disroot.org and select 'Delete My Account'.
- Accounts and their data are wiped on daily.
"
+ answer: "To delete your Disroot account log in to https://user.disroot.org and select 'Delete My Account'.
Accounts and their data are wiped on daily.
"
-
question: "How can I change my password?"
answer: "Log in to https://user.disroot.org and select 'Change Password'.
diff --git a/pages/10.faq/_user/faq.es.md b/pages/10.faq/_user/faq.es.md
index a0c17507..7aaca837 100644
--- a/pages/10.faq/_user/faq.es.md
+++ b/pages/10.faq/_user/faq.es.md
@@ -8,7 +8,7 @@ section_number: "500"
faq:
-
question: "Olvidé mi contraseña. ¿Cómo puedo restablecerla?"
- answer: "Para restablecer tu contraseña necesitas, primero, tener configuradas las preguntas de seguridad y/o una dirección de correo secundaria. Si este es el caso, entonces ve aquí y haz click en 'Forgotten password'.
+ answer: "Para restablecer tu contraseña necesitas, primero, tener configuradas las preguntas de seguridad y/o una dirección de correo secundaria. Si este es el caso, entonces ve aquí y haz click en 'Forgotten password'.
Si no has configurado alguna de estas opciones, entonces no hay nada más que puedas hacer, excepto registrar una nueva cuenta.
"
-
question: "Mi cuenta fue aprobada pero no puedo iniciar sesión. ¿Por qué?"
diff --git a/pages/10.faq/_user/faq.fr.md b/pages/10.faq/_user/faq.fr.md
index 05e0b999..34beb9d8 100644
--- a/pages/10.faq/_user/faq.fr.md
+++ b/pages/10.faq/_user/faq.fr.md
@@ -8,7 +8,7 @@ section_number: "500"
faq:
-
question: "J'ai oublié mon mot de passe. Comment puis-je le réinitialiser?"
- answer: "Afin de réinitialiser votre mot de passe, vous devez configurer des questions de sécurité et/ou un e-mail de récupération. Si c'est le cas, allez ici et cliquez sur 'Mot de passe oublié'.
+ answer: "Afin de réinitialiser votre mot de passe, vous devez configurer des questions de sécurité et/ou un e-mail de récupération. Si c'est le cas, allez ici et cliquez sur 'Mot de passe oublié'.
Si vous n'avez défini aucune de ces options, vous ne pouvez rien faire d'autre que créer un nouveau compte.
"
-
@@ -30,7 +30,7 @@ faq:
Après vous être déconnecté et être retourné dans le cloud, vous devriez voir vos fichiers et le message devrait avoir disparu.
- Si vous ne vous souvenez plus de votre ancien mot de passe, il est toujours possible de réinitialiser le compte, mais il ne sera pas possible de récupérer les fichiers sur le cloud car ils sont chiffrés par l'ancienne clé.
"
+ Si vous ne vous souvenez pas de votre ancien mot de passe, il est toujours possible de réinitialiser le compte mais il ne sera pas possible de récupérer les fichiers sur le cloud car ils sont chiffrés avec l'ancienne clé. Ce que vous devez faire c'est de supprimer tous les fichiers de Nextcloud (cela n'inclut pas les calendriers, les contacts, etc., mais seulement les fichiers), et nous contactez (support@disroot.org). Nous procéderons alors à l'effacement de la clé afin que la nouvelle paire de clés basée sur votre mot de passe actuel puisse être générée automatiquement lors de la nouvelle connexion.
"
-
question: "Mon compte Disroot expire-t-il ?"
answer: " Non. Nous n'expirons pas les comptes non utilisés. Cependant, nous apprécions que les gens assument la responsabilité de leur compte et de son impact sur les ressources Disroot, et nous demandons la suppression du compte quand ils décident de ne plus utiliser nos services.
"
diff --git a/pages/10.faq/_user/faq.it.md b/pages/10.faq/_user/faq.it.md
index d0e39be6..8e6f443d 100644
--- a/pages/10.faq/_user/faq.it.md
+++ b/pages/10.faq/_user/faq.it.md
@@ -8,7 +8,7 @@ section_number: "500"
faq:
-
question: "Ho dimenticato la password. Come posso resettarla?"
- answer: "Per poter resettare la password, devi aver precedentemente impostato le domande di sicurezza o un indirizzo di posta elettronica secondario. In questi casi, puoi procedere qui cliccando su "Password dimenticata".'.
+ answer: "Per poter resettare la password, devi aver precedentemente impostato le domande di sicurezza o un indirizzo di posta elettronica secondario. In questi casi, puoi procedere qui cliccando su "Password dimenticata".'.
Se non hai impostato nessuna delle opzioni di recupero, non puoi fare nulla, se non registrare un nuovo account.
"
-
diff --git a/pages/10.faq/_user/faq.ru.md b/pages/10.faq/_user/faq.ru.md
new file mode 100644
index 00000000..0929284d
--- /dev/null
+++ b/pages/10.faq/_user/faq.ru.md
@@ -0,0 +1,45 @@
+---
+title: 'FAQ'
+bgcolor: '#FFF'
+fontcolor: '#327E82'
+text_align: left
+part: "ПОЛЬЗОВАТЕЛЬСКИЕ"
+section_number: "500"
+faq:
+ -
+ question: "Я забыл свой пароль. Как его сбросить?"
+ answer: "Чтобы сбросить пароль, вам необходимо настроить контрольные вопросы и/или запасной адрес электронной почты для восстановления. Если вы хотите восстановить пароль сейчас, перейдите сюда и кликните 'Забыл пароль'.
+
+ Если вы не установили ни один из этих параметров, вы ничего не можете сделать, кроме как зарегистрировать новую учетную запись.
"
+ -
+ question: "Моя учетная запись была одобрена, но я не могу войти. Почему?"
+ answer: "Скорее всего, вы неправильно ввели:
+
+ - ваш никнейм (помните, это никнейм, он указывается без домена), или...
+ - ваш пароль (имейте ввиду, он чувствителен к малым и большим буквам).
+
"
+ -
+ question: "Я получаю сообщение 'Недействительный закрытый ключ для приложения шифрования'. Почему?"
+ answer: "Вероятно, это потому, что вы недавно изменили свой пароль. Поскольку Nextcloud использует пароль пользователя для создания ключей шифрования, необходимо создать их из вашего нового пароля. Для этого вы должны:
+
+ - войти в настройки Облака
+ - выбрать Безопасность в меню слева
+ - найти секцию Базовый модуль шифрования и ввести ваш старый пароль
+ - затем ввести новый
+ - и кликнуть Обновить пароль
+
+ После входа в систему и повторного возврата в облако вы должны увидеть свои файлы, и сообщение должно исчезнуть.
+
+ Если вы не помните свой старый пароль, сбросить учетную запись по-прежнему возможно, но восстановить файлы в облаке будет нельзя, поскольку они зашифрованы старым ключом. Вам нужно удалить все файлы из Nextcloud (это не календари, контакты и т.д., а только файлы) и связаться с нами (support@disroot.org). Затем мы удалим ключ, чтобы новая пара ключей на основе вашего текущего пароля могла быть автоматически сгенерирована заново при новом входе в систему.
"
+ -
+ question: "Срок действия моей учетной записи Disroot ограничен?"
+ answer: "Нет. Мы не прекращаем срок действия неиспользуемых аккаунтов. Однако мы ценим, когда люди берут на себя ответственность за свою учетную запись и ее влияние на ресурсы Disroot и запрашивают удаление учетной записи, когда они решают больше не пользоваться нашими услугами.
"
+ -
+ question: "Как я могу удалить свой аккаунт Disroot?"
+ answer: "Для удаления вашего аккаунт Disroot авторизуйтесь по адресу https://user.disroot.org и выберите 'Удалить мою учетную запись'.
Учетные записи и их данные очищаются ежедневно.
"
+ -
+ question: "Как мне сменить пароль?"
+ answer: "Войдите в аккаунт по адресу https://user.disroot.org и выберите 'Изменить пароль'.
+ Вам также необходимо будет изменить свой пароль в Nextcloud, чтобы иметь доступ к своим файлам, которые зашифрованы с использованием вашего пароля. Для этого выполните действия, описанные в ответе на Я получаю сообщение 'Недействительный закрытый ключ для приложения шифрования' или посмотрите эту инструкцию.
"
+
+---
diff --git a/pages/10.faq/modular.ru.md b/pages/10.faq/modular.ru.md
new file mode 100644
index 00000000..d4d8ff10
--- /dev/null
+++ b/pages/10.faq/modular.ru.md
@@ -0,0 +1,18 @@
+---
+title: 'ЧаВо'
+bgcolor: '#fff'
+content:
+ items: '@self.modular'
+ order:
+ by: default
+ dir: asc
+ custom:
+ - _faq
+ - _general
+ - _user
+ - _services
+ - _encryption
+ - _communication
+body_classes: modular
+header_image: faq_banner.jpg
+---
diff --git a/pages/11.covid19/_about/fullbar.en.md b/pages/11.covid19/_about/fullbar.en.md
new file mode 100644
index 00000000..70c76815
--- /dev/null
+++ b/pages/11.covid19/_about/fullbar.en.md
@@ -0,0 +1,15 @@
+---
+title: Covid-19 Kit
+bgcolor: '#1F5C60'
+fontcolor: '#FFFFFF'
+text_align: center
+body_classes: modular
+---
+
+
+## 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.
diff --git a/pages/11.covid19/_about/fullbar.es.md b/pages/11.covid19/_about/fullbar.es.md
new file mode 100644
index 00000000..b583809d
--- /dev/null
+++ b/pages/11.covid19/_about/fullbar.es.md
@@ -0,0 +1,15 @@
+---
+title: Kit Covid19
+bgcolor: '#1F5C60'
+fontcolor: '#FFFFFF'
+text_align: center
+body_classes: modular
+---
+
+
+## ¡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.
diff --git a/pages/11.covid19/_about/fullbar.fr.md b/pages/11.covid19/_about/fullbar.fr.md
new file mode 100644
index 00000000..87845ee6
--- /dev/null
+++ b/pages/11.covid19/_about/fullbar.fr.md
@@ -0,0 +1,15 @@
+---
+title: Kit Covid19
+bgcolor: '#1F5C60'
+fontcolor: '#FFFFFF'
+text_align: center
+body_classes: modular
+---
+
+
+## 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.
diff --git a/pages/11.covid19/_about/fullbar.it.md b/pages/11.covid19/_about/fullbar.it.md
new file mode 100644
index 00000000..9289ab55
--- /dev/null
+++ b/pages/11.covid19/_about/fullbar.it.md
@@ -0,0 +1,14 @@
+---
+title: Covid-19 Kit
+bgcolor: '#1F5C60'
+fontcolor: '#FFFFFF'
+text_align: center
+body_classes: modular
+---
+
+
+## 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.
diff --git a/pages/11.covid19/_services/services.en.md b/pages/11.covid19/_services/services.en.md
new file mode 100644
index 00000000..7f8fea68
--- /dev/null
+++ b/pages/11.covid19/_services/services.en.md
@@ -0,0 +1,73 @@
+---
+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"
+----
diff --git a/pages/11.covid19/_services/services.es.md b/pages/11.covid19/_services/services.es.md
new file mode 100644
index 00000000..b2d64cac
--- /dev/null
+++ b/pages/11.covid19/_services/services.es.md
@@ -0,0 +1,73 @@
+---
+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"
+----
diff --git a/pages/11.covid19/_services/services.fr.md b/pages/11.covid19/_services/services.fr.md
new file mode 100644
index 00000000..a3e6e6bd
--- /dev/null
+++ b/pages/11.covid19/_services/services.fr.md
@@ -0,0 +1,73 @@
+---
+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"
+---
diff --git a/pages/11.covid19/_services/services.it.md b/pages/11.covid19/_services/services.it.md
new file mode 100644
index 00000000..af0c9332
--- /dev/null
+++ b/pages/11.covid19/_services/services.it.md
@@ -0,0 +1,73 @@
+---
+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"
+----
diff --git a/pages/11.covid19/coronavirus.jpg b/pages/11.covid19/coronavirus.jpg
new file mode 100644
index 00000000..176f1850
Binary files /dev/null and b/pages/11.covid19/coronavirus.jpg differ
diff --git a/pages/11.covid19/modular.en.md b/pages/11.covid19/modular.en.md
new file mode 100644
index 00000000..6718e469
--- /dev/null
+++ b/pages/11.covid19/modular.en.md
@@ -0,0 +1,14 @@
+---
+title: Covid19Kit
+bgcolor: '#1F5C60'
+content:
+ items: '@self.modular'
+ order:
+ by: default
+ dir: asc
+ custom:
+ - _about
+ - _services
+body_classes: modular
+header_image: coronavirus.jpg
+---
diff --git a/pages/11.covid19/modular.es.md b/pages/11.covid19/modular.es.md
new file mode 100644
index 00000000..c785b4b2
--- /dev/null
+++ b/pages/11.covid19/modular.es.md
@@ -0,0 +1,14 @@
+---
+title: KitCovid19
+bgcolor: '#1F5C60'
+content:
+ items: '@self.modular'
+ order:
+ by: default
+ dir: asc
+ custom:
+ - _about
+ - _services
+body_classes: modular
+header_image: coronavirus.jpg
+---
diff --git a/pages/11.covid19/modular.fr.md b/pages/11.covid19/modular.fr.md
new file mode 100644
index 00000000..2cfd534a
--- /dev/null
+++ b/pages/11.covid19/modular.fr.md
@@ -0,0 +1,14 @@
+---
+title: Kit Covid19
+bgcolor: '#1F5C60'
+content:
+ items: '@self.modular'
+ order:
+ by: default
+ dir: asc
+ custom:
+ - _about
+ - _services
+body_classes: modular
+header_image: coronavirus.jpg
+---
diff --git a/pages/11.covid19/modular.it.md b/pages/11.covid19/modular.it.md
new file mode 100644
index 00000000..6718e469
--- /dev/null
+++ b/pages/11.covid19/modular.it.md
@@ -0,0 +1,14 @@
+---
+title: Covid19Kit
+bgcolor: '#1F5C60'
+content:
+ items: '@self.modular'
+ order:
+ by: default
+ dir: asc
+ custom:
+ - _about
+ - _services
+body_classes: modular
+header_image: coronavirus.jpg
+---
diff --git a/pages/annual_reports/AnnualReport2019.pdf b/pages/annual_reports/AnnualReport2019.pdf
new file mode 100644
index 00000000..86c3d5d8
Binary files /dev/null and b/pages/annual_reports/AnnualReport2019.pdf differ
diff --git a/pages/cryptocurrency/_bitcoin/2col.de.md b/pages/cryptocurrency/_bitcoin/2col.de.md
index 57bd01a9..007bea45 100644
--- a/pages/cryptocurrency/_bitcoin/2col.de.md
+++ b/pages/cryptocurrency/_bitcoin/2col.de.md
@@ -6,11 +6,11 @@ fontcolor: '#FFF'
wider_column: right
---
-![](qr1223.png)
+![](qr0508.png)
---
# Bitcoin
Sende Deine Bitcoin an unser Portemonnaie:
-bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
+bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e
diff --git a/pages/cryptocurrency/_bitcoin/2col.en.md b/pages/cryptocurrency/_bitcoin/2col.en.md
index 72e85888..86ea9943 100644
--- a/pages/cryptocurrency/_bitcoin/2col.en.md
+++ b/pages/cryptocurrency/_bitcoin/2col.en.md
@@ -6,11 +6,11 @@ fontcolor: '#FFF'
wider_column: right
---
-![](qr1223.png)
+![](qr0508.png)
---
# Bitcoin
Send your bitcoins to our wallet at:
-bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
+bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e
diff --git a/pages/cryptocurrency/_bitcoin/2col.es.md b/pages/cryptocurrency/_bitcoin/2col.es.md
index 4a3803a9..8ca59d16 100644
--- a/pages/cryptocurrency/_bitcoin/2col.es.md
+++ b/pages/cryptocurrency/_bitcoin/2col.es.md
@@ -5,10 +5,10 @@ fontcolor: '#FFF'
wider_column: right
---
-![](qr1223.png)
+![](qr0508.png)
---
# Bitcoin
Envía [bitcoins](https://es.wikipedia.org/wiki/Bitcoin) a nuestra cartera a:
-bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
+bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e
diff --git a/pages/cryptocurrency/_bitcoin/2col.fr.md b/pages/cryptocurrency/_bitcoin/2col.fr.md
index a29b121a..8c7aef9e 100644
--- a/pages/cryptocurrency/_bitcoin/2col.fr.md
+++ b/pages/cryptocurrency/_bitcoin/2col.fr.md
@@ -5,10 +5,10 @@ fontcolor: '#FFF'
wider_column: right
---
-![](qr1223.png)
+![](qr0508.png)
---
# Bitcoin
Envoyez vos bitcoins à notre porte-monnaie:
-bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
+bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e
diff --git a/pages/cryptocurrency/_bitcoin/2col.it.md b/pages/cryptocurrency/_bitcoin/2col.it.md
index b77f81c8..960acc0d 100644
--- a/pages/cryptocurrency/_bitcoin/2col.it.md
+++ b/pages/cryptocurrency/_bitcoin/2col.it.md
@@ -6,10 +6,10 @@ fontcolor: '#FFF'
wider_column: right
---
-![](qr1223.png)
+![](qr0508.png)
---
# Bitcoin
Invia i tuoi bitcoin nel nostro portafoglio a:
-bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
+bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e
diff --git a/pages/cryptocurrency/_bitcoin/qr0508.png b/pages/cryptocurrency/_bitcoin/qr0508.png
new file mode 100644
index 00000000..8a11ad78
Binary files /dev/null and b/pages/cryptocurrency/_bitcoin/qr0508.png differ
diff --git a/pages/forms/alias-request-form/form.de.md b/pages/forms/alias-request-form/form.de.md.bak
similarity index 100%
rename from pages/forms/alias-request-form/form.de.md
rename to pages/forms/alias-request-form/form.de.md.bak
diff --git a/pages/forms/alias-request-form/form.en.md b/pages/forms/alias-request-form/form.en.md
index a64235ce..77d3218b 100644
--- a/pages/forms/alias-request-form/form.en.md
+++ b/pages/forms/alias-request-form/form.en.md
@@ -1,140 +1,7 @@
---
-title: 'Alias Request Form'
+title: 'Temporary disabled'
header_image: introverts.jpg
-form:
- name: Alias-request-form
- fields:
- -
- name: username
- label: 'User Name'
- placeholder: 'Enter your Disroot user name'
- autofocus: 'on'
- autocomplete: 'on'
- type: text
- validate:
- pattern: '[A-Za-z0-9.]*'
- required: true
- -
- name: 'Alias 1'
- label: Alias
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.]*'
- required: true
- -
- name: 'Alias 2'
- label: 'Second Alias (optional)'
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.]*'
- required: false
- -
- name: 'Alias 3'
- label: 'Third Alias (optional)'
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.]*'
- required: false
- -
- name: 'Alias 4'
- label: 'Forth Alias (optional)'
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.]*'
- required: false
- -
- name: 'Alias 5'
- label: 'Fifth Alias (optional)'
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.]*'
- required: false
- -
- name: contribution
- label: 'Contributing via'
- placeholder: select
- type: select
- options:
- patreon: Patreon
- paypal: Paypal
- bank: 'Bank transfer'
- faircoin: Faircoin
- bitcoin: Bitcoin
- validate:
- required: true
- -
- name: amount
- label: Amount
- placeholder: 'EUR/USD/BTC/etc.'
- type: text
- validate:
- pattern: '[A-Za-z0-9., ]*'
- required: true
- -
- name: frequency
- label: Repeated
- type: radio
- default: monthly
- options:
- monthly: Monthly
- yearly: Yearly
- validate:
- required: true
- -
- name: reference
- label: Reference
- type: text
- placeholder: 'Name of payment holder or other transfer reference'
- validate:
- required: true
- -
- name: comments
- type: textarea
- -
- name: honeypot
- type: honeypot
- buttons:
- -
- type: submit
- value: Submit
- -
- type: reset
- value: Reset
- process:
- -
- email:
- from: alias-request@disroot.org
- to: '{{ form.value.username }}@disroot.org'
- subject: '[Disroot] Your alias request'
- body: '
Hi {{ form.value.username|e }},
Thank you for your contribution to Disroot.org!
We truly appreciate your generosity.
We will review your alias request and get back to you as soon as we can.
Here is a summary of the received request:
{% include ''forms/data.html.twig'' %}'
- -
- email:
- from: alias-request@disroot.org
- to: '{{ config.plugins.email.to }}'
- reply_to: '{{ form.value.username }}@disroot.org'
- subject: '[Alias request] - {{ form.value.username|e }}'
- body: '{% include ''forms/data.html.twig'' %}'
- -
- save:
- fileprefix: feedback-
- dateformat: Ymd-His-u
- extension: txt
- body: '{% include ''forms/data.txt.twig'' %}'
- -
- message: 'Your alias request has been sent!'
- -
- display: thankyou
---
-
-The email aliases feature is offered as a "reward" for regular supporters. By regular supporters we think of those who contribute with, at least, the equivalent of one cup of coffee a month. In order for the 'reward' not becoming the only incentive to donate, we expect to see the donation made before we can enable this feature.
-
-It is not that we are promoting coffee, on the contrary - coffee is a symbol for exploitation and inequality so we thought that it is a good way to let people measure themselves how much they can give.
-We found this list of coffee cup prices 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.
+
+ Due to huge backlog in incoming custom requests and work being done to improve our response time, we have decided to temporarily disable this feature.
Sorry for the inconvenience and hope to have it up and running again as soon as possible.
diff --git a/pages/forms/alias-request-form/form.en.md.bak b/pages/forms/alias-request-form/form.en.md.bak
new file mode 100644
index 00000000..a64235ce
--- /dev/null
+++ b/pages/forms/alias-request-form/form.en.md.bak
@@ -0,0 +1,140 @@
+---
+title: 'Alias Request Form'
+header_image: introverts.jpg
+form:
+ name: Alias-request-form
+ fields:
+ -
+ name: username
+ label: 'User Name'
+ placeholder: 'Enter your Disroot user name'
+ autofocus: 'on'
+ autocomplete: 'on'
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.]*'
+ required: true
+ -
+ name: 'Alias 1'
+ label: Alias
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.]*'
+ required: true
+ -
+ name: 'Alias 2'
+ label: 'Second Alias (optional)'
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.]*'
+ required: false
+ -
+ name: 'Alias 3'
+ label: 'Third Alias (optional)'
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.]*'
+ required: false
+ -
+ name: 'Alias 4'
+ label: 'Forth Alias (optional)'
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.]*'
+ required: false
+ -
+ name: 'Alias 5'
+ label: 'Fifth Alias (optional)'
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.]*'
+ required: false
+ -
+ name: contribution
+ label: 'Contributing via'
+ placeholder: select
+ type: select
+ options:
+ patreon: Patreon
+ paypal: Paypal
+ bank: 'Bank transfer'
+ faircoin: Faircoin
+ bitcoin: Bitcoin
+ validate:
+ required: true
+ -
+ name: amount
+ label: Amount
+ placeholder: 'EUR/USD/BTC/etc.'
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9., ]*'
+ required: true
+ -
+ name: frequency
+ label: Repeated
+ type: radio
+ default: monthly
+ options:
+ monthly: Monthly
+ yearly: Yearly
+ validate:
+ required: true
+ -
+ name: reference
+ label: Reference
+ type: text
+ placeholder: 'Name of payment holder or other transfer reference'
+ validate:
+ required: true
+ -
+ name: comments
+ type: textarea
+ -
+ name: honeypot
+ type: honeypot
+ buttons:
+ -
+ type: submit
+ value: Submit
+ -
+ type: reset
+ value: Reset
+ process:
+ -
+ email:
+ from: alias-request@disroot.org
+ to: '{{ form.value.username }}@disroot.org'
+ subject: '[Disroot] Your alias request'
+ body: '
Hi {{ form.value.username|e }},
Thank you for your contribution to Disroot.org!
We truly appreciate your generosity.
We will review your alias request and get back to you as soon as we can.
Here is a summary of the received request:
{% include ''forms/data.html.twig'' %}'
+ -
+ email:
+ from: alias-request@disroot.org
+ to: '{{ config.plugins.email.to }}'
+ reply_to: '{{ form.value.username }}@disroot.org'
+ subject: '[Alias request] - {{ form.value.username|e }}'
+ body: '{% include ''forms/data.html.twig'' %}'
+ -
+ save:
+ fileprefix: feedback-
+ dateformat: Ymd-His-u
+ extension: txt
+ body: '{% include ''forms/data.txt.twig'' %}'
+ -
+ message: 'Your alias request has been sent!'
+ -
+ display: thankyou
+---
+
+
+The email aliases feature is offered as a "reward" for regular supporters. By regular supporters we think of those who contribute with, at least, the equivalent of one cup of coffee a month. In order for the 'reward' not becoming the only incentive to donate, we expect to see the donation made before we can enable this feature.
+
+It is not that we are promoting coffee, on the contrary - coffee is a symbol for exploitation and inequality so we thought that it is a good way to let people measure themselves how much they can give.
+We found this list of coffee cup prices 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.
diff --git a/pages/forms/alias-request-form/form.es.md b/pages/forms/alias-request-form/form.es.md.bak
similarity index 100%
rename from pages/forms/alias-request-form/form.es.md
rename to pages/forms/alias-request-form/form.es.md.bak
diff --git a/pages/forms/alias-request-form/form.fr.md b/pages/forms/alias-request-form/form.fr.md.bak
similarity index 100%
rename from pages/forms/alias-request-form/form.fr.md
rename to pages/forms/alias-request-form/form.fr.md.bak
diff --git a/pages/forms/alias-request-form/form.it.md b/pages/forms/alias-request-form/form.it.md.bak
similarity index 100%
rename from pages/forms/alias-request-form/form.it.md
rename to pages/forms/alias-request-form/form.it.md.bak
diff --git a/pages/forms/domain-linking-form/form.de.md b/pages/forms/domain-linking-form/form.de.md.bak
similarity index 100%
rename from pages/forms/domain-linking-form/form.de.md
rename to pages/forms/domain-linking-form/form.de.md.bak
diff --git a/pages/forms/domain-linking-form/form.en.md b/pages/forms/domain-linking-form/form.en.md
index 7c0e7560..77d3218b 100644
--- a/pages/forms/domain-linking-form/form.en.md
+++ b/pages/forms/domain-linking-form/form.en.md
@@ -1,158 +1,7 @@
---
-title: 'Domain Linking Form'
-header_image: netneutrality.jpg
-form:
- name: Domain-linking-form
- fields:
- -
- name: username
- label: 'User Name'
- placeholder: 'Enter your Disroot user name'
- autofocus: 'on'
- autocomplete: 'on'
- type: text
- validate:
- pattern: '[A-Za-z0-9.-]*'
- required: true
- -
- name: Domain
- label: 'Your domain'
- placeholder: your-domain
- type: text
- validate:
- pattern: '[A-Za-z0-9.-]*'
- required: true
- -
- name: 'Alias 1'
- label: Alias
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.-]*'
- required: true
- -
- name: 'Alias 2'
- label: 'Second Alias (optional)'
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.-]*'
- required: false
- -
- name: 'Alias 3'
- label: 'Third Alias (optional)'
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.-]*'
- required: false
- -
- name: 'Alias 4'
- label: 'Forth Alias (optional)'
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.-]*'
- required: false
- -
- name: 'Alias 5'
- label: 'Fifth Alias (optional)'
- placeholder: your-alias
- type: text
- validate:
- pattern: '[A-Za-z0-9.-]*'
- required: false
- -
- name: contribution
- label: 'Contributing via'
- placeholder: select
- type: select
- options:
- patreon: Patreon
- paypal: Paypal
- bank: 'Bank transfer'
- faircoin: Faircoin
- bitcoin: Bitcoin
- validate:
- required: true
- -
- name: amount
- label: Amount
- placeholder: 'EUR/USD/BTC/etc.'
- type: text
- validate:
- pattern: '[A-Za-z0-9., ]*'
- required: true
- -
- name: frequency
- label: Repeated
- type: radio
- default: monthly
- options:
- monthly: Monthly
- yearly: Yearly
- validate:
- required: true
- -
- name: reference
- label: Reference
- type: text
- placeholder: 'Name of payment holder or other transfer reference'
- validate:
- required: true
- -
- name: comments
- type: textarea
- -
- name: honeypot
- type: honeypot
- buttons:
- -
- type: submit
- value: Submit
- -
- type: reset
- value: Reset
- process:
- -
- email:
- from: domain-request@disroot.org
- to: '{{ form.value.username }}@disroot.org'
- subject: '[Disroot] Your domain linking request'
- body: '
Hi {{ form.value.username|e }},
Thank you for your contribution to Disroot.org!
We truly appreciate your generosity.
We will review your request and get back to you as soon as we can.
Here is a summary of the received request:
{% include ''forms/data.html.twig'' %}'
- -
- email:
- from: alias-request@disroot.org
- to: '{{ config.plugins.email.to }}'
- reply_to: '{{ form.value.username }}@disroot.org'
- subject: '[Domain linking request] - {{ form.value.username|e }}'
- body: '{% include ''forms/data.html.twig'' %}'
- -
- save:
- fileprefix: feedback-
- dateformat: Ymd-His-u
- extension: txt
- body: '{% include ''forms/data.txt.twig'' %}'
- -
- message: 'Your domain linking request has been sent!'
- -
- display: thankyou
+title: 'Temporary disabled'
+header_image: introverts.jpg
---
-
- Fill in this form if you would like to use your own domain for Email aliases.
-
-Please follow these steps to point your domain to our server before you submit the request:
(this will also serve to verify the domain is really owned by you and without that we will not proceed to process your request)
- 1. Go to the DNS records settings for your domain
-- Point MX record to disroot.org (if you are using your domain currently with other provider, set MX20 or higher)
-- Set TXT (spf) record to "v=spf1 mx a ptr include:disroot.org ~all"
-- Set TXT record to "v=spf1 mx ~all"
-
-2. Start donating
-The email aliases feature is offered as a "reward" for regular supporters. By regular supporters we think of those who contribute with, at least, the equivalent of one cup of coffee a month. In order for the 'reward' not becoming the only incentive to donate, we expect to see the donation made before we can enable this feature.
-Check donate page to learn more
-
-3. Once we review your request we will contact you to finalize the procedure
-
-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.
-
+
+ Due to huge backlog in incoming custom requests and work being done to improve our response time, we have decided to temporarily disable this feature.
Sorry for the inconvenience and hope to have it up and running again as soon as possible.
diff --git a/pages/forms/domain-linking-form/form.en.md.bak b/pages/forms/domain-linking-form/form.en.md.bak
new file mode 100644
index 00000000..358eb401
--- /dev/null
+++ b/pages/forms/domain-linking-form/form.en.md.bak
@@ -0,0 +1,157 @@
+---
+title: 'Domain Linking Form'
+header_image: netneutrality.jpg
+form:
+ name: Domain-linking-form
+ fields:
+ -
+ name: username
+ label: 'User Name'
+ placeholder: 'Enter your Disroot user name'
+ autofocus: 'on'
+ autocomplete: 'on'
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-]*'
+ required: true
+ -
+ name: Domain
+ label: 'Your domain'
+ placeholder: your-domain
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-]*'
+ required: true
+ -
+ name: 'Alias 1'
+ label: Alias
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-]*'
+ required: true
+ -
+ name: 'Alias 2'
+ label: 'Second Alias (optional)'
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-]*'
+ required: false
+ -
+ name: 'Alias 3'
+ label: 'Third Alias (optional)'
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-]*'
+ required: false
+ -
+ name: 'Alias 4'
+ label: 'Forth Alias (optional)'
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-]*'
+ required: false
+ -
+ name: 'Alias 5'
+ label: 'Fifth Alias (optional)'
+ placeholder: your-alias
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-]*'
+ required: false
+ -
+ name: contribution
+ label: 'Contributing via'
+ placeholder: select
+ type: select
+ options:
+ patreon: Patreon
+ paypal: Paypal
+ bank: 'Bank transfer'
+ faircoin: Faircoin
+ bitcoin: Bitcoin
+ validate:
+ required: true
+ -
+ name: amount
+ label: Amount
+ placeholder: 'EUR/USD/BTC/etc.'
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9., ]*'
+ required: true
+ -
+ name: frequency
+ label: Repeated
+ type: radio
+ default: monthly
+ options:
+ monthly: Monthly
+ yearly: Yearly
+ validate:
+ required: true
+ -
+ name: reference
+ label: Reference
+ type: text
+ placeholder: 'Name of payment holder or other transfer reference'
+ validate:
+ required: true
+ -
+ name: comments
+ type: textarea
+ -
+ name: honeypot
+ type: honeypot
+ buttons:
+ -
+ type: submit
+ value: Submit
+ -
+ type: reset
+ value: Reset
+ process:
+ -
+ email:
+ from: domain-request@disroot.org
+ to: '{{ form.value.username }}@disroot.org'
+ subject: '[Disroot] Your domain linking request'
+ body: '
Hi {{ form.value.username|e }},
Thank you for your contribution to Disroot.org!
We truly appreciate your generosity.
We will review your request and get back to you as soon as we can.
Here is a summary of the received request:
{% include ''forms/data.html.twig'' %}'
+ -
+ email:
+ from: alias-request@disroot.org
+ to: '{{ config.plugins.email.to }}'
+ reply_to: '{{ form.value.username }}@disroot.org'
+ subject: '[Domain linking request] - {{ form.value.username|e }}'
+ body: '{% include ''forms/data.html.twig'' %}'
+ -
+ save:
+ fileprefix: feedback-
+ dateformat: Ymd-His-u
+ extension: txt
+ body: '{% include ''forms/data.txt.twig'' %}'
+ -
+ message: 'Your domain linking request has been sent!'
+ -
+ display: thankyou
+---
+
+
+ Fill in this form if you would like to use your own domain for Email aliases.
+
+Please follow these steps to point your domain to our server before you submit the request:
(this will also serve to verify the domain is really owned by you and without that we will not proceed to process your request)
+ 1. Go to the DNS records settings for your domain
+- Point MX record to disroot.org (if you are using your domain currently with other provider, set MX20 or higher)
+- Set TXT record to "v=spf1 mx a ptr include:disroot.org -all"
+
+2. Start donating
+The email aliases feature is offered as a "reward" for regular supporters. By regular supporters we think of those who contribute with, at least, the equivalent of one cup of coffee a month. In order for the 'reward' not becoming the only incentive to donate, we expect to see the donation made before we can enable this feature.
+Check donate page to learn more
+
+3. Once we review your request we will contact you to finalize the procedure
+
+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.
+
diff --git a/pages/forms/domain-linking-form/form.es.md b/pages/forms/domain-linking-form/form.es.md.bak
similarity index 100%
rename from pages/forms/domain-linking-form/form.es.md
rename to pages/forms/domain-linking-form/form.es.md.bak
diff --git a/pages/forms/domain-linking-form/form.fr.md b/pages/forms/domain-linking-form/form.fr.md.bak
similarity index 100%
rename from pages/forms/domain-linking-form/form.fr.md
rename to pages/forms/domain-linking-form/form.fr.md.bak
diff --git a/pages/forms/domain-linking-form/form.it.md b/pages/forms/domain-linking-form/form.it.md.bak
similarity index 100%
rename from pages/forms/domain-linking-form/form.it.md
rename to pages/forms/domain-linking-form/form.it.md.bak
diff --git a/pages/forms/extra-storage-mailbox/form.de.md b/pages/forms/extra-storage-mailbox/form.de.md.bak
similarity index 100%
rename from pages/forms/extra-storage-mailbox/form.de.md
rename to pages/forms/extra-storage-mailbox/form.de.md.bak
diff --git a/pages/forms/extra-storage-mailbox/form.en.md b/pages/forms/extra-storage-mailbox/form.en.md
index 63673320..77d3218b 100644
--- a/pages/forms/extra-storage-mailbox/form.en.md
+++ b/pages/forms/extra-storage-mailbox/form.en.md
@@ -1,109 +1,7 @@
---
-title: 'Extra Mailbox Storage'
-form:
- name: 'Extra Mailbox Space'
- fields:
- -
- name: username
- label: 'User Name'
- placeholder: 'Enter the Disroot user name'
- autofocus: 'on'
- autocomplete: 'on'
- type: text
- validate:
- pattern: '[A-Za-z0-9.]*'
- required: true
- -
- name: email
- label: 'Contact Email Address'
- placeholder: 'Enter an email address to contact you'
- type: text
- validate:
- pattern: '[A-Za-z0-9.-_@]*'
- required: true
- -
- name: 'Additional Inbox Storage'
- label: 'Additional Storage in GB'
- type: number
- classes: form-number
- outerclasses: form-outer
- validate:
- min: 1
- max: 10
- steps: 1
- value: 1
- required: true
- -
- name: comments
- type: textarea
- -
- name: 'payment details'
- type: display
- size: large
- label: ' '
- markdown: true
- content: '**Payment details:**'
- -
- name: country
- label: 'Country (necessary for VAT purposes)'
- placeholder: 'Please specify the country your paying account is registered in'
- type: text
- validate:
- pattern: '[A-Za-z]*'
- required: true
- -
- name: payment
- label: 'Payment via (May be subjected to extra transaction fees)'
- placeholder: select
- type: select
- options:
- paypal: Paypal
- bank: 'Bank transfer'
- faircoin: Faircoin
- bitcoin: Bitcoin
- patreon: Patreon
- validate:
- required: true
- -
- name: honeypot
- type: honeypot
- buttons:
- -
- type: submit
- value: Submit
- -
- type: reset
- value: Reset
- process:
- -
- email:
- from: extra-storage@disroot.org
- to: '{{ form.value.email }}'
- subject: '[Disroot] Extra Storage Request'
- body: 'Dear {{ form.value.username }},
We have received a request for extra storage space.
You should receive your confirmation per E-mail with your billing reference.
Once we receive your payment we will assign you the extra storage.
Thank you for supporting Disroot!'
- -
- email:
- from: extra-storage@disroot.org
- to: '{{ config.plugins.email.to }}'
- reply_to: '{{ form.value.email }}'
- subject: '[Extra storage request] - {{ form.value.username|e }}'
- body: '{% include ''forms/data.html.twig'' %}'
- -
- save:
- fileprefix: feedback-
- dateformat: Ymd-His-u
- extension: txt
- body: '{% include ''forms/data.html.twig'' %}'
- -
- message: 'Your request has been sent!'
- -
- display: thankyou
+title: 'Temporary disabled'
+header_image: introverts.jpg
---
-
-
-
-
-
-It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month, paid yearly. If you are adding storage both to your mailbox and cloud account - use [this form](https://disroot.org/en/forms/extra-storage-space)
-
+
+ Due to huge backlog in incoming custom requests and work being done to improve our response time, we have decided to temporarily disable this feature.
Sorry for the inconvenience and hope to have it up and running again as soon as possible.
diff --git a/pages/forms/extra-storage-mailbox/form.en.md.bak b/pages/forms/extra-storage-mailbox/form.en.md.bak
new file mode 100644
index 00000000..63673320
--- /dev/null
+++ b/pages/forms/extra-storage-mailbox/form.en.md.bak
@@ -0,0 +1,109 @@
+---
+title: 'Extra Mailbox Storage'
+form:
+ name: 'Extra Mailbox Space'
+ fields:
+ -
+ name: username
+ label: 'User Name'
+ placeholder: 'Enter the Disroot user name'
+ autofocus: 'on'
+ autocomplete: 'on'
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.]*'
+ required: true
+ -
+ name: email
+ label: 'Contact Email Address'
+ placeholder: 'Enter an email address to contact you'
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-_@]*'
+ required: true
+ -
+ name: 'Additional Inbox Storage'
+ label: 'Additional Storage in GB'
+ type: number
+ classes: form-number
+ outerclasses: form-outer
+ validate:
+ min: 1
+ max: 10
+ steps: 1
+ value: 1
+ required: true
+ -
+ name: comments
+ type: textarea
+ -
+ name: 'payment details'
+ type: display
+ size: large
+ label: ' '
+ markdown: true
+ content: '**Payment details:**'
+ -
+ name: country
+ label: 'Country (necessary for VAT purposes)'
+ placeholder: 'Please specify the country your paying account is registered in'
+ type: text
+ validate:
+ pattern: '[A-Za-z]*'
+ required: true
+ -
+ name: payment
+ label: 'Payment via (May be subjected to extra transaction fees)'
+ placeholder: select
+ type: select
+ options:
+ paypal: Paypal
+ bank: 'Bank transfer'
+ faircoin: Faircoin
+ bitcoin: Bitcoin
+ patreon: Patreon
+ validate:
+ required: true
+ -
+ name: honeypot
+ type: honeypot
+ buttons:
+ -
+ type: submit
+ value: Submit
+ -
+ type: reset
+ value: Reset
+ process:
+ -
+ email:
+ from: extra-storage@disroot.org
+ to: '{{ form.value.email }}'
+ subject: '[Disroot] Extra Storage Request'
+ body: 'Dear {{ form.value.username }},
We have received a request for extra storage space.
You should receive your confirmation per E-mail with your billing reference.
Once we receive your payment we will assign you the extra storage.
Thank you for supporting Disroot!'
+ -
+ email:
+ from: extra-storage@disroot.org
+ to: '{{ config.plugins.email.to }}'
+ reply_to: '{{ form.value.email }}'
+ subject: '[Extra storage request] - {{ form.value.username|e }}'
+ body: '{% include ''forms/data.html.twig'' %}'
+ -
+ save:
+ fileprefix: feedback-
+ dateformat: Ymd-His-u
+ extension: txt
+ body: '{% include ''forms/data.html.twig'' %}'
+ -
+ message: 'Your request has been sent!'
+ -
+ display: thankyou
+---
+
+
+
+
+
+
+It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month, paid yearly. If you are adding storage both to your mailbox and cloud account - use [this form](https://disroot.org/en/forms/extra-storage-space)
+
diff --git a/pages/forms/extra-storage-mailbox/form.es.md b/pages/forms/extra-storage-mailbox/form.es.md.bak
similarity index 100%
rename from pages/forms/extra-storage-mailbox/form.es.md
rename to pages/forms/extra-storage-mailbox/form.es.md.bak
diff --git a/pages/forms/extra-storage-mailbox/form.fr.md b/pages/forms/extra-storage-mailbox/form.fr.md.bak
similarity index 100%
rename from pages/forms/extra-storage-mailbox/form.fr.md
rename to pages/forms/extra-storage-mailbox/form.fr.md.bak
diff --git a/pages/forms/extra-storage-mailbox/form.it.md b/pages/forms/extra-storage-mailbox/form.it.md.bak
similarity index 100%
rename from pages/forms/extra-storage-mailbox/form.it.md
rename to pages/forms/extra-storage-mailbox/form.it.md.bak
diff --git a/pages/forms/extra-storage-space/form.de.md b/pages/forms/extra-storage-space/form.de.md.bak
similarity index 100%
rename from pages/forms/extra-storage-space/form.de.md
rename to pages/forms/extra-storage-space/form.de.md.bak
diff --git a/pages/forms/extra-storage-space/form.en.md b/pages/forms/extra-storage-space/form.en.md
index fcff7903..77d3218b 100644
--- a/pages/forms/extra-storage-space/form.en.md
+++ b/pages/forms/extra-storage-space/form.en.md
@@ -1,113 +1,7 @@
---
-title: 'Extra Storage Space'
-form:
- name: 'Extra Storage Space'
- fields:
- -
- name: username
- label: 'User Name'
- placeholder: 'Enter the Disroot user name'
- autofocus: 'on'
- autocomplete: 'on'
- type: text
- validate:
- pattern: '[A-Za-z0-9.]*'
- required: true
- -
- name: email
- label: 'Contact Email Address'
- placeholder: 'Enter an email address to contact you'
- type: text
- validate:
- pattern: '[A-Za-z0-9.-_@]*'
- required: true
- -
- name: 'Amount of Space'
- label: 'Total Storage Space'
- type: select
- default: 14GB
- options:
- 14GB: '14GB (2.10€ per month)'
- 29GB: '29GB (4.35€ per month)'
- 54GB: '54GB (8.10€ per month)'
- validate:
- required: true
- -
- name: comments
- type: textarea
- -
- name: 'payment details'
- type: display
- size: large
- label: ' '
- markdown: true
- content: '**Payment details:**'
- -
- name: country
- label: 'Country (necessary for VAT purposes)'
- placeholder: 'Please specify the country your paying account is registered in'
- type: text
- validate:
- pattern: '[A-Za-z]*'
- required: true
- -
- name: payment
- label: 'Payment via (May be subjected to extra transaction fees)'
- placeholder: select
- type: select
- options:
- paypal: Paypal
- bank: 'Bank transfer'
- faircoin: Faircoin
- bitcoin: Bitcoin
- patreon: Patreon
- validate:
- required: true
- -
- name: frequency
- label: Monthly/Yearly
- type: radio
- default: yearly
- options:
- monthly: Monthly
- yearly: Yearly
- validate:
- required: true
- -
- name: honeypot
- type: honeypot
- buttons:
- -
- type: submit
- value: Submit
- -
- type: reset
- value: Reset
- process:
- -
- email:
- from: extra-storage@disroot.org
- to: '{{ form.value.email }}'
- subject: '[Disroot] Extra Storage Request'
- body: 'Dear {{ form.value.username }},
We have received a request for extra storage space.
You should receive your confirmation per E-mail with your billing reference.
Once we receive your payment we will assign you the extra storage.
Thank you for supporting Disroot!'
- -
- email:
- from: extra-storage@disroot.org
- to: '{{ config.plugins.email.to }}'
- reply_to: '{{ form.value.email }}'
- subject: '[Extra storage request] - {{ form.value.username|e }}'
- body: '{% include ''forms/data.html.twig'' %}'
- -
- save:
- fileprefix: feedback-
- dateformat: Ymd-His-u
- extension: txt
- body: '{% include ''forms/data.html.twig'' %}'
- -
- message: 'Your request has been sent!'
- -
- display: thankyou
+title: 'Temporary disabled'
+header_image: introverts.jpg
---
-
-It is possible to extend your cloud storage to 14, 29 or 54 GB for the cost of 0.15 euro per GB per month. You can also choose to use some of all of the additional space for mail storage, please specify that in the comment section in the request form.
+
+ Due to huge backlog in incoming custom requests and work being done to improve our response time, we have decided to temporarily disable this feature.
Sorry for the inconvenience and hope to have it up and running again as soon as possible.
diff --git a/pages/forms/extra-storage-space/form.en.md.bak b/pages/forms/extra-storage-space/form.en.md.bak
new file mode 100644
index 00000000..fcff7903
--- /dev/null
+++ b/pages/forms/extra-storage-space/form.en.md.bak
@@ -0,0 +1,113 @@
+---
+title: 'Extra Storage Space'
+form:
+ name: 'Extra Storage Space'
+ fields:
+ -
+ name: username
+ label: 'User Name'
+ placeholder: 'Enter the Disroot user name'
+ autofocus: 'on'
+ autocomplete: 'on'
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.]*'
+ required: true
+ -
+ name: email
+ label: 'Contact Email Address'
+ placeholder: 'Enter an email address to contact you'
+ type: text
+ validate:
+ pattern: '[A-Za-z0-9.-_@]*'
+ required: true
+ -
+ name: 'Amount of Space'
+ label: 'Total Storage Space'
+ type: select
+ default: 14GB
+ options:
+ 14GB: '14GB (2.10€ per month)'
+ 29GB: '29GB (4.35€ per month)'
+ 54GB: '54GB (8.10€ per month)'
+ validate:
+ required: true
+ -
+ name: comments
+ type: textarea
+ -
+ name: 'payment details'
+ type: display
+ size: large
+ label: ' '
+ markdown: true
+ content: '**Payment details:**'
+ -
+ name: country
+ label: 'Country (necessary for VAT purposes)'
+ placeholder: 'Please specify the country your paying account is registered in'
+ type: text
+ validate:
+ pattern: '[A-Za-z]*'
+ required: true
+ -
+ name: payment
+ label: 'Payment via (May be subjected to extra transaction fees)'
+ placeholder: select
+ type: select
+ options:
+ paypal: Paypal
+ bank: 'Bank transfer'
+ faircoin: Faircoin
+ bitcoin: Bitcoin
+ patreon: Patreon
+ validate:
+ required: true
+ -
+ name: frequency
+ label: Monthly/Yearly
+ type: radio
+ default: yearly
+ options:
+ monthly: Monthly
+ yearly: Yearly
+ validate:
+ required: true
+ -
+ name: honeypot
+ type: honeypot
+ buttons:
+ -
+ type: submit
+ value: Submit
+ -
+ type: reset
+ value: Reset
+ process:
+ -
+ email:
+ from: extra-storage@disroot.org
+ to: '{{ form.value.email }}'
+ subject: '[Disroot] Extra Storage Request'
+ body: 'Dear {{ form.value.username }},
We have received a request for extra storage space.
You should receive your confirmation per E-mail with your billing reference.
Once we receive your payment we will assign you the extra storage.
Thank you for supporting Disroot!'
+ -
+ email:
+ from: extra-storage@disroot.org
+ to: '{{ config.plugins.email.to }}'
+ reply_to: '{{ form.value.email }}'
+ subject: '[Extra storage request] - {{ form.value.username|e }}'
+ body: '{% include ''forms/data.html.twig'' %}'
+ -
+ save:
+ fileprefix: feedback-
+ dateformat: Ymd-His-u
+ extension: txt
+ body: '{% include ''forms/data.html.twig'' %}'
+ -
+ message: 'Your request has been sent!'
+ -
+ display: thankyou
+---
+
+
+It is possible to extend your cloud storage to 14, 29 or 54 GB for the cost of 0.15 euro per GB per month. You can also choose to use some of all of the additional space for mail storage, please specify that in the comment section in the request form.
diff --git a/pages/forms/extra-storage-space/form.es.md b/pages/forms/extra-storage-space/form.es.md.bak
similarity index 100%
rename from pages/forms/extra-storage-space/form.es.md
rename to pages/forms/extra-storage-space/form.es.md.bak
diff --git a/pages/forms/extra-storage-space/form.fr.md b/pages/forms/extra-storage-space/form.fr.md.bak
similarity index 100%
rename from pages/forms/extra-storage-space/form.fr.md
rename to pages/forms/extra-storage-space/form.fr.md.bak
diff --git a/pages/forms/extra-storage-space/form.it.md b/pages/forms/extra-storage-space/form.it.md.bak
similarity index 100%
rename from pages/forms/extra-storage-space/form.it.md
rename to pages/forms/extra-storage-space/form.it.md.bak
diff --git a/pages/privacy_policy/_pp/2col.de.md b/pages/privacy_policy/_pp/2col.de.md
deleted file mode 100644
index f95e5e45..00000000
--- a/pages/privacy_policy/_pp/2col.de.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-title: Datenschutzerklärung
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-** v1.1 - May 2018**
-
*Deutsche Übersetzung: September 2019*
-
-*Hinweis: Bei dem folgenden Text handelt es sich um eine Übersetzung der originalen, englischen [Privacy Policy](https://www.disroot.org/en/privacy_policy). Im Zweifel und vor allem bei rechtlichen Streitigkeiten gilt der englische Originaltext. Die vorliegende Übersetzung gilt bei aller Sorgfältigkeit des Übersetzungsprozesses vor allem der leichteren Verständlichkeit für deutschsprachige Nutzer.*
-
-Diese Datenschutzerklärung gilt für alle Dienste, die auf Disroot.org und den zugehörigen Subdomains gehostet werden. Wir versuchen, sie so einheitlich und einfach wie möglich zu halten.
-
-**Disclaimer!** Wir behalten uns das Recht vor, jeden der folgenden Punkte zu ändern. Alle Änderungen werden öffentlich und allen Nutzern per Forum, Diaspora*, Mastodon und Blog mitgeteilt. Schwerwiegende Änderungen der Datenschutzerklärung werden wir zudem allen Nutzern per Email mitteilen.
-
-*Unser Motto:*
-## "Je weniger wir wissen, umso besser"
-
-### 1. Was machen wir mit Deinen Daten:
-1. Wir benötigen einen Nutzernamen und ein Passwort, um den Accountinhaber zu identifizieren und die von Disroot.org angebotenen Dienste zu liefern. Alle zusätzlichen Informationen, die Du in irgendeinem von Disroot.org angebotenen Dienst angibst, sind optional.
-
-2. Unsere Verarbeitung Deiner Informationen beschränkt sich darauf, sie zur Nutzung durch Dich zu speichern.
-
-3. Wir speichern Protokolle Deiner Aktivitäten nicht länger als für einen Zeitraum von 24 h (es sei denn, dies wird in einem Dienst anders festgelegt). Diese Daten werden genutzt, um Softwarefehler zu diagnostizieren, die Sicherheit des Systems gegen Eindringen aufrecht zu halten und den Zustand der Plattform zu überwachen.
-
-3. Jeder weitere Zugriff auf Deine persönlichen Daten und Deine gespeicherten Dateien und anderen Informationen, die Du an einen der von disroot.org angebotenen Dienste gibst, steht unter Deiner Kontrolle.
-
-4. Wir nutzen Festplattenverschlüsselung bei allen Daten, um Datenlecks für den Fall, dass Server gestohlen, konfisziert, oder in irgendeiner Form physikalisch manipuliert werden, zu verhindern.
-
-6. Wir ermöglichen und fordern SSL/TLS-Verschlüsselung bei allen angebotenen Diensten.
-
-### 2. Was wir nicht mit Deinen Daten machen:
-1. Wir sammeln keine Daten außer denen, die für den Betrieb der Dienste notwendig sind.
-
-2. Wir verarbeiten oder analysieren in keiner Weise Dein Verhalten oder persönliche Charakteristika (Profiling). Wir haben keine Werbung oder Geschäftsbeziehung mit Werbenden.
-
-3. Wir teilen oder verkaufen Deine Daten nicht mit bzw. an Dritte, es sei denn, im Falle des Teilens, wenn für netzwerkinteragierende (föderierte) Dienste bestimmte Daten zur Funktion notwendig sind (z.B. benötigt ein anderer Email-Provider Deine Email-Adresse, um Emails ausliefern zu können).
-
-4. Wir fordern keine zusätzlichen Informationen, die nicht existentiell für den Betrieb der Dienste sind (wir fragen nicht nach zusätzlichen Email-Adressen oder Telefonnummern).
-
-5. Weder lesen noch verarbeiten wir Deine persönlichen Daten, Emails, Dateien etc., die auf unseren Servern gespeichert sind, es sei denn es ist notwendig zur Fehlerbehebung oder bei Verdacht des Verstoßes gegen die Nutzungsbedingungen. In diesem Fall bitten wir Dich entweder um vorherige Erlaubnis oder informieren Dich im Nachgang im Transparenz-Bericht an den Accountinhaber über alle Handlungen, die gegen den Account vorgenommen wurden.
-
-### 3. Zugang zu Deinen Informationen:
- 1. Föderation.
-
- Einige der von Disroot.org angebotenen Dienste wie Nextcloud, Email, Diaspora*, Hubzilla, XMPP und Matrix-Chat funktionieren auf der Basis von sogenannten Föderativen Protokollen. Das ermöglicht es Nutzern, die bei verschiedenen Service-Anbietern angemeldet sind, miteinander zu interagieren. AUfgrund der Natur dieser Protokolle (Möglichkeit, einander Nachrichten zu senden, Dateien zu teilen, zu chatten, zu liken) werden einige Daten logischerweise mit anderen Entitäten ausgetauscht. Dennoch ist es die Entscheidung des Nutzers, inwieweit und mit wem Daten ausgetauscht werden sollen. Diese Entscheidung wird vom Nutzer ausgeübt durch die Konfiguration in den Einstellungen des jeweiligen Dienstes inklusive der Entscheidung, mit wem was ausgetauscht werden soll.
-
- 2. Möglicherweise werden Dir eingebettete Videos und Verknüpfungsvorschauen von anderen Websites gezeigt, während Du von Disroot.org angebotene Dienste nutzt. Dies kann Dich eventuell dem Webtracking durch externe Dienste ausetzen, wie zum Beipiel (nicht abschließend) Facebook, Twitter und Google.
-
- 3. Alle Daten und Dateien, die auf Diensten mit der Bindung an persönliche Informationen gespeichert sind (Dienste, die eine Anmeldung erfordern), kannst Du herunterladen zur Archivierung oder um sie zu einer anderen, kompatiblen Website zu transferieren.
-
-### 4. Deine Rechte
-Mit der Datenschutzgrundverordnung (DSGVO) und dem Data Protection Act 2018 (DPA, Großbritannien) hast Du zahlreiche Rechte im Bezug auf Deine persönlichen Daten. Du hast das Recht, von uns Zugang zu Deinen persönlichen Daten und deren Korrektur oder Löschung zu fordern, die Verarbeitung einzuschränken, sie zu untersagen sowie unter bestimmten Umständen die Übertragbarkeit der Daten zu fordern.
-Wenn Du Dein Einverständnis zur Verarbeitung Deiner Daten gegeben hast, hast Du (unter bestimmten Umständen) das Recht, Dein Einverständnis jederzeit zurückzuziehen, was jedoch die Rechtmäßigkeit der Verarbeitung, bevor DU Dein Einverständnis zurückgezogen hast, beeinflussen wird.
-
-Du hast das Recht, eine Beschwerde beim Büro des Datenschutzbeauftragten zu hinterlegen, wenn Du der Meinung bist, dass wir uns in Bezug auf Deine persönlichen Daten nicht an die DSGVO und DPA 18 gehalten haben.
-Identität und Kontaktdaten des Datenschutzverantwortlichen und des für die Verarbeitung Verantwortlichen:
-
-Stichting Disroot.org ist für die Verarbeitung der Daten verantwortlich gemäß DPA 18 und DSGVO.
-Wenn Du Zweifel hast, wie Deine Daten verarbeitet werden, kannst Du Dich an
-
-- - data.protection.officer@disroot.org - Datenschutzbeauftragter
-- - info@disroot.org - Allgemeine Kontaktinformationen
-
-wenden.
-
----
-## 5. Zusätzliche Datenschutzerklärungen und Ausnahmen je Dienst:
-1. **search.disroot.org**
-
- - - Es werden keine Daten (IP-Adresse, Session-Cookie, etc.) gespeichert, es sei denn zur Problembehebung, nach welcher die Log-Daten vom Server entfernt werden.
-
-
-2. **upload.disroot.org**
-
-- - Es werden keine Daten (IP-ADresse, Session-Cookie, etc.) auf dem Server gespeichert, es sei denn zur Problembehebung, nach welcher die Log-Daten vom Server entfernt werden.
-- - Alle Dateien, die in diesem Dienst hochgeladen werden, sind Ende-zu-Ende-verschlüsselt. Wir, die Disroot-Admins, haben keine Möglichkeit, diese Informationen zu entschlüsseln.
-
-
-3. **bin.disroot.org**
-
-- - Es werden keine Daten (IP-Adresse, Session-Cookie, etc.) auf dem Server gespeichert, es sei denn zur Problembehebung, nach welcher die Log-Daten vom Server entfernt werden.
-- - Alle Dateien, die in diesem Dienst hochgeladen werden, sind Ende-zu-Ende-verschlüsselt. Wir, die Disroot-Admins, haben keine Möglichkeit, diese Informationen zu entschlüsseln.
-
-
-4. **pad.disroot.org** and **calc.disroot.org**
-
-- - Wir sammeln keine IP-Adressen oder andere persönliche Informationen, die mit dem Pad in Verbindung gebracht werden können.
-
-
-5. **cloud.disroot.org**
-
-- - Alle Dateien, die an die Cloud gesendet werden, werden mit einem Schlüsselpaar verschlüsselt, das basierend auf Deinem Passwort erstellt witd, um ein besonders hohes Maß an Sicherheit zu erhalten. Allerdings werden die Schlüssel auf dem Server aufbewahrt, was wiederum die Stärke der Sicherheit kompromittiert.
-- - Alles andere außer den Dateien (Kalender, Kontakte, Neuigkeiten, Aufgaben, Lesezeichen, etc.) wird im Klartext in einer Datenbank gespeichert, es sei denn, eine App bietet externe Verschlüsselung (bisher keine bekannt).
-
-
-6. **Email**
-
-- - Alle Emails werden im Klartext auf unseren Servern gespeichert, es sei denn, sie wurden durch den Nutzer verschlüsselt (z.B. mit GPG).
-- - IP-Adressen des aktuell per IMAP/POP3 angemeldeten Nutzers werden gespeichert, solange das Gerät angemeldet ist (für jedes angemeldete Gerät).
-
-
-7. **poll.disroot.org**
-
-- - Es werden keine IP-Adressen auf dem Server gespeichert, es sei denn zur Problembehebung, nach welcher die Log-Daten vom Server entfernt werden.
-
diff --git a/pages/privacy_policy/_pp/2col.en.md b/pages/privacy_policy/_pp/2col.en.md
deleted file mode 100644
index b535b8b7..00000000
--- a/pages/privacy_policy/_pp/2col.en.md
+++ /dev/null
@@ -1,101 +0,0 @@
----
-title: Privacy Policy
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-** v1.1 - May 2018**
-
-This privacy policy applies to all Services hosted on Disroot.org and its sub-domains. We try to keep it as unified and simple as we possibly can.
-
-**Disclaimer!** We reserve the right to change any of the points. All changes will be publicly available and will be communicated to all users via the forum, Diaspora, Mastodon and Blog. Major changes to Privacy Policy will be sent additionally via email to all users.
-
-*Our motto:*
-## "The less we know about our users the better"
-
-### 1.What do we do with your data:
-1. We require a username and password to identify the account holder and provide the services offered by Disroot.org All additional information you supply on any of the services provided by Disroot.org are optional.
-
-2. Our processing of your information is limited to storing it for you to use.
-
-3. We store logs of your activity for period no longer then 24h (unless specified otherwise per service). This data is used to help diagnose software issues, maintain security of the system against intrusion, and monitor the health of the platform.
-
-3. Further access to your personal data and stored files and other information you provide to any of the services offered by disroot.org is under your control.
-
-4. We use disk encryption on all data to prevent data leak in cases where servers are stolen, confiscated, or in any way physically tampered with.
-
-6. We provide and require SSL/TLS encryption on all provided services
-
-### 2. What we do not do with your data:
-1. We do not collect any data other then what is needed to provide you the service.
-
-2. We do not in any way process, analyze your behavior or personal characteristics (profiling). We have no advertisements or business relationships with advertisers.
-
-3. We do not share nor sell your data to third party unless in case of network inter-operatable (federated) services require certain data to operate (eg. other email service provider needs to know your email address to be able to deliver emails).
-
-4. We do not require any additional information that is not crucial for operation of the service (we do not ask for additional email addresses, phone numbers)
-
-5. We do not read/look nor process your personal data, emails, files etc. stored on our servers unless needed for troubleshooting purposes, or under suspicion of breaking Terms Of Services in which case we ask for prior permission from you or inform you afterwards of all actions taken against the account in the transparency report addressed to account holder.
-
-### 3. Access to your information:
- 1. Federation.
-
- Some of the services provided by Disroot.org such as Nextcloud, Email, Diaspora, Hubzilla, Xmpp and Matrix chat are operating based on so called Federation Protocols. This enables users signed up at different service providers to interact with each other. Because of the nature of the protocols (ability to send each other messages, likes, share files, chat) some of the data is naturally shared with other entities. However, sharing data with other service provider is the user's choice and is configured by the users in their settings per service including the decision of with whom and what to share.
-
- 2. You may be shown embedded videos and link previews from other websites while using services provided by Disroot.org. This may expose you to web tracking by external services, such as (but not limited to) Facebook, Twitter, and Google.
-
- 3. All data and files stored on services that are bound to personal information (services that require logging in) are available for you to download for either archival purposes or to transfer to another compatible website.
-
-### 4. Your Rights
-Under the General Data Protection Regulation (GDPR) and The Data Protection Act 2018 (DPA) you have a number of rights with regard to your personal data. You have the right to request from us access to and rectification or erasure of your personal data, the right to restrict processing, object to processing as well as in certain circumstances the right to data portability.
-If you have provided consent for the processing of your data you have the right (in certain circumstances) to withdraw that consent at any time which will not affect the lawfulness of the processing before your consent was withdrawn.
-
-You have the right to lodge a complaint to the Information Commissioners’ Office if you believe that we have not complied with the requirements of the GDPR or DPA 18 with regard to your personal data.
-Identity and contact details of controller and data protection officer:
-
-Stichting Disroot.org is the controller of data for the purposes of the DPA 18 and GDPR. 3
-If you have any concerns as to how your data is processed you can contact:
-
-- - data.protection.officer@disroot.org - Person repsponsible for Privacy Policy
-- - info@disroot.org - General contact information
-
-
----
-## 5. Per Service additional privacy policies and exceptions:
-1. **search.disroot.org**
-
- - - No data (IP address, session cookie etc) is stored on the server, unless for troubleshooting purposes, after which the log data is purged from the server.
-
-
-2. **upload.disroot.org**
-
-- - No data (IP address, session cookie etc) is stored on the server, unless for troubleshooting purposes, after which the log data is purged from the server.
-- - All files uploaded to the service are end-to-end encrypted. we, Disroot admins have no way of decrypting that information
-
-
-3. **bin.disroot.org**
-
-- - No data (IP address, session cookie etc) is stored on the server, unless for troubleshooting purposes, after which the log data is purged from the server.
-- - All files uploaded to the service are end-to-end encrypted. we, Disroot admins have no way of decrypting that information
-
-
-4. **pad.disroot.org** and **calc.disroot.org**
-
-- - We do not collect IP addresses and other personal data that can be linked to the pad.
-
-
-5. **cloud.disroot.org**
-
-- - All files send to the cloud are encrypted with a keypair created based on the user password, to create extra level of security. Note however that the keys are stored on the server which compromises the level of security
-- - Everything else except for files (calendars, contacts, news, tasks, bookmarks etc) is stored in plain-text in a database, unless an app provides external encryption (non so far).
-
-
-6. **email**
-
-- - All emails, unless encrypted by user (with gpg for example) are stored on our servers in plain-text.
-- - IP addresses of currently logged in user via IMAP/POP3 protocol are stored as long as the device is logged in to the server. (per each device logged in)
-
-
-7. **poll.disroot.org**
-
-- - No IP addresses are stored on the server, unless temporarily for troubleshooting, after which they are purged from the server
-
diff --git a/pages/privacy_policy/_pp/2col.es.md b/pages/privacy_policy/_pp/2col.es.md
deleted file mode 100644
index b7c538fa..00000000
--- a/pages/privacy_policy/_pp/2col.es.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-title: Privacy Policy
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-
-**v1.0**
-
-Esta política de privacidad aplica para todos los servicios hospedados en Disroot.org y sus sub-dominios. Intentamos mantenerlo tan unificado y simple como nos es posible.
-
-**¡Aviso legal!** Nos reservamos el derecho de modificar cualquiera de los puntos. Todos los cambios estarán públicamente disponibles y serán comunicados a todos los usuarios a través del foro, Diaspora*, Mastodon y el Sitio. Modificaciones mayores a la Política de Privacidad serán, además, enviadas por correo electrónico a todos los usuarios.
-
-
-*Nuestro lema:*
-## "Cuanto menos sepamos sobre nuestros usuarios, mejor"
-
-
-
-1. No recopilamos ninguna información que no sea la necesaria para proveer el servicio (almacenamos tus credenciales, almacenamos tus correos electrónicos, direcciones de correo, contactos, archivos, etc, en nuestros servidores)
-2. No procesamos de ninguna manera la información de nuestros usuarios (no utilizamos ninguna forma de análisis ni software analítico, ni de Google ni propia, como, por ejemplo, piwik).
-3. No creamos ningún tipo de perfil de nuestros usuarios
-4. No compartimos ni vendemos información de nuestros usuarios a terceras partes, a menos que sea obligatorio para que el servicio funcione adecuadamente (por ejemplo, otros servidores de correo necesitan saber tu dirección para poder entregar correos)
-4. No recopilamos ninguna información adicional que no sea crucial para la operatividad del servicio (no solicitamos direcciones de correo adicionales, números de teléfonos)
-5. Almacenamos direcciones IP en nuestro registro de acceso por un período no mayor a 24hs con el fin de poder bloquear [spammers](https://es.wikipedia.org/wiki/Spam), estar capacitados para reaccionar a intentos de violación de seguridad y otras situaciones similares. No procesamos esta información para ningún otro propósito que reaccionar al abuso, monitoreo del estado del servicio (ver la sección inferior acerca de las Excepciones para los casos en los que no almacenamos ningún registro en absoluto)
-6. No leemos/miramos ni procesamos información personal de los usuarios, correos electrónicos o archivos almacenados en nuestros servidores a menos que sea necesario para resolver un problema, y en ese caso pedimos previamente permiso del usuario.
-7. Usamos cifrado de disco sobre toda la información para prevenir filtración de datos en caso que los servidores sean robados, confiscados o físicamente alterados.
-9. Proveemos y solicitamos cifrado SSL/TLS en todos los servicios ofrecidos.
-
----
-
-## Excepciones y ampliaciones:
-
-#### Search.disroot.org
-
-- Ninguna información (dirección IP, cookie de sesión, etc.) es almacenada en el servidor.
-
-
-#### upload.disroot.org
-
-- Ninguna información (dirección IP, cookie de sesión, etc.) es almacenada en el servidor.
-- Todos los archivos subidos al servicio cifrados de extremo a extremo. Nosotros, los administradores de Disroot, no tenemos manera de descifrar esa información.
-
-
-#### bin.disroot.org
-
-- Ninguna información (dirección IP, cookie de sesión, etc.) es almacenada en el servidor.
-- Todos los archivos subidos al servicio cifrados de extremo a extremo. Nosotros, los administradores de Disroot, no tenemos manera de descifrar esa información.
-
-
-#### Chat XMPP
-
-- Ningún historial de chat es almacenado en los servidores.
-- Tampoco almacenamos tu dirección IP.
-
-
-#### Block de Notas y Calc
-
-- No recopilamos direcciones IP y otra información personal que pueda ser vinculada con el block. Sin embargo, podríamos habilitar el registro en caso de resolución de problemas con el servicio. Esto es temporario y luego de solucionarlos, los registros son purgados del sistema.
-
-
-#### cloud.disroot.org
-
-- Todos los archivos enviados a la nube son cifrados con un par de claves generadas a partir de la contraseña de usuario para crear un nivel extra de seguridad. Hacemos notar que, sin embargo, las claves son almacenadas en el servidor, lo que compromete el nivel de seguridad.
-- Todo lo demás, excepto los archivos, es almacenado en texto plano en una base de datos, a menos que una aplicación provea cifrado externo (ninguna por el momento).
-
-
-#### Correo electrónico
-
-- Todos los correos electrónicos, a menos que sean cifrados (con [GPG](https://es.wikipedia.org/wiki/GNU_Privacy_Guard), por ejemplo) son almacenados en nuestros servidores en texto plano.
-- Las direcciones IP de usuarios actualmente conectados a través del protocolo IMAP/POP3 son almacenadas por el tiempo que el dispositivo esté conectado al servidor (por cada dispositivo conectado).
-
-
-#### Encuestas
-
-- Ninguna dirección IP es almacenada en el servidor, a menos que sea necesario temporariamente en caso de resolución de problemas, después de lo cual son purgadas del servidor.
-
diff --git a/pages/privacy_policy/_pp/2col.fr.md b/pages/privacy_policy/_pp/2col.fr.md
deleted file mode 100644
index 62dda7b0..00000000
--- a/pages/privacy_policy/_pp/2col.fr.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-title: Privacy Policy
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-** v1.1 - May 2018**
-
-Cette politique de confidentialité s'applique à tous les Services hébergés sur disroot.org et ses sous-domaines. Nous essayons de le rendre aussi unifié et simple que possible.
-
-**Clause de non-responsabilité!** Nous nous réservons le droit de modifier n'importe quel point. Tous les changements seront accessibles au public et seront communiqués à tous les utilisateurs via le forum, Diaspora, Mastodon et le blog. Les changements majeurs à la politique de confidentialité seront envoyés par e-mail à tous les utilisateurs.
-
-
-*Notre devise:*
-## "Moins on en sait sur nos utilisateurs, mieux c'est"
-
-### 1.Ce que nous faisons avec vos donées:
-1. Nous avons besoin d'un nom d'utilisateur et d'un mot de passe pour identifier le titulaire du compte et fournir les services offerts par Disroot.org Toutes les informations supplémentaires que vous fournissez sur les services fournis par Disroot.org sont facultatives.
-
-2. Notre traitement de vos informations est limité à leur stockage pour que vous puissiez les utiliser.
-
-3. Nous stockons les journaux de votre activité pour une période ne dépassant pas 24h (sauf indication contraire par service). Ces données sont utilisées pour diagnostiquer les problèmes logiciels, maintenir la sécurité du système contre les intrusions et surveiller la santé de la plate-forme.
-
-3. L'accès à vos données personnelles et aux fichiers stockés et autres informations que vous fournissez à l'un des services offerts par disroot.org est sous votre contrôle.
-
-4. Nous utilisons le chiffrement de disque sur toutes les données pour prévenir les fuites de données dans les cas où les serveurs seraient volés, confisqués ou physiquement altérés de quelque manière que ce soit.
-
-6. Nous fournissons et exigeons le cryptage SSL/TLS sur tous les services fournis.
-
-### 2. Ce que nous ne faisons pas avec vos données:
-1. Nous ne collectons pas d'autres données que celles nécessaires à la fourniture du service.
-
-2. Nous n'analysons en aucune façon votre comportement ou vos caractéristiques personnelles (profilage). Nous n'avons pas de publicité ou de relations d'affaires avec les annonceurs.
-
-3. Nous ne partageons ni ne vendons vos données à des tiers, sauf dans le cas de services réseau interopérables (fédérés) qui nécessitent certaines données pour fonctionner (par exemple, un autre fournisseur de services de messagerie doit connaître votre adresse e-mail pour pouvoir vous envoyer des e-mails).
-
-4. Nous n'avons pas besoin d'informations supplémentaires qui ne sont pas cruciales pour le fonctionnement du service (nous ne demandons pas d'adresses e-mail ou de numéros de téléphone supplémentaires).
-
-5. Nous ne lisons pas et ne traitons pas vos données personnelles, e-mails, fichiers, etc. stockés sur nos serveurs, sauf si cela est nécessaire à des fins de dépannage ou si nous soupçonnons une violation des Conditions Générales de Services, auquel cas nous vous demandons une autorisation préalable ou vous informons par la suite de toutes les actions prises contre le compte dans le rapport de transparence adressé au titulaire du compte.
-
-### 3. Accès à vos informations :
- 1. Fédération.
-
- Certains des services fournis par Disroot.org tels que Nextcloud, Email, Diaspora, Hubzilla, Xmpp et Matrix chat fonctionnent sur la base des protocoles de la Fédération. Cela permet aux utilisateurs inscrits chez différents fournisseurs de services d'interagir les uns avec les autres. En raison de la nature des protocoles (possibilité de s'envoyer des messages, d'aimer, de partager des fichiers, de chat), certaines données sont naturellement partagées avec d'autres entités. Cependant, le partage des données avec d'autres fournisseurs de services est le choix de l'utilisateur et est configuré par les utilisateurs dans leurs paramètres par service, y compris la décision de savoir avec qui et quoi partager.
-
- 2. Il se peut que vous soient montrés des vidéos intégrées et des aperçus de liens à partir d'autres sites Web lors de l'utilisation des services fournis par Disroot.org. Cela peut vous exposer à des services externes tels que (mais pas seulement) Facebook, Twitter et Google.
-
- 3. Toutes les données et fichiers stockés sur les services qui sont liés à des informations personnelles (services qui nécessitent une connexion) sont disponibles pour que vous puissiez les télécharger à des fins d'archivage ou pour les transférer vers un autre site Web compatible.
-
-### 4. Vos droits
-En vertu du Règlement général sur la protection des données (GDPR) et de la Loi sur la protection des données 2018 (DPA), vous disposez d'un certain nombre de droits en ce qui concerne vos données personnelles. Vous avez le droit de nous demander l'accès et la rectification ou l'effacement de vos données personnelles, le droit de restreindre le traitement, de s'opposer au traitement ainsi que, dans certaines circonstances, le droit à la portabilité des données.
-Si vous avez donné votre consentement au traitement de vos données, vous avez le droit (dans certaines circonstances) de retirer ce consentement à tout moment, ce qui n'affectera pas la licéité du traitement avant le retrait de votre consentement.
-
-Vous avez le droit de déposer une plainte auprès du Commissariat à l'information si vous estimez que nous n'avons pas respecté les exigences du GDPR ou de la DPA 18 en ce qui concerne vos données personnelles.
-Identité et coordonnées du responsable du traitement et du délégué à la protection des données :
-
-Stichting Disroot.org est le responsable du traitement des données aux fins de la DPA 18 et du GDPR. 3
-Si vous avez des questions sur la manière dont vos données sont traitées, vous pouvez nous contacter :
-
-- - data.protection.officer@disroot.org - Personne responsable de la politique de confidentialité
.
-- - info@disroot.org - Informations générales de contact
.
-
-
----
-
-## Politiques de confidentialité supplémentaires et exceptions pour chaque service :
-
-1. **search.disroot.org**
-
- - - Aucune donnée (adresse IP, cookie de session, etc.) n'est stockée sur le serveur, sauf à des fins de dépannage, après quoi les données du journal sont purgées du serveur.
-
-
-2. **upload.disroot.org**
-
-- - Aucune donnée (adresse IP, cookie de session, etc.) n'est stockée sur le serveur, sauf à des fins de dépannage, après quoi les données du journal sont purgées du serveur.
-- - Tous les fichiers uploadés sur le service sont chiffrés de bout en bout. Nous, administrateurs de Disroot n'avons aucun moyen de déchiffrer cette information
.
-
-
-3. **bin.disroot.org**
-
-- - Aucune donnée (adresse IP, cookie de session, etc.) n'est stockée sur le serveur, sauf à des fins de dépannage, après quoi les données du journal sont purgées du serveur.
-- - Tous les fichiers téléchargés vers le service sont cryptés de bout en bout. Nous, administrateurs de Disroot n'avons aucun moyen de déchiffrer cette information
-
-
-4. **pad.disroot.org** et **calc.disroot.org**
-
-- - Nous ne collectons pas les adresses IP et autres données personnelles qui peuvent être liées au pad.
-
-
-5. **cloud.disroot.org**
-
-- - Tous les fichiers envoyés vers le cloud sont chiffrés avec une paire de clés créée sur la base du mot de passe utilisateur, pour créer un niveau de sécurité supplémentaire. Notez cependant que les clés sont stockées sur le serveur, ce qui compromet le niveau de sécurité
.
-- - Tout le reste sauf les fichiers (calendriers, contacts, nouvelles, tâches, tâches, signets, etc.) est stocké en texte brut dans une base de données, à moins qu'une application ne fournisse un cryptage externe (aucun pour le moment).
-
-
-6. **email**
-
-- - tous les courriels, à moins qu'ils ne soient chiffrés par l'utilisateur (avec gpg par exemple) sont stockés sur nos serveurs en texte brut.
-- - Les adresses IP de l'utilisateur actuellement connecté via le protocole IMAP/POP3 sont stockées tant que l'appareil est connecté au serveur. (par appareil connecté)
-
-
-7. **poll.disroot.org**
-
-- - Aucune adresse IP n'est stockée sur le serveur, sauf en cas de dépannage temporaire, après quoi elles sont purgées du serveur
-
diff --git a/pages/privacy_policy/_pp/2col.it.md b/pages/privacy_policy/_pp/2col.it.md
deleted file mode 100644
index 0b49e358..00000000
--- a/pages/privacy_policy/_pp/2col.it.md
+++ /dev/null
@@ -1,101 +0,0 @@
----
-title: Privacy Policy
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-** v1.1 - Maggio 2018**
-
-La presente informativa sulla privacy si applica a tutti i Servizi ospitati su Disroot.org e i suoi sotto-domini. Cerchiamo di mantenerla il più uniforme e semplice possibile.
-
-**Esclusione di responsabilità!** Ci riserviamo il diritto di modificare uno qualsiasi dei punti. Tutte le modifiche saranno disponibili al pubblico e saranno comunicate a tutti gli utenti attraverso il forum, Diaspora, Mastodon e Blog. Modifiche importanti all'Informativa sulla privacy saranno inviate via e-mail a tutti gli utenti.
-
-*Il nostro motto:*
-## "Meno sappiamo dei nostri utenti, meglio è."
-
-### 1.Cosa facciamo con i vostri dati:
-1. Abbiamo bisogno di un nome utente e una password per identificare il titolare dell'account e fornire i servizi offerti da Disroot.org Tutte le informazioni aggiuntive fornite su uno qualsiasi dei servizi forniti da Disroot.org sono facoltative.
-
-2. Il nostro trattamento delle vostre informazioni è limitato alla loro conservazione per l'utilizzo da parte vostra.
-
-3. Memorizziamo i log della vostra attività per un periodo non più lungo di 24 ore (salvo se indicato diversamente per servizio). Questi dati vengono utilizzati per aiutare a diagnosticare problemi di software, mantenere la sicurezza del sistema contro le intrusioni e monitorare lo stato di salute della piattaforma.
-
-3. L'ulteriore accesso ai vostri dati personali e ai file memorizzati e ad altre informazioni da voi fornite ai servizi offerti da disroot.org è sotto il vostro controllo.
-
-4. Utilizziamo la crittografia del disco su tutti i dati per evitare perdite di dati nei casi in cui i server vengono rubati, confiscati o in qualsiasi modo fisicamente temperati.
-
-6. Forniamo e richiediamo la crittografia SSL/TLS su tutti i servizi forniti.
-
-### 2. Cosa non facciamo con i vostri dati:
-1. Non raccogliamo dati diversi da quelli necessari per fornirvi il servizio.
-
-2. Non elaboriamo, analizziamo in alcun modo il tuo comportamento o le tue caratteristiche personali (profiling). Non abbiamo pubblicità o rapporti commerciali con gli inserzionisti.
-
-3. Non condividiamo né vendiamo i tuoi dati a terzi a meno che, in caso di servizi di rete interoperativi (federata), non richiedano determinati dati per funzionare (ad esempio, un altro fornitore di servizi di posta elettronica deve conoscere il tuo indirizzo e-mail per essere in grado di consegnare e-mail).
-
-4. Non sono richieste informazioni aggiuntive che non sono cruciali per il funzionamento del servizio (non sono richiesti ulteriori indirizzi e-mail, numeri di telefono).
-
-5. Noi non leggiamo/guardiamo né trattiamo i vostri dati personali, e-mail, file ecc. memorizzati sui nostri server, a meno che non siano necessari per la risoluzione dei problemi, o con il sospetto di violazione dei Termini di servizio, nel qual caso chiediamo la vostra autorizzazione preventiva o vi informiamo in seguito di tutte le azioni intraprese contro l'account nella relazione di trasparenza indirizzata al titolare dell'account.
-
-### 3. Accesso alle vostre informazioni:
- 1. Federazione.
-
- Alcuni dei servizi forniti da Disroot.org come Nextcloud, Email, Diaspora, Hubzilla, Xmpp e Matrix chat sono basati sui cosiddetti Protocolli della Federazione. Questo permette agli utenti registrati presso diversi fornitori di servizi di interagire tra loro. A causa della natura dei protocolli (possibilità di inviarsi messaggi, preferenze, condividere file, chat) alcuni dati sono naturalmente condivisi con altre entità. Tuttavia, la condivisione dei dati con altri fornitori di servizi è a scelta dell'utente e viene configurata dagli utenti nelle loro impostazioni per servizio, compresa la decisione di chi e cosa condividere.
-
- 2. Si possono mostrare video incorporati e anteprime di link da altri siti web mentre si utilizzano i servizi forniti da Disroot.org. Questo potrebbe esporvi al web tracking da parte di servizi esterni, come (ma non solo) Facebook, Twitter e Google.
-
- 3. Tutti i dati e i file memorizzati sui servizi legati alle informazioni personali (servizi che richiedono l'accesso) sono disponibili per il download a fini di archiviazione o per il trasferimento su un altro sito web compatibile.
-
-### 4. I tuoi diritti
-Ai sensi del General Data Protection Regulation (GDPR) e The Data Protection Act 2018 (DPA) avete una serie di diritti in relazione ai vostri dati personali. Avete il diritto di richiedere da noi l'accesso, la rettifica o la cancellazione dei vostri dati personali, il diritto di limitare l'elaborazione, di opporsi al trattamento e, in determinate circostanze, il diritto alla portabilità dei dati.
-Se avete fornito il consenso al trattamento dei vostri dati, avete il diritto (in determinate circostanze) di ritirare tale consenso in qualsiasi momento, il che non pregiudica la liceità del trattamento prima che il vostro consenso sia stato ritirato.
-
-Avete il diritto di presentare un reclamo all'Ufficio dei Commissari Informativi se ritenete che non abbiamo rispettato i requisiti del GDPRR o DPA 18 in relazione ai vostri dati personali.
-Identità e recapiti del responsabile del trattamento e del responsabile della protezione dei dati:
-
-Stichting Disroot.org è il responsabile del trattamento dei dati ai fini della DPA 18 e del GDPR. 3
-Se avete dubbi sulle modalità di trattamento dei vostri dati potete rivolgervi a:
-
-- - data.protection.officer@disroot.org - Persona responsabile dell'informativa sulla privacy
-- - info@disroot.org - Informazioni generali di contatto
-
-
----
-## 5. Per Servizio ulteriori politiche sulla privacy ed eccezioni:
-1. **search.disroot.org**
-
- - - Nessun dato (indirizzo IP, cookie di sessione, ecc.) viene memorizzato sul server, a meno che non sia a scopo di risoluzione dei problemi, dopo di che i dati di log vengono eliminati dal server.
-
-
-2. **upload.disroot.org**
-
-- - Nessun dato (indirizzo IP, cookie di sessione, ecc.) viene memorizzato sul server, a meno che non sia a scopo di risoluzione dei problemi, dopo di che i dati di log vengono eliminati dal server.
-- - Tutti i file caricati sul servizio sono criptati end-to-end. noi, amministratori Disroot non abbiamo modo di decriptare tali informazioni.
-
-
-3. **bin.disroot.org**
-
-- - Nessun dato (indirizzo IP, cookie di sessione, ecc.) viene memorizzato sul server, a meno che non sia a scopo di risoluzione dei problemi, dopo di che i dati di log vengono eliminati dal server.
-- - Tutti i file caricati sul servizio sono criptati end-to-end. noi, amministratori Disroot non abbiamo modo di decriptare tali informazioni.
-
-
-4. **pad.disroot.org** e **calc.disroot.org**
-
-- - Non raccogliamo indirizzi IP e altri dati personali che possono essere collegati al pad.
-
-
-5. **cloud.disroot.org**
-
-- - Tutti i file inviati al cloud sono criptati con una coppia di chiavi creata in base alla password utente, per creare un livello di sicurezza extra. Si noti tuttavia che le chiavi sono memorizzate sul server, il che compromette il livello di sicurezza.
-- - Tutto il resto tranne i file (calendari, contatti, contatti, notizie, attività, segnalibri, ecc.) è memorizzato in testo semplice in un database, a meno che un'applicazione non fornisca una crittografia esterna (non ancora in corso).
-
-
-6. **email**
-
-- - Tutte le email, a meno che non siano criptate dall'utente (con gpg per esempio) sono memorizzate sui nostri server in chiaro.
-- - Gli indirizzi IP dell'utente attualmente connesso tramite il protocollo IMAP/POP3 vengono memorizzati finché il dispositivo è connesso al server. (per ogni dispositivo connesso)
-
-
-7. **poll.disroot.org**
-
-- - Nessun indirizzo IP è memorizzato sul server, a meno che non sia temporaneamente per la risoluzione dei problemi, dopo di che vengono eliminati dal server.
-
diff --git a/pages/privacy_policy/_title/fullbar.en.md b/pages/privacy_policy/_title/fullbar.en.md
index db0d7022..3ec79322 100644
--- a/pages/privacy_policy/_title/fullbar.en.md
+++ b/pages/privacy_policy/_title/fullbar.en.md
@@ -3,4 +3,6 @@ title: TOS
bgcolor: '#1F5C60'
fontcolor: '#FFF'
---
-# Privacy Policy
+
+
+# Privacy Statement
diff --git a/pages/privacy_policy/modular.de.md b/pages/privacy_policy/modular.de.md
index b5a1776b..f3afe571 100644
--- a/pages/privacy_policy/modular.de.md
+++ b/pages/privacy_policy/modular.de.md
@@ -1,6 +1,6 @@
---
title: Datenschutzerklärung
-bgcolor: '#1F5C60'
+bgcolor: '#FFF'
content:
items: '@self.modular'
order:
@@ -9,7 +9,6 @@ content:
custom:
- _title
- _pp
- - _empty-bar
body_classes: modular
header_image: pp.jpg
---
diff --git a/pages/privacy_policy/modular.en.md b/pages/privacy_policy/modular.en.md
index ad8f3c6b..2645e5f7 100644
--- a/pages/privacy_policy/modular.en.md
+++ b/pages/privacy_policy/modular.en.md
@@ -1,6 +1,6 @@
---
title: Privacy Policy
-bgcolor: '#1F5C60'
+bgcolor: '#FFF'
content:
items: '@self.modular'
order:
@@ -9,7 +9,6 @@ content:
custom:
- _title
- _pp
- - _empty-bar
body_classes: modular
header_image: pp.jpg
---
diff --git a/pages/privacy_policy/modular.es.md b/pages/privacy_policy/modular.es.md
index ff747b0e..a73ba19e 100644
--- a/pages/privacy_policy/modular.es.md
+++ b/pages/privacy_policy/modular.es.md
@@ -1,6 +1,6 @@
---
title: Política de Privacidad
-bgcolor: '#1F5C60'
+bgcolor: '#FFF'
content:
items: '@self.modular'
order:
@@ -9,7 +9,6 @@ content:
custom:
- _title
- _pp
- - _empty-bar
body_classes: modular
header_image: pp.jpg
---
diff --git a/pages/privacy_policy/modular.fr.md b/pages/privacy_policy/modular.fr.md
index fb30c702..219f03a2 100644
--- a/pages/privacy_policy/modular.fr.md
+++ b/pages/privacy_policy/modular.fr.md
@@ -1,6 +1,6 @@
---
title: Politique de confidentialité
-bgcolor: '#1F5C60'
+bgcolor: '#FFF'
content:
items: '@self.modular'
order:
@@ -9,7 +9,6 @@ content:
custom:
- _title
- _pp
- - _empty-bar
body_classes: modular
header_image: pp.jpg
---
diff --git a/pages/privacy_policy/modular.it.md b/pages/privacy_policy/modular.it.md
index 52123caf..08f56070 100644
--- a/pages/privacy_policy/modular.it.md
+++ b/pages/privacy_policy/modular.it.md
@@ -1,6 +1,6 @@
---
title: Informativa sulla privacy
-bgcolor: '#1F5C60'
+bgcolor: '#FFF'
content:
items: '@self.modular'
order:
@@ -9,7 +9,6 @@ content:
custom:
- _title
- _pp
- - _empty-bar
body_classes: modular
header_image: pp.jpg
---
diff --git a/pages/quarantine/_goal/fullbar.en.md b/pages/quarantine/_goal/fullbar.en.md
new file mode 100644
index 00000000..9cfc6770
--- /dev/null
+++ b/pages/quarantine/_goal/fullbar.en.md
@@ -0,0 +1,16 @@
+---
+title: 'Goal'
+bgcolor: '#09846aff'
+fontcolor: '#FFFFFF'
+text_align: left
+---
+
+
+
+
+# Quick guide:
+1. To get you started, install Teeworlds either using your package manager if you are using a proper operating system like linux/bsd or go to teeworlds [website](https://teeworlds.com/?page=downloads) and download it for your platform.
+2. Once you're done with that, start the game.
+3. Fisrt select "Setup" to add your players name, choose and customize your Tee is you like.
+4. Hit play and find **"Quarantine with Disroot"** and join us.
+![](splashtee3.png)
diff --git a/pages/quarantine/_goal/fullbar.es.md b/pages/quarantine/_goal/fullbar.es.md
new file mode 100644
index 00000000..ff6f5b77
--- /dev/null
+++ b/pages/quarantine/_goal/fullbar.es.md
@@ -0,0 +1,17 @@
+---
+title: 'Objetivo'
+bgcolor: '#09846aff'
+fontcolor: '#FFFFFF'
+text_align: left
+---
+
+
+
+
+# Guía rápida:
+1. Para empezar, instala **Teeworlds** utilizando el gestor de software si estás usando un sistema operativo de verdad, como GNU/Linux / BSD, o ve al [sitio de Teeworlds](https://teeworlds.com/?page=downloads) y descárgalo para tu plataforma.
+2. Una vez que lo hayas hecho, inicia el juego.
+3. Primero selecciona "Setup" para agregar tu nombre de jugador o jugadora y elegir y personalizar tu Tee como quieras.
+4. Dale a "Play", busca **"Quarantine with Disroot"** y únete a nosotrxs.
+
+![](splashtee3.png)
diff --git a/pages/quarantine/_goal/fullbar.fr.md b/pages/quarantine/_goal/fullbar.fr.md
new file mode 100644
index 00000000..efc42b82
--- /dev/null
+++ b/pages/quarantine/_goal/fullbar.fr.md
@@ -0,0 +1,17 @@
+---
+title: 'Objectif'
+bgcolor: '#09846aff'
+fontcolor: '#FFFFFF'
+text_align: left
+---
+
+
+
+
+# Guide rapide :
+1. Pour commencer, installez Teeworlds soit en utilisant votre gestionnaire de paquets si vous utilisez un système d'exploitation correct comme linux/bsd, soit en allant sur teeworlds [site web] (https://teeworlds.com/?page=downloads) et en le téléchargeant pour votre plate-forme.
+2. Une fois que vous avez terminé, démarrez le jeu.
+3. Sélectionnez d'abord "Setup" pour ajouter le nom de votre joueur, puis choisissez et personnalisez votre Tee selon vos goûts.
+4. Cliquez sur "Jouer" et trouvez **"Quarantine with Disroot "** et rejoignez-nous.
+
+![](splashtee3.png)
diff --git a/pages/quarantine/_goal/splashtee3.png b/pages/quarantine/_goal/splashtee3.png
new file mode 100644
index 00000000..41daddb6
Binary files /dev/null and b/pages/quarantine/_goal/splashtee3.png differ
diff --git a/pages/quarantine/_intro/fullbar.en.md b/pages/quarantine/_intro/fullbar.en.md
new file mode 100644
index 00000000..6ce86932
--- /dev/null
+++ b/pages/quarantine/_intro/fullbar.en.md
@@ -0,0 +1,20 @@
+---
+title: 'Are you bored yet'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: left
+---
+
+
+
+
+## Are you bored yet?
+
+Since lots of you (us included) are locked in their houses trying to avoid contact with other human beings, we thought it would be nice to spend this time socializing in front of computer with bunch of strangers you know so well from chats, social federated networks and whom you most probably never seen in real life.
+
+Let's spend an evening drinking booze, eating junk, and shooting one another on Teeworlds. The first edition of Quarantine with Disroot starts on Saturday 21.03.2020 20:00 CET and will go on until last one standing. Server will probably be on for the whole week or two if there are people willing to play.
+
+
+
+
+
diff --git a/pages/quarantine/_intro/fullbar.es.md b/pages/quarantine/_intro/fullbar.es.md
new file mode 100644
index 00000000..d30a1787
--- /dev/null
+++ b/pages/quarantine/_intro/fullbar.es.md
@@ -0,0 +1,20 @@
+---
+title: 'Ya están aburridxs'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: left
+---
+
+
+
+
+## ¿Ya están aburridxs?
+
+Ya que muchxs de ustedes (nosotrxs incluidxs) están encerradxs en sus casas tratando de evitar el contacto con otxs seres humanxs, pensamos que estaría bueno pasar este tiempo socializando frente a la computadora con un montón de extrañxs que conoces tan bien de los chats y las redes sociales federadas y a quienes muy probablemente nunca hayas visto en la vida real.
+
+Pasemos una noche bebiendo alcohol, comiendo basura y disparándonos unxs a otrxs en **Teeworlds**. La primera edición de **Cuarentena con Disroot** comienza el sábado 21.03.2020 a las 20:00 CET y durará hasta que quede solo unx en pie. El servidor estará funcionando toda la semana o dos si hay personas con ganas de jugar.
+
+
+
+
+
diff --git a/pages/quarantine/_intro/fullbar.fr.md b/pages/quarantine/_intro/fullbar.fr.md
new file mode 100644
index 00000000..22f62539
--- /dev/null
+++ b/pages/quarantine/_intro/fullbar.fr.md
@@ -0,0 +1,20 @@
+---
+title: 'Vous vous ennuyez déjà'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: left
+---
+
+
+
+
+## Vous vous ennuyez déjà ?
+
+Comme beaucoup d'entre vous (nous inclus) sont enfermés chez eux en essayant d'éviter tout contact avec d'autres êtres humains, nous avons pensé qu'il serait agréable de passer ce temps à socialiser devant l'ordinateur avec une bande d'étrangers que vous connaissez si bien grâce aux chats, aux réseaux sociaux fédérés et que vous n'avez probablement jamais vus dans la vraie vie.
+
+Passons une soirée à boire de l'alcool, à manger des cochonneries et à se tirer dessus sur Teeworlds. La première édition de la Quarantaine avec Disroot commence le samedi 21.03.2020 20:00 CET et se poursuivra jusqu'au dernier debout. Le serveur sera probablement ouvert pendant toute la semaine ou plus s'il y a des gens qui veulent jouer.
+
+
+
+
+
diff --git a/pages/quarantine/_rewardstitle/fullbar.en.md b/pages/quarantine/_rewardstitle/fullbar.en.md
new file mode 100644
index 00000000..f9648d4b
--- /dev/null
+++ b/pages/quarantine/_rewardstitle/fullbar.en.md
@@ -0,0 +1,9 @@
+---
+title: 'Kick butt'
+bgcolor: '#50162D'
+fontcolor: '#FFF'
+text_align: center
+---
+
+
+# So let's kick some CoVID butt.
diff --git a/pages/quarantine/_rewardstitle/fullbar.es.md b/pages/quarantine/_rewardstitle/fullbar.es.md
new file mode 100644
index 00000000..f57d10e0
--- /dev/null
+++ b/pages/quarantine/_rewardstitle/fullbar.es.md
@@ -0,0 +1,9 @@
+---
+title: 'Kick butt'
+bgcolor: '#50162D'
+fontcolor: '#FFF'
+text_align: center
+---
+
+
+# Así que, ¡vamos a patear algunos culos de CoVID!
diff --git a/pages/quarantine/_rewardstitle/fullbar.fr.md b/pages/quarantine/_rewardstitle/fullbar.fr.md
new file mode 100644
index 00000000..4561e68d
--- /dev/null
+++ b/pages/quarantine/_rewardstitle/fullbar.fr.md
@@ -0,0 +1,9 @@
+---
+title: 'Botter des fesses'
+bgcolor: '#50162D'
+fontcolor: '#FFF'
+text_align: center
+---
+
+
+# Alors donnons un coup de pied aux fesses du CoVID .
diff --git a/pages/quarantine/_title/fullbar.en.md b/pages/quarantine/_title/fullbar.en.md
new file mode 100644
index 00000000..f302c43e
--- /dev/null
+++ b/pages/quarantine/_title/fullbar.en.md
@@ -0,0 +1,9 @@
+---
+title: 'Challenge title'
+bgcolor: '#f2f2f2ff'
+fontcolor: '#50162D'
+text_align: center
+---
+
+
+# ![](splashtee1.png) Quarantine with Disroot!
diff --git a/pages/quarantine/_title/fullbar.fr.md b/pages/quarantine/_title/fullbar.fr.md
new file mode 100644
index 00000000..b189de37
--- /dev/null
+++ b/pages/quarantine/_title/fullbar.fr.md
@@ -0,0 +1,9 @@
+---
+title: 'Titre du défi'
+bgcolor: '#f2f2f2ff'
+fontcolor: '#50162D'
+text_align: center
+---
+
+
+# ![](splashtee1.png) La quarantaine avec Disroot!
diff --git a/pages/quarantine/_title/splashtee1.png b/pages/quarantine/_title/splashtee1.png
new file mode 100644
index 00000000..cd5fdb8f
Binary files /dev/null and b/pages/quarantine/_title/splashtee1.png differ
diff --git a/pages/quarantine/header.jpg b/pages/quarantine/header.jpg
new file mode 100644
index 00000000..6bbc4d17
Binary files /dev/null and b/pages/quarantine/header.jpg differ
diff --git a/pages/quarantine/modular.en.md b/pages/quarantine/modular.en.md
new file mode 100644
index 00000000..af698232
--- /dev/null
+++ b/pages/quarantine/modular.en.md
@@ -0,0 +1,16 @@
+---
+title: Quarantine
+bgcolor: '#50162D'
+content:
+ items: '@self.modular'
+ order:
+ by: default
+ dir: asc
+ custom:
+ - _title
+ - _intro
+ - _goal
+ - _rewardstitle
+body_classes: modular
+header_image: 'header.jpg'
+---
diff --git a/pages/quarantine/modular.es.md b/pages/quarantine/modular.es.md
new file mode 100644
index 00000000..a8de0db6
--- /dev/null
+++ b/pages/quarantine/modular.es.md
@@ -0,0 +1,16 @@
+---
+title: Cuarentena
+bgcolor: '#50162D'
+content:
+ items: '@self.modular'
+ order:
+ by: default
+ dir: asc
+ custom:
+ - _title
+ - _intro
+ - _goal
+ - _rewardstitle
+body_classes: modular
+header_image: 'header.jpg'
+---
diff --git a/pages/quarantine/modular.fr.md b/pages/quarantine/modular.fr.md
new file mode 100644
index 00000000..347f897b
--- /dev/null
+++ b/pages/quarantine/modular.fr.md
@@ -0,0 +1,16 @@
+---
+title: Quarantaine
+bgcolor: '#50162D'
+content:
+ items: '@self.modular'
+ order:
+ by: default
+ dir: asc
+ custom:
+ - _title
+ - _intro
+ - _goal
+ - _rewardstitle
+body_classes: modular
+header_image: 'header.jpg'
+---
diff --git a/pages/tos/_title/fullbar.en.md b/pages/tos/_title/fullbar.en.md
index e075b468..0747a355 100644
--- a/pages/tos/_title/fullbar.en.md
+++ b/pages/tos/_title/fullbar.en.md
@@ -3,4 +3,7 @@ title: TOS
bgcolor: '#1F5C60'
fontcolor: '#FFF'
---
-# By using any of the services provided by disroot.org you agree to the following TERMS OF USE.
+
+
+# By using any of the services provided by disroot.org you agree to the following TERMS OF USE:
+
diff --git a/pages/tos/_tos/2col.de.md b/pages/tos/_tos/2col.de.md
deleted file mode 100644
index ae39dea3..00000000
--- a/pages/tos/_tos/2col.de.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-title: 'Nutzungsbedingungen'
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-
-## Nutzungsbedingungen
-**May 2018 - v1.1**
-*Deutsche Übersetzung: September 2019*
-
-*Hinweis: Bei dem folgenden Text handelt es sich um eine Übersetzung der originalen, englischen [Terms of Service](https://www.disroot.org/en/tos). Im Zweifel und vor allem bei rechtlichen Streitigkeiten gilt der englische Originaltext. Die vorliegende Übersetzung gilt bei aller Sorgfältigkeit des Übersetzungsprozesses vor allem der leichteren Verständlichkeit für deutschsprachige Nutzer.*
-
-Indem Du einen von disroot.org angebotenen Service nutzt, akzeptierst Du unsere Nutzungsbedingungen. Diese Bedingungen können jederzeit ohne vorherige Mitteilung geändert werden. Nichtsdestotrotz ist uns Transparenz überaus wichtig, daher werden wir unser Bestes tun, um unsere Nutzer schnellstmöglich via Email, Diaspora* und/oder das [Ankündigungs](https://forum.disroot.org/c/disroot/disroot-changelog)-Forum über große Änderungen zu informieren. Kleinere Änderungen werden zumeist nur im Ankündigungs-Forum mitgeteilt.
-
-Disroot ist eine Gemeinschaft. Wir alle teilen Server-Ressourcen, arbeiten miteinander und benutzen gemeinsam Dienste von disroot.org. Es ist wichtig, dass jeder von uns dies versteht sich gleichermaßen verantwortlich fühlt. Bitte halte Dich an die folgenden Richtlinien, damit wir alle miteinander klarkommen:
-
-### 1. Limitierter Speicherplatz:
-Ressourcen sind rar. Denk daran, dass ein Aufheben von unnötigen Emails und Dateien möglicherweise Speicherplatz beschränken und dazu führen, dass weniger Accounts für andere zur Verfügung gestellt werden können. Wie im echten Leben gilt: Trenn Deinen Müll!
-
-### 2. Account-Verfall:
-disroot.org lässt keine ungenutzten Accounts verfallen. Das mag vielleicht später mal ein Thema werden, wenn wir gezwungen sind, Speicherplatz für andere Nutzer einzusparen. Solche Änderungen in den Bedingungen werden aber im Voraus über alle Kommunikationskanäle angekündigt. Wir würden es jedoch vorziehen und begrüßen, wenn die Menschen dieser Gemeinschaft Verantwortung für ihren Account und dessen Auswirkung auf die Disroot-Ressourcen übernehmen und eine Account-Löschung beantragen, falls sie unsere Dienste nicht mehr länger nutzen wollen. Oder, wenn sie diesen Schritt nicht gehen wollen, zumindest unnötige Dateien löschen.
-
-### 3. Passwort:
-Aus Datenschutzgründen verfolgen wir niemanden, der die Aktivierung eines Disroot-Accounts beantragt. Wenn Du Deinen Account erstellst, kannst Du eine Sicherheitsfrage auswählen, die Dir eine Passwortwiederherstellung ermöglicht, falls Du Dein Passwort verlierst oder vergisst. Wenn Du zusätzlich die Frage oder die Antwort vergisst, werden wir nicht in der Lage sein, Dir Deine Zugangsdaten erneut zuzusenden. Denk auch daran, Dein Passwort regelmäßig zu ändern: Du kannst dies tun, indem Du Dich im User-Panel unter user.disroot.org anmeldest und den "Passwort ändern"-Button anklickst.
-**!WARNUNG!** Verlorene Passwörter führen zur Nichtwiederherstellbarkeit Deiner verschlüsselten Cloud-Dateien und damit zum Verlust Deiner Daten. Um Dich davor zu schützen, kannst Du die Passwortwiederherstellung in Deinen persönlichen Cloud-Einstellungen aktivieren.
-
-### 4. Spam und Viren:
-Um zu vermeiden, dass unsere Server in Blacklists aufgeführt werden, wollen wir nicht, dass von unseren Email-Accounts Spam versendet wird. Jeder Account, den wir dabei erwischen, wird ohne weitere Mitteilung deaktiviert.
-
-Wenn Du eine große Menge an Spam oder verdächtiger Emails erhältst, teile uns das bitte unter support@disroot.org mit, damit wir das näher untersuchen können.
-
-### 5. Urheberrechtlich geschützte Inhalte:
-Das Hochladen und (vor allem) das öffentliche Teilen von urheberrechtlich geschützten Inhalten kann andere Nutzer und insbesondere das gesamte Projekt in Gefahr bringen. Also lass es bitte einfach.
-
-Das Ziel von Disroot ist es, quelloffene freie Software und jede Art von Copyleft-Inhalten zu fördern. Mach Dir das zu Eigen und unterstütze Künstler, Entwickler und Projekte, die ihre Arbeiten unter diesen Lizenzen veröffentlichen.
-
-### 6. Rechtliche Verantwortlichkeit:
-Wie bei allem ist jeder für sein eigenes Handeln verantwortlich. Sei Dir also bewusst, dass disroot.org nicht verantwortlich ist für das, was Du schreibst, oder für den Schutz Deiner eigenen Privatsphäre. Wir laden Dich daher ein, das beste aus all den existierenden Werkzeugen herauszuholen, um Deine Rechte zu verteidigen.
-
-Wir möchten noch einmal daran erinnern, dass Du bitte kein urheberrechtlich geschütztes Material hochlädst, das die Existenz unserer Server (und aller damit verbundenen Dienste) gefährden könnte.
-
-Sieh Dir gerne unsere Datenschutzerklärung an, um mehr darüber zu erfahren, wie Deine Informationen gespeichert und genutzt werden.
-
----
-
-##
-### 7. Eigentum an und Verantwortlichkeit für Inhalte:
-
-disroot.org ist nicht verantwortlich für jegliche Inhalte, die durch die Nutzer unserer Dienste auf irgendeinem dieser Dienste veröffentlicht werden. Du bist selbst verantwortlich für Deine Nutzung der Disroot-Dienste, für den durch Dich veröffentlichten Inhalt und für alle Konsequenzen daraus. Allerdings behalten wir uns, um unsere (Disroots) Existenz zu schützen, das Recht vor, jegliche Inhalte zu entfernen, die gegen geltendes Recht verstoßen.
-
-### 8. Geltendes Recht:
-disroot.org wird in den Niederlanden gehostet, es gelten daher niederländische Gesetze und Rechtsprechung.
-
-### 9. Unterlassen bestimmter Aktivitäten:
-Es ist Dir untersagt, mithilfe der von disroot.org angebotenen Dienste eine oder mehrere der folgenden Handlungen vorzunehmen:
-
-
-- 1. Andere zu belästigen, nötigen oder missbrauchen, indem Du sie bedrohst, stalkst oder Spam versendest.
-- 2. Die Beteiligung an Diskriminierung, Belästigung oder Schädigung von jeglichem Individuum oder jeglicher Gruppe. Dazu gehört auch das Verbreiten von Hass und Intoleranz mittels Rassismus, Ethnophobie, Antisemitismus, Sexismus, Homophobie und anderen Formen diskriminierenden Verhaltens.
-- 3. Die Beteiligung am Missbrauch anderer durch die Verbreitung von Material und Medien, bei denen der Herstellungsprozess Gewalt oder sexuelle Übergriffe gegen Personen oder Tiere beinhaltet.
-- 4. Die Imitation oder Darstellung einer anderen Person in einer verwirrenden oder betrügerischen Art und Weise, es sei denn der Account ist deutlich als Parodie gekennzeichnet.
-- 5. Doxing: Doxing (die Veröffentlichung von persönlichen Daten und Informationen anderer Personen) ist nicht erlaubt. Wir können nicht nachprüfen, ob es vielleicht in guter Absicht geschah oder welche Konsequenzen es für die betroffenen Personen haben wird. Außerdem erzeugt ein solches Verhalten ein zu großes rechtliches Risiko für uns.
-- 6. Missbrauch unserer Dienste zur Verbreitung von Viren oder Malware, Teilnahme einer Denial-of-Service-Attacke oder dem Versuch, einen unautorisierten Zugang zu einem Computersystem, unseres eingeschlossen, zu erhalten.
-- 7. Aktivitäten, welche durch nationales oder internationales Recht verboten sind.
-
-
-### 10. Nutzung von Disroot-Diensten zu kommerziellen Zwecken:
-Disroot ist eine non-profit Organisation, die Dienste für Individuen auf einer "Zahl soviel Du willst"-Basis anbietet. Aufgrund dieser Struktur sehen wir die Nutzung von Disroot-Diensten zu kommerziellen Zwecken als Missbrauch der der Dienste und sie wird als ebensolche behandelt werden.
-
-- 1. Der Handel eines Disroot-Dienstes mit einer Drittpartei ist untersagt.
-- 2. Das Nutzen des Email-Dienstes in der Art eines "no-reply"-Accounts für Unternehmen wird ohne Warnung blockiert, sobald eine solche Aktivität entdeckt wird.
-- 3. Das Senden von Massen-Emails, einschließlich aber nicht begrenzt auf Marketing und Werbung zu kommerziellen Zwecken, wird als Spam behandelt und bei Feststellung ohne vorherige Ankündigung blockiert.
-- 4. Die Nutzung von Disroot-Diensten zum Zwecke des Profits, einschließlich aber nicht begrenzt auf Handel oder die Verwaltung von Verkäufen, wird nicht toleriert. Accounts, die zum Zwecke der Erwirtschaftung von Profiten erstellt wurden, werden bei Feststellung gelöscht.
-- 5. Die Nutzung von Disroot-Diensten für jede andere kommerzielle Nutzung wird einzelfallabhängig geprüft und die Entscheidung über eine Löschung eines solchen Accounts wird abhängig sein von der Kommunikation mit dem Account-Inhaber und der Art der fraglichen Aktivitäten.
-
-
-### 11. Account-Löschung:
-disroot.org kann Deinen Zugang jederzeit löschen, wenn eine der folgenden Bedingungen erfüllt ist:
-
-- 1. Es wurde festgestellt, dass von Deinem Account Spam (exzessive Menge unerwünschter Emails) versandt wurde.
-- 2. Der Account war an einer oder mehrerer der oben aufgeführten, verbotenen Aktivitäten beteiligt.
-
-Die genannten Bedingungen können sich jederzeit ändern.
-
-### 12. Keine Garantie:
-Mit der Nutzung von disroot.org und der angebotenen Dienste hast verstehst und stimmst Du zu, dass disroot.org Dich hauptsächlich mit internetbasierten Diensten versorgt. Dabei gilt das Angebot der Dienste als "so wie sie sind", abhängig von der Verfügbarkeit und ohne Verbindlichkeit Dir gegenüber.
-So wenig wir unsere Nutzer im Stich lassen wollen, können wir keine Garantie über die Zuverlässigkeit, Erreichbarkeit oder Qualität unserer Dienste geben. Du stimmst zu, dass die Nutzung unserer Dienste einzig und allein auf Dein eigenes Risiko stattfindet.
diff --git a/pages/tos/_tos/2col.en.md b/pages/tos/_tos/2col.en.md
deleted file mode 100644
index 5a61f4e2..00000000
--- a/pages/tos/_tos/2col.en.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: 'Term Of Services'
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-
-## Terms Of Service
-**May 2018 - v1.1**
-
-By using any of the services provided by disroot.org you agree to our terms of use. These conditions can be changed at any time without prior notice. However we highly evaluate transparency and will do our best to make sure users are notified as soon as possible about any major changes via email, Diaspora* network and/or the announcement [forum](https://forum.disroot.org/c/disroot/disroot-changelog), minor changes will most likely only be published on the announcement forum.
-
-Disroot is a community. We all share servers resources, collaborate and use disroot.org services together. It is important that everyone of us understands it and feels equally responsible for it. Please keep to the following guidelines so we all get along:
-
-### 1. Space limits on disk:
-Resources are scarce. Keep in mind keeping unnecessary files and emails might limit server space, which can lead to less accounts served to others. Don't litter!
-
-### 2. Account expiration:
-disroot.org does not expire unused accounts. This might be a subject to change if we are forced to save up disk space for other users. Such changes in policy will be announced via all communication channels well in advance. We would rather appreciate people taking responsibility for their account and its impact on disroot resources, and rather request account deletion when they decide not to use our services any longer, or purge unused files.
-
-### 3. Password:
-For privacy-related reasons, we never keep track of anybody who requests the activation of a Disroot account. When creating your account, you may choose questions which will allow you to recover your password in case you lose/forget it. If you also forget the question or the answer to the question we won't be able to re-send you the data to access your account again. Remember as well to periodically change your password: you can do it by login into the user panel at user.disroot.org and clicking the 'Change password' button. **!WARNING!** Lost passwords will lead to un-recoverable cloud file loss. To protect yourself from it, you can enable password recovery feature in your personal Cloud settings.
-
-### 4. Spam and Viruses:
-To avoid having our servers included in blacklists, we don't want our email accounts to be used for sending spam. Any account caught doing so will be disabled without further notice.
-
-
-If you happen to receive great amount of spam or any suspicious emails please let us know at support@disroot.org so we can investigate it further.
-
-### 5. Copyright material:
-Uploading and (most of all) publicly sharing copyrighted material on disroot might put other users and the whole project in danger so just don't do it.
-
-
-The aim of disroot is to promote open source, free software and all kind of copyleft content. Embrace it and support artists and projects that release their work under those licences.
-
-### 6. Legal responsibilities:
-As for anything else you do, be aware that disroot.org is not responsible for what you write, nor for the safeguard of your own privacy. We therefore invite you to make the most of all the existing tools to defend your rights.
-
-We remind you not to upload on the site copyright protected materials that could endanger the existence of our very servers (and all services connected to it).
-
-Please refer to our privacy policy to learn more about how your information is being stored and used.
-
----
-
-##
-### 7. Ownership of and responsibility for content
-
-disroot.org is not responsible for any content published on any of our services. You are responsible for your use of the disroot's services, for any Content you provide, and for any consequences thereof. However, to secure our existence, we reserve the right to remove any content if found in violation with applicable law.
-
-### 8. Laws
-disroot.org is hosted in the Netherlands and therefore is subject to Dutch laws and jurisdiction.
-
-### 9. Refraining from certain activities
-You may not engage in the following activities through the services provided by disroot.org:
-
-
-- 1. Harassing and abusing others by engaging in threats, stalking, or sending spam.
-- 2. Contributing to the discrimination, harassment or harm against any individual or group. That includes the spread of hate and bigotry through racism, ethnophobia, antisemitism, sexism, homophobia and other forms of discriminatory behavior.
-- 3. Contributing to the abuse of others by distributing material where the production process created violence or sexual assault against persons or animals.
-- 4. Impersonating or portraying another person in a confusing or deceptive manner unless the account is clearly classified as a parody.
-- 5. Doxing: Doxing (the publication of other people's personal data) is not allowed because we can't assess either if it's done in good faith or what consequences it will have for the exposed people, and because it implies too big a legal risk for us.
-- 6. Misuse of services by distributing viruses or malware, engaging in a denial of service attack, or attempting to gain unauthorized access to any computer system, including this one.
-- 7. Activity not permitted by national or international law.
-
-
-### 10. Using Disroot services for commercial activities
-Disroot is a non-profit organization providing services for individuals on "pay as you wish" basis. Because of this structure we see using Disroot services for commercial purposes as abuse of the service and it will be treated as such.
-
-- 1. Trading any Disroot services with a third party is prohibited.
-- 2. Using email for purposes such as "no-reply" type of accounts for a business will be blocked without a warning once such activity is detected.
-- 3. Sending bulk emails, including but not limited to marketing and advertising, for business purposes, will be treated as spam and blocked upon discovery without any prior notice.
-- 4. Using Disroot services for financial gain, including but not limited to trading or managing sales, is not tolerated. Accounts created for the purpose of generating profits will be subject to termination upon inquiry.
-- 5. Using Disroot services for any other commercial activity will be examined per case and the decision on terminating such accounts will be based upon communication with the account holder and the type of the activities in question.
-
-
-### 11. Account Termination
-disroot.org may terminate your service at any time under the following conditions:
-
-- 1. The account has been found to be sending Spam (excessive amounts of unsolicited email).
-- 2. The account has engaged in one or more of the banned activities listed above.
-
-The above conditions are subject to change at any time.
-
-### 12. No Warranty
-You understand and agree that disroot.org provides you primarily with internet-based services. Therefore, services are offered as is, subject to availability and without liability to you.
-As much as we wouldn't like letting any of our users down, we just cannot give any warranty as to the reliability, accessibility, or quality of our services. You agree that the use of our services is at your sole and exclusive risk.
diff --git a/pages/tos/_tos/2col.es.md.old b/pages/tos/_tos/2col.es.md.old
deleted file mode 100644
index 06d58003..00000000
--- a/pages/tos/_tos/2col.es.md.old
+++ /dev/null
@@ -1,89 +0,0 @@
----
-title: 'Condiciones del Servicio'
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-
-## Terms Of Service
-**May 2018 - v1.1**
-
-
-Al utilizar cualquiera de los servicios provistos por Disroot.org, aceptas nuestras condiciones de uso. Estas condiciones pueden ser modificadas en cualquier momento sin aviso previo. Sin embargo, valoramos altamente la transparencia y haremos lo mejor para asegurarnos que nuestros usuarios sean notificados tan pronto como sea posible acerca de modificaciones mayores a través del correo electrónico, la red Diaspora* y/o el [foro](https://forum.disroot.org/c/disroot/disroot-changelog) de anuncios; los cambios menores probablemente serán publicados sólo en el foro de anuncios.
-
-Disroot es una comunidad. Todos compartimos los recursos de los servidores, colaboramos y utilizamos los servicios de Disroot.org juntos. Es importante que cada uno de nosotros lo comprenda y se sienta igualmente responsable por ello. Por favor, sigue las siguientes pautas así todos podemos llevarnos bien:
-
-### 1. Límites de espacio en disco:
-Los recursos son escasos. Ten presente que guardando archivos y correos innecesarios podrían limitar el espacio del servidor, lo que puede llevar a menos cuentas para otros a las que prestar servicio. ¡No amontones basura!
-
-### 2. Caducidad de la cuenta:
-Disroot.org no da de baja cuentas sin uso. Esto podría ser un tema a cambiar si nos vemos forzados a ahorrar espacio de disco para otros usuarios. Tales cambios en la política serán anunciados a través de todos los canales de comunicación con buena antelación. Apreciaríamos bastante que las personas asuman la responsabilidad por sus cuentas y el impacto en los recursos de Disroot, y prefiriera solicitar la eliminación de la cuenta en caso de decidir no utilizar más nuestros servicios, o deshacerse de los archivos que no usa.
-
-### 3. Contraseña:
-Por razones relativas a la privacidad, nunca mantenemos un registro de cualquiera que solicite la activación de un cuenta de Disroot. Cuando creas una cuenta, eliges preguntas que te permitirán recuperar tu contraseña en caso que la pierdas/olvides. Si también olvidas la pregunta o la respuesta a la pregunta no podremos reenviarte la información para acceder a tu cuenta nuevamente. Recuerda también de cambiar periódicamente tu contraseña: puedes hacerlo iniciando sesión en el panel de usuario en user.disroot.org y haciendo click en el botón 'Cambiar contraseña'. **¡ADVERTENCIA!** La pérdida de la contraseña acarreará la pérdida irrecuperable de los archivos en la nube. Para protegerte de ello, puedes habilitar la utilidad de recuperación de contraseña en la configuración personal de tu nube.
-
-### 4. Spam y Virus:
-Para evitar tener nuestros servidores incluidos en listas negras, no queremos que nuestras cuentas de correo sean utilizadas para enviar [spam](https://es.wikipedia.org/wiki/Spam). Cualquier cuenta descubierta haciendo eso será deshabilitada sin más aviso.
-
-
-Si resulta que recibes gran cantidad de correo basura o cualquier tipo de correo sospechoso, por favor, avisanos a support@disroot.org así podemos investigarlo más a fondo.
-
-### 5. Material con [Copyright](https://es.wikipedia.org/wiki/Copyright) (Derechos de autor):
-Subir y (sobre todo) compartir públicamente material protegido por derechos de autor en Disroot, podría poner a otros usuarios y al proyecto entero en peligro, así que no lo hagas.
-
-
-El objetivo de Disroot es promover el software de [código abierto](https://es.wikipedia.org/wiki/C%C3%B3digo_abierto), el software [libre](https://es.wikipedia.org/wiki/Software_libre) y toda clase de contenidos [copyleft](https://es.wikipedia.org/wiki/Copyleft). Adóptalos y apoya a los artistas y proyectos que liberar sus trabajos bajo esas licencias.
-
-### 6. Responsabilidades legales:
-En cuanto a todo lo demás que hagas, se consciente que Disroot.org no es responsable por lo que escribes, ni por el cuidado de tu propia privacidad. Por lo tanto, te invitamos a aprovechar todas las herramientas que existen para defender tus derechos.
-
-
-Te recordamos no subir al sitio material protegido por derechos de autor que podría poner en peligro la existencia misma de nuestros servidores (y todos los servicios conectados a ellos).
-
-
-Por favor, consulta nuestra política de privacidad para conocer más acerca de cómo tu información es almacenada y utilizada.
-
----
-
-### 7. CONDICIONES DE USO
-**Propiedad y responsabilidad del contenido**
-
-Disroot.org no es responsable por ningún contenido publicado en cualquiera de nuestros servicios. Tú eres responsable por el uso que hagas de los servicios de Disroot, de cualquier contenido que proporciones, y de cualquier consecuencia del mismo. Sin embargo, para asegurar nuestra existencia, nos reservamos el derecho de quitar cualquier contenido si es encontrado en violación de leyes vigentes.
-
-### 8. Leyes
-Disroot.org es hospedado en los Países Bajos y por lo tanto está sujeto a las leyes y jurisdicción holandesa.
-
-### 9. Abstención de ciertas actividades
-No puedes involucrarte en las siguientes actividades a través de los servicios provistos por Disroot.org:
-
-
-- 1. Hostigar y abusar de otros a través de amenazas, acoso, o enviando correo basura.
-- 2. Hacer uso incorrecto de los servicios distribuyendo virus o malware, involucrarse en un [ataque de denegación de servicio](https://es.wikipedia.org/wiki/Ataque_de_denegaci%C3%B3n_de_servicio) o intentar obtener acceso sin autorización a cualquier sistema informático, incluyendo éste mismo.
-- 3. Contribuir al abuso de otros distribuyendo material donde el proceso de producción generó violencia o agresión sexual contra personas o animales.
-- 4. Hacerse pasar o representar a otra persona de manera confusa o engañosa, a menos que la cuenta esté claramente clasificada como una parodia.
-- 5. Doxing: Doxing (la publicación de información personal de otras personas) no está permitido porque no podemos evaluar si está hecho con buena fe o qué consecuencias tendrá para las personas expuestas, y porque implica un riesgo legal muy grande para nosotros.
-- 6. Actividades no permitidas por las leyes nacionales o internacionales.
-
-
-### 10. Uso de los servicios de Disroot para actividades comerciales
-Disroot es una organización sin fines de lucro que provee servicios para individuos con el criterio "paga lo que desees". En virtud de esta estructura, entendemos la utilización de los servicios de Disroot con propósitos comerciales como un abuso del servicio y será tratado como tal.
-
-- 1. Comerciar cualquier servicio de Disroot con terceras partes está prohibido.
-- 2. Utilizar el correo con fines tales como cuentas del tipo "no responder" para negocios implicará el bloqueo son aviso si dicha actividad es detectada.
-- 3. Enviar correos a granel, incluyendo mas no limitado a, marketing y publicidad, con fines comerciales, será tratado como spam e implicará el bloqueo sin aviso previo en caso de ser descubierto.
-- 4. Utilizar los servicios de Disroot con afán de lucro, incluyendo, mas no limitado a, comerciar o conseguir ventas, no es tolerado. Las cuentas creadas con el propósito de generar beneficios económicos estarán sujetas a rescisión en respuesta.
-- 5. Utilizar los servicios de Disroot para cualquier otra actividad comercial será revisada en cada caso y la decisión de rescindir tales cuentas se basará en la comunicación con el titular de la cuenta y el tipo de actividad en cuestión.
-
-
-### 11. Rescisión de la cuenta
-Disroot.org podría cancelar tu servicio en cualquier momento bajo las siguientes condiciones:
-
-- 1. La cuenta fue encontrada enviando Spam (cantidades excesivas de correos no solicitados).
-- 2. La cuenta ha estado involucrada en una o más de las actividades prohibidas listadas arriba.
-
-Las condiciones anteriores están sujetas a modificaciones en cualquier momento.
-
-### 12. Sin garantía
-Comprendes y estás de acuerdo que Disroot.org te provee principalmente de servicios basados en internet. Por lo tanto, los servicios son ofrecidos tal cual, sujetos a disponibilidad y sin responsabilidad para contigo.
-Aunque no quisiéramos fallar a ninguno de nuestros usuarios, no podemos dar ninguna garantía en cuanto a la fiabilidad, accesibilidad, o calidad de nuestros servicios. Estás de acuerdo que el uso de nuestros servicio es riesgo exclusivo tuyo.
-
-\* Por cualquier asunto legal, las [Condiciones de Uso originales (en inglés)](https://disroot.org/en/tos) son las únicas válidas de aplicación. Las condiciones arriba descritas son una mera traducción.
diff --git a/pages/tos/_tos/2col.fr.md b/pages/tos/_tos/2col.fr.md
deleted file mode 100644
index ad0d8dab..00000000
--- a/pages/tos/_tos/2col.fr.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: "Conditions d'utilisation"
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-
-## Conditions d'utilisation
-**Mai 2018 - v1.1**
-
-En utilisant l'un des services fournis par disroot.org, vous acceptez nos conditions d'utilisation. Ces conditions peuvent être modifiées à tout moment sans préavis. Toutefois, nous attachons une grande importance à la transparence et nous ferons de notre mieux pour nous assurer que les utilisateurs sont informés dès que possible de tout changement majeur par e-mail, par le réseau Diaspora* et/ou par une annonce sur le [forum](https://forum.disroot.org/c/disroot/disroot-changelog), les changements mineurs ne seront probablement publiés que sur le forum d'annonce.
-
-Disroot est une communauté. Nous partageons tous les ressources des serveurs, collaborons et utilisons ensemble les services de disroot.org. Il est important que chacun d'entre nous le comprenne et se sente également responsable de cela. Veuillez respecter les directives suivantes afin que nous nous entendions tous :
-
-### 1. Limitation de l'espace disque :
-Les ressources sont rares. N'oubliez pas que le fait de conserver des fichiers et des courriels inutiles peut limiter l'espace sur le serveur, ce qui peut entraîner une diminution du nombre de comptes offerts aux autres. Ne gaspillez pas d'espace !
-
-### 2. Expiration du compte :
-disroot.org ne supprime pas les comptes inutilisés. Cela peut être sujet à changement si nous sommes obligés d'économiser de l'espace disque pour d'autres utilisateurs. De tels changements de politique seront annoncés par tous les canaux de communication bien à l'avance. Nous apprécierions plutôt que les gens prennent la responsabilité de leur compte et de son impact sur les ressources de disroot, et demandent plutôt la suppression du compte lorsqu'ils décident de ne plus utiliser nos services, ou purgent les fichiers inutilisés.
-
-### 3. Mot de passe :
-Pour des raisons de confidentialité, nous ne gardons jamais trace des personnes qui demandent l'activation d'un compte Disroot. Lors de la création de votre compte, vous pouvez choisir des questions qui vous permettront de récupérer votre mot de passe au cas où vous le perdriez/oublieriez. Si vous oubliez également la question ou la réponse à la question, nous ne pourrons pas vous envoyer de nouveau les données pour accéder à votre compte. N'oubliez pas non plus de changer régulièrement votre mot de passe : vous pouvez le faire en vous connectant au panneau d'utilisateur sur user.disroot.org et en cliquant sur le bouton "Changer le mot de passe". **AVERTISSEMENT : La perte de mots de passe entraîne la perte irrémédiable des fichiers cloud. Pour vous en protéger, vous pouvez activer la fonction de récupération de mot de passe dans vos paramètres personnels de Cloud.**
-
-### 4. Spam et virus :
-Pour éviter que nos serveurs soient inclus dans des listes noires, nous ne voulons pas que nos comptes de messagerie soient utilisés pour envoyer des spams. Tout compte surpris à le faire sera désactivé sans autre avis.
-
-
-Si vous recevez une grande quantité de pourriels ou des courriels suspects, veuillez nous le faire savoir à support@disroot.org afin que nous puissions faire une enquête plus approfondie.
-
-### 5. 5. Matériel protégé par le droit d'auteur :
-Le téléchargement et (surtout) le partage public de matériel protégé par le droit d'auteur sur disroot pourrait mettre en danger d'autres utilisateurs et l'ensemble du projet, alors ne le faites pas.
-
-
-Le but de disroot est de promouvoir l'open source, les logiciels libres et toutes sortes de contenus sous droit d'auteur. Adoptez-le et soutenez les artistes et les projets qui publient leurs travaux sous ces licences.
-
-### 6. Responsabilités légales :
-Comme pour tout ce que vous faites, sachez que disroot.org n'est pas responsable de ce que vous écrivez, ni de la sauvegarde de votre propre vie privée. Nous vous invitons donc à profiter de tous les outils existants pour défendre vos droits.
-
-Nous vous rappelons de ne pas télécharger sur le site des documents protégés par des droits d'auteur qui pourraient mettre en danger l'existence même de nos serveurs (et de tous les services qui y sont liés).
-
-Veuillez vous référer à notre politique de confidentialité pour en savoir plus sur la manière dont vos informations sont stockées et utilisées.
-
----
-
-##
-### 7. Propriété et responsabilité du contenu
-
-disroot.org n'est pas responsable du contenu publié sur l'un de nos services. Vous êtes responsable de votre utilisation des services de disroot, de tout contenu que vous fournissez, et de toutes les conséquences qui en découlent. Toutefois, pour assurer notre existence, nous nous réservons le droit de supprimer tout contenu si nous constatons une violation de la loi applicable.
-
-### 8. Lois
-disroot.org est hébergé aux Pays-Bas et est donc soumis aux lois et à la juridiction néerlandaises.
-
-### 9. S'abstenir de certaines activités
-Vous ne pouvez pas vous engager dans les activités suivantes par le biais des services fournis par disroot.org :
-
-
- 2. Contribuer à la discrimination, au harcèlement ou au préjudice contre tout individu ou groupe. Cela comprend la propagation de la haine et du sectarisme par le racisme, l'ethnophobie, l'antisémitisme, le sexisme, l'homophobie et d'autres formes de comportement discriminatoire.
-- 3. contribuer à l'abus d'autrui en distribuant du matériel dont le processus de production a créé de la violence ou des agressions sexuelles contre des personnes ou des animaux.
-- 4. usurper l'identité d'une autre personne ou la dépeindre de manière confuse ou trompeuse, à moins que le récit ne soit clairement classé comme une parodie.
-- 5. Doxing : Le Doxing (la publication des données personnelles d'autres personnes) n'est pas autorisé parce que nous ne pouvons pas évaluer si cela est fait de bonne foi ou quelles conséquences cela aura pour les personnes exposées, et parce que cela implique un risque juridique trop important pour nous.
-- 6. L'utilisation abusive des services en distribuant des virus ou des logiciels malveillants, en s'engageant dans une attaque par déni de service ou en essayant d'obtenir un accès non autorisé à tout système informatique, y compris celui-ci.
-- 7. activité non autorisée par le droit national ou international.
-
-
-### 10. Utilisation des services Disroot pour les activités commerciales
-Disroot est un organisme sans but lucratif qui offre des services aux particuliers sur la base du " paiement à la carte ". En raison de cette structure, nous considérons l'utilisation des services de Disroot à des fins commerciales comme un abus du service et elle sera traitée comme telle.
-
-- 1. Le commerce de tout service Disroot avec une tierce partie est interdit.
-- 2. L'utilisation du courrier électronique à des fins telles que le type de compte "sans réponse" pour une entreprise sera bloquée sans avertissement une fois qu'une telle activité aura été détectée.
.
-- 3. l'envoi de courriels en vrac, y compris mais non limité au marketing et à la publicité, à des fins commerciales, sera traité comme du spam et bloqué dès sa découverte sans préavis.
-- 4. L'utilisation des services Disroot à des fins de gain financier, y compris mais sans s'y limiter, la négociation ou la gestion des ventes, n'est pas tolérée. Les comptes créés dans le but de générer des profits seront sujets à une résiliation sur demande.
-
- 5. L'utilisation des services Disroot pour toute autre activité commerciale sera examinée au cas par cas et la décision de résilier ces comptes sera basée sur la communication avec le titulaire du compte et le type d'activités en question.
-
-
-### 11. Résiliation du compte
-disroot.org peut mettre fin à votre service à tout moment dans les conditions suivantes :
-
-- 1. Il a été constaté que le compte envoyait du spam (quantité excessive de courriels non sollicités).
-
- 2. Le compte s'est engagé dans une ou plusieurs des activités interdites énumérées ci-dessus.
-
-Les conditions ci-dessus sont susceptibles d'être modifiées à tout moment.
-
-### 12. Pas de garantie
-Vous comprenez et acceptez que disroot.org vous fournit principalement des services basés sur Internet. Par conséquent, les services sont offerts tels quels, sous réserve de leur disponibilité et sans responsabilité envers vous.
-Bien que nous ne voulions pas laisser tomber un de nos utilisateurs, nous ne pouvons donner aucune garantie quant à la fiabilité, l'accessibilité ou la qualité de nos services. Vous acceptez que l'utilisation de nos services est à vos risques et périls.
diff --git a/pages/tos/_tos/2col.it.md.old b/pages/tos/_tos/2col.it.md.old
deleted file mode 100644
index 6af4ca73..00000000
--- a/pages/tos/_tos/2col.it.md.old
+++ /dev/null
@@ -1,87 +0,0 @@
----
-title: 'Term Of Services'
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
----
-
-## Termini di utilizzo
-**Maggio 2018 - v1.1**
-
-Usando i servizi messi a disposizione da Disroot accetti i nostri termini di utilizzo. Nonostante riteniamo che la trasparenza sia estremamente importante e facciamo del nostro meglio per aggiornare gli utenti attraverso la posta elettronica, Diaspora* o sul [forum](https://forum.disroot.org/c/disroot/disroot-changelog) queste condizioni possono cambiare in qualsiasi momento senza preavviso. I piccoli cambiamenti verranno invece comunicati solamente sugli annunci del forum.
-Disroot è una comunità. Condividiamo le risorse, collaboriamo e usiamo i servizi in modo condiviso. Risulta quindi importante la responsabilità degli utenti.
-Per far si che il progetto possa funzionare al meglio si prega di attenersi alle seguenti linee guida:
-
-### 1. Limiti di spazio
-Le risorse sono scarse. Tieni presente che la conservazione di file e messaggi di posta elettronica non necessari potrebbe limitare lo spazio sul server, togliendo spazio a possibili ulteriori fruitori di Disroot.
-
-### 2. Scadenza degli account
-
-Anche gli account non utilizzati, per ora, non vengono cancellati. Questa strategia potrebbe cambiare nel caso dovessimo necessitare di nuovo spazio per altri utenti. Questi eventuali cambiamenti verranno naturalmente comunicati in anticipo attraverso i canali descritti precedentemente. La comunicazione da parte dell'utente di un proprio account inutilizzato e quindi da poter eliminare è certamente apprezzata e in linea con il concetto di responsabilità richiesto a tutti gli utenti.
-
-### 3. Password:
-Per ragioni legate alla privacy, non teniamo nessuna traccia di chi richiede l'attivazione di un servizio. Quando viente creato un account, è possibile scegliere una domanda che permetterà di recuperare le credenziali di accesso perdute. Nel caso in cui non si fosse in grado di rispondere alla domanda, non saremo in grado di garantire nuovamente l'accesso all'account. Ricordati inoltre di cambiare la password periodicamente. Puoi farlo accedendo al pannello utente su user.disroot.org e cliccando su "Cambia password". **!ATTENZIONE!** La perdita della password significa pure non avere più accesso ai propri file salvati nel cloud. Per evitare ciò è possibile abilitare il recovery password nelle impostazioni del cloud.
-
-### 4. Spam e virus:
-Onde evitare che i nostri server finiscano nelle blacklist, gli account non possono essere utilizzati per l'invio di spam. Qualsiasi account sorpreso in tale attività sarà disabilitato senza preavviso.
-
-Nel caso in cui dovessi ricevere un numero considerevole di spam o di email sospetti, perfavore contattaci a support@disroot.org così da poter investigare le cause.
-
-### 5. Materiale sottoposto a copyright
-Caricare e soprattutto pubblicare e condividere materiale protetto da copyright può compromettere l'intero progetto, quindi è vietato.
-
-L'obiettivo di disroot è quello di promuovere il software open source, il software libero e qualsiasi contenuto rilasciato sotto copyleft. Disroot incoraggia e supporta gli artisti e i progetti a rilasciare i loro lavori sotto queste licenze d'uso.
-
-### 6. Responsabilità legali:
-Disroot non è responsabile per i contenuti degli utenti. Nonostante faccia il possibile, non è nemmeno responsabile per la privacy dei suoi utenti. Proprio per questo si invita caldamente all'utilizzo di quegli strumenti utili per la difesa dei propri diritti.
-
-Ricordiamo l'importanza di non caricare materiale protetto da copyright che potrebbe mettere a rischio l'esistenza di Disroot e tutti i servizi annessi.
-
-Riferirisi alla privacy policy per capire meglio come i dati vengono salvati e utilizzati.
-
----
-
-##
-### 7. Proprietà e responsabilità dei contenuti
-
-Disroot non è responsabile per i contenuti pubblicati sui suoi servizi. Ogni utente è responsabile dell'uso che fa dei servizi di disroot.org e di ciò che pubblica.
-Disroot, per salvaguardare la propria esistenza, si riserva il diritto di rimuovere eventuali contenuti in violazione con la legge applicabile.
-
-### 8. Leggi
-Disroot è hostato in Olanda e quindi soggetto alla legge e giurisdizione olandese.
-
-### 9. Attività non consentite
-
-Non è possibile svolgere le seguenti attività attraverso i servizi forniti da Disroot:
-
-- 1. Molestare e maltrattare gli altri con minacce, stalking o invio di spam.
-- 2. Utilizzare i servizi per la distribuzione di virus o malware, denial of service o per tentare l'accesso non autorizzato a qualsiasi sistema informatico, incluso quello di Disroot.
-- 3. Distribuire materiale il cui processo ha causato atti di violenza contro persone o animali.
-- 4. Impersonare o fingersi un'altra persona, a meno che l'account non sia chiaramente classificato come parodia.
-- 5. Doxing: la pratica del doxing (pubblicazione di dati personali di altre persone) non è ammessa in quanto implica un rischio legale troppo grande per la nostra infrastruttura e per il nostro progetto.
-
-- 6. Attività non permesse da leggi nazionali e internazionali.
-
-
-### 10. Utilizzo di Disroot per attività commerciali
-Disroot è un'organizzazione no profit che offre servizi sulla base del concetto "paga quanto desideri".
-Proprio per questo l'utilizzo commerciale dei servizi di Disroot è visto come un abuso e verrà trattato di conseguenza.
-
-- 1. È vietato negoziare i servizi di Disroot con terze parti.
-- 2. L'uso dell'account di posta elettronica per scopi come quello del "no-reply" per attività commerciali è proibito e se scoperto bloccato senza nessun preavviso.
-- 3. L'invio di email di massa per scopi commerciali (come ad esempio per campagne di marketing) non è ammesso e se scoperto verrà trattato come per le attività di spam (account bloccato senza preavviso).
-- 4. L'uso dei servizi di Disroot per attività atte a generare profitto non è ammesso.
-- 5. L'utilizzo per altre attività commerciali verrà valutato caso per caso e la decisione comunicata al possessore dell'account.
-
-
-### 11. Cessazione dei servizi
-Disroot potrebbe interrompere l'erogazione di un servizio per un utente nel caso fossero riscontrate una delle seguenti condizioni:
-
-- 1. L'account è stato utilizzato per l'invio di spam).
-- 2. L'account è stato utilizzato per una delle attività proibite citate sopra.
-
-Le seguenti condizioni di utilizzo possono cambiare in qualsiasi momento.
-
-### 12. Nessuna garanzia
-
-Comprendi e accetti che Disroot fornisce principalmente servizi basati su Internet. Pertanto, i servizi sono offerti così come sono, soggetti a disponibilità e senza responsabilità nei tuoi confronti.
-Per quanto ci piacerebbe, non possiamo dare alcuna garanzia sull'affidabilità, l'accessibilità o la qualità dei nostri servizi. Accetti che l'utilizzo dei nostri servizi sia a tuo esclusivo rischio.
diff --git a/pages/tos/_tos/fullbar.en.md b/pages/tos/_tos/fullbar.en.md
new file mode 100755
index 00000000..2bb1294f
--- /dev/null
+++ b/pages/tos/_tos/fullbar.en.md
@@ -0,0 +1,164 @@
+---
+title: 'Term Of Services'
+bgcolor: '#FFF'
+fontcolor: '#1F5C60'
+section_id: tos
+text_align: left
+---
+
+
+**v1.2 - March 2020**
+
+
+
+## About this document
+
+This document has been originally written in English and is the only version for which **Stichting Disroot.org** can be held accountable.
+Any translation of this **Terms of Services** is a community effort to make the information accessible in other languages and should be taken as such, with no other value than merely informative.
+
+# Accepting these Terms
+By using any of the services provided by **Disroot.org** you agree to be bound by our Terms of Services. So, you should start reading these terms before first using our platform.
+
+## Community Notice
+**Disroot** is a community and our platform a part of the Free Software and Open Source ecosystem. We all share servers resources, collaborate and use **Disroot.org** services together. It is very important that each and everyone of us understands it and feels equally responsible for it. So, please keep to the following guidelines so we all get along.
+
+# Terms of Services
+
+
+## 1. Who can use our services?
+Any person who is at least 16 years of age can use the Services.
+
+
+
+
+
+## 2. Space limits on disk
+**Resources are scarce**. Have in mind that keeping unnecessary files and emails might limit server space, which can lead to less accounts served to others.
**Don't litter!**
+
+
+
+
+
+## 3. Account expiration
+For safety reasons, **Disroot.org** does not expire unused accounts. This might be a subject to change if we are forced to save up disk space for other users. Such changes in our terms will be announced via all communication channels well in advance.
We would rather appreciate people taking responsibility for their account and its impact on **Disroot** resources, and rather [**delete their account**](https://user.disroot.org) when they decide not to use our services any longer, or purge unused files.
+
+
+
+
+
+## 4. Password
+We never keep track of anybody who requests the activation of a **Disroot** account. When creating your account, you may either choose security questions and/or adding a secondary email, both of which will allow you to recover your password in case you lose/forget it.
+- If you don't set a secondary email or forget the question or the answers to the questions, we won't be able to re-send you the data to access your account again. Remember as well to periodically change your password: you can do it by login into the [User Self-Service](https://user.disroot.org) and clicking the 'Change password' button.
+
+**! WARNING !** Lost passwords will lead to un-recoverable cloud file loss. To protect yourself from it, you can enable password recovery feature in your personal Cloud settings.
+
+
+
+
+
+## 5. SPAM and Viruses
+To avoid having our servers included in blacklists:
+- We do not allow the use of Disroot email accounts to send spam. Any account caught doing so will be disabled without further notice.
+
+- If you happen to receive great amount of SPAM or any suspicious emails please let us know at support@disroot.org so we can investigate it further.
+
+
+
+
+
+
+## 6. Copyright material
+One of the main aims of **Disroot** is to promote Free Libre and Open Source software and all kind of copyleft content. Embrace it and support artists and projects that release their work under those licences.
+- Uploading and (most of all) publicly sharing copyrighted material on **Disroot** could put other users and **Disroot.org** in serious legal troubles as well as endanger the whole project and the existence of our servers (and all services connected to it) so **just don't do it**.
+
+
+
+
+
+
+## 7. Activities not allowed
+Do not engage in the following activities through the services provided by **Disroot.org**:
+
+
+- Harassing and abusing others by engaging in threats, stalking, or sending spam.
+- Contributing to the discrimination, harassment or harm against any individual or group. That includes the spread of hate and bigotry through racism, ethnophobia, antisemitism, sexism, homophobia and any other forms of discriminatory behavior.
+- Contributing to the abuse of others by distributing material where the production process created violence or sexual assault against persons or animals.
+- Impersonating or portraying another person in a confusing or deceptive manner unless the account is clearly classified as a parody.
+- Doxing: the publication of other people's personal data is not allowed because:
(I) we cannot assess either the purposes or what consequences it will have for the exposed people, and (II), it implies too big a legal risk for Disroot.org.
+- Misuse of services by distributing viruses or malware, engaging in a denial of service attack, or attempting to gain unauthorized access to any computer system, including this one.
+- Activities not permitted by national or international law.
+
+
+
+
+
+
+## 8. Using Disroot services for commercial activities
+**Disroot** is a non-profit organization providing services for individuals on "pay as you wish" basis. Because of this structure we see using **Disroot** services for commercial purposes as an abuse of the service and it will be treated as such.
+These commercial activities or purposes include, but are not limited to:
+
+- Trading any Disroot services with a third party.
This is prohibited.
+- Using email for purposes such as "no-reply" type of accounts for a business.
If such activity is detected, the account will be blocked without a warning.
+- Sending bulk emails, including but not limited to marketing and advertising, for business purposes.
+The account will be treated as spam and blocked upon discovery without any prior notice.
+- Using Disroot services for financial gain, including but not limited to trading or managing sales, is not tolerated.
Accounts created for the purpose of generating profits will be subject to termination upon inquiry.
+
+
+Using Disroot services for any other commercial activity will be examined per case and the decision on terminating such accounts will be based upon communication with the account holder and the type of the activities in question.
+
+If you have any doubts or questions about the scope of the term "commercial activities", please contact us.
+
+
+
+
+
+## 9. Ownership of and responsibility for content
+**Disroot.org** is not responsible for any content published on any of our services. You are responsible for your use of the **Disroot**'s services, for any content you provide and for any consequences thereof. However, to secure our existence, we reserve the right to remove any content if found in violation with applicable law.
+
+
+
+
+
+## 10. Legal responsibilities
+As for anything else you do, be aware that **Disroot.org** is not responsible for what you write, nor for the safeguard of your own privacy. We therefore invite you to make the most of all the existing tools to defend your rights.
+To learn more about how your information is being stored and used, please refer to our **Privacy Statement**.
+
+
+
+
+
+## 11. Laws
+**Disroot.org** is hosted in the **Netherlands** and therefore is subject to **Dutch** laws and jurisdiction.
+
+
+
+
+
+## 12. Account termination
+**Disroot.org** may terminate your service at any time under the following conditions:
+
+- The account has been found to be sending SPAM (excessive amounts of unsolicited email).
+- The account has engaged in one or more of the banned activities listed above.
+
+The above conditions are subject to change at any time.
+
+
+
+
+
+
+## 13. No Warranty
+You understand and agree that **Disroot.org** provides you primarily with internet-based services. Therefore, services are offered as is, subject to availability and without liability to you. As much as we would not like to let any of our users down, we just can not give any warranty as to the reliability, accessibility, or quality of our services.
You agree that the use of our services is at your sole and exclusive risk.
+
+
+
+
+
+
+## 14. Changes on these Terms
+We reserve the right to modify these conditions at any time. We highly evaluate transparency and do our best to make sure users are notified as soon as possible about any major changes via email, social networks and/or the announcement [forum](https://forum.disroot.org/c/disroot/disroot-changelog). Minor changes will most likely only be published on the announcement forum.
+
+You can follow the history of changes on this document on our git repository [**here**](https://git.disroot.org/Disroot/Disroot-ToS/commits/branch/master)
+
+
+[Back to top](#top)
diff --git a/pages/tos/modular.en.md b/pages/tos/modular.en.md
index eb146f64..911c30d8 100644
--- a/pages/tos/modular.en.md
+++ b/pages/tos/modular.en.md
@@ -1,6 +1,6 @@
---
title: Terms Of Service
-bgcolor: '#1F5C60'
+bgcolor: '#FFF'
content:
items: '@self.modular'
order:
diff --git a/vagrant/README.md b/vagrant/README.md
index 8c593b8b..975fce20 100644
--- a/vagrant/README.md
+++ b/vagrant/README.md
@@ -3,13 +3,13 @@
# Disroot Website Development Environment using Vagrant
## requirements
-1. vagrant 2.2.6
+1. vagrant 2.2.10
for install on Debian run commands:
```
- wget https://releases.hashicorp.com/vagrant/2.2.6/vagrant_2.2.6_x86_64.deb
+ wget https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb
```
```
- sudo dpkg -i vagrant_2.2.6_x86_64.deb
+ sudo dpkg -i vagrant_2.2.10_x86_64.deb
```
```
sudo apt install -f
@@ -58,16 +58,24 @@
```
git clone https://git.disroot.org/Disroot/grav-theme-disroot.git ~/Disroot/grav-theme-disroot
```
-4. Clone grav-plugin-language-selector repo to Disroot folder
+4. Clone grav-theme-disrootblog repo to Disroot folder
+ ```
+ git clone https://git.disroot.org/Disroot/grav-theme-disrootblog.git ~/Disroot/grav-theme-disrootblog
+ ```
+5. Clone grav-plugin-language-selector repo to Disroot folder
```
git clone https://git.disroot.org/Disroot/grav-plugin-language-selector.git ~/Disroot/grav-plugin-language-selector
```
-5. Add the local domain name for the hub to your host machine's `/etc/hosts` file.
+6. Clone Disroot-Privacy-Policy repo to Disroot folder
+ ```
+ 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.
```
echo "192.168.33.12 disroot.lan" >> /etc/hosts
```
-6. Launch Vagrant to build the virtual machine (VM). This will take several minutes.
+8. Launch Vagrant to build the virtual machine (VM). This will take several minutes.
```
cd ~/Disroot/disroot-website/vagrant
vagrant up disroot_lan
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 24af1132..e0d8a941 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -18,8 +18,10 @@ Vagrant.configure("2") do |config|
disroot_lan.vm.provision :shell, path: "bootstrap.sh"
disroot_lan.vm.synced_folder "../pages/", "/var/www/pages", owner: "www-data", group: "www-data"
- disroot_lan.vm.synced_folder "../../grav-theme-disroot", "/var/www/grav-theme-disroot", 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 "../../grav-theme-disroot/", "/var/www/grav-theme-disroot", owner: "www-data", group: "www-data"
+ 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/pages/privacy_policy/_pp", owner: "www-data", group: "www-data"
end
end
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index 645777ed..a437eac5 100755
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -8,6 +8,11 @@ YAML="/var/www/disroot.lan/user/config/system.yaml"
# Provisioning actions
apt install dialog
+
+# Avoid Postfix installation interactive screens by preconfiguring this information
+sudo debconf-set-selections <<< "postfix postfix/main_mailer_type select No configuration"
+sudo debconf-set-selections <<< "postfix postfix/mailname string ${WEB_NAME}"
+
# Add sury repository to sources.list for PHP7.4
sudo apt-get -y update
sudo apt-get -y upgrade
@@ -47,8 +52,12 @@ sudo -u "${WWW_USER}" composer install --no-dev -o
sudo chown -R ${WWW_USER}:${WWW_USER} "${WEB_ROOT}"
sudo chmod 775 -R bin/
sudo -u "${WWW_USER}" bin/grav install
-#sudo -u www-data bin/gpm install disroot
+#sudo -u "${WWW_USER}" bin/gpm install disroot
#sudo -u "${WWW_USER}" bin/gpm install language-selector
+
+sudo -u "${WWW_USER}" bin/gpm install themer
+# https://github.com/sommerregen/grav-plugin-themer
+
sudo -u "${WWW_USER}" bin/gpm install form
sudo -u "${WWW_USER}" sed -i 's/quark/disroot/g' "${YAML}"
@@ -95,9 +104,16 @@ sudo sed -i "s/127.0.0.1\tlocalhost/127.0.0.1\tlocalhost $WEB_NAME/" /etc/hosts
sudo mount -o bind /var/www/pages "${WEB_ROOT}""${WEB_NAME}"/user/pages
chown "${WWW_USER}":"${WWW_USER}" -R "${WEB_ROOT}""${WEB_NAME}"/user/pages
+#Add Privacy Statement pages in GRAV
+sudo mount -o bind /var/www/pages/privacy_policy/_pp "${WEB_ROOT}""${WEB_NAME}"/user/pages/privacy_policy/_pp
+chown "${WWW_USER}":"${WWW_USER}" -R "${WEB_ROOT}""${WEB_NAME}"/user/pages/privacy_policy/_pp
+
#Add Disroot theme in GRAV
sudo -u "${WWW_USER}" ln -s "${WEB_ROOT}"/grav-theme-disroot "${WEB_ROOT}""${WEB_NAME}"/user/themes/disroot
+#Add Disroot Blog theme in GRAV
+sudo -u "${WWW_USER}" ln -s "${WEB_ROOT}"/grav-theme-disrootblog "${WEB_ROOT}""${WEB_NAME}"/user/themes/disrootblog
+
#Add language-selector in GRAV
sudo -u "${WWW_USER}" ln -s "${WEB_ROOT}"/grav-plugin-language-selector "${WEB_ROOT}""${WEB_NAME}"/user/plugins/language-selector