From 0a4cfd33abd3a664c5d869f0c97023ada9679020 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 1 Jun 2021 17:40:59 +0200
Subject: [PATCH] [i18n] update locales

---
 gui/i18n/base.ts       | 21 ++++++++++-----------
 gui/i18n/main_es.ts    | 21 ++++++++++-----------
 gui/i18n/main_es_ES.ts | 21 ++++++++++-----------
 gui/i18n/main_et.ts    | 21 ++++++++++-----------
 gui/i18n/main_fr.ts    | 21 ++++++++++-----------
 gui/i18n/main_lt.ts    | 21 ++++++++++-----------
 gui/i18n/main_tr.ts    | 21 ++++++++++-----------
 gui/qml/VpnState.qml   |  5 ++++-
 gui/qml/main.qml       |  2 +-
 9 files changed, 75 insertions(+), 79 deletions(-)

diff --git a/gui/i18n/base.ts b/gui/i18n/base.ts
index 3f3638b0..09eb5da6 100644
--- a/gui/i18n/base.ts
+++ b/gui/i18n/base.ts
@@ -148,7 +148,7 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -156,10 +156,13 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/VpnState.qml" line="34"/>
         <location filename="../qml/VpnState.qml" line="74"/>
-        <location filename="../qml/VpnState.qml" line="106"/>
-        <location filename="../qml/VpnState.qml" line="132"/>
-        <location filename="../qml/VpnState.qml" line="156"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
@@ -176,8 +179,8 @@ Do you want to donate now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/VpnState.qml" line="112"/>
-        <source>Connecting...</source>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -297,6 +300,7 @@ Do you want to donate now?</source>
     <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>
     </message>
@@ -305,11 +309,6 @@ Do you want to donate now?</source>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/main.qml" line="323"/>
-        <source>Best</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
diff --git a/gui/i18n/main_es.ts b/gui/i18n/main_es.ts
index d95240c2..e1a4025b 100644
--- a/gui/i18n/main_es.ts
+++ b/gui/i18n/main_es.ts
@@ -150,7 +150,7 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -158,10 +158,13 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/VpnState.qml" line="34"/>
         <location filename="../qml/VpnState.qml" line="74"/>
-        <location filename="../qml/VpnState.qml" line="106"/>
-        <location filename="../qml/VpnState.qml" line="132"/>
-        <location filename="../qml/VpnState.qml" line="156"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
@@ -178,8 +181,8 @@ Do you want to donate now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/VpnState.qml" line="112"/>
-        <source>Connecting...</source>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -324,6 +327,7 @@ Do you want to donate now?</source>
     <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>
     </message>
@@ -332,11 +336,6 @@ Do you want to donate now?</source>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/main.qml" line="323"/>
-        <source>Best</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
diff --git a/gui/i18n/main_es_ES.ts b/gui/i18n/main_es_ES.ts
index b3146a9f..503aa99a 100644
--- a/gui/i18n/main_es_ES.ts
+++ b/gui/i18n/main_es_ES.ts
@@ -150,7 +150,7 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -158,10 +158,13 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/VpnState.qml" line="34"/>
         <location filename="../qml/VpnState.qml" line="74"/>
-        <location filename="../qml/VpnState.qml" line="106"/>
-        <location filename="../qml/VpnState.qml" line="132"/>
-        <location filename="../qml/VpnState.qml" line="156"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
@@ -178,8 +181,8 @@ Do you want to donate now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/VpnState.qml" line="112"/>
-        <source>Connecting...</source>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -324,6 +327,7 @@ Do you want to donate now?</source>
     <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>
     </message>
@@ -332,11 +336,6 @@ Do you want to donate now?</source>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/main.qml" line="323"/>
-        <source>Best</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
diff --git a/gui/i18n/main_et.ts b/gui/i18n/main_et.ts
index 744dd41f..b9194062 100644
--- a/gui/i18n/main_et.ts
+++ b/gui/i18n/main_et.ts
@@ -150,7 +150,7 @@ Kas soovid kohe annetada?</translation>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -158,10 +158,13 @@ Kas soovid kohe annetada?</translation>
     <message>
         <location filename="../qml/VpnState.qml" line="34"/>
         <location filename="../qml/VpnState.qml" line="74"/>
-        <location filename="../qml/VpnState.qml" line="106"/>
-        <location filename="../qml/VpnState.qml" line="132"/>
-        <location filename="../qml/VpnState.qml" line="156"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
@@ -178,8 +181,8 @@ Kas soovid kohe annetada?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/VpnState.qml" line="112"/>
-        <source>Connecting...</source>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -324,6 +327,7 @@ Kas soovid kohe annetada?</translation>
     <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>
     </message>
@@ -332,11 +336,6 @@ Kas soovid kohe annetada?</translation>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/main.qml" line="323"/>
-        <source>Best</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
diff --git a/gui/i18n/main_fr.ts b/gui/i18n/main_fr.ts
index df76cfdd..7ce07fab 100644
--- a/gui/i18n/main_fr.ts
+++ b/gui/i18n/main_fr.ts
@@ -150,7 +150,7 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -158,10 +158,13 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
     <message>
         <location filename="../qml/VpnState.qml" line="34"/>
         <location filename="../qml/VpnState.qml" line="74"/>
-        <location filename="../qml/VpnState.qml" line="106"/>
-        <location filename="../qml/VpnState.qml" line="132"/>
-        <location filename="../qml/VpnState.qml" line="156"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
@@ -178,8 +181,8 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/VpnState.qml" line="112"/>
-        <source>Connecting...</source>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -324,6 +327,7 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
     <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>
     </message>
@@ -332,11 +336,6 @@ Voulez-vous faire un don maintenant&#x2009;?</translation>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/main.qml" line="323"/>
-        <source>Best</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
diff --git a/gui/i18n/main_lt.ts b/gui/i18n/main_lt.ts
index 6da83543..3c12f699 100644
--- a/gui/i18n/main_lt.ts
+++ b/gui/i18n/main_lt.ts
@@ -150,7 +150,7 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -158,10 +158,13 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
     <message>
         <location filename="../qml/VpnState.qml" line="34"/>
         <location filename="../qml/VpnState.qml" line="74"/>
-        <location filename="../qml/VpnState.qml" line="106"/>
-        <location filename="../qml/VpnState.qml" line="132"/>
-        <location filename="../qml/VpnState.qml" line="156"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
@@ -178,8 +181,8 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/VpnState.qml" line="112"/>
-        <source>Connecting...</source>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -324,6 +327,7 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
     <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>
     </message>
@@ -332,11 +336,6 @@ Ar norÄ—tumÄ—te paaukoti dabar?</translation>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/main.qml" line="323"/>
-        <source>Best</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
diff --git a/gui/i18n/main_tr.ts b/gui/i18n/main_tr.ts
index fc5892af..b58d97f5 100644
--- a/gui/i18n/main_tr.ts
+++ b/gui/i18n/main_tr.ts
@@ -150,7 +150,7 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/VPNSwitch.qml" line="10"/>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -158,10 +158,13 @@ Do you want to donate now?</source>
     <message>
         <location filename="../qml/VpnState.qml" line="34"/>
         <location filename="../qml/VpnState.qml" line="74"/>
-        <location filename="../qml/VpnState.qml" line="106"/>
-        <location filename="../qml/VpnState.qml" line="132"/>
-        <location filename="../qml/VpnState.qml" line="156"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
@@ -178,8 +181,8 @@ Do you want to donate now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/VpnState.qml" line="112"/>
-        <source>Connecting...</source>
+        <location filename="../qml/VpnState.qml" line="113"/>
+        <source>Connecting…</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -324,6 +327,7 @@ Do you want to donate now?</source>
     <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>
     </message>
@@ -332,11 +336,6 @@ Do you want to donate now?</source>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qml/main.qml" line="323"/>
-        <source>Best</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qml/main.qml" line="340"/>
         <source>Pick location…</source>
diff --git a/gui/qml/VpnState.qml b/gui/qml/VpnState.qml
index 481d68eb..b18d6b5a 100644
--- a/gui/qml/VpnState.qml
+++ b/gui/qml/VpnState.qml
@@ -103,13 +103,14 @@ StateGroup {
                         //: %1 -> location to which the client is connected to
                         qsTr("Recommended (%1)").arg(locationStr())
                     } else {
+                        //: Clickable item to switch to the recommended location
                         qsTr("Recommended")
                     }
                 }
             }
             PropertyChanges {
                 target: mainStatus
-                text: qsTr("Connecting...")
+                text: qsTr("Connecting…")
             }
             PropertyChanges {
                 target: mainCurrentGateway
@@ -129,6 +130,7 @@ StateGroup {
             }
             PropertyChanges {
                 target: autoSelectionItem
+                //: Clickable item to switch to the recommended location
                 text: qsTr("Recommended")
             }
             PropertyChanges {
@@ -153,6 +155,7 @@ StateGroup {
             }
             PropertyChanges {
                 target: autoSelectionItem
+                //: Clickable item to swicth to the recommended location
                 text: qsTr("Recommended")
             }
             PropertyChanges {
diff --git a/gui/qml/main.qml b/gui/qml/main.qml
index cba12a11..25733233 100644
--- a/gui/qml/main.qml
+++ b/gui/qml/main.qml
@@ -320,7 +320,7 @@ ApplicationWindow {
 
             MenuItem {
                 id: autoSelectionItem
-                text: qsTr("Best")
+                text: qsTr("Recommended")
                 checkable: true
                 checked: !isManualLocation()
                 onTriggered: {
-- 
GitLab