diff --git a/CHANGELOG b/CHANGELOG
index dcf0f5c4d0d3c2332e26255aa7bae163e09c2f47..cbaf8224c8f562fd2737f97dddf73ef3717b8e73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 0.21.6
 ======
 
-- A new and shiny gateway selector!
-- Allow to select obfs4 gateways (bridges)
-- Ability to define explicit allowed addresses for local networks.
-
+- First iteration of the gateway selector.
+- Allow to select obfs4 gateways (bridges) to bypass censorship.
+- Ability to define explicitly allowed addresses for local networks.
+- Update translations. New locales: greek, farsi, hungarian, dutch, polish and uyghur.
diff --git a/gui/i18n/main_el.ts b/gui/i18n/main_el.ts
new file mode 100644
index 0000000000000000000000000000000000000000..64ad76f6415d82ae6edaebc1d3e472f94e9424d9
--- /dev/null
+++ b/gui/i18n/main_el.ts
@@ -0,0 +1,388 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="5"/>
+        <source>About</source>
+        <translation>Σχετικά</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="18"/>
+        <source>&lt;p&gt;This service is paid for entirely by donations from users like you. &lt;a href=&quot;%1&quot;&gt;Please donate&lt;/a&gt;.&lt;/p&gt;</source>
+        <extracomment>donation text of the about dialog</extracomment>
+        <translation>&lt;p&gt;Αυτή η υπηρεσία πληρώνεται εξ&apos; ολοκλήρου από τις δωρεές που κάνουν χρήστες σαν κι εσένα.. &lt;a href=&quot;%1&quot;&gt;Παρακαλούμε κάνε μια δωρεά&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="26"/>
+        <source>&lt;p&gt;%1 is an easy, fast, and secure VPN service from %2. %1 does not require a user account, keep logs, or track you in any way.&lt;/p&gt; %3 &lt;p&gt;By using this application, you agree to the &lt;a href=&quot;%4&quot;&gt;Terms of Service&lt;/a&gt;. This service is provided as-is, without any warranty, and is intended for people who work to make the world a better place.&lt;/p&gt;</source>
+        <extracomment>about dialog %1 -&gt; application name %2 -&gt; provider name %3 -&gt; donation text if activated</extracomment>
+        <translation>&lt;p&gt;Το %1 είναι μια εύκολη, γρήγορη και ασφαλής υπηρεσία VPN που προσφέρεται από το %2. Το %1 δεν χρειάζετεαι λογαριασμούς χρηστών, δεν κρατά αρχείο καταγραφής ούτε σε παρακολουθεί με οποιονδήποτε τρόπο.&lt;/p&gt; %3 &lt;p&gt;Με τη χρήση αυτής της εφαρμογής, συμφονείς με τους &lt;a href=&quot;%4&quot;&gt;Όρους Χρήσης&lt;/a&gt;. Αυτή η υπηρεσία παρέχεται ως έχει, χωρίς καμία εγγύηση, και προορίζεται για άτομα που προσπαθούν να κάνουν τον κόσμο καλύτερο.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="37"/>
+        <source>%1 version: %2</source>
+        <extracomment>%1 -&gt; application name %2 -&gt; version string</extracomment>
+        <translation>%1 έκδοση: %2</translation>
+    </message>
+</context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation>Χρήση γεφυρών obfs4</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>Επέλεξε μια γέφυρα μόνο αν ξέρεις πως τη χρειάζεσαι για να παρακάμψεις λογοκρισία στη χώρα σου ή στο τοπικό δίκτυο.</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>Την επόμενη φορά που θα συνδεθείς στο VPN θα χρησιμοποιηθεί μια γέφυρα obfs4.</translation>
+    </message>
+</context>
+<context>
+    <name>DonateDialog</name>
+    <message>
+        <location filename="../qml/DonateDialog.qml" line="6"/>
+        <source>Donate</source>
+        <translation>Δωρεά</translation>
+    </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.
+
+Do you want to donate now?</source>
+        <extracomment>donate dialog %1 -&gt; application name</extracomment>
+        <translation>Η υπηρεσία %1 έχει μεγάλο κόστος λειτουργίας. Επειδή δεν θέλουμε να αποθηκεύουμε προσωπικά δεδομένα σου, δεν υπάρχουν λογαριασμοί ούτε χρεώσεις για την υπηρεσία. Αλλά αν θέλεις να συνεχίσει να υπάρχει η υπηρεσία, παρακαλούμε να κάνεις μια μηνιαία δωρεά τουλάχιστον $5.
+
+Θέλεις να κάνεις μια δωρεά τώρα;</translation>
+    </message>
+</context>
+<context>
+    <name>FailDialog</name>
+    <message>
+        <location filename="../qml/FailDialog.qml" line="5"/>
+        <source>Initialization Error</source>
+        <translation>Σφάλμα αρχικοποίησης</translation>
+    </message>
+</context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation>Η τοποθεσία ορίστηκε χειροκίνητα.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="6"/>
+        <source>Login</source>
+        <translation>Συνδεση</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="21"/>
+        <source>Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Patron ID</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="25"/>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="37"/>
+        <source>Enter your Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Γράψε το Patron ID σου</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="39"/>
+        <source>Log in with your library credentials</source>
+        <translation>Σύνδεση με τα στοιχεία σύνδεσης της βιβλιοθήκης σου</translation>
+    </message>
+    <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>Μπορείς να δεις το Patron ID σου στο πίσω μέρος της κάρτας βιβλιοθήκης σου.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginOKDialog</name>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="7"/>
+        <source>Login Successful</source>
+        <translation>Επιτυχής σύνδεση</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="11"/>
+        <source>Login successful. You can now start the VPN.</source>
+        <translation>Επιτυχής σύνδεση. Μπορείς τώρα να ενεργοποιήσεις το VPN.</translation>
+    </message>
+</context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation>Κατάσταση</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation>Γέφυρες</translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source/>
+        <translation type="unfinished"/>
+    </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="107"/>
+        <location filename="../qml/VpnState.qml" line="134"/>
+        <location filename="../qml/VpnState.qml" line="159"/>
+        <source>Recommended</source>
+        <extracomment>Clickable item to switch to the recommended location
+----------
+Clickable item to swicth to the recommended location</extracomment>
+        <translation>Προτεινόμενη</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>Προτεινόμενη (%1)</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>Συνδέθηκε σε %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
+        <translation>Συνδέεται...</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>%1 ανενεργό</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 ενεργό</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>Συνδέεται στο %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>Σταμάτημα του %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 μπλοκάρει το διαδίκτυο</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>Δεν μπόρεσαν να βρεθούν βοηθοί. Παρακαλώ έλεγξε την εγκατάστασή σου</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="210"/>
+        <source>Could not find polkit agent.</source>
+        <translation>Δεν μπόρεσε να βρεθεί polkit agent.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="226"/>
+        <source>Oops! The authentication service seems down. Please try again later</source>
+        <translation>Ωχ! Η υπηρεσία αυθεντικοποίησης φαίνεται πως έχει πέσει. Παρακαλούμε προσπάθησε ξανά αργότερα.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="227"/>
+        <source>Service Error</source>
+        <translation>Σφάλμα υπηρεσίας</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="233"/>
+        <source>Please check your Patron ID</source>
+        <extracomment>Incorrect library card number</extracomment>
+        <translation>Παρακαλούμε έλεγξε το Patron ID σου</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="235"/>
+        <source>Could not log in with those credentials, please retry</source>
+        <translation>Δεν μπόρεσες να συνδεθείς με αυτά τα στοιχεία, παρακαλούμε ξαναδοκίμασε</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="237"/>
+        <source>Login Error</source>
+        <translation>Σφάλμα σύνδεσης</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>Σφάλμα κατά την εκκίνηση του %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
+        <source>Checking status…</source>
+        <translation>Έλεγχος κατάστασης...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="353"/>
+        <source>Reconnect</source>
+        <translation>Επανασύνδεση</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="355"/>
+        <source>Turn on</source>
+        <translation>Ενεργοποίηση</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="367"/>
+        <source>Cancel</source>
+        <translation>Ακύρωση</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="369"/>
+        <source>Turn off</source>
+        <translation>Απενεργοποίηση</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="401"/>
+        <source>Help…</source>
+        <translation>Βοήθεια...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="391"/>
+        <source>Donate…</source>
+        <translation>Δωρεά...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Recommended</source>
+        <translation>Προτεινόμενη</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation>Χειροκίνητα</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation>Επιλογή τοποθεσίας...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
+        <source>About…</source>
+        <translation>Σχετικά...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="410"/>
+        <source>Report a bug…</source>
+        <translation>Αναφορά σφάλματος...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="422"/>
+        <source>Quit</source>
+        <translation>Έξοδος</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="467"/>
+        <source>Error starting VPN</source>
+        <translation>Σφάλμα κατά την εκκίνηση του VPN</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="476"/>
+        <source>Missing authentication agent</source>
+        <translation>Απουσία του agent αυθεντικοποίησης</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="477"/>
+        <source>Could not find a polkit authentication agent. Please run one and try again.</source>
+        <translation>Δεν μπόρεσε να βρεθεί ο agent αυθεντικοποίησης του polkit. Παρακαλούμε εκτέλεσε έναν και προσπάθησε ξανά.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="76"/>
+        <source>: a fast and secure VPN. Powered by Bitmask.</source>
+        <translation>: ένα γρήγορο και ασφαλές VPN. Με την υποστήριξη του 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>Να μην εμφανίζεται το εικονίδιο στη μπάρα κατάστασης (χρήσιμο σε συνδυασμό με την επέκταση Gnome Shell ή για τον έλεγχο του VPN με άλλα μέσα).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="90"/>
+        <source>Enable Web API.</source>
+        <translation>Ενεργοποίηση Web API.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="96"/>
+        <source>Install helpers (Linux only, requires sudo).</source>
+        <translation>Εγκατάσταση βοηθών (μόνο για Linux, απαιτείται sudo). </translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="102"/>
+        <source>Use obfs4 to obfuscate the traffic, if available in the provider.</source>
+        <translation>Χρήση obfs4 για την απόκρυψη και συσκότιση της κίνησης, αν είναι διαθέσιμο από τον πάροχο.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="108"/>
+        <source>Disable autostart for the next run.</source>
+        <translation>Απενεργοποίηση αυτόματης εκκίνησης στην επόμενη εκτέλεση.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="113"/>
+        <source>Web API port (default: 8080)</source>
+        <translation>Θύρα Web API (προκαθορισμένη: 8080)</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="115"/>
+        <source>Start the VPN, either &apos;on&apos; or &apos;off&apos;.</source>
+        <translation>Εκκίνηση του VPN, είτε &quot;ενεργό&quot; είτε &quot;ανενεργό&quot;.</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_es.ts b/gui/i18n/main_es.ts
index e1a4025b76fdcfcbaea07c7cf9c20c61ad6c562c..f86379a2695668f25a4a39a7f0e07d5e7f7d4c1e 100644
--- a/gui/i18n/main_es.ts
+++ b/gui/i18n/main_es.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="es">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -32,17 +30,17 @@
     <message>
         <location filename="../qml/BridgesItem.qml" line="24"/>
         <source>Use obfs4 bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar puentes obfs4</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>
+        <translation>Selecciona un puente solamente si sabes que lo necesitas para evadir la censura en tu país o red local.</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>
+        <translation>Un puente obfs4 será usado la próxima vez que conectes a la VPN.</translation>
     </message>
 </context>
 <context>
@@ -54,7 +52,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <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.
+        <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.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -76,7 +74,7 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/LocationText.qml" line="6"/>
         <source>Location has been manually set.</source>
-        <translation type="unfinished"></translation>
+        <translation>La ubicación ha sido establecida manualmente.</translation>
     </message>
 </context>
 <context>
@@ -132,25 +130,25 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/MainBar.qml" line="7"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="10"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Lugar</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="13"/>
         <source>Bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Puentes</translation>
     </message>
 </context>
 <context>
     <name>VPNSwitch</name>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
-        <source></source>
-        <translation></translation>
+        <source/>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -165,25 +163,25 @@ Do you want to donate now?</source>
         <extracomment>Clickable item to switch to the recommended location
 ----------
 Clickable item to swicth to the recommended location</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Recomendado</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>
+        <translation>Recomendado (%1)</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>
+        <translation>Conectado a %1</translation>
     </message>
     <message>
         <location filename="../qml/VpnState.qml" line="113"/>
         <source>Connecting…</source>
-        <translation type="unfinished"></translation>
+        <translation>Conectando...</translation>
     </message>
 </context>
 <context>
@@ -192,31 +190,31 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/logic.js" line="24"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="unfinished">%1 desconectada</translation>
+        <translation>%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>
+        <translation>%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>
+        <translation>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>
+        <translation>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>
+        <translation>$1 bloqueando Internet</translation>
     </message>
 </context>
 <context>
@@ -263,31 +261,6 @@ Clickable item to swicth to the recommended location</extracomment>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>Se produjo un error iniciando %1: %2</translation>
     </message>
-    <message>
-        <source>%1 off</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 desconectada</translation>
-    </message>
-    <message>
-        <source>%1 on</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 conectada</translation>
-    </message>
-    <message>
-        <source>Connecting to %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Conectando a %1</translation>
-    </message>
-    <message>
-        <source>Stopping %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Deteniendo %1</translation>
-    </message>
-    <message>
-        <source>%1 blocking internet</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">$1 bloqueando Internet</translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="315"/>
         <location filename="../qml/main.qml" line="429"/>
@@ -329,17 +302,17 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/main.qml" line="138"/>
         <location filename="../qml/main.qml" line="323"/>
         <source>Recommended</source>
-        <translation type="unfinished"></translation>
+        <translation>Recomendado</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="129"/>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Manual</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
-        <translation type="unfinished"></translation>
+        <translation>Elegir ubicación...</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="381"/>
@@ -412,4 +385,4 @@ Clickable item to swicth to the recommended location</extracomment>
         <translation>Iniciar la VPN, &apos;conectada&apos; o bien, &apos;desconectada&apos;.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_es_ES.ts b/gui/i18n/main_es_ES.ts
index 503aa99a65ea53b0a8a2e2adb38048db22dd2a20..8a2ca3ced3e6d1ee24aeeb145e4d746a434f7e8d 100644
--- a/gui/i18n/main_es_ES.ts
+++ b/gui/i18n/main_es_ES.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="es_ES">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_ES" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -32,17 +30,17 @@
     <message>
         <location filename="../qml/BridgesItem.qml" line="24"/>
         <source>Use obfs4 bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar puentes obfs4</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>
+        <translation>Selecciona un puente solamente si sabes que lo necesitas para evadir la censura en tu país o red local.</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>
+        <translation>Un puente obfs4 será usado la próxima vez que conectes a la VPN.</translation>
     </message>
 </context>
 <context>
@@ -54,7 +52,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <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.
+        <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.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -76,7 +74,7 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/LocationText.qml" line="6"/>
         <source>Location has been manually set.</source>
-        <translation type="unfinished"></translation>
+        <translation>La ubicación ha sido establecida manualmente.</translation>
     </message>
 </context>
 <context>
@@ -132,25 +130,25 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/MainBar.qml" line="7"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="10"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Ubicación</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="13"/>
         <source>Bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Puentes</translation>
     </message>
 </context>
 <context>
     <name>VPNSwitch</name>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
-        <source></source>
-        <translation></translation>
+        <source/>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -165,25 +163,25 @@ Do you want to donate now?</source>
         <extracomment>Clickable item to switch to the recommended location
 ----------
 Clickable item to swicth to the recommended location</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Recomendado</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>
+        <translation>Recomendado (%1)</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>
+        <translation>Conectado a %1</translation>
     </message>
     <message>
         <location filename="../qml/VpnState.qml" line="113"/>
         <source>Connecting…</source>
-        <translation type="unfinished"></translation>
+        <translation>Conectando...</translation>
     </message>
 </context>
 <context>
@@ -192,31 +190,31 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/logic.js" line="24"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="unfinished">%1 desconectada</translation>
+        <translation>%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>
+        <translation>%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>
+        <translation>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>
+        <translation>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>
+        <translation>$1 bloqueando Internet</translation>
     </message>
 </context>
 <context>
@@ -263,31 +261,6 @@ Clickable item to swicth to the recommended location</extracomment>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>Se produjo un error iniciando %1: %2</translation>
     </message>
-    <message>
-        <source>%1 off</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 desconectada</translation>
-    </message>
-    <message>
-        <source>%1 on</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 conectada</translation>
-    </message>
-    <message>
-        <source>Connecting to %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Conectando a %1</translation>
-    </message>
-    <message>
-        <source>Stopping %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Deteniendo %1</translation>
-    </message>
-    <message>
-        <source>%1 blocking internet</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">$1 bloqueando Internet</translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="315"/>
         <location filename="../qml/main.qml" line="429"/>
@@ -329,17 +302,17 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/main.qml" line="138"/>
         <location filename="../qml/main.qml" line="323"/>
         <source>Recommended</source>
-        <translation type="unfinished"></translation>
+        <translation>Recomendado</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="129"/>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Manual</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
-        <translation type="unfinished"></translation>
+        <translation>Elegir ubicación...</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="381"/>
@@ -412,4 +385,4 @@ Clickable item to swicth to the recommended location</extracomment>
         <translation>Iniciar la VPN, &apos;conectada&apos; o bien, &apos;desconectada&apos;.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_et.ts b/gui/i18n/main_et.ts
index b9194062d48cf418f89bef835ad777e1195947ec..ee0f609664a97da34027ee4b7cf119fe28892532 100644
--- a/gui/i18n/main_et.ts
+++ b/gui/i18n/main_et.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="et">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -32,17 +30,17 @@
     <message>
         <location filename="../qml/BridgesItem.qml" line="24"/>
         <source>Use obfs4 bridges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -54,7 +52,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <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.
+        <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.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -76,7 +74,7 @@ Kas soovid kohe annetada?</translation>
     <message>
         <location filename="../qml/LocationText.qml" line="6"/>
         <source>Location has been manually set.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -90,7 +88,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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/LoginDialog.qml" line="25"/>
@@ -132,25 +130,25 @@ Kas soovid kohe annetada?</translation>
     <message>
         <location filename="../qml/MainBar.qml" line="7"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Staatus</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="10"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="13"/>
         <source>Bridges</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VPNSwitch</name>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
-        <source></source>
-        <translation></translation>
+        <source/>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -165,25 +163,25 @@ Kas soovid kohe annetada?</translation>
         <extracomment>Clickable item to switch to the recommended location
 ----------
 Clickable item to swicth to the recommended location</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/VpnState.qml" line="113"/>
         <source>Connecting…</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -192,31 +190,31 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/logic.js" line="24"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="unfinished">%1 väljas</translation>
+        <translation>%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>
+        <translation>%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>
+        <translation>Ãœ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>
+        <translation>%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>
+        <translation>%1 - internet blokeeritud</translation>
     </message>
 </context>
 <context>
@@ -224,7 +222,7 @@ Clickable item to swicth to the recommended location</extracomment>
     <message>
         <location filename="../qml/main.qml" line="208"/>
         <source>Could not find helpers. Please check your installation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="210"/>
@@ -263,36 +261,11 @@ Clickable item to swicth to the recommended location</extracomment>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>Rakendust %1 käivitades anti veateade: %2</translation>
     </message>
-    <message>
-        <source>%1 off</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 väljas</translation>
-    </message>
-    <message>
-        <source>%1 on</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 sees</translation>
-    </message>
-    <message>
-        <source>Connecting to %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Ãœhendumine rakendusega %1</translation>
-    </message>
-    <message>
-        <source>Stopping %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 peatamine</translation>
-    </message>
-    <message>
-        <source>%1 blocking internet</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 - internet blokeeritud</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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="353"/>
@@ -317,39 +290,39 @@ Clickable item to swicth to the recommended location</extracomment>
     <message>
         <location filename="../qml/main.qml" line="401"/>
         <source>Help…</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="391"/>
         <source>Donate…</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="120"/>
         <location filename="../qml/main.qml" line="138"/>
         <location filename="../qml/main.qml" line="323"/>
         <source>Recommended</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="129"/>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="381"/>
         <source>About…</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="410"/>
         <source>Report a bug…</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qml/main.qml" line="422"/>
@@ -379,17 +352,17 @@ Clickable item to swicth to the recommended location</extracomment>
     <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>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../main.cpp" line="90"/>
         <source>Enable Web API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../main.cpp" line="96"/>
         <source>Install helpers (Linux only, requires sudo).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../main.cpp" line="102"/>
@@ -404,12 +377,12 @@ Clickable item to swicth to the recommended location</extracomment>
     <message>
         <location filename="../main.cpp" line="113"/>
         <source>Web API port (default: 8080)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </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>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_fa_IR.ts b/gui/i18n/main_fa_IR.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ca17d5c76d120cfd49759a06946e79cb225d1308
--- /dev/null
+++ b/gui/i18n/main_fa_IR.ts
@@ -0,0 +1,388 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa_IR" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="5"/>
+        <source>About</source>
+        <translation>‫‫درباره‬</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="18"/>
+        <source>&lt;p&gt;This service is paid for entirely by donations from users like you. &lt;a href=&quot;%1&quot;&gt;Please donate&lt;/a&gt;.&lt;/p&gt;</source>
+        <extracomment>donation text of the about dialog</extracomment>
+        <translation>&lt;p&gt;هزینه این سرویس از طریق کمک مالی کاربرانی مثل شما پرداخت می‌شود. &lt;a href=&quot;%1&quot;&gt;لطفاً کمک مالی کنید&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="26"/>
+        <source>&lt;p&gt;%1 is an easy, fast, and secure VPN service from %2. %1 does not require a user account, keep logs, or track you in any way.&lt;/p&gt; %3 &lt;p&gt;By using this application, you agree to the &lt;a href=&quot;%4&quot;&gt;Terms of Service&lt;/a&gt;. This service is provided as-is, without any warranty, and is intended for people who work to make the world a better place.&lt;/p&gt;</source>
+        <extracomment>about dialog %1 -&gt; application name %2 -&gt; provider name %3 -&gt; donation text if activated</extracomment>
+        <translation>&lt;p&gt;%1 یک VPN آسان، سریع و امن از %2 است. %1 نیازی به حساب کاربری ندارد، لاگ نگه نمی‌دارد و شما را به هیچ شکلی شنود نمی‌کند.&lt;/p&gt; %3 &lt;p&gt;با استفاده از این اپلیکیشن، شما با &lt;a href=&quot;%4&quot;&gt;شرایط خدمات این سرویس &lt;/a&gt; موافقت می‌کنید. این سرویس به همین شکلی هست و بدون هیچگونه گارانتی ارائه می‌شود, و برای استفاده افرادی است که برای اینکه دنیا محل بهتری باشد کار می‌کنند.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="37"/>
+        <source>%1 version: %2</source>
+        <extracomment>%1 -&gt; application name %2 -&gt; version string</extracomment>
+        <translation>%1 نسخه: %2</translation>
+    </message>
+</context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation>از پل‌های obfs4 استفاده شود</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>فقط وقتی که نیاز به عبور از سانسور در کشور یا شبکه ملی خود دارید از یک پل استفاده کنید.سانسور</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>دفعه بعد که بخواهید به VPN وصل شوید از یک پل obfs4 استفاده خواهد شد.</translation>
+    </message>
+</context>
+<context>
+    <name>DonateDialog</name>
+    <message>
+        <location filename="../qml/DonateDialog.qml" line="6"/>
+        <source>Donate</source>
+        <translation>حمایت از ما</translation>
+    </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.
+
+Do you want to donate now?</source>
+        <extracomment>donate dialog %1 -&gt; application name</extracomment>
+        <translation>سرویس %1 برای اجرا گران است. به این دلیل که ما نمی‌خواهیم اطلاعات شخصی شما را ذخیره کنیم، حساب کاربری یا صورت حساب برای این سرویس وجود ندارد. ولی اگر مایل هستید که این سرویس ادامه داشته باشد، حداقل ماهی ۵ دلار به ما کمک کنید.
+
+مایل هستید که الان کمک کنید؟</translation>
+    </message>
+</context>
+<context>
+    <name>FailDialog</name>
+    <message>
+        <location filename="../qml/FailDialog.qml" line="5"/>
+        <source>Initialization Error</source>
+        <translation>خطا در راه راه اندازی</translation>
+    </message>
+</context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation>موقعیت مکانی به صورت دستی تنظیم شد.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="6"/>
+        <source>Login</source>
+        <translation>ورود</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="21"/>
+        <source>Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Patron ID</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="25"/>
+        <source>Password</source>
+        <translation>رمز عبور</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="37"/>
+        <source>Enter your Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Patron ID خود را وارد کنید</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="39"/>
+        <source>Log in with your library credentials</source>
+        <translation>ورود با اعتبارات کتابخانه‌ای شما</translation>
+    </message>
+    <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>شما می‌توانید شماره Patron ID خود را در پشت کارت کتابخانه خود پیدا کنید.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginOKDialog</name>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="7"/>
+        <source>Login Successful</source>
+        <translation>لاگین با موفقیت انجام شد</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="11"/>
+        <source>Login successful. You can now start the VPN.</source>
+        <translation>لاگین با موفقیت انجام شد. شما الان می‌توانید از VPN استفاده کنید.</translation>
+    </message>
+</context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation>وضعیت</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation>مکان</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation>پل‌ها</translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source/>
+        <translation type="unfinished"/>
+    </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="107"/>
+        <location filename="../qml/VpnState.qml" line="134"/>
+        <location filename="../qml/VpnState.qml" line="159"/>
+        <source>Recommended</source>
+        <extracomment>Clickable item to switch to the recommended location
+----------
+Clickable item to swicth to the recommended location</extracomment>
+        <translation>توصیه می‌شود</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>توصیه می‌شود (%1)</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>اتصال به %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
+        <translation>در حال اتصال...</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>%1 خاموش</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 روشن</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>در حال اتصال به %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>متوقف کردن %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 اینترنت را متوقف کرده</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>ابزار کمکی پیدا نشدند. لطفاً برنامه نصب شده را چک کنید.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="210"/>
+        <source>Could not find polkit agent.</source>
+        <translation>رابط polkit پیدا نشد.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="226"/>
+        <source>Oops! The authentication service seems down. Please try again later</source>
+        <translation>خطا! به نظر می‌رسد که سرویس احراز حویت از کار افتاده است. لطفاً بعداً مجدداً تلاش کنید.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="227"/>
+        <source>Service Error</source>
+        <translation>خطای سرویس</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="233"/>
+        <source>Please check your Patron ID</source>
+        <extracomment>Incorrect library card number</extracomment>
+        <translation>لطفاً Patron ID خود را چک کنید</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="235"/>
+        <source>Could not log in with those credentials, please retry</source>
+        <translation>ورود با این مدارک ممکن نشد. لطفاً دوباره سعی کنید</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="237"/>
+        <source>Login Error</source>
+        <translation>خطای لاگین</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>خطا در اجرای %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
+        <source>Checking status…</source>
+        <translation>در حال بررسی وضعیت...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="353"/>
+        <source>Reconnect</source>
+        <translation>اتصال مجدد</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="355"/>
+        <source>Turn on</source>
+        <translation>روشن کردن</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="367"/>
+        <source>Cancel</source>
+        <translation>انصراف</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="369"/>
+        <source>Turn off</source>
+        <translation>خاموش کردن</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="401"/>
+        <source>Help…</source>
+        <translation>Ú©Ù…Ú©...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="391"/>
+        <source>Donate…</source>
+        <translation>کمک مالی...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Recommended</source>
+        <translation>توصیه می‌شود</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation>دستی</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation>مکان را انتخاب کنید...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
+        <source>About…</source>
+        <translation>درباره...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="410"/>
+        <source>Report a bug…</source>
+        <translation>گزارش باگ...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="422"/>
+        <source>Quit</source>
+        <translation>خروج</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="467"/>
+        <source>Error starting VPN</source>
+        <translation>خطا در راه اندازی VPN</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="476"/>
+        <source>Missing authentication agent</source>
+        <translation>عامل تأیید هویت پیدا نشد</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="477"/>
+        <source>Could not find a polkit authentication agent. Please run one and try again.</source>
+        <translation>عامل تأیید هویت polkit در دسترس نیست. لطفاً یکی را اجرا کنید و مجدد امتحان کنید.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="76"/>
+        <source>: a fast and secure VPN. Powered by Bitmask.</source>
+        <translation>: یک VPN سریع و امن. قدرت گرفت از 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>آیکون را در نوارسیستم نشان نده (مناسب برای استفاده با افزونه پوسته گنوم، یا کنترل VPN با روش‌های دیگر).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="90"/>
+        <source>Enable Web API.</source>
+        <translation>فعال کردن API وب.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="96"/>
+        <source>Install helpers (Linux only, requires sudo).</source>
+        <translation>نصب ابزار کمکی (فقط در لینوکس، نیاز به sudo دارد).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="102"/>
+        <source>Use obfs4 to obfuscate the traffic, if available in the provider.</source>
+        <translation>برای مخفی سازی ترافیک از obfs4 استفاده کند، اگر توسط ارائه کننده فراهم شده باشد.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="108"/>
+        <source>Disable autostart for the next run.</source>
+        <translation>شروع اتوماتیک را در اجرای بعد غیر فعال کن.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="113"/>
+        <source>Web API port (default: 8080)</source>
+        <translation>پورت API وب (پیشفرض: 8080)</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="115"/>
+        <source>Start the VPN, either &apos;on&apos; or &apos;off&apos;.</source>
+        <translation>شروع VPN، یا &apos;روشن&apos; یا &apos;خاموش&apos;.</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_fr.ts b/gui/i18n/main_fr.ts
index 7ce07fabd3e3fcf6606ebd22641c9d72ca7a1d88..74b9955d9ad99ee2b692942364537dda525d23c9 100644
--- a/gui/i18n/main_fr.ts
+++ b/gui/i18n/main_fr.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="fr">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -24,7 +22,7 @@
         <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&#xa0;: %2</translation>
+        <translation>%1 version : %2</translation>
     </message>
 </context>
 <context>
@@ -32,17 +30,17 @@
     <message>
         <location filename="../qml/BridgesItem.qml" line="24"/>
         <source>Use obfs4 bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser des ponts obfs4</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>
+        <translation>Ne sélectionnez un pont que si vous savez que vous en avez besoin pour échapper à la censure dans votre pays ou sur votre réseau local.</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>
+        <translation>Un pont obfs4 sera utilisé la prochaine fois que vous vous connecterez au RPV.</translation>
     </message>
 </context>
 <context>
@@ -54,13 +52,13 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <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.
+        <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.
 
 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&#xa0;$ 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 $ mensuellement.
 
-Voulez-vous faire un don maintenant&#x2009;?</translation>
+Voulez-vous faire un don maintenant ?</translation>
     </message>
 </context>
 <context>
@@ -76,7 +74,7 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
     <message>
         <location filename="../qml/LocationText.qml" line="6"/>
         <source>Location has been manually set.</source>
-        <translation type="unfinished"></translation>
+        <translation>L’emplacement a été défini manuellement.</translation>
     </message>
 </context>
 <context>
@@ -90,7 +88,7 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
         <location filename="../qml/LoginDialog.qml" line="21"/>
         <source>Patron ID</source>
         <extracomment>Ask for the library card number</extracomment>
-        <translation>ID&#xa0;Patron</translation>
+        <translation>ID Patron</translation>
     </message>
     <message>
         <location filename="../qml/LoginDialog.qml" line="25"/>
@@ -101,7 +99,7 @@ Voulez-vous faire un don maintenant&#x2009;?</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&#xa0;Patron</translation>
+        <translation>Saisissez votre ID Patron</translation>
     </message>
     <message>
         <location filename="../qml/LoginDialog.qml" line="39"/>
@@ -111,7 +109,7 @@ Voulez-vous faire un don maintenant&#x2009;?</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&#xa0;Patron au verso de votre carte de papeterie</translation>
+        <translation>Vous pouvez vérifier votre numéro d’ID Patron au verso de votre carte de papeterie</translation>
     </message>
 </context>
 <context>
@@ -132,25 +130,25 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
     <message>
         <location filename="../qml/MainBar.qml" line="7"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>État</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="10"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Emplacement</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="13"/>
         <source>Bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Ponts</translation>
     </message>
 </context>
 <context>
     <name>VPNSwitch</name>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
-        <source></source>
-        <translation></translation>
+        <source/>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -165,25 +163,25 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
         <extracomment>Clickable item to switch to the recommended location
 ----------
 Clickable item to swicth to the recommended location</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Recommandé</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>
+        <translation>Recommandé (%1)</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>
+        <translation>Connecté à %1</translation>
     </message>
     <message>
         <location filename="../qml/VpnState.qml" line="113"/>
         <source>Connecting…</source>
-        <translation type="unfinished"></translation>
+        <translation>Connexion...</translation>
     </message>
 </context>
 <context>
@@ -192,31 +190,31 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/logic.js" line="24"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="unfinished">%1 désactivé</translation>
+        <translation>%1 est désactivée</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>
+        <translation>%1 est activée</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>
+        <translation>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>
+        <translation>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>
+        <translation>%1 bloque Internet</translation>
     </message>
 </context>
 <context>
@@ -245,7 +243,7 @@ Clickable item to swicth to the recommended location</extracomment>
         <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&#xa0;Patron</translation>
+        <translation>Veuillez confirmer votre ID Patron</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="235"/>
@@ -261,32 +259,7 @@ Clickable item to swicth to the recommended location</extracomment>
         <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&#xa0;: %2</translation>
-    </message>
-    <message>
-        <source>%1 off</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 désactivé</translation>
-    </message>
-    <message>
-        <source>%1 on</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 activé</translation>
-    </message>
-    <message>
-        <source>Connecting to %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Connexion à %1</translation>
-    </message>
-    <message>
-        <source>Stopping %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Arrêt de %1</translation>
-    </message>
-    <message>
-        <source>%1 blocking internet</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 bloque Internet</translation>
+        <translation>Erreur de démarrage de %1 : %2</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="315"/>
@@ -329,17 +302,17 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/main.qml" line="138"/>
         <location filename="../qml/main.qml" line="323"/>
         <source>Recommended</source>
-        <translation type="unfinished"></translation>
+        <translation>Recommandé</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="129"/>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Manuel</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisir un emplacement…</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="381"/>
@@ -374,12 +347,12 @@ Clickable item to swicth to the recommended location</extracomment>
     <message>
         <location filename="../main.cpp" line="76"/>
         <source>: a fast and secure VPN. Powered by Bitmask.</source>
-        <translation>&#xa0;: un RPV rapide et sécurisé. Propulsé par Bitmask.</translation>
+        <translation> : 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&#xa0;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 Shell ou pour contrôler le RPV par d’autres moyens).</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="90"/>
@@ -389,7 +362,7 @@ Clickable item to swicth to the recommended location</extracomment>
     <message>
         <location filename="../main.cpp" line="96"/>
         <source>Install helpers (Linux only, requires sudo).</source>
-        <translation>Installer les aides (Linux seulement, «&#xa0;sudo&#xa0;» est requis). </translation>
+        <translation>Installer les aides (Linux seulement, « sudo » est requis). </translation>
     </message>
     <message>
         <location filename="../main.cpp" line="102"/>
@@ -404,7 +377,7 @@ Clickable item to swicth to the recommended location</extracomment>
     <message>
         <location filename="../main.cpp" line="113"/>
         <source>Web API port (default: 8080)</source>
-        <translation>Port de l’API Web (par défaut&#xa0;: 8080)</translation>
+        <translation>Port de l’API Web (par défaut : 8080)</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="115"/>
@@ -412,4 +385,4 @@ Clickable item to swicth to the recommended location</extracomment>
         <translation>Démarrer le RPV, soit Activer soit Désactiver</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_hu.ts b/gui/i18n/main_hu.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f1c13106285f3277955ba692b94e2bb7b597550b
--- /dev/null
+++ b/gui/i18n/main_hu.ts
@@ -0,0 +1,388 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="5"/>
+        <source>About</source>
+        <translation>Névjegy</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="18"/>
+        <source>&lt;p&gt;This service is paid for entirely by donations from users like you. &lt;a href=&quot;%1&quot;&gt;Please donate&lt;/a&gt;.&lt;/p&gt;</source>
+        <extracomment>donation text of the about dialog</extracomment>
+        <translation>&lt;p&gt;Ez a szolgáltatás teljesen olyan felhasználók támogatásából fizetett, mint Ön. &lt;a href=&quot;%1&quot;&gt;Kérjük támogasson&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="26"/>
+        <source>&lt;p&gt;%1 is an easy, fast, and secure VPN service from %2. %1 does not require a user account, keep logs, or track you in any way.&lt;/p&gt; %3 &lt;p&gt;By using this application, you agree to the &lt;a href=&quot;%4&quot;&gt;Terms of Service&lt;/a&gt;. This service is provided as-is, without any warranty, and is intended for people who work to make the world a better place.&lt;/p&gt;</source>
+        <extracomment>about dialog %1 -&gt; application name %2 -&gt; provider name %3 -&gt; donation text if activated</extracomment>
+        <translation>&lt;p&gt;%1 egy könnyű, gyors, és biztonságos VPN szolgáltatás %2 szolgáltatótól. %1 nem igényel felhasználói fiókot, nem tárol logot vagy követi Önt bármi módon.&lt;/p&gt; %3 &lt;p&gt;Az alkalmazás használatával elfogadja a &lt;a href=&quot;%4&quot;&gt;Szolgáltatási feltételeket&lt;/a&gt;. A szolgáltatás ahogy van kerül szolgáltatásra, garancia nélkül, és a célja, hogy jobbá tegye a világot.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="37"/>
+        <source>%1 version: %2</source>
+        <extracomment>%1 -&gt; application name %2 -&gt; version string</extracomment>
+        <translation>%1 Verzió: %2</translation>
+    </message>
+</context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation>obfs4 hidak használata</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>Csak akkor válasszon egy hidat, ha tudja, hogy szüksége van a cenzúra megkerülésére az országában vagy a helyi hálózatán.</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>Egy obfs4 híd kerül használatba vételre a következő VPN csatlakozáskor.</translation>
+    </message>
+</context>
+<context>
+    <name>DonateDialog</name>
+    <message>
+        <location filename="../qml/DonateDialog.qml" line="6"/>
+        <source>Donate</source>
+        <translation>Támogatás</translation>
+    </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.
+
+Do you want to donate now?</source>
+        <extracomment>donate dialog %1 -&gt; application name</extracomment>
+        <translation>A %1 szolgáltatás futtatása drága. Mivel nem szeretnénk Önről adatot tárolni, azért nincsen fiók és számlázás ehhez a szolgáltatáshoz. De ha szeretné, hogy a szolgáltatás folytatódjék, támogassa legalább 5$-ral havonta.
+	
+Szeretne támogatni most?</translation>
+    </message>
+</context>
+<context>
+    <name>FailDialog</name>
+    <message>
+        <location filename="../qml/FailDialog.qml" line="5"/>
+        <source>Initialization Error</source>
+        <translation>Inicializációs hiba</translation>
+    </message>
+</context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation>A hely kézzel lett beállítva.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="6"/>
+        <source>Login</source>
+        <translation>Belépés</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="21"/>
+        <source>Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Patron ID</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="25"/>
+        <source>Password</source>
+        <translation>Jelsző</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="37"/>
+        <source>Enter your Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Adja meg Patron ID-jét</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="39"/>
+        <source>Log in with your library credentials</source>
+        <translation>Belépés könyvtári azonosítóival</translation>
+    </message>
+    <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>Leellenőrizheti a Patron ID számát a könyvtári kártyája hátoldalán</translation>
+    </message>
+</context>
+<context>
+    <name>LoginOKDialog</name>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="7"/>
+        <source>Login Successful</source>
+        <translation>Belépés sikeres</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="11"/>
+        <source>Login successful. You can now start the VPN.</source>
+        <translation>A belépés sikeres. Most már elindíthatja a VPN-t.</translation>
+    </message>
+</context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation>Állapot</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation>Hidak</translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source/>
+        <translation type="unfinished"/>
+    </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="107"/>
+        <location filename="../qml/VpnState.qml" line="134"/>
+        <location filename="../qml/VpnState.qml" line="159"/>
+        <source>Recommended</source>
+        <extracomment>Clickable item to switch to the recommended location
+----------
+Clickable item to swicth to the recommended location</extracomment>
+        <translation>Ajánlott</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>Ajánlott (%1)</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>Kapcsolódva ide: %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
+        <translation>Kapcsolódás...</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>%1 ki</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 be</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>Kapcsolódás ide: %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 leállítása</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 blokkolja az internetet</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>Nem találhatók segítők. Kérjük ellenőrizze a telepítését</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="210"/>
+        <source>Could not find polkit agent.</source>
+        <translation>Nem található a polkit ügynök.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="226"/>
+        <source>Oops! The authentication service seems down. Please try again later</source>
+        <translation>Hoppá! Az azonosító szolgáltatás úgy tűnik nem működik. Kérjük próbálja újra később</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="227"/>
+        <source>Service Error</source>
+        <translation>Szolgáltatás hiba</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="233"/>
+        <source>Please check your Patron ID</source>
+        <extracomment>Incorrect library card number</extracomment>
+        <translation>Kérjük ellenőrizze a Patron ID-jét </translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="235"/>
+        <source>Could not log in with those credentials, please retry</source>
+        <translation>Nem sikerült belépni ezekkel az azonosítókkal, próbálja újra</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="237"/>
+        <source>Login Error</source>
+        <translation>Belépési hiba</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>Hiba %1 indításakor: %2</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
+        <source>Checking status…</source>
+        <translation>Állapot ellenőrzése...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="353"/>
+        <source>Reconnect</source>
+        <translation>Újracsatlakozás</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="355"/>
+        <source>Turn on</source>
+        <translation>Bekapcsolás</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="367"/>
+        <source>Cancel</source>
+        <translation>Mégsem</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="369"/>
+        <source>Turn off</source>
+        <translation>Kikapcsolás</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="401"/>
+        <source>Help…</source>
+        <translation>Súgó...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="391"/>
+        <source>Donate…</source>
+        <translation>Támogatás...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Recommended</source>
+        <translation>Ajánlott</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation>Kézi</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation>Hely kiválasztása...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
+        <source>About…</source>
+        <translation>Névjegy...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="410"/>
+        <source>Report a bug…</source>
+        <translation>Hiba bejelentése...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="422"/>
+        <source>Quit</source>
+        <translation>Kilépés</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="467"/>
+        <source>Error starting VPN</source>
+        <translation>VPN indítása sikertelen</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="476"/>
+        <source>Missing authentication agent</source>
+        <translation>Hiányzó autentikációs ügynök</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="477"/>
+        <source>Could not find a polkit authentication agent. Please run one and try again.</source>
+        <translation>Nem található polkit azonosító ügynök. Kérjük futtasson egyet és próbálja újra.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="76"/>
+        <source>: a fast and secure VPN. Powered by Bitmask.</source>
+        <translation>: gyors és biztonságos VPN. A Bitmask-kal hajtva.</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>A tálca ikon elrejtése (hasznos a Gnome Shell kiterjesztéssel együtt, vagy ha a VPN-t más módon vezérli).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="90"/>
+        <source>Enable Web API.</source>
+        <translation>Web API engedélyezés.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="96"/>
+        <source>Install helpers (Linux only, requires sudo).</source>
+        <translation>Segítők telepítése (csak Linux, sudo-t igényel).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="102"/>
+        <source>Use obfs4 to obfuscate the traffic, if available in the provider.</source>
+        <translation>Az obfs4 használata a forgalom obfuszkálására, ha elérhető a szolgáltatónál.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="108"/>
+        <source>Disable autostart for the next run.</source>
+        <translation>Autostart tiltása a következő futtatásnál.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="113"/>
+        <source>Web API port (default: 8080)</source>
+        <translation>Web API port alapértelmezett: 8080)</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="115"/>
+        <source>Start the VPN, either &apos;on&apos; or &apos;off&apos;.</source>
+        <translation>VPN indítása &apos;be&apos; vagy &apos;ki&apos;.</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_lt.ts b/gui/i18n/main_lt.ts
index 3c12f699894782f053ddb7cc29c20b6d5679a9ef..a417e40c3404c273a35783b220ad5d6a6e428934 100644
--- a/gui/i18n/main_lt.ts
+++ b/gui/i18n/main_lt.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="lt">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -32,17 +30,17 @@
     <message>
         <location filename="../qml/BridgesItem.qml" line="24"/>
         <source>Use obfs4 bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Naudoti obfs4 tinklų tiltus</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>
+        <translation>Pasirinkite tinklų tiltą tik tuo atveju, jei žinote, jog jis yra reikalingas apeiti cenzūrą jūsų šalyje ar vietiniame tinkle.</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>
+        <translation>Kitą kartą jums prisijungus prie VPN, bus naudojamas obfs4 tinklų tiltas.</translation>
     </message>
 </context>
 <context>
@@ -54,7 +52,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <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.
+        <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.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -76,7 +74,7 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
     <message>
         <location filename="../qml/LocationText.qml" line="6"/>
         <source>Location has been manually set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vieta nustatyta rankiniu būdu.</translation>
     </message>
 </context>
 <context>
@@ -132,25 +130,25 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
     <message>
         <location filename="../qml/MainBar.qml" line="7"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>BÅ«sena</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="10"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Vieta</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="13"/>
         <source>Bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Tinklų tiltai</translation>
     </message>
 </context>
 <context>
     <name>VPNSwitch</name>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
-        <source></source>
-        <translation></translation>
+        <source/>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -165,25 +163,25 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
         <extracomment>Clickable item to switch to the recommended location
 ----------
 Clickable item to swicth to the recommended location</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Rekomenduojama</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>
+        <translation>Rekomenduojama (%1)</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>
+        <translation>Prisijungta prie %1</translation>
     </message>
     <message>
         <location filename="../qml/VpnState.qml" line="113"/>
         <source>Connecting…</source>
-        <translation type="unfinished"></translation>
+        <translation>Jungiamasi…</translation>
     </message>
 </context>
 <context>
@@ -192,31 +190,31 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/logic.js" line="24"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="unfinished">%1 išjungta</translation>
+        <translation>%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>
+        <translation>%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>
+        <translation>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>
+        <translation>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>
+        <translation>%1 blokuoja internetÄ…</translation>
     </message>
 </context>
 <context>
@@ -263,31 +261,6 @@ Clickable item to swicth to the recommended location</extracomment>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>Paleidžiant %1, gauta klaida: %2</translation>
     </message>
-    <message>
-        <source>%1 off</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 išjungta</translation>
-    </message>
-    <message>
-        <source>%1 on</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 įjungta</translation>
-    </message>
-    <message>
-        <source>Connecting to %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Jungiamasi prie %1</translation>
-    </message>
-    <message>
-        <source>Stopping %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">Stabdoma %1</translation>
-    </message>
-    <message>
-        <source>%1 blocking internet</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 blokuoja internetÄ…</translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="315"/>
         <location filename="../qml/main.qml" line="429"/>
@@ -329,17 +302,17 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/main.qml" line="138"/>
         <location filename="../qml/main.qml" line="323"/>
         <source>Recommended</source>
-        <translation type="unfinished"></translation>
+        <translation>Rekomenduojama</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="129"/>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Rankiniu būdu</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasirinkti vietą…</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="381"/>
@@ -412,4 +385,4 @@ Clickable item to swicth to the recommended location</extracomment>
         <translation>Paleisti VPN, arba „on“, arba „off“.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_nl.ts b/gui/i18n/main_nl.ts
new file mode 100644
index 0000000000000000000000000000000000000000..a92370450e76c59b8e8708d84daa38ecd8b9ef40
--- /dev/null
+++ b/gui/i18n/main_nl.ts
@@ -0,0 +1,388 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="5"/>
+        <source>About</source>
+        <translation>Over</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="18"/>
+        <source>&lt;p&gt;This service is paid for entirely by donations from users like you. &lt;a href=&quot;%1&quot;&gt;Please donate&lt;/a&gt;.&lt;/p&gt;</source>
+        <extracomment>donation text of the about dialog</extracomment>
+        <translation>&lt;p&gt;Deze dienst wordt volledig gefinancierd door donaties van gebruikers zoals jij.&lt;a href=&quot;%1&quot;&gt;Gelieve te doneren&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="26"/>
+        <source>&lt;p&gt;%1 is an easy, fast, and secure VPN service from %2. %1 does not require a user account, keep logs, or track you in any way.&lt;/p&gt; %3 &lt;p&gt;By using this application, you agree to the &lt;a href=&quot;%4&quot;&gt;Terms of Service&lt;/a&gt;. This service is provided as-is, without any warranty, and is intended for people who work to make the world a better place.&lt;/p&gt;</source>
+        <extracomment>about dialog %1 -&gt; application name %2 -&gt; provider name %3 -&gt; donation text if activated</extracomment>
+        <translation>&lt;p&gt;%1 is een gemakkelijke, snelle en veilige VPN-dienst van %2. %1 vereist geen gebruikersaccount, houdt geen logboek bij en volgt je niet op wat voor manier dan ook.&lt;/p&gt;%3 &lt;p&gt;Door deze applicatie te gebruiken, gaat u akkoord met de &lt;a href=&quot;%4&quot;&gt;gebruikersvoorwaarden&lt;/a&gt;. Deze dienst wordt geleverd zonder enige garantie en is bedoeld voor mensen die werken aan een betere wereld.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="37"/>
+        <source>%1 version: %2</source>
+        <extracomment>%1 -&gt; application name %2 -&gt; version string</extracomment>
+        <translation>%1 versie: %2</translation>
+    </message>
+</context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation>Gebruik een obfs4 bridge</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>Selecteer alleen een bridge wanneer je weet dat je censuur moet omzeilen in je land of lokale netwerk.</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>Een obfs4 bridge zal gebruikt worden de volgende keer dat je je verbindt met de VPN.</translation>
+    </message>
+</context>
+<context>
+    <name>DonateDialog</name>
+    <message>
+        <location filename="../qml/DonateDialog.qml" line="6"/>
+        <source>Donate</source>
+        <translation>Doneren</translation>
+    </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.
+
+Do you want to donate now?</source>
+        <extracomment>donate dialog %1 -&gt; application name</extracomment>
+        <translation>De %1 dienst is duur om te draaien. Omdat we geen persoonlijke gegevens over je willen bijhouden, zijn er geen accounts of betalingen voor deze dienst. Als je deze dienst in leven wilt houden, doneer dan minstens 5€ per maand.
+
+Wilt je nu doneren?</translation>
+    </message>
+</context>
+<context>
+    <name>FailDialog</name>
+    <message>
+        <location filename="../qml/FailDialog.qml" line="5"/>
+        <source>Initialization Error</source>
+        <translation>Initialisatiefout</translation>
+    </message>
+</context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation>Locatie is manueel geselecteerd.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="6"/>
+        <source>Login</source>
+        <translation>Inloggen</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="21"/>
+        <source>Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Pasnummer (bibliotheekpas)</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="25"/>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="37"/>
+        <source>Enter your Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Voer het pasnummer van je bibliotheekpas in</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="39"/>
+        <source>Log in with your library credentials</source>
+        <translation>Inloggen met je bibliotheekgegevens</translation>
+    </message>
+    <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>Je kan je pasnummer op je bibliotheekpas vinden.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginOKDialog</name>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="7"/>
+        <source>Login Successful</source>
+        <translation>Succesvol ingelogd</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="11"/>
+        <source>Login successful. You can now start the VPN.</source>
+        <translation>Succesvol ingelogd. Je kan nu de VPN starten.</translation>
+    </message>
+</context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation>Bridges</translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source/>
+        <translation type="unfinished"/>
+    </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="107"/>
+        <location filename="../qml/VpnState.qml" line="134"/>
+        <location filename="../qml/VpnState.qml" line="159"/>
+        <source>Recommended</source>
+        <extracomment>Clickable item to switch to the recommended location
+----------
+Clickable item to swicth to the recommended location</extracomment>
+        <translation>Aanbevolen</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>Aanbevolen (%1)</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>Verbonden met %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
+        <translation>Verbinden…</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>%1 uit</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 aan</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>Verbinden met %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>Stoppen %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 blokkeert het internet</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>Kon de helpertoepassing niet vinden. Controleer je installatie.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="210"/>
+        <source>Could not find polkit agent.</source>
+        <translation>Kon geen polkit-agent vinden.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="226"/>
+        <source>Oops! The authentication service seems down. Please try again later</source>
+        <translation>Oeps! De authenticatie dienst lijkt down. Probeer het later opnieuw</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="227"/>
+        <source>Service Error</source>
+        <translation>Servicefout</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="233"/>
+        <source>Please check your Patron ID</source>
+        <extracomment>Incorrect library card number</extracomment>
+        <translation>Controleer je pasnummer</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="235"/>
+        <source>Could not log in with those credentials, please retry</source>
+        <translation>Kon niet inloggen met deze inloggegevens, probeer het opnieuw</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="237"/>
+        <source>Login Error</source>
+        <translation>Login fout</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>Er is een fout opgetreden bij het starten van %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
+        <source>Checking status…</source>
+        <translation>Status controleren…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="353"/>
+        <source>Reconnect</source>
+        <translation>Opnieuw verbinden</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="355"/>
+        <source>Turn on</source>
+        <translation>Inschakelen</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="367"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="369"/>
+        <source>Turn off</source>
+        <translation>Uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="401"/>
+        <source>Help…</source>
+        <translation>Hulp…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="391"/>
+        <source>Donate…</source>
+        <translation>Doneren…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Recommended</source>
+        <translation>Aanbevolen</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation>Handmatig</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation>Kies een locatie…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
+        <source>About…</source>
+        <translation>Over…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="410"/>
+        <source>Report a bug…</source>
+        <translation>Rapporteer een bug…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="422"/>
+        <source>Quit</source>
+        <translation>Stoppen</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="467"/>
+        <source>Error starting VPN</source>
+        <translation>Fout bij het opstarten van de VPN</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="476"/>
+        <source>Missing authentication agent</source>
+        <translation>Authenticatieagent ontbreekt</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="477"/>
+        <source>Could not find a polkit authentication agent. Please run one and try again.</source>
+        <translation>Kan geen polkit authenticatieagent vinden. Voer er een uit en probeer opnieuw.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="76"/>
+        <source>: a fast and secure VPN. Powered by Bitmask.</source>
+        <translation>: een snelle en veilige VPN. Powered by 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>Toon het systray icoontje niet (handig in combinatie met Gnome Shell extensie, of om VPN op een andere manier te bedienen).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="90"/>
+        <source>Enable Web API.</source>
+        <translation>Web API activeren.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="96"/>
+        <source>Install helpers (Linux only, requires sudo).</source>
+        <translation>Helpertoepassing installeren (enkel voor Linux, vereist sudo).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="102"/>
+        <source>Use obfs4 to obfuscate the traffic, if available in the provider.</source>
+        <translation>Gebruik obfs4 om je verkeer te versluieren, als het beschikbaar is biji de provider.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="108"/>
+        <source>Disable autostart for the next run.</source>
+        <translation>Autostart uitschakelen voor de volgende keer.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="113"/>
+        <source>Web API port (default: 8080)</source>
+        <translation>Web API poort (standard: 8080)</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="115"/>
+        <source>Start the VPN, either &apos;on&apos; or &apos;off&apos;.</source>
+        <translation>Start VPN, &apos;aan&apos; of &apos;uit&apos;.</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_pl.ts b/gui/i18n/main_pl.ts
new file mode 100644
index 0000000000000000000000000000000000000000..092569ee7895e2bd0c3f4b670247aa34ec3a930f
--- /dev/null
+++ b/gui/i18n/main_pl.ts
@@ -0,0 +1,388 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="5"/>
+        <source>About</source>
+        <translation>O Aplikacji</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="18"/>
+        <source>&lt;p&gt;This service is paid for entirely by donations from users like you. &lt;a href=&quot;%1&quot;&gt;Please donate&lt;/a&gt;.&lt;/p&gt;</source>
+        <extracomment>donation text of the about dialog</extracomment>
+        <translation>&lt;p&gt;Ta usługa jest w całości opłacana przez datki od użytkowników takich jak Ty. &lt;a href=&quot;%1&quot;&gt;Rozważ datek&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="26"/>
+        <source>&lt;p&gt;%1 is an easy, fast, and secure VPN service from %2. %1 does not require a user account, keep logs, or track you in any way.&lt;/p&gt; %3 &lt;p&gt;By using this application, you agree to the &lt;a href=&quot;%4&quot;&gt;Terms of Service&lt;/a&gt;. This service is provided as-is, without any warranty, and is intended for people who work to make the world a better place.&lt;/p&gt;</source>
+        <extracomment>about dialog %1 -&gt; application name %2 -&gt; provider name %3 -&gt; donation text if activated</extracomment>
+        <translation>&lt;p&gt;%1 jest łatwą w obsłudze, szybką i bezpieczną usługą VPN od %2. %1 nie wymaga założenia konta, przetrzymywania logów, ani śledzenie Twojej aktywności w żaden sposób.&lt;/p&gt; %3 &lt;p&gt;Przez używanie tej aplikacji, wyrażasz zgodę na &lt;a href=&quot;%4&quot;&gt;Warunki Usługi &lt;/a&gt;. Ta usługa jest świadczone w stanie takim jakim jest, bez żadnej gwarancji, i jest przeznaczona dla tych, którzy pracują, aby uczynić świat lepszym miejscem. &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="37"/>
+        <source>%1 version: %2</source>
+        <extracomment>%1 -&gt; application name %2 -&gt; version string</extracomment>
+        <translation>%1 wersja: %2</translation>
+    </message>
+</context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation>Używaj mostów obfs4</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>Wybierz most, wyłącznie w przypadku, gdy masz pewność, że jest Ci on niezbędny w ominięciu cenzury w Twoim kraju lub sieci lokalnej.</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>Most obfs4 będzie użyty przy następnym połączeniu z VPN.</translation>
+    </message>
+</context>
+<context>
+    <name>DonateDialog</name>
+    <message>
+        <location filename="../qml/DonateDialog.qml" line="6"/>
+        <source>Donate</source>
+        <translation>Darowizna</translation>
+    </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.
+
+Do you want to donate now?</source>
+        <extracomment>donate dialog %1 -&gt; application name</extracomment>
+        <translation>Usługa %1 jest kosztowna w utrzymaniu. Ponieważ nie chcemy przechowywać Twoich personalnych informacji, nie ma żadnych kont ani rozliczeń za tę usługę. Jeśli chcesz, aby usługa była kontynuowana, przekaż co najmniej 5$ każdego miesiąca.
+
+Chcesz teraz przekazać darowiznę?</translation>
+    </message>
+</context>
+<context>
+    <name>FailDialog</name>
+    <message>
+        <location filename="../qml/FailDialog.qml" line="5"/>
+        <source>Initialization Error</source>
+        <translation>BÅ‚Ä…d Inicjowania</translation>
+    </message>
+</context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation>Lokalizacja została ustawiona ręcznie.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="6"/>
+        <source>Login</source>
+        <translation>Login</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="21"/>
+        <source>Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Identyfikator Patrona</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="25"/>
+        <source>Password</source>
+        <translation>Hasło</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="37"/>
+        <source>Enter your Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>Wprowadź Twój Identyfikator Patrona</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="39"/>
+        <source>Log in with your library credentials</source>
+        <translation>Zaloguj się używając swoich danych do biblioteki</translation>
+    </message>
+    <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>Możesz sprawdzić swój numer Identyfikacyjny Patrona na odwrocie swojej karty bibliotecznej</translation>
+    </message>
+</context>
+<context>
+    <name>LoginOKDialog</name>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="7"/>
+        <source>Login Successful</source>
+        <translation>Zalogowano Poprawnie</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="11"/>
+        <source>Login successful. You can now start the VPN.</source>
+        <translation>Zalogowano poprawnie. Możesz teraz uruchomić VPN.</translation>
+    </message>
+</context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation>Lokacja</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation>Mosty</translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source/>
+        <translation type="unfinished"/>
+    </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="107"/>
+        <location filename="../qml/VpnState.qml" line="134"/>
+        <location filename="../qml/VpnState.qml" line="159"/>
+        <source>Recommended</source>
+        <extracomment>Clickable item to switch to the recommended location
+----------
+Clickable item to swicth to the recommended location</extracomment>
+        <translation>Rekomendowane</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>Rekomendowane (%1)</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>Połączono z %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
+        <translation>Łączenie...</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>%1 wyłączony</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 włączony</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>Łączenie z %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>Zatrzymywanie %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 blokuje internet</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>Nie udało się znaleźć pomocników. Sprawdź swoją instalację</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="210"/>
+        <source>Could not find polkit agent.</source>
+        <translation>Nie udało się znaleźć agenta polkit.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="226"/>
+        <source>Oops! The authentication service seems down. Please try again later</source>
+        <translation>Ups! Wydaje się, że usługa uwierzytelniania nie działa. Spróbuj ponownie później</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="227"/>
+        <source>Service Error</source>
+        <translation>Błąd Usługi</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="233"/>
+        <source>Please check your Patron ID</source>
+        <extracomment>Incorrect library card number</extracomment>
+        <translation>Sprawdź swój Identyfikator Patrona</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="235"/>
+        <source>Could not log in with those credentials, please retry</source>
+        <translation>Nie udało się zalogować przy użyciu tych danych logowania, spróbuj ponownie</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="237"/>
+        <source>Login Error</source>
+        <translation>BÅ‚Ä…d Logowania</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>BÅ‚Ä…d podczas uruchamiania %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
+        <source>Checking status…</source>
+        <translation>Sprawdzanie statusu...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="353"/>
+        <source>Reconnect</source>
+        <translation>Połącz ponownie</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="355"/>
+        <source>Turn on</source>
+        <translation>WÅ‚Ä…cz</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="367"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="369"/>
+        <source>Turn off</source>
+        <translation>Wyłącz</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="401"/>
+        <source>Help…</source>
+        <translation>Pomoc...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="391"/>
+        <source>Donate…</source>
+        <translation>Wesprzyj...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Recommended</source>
+        <translation>Rekomendowane</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation>Podręcznik</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation>Wybierz lokalizacje...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
+        <source>About…</source>
+        <translation>O Aplikacji...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="410"/>
+        <source>Report a bug…</source>
+        <translation>Zgłoś błąd...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="422"/>
+        <source>Quit</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="467"/>
+        <source>Error starting VPN</source>
+        <translation>BÅ‚Ä…d przy uruchamianiu VPN</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="476"/>
+        <source>Missing authentication agent</source>
+        <translation>Brak agenta uwierzytelniania</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="477"/>
+        <source>Could not find a polkit authentication agent. Please run one and try again.</source>
+        <translation>Nie można znaleźć agenta uwierzytelniania polkit. Uruchom go i spróbuj ponownie.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="76"/>
+        <source>: a fast and secure VPN. Powered by Bitmask.</source>
+        <translation>: szybki i bezpieczny VPN. Obsługiwany przez 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>Nie wyświetlaj ikony paska zadań (przydatne w połączeniu z rozszerzeniem Gnome Shell lub do kontrolowania VPN w inny sposób).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="90"/>
+        <source>Enable Web API.</source>
+        <translation>WÅ‚Ä…cz Web API.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="96"/>
+        <source>Install helpers (Linux only, requires sudo).</source>
+        <translation>Zainstaluj pomocniki (wyłącznie Linux, wymaga sudo).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="102"/>
+        <source>Use obfs4 to obfuscate the traffic, if available in the provider.</source>
+        <translation>Używaj obfs4, aby ukryć ruch, jeśli dostępny u dostawcy.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="108"/>
+        <source>Disable autostart for the next run.</source>
+        <translation>Wyłącz autostart dla następnego uruchomienia.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="113"/>
+        <source>Web API port (default: 8080)</source>
+        <translation>Port Web API (domyślny: 8080)</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="115"/>
+        <source>Start the VPN, either &apos;on&apos; or &apos;off&apos;.</source>
+        <translation>Uruchom VPN, &apos;włączony&apos; lub &apos;wyłączony&apos;.</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_tr.ts b/gui/i18n/main_tr.ts
index b58d97f5ca7cc8771eb1723d519eeff66cd6915c..a7050ee91b375cac40597886c0562f59613fa00c 100644
--- a/gui/i18n/main_tr.ts
+++ b/gui/i18n/main_tr.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="tr">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.1">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -32,17 +30,17 @@
     <message>
         <location filename="../qml/BridgesItem.qml" line="24"/>
         <source>Use obfs4 bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>obfs4 köprülerini kullan</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>
+        <translation>Sadece ülkenizde veya yerel ağınızda sansürü aşmanız gerektiğini düşünüyorsanız bir köprü seçin.</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>
+        <translation>VPN&apos;e bir sonraki bağlantınızda bir obfs4 köprüsü kullanılacaktır.</translation>
     </message>
 </context>
 <context>
@@ -54,7 +52,7 @@
     </message>
     <message>
         <location filename="../qml/DonateDialog.qml" line="14"/>
-        <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.
+        <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.
 
 Do you want to donate now?</source>
         <extracomment>donate dialog %1 -&gt; application name</extracomment>
@@ -76,7 +74,7 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/LocationText.qml" line="6"/>
         <source>Location has been manually set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konum el ile ayarlandı.</translation>
     </message>
 </context>
 <context>
@@ -132,25 +130,25 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/MainBar.qml" line="7"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Durum</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="10"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Konum</translation>
     </message>
     <message>
         <location filename="../qml/MainBar.qml" line="13"/>
         <source>Bridges</source>
-        <translation type="unfinished"></translation>
+        <translation>Köprüler</translation>
     </message>
 </context>
 <context>
     <name>VPNSwitch</name>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
-        <source></source>
-        <translation></translation>
+        <source/>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -165,25 +163,25 @@ Do you want to donate now?</source>
         <extracomment>Clickable item to switch to the recommended location
 ----------
 Clickable item to swicth to the recommended location</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Önerilen</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>
+        <translation>Önerilen (%1)</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>
+        <translation>%1&apos;e bağlanıldı</translation>
     </message>
     <message>
         <location filename="../qml/VpnState.qml" line="113"/>
         <source>Connecting…</source>
-        <translation type="unfinished"></translation>
+        <translation>Bağlanıyor...</translation>
     </message>
 </context>
 <context>
@@ -192,31 +190,31 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/logic.js" line="24"/>
         <source>%1 off</source>
         <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="unfinished">%1 kapalı</translation>
+        <translation>%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>
+        <translation>%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>
+        <translation>%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>
+        <translation>%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>
+        <translation>%1 interneti engelliyor</translation>
     </message>
 </context>
 <context>
@@ -263,31 +261,6 @@ Clickable item to swicth to the recommended location</extracomment>
         <extracomment>%1 -&gt; application name %2 -&gt; error string</extracomment>
         <translation>%1 başlatılırken bir hata oluştu: %2</translation>
     </message>
-    <message>
-        <source>%1 off</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 kapalı</translation>
-    </message>
-    <message>
-        <source>%1 on</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 açık</translation>
-    </message>
-    <message>
-        <source>Connecting to %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 uygulamasına bağlanılıyor</translation>
-    </message>
-    <message>
-        <source>Stopping %1</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 durduruluyor</translation>
-    </message>
-    <message>
-        <source>%1 blocking internet</source>
-        <extracomment>%1 -&gt; application name</extracomment>
-        <translation type="vanished">%1 interneti engelliyor</translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="315"/>
         <location filename="../qml/main.qml" line="429"/>
@@ -329,17 +302,17 @@ Clickable item to swicth to the recommended location</extracomment>
         <location filename="../qml/main.qml" line="138"/>
         <location filename="../qml/main.qml" line="323"/>
         <source>Recommended</source>
-        <translation type="unfinished"></translation>
+        <translation>Önerilen</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="129"/>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>El ile</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
-        <translation type="unfinished"></translation>
+        <translation>Konum seç...</translation>
     </message>
     <message>
         <location filename="../qml/main.qml" line="381"/>
@@ -412,4 +385,4 @@ Clickable item to swicth to the recommended location</extracomment>
         <translation>VPN&apos;i başlat, &apos;açık&apos; veya &apos;kapalı&apos;.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/gui/i18n/main_ug.ts b/gui/i18n/main_ug.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0c001f113cd42af2be001ac71448b789a29fb0fe
--- /dev/null
+++ b/gui/i18n/main_ug.ts
@@ -0,0 +1,388 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ug" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="5"/>
+        <source>About</source>
+        <translation>ھەققىدە</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="18"/>
+        <source>&lt;p&gt;This service is paid for entirely by donations from users like you. &lt;a href=&quot;%1&quot;&gt;Please donate&lt;/a&gt;.&lt;/p&gt;</source>
+        <extracomment>donation text of the about dialog</extracomment>
+        <translation>&lt;p&gt;بۇ مۇلازىمەتنىڭ چىقىمىنى سىزگە ئوخشاش سېخى خەيرپەرۋەرلەر ئۈستىگە ئالغان. &lt;a href=&quot;%1&quot;&gt;قېنى ئىئانە قىلىڭ&lt;/a&gt;. &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="26"/>
+        <source>&lt;p&gt;%1 is an easy, fast, and secure VPN service from %2. %1 does not require a user account, keep logs, or track you in any way.&lt;/p&gt; %3 &lt;p&gt;By using this application, you agree to the &lt;a href=&quot;%4&quot;&gt;Terms of Service&lt;/a&gt;. This service is provided as-is, without any warranty, and is intended for people who work to make the world a better place.&lt;/p&gt;</source>
+        <extracomment>about dialog %1 -&gt; application name %2 -&gt; provider name %3 -&gt; donation text if activated</extracomment>
+        <translation>&lt;p&gt;%1 بولسا %2 تەمىنلىگەن قولاي، تېز ھەم بىخەتەر VPN مۇلازىمىتى. %1 سىزنىڭ بىر قوللانغۇچى ھېسابى تەمىنلىشىڭىزنى تەلەپ قىلمايدۇ، خاتىرە قالدۇرمايدۇ، ياكى ھەرقانداق بىر شەكىلدە ئىز قوغلىمايدۇ.&lt;/p&gt;%3&lt;p&gt; بۇ يۇمتالنى ئىشلەتكىنىڭىز، سىزنىڭ &lt;a href=&quot;%4&quot;&gt;مۇلازىمەت ماددىلىرىنى&lt;/a&gt;قوبۇل قىلغىنىڭىزدۇر. بۇ مۇلازىمەت ئۆز-پېتى تەمىنلىنىدۇ، ھېچقانداق كاپالىتى يوق. دۇنيانى تېخىمۇ ياخشى بىر يەر قىلىش ئۈچۈن ئىشلەۋاتقان كىشىلەر ئۈچۈن لايھىيەلەندى. </translation>
+    </message>
+    <message>
+        <location filename="../qml/AboutDialog.qml" line="37"/>
+        <source>%1 version: %2</source>
+        <extracomment>%1 -&gt; application name %2 -&gt; version string</extracomment>
+        <translation>%1 نەشرى: %2</translation>
+    </message>
+</context>
+<context>
+    <name>BridgesItem</name>
+    <message>
+        <location filename="../qml/BridgesItem.qml" line="24"/>
+        <source>Use obfs4 bridges</source>
+        <translation>Obfs4 كۆۋرۈكلىرىنى ئىشلىتىڭ</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>ئەگەر پەقەت دۆلىتىڭىز ياكى يەرلىك تورىڭىزدىكى سانسۈرلىمەلەردىن قېچىشىڭىز لازىملىقىنى بىلسىڭىز، بىر obsf4 كۆرۈكىنى تاللاڭ.</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>بىر obfs4 كۆۋرۈكى سىز كېيىنكى قېتىم VPN غا ئۇلانغاندا ئىشلىتىلىدۇ.</translation>
+    </message>
+</context>
+<context>
+    <name>DonateDialog</name>
+    <message>
+        <location filename="../qml/DonateDialog.qml" line="6"/>
+        <source>Donate</source>
+        <translation>ئىئانە</translation>
+    </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.
+
+Do you want to donate now?</source>
+        <extracomment>donate dialog %1 -&gt; application name</extracomment>
+        <translation>بۇ %1 مۇلازىمىتىنى ماڭغۇزۇش قىممەتكە توختايدۇ. چۈنكى بىز سىزنىڭ خۇسۇسىي ئۇچۇرلىرىڭىزنى ساقلىمايمىز. بۇ مۇلازىمەتتە ھېچقانداق ھېسابات ياكى تالون يوق. ئەمما سىز بۇ مۇلازىمەتنىڭ داۋاملىشىشىنى خالىسىڭىز، ھەر ئايدا بولمىدى دېگەندە 5$ ئىئانە قىلىپ قويارسىز.
+
+ھازىرلا ئىئانە قىلامسىز؟</translation>
+    </message>
+</context>
+<context>
+    <name>FailDialog</name>
+    <message>
+        <location filename="../qml/FailDialog.qml" line="5"/>
+        <source>Initialization Error</source>
+        <translation>دەسلەپكىلەشتۈرۈشتە خاتالق</translation>
+    </message>
+</context>
+<context>
+    <name>LocationText</name>
+    <message>
+        <location filename="../qml/LocationText.qml" line="6"/>
+        <source>Location has been manually set.</source>
+        <translation>ئورنى قولدا تەڭشەلدى.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="6"/>
+        <source>Login</source>
+        <translation>كىرىش</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="21"/>
+        <source>Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>خوجايىن كىملىگى</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="25"/>
+        <source>Password</source>
+        <translation>شىفرەسى</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="37"/>
+        <source>Enter your Patron ID</source>
+        <extracomment>Ask for the library card number</extracomment>
+        <translation>خوجايىن كىملىگىڭىزنى كىرىڭ</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginDialog.qml" line="39"/>
+        <source>Log in with your library credentials</source>
+        <translation>كۇتۇپخانا شىفرىلىرىڭىز بىلەن كىرىڭ</translation>
+    </message>
+    <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>سىز خوجايىن كىملىك نومۇرىنى كۇتۇپخانا كارتىنىڭ ئارقىسىدىن تەكشۈرەلەيسىز.</translation>
+    </message>
+</context>
+<context>
+    <name>LoginOKDialog</name>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="7"/>
+        <source>Login Successful</source>
+        <translation>مۇۋەپپىقىيەتلىك كىردىڭىز</translation>
+    </message>
+    <message>
+        <location filename="../qml/LoginOKDialog.qml" line="11"/>
+        <source>Login successful. You can now start the VPN.</source>
+        <translation>مۇۋەپپىيەتلىك كىردىڭىز. ئەمدى VPNنى قوزغىتىڭ</translation>
+    </message>
+</context>
+<context>
+    <name>MainBar</name>
+    <message>
+        <location filename="../qml/MainBar.qml" line="7"/>
+        <source>Status</source>
+        <translation>ھالەت</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="10"/>
+        <source>Location</source>
+        <translation>ئورنى</translation>
+    </message>
+    <message>
+        <location filename="../qml/MainBar.qml" line="13"/>
+        <source>Bridges</source>
+        <translation>كۆۋرۈكلەر</translation>
+    </message>
+</context>
+<context>
+    <name>VPNSwitch</name>
+    <message>
+        <location filename="../qml/VPNSwitch.qml" line="10"/>
+        <source/>
+        <translation type="unfinished"/>
+    </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="107"/>
+        <location filename="../qml/VpnState.qml" line="134"/>
+        <location filename="../qml/VpnState.qml" line="159"/>
+        <source>Recommended</source>
+        <extracomment>Clickable item to switch to the recommended location
+----------
+Clickable item to swicth to the recommended location</extracomment>
+        <translation>تەۋسىيە</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>تەۋسىيە (%1)</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>‏گە ئۇلىنىۋاتىدۇ  %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
+        <translation>ئۇلىنىۋاتىدۇ…</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>%1 ئېتىش</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="27"/>
+        <source>%1 on</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 ئېچىش</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="30"/>
+        <source>Connecting to %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>گە ئۇلىنىۋاتىدۇ %1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="33"/>
+        <source>Stopping %1</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>توختىدى%1</translation>
+    </message>
+    <message>
+        <location filename="../qml/logic.js" line="36"/>
+        <source>%1 blocking internet</source>
+        <extracomment>%1 -&gt; application name</extracomment>
+        <translation>%1 ئىنتېرنېت تاقالغان</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>ياردەمچىنى تاپالمىدىم. توغرا قاچىلىدىڭىزمۇ تەكشۈرۈڭ</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="210"/>
+        <source>Could not find polkit agent.</source>
+        <translation>پولكىت ئاگېنتىسىنى تاپالمدىدىم.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="226"/>
+        <source>Oops! The authentication service seems down. Please try again later</source>
+        <translation>ئاپلا! سالاھىيەت مۇلازىمىتى ئىشتىن توختىغاندەك قىلىدۇ. سەل تۇرۇپ قايتا سىناڭ.</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="227"/>
+        <source>Service Error</source>
+        <translation>مۇلازىمەت خاتالىقى</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="233"/>
+        <source>Please check your Patron ID</source>
+        <extracomment>Incorrect library card number</extracomment>
+        <translation>خوجايىن كىملىگىڭىزنى تەكشۈرۈڭ</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="235"/>
+        <source>Could not log in with those credentials, please retry</source>
+        <translation>بۇ شىفرەلەر بىلەن كىرەلمىدىڭىز، قايتا سىناڭ</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="237"/>
+        <source>Login Error</source>
+        <translation>كىرىش خاتاسى</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>دىن باشلانغان يەردە خاتالىق كۆرۈلدى %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="315"/>
+        <location filename="../qml/main.qml" line="429"/>
+        <source>Checking status…</source>
+        <translation>ھالىتى تەكشۈرىلىۋاتىدۇ…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="353"/>
+        <source>Reconnect</source>
+        <translation>قايتا ئۇلاش</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="355"/>
+        <source>Turn on</source>
+        <translation>ئېتىش</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="367"/>
+        <source>Cancel</source>
+        <translation>بىكار قىلىش</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="369"/>
+        <source>Turn off</source>
+        <translation>ئېچىش</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="401"/>
+        <source>Help…</source>
+        <translation>ياردەم…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="391"/>
+        <source>Donate…</source>
+        <translation>ئىئانە…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="120"/>
+        <location filename="../qml/main.qml" line="138"/>
+        <location filename="../qml/main.qml" line="323"/>
+        <source>Recommended</source>
+        <translation>تەۋسىيە</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="129"/>
+        <source>Manual</source>
+        <translation>قوللانما</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="340"/>
+        <source>Pick location…</source>
+        <translation>چوققا ئورنى…</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="381"/>
+        <source>About…</source>
+        <translation>ھەققىدە ...</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="410"/>
+        <source>Report a bug…</source>
+        <translation>بىر خاتانى مەلۇم قىلىش</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="422"/>
+        <source>Quit</source>
+        <translation>چىقىش</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="467"/>
+        <source>Error starting VPN</source>
+        <translation>VPNنى  قوزغىتىشتا خاتالىق</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="476"/>
+        <source>Missing authentication agent</source>
+        <translation>كىملىك توغرۇلاش ئاگېنتى يوقالغان</translation>
+    </message>
+    <message>
+        <location filename="../qml/main.qml" line="477"/>
+        <source>Could not find a polkit authentication agent. Please run one and try again.</source>
+        <translation>پولكىت ئاگېنتىنى تاپالمىدىم، بىرسىنى ئجرا قىلىپ تەكرار سىناڭ.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="76"/>
+        <source>: a fast and secure VPN. Powered by Bitmask.</source>
+        <translation>تېز ھەم بىخەتەر VPN بىتماسك تەرىپىدىن سۇنۇلىدۇ.</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>سېستىما تەگلىكىدە سىن رەسىمنى كۆرسەتمە (Gnome پوستى كېڭەيتىلمىلىرى، ياكى باشقا ئۇشۇلدا VPNنى كونترول قىلىشتەك ھەر ئىككى ئىشتا قوللىنىشچان)</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="90"/>
+        <source>Enable Web API.</source>
+        <translation>ئاكتىپلاشWeb API.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="96"/>
+        <source>Install helpers (Linux only, requires sudo).</source>
+        <translation>ياردمچى قاچىلاش (پەقەتلا لىناكىس ئۈچۈن، لازىم sudo).</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="102"/>
+        <source>Use obfs4 to obfuscate the traffic, if available in the provider.</source>
+        <translation>ئەگەر تەمىنلىگۈچىدە بولسا، obfs4 نى قاتناشنى مۈجىمەللەشتۈرۈشكە ئىشلىتىش.</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="108"/>
+        <source>Disable autostart for the next run.</source>
+        <translation>كېيىنكى قېتىم باشلىتىلغاندا ئاپتۇماتىك قوزغىتىشنى چەكلەش</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="113"/>
+        <source>Web API port (default: 8080)</source>
+        <translation>Web API پورتى (ئەستىكىسى: 8080)</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="115"/>
+        <source>Start the VPN, either &apos;on&apos; or &apos;off&apos;.</source>
+        <translation>VPN باشلات، مەيلى &quot;ئوچۇق&quot; ياكى &quot;ئېتىك&quot; بولسۇن</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file