chore: minor ui changes (#1597)
This commit is contained in:
parent
e16243ff55
commit
df7bf204ea
4 changed files with 30 additions and 19 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -133,4 +133,8 @@ client/3rd/ShadowSocks/ss_ios.xcconfig
|
||||||
out/
|
out/
|
||||||
|
|
||||||
# CMake files
|
# CMake files
|
||||||
CMakeFiles/
|
CMakeFiles/
|
||||||
|
|
||||||
|
ios-ne-build.sh
|
||||||
|
macos-ne-build.sh
|
||||||
|
macos-signed-build.sh
|
||||||
|
|
|
@ -89,17 +89,17 @@
|
||||||
<context>
|
<context>
|
||||||
<name>ApiConfigsController</name>
|
<name>ApiConfigsController</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/controllers/api/apiConfigsController.cpp" line="203"/>
|
<location filename="../ui/controllers/api/apiConfigsController.cpp" line="207"/>
|
||||||
<source>%1 installed successfully.</source>
|
<source>%1 installed successfully.</source>
|
||||||
<translation>%1 успешно установлен.</translation>
|
<translation>%1 успешно установлен.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/controllers/api/apiConfigsController.cpp" line="257"/>
|
<location filename="../ui/controllers/api/apiConfigsController.cpp" line="262"/>
|
||||||
<source>API config reloaded</source>
|
<source>API config reloaded</source>
|
||||||
<translation>Конфигурация API перезагружена</translation>
|
<translation>Конфигурация API перезагружена</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/controllers/api/apiConfigsController.cpp" line="261"/>
|
<location filename="../ui/controllers/api/apiConfigsController.cpp" line="266"/>
|
||||||
<source>Successfully changed the country of connection to %1</source>
|
<source>Successfully changed the country of connection to %1</source>
|
||||||
<translation>Страна подключения изменена на %1</translation>
|
<translation>Страна подключения изменена на %1</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -149,7 +149,7 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="92"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="92"/>
|
||||||
<source>mail@example.com</source>
|
<source>mail@example.com</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation>mail@example.com</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="103"/>
|
<location filename="../ui/qml/Components/ApiPremV1MigrationDrawer.qml" line="103"/>
|
||||||
|
@ -242,7 +242,7 @@
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/models/api/apiServicesModel.cpp" line="111"/>
|
<location filename="../ui/models/api/apiServicesModel.cpp" line="111"/>
|
||||||
<source></source>
|
<source></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/models/api/apiServicesModel.cpp" line="113"/>
|
<location filename="../ui/models/api/apiServicesModel.cpp" line="113"/>
|
||||||
|
@ -378,9 +378,6 @@
|
||||||
<translation>Выбрать всё</translation>
|
<translation>Выбрать всё</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
|
||||||
<name>ExportController</name>
|
|
||||||
</context>
|
|
||||||
<context>
|
<context>
|
||||||
<name>HomeContainersListView</name>
|
<name>HomeContainersListView</name>
|
||||||
<message>
|
<message>
|
||||||
|
@ -1763,9 +1760,6 @@ Thank you for staying with us!</source>
|
||||||
<translation>Инструкции по настройке</translation>
|
<translation>Инструкции по настройке</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
|
||||||
<name>PageSettingsApiLanguageList</name>
|
|
||||||
</context>
|
|
||||||
<context>
|
<context>
|
||||||
<name>PageSettingsApiNativeConfigs</name>
|
<name>PageSettingsApiNativeConfigs</name>
|
||||||
<message>
|
<message>
|
||||||
|
@ -2424,7 +2418,7 @@ Thank you for staying with us!</source>
|
||||||
</message>
|
</message>
|
||||||
<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 when VPN is turned off manually or hasn't started</source>
|
<source>Internet connection is blocked even when VPN is turned off manually or hasn't started</source>
|
||||||
<translation>Доступ в интернет блокируется, даже если VPN отключен вручную или не был запущен</translation>
|
<translation>Доступ в интернет блокируется, даже если VPN отключен вручную или не был запущен</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
|
@ -2466,9 +2460,17 @@ Thank you for staying with us!</source>
|
||||||
<translation>Исключения для DNS</translation>
|
<translation>Исключения для DNS</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitchExceptions.qml" line="46"/>
|
|
||||||
<source>DNS servers listed here will be excluded from KillSwitch restrictions and remain accessible when KillSwitch is active.</source>
|
<source>DNS servers listed here will be excluded from KillSwitch restrictions and remain accessible when KillSwitch is active.</source>
|
||||||
<translation>Перечисленные DNS-серверы будут исключены из ограничений KillSwitch и останутся доступными при активном KillSwitch.</translation>
|
<translation type="vanished">Перечисленные DNS-серверы будут исключены из ограничений KillSwitch и останутся доступными при активном KillSwitch.</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>DNS servers from the list will remain accessible when KillSwitch is triggered</source>
|
||||||
|
<translation type="vanished">DNS-серверы из этого списка будут исключены из ограничений KillSwitch и останутся доступными при активном KillSwitch.</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitchExceptions.qml" line="46"/>
|
||||||
|
<source>DNS servers listed here will remain accessible when KillSwitch is active</source>
|
||||||
|
<translation>DNS-серверы из этого списка останутся доступными при активном KillSwitch</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../ui/qml/Pages2/PageSettingsKillSwitchExceptions.qml" line="106"/>
|
<location filename="../ui/qml/Pages2/PageSettingsKillSwitchExceptions.qml" line="106"/>
|
||||||
|
@ -4077,6 +4079,11 @@ Thank you for staying with us!</source>
|
||||||
<source>This config has already been added to the application</source>
|
<source>This config has already been added to the application</source>
|
||||||
<translation>Данная конфигурация уже была добавлена в приложение</translation>
|
<translation>Данная конфигурация уже была добавлена в приложение</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../core/errorstrings.cpp" line="77"/>
|
||||||
|
<source>A migration error has occurred. Please contact our technical support</source>
|
||||||
|
<translation>Произошла ошибка миграции. Обратитесь в нашу техническую поддержку</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../core/errorstrings.cpp" line="92"/>
|
<location filename="../core/errorstrings.cpp" line="92"/>
|
||||||
<source>ErrorCode: %1. </source>
|
<source>ErrorCode: %1. </source>
|
||||||
|
@ -4185,9 +4192,8 @@ Thank you for staying with us!</source>
|
||||||
<translation>Превышен лимит разрешенных конфигураций для одной подписки</translation>
|
<translation>Превышен лимит разрешенных конфигураций для одной подписки</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../core/errorstrings.cpp" line="77"/>
|
|
||||||
<source>A migration has error occurred. Please contact our technical support</source>
|
<source>A migration has error occurred. Please contact our technical support</source>
|
||||||
<translation>Произошла ошибка миграции. Обратитесь в нашу техническую поддержку</translation>
|
<translation type="vanished">Произошла ошибка миграции. Обратитесь в нашу техническую поддержку</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../core/errorstrings.cpp" line="80"/>
|
<location filename="../core/errorstrings.cpp" line="80"/>
|
||||||
|
@ -4342,7 +4348,7 @@ REALITY распознаёт системы блокировки во время
|
||||||
<message>
|
<message>
|
||||||
<location filename="../containers/containers_defs.cpp" line="136"/>
|
<location filename="../containers/containers_defs.cpp" line="136"/>
|
||||||
<source></source>
|
<source></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../containers/containers_defs.cpp" line="143"/>
|
<location filename="../containers/containers_defs.cpp" line="143"/>
|
||||||
|
|
|
@ -88,6 +88,7 @@ PageType {
|
||||||
|
|
||||||
LabelWithButtonType {
|
LabelWithButtonType {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
visible: link !== ""
|
||||||
text: title
|
text: title
|
||||||
descriptionText: description
|
descriptionText: description
|
||||||
rightImageSource: "qrc:/images/controls/external-link.svg"
|
rightImageSource: "qrc:/images/controls/external-link.svg"
|
||||||
|
|
|
@ -43,7 +43,7 @@ PageType {
|
||||||
Layout.leftMargin: 16
|
Layout.leftMargin: 16
|
||||||
|
|
||||||
headerText: qsTr("DNS Exceptions")
|
headerText: 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 remain accessible when KillSwitch is active")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue