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

Refactoring/change application text (#687)

Browse source 
Changing some texts
This commit is contained in:
Shehab Ahmed 2024-03-26 20:05:04 +02:00 • committed by GitHub
parent 7730dd510c
commit 5f631eaa76
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 1814 additions and 1657 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/ui/qml/Pages2/PageProtocolAwgSettings.qml
View file

@ -325,7 +325,7 @@ PageType {
onClicked: {
var headerText = qsTr("Remove AmneziaWG from server?")
var descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
var yesButtonText = qsTr("Continue")
var noButtonText = qsTr("Cancel")
@ -359,15 +359,24 @@ PageType {
text: qsTr("Save")
clickedFunc: function() {
forceActiveFocus()
PageController.goToPage(PageEnum.PageSetupWizardInstalling);
InstallController.updateContainer(AwgConfigModel.getConfig())
onClicked: {
var headerText = qsTr("Save settings?")
var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
var yesButtonText = qsTr("Continue")
var noButtonText = qsTr("Cancel")
var yesButtonFunction = function() {
forceActiveFocus()
PageController.goToPage(PageEnum.PageSetupWizardInstalling);
InstallController.updateContainer(AwgConfigModel.getConfig())
}
var noButtonFunction = function() {
}
showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
}
}
}
}
}
}
}

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

@ -382,7 +382,7 @@ PageType {
clickedFunc: function() {
var headerText = qsTr("Remove OpenVpn from server?")
var descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
var yesButtonText = qsTr("Continue")
var noButtonText = qsTr("Cancel")

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

@ -182,7 +182,7 @@ PageType {
clickedFunction: function() {
var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
var descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
var yesButtonText = qsTr("Continue")
var noButtonText = qsTr("Cancel")

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

@ -121,7 +121,7 @@ PageType {
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("Login")
text: qsTr("User name")
descriptionText: username
descriptionOnTop: true

55
client/ui/qml/Pages2/PageSettingsAbout.qml
View file

@ -68,44 +68,10 @@ PageType {
height: 20
font.pixelSize: 14
text: qsTr("This is a free and open source application. If you like it, support the developers with a donation. ") +
qsTr("And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.")
text: qsTr("Amnezia is a free and open-source application. You can support the developers if you like it.")
color: "#CCCAC8"
}
BasicButtonType {
Layout.fillWidth: true
Layout.topMargin: 24
Layout.leftMargin: 16
Layout.rightMargin: 16
text: qsTr("Card on Patreon")
clickedFunc: function() {
Qt.openUrlExternally(qsTr("https://www.patreon.com/amneziavpn"))
}
}
BasicButtonType {
Layout.fillWidth: true
Layout.topMargin: 8
Layout.leftMargin: 16
Layout.rightMargin: 16
defaultColor: "transparent"
hoveredColor: Qt.rgba(1, 1, 1, 0.08)
pressedColor: Qt.rgba(1, 1, 1, 0.12)
disabledColor: "#878B91"
textColor: "#D7D8DB"
borderWidth: 1
text: qsTr("Show other methods on Github")
clickedFunc: function() {
Qt.openUrlExternally(qsTr("https://github.com/amnezia-vpn/amnezia-client#donate"))
}
}
ParagraphTextType {
Layout.fillWidth: true
Layout.topMargin: 32
@ -197,6 +163,25 @@ PageType {
Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
}
}
BasicButtonType {
Layout.alignment: Qt.AlignHCenter
Layout.bottomMargin: 16
Layout.topMargin: -15
implicitHeight: 25
defaultColor: "transparent"
hoveredColor: Qt.rgba(1, 1, 1, 0.08)
pressedColor: Qt.rgba(1, 1, 1, 0.12)
disabledColor: "#878B91"
textColor: "#FBB26A"
text: qsTr("Privacy Policy")
clickedFunc: function() {
Qt.openUrlExternally("https://amnezia.org/en/policy")
}
}
}
}
}

18
client/ui/qml/Pages2/PageSettingsBackup.qml
View file

@ -63,22 +63,18 @@ PageType {
HeaderType {
Layout.fillWidth: true
headerText: qsTr("Backup")
headerText: qsTr("Back up your configuration")
descriptionText: qsTr("You can save your settings to a backup file to restore them the next time you install the application.")
}
ListItemTitleType {
WarningType {
Layout.topMargin: 16
Layout.fillWidth: true
Layout.topMargin: 10
text: qsTr("Configuration backup")
}
textString: qsTr("The backup will contain your passwords and private keys for all servers added " +
"to AmneziaVPN. Keep this information in a secure place.")
CaptionTextType {
Layout.fillWidth: true
Layout.topMargin: -12
text: qsTr("You can save your settings to a backup file to restore them the next time you install the application.")
color: "#878B91"
iconPath: "qrc:/images/controls/alert-circle.svg"
}
BasicButtonType {

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

@ -57,6 +57,8 @@ disabled after 14 days, and all log files will be deleted.")
Layout.fillWidth: true
headerText: qsTr("Logging")
descriptionText: qsTr("Enabling this function will save application's logs automatically, " +
"By default, logging functionality is disabled. Enable log saving in case of application malfunction.")
}
SwitcherType {

8
client/ui/qml/Pages2/PageSettingsServerData.qml
View file

@ -166,7 +166,7 @@ PageType {
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("Remove this server from the app")
text: qsTr("Remove server from application")
textColor: "#EB5757"
clickedFunction: function() {
@ -196,12 +196,12 @@ PageType {
visible: content.isServerWithWriteAccess
Layout.fillWidth: true
text: qsTr("Clear server Amnezia-installed services")
text: qsTr("Clear server from Amnezia software")
textColor: "#EB5757"
clickedFunction: function() {
var headerText = qsTr("Do you want to clear server Amnezia-installed services?")
var descriptionText = qsTr("All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.")
var headerText = qsTr("Do you want to clear server from Amnezia software?")
var descriptionText = qsTr("All users whom you shared a connection with will no longer be able to connect to it.")
var yesButtonText = qsTr("Continue")
var noButtonText = qsTr("Cancel")

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

@ -163,7 +163,7 @@ PageType {
}
TabButtonType {
isSelected: tabBar.currentIndex === 2
text: qsTr("Data")
text: qsTr("Management")
}
}

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

@ -67,7 +67,7 @@ PageType {
id: username
Layout.fillWidth: true
headerText: qsTr("Login to connect via SSH")
headerText: qsTr("SSH Username")
textFieldPlaceholderText: "root"
textField.onFocusChanged: {

5
client/ui/qml/Pages2/PageSetupWizardEasy.qml
View file

@ -136,8 +136,7 @@ PageType {
CardType {
implicitWidth: parent.width
headerText: qsTr("Set up a VPN yourself")
bodyText: qsTr("I want to choose a VPN protocol")
headerText: qsTr("Choose a VPN protocol")
ButtonGroup.group: buttonGroup
@ -194,7 +193,7 @@ PageType {
return true
}
text: qsTr("Set up later")
text: qsTr("Skip setup")
clickedFunc: function() {
PageController.goToPage(PageEnum.PageSetupWizardInstalling)

19
client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
View file

@ -74,7 +74,7 @@ PageType {
visible: fileName.text !== ""
Image {
source: "qrc:/images/controls/file-cog-2.svg"
source: "qrc:/images/controls/file-check-2.svg"
}
Header2TextType {
@ -87,14 +87,6 @@ PageType {
}
}
CaptionTextType {
Layout.fillWidth: true
Layout.topMargin: 16
text: qsTr("Do not use connection codes from untrusted sources, as they may be created to intercept your data.")
color: "#878B91"
}
BasicButtonType {
Layout.topMargin: 16
Layout.leftMargin: -8
@ -113,6 +105,15 @@ PageType {
}
}
WarningType {
Layout.topMargin: 16
Layout.fillWidth: true
textString: qsTr("Use connection codes only from sources you trust. Codes from public sources may have been created to intercept your data.")
iconPath: "qrc:/images/controls/alert-circle.svg"
}
Rectangle {
Layout.fillWidth: true
Layout.bottomMargin: 16