diff options
Diffstat (limited to 'src')
67 files changed, 673 insertions, 503 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index ca2c7b2eb0..7730aba375 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -8,6 +8,7 @@ QT_TS = \ qt/locale/bitcoin_ar.ts \ qt/locale/bitcoin_be_BY.ts \ qt/locale/bitcoin_bg.ts \ + qt/locale/bitcoin_bg_BG.ts \ qt/locale/bitcoin_ca_ES.ts \ qt/locale/bitcoin_ca.ts \ qt/locale/bitcoin_ca@valencia.ts \ diff --git a/src/core_memusage.h b/src/core_memusage.h index dd86f805fe..b8e0f08bbf 100644 --- a/src/core_memusage.h +++ b/src/core_memusage.h @@ -33,13 +33,13 @@ static inline size_t RecursiveDynamicUsage(const CScriptWitness& scriptWit) { return mem; } -static inline size_t RecursiveDynamicUsage(const CTxinWitness& txinwit) { +static inline size_t RecursiveDynamicUsage(const CTxInWitness& txinwit) { return RecursiveDynamicUsage(txinwit.scriptWitness); } static inline size_t RecursiveDynamicUsage(const CTxWitness& txwit) { size_t mem = memusage::DynamicUsage(txwit.vtxinwit); - for (std::vector<CTxinWitness>::const_iterator it = txwit.vtxinwit.begin(); it != txwit.vtxinwit.end(); it++) { + for (std::vector<CTxInWitness>::const_iterator it = txwit.vtxinwit.begin(); it != txwit.vtxinwit.end(); it++) { mem += RecursiveDynamicUsage(*it); } return mem; diff --git a/src/main.cpp b/src/main.cpp index dd71ee5510..73fbe53afb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1135,11 +1135,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C if (tx.IsCoinBase()) return state.DoS(100, false, REJECT_INVALID, "coinbase"); - // Rather not work on nonstandard transactions (unless -testnet/-regtest) - string reason; - if (fRequireStandard && !IsStandardTx(tx, reason)) - return state.DoS(0, false, REJECT_NONSTANDARD, reason); - // Don't relay version 2 transactions until CSV is active, and we can be // sure that such transactions will be mined (unless we're on // -testnet/-regtest). @@ -1153,6 +1148,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C return state.DoS(0, false, REJECT_NONSTANDARD, "no-witness-yet", true); } + // Rather not work on nonstandard transactions (unless -testnet/-regtest) + string reason; + if (fRequireStandard && !IsStandardTx(tx, reason)) + return state.DoS(0, false, REJECT_NONSTANDARD, reason); + // Only accept nLockTime-using transactions that can be mined in the next // block; we don't want our mempool filled up with transactions that can't // be mined yet. @@ -6505,7 +6505,7 @@ bool SendMessages(CNode* pto) CBlock block; assert(ReadBlockFromDisk(block, pBestIndex, consensusParams)); CBlockHeaderAndShortTxIDs cmpctblock(block); - pto->PushMessage(NetMsgType::CMPCTBLOCK, cmpctblock); + pto->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock); state.pindexBestHeaderSent = pBestIndex; } else if (state.fPreferHeaders) { if (vHeaders.size() > 1) { diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index e87ad90f0d..8a2d5dd22c 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -213,7 +213,7 @@ public: std::string ToString() const; }; -class CTxinWitness +class CTxInWitness { public: CScriptWitness scriptWitness; @@ -228,14 +228,14 @@ public: bool IsNull() const { return scriptWitness.IsNull(); } - CTxinWitness() { } + CTxInWitness() { } }; class CTxWitness { public: /** In case vtxinwit is missing, all entries are treated as if they were empty CTxInWitnesses */ - std::vector<CTxinWitness> vtxinwit; + std::vector<CTxInWitness> vtxinwit; ADD_SERIALIZE_METHODS; diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc index 54d36ac011..8dd07c3d41 100644 --- a/src/qt/bitcoin_locale.qrc +++ b/src/qt/bitcoin_locale.qrc @@ -5,6 +5,7 @@ <file alias="ar">locale/bitcoin_ar.qm</file> <file alias="be_BY">locale/bitcoin_be_BY.qm</file> <file alias="bg">locale/bitcoin_bg.qm</file> + <file alias="bg_BG">locale/bitcoin_bg_BG.qm</file> <file alias="ca_ES">locale/bitcoin_ca_ES.qm</file> <file alias="ca">locale/bitcoin_ca.qm</file> <file alias="ca@valencia">locale/bitcoin_ca@valencia.qm</file> diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 4327de9b0c..947a4c6821 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -107,6 +107,23 @@ QFont fixedPitchFont() #endif } +// Just some dummy data to generate an convincing random-looking (but consistent) address +static const uint8_t dummydata[] = {0xeb,0x15,0x23,0x1d,0xfc,0xeb,0x60,0x92,0x58,0x86,0xb6,0x7d,0x06,0x52,0x99,0x92,0x59,0x15,0xae,0xb1,0x72,0xc0,0x66,0x47}; + +// Generate a dummy address with invalid CRC, starting with the network prefix. +static std::string DummyAddress(const CChainParams ¶ms) +{ + std::vector<unsigned char> sourcedata = params.Base58Prefix(CChainParams::PUBKEY_ADDRESS); + sourcedata.insert(sourcedata.end(), dummydata, dummydata + sizeof(dummydata)); + for(int i=0; i<256; ++i) { // Try every trailing byte + std::string s = EncodeBase58(begin_ptr(sourcedata), end_ptr(sourcedata)); + if (!CBitcoinAddress(s).IsValid()) + return s; + sourcedata[sourcedata.size()-1] += 1; + } + return ""; +} + void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent) { parent->setFocusProxy(widget); @@ -115,7 +132,8 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent) #if QT_VERSION >= 0x040700 // We don't want translators to use own addresses in translations // and this is the only place, where this address is supplied. - widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. %1)").arg("1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L")); + widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. %1)").arg( + QString::fromStdString(DummyAddress(Params())))); #endif widget->setValidator(new BitcoinAddressEntryValidator(parent)); widget->setCheckValidator(new BitcoinAddressCheckValidator(parent)); diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts index 7c2d294c7e..97ada8dd5c 100644 --- a/src/qt/locale/bitcoin_af.ts +++ b/src/qt/locale/bitcoin_af.ts @@ -257,10 +257,6 @@ <translation>Bitcoin Kern</translation> </message> <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>WAARSKUWING: toets die status van u netwerk, %d blokke ontvang in die laaste %d ure (%d verwag)</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Moenie transaksies vir langer as <n> ure in die geheuepoel hou nie (verstek: %u)</translation> </message> diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index 78fd074434..af62207df2 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -111,10 +111,6 @@ <translation>الخروج من التطبيق</translation> </message> <message> - <source>&About %1</source> - <translation>&عن %1</translation> - </message> - <message> <source>Show information about %1</source> <translation>أظهر المعلومات حولة %1</translation> </message> @@ -307,6 +303,20 @@ <translation>اللحاق بالركب ...</translation> </message> <message> + <source>Date: %1 +</source> + <translation>التاريخ %1 + + +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>علامه: %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>المعاملات المرسلة</translation> </message> @@ -326,10 +336,18 @@ <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>اختيار العمله</translation> + </message> + <message> <source>Quantity:</source> <translation>الكمية :</translation> </message> <message> + <source>Bytes:</source> + <translation>بايت</translation> + </message> + <message> <source>Amount:</source> <translation>القيمة :</translation> </message> @@ -342,6 +360,10 @@ <translation>رسوم :</translation> </message> <message> + <source>Dust:</source> + <translation>غبار:</translation> + </message> + <message> <source>After Fee:</source> <translation>بعد الرسوم :</translation> </message> @@ -350,8 +372,20 @@ <translation>تعديل :</translation> </message> <message> + <source>(un)select all</source> + <translation>عدم اختيار الجميع</translation> + </message> + <message> + <source>Tree mode</source> + <translation>صيغة الشجرة</translation> + </message> + <message> + <source>List mode</source> + <translation>صيغة القائمة</translation> + </message> + <message> <source>Amount</source> - <translation>المبلغ</translation> + <translation>مبلغ</translation> </message> <message> <source>Received with label</source> @@ -363,11 +397,11 @@ </message> <message> <source>Date</source> - <translation>التاريخ</translation> + <translation>تاريخ</translation> </message> <message> <source>Confirmations</source> - <translation>تأكيد</translation> + <translation>تأكيدات</translation> </message> <message> <source>Confirmed</source> @@ -389,6 +423,14 @@ <translation>&وصف</translation> </message> <message> + <source>The label associated with this address list entry</source> + <translation>الملصق المرتبط بقائمة العناوين المدخلة</translation> + </message> + <message> + <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> + <translation>العنوان المرتبط بقائمة العناوين المدخلة. و التي يمكن تعديلها فقط بواسطة ارسال العناوين</translation> + </message> + <message> <source>&Address</source> <translation>&العنوان</translation> </message> @@ -443,6 +485,14 @@ <translation>اختر دليل البيانات عند بدء التشغير (افتراضي: %u)</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>أضع لغة, على سبيل المثال " de_DE " (افتراضي:- مكان النظام)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>الدخول مصغر</translation> + </message> + <message> <source>Set SSL root certificates for payment request (default: -system-)</source> <translation>أضع شهادة بروتوكول الشبقة الأمنية لطلب المدفوع (افتراضي: -نظام-)</translation> </message> @@ -450,7 +500,11 @@ <source>Show splash screen on startup (default: %u)</source> <translation>أظهر شاشة البداية عند بدء التشغيل (افتراضي: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>اعد تعديل جميع النظم المتغيرة في GUI</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -473,6 +527,14 @@ <context> <name>OpenURIDialog</name> <message> + <source>Open URI</source> + <translation>افتح URL</translation> + </message> + <message> + <source>Open payment request from URI or file</source> + <translation>حدد طلب الدفع من ملف او URI</translation> + </message> + <message> <source>Select payment request file</source> <translation>حدد ملف طلب الدفع</translation> </message> @@ -528,10 +590,18 @@ <translation>منفذ البروكسي (مثلا 9050)</translation> </message> <message> + <source>Used for reaching peers via:</source> + <translation>مستخدم للاتصال بالاصدقاء من خلال:</translation> + </message> + <message> <source>&Window</source> <translation>نافذه</translation> </message> <message> + <source>Hide tray icon</source> + <translation>اخفاء لوحة الايقون</translation> + </message> + <message> <source>&Display</source> <translation>&عرض</translation> </message> @@ -616,10 +686,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>اسم العميل</translation> - </message> - <message> <source>N/A</source> <translation>غير معروف</translation> </message> @@ -664,6 +730,10 @@ <translation>تم الإرسال</translation> </message> <message> + <source>&Peers</source> + <translation>&اصدقاء</translation> + </message> + <message> <source>Direction</source> <translation>جهة</translation> </message> @@ -704,6 +774,22 @@ <translation>خارج:</translation> </message> <message> + <source>1 &hour</source> + <translation>1 &ساعة</translation> + </message> + <message> + <source>1 &day</source> + <translation>1 & يوم</translation> + </message> + <message> + <source>1 &week</source> + <translation>1 & اسبوع</translation> + </message> + <message> + <source>1 &year</source> + <translation>1 & سنة</translation> + </message> + <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>استخدم اسهم الاعلى و الاسفل للتنقل بين السجلات و <b>Ctrl-L</b> لمسح الشاشة</translation> </message> @@ -724,6 +810,18 @@ <translation>%1 قيقا بايت</translation> </message> <message> + <source>never</source> + <translation>ابدا</translation> + </message> + <message> + <source>Inbound</source> + <translation>داخل</translation> + </message> + <message> + <source>Outbound</source> + <translation>خارجي</translation> + </message> + <message> <source>Yes</source> <translation>نعم</translation> </message> @@ -809,6 +907,10 @@ <translation>الكمية :</translation> </message> <message> + <source>Bytes:</source> + <translation>بايت</translation> + </message> + <message> <source>Amount:</source> <translation>القيمة :</translation> </message> @@ -837,6 +939,14 @@ <translation>إخفاء</translation> </message> <message> + <source>normal</source> + <translation>طبيعي</translation> + </message> + <message> + <source>fast</source> + <translation>سريع</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>إرسال إلى عدة مستلمين في وقت واحد</translation> </message> @@ -849,6 +959,10 @@ <translation>مسح كل حقول النموذج المطلوبة</translation> </message> <message> + <source>Dust:</source> + <translation>غبار</translation> + </message> + <message> <source>Clear &All</source> <translation>مسح الكل</translation> </message> @@ -880,6 +994,18 @@ <translation>&وصف :</translation> </message> <message> + <source>Choose previously used address</source> + <translation>اختر عنوانا مستخدم سابقا</translation> + </message> + <message> + <source>This is a normal payment.</source> + <translation>هذا دفع اعتيادي</translation> + </message> + <message> + <source>The Bitcoin address to send the payment to</source> + <translation>عنوان البت كوين المرسل اليه الدفع</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -892,6 +1018,10 @@ <translation>Alt+P</translation> </message> <message> + <source>Remove this entry</source> + <translation>ازل هذه المداخله</translation> + </message> + <message> <source>Message:</source> <translation>الرسائل</translation> </message> @@ -914,6 +1044,10 @@ <translation>&توقيع الرسالة</translation> </message> <message> + <source>Choose previously used address</source> + <translation>اختر عنوانا مستخدم سابقا</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index bd85d8c8b0..acb60cf41c 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -882,10 +882,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Име на клиента</translation> - </message> - <message> <source>N/A</source> <translation>Несъществуващ</translation> </message> diff --git a/src/qt/locale/bitcoin_bg_BG.ts b/src/qt/locale/bitcoin_bg_BG.ts new file mode 100644 index 0000000000..4bddb5ff4a --- /dev/null +++ b/src/qt/locale/bitcoin_bg_BG.ts @@ -0,0 +1,236 @@ +<TS language="bg_BG" version="2.1"> +<context> + <name>AddressBookPage</name> + <message> + <source>Right-click to edit address or label</source> + <translation>Клик с десен бутон на мишката за промяна на адрес или етикет</translation> + </message> + <message> + <source>Create a new address</source> + <translation>Създай нов адрес</translation> + </message> + <message> + <source>&New</source> + <translation>Нов</translation> + </message> + <message> + <source>Copy the currently selected address to the system clipboard</source> + <translation>Копирай текущо избрания адрес към клипборда</translation> + </message> + <message> + <source>&Copy</source> + <translation>Копирай</translation> + </message> + <message> + <source>C&lose</source> + <translation>Затвори</translation> + </message> + <message> + <source>Delete the currently selected address from the list</source> + <translation>Изтрий текущо избрания адрес от листа</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Изнеси данните в избрания раздел към файл</translation> + </message> + <message> + <source>&Export</source> + <translation>Изнеси</translation> + </message> + <message> + <source>&Delete</source> + <translation>Изтрий</translation> + </message> +</context> +<context> + <name>AskPassphraseDialog</name> + <message> + <source>Passphrase Dialog</source> + <translation>Диалог за пропуск</translation> + </message> + <message> + <source>Enter passphrase</source> + <translation>Въведи парола</translation> + </message> + <message> + <source>New passphrase</source> + <translation>Нова парола</translation> + </message> + <message> + <source>Repeat new passphrase</source> + <translation>Повтори парола</translation> + </message> +</context> +<context> + <name>BanTableModel</name> + <message> + <source>IP/Netmask</source> + <translation>IP/Мрежова маска</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Блокиран до</translation> + </message> +</context> +<context> + <name>BitcoinGUI</name> + <message> + <source>Sign &message...</source> + <translation>Подпиши съобщение...</translation> + </message> + <message> + <source>Synchronizing with network...</source> + <translation>Синхронизиране с мрежата...</translation> + </message> + <message> + <source>&Overview</source> + <translation>Преглед</translation> + </message> + <message> + <source>Node</source> + <translation>Възел</translation> + </message> + <message> + <source>Show general overview of wallet</source> + <translation>Покажи общ преглед на портфейла</translation> + </message> + <message> + <source>&Transactions</source> + <translation>Транзакции</translation> + </message> + <message> + <source>Browse transaction history</source> + <translation>Разгледай история на транзакциите</translation> + </message> + <message> + <source>E&xit</source> + <translation>Изход</translation> + </message> + <message> + <source>Quit application</source> + <translation>Излез от приложението</translation> + </message> + <message> + <source>&About %1</source> + <translation>За %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Покажи информация за %1</translation> + </message> + <message> + <source>About &Qt</source> + <translation>Относно Qt</translation> + </message> + <message> + <source>Show information about Qt</source> + <translation>Покажи информация отностно Qt</translation> + </message> + <message> + <source>&Options...</source> + <translation>Настройки...</translation> + </message> + <message> + <source>Modify configuration options for %1</source> + <translation>Промени конфигурации за %1</translation> + </message> + <message> + <source>&Encrypt Wallet...</source> + <translation>Криптирай портфейл</translation> + </message> + <message> + <source>&Backup Wallet...</source> + <translation>Направи резервно копие на портфейла...</translation> + </message> + <message> + <source>&Change Passphrase...</source> + <translation>Промени паролата...</translation> + </message> + <message> + <source>&Sending addresses...</source> + <translation>Адреси за пращане...</translation> + </message> + <message> + <source>&Receiving addresses...</source> + <translation>Адреси за получаване...</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>Отвори URI</translation> + </message> + <message> + <source>Reindexing blocks on disk...</source> + <translation>Повторно индексиране на блоковете на диска...</translation> + </message> + </context> +<context> + <name>CoinControlDialog</name> + </context> +<context> + <name>EditAddressDialog</name> + </context> +<context> + <name>FreespaceChecker</name> + </context> +<context> + <name>HelpMessageDialog</name> + </context> +<context> + <name>Intro</name> + </context> +<context> + <name>OpenURIDialog</name> + </context> +<context> + <name>OptionsDialog</name> + </context> +<context> + <name>OverviewPage</name> + </context> +<context> + <name>PeerTableModel</name> + </context> +<context> + <name>QObject</name> + </context> +<context> + <name>RPCConsole</name> + </context> +<context> + <name>ReceiveCoinsDialog</name> + </context> +<context> + <name>ReceiveRequestDialog</name> + </context> +<context> + <name>SendCoinsDialog</name> + </context> +<context> + <name>SendCoinsEntry</name> + </context> +<context> + <name>ShutdownWindow</name> + </context> +<context> + <name>SignVerifyMessageDialog</name> + </context> +<context> + <name>SplashScreen</name> + </context> +<context> + <name>TrafficGraphWidget</name> + </context> +<context> + <name>TransactionDescDialog</name> + </context> +<context> + <name>UnitDisplayStatusBarControl</name> + </context> +<context> + <name>bitcoin-core</name> + <message> + <source>Bitcoin Core</source> + <translation>Биткойн ядро</translation> + </message> + </context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index 3eb384868e..ed259c4d08 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -926,10 +926,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nom del client</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> @@ -1739,14 +1735,6 @@ <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVÍS: comproveu la vostra connexió a la xarxa, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation> </message> diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts index 1fdf0249a5..df0f750a61 100644 --- a/src/qt/locale/bitcoin_ca@valencia.ts +++ b/src/qt/locale/bitcoin_ca@valencia.ts @@ -870,10 +870,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nom del client</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> @@ -1571,14 +1567,6 @@ <translation>Esta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVÍS: comproveu la vostra connexió a la xarxa, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Avís: la xarxa no pareix que hi estiga plenament d'acord. Alguns miners pareix que estan experimentant problemes.</translation> </message> diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 30004e10e4..f985a6928d 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -926,10 +926,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nom del client</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> @@ -1735,14 +1731,6 @@ <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVÍS: s'ha generat un nombre anòmalament alt de blocs, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVÍS: comproveu la vostra connexió a la xarxa, %d blocs rebuts en les darreres %d hores (se n'esperaven %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation> </message> diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index d76839723f..2dfa295ce0 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -918,10 +918,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Název klienta</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> @@ -1715,14 +1711,6 @@ <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá a nepoužívá -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>UPOZORNĚNÍ: vygenerováno nezvykle mnoho bloků – přijato %d bloků jen za posledních %d hodin (očekáváno %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>UPOZORNĚNÍ: zkontroluj své spojení do sítě – bylo přijato %d bloků za posledních %d hodin (očekáváno %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Upozornění: Síť podle všeho není v konzistentním stavu. Někteří těžaři jsou zřejmě v potížích.</translation> </message> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index fd1a4a0863..d298c81bd4 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Klientnavn</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> @@ -1887,14 +1883,6 @@ <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>ADVARSEL: unormalt mange blokke er genereret; %d blokke er modtaget i løbet af de seneste %d timer (%d forventet)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>ADVARSEL: tjek din netværksforbindelse; %d blokke er modtaget i løbet af de seneste %d timer (%d forventet)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Advarsel: Netværket ser ikke ud til at være fuldt ud enige! Enkelte minere ser ud til at opleve problemer.</translation> </message> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 77482c774b..f38f4c10f7 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -782,6 +782,14 @@ <translation>&Programmfenster</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>&Das Icon im System Tray verstecken.</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>Tray Icon verstecken</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Nur ein Symbol im Infobereich anzeigen, nachdem das Programmfenster minimiert wurde.</translation> </message> @@ -982,10 +990,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Clientname</translation> - </message> - <message> <source>N/A</source> <translation>k.A.</translation> </message> @@ -1011,7 +1015,7 @@ </message> <message> <source>Datadir</source> - <translation>Datenverz</translation> + <translation>Datenverzeichnis</translation> </message> <message> <source>Startup time</source> @@ -1098,6 +1102,10 @@ <translation>User-Agent</translation> </message> <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Öffnet die %1-Debugprotokolldatei aus dem aktuellen Datenverzeichnis. Dies kann bei großen Protokolldateien einige Sekunden dauern.</translation> + </message> + <message> <source>Decrease font size</source> <translation>Schrift verkleinern</translation> </message> @@ -1791,6 +1799,10 @@ <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 "[Host]:Port"-Notation verwenden</translation> </message> <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde %s bereits gestartet.</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Alle Wallet-Transaktionen löschen und nur diese Teilbereiche der Blockkette durch -rescan beim Starten wiederherstellen</translation> </message> @@ -1807,6 +1819,14 @@ <translation>Leite Transaktionen von Peers auf der Positivliste auf jeden Fall weiter, auch wenn sie die lokale Weiterleitungsregeln verletzen (Standardeinstellung: %d)</translation> </message> <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da %s ansonsten nicht ordnungsgemäß funktionieren wird.</translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Wenn sie %s nützlich finden, sind Helfer sehr gern gesehen. Besuchen Sie %s um mehr über das Softwareprojekt zu erfahren.</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (%u bis %d, 0 = automatisch, <0 = so viele Kerne frei lassen, Standard: %d)</translation> </message> @@ -1823,14 +1843,6 @@ <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird und -proxy nicht gesetzt ist)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>Warnung: Es wurde eine ungewöhnlich hohe Anzahl Blöcke erzeugt, %d Blöcke wurden in den letzten %d Stunden empfangen (%d wurden erwartet).</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>Warnung: Überprüpfen Sie ihre Netzwerkverbindung, %d Blöcke wurden in den letzten %d Stunden empfangen (%d wurden erwartet).</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Warnung: Das Netzwerk scheint nicht vollständig übereinzustimmen! Einige Miner scheinen Probleme zu haben.</translation> </message> @@ -1843,6 +1855,14 @@ <translation>Gegenstellen die sich von der angegebenen Netzmaske oder IP-Adresse aus verbinden immer zulassen. Kann mehrmals angegeben werden.</translation> </message> <message> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>Sie müssen die Datenbank mit Hilfe von -reindex-chainstate neu aufbauen, um -txindex zu verändern</translation> + </message> + <message> + <source>%s corrupt, salvage failed</source> + <translation>%s beschädigt, Datenrettung fehlgeschlagen</translation> + </message> + <message> <source>-maxmempool must be at least %d MB</source> <translation>-maxmempool muss mindestens %d MB betragen</translation> </message> @@ -1855,6 +1875,10 @@ <translation>Hänge ein Kommentar zur User Agent-Zeichenkette an</translation> </message> <message> + <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <translation>Es wird versucht, private Schlüssel beim Starten aus einem beschädigtem Wallet wiederherzustellen</translation> + </message> + <message> <source>Block creation options:</source> <translation>Blockerzeugungsoptionen:</translation> </message> @@ -1919,6 +1943,14 @@ <translation>Fehler beim Laden von %s</translation> </message> <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Fehler beim Laden von %s: Das Wallet ist beschädigt</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Fehler beim Laden von %s: Das Wallet benötigt eine neuere Version von %s</translation> + </message> + <message> <source>Error loading block database</source> <translation>Fehler beim Laden der Blockdatenbank</translation> </message> diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index 59779692d9..2814e4f6e7 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -835,10 +835,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Όνομα Πελάτη</translation> - </message> - <message> <source>N/A</source> <translation>Μη διαθέσιμο</translation> </message> diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts index 226444e9c5..1893aaca09 100644 --- a/src/qt/locale/bitcoin_en_GB.ts +++ b/src/qt/locale/bitcoin_en_GB.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Client name</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> @@ -1887,14 +1883,6 @@ <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation> </message> diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts index 043b28abc6..4471aeb72e 100644 --- a/src/qt/locale/bitcoin_eo.ts +++ b/src/qt/locale/bitcoin_eo.ts @@ -742,10 +742,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nomo de kliento</translation> - </message> - <message> <source>N/A</source> <translation>neaplikebla</translation> </message> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 80cbe39932..c67016637b 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -990,10 +990,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nombre del cliente</translation> - </message> - <message> <source>N/A</source> <translation>N/D</translation> </message> @@ -1886,14 +1882,6 @@ <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>ADVERTENCIA: anormalmente alto número de bloques generado, %d bloques recibidos en las últimas horas %d (%d espera)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>ADVERTENCIA: comprueba tu conexión de red, %d bloques recibidos en las últimas %d horas (%d esperados)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Atención: ¡Parece que la red no está totalmente de acuerdo! Algunos mineros están presentando inconvenientes.</translation> </message> diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index ff0fce6119..188641d6e7 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -458,10 +458,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nombre del cliente</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts index 3f4380840a..ba963d2b80 100644 --- a/src/qt/locale/bitcoin_es_DO.ts +++ b/src/qt/locale/bitcoin_es_DO.ts @@ -640,10 +640,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nombre del cliente</translation> - </message> - <message> <source>N/A</source> <translation>N/D</translation> </message> diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index e861d4e472..0d659fd719 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -542,10 +542,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Kliendi nimi</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 5bebb35822..8bf727a0cd 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -730,10 +730,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>نام کلاینت</translation> - </message> - <message> <source>N/A</source> <translation>ناموجود</translation> </message> diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index b329612ded..8faa3ce659 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -300,10 +300,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>نام کنسول RPC</translation> - </message> - <message> <source>Client version</source> <translation>ویرایش کنسول RPC</translation> </message> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index c2226e9b98..b7b3115e25 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -930,10 +930,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Pääteohjelman nimi</translation> - </message> - <message> <source>N/A</source> <translation>Ei saatavilla</translation> </message> @@ -1719,14 +1715,6 @@ <translation>Käytä UPnP:ta kuuntelevan portin kartoitukseen (oletus: 1 kun kuunnellaan ja -proxy ei käytössä)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>VAROITUS: epätavallisen monta lohkoa generoitu, vastaanotettu %d lohkoa viimeisen %d tunnin aikana (odotettavissa %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>VAROITUS: tarkista verkkoyhteytesi, vastaanotettu %d lohkoa viimeisen %d tunnin aikana (odotettavissa %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Varoitus: Tietoverkko ei ole sovussa! Luohijat näyttävät kokevan virhetilanteita.</translation> </message> diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index 5c4f7f2b04..0b538d7664 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nom du client</translation> - </message> - <message> <source>N/A</source> <translation>N.D.</translation> </message> @@ -1867,14 +1863,6 @@ <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 lors de l'écoute et pas de mandataire -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVERTISSEMENT : un nombre anormalement élevé de blocs a été généré, %d blocs reçus durant les %d dernières heures (%d attendus)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVERTISSEMENT : vérifiez votre connexion réseau, %d blocs reçus durant les %d dernières heures (%d attendus)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Avertissement : le réseau ne semble pas totalement d'accord ! Quelques mineurs semblent éprouver des difficultés.</translation> </message> diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts index 08824e113a..a6f6ac4fd1 100644 --- a/src/qt/locale/bitcoin_fr_FR.ts +++ b/src/qt/locale/bitcoin_fr_FR.ts @@ -810,10 +810,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nom du client</translation> - </message> - <message> <source>N/A</source> <translation>N/A </translation> </message> diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts index f3673b6dc7..9aa7b55096 100644 --- a/src/qt/locale/bitcoin_gl.ts +++ b/src/qt/locale/bitcoin_gl.ts @@ -596,10 +596,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nome do cliente</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index fbe16364eb..4a293c1c3f 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -828,10 +828,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>שם לקוח</translation> - </message> - <message> <source>N/A</source> <translation>לא זמין</translation> </message> diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index 0d8d3d5c99..f5accfb0b8 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -658,10 +658,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Ime klijenta</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index bddc430f22..9eb0cf76c4 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -806,10 +806,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Kliens néve</translation> - </message> - <message> <source>N/A</source> <translation>Nem elérhető</translation> </message> diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index fe07ab7a29..feb6f690c4 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -854,10 +854,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nama Klien</translation> - </message> - <message> <source>N/A</source> <translation>T/S</translation> </message> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index b92dbb2cb3..55bc9c3c82 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -931,10 +931,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nome del client</translation> - </message> - <message> <source>N/A</source> <translation>N/D</translation> </message> @@ -1748,14 +1744,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Utilizza UPnP per mappare la porta in ascolto (default: 1 quando in ascolto e -proxy non è specificato)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>ATTENZIONE, il numero di blocchi generati è insolitamente elevato: %d blocchi ricevuti nelle ultime %d ore (%d previsti)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>ATTENZIONE, si consiglia di verificare la connessione di rete: %d blocchi ricevuti nelle ultime %d ore (%d previsti)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Attenzione: La rete non sembra trovarsi in pieno consenso! Alcuni minatori sembrano riscontrare problemi.</translation> </message> diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 460a652e37..4948cc3067 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>クライアント名</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> @@ -1887,14 +1883,6 @@ <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中および-proxyが指定されていない場合は1)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>警告：異常に多くの数のブロックが生成されています。%d ブロックが最近 %d 時間以内に受け取られました。(期待値: %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>警告：ネットワーク接続を確認してください。%d ブロックが最近 %d 時間以内にに受け取られました。(期待値: %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>警告： ネットワークは完全に同意しないみたいです。マイナーは何かの問題を経験してるみたいなんです。</translation> </message> diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts index 22e7651f63..80508be8ee 100644 --- a/src/qt/locale/bitcoin_ka.ts +++ b/src/qt/locale/bitcoin_ka.ts @@ -664,10 +664,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>კლიენტი</translation> - </message> - <message> <source>N/A</source> <translation>მიუწვდ.</translation> </message> diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index 11e5d35af2..012632c0e0 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -926,10 +926,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>클라이언트 이름</translation> - </message> - <message> <source>N/A</source> <translation>없음</translation> </message> @@ -1759,14 +1755,6 @@ <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: 열려있거나 -proxy 옵션을 사용하지 않을 시 1)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>경고: 비정상적으로 많은 블록이 생성되고 있습니다. %d 블록은 마지막 %d에 수신되었습니다 (%d 예측됨)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>경고: 네트워크 연결을 확인해 주세요. %d 블록은 마지막 %d에 수신되었습니다 (%d 예측됨)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>경고 : 모든 네트워크가 동의해야 하나, 일부 채굴자들에게 문제가 있는 것으로 보입니다. </translation> </message> diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts index ebaddba7e9..dc532fe011 100644 --- a/src/qt/locale/bitcoin_la.ts +++ b/src/qt/locale/bitcoin_la.ts @@ -444,10 +444,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nomen clientis</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 9e98baa77a..1f6cda1f52 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -564,10 +564,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Kliento pavadinimas</translation> - </message> - <message> <source>N/A</source> <translation>nėra</translation> </message> diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts index bac5875695..38333531e4 100644 --- a/src/qt/locale/bitcoin_lv_LV.ts +++ b/src/qt/locale/bitcoin_lv_LV.ts @@ -652,10 +652,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Klienta vārds</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts index e38320ac5d..d9ef0d127b 100644 --- a/src/qt/locale/bitcoin_mn.ts +++ b/src/qt/locale/bitcoin_mn.ts @@ -292,10 +292,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Клиентийн нэр</translation> - </message> - <message> <source>N/A</source> <translation>Алга Байна</translation> </message> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index b5ffdb2e10..4538fd6e1e 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -930,10 +930,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Klientnavn</translation> - </message> - <message> <source>N/A</source> <translation>-</translation> </message> @@ -1747,14 +1743,6 @@ <translation>Bruk UPnP for lytteport (standardverdi: 1 ved lytting og uten -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>ADVARSEL: unormalt høyt antall blokker generert, %d blokker mottatt de siste %d timene (%d forventet)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>ADVARSEL: kontroller nettverkstilkoblingen, mottok %d blokker i de siste %d timene (%d forventet)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Advarsel: Nettverket ser ikke ut til å være enig! Noen minere ser ut til å ha problemer.</translation> </message> diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 2b0cded386..781c5a8fd6 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Clientnaam</translation> - </message> - <message> <source>N/A</source> <translation>N.v.t.</translation> </message> @@ -1871,14 +1867,6 @@ <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er geluisterd worden en geen -proxy is meegegeven)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>WAARSCHUWING: abnormaal hoog aantal blokken is gegenereerd, %d blokken ontvangen in de laatste %d uren (%d verwacht)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>WAARSCHUWING: controleer uw netwerkverbinding, %d blokken ontvangen in de laatste %d uren (%d verwacht)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Waarschuwing: Het lijkt erop dat het netwerk geen consensus kan vinden! Sommige delvers lijken problemen te ondervinden.</translation> </message> diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts index 12151a576c..5351543338 100644 --- a/src/qt/locale/bitcoin_pam.ts +++ b/src/qt/locale/bitcoin_pam.ts @@ -428,10 +428,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Lagyu ning kliente</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 6d41cbeef2..a88e505b39 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nazwa klienta</translation> - </message> - <message> <source>N/A</source> <translation>NIEDOSTĘPNE</translation> </message> @@ -1840,14 +1836,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Użyj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje i brak -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>UWAGA: nienaturalnie duża liczba wygenerowanych bloków, %d bloków otrzymano w ostatnich %d godzinach (%d oczekiwanych)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>UWAGA: sprawdź swoje połączenie sieciowe, %d bloków otrzymano w ostatnich %d godzinach (%d oczekiwanych)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Ostrzeżenie: Sieć nie wydaje się w pełni zgodna! Niektórzy górnicy wydają się doświadczać problemów.</translation> </message> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index fe9dd66269..2941430392 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -115,6 +115,10 @@ <translation>&About %1</translation> </message> <message> + <source>Show information about %1</source> + <translation>Mostrar informações sobre %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Sobre &Qt</translation> </message> @@ -572,6 +576,14 @@ <translation>Bem vindo ao %1</translation> </message> <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Como essa é a primeira vez que o programa é executado, você pode escolher onde %1 armazenará seus dados.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>O %1 irá baixar e armazenar uma cópia do block chain do Bitcoin. Pelo menos %2GB de dados serão armazenados neste diretório, e ele crescerá ao longo do tempo. A carteira também será armazenada neste diretório.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Use o diretório de dados padrão</translation> </message> @@ -982,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nome do cliente</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> @@ -1010,6 +1018,10 @@ <translation>Versão do BerkeleyDB</translation> </message> <message> + <source>Datadir</source> + <translation>Datadir</translation> + </message> + <message> <source>Startup time</source> <translation>Horário de inicialização</translation> </message> @@ -1094,6 +1106,10 @@ <translation>User Agent</translation> </message> <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Abrir o arquivo de log de depuração do %1 localizado no diretório atual de dados. Isso pode levar alguns segundos para arquivos de log grandes.</translation> + </message> + <message> <source>Decrease font size</source> <translation>Diminuir o tamanho da fonte</translation> </message> @@ -1795,6 +1811,10 @@ <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation> </message> <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Não foi possível obter exclusividade de escrita no endereço %s. O %s provavelmente já está sendo executado.</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Apaga todas as transações da carteira e somente recupera essas partes da blockchain usando o comando -rescan na inicialização</translation> </message> @@ -1803,6 +1823,14 @@ <translation>Distribuido sob a licença MIT software license. Veja os termos em <http://www.opensource.org/licenses/mit-license.php>.</translation> </message> <message> + <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> + <translation>Erro ao carregar %s. Não é permitido habilitar HD em carteiras não-HD pre existentes.</translation> + </message> + <message> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>Erro ao ler arquivo %s! Todas as chaves foram lidas corretamente, mas os dados de transação ou o livro de endereos podem estar faltando ou incorretos.</translation> + </message> + <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation> </message> @@ -1811,6 +1839,22 @@ <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation> </message> <message> + <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> + <translation>A mediana máxima permitida de peer time compensa o ajuste. Perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation> + </message> + <message> + <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Preço máximo total (in %s) aplicado a uma única transação de carteira ou transação crua; aplicar isto tão baixo pode abortar grandes transações (padrão: %s)</translation> + </message> + <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Por favor verifique que a data e o horário de seu computador estão corretos. Se o relógio de seu computador estiver incorreto, %s não funcionarão corretamente.</translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Por favor contribua se você entender que %s é útil. Visite %s para mais informações sobre o software.</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Define o número de threads de verificação de script (%u a %d, 0 = automático, <0 = número de cores deixados livres, padrão: %d)</translation> </message> @@ -1827,14 +1871,6 @@ <translation>Use UPnP para mapear a porta escutada (padrão: 1 quando escutando e sem -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVISO: números estranhamente altos de blocos gerados, %d blocos recebidos nas últimas %d horas (%d esperados)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>ATENÇÃO: verifique sua conexão %d blocos recebidos nas últimas %d horas (%d tempo estimado)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Atenção: A rede não parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</translation> </message> diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index 16b912dfdc..f63bfece69 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -963,10 +963,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nome do Cliente</translation> - </message> - <message> <source>N/A</source> <translation>N/D</translation> </message> @@ -1812,14 +1808,6 @@ <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: 1 quando escutar e sem -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVISO: gerado um número anormalmente elevado de blocos, %d blocos recebidos nas últimas %d horas (%d esperados)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>AVISO: verifique a sua conexão à rede, %d blocos recebidos nas últimas %d horas (%d esperados)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Aviso: A rede não parece estar completamente de acordo! Parece que alguns mineiros estão com dificuldades técnicas.</translation> </message> diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index e6f591aa9e..489ed07639 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -914,10 +914,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Nume client</translation> - </message> - <message> <source>N/A</source> <translation>indisponibil</translation> </message> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 750ea7db65..60f5d5dfa2 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -990,10 +990,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Имя клиента</translation> - </message> - <message> <source>N/A</source> <translation>Н/Д</translation> </message> @@ -1110,6 +1106,14 @@ <translation>Открыть отладочный лог-файл %1 из текущего каталога данных. Это может занять несколько секунд для больших лог-файлов.</translation> </message> <message> + <source>Decrease font size</source> + <translation>Уменьшить размер текста</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Увеличить размер текста</translation> + </message> + <message> <source>Services</source> <translation>Сервисы</translation> </message> @@ -1214,6 +1218,10 @@ <translation>&Разблокировать узел</translation> </message> <message> + <source>Welcome to the %1 RPC console.</source> + <translation>Добро пожаловать в консоль RPC %1.</translation> + </message> + <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Используйте стрелки вверх и вниз для просмотра истории и <b>Ctrl-L</b> для очистки экрана.</translation> </message> @@ -1593,6 +1601,10 @@ <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>%1 выключается...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>Не выключайте компьютер, пока это окно не исчезнет.</translation> </message> @@ -1783,10 +1795,22 @@ <translation>Bitcoin Core</translation> </message> <message> + <source>The %s developers</source> + <translation>Разработчики %s</translation> + </message> + <message> + <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Установлено очень большое значение -fallbackfee! Это комиссия за транзацию, которую вы можете заплатить, если оценка размера комиссии не доступна. </translation> + </message> + <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Привязаться к указанному адресу и всегда прослушивать только его. Используйте [хост]:порт для IPv6</translation> </message> <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Невозможно заблокировать каталог данных %s. %s возможно уже работает.</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Удалить все транзакции бумажника с возможностью восстановить эти части цепи блоков с помощью -rescan при запуске</translation> </message> @@ -1795,6 +1819,10 @@ <translation>Распространяется под лицензией MIT, см. приложенный файл COPYING или <http://www.opensource.org/licenses/mit-license.php>.</translation> </message> <message> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>Ошибка чтения %s! Все ключи прочитаны верно, но данные транзакций или записи адресной книги могут отсутствовать или быть неправильными.</translation> + </message> + <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation> </message> @@ -1803,6 +1831,10 @@ <translation>Всегда разрешать транзакции, полученные от участников из белого списка (по умолчанию: %d)</translation> </message> <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Пожалуйста убедитесь в корректности установки времени и даты на вашем компьютере! Если время установлено неверно, %s не будет работать правильно.</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Задать число потоков проверки скрипта (от %u до %d, 0=авто, <0 = оставить столько ядер свободными, по умолчанию: %d)</translation> </message> @@ -1819,14 +1851,6 @@ <translation>Использовать UPnP для проброса порта (по умолчанию: 1, если используется прослушивание и нет -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>ВНИМАНИЕ: сгенерировано ненормально большое число блоков, %d блоков получено за последние %d часов (ожидалось %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>ВНИМАНИЕ: проверьте сетевое подключение, получено %d блоков за последние %d часов (ожидалось %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Внимание: похоже, в сети нет полного согласия! Некоторый майнеры, возможно, испытывают проблемы.</translation> </message> @@ -1839,6 +1863,10 @@ <translation>Вносить в белый список участников, подключающихся с указанной маски сети или IP. Можно использовать многократно.</translation> </message> <message> + <source>%s corrupt, salvage failed</source> + <translation>%s поврежден, восстановить не удалось</translation> + </message> + <message> <source>-maxmempool must be at least %d MB</source> <translation>-maxmempool должен быть как минимум %d MB</translation> </message> @@ -1851,6 +1879,10 @@ <translation>Добавить комментарий к строке пользовательского агента</translation> </message> <message> + <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <translation>Попытаться восстановить приватные ключи из повреждённого бумажника при запуске</translation> + </message> + <message> <source>Block creation options:</source> <translation>Параметры создания блоков:</translation> </message> @@ -1863,6 +1895,10 @@ <translation>Параметры подключения:</translation> </message> <message> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i-%i</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>БД блоков повреждена</translation> </message> @@ -1907,6 +1943,14 @@ <translation>Ошибка загрузки %s</translation> </message> <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Ошибка загрузки %s: Бумажник поврежден</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Ошибка загрузки %s: Для бумажника требуется более новая версия %s</translation> + </message> + <message> <source>Error loading block database</source> <translation>Ошибка чтения базы данных блоков</translation> </message> @@ -1935,10 +1979,18 @@ <translation>Неверный -onion адрес: '%s'</translation> </message> <message> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>Неверная сумма для -%s=<amount>: '%s'</translation> + </message> + <message> <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> <translation>Сбрасывать транзакции из памяти на диск каждые <n> мегабайт (по умолчанию: %u)</translation> </message> <message> + <source>Loading banlist...</source> + <translation>Загрузка банлиста...</translation> + </message> + <message> <source>Location of the auth cookie (default: data dir)</source> <translation>Расположение куки входы(по умолчанию: data dir)</translation> </message> @@ -1951,6 +2003,10 @@ <translation>Соединяться только по сети <net> (ipv4, ipv6 или onion)</translation> </message> <message> + <source>Print this help message and exit</source> + <translation>Вывести эту справку и выйти</translation> + </message> + <message> <source>Print version and exit</source> <translation>Написать версию и выйти</translation> </message> @@ -1963,10 +2019,18 @@ <translation>Режим удаления блоков несовместим с -txindex.</translation> </message> <message> + <source>Rebuild chain state from the currently indexed blocks</source> + <translation>Перестроить индекс цепи из текущих индексированных блоков</translation> + </message> + <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Установить размер кэша БД в мегабайтах(от %d до %d, по умолчанию: %d)</translation> </message> <message> + <source>Set maximum block cost (default: %d)</source> + <translation>Задать максимальную стоимость блока (по умолчанию: %d)</translation> + </message> + <message> <source>Set maximum block size in bytes (default: %d)</source> <translation>Задать максимальный размер блока в байтах (по умолчанию: %d)</translation> </message> @@ -1975,6 +2039,14 @@ <translation>Укажите файл бумажника (внутри каталога данных)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>Исходный код доступен в %s.</translation> + </message> + <message> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>Невозможно привязаться к %s на этом компьютере. Возможно, %s уже работает.</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Неподдерживаемый аргумент -benchmark проигнорирован, используйте -debug=bench.</translation> </message> @@ -2007,6 +2079,14 @@ <translation>Бумажник %s располагается вне каталога данных %s</translation> </message> <message> + <source>Wallet debugging/testing options:</source> + <translation>Параметры отладки/тестирования бумажника:</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Необходимо перезаписать бумажник, перезапустите %s для завершения операции.</translation> + </message> + <message> <source>Wallet options:</source> <translation>Настройки бумажника:</translation> </message> @@ -2307,6 +2387,10 @@ <translation>Внимание: Получена неизвестная версия блока! Возможно неизвестные правила вступили в силу.</translation> </message> <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>Внимание: Файл бумажника поврежден, данные восстановлены! Оригинальный %s сохранен как %s в %s; Если баланс или транзакции некорректны, вы должны восстановить файл из резервной копии.</translation> + </message> + <message> <source>(default: %s)</source> <translation>(по умолчанию: %s)</translation> </message> diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index e2b8a02015..a4f0ebcb4e 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -930,10 +930,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Meno klienta</translation> - </message> - <message> <source>N/A</source> <translation>nie je k dispozícii</translation> </message> @@ -1708,14 +1704,6 @@ <translation>Toto je pred-testovacia verzia - použitie je na vlastné riziko - nepoužívajte na tvorbu bitcoin ani obchodovanie.</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>VAROVANIE: príliš veľa vygenerovaných blokov; %d prijatých blokov v posledných %d hodinách (očakávaných %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>VAROVANIE: skontrolujte sieťové pripojenie, %d prijatých blokov za posledných %d hodín (očakávané %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Varovanie: Javí sa že sieť sieť úplne nesúhlasí! Niektorí mineri zjavne majú ťažkosti. diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts index 155be7bb27..16ef20ea3a 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -870,10 +870,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Ime odjemalca</translation> - </message> - <message> <source>N/A</source> <translation>Neznano</translation> </message> @@ -1567,14 +1563,6 @@ <translation>To je preizkusna različica še neizdanega programa. Uporabljate jo na lastno odgovornost. Programa ne uporabljajte je za rudarjenje ali trgovske aplikacije.</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>OPOZORILO: Generirano je bilo nenavadno veliko število blokov. Št. prejetih blokov: %d v št. ur: %d (pričakovanih je %d blokov)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>OPOZORILO: Preverite vašo omrežno povezavo. Št. prejetih blokov: %d v št. ur: %d (pričakovanih je %d blokov)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Opozorilo: Trenutno na omrežju ni videti konsenza! Videti je, kot da bi imeli nekateri rudarji težave.</translation> </message> diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index 6361b5ea5f..ee46974d8b 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Klientnamn</translation> - </message> - <message> <source>N/A</source> <translation>ej tillgänglig</translation> </message> @@ -1883,14 +1879,6 @@ <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 när lyssning aktiverat och utan -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>Varning: Onormalt antal block block genererade. %d block mottagna senaste %d timmarna (%d förväntade)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>Varning: Kontrollera din närverksanslutning. %d block mottagna senaste %d timmarna, (%d förväntade)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Varning: Nätverket verkar inte vara helt överens! Några miners verkar ha problem.</translation> </message> diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts index 6878d23fe2..921171c544 100644 --- a/src/qt/locale/bitcoin_ta.ts +++ b/src/qt/locale/bitcoin_ta.ts @@ -372,10 +372,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>வாடிக்கையாளர் பெயர்</translation> - </message> - <message> <source>N/A</source> <translation>N/A</translation> </message> diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index f6ab2ca18b..bbd0117404 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>İstemci ismi</translation> - </message> - <message> <source>N/A</source> <translation>Mevcut değil</translation> </message> @@ -1875,14 +1871,6 @@ <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>İKAZ: anormal yüksek sayıda blok oluşturulmuştur, %d blok son %d saat içinde alınmıştır (%d bekleniyordu)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>İKAZ: ağ bağlantınızı kontrol ediniz, %d blok son %d saat içinde alınmıştır (%d bekleniyordu)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Uyarı: şebeke tamamen mutabık değil gibi görünüyor! Bazı madenciler sorun yaşıyor gibi görünüyor.</translation> </message> diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 668e787a6e..a06cc9e092 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -930,10 +930,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Назва клієнту</translation> - </message> - <message> <source>N/A</source> <translation>Н/Д</translation> </message> @@ -1747,14 +1743,6 @@ <translation>Використовувати UPnP для відображення порту, що прослуховується (типово: 1 при прослуховуванні та за відсутності -proxy)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>УВАГА: аномально висока кількість згенерованих блоків, %d блок(ів) було отримано за останні %d годин(и) (має бути %d)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>УВАГА: перевірте ваше мережеве з'єднання, %d блок(ів) було отримано за останні %d годин(и) (має бути %d)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Увага: Частина мережі використовує інший головний ланцюжок! Деякі добувачі, можливо, зазнають проблем.</translation> </message> diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts index ce33262976..0062abfc1d 100644 --- a/src/qt/locale/bitcoin_uz@Cyrl.ts +++ b/src/qt/locale/bitcoin_uz@Cyrl.ts @@ -728,10 +728,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>Мижоз номи</translation> - </message> - <message> <source>N/A</source> <translation>Тўғри келмайди</translation> </message> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 8f467b79c1..92a7006d30 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -930,10 +930,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>客户端名称</translation> - </message> - <message> <source>N/A</source> <translation>不可用</translation> </message> @@ -1764,14 +1760,6 @@ <translation>使用UPnP暴露本机监听端口（默认：1 当正在监听且不使用代理）</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>警告：数据块生成数量异常，最近 %d 小时收到了 %d 个数据块（预期为 %d 个）</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>警告：请检查您的网络连接，最近 %d 小时收到了 %d 个数据块（预期为 %d 个）</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>警告：网络似乎并不完全同意！有些矿工似乎遇到了问题。</translation> </message> diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index c71a37ba98..ab56f96795 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -994,10 +994,6 @@ <context> <name>RPCConsole</name> <message> - <source>Client name</source> - <translation>客戶端軟體名稱</translation> - </message> - <message> <source>N/A</source> <translation>未知</translation> </message> @@ -1865,7 +1861,7 @@ </message> <message> <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> - <translation>如果你覺得 %s 有用，可以捐助我們。關於這個軟體的更多資訊請見 %s。</translation> + <translation>如果你覺得 %s 有用，可以幫助我們。關於這個軟體的更多資訊請見 %s。</translation> </message> <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> @@ -1888,14 +1884,6 @@ <translation>是否要使用「通用即插即用」協定(UPnP)，來設定聽候連線的通訊埠的對應(預設值: 當有聽候連線且沒有指定 -proxy 參數時為 1)</translation> </message> <message> - <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source> - <translation>警告: 收到了不尋常地多的 %d 個區塊在過去 %d 小時內生產出來(預期是 %d 個)</translation> - </message> - <message> - <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source> - <translation>警告: 請檢查你的網路連線狀況，收到了 %d 個區塊是在過去 %d 小時內生產出來(預期是 %d 個)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>警告: 節點網路對於區塊鏈結的決定目前有分歧！看來有些礦工會有問題。</translation> </message> diff --git a/src/script/script.cpp b/src/script/script.cpp index da551c23ee..ddf6775569 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -132,7 +132,7 @@ const char* GetOpName(opcodetype opcode) // expanson case OP_NOP1 : return "OP_NOP1"; case OP_CHECKLOCKTIMEVERIFY : return "OP_CHECKLOCKTIMEVERIFY"; - case OP_NOP3 : return "OP_NOP3"; + case OP_CHECKSEQUENCEVERIFY : return "OP_CHECKSEQUENCEVERIFY"; case OP_NOP4 : return "OP_NOP4"; case OP_NOP5 : return "OP_NOP5"; case OP_NOP6 : return "OP_NOP6"; diff --git a/src/script/script.h b/src/script/script.h index 71af3754bc..278774d32e 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -167,8 +167,8 @@ enum opcodetype OP_NOP1 = 0xb0, OP_CHECKLOCKTIMEVERIFY = 0xb1, OP_NOP2 = OP_CHECKLOCKTIMEVERIFY, - OP_NOP3 = 0xb2, - OP_CHECKSEQUENCEVERIFY = OP_NOP3, + OP_CHECKSEQUENCEVERIFY = 0xb2, + OP_NOP3 = OP_CHECKSEQUENCEVERIFY, OP_NOP4 = 0xb3, OP_NOP5 = 0xb4, OP_NOP6 = 0xb5, diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json index 9b81e0c77d..fcd5457386 100644 --- a/src/test/data/script_tests.json +++ b/src/test/data/script_tests.json @@ -232,8 +232,8 @@ ["'abcdefghijklmnopqrstuvwxyz'", "HASH256 0x4c 0x20 0xca139bc10c2f660da42666f72e89a225936fc60f193c161124a672050c434671 EQUAL", "P2SH,STRICTENC", "OK"], -["1","NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC", "OK"], -["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC", "OK"], +["1","NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC", "OK"], +["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC", "OK"], ["1", "NOP", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "OK", "Discourage NOPx flag allows OP_NOP"], @@ -443,7 +443,7 @@ ["NOP", "NOP1 1", "P2SH,STRICTENC", "OK"], ["NOP", "CHECKLOCKTIMEVERIFY 1", "P2SH,STRICTENC", "OK"], -["NOP", "NOP3 1", "P2SH,STRICTENC", "OK"], +["NOP", "CHECKSEQUENCEVERIFY 1", "P2SH,STRICTENC", "OK"], ["NOP", "NOP4 1", "P2SH,STRICTENC", "OK"], ["NOP", "NOP5 1", "P2SH,STRICTENC", "OK"], ["NOP", "NOP6 1", "P2SH,STRICTENC", "OK"], @@ -701,7 +701,7 @@ ["0x17 0x3014021077777777777777777777777777777777020001", "0 CHECKSIG NOT", "", "OK", "Zero-length S is correctly encoded for DERSIG"], ["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "", "OK", "Negative S is correctly encoded"], -["2147483648", "NOP3", "CHECKSEQUENCEVERIFY", "OK", "CSV passes if stack top bit 1 << 31 is set"], +["2147483648", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "OK", "CSV passes if stack top bit 1 << 31 is set"], ["", "DEPTH", "P2SH,STRICTENC", "EVAL_FALSE", "Test the test: we should have an empty stack after scriptSig evaluation"], [" ", "DEPTH", "P2SH,STRICTENC", "EVAL_FALSE", "and multiple spaces should not change that."], @@ -857,13 +857,13 @@ ["2 2 LSHIFT", "8 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"], ["2 1 RSHIFT", "1 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"], -["1", "NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"], -["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"], +["1", "NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"], +["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"], ["Ensure 100% coverage of discouraged NOPS"], ["1", "NOP1", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"], ["1", "CHECKLOCKTIMEVERIFY", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"], -["1", "NOP3", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"], +["1", "CHECKSEQUENCEVERIFY", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"], ["1", "NOP4", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"], ["1", "NOP5", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"], ["1", "NOP6", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"], @@ -2119,11 +2119,11 @@ ], ["CHECKSEQUENCEVERIFY tests"], -["", "NOP3", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a empty stack"], -["-1", "NOP3", "CHECKSEQUENCEVERIFY", "NEGATIVE_LOCKTIME", "CSV automatically fails if stack top is negative"], -["0x0100", "NOP3", "CHECKSEQUENCEVERIFY,MINIMALDATA", "UNKNOWN_ERROR", "CSV fails if stack top is not minimally encoded"], -["0", "NOP3", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "CSV fails if stack top bit 1 << 31 is set and the tx version < 2"], -["4294967296", "NOP3", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", +["", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on a empty stack"], +["-1", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "NEGATIVE_LOCKTIME", "CSV automatically fails if stack top is negative"], +["0x0100", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY,MINIMALDATA", "UNKNOWN_ERROR", "CSV fails if stack top is not minimally encoded"], +["0", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "CSV fails if stack top bit 1 << 31 is set and the tx version < 2"], +["4294967296", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "CSV fails if stack top bit 1 << 31 is not set, and tx version < 2"], ["The End"] ] diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json index 05502a83f7..f8baee0577 100644 --- a/src/test/data/tx_invalid.json +++ b/src/test/data/tx_invalid.json @@ -200,41 +200,41 @@ ["CHECKSEQUENCEVERIFY tests"], ["By-height locks, with argument just beyond txin.nSequence"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["By-time locks, with argument just beyond txin.nSequence (but within numerical boundries)"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194305 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194305 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Argument missing"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Argument negative with by-blockheight txin.nSequence=0"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Argument negative with by-blocktime txin.nSequence=CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Argument/tx height/time mismatch, both versions"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["6 byte non-minimally-encoded arguments are invalid even if their contents are valid"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x06 0x000000000000 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x06 0x000000000000 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff00000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Failure due to failing CHECKSEQUENCEVERIFY in scriptSig"], @@ -246,9 +246,9 @@ "0200000001000100000000000000000000000000000000000000000000000000000000000000000000030251b2000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Failure due to insufficient tx.nVersion (<2)"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]], "010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]], "010000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Unknown witness program version (with DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM)"], diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json index c9fe4e313a..1ea70135b4 100644 --- a/src/test/data/tx_valid.json +++ b/src/test/data/tx_valid.json @@ -236,77 +236,77 @@ ["CHECKSEQUENCEVERIFY tests"], ["By-height locks, with argument == 0 and == txin.nSequence"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff00000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["By-time locks, with argument == 0 and == txin.nSequence"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Upper sequence with upper sequence is fine"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000800100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000800100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000feffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Argument 2^31 with various nSequence"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Argument 2^32-1 with various nSequence"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Argument 3<<31 with various nSequence"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["5 byte non-minimally-encoded operandss are valid"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x05 0x0000000000 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x05 0x0000000000 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["The argument can be calculated rather than created directly by a PUSHDATA"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194303 1ADD NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194303 1ADD CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 1SUB NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 1SUB CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff00000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["An ADD producing a 5-byte result that sets CTxIn::SEQUENCE_LOCKTIME_DISABLE_FLAG"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 65536 NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 65536 CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], -[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 4259840 ADD NOP3 1"]], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 4259840 ADD CHECKSEQUENCEVERIFY 1"]], "020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"], ["Valid CHECKSEQUENCEVERIFY in scriptSig"], diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 8dea388332..e8a63ae60c 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -84,7 +84,7 @@ ScriptError VerifyWithFlag(const CTransaction& output, const CMutableTransaction * and witness such that spendingTx spends output zero of creationTx. * Also inserts creationTx's output into the coins view. */ -void BuildTxs(CMutableTransaction& spendingTx, CCoinsViewCache& coins, CMutableTransaction& creationTx, const CScript& scriptPubKey, const CScript& scriptSig, const CTxinWitness& witness) +void BuildTxs(CMutableTransaction& spendingTx, CCoinsViewCache& coins, CMutableTransaction& creationTx, const CScript& scriptPubKey, const CScript& scriptSig, const CTxInWitness& witness) { creationTx.nVersion = 1; creationTx.vin.resize(1); @@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) // Do not use a valid signature to avoid using wallet operations. CScript scriptSig = CScript() << OP_0 << OP_0; - BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxinWitness()); + BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxInWitness()); // Legacy counting only includes signature operations in scriptSigs and scriptPubKeys // of a transaction and does not take the actual executed sig operations into account. // spendingTx in itself does not contain a signature operation. @@ -151,7 +151,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript)); CScript scriptSig = CScript() << OP_0 << OP_0 << ToByteVector(redeemScript); - BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxinWitness()); + BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, CTxInWitness()); assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2 * WITNESS_SCALE_FACTOR); assert(VerifyWithFlag(creationTx, spendingTx, flags) == SCRIPT_ERR_CHECKMULTISIGVERIFY); } @@ -161,7 +161,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript p2pk = CScript() << ToByteVector(pubkey) << OP_CHECKSIG; CScript scriptPubKey = GetScriptForWitness(p2pk); CScript scriptSig = CScript(); - CTxinWitness witness; + CTxInWitness witness; CScriptWitness scriptWitness; scriptWitness.stack.push_back(vector<unsigned char>(0)); scriptWitness.stack.push_back(vector<unsigned char>(0)); @@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript scriptSig = GetScriptForWitness(p2pk); CScript scriptPubKey = GetScriptForDestination(CScriptID(scriptSig)); scriptSig = CScript() << ToByteVector(scriptSig); - CTxinWitness witness; + CTxInWitness witness; CScriptWitness scriptWitness; scriptWitness.stack.push_back(vector<unsigned char>(0)); scriptWitness.stack.push_back(vector<unsigned char>(0)); @@ -209,7 +209,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript witnessScript = CScript() << 1 << ToByteVector(pubkey) << ToByteVector(pubkey) << 2 << OP_CHECKMULTISIGVERIFY; CScript scriptPubKey = GetScriptForWitness(witnessScript); CScript scriptSig = CScript(); - CTxinWitness witness; + CTxInWitness witness; CScriptWitness scriptWitness; scriptWitness.stack.push_back(vector<unsigned char>(0)); scriptWitness.stack.push_back(vector<unsigned char>(0)); @@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript redeemScript = GetScriptForWitness(witnessScript); CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript)); CScript scriptSig = CScript() << ToByteVector(redeemScript); - CTxinWitness witness; + CTxInWitness witness; CScriptWitness scriptWitness; scriptWitness.stack.push_back(vector<unsigned char>(0)); scriptWitness.stack.push_back(vector<unsigned char>(0)); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 8538f880ff..2747477fd9 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -564,8 +564,8 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp) if (!address.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); CScript scriptPubKey = GetScriptForDestination(address.Get()); - if (!IsMine(*pwalletMain,scriptPubKey)) - return (double)0.0; + if (!IsMine(*pwalletMain, scriptPubKey)) + return ValueFromAmount(0); // Minimum confirmations int nMinDepth = 1; @@ -643,7 +643,7 @@ UniValue getreceivedbyaccount(const UniValue& params, bool fHelp) } } - return (double)nAmount / (double)COIN; + return ValueFromAmount(nAmount); } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index a0095ebd92..7cb294bec1 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3291,7 +3291,7 @@ bool CWallet::InitLoadWallet() if (fFirstRun) { // Create new keyUser and set as default key - if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET)) { + if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) { // generate a new master key CKey key; key.MakeNewKey(true); diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 7bfd490950..72af8ab7b2 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -977,7 +977,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe fReadOK = ReadKeyValue(&dummyWallet, ssKey, ssValue, wss, strType, strErr); } - if (!IsKeyType(strType)) + if (!IsKeyType(strType) && strType != "hdchain") continue; if (!fReadOK) { |