Skip to content

Commit

Permalink
Merge branch 'bitcoin-core:main' into qml-custom-datadir-display
Browse files Browse the repository at this point in the history
  • Loading branch information
D33r-Gee authored Apr 11, 2024
2 parents 1cd69ba + b80e167 commit 3b8e35c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/qml/components/ProxySettings.qml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ColumnLayout {
center: false
header: qsTr("Default Proxy")
headerSize: 24
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.")
description: qsTr("Run peer connections through a proxy (SOCKS5) for improved privacy. The default proxy supports connections via IPv4, IPv6 and Tor.")
descriptionSize: 15
Layout.bottomMargin: 10
}
Expand Down Expand Up @@ -61,7 +61,7 @@ ColumnLayout {
center: false
header: qsTr("Tor Proxy")
headerSize: 24
description: qsTr("Enable to run Tor connections through a dedicated proxy.")
description: qsTr("Run Tor connections through a dedicated proxy.")
descriptionSize: 15
Layout.topMargin: 35
Layout.bottomMargin: 10
Expand Down

0 comments on commit 3b8e35c

Please sign in to comment.