Skip to content

Commit fa7847d

Browse files
author
MarcoFalke
committed
gui: Rename address checkbox back to bech32
This is the wording that has been used in the previous release
1 parent 0432149 commit fa7847d

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

src/qt/forms/receivecoinsdialog.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
</widget>
190190
</item>
191191
<item>
192-
<widget class="QCheckBox" name="useLegacyAddress">
192+
<widget class="QCheckBox" name="useBech32">
193193
<property name="sizePolicy">
194194
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
195195
<horstretch>0</horstretch>
@@ -206,10 +206,10 @@
206206
<enum>Qt::StrongFocus</enum>
207207
</property>
208208
<property name="toolTip">
209-
<string>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When checked, an address compatible with older wallets will be created instead.</string>
209+
<string>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</string>
210210
</property>
211211
<property name="text">
212-
<string>Generate legacy address</string>
212+
<string>Generate native segwit (Bech32) address</string>
213213
</property>
214214
</widget>
215215
</item>
@@ -360,7 +360,7 @@
360360
<tabstops>
361361
<tabstop>reqLabel</tabstop>
362362
<tabstop>reqAmount</tabstop>
363-
<tabstop>useLegacyAddress</tabstop>
363+
<tabstop>useBech32</tabstop>
364364
<tabstop>reqMessage</tabstop>
365365
<tabstop>receiveButton</tabstop>
366366
<tabstop>clearButton</tabstop>

src/qt/locale/bitcoin_en.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2696,17 +2696,7 @@
26962696
<translation type="unfinished"></translation>
26972697
</message>
26982698
<message>
2699-
<location line="+136"/>
2700-
<source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don&apos;t support them. When checked, an address compatible with older wallets will be created instead.</source>
2701-
<translation type="unfinished"></translation>
2702-
</message>
2703-
<message>
2704-
<location line="+3"/>
2705-
<source>Generate legacy address</source>
2706-
<translation type="unfinished"></translation>
2707-
</message>
2708-
<message>
2709-
<location line="-178"/>
2699+
<location line="-39"/>
27102700
<location line="+153"/>
27112701
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
27122702
<translation type="unfinished"></translation>
@@ -2727,7 +2717,17 @@
27272717
<translation type="unfinished"></translation>
27282718
</message>
27292719
<message>
2730-
<location line="+142"/>
2720+
<location line="+78"/>
2721+
<source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don&apos;t support them. When unchecked, an address compatible with older wallets will be created instead.</source>
2722+
<translation type="unfinished"></translation>
2723+
</message>
2724+
<message>
2725+
<location line="+3"/>
2726+
<source>Generate native segwit (Bech32) address</source>
2727+
<translation type="unfinished"></translation>
2728+
</message>
2729+
<message>
2730+
<location line="+61"/>
27312731
<source>Requested payments history</source>
27322732
<translation type="unfinished"></translation>
27332733
</message>

src/qt/receivecoinsdialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ void ReceiveCoinsDialog::setModel(WalletModel *_model)
9696
if (model->node().isAddressTypeSet()) {
9797
// user explicitly set the type, use it
9898
if (model->wallet().getDefaultAddressType() == OutputType::BECH32) {
99-
ui->useLegacyAddress->setCheckState(Qt::Unchecked);
99+
ui->useBech32->setCheckState(Qt::Checked);
100100
} else {
101-
ui->useLegacyAddress->setCheckState(Qt::Checked);
101+
ui->useBech32->setCheckState(Qt::Unchecked);
102102
}
103103
} else {
104104
// Always fall back to bech32 in the gui
105-
ui->useLegacyAddress->setCheckState(Qt::Unchecked);
105+
ui->useBech32->setCheckState(Qt::Checked);
106106
}
107107

108108
// Set the button to be enabled or disabled based on whether the wallet can give out new addresses.
@@ -155,7 +155,7 @@ void ReceiveCoinsDialog::on_receiveButton_clicked()
155155
QString label = ui->reqLabel->text();
156156
/* Generate new receiving address */
157157
OutputType address_type;
158-
if (!ui->useLegacyAddress->isChecked()) {
158+
if (ui->useBech32->isChecked()) {
159159
address_type = OutputType::BECH32;
160160
} else {
161161
address_type = model->wallet().getDefaultAddressType();

0 commit comments

Comments
 (0)