Merge branch 'update_front_page' into 'master'

Update front page

See merge request leap/bitmask_help!9

9 files changed, 8 insertions, 26 deletions

diff --git a/pages/home/_about.en.text b/pages/home/_about.en.text
index 19589b3..679765a 100644
--- a/pages/home/_about.en.text
+++ b/pages/home/_about.en.text
@@ -1,5 +1,3 @@
 !>/assets/images/leap-small.png!
 
-The *Bitmask* application and its custom branded versions like RiseupVPN are lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the [[LEAP Encryption Access Project => https://leap.se]], an non-profit organization dedicated to defending democracy by *protecting the right to whisper*.
-
-The service provider https://demo.bitmask.net is operated by LEAP in order to demonstrate usage of the *Bitmask* application. However, we actively encourage other organizations to start their own compatible service providers by using our free software [[platform for server automation => https://leap.se/en/platform]].
+The *Bitmask* application and its custom branded versions like RiseupVPN are lovingly hand-crafted by a team of paid and volunteer programmers from different countries. Development is principally sponsored by the [[LEAP Encryption Access Project => https://leap.se]], an non-profit organization dedicated to defending democracy by *protecting the right to whisper*.
diff --git a/pages/home/_about.es.text b/pages/home/_about.es.text
index 7e32189..2180591 100644
--- a/pages/home/_about.es.text
+++ b/pages/home/_about.es.text
@@ -1,5 +1,3 @@
 !>/assets/images/leap-small.png!
 
-La aplicación *Bitmask* está cuidadosamente manufacturada por un equipo de programadores, pagados y voluntarios, repartidos por siete países diferentes. El desarrollo está esponsorizado principalmente por el proyecto [[LEAP Encryption Access Project => https://leap.se]], una organización sin ánimo de lucro dedicada a la defensa de la democracia al *proteger el derecho a susurrar*.
-
-LEAP opera los proveedores de servicios https://demo.bitmask.net y https://mail.bitmask.net a efectos de demostración del uso de la aplicación *Bitmask*. Al mismo tiempo, animamos activamente a otras organizaciones a montar sus propios proveedores de servicios compatibles, usando nuestra [[plataforma para la automatización de servidores => https://leap.se/es/platform]], que es software libre.
+La aplicación *Bitmask* está cuidadosamente manufacturada por un equipo de programadores, pagados y voluntarios, repartidos por países diferentes. El desarrollo está esponsorizado principalmente por el proyecto [[LEAP Encryption Access Project => https://leap.se]], una organización sin ánimo de lucro dedicada a la defensa de la democracia al *proteger el derecho a susurrar*.
diff --git a/pages/home/_about.pt.text b/pages/home/_about.pt.text
index a2dee12..1992389 100644
--- a/pages/home/_about.pt.text
+++ b/pages/home/_about.pt.text
@@ -1,5 +1,3 @@
 !>/assets/images/leap-small.png!
 
-O *Bitmask* é uma aplicação cuidadosamente manufaturada por um time de programadores pagos e voluntários, vindos de sete países diferentes. O desenvolvimento é financiado principalmente pelo [[LEAP Encryption Access Project => https://leap.se]], uma organização não-lucrativa dedicada a defender a democracia através da *proteção do direito de cochichar*.
-
-O provedor de serviço https://demo.bitmask.net é operado pelo LEAP de maneira a demonstrar o uso do *Bitmask*. Entretanto, encorajamos fortemente que outras organizações iniciem seus próprios provedores de serviço compatíveis através do uso da nossa [[plataforma para automação de servidores => https://leap.se/en/platform]], que é um software livre.
+O *Bitmask* é uma aplicação cuidadosamente manufaturada por um time de programadores pagos e voluntários, vindos de países diferentes. O desenvolvimento é financiado principalmente pelo [[LEAP Encryption Access Project => https://leap.se]], uma organização não-lucrativa dedicada a defender a democracia através da *proteção do direito de cochichar*.
diff --git a/pages/home/_about.ru.text b/pages/home/_about.ru.text
index a9d2295..b1524ba 100644
--- a/pages/home/_about.ru.text
+++ b/pages/home/_about.ru.text
@@ -1,5 +1,3 @@
 !>/assets/images/leap-small.png!
 
-Приложение *Bitmask* - это ручная работа, сделанная с любовью командой оплачиваемых программистов и программистов-волонтеров из семи разных стран. Разработка главным образом проспоснирована [[LEAP Encryption Access Project => https://leap.se]], некоммерческой организацией, занимающейся защитой демократии путем *защиты нашего права шептать*.
-
-Сервис-провайдер https://demo.bitmask.net управляется LEAP, чтобы продемонстрировать использование приложения *Bitmask*. Тем не менее, мы активно поощряем другие организации запускать свои собственные совместимые сервис-провайдеры, используя наше свободное программное обеспечение для [[платформы для автоматизации серверов => https://leap.se/en/platform]].
+Приложение *Bitmask* - это ручная работа, сделанная с любовью командой оплачиваемых программистов и программистов-волонтеров из разных стран. Разработка главным образом проспоснирована [[LEAP Encryption Access Project => https://leap.se]], некоммерческой организацией, занимающейся защитой демократии путем *защиты нашего права шептать*.
diff --git a/pages/home/_intro.en.text b/pages/home/_intro.en.text
index 4b4966f..fd41cd2 100644
--- a/pages/home/_intro.en.text
+++ b/pages/home/_intro.en.text
@@ -1 +1 @@
-*Bitmask* is an open source application to provide easy and secure encrypted communication with a VPN. You can choose among [[different providers => #providers]] or [[start your own => https://leap.se/en/docs/platform]].
+*Bitmask* is an open source application to provide easy and secure encrypted communication with a VPN. You can choose among [[different providers => #providers]] or [[start your own => https://0xacab.org/leap/container-platform/platform]].
diff --git a/pages/home/_intro.es.text b/pages/home/_intro.es.text
index 0d1cd47..fd5a4e0 100644
--- a/pages/home/_intro.es.text
+++ b/pages/home/_intro.es.text
@@ -1 +1 @@
-*Bitmask* es una aplicación de código abierto para hacer las comunicaciones cifradas más fáciles y seguras vía VPN. Puedes elegir entre [[diferentes proveedores de servicios => #providers]] o [[montarte el tuyo propio => https://leap.se/en/docs/platform]]. 
+*Bitmask* es una aplicación de código abierto para hacer las comunicaciones cifradas más fáciles y seguras vía VPN. Puedes elegir entre [[diferentes proveedores de servicios => #providers]] o [[montarte el tuyo propio => https://0xacab.org/leap/container-platform/platform]].
diff --git a/pages/home/_intro.pt.text b/pages/home/_intro.pt.text
index 344f888..93d6cd2 100644
--- a/pages/home/_intro.pt.text
+++ b/pages/home/_intro.pt.text
@@ -1 +1 @@
-*Bitmask* é uma aplicação de código aberto feita para tornar as comunicações encriptadas mais fáceis e seguras via VPN. Você pode escolher entre [[vários provedores de serviço diferentes => #providers]] ou [[começar o seu próprio => https://leap.se/en/docs/platform]].
+*Bitmask* é uma aplicação de código aberto feita para tornar as comunicações encriptadas mais fáceis e seguras via VPN. Você pode escolher entre [[vários provedores de serviço diferentes => #providers]] ou [[começar o seu próprio => https://0xacab.org/leap/container-platform/platform]].
diff --git a/pages/home/_intro.ru.text b/pages/home/_intro.ru.text
index 57ffaec..80648b5 100644
--- a/pages/home/_intro.ru.text
+++ b/pages/home/_intro.ru.text
@@ -1 +1 @@
-*Bitmask* - это приложение с открытым исходным кодом, обеспечивающее легкую в использовании и безопасную зашифрованную коммуникацию по VPN. Вы можете выбрать один из [[нескольких сервис-провайдеров => #providers]] или [[запустить свой собственный => https://leap.se/en/docs/platform]]. 
+*Bitmask* - это приложение с открытым исходным кодом, обеспечивающее легкую в использовании и безопасную зашифрованную коммуникацию по VPN. Вы можете выбрать один из [[нескольких сервис-провайдеров => #providers]] или [[запустить свой собственный => https://0xacab.org/leap/container-platform/platform]]. 
diff --git a/pages/home/_text.haml b/pages/home/_text.haml
index 4af89bb..78a4a6e 100644
--- a/pages/home/_text.haml
+++ b/pages/home/_text.haml
@@ -27,16 +27,6 @@
             [[calyx.net => https://calyx.net]]
       .col-lg-2.col-md-3.col-sm-3.col-xs-4
         .thumbnail
-          %img(src='/assets/providers/codigosur.org.png')
-          .b
-            [[codigosur.org => https://codigosur.org/servicios]]
-      .col-lg-2.col-md-3.col-sm-3.col-xs-4
-        .thumbnail
-          %img(src='/assets/providers/colnodo.png')
-          .b
-            [[colnodo => https://leapcolombia.org]]
-      .col-lg-2.col-md-3.col-sm-3.col-xs-4
-        .thumbnail
           %img(src='/assets/providers/riseup.net.png')
           .b
             [[riseup.net => https://black.riseup.net]]