Merge bitcoin-core/gui#332: Replace disambiguation strings with translator comments

8b7713365134022475e7e5d24d3ca73149bd10e1 qt: Replace disambiguation strings with translator comments (Hennadii Stepanov)

Pull request description:

  Since https://github.com/bitcoin/bitcoin/pull/21694 is merged, translator comments is the right way to pass context to translators.

  This PR fixes changes were made:
  - in #220 before https://github.com/bitcoin/bitcoin/pull/21694
  - in https://github.com/bitcoin/bitcoin/pull/21694 on testing purpose
  - in #125

  Closes #288.

ACKs for top commit:
  jarolrod:
    ACK 8b7713365134022475e7e5d24d3ca73149bd10e1

Tree-SHA512: 466ade35f4969a41fbf3196780b1ae9fa810bab5d2f09077f8631604636cc63b24a901c719f6b5797366d2aa307993d0aa419ce35200c8d0a741a3d81cad3e6b
This commit is contained in:
Hennadii Stepanov 2021-05-27 13:17:01 +03:00 committed by pasta
parent 292170cfeb
commit 3520ac271e
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
7 changed files with 21 additions and 9 deletions

View File

@ -319,7 +319,9 @@ void AddressBookPage::on_exportButton_clicked()
// CSV is currently the only supported format // CSV is currently the only supported format
QString filename = GUIUtil::getSaveFileName(this, QString filename = GUIUtil::getSaveFileName(this,
tr("Export Address List"), QString(), tr("Export Address List"), QString(),
tr("Comma separated file", "Name of CSV file format") + QLatin1String(" (*.csv)"), nullptr); /*: Expanded name of the CSV file format.
See https://en.wikipedia.org/wiki/Comma-separated_values */
tr("Comma separated file") + QLatin1String(" (*.csv)"), nullptr);
if (filename.isNull()) if (filename.isNull())
return; return;
@ -333,8 +335,9 @@ void AddressBookPage::on_exportButton_clicked()
if(!writer.write()) { if(!writer.write()) {
QMessageBox::critical(this, tr("Exporting Failed"), QMessageBox::critical(this, tr("Exporting Failed"),
//: %1 is a name of the file (e.g., "addrbook.csv") that the bitcoin addresses were exported to. /*: An error message. %1 is a stand-in argument for the name
tr("There was an error trying to save the address list to %1. Please try again.", "An error message.").arg(filename)); of the file we attempted to save to. */
tr("There was an error trying to save the address list to %1. Please try again.").arg(filename));
} }
} }

View File

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

View File

@ -141,7 +141,8 @@ void PSBTOperationsDialog::saveTransaction() {
filename_suggestion.append(".psbt"); filename_suggestion.append(".psbt");
QString filename = GUIUtil::getSaveFileName(this, QString filename = GUIUtil::getSaveFileName(this,
tr("Save Transaction Data"), filename_suggestion, tr("Save Transaction Data"), filename_suggestion,
tr("Partially Signed Transaction (Binary)", "Name of binary PSBT file format") + QLatin1String(" (*.psbt)"), &selected_filter); //: Expanded name of the binary PSBT file format. See: BIP 174.
tr("Partially Signed Transaction (Binary)") + QLatin1String(" (*.psbt)"), &selected_filter);
if (filename.isEmpty()) { if (filename.isEmpty()) {
return; return;
} }

View File

@ -136,7 +136,9 @@ void QRImageWidget::saveImage()
return; return;
QString fn = GUIUtil::getSaveFileName( QString fn = GUIUtil::getSaveFileName(
this, tr("Save QR Code"), QString(), this, tr("Save QR Code"), QString(),
tr("PNG Image", "Name of PNG file format") + QLatin1String(" (*.png)"), nullptr); /*: Expanded name of the PNG file format.
See https://en.wikipedia.org/wiki/Portable_Network_Graphics */
tr("PNG Image") + QLatin1String(" (*.png)"), nullptr);
if (!fn.isEmpty()) if (!fn.isEmpty())
{ {
exportImage().save(fn); exportImage().save(fn);

View File

@ -514,7 +514,8 @@ void SendCoinsDialog::on_sendButton_clicked()
fileNameSuggestion.append(".psbt"); fileNameSuggestion.append(".psbt");
QString filename = GUIUtil::getSaveFileName(this, QString filename = GUIUtil::getSaveFileName(this,
tr("Save Transaction Data"), fileNameSuggestion, tr("Save Transaction Data"), fileNameSuggestion,
tr("Partially Signed Transaction (Binary)", "Name of binary PSBT file format") + QLatin1String(" (*.psbt)"), &selectedFilter); //: Expanded name of the binary PSBT file format. See: BIP 174.
tr("Partially Signed Transaction (Binary)") + QLatin1String(" (*.psbt)"), &selectedFilter);
if (filename.isEmpty()) { if (filename.isEmpty()) {
return; return;
} }

View File

@ -387,7 +387,9 @@ void TransactionView::exportClicked()
// CSV is currently the only supported format // CSV is currently the only supported format
QString filename = GUIUtil::getSaveFileName(this, QString filename = GUIUtil::getSaveFileName(this,
tr("Export Transaction History"), QString(), tr("Export Transaction History"), QString(),
tr("Comma separated file", "Name of CSV file format") + QLatin1String(" (*.csv)"), nullptr); /*: Expanded name of the CSV file format.
See https://en.wikipedia.org/wiki/Comma-separated_values */
tr("Comma separated file") + QLatin1String(" (*.csv)"), nullptr);
if (filename.isNull()) if (filename.isNull())
return; return;

View File

@ -366,7 +366,8 @@ void WalletView::backupWallet()
{ {
QString filename = GUIUtil::getSaveFileName(this, QString filename = GUIUtil::getSaveFileName(this,
tr("Backup Wallet"), QString(), tr("Backup Wallet"), QString(),
tr("Wallet Data", "Name of wallet data file format") + QLatin1String(" (*.dat)"), nullptr); //: Name of the wallet data file format.
tr("Wallet Data") + QLatin1String(" (*.dat)"), nullptr);
if (filename.isEmpty()) if (filename.isEmpty())
return; return;