diff options
| author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2023-10-01 12:57:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-01 12:57:03 +0000 |
| commit | e9104f8c696850cf52080506a5e4ccbf704f01e7 (patch) | |
| tree | 31cafaea439190959e429d37a78015ae5fac4459 /resources | |
| parent | Merge pull request #1572 from Nheko-Reborn/differentiateTouch (diff) | |
| parent | Use @user:example.com for all sample mxids (diff) | |
| download | nheko-e9104f8c696850cf52080506a5e4ccbf704f01e7.tar.xz | |
Merge pull request #1534 from Nheko-Reborn/issue1494
Use @user:example.com for all sample mxids
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/dialogs/InviteDialog.qml | 2 | ||||
| -rw-r--r-- | resources/qml/pages/LoginPage.qml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/resources/qml/dialogs/InviteDialog.qml b/resources/qml/dialogs/InviteDialog.qml index 58bae7fd..ce17bd0f 100644 --- a/resources/qml/dialogs/InviteDialog.qml +++ b/resources/qml/dialogs/InviteDialog.qml @@ -100,7 +100,7 @@ ApplicationWindow { property bool isValidMxid: text.match("@.+?:.{3,}") backgroundColor: palette.window - placeholderText: qsTr("@joe:matrix.org", "Example user id. The name 'joe' can be localized however you want.") + placeholderText: qsTr("@user:yourserver.example.com", "Example user id. The name 'user' can be localized however you want.") Layout.fillWidth: true onAccepted: { if (isValidMxid) { diff --git a/resources/qml/pages/LoginPage.qml b/resources/qml/pages/LoginPage.qml index 9bf4e97e..f94e0082 100644 --- a/resources/qml/pages/LoginPage.qml +++ b/resources/qml/pages/LoginPage.qml @@ -56,10 +56,10 @@ Item { MatrixTextField { id: matrixIdLabel label: qsTr("Matrix ID") - placeholderText: qsTr("e.g @joe:matrix.org") + placeholderText: qsTr("e.g @user:yourserver.example.com") onEditingFinished: login.mxid = text - ToolTip.text: qsTr("Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.\nYou can also put your homeserver address there if your server doesn't support .well-known lookup.\nExample: @user:server.my\nIf Nheko fails to discover your homeserver, it will show you a field to enter the server manually.") + ToolTip.text: qsTr("Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.\nYou can also put your homeserver address there if your server doesn't support .well-known lookup.\nExample: @user:yourserver.example.com\nIf Nheko fails to discover your homeserver, it will show you a field to enter the server manually.") Keys.forwardTo: [pwBtn, ssoRepeater] } @@ -109,10 +109,10 @@ Item { Layout.fillWidth: true label: qsTr("Homeserver address") - placeholderText: qsTr("server.my:8787") + placeholderText: qsTr("yourserver.example.com:8787") text: login.homeserver onEditingFinished: login.homeserver = text - ToolTip.text: qsTr("The address that can be used to contact you homeserver's client API.\nExample: https://server.my:8787") + ToolTip.text: qsTr("The address that can be used to contact your homeserver's client API.\nExample: https://yourserver.example.com:8787") Keys.forwardTo: [pwBtn, ssoRepeater] } |