diff options
author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-05-27 13:17:01 +0300 |
---|---|---|
committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-05-27 13:19:39 +0300 |
commit | b789914f1723e34966ec4b73292b6345a38a7d46 (patch) | |
tree | 63b62b824e520639edf4b48be911db2df9365360 /src/qt | |
parent | 811aa24c7111d4f433346f441f9c42cca18578b8 (diff) | |
parent | 8b7713365134022475e7e5d24d3ca73149bd10e1 (diff) |
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
Diffstat (limited to 'src/qt')
-rw-r--r-- | src/qt/addressbookpage.cpp | 9 | ||||
-rw-r--r-- | src/qt/intro.cpp | 4 | ||||
-rw-r--r-- | src/qt/psbtoperationsdialog.cpp | 3 | ||||
-rw-r--r-- | src/qt/qrimagewidget.cpp | 4 | ||||
-rw-r--r-- | src/qt/sendcoinsdialog.cpp | 3 | ||||
-rw-r--r-- | src/qt/transactionview.cpp | 4 | ||||
-rw-r--r-- | src/qt/walletview.cpp | 3 |
7 files changed, 21 insertions, 9 deletions
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index a816a0764c..7024fc7654 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -281,7 +281,9 @@ void AddressBookPage::on_exportButton_clicked() // CSV is currently the only supported format QString filename = GUIUtil::getSaveFileName(this, 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()) return; @@ -295,8 +297,9 @@ void AddressBookPage::on_exportButton_clicked() if(!writer.write()) { QMessageBox::critical(this, tr("Exporting Failed"), - //: %1 is a name of the file (e.g., "addrbook.csv") that the bitcoin addresses were exported to. - tr("There was an error trying to save the address list to %1. Please try again.", "An error message.").arg(filename)); + /*: An error message. %1 is a stand-in argument for the name + 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)); } } diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 15b14c35ec..a698a96857 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -385,7 +385,9 @@ void Intro::UpdatePruneLabels(bool prune_checked) static constexpr uint64_t nPowTargetSpacing = 10 * 60; // from chainparams, which we don't have at this stage 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); - 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( tr("%1 will download and store a copy of the Bitcoin block chain.").arg(PACKAGE_NAME) + " " + storageRequiresMsg.arg(m_required_space_gb) + " " + diff --git a/src/qt/psbtoperationsdialog.cpp b/src/qt/psbtoperationsdialog.cpp index 17746b395b..99318c3bc0 100644 --- a/src/qt/psbtoperationsdialog.cpp +++ b/src/qt/psbtoperationsdialog.cpp @@ -141,7 +141,8 @@ void PSBTOperationsDialog::saveTransaction() { filename_suggestion.append(".psbt"); QString filename = GUIUtil::getSaveFileName(this, 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()) { return; } diff --git a/src/qt/qrimagewidget.cpp b/src/qt/qrimagewidget.cpp index 3e1964915d..f5200bb5c0 100644 --- a/src/qt/qrimagewidget.cpp +++ b/src/qt/qrimagewidget.cpp @@ -118,7 +118,9 @@ void QRImageWidget::saveImage() return; QString fn = GUIUtil::getSaveFileName( 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()) { exportImage().save(fn); diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index e3ea6e9015..160b43324f 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -432,7 +432,8 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked) fileNameSuggestion.append(".psbt"); QString filename = GUIUtil::getSaveFileName(this, 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()) { return; } diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 7a975dadae..084b98a4e0 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -336,7 +336,9 @@ void TransactionView::exportClicked() // CSV is currently the only supported format QString filename = GUIUtil::getSaveFileName(this, 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()) return; diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 67cc42725b..4bae4cab41 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -273,7 +273,8 @@ void WalletView::backupWallet() { QString filename = GUIUtil::getSaveFileName(this, 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()) return; |