custom domain form and changes on the mail service page

.vagrant/bundler/global.sol

@@ -0,0 +1 @@
+{"dependencies":[["log4r",[">= 0"]],["concurrent-ruby",["~> 1.0"]],["i18n",[">= 0"]],["micromachine",[">= 2","< 4"]],["vagrant-vbguest",["= 0.30.0"]]],"checksum":"a645b4e3a1a99ba4029691649fc03e4a3b392dfb4e29c7379b4233997d2447e2","vagrant_version":"2.2.18"}

.vagrant/machines/default/virtualbox/vagrant_cwd

@@ -0,0 +1 @@
+/home/muppeth/Projects/Disroot/Websites/Website

.vagrant/rgloader/loader.rb

@@ -0,0 +1,9 @@
+# This file loads the proper rgloader/loader.rb file that comes packaged
+# with Vagrant so that encoded files can properly run with Vagrant.
+
+if ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]
+  require File.expand_path(
+    "rgloader/loader", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
+else
+  raise "Encoded files can't be read outside of the Vagrant installer."
+end

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)

Vagrantfile

@@ -0,0 +1,70 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "base"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+end

pages/.gitignore

@@ -1,3 +1,4 @@
 privacy_policy/_pp
 tos/_tos
 cryptocurrency/
+changelog/_main

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

@@ -13,4 +13,4 @@ wider_column: right
 ---
 
 ## Disroot app
-Это приложение вроде швейцарского ножа для платформы **Disroot**, созданной сообществом для сообщества. Если у вас нет учетной записи **Disroot**, вы все равно можете использовать это приложение для доступа ко всем сервисам **Disroot**, для которых не требуется учетная запись, таким как быстрые заметки, файлообменник и т.д.
+Это приложение вроде швейцарского ножа для платформы Disroot, созданной сообществом для сообщества. Если у вас нет учетной записи Disroot, вы все равно можете использовать это приложение для доступа ко всем сервисам Disroot, для которых не требуется учетная запись, таким как быстрые заметки, файлообменник и т.д.

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/_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,7 +5,7 @@ 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).
 
@@ -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,7 +5,7 @@ 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 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) sono disponibili per donatori regolari.
 
 Puoi anche contribuire acquistando [spazio aggiuntivo per l'email](/services/email#storage) oppure [spazio aggiuntivo per il cloud](/services/nextcloud#storage).
 
@@ -17,6 +17,8 @@ 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>

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

@@ -5,8 +5,8 @@ wider_column: left
 fontcolor: '#1e5a5e'
 ---
 
-![](premium.png?class=reward) **Disroot** полагается на пожертвования и поддержку сообщества. Если вы хотите, чтобы проект продолжал существование и развитие, помогая новым пользователям находить уголок цифровой свободы, пожалуйста, используйте любой из доступных методов доната для внесения материального вклада в наше дело.
-Для людей, которые регулярно поддерживают нас, возможна [привязка доменов](/services/email#alias).
+![](premium.png?class=reward) Disroot полагается на пожертвования и поддержку сообщества. Если вы хотите, чтобы проект продолжал существование и развитие, помогая новым пользователям находить уголок цифровой свободы, пожалуйста, используйте любой из доступных методов доната для внесения материального вклада в наше дело.
+Для людей, которые регулярно поддерживают нас, возможны [псевдонимы и привязка доменов](/services/email#alias).
 
 Вы также можете поддержать нас, [расширив почтовое хранилище](/services/email#storage) и/или [увеличив дисковое пространство](/services/nextcloud#storage) вашего облачного хранилища.
 
@@ -18,6 +18,8 @@ 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>

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"
+        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"
+        buttontext: "Access"
         #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"
 ---

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

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"
+        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"
+        buttontext: "Accede"
         #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"
 ---

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,15 @@ 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"
+        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:
-    -
-        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"
+        #badge: 
 ---

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"
+        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"
+        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: "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"
-
 ---

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

@@ -11,7 +11,7 @@ services:
         icon: email.png
         link: 'https://disroot.org/services/email'
         text: "Бесплатный и безопасный почтовый сервер с поддержкой IMAP и приятным веб-интерфейсом."
-        button: 'https://webmail.disroot.org'
+        button: 'https://mail.disroot.org'
         buttontext: "Войти"
     -
         title: 'Облако'
@@ -20,6 +20,13 @@ services:
         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
@@ -34,7 +41,13 @@ services:
         text: "Совместно создавайте и редактируйте документы прямо в браузере."
         button: 'https://pad.disroot.org'
         buttontext: "Создать документ"
-
+    -
+        title: 'Таблицы'
+        icon: calc.png
+        link: 'https://disroot.org/services/pads'
+        text: "Совместно создавайте и редактируйте электронные таблицы прямо в браузере!"
+        button: 'https://calc.disroot.org'
+        buttontext: "Создать таблицу"
     -
         title: 'Paste Bin'
         icon: pastebin.png
@@ -56,7 +69,20 @@ services:
         text: "Гибкий приватный инструмент для поиска в интернете."
         button: 'https://search.disroot.org'
         buttontext: "Найти"
-
+    -
+        title: 'Опросы'
+        icon: polls.png
+        link: 'https://disroot.org/services/polls'
+        text: "Онлайн-сервис для быстрого и удобного проведения массовых опросов."
+        button: 'http://polls.disroot.org'
+        buttontext: "Создать опрос"
+    -
+        title: 'Проекты'
+        icon: project_board.png
+        link: 'https://disroot.org/services/project-board'
+        text: "Инструмент для управления проектами."
+        button: 'https://board.disroot.org'
+        buttontext: "Войти"
     -
         title: 'Jitsi'
         icon: calls.png
@@ -76,30 +102,15 @@ services:
         icon: mumble.png
         link: 'https://disroot.org/services/audio'
         text: "Голосовой чат с низкой задержкой и хорошим качеством звука."
-        button: 'https://disroot.org/services/audio'
-        buttontext: "Инфо"
+        button: 'https://mumble.disroot.org'
+        buttontext: "Войти"
         #badge: EXPERIMENTAL
     -
-        title: 'CryptPad'
+        title: 'Cryptpad'
         icon: cryptpad.png
         link: 'https://disroot.org/services/cryptpad'
         text: "Альтернатива популярным офисным приложениям с акцентом на приватность."
         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: "Начать"
 ---

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/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/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 principles. 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/_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

@@ -6,13 +6,9 @@ text_align: center
 ---
 
 
-## Команда Disroot 
+## Disroot Team
 
-**Antilopa**, **Muppeth**, **Fede**, **Meaz**, **Avg_Joe**.
+Disroot был основан пользователями **Antilopa** и **Muppeth** в 2015 году.
+В июле 2019 к Команде присоединились **Fede** и **Meaz**.
 
-![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)*
+![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")

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

@@ -1,5 +1,5 @@
 ---
-title: Föderation und Dezentralisierung
+title: Federation and Decentralization
 fontcolor: '#555'
 wider_column: right
 bgcolor: '#fff'
@@ -19,7 +19,7 @@ Die meisten Internetdienste werden von einem zentralen Punkt aus betrieben, im E
 
 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‑Mails funktionieren: Du kannst Dir jeden Dienstanbieter (Provider) aussuchen, den Du willst, oder sogar einen eigenen E‑Mail-Dienst anbieten. Und trotzdem kannst Du mit jedem anderen Menschen in Kontakt treten, auch wenn dieser einen anderen Anbieter nutzt. E‑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.es.md

@@ -15,12 +15,12 @@ bgcolor: '#fff'
 <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/_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.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/_privacy/2col.de.md

@@ -12,9 +12,8 @@ Software kann erschaffen und geformt werden, wie man das möchte. Jeder Button,
 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.
 
 ---
 

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

@@ -13,7 +13,7 @@ In the last few decades information has become very valuable and more and more e
 
 **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**: 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 manger)_
 
 ---
 

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

@@ -9,11 +9,11 @@ bgcolor: '#fff'
 # Privacidad
 
 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)
 
 ---
 

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

@@ -11,9 +11,9 @@ bgcolor: '#fff'
 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)
 
 ---
 

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

@@ -13,7 +13,7 @@ Negli ultimi decenni le informazioni sono diventate molto preziose e sempre più
 
 **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)
 
 ---
 

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

@@ -8,12 +8,12 @@ bgcolor: '#fff'
 
 # Конфиденциальность
 
-Программное обеспечение может быть создано и сформировано во всё, что угодно. Каждая кнопка, каждый цвет и каждая ссылка, которую мы видим и используем в интернете, была помещена туда кем-то. Когда мы используем приложение, предоставленное нам, мы многого не видим, а иногда не задумываемся, сколько всего произошло за интерфейсом, который мы используем. Мы связываемся с другими людьми, храним файлы, организуем встречи и фестивали, отправляем почту или общаемся часами на пролёт, и всё это происходит магически.
+Программное обеспечение может быть создано и сформированно во всё, что угодно. Каждая кнопка, каждый цвет и каждая ссылка, которую мы видим и используем в интернете, была помещена туда кем-то. Когда мы используем приложение, предоставленное нам, мы многого не видим, а иногда не задумываемся, сколько всего произошло за интерфейсом, который мы используем. Мы связываемся с другими людьми, храним файлы, организуем встречи и фестивали, отправляем почту или общаемся часами на пролёт, и всё это происходит магически.
 В последние несколько десятков лет информация стала очень ценной, и её всё проще собирать и обрабатывать. Мы привыкли находиться под постоянным анализом, слепо принимать условия и соглашения для "своего же блага", доверяя властям и мульти-миллиардным компаниям защищать наши интересы, превращая всех нас в продукт их "человеческих ферм".
 
 **Владей своими данными:**
-Многие сети используют ваши данные, чтобы зарабатывать деньги, анализируя ваши взаимодействия, и используют их для предоставления вам рекламы. **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)
 
 ---
 

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

@@ -1,5 +1,5 @@
 ---
-title: Transparencia
+title: Transparency
 fontcolor: '#555'
 wider_column: right
 bgcolor: '#fff'
@@ -7,7 +7,7 @@ bgcolor: '#fff'
 ---
 
 <br>
-![](about-trust_es.png)
+![](about-trust.png)
 
 ---
 
@@ -15,4 +15,4 @@ bgcolor: '#fff'
 
 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/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.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

@@ -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/03.services/02.email/_email-alias/2col.de.md

@@ -6,9 +6,9 @@ wider_column: right
 section_id: alias
 ---
 
-## E-Mail Domain Linking
+## Email Domain Linking
 
-<a class="button button2" href="https://disroot.org/perks">Vorteile</a>
+<a class="button button2" href="https://disroot.org/perks">Perks</a>
 
 ---
 

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

@@ -6,11 +6,12 @@ wider_column: right
 section_id: alias
 ---
 
-## Custom domain linking
+## Custom domain linking 
 <br>
 <a class="button button2" href="https://disroot.org/perks">Request Perks</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.
+This feature is a perk for your financial contribution to the project. It allows you to use your own domain to be able to send and recieve emails. It is a lifetime reward.
+

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

@@ -7,12 +7,8 @@ section_id: alias
 ---
 
 ## Vinculación de Dominios
-<br>
-<a class="button button2" href="https://disroot.org/perks">Solicitar Beneficios</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.
+<a class="button button2" href="https://disroot.org/perks">Perks</a>
 ---
 

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

@@ -1,16 +1,14 @@
 ---
-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 button2" href="https://disroot.org/perks">Perks</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.

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

@@ -8,6 +8,6 @@ section_id: alias
 
 ## Email Alias<br> e collegamento a domini
 
-<a class="button button2" href="https://disroot.org/perks">Benefici</a>
+<a class="button button2" href="https://disroot.org/perks">Perks</a>
 
 ---

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

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

@@ -10,10 +10,6 @@ wider_column: right
 
 ---
 
-Encryption is when you change data with a special encoding process so that the data becomes unrecognizable; it's encrypted.  You can then apply a special decoding process and you will get the original data back. By keeping the decoding process a secret, nobody else can recover the original data from the encrypted data.
+Encryption is when you change data with a special encoding process so that the data becomes unrecognizable (it's encrypted).  You can then apply a special decoding process and you will get the original data back. By keeping the decoding process a secret, nobody else can recover the original data from the encrypted data.
 
-[Video - How asymmetric encryption works](https://invidious.snopyta.org/E5FEqGYLL0o)
-
-<br>
-![mailvelope](en/mailvelope.svg?resize=150)
-Mailvelope is a browser add-on for Chrome, Edge and Firefox that securely encrypts your emails with PGP using Disroot webmail. Check this [guide](https://mailvelope.com/en/help) for more details.
+[Video - How asymmetric encryption works](https://www.youtube.com/watch?v=E5FEqGYLL0o)

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

@@ -10,10 +10,6 @@ wider_column: right
 
 ---
 
-Cifrar es modificar información con un proceso especial de codificación para que esta sea irreconocible (es cifrada). Luego podemos aplicar un proceso especial de decodificación y obtienemos la información original de vuelta. Manteniendo en secreto el proceso de decodificación, nadie más puede recuperar la información original que ha sido cifrada.
+Cifrar es modificar información con un proceso especial de codificación para que esta sea irreconocible (es cifrada). Luego puedes aplicar un proceso especial de decodificación y obtienes la información original de vuelta. Manteniendo en secreto el proceso de decodificación, nadie más puede recuperar la información original que ha sido cifrada.
 
-[Video - Criptografía asimétrica explicada](https://invidious.snopyta.org/3qk1fy6rOJM)
-
-<br>
-![mailvelope](en/mailvelope.svg?resize=150)
-Podemos utilizar Mailvelope, un complemento del navegador en Chrome, Edge y Firefox, que cifra de forma segura nuestros correos electrónicos con PGP utilizando el webmail de Disroot. Consulta esta [guía](https://mailvelope.com/es/help).
+[Video - Criptografía asimétrica explicada](https://youtu.be/3qk1fy6rOJM)

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

@@ -13,7 +13,3 @@ wider_column: right
 Le chiffrement est lorsque vous modifiez des données à l'aide d'un procédé de codage spécial de sorte que les données deviennent illisibles (c'est chiffré).  Vous pouvez ensuite appliquer un processus de décodage spécial et récupérer les données originales.  En gardant le processus de décodage secret, personne d'autre ne peut récupérer les données originales à partir des données chiffrées.
 
 [Video - How asymmetric encryption works](https://www.youtube.com/watch?v=E5FEqGYLL0o)
-
-<br>
-![mailvelope](en/mailvelope.svg?resize=150)
-Vous pouvez utiliser Mailvelope, un module complémentaire de navigateur dans Chrome, Edge et Firefox, qui chiffre vos e-mails de manière sécurisée avec PGP en utilisant le webmail de Disroot. Consultez ce [tutoriel](https://mailvelope.com/fr/help).

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

@@ -11,9 +11,4 @@ wider_column: right
 ---
 
 La crittografia avviene quando si modificano i dati con uno speciale processo di codifica in modo che i dati diventino irriconoscibili (sono crittografati). È quindi possibile applicare un processo di decodifica speciale e si otterranno i dati originali. Mantenendo il processo di decodifica un segreto, nessun altro può recuperare i dati originali dai dati crittografati.
-
-[Video di YouTube - Come funziona la crittografia asimmetrica (in inglese)](https://invidious.snopyta.org/E5FEqGYLL0o)
-
-<br>
-![mailvelope](en/mailvelope.svg?resize=150)
-Puoi utilizzare Mailvelope, un componente aggiuntivo del browser per Chrome, Edge e Firefox, che crittografa in modo sicuro le tue e-mail con PGP utilizzando Disroot webmail. Guarda questa [guida](https://mailvelope.com/en/help).
+https://www.youtube.com/watch?v=E5FEqGYLL0o

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

@@ -13,7 +13,3 @@ wider_column: right
 Шифрование - это когда вы изменяете данные с помощью специального процесса кодирования, так что данные становятся неузнаваемыми (они зашифрованы). Затем вы можете применить специальный процесс декодирования, и вы получите исходные данные обратно. Сохраняя ключ декодирования в секрете, никто другой не сможет восстановить исходные данные из наших зашифрованных данных.
 
 [Видео о том, как работает ассиметричное шифрование (EN)](https://www.youtube.com/watch?v=E5FEqGYLL0o)
-
-<br>
-![mailvelope](en/mailvelope.svg?resize=150)
-You can use Mailvelope, a browser add-on in Chrome, Edge and Firefox, that securely encrypts your emails with PGP using Disroot webmail. Check this [howto](https://mailvelope.com/en/help).

pages/03.services/02.email/_email-encryption/en/mailvelope.svg

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

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

@@ -1,5 +1,5 @@
 ---
-title: 'E-Mail-Einstellungen'
+title: 'Email-Einstellungen'
 bgcolor: '#1F5C60'
 fontcolor: '#FFF'
 text_align: center
@@ -18,4 +18,4 @@ text_align: center
 
 ---
 
-**Trennzeichen:** Du kannst ein Pluszeichen ("+") in Deiner E‑Mail-Adresse verwenden, um Unteradressen wie **Benutzername+wasauchimmer@disroot.org** zu erstellen, z.B. zum Filtern und Nachvollziehen von Spam. Beispiel: *david@disroot.org* kann Mail-Adressen wie *david+bank@disroot.org* einrichten, die er seiner Bank geben könnte. Sie kann zum Senden und Empfangen von E‑Mails genutzt werden.
+**Trennzeichen:** Du kannst ein Pluszeichen ("+") in Deiner Email-Adresse verwenden, um Unteradressen wie **Benutzername+wasauchimmer@disroot.org** zu erstellen, z.B. zum Filtern und Nachvollziehen von Spam. Beispiel: *david@disroot.org* kann Mail-Adressen wie *david+bank@disroot.org* einrichten, die er seiner Bank geben könnte. Sie kann **nur zum Empfang von E-Mails** nicht jedoch zum Senden von Emails verwendet werden. Deine Emails werden immer als **Benutzername@disroot.org**, im genannten Beispiel also *david@disroot.org*, gesendet.

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

@@ -14,9 +14,8 @@ text_align: center
 ---
 
 **Mailbox size limit:** 1 GB
-**Attachment size limit:** 64 MB
+**Attachement size limit:** 64 MB
 
 ---
 
-**Delimiters:** The plus sign ("+") can be used as a delimiter in your email address to create sub-addresses, e.g. **username+whatever@disroot.org**. This can be used, for instance, to filter and track spam.
-Example: david@disroot.org could have an email address like 'david+bank@disroot.org' that he could give to his bank. It can be used to send and receive emails. These addresses do not need to be manually configured; they are always routed back to the original mailbox.
+**Delimiters:** You can use delimiters (plus sign, "+") in your email address to create sub-addresses, like **username+whatever@disroot.org**, for example for filtering and tracking spam. Example: david@disroot.org can set up mail addresses like 'david+bank@disroot.org' that he could give to his bank. It can be used **only to receive emails**, not to send ones. Your emails will always be sent as david@disroot.org.

pages/03.services/02.email/_email-settings/fullbar.es.md

@@ -18,4 +18,4 @@ text_align: center
 
 ---
 
-**Delimitadores:** Se pueden utilizar delimitadores (signo más, "+") en la dirección de correo electrónico para crear subdirecciones del tipo **nombredeusuario+loquequieras@disroot.org**. Esto es útil para, por ejemplo, filtrar y rastrear el SPAM. Ejemplo: usuaria@disroot.org puede crear direcciones de correo como 'usuaria+banco@disroot.org' que podría usar como cuenta para su banco. Puede utilizarse para enviar y recibir correos.
+**Delimitadores:** Puedes utilizar delimitadores (signo más, "+") en tu dirección de correo electrónico para crear subdirecciones del tipo **nombredeusuario+loquequieras@disroot.org**. Esto es útil para, por ejemplo, filtrar y rastrear el SPAM. Ejemplo: usuaria@disroot.org puede crear direcciones de correo como 'usuaria+banco@disroot.org' que podría usar como cuenta para su banco. Los delimitadores pueden usarse solamente **para recibir** correo, **no para enviarlos**. Tus correos siempre serán enviados como usuaria@disroot.org.

pages/03.services/02.email/_email-settings/fullbar.fr.md

@@ -17,4 +17,4 @@ text_align: center
 
 ---
 
-**Delimiteurs:** Vous pouvez utiliser des délimiteurs (le signe "+") dans votre adresse électronique pour créer des sous-adresses, telles que **nom d'utilisateur+nimporte@disroot.org**, par exemple pour le filtrage et le suivi du spam. Exemple : david@disroot.org peut créer des adresses de courrier électronique comme "david+bank@disroot.org" qu'il pourrait donner à sa banque. Il peut être utilisé pour envoyer et recevoir des courriels.
+**Delimiteurs:** Vous pouvez utiliser des délimiteurs (le signe "+") dans votre adresse électronique pour créer des sous-adresses, telles que **nom d'utilisateur+nimporte@disroot.org**, par exemple pour le filtrage et le suivi du spam. Exemple : david@disroot.org peut créer des adresses de courrier électronique comme "david+bank@disroot.org" qu'il pourrait donner à sa banque. Ces adresses peuvent être utilisées **seulement pour recevoir des courriels**, pas pour en envoyer. Vos e-mails seront toujours envoyés sous la forme david@disroot.org.

pages/03.services/02.email/_email-settings/fullbar.it.md

@@ -12,9 +12,9 @@ text_align: center
 
 ---
 
-**Limite Mailbox:** 1 GB
+**Limite Mailbox:** 2 GB
 **Limite allegati:** 64 MB
 
 ---
 
-**Delimitatori:** Puoi utilizzare un delimitatore (segno più, "+") nel tuo indirizzo di posta elettronica per creare sottoindirizzi come **nomeutente+qualunquecosa@disroot.org**. I delimitatori si possono utilizzare ad esempio per filtrare o tracciare lo spam. Esempio: david@disroot.org può usare come indirizzo da dare alla sua banca: 'david+bank@disroot.org'. Può essere utilizzato per inviare e ricevere e-mail.
+**Delimitatori:** Puoi (segno più, "+") nel vostro indirizzo e-mail per creare sottoindirizzi, come **nomeutente+qualunquecosa@disroot.org**, ad esempio per filtrare e tracciare lo spam. Esempio: david@disroot.org può impostare indirizzi e-mail come 'david+bank@disroot.org' che può dare alla sua banca. Può essere usato **solo per ricevere e-mail**, non per inviarle. Le vostre e-mail saranno sempre inviate come david@disroot.org.

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

@@ -18,4 +18,4 @@ text_align: center
 
 ---
 
-**Разделители:** Вы можете использовать разделители (знак плюса «+») в своем адресе электронной почты для создания дополнительных адресов вида **username+whatever@disroot.org**, например, для фильтрации и отслеживания спама. Пример: david@disroot.org может настроить почтовые адреса типа david+bank@disroot.org, которые он может передать своему банку. Этот адрес может использоваться для отправки и получения электронной почты.
+**Разделители:** Вы можете использовать разделители (знак плюса «+») в своем адресе электронной почты для создания дополнительных адресов вида **username+whatever@disroot.org**, например, для фильтрации и отслеживания спама. Пример: david@disroot.org может настроить почтовые адреса типа david+bank@disroot.org, которые он может передать своему банку. Его можно использовать **только для получения писем**, но не для их отправки. Электронные письма всегда будут отправляться от настоящего адреса, в нашем примере это david@disroot.org.

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

@@ -1,5 +1,5 @@
 ---
-title: 'E-mail Webmail'
+title: 'Email Webmail'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
@@ -7,24 +7,23 @@ wider_column: right
 
 ## Webmail
 
-![webmail](en/webmail.png)
+![webmail](de/webmail.png)
 
 ---
 
-<br>
-Du kannst von jedem Gerät (mit Internetzugang) auf Deine E&#8209;Mails zugreifen, indem Du unsere Webmail-Oberfläche unter [https://webmail.disroot.org](https://webmail.disroot.org) nutzt.
 
-Unsere Webmail haben wir mit **Roundcube** verwirklicht. Roundcube ist ein moderner Ansatz zum Thema Webmail. Es ist simpel, schnell und bietet die meisten Features, die man von Webmail erwarten kann:
+Du kannst von jedem Gerät (mit Internetzugang) auf Deine Emails zugreifen, indem Du unsere Webmail-Oberfläche unter [https://mail.disroot.org](https://mail.disroot.org) nutzt.
 
-<ul class=disc>
-<li>Theme: Eine ansprechende Oberfläche: im Disroot Design mit Unterstützung für unterschiedliche Endgeräte.</li>
-<li>Übersetzungen: Die Benutzeroberfläche gibt es in über 80 Sprachen.</li>
-<li>Drag-&-drop support: verschiebe deine Nachrichten mit der Maus.</li>
-<li>Volle Unterstützung von MIME und HTML Nachrichten.</li>
-<li>Vorschau von Anhängen: Anhänge werden direkt in der E&#8209;Mail angezeigt.</li>
-<li>Anzeige als Threads: Konversationen können als Thread angezeigt werden.</li>
-<li>Filter: Mit Hilfe von Regeln verschiebst oder kopierst Du E&#8209;Mails in die richtigen Verzeichnisse, leitest sie weiter oder lehnt sie ab.</li>
-<li>Verzeichnisse: Verwalte Deine Verzeichnisse (Erstellen, Entfernen oder Verstecken).</li>
-</ul>
+Unsere Webmail haben wir mit **RainLoop** verwirklicht. RainLoop ist ein moderner Ansatz zum Thema Webmail. Es ist simpel, schnell und bietet die meisten Features, die man von Webmail erwarten kann:
 
-Projekt-Website: [https://roundcube.net](https://roundcube.net)
+- Themes: Wähle Dein Hintergrundbild.
+- Threads: Stelle Unterhaltungen im Thread-Modus dar.
+- Übersetzungen: Die Benutzeroberfläche gibt es in vielen Sprachen.
+- Filter: Mit Hilfe von Regeln verschiebst oder kopierst Du Emails in die richtigen Verzeichnisse, leitest sie weiter oder lehnt sie ab.
+- Verzeichnisse: Verwalte Deine Verzeichnisse (Erstellen, Entfernen oder Verstecken).
+- Kontakte: Du kannst Deine Kontakte hinzufügen oder sogar Deine Nextcloud-Kontakte direkt mit der Webmail verknüpfen.
+- GPG Verschlüsselung: Der **RainLoop**-Webclient bietet integrierte Veschlüsselung.
+
+**HINWEIS**: *Bitte sei Dir bewusst, dass es sich hierbei um eine serverseitige Verschlüsselung handelt. Das heißt, dass Du keine Kontrolle über Deinen geheimen Schlüssel hast. Diese Methode ist nicht so sicher wie die Verwendung eines Desktop-Clients, wie zum Beispiel Thunderbird, mit lokaler Verschlüsselung. Andererseits ist es natürlich besser als überhaupt keine Verschlüsselung zu verwenden...*
+
+Projekt-Website: [https://www.rainloop.net](https://www.rainloop.net/)

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

@@ -12,20 +12,20 @@ wider_column: right
 ---
 
 <br>
-You can access your email from any device by using our hosted webmail at [https://webmail.disroot.org](https://webmail.disroot.org)
+You can access your mail from any devices by using our webmail at [https://mail.disroot.org](https://mail.disroot.org)
 
-Our webmail is powered by **Roundcube**. Roundcube is a modern approach to webmail. It's simple, fast and provides most of the features one could expect from webmail:
+Our webmail is powered by **RainLoop**. Rainloop is a modern approach to webmail. It's simple, fast and provides most of the features one could expect from webmail:
 
 <ul class=disc>
-<li>A nice responsive skin: a beautiful Disroot flavor skin with multi-device support.</li>
-<li>Translations: user interface is available in more than 80 languages.</li>
-<li>Drag-and-drop message management: easily move your messages with your mouse.</li>
-<li>Full support for MIME and HTML messages.</li>
-<li>Attachment previews: see images directly within messages.</li>
-<li>Threaded message listing: display conversations in a threaded fashion.</li>
-<li>Filters: set up rules to automatically move or copy email to specific folders, as well as forwarding or rejecting emails (according to the subject, sender, etc.)</li>
-<li>Folder management: add, remove, or hide your folders.</li>
+<li>Themes: Select your background picture.</li>
+<li>Threads: Display conversations in a threaded mode.</li>
+<li>Translations: The interface is being translated to many languages</li>
+<li>Filters: Set up rules to automatically move or copy email to specific folders, forward or reject emails.</li>
+<li>Folders: Manage your folders (add, remove, or hide).</li>
+<li>GPG Encryption: The <b>RainLoop</b> web-client offers built in encryption option.</li>
+<li>Contacts: you can add your contacts and even link your Nextcloud contacts directly into the webmail.</li>
 </ul>
 
+**NOTE**: *Please be aware that this is a server side encryption, which means you don't have control on your secret key. This is not as safe as using desktop email client, such as Thunderbird, with local encryption. But then again, it is better than not using any encryption at all...*
 
-Project homepage: [https://roundcube.net](https://roundcube.net)
+Project Homepage: [https://www.rainloop.net](https://www.rainloop.net/)

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

@@ -1,5 +1,5 @@
 ---
-title: 'Email Webmail'
+title: 'Webmail'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
@@ -12,21 +12,20 @@ wider_column: right
 ---
 
 <br>
-Acceso al correo electrónico desde cualquier dispositivo, utilizando nuestro cliente web en [https://webmail.disroot.org](https://webmail.disroot.org).
+Puedes acceder a tu correo electrónico desde cualquier dispositivo, utilizando nuestro cliente web en [https://mail.disroot.org](https://mail.disroot.org)
 
-
-Nuestro webmail está desarrollado por **Roundcube**. Es simple, rápido y proporciona la mayoría de las características que podríamos esperar del correo web:
+Nuestro webmail está desarrollado por **RainLoop**. Es simple, rápido y proporciona la mayoría de las características que podríamos esperar del correo web:
 
 <ul class=disc>
-<li>Un tema agradable y adaptable: un hermoso tema de Disroot con soporte para múltiples dispositivos.</li>
-<li>Traducciones: la interfaz está traducida a más de 80 idiomas.</li>
-<li>Gestión de mensajes "arrastrar-y-soltar": mueve tus correos con el ratón.</li>
-<li>Soporte completo para mensajes MIME y HTML.</li>
-<li>Vista previa de adjuntos: ve las imágenes directamente en tus mensajes.</li>
-<li>Listado de mensajes en hilos: muestra las conversaciones en forma de hilos jerárquicos.</.</li>
-<li>Filtros: configura reglas para mover o copiar correos automáticamente a carpetas específicas, reenviarlos o rechazarlos de acuerdo con el asunto, el remitente, etc.</li>
-<li>Carpetas: gestiona tus carpetas (agregar, quitar u ocultar).</li>
+<li>Temas: Selecciona tu imagen de fondo.</li>
+<li>Hilos: Muestra las conversaciones en forma de hilos jerárquicos.</li>
+<li>Traducciones: La interfaz está siendo traducida a muchos idiomas</li>
+<li>Filtros: Configura reglas para mover o copiar correos automáticamente a carpetas específicas, reenviarlos o rechazarlos.</li>
+<li>Carpetas: Gestiona tus carpetas (agregar, quitar u ocultar).</li>
+<li>Cifrado GPG: El cliente web <b>RainLoop</b> ofrece una opción de cifrado incorporado.</li>
+<li>Contactos: puedes agregar tus contactos e incluso vincular los de Nextcloud directamente en el webmail.</li>
 </ul>
 
+**AVISO**: *Por favor, ten en cuenta que se trata de cifrado del lado del servidor, lo que significa que no tienes control sobre tu clave secreta. Esto no es tan seguro como utilizar un cliente de correo de escritorio, como Thunderbird, con cifrado local. Pero, por otro lado, es mejor que no usar cifrado en absoluto...*
 
-Página del proyecto: [https://roundcube.net](https://roundcube.net)
+Página del proyecto: [https://www.rainloop.net](https://www.rainloop.net/)

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

@@ -1,31 +1,31 @@
 ---
-title: 'Email Webmail'
+title: 'Messagerie Web'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
 ---
 
-## Webmail
+## Messagerie Web:
 
-![webmail](en/webmail.png)
+![Messagerie Web](en/webmail.png)
 
 ---
 
 <br>
-Vous pouvez accéder à votre courrier depuis n'importe quel appareil en utilisant notre webmail à l'adresse [https://webmail.disroot.org](https://webmail.disroot.org).
+Vous pouvez accéder à votre messagerie de n'importe quel appareil en utilisant la messagerie web à l'adresse: [https://mail.disroot.org](https://mail.disroot.org)
 
-Notre webmail est alimenté par **Roundcube**. Roundcube est une approche moderne du webmail. C'est simple, rapide et fournit la plupart des fonctionnalités que l'on peut attendre d'un webmail :
+Notre webmail est propulsé par **RainLoop**. RainLoop est une approche moderne de la messagerie Web. Cela a l'air nouveau et simple, mais cela vous offre la plupart des fonctionnalités que l'on peut attendre de la messagerie Web:
 
 <ul class=disc>
-<li>Un joli theme réactif : un bel habillage à la saveur de Disroot avec une prise en charge multi-appareils.</li>
-<li>Traductions : l'interface est traduite dans plus de 80 langues..</li>
-<li>Gestion des messages par glisser-déposer : déplacez vos messages avec votre souris..</li>
-<li>Prise en charge complète des messages MIME et HTML.</li>
-<li>Aperçu des pièces jointes : visualisez les images directement dans vos messages..</li>
-<li>Liste de messages en fil de discussion : Afficher les conversations en mode filaire.</li>
-<li>Filtres : Définissez des règles pour déplacer ou copier automatiquement les e-mails dans des dossiers spécifiques, les transférer ou les rejeter, en fonction de l'objet, de l'expéditeur, etc.</li>
-<li>Dossiers : Gérer vos dossiers (ajouter, supprimer ou masquer).</li>
+<li>Thèmes: Sélectionnez votre photo de fond.</li>
+<li>Fils: Afficher les conversations en mode fil de discussion.</li>
+<li>Traductions: L'interface est en cours de traduction dans plusieurs langues.</li>
+<li>Filtres: Définissez des règles pour déplacer ou copier automatiquement les e-mails dans des dossiers spécifiques, transférer ou rejeter les e-mails.</li>
+<li>Dossiers: Gérez vos dossiers (ajout, suppression ou masquage).</li>
+<li>Chiffrement GPG: Le client web RainLoop offre une option de chiffrement intégré.</li>
+<li>Contacts: vous pouvez ajouter vos contacts et même directement lier vos contacts Nextcloud.</li>
 </ul>
 
+**ATTENTION**: *Veuillez noter qu'il s'agit d'un chiffrement côté serveur, ce qui signifie que vous n'avez aucun contrôle sur votre clé secrète. Ce n'est pas aussi sûr que d'utiliser un client de messagerie électronique de bureau, tel que Thunderbird, avec un chiffrement local. Mais encore une fois, c'est mieux que de ne pas utiliser de chiffrement du tout...*
 
-Project Homepage: [https://roundcube.net](https://roundcube.net)
+Page d'Accueil du Projet: [https://www.rainloop.net](https://www.rainloop.net/)

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

@@ -1,5 +1,5 @@
 ---
-title: 'Email Webmail'
+title: 'Webmail'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: right
@@ -12,21 +12,15 @@ wider_column: right
 ---
 
 <br>
-Puoi accedere alla tua posta da qualsiasi dispositivo utilizzando la nostra webmail all'indirizzo [https://webmail.disroot.org](https://webmail.disroot.org)
-
-
-La nostra webmail usa **Roundcube**. Roundcube è un software semplice, veloce e fornisce la maggior parte delle funzionalità che ci si può aspettare da una webmail:
 
+RainLoop è una webmail moderna dall'aspetto semplice ma che offre tutte le impostazioni e le configurazioni che ci si può aspettare da un servizio di posta moderno:
 <ul class=disc>
-<li>Una bella interfaccia grafica reattiva: una bellissima skin dal sapore Disroot con supporto multi-dispositivo.</li>
-<li>Traduzioni: l'interfaccia è tradotta in più di 80 lingue.</li>
-<li>Gestione dei messaggi drag-and-drop: sposta i tuoi messaggi con il mouse.</li>
-<li>Pieno supporto per messaggi MIME e HTML.</li>
-<li>Anteprime allegati: guarda le immagini direttamente all'interno dei tuoi messaggi.</li>
-<li>Elenco dei messaggi in thread: visualizza le conversazioni in modalità thread.</li>
-<li>Filtri: imposta le regole per spostare o copiare automaticamente le e-mail in cartelle specifiche, inoltrare o rifiutare le e-mail, in base all'oggetto, al mittente, ecc.</li>
-<li>Cartelle: gestisci le tue cartelle (aggiungi, rimuovi o nascondi).</li>
+<li>Temi: Possibilità di scegliere tra vari sfondi.</li>
+<li>Vista per argomenti: Possibilità di visualizzare i messaggi in ordine di argomenti.</li>
+<li>Localizzazione: Possibilità di scegliere tra varie lingue.</li>
+<li>Filtri: Possibilità di creare automaticamente dei filtri per spostare, copiare, inoltrare o eliminare i messaggi.</li>
+<li>Cartelle: Possibilità di gestire le cartelle (aggiungere, rimuovere o nascondere).</li>
+<li>GPG: RainLoop offre la possibilità di criptare i messaggi diretttamente dall'interfaccia web.</li>
 </ul>
 
-
-Homepage del progetto: [https://roundcube.net](https://roundcube.net)
+*Attenzione, l'utilizzo di GPG direttamente dall'interfaccia web significa non avere il pieno controllo sulla propria chiave privata. Questa opzione non è così sicura come l'uso di GPG su un client di posta elettronica come Thunderbird che permette di gestire le proprie chiavi in locale.

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

@@ -12,20 +12,19 @@ wider_column: right
 ---
 
 <br>
-You can access your mail from any devices by using our webmail at [https://webmail.disroot.org](https://webmail.disroot.org)
+Вы можете получить доступ к своей почте с любых устройств, используя нашу веб-почту по адресу [https://mail.disroot.org](https://mail.disroot.org)
 
-Our webmail is powered by **Roundcube**. Roundcube is a modern approach to webmail. It's simple, fast and provides most of the features one could expect from webmail:
+Наша веб-почта работает на **RainLoop**. Rainloop - это современный подход к почтовому клиенту. Это просто, быстро и предоставляет большинство функций, которые можно ожидать от почтового сервиса:
 
 <ul class=disc>
-<li>A nice responsive skin: a beautiful Disroot flavor skin with multi-device support.</li>
-<li>Translations: the interface is translated in more than 80 languages.</li>
-<li>Drag-&-drop message management: move your messages with your mouse.</li>
-<li>Full support for MIME and HTML messages.</li>
-<li>Attachment previews: see the images directly within your messages.</li>
-<li>Threaded message listing: Display conversations in a threaded mode.</li>
-<li>Filters: Set up rules to automatically move or copy email to specific folders, forward or reject emails, according to subject, sender, etc.</li>
-<li>Folders: Manage your folders (add, remove, or hide).</li>
+<li>Оформление: Установка вашего фонового изображения.</li>
+<li>Локализация: Веб-интерфейс переведен на большое количество языков, в том числе на русский.</li>
+<li>Фильтры: Настройка правил для автоматического копирования или перемещения писем в специальные папки, пересылки или отклонения почты.</li>
+<li>Папки: Собственная настройка папок для упорядоченного хранения писем (удаление, переименование или скрытие).</li>
+<li>GPG-шифрование: <b>RainLoop</b> имеет настройки шифрования.</li>
+<li>Контакты: Вы можете добавлять свои контакты и даже связывать контакты Nextcloud прямо в веб-почте.</li>
 </ul>
 
+**ПРИМЕЧАНИЕ**: *Имейте в виду, что это шифрование на стороне сервера, что означает, что вы не можете контролировать свой секретный ключ. Это не так безопасно, как использование настольного почтового клиента, такого как Thunderbird, с локальным шифрованием. Но опять же, это лучше, чем вообще не использовать никакого шифрования...*
 
-Project Homepage: [https://roundcube.net](https://roundcube.net)
+Страница проекта: [https://www.rainloop.net](https://www.rainloop.net/)

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

@@ -1,31 +1,19 @@
 ---
-title: 'Zusätzlicher Mailboxspeicherplatz'
+title: 'Zusätzlicher Mailboxspeicher'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: left
-section_id: storage
 ---
 
-## Erweitere den Speicherplatz Deines Postfachs
-Wenngleich eine Postfachgröße von 1 GB nicht so klein ist, kann es natürlich sein, dass Du mehr Speicher benötigst. Es ist daher möglich, Deinen E‑Mail-Speicher zu erweitern.
 
-Dies sind die Preise **pro Jahr, Zahlungsgebühren inklusive**:
+Wenngleich eine Postfachgröße von 1 GB nicht so klein ist, kann es natürlich sein, dass Du mehr Speicher benötigst. Es ist daher möglich, Deinen Email-Speicher von 1 GB auf bis zu 10 GB zu erweitern für monatlich 0,15 €/GB, jährlich zu zahlen.
 
-||||
-|---:|---|---:|
-| 5GB |......| 11€ |
-| 10GB |......| 20€ |
-| 15GB |......| 29€ |
-| 30GB |......| 56€ |
-| 45GB |......| 83€ |
-| 60GB |......| 110€ |
+Um zusätzlichen Speicher zu beantragen, fülle dieses [Formular](/forms/extra-storage-mailbox) aus.<br>
 
 
+---
+
+## Erweitere den Speicher Deines Postfachs
 <br>
-Auf Transaktionen innerhalb der EU wird eine zusätzliche VAT (Value Added Tax) von 21 % fällig.
 
----
-
-<br><br>
-
-<a class="button button1" href="/forms/extra-storage-space">Zusätzlichen E&#8209;Mail-Speicher beantragen</a>
+<a class="button button1" href="https://disroot.org/de/forms/extra-storage-mailbox">Zusätzlichen Email-Speicher beantragen</a>

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

@@ -1,5 +1,5 @@
 ---
-title: 'Extra mailbox storage'
+title: 'Extra mailbox Storage'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: left
@@ -7,25 +7,14 @@ section_id: storage
 ---
 
 ## Add storage to your mailbox
-If the free 1GB is not enough, you can extend your email storage.
 
-Here are the prices **per year** (payment fees included):
+It is possible to extend your E-mail storage from 1GB to 10GB for the cost of 0.15 euro per GB per month, paid yearly.
 
-||||
-|---:|---|---:|
-| 5GB |......| 11€ |
-| 10GB |......| 20€ |
-| 15GB |......| 29€ |
-| 30GB |......| 56€ |
-| 45GB |......| 83€ |
-| 60GB |......| 110€ |
+To request extra storage you need to fill in this [form](/forms/extra-storage-mailbox).<br>
 
 
-<br>
-Transactions made within the EU are subjected to extra VAT of 21%.
-
 ---
 
 <br><br>
 
-<a class="button button1" href="/forms/extra-storage-space">Request Extra Mailbox Storage</a>
+<a class="button button1" href="/forms/extra-storage-mailbox">Request Extra Mailbox Storage</a>

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

@@ -1,31 +1,20 @@
 ---
-title: 'Almacenamiento extra para el buzón'
+title: 'Espacio Extra para el buzón'
 bgcolor: '#FFF'
 fontcolor: '#555'
 wider_column: left
 section_id: storage
 ---
 
-## Añade espacio a tu buzón
-Si 1GB GRATUITO no es suficiente, puedes ampliar el almacenamiento de tu correo.
+## Aumenta el espacio de tu buzón de correo
 
-Estos son los precios **por año, tasas de pagos incluidas**:
+Es posible aumentar el espacio de almacenamiento de tu E-mail hasta 10 GB por 0.15 euro por GB mensual, abonado anualmente.
 
-||||
-|---:|---|---:|
-| 5GB |......| 11€ |
-| 10GB |......| 20€ |
-| 15GB |......| 29€ |
-| 30GB |......| 56€ |
-| 45GB |......| 83€ |
-| 60GB |......| 110€ |
+Para solicitar espacio extra necesitas completar [este formulario](/forms/extra-storage-mailbox).<br>
 
 
-<br>
-Las transacciones dentro de la UE están sujetas a un I.V.A (Impuesto al Valor Agregado) adicional de 21%.
-
 ---
 
 <br><br>
 
-<a class="button button1" href="/forms/extra-storage-space">Solicitar almacenamiento extra para el buzón</a>
+<a class="button button1" href="https://disroot.org/es/forms/extra-storage-mailbox">Solicitar espacio adicional para el buzón</a>

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

@@ -1,31 +1,19 @@
 ---
-title: 'Espace de stockage supplémentaire'
+title: 'Messagerie: espace de stockage supplémentaire'
 bgcolor: '#FFF'
-fontcolor: '#555'
+fontcolor: '#7A7A7A'
 wider_column: left
-section_id: storage
 ---
 
-## Ajoutez du stockage à votre boîte mail
-Si le 1 Go GRATUIT ne suffit pas, vous pouvez étendre le stockage de vos e-mails.
+## Ajoutez de l'espace de stockage à votre boîte aux lettres
 
-Voici les prix **par an, frais de paiement inclus** :
+Il est possible d'étendre la capacité de stockage de votre messagerie jusqu'à 10 Go pour le coût de 0,15 euro par Go et par mois, à payer annuellement.
 
-||||
-|---:|---|---:|
-| 5Go |......| 11€ |
-| 10Go |......| 20€ |
-| 15Go |......| 29€ |
-| 30Go |......| 56€ |
-| 45Go |......| 83€ |
-| 60Go |......| 110€ |
+Pour demander de l'espace de stockage supplémentaire, vous devez remplir ce  [formulaire](/forms/extra-storage-mailbox).<br>
 
 
-<br>
-Les transactions au sein de l'UE sont soumises à une TVA (taxe sur la valeur ajoutée) supplémentaire de 21 %.
-
 ---
 
 <br><br>
 
-<a class="button button1" href="/forms/extra-storage-space">Demande de stockage supplémentaire</a>
+<a class="button button1" href="/forms/extra-storage-mailbox">Demander plus d'espace de stockage pour la messagerie</a>

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

@@ -7,25 +7,13 @@ wider_column: left
 
 ## Aggiungi spazio di archiviazione per la posta elettronica
 
-Se 1GB di spazio gratuito non è abbastanza, puoi estendere la tua memoria di posta elettronica.
+È possibile estendere l'archiviazione della posta elettronica fino a 10 GB al costo di 0,15 euro al GB al mese.
 
-Ecco i prezzi **all'anno, spese di pagamento incluse**:
+Per richiedere ulteriore spazio di archiviazione è necessario compilare questa [form](/forms/extra-storage-mailbox).<br>
 
-||||
-|---:|---|---:|
-| 5GB |......| 11€ |
-| 10GB |......| 20€ |
-| 15GB |......| 29€ |
-| 30GB |......| 56€ |
-| 45GB |......| 83€ |
-| 60GB |......| 110€ |
-
-<br>
-Le transazioni all'interno dell'UE sono soggette a un'IVA aggiuntiva (imposta sul valore aggiunto) del 21%.
 
 ---
 
 <br><br>
 
-<a class="button button1" href="/forms/extra-storage-space">Richiedi ulteriore spazio di archiviazione per la posta elettronica</a>
-
+<a class="button button1" href="https://disroot.org/it/forms/extra-storage-mailbox">Richiedi ulteriore spazio di archiviazione per la posta elettronica</a>

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

@@ -6,26 +6,15 @@ wider_column: left
 section_id: storage
 ---
 
-## Add storage to your mailbox
-If the FREE 1GB is not enough, you can extend your E-mail storage.
+## Добавить дисковое пространство в почту
 
-Here are the prices **per year, payment fees included**:
+Вы можете расширить хранилище электронной почты с 1 ГБ до 10 ГБ по цене 0,15 евро за гигабайт в месяц при оплате за год.
 
-||||
-|---:|---|---:|
-| 5GB |......| 11€ |
-| 10GB |......| 20€ |
-| 15GB |......| 29€ |
-| 30GB |......| 56€ |
-| 45GB |......| 83€ |
-| 60GB |......| 110€ |
+Чтобы запросить дополнительное пространство для хранения, вам необходимо заполнить эту [форму](/forms/extra-storage-mailbox).<br>
 
 
-<br>
-Transactions within the EU are subjected to extra VAT (Value Added Tax) of 21%.
-
 ---
 
 <br><br>
 
-<a class="button button1" href="/forms/extra-storage-space">Request Extra Mailbox Storage</a>
+<a class="button button1" href="https://disroot.org/en/forms/extra-storage-mailbox">Запросить дополнительное хранилище для почтового ящика</a>

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

@@ -1,5 +1,5 @@
 ---
-title: E-Mail
+title: Email
 bgcolor: '#FFF'
 fontcolor: '#1F5C60'
 body_classes: modular
@@ -7,14 +7,12 @@ wider_column: right
 ---
 
 <a class="button button2" href="https://user.disroot.org/pwm/public/newuser">Disroot-Account registrieren</a>
-<a class="button button1" href="https://webmail.disroot.org/">Anmelden</a>
-<a class="button button1" href="http://mdlwkwn2nhzzuymmyr5mjyoqppoyp46k4remaliu2zrmkayl5yfeh7ad.onion">Tor</a>
-
+<a class="button button1" href="https://mail.disroot.org/">Anmelden</a>
 
 ---
 
-## E&#8209;Mail
+## Email
 
-**Disroot** bietet sichere E&#8209;Mail-Accounts zur Nutzung mit Deinem Desktop-Client oder per Webmail. Die Kommunikation zwischen Dir und dem Mailserver ist SSL-verschlüsselt, was den größtmöglichen Schutz bietet. Darüber hinaus werden alle E&#8209;Mails, die von unserem Server versendet werden, TLS-verschlüsselt, wenn der empfangende Mailserver dies unterstützt. Das heißt, Deine E&#8209;Mails werden nicht wie früher als "Postkarte" verschickt, sondern vorher in einen "Briefumschlag" gesteckt.
+**Disroot** bietet sichere Email-Accounts zur Nutzung mit Deinem Desktop-Client oder per Webmail. Die Kommunikation zwischen Dir und dem Mailserver ist SSL-verschlüsselt, was den größtmöglichen Schutz bietet. Darüber hinaus werden alle Emails, die von unserem Server versendet werden, TLS-verschlüsselt, wenn der empfangende Mailserver dies unterstützt. Das heißt, Deine Emails werden nicht wie früher als "Postkarte" verschickt, sondern vorher in einen "Briefumschlag" gesteckt.
 
-**Nichtsdestotrotz raten wir Dir dringend, immer vorsichtig zu sein, wenn Du per E&#8209;Mail kommunizierst, und GPG Ende-zu-Ende-Verschlüsselung zu nutzen. So stellst Du sicher, dass Deine Korrespondenz so privat ist, wie sie nur sein kann.**
+**Nichtsdestotrotz raten wir Dir dringend, immer vorsichtig zu sein, wenn Du per Email kommunizierst, und GPG Ende-zu-Ende-Verschlüsselung zu nutzen. So stellst Du sicher, dass Deine Korrespondenz so privat ist, wie sie nur sein kann.**