transliteration_part-1

LICENSE

@@ -1,428 +0,0 @@
-Attribution-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-    wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More considerations
-     for the public:
-    wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-ShareAlike 4.0 International Public
-License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-ShareAlike 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. BY-SA Compatible License means a license listed at
-     creativecommons.org/compatiblelicenses, approved by Creative
-     Commons as essentially the equivalent of this Public License.
-
-  d. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  e. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  f. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  g. License Elements means the license attributes listed in the name
-     of a Creative Commons Public License. The License Elements of this
-     Public License are Attribution and ShareAlike.
-
-  h. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  i. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  j. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  k. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  l. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  m. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. Additional offer from the Licensor -- Adapted Material.
-               Every recipient of Adapted Material from You
-               automatically receives an offer from the Licensor to
-               exercise the Licensed Rights in the Adapted Material
-               under the conditions of the Adapter's License You apply.
-
-            c. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-  b. ShareAlike.
-
-     In addition to the conditions in Section 3(a), if You Share
-     Adapted Material You produce, the following conditions also apply.
-
-       1. The Adapter's License You apply must be a Creative Commons
-          license with the same License Elements, this version or
-          later, or a BY-SA Compatible License.
-
-       2. You must include the text of, or the URI or hyperlink to, the
-          Adapter's License You apply. You may satisfy this condition
-          in any reasonable manner based on the medium, means, and
-          context in which You Share Adapted Material.
-
-       3. You may not offer or impose any additional or different terms
-          or conditions on, or apply any Effective Technological
-          Measures to, Adapted Material that restrict exercise of the
-          rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material,
-     including for purposes of Section 3(b); and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
-

README.md

@@ -1,7 +1 @@
-# Disroot.org
-https://disroot.org - site
-
-For instructions on cloning & running locally, see [vagrant/README.md](vagrant/README.md)
-
-## License
-The content on **Disroot Website** is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/)
+https://disroot.org - site. (need to add licence)

pages/01.home/_about/fullbar.sr.md

@@ -0,0 +1,11 @@
+---
+title: Дисрут је
+bgcolor: '#1F5C60'
+fontcolor: '#FFFFFF'
+text_align: center
+body_classes: modular
+---
+
+<br>
+## Дисрут је платформа која нуди онлајн услуге засноване на принципима слободе, поверљивости података, федерације и децентрализације.
+**Нема праћења, реклама, израде профила, нити рударења података!**

pages/01.home/_disapp/2col.de.md

@@ -12,5 +12,5 @@ wider_column: left
 
 ---
 
-## Disroot App
-Diese App ist wie ein Schweizer Taschenmesser für die **Disroot**-Plattform, gemacht von der Community für die Community. Auch wenn Du kein **Disroot**-Konto hast, kannst Du mit dieser App trotzdem auf alle **Disroot**-Dienste zugreifen, für die kein Konto erforderlich ist. Das sind beispielsweise Etherpad, Upload und andere.
+## Disroot app
+This app is like your Swiss Army knife to the Disroot platform, made by the community for the community. If you don’t have a Disroot account you can still use this app to access all the Disroot services that do not require an account, like etherpad, upload, etc.

pages/01.home/_disapp/2col.en.md

@@ -13,4 +13,4 @@ wider_column: right
 ---
 
 ## Disroot app
-This app is like your Swiss Army knife to the **Disroot** platform, made by the community for the community. If you don’t have a **Disroot** account you can still use this app to access all the **Disroot** services that do not require an account, like etherpad, upload, etc.
+This app is like your Swiss Army knife to the Disroot platform, made by the community for the community. If you don’t have a Disroot account you can still use this app to access all the Disroot services that do not require an account, like etherpad, upload, etc.

pages/01.home/_disapp/2col.es.md

@@ -13,4 +13,4 @@ wider_column: right
 ---
 
 ## La App de Disroot
-Es como tu navaja suiza de la plataforma, hecha por la comunidad para la comunidad. Si no tienes una cuenta de **Disroot** aún puedes utilizar esta aplicación para acceder a los servicios que no requieren una, como los Blocs, Subida, etc.
+Es como tu navaja suiza de la plataforma, hecha por la comunidad para la comunidad. Si no tienes una cuenta de Disroot aún puedes utilizar esta aplicación para acceder a los servicios que no requieren una, como los Blocs, Subida, etc.

pages/01.home/_disapp/2col.fr.md

@@ -8,9 +8,9 @@ wider_column: left
 
 <br>
 
-## Récupérez la sur  [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
+## Get it on  [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
 
 ---
 
-## Application Disroot
-Cette application est comme votre couteau suisse de la plateforme **Disroot**, faite par la communauté pour la communauté. Si vous n'avez pas de compte **Disroot**, vous pouvez quand même utiliser cette application pour accéder à tous les services **Disroot** qui ne nécessitent pas de compte, comme etherpad, upload, etc.
+## Disroot app
+This app is like your Swiss Army knife to the Disroot platform, made by the community for the community. If you don’t have a Disroot account you can still use this app to access all the Disroot services that do not require an account, like etherpad, upload, etc.

pages/01.home/_disapp/2col.it.md

@@ -8,9 +8,9 @@ wider_column: left
 
 <br>
 
-## Scaricala da  [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
+## Get it on  [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
 
 ---
 
 ## Disroot app
-Questa app è come il tuo coltellino svizzero per la piattaforma Disroot, realizzata dalla community per la community. Se non disponi di un account Disroot, puoi comunque utilizzare questa app per accedere a tutti i servizi Disroot che non richiedono un account, come ad esempio upload.
+This app is like your Swiss Army knife to the Disroot platform, made by the community for the community. If you don’t have a Disroot account you can still use this app to access all the Disroot services that do not require an account, like etherpad, upload, etc.

pages/01.home/_disapp/2col.ru.md

@@ -1,16 +0,0 @@
----
-title: 'Disroot App'
-bgcolor: '#1F5C60'
-fontcolor: '#fff'
-text_align: left
-wider_column: right
----
-
-<br>
-
-## Скачайте в  [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/ru/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/ru/packages/org.disroot.disrootapp/?class=lighter)
-
----
-
-## Disroot app
-Это приложение вроде швейцарского ножа для платформы **Disroot**, созданной сообществом для сообщества. Если у вас нет учетной записи **Disroot**, вы все равно можете использовать это приложение для доступа ко всем сервисам **Disroot**, для которых не требуется учетная запись, таким как быстрые заметки, файлообменник и т.д.

pages/01.home/_disapp/2col.sr.md

@@ -0,0 +1,16 @@
+---
+title: 'Дисрут апликација'
+bgcolor: '#1F5C60'
+fontcolor: '#fff'
+text_align: left
+wider_column: right
+---
+
+<br>
+
+## Преузмите са [![F-droid](F-Droid.svg.png?resize=80,80&class=imgcenter)](https://f-droid.org/en/packages/org.disroot.disrootapp/) [F-droid](https://f-droid.org/en/packages/org.disroot.disrootapp/?class=lighter)
+
+---
+
+## Дисрут апликација
+Ова апликација је вишенаменска алатка за „Дисрут“ платформу, настала залагањем чланова наше заједнице. Ако немате налог код нас, можете је користити за приступ свим нашим услугама за које вам није потребан, попут „Етерпад“, „Аплоуд“, итд.

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>

pages/01.home/_donatebutton/fullbar.ru.md

@@ -8,4 +8,4 @@ body_classes: modular
 ---
 
 <br>
-<a class="button button2" href="https://disroot.org/en/donate">ПОДДЕРЖАТЬ НАС</a>
+<a class="button button2" href="https://disroot.org/en/donate">SUPPORT US</a>

pages/01.home/_donatebutton/fullbar.sr.md

@@ -0,0 +1,11 @@
+---
+title: Donate button
+fontcolor: '#FFF'
+bgcolor: '#fff'
+text_align: center
+padding: 20px
+body_classes: modular
+---
+
+<br>
+<a class="button button2" href="https://disroot.org/en/donate">ПОДРЖИТЕ НАС</a>

pages/01.home/_donation/2col.de.md

@@ -5,9 +5,9 @@ wider_column: left
 fontcolor: '#1e5a5e'
 ---
 
-![](premium.png?class=reward) **Disroot** ist angewiesen auf Spenden und Unterstützung seiner Community und der Nutzer der angebotenen Dienste. Wenn Du gerne das Projekt am Leben erhalten und dabei helfen möchtest, Platz für potentielle neue Disrooter zu schaffen, nutze bitte eine der verfügbaren Möglichkeiten, um einen finanziellen Beitrag zu leisten. Die [Domain-Verknüpfung](/services/email#alias) ist verfügbar für regelmäßige Unterstützer.
+![](premium.png?class=reward) Disroot ist angewiesen auf Spenden und Unterstützung seiner Community und der Nutzer der angebotenen Dienste. Wenn Du gerne das Projekt am Leben erhalten und dabei helfen möchtest, Platz für potentielle neue Disrooter zu schaffen, nutze bitte eine der verfügbaren Möglichkeiten, um einen finanziellen Beitrag zu leisten. [Aliase und Domain-Verknüpfung](/services/email#alias) sind verfügbar für regelmäßige Unterstützer.
 
-Du kannst uns auch unterstützen, indem Du [zusätzlichen E‑Mailspeicher](/services/email#storage) und/oder [zusätzlichen Cloudspeicher](/services/nextcloud#storage) kaufst.
+Du kannst uns auch unterstützen, indem Du [zusätzlichen Emailspeicher](/services/email#storage) und/oder [zusätzlichen Cloudspeicher](/services/nextcloud#storage) kaufst.
 
 ---
 
@@ -17,6 +17,8 @@ Du kannst uns auch unterstützen, indem Du [zusätzlichen E‑Mailspeicher](
 
 <a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Ein Patron werden" src="donate/_donate/p_button.png" /></a>
 
+<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter das!" src="donate/_donate/f_button.png" /></a>
+
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=de&hosted_button_id=AW6EU7E9NN3VQ&source=url" target=_blank><img alt="Paypal"  src="donate/_donate/pp_button.png" /></a>
 
 <a href="https://disroot.org/cryptocurrency"><img alt="Kryptowährung" src="donate/_donate/c_button.png" /></a>

pages/01.home/_donation/2col.en.md

@@ -5,7 +5,7 @@ wider_column: left
 fontcolor: '#1e5a5e'
 ---
 
-![](premium.png?class=reward) **Disroot** relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution. [Domain linking](/services/email#alias) is available for regular supporters.
+![](premium.png?class=reward) Disroot relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution. [Aliases and domain linking](/services/email#alias) are available for regular supporters.
 
 You can also collaborate by buying [extra email storage](/services/email#storage) space and/or [extra cloud storage](/services/nextcloud#storage) space.
 
@@ -17,6 +17,8 @@ You can also collaborate by buying [extra email storage](/services/email#storage
 
 <a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
 
+<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter this!" src="donate/_donate/f_button.png" /></a>
+
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal"  src="donate/_donate/pp_button.png" /></a>
 
 <a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>

pages/01.home/_donation/2col.es.md

@@ -5,7 +5,7 @@ wider_column: left
 fontcolor: '#1e5a5e'
 ---
 
-![](premium.png?class=reward) **Disroot** depende de las donaciones y apoyo de su comunidad y personas usuarias de los servicios. Si quieres ayudar a que el proyecto avance y haya más espacio para potenciales nuevos y nuevas disrooters, por favor, utiliza cualquiera de los métodos habilitados para realizar una contribución económica. [Vinculación de dominios](/services/email#alias) está disponible para donantes habituales.
+![](premium.png?class=reward) Disroot depende de las donaciones y apoyo de su comunidad y las usuarias y usuarios de los servicios. Si quieres ayudar a que el proyecto avance y haya más espacio para potenciales nuevxs disrooters, por favor, utiliza cualquiera de los métodos habilitados para realizar una contribución económica. [Alias y vinculación de dominios](/services/email#alias) están disponibles para donantes habituales.
 
 También puedes colaborar comprando [espacio de almacenamiento extra para el correo](/services/email#storage) y/o [espacio de almacenamiento extra para la nube](/services/nextcloud#storage).
 
@@ -17,6 +17,8 @@ También puedes colaborar comprando [espacio de almacenamiento extra para el cor
 
 <a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Conviértete en Mecenas" src="donate/_donate/p_button.png" /></a>
 
+<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter this!" src="donate/_donate/f_button.png" /></a>
+
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal"  src="donate/_donate/pp_button.png" /></a>
 
 <a href="https://disroot.org/cryptocurrency"><img alt="Cryptomoneda" src="donate/_donate/c_button.png" /></a>

pages/01.home/_donation/2col.fr.md

@@ -5,9 +5,9 @@ wider_column: left
 fontcolor: '#1e5a5e'
 ---
 
-![](premium.png?class=reward) **Disroot** compte sur les dons et le soutien de sa communauté et des utilisateurs de ses services. Si vous souhaitez que le projet se poursuive et contribuer à créer un environnement favorable à de nouveaux disrooters potentiels, veuillez utiliser l'une des méthodes disponibles pour apporter une contribution financière. Un lien vers un  [domaine personnalisé](/services/email#alias) est disponible pour les donateurs réguliers.
+![](premium.png?class=reward) Disroot compte sur les dons et le soutien de sa communauté et des utilisateurs de ses services. Si vous souhaitez que le projet se poursuive et contribuer à créer un environnement favorable à de nouveaux disrooters potentiels, veuillez utiliser l'une des méthodes disponibles pour apporter une contribution financière. Des [alias et des renvois de domaine](/services/email#alias) sont disponibles pour les donateurs réguliers.
 
-Vous pouvez également collaborer en achetant de l'espace [stockage supplémentaire de courrier électronique](/services/email#storage) et/ou du [stockage cloud supplémentaire](/services/nextcloud#storage).
+Vous pouvez également collaborer en achetant de l'espace [stockage supplémentaire de courrier électronique] (/services/email#storage) et/ou du [stockage cloud supplémentaire](/services/nextcloud#storage).
 
 ---
 
@@ -17,6 +17,8 @@ Vous pouvez également collaborer en achetant de l'espace [stockage supplémenta
 
 <a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Devenez un mécène" src="donate/_donate/p_button.png" /></a>
 
+<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter" src="donate/_donate/f_button.png" /></a>
+
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=fr&hosted_button_id=AW6EU7E9NN3VQ&source=url" target=_blank><img alt="Paypal"  src="donate/_donate/pp_button.png" /></a>
 
 <a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>

pages/01.home/_donation/2col.it.md

@@ -5,9 +5,9 @@ wider_column: left
 fontcolor: '#1e5a5e'
 ---
 
-![](premium.png?class=reward) **Disroot** si basa sulle donazioni e sul sostegno della sua comunità e degli utenti dei servizi. Se desideri mantenere attivo il progetto e contribuire a creare spazio per potenziali nuovi disrooter, utilizza uno dei metodi disponibili per fornire un contributo finanziario. [Alias e domini personalizzati](/services/email#alias) è disponibile per donatori regolari.
+![](premium.png?class=reward) Disroot relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution. [Aliases and domain linking](/services/email#alias) are available for regular supporters.
 
-Puoi anche contribuire acquistando [spazio aggiuntivo per l'email](/services/email#storage) oppure [spazio aggiuntivo per il cloud](/services/nextcloud#storage).
+You can also collaborate by buying [extra email storage](/services/email#storage) space and/or [extra cloud storage](/services/nextcloud#storage) space.
 
 ---
 
@@ -17,13 +17,15 @@ Puoi anche contribuire acquistando [spazio aggiuntivo per l'email](/services/ema
 
 <a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Diventa un Patron" src="donate/_donate/p_button.png" /></a>
 
+<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter" src="donate/_donate/f_button.png" /></a>
+
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal"  src="donate/_donate/pp_button.png" /></a>
 
 <a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
 
 </div>
 
-<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Coordinate bancarie:</span>
+<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Bank transfer:</span>
 <span style="color:#4e1e2d; font-size:1.1em;">
 Stichting Disroot.org
 IBAN NL19 TRIO 0338 7622 05

pages/01.home/_donation/2col.ru.md

@@ -5,10 +5,9 @@ wider_column: left
 fontcolor: '#1e5a5e'
 ---
 
-![](premium.png?class=reward) **Disroot** полагается на пожертвования и поддержку сообщества. Если вы хотите, чтобы проект продолжал существование и развитие, помогая новым пользователям находить уголок цифровой свободы, пожалуйста, используйте любой из доступных методов доната для внесения материального вклада в наше дело.
-Для людей, которые регулярно поддерживают нас, возможна [привязка доменов](/services/email#alias).
+![](premium.png?class=reward) Disroot relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution. [Aliases and domain linking](/services/email#alias) are available for regular supporters.
 
-Вы также можете поддержать нас, [расширив почтовое хранилище](/services/email#storage) и/или [увеличив дисковое пространство](/services/nextcloud#storage) вашего облачного хранилища.
+You can also collaborate by buying [extra email storage](/services/email#storage) space and/or [extra cloud storage](/services/nextcloud#storage) space.
 
 ---
 
@@ -18,13 +17,15 @@ fontcolor: '#1e5a5e'
 
 <a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
 
+<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter this!" src="donate/_donate/f_button.png" /></a>
+
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal"  src="donate/_donate/pp_button.png" /></a>
 
 <a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
 
 </div>
 
-<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Банковский перевод:</span>
+<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Bank transfer:</span>
 <span style="color:#4e1e2d; font-size:1.1em;">
 Stichting Disroot.org
 IBAN NL19 TRIO 0338 7622 05

pages/01.home/_donation/2col.sr.md

@@ -0,0 +1,33 @@
+---
+title: Online-donation
+bgcolor: '#fff'
+wider_column: left
+fontcolor: '#1e5a5e'
+---
+
+![](premium.png?class=reward) Disroot се ослања на донације и подршку своје заједнице и корисника услуга. Ако желите да помогнете да пројекат опстане и тако створите простор за нове чланове, молимо да искористите било коју од доступних могућности плаћања и новчано нас подржите. [Псеудоними и повезивање домена](/services/email#alias) доступни су за редовне донаторе.
+
+Можете нас подржати и куповином [додатног имејл складишта](/services/email#storage) и/или [додатног складишта у облаку](/services/nextcloud#storage).
+
+---
+
+<div class="donate">
+
+<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donate using Liberapay" src="donate/_donate/lp_button.png" /></a>
+
+<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
+
+<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter this!" src="donate/_donate/f_button.png" /></a>
+
+<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal"  src="donate/_donate/pp_button.png" /></a>
+
+<a href="https://disroot.org/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
+
+</div>
+
+<span style="color:#4e1e2d; font-size:1.1em; font-weight:bold;">Bank transfer:</span>
+<span style="color:#4e1e2d; font-size:1.1em;">
+Stichting Disroot.org
+IBAN NL19 TRIO 0338 7622 05
+BIC TRIONL2U
+</span>

pages/01.home/_services/services.de.md

@@ -7,11 +7,11 @@ fontcolor: '#555'
 text_align: left
 services:
     -
-        title: E-Mail
+        title: Email
         icon: email.png
         link: 'https://disroot.org/services/email'
-        text: "Freie und sichere E‑Mail-Accounts, nutzbar mit einem IMAP-Client oder via Online-Benutzeroberfläche."
-        button: 'https://webmail.disroot.org'
+        text: "Freie und sichere Email-Accounts, nutzbar mit einem IMAP-Client oder via Online-Benutzeroberfläche."
+        button: 'https://mail.disroot.org'
         buttontext: "Anmelden"
     -
         title: Cloud
@@ -20,6 +20,13 @@ services:
         text: "Deine Daten unter Deiner Kontrolle! Sichern, Synchronisieren, Teilen von Kalendern, Kontakten und mehr."
         button: 'https://cloud.disroot.org'
         buttontext: "Anmelden"
+    -
+        title: Forum
+        icon: forum.png
+        link: 'https://disroot.org/services/forum'
+        text: "Diskussionsforen / Mailinglisten für Deine Projekte, Gruppen oder Gemeinschaften."
+        button: 'https://forum.disroot.org'
+        buttontext: "Anmelden"
     -
         title: XMPP-Chat
         icon: xmpp.png
@@ -34,7 +41,13 @@ 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
@@ -56,7 +69,20 @@ 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
+        link: 'https://disroot.org/services/project-board'
+        text: "Ein Werkzeug zur Projektverwaltung im Kanban-Stil."
+        button: 'https://board.disroot.org'
+        buttontext: "Anmelden"
     -
         title: 'Calls'
         icon: calls.png
@@ -68,46 +94,23 @@ services:
         title: 'Git'
         icon: git.png
         link: 'https://disroot.org/services/git'
-        text: "Eine Code-Hosting- und -Projektzusammenarbeits-Plattform."
+        text: "A code hosting and project collaboration."
         button: 'https://git.disroot.org'
-        buttontext: "Anmelden"
+        buttontext: "Log in"
     -
         title: 'Audio'
         icon: mumble.png
         link: 'https://disroot.org/services/audio'
-        text: "Eine Voice-Chat-Anwendung mit niedriger Latenz und hoher Sprachqualität."
-        button: 'https://disroot.org/services/audio'
-        buttontext: "Info"
-        #badge: EXPERIMENTAL
+        text: "A low latency, high quality voice chat application."
+        button: 'https://mumble.disroot.org'
+        buttontext: "Log in"
+        badge: EXPERIMENTAL
     -
-        title: 'CryptPad'
+        title: 'Cryptpad'
         icon: cryptpad.png
         link: 'https://disroot.org/services/cryptpad'
-        text: "Eine schon vom Design her vertraulich gestaltete Alternative zu gängigen Office-Tools."
+        text: "A private-by-design alternative to popular office tools."
         button: 'https://cryptpad.disroot.org'
-        buttontext: "Zugang"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Akkoma'
-        icon: akkoma.png
-        link: 'https://disroot.org/services/akkoma'
-        text: "Ein Microblogging-Tool, das mit anderen Servern, die ActivityPub unterstützen, föderiert."
-        button: 'https://fe.disroot.org'
-        buttontext: "Anmelden"
-
-    -
-        title: 'Translate'
-        icon: translate.png
-        link: 'https://disroot.org/services/libretranslate'
-        text: "Ein Übersetzungs-Tool."
-        button: 'https://translate.disroot.org'
-        buttontext: "Zugang"
-
-    -
-        title: 'D·Scribe'
-        icon: scribe.png
-        link: 'https://disroot.org/services/scribe'
-        text: "Eine Plattform zur Sammeln von Links und zur Diskussion, die mit anderen Servern, die ActivityPub unterstützen föderieren kann"
-        button: 'https://scribe.disroot.org'
-        buttontext: "Zugang"
+        buttontext: "Access"
+        badge: EXPERIMENTAL
 ---

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://webmail.disroot.org'
+        button: 'https://mail.disroot.org'
         buttontext: "Log in"
     -
         title: Cloud
@@ -20,6 +20,13 @@ services:
         text: "Your data under your control! Collaborate, sync & share files, calendars, contacts and more."
         button: 'https://cloud.disroot.org'
         buttontext: "Log in"
+    -
+        title: Forum
+        icon: forum.png
+        link: 'https://disroot.org/services/forum'
+        text: "Discussion forums / mailing-list for your community, group or collective."
+        button: 'https://forum.disroot.org'
+        buttontext: "Log in"
     -
         title: XMPP Chat
         icon: xmpp.png
@@ -28,13 +35,19 @@ services:
         button: 'https://webchat.disroot.org'
         buttontext: "Log in"
     -
-        title: Pad
+        title: Pads
         icon: pads.png
         link: 'https://disroot.org/services/pads'
         text: "Create and edit documents collaboratively in real-time directly in the web browser."
         button: 'https://pad.disroot.org'
         buttontext: "Start a pad"
-
+    -
+        title: Calc
+        icon: calc.png
+        link: 'https://disroot.org/services/pads'
+        text: "Create and edit spreadsheets collaboratively in real-time directly in the web browser."
+        button: 'https://calc.disroot.org'
+        buttontext: "Start a calc"
     -
         title: 'Paste Bin'
         icon: pastebin.png
@@ -56,7 +69,20 @@ 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
+        link: 'https://disroot.org/services/project-board'
+        text: "A project management tool."
+        button: 'https://board.disroot.org'
+        buttontext: "Log in"
     -
         title: 'Calls'
         icon: calls.png
@@ -76,39 +102,15 @@ services:
         icon: mumble.png
         link: 'https://disroot.org/services/audio'
         text: "A low latency, high quality voice chat application."
-        button: 'https://disroot.org/services/audio'
-        buttontext: "Info"
-        #badge: EXPERIMENTAL
+        button: 'https://mumble.disroot.org'
+        buttontext: "Log in"
+        badge: EXPERIMENTAL
     -
-        title: 'CryptPad'
+        title: 'Cryptpad'
         icon: cryptpad.png
         link: 'https://disroot.org/services/cryptpad'
         text: "A private-by-design alternative to popular office tools."
         button: 'https://cryptpad.disroot.org'
         buttontext: "Access"
-        #badge: EXPERIMENTAL
-
-    -
-        title: 'Akkoma'
-        icon: akkoma.png
-        link: 'https://disroot.org/services/akkoma'
-        text: "A microblogging tool that can federate with other servers that support ActivityPub."
-        button: 'https://fe.disroot.org'
-        buttontext: "Log in"
-
-    -
-        title: 'Translate'
-        icon: translate.png
-        link: 'https://disroot.org/services/libretranslate'
-        text: "A translation application."
-        button: 'https://translate.disroot.org'
-        buttontext: "Access"
-
-    -
-        title: 'D·Scribe'
-        icon: scribe.png
-        link: 'https://disroot.org/services/scribe'
-        text: "A link aggregation and discussion platform that can federate with other servers that support ActivityPub."
-        button: 'https://scribe.disroot.org'
-        buttontext: "Access"
+        badge: EXPERIMENTAL
 ---

pages/01.home/_services/services.es.md

@@ -11,44 +11,57 @@ 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://webmail.disroot.org'
-        buttontext: "Acceder"
+        button: 'https://mail.disroot.org'
+        buttontext: "Accede"
     -
         title: Nube
         icon: cloud.png
         link: 'https://disroot.org/services/nextcloud/'
         text: "¡Tus datos bajo tu control! Colabora, sincroniza y comparte archivos, calendarios, contactos y más."
         button: 'https://cloud.disroot.org'
-        buttontext: "Acceder"
+        buttontext: "Accede"
+    -
+        title: Foro
+        icon: forum.png
+        link: 'https://disroot.org/services/forum'
+        text: "Foros de discusión y lista de correo para tu comunidad, grupo o colectivo."
+        button: 'https://forum.disroot.org'
+        buttontext: "Accede"
     -
         title: Chat XMPP
         icon: xmpp.png
         link: 'https://disroot.org/services/xmpp'
         text: "Mensajería instantánea descentralizada."
         button: 'https://webchat.disroot.org'
-        buttontext: "Acceder"
+        buttontext: "Accede"
     -
         title: Blocs
         icon: pads.png
         link: 'https://disroot.org/services/pads'
         text: "Crea y edita documentos colaborativamente y en tiempo real directamente en tu navegador."
         button: 'https://pad.disroot.org'
-        buttontext: "Abrir un bloc"
-
+        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 un calc"
     -
         title: 'Paste Bin'
         icon: pastebin.png
         link: 'https://disroot.org/services/privatebin'
         text: "Paste-bin/tablero de discusión cifrado en línea."
         button: 'https://bin.disroot.org'
-        buttontext: "Compartir un pastebin"
+        buttontext: "Comparte un pastebin"
     -
         title: Subida
         icon: upload.png
         link: 'https://disroot.org/services/upload'
         text: "Alojamiento temporario cifrado."
         button: 'https://upload.disroot.org'
-        buttontext: "Compartir un archivo"
+        buttontext: "Comparte un archivo"
     -
         title: Búsqueda
         icon: search.png
@@ -56,7 +69,20 @@ 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
+        link: 'https://disroot.org/services/project-board'
+        text: "Herramienta de gestión de proyectos."
+        button: 'https://board.disroot.org'
+        buttontext: "Accede"
     -
         title: 'Llamadas'
         icon: calls.png
@@ -70,43 +96,21 @@ services:
         link: 'https://disroot.org/services/git'
         text: "Hospedaje de código y proyectos colaborativos."
         button: 'https://git.disroot.org'
-        buttontext: "Acceder"
+        buttontext: "Accede"
     -
         title: 'Audio'
         icon: mumble.png
         link: 'https://disroot.org/services/audio'
         text: "Herramienta de audio chat."
-        button: 'https://disroot.org/services/audio'
-        buttontext: "Hablar"
-        #badge: EXPERIMENTAL
+        button: 'https://mumble.disroot.org'
+        buttontext: "Conéctate"
+        badge: EXPERIMENTAL
     -
         title: 'CryptPad'
         icon: cryptpad.png
         link: 'https://disroot.org/services/cryptpad'
-        text: "Herramientas ofimáticas privadas-por-defecto."
+        text: "Herramientas de oficina privadas-por-defecto."
         button: 'https://cryptpad.disroot.org'
-        buttontext: "Acceder"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Akkoma'
-        icon: akkoma.png
-        link: 'https://disroot.org/services/akkoma'
-        text: "Herramienta de microblogging que puede federar con otros servidores que soporten ActivityPub."
-        button: 'https://fe.disroot.org'
-        buttontext: "Iniciar sesión"
-
-    -
-        title: 'Traductor'
-        icon: translate.png
-        link: 'https://disroot.org/services/libretranslate'
-        text: "Aplicación en línea para traducir."
-        button: 'https://translate.disroot.org'
-        buttontext: "Traducir"
-    -
-        title: 'D·Scribe'
-        icon: scribe.png
-        link: 'https://disroot.org/services/scribe'
-        text: "Agregador de links y plataforma de discusión que puede federar con otros servidores que soporten ActivityPub."
-        button: 'https://scribe.disroot.org'
-        buttontext: "Acceder"
+        buttontext: "Accede"
+        badge: EXPERIMENTAL
 ---

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://webmail.disroot.org'
+        button: 'https://mail.disroot.org'
         buttontext: "Se connecter"
     -
         title: Cloud
@@ -20,7 +20,13 @@ services:
         text: "Vos données sous votre contrôle ! Collaborez, synchronisez et partagez des fichiers, des calendriers, etc."
         button: 'https://cloud.disroot.org'
         buttontext: "Se connecter"
-
+    -
+        title: Forum
+        icon: forum.png
+        link: 'https://disroot.org/services/forum'
+        text: "Forums de discussion / mailing-list pour votre communauté, groupe ou collectif."
+        button: 'https://forum.disroot.org'
+        buttontext: "Se connecter"
     -
         title: Chat XMPP
         icon: xmpp.png
@@ -35,7 +41,13 @@ 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
@@ -57,7 +69,20 @@ 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
+        link: 'https://disroot.org/services/project-board'
+        text: "Un outil de gestion de projet."
+        button: 'https://board.disroot.org'
+        buttontext: "Se connecter"
     -
         title: 'Calls'
         icon: calls.png
@@ -77,38 +102,23 @@ services:
         icon: mumble.png
         link: 'https://disroot.org/services/audio'
         text: "Une application de chat vocal à faible latence et de haute qualité."
-        button: 'https://disroot.org/services/audio'
-        buttontext: "Info"
-        #badge: EXPERIMENTAL
+        button: 'https://mumble.disroot.org'
+        buttontext: "Créer une chaîne"
+        badge: EXPERIMENTAL
     -
-        title: 'CryptPad'
+        title: 'Cryptpad'
         icon: cryptpad.png
         link: 'https://disroot.org/services/cryptpad'
         text: "Une alternative privée aux outils de bureautique populaires."
         button: 'https://cryptpad.disroot.org'
         buttontext: "Accès"
-        #badge:
+        badge: EXPERIMENTAL
     -
-        title: 'Akkoma'
-        icon: akkoma.png
-        link: 'https://disroot.org/services/akkoma'
-        text: "Un outil de microblogging qui peut fédérer avec d'autres serveurs qui supportent ActivityPub."
-        button: 'https://fe.disroot.org'
-        buttontext: "Se connecter"
-
-    -
-        title: 'Translate'
-        icon: translate.png
-        link: 'https://disroot.org/services/libretranslate'
-        text: "Une application de traduction."
-        button: 'https://translate.disroot.org'
-        buttontext: "Accès"
-
-    -
-        title: 'D·Scribe'
-        icon: scribe.png
-        link: 'https://disroot.org/services/scribe'
-        text: "Une plateforme d'agrégation de liens et de discussion qui peut se fédérer avec d'autres serveurs qui supportent ActivityPub."
-        button: 'https://scribe.disroot.org'
-        buttontext: "Accès"
+        title: 'Games'
+        icon: game.png
+        link: 'https://disroot.org/en/quarantine'
+        text: "Un serveur de jeu pour s'amuser!"
+        button: 'https://disroot.org/en/quarantine'
+        buttontext: "Plus d'info"
+        badge: NOUVEAU
 ---

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://webmail.disroot.org'
+        button: 'https://mail.disroot.org'
         buttontext: "Accedi"
     -
         title: Cloud
@@ -20,6 +20,13 @@ services:
         text: "I tuoi dati sotto il tuo controllo. Collabora, sincronizza e condividi file, calendari e contatti."
         button: 'https://cloud.disroot.org'
         buttontext: "Accedi"
+    -
+        title: Forum
+        icon: forum.png
+        link: 'https://disroot.org/services/forum'
+        text: "Forum di discussione/mailing list per la tua comunità, gruppo o collettivo."
+        button: 'https://forum.disroot.org'
+        buttontext: "Accedi"
     -
         title: XMPP Chat
         icon: xmpp.png
@@ -34,7 +41,13 @@ 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
@@ -46,7 +59,7 @@ services:
         title: Upload
         icon: upload.png
         link: 'https://disroot.org/services/upload'
-        text: "Software di condivisione per file temporanei crittografato ."
+        text: "Encrypted, temporary file hosting and sharing software."
         button: 'https://upload.disroot.org'
         buttontext: "Condividere"
     -
@@ -56,7 +69,20 @@ 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
+        link: 'https://disroot.org/services/project-board'
+        text: "Uno strumento di project management."
+        button: 'https://board.disroot.org'
+        buttontext: "Accedi"
     -
         title: 'Calls'
         icon: calls.png
@@ -68,47 +94,23 @@ services:
         title: 'Git'
         icon: git.png
         link: 'https://disroot.org/services/git'
-        text: "Un hosting per codice e gestione di progetti."
+        text: "A code hosting and project collaboration."
         button: 'https://git.disroot.org'
-        buttontext: "Entra"
+        buttontext: "Log in"
     -
         title: 'Audio'
         icon: mumble.png
         link: 'https://disroot.org/services/audio'
-        text: "Un'applicazione di chat vocale a bassa latenza e di alta qualità."
+        text: "A low latency, high quality voice chat application."
         button: 'https://mumble.disroot.org'
-        buttontext: "Entra"
-        #badge: EXPERIMENTAL
+        buttontext: "Log in"
+        badge: EXPERIMENTAL
     -
-        title: 'CryptPad'
+        title: 'Cryptpad'
         icon: cryptpad.png
         link: 'https://disroot.org/services/cryptpad'
-        text: "Un'alternativa personalizzata ai popolari strumenti di ufficio."
-        button: 'https://disroot.org/services/audio'
-        buttontext: "Info"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Akkoma'
-        icon: akkoma.png
-        link: 'https://disroot.org/services/akkoma'
-        text: "Uno strumento di microblogging che può federarsi con altri server che supportano ActivityPub."
-        button: 'https://fe.disroot.org'
-        buttontext: "Entra"
-
-    -
-        title: 'Translate'
-        icon: translate.png
-        link: 'https://disroot.org/services/libretranslate'
-        text: "Una applicazione di traduzione."
-        button: 'https://translate.disroot.org'
-        buttontext: "Accesso"
-
-    -
-        title: 'D·Scribe'
-        icon: scribe.png
-        link: 'https://disroot.org/services/scribe'
-        text: "Piattaforma di aggregazione e discussione di link che può federarsi con altri server che supportano ActivityPub."
-        button: 'https://scribe.disroot.org'
-        buttontext: "Entra"
-
+        text: "A private-by-design alternative to popular office tools."
+        button: 'https://cryptpad.disroot.org'
+        buttontext: "Access"
+        badge: EXPERIMENTAL
 ---

pages/01.home/_services/services.ru.md

@@ -7,99 +7,110 @@ fontcolor: '#555'
 text_align: left
 services:
     -
-        title: 'Почта'
+        title: Email
         icon: email.png
         link: 'https://disroot.org/services/email'
-        text: "Бесплатный и безопасный почтовый сервер с поддержкой IMAP и приятным веб-интерфейсом."
-        button: 'https://webmail.disroot.org'
-        buttontext: "Войти"
+        text: "Free and secure email accounts for your desktop IMAP client or via a Web-interface."
+        button: 'https://mail.disroot.org'
+        buttontext: "Log in"
     -
-        title: 'Облако'
+        title: Cloud
         icon: cloud.png
         link: 'https://disroot.org/services/nextcloud/'
-        text: "Ваши данные под вашим контролем! Совместная работа, синхронизация, обмен файлами и многое другое."
+        text: "Your data under your control! Collaborate, sync & share files, calendars, contacts and more."
         button: 'https://cloud.disroot.org'
-        buttontext: "Войти"
+        buttontext: "Log in"
     -
-        title: 'XMPP чат'
+        title: Forum
+        icon: forum.png
+        link: 'https://disroot.org/services/forum'
+        text: "Discussion forums / mailing-list for your community, group or collective."
+        button: 'https://forum.disroot.org'
+        buttontext: "Log in"
+    -
+        title: XMPP Chat
         icon: xmpp.png
         link: 'https://disroot.org/services/xmpp'
-        text: "Децентрализованный мессенджер, проверенный временем."
+        text: "Decentralized instant messaging."
         button: 'https://webchat.disroot.org'
-        buttontext: "Войти"
+        buttontext: "Log in"
     -
-        title: 'Документы'
+        title: Pads
         icon: pads.png
         link: 'https://disroot.org/services/pads'
-        text: "Совместно создавайте и редактируйте документы прямо в браузере."
+        text: "Create and edit documents collaboratively in real-time directly in the web browser."
         button: 'https://pad.disroot.org'
-        buttontext: "Создать документ"
-
+        buttontext: "Start a pad"
+    -
+        title: Calc
+        icon: calc.png
+        link: 'https://disroot.org/services/pads'
+        text: "Create and edit spreadsheets collaboratively in real-time directly in the web browser."
+        button: 'https://calc.disroot.org'
+        buttontext: "Start a calc"
     -
         title: 'Paste Bin'
         icon: pastebin.png
         link: 'https://disroot.org/services/privatebin'
-        text: "Зашифрованные онлайн заметки и обсуждения."
+        text: "Encrypted online paste-bin/discussion board."
         button: 'https://bin.disroot.org'
-        buttontext: "Поделиться заметкой"
+        buttontext: "Share a pastebin"
     -
-        title: 'Файлообменник'
+        title: Upload
         icon: upload.png
         link: 'https://disroot.org/services/upload'
-        text: "Зашифрованное файловое хранилище с ограниченным сроком хранения."
+        text: "Encrypted, temporary file hosting and sharing software."
         button: 'https://upload.disroot.org'
-        buttontext: "Поделиться файлом"
+        buttontext: "Share a file"
     -
-        title: 'SearX'
+        title: Search
         icon: search.png
         link: 'https://disroot.org/services/search'
-        text: "Гибкий приватный инструмент для поиска в интернете."
+        text: "An anonymous multi search engine platform."
         button: 'https://search.disroot.org'
-        buttontext: "Найти"
-
+        buttontext: "Search"
     -
-        title: 'Jitsi'
+        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: 'http://polls.disroot.org'
+        buttontext: "Start a poll"
+    -
+        title: 'Project Board'
+        icon: project_board.png
+        link: 'https://disroot.org/services/project-board'
+        text: "A project management tool."
+        button: 'https://board.disroot.org'
+        buttontext: "Log in"
+    -
+        title: 'Calls'
         icon: calls.png
         link: 'https://disroot.org/services/calls'
-        text: "Сервис для проведения видеозвонков."
+        text: "A videoconferencing tool."
         button: 'https://calls.disroot.org'
-        buttontext: "Начать конференцию"
+        buttontext: "Start a call"
     -
         title: 'Git'
         icon: git.png
         link: 'https://disroot.org/services/git'
-        text: "Площадка для хостинга исходных текстов и совместной разработки."
+        text: "A code hosting and project collaboration."
         button: 'https://git.disroot.org'
-        buttontext: "Войти"
+        buttontext: "Log in"
     -
-        title: 'Mumble'
+        title: 'Audio'
         icon: mumble.png
         link: 'https://disroot.org/services/audio'
-        text: "Голосовой чат с низкой задержкой и хорошим качеством звука."
-        button: 'https://disroot.org/services/audio'
-        buttontext: "Инфо"
-        #badge: EXPERIMENTAL
+        text: "A low latency, high quality voice chat application."
+        button: 'https://mumble.disroot.org'
+        buttontext: "Log in"
+        badge: EXPERIMENTAL
     -
-        title: 'CryptPad'
+        title: 'Cryptpad'
         icon: cryptpad.png
         link: 'https://disroot.org/services/cryptpad'
-        text: "Альтернатива популярным офисным приложениям с акцентом на приватность."
+        text: "A private-by-design alternative to popular office tools."
         button: 'https://cryptpad.disroot.org'
-        buttontext: "Начать"
-        #badge: EXPERIMENTAL
-    -
-        title: 'Akkoma'
-        icon: akkoma.png
-        link: 'https://disroot.org/services/akkoma'
-        text: "A microblogging tool that can federate with other servers that support ActivityPub."
-        button: 'https://fe.disroot.org'
-        buttontext: "Log in"
-
-    -
-        title: 'Translate'
-        icon: translate.png
-        link: 'https://disroot.org/services/libretranslate'
-        text: "Онлайн переводчик."
-        button: 'https://translate.disroot.org'
-        buttontext: "Начать"
+        buttontext: "Access"
+        badge: EXPERIMENTAL
 ---

pages/01.home/_services/services.sr.md

@@ -0,0 +1,117 @@
+---
+title: Услуге
+section_id: services
+bgcolor: '#FFF'
+bg_img: tent.jpg
+fontcolor: '#555'
+text_align: left
+services:
+    -
+        title: Имејл
+        icon: email.png
+        link: 'https://disroot.org/services/email'
+        button: 'https://mail.disroot.org'
+        text: "Бесплатни и безбедни имејл налози за IMAP апликацију вашег рачунара или у веб-окружењу."
+        button: 'https://mail.disroot.org'
+        buttontext: "Пријавите се"
+    -
+        title: Облак
+        icon: cloud.png
+        link: 'https://disroot.org/services/nextcloud/'
+        text: "Ваши подаци под вашом контролом! Сарађујте, синхронизујте и делите датотеке, календаре, контакте итд."
+        button: 'https://cloud.disroot.org'
+        buttontext: "Пријавите се"
+    -
+        title: Форум
+        icon: forum.png
+        link: 'https://disroot.org/services/forum'
+        text: "Дискусиони форуми/дописне листе за вашу заједницу, групу или колектив."
+        button: 'https://forum.disroot.org'
+        buttontext: "Пријавите се"
+   -
+        title: XMPP ћаскање
+        icon: xmpp.png
+        link: 'https://disroot.org/services/xmpp'
+        text: "Децентрализовано слање тренутних порука."
+        button: 'https://webchat.disroot.org'
+        buttontext: "Пријавите се"
+    -
+        title: Бележнице
+        icon: pads.png
+        link: 'https://disroot.org/services/pads'
+        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: 'Корпа за одлагање'
+        icon: pastebin.png
+        link: 'https://disroot.org/services/privatebin'
+        text: "Шифрована платформа намењена одлагању података и дискусијама."
+        button: 'https://bin.disroot.org'
+        buttontext: "Подели одложене податке"
+    -
+        title: Отпреми
+        icon: upload.png
+        link: 'https://disroot.org/services/upload'
+        text: "Софтвер за дељење шифрованих, привремено ускладиштених података."
+        button: 'https://upload.disroot.org'
+        buttontext: "Подели датотеку"
+    -
+        title: Претрага
+        icon: search.png
+        link: 'https://disroot.org/services/search'
+        text: "Платформа за анонимну претрагу на неколико претраживача."
+        button: 'https://search.disroot.org'
+        buttontext: "Претражи"
+    -
+        title: Анкете
+        icon: polls.png
+        link: 'https://disroot.org/services/polls'
+        text: "Интернет услуга за планирање састанака или брзо и лако доношење одлука."
+        button: 'https://poll.disroot.org'
+        buttontext: "Покрени анкету"
+    -
+        title: 'Пројектна табла'
+        icon: project_board.png
+        link: 'https://disroot.org/services/project-board'
+        text: "Алат за управљање пројектима."
+        button: 'https://board.disroot.org'
+        buttontext: "Пријавите се"
+    -
+        title: 'Позиви'
+        icon: calls.png
+        link: 'https://disroot.org/services/calls'
+        text: "Алат за видео-конференције."
+        button: 'https://calls.disroot.org'
+        buttontext: "Започни позив"
+    -
+        title: 'Гит'
+        icon: git.png
+        link: 'https://disroot.org/services/git'
+        text: "Угошћавање кода и сарадња на пројекту."
+        button: 'https://git.disroot.org'
+        buttontext: "Пријавите се"
+    -
+        title: 'Звучни'
+        icon: mumble.png
+        link: 'https://disroot.org/services/audio'
+        text: "Апликација за гласовно ћаскање високог квалитета, с малим кашњењем."
+        button: 'https://mumble.disroot.org'
+        buttontext: "Пријавите се"
+        badge: ПРОБНА ВЕРЗИЈА
+    -
+        title: 'Криптпад'
+        icon: cryptpad.png
+        link: 'https://disroot.org/services/cryptpad'
+        text: "Намењен тајности, канцеларијски алат друкчији од осталих."
+        button: 'https://cryptpad.disroot.org'
+        buttontext: "Приступите"
+        badge: ПРОБНА ВЕРЗИЈА
+---

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>

pages/01.home/_signup/fullbar.it.md

@@ -8,4 +8,4 @@ body_classes: modular
 ---
 
 <br>
-<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">REGISTRATI</a>
+<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">SIGN UP</a>

pages/01.home/_signup/fullbar.ru.md

@@ -8,4 +8,4 @@ body_classes: modular
 ---
 
 <br>
-<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">ЗАРЕГИСТРИРОВАТЬСЯ</a>
+<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">SIGN UP</a>

pages/01.home/_signup/fullbar.sr.md

@@ -0,0 +1,11 @@
+---
+title: Sign up
+bgcolor: '#8EB726'
+fontcolor: '#FFF'
+text_align: center
+padding: 20px
+body_classes: modular
+---
+
+<br>
+<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">ПРИЈАВИТЕ СЕ</a>

pages/01.home/modular.de.md

@@ -16,12 +16,4 @@ 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" />

pages/01.home/modular.en.md

@@ -17,5 +17,3 @@ menu: home
 big_header: true
 onpage_menu: true
 ---
-
-<link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="en/blog.atom" />

pages/01.home/modular.es.md

@@ -16,11 +16,4 @@ content:
 menu: home
 big_header: true
 onpage_menu: true
-
-translation_banner:
-    set: true
-    last_modified: Enero · 2024
-    language: Spanish
 ---
-
-<link rel="alternate" type="application/atom+xml" title="Disrot Blog" href="es/blog.atom" />

pages/01.home/modular.fr.md

@@ -16,11 +16,4 @@ 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" />

pages/01.home/modular.it.md

@@ -16,11 +16,4 @@ 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" />

pages/01.home/modular.ru.md

@@ -16,11 +16,4 @@ 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" />

pages/01.home/modular.sr.md

@@ -0,0 +1,19 @@
+---
+title: Disroot
+bgcolor: '#1F5C60'
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _about
+            - _donatebutton
+            - _donation
+            - _signup
+            - _services
+            - _disapp
+menu: home
+big_header: true
+onpage_menu: true
+---

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 sollten **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 sollen **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 "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).
+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).
 
 Zusammen können wir ein Netzwerk erschaffen, dass wirklich unabhängig ist, ausgerichtet auf den Vorteil der Menschen anstatt auf ihre Ausbeutung.

pages/02.about/_about-who-and-why/2col.en.md

@@ -10,13 +10,13 @@ wider_column: right
 
 ---
 
-**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.
+**Disroot** is a project based in Amsterdam which is maintained by volunteers and depends on the support of its community.
 
 
-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.
+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**.
 
+While searching for such tools, we found some really interesting projects, projects that we believe should be available to anyone who values similar principals. We therefore decided to bundle some applications together and share them with others. This is how **Disroot** got started.
 
-**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.
+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).
 
-
-We are convinced that we can build together a truly independent network, focused on the benefit of the people and not on their exploitation.
+Together we can form a network that is truly independent, focused on the benefit of the people rather than the exploitation thereof.

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="/mission-statement">Lee nuestra Declaración de Objetivos</a>
+<a class="button button1" href="https://disroot.org/es/mission-statement">Lee nuestra Declaración de Objetivos</a>
 
 ---
 
-**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 nosotros: 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 otres, sino también gestionarlas de acuerdo con esos valores. Así es como **Disroot** comenzó.
+**Disroot** es un proyecto radicado en Amsterdam, mantenido por voluntarixs y que depende del apoyo de su comunidad.
 
 
-El proyecto está radicado en Amsterdam, fue fundado por **Muppeth** y **Antilopa** en 2015, es mantenido por personas voluntarias 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.
+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**.
 
+Mientras buscábamos esas herramientas, encontramos algunos proyectos realmente interesantes, proyectos que creemos que deberían estar disponibles para cualquiera que valore principios similares. Por lo tanto, decidimos reunir algunas aplicaciones y compartirlas con otras personas. Así es cómo **Disroot** empezó.
 
-**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.
+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).
 
-
-Estamos convencidos que podemos construir, todas y todos juntos, una red verdaderamente independiente, enfocada en el beneficio de la gente y no en su explotación.
+Juntos podemos construir una red que sea verdaderamente independiente, enfocada en el beneficio de la gente y no en su explotación.

pages/02.about/_about-who-and-why/2col.ru.md

@@ -10,13 +10,13 @@ wider_column: right
 
 ---
 
-Проект **Disroot** создавался из личной потребности общаться и организовываться в своих кругах с помощью инструментов, которые отвечали бы ряду фундаментальных для нас критериев: они должны быть **открытыми**, **децентрализованными**, **федеративными** и, прежде всего, **уважительными** по отношению к **свободе** и **конфиденциальности**. Ни одно из наиболее популярных решений им не соответствовало, но в ходе поиска мы нашли несколько очень интересных проектов. И поскольку мы считали, что они должны быть доступны всем, кто придерживается подобных этических принципов, мы решили не только сгруппировать эти приложения и поделиться ими с другими, но и управлять ими в соответствии с этими ценностями. Так появился **Disroot**.
+**Disroot** - это поддерживаемый добровольцами проект основанный в Амстердаме, который зависит от помощи своего сообщества.
 
 
-Проект базируется в Амстердаме, был основан **Muppeth** и **Antilopa** в 2015 году, поддерживается волонтёрами и опирается на поддержку сообщества. В 2017-2018 годах группа участников начала очень активно включаться в работу и тесно сотрудничать. В 2019 году двое из них, **Fede** и **Meaz**, официально вошли в состав основной команды, управляющей платформой. Два года спустя, в 2021 году, к задачам и обязанностям присоединился **Avg_Joe**.
+Первоначально мы создавали **Disroot** из-за своих надобностей, мы искали такое обеспечение, которое можно было бы использовать для общения и организации внутри наших кругов. Большей части из имеющихся решений недоставало ключевых элементов, которые мы считаем главными. Наши инструменты должны быть **открытыми**, **децентрализованными**, **объединёнными** и **уважающими** аспекты **свободы** и **конфиденциальности**.
 
+В процессе поиска таких инструментов мы нашли несколько по-настоящему интересных проектов, которые, как мы считаем, должны быть доступны каждому, кто ценит похожие принципы. Поэтому мы решили собрать несколько приложений вместе и делиться ими с другими. Вот как **Disroot** начался.
 
-Цель **Disroot** - изменить привычный способ взаимодействия людей в Интернете. Мы хотим не только показать, что существуют открытые и этичные альтернативы, но и то, что это единственный возможный способ вырваться из *огороженных садов*, предлагаемых и продвигаемых проприетарным ПО и корпорациями, либо с помощью нашей платформы, либо с помощью других, которые имеют схожие ценности и цели или даже собственные проекты.
+Заставляя **Disroot** работать, мы надеемся изменить типичное представление людей о взаимодействии с интернетом. Мы хотим воодушевить людей **прорваться на свободу** из огороженных садов популярных программ и повернуть их в сторону нравственных альтернатив; где бы это не произошло - на нашей платформе или на другой (или даже вы запустите свою).
 
-
-Мы убеждены, что вместе сможем создать действительно независимую сеть, ориентированную на благо людей, а не на их эксплуатацию.
+Вместе мы можем сформировать сеть, которая в самом деле независима, лучше нацелена на благо людей, а не на их эксплуатацию.

pages/02.about/_about-who-and-why/2col.sr.md

@@ -0,0 +1,22 @@
+---
+title: Email
+bgcolor: '#1F5C60'
+fontcolor: '#FFFFFF'
+body_classes: modular
+wider_column: right
+---
+
+<a class="button button1" href="/mission-statement">Прочитајте нашу изјаву о мисији</a>
+
+---
+
+Седиште пројекта **Дисрут** налази се у Амстердаму, одржавају га волонтери и ослања се на подршку заједнице.
+
+
+Првобитно је **Дисрут** створен из личних потреба. Трагали смо за софтвером за комуникацију, дељење и организацију с нашим сарадницима. Већини доступних решења недостајали су нама важни чиниоци. Наши алати требало је да буду **отворени**, **децентрализовани**, **федеративни** и да **уважавају** **слободу** и **приватност**.
+
+Трагајући за таквим алатима, пронашли смо заиста занимљиве пројекте, за које сматрамо да треба да буду доступни свима који цене сличне принципе. Зато смо одлучили да повежемо неколико апликација и поделимо их с другима. Тако смо започели пројекат **Дисрут**.
+
+Покретањем овог пројекта надамо се да ћемо променити уобичајени начин интеракције на мрежи. Желимо да охрабримо људе да се **ослободе** стега популарног софтвера и окрену отвореним и етичким алтернативама, користећи нашу или било коју другу платформу (а можете покренути и сопствену).
+
+Заједно можемо успоставити истински независну мрежу и пажњу усмерити на добробит, уместо на искоришћавање људи.

pages/02.about/_core-team/fullbar.de.md

@@ -1,14 +0,0 @@
----
-title: 'Green bar'
-bgcolor: '#8EB726'
-fontcolor: '#1F5C60'
-text_align: center
----
-
-
-## Disroot Team
-
-Disroot wurde von **Antilopa** und **Muppeth**  2015 gegründet.
-Im Juli 2019 hat sich das Team um **Fede** und **Meaz** erweitert.
-
-![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")

pages/02.about/_core-team/fullbar.en.md

@@ -8,11 +8,7 @@ text_align: center
 
 ## Disroot Team
 
-**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
+Disroot was founded by **Antilopa** and **Muppeth** in 2015.
+In July 2019 **Fede** and **Meaz** joined the Team.
 
-![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)*
+![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")

pages/02.about/_core-team/fullbar.es.md

@@ -8,10 +8,7 @@ text_align: center
 
 ## Equipo de Disroot
 
-**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
+Disroot fue fundada por **Antilopa** y **Muppeth** en 2015.
+En Julio de 2019 **Fede** y **Meaz** se unieron al Equipo.
 
-![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
-
-## Equipo de traducciones
-La traducción italiana es obra de **@l3o**, las traducciones al francés, español y alemán están a cargo del **Equipo Principal**.
-*Si tienen interés por ayudarnos con esta tarea, contáctennos [aquí](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*
+![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")

pages/02.about/_core-team/fullbar.fr.md

@@ -1,18 +0,0 @@
----
-title: 'Green bar'
-bgcolor: '#8EB726'
-fontcolor: '#1F5C60'
-text_align: center
----
-
-
-## Equipe Disroot
-
-**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
-
-![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
-
-
-## Equipe de traduction
-La traduction italienne est le travail de **@l3o**, le français, l'espagnol et l'allemand sont pris en charge par l'équipe **Core**.
-*Si vous souhaitez nous aider dans ce travail, contactez-nous [ici](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*.

pages/02.about/_core-team/fullbar.it.md

@@ -1,17 +0,0 @@
----
-title: 'Green bar'
-bgcolor: '#8EB726'
-fontcolor: '#1F5C60'
-text_align: center
----
-
-
-## Disroot Team
-
-**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
-
-![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)*

pages/02.about/_core-team/fullbar.ru.md

@@ -1,18 +0,0 @@
----
-title: 'Green bar'
-bgcolor: '#8EB726'
-fontcolor: '#1F5C60'
-text_align: center
----
-
-
-## Команда Disroot 
-
-**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
-
-![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz") ![avg_joe](avg_joe.png "Avg_Joe")
-
-
-## Команда переводчиков
-Перевод на итальянский язык выполняет **@l3o**. Французским, испанским и немецким языками занимается **Основная команда**.
-*Если вы заинтересованны в помощи нам в этой работе, свяжитесь с нами [здесь](https://git.disroot.org/Disroot/Disroot-Project/issues/148)*

pages/02.about/_core-team/fullbar.sr.md

@@ -0,0 +1,14 @@
+---
+title: 'Green bar'
+bgcolor: '#8EB726'
+fontcolor: '#1F5C60'
+text_align: center
+---
+
+
+## Дисрут тим
+
+Пројекат "Дисрут" основали су **Antilopa** и **Muppeth** 2015. године.
+У јулу 2019. **Fede** и **Meaz** придружили су се тиму.
+
+![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")

pages/02.about/_federation/2col.de.md

@@ -1,25 +1,26 @@
 ---
-title: Föderation und Dezentralisierung
+title: Federation and Decentralization
 fontcolor: '#555'
 wider_column: right
 bgcolor: '#fff'
 
 ---
 
+# Föderation und Dezentralisierung
+
 <br>
-<br>
+
 ![](about-organize.jpg)
 
 ---
 
 <br>
-# Föderation und Dezentralisierung
 
 Die meisten Internetdienste werden von einem zentralen Punkt aus betrieben, im Eigentum und Betrieb von gewinnorientierten Unternehmen. Diese speichern persönliche Daten ihrer Nutzer und analysieren sie mithilfe ausgeklügelter Algorithmen, um genaue und umfangreiche Profile ihrer 'Nutzer' anzulegen. Diese Informationen werden oft genutzt, um die Menschen zum Vorteil der Werbeindustrie auszubeuten. Ebenso können die Informationen durch staatliche Organisationen oder durch böswillige Hacker erlangt und ausgenutzt werden. Daten können ohne Warnung entfernt werden, aus fragwürdigen Gründen oder aufgrund regionaler Zensurvorgaben.
 
 Ein dezentraler Service kann auf vielen Geräten laufen, im Eigentum verschiedener Individuen, Unternehmen oder Organisationen. Dank föderativer Protokolle können diese Instanzen miteinander interagieren und so ein Netzwerk formen, bestehend aus vielen Knotenpunkten (Servern, die die gleichen Dienste hosten). Es mag vorkommen, dass jemand es schafft, einen Knotenpunkt auszuschalten, aber niemals das gesamte Netzwerk. Bei einem solchen Aufbau ist Zensur praktisch unmöglich.
 
-Ein solcher Aufbau ist nichts Neues. Überleg' Dir mal, wie E&#8209;Mails funktionieren: Du kannst Dir jeden Dienstanbieter (Provider) aussuchen, den Du willst, oder sogar einen eigenen E&#8209;Mail-Dienst anbieten. Und trotzdem kannst Du mit jedem anderen Menschen in Kontakt treten, auch wenn dieser einen anderen Anbieter nutzt. E&#8209;Mail baut auf einem dezentralen und föderativen Protokoll auf.
+Ein solcher Aufbau ist nichts Neues. Überleg' Dir mal, wie Emails funktionieren: Du kannst Dir jeden Dienstanbieter (Provider) aussuchen, den Du willst, oder sogar einen eigenen Email-Dienst anbieten. Und trotzdem kannst Du mit jedem anderen Menschen in Kontakt treten, auch wenn dieser einen anderen Anbieter nutzt. Email baut auf einem dezentralen und föderativen Protokoll auf.
 
 Diese zwei Prinzipien zusammengenommen bilden den Hintergrund für ein riesiges Netzwerk, das bei aller Größe eine eher einfache Infrastruktur mit relativ geringen Kosten benötigt. Jedes Gerät kann ein Server und ein gleichberechtigter Teilnehmer im Netzwerk werden. Vom kleinen Heimcomputer über den dedizierten Server bis hin zum Serverschrank. Dieser Ansatz gibt uns die Möglichkeit, das größte benutzereigene, globale Netzwerk zu erschaffen - genau so, wie das Internet mal sein sollte.
 

pages/02.about/_federation/2col.en.md

@@ -6,14 +6,15 @@ bgcolor: '#fff'
 
 ---
 
+# Federation and Decentralization
+
 <br>
-<br>
+
 ![](about-organize.jpg)
 
 ---
 
 <br>
-# Federation and Decentralization
 
 Most internet services are run from centralized point owned and run by corporations. These store private data of their users and analyze it using advanced algorithms in order to create accurate profiles of their 'users'. This information is often used to exploit the people for the sake of advertisers. Information can also be obtained by governmental institutions or by malicious hackers. Data can be removed without warning due to dubious reasons or regional censorship policies.
 

pages/02.about/_federation/2col.es.md

@@ -6,21 +6,22 @@ bgcolor: '#fff'
 
 ---
 
+# Federación y Descentralización
+
 <br>
-<br>
+
 ![](about-organize_es.jpg)
 
 ---
 
 <br>
-# Federación y Descentralización
 
-La mayoría de los servicios de internet funcionan desde un punto centralizado, controlado y operado por corporaciones. Estas almacenan información privada de sus "usuarios" y "usuarias" y la analizan utilizando algoritmos avanzados con el fin de crear perfiles precisos de ellos y ellas. Esta información se usa habitualmente para aprovecharse de la gente en beneficio de los anunciantes. Son datos que también pueden obtener instituciones gubernamentales o hackers malintencionados. La información incluso puede ser eliminada sin aviso, por razones dudosas o por políticas regionales de censura.
+La mayoría de los servicios de internet funcionan desde un punto centralizado, controlado y operado por corporaciones. Estas almacenan información privada de sus "usuarios" y "usuarias" y la analizan utilizando algoritmos avanzados con el fin de crear perfiles precisos de ellxs. Esta información es usada habitualmente para aprovecharse de la gente en beneficio de los anunciantes. Son datos que también pueden obtener instituciones gubernamentales o hackers malintencionados. La información incluso puede ser eliminada sin aviso, por razones dudosas o por políticas regionales de censura.
 
 Un servicio descentralizado puede residir en varias máquinas, propiedad de diferentes individuos, compañías u organizaciones. Con protocolos de federación, esas instancias pueden interactuar y formar una red de muchos nodos (servidores que hospedan servicios similares). Se podría dar de baja un nodo pero nunca la red entera. Con este tipo de organización, la censura es prácticamente imposible.
 
-Piensen en cómo utilizamos el correo electrónico: podemos elegir cualquier proveedor de servicio o armar el nuestro propio, y aún así intercambiar correos con personas que usen otro proveedor de correo. El correo electrónico está construido sobre un protocolo descentralizado y federado.
+Piensa acerca de cómo utilizamos el correo electrónico: puedes elegir cualquier proveedor de servicio o armar el tuyo propio, y aún así intercambiar correos con personas que usen otro proveedor de correo. El correo electrónico está construido sobre un protocolo descentralizado y federado.
 
-Estos dos principios juntos, constituyen la base de una enorme red que depende de una estructura bastante simple y con costos relativamente bajos. Cualquier máquina puede convertirse en un servidor y ser un participante semejante en la red. Desde una pequeña computadora de escritorio en sus casas hasta un servidor dedicado o racks con múltiples servidores. Este abordaje proporciona la posibilidad de crear la más grande red global perteneciente a las personas usuarias. Tal como se concibió que fuera la Internet.
+Estos dos principios juntos, constituyen la base de una enorme red que depende de una estructura bastante simple y con costos relativamente bajos. Cualquier máquina puede convertirse en un servidor y ser un participante semejante en la red. Desde una pequeña computadora de escritorio en tu casa hasta un servidor dedicado o racks con múltiples servidores. Este abordaje proporciona la posibilidad de crear la más grande red global perteneciente a las usuarias y usuarios. Tal como se concibió que fuera la Internet.
 
 No deseamos que **Disroot** se convierta en una entidad centralizada sino una parte de una comunidad más grande, un nodo entre muchos. Esperamos que otras personas se sientan inspiradas y estimuladas a crear más proyectos con similares intenciones.

pages/02.about/_federation/2col.fr.md

@@ -6,14 +6,15 @@ bgcolor: '#fff'
 
 ---
 
+# Fédération et Décentralisation
+
 <br>
-<br>
+
 ![](about-organize.jpg)
 
 ---
 
 <br>
-# Fédération et Décentralisation
 
 La plupart des services Internet sont gérés à partir de points centralisés appartenant à des entreprises et gérés par celles-ci. Ces derniers stockent les données privées de leurs utilisateurs et les analysent à l'aide d'algorithmes poussés afin de créer des profils précis de leurs "utilisateurs". Ces informations sont souvent utilisées pour exploiter les personnes dans l'intérêt des annonceurs. Les informations peuvent également être obtenues par des institutions gouvernementales ou par des pirates informatiques malveillants. Les données peuvent être supprimées sans avertissement pour des raisons douteuses ou en raison de politiques régionales de censure.
 

pages/02.about/_federation/2col.it.md

@@ -6,14 +6,15 @@ bgcolor: '#fff'
 
 ---
 
+# Federazione e decentralizzazione
+
 <br>
-<br>
+
 ![](about-organize.jpg)
 
 ---
 
 <br>
-# Federazione e decentralizzazione
 
 La maggior parte dei servizi internet sono gestiti da un punto centralizzato di proprietà e gestiti da società. Questi memorizzano i dati privati dei loro utenti e li analizzano utilizzando algoritmi avanzati per creare profili accurati dei loro "utenti". Queste informazioni sono spesso utilizzate per sfruttare le persone per il bene degli inserzionisti. Le informazioni possono anche essere ottenute da istituzioni governative o da malintenzionati. I dati possono essere rimossi senza preavviso a causa di dubbi motivi o politiche regionali di censura.
 

pages/02.about/_federation/2col.ru.md

@@ -6,14 +6,15 @@ bgcolor: '#fff'
 
 ---
 
+# Объединение и Децентрализация
+
 <br>
-<br>
+
 ![](about-organize_ru.jpg)
 
 ---
 
 <br>
-# Объединение и Децентрализация
 
 Большинство интернет сервисов работают из централизованных точек принадлежащих корпорациям. Они собирают личную информацию своих пользователей и анализируют её, используя продвинутые алгормитмы, что бы создать точные профили своих "пользователей". Эта информация часто используется для эксплуатирования людей ради рекламодателей. Информация так же может быть получена государственными учреждениями или злонамеренными хакерами. Данные могут быть удалены без предупреждений в связи с сомнительными обстоятельствами или политикой региональной цензуры.
 

pages/02.about/_federation/2col.sr.md

@@ -0,0 +1,27 @@
+---
+title: Федерација и децентрализација
+fontcolor: '#555'
+wider_column: right
+bgcolor: '#fff'
+
+---
+
+# Федерација и децентрализација
+
+<br>
+
+![](about-organize.jpg)
+
+---
+
+<br>
+
+Већину интернет услуга пружају корпорације путем централизованих сервера. На њима се складиште лични подаци корисника које помоћу напредних алгоритама анализирају у циљу израде прецизних профила 'корисника'. Тако добијене информације често злоупотребљавају у корист оглашивача. Исти подаци могу постати доступни и на захтев владиних институција или деловањем злонамерних хакера. Податке могу уклонити без упозорења и посебног образложења или због политике цензуре.
+
+Децентрализована услуга може се понудити са више рачунара појединаца, компанија или организација. Помоћу федеративних протокола рачунари могу бити повезани у мрежу са мноштвом чворишта (сервера коју омогућавају сличне услуге). Појединац може искључити једно чвориште, али не може угасити целу мрежу. У таквој поставци цензура је практично немогућа.
+
+Сетите се како користимо е-пошту. Можете изабрати добављача услуге или подесити сопствени сервис, а притом размењивати поруке с људима који користе е-пошту другог добављача. Услуга е-поште изграђена је на принципима децентрализованих и федеративних протокола.
+
+Ова два протокола чине окосницу огромне мреже која махом зависи од једноставне и јефтине инфраструктуре. Било који рачунар може бити сервер и подједнако допринети раду мреже. То могу бити мали кућни рачунари, наменски сервери или ормари с неколико повезаних сервера. На овај начин могуће је створити највећу светску мрежу у власништву корисника - онакву каква је интернет требало да буде.
+
+Не желимо да **Дисрут** постане централизована јединица, него саставни део веће заједнице, тј. једно од многих чворишта. Надамо се да ће и други људи пронаћи надахнуће да покрену пројекте са сличним циљевима.

pages/02.about/_greenenergy/2col.de.md

@@ -1,12 +0,0 @@
----
-title: Online-donation
-bgcolor: '#1F5C60'
-wider_column: left
-fontcolor: '#ffffff'
----
-
-Die Disroot-Server werden in einem Rechenzentrum gehostet, das laut Betreiber ausschließlich erneuerbare Energien nutzt.
-
----
-
-<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="Diese Website wird umweltfreundlich gehostet - geprüft von thegreenwebfoundation.org" style="height:100px"></a>

pages/02.about/_greenenergy/2col.en.md

@@ -1,12 +0,0 @@
----
-title: Online-donation
-bgcolor: '#1F5C60'
-wider_column: left
-fontcolor: '#ffffff'
----
-
-Disroot servers are hosted in a data-center using renewable energy.
-
----
-
-<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="This website is hosted Green - checked by thegreenwebfoundation.org" style="height:100px"></a>

pages/02.about/_greenenergy/2col.es.md

@@ -1,12 +0,0 @@
----
-title: Online-donation
-bgcolor: '#1F5C60'
-wider_column: left
-fontcolor: '#ffffff'
----
-
-Los servidores de **Disroot** están alojados en un data center que utiliza energía renovable.
-
----
-
-<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="Este sitio utiliza energía renovable - Verificado por thegreenwebfoundation.org" style="height:100px"></a>

pages/02.about/_greenenergy/2col.it.md

@@ -1,12 +0,0 @@
----
-title: Online-donation
-bgcolor: '#1F5C60'
-wider_column: left
-fontcolor: '#ffffff'
----
-
-I server di Disroot sono hostati in un data-center che usa energia rinnovabile.
-
----
-
-<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="Questo sito usa energia rinnovabile - verificato da thegreenwebfoundation.org" style="height:100px"></a>

pages/02.about/_greenenergy/2col.ru.md

@@ -1,12 +0,0 @@
----
-title: Online-donation
-bgcolor: '#1F5C60'
-wider_column: left
-fontcolor: '#ffffff'
----
-
-Сервера Disroot стоят в дата-центре, использующем возобновляемые источники энергии.
-
----
-
-<a href="https://api.thegreenwebfoundation.org/greencheckimage/DISROOT.ORG" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/DISROOT.ORG" alt="This website is hosted Green - checked by thegreenwebfoundation.org" style="height:100px"></a>

pages/02.about/_privacy/2col.de.md

@@ -6,18 +6,19 @@ bgcolor: '#fff'
 
 ---
 
-# Datenschutz
+<br>
 
 Software kann erschaffen und geformt werden, wie man das möchte. Jeder Button, jede Farbe und jede Verknüpfung, die wir im Internet sehen, wurde von irgendjemand hingetan. Wenn wir die Anwendungen nutzen, die uns zur Verfügung gestellt werden, sehen wir meistens nicht - oft ist es uns auch egal - was hinter der Benutzeroberfläche passiert. Wir verbinden und mit anderen Menschen, speichern unsere Dateien, organisieren Besprechungen und Festivals, senden Emails oder chatten stundenlang - Und all das ganz einfach auf magische Weise!
 In den letzten ein oder zwei Jahrzehnten wurden Informationen immer wertvoller und gleichzeitig immer einfacher zu sammeln und zu verarbeiten. Wir haben uns daran gewöhnt, analysiert zu werden, blindlings Allgemeine Geschäftsbedingungen, Nutzungsbedingungen und Datenschutzerklärungen zu "unserem eigenen Besten" zu akzeptieren, Obrigkeiten und Multimilliarden-Dollar-Unternehmen den Schutz unserer Interessen anzuvertrauen. Dabei sind wir die ganze Zeit nur das Produkt in deren 'Menschenfarmen'.
 
 **Sei der Herr über Deine eigenen Daten:**
-Viele Netzwerke nutzen Deine Daten, um Geld damit zu verdienen, Deine Interaktionen zu analysieren und die daraus gewonnenen Informationen zu Werbezwecken (und mehr) zu nutzen. **Disroot** hat kein Interesse an Deinen Daten und nutzt sie für keinen anderen Zweck, als Dir die Verbindung mit unserem Service und dessen Nutzung zu ermöglichen.
-Deine Dateien in der Cloud sind verschlüsselt mit Deinem Benutzerpasswort, jeder Wegwerf-Container und jede auf **Lufi** hochgeladene Datei sind von der Nutzerseite aus verschlüsselt. Das bedeutet, dass nicht mal die Server-Administratoren Zugriff auf Deine Daten haben. Wann immer es die Möglichkeit zur Verschlüsselung gibt, aktivieren wir sie, und wenn das nicht möglich ist, raten wir zur Nutzung externer Verschlüsselungssoftware. Je weniger wir, die Administratoren, über Deine Daten wissen, umso besser :D.
-(_**Tipp des Tages**: Da deine Daten auf **Nextcloud** mit deinem Benutzerpasswort verschlüsselt sind, kannst du, wenn du dein Passwort vergisst, nicht mehr auf deine Daten zugreifen, also **stelle sicher, dass du dein Passwort NIEMALS verlierst!** (Wir empfehlen einen Passwort-Manager zu benutzen)_) [Lies dieses Tutorial](https://howto.disroot.org/de/tutorials/user/account/administration/ussc)
+Viele Netzwerke nutzen Deine Daten, um Geld damit zu verdienen, Deine Interaktionen zu analysieren und die daraus gewonnenen Informationen zu Werbezwecken (und mehr) zu nutzen. **Disroot** hat kein Interesse an Deinen Daten und nutzt sie für keinen anderen Zweck, als Dir die Verbindung mit unserem Service und dessen Nutzung zu ermöglichn.
+Deine Dateien in der Cloud sind verschlüsselt mit Deinem Benutzerpasswort, jeder Wegwerf-Container und jede auf **Lufi** hochgeladene Datei sind von der Nutzerseite aus verschlüsselt. Das bedeutet, dass nicht mal die Server-Administratoren Zugriff auf Deine Daten haben. Wann immer es die Möglichkeit zur Verschlüsselung gibt, aktivieren wir sie, und wenn das nihct möglich ist, raten wir zur Nutzung externer Verschlüsselungssoftware. Je weniger wir, die Administratoren, über Deine Daten wissen, umso besser :D. (Tipp des Tages: *Verliere niemals Dein Passwort!*) Sieh Dir dazu auch [dieses Tutorial](https://howto.disroot.org/de/tutorials/user/account/ussc) an.
 
 ---
 
-<br>
+# Datenschutz
+
+
 ![](priv1.jpg?lightbox=1024)
 ![](priv2.jpg?lightbox=1024)

pages/02.about/_privacy/2col.en.md

@@ -6,17 +6,19 @@ bgcolor: '#fff'
 
 ---
 
-# Privacy
+<br>
 
 Software can be created and shaped into anything. Every button, every color and every link that we see and use on the web was put there by someone. When we use the applications provided for us, we mostly don't see - and sometimes don't care about - much of what happens behind the interface we use. We connect with other people, we store our files, organize meetings and festivals, send emails or chat for hours and it all happens magically.
 In the last few decades information has become very valuable and more and more easy to collect and process. We are accustomed to being analyzed, blindly accepting terms and conditions for "our own good", trusting authorities and multi-billion dollar companies to protect our interest, while all along we are the product in their 'people farms'.
 
 **Own your own data:**
 Many networks use your data to make money by analyzing your interactions and using this information to advertise things to you. **Disroot** doesn't use your data for any purpose other than allowing you to connect and use the service.
-Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :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/en/tutorials/user/account/administration/ussc)
+Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D. (Tip of the day: *Never lose your password!*) [Check this tutorial](https://howto.disroot.org/en/tutorials/user/account/ussc)
 
 ---
 
-<br>
+# Privacy
+
+
 ![](priv1.jpg?lightbox=1024)
 ![](priv2.jpg?lightbox=1024)

pages/02.about/_privacy/2col.es.md

@@ -6,17 +6,19 @@ bgcolor: '#fff'
 
 ---
 
-# Privacidad
+<br>
 
 El software se puede crear y darle cualquier forma. Cada botón, cada color y cada enlace que vemos y utilizamos en la web fue puesto ahí por alguien. Cuando hacemos uso de las aplicaciones que nos ofrecen, generalmente no vemos (y muchas veces, no nos interesa) lo que ocurre detrás de la interfaz que utilizamos. Nos conectamos con otra gente, almacenamos nuestros archivos, organizamos reuniones y festivales, enviamos correos o chateamos durante horas y todo sucede "mágicamente".
-En las últimas décadas la información se ha vuelto muy valiosa y cada vez más fácil de recopilar y procesar. Las personas estamos acostumbradas a ser analizadas, aceptando ciegamente términos y condiciones por "nuestro propio bien", confiando en autoridades gubernamentales y compañías multimillonarias para que protejan nuestros intereses, mientras que en realidad todo el tiempo somos productos en sus 'granjas de personas'.
+En las últimas décadas la información se ha vuelto muy valiosa y cada vez más fácil de recopilar y procesar. Estamos acostumbradxs a ser analizadxs, aceptando ciegamente términos y condiciones por "nuestro propio bien", confiando en autoridades gubernamentales y compañías multimillonarias para que protejan nuestros intereses, mientras que en realidad todo el tiempo somos productos en sus 'granjas de personas'.
 
-**Seamos dueños de nuestros datos:**
-Muchas redes usan nuestros datos para hacer dinero analizando nuestras interacciones y utilizando esta información para publicitarnos cosas. **Disroot** no utiliza tus datos con ningún otro propósito que no sea permitir conectarte y usar el servicio.
-Tus archivos en la nube están cifrados con tu contraseña de usuarie, cada [pastebin](https://es.wikipedia.org/wiki/Pastebin) y archivo subido al servicio de **Lufi** está cifrado del lado del cliente también, lo que significa que ni siquiera los administradores del sistema tienen acceso a tus datos. Siempre que exista una posibilidad para cifrar, la habilitamos y si no es posible, aconsejamos utilizar un software de cifrado externo. Cuanto menos sepamos, como administradores, sobre tu información, mejor :D. (Consejo del día: *¡Nunca pierdan su contraseña!)* [Ver tutorial](https://howto.disroot.org/es/tutorials/user/account/administration/ussc)
+**Se dueñx de tu información:**
+Muchas redes usan tus datos para hacer dinero analizando tus interacciones y utilizando esta información para publicitarte cosas. **Disroot** no utiliza tus datos con ningún otro propósito que no sea permitir conectarte y usar el servicio.
+Tus archivos en la nube están cifrados con tu contraseña de usuarix, cada [pastebin](https://es.wikipedia.org/wiki/Pastebin) y archivo subido al servicio de **Lufi** está cifrado del lado del cliente también, lo que significa que ni siquiera los administradores del sistema tienen acceso a tus datos. Siempre que exista una posibilidad para cifrar, la habilitamos y si no es posible, aconsejamos utilizar un software de cifrado externo. Cuanto menos sepamos, como administradores, sobre tu información, mejor :D. (Consejo del día: *¡Nunca pierdas tu contraseña!)* [Ver tutorial](https://howto.disroot.org/es/tutorials/user/account/ussc)
 
 ---
 
-<br>
+# Privacidad
+
+
 ![](priv1.jpg?lightbox=1024)
 ![](priv2.jpg?lightbox=1024)

pages/02.about/_privacy/2col.fr.md

@@ -6,17 +6,19 @@ bgcolor: '#fff'
 
 ---
 
-# Vie privée
+<br>
 
 Les logiciels peuvent être créés et transformés en n'importe quoi. Tous les boutons, toutes les couleurs et tous les liens que nous voyons et utilisons sur le web y ont été placés par quelqu'un. Lorsque nous utilisons les applications qui nous sont fournies, nous ne voyons généralement pas - et parfois nous nous en fichons - ce qui se passe derrière l'interface que nous utilisons. Nous communiquons avec d'autres personnes, nous stockons nos dossiers, organisons des réunions et des festivals, envoyons des courriels ou discutons pendant des heures et tout cela se passe comme par magie.
 Au cours des dernières décennies, l'information est devenue très précieuse et de plus en plus facile à recueillir et à traiter. Nous avons l'habitude d'être analysés, acceptant aveuglément les termes et conditions pour "notre propre bien", faisant confiance aux autorités et à des entreprises de plusieurs milliards de dollars pour protéger nos intérêts, alors que nous sommes toujours le produit dans leurs "fermes de gens".
 
-**Possédez vos propres données:**
+**Posséder vos propres données:**
 De nombreux réseaux utilisent vos données pour gagner de l'argent en analysant vos interactions et en utilisant cette information pour vous fournir de la publicités. Disroot n'utilise pas vos données à d'autres fins que celles de vous permettre de vous connecter et d'utiliser le service.
-Vos fichiers sur le cloud sont chiffrés avec votre mot de passe utilisateur, chaque bin-paste et fichier uploadé sur le service Lufi est également chiffré côté client, ce qui signifie que même les administrateurs du serveur n'ont pas accès à vos données. Chaque fois qu'il y a une possibilité de chiffrement, nous l'activons et si ce n'est pas possible, nous conseillons d'utiliser un logiciel de chiffrement externe. En tant qu'admins, moins nous connaissons vos données, mieux c'est :D. (_**Conseil du jour** : Puisque vos fichiers sur **Nextcloud** sont chiffrés avec votre mot de passe d'utilisateur, si vous l'oubliez, vous ne pourrez plus accéder à vos fichiers, donc **assurez-vous de ne JAMAIS perdre votre mot de passe** (nous suggérons d'utiliser un gestionnaire de mots de passe)_). [Lire ce tutoriel](https://howto.disroot.org/fr/tutorials/user/account/administration/ussc)
+Vos fichiers sur le cloud sont chiffrés avec votre mot de passe utilisateur, chaque bin-paste et fichier uploadé sur le service Lufi est également chiffré côté client, ce qui signifie que même les administrateurs du serveur n'ont pas accès à vos données. Chaque fois qu'il y a une possibilité de chiffrement, nous l'activons et si ce n'est pas possible, nous conseillons d'utiliser un logiciel de chiffrement externe. En tant qu'admins, moins nous connaissons vos données, mieux c'est :D. (Conseil du jour: Ne perdez jamais votre mot de passe!)  [lisez ce tutoriel](https://howto.disroot.org/fr/tutorials/user/account/ussc)
 
 ---
 
-<br>
+# Vie privée
+
+
 ![](priv1.jpg?lightbox=1024)
 ![](priv2.jpg?lightbox=1024)

pages/02.about/_privacy/2col.it.md

@@ -6,17 +6,19 @@ bgcolor: '#fff'
 
 ---
 
-# Privacy
+<br>
 
 Il software può essere creato e modellato in qualsiasi cosa. Ogni pulsante, ogni colore e ogni link che vediamo e usiamo sul web è stato messo lì da qualcuno. Quando usiamo le applicazioni che ci vengono fornite, in genere non vediamo - e a volte non ci interessa - molto di ciò che accade dietro l'interfaccia che usiamo. Ci mettiamo in contatto con altre persone, conserviamo i nostri file, organizziamo incontri e festival, mandiamo e-mail o chiacchieriamo per ore e tutto questo accade per magia.
 Negli ultimi decenni le informazioni sono diventate molto preziose e sempre più facili da raccogliere ed elaborare. Siamo abituati ad essere analizzati, accettando ciecamente termini e condizioni per "il nostro bene", confidando nelle autorità e nelle aziende multimiliardarie per proteggere i nostri interessi, mentre noi siamo sempre il prodotto nelle loro " fattorie della gente".
 
 **Possiedi i tuoi dati personali:**
 Molte reti utilizzano i tuoi dati per fare soldi analizzando le tue interazioni e utilizzando queste informazioni per pubblicizzare le cose a voi. Disroot non utilizza i vostri dati per scopi diversi da quelli che vi permettono di connettervi e utilizzare il servizio.
-I tuoi file sul cloud sono criptati con la tua password utente, ogni bin-paste e file caricati sul servizio Lufi è criptato anche lato client, il che significa che anche gli amministratori dei server non hanno accesso ai tuoi dati. Ogni volta che c'è la possibilità di crittografia, la abilitiamo e, se non è possibile, consigliamo di utilizzare un software di crittografia esterno. Come amministratori, meno noi conosciamo i vostri dati, meglio è :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/it/tutorials/user/account/administration/ussc)
+I tuoi file sul cloud sono criptati con la tua password utente, ogni bin-paste e file caricati sul servizio Lufi è criptato anche lato client, il che significa che anche gli amministratori dei server non hanno accesso ai tuoi dati. Ogni volta che c'è la possibilità di crittografia, la abilitiamo e, se non è possibile, consigliamo di utilizzare un software di crittografia esterno. Come amministratori, meno noi conosciamo i vostri dati, meglio è :D. (Consiglio del giorno: non perdere mai la password!)  [guarda la guida](https://howto.disroot.org/it/tutorials/user/account/ussc)
 
 ---
 
-<br>
+# Privacy
+
+
 ![](priv1.jpg?lightbox=1024)
 ![](priv2.jpg?lightbox=1024)

pages/02.about/_privacy/2col.ru.md

@@ -6,17 +6,19 @@ bgcolor: '#fff'
 
 ---
 
-# Конфиденциальность
+<br>
 
-Программное обеспечение может быть создано и сформировано во всё, что угодно. Каждая кнопка, каждый цвет и каждая ссылка, которую мы видим и используем в интернете, была помещена туда кем-то. Когда мы используем приложение, предоставленное нам, мы многого не видим, а иногда не задумываемся, сколько всего произошло за интерфейсом, который мы используем. Мы связываемся с другими людьми, храним файлы, организуем встречи и фестивали, отправляем почту или общаемся часами на пролёт, и всё это происходит магически.
+Программное обеспечение может быть создано и сформированно во всё, что угодно. Каждая кнопка, каждый цвет и каждая ссылка, которую мы видим и используем в интернете, была помещена туда кем-то. Когда мы используем приложение, предоставленное нам, мы многого не видим, а иногда не задумываемся, сколько всего произошло за интерфейсом, который мы используем. Мы связываемся с другими людьми, храним файлы, организуем встречи и фестивали, отправляем почту или общаемся часами на пролёт, и всё это происходит магически.
 В последние несколько десятков лет информация стала очень ценной, и её всё проще собирать и обрабатывать. Мы привыкли находиться под постоянным анализом, слепо принимать условия и соглашения для "своего же блага", доверяя властям и мульти-миллиардным компаниям защищать наши интересы, превращая всех нас в продукт их "человеческих ферм".
 
 **Владей своими данными:**
-Многие сети используют ваши данные, чтобы зарабатывать деньги, анализируя ваши взаимодействия, и используют их для предоставления вам рекламы. **Disroot** не использует никаких ваших данных за исключением тех, которые нужны чтобы подключиться и использовать сервис.
-Ваши файлы в облаке всегда зашифрованы вашим пользовательским паролем, а любой загруженный в **Lufi** файл так же зашифрован на стороне клиента; означая, что даже серверные администраторы не имеют доступа к вашим данным. Всякий раз, когда появляется возможность зашифровать что-то, мы её включаем; а если это невозможно, мы советуем использовать стороннее обеспечение для шифровки. Чем меньше мы, админы, знаем вашей информации - тем лучше :D. (_**Совет дня**: Пока ваши файлы на **Nextcloud** зашифрованы пользовательским паролем, если вы забудете его, то потеряете доступ к вашим файлам снова, так что **старайтесь НИКОГДА не забывать свой пароль!** (Мы предпочитаем использование менеджера паролей)_) [Прочтите об этом здесь](https://howto.disroot.org/ru/tutorials/user/account/administration/ussc)
+Многие сети используют ваши данные, что бы зарабатывать деньги, анализируя ваши взаимодействия, и используют их для предоставления вам рекламы. **Disroot** не использует никаких ваших данных за исключением тех, которые нужны чтобы подключиться и использовать сервис.
+Ваши файлы в облаке всегда зашифрованы вашим пользовательским паролем, а любой загруженный в **Lufi** файл так же зашифрован на стороне клиента; означая, что даже серверные администраторы не имеют доступа к вашим данным. Всякий раз, когда появляется возможность зашифровать что-то, мы её включаем; а если это не возможно, мы советуем использовать стороннее обеспечение для шифровки. Чем меньше мы, админы, знаем вашей информации - тем лучше :D. (Совет дня: *Никогда не теряйте свой пароль!*) [Просмотрите руководство](https://howto.disroot.org/ru/tutorials/user/account/ussc)
 
 ---
 
-<br>
+# Конфиденциальность
+
+
 ![](priv1.jpg?lightbox=1024)
 ![](priv2.jpg?lightbox=1024)

pages/02.about/_privacy/2col.sr.md

@@ -0,0 +1,24 @@
+---
+title: Приватност
+fontcolor: '#555'
+wider_column: left
+bgcolor: '#fff'
+
+---
+
+<br>
+
+Софтвер може бити створен у било каквом облику. Свако дугме, боју или везу коју видимо и користимо на мрежи, неко је тамо поставио. Кад користимо апликацију најчешће не видимо, а понекад нас не занима, шта се дешава иза интерфејса. Повезујемо се с људима, складиштимо податке, организујемо састанке и фестивале, шаљемо имејлове или ћаскамо сатима; и све то изгледа магично.
+У протеклим деценијама информације су постале веома вредне и све лакше их је прикупљати и обрађивати. Навикли смо да наше податке анализирају, слепо прихватамо услове коришћења 'за сопствено добро', властима и мултимилијардерским компанијама поверавамо заштиту интереса, док успут постајемо производ тзв. људских фарми.
+
+**Управљајте сопственим подацима**
+Многе мреже зарађују на основу ваших података, анализирају ваше везе и на основу добијених информација приказују вам рекламе. **Дисрут** не користи ваше податке у било какву сврху, осим да вам омогући повезивање и коришћење услуга.
+Ваше датотеке у облаку шифроване су вашом лозинком, сваки податак похрањен у привремено складиште или отпремљен помоћу **Луфи** сервиса, такође је шифрован у самој апликацији, што значи да ни администратори сервера немају приступ тим подацима. Шифровање омогућавамо где год је могуће, а ако није, препоручујемо додатни софтвер. Што мање ми, администратори, знамо о вашим подацима, утолико боље. :D (Савет дана: *Чувајте своју лозинку!*) [Погледајте ово упутство](https://howto.disroot.org/en/tutorials/user/account/ussc)
+
+---
+
+# Приватност
+
+
+![](priv1.jpg?lightbox=1024)
+![](priv2.jpg?lightbox=1024)

pages/02.about/_transparency/2col.de.md

@@ -6,12 +6,13 @@ bgcolor: '#fff'
 
 ---
 
-<br>
+# Transparenz und Offenheit
+
 ![](about-trust.png)
 
 ---
 
-# Transparenz und Offenheit
+<br>
 
 Für **Disroot** nutzen wir zu 100% freie und quelloffene Software. Das heißt, dass der Quellcode (die Anweisungen, die die Software abarbeitet) öffentlich zugänglich ist. Jeder kann Verbesserungen oder Anpassungen zu der Software hinzufügen und sie kann jederzeit überprüft und kontrolliert werden - keine versteckten Hintertürchen oder bösartigen Schadprogramme.
 

pages/02.about/_transparency/2col.en.md

@@ -6,13 +6,14 @@ bgcolor: '#fff'
 
 ---
 
-<br>
+# Transparency and openness
+
 ![](about-trust.png)
 
 ---
 
-# Transparency and openness
+<br>
 
 At **Disroot** we use 100% free and open source software. This means that the source code (the way the software operates) is publicly accessible. Anyone is able to contribute improvements or adjustments to the software and it can be audited and controlled at any moment - no hidden back-doors or other malicious malware.
 
-We want to be fully transparent and open towards people using our services and therefore we publish information about the current state of the project, the financial status, our plans and ideas. We would also like to hear your suggestions and feedback so we can deliver the best experience possible to all **Disrooters**.
+We want to be fully transparent and open towards people using our services and therefor we publish information about the current state of the project, the financial status, our plans and ideas. We would also like to hear your suggestions and feedback so we can deliver the best experience possible to all **Disrooters**.

pages/02.about/_transparency/2col.es.md

@@ -1,18 +1,19 @@
 ---
-title: Transparencia
+title: Transparency
 fontcolor: '#555'
 wider_column: right
 bgcolor: '#fff'
 
 ---
 
-<br>
-![](about-trust_es.png)
+# Transparencia y apertura
+
+![](about-trust.png)
 
 ---
 
-# Transparencia y apertura
+<br>
 
 En **Disroot** utilizamos software 100% libre y de código de abierto. Esto significa que el [código fuente](https://es.wikipedia.org/wiki/C%C3%B3digo_fuente) (las instrucciones que hacen funcionar un software) es de acceso público. Cualquiera está en condiciones de contribuir con mejoras o ajustes al software y este puede ser auditado y controlado en cualquier momento, sin [puertas traseras](https://es.wikipedia.org/wiki/Puerta_trasera) ocultas u otro [malware](https://es.wikipedia.org/wiki/Malware) malintencionado.
 
-Queremos ser completamente transparentes y abiertos con las personas que utilizan nuestros servicios y por ello publicamos regularmente información sobre el estado actual del proyecto, su condición financiera, nuestros planes e ideas. También nos gustaría escuchar sus sugerencias y comentarios así podemos dar la mejor experiencia posible a todas y todos los **Disrooters**.
+Queremos ser completamente transparentes y abiertos con las personas que utilizan nuestros servicios y por ello publicamos regularmente información sobre el estado actual del proyecto, su condición financiera, nuestros planes e ideas. También nos gustaría escuchar sus sugerencias y comentarios así podemos dar la mejor experiencia posible a todxs lxs **Disrooters**.

pages/02.about/_transparency/2col.fr.md

@@ -6,12 +6,13 @@ bgcolor: '#fff'
 
 ---
 
-<br>
+# Transparence et ouverture
+
 ![](about-trust.png)
 
 ---
 
-# Transparence et ouverture
+<br>
 
 Chez **Disroot**, nous utilisons des logiciels 100% libres et open source. Cela signifie que le code source (le fonctionnement du logiciel) est accessible au public. N'importe qui est en mesure d'apporter des améliorations ou des ajustements au logiciel et il peut être audité et contrôlé à tout moment - pas de portes dérobées cachées ou d'autres logiciels malveillants.
 

pages/02.about/_transparency/2col.it.md

@@ -6,12 +6,13 @@ bgcolor: '#fff'
 
 ---
 
-<br>
+# Trasparenza e apertura
+
 ![](about-trust.png)
 
 ---
 
-# Trasparenza e apertura
+<br>
 
 Su **Disroot** usiamo software libero e open source al 100%. Questo significa che il codice sorgente (il modo in cui opera il software) è pubblicamente accessibile. Chiunque è in grado di apportare miglioramenti o modifiche al software, che può essere verificato e controllato in qualsiasi momento - senza backdoor nascoste o altro malware dannoso.
 

pages/02.about/_transparency/2col.ru.md

@@ -6,13 +6,14 @@ bgcolor: '#fff'
 
 ---
 
-<br>
+# Прозрачность и открытость
+
 ![](about-trust.png)
 
 ---
 
-# Прозрачность и открытость
+<br>
 
-Мы в **Disroot** используем 100% свободное и открытое программное обеспечение. Это значит, что исходный код доступен публично. Всякий желающий может внести улучшение или дополнение в программу и оно будет рассмотрено в любой момент - без потайных ходов или скрытых вирусов.
+В **Disroot** мы используем 100% свободное и открытое программное обеспечение. Это значит, что исходный код (причина, по которой программа работает) доступен публично. Всякий желающий может внести улучшение или дополнение в программу и оно будет рассмотрено в любой момент - без потайных ходов или других вирусов.
 
-Мы хотим быть полностью прозрачными и открытыми перед людьми, использующими наши сервисы, и для этого мы публикуем информацию о текущем состоянии проекта, финансовый статус, наши планы и идеи. Мы также желаем слышать ваши предложения и обратную связь, что позволит нам предоставлять всем **Disrooter'ам** наилучший сервис.
+Мы хотим быть полностью прозрачными и открытыми перед людьми, использующими наши сервисы, и для этого мы публикуем информацию о текущем состоянии проекта, финансовый статус, наши планы и идеи. Мы так же желаем слышать ваши предложения и обратную связь, что бы мы могли доставить наилучший возможный опыт пользования всем **Disrooter'ам**.

pages/02.about/_transparency/2col.sr.md

@@ -0,0 +1,19 @@
+---
+title: Транспарентност
+fontcolor: '#555'
+wider_column: right
+bgcolor: '#fff'
+
+---
+
+# Транспарентност и отвореност
+
+![](about-trust.png)
+
+---
+
+<br>
+
+Тим **Дисрут** користи 100% слободан софтвер отвореног кода. То значи да је изворни код (онај на коме почива софтвер) јавно доступан. Свако може допринети унапређењу и изменама софтвера, проверити га и контролисати у сваком тренутку - нема скривених _задњих врата_ и других злонамерних програма.
+
+Желимо бити транспарентни и отворени према корисницима наших услуга и зато објављујемо информације у вези тренутног стања пројекта, финансија, планова и идеја. Радо ћемо саслушати ваше предлоге и утиске, да бисмо омогућили најбоље могуће искуство свим **Искорењивачима**.

pages/02.about/modular.de.md

@@ -8,16 +8,9 @@ content:
         dir: asc
         custom:
             - _about-who-and-why
-            - _core-team
             - _federation
             - _privacy
             - _transparency
-            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
-
-translation_banner:
-    set: true
-    last_modified: März 2022
-    language: German
 ---

pages/02.about/modular.en.md

@@ -12,7 +12,6 @@ content:
             - _federation
             - _privacy
             - _transparency
-            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
 ---

pages/02.about/modular.es.md

@@ -1,6 +1,6 @@
 ---
 title: 'Nosotros'
-bgcolor: '#1F5C60'
+bgcolor: '#fff'
 content:
     items: '@self.modular'
     order:
@@ -8,16 +8,9 @@ content:
         dir: asc
         custom:
             - _about-who-and-why
-            - _core-team
             - _federation
             - _privacy
             - _transparency
-            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
-
-translation_banner:
-    set: true
-    last_modified: Enero · 2024
-    language: Español
 ---

pages/02.about/modular.fr.md

@@ -8,16 +8,9 @@ content:
         dir: asc
         custom:
             - _about-who-and-why
-            - _core-team
             - _federation
             - _privacy
             - _transparency
-            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
-
-translation_banner:
-    set: true
-    last_modified: Mars 2022
-    language: French
 ---

pages/02.about/modular.it.md

@@ -8,16 +8,9 @@ content:
         dir: asc
         custom:
             - _about-who-and-why
-            - _core-team
             - _federation
             - _privacy
             - _transparency
-            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
-
-translation_banner:
-    set: true
-    last_modified: Marzo 2022
-    language: Italian
 ---

pages/02.about/modular.ru.md

@@ -1,5 +1,5 @@
 ---
-title: 'Мы'
+title: 'О нас'
 bgcolor: '#fff'
 content:
     items: '@self.modular'
@@ -8,16 +8,9 @@ content:
         dir: asc
         custom:
             - _about-who-and-why
-            - _core-team
             - _federation
             - _privacy
             - _transparency
-            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
-
-translation_banner:
-    set: true
-    last_modified: Ноябрь 2023
-    language: Russian
 ---

pages/02.about/modular.sr.md

@@ -0,0 +1,17 @@
+---
+title: 'О нама'
+bgcolor: '#1F5C60'
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _about-who-and-why
+            - _core-team
+            - _federation
+            - _privacy
+            - _transparency
+body_classes: modular
+header_image: about-banner.jpeg
+---

pages/03.services/02.email/_email-alias/2col.de.md

@@ -6,10 +6,22 @@ wider_column: right
 section_id: alias
 ---
 
-## E-Mail Domain Linking
+## Email Aliase<br> und Domain Linking
 
-<a class="button button2" href="https://disroot.org/perks">Vorteile</a>
+<a class="button button1" href="https://disroot.org/de/forms/alias-request-form">Aliase beantragen</a>
+<a class="button button2" href="https://disroot.org/de/forms/domain-linking-form">Eigene Domain verlinken</a>
 
 ---
 
 
+Ein Email-Alias ist im Prinzip nichts anderes als eine Art Nachsendeadresse für Deine Emails.
+
+Mehr Aliase sind verfügbar für regelmäßige Unterstützer. Mit regelmäßigen Unterstützern meinen wir die Community-Mitglieder, die uns mindestens eine Tasse Kaffee im Monat "kaufen".
+
+Es ist jetzt nicht so, dass wir hier Kaffee anpreisen wollen. Auf der anderen Seite ist Kaffee jedoch eine sehr griffige Analogie für [Ausbeutung](http://thesourcefilm.com) und [Ungleichheit](http://www.foodispower.org/coffee/)). Wir denken, dies ist eine gute Möglichkeit, jeden selbst bestimmen zu lassen, wie viel er geben kann.
+Wir haben diese [Liste](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) gefunden mit Kaffeepreisen rund um die Welt. Die Liste ist vielleicht nicht hundertprozentig korrekt oder gar tagesaktuell, aber Du hast in ihr einen guten Indikator für die verschiedenen Preise. Nimm Dir ruhig Zeit, die Höhe Deines Beitrags abzuwägen. Wenn Du uns einen **Rio de Janeiro**-Kaffee im Monat "kaufen" kannst, ist das OK. Wenn Du Dir jedoch einen *doppelten entkoffeinierten Soja Frappuccino mit einem extra Shot und Sahne* im Monat leisten kannst, dann hilfst Du uns wirklich, die **Disroot**-Plattform am Laufen zu halten und sicherzugehen, dass sie frei zugänglich bleibt für andere Menschen mit weniger Mitteln.
+
+Um ein Alias zu beantragen, fülle bitte dieses [Formular](https://disroot.org/de/forms/alias-request-form) aus.<br>
+Wenn Du Deine eigene Domain nutzen willst, brauchst Du dieses [Formular](https://disroot.org/de/forms/domain-linking-form).
+
+Für weitere Informationen, z.B. wie Du Deine neuen Email-Aliase einrichtest, schau Dir unsere [Tutorials](https://howto.disroot.org/de/tutorials/email/alias) an.

pages/03.services/02.email/_email-alias/2col.en.md

@@ -6,11 +6,21 @@ wider_column: right
 section_id: alias
 ---
 
-## Custom domain linking
-<br>
-<a class="button button2" href="https://disroot.org/perks">Request Perks</a>
+## Email Aliases<br> and Domain Linking
+
+<a class="button button1" href="https://disroot.org/en/forms/alias-request-form">Request Aliases</a>
+<a class="button button2" href="https://disroot.org/en/forms/domain-linking-form">Link Own Domain</a>
 
 ---
 
 <br>
-This feature is a lifetime bonus for those who make a financial contribution to the project. It allows you to send and receive emails using your own domain name.
+An email alias is simply a forwarding email address.
+
+More aliases are available for our regular supporters. By regular supporters we think of those who contribute the equivalent of at least one cup of coffee a month. It is not that we are promoting coffee, on the contrary - coffee is actually quite the symbol for [exploitation](http://thesourcefilm.com/)  and [inequality](http://www.foodispower.org/coffee/) so we thought that it is a good way to let people measure themselves how much they can give.
+We found this [list of coffee cup prices](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) around the world, it might not be very accurate, but it gives a good indication of the different fares. Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the **Disroot** platform running and make sure it is available for free for other people with less means.
+
+
+To request aliases you need to fill in this [form](https://disroot.org/en/forms/alias-request-form).<br>
+If you would like to use your own domain use this [form](https://disroot.org/en/forms/domain-linking-form).
+
+For information on howto to setup your new email aliases check our [howto section](https://howto.disroot.org/en/tutorials/email/alias).

pages/03.services/02.email/_email-alias/2col.es.md

@@ -6,13 +6,22 @@ wider_column: right
 section_id: alias
 ---
 
-## Vinculación de Dominios
-<br>
-<a class="button button2" href="https://disroot.org/perks">Solicitar Beneficios</a>
+## Alias de correo<br> y Vinculación de Dominios
+
+<a class="button button1" href="https://disroot.org/es/forms/alias-request-form">Solicitar Alias</a>
+<a class="button button2" href="https://disroot.org/es/forms/domain-linking-form">Vincular dominio propio</a>
 
 ---
 
 <br>
-Esta funcionalidad es un beneficio por tu contribución económica al proyecto. Te permite utilizar tu propio dominio para poder enviar y recibir correos. Es un beneficio de por vida.
----
+Un alias de correo es simplemente una dirección de reenvío.
 
+Hay más alias de correo disponibles para nuestrxs aportantes habituales. Con "aportantes habituales" pensamos en aquellas personas que contribuyen con el equivalente a, por lo menos, una taza de café al mes.
+No estamos promoviendo el café, al contrario, pensamos que es, de hecho, un claro ejemplo de lo que es la [explotación](http://thesourcefilm.com/) y la [inequidad](http://www.foodispower.org/coffee/), pero entendemos que es mejor dejar a la gente mensurar por sí misma cuánto pueden dar.
+Encontramos esta [lista](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) de precios de tazas de café alrededor del mundo, podría no ser muy precisa, pero da un buen indicio de los diferentes costos.
+Por favor, tómate el tiempo para considerar tu contribución. Si puedes 'comprarnos' una taza de café al mes en Río De Janeiro, eso está muy bien. Pero si puedes permitirte pagar un _Café Doble Descafeinado Con Crema extra_ al mes, entonces puedes ayudarnos en serio a mantener funcionando la plataforma **Disroot** y asegurar que esté disponible de manera gratuita para otras personas con menos recursos.
+
+Para solicitar Alias necesitas completar este [formulario](https://disroot.org/es/forms/alias-request-form).<br>
+Si deseas utilizar tu propio dominio, usa este [formulario](https://disroot.org/es/forms/domain-linking-form).
+
+Para más información sobre cómo configurar tu nuevo alias de correo, mira en nuestra [sección de manuales](https://howto.disroot.org/es/tutorials/email/alias)

pages/03.services/02.email/_email-alias/2col.fr.md

@@ -1,16 +1,29 @@
 ---
-title: "Lien vers un domaine personnel"
+title: "Alias d'email"
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
 section_id: alias
 ---
 
-## Lien vers un domaine personnel
-<br>
-<a class="button button2" href="https://disroot.org/perks">Demander un avantage</a>
+## Alias d'email et liaison de domaine
+
+<a class="button button1" href="https://disroot.org/fr/forms/alias-request-form">Demande d'alias</a>
+<a class="button button2" href="https://disroot.org/fr/forms/domain-linking-form">Lier votre propre domaine</a>
 
 ---
 
 <br>
-Cette fonction est un avantage donné en remerciement pour votre contribution financière au projet. Elle vous permet d'utiliser votre propre domaine pour pouvoir envoyer et recevoir des courriels. C'est une récompense à vie.
+Des alias sont simplement des adresses emails de transfert, utilisées par exemple pour simplifier une adresse mail compliquée.
+
+Des alias supplémentaires sont disponibles pour nos contributeurs réguliers. Par contributeurs réguliers, nous pensons à ceux qui contribuent l'équivalent d'au moins une tasse de café par mois.
+Ce n'est pas que nous faisons la promotion du café, bien au contraire - le café est en fait tout à fait le symbole de [l'exploitation](http://thesourcefilm.com/)  et de  [l'inégalité](http://www.foodispower.org/coffee/) donc nous avons pensé que c'était une bonne façon de laisser les gens mesurer eux-mêmes combien ils peuvent donner.
+Nous avons trouvé cette [liste](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) des prix des tasses de café à travers le monde, elle n'est peut-être pas très précise, mais elle donne une bonne indication des différents tarifs.
+Veuillez prendre le temps de réfléchir à votre contribution. Si vous pouvez nous "acheter" une tasse de café Rio De Janeiro par mois, c'est correct, mais si vous avez les moyens d'acheter un double décaféiné Frappuccino au soja avec un extra Shot And Cream par mois, alors vous pouvez vraiment nous aider à maintenir la plateforme **Disroot** en fonctionnement et vous assurer qu'elle est disponible gratuitement pour d'autres personnes avec moins de moyens.
+
+Pour demander des alias vous devez remplir ce [formulaire](https://disroot.org/fr/forms/alias-request-form).<br>
+Si vous souhaitez utiliser votre propre domaine, utilisez ce [formulaire](https://disroot.org/fr/forms/domain-linking-form).
+
+*Si vous avez déjà fait un don pour **Disroot** dans le passé et que vous souhaitez toujours obtenir des alias, veuillez nous contacter.*
+
+Pour plus d'informations sur la configuration de vos nouveaux alias de courriel, consultez notre [section de guides](https://howto.disroot.org/fr/tutorials/email/alias)

pages/03.services/02.email/_email-alias/2col.it.md

@@ -8,6 +8,24 @@ section_id: alias
 
 ## Email Alias<br> e collegamento a domini
 
-<a class="button button2" href="https://disroot.org/perks">Benefici</a>
+<a class="button button1" href="https://disroot.org/en/forms/alias-request-form">Richiedi un alias</a>
+<a class="button button2" href="https://disroot.org/en/forms/domain-linking-form">Collega il tuo dominio</a>
 
 ---
+
+<br>
+
+Gli alias sono disponbili per gli utenti regolari. Con regolari si intende coloro che contribuiscono l'equivalente di almeno una tazza di caffé al mese.
+
+Non stiamo promuovendo il caffé, al contrario, il caffé simbolizza [lo sfruttamento](http://thesourcefilm.com/) e l'[inuguaglianza](http://www.foodispower.org/coffee/), crediamo però che sia un buon modo di permettere agli utenti di regolarsi nel contributo a **Disroot**.
+
+Abbiamo trovato [la lista dei prezzi](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) di una tazza di caffé nel mondo. Potrebbe non essere molto accurata ma da una buona indicazione sulla differenza di prezzi.
+
+Ti chiediamo quindi di valutare quanto donare. Se ti puoi permettere una tazza di caffé a Rio De Janeiro al mese, per noi va bene, ma se ti puoi permettere un Frapuccino doppio decaffeinato di soia con doppia panna al mese, sappi che in questo modo potresti aiutarci in modo importante a far funzionare la piattaforma Disroot ed assicurare il buon funzionamento del progetto anche per chi non ha le tue stesse disponibilità economiche.
+
+Per richiedere un alias compila questa [form](https://disroot.org/en/forms/alias-request-form).<br>
+Se invece desideri utilizzare un tuo dominio compila questa [form](https://disroot.org/en/forms/domain-linking-form).
+
+Nel caso avessi già donato in passato a **Disroot** e ti piacerebbe comunque avere degli alias contattaci direttamente.
+
+Per informazioni su come impostare il tuo nuovo alias guarda la sezione [guide](https://howto.disroot.org/it/tutorials/email/alias)

pages/03.services/02.email/_email-alias/2col.ru.md

@@ -1,13 +0,0 @@
----
-title: 'Email Alias'
-bgcolor: '#FFF'
-fontcolor: '#555'
-wider_column: right
-section_id: alias
----
-
-## Почтовые алиасы<br> и привязка доменов
-
-<a class="button button2" href="https://disroot.org/perks">Perks</a>
----
-

pages/03.services/02.email/_email-alias/2col.sr.md

@@ -0,0 +1,28 @@
+---
+title: 'Надимак за е-пошту'
+bgcolor: '#FFF'
+fontcolor: '#555'
+wider_column: right
+section_id: alias
+---
+
+## Надимци за е-пошту<br> и повезивање домена
+
+<a class="button button1" href="https://disroot.org/en/forms/alias-request-form">Затражи надимак</a>
+<a class="button button2" href="https://disroot.org/en/forms/domain-linking-form">Повежи лични домен</a>
+
+---
+
+<br>
+
+Надимак је заправо имејл адреса за прослеђивање поште.
+
+Већи број надимака доступан је нашим редовним донаторима. Мислимо на људе који на месечном нивоу донирају у противвредности макар једне шољице кафе.
+То не значи да ми промовишемо кафу — напротив. Кафа је симбол израбљивања и [неједнакости](http://www.foodispower.org/coffee/) али сматрамо да може бити мерило средстава којих се можете одрећи.
+Пронашли смо ову [листу цена кафе](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) широм света, и мада бројке можда нису прецизне, довољно говоре о разликама на тржишту.
+Молимо да размотрите могућност донације. Ако нам можете 'купити' шољицу кафе _Рио де Жанеиро_ месечно, то је у реду, али ако нас можете почастити продуженим еспресом с млеком и шлагом, то би заиста помогло да **Disroot** pлатформа остане бесплатан сервис и за оне с мањком средстава.
+
+Надимак можете затражити попуњавањем овог [формулара](https://disroot.org/en/forms/alias-request-form).<br>
+Ако желите да користите сопствени домен, користите овај [формулар](https://disroot.org/en/forms/domain-linking-form).
+
+За информације о подешавању новог имејл надимка погледајте [одељак с упутствима](https://howto.disroot.org/en/communication/email/alias)

pages/03.services/02.email/_email-clients/clients.de.md

@@ -1,5 +1,5 @@
 ---
-title: 'E-Mail Clients'
+title: 'Email Clients'
 bgcolor: '#FFF'
 fontcolor: '#327E82'
 text_align: left
@@ -41,7 +41,7 @@ clients:
     -
         title: K9Mail
         logo: k9mail.png
-        link: https://k9mail.app/
+        link: https://k9mail.github.io/
         text:
         platforms: [fa-android]
 

pages/03.services/02.email/_email-clients/clients.en.md

@@ -41,7 +41,7 @@ clients:
     -
         title: K9Mail
         logo: k9mail.png
-        link: https://k9mail.app/
+        link: https://k9mail.github.io/
         text:
         platforms: [fa-android]
 

pages/03.services/02.email/_email-clients/clients.sr.md

@@ -0,0 +1,67 @@
+---
+title: 'Имејл клијенти'
+bgcolor: '#FFF'
+fontcolor: '#327E82'
+text_align: left
+clients:
+    -
+        title: Thunderbird
+        logo: thunderbird.png
+        link: https://www.thunderbird.net/
+        text:
+        platforms: [fa-linux, fa-windows, fa-apple]
+    -
+        title: Evolution
+        logo: evolution.png
+        link: https://wiki.gnome.org/Apps/Evolution
+        text:
+        platforms: [fa-linux]
+
+    -
+        title: KMail
+        logo: kmail.png
+        link: https://userbase.kde.org/KMail#Download
+        text:
+        platforms: [fa-linux]
+
+    -
+        title: ClawsMail
+        logo: clawsmail.png
+        link: https://www.claws-mail.org/downloads.php
+        text:
+        platforms: [fa-linux, fa-windows]
+
+    -
+        title: Mailpile
+        logo: mailpile.png
+        link: https://www.mailpile.is/
+        text:
+        platforms: [fa-linux]
+
+    -
+        title: K9Mail
+        logo: k9mail.png
+        link: https://k9mail.github.io/
+        text:
+        platforms: [fa-android]
+
+    -
+        title: FairEmail
+        logo: fairemail.png
+        link: https://email.faircode.eu/
+        text:
+        platforms: [fa-android]
+
+    -
+        title: iOS Mail App
+        logo: iosmail.png
+        link: https://support.apple.com/en-us/HT201320
+        text:
+        platforms: [fa-apple]
+
+
+---
+
+<div class=clients markdown=1>
+
+</div>

pages/03.services/02.email/_email-clients_header/fullbar.de.md

@@ -1,14 +1,14 @@
 ---
-title: 'Nutze Deinen bevorzugten E-Mail-Client'
+title: 'Nutze Deinen bevorzugten Email-Client'
 bgcolor: '#FFFFFF'
 fontcolor: '#327E82'
 text_align: center
 ---
 
 <br>
-# Nutze das E&#8209;Mail-Programm Deiner Wahl
-Es gibt Unmengen E&#8209;Mail-Clients für den Desktop oder Dein Mobilgerät. Such Dir den Client aus, der Dir am besten gefällt.<br>
+# Nutze das Email-Programm Deiner Wahl
+Es gibt Unmengen Email-Clients für den Desktop oder Dein Mobilgerät. Such Dir den Client aus, der Dir am besten gefällt.<br>
 
 Schau Dir unser [Tutorial](https://howto.disroot.org/de/tutorials/email/clients) an, um nähere Informationen zum Setup Deines bevorzugten Clients zu erhalten.
 <br>
-*Oben auf dieser Seite findest Du die Einstellungen, um Deine* **Disroot**-*E&#8209;Mail auf Deinem Gerät einzurichten. Diese Einstellungen sind die Standardinformationen, die Deinem E&#8209;Mail-Client sagen, wie er den* **Disroot**-*E&#8209;Mailserver erreicht.*
+*Oben auf dieser Seite findest Du die Einstellungen, um Deine* **Disroot**-*Email auf Deinem Gerät einzurichten. Diese Einstellungen sind die Standardinformationen, die Deinem Email-Client sagen, wie er den* **Disroot**-*Emailserver erreicht.*

pages/03.services/02.email/_email-clients_header/fullbar.en.md

@@ -6,9 +6,9 @@ text_align: center
 ---
 
 <br>
-# Use your favorite email client
-There are many desktop/mobile email clients to choose from. Pick the one you like the best.<br>
+# Use your favorite Email client
+There are a lot of desktop/mobile email clients to choose from. Pick the one you like the best.<br>
 
-Check our [Howto page](https://howto.disroot.org/en/tutorials/email/clients) for details on how to set up Disroot's email with your favourite clients.
+Check our [Howto page](https://howto.disroot.org/en/tutorials/email/clients) for details on how to setup your favourite clients.
 <br>
 *Check the settings on top of this page to set up your* **Disroot** *email on your device. These settings are standard information that tells your email client how to reach* **Disroot**'*s email server.*

pages/03.services/02.email/_email-clients_header/fullbar.ru.md

@@ -1,14 +0,0 @@
----
-title: 'Email Clients'
-bgcolor: '#FFFFFF'
-fontcolor: '#327E82'
-text_align: center
----
-
-<br>
-# Используйте любимый почтовый клиент
-Существует много настольных/мобильных почтовых клиентов на выбор. Выберите тот, который вам больше всего нравится.<br>
-
-Смотрите нашу [страницу с инструкциями](https://howto.disroot.org/ru/tutorials/email/clients) для получения информации о настройке каждого отдельно взятого приложения.
-<br>
-*Узнайте конфигурацию почтового сервера* **Disroot** *чтобы настроить ваше приложения для работы. Информация о IMAP, SMTP, SMTPS и POP находится на этой странице чуть ниже. Эти настройки представляют собой стандартную информацию, которая сообщает вашему почтовому клиенту, как связаться с сервером* **Disroot** *.*

pages/03.services/02.email/_email-clients_header/fullbar.sr.md

@@ -0,0 +1,14 @@
+---
+title: 'Имејл клијенти'
+bgcolor: '#FFFFFF'
+fontcolor: '#327E82'
+text_align: center
+---
+
+<br>
+# Користите ваш омиљени имејл клијент
+На располагању су вам многи стони/мобилни клијенти за имејл. Одаберите онај који вам се највише допада.<br>
+
+Погледајте нашу [страницу с упутствима](https://howto.disroot.org/en/tutorials/email/clients) за више детаља о подешавању вашег омиљеног клијента.
+<br>
+*Погледајте подешавања на врху ове странице и подесите* **Disroot** *имејл на вашем уређају. Подешавања садрже стандардне информације за приступ вашег имејл клијента* **Disroot** *серверу за е-пошту.*

pages/03.services/02.email/_email-encryption/2col.de.md

@@ -1,5 +1,5 @@
 ---
-title: 'E-Mail-Verschlüsselung'
+title: 'Email-Verschlüsselung'
 bgcolor: '#8EB726'
 fontcolor: '#1F5C60'
 text_align: left
@@ -11,10 +11,6 @@ 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.
+Verschlüsselung ist, wenn 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.