AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into feature/macos-network-extension-bak

Browse source
This commit is contained in:
Yaroslav Yashin 2025-03-17 16:20:42 +01:00
commit df9170d97f
28 changed files with 366 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/qml/Pages2/PageSettingsApiDevices.qml
View file

@ -42,7 +42,7 @@ PageType {
Layout.rightMargin: 16
Layout.leftMargin: 16
headerText: qsTr("Active devices")
headerText: qsTr("Active Devices")
descriptionText: qsTr("Manage currently connected devices")
}

2
client/ui/qml/Pages2/PageSettingsApiNativeConfigs.qml
View file

@ -45,7 +45,7 @@ PageType {
Layout.rightMargin: 16
Layout.leftMargin: 16
headerText: qsTr("Configuration files")
headerText: qsTr("Configuration Files")
descriptionText: qsTr("For router setup or the AmneziaWG app")
}
}

14
client/ui/qml/Pages2/PageSettingsApiServerInfo.qml
View file

@ -26,7 +26,7 @@ PageType {
QtObject {
id: statusObject
readonly property string title: qsTr("Subscription status")
readonly property string title: qsTr("Subscription Status")
readonly property string contentKey: "subscriptionStatus"
readonly property string objectImageSource: "qrc:/images/controls/info.svg"
}
@ -34,7 +34,7 @@ PageType {
QtObject {
id: endDateObject
readonly property string title: qsTr("Valid until")
readonly property string title: qsTr("Valid Until")
readonly property string contentKey: "endDate"
readonly property string objectImageSource: "qrc:/images/controls/history.svg"
}
@ -42,7 +42,7 @@ PageType {
QtObject {
id: deviceCountObject
readonly property string title: qsTr("Active connections")
readonly property string title: qsTr("Active Connections")
readonly property string contentKey: "connectedDevices"
readonly property string objectImageSource: "qrc:/images/controls/monitor.svg"
}
@ -183,7 +183,7 @@ PageType {
visible: false //footer.isVisibleForAmneziaFree
text: qsTr("Subscription key")
text: qsTr("Subscription Key")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
clickedFunction: function() {
@ -191,7 +191,7 @@ PageType {
shareConnectionDrawer.openTriggered()
shareConnectionDrawer.isSelfHostedConfig = false;
shareConnectionDrawer.shareButtonText = qsTr("Save VPN key to file")
shareConnectionDrawer.shareButtonText = qsTr("Save VPN key as a file")
shareConnectionDrawer.copyButtonText = qsTr("Copy VPN key")
@ -213,7 +213,7 @@ PageType {
visible: footer.isVisibleForAmneziaFree
text: qsTr("Configuration files")
text: qsTr("Configuration Files")
descriptionText: qsTr("Manage configuration files")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
@ -233,7 +233,7 @@ PageType {
visible: footer.isVisibleForAmneziaFree
text: qsTr("Active devices")
text: qsTr("Active Devices")
descriptionText: qsTr("Manage currently connected devices")
rightImageSource: "qrc:/images/controls/chevron-right.svg"

2
client/ui/qml/Pages2/PageSettingsApiSupport.qml
View file

@ -27,7 +27,7 @@ PageType {
QtObject {
id: techSupport
readonly property string title: qsTr("Email Support")
readonly property string title: qsTr("Email")
readonly property string description: qsTr("support@amnezia.org")
readonly property string link: "mailto:support@amnezia.org"
}

2
client/ui/qml/Pages2/PageSettingsConnection.qml
View file

@ -140,7 +140,7 @@ PageType {
}
onClicked: {
if (!checkable) {
PageController.showNotificationMessage(qsTr("Cannot change killSwitch settings during active connection"))
PageController.showNotificationMessage(qsTr("Cannot change KillSwitch settings during active connection"))
}
}
}