From 30c85e072282e9a66c5ff940bf9f84e21beb5238 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 1 Jun 2021 13:18:21 +0200
Subject: [PATCH] [i18n] update locales

---
 gui/i18n/base.ts       | 182 ++++++++++++++++++++++++++-------
 gui/i18n/main_es.ts    | 203 +++++++++++++++++++++++++++++-------
 gui/i18n/main_es_ES.ts | 203 +++++++++++++++++++++++++++++-------
 gui/i18n/main_et.ts    | 227 ++++++++++++++++++++++++++++++++---------
 gui/i18n/main_fr.ts    | 227 ++++++++++++++++++++++++++++++++---------
 gui/i18n/main_lt.ts    | 203 +++++++++++++++++++++++++++++-------
 gui/i18n/main_tr.ts    | 203 +++++++++++++++++++++++++++++-------
 7 files changed, 1176 insertions(+), 272 deletions(-)

diff --git a/gui/i18n/base.ts b/gui/i18n/base.ts
index af040bd8..3f3638b0 100644
--- a/gui/i18n/base.ts
+++ b/gui/i18n/base.ts
@@ -27,6 +27,24 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="46"/>
+        <source>Select a bridge only if you know that you need it to evade censorship in your country or local network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="57"/>
+        <source>An obfs4 bridge will be used the next time you connect to the VPN.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DonateDialog</name>
     <message>
@@ -51,6 +69,14 @@ Do you want to donate now?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LoginDialog</name>
     <message>
@@ -100,142 +126,222 @@ Do you want to donate now?</source>
     </message>
 </context>
 <context>
-    <name>main</name>
+    <name>MainBar</name>
     <message>
-        <location filename="../qml/main.qml" line="39"/>
-        <source>Could not find helpers. Please check your installation</source>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="41"/>
-        <source>Could not find polkit agent.</source>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="57"/>
-        <source>Oops! The authentication service seems down. Please try again later</source>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
     <message>
-        <location filename="../qml/main.qml" line="58"/>
-        <source>Service Error</source>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source></source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>VpnState</name>
     <message>
-        <location filename="../qml/main.qml" line="64"/>
-        <source>Please check your Patron ID</source>
-        <extracomment>Incorrect library card number</extracomment>
+        <location filename="../qml/VpnState.qml" line="34"/>
+        <location filename="../qml/VpnState.qml" line="74"/>
+        <location filename="../qml/VpnState.qml" line="106"/>
+        <location filename="../qml/VpnState.qml" line="132"/>
+        <location filename="../qml/VpnState.qml" line="156"/>
+        <source>Recommended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="66"/>
-        <source>Could not log in with those credentials, please retry</source>
+        <location filename="../qml/VpnState.qml" line="72"/>
+        <location filename="../qml/VpnState.qml" line="104"/>
+        <source>Recommended (%1)</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="68"/>
-        <source>Login Error</source>
+        <location filename="../qml/VpnState.qml" line="85"/>
+        <source>Connected to %1</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="72"/>
-        <source>Got an error starting %1: %2</source>
-        <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
+        <location filename="../qml/VpnState.qml" line="112"/>
+        <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>logic</name>
     <message>
-        <location filename="../qml/main.qml" line="107"/>
+        <location filename="../qml/logic.js" line="24"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="110"/>
+        <location filename="../qml/logic.js" line="27"/>
         <source>%1 on</source>
         <extracomment>%1 -&gt; application name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="113"/>
+        <location filename="../qml/logic.js" line="30"/>
         <source>Connecting to %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="116"/>
+        <location filename="../qml/logic.js" line="33"/>
         <source>Stopping %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="119"/>
+        <location filename="../qml/logic.js" line="36"/>
         <source>%1 blocking internet</source>
         <extracomment>%1 -&gt; application name</extracomment>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>main</name>
+    <message>
+        <location filename="../qml/main.qml" line="208"/>
+        <source>Could not find helpers. Please check your installation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="210"/>
+        <source>Could not find polkit agent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="226"/>
+        <source>Oops! The authentication service seems down. Please try again later</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="227"/>
+        <source>Service Error</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../qml/main.qml" line="171"/>
-        <location filename="../qml/main.qml" line="273"/>
+        <location filename="../qml/main.qml" line="233"/>
+        <source>Please check your Patron ID</source>
+        <extracomment>Incorrect library card number</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="235"/>
+        <source>Could not log in with those credentials, please retry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="237"/>
+        <source>Login Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="241"/>
+        <source>Got an error starting %1: %2</source>
+        <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
         <source>Checking status…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="280"/>
+        <location filename="../qml/main.qml" line="353"/>
         <source>Reconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="282"/>
+        <location filename="../qml/main.qml" line="355"/>
         <source>Turn on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="294"/>
+        <location filename="../qml/main.qml" line="367"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="296"/>
+        <location filename="../qml/main.qml" line="369"/>
         <source>Turn off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="326"/>
+        <location filename="../qml/main.qml" line="401"/>
         <source>Help…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="391"/>
         <source>Donate…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="308"/>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
         <source>About…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="335"/>
+        <location filename="../qml/main.qml" line="410"/>
         <source>Report a bug…</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="347"/>
+        <location filename="../qml/main.qml" line="422"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="377"/>
+        <location filename="../qml/main.qml" line="467"/>
         <source>Error starting VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="387"/>
+        <location filename="../qml/main.qml" line="476"/>
         <source>Missing authentication agent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="388"/>
+        <location filename="../qml/main.qml" line="477"/>
         <source>Could not find a polkit authentication agent. Please run one and try again.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/i18n/main_es.ts b/gui/i18n/main_es.ts
index 3d8f904e..d95240c2 100644
--- a/gui/i18n/main_es.ts
+++ b/gui/i18n/main_es.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="es">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -25,6 +27,24 @@
         <translation>Versión de %1: %2</translation>
     </message>
 </context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="46"/>
+        <source>Select a bridge only if you know that you need it to evade censorship in your country or local network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="57"/>
+        <source>An obfs4 bridge will be used the next time you connect to the VPN.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DonateDialog</name>
     <message>
@@ -34,7 +54,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <source>The %1 service is expensive to run. Because we don't want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
+        <source>The %1 service is expensive to run. Because we don&apos;t want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -51,6 +71,14 @@ Do you want to donate now?</source>
         <translation>Error de inicialización</translation>
     </message>
 </context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LoginDialog</name>
     <message>
@@ -99,143 +127,248 @@ Do you want to donate now?</source>
         <translation>Sesión iniciada con éxito. Ahora puedes iniciar la VPN.</translation>
     </message>
 </context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VpnState</name>
+    <message>
+        <location filename="../qml/VpnState.qml" line="34"/>
+        <location filename="../qml/VpnState.qml" line="74"/>
+        <location filename="../qml/VpnState.qml" line="106"/>
+        <location filename="../qml/VpnState.qml" line="132"/>
+        <location filename="../qml/VpnState.qml" line="156"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="72"/>
+        <location filename="../qml/VpnState.qml" line="104"/>
+        <source>Recommended (%1)</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="85"/>
+        <source>Connected to %1</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="112"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>logic</name>
+    <message>
+        <location filename="../qml/logic.js" line="24"/>
+        <source>%1 off</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 desconectada</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 conectada</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Conectando a %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Deteniendo %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">$1 bloqueando Internet</translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../qml/main.qml" line="39"/>
+        <location filename="../qml/main.qml" line="208"/>
         <source>Could not find helpers. Please check your installation</source>
         <translation>No se pudieron encontrar los programas auxiliares. Por favor, comprueba tu instalación</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="41"/>
+        <location filename="../qml/main.qml" line="210"/>
         <source>Could not find polkit agent.</source>
         <translation>No se pudo encontrar el agente polkit.</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="57"/>
+        <location filename="../qml/main.qml" line="226"/>
         <source>Oops! The authentication service seems down. Please try again later</source>
         <translation>¡Epa! El servicio de autenticación está caído. Por favor intenta de nuevo más tarde</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="58"/>
+        <location filename="../qml/main.qml" line="227"/>
         <source>Service Error</source>
         <translation>Error en el Servicio</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="64"/>
+        <location filename="../qml/main.qml" line="233"/>
         <source>Please check your Patron ID</source>
         <extracomment>Incorrect library card number</extracomment>
         <translation>Por favor comprueba tu Identificación de Patrocinador</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="66"/>
+        <location filename="../qml/main.qml" line="235"/>
         <source>Could not log in with those credentials, please retry</source>
         <translation>No se pudo iniciar sesión con esas credenciales, por favor vuelve a intentar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="68"/>
+        <location filename="../qml/main.qml" line="237"/>
         <source>Login Error</source>
         <translation>Error de Inicio de sesión</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="72"/>
+        <location filename="../qml/main.qml" line="241"/>
         <source>Got an error starting %1: %2</source>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>Se produjo un error iniciando %1: %2</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="107"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 desconectada</translation>
+        <translation type="vanished">%1 desconectada</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="110"/>
         <source>%1 on</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 conectada</translation>
+        <translation type="vanished">%1 conectada</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="113"/>
         <source>Connecting to %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Conectando a %1</translation>
+        <translation type="vanished">Conectando a %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="116"/>
         <source>Stopping %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Deteniendo %1</translation>
+        <translation type="vanished">Deteniendo %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="119"/>
         <source>%1 blocking internet</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>$1 bloqueando Internet</translation>
+        <translation type="vanished">$1 bloqueando Internet</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="171"/>
-        <location filename="../qml/main.qml" line="273"/>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
         <source>Checking status…</source>
         <translation>Comprobando estado...</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="280"/>
+        <location filename="../qml/main.qml" line="353"/>
         <source>Reconnect</source>
         <translation>Volver a conectar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="282"/>
+        <location filename="../qml/main.qml" line="355"/>
         <source>Turn on</source>
         <translation>Encender</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="294"/>
+        <location filename="../qml/main.qml" line="367"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="296"/>
+        <location filename="../qml/main.qml" line="369"/>
         <source>Turn off</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="326"/>
+        <location filename="../qml/main.qml" line="401"/>
         <source>Help…</source>
         <translation>Ayuda...</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="391"/>
         <source>Donate…</source>
         <translation>Donar...</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="308"/>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
         <source>About…</source>
         <translation>Acerca de...</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="335"/>
+        <location filename="../qml/main.qml" line="410"/>
         <source>Report a bug…</source>
         <translation>Informar sobre un error…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="347"/>
+        <location filename="../qml/main.qml" line="422"/>
         <source>Quit</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="377"/>
+        <location filename="../qml/main.qml" line="467"/>
         <source>Error starting VPN</source>
         <translation>Error al iniciar la VPN</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="387"/>
+        <location filename="../qml/main.qml" line="476"/>
         <source>Missing authentication agent</source>
         <translation>Falta un agente de autenticación</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="388"/>
+        <location filename="../qml/main.qml" line="477"/>
         <source>Could not find a polkit authentication agent. Please run one and try again.</source>
         <translation>No se pudo encontrar ningún agente de autenticacion de polkit. Por favor lanza uno y prueba de nuevo.</translation>
     </message>
@@ -280,4 +413,4 @@ Do you want to donate now?</source>
         <translation>Iniciar la VPN, &apos;conectada&apos; o bien, &apos;desconectada&apos;.</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/gui/i18n/main_es_ES.ts b/gui/i18n/main_es_ES.ts
index c5713252..b3146a9f 100644
--- a/gui/i18n/main_es_ES.ts
+++ b/gui/i18n/main_es_ES.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_ES" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="es_ES">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -25,6 +27,24 @@
         <translation>Versión de %1: %2</translation>
     </message>
 </context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="46"/>
+        <source>Select a bridge only if you know that you need it to evade censorship in your country or local network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="57"/>
+        <source>An obfs4 bridge will be used the next time you connect to the VPN.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DonateDialog</name>
     <message>
@@ -34,7 +54,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <source>The %1 service is expensive to run. Because we don't want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
+        <source>The %1 service is expensive to run. Because we don&apos;t want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -51,6 +71,14 @@ Do you want to donate now?</source>
         <translation>Error de inicialización</translation>
     </message>
 </context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LoginDialog</name>
     <message>
@@ -99,143 +127,248 @@ Do you want to donate now?</source>
         <translation>Sesión iniciada con éxito. Ahora puedes iniciar la VPN.</translation>
     </message>
 </context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VpnState</name>
+    <message>
+        <location filename="../qml/VpnState.qml" line="34"/>
+        <location filename="../qml/VpnState.qml" line="74"/>
+        <location filename="../qml/VpnState.qml" line="106"/>
+        <location filename="../qml/VpnState.qml" line="132"/>
+        <location filename="../qml/VpnState.qml" line="156"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="72"/>
+        <location filename="../qml/VpnState.qml" line="104"/>
+        <source>Recommended (%1)</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="85"/>
+        <source>Connected to %1</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="112"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>logic</name>
+    <message>
+        <location filename="../qml/logic.js" line="24"/>
+        <source>%1 off</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 desconectada</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 conectada</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Conectando a %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Deteniendo %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">$1 bloqueando Internet</translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../qml/main.qml" line="39"/>
+        <location filename="../qml/main.qml" line="208"/>
         <source>Could not find helpers. Please check your installation</source>
         <translation>No se pudieron encontrar los programas auxiliares. Por favor, comprueba tu instalación</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="41"/>
+        <location filename="../qml/main.qml" line="210"/>
         <source>Could not find polkit agent.</source>
         <translation>No se pudo encontrar el agente polkit.</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="57"/>
+        <location filename="../qml/main.qml" line="226"/>
         <source>Oops! The authentication service seems down. Please try again later</source>
         <translation>¡Epa! El servicio de autenticación está caído. Por favor intenta de nuevo más tarde</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="58"/>
+        <location filename="../qml/main.qml" line="227"/>
         <source>Service Error</source>
         <translation>Error en el Servicio</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="64"/>
+        <location filename="../qml/main.qml" line="233"/>
         <source>Please check your Patron ID</source>
         <extracomment>Incorrect library card number</extracomment>
         <translation>Por favor comprueba tu Identificación de Patrocinador</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="66"/>
+        <location filename="../qml/main.qml" line="235"/>
         <source>Could not log in with those credentials, please retry</source>
         <translation>No se pudo iniciar sesión con esas credenciales, por favor vuelve a intentar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="68"/>
+        <location filename="../qml/main.qml" line="237"/>
         <source>Login Error</source>
         <translation>Error de Inicio de sesión</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="72"/>
+        <location filename="../qml/main.qml" line="241"/>
         <source>Got an error starting %1: %2</source>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>Se produjo un error iniciando %1: %2</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="107"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 desconectada</translation>
+        <translation type="vanished">%1 desconectada</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="110"/>
         <source>%1 on</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 conectada</translation>
+        <translation type="vanished">%1 conectada</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="113"/>
         <source>Connecting to %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Conectando a %1</translation>
+        <translation type="vanished">Conectando a %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="116"/>
         <source>Stopping %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Deteniendo %1</translation>
+        <translation type="vanished">Deteniendo %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="119"/>
         <source>%1 blocking internet</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>$1 bloqueando Internet</translation>
+        <translation type="vanished">$1 bloqueando Internet</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="171"/>
-        <location filename="../qml/main.qml" line="273"/>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
         <source>Checking status…</source>
         <translation>Comprobando estado...</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="280"/>
+        <location filename="../qml/main.qml" line="353"/>
         <source>Reconnect</source>
         <translation>Reconectar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="282"/>
+        <location filename="../qml/main.qml" line="355"/>
         <source>Turn on</source>
         <translation>Activar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="294"/>
+        <location filename="../qml/main.qml" line="367"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="296"/>
+        <location filename="../qml/main.qml" line="369"/>
         <source>Turn off</source>
         <translation>Desactivar</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="326"/>
+        <location filename="../qml/main.qml" line="401"/>
         <source>Help…</source>
         <translation>Ayuda...</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="391"/>
         <source>Donate…</source>
         <translation>Donar...</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="308"/>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
         <source>About…</source>
         <translation>Acerca de...</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="335"/>
+        <location filename="../qml/main.qml" line="410"/>
         <source>Report a bug…</source>
         <translation>Informar sobre un error…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="347"/>
+        <location filename="../qml/main.qml" line="422"/>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="377"/>
+        <location filename="../qml/main.qml" line="467"/>
         <source>Error starting VPN</source>
         <translation>Error iniciando VPN</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="387"/>
+        <location filename="../qml/main.qml" line="476"/>
         <source>Missing authentication agent</source>
         <translation>Falta agente de autentificación</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="388"/>
+        <location filename="../qml/main.qml" line="477"/>
         <source>Could not find a polkit authentication agent. Please run one and try again.</source>
         <translation>No se pudo encontrar un agente de autentificación polkit. Por favor corre uno e intenta de nuevo.</translation>
     </message>
@@ -280,4 +413,4 @@ Do you want to donate now?</source>
         <translation>Iniciar la VPN, &apos;conectada&apos; o bien, &apos;desconectada&apos;.</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/gui/i18n/main_et.ts b/gui/i18n/main_et.ts
index 0c7faf94..744dd41f 100644
--- a/gui/i18n/main_et.ts
+++ b/gui/i18n/main_et.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="et">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -25,6 +27,24 @@
         <translation>%1 versioon: %2</translation>
     </message>
 </context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="46"/>
+        <source>Select a bridge only if you know that you need it to evade censorship in your country or local network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="57"/>
+        <source>An obfs4 bridge will be used the next time you connect to the VPN.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DonateDialog</name>
     <message>
@@ -34,7 +54,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <source>The %1 service is expensive to run. Because we don't want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
+        <source>The %1 service is expensive to run. Because we don&apos;t want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -51,6 +71,14 @@ Kas soovid kohe annetada?</translation>
         <translation>Käivitamise tõrge</translation>
     </message>
 </context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LoginDialog</name>
     <message>
@@ -62,7 +90,7 @@ Kas soovid kohe annetada?</translation>
         <location filename="../qml/LoginDialog.qml" line="21"/>
         <source>Patron ID</source>
         <extracomment>Ask for the library card number</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/LoginDialog.qml" line="25"/>
@@ -99,143 +127,248 @@ Kas soovid kohe annetada?</translation>
         <translation>Sisselogimine oli edukas. Võid nüüd VPN-i käivitada.</translation>
     </message>
 </context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VpnState</name>
+    <message>
+        <location filename="../qml/VpnState.qml" line="34"/>
+        <location filename="../qml/VpnState.qml" line="74"/>
+        <location filename="../qml/VpnState.qml" line="106"/>
+        <location filename="../qml/VpnState.qml" line="132"/>
+        <location filename="../qml/VpnState.qml" line="156"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="72"/>
+        <location filename="../qml/VpnState.qml" line="104"/>
+        <source>Recommended (%1)</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="85"/>
+        <source>Connected to %1</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="112"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>logic</name>
+    <message>
+        <location filename="../qml/logic.js" line="24"/>
+        <source>%1 off</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 väljas</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 sees</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Ãœhendumine rakendusega %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 peatamine</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 - internet blokeeritud</translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../qml/main.qml" line="39"/>
+        <location filename="../qml/main.qml" line="208"/>
         <source>Could not find helpers. Please check your installation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="41"/>
+        <location filename="../qml/main.qml" line="210"/>
         <source>Could not find polkit agent.</source>
         <translation>Polkit agenti ei leitud.</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="57"/>
+        <location filename="../qml/main.qml" line="226"/>
         <source>Oops! The authentication service seems down. Please try again later</source>
         <translation>Oih! Tundub, et autentimise teenus on maas. Palun proovi hiljem uuesti</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="58"/>
+        <location filename="../qml/main.qml" line="227"/>
         <source>Service Error</source>
         <translation>Teenuse tõrge</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="64"/>
+        <location filename="../qml/main.qml" line="233"/>
         <source>Please check your Patron ID</source>
         <extracomment>Incorrect library card number</extracomment>
         <translation>Palun kontrolli oma Patron ID-d</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="66"/>
+        <location filename="../qml/main.qml" line="235"/>
         <source>Could not log in with those credentials, please retry</source>
         <translation>Nende andmetega ei õnnestunud sisse logida. Palun proovi uuesti</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="68"/>
+        <location filename="../qml/main.qml" line="237"/>
         <source>Login Error</source>
         <translation>Sisselogimise tõrge</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="72"/>
+        <location filename="../qml/main.qml" line="241"/>
         <source>Got an error starting %1: %2</source>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>Rakendust %1 käivitades anti veateade: %2</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="107"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 väljas</translation>
+        <translation type="vanished">%1 väljas</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="110"/>
         <source>%1 on</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 sees</translation>
+        <translation type="vanished">%1 sees</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="113"/>
         <source>Connecting to %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Ãœhendumine rakendusega %1</translation>
+        <translation type="vanished">Ãœhendumine rakendusega %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="116"/>
         <source>Stopping %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 peatamine</translation>
+        <translation type="vanished">%1 peatamine</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="119"/>
         <source>%1 blocking internet</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 - internet blokeeritud</translation>
+        <translation type="vanished">%1 - internet blokeeritud</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="171"/>
-        <location filename="../qml/main.qml" line="273"/>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
         <source>Checking status…</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="280"/>
+        <location filename="../qml/main.qml" line="353"/>
         <source>Reconnect</source>
         <translation>Ãœhenda uuesti</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="282"/>
+        <location filename="../qml/main.qml" line="355"/>
         <source>Turn on</source>
         <translation>Lülita sisse</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="294"/>
+        <location filename="../qml/main.qml" line="367"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="296"/>
+        <location filename="../qml/main.qml" line="369"/>
         <source>Turn off</source>
         <translation>Lülita välja</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="326"/>
+        <location filename="../qml/main.qml" line="401"/>
         <source>Help…</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="391"/>
         <source>Donate…</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="308"/>
+        <location filename="../qml/main.qml" line="381"/>
         <source>About…</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="335"/>
+        <location filename="../qml/main.qml" line="410"/>
         <source>Report a bug…</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="347"/>
+        <location filename="../qml/main.qml" line="422"/>
         <source>Quit</source>
         <translation>Välju</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="377"/>
+        <location filename="../qml/main.qml" line="467"/>
         <source>Error starting VPN</source>
         <translation>Tõrge VPN-i käivitamisel</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="387"/>
+        <location filename="../qml/main.qml" line="476"/>
         <source>Missing authentication agent</source>
         <translation>Autentimise agent puudub</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="388"/>
+        <location filename="../qml/main.qml" line="477"/>
         <source>Could not find a polkit authentication agent. Please run one and try again.</source>
         <translation>Polkit autentimise agenti ei leitud. Palun käivita see ning proovi siis uuesti.</translation>
     </message>
@@ -247,17 +380,17 @@ Kas soovid kohe annetada?</translation>
     <message>
         <location filename="../main.cpp" line="83"/>
         <source>Do not show the systray icon (useful together with Gnome Shell extension, or to control VPN by other means).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../main.cpp" line="90"/>
         <source>Enable Web API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../main.cpp" line="96"/>
         <source>Install helpers (Linux only, requires sudo).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../main.cpp" line="102"/>
@@ -272,12 +405,12 @@ Kas soovid kohe annetada?</translation>
     <message>
         <location filename="../main.cpp" line="113"/>
         <source>Web API port (default: 8080)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../main.cpp" line="115"/>
         <source>Start the VPN, either &apos;on&apos; or &apos;off&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/gui/i18n/main_fr.ts b/gui/i18n/main_fr.ts
index b383113e..df76cfdd 100644
--- a/gui/i18n/main_fr.ts
+++ b/gui/i18n/main_fr.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -22,7 +24,25 @@
         <location filename="../qml/AboutDialog.qml" line="37"/>
         <source>%1 version: %2</source>
         <extracomment>%1 -&gt; application name %2 -&gt; version string</extracomment>
-        <translation>%1 version : %2</translation>
+        <translation>%1 version&#xa0;: %2</translation>
+    </message>
+</context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="46"/>
+        <source>Select a bridge only if you know that you need it to evade censorship in your country or local network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="57"/>
+        <source>An obfs4 bridge will be used the next time you connect to the VPN.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -34,13 +54,13 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <source>The %1 service is expensive to run. Because we don't want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
+        <source>The %1 service is expensive to run. Because we don&apos;t want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
-        <translation>L’exploitation du service %1 coûte cher. Dans la mesure où ne nous voulons enregistrer aucun renseignement personnel à votre sujet, il n’y a ni compte ni facturation pour ce service. Mais si vous souhaitez toutefois que le service perdure, faites un don d’au moins 5 $ mensuellement.
+        <translation>L’exploitation du service %1 coûte cher. Dans la mesure où ne nous voulons enregistrer aucun renseignement personnel à votre sujet, il n’y a ni compte ni facturation pour ce service. Mais si vous souhaitez toutefois que le service perdure, faites un don d’au moins 5&#xa0;$ mensuellement.
 
-Voulez-vous faire un don maintenant ?</translation>
+Voulez-vous faire un don maintenant&#x2009;?</translation>
     </message>
 </context>
 <context>
@@ -51,6 +71,14 @@ Voulez-vous faire un don maintenant ?</translation>
         <translation>Erreur d’initialisation</translation>
     </message>
 </context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LoginDialog</name>
     <message>
@@ -62,7 +90,7 @@ Voulez-vous faire un don maintenant ?</translation>
         <location filename="../qml/LoginDialog.qml" line="21"/>
         <source>Patron ID</source>
         <extracomment>Ask for the library card number</extracomment>
-        <translation>ID Patron</translation>
+        <translation>ID&#xa0;Patron</translation>
     </message>
     <message>
         <location filename="../qml/LoginDialog.qml" line="25"/>
@@ -73,7 +101,7 @@ Voulez-vous faire un don maintenant ?</translation>
         <location filename="../qml/LoginDialog.qml" line="37"/>
         <source>Enter your Patron ID</source>
         <extracomment>Ask for the library card number</extracomment>
-        <translation>Saisissez votre ID Patron</translation>
+        <translation>Saisissez votre ID&#xa0;Patron</translation>
     </message>
     <message>
         <location filename="../qml/LoginDialog.qml" line="39"/>
@@ -83,7 +111,7 @@ Voulez-vous faire un don maintenant ?</translation>
     <message>
         <location filename="../qml/LoginDialog.qml" line="44"/>
         <source>You can check your Patron ID number in the back of your library card</source>
-        <translation>Vous pouvez vérifier votre numéro d’ID Patron au verso de votre carte de papeterie</translation>
+        <translation>Vous pouvez vérifier votre numéro d’ID&#xa0;Patron au verso de votre carte de papeterie</translation>
     </message>
 </context>
 <context>
@@ -99,155 +127,260 @@ Voulez-vous faire un don maintenant ?</translation>
         <translation>La connexion est réussie. Vous pouvez maintenant lancer le RPV.</translation>
     </message>
 </context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VpnState</name>
+    <message>
+        <location filename="../qml/VpnState.qml" line="34"/>
+        <location filename="../qml/VpnState.qml" line="74"/>
+        <location filename="../qml/VpnState.qml" line="106"/>
+        <location filename="../qml/VpnState.qml" line="132"/>
+        <location filename="../qml/VpnState.qml" line="156"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="72"/>
+        <location filename="../qml/VpnState.qml" line="104"/>
+        <source>Recommended (%1)</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="85"/>
+        <source>Connected to %1</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="112"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>logic</name>
+    <message>
+        <location filename="../qml/logic.js" line="24"/>
+        <source>%1 off</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 désactivé</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 activé</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Connexion à %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Arrêt de %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 bloque Internet</translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../qml/main.qml" line="39"/>
+        <location filename="../qml/main.qml" line="208"/>
         <source>Could not find helpers. Please check your installation</source>
         <translation>Impossible de trouver les aides. Veuillez vérifier votre installation</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="41"/>
+        <location filename="../qml/main.qml" line="210"/>
         <source>Could not find polkit agent.</source>
         <translation>Impossible de trouver l’agent polkit</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="57"/>
+        <location filename="../qml/main.qml" line="226"/>
         <source>Oops! The authentication service seems down. Please try again later</source>
         <translation>Oups. Le service d&apos;authentification semble être hors service. Veuillez essayer plus tard</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="58"/>
+        <location filename="../qml/main.qml" line="227"/>
         <source>Service Error</source>
         <translation>Erreur de service</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="64"/>
+        <location filename="../qml/main.qml" line="233"/>
         <source>Please check your Patron ID</source>
         <extracomment>Incorrect library card number</extracomment>
-        <translation>Veuillez confirmer votre ID Patron</translation>
+        <translation>Veuillez confirmer votre ID&#xa0;Patron</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="66"/>
+        <location filename="../qml/main.qml" line="235"/>
         <source>Could not log in with those credentials, please retry</source>
         <translation>Impossible de se connecter avec ces identifiants, veuillez réessayer</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="68"/>
+        <location filename="../qml/main.qml" line="237"/>
         <source>Login Error</source>
         <translation>Erreur de connexion</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="72"/>
+        <location filename="../qml/main.qml" line="241"/>
         <source>Got an error starting %1: %2</source>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
-        <translation>Erreur de démarrage de %1 : %2</translation>
+        <translation>Erreur de démarrage de %1&#xa0;: %2</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="107"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 désactivé</translation>
+        <translation type="vanished">%1 désactivé</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="110"/>
         <source>%1 on</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 activé</translation>
+        <translation type="vanished">%1 activé</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="113"/>
         <source>Connecting to %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Connexion à %1</translation>
+        <translation type="vanished">Connexion à %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="116"/>
         <source>Stopping %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Arrêt de %1</translation>
+        <translation type="vanished">Arrêt de %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="119"/>
         <source>%1 blocking internet</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 bloque Internet</translation>
+        <translation type="vanished">%1 bloque Internet</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="171"/>
-        <location filename="../qml/main.qml" line="273"/>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
         <source>Checking status…</source>
         <translation>Vérification de l’état…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="280"/>
+        <location filename="../qml/main.qml" line="353"/>
         <source>Reconnect</source>
         <translation>Se reconnecter</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="282"/>
+        <location filename="../qml/main.qml" line="355"/>
         <source>Turn on</source>
         <translation>Activer</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="294"/>
+        <location filename="../qml/main.qml" line="367"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="296"/>
+        <location filename="../qml/main.qml" line="369"/>
         <source>Turn off</source>
         <translation>Désactiver</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="326"/>
+        <location filename="../qml/main.qml" line="401"/>
         <source>Help…</source>
         <translation>Aide…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="391"/>
         <source>Donate…</source>
         <translation>Faire un don…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="308"/>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
         <source>About…</source>
         <translation>À propos…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="335"/>
+        <location filename="../qml/main.qml" line="410"/>
         <source>Report a bug…</source>
         <translation>Signaler un bogue…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="347"/>
+        <location filename="../qml/main.qml" line="422"/>
         <source>Quit</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="377"/>
+        <location filename="../qml/main.qml" line="467"/>
         <source>Error starting VPN</source>
         <translation>Erreur de démarrage du RPV</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="387"/>
+        <location filename="../qml/main.qml" line="476"/>
         <source>Missing authentication agent</source>
         <translation>L’agent d’authentification manque</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="388"/>
+        <location filename="../qml/main.qml" line="477"/>
         <source>Could not find a polkit authentication agent. Please run one and try again.</source>
         <translation>Impossible de trouver un agent d’authentification polkit. Veuillez en exécuter un et réessayer.</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="76"/>
         <source>: a fast and secure VPN. Powered by Bitmask.</source>
-        <translation> : un RPV rapide et sécurisé. Propulsé par Bitmask.</translation>
+        <translation>&#xa0;: un RPV rapide et sécurisé. Propulsé par Bitmask.</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="83"/>
         <source>Do not show the systray icon (useful together with Gnome Shell extension, or to control VPN by other means).</source>
-        <translation>Ne pas afficher l’icône de la zone de notification (utile combiné à l’extension Gnome Shell ou pour contrôler le RPV par d’autres moyens).</translation>
+        <translation>Ne pas afficher l’icône de la zone de notification (utile combiné à l’extension Gnome&#xa0;Shell ou pour contrôler le RPV par d’autres moyens).</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="90"/>
@@ -257,7 +390,7 @@ Voulez-vous faire un don maintenant ?</translation>
     <message>
         <location filename="../main.cpp" line="96"/>
         <source>Install helpers (Linux only, requires sudo).</source>
-        <translation>Installer les aides (Linux seulement, « sudo » est requis). </translation>
+        <translation>Installer les aides (Linux seulement, «&#xa0;sudo&#xa0;» est requis). </translation>
     </message>
     <message>
         <location filename="../main.cpp" line="102"/>
@@ -272,7 +405,7 @@ Voulez-vous faire un don maintenant ?</translation>
     <message>
         <location filename="../main.cpp" line="113"/>
         <source>Web API port (default: 8080)</source>
-        <translation>Port de l’API Web (par défaut : 8080)</translation>
+        <translation>Port de l’API Web (par défaut&#xa0;: 8080)</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="115"/>
@@ -280,4 +413,4 @@ Voulez-vous faire un don maintenant ?</translation>
         <translation>Démarrer le RPV, soit Activer soit Désactiver</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/gui/i18n/main_lt.ts b/gui/i18n/main_lt.ts
index 39d5153f..6da83543 100644
--- a/gui/i18n/main_lt.ts
+++ b/gui/i18n/main_lt.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="lt">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -25,6 +27,24 @@
         <translation>%1 versija: %2</translation>
     </message>
 </context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="46"/>
+        <source>Select a bridge only if you know that you need it to evade censorship in your country or local network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="57"/>
+        <source>An obfs4 bridge will be used the next time you connect to the VPN.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DonateDialog</name>
     <message>
@@ -34,7 +54,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <source>The %1 service is expensive to run. Because we don't want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
+        <source>The %1 service is expensive to run. Because we don&apos;t want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -51,6 +71,14 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
         <translation>Inicijavimo klaida</translation>
     </message>
 </context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LoginDialog</name>
     <message>
@@ -99,143 +127,248 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
         <translation>Prisijungimas sÄ—kmingas. Dabar, galite paleisti VPN.</translation>
     </message>
 </context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VpnState</name>
+    <message>
+        <location filename="../qml/VpnState.qml" line="34"/>
+        <location filename="../qml/VpnState.qml" line="74"/>
+        <location filename="../qml/VpnState.qml" line="106"/>
+        <location filename="../qml/VpnState.qml" line="132"/>
+        <location filename="../qml/VpnState.qml" line="156"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="72"/>
+        <location filename="../qml/VpnState.qml" line="104"/>
+        <source>Recommended (%1)</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="85"/>
+        <source>Connected to %1</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="112"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>logic</name>
+    <message>
+        <location filename="../qml/logic.js" line="24"/>
+        <source>%1 off</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 išjungta</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 įjungta</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Jungiamasi prie %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">Stabdoma %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 blokuoja internetÄ…</translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../qml/main.qml" line="39"/>
+        <location filename="../qml/main.qml" line="208"/>
         <source>Could not find helpers. Please check your installation</source>
         <translation>Nepavyko rasti pagelbiklių. Patikrinkite savo diegimą</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="41"/>
+        <location filename="../qml/main.qml" line="210"/>
         <source>Could not find polkit agent.</source>
         <translation>Nepavyko rasti polkit agento.</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="57"/>
+        <location filename="../qml/main.qml" line="226"/>
         <source>Oops! The authentication service seems down. Please try again later</source>
         <translation>Oi! Atrodo, kad tapatybÄ—s nustatymo paslauga neveikia. VÄ—liau bandykite dar kartÄ…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="58"/>
+        <location filename="../qml/main.qml" line="227"/>
         <source>Service Error</source>
         <translation>Paslaugos klaida</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="64"/>
+        <location filename="../qml/main.qml" line="233"/>
         <source>Please check your Patron ID</source>
         <extracomment>Incorrect library card number</extracomment>
         <translation>Pasitikrinkite Patron ID</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="66"/>
+        <location filename="../qml/main.qml" line="235"/>
         <source>Could not log in with those credentials, please retry</source>
         <translation>Nepavyko prisijungti naudojant tuos prisijungimo duomenis, bandykite dar kartÄ…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="68"/>
+        <location filename="../qml/main.qml" line="237"/>
         <source>Login Error</source>
         <translation>Prisijungimo klaida</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="72"/>
+        <location filename="../qml/main.qml" line="241"/>
         <source>Got an error starting %1: %2</source>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>Paleidžiant %1, gauta klaida: %2</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="107"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 išjungta</translation>
+        <translation type="vanished">%1 išjungta</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="110"/>
         <source>%1 on</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 įjungta</translation>
+        <translation type="vanished">%1 įjungta</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="113"/>
         <source>Connecting to %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Jungiamasi prie %1</translation>
+        <translation type="vanished">Jungiamasi prie %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="116"/>
         <source>Stopping %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>Stabdoma %1</translation>
+        <translation type="vanished">Stabdoma %1</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="119"/>
         <source>%1 blocking internet</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 blokuoja internetÄ…</translation>
+        <translation type="vanished">%1 blokuoja internetÄ…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="171"/>
-        <location filename="../qml/main.qml" line="273"/>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
         <source>Checking status…</source>
         <translation>Tikrinama būsena…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="280"/>
+        <location filename="../qml/main.qml" line="353"/>
         <source>Reconnect</source>
         <translation>Prisijungti iš naujo</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="282"/>
+        <location filename="../qml/main.qml" line="355"/>
         <source>Turn on</source>
         <translation>Įjungti</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="294"/>
+        <location filename="../qml/main.qml" line="367"/>
         <source>Cancel</source>
         <translation>Atšaukti</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="296"/>
+        <location filename="../qml/main.qml" line="369"/>
         <source>Turn off</source>
         <translation>IÅ¡jungti</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="326"/>
+        <location filename="../qml/main.qml" line="401"/>
         <source>Help…</source>
         <translation>Pagalba…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="391"/>
         <source>Donate…</source>
         <translation>Paaukoti…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="308"/>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
         <source>About…</source>
         <translation>Apie…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="335"/>
+        <location filename="../qml/main.qml" line="410"/>
         <source>Report a bug…</source>
         <translation>Pranešti apie klaidą…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="347"/>
+        <location filename="../qml/main.qml" line="422"/>
         <source>Quit</source>
         <translation>IÅ¡eiti</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="377"/>
+        <location filename="../qml/main.qml" line="467"/>
         <source>Error starting VPN</source>
         <translation>Klaida paleidžiant VPN</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="387"/>
+        <location filename="../qml/main.qml" line="476"/>
         <source>Missing authentication agent</source>
         <translation>Trūksta tapatybės nustatymo agento</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="388"/>
+        <location filename="../qml/main.qml" line="477"/>
         <source>Could not find a polkit authentication agent. Please run one and try again.</source>
         <translation>Nepavyko rasti politikos rinkinio tapatybės nustatymo agento. Paleiskite jį ir bandykite dar kartą.</translation>
     </message>
@@ -280,4 +413,4 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
         <translation>Paleisti VPN, arba „on“, arba „off“.</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/gui/i18n/main_tr.ts b/gui/i18n/main_tr.ts
index f0a0647b..fc5892af 100644
--- a/gui/i18n/main_tr.ts
+++ b/gui/i18n/main_tr.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="tr">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -25,6 +27,24 @@
         <translation>%1 sürüm: %2</translation>
     </message>
 </context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="46"/>
+        <source>Select a bridge only if you know that you need it to evade censorship in your country or local network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="57"/>
+        <source>An obfs4 bridge will be used the next time you connect to the VPN.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DonateDialog</name>
     <message>
@@ -34,7 +54,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <source>The %1 service is expensive to run. Because we don't want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
+        <source>The %1 service is expensive to run. Because we don&apos;t want to store personal information about you, there are no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -51,6 +71,14 @@ Do you want to donate now?</source>
         <translation>Başlatma Hatası</translation>
     </message>
 </context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LoginDialog</name>
     <message>
@@ -99,143 +127,248 @@ Do you want to donate now?</source>
         <translation>Giriş başarılı. VPN&apos;i şimdi başlatabilirsiniz.</translation>
     </message>
 </context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VpnState</name>
+    <message>
+        <location filename="../qml/VpnState.qml" line="34"/>
+        <location filename="../qml/VpnState.qml" line="74"/>
+        <location filename="../qml/VpnState.qml" line="106"/>
+        <location filename="../qml/VpnState.qml" line="132"/>
+        <location filename="../qml/VpnState.qml" line="156"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="72"/>
+        <location filename="../qml/VpnState.qml" line="104"/>
+        <source>Recommended (%1)</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="85"/>
+        <source>Connected to %1</source>
+        <extracomment>%1 -&gt; location to which the client is connected to</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="112"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>logic</name>
+    <message>
+        <location filename="../qml/logic.js" line="24"/>
+        <source>%1 off</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 kapalı</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 açık</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 uygulamasına bağlanılıyor</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 durduruluyor</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation type="unfinished">%1 interneti engelliyor</translation>
+    </message>
+</context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../qml/main.qml" line="39"/>
+        <location filename="../qml/main.qml" line="208"/>
         <source>Could not find helpers. Please check your installation</source>
         <translation>Yardımcılar bulunamıyor, lütfen kurulumunuzu kontrol edin.</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="41"/>
+        <location filename="../qml/main.qml" line="210"/>
         <source>Could not find polkit agent.</source>
         <translation>polkit vekili bulunamıyor.</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="57"/>
+        <location filename="../qml/main.qml" line="226"/>
         <source>Oops! The authentication service seems down. Please try again later</source>
         <translation>Eyvah! Kimlik doğrulama hizmeti çalışmıyor gözüküyor. Lütfen daha sonra tekrar deneyin</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="58"/>
+        <location filename="../qml/main.qml" line="227"/>
         <source>Service Error</source>
         <translation>Hizmet Hatası</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="64"/>
+        <location filename="../qml/main.qml" line="233"/>
         <source>Please check your Patron ID</source>
         <extracomment>Incorrect library card number</extracomment>
         <translation>Lütfen Patron kimliğinizi kontrol edin</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="66"/>
+        <location filename="../qml/main.qml" line="235"/>
         <source>Could not log in with those credentials, please retry</source>
         <translation>Bu kimlik bilgileriyle giriş yapılamıyor, lütfen tekrar deneyin</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="68"/>
+        <location filename="../qml/main.qml" line="237"/>
         <source>Login Error</source>
         <translation>Giriş Hatası</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="72"/>
+        <location filename="../qml/main.qml" line="241"/>
         <source>Got an error starting %1: %2</source>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>%1 başlatılırken bir hata oluştu: %2</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="107"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 kapalı</translation>
+        <translation type="vanished">%1 kapalı</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="110"/>
         <source>%1 on</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 açık</translation>
+        <translation type="vanished">%1 açık</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="113"/>
         <source>Connecting to %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 uygulamasına bağlanılıyor</translation>
+        <translation type="vanished">%1 uygulamasına bağlanılıyor</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="116"/>
         <source>Stopping %1</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 durduruluyor</translation>
+        <translation type="vanished">%1 durduruluyor</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="119"/>
         <source>%1 blocking internet</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation>%1 interneti engelliyor</translation>
+        <translation type="vanished">%1 interneti engelliyor</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="171"/>
-        <location filename="../qml/main.qml" line="273"/>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
         <source>Checking status…</source>
         <translation>Durum denetleniyor…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="280"/>
+        <location filename="../qml/main.qml" line="353"/>
         <source>Reconnect</source>
         <translation>Yeniden baÄŸlan</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="282"/>
+        <location filename="../qml/main.qml" line="355"/>
         <source>Turn on</source>
         <translation>Aç</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="294"/>
+        <location filename="../qml/main.qml" line="367"/>
         <source>Cancel</source>
         <translation>Ä°ptal</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="296"/>
+        <location filename="../qml/main.qml" line="369"/>
         <source>Turn off</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="326"/>
+        <location filename="../qml/main.qml" line="401"/>
         <source>Help…</source>
         <translation>Yardım…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="316"/>
+        <location filename="../qml/main.qml" line="391"/>
         <source>Donate…</source>
         <translation>Bağış yapın…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="308"/>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <source>Recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Best</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
         <source>About…</source>
         <translation>Hakkında…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="335"/>
+        <location filename="../qml/main.qml" line="410"/>
         <source>Report a bug…</source>
         <translation>Hata bildir…</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="347"/>
+        <location filename="../qml/main.qml" line="422"/>
         <source>Quit</source>
         <translation>Çıkış</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="377"/>
+        <location filename="../qml/main.qml" line="467"/>
         <source>Error starting VPN</source>
         <translation>VPN başlatma hatası</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="387"/>
+        <location filename="../qml/main.qml" line="476"/>
         <source>Missing authentication agent</source>
         <translation>Kimlik doğrulama vekili bulunamıyor</translation>
     </message>
     <message>
-        <location filename="../qml/main.qml" line="388"/>
+        <location filename="../qml/main.qml" line="477"/>
         <source>Could not find a polkit authentication agent. Please run one and try again.</source>
         <translation>Bir polkit kimlik doğrulama vekili bulunamıyor. Bir tane çalıştırın ve tekrar deneyin.</translation>
     </message>
@@ -280,4 +413,4 @@ Do you want to donate now?</source>
         <translation>VPN&apos;i başlat, &apos;açık&apos; veya &apos;kapalı&apos;.</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
-- 
GitLab