Skip to content

Commit b5833fe

Browse files
hebastoPastaPastaPasta
authored andcommitted
Merge bitcoin-core/gui#332: Replace disambiguation strings with translator comments
8b77133 qt: Replace disambiguation strings with translator comments (Hennadii Stepanov) Pull request description: Since bitcoin#21694 is merged, translator comments is the right way to pass context to translators. This PR fixes changes were made: - in dashpay#220 before bitcoin#21694 - in bitcoin#21694 on testing purpose - in dashpay#125 Closes dashpay#288. ACKs for top commit: jarolrod: ACK 8b77133 Tree-SHA512: 466ade35f4969a41fbf3196780b1ae9fa810bab5d2f09077f8631604636cc63b24a901c719f6b5797366d2aa307993d0aa419ce35200c8d0a741a3d81cad3e6b
1 parent 291123f commit b5833fe

7 files changed

+21
-9
lines changed

src/qt/addressbookpage.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,9 @@ void AddressBookPage::on_exportButton_clicked()
319319
// CSV is currently the only supported format
320320
QString filename = GUIUtil::getSaveFileName(this,
321321
tr("Export Address List"), QString(),
322-
tr("Comma separated file", "Name of CSV file format") + QLatin1String(" (*.csv)"), nullptr);
322+
/*: Expanded name of the CSV file format.
323+
See https://en.wikipedia.org/wiki/Comma-separated_values */
324+
tr("Comma separated file") + QLatin1String(" (*.csv)"), nullptr);
323325

324326
if (filename.isNull())
325327
return;
@@ -333,8 +335,9 @@ void AddressBookPage::on_exportButton_clicked()
333335

334336
if(!writer.write()) {
335337
QMessageBox::critical(this, tr("Exporting Failed"),
336-
//: %1 is a name of the file (e.g., "addrbook.csv") that the bitcoin addresses were exported to.
337-
tr("There was an error trying to save the address list to %1. Please try again.", "An error message.").arg(filename));
338+
/*: An error message. %1 is a stand-in argument for the name
339+
of the file we attempted to save to. */
340+
tr("There was an error trying to save the address list to %1. Please try again.").arg(filename));
338341
}
339342
}
340343

src/qt/intro.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,9 @@ void Intro::UpdatePruneLabels(bool prune_checked)
391391
static constexpr uint64_t nPowTargetSpacing = 2.5 * 60; // from chainparams, which we don't have at this stage
392392
static constexpr uint32_t expected_block_data_size = 2250000; // includes undo data
393393
const uint64_t expected_backup_days = m_prune_target_gb * 1e9 / (uint64_t(expected_block_data_size) * 86400 / nPowTargetSpacing);
394-
ui->lblPruneSuffix->setText(tr("(sufficient to restore backups %n day(s) old)", "block chain pruning", expected_backup_days));
394+
ui->lblPruneSuffix->setText(
395+
//: Explanatory text on the capability of the current prune target.
396+
tr("(sufficient to restore backups %n day(s) old)", "", expected_backup_days));
395397
ui->sizeWarningLabel->setText(
396398
tr("%1 will download and store a copy of the Dash block chain.").arg(PACKAGE_NAME) + " " +
397399
storageRequiresMsg.arg(m_required_space_gb) + " " +

src/qt/psbtoperationsdialog.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ void PSBTOperationsDialog::saveTransaction() {
141141
filename_suggestion.append(".psbt");
142142
QString filename = GUIUtil::getSaveFileName(this,
143143
tr("Save Transaction Data"), filename_suggestion,
144-
tr("Partially Signed Transaction (Binary)", "Name of binary PSBT file format") + QLatin1String(" (*.psbt)"), &selected_filter);
144+
//: Expanded name of the binary PSBT file format. See: BIP 174.
145+
tr("Partially Signed Transaction (Binary)") + QLatin1String(" (*.psbt)"), &selected_filter);
145146
if (filename.isEmpty()) {
146147
return;
147148
}

src/qt/qrimagewidget.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ void QRImageWidget::saveImage()
136136
return;
137137
QString fn = GUIUtil::getSaveFileName(
138138
this, tr("Save QR Code"), QString(),
139-
tr("PNG Image", "Name of PNG file format") + QLatin1String(" (*.png)"), nullptr);
139+
/*: Expanded name of the PNG file format.
140+
See https://en.wikipedia.org/wiki/Portable_Network_Graphics */
141+
tr("PNG Image") + QLatin1String(" (*.png)"), nullptr);
140142
if (!fn.isEmpty())
141143
{
142144
exportImage().save(fn);

src/qt/sendcoinsdialog.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,8 @@ void SendCoinsDialog::on_sendButton_clicked()
514514
fileNameSuggestion.append(".psbt");
515515
QString filename = GUIUtil::getSaveFileName(this,
516516
tr("Save Transaction Data"), fileNameSuggestion,
517-
tr("Partially Signed Transaction (Binary)", "Name of binary PSBT file format") + QLatin1String(" (*.psbt)"), &selectedFilter);
517+
//: Expanded name of the binary PSBT file format. See: BIP 174.
518+
tr("Partially Signed Transaction (Binary)") + QLatin1String(" (*.psbt)"), &selectedFilter);
518519
if (filename.isEmpty()) {
519520
return;
520521
}

src/qt/transactionview.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,9 @@ void TransactionView::exportClicked()
387387
// CSV is currently the only supported format
388388
QString filename = GUIUtil::getSaveFileName(this,
389389
tr("Export Transaction History"), QString(),
390-
tr("Comma separated file", "Name of CSV file format") + QLatin1String(" (*.csv)"), nullptr);
390+
/*: Expanded name of the CSV file format.
391+
See https://en.wikipedia.org/wiki/Comma-separated_values */
392+
tr("Comma separated file") + QLatin1String(" (*.csv)"), nullptr);
391393

392394
if (filename.isNull())
393395
return;

src/qt/walletview.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,8 @@ void WalletView::backupWallet()
366366
{
367367
QString filename = GUIUtil::getSaveFileName(this,
368368
tr("Backup Wallet"), QString(),
369-
tr("Wallet Data", "Name of wallet data file format") + QLatin1String(" (*.dat)"), nullptr);
369+
//: Name of the wallet data file format.
370+
tr("Wallet Data") + QLatin1String(" (*.dat)"), nullptr);
370371

371372
if (filename.isEmpty())
372373
return;

0 commit comments

Comments
 (0)