diff --git a/assets/static/images/circuit_full.png b/assets/static/images/circuit_full.png
new file mode 100644
index 00000000..756daec6
Binary files /dev/null and b/assets/static/images/circuit_full.png differ
diff --git a/assets/static/images/configure.png b/assets/static/images/configure.png
new file mode 100644
index 00000000..8dad78e7
Binary files /dev/null and b/assets/static/images/configure.png differ
diff --git a/assets/static/images/https.png b/assets/static/images/https.png
new file mode 100644
index 00000000..b70197d0
Binary files /dev/null and b/assets/static/images/https.png differ
diff --git a/assets/static/images/new_identity.png b/assets/static/images/new_identity.png
new file mode 100644
index 00000000..d44e6c64
Binary files /dev/null and b/assets/static/images/new_identity.png differ
diff --git a/assets/static/images/proxy.png b/assets/static/images/proxy.png
new file mode 100644
index 00000000..a830bd2b
Binary files /dev/null and b/assets/static/images/proxy.png differ
diff --git a/assets/static/images/proxy_question.png b/assets/static/images/proxy_question.png
new file mode 100644
index 00000000..f6bb05ad
Binary files /dev/null and b/assets/static/images/proxy_question.png differ
diff --git a/assets/static/images/slider.png b/assets/static/images/slider.png
new file mode 100644
index 00000000..384e908f
Binary files /dev/null and b/assets/static/images/slider.png differ
diff --git a/assets/static/images/slider_window.png b/assets/static/images/slider_window.png
new file mode 100644
index 00000000..e5cd4c68
Binary files /dev/null and b/assets/static/images/slider_window.png differ
diff --git a/assets/static/images/tor-and-https.svg b/assets/static/images/tor-and-https.svg
new file mode 100644
index 00000000..94106eb5
--- /dev/null
+++ b/assets/static/images/tor-and-https.svg
@@ -0,0 +1,690 @@
+
+
+
diff --git a/assets/static/images/tor-launcher-custom-bridges.png b/assets/static/images/tor-launcher-custom-bridges.png
new file mode 100644
index 00000000..f9990b89
Binary files /dev/null and b/assets/static/images/tor-launcher-custom-bridges.png differ
diff --git a/content/onion-services/contents+en.lr b/content/onion-services/contents+en.lr
index 176de898..737d1e3d 100644
--- a/content/onion-services/contents+en.lr
+++ b/content/onion-services/contents+en.lr
@@ -14,11 +14,9 @@ Onion services (formerly known as “hidden services”) are services (like webs
Onion services offer several advantages over ordinary services on the non-private web:
-An onion services’s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators.
-
-All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about connecting over HTTPS.
-
-The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with.
+* An onion services’s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators.
+* All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about connecting over HTTPS.
+* The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with.
##### How to access an onion service
@@ -35,6 +33,4 @@ If you cannot reach the onion service you require, make sure that you have enter
If you are still unable to connect to the onion service, please try again later.
There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning.
-You can also ensure that you're able to access other onion services by connecting to
-
-DuckDuckGo's Onion Service
+You can also ensure that you're able to access other onion services by connecting to DuckDuckGo's Onion Service
diff --git a/content/onion-services/contents+es.lr b/content/onion-services/contents+es.lr
index a54b7575..4902ebad 100644
--- a/content/onion-services/contents+es.lr
+++ b/content/onion-services/contents+es.lr
@@ -1,6 +1,6 @@
_model: topic
---
-title: Servicios Onion
+title: Servicios cebolla
---
description: Servicios que sólo son accesibles usando Tor
---
@@ -10,31 +10,27 @@ key: 6
---
body:
-Onion services (formerly known as “hidden services”) are services (like websites) that are only accessible through the Tor network.
+Los servicios cebolla (anteriormente conocidos como "servicios ocultos") son servicios (como pueden ser los sitios web) que sólo son accesibles a través de la red Tor.
-Onion services offer several advantages over ordinary services on the non-private web:
+Los servicios cebolla ofrecen varias ventajas sobre los servicios ordinarios en la web no-privada:
-La ubicación y direcciones IP de un servicio cebolla están ocultas, dificultando que los adversarios puedan censurarlo o identificar a sus operadores.
-
-Todo el tráfico entre los usuarios de Tor y los servicios onion están cifrados extremo-a-extremo, así que no necesitas preocuparte de conectar sobre HTTPS.
-
-The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with.
+* La ubicación y direcciones IP de un servicio cebolla están ocultas, dificultando que los adversarios puedan censurarlo o identificar a sus operadores.
+Todo el tráfico entre los usuarios de Tor y los servicios cebolla está cifrados extremo-a-extremo, así que no necesitas preocuparte de conectar sobre HTTPS.
+La dirección de un servicio onion se genera automáticamente, de forma que los operadores no necesitan comprar un nombre de dominio; la URL .onion también ayuda a Tor a asegurarse de que está conectando a la ubicación correcta y que la conexión no está siendo alterada.
##### Cómo acceder a un servicio cebolla
-Just like any other website, you will need to know the address of an onion service in order to connect to it.
+Como en cualquier otro sitio web, necesitarás conocer la dirección de un servicio cebolla para conectar con él.
Una dirección cebolla es una cadena de 16 (y en formato V3, 56) de letras y números en su mayoría aleatorios, seguidos de ".onion".
-When accessing a website that uses an onion service, Tor Browser will show at the URL bar an icon of a little green onion displaying the state of your connection: secure and using an onion service.
-Y si estás accediendo a un sitio web con https y servicio onion, te mostrará un icono de una cebolla verde y un candado.
+Cuando accedas a un sitio web que use un servicio cebolla, el navegador Tor mostrará en la barra URL un icono de una cebollita verde visualizando el estado de tu conexión: segura y usando un servicio cebolla.
+Y si estás accediendo a un sitio web con https y servicio cebolla, te mostrará un icono de una cebolla verde y un candado.
##### Resolución de problemas
-If you cannot reach the onion service you require, make sure that you have entered the onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site.
+Si no puedes acceder al servicio de onion que necesitas, asegúrate de haber ingresado correctamente la dirección de onion: incluso un pequeño error puede impedir que el navegador Tor acceda al sitio.
-If you are still unable to connect to the onion service, please try again later.
-There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning.
+Si todavía no puedes conectar al servicio cebolla, por favor, inténtalo de nuevo más tarde.
+Puede haber un problema temporal de conexión, o los operadores del sitio pueden haberlo desconectado sin avisar.
-You can also ensure that you're able to access other onion services by connecting to
-
-DuckDuckGo's Onion Service
+También puedes asegurarte de poder acceder a otros servicios cebolla conectando al servicio cebolla de DuckDuckGo.
diff --git a/content/onion-services/contents+fr.lr b/content/onion-services/contents+fr.lr
index 27a10425..3ea1f4ce 100644
--- a/content/onion-services/contents+fr.lr
+++ b/content/onion-services/contents+fr.lr
@@ -14,11 +14,9 @@ Onion services (formerly known as “hidden services”) are services (like webs
Onion services offer several advantages over ordinary services on the non-private web:
-An onion services’s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators.
-
-All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about connecting over HTTPS.
-
-The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with.
+* An onion services’s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators.
+* All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about connecting over HTTPS.
+* The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with.
##### How to access an onion service
@@ -35,6 +33,4 @@ If you cannot reach the onion service you require, make sure that you have enter
If you are still unable to connect to the onion service, please try again later.
There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning.
-You can also ensure that you're able to access other onion services by connecting to
-
-DuckDuckGo's Onion Service
+You can also ensure that you're able to access other onion services by connecting to DuckDuckGo's Onion Service
diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr
index 176de898..737d1e3d 100644
--- a/content/onion-services/contents.lr
+++ b/content/onion-services/contents.lr
@@ -14,11 +14,9 @@ Onion services (formerly known as “hidden services”) are services (like webs
Onion services offer several advantages over ordinary services on the non-private web:
-An onion services’s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators.
-
-All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about connecting over HTTPS.
-
-The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with.
+* An onion services’s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators.
+* All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about connecting over HTTPS.
+* The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with.
##### How to access an onion service
@@ -35,6 +33,4 @@ If you cannot reach the onion service you require, make sure that you have enter
If you are still unable to connect to the onion service, please try again later.
There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning.
-You can also ensure that you're able to access other onion services by connecting to
-
-DuckDuckGo's Onion Service
+You can also ensure that you're able to access other onion services by connecting to DuckDuckGo's Onion Service
diff --git a/content/secure-connections/contents+en.lr b/content/secure-connections/contents+en.lr
index 41d7562f..d5a3b614 100644
--- a/content/secure-connections/contents+en.lr
+++ b/content/secure-connections/contents+en.lr
@@ -9,3 +9,60 @@ seo_slug: secure-connections
key: 7
---
body:
+If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper.
+If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping.
+You can verify this in the URL bar: if your connection is encrypted, the address will begin with “https://”, rather than “http://”.
+
+
+
+The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:
+
+
+
+* Click the “Tor” button to see what data is visible to observers when you're using Tor.
+The button will turn green to indicate that Tor is on.
+* Click the “HTTPS” button to see what data is visible to observers when you're using HTTPS.
+The button will turn green to indicate that HTTPS is on.
+* When both buttons are green, you see the data that is visible to observers when you are using both tools.
+* When both buttons are grey, you see the data that is visible to observers when you don't use either tool.
+
+##### Potentially visible data
+
+
+
+
+Site.com
+
+
+ The site being visited.
+
+
+
+user / pw
+
+
+ Username and password used for authentication.
+
+
+
+data
+
+
+ Data being transmitted.
+
+
+
+location
+
+
+ Network location of the computer used to visit the website (the public IP address).
+
+
+
+Tor
+
+
+ Whether or not Tor is being used.
+
+
+
diff --git a/content/secure-connections/contents+es.lr b/content/secure-connections/contents+es.lr
index f4728134..44869087 100644
--- a/content/secure-connections/contents+es.lr
+++ b/content/secure-connections/contents+es.lr
@@ -9,3 +9,60 @@ seo_slug: conexiones-seguras
key: 7
---
body:
+Si la información personal como nombre de usuario y contraseña viaja cifrada por Internet, puede ser interceptada muy fácilmente por alguien a la escucha.
+Si la información personal como nombre de usuario y contraseña viaja cifrada por Internet, puede ser interceptada muy fácilmente por alguien a la escucha.
+Puedes verificar esto en la barra de URLs: Si tu conexión está cifrada, la dirección comenzará con “https://”, en lugar de “http://”.
+
+
+
+La siguiente visualización muestra qué información es visible a quienes estén a la escucha, tanto si usa como si no el Navegador Tor y el cifrado HTTPS:
+
+
+
+* Haz clic en el botón "Tor" para ver qué datos son visibles para los observadores cuando estás usando Tor.
+El botón se pondrá verde para indicar que Tor está activado.
+* Pulsa el botón "HTTPS" para ver qué datos son visibles a los observadores cuando estás usando HTTPS.
+El botón se pondrá verde para indicar que HTTPS está activado.
+* Cuando ambos botones están en verde, verás los datos que son visibles para los observadores cuando estás usando ambas herramientas.
+* Cuando ambos botones están en gris, verás los datos que son visibles para los observadores cuando no usas ninguna de las dos herramientas.
+
+##### Datos potencialmente visibles
+
+
+
+
+Site.com
+
+
+ El sitio que estás visitando.
+
+
+
+user / pw
+
+
+ Nombre de usuario y contraseña usados para la autentificación.
+
+
+
+data
+
+
+ Datos que se están transmitiendo.
+
+
+
+location
+
+
+ La ubicación de red del ordenador usado para visitar el sitio web (la dirección IP pública).
+
+
+
+Tor
+
+
+ Si se está usando Tor o no.
+
+
+
diff --git a/content/secure-connections/contents+fr.lr b/content/secure-connections/contents+fr.lr
index 9afc929b..e5f3337b 100644
--- a/content/secure-connections/contents+fr.lr
+++ b/content/secure-connections/contents+fr.lr
@@ -9,3 +9,60 @@ seo_slug: secure-connections
key: 7
---
body:
+If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper.
+If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping.
+You can verify this in the URL bar: if your connection is encrypted, the address will begin with “https://”, rather than “http://”.
+
+
+
+The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:
+
+
+
+* Click the “Tor” button to see what data is visible to observers when you're using Tor.
+The button will turn green to indicate that Tor is on.
+* Click the “HTTPS” button to see what data is visible to observers when you're using HTTPS.
+The button will turn green to indicate that HTTPS is on.
+* When both buttons are green, you see the data that is visible to observers when you are using both tools.
+* When both buttons are grey, you see the data that is visible to observers when you don't use either tool.
+
+##### Potentially visible data
+
+
+
+
+Site.com
+
+
+ The site being visited.
+
+
+
+user / pw
+
+
+ Username and password used for authentication.
+
+
+
+data
+
+
+ Data being transmitted.
+
+
+
+location
+
+
+ Network location of the computer used to visit the website (the public IP address).
+
+
+
+Tor
+
+
+ Whether or not Tor is being used.
+
+
+
diff --git a/content/secure-connections/contents.lr b/content/secure-connections/contents.lr
index 41d7562f..d5a3b614 100644
--- a/content/secure-connections/contents.lr
+++ b/content/secure-connections/contents.lr
@@ -9,3 +9,60 @@ seo_slug: secure-connections
key: 7
---
body:
+If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper.
+If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping.
+You can verify this in the URL bar: if your connection is encrypted, the address will begin with “https://”, rather than “http://”.
+
+
+
+The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:
+
+
+
+* Click the “Tor” button to see what data is visible to observers when you're using Tor.
+The button will turn green to indicate that Tor is on.
+* Click the “HTTPS” button to see what data is visible to observers when you're using HTTPS.
+The button will turn green to indicate that HTTPS is on.
+* When both buttons are green, you see the data that is visible to observers when you are using both tools.
+* When both buttons are grey, you see the data that is visible to observers when you don't use either tool.
+
+##### Potentially visible data
+
+
+
+
+Site.com
+
+
+ The site being visited.
+
+
+
+user / pw
+
+
+ Username and password used for authentication.
+
+
+
+data
+
+
+ Data being transmitted.
+
+
+
+location
+
+
+ Network location of the computer used to visit the website (the public IP address).
+
+
+
+Tor
+
+
+ Whether or not Tor is being used.
+
+
+
diff --git a/content/security-slider/contents+en.lr b/content/security-slider/contents+en.lr
index efff6ad0..6ea8c76a 100644
--- a/content/security-slider/contents+en.lr
+++ b/content/security-slider/contents+en.lr
@@ -9,3 +9,39 @@ seo_slug: security-slider
key: 8
---
body:
+Tor Browser includes a “Security Slider” that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity.
+Increasing Tor Browser’s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require.
+
+##### Accessing the Security Slider
+
+
+
+The Security Slider is located in Torbutton’s “Security Settings” menu.
+
+##### Security Levels
+
+
+
+Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks.
+
+
+
+Safest
+
+
+At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly.
+
+
+Safer
+
+
+At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-HTTPS sites.
+
+
+Standard
+
+
+At this level, all browser features are enabled.
+This is the most usable option.
+
+
diff --git a/content/security-slider/contents+es.lr b/content/security-slider/contents+es.lr
index 61ca64cf..dfc01f21 100644
--- a/content/security-slider/contents+es.lr
+++ b/content/security-slider/contents+es.lr
@@ -9,3 +9,39 @@ seo_slug: control-deslizante-de-seguridad
key: 8
---
body:
+El Navegador Tor incluye un "Control deslizante de seguridad" que te permite incrementar tu seguridad deshabilitando ciertas características de la web que se pueden usar para atacar tu seguridad y anonimato.
+Incrementar el nivel de seguridad del Navegador Tor evitará que algunas páginas web funcionen adecuadamente, así que debes sopesar tus necesidades de seguridad con respecto al grado de usabilidad que necesitas.
+
+##### Acceder al 'Control deslizante de seguridad'
+
+
+
+La barra de Seguridad se encuentra en el menú "Configuración de Seguridad" de Torbutton.
+
+##### Niveles de seguridad
+
+
+
+Incrementar el nivel del 'Control deslizante de seguridad' deshabilitará total o parcialmente algunas características para proteger contra posibles ataques.
+
+
+
+La más segura
+
+
+En este nivel, los audiovisuales HTML5 funcionan en modo clic-para-reproducir mediante NoScript; se deshabilitan todas las optimizaciones de rendimiento de JavaScript; algunas ecuaciones matemáticas puede que no se muestren adecuadamente; algunas características de renderización de fuentes están deshabilitadas; algunos tipos de imagen están deshabilitados; JavaScript está deshabilitado por defecto en todos los sitios; la mayoría de formatos de vídeo y audio están deshabilitados; y algunas fuentes e iconos puede que no se muestren correctamente.
+
+
+Más segura
+
+
+En este nivel, el vídeo y el audio HTML5 se comportan en modo clic-para-reproducir mediante NoScript; se deshabilitan todas las optimizaciones de rendimiento; algunas ecuaciones matemáticas puede que no se muestren adecuadamente; algunas características de renderización están deshabilitadas; algunos tipos de imagen están deshabilitados; y JavaScript está deshabilitado por defecto en todos los sitios no-HTTPS.
+
+
+Estándar
+
+
+En este nivel, todas las características del navegador están habilitadas.
+Esta es la opción más fácil de usar.
+
+
diff --git a/content/security-slider/contents+fr.lr b/content/security-slider/contents+fr.lr
index cac72315..cf9d77df 100644
--- a/content/security-slider/contents+fr.lr
+++ b/content/security-slider/contents+fr.lr
@@ -9,3 +9,39 @@ seo_slug: security-slider
key: 8
---
body:
+Tor Browser includes a “Security Slider” that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity.
+Increasing Tor Browser’s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require.
+
+##### Accessing the Security Slider
+
+
+
+The Security Slider is located in Torbutton’s “Security Settings” menu.
+
+##### Security Levels
+
+
+
+Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks.
+
+
+
+Safest
+
+
+At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly.
+
+
+Safer
+
+
+At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-HTTPS sites.
+
+
+Standard
+
+
+At this level, all browser features are enabled.
+This is the most usable option.
+
+
diff --git a/content/security-slider/contents.lr b/content/security-slider/contents.lr
index efff6ad0..6ea8c76a 100644
--- a/content/security-slider/contents.lr
+++ b/content/security-slider/contents.lr
@@ -9,3 +9,39 @@ seo_slug: security-slider
key: 8
---
body:
+Tor Browser includes a “Security Slider” that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity.
+Increasing Tor Browser’s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require.
+
+##### Accessing the Security Slider
+
+
+
+The Security Slider is located in Torbutton’s “Security Settings” menu.
+
+##### Security Levels
+
+
+
+Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks.
+
+
+
+Safest
+
+
+At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly.
+
+
+Safer
+
+
+At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-HTTPS sites.
+
+
+Standard
+
+
+At this level, all browser features are enabled.
+This is the most usable option.
+