diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 4d333d3bd..2dec37135 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -441,7 +441,7 @@ QT_QM=$(QT_TS:.ts=.qm) SECONDARY: $(QT_QM) -$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES) +$(srcdir)/qt/bitcoinstrings.cpp: $(libdogecoin_server_a_SOURCES) $(libdogecoin_wallet_a_SOURCES) $(libdogecoin_common_a_SOURCES) $(libdogecoin_zmq_a_SOURCES) $(libdogecoin_consensus_a_SOURCES) $(libdogecoin_util_a_SOURCES) @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^ diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 9ba6fb241..513ea1149 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -16,6 +16,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "(1 = keep tx meta data e.g. account owner and payment request information, 2 " "= drop tx meta data)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"-discardthreshold is set very high! This is the output amount that the " +"wallet will discard (to fee) if it is smaller than this setting."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "-maxtxfee is set very high! Fees this large could be paid on a single " "transaction."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -35,6 +38,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Amount under which a transaction output is considered dust, in %s (default: " "%s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Amount under which a transaction output is considered non-standard and will " +"not be accepted or relayed, in %s (default: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Bind to given address and always listen on it. Use [host]:port notation for " "IPv6"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -106,6 +112,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "potentially skip their script verification (0 to verify all, default: %s, " "testnet: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Invalid amount for -discardthreshold=: '%s' (must be at least the " +"dust limit of %s to prevent stuck transactions)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Invalid amount for -maxtxfee=: '%s' (must be at least the minrelay " "fee of %s to prevent stuck transactions)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -173,6 +182,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "rebuild the block database if you are sure that your computer's date and " "time are correct"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"The minimum transaction output size (in %s) used to validate wallet " +"transactions and discard change (to fee) (default: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "The transaction amount is too small to send after the fee has been deducted"), QT_TRANSLATE_NOOP("bitcoin-core", "" "This is a pre-release test build - use at your own risk - do not use for " @@ -387,6 +399,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -benchmark ignored, use QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -debugnet ignored, use -debug=net."), QT_TRANSLATE_NOOP("bitcoin-core", "Unsupported argument -tor found, use -onion."), QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format on startup"), +QT_TRANSLATE_NOOP("bitcoin-core", "Use Namecoin-compatible AuxPow API structure, (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use UPnP to map the listening port (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use the test chain"), QT_TRANSLATE_NOOP("bitcoin-core", "User Agent comment (%s) contains unsafe characters."), diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 6258b6c93..79ee73711 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -1687,10 +1687,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. Ungültige Zahlungsanforderung. - - Requested payment amount of %1 is too small (considered dust). - Angeforderter Zahlungsbetrag in Höhe von %1 ist zu niedrig und wurde als "Staub" eingestuft. - Refund from %1 Rücküberweisung von %1 @@ -1719,6 +1715,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged Zahlung bestätigt + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4471,5 +4471,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index aaaa9aaf6..b6f31560b 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1677,12 +1677,12 @@ - + The displayed information may be out of date. Your wallet automatically synchronizes with the Dogecoin network after a connection is established, but this process has not completed yet. - + Watch-only: @@ -1742,7 +1742,7 @@ - + Recent transactions @@ -1757,7 +1757,7 @@ - + Unconfirmed transactions to watch-only addresses @@ -1772,7 +1772,7 @@ - + Never share your wallet.dat file/your private key with anyone @@ -2132,7 +2132,7 @@ p, li { white-space: pre-wrap; } - Requested payment amount of %1 is too small (considered dust). + Requested payment amount of %1 is too small (below discard threshold). @@ -2246,12 +2246,12 @@ p, li { white-space: pre-wrap; } Amount - + Enter a Dogecoin address (e.g. %1) - + %1 d @@ -4487,7 +4487,7 @@ p, li { white-space: pre-wrap; } - + -maxtxfee is set very high! Fees this large could be paid on a single transaction. @@ -4517,7 +4517,7 @@ p, li { white-space: pre-wrap; } - + Bind to given address and always listen on it. Use [host]:port notation for IPv6 @@ -4637,7 +4637,7 @@ p, li { white-space: pre-wrap; } - + Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions) @@ -4742,7 +4742,7 @@ p, li { white-space: pre-wrap; } - + The transaction amount is too small to send after the fee has been deducted @@ -4757,12 +4757,32 @@ p, li { white-space: pre-wrap; } - + Execute command when the best block changes (%s in cmd is replaced by block hash, %i is replaced by block number) - + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard. Paper wallet art provided by Anacoluthia. @@ -5591,6 +5611,11 @@ p, li { white-space: pre-wrap; } Upgrade wallet to latest format on startup + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + Use UPnP to map the listening port (default: %u) diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index ff0cf16a4..a755a786b 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -1687,10 +1687,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. Solicitud de pago inválida. - - Requested payment amount of %1 is too small (considered dust). - Cantidad de pago solicitada de %1 es demasiado pequeña (considerado polvo). - Refund from %1 Reembolsar desde %1 @@ -1719,6 +1715,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged Pago declarado + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4477,5 +4477,25 @@ Establecer la serialización de las transacciones sin procesar o el bloque hex d Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index b2b5ea16b..99e964f08 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -1687,10 +1687,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. Demande de paiement invalide. - - Requested payment amount of %1 is too small (considered dust). - Le paiement demandé d'un montant de %1 est trop faible (considéré comme de la poussière). - Refund from %1 Remboursement de %1 @@ -1719,6 +1715,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged Le paiement a été confirmé + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4471,5 +4471,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index 1c784afe7..a8bc74bd2 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -1683,10 +1683,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. Permintaan pembayaran tidak valid. - - Requested payment amount of %1 is too small (considered dust). - Jumlah permintaan pembayaran dari %1 terlalu kecil (disarakan dust). - Refund from %1 Refund dari %1 @@ -1715,6 +1711,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged Pembayaran diakui + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4457,5 +4457,25 @@ p, li { white-space: pre-wrap; } ZeroMQ notification options: + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index f7c36baee..bb8a9f0d5 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -1688,10 +1688,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. Richiesta di pagamento invalida - - Requested payment amount of %1 is too small (considered dust). - L'importo di pagamento di %1 richiesto è troppo basso (considerato come trascurabile). - Refund from %1 Rimborso da %1 @@ -1720,6 +1716,10 @@ p, li { white-space: pre-wrap; } Network request error + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4472,5 +4472,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 7e3e18ec1..99b58d23b 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -1683,10 +1683,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. 無効な支払いリクエスト。 - - Requested payment amount of %1 is too small (considered dust). - 要求された支払額 %1 は少なすぎます (ダストとみなされてしまいます)。 - Refund from %1 %1 からの返金 @@ -1715,6 +1711,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged 支払いは確認しました + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4458,5 +4458,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index 7e6694fd1..961a38388 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -1679,10 +1679,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. 잘못된 지불 요청입니다. - - Requested payment amount of %1 is too small (considered dust). - 요청한 금액 %1 의 양이 너무 적습니다(스팸성 거래로 간주). - Refund from %1 %1 (으)로부터의 환불 @@ -1715,6 +1711,10 @@ p, li { white-space: pre-wrap; } URI cannot be parsed! This can be caused by an invalid Dogecoin address or malformed URI parameters. + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4457,5 +4457,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index ee24a1939..fadf4dc47 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -1687,10 +1687,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. Ongeldig betalingsverzoek. - - Requested payment amount of %1 is too small (considered dust). - Het gevraagde betalingsbedrag van %1 is te weinig (beschouwd als stof). - Refund from %1 Restitutie van %1 @@ -1719,6 +1715,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged Betaling bevestigd + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4471,5 +4471,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 6dc1d8978..2f5a039ea 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -1691,10 +1691,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. Неверный запрос платежа. - - Requested payment amount of %1 is too small (considered dust). - Запрошенная сумма платежа %1 слишком мала (считается пылью). - Refund from %1 Возврат от %1 @@ -1723,6 +1719,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged Платёж принят + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4485,5 +4485,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index a9e061fcc..910c61fd3 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -1683,10 +1683,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. Geçersiz ödeme talebi. - - Requested payment amount of %1 is too small (considered dust). - Talep edilen %1 ödeme tutarı çok küçüktür (toz olarak kabul edilir). - Refund from %1 %1 adresinden geri ödeme @@ -1715,6 +1711,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged Ödeme kabul edildi + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4457,5 +4457,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + + diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 05cf4e6b5..24e7c9643 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -1685,10 +1685,6 @@ p, li { white-space: pre-wrap; } Invalid payment request. 无效的支付请求。 - - Requested payment amount of %1 is too small (considered dust). - 请求支付的金额 %1 太小（就像尘埃）。 - Refund from %1 退款来自 %1 @@ -1717,6 +1713,10 @@ p, li { white-space: pre-wrap; } Payment acknowledged 付款已确认 + + Requested payment amount of %1 is too small (below discard threshold). + + PeerTableModel @@ -4461,5 +4461,25 @@ p, li { white-space: pre-wrap; } Wow + + -discardthreshold is set very high! This is the output amount that the wallet will discard (to fee) if it is smaller than this setting. + + + + Amount under which a transaction output is considered non-standard and will not be accepted or relayed, in %s (default: %s) + + + + Invalid amount for -discardthreshold=<amount>: '%s' (must be at least the dust limit of %s to prevent stuck transactions) + + + + The minimum transaction output size (in %s) used to validate wallet transactions and discard change (to fee) (default: %s) + + + + Use Namecoin-compatible AuxPow API structure, (default: %u) + +