Skip to content

Commit 985ec17

Browse files
Philip Kaufmannlaanwj
authored andcommitted
[Qt, Trivial] misc minor string changes
- write "Bitcoins" uppercase - replace secure/insecure for payment requests with authenticated/unauthenticated - change a translatable string for payment request expiry to match another existing string to only get ONE resulting string to translate
1 parent c0555dc commit 985ec17

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/qt/forms/sendcoinsentry.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
</item>
196196
</layout>
197197
</widget>
198-
<widget class="QFrame" name="SendCoins_InsecurePaymentRequest">
198+
<widget class="QFrame" name="SendCoins_UnauthenticatedPaymentRequest">
199199
<property name="palette">
200200
<palette>
201201
<active>
@@ -612,7 +612,7 @@
612612
</palette>
613613
</property>
614614
<property name="toolTip">
615-
<string>This is an unverified payment request.</string>
615+
<string>This is an unauthenticated payment request.</string>
616616
</property>
617617
<property name="autoFillBackground">
618618
<bool>true</bool>
@@ -700,7 +700,7 @@
700700
</item>
701701
</layout>
702702
</widget>
703-
<widget class="QFrame" name="SendCoins_SecurePaymentRequest">
703+
<widget class="QFrame" name="SendCoins_AuthenticatedPaymentRequest">
704704
<property name="palette">
705705
<palette>
706706
<active>
@@ -1144,7 +1144,7 @@
11441144
</palette>
11451145
</property>
11461146
<property name="toolTip">
1147-
<string>This is a verified payment request.</string>
1147+
<string>This is an authenticated payment request.</string>
11481148
</property>
11491149
<property name="autoFillBackground">
11501150
<bool>true</bool>

src/qt/sendcoinsdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@ void SendCoinsDialog::on_sendButton_clicked()
274274
recipientElement = tr("%1 to %2").arg(amount, address);
275275
}
276276
}
277-
else if(!rcp.authenticatedMerchant.isEmpty()) // secure payment request
277+
else if(!rcp.authenticatedMerchant.isEmpty()) // authenticated payment request
278278
{
279279
recipientElement = tr("%1 to %2").arg(amount, GUIUtil::HtmlEscape(rcp.authenticatedMerchant));
280280
}
281-
else // insecure payment request
281+
else // unauthenticated payment request
282282
{
283283
recipientElement = tr("%1 to %2").arg(amount, address);
284284
}

src/qt/sendcoinsentry.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ void SendCoinsEntry::clear()
9999
ui->messageTextLabel->clear();
100100
ui->messageTextLabel->hide();
101101
ui->messageLabel->hide();
102-
// clear UI elements for insecure payment request
102+
// clear UI elements for unauthenticated payment request
103103
ui->payTo_is->clear();
104104
ui->memoTextLabel_is->clear();
105105
ui->payAmount_is->clear();
106-
// clear UI elements for secure payment request
106+
// clear UI elements for authenticated payment request
107107
ui->payTo_s->clear();
108108
ui->memoTextLabel_s->clear();
109109
ui->payAmount_s->clear();
@@ -190,21 +190,21 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
190190

191191
if (recipient.paymentRequest.IsInitialized()) // payment request
192192
{
193-
if (recipient.authenticatedMerchant.isEmpty()) // insecure
193+
if (recipient.authenticatedMerchant.isEmpty()) // unauthenticated
194194
{
195195
ui->payTo_is->setText(recipient.address);
196196
ui->memoTextLabel_is->setText(recipient.message);
197197
ui->payAmount_is->setValue(recipient.amount);
198198
ui->payAmount_is->setReadOnly(true);
199-
setCurrentWidget(ui->SendCoins_InsecurePaymentRequest);
199+
setCurrentWidget(ui->SendCoins_UnauthenticatedPaymentRequest);
200200
}
201-
else // secure
201+
else // authenticated
202202
{
203203
ui->payTo_s->setText(recipient.authenticatedMerchant);
204204
ui->memoTextLabel_s->setText(recipient.message);
205205
ui->payAmount_s->setValue(recipient.amount);
206206
ui->payAmount_s->setReadOnly(true);
207-
setCurrentWidget(ui->SendCoins_SecurePaymentRequest);
207+
setCurrentWidget(ui->SendCoins_AuthenticatedPaymentRequest);
208208
}
209209
}
210210
else // normal payment

0 commit comments

Comments
 (0)