Merge branch 'master' into pleroma

2022-11-12 18:33:52 +01:00 · 2022-11-12 18:33:52 +01:00 · ae27a7f30b
parent 8872cd057d 6de6d51397
commit ae27a7f30b
281 changed files with 2013 additions and 1291 deletions
--- a/pages/01.home/_donatebutton/fullbar.de.md
+++ b/pages/01.home/_donatebutton/fullbar.de.md
@ -8,4 +8,4 @@ body_classes: modular
 ---

 <br>
-<a class="button button2" href="https://disroot.org/de/donate">Unterstütze uns</a>
+<a class="button button2" href="https://disroot.org/de/donate">UNTERSTÜTZE UNS</a>
--- a/pages/01.home/_services/services.de.md
+++ b/pages/01.home/_services/services.de.md
@ -11,7 +11,7 @@ services:
        icon: email.png
        link: 'https://disroot.org/services/email'
        text: "Freie und sichere E&#8209;Mail-Accounts, nutzbar mit einem IMAP-Client oder via Online-Benutzeroberfläche."
-        button: 'https://mail.disroot.org'
+        button: 'https://webmail.disroot.org'
        buttontext: "Anmelden"
    -
        title: Cloud
@ -41,13 +41,7 @@ services:
        text: "Gemeinschaftlich und in Echtzeit Dokumente direkt im Webbrowser bearbeiten"
        button: 'https://pad.disroot.org'
        buttontext: "Ein Pad starten"
-    -
-        title: Calc
-        icon: calc.png
-        link: 'https://disroot.org/services/pads'
-        text: "Gemeinschaftlich und in Echtzeit Tabellen direkt im Webbrowser bearbeiten"
-        button: 'https://calc.disroot.org'
-        buttontext: "Ein Calc starten"
+
    -
        title: 'Paste-Bin'
        icon: pastebin.png
@ -69,13 +63,7 @@ services:
        text: "Eine anonyme Meta-Suchmaschine."
        button: 'https://search.disroot.org'
        buttontext: "Suche"
-    -
-        title: Umfragen
-        icon: polls.png
-        link: 'https://disroot.org/services/polls'
-        text: "Onlinedienst zur Abstimmung von Terminen oder um schnell eine gemeinsame Entscheidung zu treffen."
-        button: 'https://poll.disroot.org'
-        buttontext: "Umfrage starten"
+
    -
        title: Projekt-Board
        icon: project_board.png
--- a/pages/01.home/_services/services.en.md
+++ b/pages/01.home/_services/services.en.md
@ -11,7 +11,7 @@ services:
        icon: email.png
        link: 'https://disroot.org/services/email'
        text: "Free and secure email accounts for your desktop IMAP client or via a Web-interface."
-        button: 'https://mail.disroot.org'
+        button: 'https://webmail.disroot.org'
        buttontext: "Log in"
    -
        title: Cloud
@ -41,13 +41,7 @@ services:
        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
@ -69,13 +63,7 @@ services:
        text: "An anonymous multi search engine platform."
        button: 'https://search.disroot.org'
        buttontext: "Search"
-    -
-        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: 'Project Board'
        icon: project_board.png
--- a/pages/01.home/_services/services.es.md
+++ b/pages/01.home/_services/services.es.md
@ -11,7 +11,7 @@ services:
        icon: email.png
        link: 'https://disroot.org/services/email'
        text: "Cuentas de correo seguras y gratuitas para tu cliente IMAP de escritorio o via web."
-        button: 'https://mail.disroot.org'
+        button: 'https://webmail.disroot.org'
        buttontext: "Accede"
    -
        title: Nube
@ -41,13 +41,7 @@ services:
        text: "Crea y edita documentos colaborativamente y en tiempo real directamente en tu navegador."
        button: 'https://pad.disroot.org'
        buttontext: "Abre un bloc"
-    -
-        title: Calc
-        icon: calc.png
-        link: 'https://disroot.org/services/pads'
-        text: "Crea y edita planillas colaborativamente y en tiempo real directamente en tu navegador."
-        button: 'https://calc.disroot.org'
-        buttontext: "Abre una planilla"
+
    -
        title: 'Paste Bin'
        icon: pastebin.png
@ -69,13 +63,7 @@ services:
        text: "Plataforma multimotor de búsqueda anónima."
        button: 'https://search.disroot.org'
        buttontext: "Buscar"
-    -
-        title: Encuestas
-        icon: polls.png
-        link: 'https://disroot.org/services/polls'
-        text: "Servicio para planificar reuniones o tomar decisiones en forma rápida y sencilla."
-        button: 'https://poll.disroot.org'
-        buttontext: "Inicia una encuesta"
+
    -
        title: 'Tablero de proyecto'
        icon: project_board.png
--- a/pages/01.home/_services/services.fr.md
+++ b/pages/01.home/_services/services.fr.md
@ -11,7 +11,7 @@ services:
        icon: email.png
        link: 'https://disroot.org/services/email'
        text: "Comptes de messagerie gratuits et sécurisés pour votre client IMAP de bureau ou via une interface Web."
-        button: 'https://mail.disroot.org'
+        button: 'https://webmail.disroot.org'
        buttontext: "Se connecter"
    -
        title: Cloud
@ -41,13 +41,7 @@ services:
        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
@ -69,13 +63,7 @@ services:
        text: "Une plate-forme anonyme multi moteurs de recherche."
        button: 'https://search.disroot.org'
        buttontext: "Rechercher"
-    -
-        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: 'Project Board'
        icon: project_board.png
--- a/pages/01.home/_services/services.it.md
+++ b/pages/01.home/_services/services.it.md
@ -11,7 +11,7 @@ services:
        icon: email.png
        link: 'https://disroot.org/services/email'
        text: "Account di posta libero e sicuro accessibile attraverso client o interfaccia web."
-        button: 'https://mail.disroot.org'
+        button: 'https://webmail.disroot.org'
        buttontext: "Accedi"
    -
        title: Cloud
@ -41,13 +41,7 @@ services:
        text: "Crea e modifica documenti direttamente nel browser web."
        button: 'https://pad.disroot.org'
        buttontext: "Iniziare"
-    -
-        title: Calc
-        icon: calc.png
-        link: 'https://disroot.org/services/pads'
-        text: "Crea e modifica fogli di calcolo direttamente nel browser web."
-        button: 'https://calc.disroot.org'
-        buttontext: "Iniziare"
+
    -
        title: 'Paste Bin'
        icon: pastebin.png
@ -69,13 +63,7 @@ services:
        text: "Un metamotore di ricerca anonimo."
        button: 'https://search.disroot.org'
        buttontext: "Ricerca"
-    -
-        title: Polls
-        icon: polls.png
-        link: 'https://disroot.org/services/polls'
-        text: "Servizio online per pianificare appuntamenti e prendere decisioni in modo veloce e facile."
-        button: 'https://poll.disroot.org'
-        buttontext: "Iniziare"
+
    -
        title: 'Project Board'
        icon: project_board.png
--- a/pages/01.home/_services/services.ru.md
+++ b/pages/01.home/_services/services.ru.md
@ -11,7 +11,7 @@ services:
        icon: email.png
        link: 'https://disroot.org/services/email'
        text: "Бесплатный и безопасный почтовый сервер с поддержкой IMAP и приятным веб-интерфейсом."
-        button: 'https://mail.disroot.org'
+        button: 'https://webmail.disroot.org'
        buttontext: "Войти"
    -
        title: 'Облако'
@ -41,13 +41,7 @@ services:
        text: "Совместно создавайте и редактируйте документы прямо в браузере."
        button: 'https://pad.disroot.org'
        buttontext: "Создать документ"
-    -
-        title: 'Таблицы'
-        icon: calc.png
-        link: 'https://disroot.org/services/pads'
-        text: "Совместно создавайте и редактируйте электронные таблицы прямо в браузере!"
-        button: 'https://calc.disroot.org'
-        buttontext: "Создать таблицу"
+
    -
        title: 'Paste Bin'
        icon: pastebin.png
@ -69,13 +63,7 @@ services:
        text: "Гибкий приватный инструмент для поиска в интернете."
        button: 'https://search.disroot.org'
        buttontext: "Найти"
-    -
-        title: 'Опросы'
-        icon: polls.png
-        link: 'https://disroot.org/services/polls'
-        text: "Онлайн-сервис для быстрого и удобного проведения массовых опросов."
-        button: 'http://polls.disroot.org'
-        buttontext: "Создать опрос"
+
    -
        title: 'Проекты'
        icon: project_board.png
--- a/pages/01.home/_signup/fullbar.de.md
+++ b/pages/01.home/_signup/fullbar.de.md
@ -8,4 +8,4 @@ body_classes: modular
 ---

 <br>
-<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">Registrieren</a>
+<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">REGISTRIEREN</a>
--- a/pages/01.home/modular.de.md
+++ b/pages/01.home/modular.de.md
@ -16,6 +16,12 @@ content:
 menu: home
 big_header: true
 onpage_menu: true
+
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---

 <link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="de/blog.atom" />
--- a/pages/01.home/modular.es.md
+++ b/pages/01.home/modular.es.md
@ -16,6 +16,11 @@ content:
 menu: home
 big_header: true
 onpage_menu: true
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---

 <link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="es/blog.atom" />
--- a/pages/01.home/modular.fr.md
+++ b/pages/01.home/modular.fr.md
@ -16,6 +16,11 @@ content:
 menu: home
 big_header: true
 onpage_menu: true
+
+translation_banner:
+    set: true
+    last_modified: Mars 2022
+    language: French
 ---

 <link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="fr/blog.atom" />
--- a/pages/01.home/modular.it.md
+++ b/pages/01.home/modular.it.md
@ -16,6 +16,11 @@ content:
 menu: home
 big_header: true
 onpage_menu: true
+
+translation_banner:
+    set: true
+    last_modified: Marzo 2022
+    language: Italian
 ---

 <link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="it/blog.atom" />
--- a/pages/01.home/modular.ru.md
+++ b/pages/01.home/modular.ru.md
@ -16,6 +16,11 @@ content:
 menu: home
 big_header: true
 onpage_menu: true
+
+translation_banner:
+    set: true
+    last_modified: Март 2022
+    language: Russian
 ---

 <link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="ru/blog.atom" />
--- a/pages/02.about/_about-who-and-why/2col.de.md
+++ b/pages/02.about/_about-who-and-why/2col.de.md
@ -13,10 +13,10 @@ wider_column: right
 **Disroot** ist ein in Amsterdam ansässiges Projekt, welches durch Freiwillige unterhalten wird und auf die Unterstützung seiner Gemeinschaft angewiesen ist.


-Ursprünglich haben wir **Disroot** aufgrund unseres persönlichen Bedarfs erschaffen. Wir waren auf der Suche nach einer Software, mit der wir innerhalb unseres Umfelds kommunizieren, teilen und organisieren konnten. Den meisten verfügbaren Lösungen fehlten die grundlegenden Prinzipien, die uns wichtig sind; Unsere Programme sollen **offen**, **dezentralisiert** und **föderalistisch** sein und **Freiheit** und **Datenschutz** absolut **respektieren**.
+Ursprünglich haben wir **Disroot** aufgrund unseres persönlichen Bedarfs erschaffen. Wir waren auf der Suche nach einer Software, mit der wir innerhalb unseres Umfelds kommunizieren, teilen und organisieren konnten. Den meisten verfügbaren Lösungen fehlten die grundlegenden Prinzipien, die uns wichtig sind; unsere Programme sollten **offen**, **dezentralisiert** und **föderalistisch** sein und **Freiheit** und **Datenschutz** absolut **respektieren**.

 Während wir nach solchen Programmen gesucht haben, fanden wir einige wirklich interessante Projekte. Projekte von denen wir denken, dass sie jedem zur Verfügung stehen sollten, der die gleichen Prinzipien wertschätzt wie wir. Deswegen haben wir beschlossen, einige Programme zu bündeln und sie mit Anderen zu teilen. **Disroot** war geboren.

-Durch **Disroot** hoffen wir, die Art, wie Menschen sich alltäglich im Internet begegnen, grundlegend zu ändern. Wir wollen die Menschen ermutigen, aus den goldenen Käfigen der etablierten Software **auszubrechen** und sich offenen und ethischen Alternativen zuzuwenden. Egal, ob auf unserer Plattform oder einer anderen (oder Du bietest sogar irgendwann selbst eine an).
+Durch **Disroot** hoffen wir, die Art, wie Menschen sich alltäglich im Internet begegnen, grundlegend zu ändern. Wir wollen die Menschen ermutigen, aus den "Walled Gardens", den geschlossenen Systemen der etablierten Software **auszubrechen** und sich offenen und ethischen Alternativen zuzuwenden. Egal, ob auf unserer Plattform oder einer anderen (oder Du bietest vielleicht sogar irgendwann selbst eine an).

 Zusammen können wir ein Netzwerk erschaffen, dass wirklich unabhängig ist, ausgerichtet auf den Vorteil der Menschen anstatt auf ihre Ausbeutung.
--- a/pages/02.about/_about-who-and-why/2col.en.md
+++ b/pages/02.about/_about-who-and-why/2col.en.md
@ -10,13 +10,13 @@ wider_column: right

 ---

-**Disroot** is a project based in Amsterdam which is maintained by volunteers and depends on the support of its community.
+**Disroot** is a project that was born from the personal need to communicate, share and organize ourselves within our circles through tools that met a series of fundamental criteria for us: they had to be **open**, **decentralized**, **federated** and above all **respectful** towards **freedom** and **privacy**. None of the most popular solutions complied with them, but in our search we found some very interesting projects that did. And since we thought that they should be available to all those with similar ethical principles, we decided not only to group these applications and share them with others, but also to manage them according to those values. That's how **Disroot** started.


-We originally created **Disroot** out of personal need, we were looking for software we could use to communicate, share and organize within our circles. Most of the available solutions were missing the key elements that we find important; Our tools should be **open**, **decentralized**, **federated** and **respectful** towards **freedom** and **privacy**.
+The project is based in Amsterdam, was founded by **Muppeth** and **Antilopa** in 2015, it is maintained by volunteers and relies on the support of its community. Between 2017 and 2018, a group of members started to get very actively involved and to collaborate very closely. In 2019, two of them, **Fede** and **Meaz**, officially became part of the Core Team that manages the platform. Two years later, in 2021, **Avg_Joe** joined the tasks and responsibilities.

-While searching for such tools, we found some really interesting projects, projects that we believe should be available to anyone who values similar principles. We therefore decided to bundle some applications together and share them with others. This is how **Disroot** got started.

-By running **Disroot** we hope to change how people typically interact on the web. We want to encourage people to **break free** of the walled gardens of popular software and turn to open and ethical alternatives, may it be on our platform or on another (or you could even host your own).
+**Disroot** aims to change the way people are used to interact on the web. We want to encourage and show them not only that there are open and ethical alternatives but also that it is the only possible way to break free from the *walled gardens* proposed and promoted by proprietary software and corporations, either through our platform, others that have similar values and goals or even their own projects.

-Together we can form a network that is truly independent, focused on the benefit of the people rather than the exploitation thereof.
+
+We are convinced that we can build together a truly independent network, focused on the benefit of the people and not on their exploitation.
--- a/pages/02.about/_about-who-and-why/2col.es.md
+++ b/pages/02.about/_about-who-and-why/2col.es.md
@ -6,17 +6,17 @@ body_classes: modular
 wider_column: right
 ---

-<a class="button button1" href="https://disroot.org/es/mission-statement">Lee nuestra Declaración de Objetivos</a>
+<a class="button button1" href="/mission-statement">Lee nuestra Declaración de Objetivos</a>

 ---

-**Disroot** es un proyecto radicado en Amsterdam, mantenido por voluntarixs y que depende del apoyo de su comunidad.
+**Disroot** es un proyecto que nació de la necesidad personal de comunicarnos, compartir y organizarnos dentro de nuestros círculos a través de herramientas que se ajustaran a una serie de criterios fundamentales para nosotrxs: tenían que ser **abiertas**, **descentralizadas**, **federadas** y sobre todo **respetuosas** de la **libertad** y la **privacidad**. Ninguna de las soluciones más populares cumplían con ellos, pero en nuestra búsqueda encontramos algunos proyectos muy interesantes que sí lo hacían. Y como pensamos que debían estar al alcance de todas aquellas personas con principios éticos similares,  decidimos no solo agrupar estas aplicaciones y compartirlas con otrxs, sino también gestionarlas de acuerdo con esos valores. Así es como **Disroot** comenzó.


-Originalmente, creamos **Disroot** por necesidades personales. Buscábamos software que pudiéramos usar para comunicarnos, compartir y organizarnos dentro de nuestros círculos. La mayoría de las soluciones disponibles carecían de los elementos claves que nosotros consideramos importantes: nuestras herramientas debían ser **abiertas**, **descentralizadas**, **federadas** y **respetuosas** de la **libertad** y la **privacidad**.
+El proyecto está radicado en Amsterdam, fue fundado por **Muppeth** y **Antilopa** en 2015, es mantenido por voluntarixs y depende del apoyo de su comunidad. Entre 2017 y 2018, un grupo de miembros comenzaron a involucrarse muy activamente y a colaborar de manera muy estrecha. En 2019, dos de ellos, **Fede** y **Meaz**, pasaron oficialmente a formar parte del Equipo Principal que administra la plataforma. Dos años más tarde, en 2021, **Avg_Joe** se sumó a las tareas y responsabilidades.

-Mientras buscábamos esas herramientas, encontramos algunos proyectos realmente interesantes, proyectos que creemos que deberían estar al alcance de cualquiera que valore principios similares. Por lo tanto, decidimos reunir algunas aplicaciones y compartirlas con otras personas. Así es cómo **Disroot** empezó.

-Con el funcionamiento de **Disroot** esperamos cambiar la manera en que la gente habitualmente interactúa en la web. Queremos alentar a las personas a **liberarse** de los ["jardines vallados"](https://es.wikipedia.org/wiki/Jard%C3%ADn_vallado_(inform%C3%A1tica)) del software popular y cambiar a alternativas abiertas y éticas, ya sea en nuestra plataforma o en otra (o incluso en la tuya propia).
+**Disroot** pretende cambiar la manera en que las personas están acostumbradas a interactuar en la web. Queremos alentarlas y mostrarles no solo que existen alternativas abiertas y éticas sino también que es el único camino posible para liberarse de los *jardines vallados* que proponen y promueven el software propietario y las corporaciones, ya sea a través de nuestra plataforma, de otras que tienen valores y objetivos similares o incluso de sus propios proyectos.

-Juntos podemos construir una red que sea verdaderamente independiente, enfocada en el beneficio de la gente y no en su explotación.
+
+Estamos convencidxs que podemos construir juntxs una red verdaderamente independiente, enfocada en el beneficio de la gente y no en su explotación.
--- a/pages/02.about/_core-team/avg_joe.png
+++ b/pages/02.about/_core-team/avg_joe.png
--- a/pages/02.about/_core-team/fullbar.en.md
+++ b/pages/02.about/_core-team/fullbar.en.md
@ -8,7 +8,11 @@ text_align: center

 ## Disroot Team

-Disroot was founded by **Antilopa** and **Muppeth** in 2015.
-In July 2019 **Fede** and **Meaz** joined the Team.
+**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.

-![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")
+![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
+
+
+## Translations team
+The Italian translation is the work of **@l3o**, French, Spanish and German are taken care by the **Core team**.
+*If you're interested in helping us with this work, contact us [here](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*
--- a/pages/02.about/_core-team/fullbar.es.md
+++ b/pages/02.about/_core-team/fullbar.es.md
@ -8,7 +8,6 @@ text_align: center

 ## Equipo de Disroot

-Disroot fue fundada por **Antilopa** y **Muppeth** en 2015.
-En Julio de 2019 **Fede** y **Meaz** se unieron al Equipo.
+**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.

-![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")
+![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
--- a/pages/02.about/_core-team/fullbar.it.md
+++ b/pages/02.about/_core-team/fullbar.it.md
@ -8,7 +8,10 @@ text_align: center

 ## Disroot Team

-Disroot è stato fondato da **Antilopa** e **Muppeth** nel 2015.
-Nel luglio del 2019 **Fede** e **Meaz** si sono aggiunti al Team.
+**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.

-![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")
+![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
+
+## Team di traduzione
+La traduzione in italiano è opera di **@l3o**, francese, spagnolo e tedesco sono a cura del **core team**.
+*Se sei interessato ad aiutarci con questo lavoro, contattaci [qui](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*
--- a/pages/02.about/_federation/2col.de.md
+++ b/pages/02.about/_federation/2col.de.md
@ -1,5 +1,5 @@
 ---
-title: Federation and Decentralization
+title: Föderation und Dezentralisierung
 fontcolor: '#555'
 wider_column: right
 bgcolor: '#fff'
--- a/pages/02.about/_privacy/2col.ru.md
+++ b/pages/02.about/_privacy/2col.ru.md
@ -8,12 +8,12 @@ bgcolor: '#fff'

 # Конфиденциальность

-Программное обеспечение может быть создано и сформированно во всё, что угодно. Каждая кнопка, каждый цвет и каждая ссылка, которую мы видим и используем в интернете, была помещена туда кем-то. Когда мы используем приложение, предоставленное нам, мы многого не видим, а иногда не задумываемся, сколько всего произошло за интерфейсом, который мы используем. Мы связываемся с другими людьми, храним файлы, организуем встречи и фестивали, отправляем почту или общаемся часами на пролёт, и всё это происходит магически.
+Программное обеспечение может быть создано и сформировано во всё, что угодно. Каждая кнопка, каждый цвет и каждая ссылка, которую мы видим и используем в интернете, была помещена туда кем-то. Когда мы используем приложение, предоставленное нам, мы многого не видим, а иногда не задумываемся, сколько всего произошло за интерфейсом, который мы используем. Мы связываемся с другими людьми, храним файлы, организуем встречи и фестивали, отправляем почту или общаемся часами на пролёт, и всё это происходит магически.
 В последние несколько десятков лет информация стала очень ценной, и её всё проще собирать и обрабатывать. Мы привыкли находиться под постоянным анализом, слепо принимать условия и соглашения для "своего же блага", доверяя властям и мульти-миллиардным компаниям защищать наши интересы, превращая всех нас в продукт их "человеческих ферм".

 **Владей своими данными:**
-Многие сети используют ваши данные, что бы зарабатывать деньги, анализируя ваши взаимодействия, и используют их для предоставления вам рекламы. **Disroot** не использует никаких ваших данных за исключением тех, которые нужны чтобы подключиться и использовать сервис.
-Ваши файлы в облаке всегда зашифрованы вашим пользовательским паролем, а любой загруженный в **Lufi** файл так же зашифрован на стороне клиента; означая, что даже серверные администраторы не имеют доступа к вашим данным. Всякий раз, когда появляется возможность зашифровать что-то, мы её включаем; а если это не возможно, мы советуем использовать стороннее обеспечение для шифровки. Чем меньше мы, админы, знаем вашей информации - тем лучше :D. (_**Tip of the day**: Since your files on **Nextcloud** are encrypted with your user's password, if you forget it you will not be able to access your files again, so **make sure to NEVER lose your password!** (We suggest using a password manager)_) [Read this tutorial](https://howto.disroot.org/ru/tutorials/user/account/administration/ussc)
+Многие сети используют ваши данные, чтобы зарабатывать деньги, анализируя ваши взаимодействия, и используют их для предоставления вам рекламы. **Disroot** не использует никаких ваших данных за исключением тех, которые нужны чтобы подключиться и использовать сервис.
+Ваши файлы в облаке всегда зашифрованы вашим пользовательским паролем, а любой загруженный в **Lufi** файл так же зашифрован на стороне клиента; означая, что даже серверные администраторы не имеют доступа к вашим данным. Всякий раз, когда появляется возможность зашифровать что-то, мы её включаем; а если это невозможно, мы советуем использовать стороннее обеспечение для шифровки. Чем меньше мы, админы, знаем вашей информации - тем лучше :D. (_**Совет дня**: Пока ваши файлы на **Nextcloud** зашифрованы пользовательским паролем, если вы забудете его, то потеряете доступ к вашим файлам снова, так что **старайтесь НИКОГДА не забывать свой пароль!** (Мы предпочитаем использование менеджера паролей)_) [Прочтите об этом здесь](https://howto.disroot.org/ru/tutorials/user/account/administration/ussc)

 ---

--- a/pages/02.about/modular.de.md
+++ b/pages/02.about/modular.de.md
@ -15,4 +15,9 @@ content:
            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---
--- a/pages/02.about/modular.es.md
+++ b/pages/02.about/modular.es.md
@ -15,4 +15,9 @@ content:
            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---
--- a/pages/02.about/modular.fr.md
+++ b/pages/02.about/modular.fr.md
@ -15,4 +15,9 @@ content:
            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: Mars 2022
+    language: French
 ---
--- a/pages/02.about/modular.it.md
+++ b/pages/02.about/modular.it.md
@ -15,4 +15,9 @@ content:
            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: Marzo 2022
+    language: Italian
 ---
--- a/pages/02.about/modular.ru.md
+++ b/pages/02.about/modular.ru.md
@ -15,4 +15,9 @@ content:
            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: Март 2022
+    language: Russian
 ---
--- a/pages/03.services/02.email/_email-clients/clients.de.md
+++ b/pages/03.services/02.email/_email-clients/clients.de.md
@ -41,7 +41,7 @@ clients:
    -
        title: K9Mail
        logo: k9mail.png
-        link: https://k9mail.github.io/
+        link: https://k9mail.app/
        text:
        platforms: [fa-android]

--- a/pages/03.services/02.email/_email-clients/clients.en.md
+++ b/pages/03.services/02.email/_email-clients/clients.en.md
@ -41,7 +41,7 @@ clients:
    -
        title: K9Mail
        logo: k9mail.png
-        link: https://k9mail.github.io/
+        link: https://k9mail.app/
        text:
        platforms: [fa-android]

--- a/pages/03.services/02.email/_email-encryption/2col.de.md
+++ b/pages/03.services/02.email/_email-encryption/2col.de.md
@ -14,3 +14,7 @@ wider_column: right
 Verschlüsselung bedeutet, dass Du Daten mit einem speziellen Kodier-Prozess so veränderst, dass die Daten unkenntlich werden (sie sind verschlüsselt). Du kannst einen speziellen Dekodier-Prozess anwenden und bekommst die Originaldaten zurück. Indem der Dekodier-Prozess geheimgehalten wird, kann niemand anders die Originaldaten aus den verschlüsselten Daten rekonstruieren.

 [YouTube-Video - Wie asymmetrische Verschlüsselung funktioniert (englisch)](https://www.youtube.com/watch?v=E5FEqGYLL0o)
+
+<br>
+![mailvelope](en/mailvelope.svg?resize=150)
+Mailvelope ist ein Browser Add-on für Chrome, Edge und Firefox. Wenn du Disroots Webmail nutzt kannst du damit deine E&#8209;Mails mit PGP sicher verschlüsseln. Schaue dir dazu dieses [howto](https://mailvelope.com/en/help) an.
--- a/pages/03.services/02.email/_email-encryption/2col.en.md
+++ b/pages/03.services/02.email/_email-encryption/2col.en.md
@ -13,3 +13,7 @@ wider_column: right
 Encryption is when you change data with a special encoding process so that the data becomes unrecognizable (it's encrypted).  You can then apply a special decoding process and you will get the original data back. By keeping the decoding process a secret, nobody else can recover the original data from the encrypted data.

 [Video - How asymmetric encryption works](https://invidious.snopyta.org/E5FEqGYLL0o)
+
+<br>
+![mailvelope](en/mailvelope.svg?resize=150)
+You can use Mailvelope, a browser add-on in Chrome, Edge and Firefox, that securely encrypts your emails with PGP using Disroot webmail. Check this [howto](https://mailvelope.com/en/help).
--- a/pages/03.services/02.email/_email-encryption/2col.es.md
+++ b/pages/03.services/02.email/_email-encryption/2col.es.md
@ -13,3 +13,7 @@ wider_column: right
 Cifrar es modificar información con un proceso especial de codificación para que esta sea irreconocible (es cifrada). Luego puedes aplicar un proceso especial de decodificación y obtienes la información original de vuelta. Manteniendo en secreto el proceso de decodificación, nadie más puede recuperar la información original que ha sido cifrada.

 [Video - Criptografía asimétrica explicada](https://invidious.snopyta.org/3qk1fy6rOJM)
+
+<br>
+![mailvelope](en/mailvelope.svg?resize=150)
+Puedes utilizar Mailvelope, un complemento del navegador en Chrome, Edge y Firefox, que encripta de forma segura tus correos electrónicos con PGP utilizando el webmail de Disroot. Consulta este [guías](https://mailvelope.com/en/help).
--- a/pages/03.services/02.email/_email-encryption/2col.fr.md
+++ b/pages/03.services/02.email/_email-encryption/2col.fr.md
@ -13,3 +13,7 @@ wider_column: right
 Le chiffrement est lorsque vous modifiez des données à l'aide d'un procédé de codage spécial de sorte que les données deviennent illisibles (c'est chiffré).  Vous pouvez ensuite appliquer un processus de décodage spécial et récupérer les données originales.  En gardant le processus de décodage secret, personne d'autre ne peut récupérer les données originales à partir des données chiffrées.

 [Video - How asymmetric encryption works](https://www.youtube.com/watch?v=E5FEqGYLL0o)
+
+<br>
+![mailvelope](en/mailvelope.svg?resize=150)
+Vous pouvez utiliser Mailvelope, un module complémentaire de navigateur dans Chrome, Edge et Firefox, qui chiffre vos e-mails de manière sécurisée avec PGP en utilisant le webmail de Disroot. Consultez ce [tutoriel](https://mailvelope.com/fr/help).
--- a/pages/03.services/02.email/_email-encryption/2col.it.md
+++ b/pages/03.services/02.email/_email-encryption/2col.it.md
@ -11,4 +11,9 @@ wider_column: right
 ---

 La crittografia avviene quando si modificano i dati con uno speciale processo di codifica in modo che i dati diventino irriconoscibili (sono crittografati). È quindi possibile applicare un processo di decodifica speciale e si otterranno i dati originali. Mantenendo il processo di decodifica un segreto, nessun altro può recuperare i dati originali dai dati crittografati.
-https://www.youtube.com/watch?v=E5FEqGYLL0o
+
+[Video di YouTube - Come funziona la crittografia asimmetrica (in inglese)](https://invidious.snopyta.org/E5FEqGYLL0o)
+
+<br>
+![mailvelope](en/mailvelope.svg?resize=150)
+Puoi utilizzare Mailvelope, un componente aggiuntivo del browser per Chrome, Edge e Firefox, che crittografa in modo sicuro le tue e-mail con PGP utilizzando Disroot webmail. Guarda questa [guida](https://mailvelope.com/en/help).
--- a/pages/03.services/02.email/_email-encryption/2col.ru.md
+++ b/pages/03.services/02.email/_email-encryption/2col.ru.md
@ -13,3 +13,7 @@ wider_column: right
 Шифрование - это когда вы изменяете данные с помощью специального процесса кодирования, так что данные становятся неузнаваемыми (они зашифрованы). Затем вы можете применить специальный процесс декодирования, и вы получите исходные данные обратно. Сохраняя ключ декодирования в секрете, никто другой не сможет восстановить исходные данные из наших зашифрованных данных.

 [Видео о том, как работает ассиметричное шифрование (EN)](https://www.youtube.com/watch?v=E5FEqGYLL0o)
+
+<br>
+![mailvelope](en/mailvelope.svg?resize=150)
+You can use Mailvelope, a browser add-on in Chrome, Edge and Firefox, that securely encrypts your emails with PGP using Disroot webmail. Check this [howto](https://mailvelope.com/en/help).
--- a/pages/03.services/02.email/_email-encryption/en/mailvelope.svg
+++ b/pages/03.services/02.email/_email-encryption/en/mailvelope.svg
@ -0,0 +1 @@
+<svg viewBox="0 0 175 32" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle cx="16" cy="16" r="16" fill="#FF004F"/><path d="M15.995 28.667c-3.39 0-6.57-1.311-8.955-3.691-2.387-2.383-3.704-5.567-3.707-8.966a12.628 12.628 0 0 1 .592-3.836l.007-.028c.087-.306.194-.6.318-.875.022-.055.047-.116.073-.176.11-.251.545-1.115 1.588-1.77.943-.593 1.77-.644 1.866-.648.228-.027.464-.04.699-.04 1.07 0 2.015.423 2.662 1.194.492.587.76 1.307.78 2.097a4.321 4.321 0 0 1 1.959-.481c1.07 0 2.016.424 2.662 1.194.039.046.076.094.113.142.859-.852 1.993-1.336 3.14-1.336 1.07 0 2.015.424 2.662 1.194.656.782.913 1.81.722 2.893l-.672 3.807c-.09.513.017.982.301 1.321.274.327.696.507 1.187.507 1.482 0 2.003-1.08 2.345-2.246.293-1.033.428-2.107.401-3.191a10.675 10.675 0 0 0-3.219-7.387 10.683 10.683 0 0 0-7.445-3.086H16c-2.14 0-4.209.63-5.982 1.825a.97.97 0 0 1-.544.167.958.958 0 0 1-.729-.335L8.74 6.91a.96.96 0 0 1 .196-1.418 12.585 12.585 0 0 1 7.317-2.156 12.604 12.604 0 0 1 8.65 3.67 12.601 12.601 0 0 1 3.758 8.612 12.664 12.664 0 0 1-.41 3.606h.001l-.043.158-.019.063a12.57 12.57 0 0 1-.4 1.187c-.079.187-.518 1.143-1.599 1.822-.935.588-1.673.618-1.76.62a4.89 4.89 0 0 1-.439.02c-1.07 0-2.016-.424-2.662-1.194-.656-.783-.913-1.81-.722-2.893l.672-3.808c.09-.512-.017-.982-.301-1.32-.274-.327-.696-.507-1.187-.507-1.166 0-2.325.99-2.531 2.162l-.735 3.998a.528.528 0 0 1-.52.432h-.883a.527.527 0 0 1-.52-.623l.762-4.144c.09-.51-.017-.98-.3-1.319-.275-.326-.697-.506-1.188-.506-1.165 0-2.324.99-2.531 2.162l-.734 3.998a.528.528 0 0 1-.52.432H9.21a.526.526 0 0 1-.52-.623l.764-4.159.512-2.799c.09-.509-.018-.976-.302-1.315-.274-.327-.696-.507-1.187-.507-1.21 0-1.989.465-2.454 1.463a10.662 10.662 0 0 0-.755 4.408c.108 2.737 1.266 5.313 3.26 7.252 1.995 1.939 4.603 3.024 7.343 3.057H16c2.266 0 4.435-.7 6.272-2.026a.942.942 0 0 1 .555-.18.962.962 0 0 1 .565 1.743 12.571 12.571 0 0 1-7.397 2.389" fill="#FFF2F6"/><path d="M59.864 6.896c.504 0 .864.408.864.96v14.448c0 .528-.384.96-.936.96a.943.943 0 0 1-.936-.96V10.928l-4.392 6.864c-.288.456-.6.672-1.008.672-.432 0-.72-.216-1.008-.672l-4.392-6.864v11.376c0 .528-.408.96-.936.96-.552 0-.936-.432-.936-.96V7.856c0-.552.36-.96.864-.96.432 0 .696.192 1.08.816l5.328 8.28 5.304-8.28c.408-.624.672-.816 1.104-.816zm16.168 4.152c.504 0 .912.456.912 1.008V22.28a.973.973 0 0 1-.984.984.959.959 0 0 1-.984-.984v-.864c-.936 1.128-2.448 1.848-4.2 1.848-3.288 0-5.784-2.616-5.784-6.12 0-3.48 2.496-6.096 5.784-6.096 1.848 0 3.408.768 4.32 1.992v-.984c0-.552.384-1.008.936-1.008zM71.04 21.56c2.424 0 4.08-1.8 4.08-4.416 0-2.616-1.656-4.392-4.08-4.392-2.376 0-4.152 1.872-4.152 4.416 0 2.52 1.752 4.392 4.152 4.392zM82.936 5.528c.744 0 1.344.6 1.344 1.32 0 .744-.6 1.32-1.344 1.32-.744 0-1.368-.576-1.368-1.32 0-.72.624-1.32 1.368-1.32zm-.048 17.736c-.528 0-.888-.432-.888-.96V12.008c0-.528.384-.96.936-.96.528 0 .912.432.912.96v10.296c0 .528-.432.96-.96.96zm6.952 0c-.552 0-.936-.432-.936-.96V5.696c0-.528.384-.96.936-.96.528 0 .912.432.912.96v16.608c0 .528-.384.96-.912.96zm15.328-12.216c.48 0 .912.432.912.912 0 .144-.024.288-.072.408l-4.92 10.32c-.168.36-.48.576-.84.576-.384 0-.696-.216-.864-.576l-4.896-10.296a1.359 1.359 0 0 1-.072-.432c0-.48.408-.912.912-.912.36 0 .696.24.864.576l4.056 8.76 4.056-8.76a.948.948 0 0 1 .864-.576zm9.232 0c3.096 0 5.328 2.256 5.328 5.4v.12c0 .768-.408 1.152-1.128 1.152h-8.256c.24 2.304 1.944 3.84 4.296 3.84a4.64 4.64 0 0 0 3.048-1.128c.192-.168.408-.264.624-.264.456 0 .816.336.816.816 0 .312-.12.528-.456.84-1.152.96-2.544 1.44-4.056 1.44-3.552 0-6.192-2.616-6.192-6.096 0-3.432 2.64-6.12 5.976-6.12zm-.048 1.68c-1.992 0-3.528 1.368-3.936 3.36h7.416c-.048-1.968-1.44-3.36-3.48-3.36zm10.552 10.536c-.552 0-.936-.432-.936-.96V5.696c0-.528.384-.96.936-.96.528 0 .912.432.912.96v16.608c0 .528-.384.96-.912.96zm11.248-12.216c3.408 0 6.12 2.688 6.12 6.096 0 3.384-2.712 6.096-6.144 6.096-3.408-.024-6.096-2.712-6.096-6.096 0-3.432 2.688-6.096 6.12-6.096zm0 1.704c-2.424 0-4.248 1.896-4.224 4.416 0 2.496 1.8 4.368 4.2 4.368 2.4 0 4.248-1.896 4.248-4.368 0-2.52-1.824-4.416-4.224-4.416zm16.504-1.704c3.312 0 5.784 2.616 5.784 6.096 0 3.504-2.472 6.12-5.784 6.12-1.8 0-3.384-.768-4.296-1.968v5.352c0 .552-.408.96-.912.96-.552 0-.936-.432-.936-.96V11.96c0-.528.384-.936.936-.936.504 0 .912.408.912.936v1.056c.912-1.2 2.472-1.968 4.296-1.968zm-.264 10.512c2.4 0 4.152-1.872 4.152-4.392 0-2.544-1.752-4.416-4.152-4.416-2.424 0-4.056 1.776-4.056 4.392 0 2.64 1.608 4.416 4.056 4.416zm15.424-10.512c3.096 0 5.328 2.256 5.328 5.4v.12c0 .768-.408 1.152-1.128 1.152h-8.256c.24 2.304 1.944 3.84 4.296 3.84a4.64 4.64 0 0 0 3.048-1.128c.192-.168.408-.264.624-.264.456 0 .816.336.816.816 0 .312-.12.528-.456.84-1.152.96-2.544 1.44-4.056 1.44-3.552 0-6.192-2.616-6.192-6.096 0-3.432 2.64-6.12 5.976-6.12zm-.048 1.68c-1.992 0-3.528 1.368-3.936 3.36h7.416c-.048-1.968-1.44-3.36-3.48-3.36z" fill="#404040" fill-rule="nonzero"/></g></svg>
--- a/pages/03.services/02.email/_email-webmail/2col.de.md
+++ b/pages/03.services/02.email/_email-webmail/2col.de.md
@ -1,5 +1,5 @@
 ---
-title: 'E-Mail Webmail'
+title: 'E-mail Webmail'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
@ -7,23 +7,24 @@ wider_column: right

 ## Webmail

-![webmail](de/webmail.png)
+![webmail](en/webmail.png)

 ---

+<br>
+Du kannst von jedem Gerät (mit Internetzugang) auf Deine E&#8209;Mails zugreifen, indem Du unsere Webmail-Oberfläche unter [https://webmail.disroot.org](https://webmail.disroot.org) nutzt.

-Du kannst von jedem Gerät (mit Internetzugang) auf Deine E&#8209;Mails zugreifen, indem Du unsere Webmail-Oberfläche unter [https://mail.disroot.org](https://mail.disroot.org) nutzt.
+Unsere Webmail haben wir mit **Roundcube** verwirklicht. Roundcube ist ein moderner Ansatz zum Thema Webmail. Es ist simpel, schnell und bietet die meisten Features, die man von Webmail erwarten kann:

-Unsere Webmail haben wir mit **RainLoop** verwirklicht. RainLoop ist ein moderner Ansatz zum Thema Webmail. Es ist simpel, schnell und bietet die meisten Features, die man von Webmail erwarten kann:
+<ul class=disc>
+<li>Theme: Eine ansprechende Oberfläche: im Disroot Design mit Unterstützung für unterschiedliche Endgeräte.</li>
+<li>Übersetzungen: Die Benutzeroberfläche gibt es in über 80 Sprachen.</li>
+<li>Drag-&-drop support: verschiebe deine Nachrichten mit der Maus.</li>
+<li>Volle Unterstützung von MIME und HTML Nachrichten.</li>
+<li>Vorschau von Anhängen: Anhänge werden direkt in der E&#8209;Mail angezeigt.</li>
+<li>Anzeige als Threads: Konversationen können als Thread angezeigt werden.</li>
+<li>Filter: Mit Hilfe von Regeln verschiebst oder kopierst Du E&#8209;Mails in die richtigen Verzeichnisse, leitest sie weiter oder lehnt sie ab.</li>
+<li>Verzeichnisse: Verwalte Deine Verzeichnisse (Erstellen, Entfernen oder Verstecken).</li>
+</ul>

- Themes: Wähle Dein Hintergrundbild.
- Threads: Stelle Unterhaltungen im Thread-Modus dar.
- Übersetzungen: Die Benutzeroberfläche gibt es in vielen Sprachen.
- Filter: Mit Hilfe von Regeln verschiebst oder kopierst Du E&#8209;Mails in die richtigen Verzeichnisse, leitest sie weiter oder lehnt sie ab.
- Verzeichnisse: Verwalte Deine Verzeichnisse (Erstellen, Entfernen oder Verstecken).
- Kontakte: Du kannst Deine Kontakte hinzufügen oder sogar Deine Nextcloud-Kontakte direkt mit der Webmail verknüpfen.
- GPG Verschlüsselung: Der **RainLoop**-Webclient bietet integrierte Verschlüsselung.
-
-**HINWEIS**: *Bitte sei Dir bewusst, dass es sich hierbei um eine serverseitige Verschlüsselung handelt. Das heißt, dass Du keine Kontrolle über Deinen geheimen Schlüssel hast. Diese Methode ist nicht so sicher wie die Verwendung eines Desktop-Clients, wie zum Beispiel Thunderbird, mit lokaler Verschlüsselung. Andererseits ist es natürlich besser als überhaupt keine Verschlüsselung zu verwenden...*
-
-Projekt-Website: [https://www.rainloop.net](https://www.rainloop.net/)
+Projekt-Website: [https://roundcube.net](https://roundcube.net)
--- a/pages/03.services/02.email/_email-webmail/2col.en.md
+++ b/pages/03.services/02.email/_email-webmail/2col.en.md
@ -12,20 +12,20 @@ wider_column: right
 ---

 <br>
-You can access your mail from any devices by using our webmail at [https://mail.disroot.org](https://mail.disroot.org)
+You can access your mail from any devices by using our webmail at [https://webmail.disroot.org](https://webmail.disroot.org)

-Our webmail is powered by **RainLoop**. Rainloop is a modern approach to webmail. It's simple, fast and provides most of the features one could expect from webmail:
+Our webmail is powered by **Roundcube**. Roundcube is a modern approach to webmail. It's simple, fast and provides most of the features one could expect from webmail:

 <ul class=disc>
-<li>Themes: Select your background picture.</li>
-<li>Threads: Display conversations in a threaded mode.</li>
-<li>Translations: The interface is being translated to many languages</li>
-<li>Filters: Set up rules to automatically move or copy email to specific folders, forward or reject emails.</li>
+<li>A nice responsive skin: a beautiful Disroot flavor skin with multi-device support.</li>
+<li>Translations: the interface is translated in more than 80 languages.</li>
+<li>Drag-&-drop message management: move your messages with your mouse.</li>
+<li>Full support for MIME and HTML messages.</li>
+<li>Attachment previews: see the images directly within your messages.</li>
+<li>Threaded message listing: Display conversations in a threaded mode.</li>
+<li>Filters: Set up rules to automatically move or copy email to specific folders, forward or reject emails, according to subject, sender, etc.</li>
 <li>Folders: Manage your folders (add, remove, or hide).</li>
-<li>GPG Encryption: The <b>RainLoop</b> web-client offers built in encryption option.</li>
-<li>Contacts: you can add your contacts and even link your Nextcloud contacts directly into the webmail.</li>
 </ul>

-**NOTE**: *Please be aware that this is a server side encryption, which means you don't have control on your secret key. This is not as safe as using desktop email client, such as Thunderbird, with local encryption. But then again, it is better than not using any encryption at all...*

-Project Homepage: [https://www.rainloop.net](https://www.rainloop.net/)
+Project Homepage: [https://roundcube.net](https://roundcube.net)
--- a/pages/03.services/02.email/_email-webmail/2col.es.md
+++ b/pages/03.services/02.email/_email-webmail/2col.es.md
@ -1,5 +1,5 @@
 ---
-title: 'Webmail'
+title: 'Email Webmail'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
@ -12,20 +12,21 @@ wider_column: right
 ---

 <br>
-Puedes acceder a tu correo electrónico desde cualquier dispositivo, utilizando nuestro cliente web en [https://mail.disroot.org](https://mail.disroot.org)
+Puedes acceder a tu correo electrónico desde cualquier dispositivo, utilizando nuestro cliente web en [https://webmail.disroot.org](https://webmail.disroot.org).

-Nuestro webmail está desarrollado por **RainLoop**. Es simple, rápido y proporciona la mayoría de las características que podríamos esperar del correo web:
+
+Nuestro webmail está desarrollado por **Roundcube**. Es simple, rápido y proporciona la mayoría de las características que podríamos esperar del correo web:

 <ul class=disc>
-<li>Temas: Selecciona tu imagen de fondo.</li>
-<li>Hilos: Muestra las conversaciones en forma de hilos jerárquicos.</li>
-<li>Traducciones: La interfaz está siendo traducida a muchos idiomas</li>
-<li>Filtros: Configura reglas para mover o copiar correos automáticamente a carpetas específicas, reenviarlos o rechazarlos.</li>
-<li>Carpetas: Gestiona tus carpetas (agregar, quitar u ocultar).</li>
-<li>Cifrado GPG: El cliente web <b>RainLoop</b> ofrece una opción de cifrado incorporado.</li>
-<li>Contactos: puedes agregar tus contactos e incluso vincular los de Nextcloud directamente en el webmail.</li>
+<li>Un tema agradable y adaptable: un hermoso tema de Disroot con soporte para múltiples dispositivos.</li>
+<li>Traducciones: la interfaz está traducida a más de 80 idiomas.</li>
+<li>Gestión de mensajes "arrastrar-y-soltar": mueve tus correos con el ratón.</li>
+<li>Soporte completo para mensajes MIME y HTML.</li>
+<li>Vista previa de adjuntos: ve las imágenes directamente en tus mensajes.</li>
+<li>Listado de mensajes en hilos: muestra las conversaciones en forma de hilos jerárquicos.</.</li>
+<li>Filtros: configura reglas para mover o copiar correos automáticamente a carpetas específicas, reenviarlos o rechazarlos de acuerdo con el asunto, el remitente, etc.</li>
+<li>Carpetas: gestiona tus carpetas (agregar, quitar u ocultar).</li>
 </ul>

-**AVISO**: *Por favor, ten en cuenta que se trata de cifrado del lado del servidor, lo que significa que no tienes control sobre tu clave secreta. Esto no es tan seguro como utilizar un cliente de correo de escritorio, como Thunderbird, con cifrado local. Pero, por otro lado, es mejor que no usar cifrado en absoluto...*

-Página del proyecto: [https://www.rainloop.net](https://www.rainloop.net/)
+Página del proyecto: [https://roundcube.net](https://roundcube.net)
--- a/pages/03.services/02.email/_email-webmail/2col.fr.md
+++ b/pages/03.services/02.email/_email-webmail/2col.fr.md
@ -1,31 +1,31 @@
 ---
-title: 'Messagerie Web'
+title: 'Email Webmail'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
 ---

-## Messagerie Web:
+## Webmail

-![Messagerie Web](en/webmail.png)
+![webmail](en/webmail.png)

 ---

 <br>
-Vous pouvez accéder à votre messagerie de n'importe quel appareil en utilisant la messagerie web à l'adresse: [https://mail.disroot.org](https://mail.disroot.org)
+Vous pouvez accéder à votre courrier depuis n'importe quel appareil en utilisant notre webmail à l'adresse [https://webmail.disroot.org](https://webmail.disroot.org).

-Notre webmail est propulsé par **RainLoop**. RainLoop est une approche moderne de la messagerie Web. Cela a l'air nouveau et simple, mais cela vous offre la plupart des fonctionnalités que l'on peut attendre de la messagerie Web:
+Notre webmail est alimenté par **Roundcube**. Roundcube est une approche moderne du webmail. C'est simple, rapide et fournit la plupart des fonctionnalités que l'on peut attendre d'un webmail :

 <ul class=disc>
-<li>Thèmes: Sélectionnez votre photo de fond.</li>
-<li>Fils: Afficher les conversations en mode fil de discussion.</li>
-<li>Traductions: L'interface est en cours de traduction dans plusieurs langues.</li>
-<li>Filtres: Définissez des règles pour déplacer ou copier automatiquement les e-mails dans des dossiers spécifiques, transférer ou rejeter les e-mails.</li>
-<li>Dossiers: Gérez vos dossiers (ajout, suppression ou masquage).</li>
-<li>Chiffrement GPG: Le client web RainLoop offre une option de chiffrement intégré.</li>
-<li>Contacts: vous pouvez ajouter vos contacts et même directement lier vos contacts Nextcloud.</li>
+<li>Un joli theme réactif : un bel habillage à la saveur de Disroot avec une prise en charge multi-appareils.</li>
+<li>Traductions : l'interface est traduite dans plus de 80 langues..</li>
+<li>Gestion des messages par glisser-déposer : déplacez vos messages avec votre souris..</li>
+<li>Prise en charge complète des messages MIME et HTML.</li>
+<li>Aperçu des pièces jointes : visualisez les images directement dans vos messages..</li>
+<li>Liste de messages en fil de discussion : Afficher les conversations en mode filaire.</li>
+<li>Filtres : Définissez des règles pour déplacer ou copier automatiquement les e-mails dans des dossiers spécifiques, les transférer ou les rejeter, en fonction de l'objet, de l'expéditeur, etc.</li>
+<li>Dossiers : Gérer vos dossiers (ajouter, supprimer ou masquer).</li>
 </ul>

-**ATTENTION**: *Veuillez noter qu'il s'agit d'un chiffrement côté serveur, ce qui signifie que vous n'avez aucun contrôle sur votre clé secrète. Ce n'est pas aussi sûr que d'utiliser un client de messagerie électronique de bureau, tel que Thunderbird, avec un chiffrement local. Mais encore une fois, c'est mieux que de ne pas utiliser de chiffrement du tout...*

-Page d'Accueil du Projet: [https://www.rainloop.net](https://www.rainloop.net/)
+Project Homepage: [https://roundcube.net](https://roundcube.net)
--- a/pages/03.services/02.email/_email-webmail/2col.it.md
+++ b/pages/03.services/02.email/_email-webmail/2col.it.md
@ -1,5 +1,5 @@
 ---
-title: 'Webmail'
+title: 'Email Webmail'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
@ -12,15 +12,21 @@ wider_column: right
 ---

 <br>
+Puoi accedere alla tua posta da qualsiasi dispositivo utilizzando la nostra webmail all'indirizzo [https://mail.disroot.org](https://mail.disroot.org)
+
+
+La nostra webmail usa **Roundcube**. Roundcube è un software semplice, veloce e fornisce la maggior parte delle funzionalità che ci si può aspettare da una webmail:

-RainLoop è una webmail moderna dall'aspetto semplice ma che offre tutte le impostazioni e le configurazioni che ci si può aspettare da un servizio di posta moderno:
 <ul class=disc>
-<li>Temi: Possibilità di scegliere tra vari sfondi.</li>
-<li>Vista per argomenti: Possibilità di visualizzare i messaggi in ordine di argomenti.</li>
-<li>Localizzazione: Possibilità di scegliere tra varie lingue.</li>
-<li>Filtri: Possibilità di creare automaticamente dei filtri per spostare, copiare, inoltrare o eliminare i messaggi.</li>
-<li>Cartelle: Possibilità di gestire le cartelle (aggiungere, rimuovere o nascondere).</li>
-<li>GPG: RainLoop offre la possibilità di criptare i messaggi diretttamente dall'interfaccia web.</li>
+<li>Una bella interfaccia grafica reattiva: una bellissima skin dal sapore Disroot con supporto multi-dispositivo.</li>
+<li>Traduzioni: l'interfaccia è tradotta in più di 80 lingue.</li>
+<li>Gestione dei messaggi drag-and-drop: sposta i tuoi messaggi con il mouse.</li>
+<li>Pieno supporto per messaggi MIME e HTML.</li>
+<li>Anteprime allegati: guarda le immagini direttamente all'interno dei tuoi messaggi.</li>
+<li>Elenco dei messaggi in thread: visualizza le conversazioni in modalità thread.</li>
+<li>Filtri: imposta le regole per spostare o copiare automaticamente le e-mail in cartelle specifiche, inoltrare o rifiutare le e-mail, in base all'oggetto, al mittente, ecc.</li>
+<li>Cartelle: gestisci le tue cartelle (aggiungi, rimuovi o nascondi).</li>
 </ul>

-*Attenzione, l'utilizzo di GPG direttamente dall'interfaccia web significa non avere il pieno controllo sulla propria chiave privata. Questa opzione non è così sicura come l'uso di GPG su un client di posta elettronica come Thunderbird che permette di gestire le proprie chiavi in locale.
+
+Homepage del progetto: [https://roundcube.net](https://roundcube.net)
--- a/pages/03.services/02.email/_email-webmail/2col.ru.md
+++ b/pages/03.services/02.email/_email-webmail/2col.ru.md
@ -12,19 +12,20 @@ wider_column: right
 ---

 <br>
-Вы можете получить доступ к своей почте с любых устройств, используя нашу веб-почту по адресу [https://mail.disroot.org](https://mail.disroot.org)
+You can access your mail from any devices by using our webmail at [https://webmail.disroot.org](https://webmail.disroot.org)

-Наша веб-почта работает на **RainLoop**. Rainloop - это современный подход к почтовому клиенту. Это просто, быстро и предоставляет большинство функций, которые можно ожидать от почтового сервиса:
+Our webmail is powered by **Roundcube**. Roundcube is a modern approach to webmail. It's simple, fast and provides most of the features one could expect from webmail:

 <ul class=disc>
-<li>Оформление: Установка вашего фонового изображения.</li>
-<li>Локализация: Веб-интерфейс переведен на большое количество языков, в том числе на русский.</li>
-<li>Фильтры: Настройка правил для автоматического копирования или перемещения писем в специальные папки, пересылки или отклонения почты.</li>
-<li>Папки: Собственная настройка папок для упорядоченного хранения писем (удаление, переименование или скрытие).</li>
-<li>GPG-шифрование: <b>RainLoop</b> имеет настройки шифрования.</li>
-<li>Контакты: Вы можете добавлять свои контакты и даже связывать контакты Nextcloud прямо в веб-почте.</li>
+<li>A nice responsive skin: a beautiful Disroot flavor skin with multi-device support.</li>
+<li>Translations: the interface is translated in more than 80 languages.</li>
+<li>Drag-&-drop message management: move your messages with your mouse.</li>
+<li>Full support for MIME and HTML messages.</li>
+<li>Attachment previews: see the images directly within your messages.</li>
+<li>Threaded message listing: Display conversations in a threaded mode.</li>
+<li>Filters: Set up rules to automatically move or copy email to specific folders, forward or reject emails, according to subject, sender, etc.</li>
+<li>Folders: Manage your folders (add, remove, or hide).</li>
 </ul>

-**ПРИМЕЧАНИЕ**: *Имейте в виду, что это шифрование на стороне сервера, что означает, что вы не можете контролировать свой секретный ключ. Это не так безопасно, как использование настольного почтового клиента, такого как Thunderbird, с локальным шифрованием. Но опять же, это лучше, чем вообще не использовать никакого шифрования...*

-Страница проекта: [https://www.rainloop.net](https://www.rainloop.net/)
+Project Homepage: [https://roundcube.net](https://roundcube.net)
--- a/pages/03.services/02.email/_email-webmail/de/webmail.png
+++ b/pages/03.services/02.email/_email-webmail/de/webmail.png
--- a/pages/03.services/02.email/_email-webmail/en/webmail.png
+++ b/pages/03.services/02.email/_email-webmail/en/webmail.png
--- a/pages/03.services/02.email/_email-x-storage/2col.de.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.de.md
@ -1,19 +1,31 @@
 ---
-title: 'Zusätzlicher Mailboxspeicher'
+title: 'Zusätzlicher Mailboxspeicherplatz'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: left
+section_id: storage
 ---

+## Erweitere den Speicherplatz Deines Postfachs
+Wenngleich eine Postfachgröße von 1 GB nicht so klein ist, kann es natürlich sein, dass Du mehr Speicher benötigst. Es ist daher möglich, Deinen E&#8209;Mail-Speicher zu erweitern.

-Wenngleich eine Postfachgröße von 1 GB nicht so klein ist, kann es natürlich sein, dass Du mehr Speicher benötigst. Es ist daher möglich, Deinen E&#8209;Mail-Speicher von 1 GB auf bis zu 10 GB zu erweitern für monatlich 0,15 €/GB, jährlich zu zahlen.
+Dies sind die Preise **pro Jahr, Zahlungsgebühren inklusive**:

-Um zusätzlichen Speicher zu beantragen, fülle dieses [Formular](/forms/extra-storage-mailbox) aus.<br>
+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |


---
-
-## Erweitere den Speicher Deines Postfachs
 <br>
+Auf Transaktionen innerhalb der EU wird eine zusätzliche VAT (Value Added Tax) von 21 % fällig.

-<a class="button button1" href="https://disroot.org/de/forms/extra-storage-mailbox">Zusätzlichen E&#8209;Mail-Speicher beantragen</a>
+---
+
+<br><br>
+
+<a class="button button1" href="/forms/extra-storage-space">Zusätzlichen E&#8209;Mail-Speicher beantragen</a>
--- a/pages/03.services/02.email/_email-x-storage/2col.en.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.en.md
@ -7,14 +7,25 @@ section_id: storage
 ---

 ## Add storage to your mailbox
+If the FREE 1GB is not enough, you can extend your E-mail storage.

-It is possible to extend your E-mail storage from 1GB to 10GB for the cost of 0.15 euro per GB per month, paid yearly.
+Here are the prices **per year, payment fees included**:

-To request extra storage you need to fill in this [form](/forms/extra-storage-mailbox).<br>
+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |


+<br>
+Transactions within the EU are subjected to extra VAT (Value Added Tax) of 21%.
+
 ---

 <br><br>

-<a class="button button1" href="/forms/extra-storage-mailbox">Request Extra Mailbox Storage</a>
+<a class="button button1" href="/forms/extra-storage-space">Request Extra Mailbox Storage</a>
--- a/pages/03.services/02.email/_email-x-storage/2col.es.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.es.md
@ -1,20 +1,31 @@
 ---
-title: 'Espacio Extra para el buzón'
+title: 'Almacenamiento extra para el buzón'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: left
 section_id: storage
 ---

-## Aumenta el espacio de tu buzón de correo
+## Añade espacio a tu buzón
+Si 1GB GRATUITO no es suficiente, puedes ampliar el almacenamiento de tu correo.

-Es posible aumentar el espacio de almacenamiento de tu E-mail hasta 10 GB por 0.15 euro por GB mensual, abonado anualmente.
+Estos son los precios **por año, tasas de pagos incluidas**:

-Para solicitar espacio extra necesitas completar [este formulario](/forms/extra-storage-mailbox).<br>
+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |


+<br>
+Las transacciones dentro de la UE están sujetas a un I.V.A (Impuesto al Valor Agregado) adicional de 21%.
+
 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/es/forms/extra-storage-mailbox">Solicitar espacio adicional para el buzón</a>
+<a class="button button1" href="/forms/extra-storage-space">Solicitar almacenamiento extra para el buzón</a>
--- a/pages/03.services/02.email/_email-x-storage/2col.fr.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.fr.md
@ -1,19 +1,31 @@
 ---
-title: 'Messagerie: espace de stockage supplémentaire'
+title: 'Espace de stockage supplémentaire'
 bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
 wider_column: left
+section_id: storage
 ---

-## Ajoutez de l'espace de stockage à votre boîte aux lettres
+## Ajoutez du stockage à votre boîte mail
+Si le 1 Go GRATUIT ne suffit pas, vous pouvez étendre le stockage de vos e-mails.

-Il est possible d'étendre la capacité de stockage de votre messagerie jusqu'à 10 Go pour le coût de 0,15 euro par Go et par mois, à payer annuellement.
+Voici les prix **par an, frais de paiement inclus** :

-Pour demander de l'espace de stockage supplémentaire, vous devez remplir ce  [formulaire](/forms/extra-storage-mailbox).<br>
+||||
+|---:|---|---:|
+| 5Go |......| 11€ |
+| 10Go |......| 20€ |
+| 15Go |......| 29€ |
+| 30Go |......| 56€ |
+| 45Go |......| 83€ |
+| 60Go |......| 110€ |


+<br>
+Les transactions au sein de l'UE sont soumises à une TVA (taxe sur la valeur ajoutée) supplémentaire de 21 %.
+
 ---

 <br><br>

-<a class="button button1" href="/forms/extra-storage-mailbox">Demander plus d'espace de stockage pour la messagerie</a>
+<a class="button button1" href="/forms/extra-storage-space">Demande de stockage supplémentaire</a>
--- a/pages/03.services/02.email/_email-x-storage/2col.it.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.it.md
@ -7,10 +7,21 @@ wider_column: left

 ## Aggiungi spazio di archiviazione per la posta elettronica

-È possibile estendere l'archiviazione della posta elettronica fino a 10 GB al costo di 0,15 euro al GB al mese.
+Se 1GB di spazio gratuito non è abbastanza, puoi estendere la tua memoria di posta elettronica.

-Per richiedere ulteriore spazio di archiviazione è necessario compilare questa [form](/forms/extra-storage-mailbox).<br>
+Ecco i prezzi **all'anno, spese di pagamento incluse**:

+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |
+
+<br>
+Le transazioni all'interno dell'UE sono soggette a un'IVA aggiuntiva (imposta sul valore aggiunto) del 21%.

 ---

--- a/pages/03.services/02.email/_email-x-storage/2col.ru.md
+++ b/pages/03.services/02.email/_email-x-storage/2col.ru.md
@ -6,15 +6,26 @@ wider_column: left
 section_id: storage
 ---

-## Добавить дисковое пространство в почту
+## Add storage to your mailbox
+If the FREE 1GB is not enough, you can extend your E-mail storage.

-Вы можете расширить хранилище электронной почты с 1 ГБ до 10 ГБ по цене 0,15 евро за гигабайт в месяц при оплате за год.
+Here are the prices **per year, payment fees included**:

-Чтобы запросить дополнительное пространство для хранения, вам необходимо заполнить эту [форму](/forms/extra-storage-mailbox).<br>
+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |


+<br>
+Transactions within the EU are subjected to extra VAT (Value Added Tax) of 21%.
+
 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/en/forms/extra-storage-mailbox">Запросить дополнительное хранилище для почтового ящика</a>
+<a class="button button1" href="/forms/extra-storage-space">Request Extra Mailbox Storage</a>
--- a/pages/03.services/02.email/_email/2col.de.md
+++ b/pages/03.services/02.email/_email/2col.de.md
@ -7,7 +7,7 @@ wider_column: right
 ---

 <a class="button button2" href="https://user.disroot.org/pwm/public/newuser">Disroot-Account registrieren</a>
-<a class="button button1" href="https://mail.disroot.org/">Anmelden</a>
+<a class="button button1" href="https://webmail.disroot.org/">Anmelden</a>

 ---

--- a/pages/03.services/02.email/_email/2col.en.md
+++ b/pages/03.services/02.email/_email/2col.en.md
@ -7,7 +7,7 @@ wider_column: right
 ---

 <a class="button button2" href="https://user.disroot.org/pwm/public/newuser">Sign up for Disroot</a>
-<a class="button button1" href="https://mail.disroot.org/">Log in</a>
+<a class="button button1" href="https://webmail.disroot.org/">Log in</a>

 ---

--- a/pages/03.services/02.email/_email/2col.es.md
+++ b/pages/03.services/02.email/_email/2col.es.md
@ -7,7 +7,7 @@ wider_column: right
 ---

 <a class="button button2" href="https://user.disroot.org/pwm/public/newuser">Inscribirse en Disroot</a>
-<a class="button button1" href="https://mail.disroot.org/">Iniciar sesión</a>
+<a class="button button1" href="https://webmail.disroot.org/">Iniciar sesión</a>

 ---

--- a/pages/03.services/02.email/_email/2col.fr.md
+++ b/pages/03.services/02.email/_email/2col.fr.md
@ -7,7 +7,7 @@ wider_column: right
 ---

 <a class="button button2" href="https://user.disroot.org/pwm/public/newuser">S'inscrire sur Disroot</a>
-<a class="button button1" href="https://mail.disroot.org/">Se connecter</a>
+<a class="button button1" href="https://webmail.disroot.org/">Se connecter</a>

 ---

--- a/pages/03.services/02.email/_email/2col.it.md
+++ b/pages/03.services/02.email/_email/2col.it.md
@ -7,7 +7,7 @@ wider_column: right
 ---

 <a class="button button2" href="https://user.disroot.org">Registrati su Disroot</a>
-<a class="button button1" href="https://mail.disroot.org/">Accedi</a>
+<a class="button button1" href="https://webmail.disroot.org/">Accedi</a>

 ---

--- a/pages/03.services/02.email/_email/2col.ru.md
+++ b/pages/03.services/02.email/_email/2col.ru.md
@ -7,7 +7,7 @@ wider_column: right
 ---

 <a class="button button2" href="https://user.disroot.org/pwm/public/newuser">Получить аккаунт Disroot</a>
-<a class="button button1" href="https://mail.disroot.org/">Войти</a>
+<a class="button button1" href="https://webmail.disroot.org/">Войти</a>

 ---

--- a/pages/03.services/02.email/modular.de.md
+++ b/pages/03.services/02.email/modular.de.md
@ -19,4 +19,9 @@ content:

 body_classes: modular
 header_image: 'riot-dog.jpg'
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---
--- a/pages/03.services/02.email/modular.es.md
+++ b/pages/03.services/02.email/modular.es.md
@ -19,4 +19,9 @@ content:

 body_classes: modular
 header_image: 'riot-dog.jpg'
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---
--- a/pages/03.services/02.email/modular.fr.md
+++ b/pages/03.services/02.email/modular.fr.md
@ -0,0 +1,27 @@
+---
+title: Email
+bgcolor: '#fff'
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _email
+            - _green-bar
+            - _email-clients_header
+            - _email-clients
+            - _email-settings
+            - _email-webmail
+            - _email-encryption
+            - _email-alias
+            - _email-x-storage
+
+body_classes: modular
+header_image: 'riot-dog.jpg'
+
+translation_banner:
+    set: true
+    last_modified: Mars 2022
+    language: French
+---
--- a/pages/03.services/02.email/modular.it.md
+++ b/pages/03.services/02.email/modular.it.md
@ -19,4 +19,9 @@ content:

 body_classes: modular
 header_image: 'riot-dog.jpg'
+
+translation_banner:
+    set: true
+    last_modified: Marzo 2022
+    language: Italian
 ---
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.de.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.de.md
@ -1,5 +1,5 @@
 ---
-title: 'Cloudspeicher'
+title: 'Zusätzlicher Cloud-Speicherplatz'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: left
@ -9,13 +9,25 @@ section_id: storage
 ## Cloud-Speicherplatz

 Mit Deinem **Disroot**-Account erhältst Du 2 GB FREIEN Speicher.
-Du kannst diesen Speicherplatz von 2 GB auf 14, 29 oder 54 GB erhöhen für nur 0,15 €/Monat. Hier kannst Du dann sogar wählen, ob Du einen Teil oder den ganzen zusätzlichen Speicher für Dein Mailpostfach nutzen willst.
+Es ist möglich diesen Speicherplatz zu erweitern.

-Um Extraspeicher zu beantragen, fülle bitte dieses [Formular](/forms/extra-storage-space) aus.<br>Wenn Du einen Teil des Extraspeichers oder alles für Dein Mailpostfach nutzen willst, vermerke das bitte im Kommentarfeld des Formulars.
+Dies sind die Preise **pro Jahr, Zahlungsgebühren inklusive**:

+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |
+
+
+<br>
+Auf Transaktionen innerhalb der EU wird eine zusätzliche VAT (Value Added Tax) von 21 % fällig.

 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/de/forms/extra-storage-space">Extraspeicher beantragen</a>
+<a class="button button1" href="/forms/extra-storage-space">Zusätzlichen Speicher beantragen</a>
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.en.md
@ -8,14 +8,25 @@ section_id: storage

 ## Cloud Storage Space

-With your **Disroot** account, you get 2GB FREE storage.
-It is possible to extend your cloud storage from 2GB to 14, 29 or 54GB for the cost of 0.15 euro per GB per month. You can also choose to use some or all of the additional space for mail storage, please specify that in the comment section in the request form.
+If the FREE 2GB is not enough, you can extend your cloud storage.

-To request extra storage you need to fill in this [form](/forms/extra-storage-space).<br>
+Here are the prices **per year, payment fees included**:

+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |
+
+
+<br>
+Transactions within the EU are subjected to extra VAT (Value Added Tax) of 21%.

 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/en/forms/extra-storage-space">Request Extra Storage</a>
+<a class="button button1" href="/forms/extra-storage-space">Request Extra Storage</a>
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.es.md
@ -1,20 +1,32 @@
 ---
-title: 'Almacenamiento en la Nube'
+title: 'Almacenamiento para la Nube'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: left
 section_id: storage
 ---

-## Almacenamiento en la Nube
+## Espacio de almacenamiento para la Nube

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

-Para solicitar almacenamiento extra necesitas completar este [formulario](/forms/extra-storage-space).<br>
+Estos son los precios **por año, tasas de pagos incluidas**:

+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |
+
+
+<br>
+Las transacciones dentro de la UE están sujetas a un I.V.A (Impuesto al Valor Agregado) adicional de 21%.

 ---

 <br><br>

-<a class="button button1" href="https://disroot.org/es/forms/extra-storage-space">Solicitar almacenamiento extra</a>
+<a class="button button1" href="/forms/extra-storage-space">Solicitar almacenamiento extra</a>
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.fr.md
@ -1,20 +1,32 @@
 ---
-title: 'Espace de stockage supplémentaire'
+title: 'Stockage cloud'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: left
 section_id: storage
 ---

-## Espace de stockage supplémentaire
+## Espace de stockage cloud

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

-Pour demander un espace de stockage supplémentaire, vous devez remplir ce  [formulaire](/forms/extra-storage-space).<br>
+Voici les prix **par an, frais de paiement inclus** :

+||||
+|---:|---|---:|
+| 5Go |......| 11€ |
+| 10Go |......| 20€ |
+| 15Go |......| 29€ |
+| 30Go |......| 56€ |
+| 45Go |......| 83€ |
+| 60Go |......| 110€ |
+
+
+<br>
+Les transactions au sein de l'UE sont soumises à une TVA (taxe sur la valeur ajoutée) supplémentaire de 21 %.

 ---

 <br><br>

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

 ## Spazio di archiviazione extra

-È possibile estendere lo spazio di archiviazione a 14,29 o 54 GB al costo di 0.15 Euro per GB per mese. È possibile utilizzare lo spazio extra pure per i tuoi messaggi di posta elettronica. Se fossi interessato a questa opzione, ti chiediamo di specificarlo nella sezione commenti della form da compilare.
+Se i 2GB di spazio gratuiti non sono sufficienti, puoi estendere il tuo spazio di archiviazione nel cloud.

-Per richiedere spazio aggiuntivo compliare questa [form](/forms/extra-storage-space).<br>
+Ecco i prezzi **all'anno, spese di pagamento incluse**:

+||||
+|---:|---|---:|
+| 5GB |......| 11€ |
+| 10GB |......| 20€ |
+| 15GB |......| 29€ |
+| 30GB |......| 56€ |
+| 45GB |......| 83€ |
+| 60GB |......| 110€ |
+
+<br>
+Le transazioni all'interno dell'UE sono soggette a un'IVA aggiuntiva (imposta sul valore aggiunto) del 21%.

 ---

--- a/pages/03.services/03.nextcloud/modular.de.md
+++ b/pages/03.services/03.nextcloud/modular.de.md
@ -30,4 +30,9 @@ content:
            - _nextcloud-checksum
 body_classes: modular
 header_image: smokecloud.jpg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---
--- a/pages/03.services/03.nextcloud/modular.es.md
+++ b/pages/03.services/03.nextcloud/modular.es.md
@ -31,4 +31,9 @@ content:
            - _nextcloud-checksum
 body_classes: modular
 header_image: smokecloud.jpg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---
--- a/pages/03.services/03.nextcloud/modular.fr.md
+++ b/pages/03.services/03.nextcloud/modular.fr.md
@ -0,0 +1,39 @@
+---
+title: Nuage
+bgcolor: '#fff'
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _nextcloud
+            - _nextcloud-x-storage
+            - _nextcloud-highlights
+            - _nextcloud-encryption
+            - _nextcloud-e2e
+            - _nextcloud-federation
+            - _nextcloud-webclient
+            - _nextcloud-sync
+            - _nextcloud-share
+            - _nextcloud-cals
+            - _nextcloud-gallery
+            - _nextcloud-text
+            - _nextcloud-deck
+            - _nextcloud-tasks
+            - _nextcloud-notes
+            - _nextcloud-pads
+            #- _nextcloud-news
+            - _nextcloud-bookmarks
+            - _nextcloud-circles
+            - _nextcloud-talk
+            - _nextcloud-sweep
+            - _nextcloud-checksum
+body_classes: modular
+header_image: smokecloud.jpg
+
+translation_banner:
+    set: true
+    last_modified: Mars 2022
+    language: French
+---
--- a/pages/03.services/03.nextcloud/modular.it.md
+++ b/pages/03.services/03.nextcloud/modular.it.md
@ -29,4 +29,9 @@ content:
            - _nextcloud-checksum
 body_classes: modular
 header_image: smokecloud.jpg
+
+translation_banner:
+    set: true
+    last_modified: Marzo 2022
+    language: Italian
 ---
--- a/pages/03.services/04.audio/modular.de.md
+++ b/pages/03.services/04.audio/modular.de.md
@ -14,4 +14,9 @@ content:
            - _mumble-clients
 body_classes: modular
 header_image: audio_banner.jpg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---
--- a/pages/03.services/04.audio/modular.es.md
+++ b/pages/03.services/04.audio/modular.es.md
@ -14,4 +14,9 @@ content:
            - _mumble-clients
 body_classes: modular
 header_image: audio_banner.jpg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---
--- a/pages/03.services/04.audio/modular.fr.md
+++ b/pages/03.services/04.audio/modular.fr.md
@ -14,4 +14,9 @@ content:
            - _mumble-clients
 body_classes: modular
 header_image: audio_banner.jpg
+
+translation_banner:
+    set: true
+    last_modified: Mars 2022
+    language: French
 ---
--- a/pages/03.services/04.audio/modular.it.md
+++ b/pages/03.services/04.audio/modular.it.md
@ -14,4 +14,9 @@ content:
            - _mumble-clients
 body_classes: modular
 header_image: audio_banner.jpg
+
+translation_banner:
+    set: true
+    last_modified: Marzo 2022
+    language: Italian
 ---
--- a/pages/03.services/05.forum/modular.de.md
+++ b/pages/03.services/05.forum/modular.de.md
@ -13,4 +13,9 @@ content:
            - _forum-feature2
 body_classes: modular
 header_image: forum_banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---
--- a/pages/03.services/05.forum/modular.es.md
+++ b/pages/03.services/05.forum/modular.es.md
@ -13,4 +13,9 @@ content:
            - _forum-feature2
 body_classes: modular
 header_image: forum_banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---
--- a/pages/03.services/05.forum/modular.fr.md
+++ b/pages/03.services/05.forum/modular.fr.md
@ -13,4 +13,9 @@ content:
            - _forum-feature2
 body_classes: modular
 header_image: forum_banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: Mars 2022
+    language: French
 ---
--- a/pages/03.services/05.forum/modular.it.md
+++ b/pages/03.services/05.forum/modular.it.md
@ -13,4 +13,9 @@ content:
            - _forum-feature2
 body_classes: modular
 header_image: forum_banner.jpeg
+
+translation_banner:
+    set: true
+    last_modified: Marzo 2022
+    language: Italian
 ---
--- a/pages/03.services/06.cryptpad/modular.de.md
+++ b/pages/03.services/06.cryptpad/modular.de.md
@ -16,7 +16,11 @@ content:
            - _cryptpad-kanban
            - _green-bar

-
 body_classes: modular
 header_image: 'stop_watching_all_of_us.jpg'
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---
--- a/pages/03.services/06.cryptpad/modular.es.md
+++ b/pages/03.services/06.cryptpad/modular.es.md
@ -19,4 +19,9 @@ content:

 body_classes: modular
 header_image: 'stop_watching_all_of_us.jpg'
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---
--- a/pages/03.services/06.cryptpad/modular.fr.md
+++ b/pages/03.services/06.cryptpad/modular.fr.md
@ -19,4 +19,9 @@ content:

 body_classes: modular
 header_image: 'stop_watching_all_of_us.jpg'
+
+translation_banner:
+    set: true
+    last_modified: Mars 2022
+    language: French
 ---
--- a/pages/03.services/06.cryptpad/modular.it.md
+++ b/pages/03.services/06.cryptpad/modular.it.md
@ -16,7 +16,11 @@ content:
            - _cryptpad-kanban
            - _green-bar

-
 body_classes: modular
 header_image: 'stop_watching_all_of_us.jpg'
+
+translation_banner:
+    set: true
+    last_modified: Marzo 2022
+    language: Italian
 ---
--- a/pages/03.services/07.xmpp/_xmpp-settings/fullbar.de.md
+++ b/pages/03.services/07.xmpp/_xmpp-settings/fullbar.de.md
@ -11,6 +11,6 @@ text_align: center

 ---

-#### Uploadlimit Dateigröße:<span style="color:#8EB726"> 10 MB </span>
-#### Archivierte Nachrichten verfallen nach: <span style="color:#8EB726"> 6 Monaten </span>
+#### Uploadlimit Dateigröße:<span style="color:#8EB726"> 512 MB </span>
+#### Archivierte Dateien und Nachrichten verfallen nach: <span style="color:#8EB726"> 1 Monat </span>
 <br>
--- a/pages/03.services/07.xmpp/_xmpp-settings/fullbar.en.md
+++ b/pages/03.services/07.xmpp/_xmpp-settings/fullbar.en.md
@ -11,6 +11,6 @@ text_align: center

 ---

-#### Upload file size limit:<span style="color:#8EB726"> 10MB </span>
-#### Archived messages expire after <span style="color:#8EB726"> 6 month </span>
+#### Upload file size limit:<span style="color:#8EB726"> 512 MB </span>
+#### Archived messages and files expire after <span style="color:#8EB726"> 1 month </span>
 <br>
--- a/pages/03.services/07.xmpp/_xmpp-settings/fullbar.es.md
+++ b/pages/03.services/07.xmpp/_xmpp-settings/fullbar.es.md
@ -11,6 +11,6 @@ text_align: center

 ---

-#### Tamaño máximo de archivo para subir:<span style="color:#8EB726"> 10MB </span>
-#### Los mensajes archivados expiran luego de <span style="color:#8EB726"> 6 meses </span>
+#### Tamaño máximo de archivo para subir:<span style="color:#8EB726"> 512 MB </span>
+#### Los mensajes y ficheros archivados expiran luego de <span style="color:#8EB726"> 1 meses </span>
 <br>
--- a/pages/03.services/07.xmpp/_xmpp-settings/fullbar.fr.md
+++ b/pages/03.services/07.xmpp/_xmpp-settings/fullbar.fr.md
@ -11,6 +11,6 @@ text_align: center

 ---

-#### Taille limite pour l'upload de fichiers:<span style="color:#8EB726"> 10Mo </span>
-#### Les messages archivés expirent après <span style="color:#8EB726"> 6 mois </span>
+#### Taille limite pour l'upload de fichiers:<span style="color:#8EB726"> 512 Mo </span>
+#### Les messages et fichiers archivés expirent après <span style="color:#8EB726"> 1 mois </span>
 <br>
--- a/pages/03.services/07.xmpp/_xmpp-settings/fullbar.it.md
+++ b/pages/03.services/07.xmpp/_xmpp-settings/fullbar.it.md
@ -11,6 +11,6 @@ text_align: center

 ---

-#### Limite file in upload:<span style="color:#8EB726"> 10MB </span>
-#### Messaggi archiviati verranno eliminati dopo <span style="color:#8EB726"> 6 mesi </span>
+#### Limite file in upload:<span style="color:#8EB726"> 512 MB </span>
+#### Messaggi e file archiviati verranno eliminati dopo <span style="color:#8EB726"> 1 mesi </span>
 <br>
--- a/pages/03.services/07.xmpp/modular.de.md
+++ b/pages/03.services/07.xmpp/modular.de.md
@ -19,4 +19,9 @@ content:
            - _xmpp-bots
 body_classes: modular
 header_image: everyones-welcome.jpg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---
--- a/pages/03.services/07.xmpp/modular.es.md
+++ b/pages/03.services/07.xmpp/modular.es.md
@ -19,4 +19,9 @@ content:
            - _xmpp-bots
 body_classes: modular
 header_image: everyones-welcome.jpg
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---
--- a/pages/03.services/07.xmpp/modular.fr.md
+++ b/pages/03.services/07.xmpp/modular.fr.md
@ -19,4 +19,9 @@ content:
            - _xmpp-bots
 body_classes: modular
 header_image: everyones-welcome.jpg
+
+translation_banner:
+    set: true
+    last_modified: Mars 2022
+    language: French
 ---
--- a/pages/03.services/07.xmpp/modular.it.md
+++ b/pages/03.services/07.xmpp/modular.it.md
@ -19,4 +19,9 @@ content:
            - _xmpp-bots
 body_classes: modular
 header_image: everyones-welcome.jpg
+
+translation_banner:
+    set: true
+    last_modified: Marzo 2022
+    language: Italian
 ---
--- a/pages/03.services/08.pads/_pads/2col.de.md
+++ b/pages/03.services/08.pads/_pads/2col.de.md
@ -7,7 +7,6 @@ wider_column: right
 ---

 <a class="button button2" href="https://pad.disroot.org/">Ein Pad öffnen</a>
-<a class="button button1" href="https://calc.disroot.org/">Tabellenkalkulation erstellen</a>

 ---

@ -27,18 +26,3 @@ Disroot Pads: [https://pad.disroot.org](https://pad.disroot.org)
 Projekt-Website: [http://etherpad.org](http://etherpad.org)

 Quellcode: [https://github.com/ether/etherpad-lite](https://github.com/ether/etherpad-lite)
-
-
-![](ethercalc.png)
-## Gemeinschaftliche Online-Tabellenkalkulation
-Disroots Spreadsheets basieren auf **Ethercalc**. Du kannst eine Online-Tabellenkalkulation erstellen, die Du gemeinschaftlich mit anderen bearbeiten kannst, in Echtzeit, direkt im Browser. Die Änderungen jedes Benutzers werden sofort auf dem Bildschirm dargestellt.
-
-Arbeitet zusammen an Inventuren, Umfrageformularen, Listenverwaltungen, etc. und mehr!
-
-Du benötigst keinen Disroot-Account, um diesen Service zu nutzen.
-
-Disroot Calc: [https://calc.disroot.org](https://calc.disroot.org)
-
-Projekt-Website: [https://ethercalc.net](https://ethercalc.net)
-
-Quellcode: [https://github.com/audreyt/ethercalc](https://github.com/audreyt/ethercalc)
--- a/pages/03.services/08.pads/_pads/2col.en.md
+++ b/pages/03.services/08.pads/_pads/2col.en.md
@ -7,7 +7,6 @@ wider_column: right
 ---

 <a class="button button2" href="https://pad.disroot.org/">Open a pad</a>
-<a class="button button1" href="https://calc.disroot.org/">Create a spreadsheet</a>

 ---

@ -27,18 +26,3 @@ Disroot Pads: [https://pad.disroot.org](https://pad.disroot.org)
 Project homepage: [http://etherpad.org](http://etherpad.org)

 Source code: [https://github.com/ether/etherpad-lite](https://github.com/ether/etherpad-lite)
-
-
-![](ethercalc.png)
-## Collaborative web spreadsheet
-
-Disroot's spreadsheets are powered by **Ethercalc**. You can create an online spreadsheet that you can collaboratively and in real-time edit directly in the web browser. Everybody's changes are instantly reflected on all screens.
-Work together on inventories, survey forms, list management, brainstorming sessions and more!
-
-You don't need any account on Disroot to use this service.
-
-Disroot Calc: [https://calc.disroot.org](https://calc.disroot.org)
-
-Project Homepage: [https://ethercalc.net](https://ethercalc.net)
-
-Source code: [https://github.com/audreyt/ethercalc](https://github.com/audreyt/ethercalc)
--- a/pages/03.services/08.pads/_pads/2col.es.md
+++ b/pages/03.services/08.pads/_pads/2col.es.md
@ -7,7 +7,6 @@ wider_column: right
 ---

 <a class="button button2" href="https://pad.disroot.org/">Abre un bloc</a>
-<a class="button button1" href="https://calc.disroot.org/">Crea una hoja de cálculo</a>

 ---

@ -26,18 +25,3 @@ Blocs de Disroot: [https://pad.disroot.org](https://pad.disroot.org)
 Página del proyecto: [http://etherpad.org](http://etherpad.org)

 Código fuente: [https://github.com/ether/etherpad-lite](https://github.com/ether/etherpad-lite)
-
-
-![](ethercalc.png)
-## Una hoja de cálculo web colaborativa.
-
-Las hojas de cálculo de **Disroot** están desarrolladas por **EtherCalc**. Puedes crear hojas de cálculo en línea que puedes editar en forma colaborativa y en tiempo real directamente en el navegador web. Los cambios de todxs son reflejados instantáneamente en todas las pantallas.
-¡Para trabajar juntxs en inventarios, formularios de encuesta, gestión de listas, sesiones de lluvia de ideas y más!
-
-No necesitas una cuenta de **Disroot** para utilizar este servicio.
-
-Calc de Disroot: [https://calc.disroot.org](https://calc.disroot.org)
-
-Página del proyecto: [https://ethercalc.net](https://ethercalc.net)
-
-Código fuente: [https://github.com/audreyt/ethercalc](https://github.com/audreyt/ethercalc)
--- a/pages/03.services/08.pads/_pads/2col.fr.md
+++ b/pages/03.services/08.pads/_pads/2col.fr.md
@ -7,7 +7,6 @@ wider_column: right
 ---

 <a class="button button2" href="https://pad.disroot.org/">Ouvrir un pad</a>
-<a class="button button1" href="https://calc.disroot.org/">Créer un tableau</a>

 ---

@ -27,18 +26,3 @@ Disroot Pads : [https://pad.disroot.org](https://pad.disroot.org)
 Page d'accueil du projet : [http://etherpad.org](http://etherpad.org)

 Le code source : [https://github.com/ether/etherpad-lite](https://github.com/ether/etherpad-lite)
-
-
-![](ethercalc.png)
-## Feuille de calcul web collaboratif
-
-Les feuilles de calcul de Disroot sont alimentées par **Ethercalc**. Vous pouvez créer une feuille de calcul en ligne que vous pouvez éditer en collaboration et en temps réel directement dans le navigateur Web. Les modifications de chacun sont instantanément répercutées sur tous les écrans.
-Travaillez ensemble sur les inventaires, les formulaires de sondage, la gestion des listes, les sessions de brainstorming et plus encore !
-
-Vous n'avez pas besoin d'un compte sur Disroot pour utiliser ce service.
-
-Disroot Calc : [https://calc.disroot.org](https://calc.disroot.org)
-
-Page d'accueil du projet : [https://ethercalc.net](https://ethercalc.net)
-
-Le code source : [https://github.com/audreyt/ethercalc](https://github.com/audreyt/ethercalc)
--- a/pages/03.services/08.pads/_pads/2col.it.md
+++ b/pages/03.services/08.pads/_pads/2col.it.md
@ -7,7 +7,6 @@ wider_column: right
 ---

 <a class="button button2" href="https://pad.disroot.org/">Apri un pad</a>
-<a class="button button1" href="https://calc.disroot.org/">Crea un nuovo foglio di calcolo</a>

 ---

@ -23,15 +22,3 @@ Scrivi in modo collettivo e sincrono con i tuoi amici o colleghi un articolo, un
 Pagina del progetto: [http://etherpad.org](http://etherpad.org)

 [Codice sorgente](https://github.com/ether/etherpad-lite)
-
-
-![](ethercalc.png)
-## Un foglio di calcolo collaborativo.
-I dati sono salvato nel web e le persone possono modificare lo stesso documento nello stesso momento. Tutte le modifiche effettuate vengono immediatamente visualizzate sullo schermo.
-
-Lavora in modo collaborativo sul foglio di calcolo!
-
-[https://calc.disroot.org](https://calc.disroot.org)
-
-Pagina del progetto: [https://ethercalc.net](https://ethercalc.net)
-[Codice sorgente(https://github.com/audreyt/ethercalc)
--- a/pages/03.services/08.pads/_pads/ethercalc.png
+++ b/pages/03.services/08.pads/_pads/ethercalc.png
--- a/pages/03.services/08.pads/_pads/navigation.html.twig
+++ b/pages/03.services/08.pads/_pads/navigation.html.twig
@ -1,49 +0,0 @@
-
-{% macro loop(page) %}
-    {% for p in page.children.visible %}
-        {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
-        <li class="dropdown {{ current_page }}">
-            <a href="{{ p.url }}">{{ p.menu }}</a>
-            {% if p.children.count > 0 %}
-            <ul class="dropdown-content">
-                {{ _self.loop(p) }}
-            </ul>
-            {% endif %}
-        </li>
-    {% endfor %}
-{% endmacro %}
-
-
-<nav id="nav-wrap">
-    <div><a id="nav-logo" href="{{ base_url == '' ? '/#home' : base_url }}"></a></div>
-
-    <a class="mobile-btn" href="#nav-wrap" title="Show navigation">Show navigation</a>
-    <a class="mobile-btn" href="#close" title="Hide navigation">Hide navigation</a>
-
-    {% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
-    {% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %}
-
-    {% include 'partials/language-selector.html.twig' %}
-    <ul id="nav" class="nav">
-        {% for page in pages.children %}
-            {% if page.visible %}
-                {% set current_page = (page.active or page.activeChild) ? 'current' : '' %}
-                {% if 'home' in page.menu %}
-                    {{ _self.loop(pages) }}
-                {% endif %}
-            {% endif %}
-        {% endfor %}
-   {% for mitem in site.menu %}
-        <li>
-            <a href="{{ mitem.url }}">
-                {% if mitem.icon %}<i class="fa fa-{{ mitem.icon }}"></i>{% endif %}
-                {{ mitem.text }}
-            </a>
-        </li>
-    {% endfor %}
-    {% if config.plugins.login.enabled and grav.user.username %}
-        <li><i class="fa fa-lock"></i> {% include 'partials/login-status.html.twig' %}</li>
-    {% endif %}
-
-    </ul>
-</nav>
--- a/pages/03.services/08.pads/modular.de.md
+++ b/pages/03.services/08.pads/modular.de.md
@ -10,9 +10,12 @@ content:
            - _pads
            - _etherpad-highlights
            - _etherpad-features
-            - _ethercalc-highlights
-            - _ethercalc-features
            - _empty-bar
 body_classes: modular
 header_image: 'riot-tagging.jpeg'
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: German
 ---
--- a/pages/03.services/08.pads/modular.en.md
+++ b/pages/03.services/08.pads/modular.en.md
@ -10,8 +10,6 @@ content:
            - _pads
            - _etherpad-highlights
            - _etherpad-features
-            - _ethercalc-highlights
-            - _ethercalc-features
            - _empty-bar
 body_classes: modular
 header_image: 'riot-tagging.jpeg'
--- a/pages/03.services/08.pads/modular.es.md
+++ b/pages/03.services/08.pads/modular.es.md
@ -10,9 +10,12 @@ content:
            - _pads
            - _etherpad-highlights
            - _etherpad-features
-            - _ethercalc-highlights
-            - _ethercalc-features
            - _empty-bar
 body_classes: modular
 header_image: 'riot-tagging.jpeg'
+
+translation_banner:
+    set: true
+    last_modified: März 2022
+    language: Spanish
 ---
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				<svg viewBox="0 0 175 32" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle cx="16" cy="16" r="16" fill="#FF004F"/><path d="M15.995 28.667c-3.39 0-6.57-1.311-8.955-3.691-2.387-2.383-3.704-5.567-3.707-8.966a12.628 12.628 0 0 1 .592-3.836l.007-.028c.087-.306.194-.6.318-.875.022-.055.047-.116.073-.176.11-.251.545-1.115 1.588-1.77.943-.593 1.77-.644 1.866-.648.228-.027.464-.04.699-.04 1.07 0 2.015.423 2.662 1.194.492.587.76 1.307.78 2.097a4.321 4.321 0 0 1 1.959-.481c1.07 0 2.016.424 2.662 1.194.039.046.076.094.113.142.859-.852 1.993-1.336 3.14-1.336 1.07 0 2.015.424 2.662 1.194.656.782.913 1.81.722 2.893l-.672 3.807c-.09.513.017.982.301 1.321.274.327.696.507 1.187.507 1.482 0 2.003-1.08 2.345-2.246.293-1.033.428-2.107.401-3.191a10.675 10.675 0 0 0-3.219-7.387 10.683 10.683 0 0 0-7.445-3.086H16c-2.14 0-4.209.63-5.982 1.825a.97.97 0 0 1-.544.167.958.958 0 0 1-.729-.335L8.74 6.91a.96.96 0 0 1 .196-1.418 12.585 12.585 0 0 1 7.317-2.156 12.604 12.604 0 0 1 8.65 3.67 12.601 12.601 0 0 1 3.758 8.612 12.664 12.664 0 0 1-.41 3.606h.001l-.043.158-.019.063a12.57 12.57 0 0 1-.4 1.187c-.079.187-.518 1.143-1.599 1.822-.935.588-1.673.618-1.76.62a4.89 4.89 0 0 1-.439.02c-1.07 0-2.016-.424-2.662-1.194-.656-.783-.913-1.81-.722-2.893l.672-3.808c.09-.512-.017-.982-.301-1.32-.274-.327-.696-.507-1.187-.507-1.166 0-2.325.99-2.531 2.162l-.735 3.998a.528.528 0 0 1-.52.432h-.883a.527.527 0 0 1-.52-.623l.762-4.144c.09-.51-.017-.98-.3-1.319-.275-.326-.697-.506-1.188-.506-1.165 0-2.324.99-2.531 2.162l-.734 3.998a.528.528 0 0 1-.52.432H9.21a.526.526 0 0 1-.52-.623l.764-4.159.512-2.799c.09-.509-.018-.976-.302-1.315-.274-.327-.696-.507-1.187-.507-1.21 0-1.989.465-2.454 1.463a10.662 10.662 0 0 0-.755 4.408c.108 2.737 1.266 5.313 3.26 7.252 1.995 1.939 4.603 3.024 7.343 3.057H16c2.266 0 4.435-.7 6.272-2.026a.942.942 0 0 1 .555-.18.962.962 0 0 1 .565 1.743 12.571 12.571 0 0 1-7.397 2.389" fill="#FFF2F6"/><path d="M59.864 6.896c.504 0 .864.408.864.96v14.448c0 .528-.384.96-.936.96a.943.943 0 0 1-.936-.96V10.928l-4.392 6.864c-.288.456-.6.672-1.008.672-.432 0-.72-.216-1.008-.672l-4.392-6.864v11.376c0 .528-.408.96-.936.96-.552 0-.936-.432-.936-.96V7.856c0-.552.36-.96.864-.96.432 0 .696.192 1.08.816l5.328 8.28 5.304-8.28c.408-.624.672-.816 1.104-.816zm16.168 4.152c.504 0 .912.456.912 1.008V22.28a.973.973 0 0 1-.984.984.959.959 0 0 1-.984-.984v-.864c-.936 1.128-2.448 1.848-4.2 1.848-3.288 0-5.784-2.616-5.784-6.12 0-3.48 2.496-6.096 5.784-6.096 1.848 0 3.408.768 4.32 1.992v-.984c0-.552.384-1.008.936-1.008zM71.04 21.56c2.424 0 4.08-1.8 4.08-4.416 0-2.616-1.656-4.392-4.08-4.392-2.376 0-4.152 1.872-4.152 4.416 0 2.52 1.752 4.392 4.152 4.392zM82.936 5.528c.744 0 1.344.6 1.344 1.32 0 .744-.6 1.32-1.344 1.32-.744 0-1.368-.576-1.368-1.32 0-.72.624-1.32 1.368-1.32zm-.048 17.736c-.528 0-.888-.432-.888-.96V12.008c0-.528.384-.96.936-.96.528 0 .912.432.912.96v10.296c0 .528-.432.96-.96.96zm6.952 0c-.552 0-.936-.432-.936-.96V5.696c0-.528.384-.96.936-.96.528 0 .912.432.912.96v16.608c0 .528-.384.96-.912.96zm15.328-12.216c.48 0 .912.432.912.912 0 .144-.024.288-.072.408l-4.92 10.32c-.168.36-.48.576-.84.576-.384 0-.696-.216-.864-.576l-4.896-10.296a1.359 1.359 0 0 1-.072-.432c0-.48.408-.912.912-.912.36 0 .696.24.864.576l4.056 8.76 4.056-8.76a.948.948 0 0 1 .864-.576zm9.232 0c3.096 0 5.328 2.256 5.328 5.4v.12c0 .768-.408 1.152-1.128 1.152h-8.256c.24 2.304 1.944 3.84 4.296 3.84a4.64 4.64 0 0 0 3.048-1.128c.192-.168.408-.264.624-.264.456 0 .816.336.816.816 0 .312-.12.528-.456.84-1.152.96-2.544 1.44-4.056 1.44-3.552 0-6.192-2.616-6.192-6.096 0-3.432 2.64-6.12 5.976-6.12zm-.048 1.68c-1.992 0-3.528 1.368-3.936 3.36h7.416c-.048-1.968-1.44-3.36-3.48-3.36zm10.552 10.536c-.552 0-.936-.432-.936-.96V5.696c0-.528.384-.96.936-.96.528 0 .912.432.912.96v16.608c0 .528-.384.96-.912.96zm11.248-12.216c3.408 0 6.12 2.688 6.12 6.096 0 3.384-2.712 6.096-6.144 6.096-3.408-.024-6.096-2.712-6.096-6.096 0-3.432 2.688-6.096 6.12-6.096zm0 1.704c-2.424 0-4.248 1.896-4.224 4.416 0 2.496 1.8 4.368 4.2 4.368 2.4 0 4.248-1.896 4.248-4.368 0-2.52-1.824-4.416-4.224-4.416zm16.504-1.704c3.312 0 5.784 2.616 5.784 6.096 0 3.504-2.472 6.12-5.784 6.12-1.8 0-3.384-.768-4.296-1.968v5.352c0 .552-.408.96-.912.96-.552 0-.936-.432-.936-.96V11.96c0-.528.384-.936.936-.936.504 0 .912.408.912.936v1.056c.912-1.2 2.472-1.968 4.296-1.968zm-.264 10.512c2.4 0 4.152-1.872 4.152-4.392 0-2.544-1.752-4.416-4.152-4.416-2.424 0-4.056 1.776-4.056 4.392 0 2.64 1.608 4.416 4.056 4.416zm15.424-10.512c3.096 0 5.328 2.256 5.328 5.4v.12c0 .768-.408 1.152-1.128 1.152h-8.256c.24 2.304 1.944 3.84 4.296 3.84a4.64 4.64 0 0 0 3.048-1.128c.192-.168.408-.264.624-.264.456 0 .816.336.816.816 0 .312-.12.528-.456.84-1.152.96-2.544 1.44-4.056 1.44-3.552 0-6.192-2.616-6.192-6.096 0-3.432 2.64-6.12 5.976-6.12zm-.048 1.68c-1.992 0-3.528 1.368-3.936 3.36h7.416c-.048-1.968-1.44-3.36-3.48-3.36z" fill="#404040" fill-rule="nonzero"/></g></svg>