Skip to content

Commit

Permalink
Merge bitcoin-core#395: Correct Default Proxy header description on P…
Browse files Browse the repository at this point in the history
…roxySettings - Follow-up bitcoin-core#391

d558b05 qml, component: Fix labelling on ProxySettings (pablomartin4btc)

Pull request description:

  This is a follow-up from bitcoin-core#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
  • Loading branch information
hebasto committed Apr 10, 2024
2 parents c3fb557 + d558b05 commit b80e167
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 b80e167

Please sign in to comment.