diff --git a/gui/i18n/base.ts b/gui/i18n/base.ts index 3f3638b0f06cf2b105f033b49f741bb8a0841d08..09eb5da622e5851ec27e86ec5976f34fb7125728 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 d95240c2531d89b90c7ae8ae2f758adfc85eb493..e1a4025b76fdcfcbaea07c7cf9c20c61ad6c562c 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 b3146a9f87a37d187eece5535be2375602632157..503aa99a65ea53b0a8a2e2adb38048db22dd2a20 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 744dd41f444b75a83597f57fd0beb4700dbaf6f4..b9194062d48cf418f89bef835ad777e1195947ec 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 df76cfddbc5aa22ceae1a1d8350527ad05d881a3..7ce07fabd3e3fcf6606ebd22641c9d72ca7a1d88 100644 --- a/gui/i18n/main_fr.ts +++ b/gui/i18n/main_fr.ts @@ -150,7 +150,7 @@ Voulez-vous faire un don maintenant ?</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 ?</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 ?</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 ?</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 ?</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 6da83543af2f05e751c897203ef464e5c56a3c08..3c12f699894782f053ddb7cc29c20b6d5679a9ef 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 fc5892af392d4e1b6fcc522d46ded31c3afefc36..b58d97f5ca7cc8771eb1723d519eeff66cd6915c 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 481d68ebe9f32ff11494f5e318e5ca412b48d8d0..b18d6b5a06b8da4c885261d30f8845665f898ba5 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 cba12a116e58cad13521624c25039d368bffcca2..25733233641235950728298ce5e3d53affd1a556 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: {