Skip to content

Commit b80e167

Browse files
committed
Merge #395: Correct Default Proxy header description on ProxySettings - Follow-up #391
d558b05 qml, component: Fix labelling on ProxySettings (pablomartin4btc) Pull request description: This is a follow-up from #391 (comment). <details> <summary>Currently/ <code>main</code> branch screenshot.</summary> ![Screenshot from 2024-04-07 23-00-31](https://github.com/bitcoin-core/gui-qml/assets/110166421/ffb86641-9f98-46d0-98d4-3c7ffd826d4e) </details> <details> <summary> This PR branch screenshot.</summary> ![image](https://github.com/bitcoin-core/gui-qml/assets/110166421/279abc03-8417-4345-bb21-06a7ff53eae6) </details> ACKs for top commit: GBKS: tACK d558b05 D33r-Gee: tACK d558b05 Tree-SHA512: b849bf2addafeac85e645281be162cf22d2f34da613f3da3fcef42377546a33e1b19beacb66660e06bc2e55b6b3c10bae08cf0ecdafb1e470fb8d44b040b6ff0
2 parents c3fb557 + d558b05 commit b80e167

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/qml/components/ProxySettings.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ColumnLayout {
1414
center: false
1515
header: qsTr("Default Proxy")
1616
headerSize: 24
17-
description: qsTr("Run peer connections through a proxy (SOCKS5) for improved privacy. The default proxy supports connections via IPv4, IPv6 and Tor. Tor connections can also be run through a separate Tor proxy.")
17+
description: qsTr("Run peer connections through a proxy (SOCKS5) for improved privacy. The default proxy supports connections via IPv4, IPv6 and Tor.")
1818
descriptionSize: 15
1919
Layout.bottomMargin: 10
2020
}
@@ -61,7 +61,7 @@ ColumnLayout {
6161
center: false
6262
header: qsTr("Tor Proxy")
6363
headerSize: 24
64-
description: qsTr("Enable to run Tor connections through a dedicated proxy.")
64+
description: qsTr("Run Tor connections through a dedicated proxy.")
6565
descriptionSize: 15
6666
Layout.topMargin: 35
6767
Layout.bottomMargin: 10

0 commit comments

Comments
 (0)