another 28 fixes
This commit is contained in:
parent
4f9d49264c
commit
7ea9958822
3 changed files with 31 additions and 31 deletions
|
|
@ -123,23 +123,23 @@
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="76"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="76"/>
|
||||||
<source><li>9 locations (with more coming soon)</li></source>
|
<source><li>13 locations (with more coming soon)</li></source>
|
||||||
<translation><li>9 местоположений (скоро будет ещё больше)</li></translation>
|
<translation><li>13 локаций (их число будет расти)</li></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="77"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="77"/>
|
||||||
<source><li>Easier switching between countries in the app</li></source>
|
<source><li>Easier switching between countries in the app</li></source>
|
||||||
<translation><li>Ещё более лёгкое переключение между странами в приложении</li></translation>
|
<translation><li>Удобное переключение между странами в приложении</li></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="78"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="78"/>
|
||||||
<source><li>Personal dashboard to manage your subscription</li></source>
|
<source><li>Personal dashboard to manage your subscription</li></source>
|
||||||
<translation>Личный кабинет для управления Вашими подписками</translation>
|
<translation>Личный кабинет для управления подпиской</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="80"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="80"/>
|
||||||
<source>Old keys will be deactivated after switching.</source>
|
<source>Old keys will be deactivated after switching.</source>
|
||||||
<translation>Старые ключи будут деактивированы после переключения.</translation>
|
<translation>После перехода старые ключи перестанут работать.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="91"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="91"/>
|
||||||
|
|
@ -154,12 +154,12 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="103"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="103"/>
|
||||||
<source>No old format subscriptions for a given email</source>
|
<source>No old format subscriptions for a given email</source>
|
||||||
<translation>Никаких подписок старого формата для данного email</translation>
|
<translation>Для указанного адреса электронной почты нет подписок старого типа</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="114"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="114"/>
|
||||||
<source>Enter the email you used for your current subscription</source>
|
<source>Enter the email you used for your current subscription</source>
|
||||||
<translation>Введите email, используемый для текущей подписки</translation>
|
<translation>Укажите адрес почты, который использовали при заказе текущей подписки</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="136"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="136"/>
|
||||||
|
|
@ -180,7 +180,7 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="177"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="177"/>
|
||||||
<source>No more reminders? You can always switch to the new format in the server settings</source>
|
<source>No more reminders? You can always switch to the new format in the server settings</source>
|
||||||
<translation>Нет напоминаний? Вы всегда можете переключиться на новый формат в настройках сервера</translation>
|
<translation>Отключить напоминания? Вы всегда сможете перейти на новый тип подписки в настройках сервера</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="179"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="179"/>
|
||||||
|
|
@ -193,7 +193,7 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1SubListDrawer.qml" line="55"/>
|
<location filename="../ui/qml/Components/ApiPremV1SubListDrawer.qml" line="55"/>
|
||||||
<source>Choose Subscription</source>
|
<source>Choose Subscription</source>
|
||||||
<translation>Выбрать Подписку</translation>
|
<translation>Выбрать подписку</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1SubListDrawer.qml" line="74"/>
|
<location filename="../ui/qml/Components/ApiPremV1SubListDrawer.qml" line="74"/>
|
||||||
|
|
@ -203,7 +203,7 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1SubListDrawer.qml" line="76"/>
|
<location filename="../ui/qml/Components/ApiPremV1SubListDrawer.qml" line="76"/>
|
||||||
<source>Purchase Date: </source>
|
<source>Purchase Date: </source>
|
||||||
<translation>Дата оплаты: </translation>
|
<translation>Дата покупки: </translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
|
@ -596,12 +596,12 @@ Already installed containers were found on the server. All installed containers
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/OtpCodeDrawer.qml" line="44"/>
|
<location filename="../ui/qml/Components/OtpCodeDrawer.qml" line="44"/>
|
||||||
<source>OTP code was sent to your email</source>
|
<source>OTP code was sent to your email</source>
|
||||||
<translation>OTP код был отправлен на ваш email</translation>
|
<translation>Одноразовый код был отправлен на ваш email</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/OtpCodeDrawer.qml" line="55"/>
|
<location filename="../ui/qml/Components/OtpCodeDrawer.qml" line="55"/>
|
||||||
<source>OTP Code</source>
|
<source>OTP Code</source>
|
||||||
<translation>OTP Код</translation>
|
<translation>Одноразовый код</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/OtpCodeDrawer.qml" line="66"/>
|
<location filename="../ui/qml/Components/OtpCodeDrawer.qml" line="66"/>
|
||||||
|
|
@ -640,13 +640,13 @@ Already installed containers were found on the server. All installed containers
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageHome.qml" line="43"/>
|
<location filename="../ui/qml/Pages2/PageHome.qml" line="43"/>
|
||||||
<source>You've successfully switched to the new Amnezia Premium subscription!</source>
|
<source>You've successfully switched to the new Amnezia Premium subscription!</source>
|
||||||
<translation>Вы успешно переключились на новую подписку Amnezia Premium!</translation>
|
<translation>Вы успешно перешли на новый тип подписки Amnezia Premium!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageHome.qml" line="44"/>
|
<location filename="../ui/qml/Pages2/PageHome.qml" line="44"/>
|
||||||
<source>Old keys will no longer work. Please use your new subscription key to connect.
|
<source>Old keys will no longer work. Please use your new subscription key to connect.
|
||||||
Thank you for staying with us!</source>
|
Thank you for staying with us!</source>
|
||||||
<translation>Старые ключи больше не будут работать. Пожалуйста, используйте Ваш новый ключ подписки для соединения.
|
<translation>Старые ключи перестанут работать. Пожалуйста, используйте новый ключ для подключения.
|
||||||
Спасибо, что остаетесь с нами!</translation>
|
Спасибо, что остаетесь с нами!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
|
@ -2400,12 +2400,12 @@ Thank you for staying with us!</source>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="41"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="41"/>
|
||||||
<source>Enable to ensure network traffic goes through a secure VPN tunnel, preventing accidental exposure of your IP and DNS queries if the connection drops</source>
|
<source>Enable to ensure network traffic goes through a secure VPN tunnel, preventing accidental exposure of your IP and DNS queries if the connection drops</source>
|
||||||
<translation>Включите, чтобы гарантировать прохождение сетевого трафика через защищенный VPN-туннель, предотвращая случайное раскрытие Вашего IP и DNS-запросов в случае обрыва соединения</translation>
|
<translation>Включите, чтобы весь сетевой трафик проходил только через безопасный VPN-туннель. Это предотвратит случайное раскрытие вашего IP-адреса и DNS-запросов при разрыве соединения</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="52"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="52"/>
|
||||||
<source>Cannot change killSwitch settings during active connection</source>
|
<source>KillSwitch settings cannot be changed during an active connection</source>
|
||||||
<translation>Невозможно изменить настройки аварийного выключателя во время активного соединения</translation>
|
<translation>Настройки KillSwitch нельзя изменить во время активного подключения</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="68"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="68"/>
|
||||||
|
|
@ -2414,8 +2414,8 @@ Thank you for staying with us!</source>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="69"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="69"/>
|
||||||
<source>Internet connection is blocked if VPN connection drops accidentally</source>
|
<source>Internet access is blocked if the VPN disconnects unexpectedly</source>
|
||||||
<translation>Интернет-соединение блокируется, если VPN-соединение случайно оборвётся</translation>
|
<translation>Доступ в интернет блокируется при разрыве VPN-соединения</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="87"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="87"/>
|
||||||
|
|
@ -2425,17 +2425,17 @@ Thank you for staying with us!</source>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="88"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="88"/>
|
||||||
<source>Internet connection is blocked even if VPN was turned off manually or not started</source>
|
<source>Internet connection is blocked even if VPN was turned off manually or not started</source>
|
||||||
<translation>Интернет-соединение блокируется,даже если VPN был выключен вручную или не запущен</translation>
|
<translation>Доступ в интернет блокируется, даже если VPN отключен вручную или не был запущен</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="91"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="91"/>
|
||||||
<source>Just a little heads-up</source>
|
<source>Just a little heads-up</source>
|
||||||
<translation>Просто небольшое предупреждение</translation>
|
<translation>Небольшое предупреждение</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="92"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="92"/>
|
||||||
<source>If you disconnect from VPN or the VPN connection drops while the Strict Kill Switch is turned on, your internet access will be disabled. To restore it, connect to VPN, change the Kill Switch mode or turn the Kill Switch off.</source>
|
<source>If the VPN disconnects or drops while Strict KillSwitch is enabled, internet access will be blocked. To restore access, reconnect VPN or disable/change the KillSwitch.</source>
|
||||||
<translation>Если вы отключитесь от VPN или соединение VPN прервется при включенном Strict Kill Switch, ваш доступ в Интернет будет отключен. Чтобы восстановить его, подключитесь к VPN, измените режим Kill Switch или выключите Kill Switch.</translation>
|
<translation>Если VPN отключится или соединение прервётся при включённом Strict KillSwitch, доступ в интернет будет заблокирован. Чтобы восстановить доступ, снова подключитесь к VPN или отключите (измените) режим KillSwitch.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="93"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="93"/>
|
||||||
|
|
@ -2450,12 +2450,12 @@ Thank you for staying with us!</source>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="113"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="113"/>
|
||||||
<source>DNS Exceptions</source>
|
<source>DNS Exceptions</source>
|
||||||
<translation>Исключенные DNS</translation>
|
<translation>Исключения для DNS</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="114"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitch.qml" line="114"/>
|
||||||
<source>DNS servers from the list will remain accessible when Kill Switch is triggered</source>
|
<source>DNS servers listed here will be excluded from KillSwitch restrictions and remain accessible when KillSwitch is active.</source>
|
||||||
<translation>DNS-серверы из списка будут доступны при срабатывании Kill Switch</translation>
|
<translation>DNS-серверы из списка будут доступны при срабатывании Kill Switch и останутся доступными при активном KillSwitch.</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ DrawerType2 {
|
||||||
var str = qsTr("We'll preserve all remaining days of your current subscription and give you an extra month as a thank you. ")
|
var str = qsTr("We'll preserve all remaining days of your current subscription and give you an extra month as a thank you. ")
|
||||||
str += qsTr("This new subscription type will be actively developed with more locations and features added regularly. Currently available:")
|
str += qsTr("This new subscription type will be actively developed with more locations and features added regularly. Currently available:")
|
||||||
str += "<ul style='margin-left: -16px;'>"
|
str += "<ul style='margin-left: -16px;'>"
|
||||||
str += qsTr("<li>9 locations (with more coming soon)</li>")
|
str += qsTr("<li>13 locations (with more coming soon)</li>")
|
||||||
str += qsTr("<li>Easier switching between countries in the app</li>")
|
str += qsTr("<li>Easier switching between countries in the app</li>")
|
||||||
str += qsTr("<li>Personal dashboard to manage your subscription</li>")
|
str += qsTr("<li>Personal dashboard to manage your subscription</li>")
|
||||||
str += "</ul>"
|
str += "</ul>"
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ PageType {
|
||||||
if (!ConnectionController.isConnected) {
|
if (!ConnectionController.isConnected) {
|
||||||
SettingsController.isKillSwitchEnabled = checked
|
SettingsController.isKillSwitchEnabled = checked
|
||||||
} else {
|
} else {
|
||||||
PageController.showNotificationMessage(qsTr("Cannot change killSwitch settings during active connection"))
|
PageController.showNotificationMessage(qsTr("KillSwitch settings cannot be changed during an active connection"))
|
||||||
switcher.checked = SettingsController.isKillSwitchEnabled
|
switcher.checked = SettingsController.isKillSwitchEnabled
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -66,7 +66,7 @@ PageType {
|
||||||
checked: !SettingsController.strictKillSwitchEnabled
|
checked: !SettingsController.strictKillSwitchEnabled
|
||||||
|
|
||||||
text: qsTr("Soft KillSwitch")
|
text: qsTr("Soft KillSwitch")
|
||||||
descriptionText: qsTr("Internet connection is blocked if VPN connection drops accidentally")
|
descriptionText: qsTr("Internet access is blocked if the VPN disconnects unexpectedly")
|
||||||
|
|
||||||
onClicked: function() {
|
onClicked: function() {
|
||||||
SettingsController.strictKillSwitchEnabled = false
|
SettingsController.strictKillSwitchEnabled = false
|
||||||
|
|
@ -89,7 +89,7 @@ PageType {
|
||||||
|
|
||||||
onClicked: function() {
|
onClicked: function() {
|
||||||
var headerText = qsTr("Just a little heads-up")
|
var headerText = qsTr("Just a little heads-up")
|
||||||
var descriptionText = qsTr("If you disconnect from VPN or the VPN connection drops while the Strict Kill Switch is turned on, your internet access will be disabled. To restore it, connect to VPN, change the Kill Switch mode or turn the Kill Switch off.")
|
var descriptionText = qsTr("If the VPN disconnects or drops while Strict KillSwitch is enabled, internet access will be blocked. To restore access, reconnect VPN or disable/change the KillSwitch.")
|
||||||
var yesButtonText = qsTr("Continue")
|
var yesButtonText = qsTr("Continue")
|
||||||
var noButtonText = qsTr("Cancel")
|
var noButtonText = qsTr("Cancel")
|
||||||
|
|
||||||
|
|
@ -111,7 +111,7 @@ PageType {
|
||||||
|
|
||||||
enabled: true
|
enabled: true
|
||||||
text: qsTr("DNS Exceptions")
|
text: qsTr("DNS Exceptions")
|
||||||
descriptionText: qsTr("DNS servers from the list will remain accessible when Kill Switch is triggered")
|
descriptionText: qsTr("DNS servers listed here will be excluded from KillSwitch restrictions and remain accessible when KillSwitch is active.")
|
||||||
rightImageSource: "qrc:/images/controls/chevron-right.svg"
|
rightImageSource: "qrc:/images/controls/chevron-right.svg"
|
||||||
|
|
||||||
clickedFunction: function() {
|
clickedFunction: function() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue