diff --git a/project/namecoin-qt.pro b/project/namecoin-qt.pro index dfb0945f0..bdd64751e 100644 --- a/project/namecoin-qt.pro +++ b/project/namecoin-qt.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = namecoin-qt macx:TARGET = "Namecoin-Qt" -VERSION = 0.3.66 +VERSION = 0.3.67 QT += network DEFINES += GUI QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE CONFIG += no_include_pwd diff --git a/src/db.cpp b/src/db.cpp index 1f1c9477a..b4f0af1f9 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -8,6 +8,7 @@ #include "auxpow.h" #include #include +#include // for starts_with(), ends_with() using namespace std; using namespace boost; @@ -145,16 +146,20 @@ void CDB::Close() unsigned int nMinutes = 0; if (fReadOnly) nMinutes = 1; + if (strFile == "addr.dat") nMinutes = 2; - if (strFile == "blkindex.dat") - nMinutes = 2; - if (strFile == "blk0001.dat" || strFile == "blk0002.dat" || strFile == "blk0003.dat") // todo: make this proper :) + else if (strFile == "nameindex.dat" || strFile == "nameindexfull.dat") nMinutes = 2; - if (strFile == "nameindex.dat" || strFile == "nameindexfull.dat") + else if (strFile == "blkindex.dat") + { nMinutes = 2; - if (strFile == "blkindex.dat" && IsInitialBlockDownload() && nBestHeight % 5000 != 0) - nMinutes = 5; + if (IsInitialBlockDownload() && nBestHeight % 5000 != 0) + nMinutes = 5; + } + else if (boost::algorithm::starts_with(strFile, "blk") && boost::algorithm::ends_with(strFile, ".dat")) + nMinutes = 2; + dbenv.txn_checkpoint(0, nMinutes, 0); CRITICAL_BLOCK(cs_db) diff --git a/src/namecoin.h b/src/namecoin.h index a8d03d3c3..b0cb5482b 100644 --- a/src/namecoin.h +++ b/src/namecoin.h @@ -86,6 +86,7 @@ bool GetNameOfTx(const CTransaction& tx, std::vector& name); bool GetValueOfNameTx(const CTransaction& tx, std::vector& value); bool DecodeNameTx(const CTransaction& tx, int& op, int& nOut, std::vector >& vvch); bool DecodeNameScript(const CScript& script, int& op, std::vector > &vvch); +bool GetNameAddress(const CTransaction& tx, std::string& strAddress); std::string SendMoneyWithInputTx(CScript scriptPubKey, int64 nValue, int64 nNetFee, CWalletTx& wtxIn, CWalletTx& wtxNew, bool fAskFee); bool CreateTransactionWithInputTx(const std::vector >& vecSend, CWalletTx& wtxIn, int nTxOut, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); int64 GetNetworkFee(int nHeight); diff --git a/src/qt/configurenamedialog.cpp b/src/qt/configurenamedialog.cpp index 7f2acf4ca..b11cdcf9f 100644 --- a/src/qt/configurenamedialog.cpp +++ b/src/qt/configurenamedialog.cpp @@ -4,6 +4,7 @@ #include "guiutil.h" #include "addressbookpage.h" #include "walletmodel.h" +#include "guiconstants.h" #include "../main.h" #include "../hook.h" #include "../wallet.h" @@ -19,10 +20,11 @@ #include #include -ConfigureNameDialog::ConfigureNameDialog(const QString &_name, const QString &data, bool _firstUpdate, QWidget *parent) : +ConfigureNameDialog::ConfigureNameDialog(const QString &name_, const QString &data, const QString &address_, bool firstUpdate_, QWidget *parent) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint), - name(_name), - firstUpdate(_firstUpdate), + name(name_), + address(address_), + firstUpdate(firstUpdate_), initialized(false), ui(new Ui::ConfigureNameDialog) { @@ -34,15 +36,17 @@ ConfigureNameDialog::ConfigureNameDialog(const QString &_name, const QString &da GUIUtil::setupAddressWidget(ui->transferTo, this, true); - ui->labelName->setText(name); + ui->labelName->setText(GUIUtil::HtmlEscape(name)); ui->dataEdit->setText(data); + ui->labelAddress->setText(GUIUtil::HtmlEscape(address)); + ui->labelAddress->setFont(GUIUtil::bitcoinAddressFont()); - ui->dataEdit->setMaxLength(MAX_VALUE_LENGTH); + ui->dataEdit->setMaxLength(GUI_MAX_VALUE_LENGTH); returnData = data; if (name.startsWith("d/")) - ui->labelDomain->setText(name.mid(2) + ".bit"); + ui->labelDomain->setText(GUIUtil::HtmlEscape(name.mid(2) + ".bit")); else ui->labelDomain->setText(tr("(not a domain name)")); @@ -164,7 +168,10 @@ ConfigureNameDialog::ConfigureNameDialog(const QString &_name, const QString &da ui->transferTo->hide(); ui->addressBookButton->hide(); ui->pasteButton->hide(); - ui->labelSubmitHint->setText(tr("Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old").arg(MIN_FIRSTUPDATE_DEPTH)); + ui->labelSubmitHint->setText( + tr("Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old").arg(MIN_FIRSTUPDATE_DEPTH) + + "
" + tr("Do not close your client while the name is pending!") + "" + ); } else { @@ -244,6 +251,11 @@ void ConfigureNameDialog::setModel(WalletModel *walletModel) this->walletModel = walletModel; } +void ConfigureNameDialog::on_copyButton_clicked() +{ + QApplication::clipboard()->setText(address); +} + void ConfigureNameDialog::on_pasteButton_clicked() { // Paste text from clipboard into recipient field diff --git a/src/qt/configurenamedialog.h b/src/qt/configurenamedialog.h index f343e6885..3733ed35e 100644 --- a/src/qt/configurenamedialog.h +++ b/src/qt/configurenamedialog.h @@ -17,7 +17,7 @@ class ConfigureNameDialog : public QDialog public: - explicit ConfigureNameDialog(const QString &_name, const QString &data, bool _firstUpdate, QWidget *parent = 0); + explicit ConfigureNameDialog(const QString &name_, const QString &data, const QString &address_, bool firstUpdate_, QWidget *parent = 0); ~ConfigureNameDialog(); void setModel(WalletModel *walletModel); @@ -27,6 +27,7 @@ public slots: void accept(); void reject(); void on_addressBookButton_clicked(); + void on_copyButton_clicked(); void on_pasteButton_clicked(); void on_nsEdit_textChanged() { if (initialized) SetDNS(); } void on_nsTranslateEdit_textChanged(const QString &text) { if (initialized) SetDNS(); } @@ -39,7 +40,7 @@ public slots: QString returnData; Ui::ConfigureNameDialog *ui; WalletModel *walletModel; - QString name; + QString name, address; bool firstUpdate; bool initialized; diff --git a/src/qt/forms/configurenamedialog.ui b/src/qt/forms/configurenamedialog.ui index 0d7c96f9b..c03c03dd5 100644 --- a/src/qt/forms/configurenamedialog.ui +++ b/src/qt/forms/configurenamedialog.ui @@ -7,7 +7,7 @@ 0 0 687 - 371 + 369 @@ -323,7 +323,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -336,7 +336,17 @@ p, li { white-space: pre-wrap; } - + + + + &Address: + + + copyButton + + + + &Transfer to: @@ -346,7 +356,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -357,10 +367,15 @@ p, li { white-space: pre-wrap; } - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + Leave empty, if not needed. + + + 34 @@ -402,13 +417,75 @@ Leave empty, if not needed. - + (can be left empty) + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Namecoin address to which the name is assigned + + + N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + + + 3 + + + transferTo + + + + + + + Copy address to clipboard + + + + + + + :/icons/editcopy:/icons/editcopy + + + Alt+P + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + diff --git a/src/qt/forms/managenamespage.ui b/src/qt/forms/managenamespage.ui index 742f16e41..6eda5595b 100644 --- a/src/qt/forms/managenamespage.ui +++ b/src/qt/forms/managenamespage.ui @@ -174,6 +174,22 @@ to the network and creates a pending name_firstupdate transaction. + + + + + 0 + 0 + + + + Enter Namecoin address (or prefix of it) + + + + + + diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 92417834e..d80178aab 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -28,6 +28,10 @@ static const int TOOLTIP_WRAP_THRESHOLD = 80; /* Maximum allowed URI length */ static const int MAX_URI_LENGTH = 255; +// Should be set to MAX_VALUE_LENGTH (from namecoin.h) when it's supported by the network +// (currently due to limitations of CScript the limit is 519 bytes) +static const int GUI_MAX_VALUE_LENGTH = 519; + /* QRCodeDialog -- size of exported QR Code image */ #define EXPORT_IMAGE_SIZE 256 diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts index 2abb801fc..7647d835e 100644 --- a/src/qt/locale/bitcoin_af_ZA.ts +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -821,18 +821,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -848,31 +846,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -887,7 +910,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1057,6 +1080,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1069,12 +1097,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1084,7 +1112,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1094,7 +1127,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1129,6 +1167,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1140,7 +1183,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting Fout uitvoering @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1178,7 +1221,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adres + + + Name registered using Namecoin. @@ -1187,6 +1235,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2105,12 +2158,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Na - + own address eie adres @@ -2123,14 +2176,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Krediet - + matures in %n more block(s) @@ -2143,9 +2196,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ nie aanvaar nie - + + Name operation + + + + - + Debit Debiet @@ -2196,7 +2254,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2528,7 +2586,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index b84c63889..43069191d 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -837,18 +837,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -864,31 +862,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -903,7 +926,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1073,6 +1096,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1085,12 +1113,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1100,7 +1128,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1110,7 +1143,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1145,6 +1183,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1156,7 +1199,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1166,7 +1209,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1179,7 +1222,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1194,7 +1237,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + + + + Name registered using Namecoin. @@ -1203,6 +1251,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2125,12 +2178,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2143,14 +2196,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2167,9 +2220,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2220,7 +2278,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2564,7 +2622,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index 9a41b23a6..d822a5fae 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -826,18 +826,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Изберете от списъка с адреси @@ -853,31 +851,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -892,7 +915,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1062,6 +1085,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1074,12 +1102,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1089,7 +1117,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1099,7 +1132,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1134,6 +1172,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1145,7 +1188,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1155,7 +1198,7 @@ to the network and creates a pending name_firstupdate transaction. CSV файл (*.csv) - + Error exporting Грешка при записа @@ -1168,7 +1211,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1183,7 +1226,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Адрес + + + Name registered using Namecoin. @@ -1192,6 +1240,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2110,12 +2163,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To За - + own address собствен адрес @@ -2128,14 +2181,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Кредит - + matures in %n more block(s) @@ -2148,9 +2201,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit Дебит @@ -2201,7 +2259,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , все още не е изпратено @@ -2533,7 +2591,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 216149ad8..cb04dd66c 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -825,18 +825,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -852,31 +850,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -891,7 +914,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1061,6 +1084,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1073,12 +1101,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1088,7 +1116,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1098,7 +1131,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1133,6 +1171,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1144,7 +1187,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1154,7 +1197,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1167,7 +1210,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1182,7 +1225,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Direcció + + + Name registered using Namecoin. @@ -1191,6 +1239,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2110,12 +2163,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2128,14 +2181,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2149,9 +2202,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2202,7 +2260,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2537,7 +2595,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index d3e7aa58c..e2385498a 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -834,18 +834,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Vyber adresu z adresáře @@ -861,31 +859,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -900,7 +923,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1070,6 +1093,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1082,12 +1110,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1097,7 +1125,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1107,7 +1140,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1142,6 +1180,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1153,7 +1196,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. CSV formát (*.csv) - + Error exporting Chyba při exportu @@ -1176,7 +1219,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1191,7 +1234,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adresa + + + Name registered using Namecoin. @@ -1200,6 +1248,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2119,12 +2172,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Pro - + own address vlastní adresa @@ -2137,14 +2190,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Příjem - + matures in %n more block(s) dozraje po jednom bloku @@ -2158,9 +2211,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ neakceptováno - + + Name operation + + + + - + Debit Výdaj @@ -2211,7 +2269,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Vstupy - + , has not been successfully broadcast yet , ještě nebylo rozesláno @@ -2546,7 +2604,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 324d6065d..9febb9bdc 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -830,18 +830,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Vælg adresse fra adressebog @@ -857,31 +855,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -896,7 +919,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1067,6 +1090,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1079,12 +1107,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1094,7 +1122,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1104,7 +1137,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1139,6 +1177,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1160,7 +1203,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting Fejl under eksport @@ -1173,7 +1216,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1188,7 +1231,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adresse + + + Name registered using Namecoin. @@ -1197,6 +1245,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2115,12 +2168,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Til - + own address @@ -2133,14 +2186,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Kredit - + matures in %n more block(s) @@ -2153,9 +2206,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ ikke accepteret - + + Name operation + + + + - + Debit Debet @@ -2206,7 +2264,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , er ikke blevet transmitteret endnu @@ -2538,7 +2596,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 62a6a4d74..5097e70ff 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -829,18 +829,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Adresse aus Adressbuch wählen @@ -856,31 +854,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -895,7 +918,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1065,6 +1088,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1077,12 +1105,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1092,7 +1120,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1102,7 +1135,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1137,6 +1175,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1148,7 +1191,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1158,7 +1201,7 @@ to the network and creates a pending name_firstupdate transaction. Kommagetrennte-Datei (*.csv) - + Error exporting Fehler beim Exportieren @@ -1171,7 +1214,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1186,7 +1229,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adresse + + + Name registered using Namecoin. @@ -1195,6 +1243,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2113,12 +2166,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To An - + own address eigene Adresse @@ -2131,14 +2184,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Gutschrift - + matures in %n more block(s) reift noch %n weiteren Block @@ -2151,9 +2204,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ nicht angenommen - + + Name operation + + + + - + Debit Belastung @@ -2204,7 +2262,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Eingaben - + , has not been successfully broadcast yet , wurde noch nicht erfolgreich übertragen @@ -2536,7 +2594,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index 314a426d1..bcffc5a9e 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -825,18 +825,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Επιλογή διεύθυνσης από το βιβλίο διευθύνσεων @@ -852,31 +850,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -891,7 +914,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1061,6 +1084,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1073,12 +1101,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1088,7 +1116,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1098,7 +1131,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1133,6 +1171,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1144,7 +1187,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1154,7 +1197,7 @@ to the network and creates a pending name_firstupdate transaction. Αρχείο οριοθετημένο με κόμματα (*.csv) - + Error exporting @@ -1167,7 +1210,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1182,7 +1225,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Διεύθυνση + + + Name registered using Namecoin. @@ -1191,6 +1239,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2109,12 +2162,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2127,14 +2180,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2147,9 +2200,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2200,7 +2258,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , δεν έχει ακόμα μεταδοθεί μ' επιτυχία @@ -2532,7 +2590,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 786c4651b..502550cfe 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -830,18 +830,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Choose address from address book @@ -857,31 +855,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -896,7 +919,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1066,6 +1089,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1078,12 +1106,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1093,7 +1121,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1103,7 +1136,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1138,6 +1176,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1149,7 +1192,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1159,7 +1202,7 @@ to the network and creates a pending name_firstupdate transaction. Comma separated file (*.csv) - + Error exporting Error exporting @@ -1172,7 +1215,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1187,7 +1230,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Address + + + Name registered using Namecoin. @@ -1196,6 +1244,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2114,12 +2167,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To To - + own address own address @@ -2132,14 +2185,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Credit - + matures in %n more block(s) matures in %n more block @@ -2152,9 +2205,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ not accepted - + + Name operation + + + + - + Debit Debit @@ -2205,7 +2263,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Inputs - + , has not been successfully broadcast yet , has not been successfully broadcast yet @@ -2537,7 +2595,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index e0cfe9b6d..1a357cf67 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -833,18 +833,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Elija una dirección de la libreta de direcciones @@ -860,31 +858,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -899,7 +922,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1069,6 +1092,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1081,12 +1109,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1096,7 +1124,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1106,7 +1139,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1141,6 +1179,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1152,7 +1195,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1162,7 +1205,7 @@ to the network and creates a pending name_firstupdate transaction. Archivos de columnas separadas por coma (*.csv) - + Error exporting @@ -1175,7 +1218,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1190,7 +1233,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Dirección + + + Name registered using Namecoin. @@ -1199,6 +1247,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2117,12 +2170,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Para - + own address dirección propia @@ -2135,14 +2188,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Crédito - + matures in %n more block(s) disponible en %n bloque más @@ -2155,9 +2208,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ no aceptada - + + Name operation + + + + - + Debit Débito @@ -2208,7 +2266,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ entradas - + , has not been successfully broadcast yet , no ha sido emitido satisfactoriamente todavía @@ -2540,7 +2598,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 09c9db99d..df65b077e 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -832,18 +832,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Elije dirección de la guia @@ -859,31 +857,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -898,7 +921,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1069,6 +1092,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1081,12 +1109,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1096,7 +1124,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1106,7 +1139,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1141,6 +1179,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1152,7 +1195,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1162,7 +1205,7 @@ to the network and creates a pending name_firstupdate transaction. Archivos separados por coma (*.csv) - + Error exporting @@ -1175,7 +1218,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1190,7 +1233,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Dirección + + + Name registered using Namecoin. @@ -1199,6 +1247,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2117,12 +2170,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2135,14 +2188,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Credito - + matures in %n more block(s) @@ -2155,9 +2208,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ no aceptada - + + Name operation + + + + - + Debit Debito @@ -2208,7 +2266,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , no ha sido emitido satisfactoriamente todavía @@ -2540,7 +2598,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 6de80491b..67f76d295 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -821,18 +821,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -848,31 +846,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -887,7 +910,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1057,6 +1080,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1069,12 +1097,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1084,7 +1112,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1094,7 +1127,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1129,6 +1167,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1140,7 +1183,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting Viga eksportimisel @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1178,7 +1221,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Aadress + + + Name registered using Namecoin. @@ -1187,6 +1235,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2105,12 +2158,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2123,14 +2176,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2143,9 +2196,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2196,7 +2254,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2528,7 +2586,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index d5ad28ca8..f6ba51a10 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -821,18 +821,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -848,31 +846,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -887,7 +910,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1057,6 +1080,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1069,12 +1097,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1084,7 +1112,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1094,7 +1127,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1129,6 +1167,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1140,7 +1183,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1178,7 +1221,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Helbidea + + + Name registered using Namecoin. @@ -1187,6 +1235,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2105,12 +2158,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2123,14 +2176,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2143,9 +2196,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2196,7 +2254,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2528,7 +2586,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 9d3c9b42f..e77e91986 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -821,18 +821,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book اآدرسن ازدفتر آدرس انتخاب کنید @@ -848,31 +846,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -887,7 +910,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1057,6 +1080,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1069,12 +1097,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1084,7 +1112,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1094,7 +1127,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1129,6 +1167,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1140,7 +1183,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1178,7 +1221,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + + + + Name registered using Namecoin. @@ -1187,6 +1235,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2105,12 +2158,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To گیرنده - + own address آدرس شما @@ -2123,14 +2176,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit بدهی - + matures in %n more block(s) بلوغ در n% از بیشتر بلاکها @@ -2143,9 +2196,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ غیرقابل قبول - + + Name operation + + + + - + Debit اعتبار @@ -2196,7 +2254,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ درونداد - + , has not been successfully broadcast yet هنوز با مو فقیت ارسال نشده @@ -2526,7 +2584,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 91afc5211..659e2613b 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -820,18 +820,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book آدرس از فهرست آدرس انتخاب کنید @@ -847,31 +845,56 @@ Leave empty, if not needed. + Alt+P Alt و P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -886,7 +909,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1056,6 +1079,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1068,12 +1096,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1083,7 +1111,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1093,7 +1126,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1128,6 +1166,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1139,7 +1182,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1149,7 +1192,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1162,7 +1205,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1177,7 +1220,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + آدرس + + + Name registered using Namecoin. @@ -1186,6 +1234,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2104,12 +2157,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2122,14 +2175,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2141,9 +2194,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2194,7 +2252,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet تا به حال با موفقیت انتشار نیافته است @@ -2523,7 +2581,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 54b7a95b7..e3844b29b 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -830,18 +830,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Valitse osoite osoitekirjasta @@ -857,31 +855,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -896,7 +919,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1066,6 +1089,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1078,12 +1106,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1093,7 +1121,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1103,7 +1136,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1138,6 +1176,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1149,7 +1192,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1159,7 +1202,7 @@ to the network and creates a pending name_firstupdate transaction. Comma separated file (*.csv) - + Error exporting @@ -1172,7 +1215,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1187,7 +1230,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Osoite + + + Name registered using Namecoin. @@ -1196,6 +1244,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2114,12 +2167,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Saaja - + own address oma osoite @@ -2132,14 +2185,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Credit - + matures in %n more block(s) kypsyy %n lohkon kuluttua @@ -2152,9 +2205,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ ei hyväksytty - + + Name operation + + + + - + Debit Debit @@ -2205,7 +2263,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Sisääntulot - + , has not been successfully broadcast yet , ei ole vielä onnistuneesti lähetetty @@ -2537,7 +2595,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index b76482798..87353ccab 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -830,18 +830,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Choisir une adresse dans le carnet d'adresses @@ -857,31 +855,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -896,7 +919,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1066,6 +1089,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1078,12 +1106,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1093,7 +1121,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1103,7 +1136,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1138,6 +1176,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1149,7 +1192,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1159,7 +1202,7 @@ to the network and creates a pending name_firstupdate transaction. Valeurs séparées par des virgules (*.csv) - + Error exporting @@ -1172,7 +1215,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1187,7 +1230,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adresse + + + Name registered using Namecoin. @@ -1196,6 +1244,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2114,12 +2167,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To À - + own address votre propre adresse @@ -2132,14 +2185,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Crédit - + matures in %n more block(s) arrive à maturité dans %n bloc @@ -2152,9 +2205,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ non accepté - + + Name operation + + + + - + Debit Débit @@ -2205,7 +2263,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Entrées - + , has not been successfully broadcast yet , n’a pas encore été diffusée avec succès @@ -2537,7 +2595,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index 9b39370e2..7c458b3d1 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -826,18 +826,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -853,31 +851,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -892,7 +915,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1062,6 +1085,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1074,12 +1102,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1089,7 +1117,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1099,7 +1132,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1134,6 +1172,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1145,7 +1188,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1155,7 +1198,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1168,7 +1211,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1183,7 +1226,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + + + + Name registered using Namecoin. @@ -1192,6 +1240,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2110,12 +2163,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2128,14 +2181,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2148,9 +2201,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2201,7 +2259,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2533,7 +2591,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_gu_IN.ts b/src/qt/locale/bitcoin_gu_IN.ts index 1d0b9bdb6..f3cd9a6bd 100644 --- a/src/qt/locale/bitcoin_gu_IN.ts +++ b/src/qt/locale/bitcoin_gu_IN.ts @@ -821,18 +821,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -848,31 +846,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -887,7 +910,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1057,6 +1080,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1069,12 +1097,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1084,7 +1112,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1094,7 +1127,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1129,6 +1167,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1140,7 +1183,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1178,7 +1221,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + + + + Name registered using Namecoin. @@ -1187,6 +1235,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2105,12 +2158,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2123,14 +2176,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2143,9 +2196,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2196,7 +2254,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2528,7 +2586,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 9a4e3b163..0c9969952 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -829,18 +829,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book בחר כתובת מפנקס הכתובות @@ -856,31 +854,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -895,7 +918,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1065,6 +1088,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1077,12 +1105,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1092,7 +1120,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1102,7 +1135,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1137,6 +1175,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1148,7 +1191,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1158,7 +1201,7 @@ to the network and creates a pending name_firstupdate transaction. קובץ מופרד בפסיקים (*.csv) - + Error exporting שגיאה ביצוא @@ -1171,7 +1214,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1186,7 +1229,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + כתובת + + + Name registered using Namecoin. @@ -1195,6 +1243,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2113,12 +2166,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To אל - + own address כתובת עצמית @@ -2131,14 +2184,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit זיכוי - + matures in %n more block(s) מבשיל בעוד בלוק אחד @@ -2151,9 +2204,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ לא התקבל - + + Name operation + + + + - + Debit חיוב @@ -2204,7 +2262,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ קלטים - + , has not been successfully broadcast yet , טרם שודר בהצלחה @@ -2536,7 +2594,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts index 11e162b0a..8de9a0dc1 100644 --- a/src/qt/locale/bitcoin_hi_IN.ts +++ b/src/qt/locale/bitcoin_hi_IN.ts @@ -821,18 +821,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -848,31 +846,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -887,7 +910,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1057,6 +1080,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1069,12 +1097,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1084,7 +1112,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1094,7 +1127,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1129,6 +1167,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1140,7 +1183,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1178,7 +1221,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + + + + Name registered using Namecoin. @@ -1187,6 +1235,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2105,12 +2158,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2123,14 +2176,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2143,9 +2196,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2196,7 +2254,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2528,7 +2586,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index 14b1ef568..d7dffbf3b 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -829,18 +829,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Odaberite adresu iz adresara @@ -856,31 +854,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -895,7 +918,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1065,6 +1088,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1077,12 +1105,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1092,7 +1120,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1102,7 +1135,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1137,6 +1175,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1148,7 +1191,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1158,7 +1201,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1171,7 +1214,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1186,7 +1229,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adresa + + + Name registered using Namecoin. @@ -1195,6 +1243,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2114,12 +2167,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Za - + own address @@ -2132,14 +2185,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Uplaćeno - + matures in %n more block(s) @@ -2153,9 +2206,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Nije prihvaćeno - + + Name operation + + + + - + Debit Zaduženje @@ -2206,7 +2264,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , još nije bio uspješno emitiran @@ -2541,7 +2599,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 14a7a132f..49a3b6c9f 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -825,18 +825,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Válassz egy címet a címjegyzékből @@ -852,31 +850,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -891,7 +914,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1062,6 +1085,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1074,12 +1102,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1089,7 +1117,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1099,7 +1132,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1134,6 +1172,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1145,7 +1188,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1155,7 +1198,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1168,7 +1211,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1183,7 +1226,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Cím + + + Name registered using Namecoin. @@ -1192,6 +1240,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2110,12 +2163,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Címzett - + own address @@ -2128,14 +2181,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Jóváírás - + matures in %n more block(s) @@ -2147,9 +2200,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ elutasítva - + + Name operation + + + + - + Debit Terhelés @@ -2200,7 +2258,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , még nem sikerült elküldeni. @@ -2529,7 +2587,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index 301bdd2b3..6136225a7 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -831,18 +831,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Scegli l'indirizzo dalla rubrica @@ -858,31 +856,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -897,7 +920,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1068,6 +1091,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1080,12 +1108,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1095,7 +1123,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1105,7 +1138,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1140,6 +1178,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1151,7 +1194,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1161,7 +1204,7 @@ to the network and creates a pending name_firstupdate transaction. Testo CSV (*.csv) - + Error exporting Errore nell'esportazione @@ -1174,7 +1217,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1189,7 +1232,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Indirizzo + + + Name registered using Namecoin. @@ -1198,6 +1246,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2116,12 +2169,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2134,14 +2187,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Credito - + matures in %n more block(s) @@ -2154,9 +2207,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ non accettate - + + Name operation + + + + - + Debit Debito @@ -2207,7 +2265,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , non è stato ancora trasmesso con successo @@ -2539,7 +2597,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 69e521483..c354af2e9 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -817,18 +817,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -844,31 +842,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -883,7 +906,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1053,6 +1076,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1065,12 +1093,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1080,7 +1108,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1090,7 +1123,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1125,6 +1163,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1136,7 +1179,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1146,7 +1189,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1159,7 +1202,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1174,7 +1217,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Helbidea + + + Name registered using Namecoin. @@ -1183,6 +1231,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2100,12 +2153,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2118,14 +2171,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2137,9 +2190,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2190,7 +2248,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2519,7 +2577,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 40041216a..a15527eee 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -832,18 +832,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Pasirinkite adresą iš adresų knygelės @@ -859,31 +857,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -898,7 +921,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1068,6 +1091,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1080,12 +1108,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1095,7 +1123,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1105,7 +1138,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1140,6 +1178,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1151,7 +1194,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1161,7 +1204,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting Eksportavimo klaida @@ -1174,7 +1217,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1189,7 +1232,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adresas + + + Name registered using Namecoin. @@ -1198,6 +1246,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2117,12 +2170,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Kam - + own address savo adresas @@ -2135,14 +2188,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Kreditas - + matures in %n more block(s) @@ -2156,9 +2209,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ nepriimta - + + Name operation + + + + - + Debit Debitas @@ -2209,7 +2267,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , transliavimas dar nebuvo sėkmingas @@ -2544,7 +2602,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index d08799222..ebfa004b9 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -830,18 +830,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Velg adresse fra adresseboken @@ -857,31 +855,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -896,7 +919,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1067,6 +1090,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1079,12 +1107,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1094,7 +1122,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1104,7 +1137,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1139,6 +1177,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1160,7 +1203,7 @@ to the network and creates a pending name_firstupdate transaction. Kommaseparert fil (*.csv) - + Error exporting @@ -1173,7 +1216,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1188,7 +1231,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adresse + + + Name registered using Namecoin. @@ -1197,6 +1245,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2115,12 +2168,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Til - + own address egen adresse @@ -2133,14 +2186,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Kredit - + matures in %n more block(s) blir moden om %n blokk @@ -2153,9 +2206,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ ikke akseptert - + + Name operation + + + + - + Debit Debet @@ -2206,7 +2264,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Inndata - + , has not been successfully broadcast yet , har ikke blitt kringkastet uten problemer enda. @@ -2538,7 +2596,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 07eecd9aa..0a5e30c0d 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -831,18 +831,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Kies adres uit adresboek @@ -858,31 +856,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -897,7 +920,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1068,6 +1091,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1080,12 +1108,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1095,7 +1123,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1105,7 +1138,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1140,6 +1178,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1151,7 +1194,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1161,7 +1204,7 @@ to the network and creates a pending name_firstupdate transaction. Kommagescheiden bestand (*.csv) - + Error exporting Fout bij exporteren @@ -1174,7 +1217,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1189,7 +1232,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adres + + + Name registered using Namecoin. @@ -1198,6 +1246,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2116,12 +2169,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Aan - + own address eigen adres @@ -2134,14 +2187,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Credit - + matures in %n more block(s) komt tot wasdom na %n nieuw blok @@ -2154,9 +2207,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ niet geaccepteerd - + + Name operation + + + + - + Debit Debet @@ -2207,7 +2265,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Inputs - + , has not been successfully broadcast yet , is nog niet met succes uitgezonden @@ -2539,7 +2597,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 880408f31..a20eb8cd6 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -834,18 +834,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Wybierz adres z książki adresowej @@ -861,31 +859,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -900,7 +923,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1070,6 +1093,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1082,12 +1110,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1097,7 +1125,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1107,7 +1140,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1142,6 +1180,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1153,7 +1196,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting Błąd podczas eksportowania @@ -1176,7 +1219,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1191,7 +1234,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adres + + + Name registered using Namecoin. @@ -1200,6 +1248,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2119,12 +2172,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Do - + own address własny adres @@ -2137,14 +2190,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Przypisy - + matures in %n more block(s) @@ -2158,9 +2211,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ niezaakceptowane - + + Name operation + + + + - + Debit Debet @@ -2211,7 +2269,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Wejścia - + , has not been successfully broadcast yet , nie został jeszcze pomyślnie wyemitowany @@ -2546,7 +2604,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index c689c07f5..fd2401d79 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -824,18 +824,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -851,31 +849,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -890,7 +913,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1060,6 +1083,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1072,12 +1100,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1087,7 +1115,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1097,7 +1130,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1132,6 +1170,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1143,7 +1186,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1153,7 +1196,7 @@ to the network and creates a pending name_firstupdate transaction. Arquivo separado por vírgulas (*. csv) - + Error exporting Erro ao exportar @@ -1166,7 +1209,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1181,7 +1224,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Endereço + + + Name registered using Namecoin. @@ -1190,6 +1238,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2108,12 +2161,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2126,14 +2179,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Crédito - + matures in %n more block(s) @@ -2146,9 +2199,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit Débito @@ -2199,7 +2257,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2531,7 +2589,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index 581e24179..a751c92b4 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -830,18 +830,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Escolher endereço do livro de endereços @@ -857,31 +855,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -896,7 +919,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1066,6 +1089,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1078,12 +1106,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1093,7 +1121,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1103,7 +1136,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1138,6 +1176,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1149,7 +1192,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1159,7 +1202,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting Erro ao exportar @@ -1172,7 +1215,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1187,7 +1230,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Endereço + + + Name registered using Namecoin. @@ -1196,6 +1244,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2114,12 +2167,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Para - + own address endereço próprio @@ -2132,14 +2185,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Crédito - + matures in %n more block(s) matura daqui por %n bloco @@ -2152,9 +2205,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ não aceite - + + Name operation + + + + - + Debit Débito @@ -2205,7 +2263,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Entradas - + , has not been successfully broadcast yet , ainda não foi transmitida com sucesso @@ -2537,7 +2595,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index dcba031d9..800e79312 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -825,18 +825,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Alegeţi adresa din Listă @@ -852,31 +850,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -891,7 +914,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1061,6 +1084,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1073,12 +1101,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1088,7 +1116,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1098,7 +1131,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1133,6 +1171,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1144,7 +1187,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1154,7 +1197,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1167,7 +1210,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1182,7 +1225,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + + + + Name registered using Namecoin. @@ -1191,6 +1239,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2110,12 +2163,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Către - + own address @@ -2128,14 +2181,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Credit - + matures in %n more block(s) @@ -2149,9 +2202,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ nu este acceptat - + + Name operation + + + + - + Debit Debit @@ -2202,7 +2260,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , nu s-a propagat încă @@ -2537,7 +2595,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index e6c3c0b4e..0a86d1430 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -834,18 +834,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Выберите адрес из адресной книги @@ -861,31 +859,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -900,7 +923,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1070,6 +1093,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1082,12 +1110,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1097,7 +1125,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1107,7 +1140,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1142,6 +1180,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1153,7 +1196,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1163,7 +1206,7 @@ to the network and creates a pending name_firstupdate transaction. Текст, разделённый запятыми (*.csv) - + Error exporting Ошибка экспорта @@ -1176,7 +1219,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1191,7 +1234,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Адрес + + + Name registered using Namecoin. @@ -1200,6 +1248,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2119,12 +2172,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Для - + own address свой адрес @@ -2137,14 +2190,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Кредит - + matures in %n more block(s) будет доступно через %n блок @@ -2158,9 +2211,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ не принято - + + Name operation + + + + - + Debit Дебет @@ -2211,7 +2269,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Входы - + , has not been successfully broadcast yet , ещё не было успешно разослано @@ -2546,7 +2604,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index 73558545b..32af77421 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -828,18 +828,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Zvoľte adresu z adresára @@ -855,31 +853,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -894,7 +917,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1064,6 +1087,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1076,12 +1104,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1091,7 +1119,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1101,7 +1134,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1136,6 +1174,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1147,7 +1190,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1157,7 +1200,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1170,7 +1213,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1185,7 +1228,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adresa + + + Name registered using Namecoin. @@ -1194,6 +1242,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2113,12 +2166,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2131,14 +2184,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Kredit - + matures in %n more block(s) @@ -2152,9 +2205,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ neprijaté - + + Name operation + + + + - + Debit Debet @@ -2205,7 +2263,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , ešte nebola úspešne odoslaná @@ -2540,7 +2598,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index 73e960e79..def99c318 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -825,18 +825,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -852,31 +850,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -891,7 +914,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1061,6 +1084,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1073,12 +1101,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1088,7 +1116,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1098,7 +1131,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1133,6 +1171,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1144,7 +1187,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1154,7 +1197,7 @@ to the network and creates a pending name_firstupdate transaction. Зарезом одвојене вредности (*.csv) - + Error exporting Грешка током извоза @@ -1167,7 +1210,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1182,7 +1225,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Адреса + + + Name registered using Namecoin. @@ -1191,6 +1239,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2110,12 +2163,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2128,14 +2181,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2149,9 +2202,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2202,7 +2260,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2537,7 +2595,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index bfc2de678..51217e0e1 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -831,18 +831,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Välj adress från adresslistan @@ -858,31 +856,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -897,7 +920,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1067,6 +1090,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1079,12 +1107,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1094,7 +1122,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1104,7 +1137,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1139,6 +1177,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1150,7 +1193,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1160,7 +1203,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting Fel vid export @@ -1173,7 +1216,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1188,7 +1231,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adress + + + Name registered using Namecoin. @@ -1197,6 +1245,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2115,12 +2168,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Till - + own address egen adress @@ -2133,14 +2186,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Kredit - + matures in %n more block(s) mognar om %n block @@ -2153,9 +2206,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ inte accepterad - + + Name operation + + + + - + Debit Belasta @@ -2206,7 +2264,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Inputs - + , has not been successfully broadcast yet , har inte lyckats skickas ännu @@ -2538,7 +2596,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts index b4f22c75e..279b40f86 100644 --- a/src/qt/locale/bitcoin_th_TH.ts +++ b/src/qt/locale/bitcoin_th_TH.ts @@ -817,18 +817,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book @@ -844,31 +842,56 @@ Leave empty, if not needed. + Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -883,7 +906,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1053,6 +1076,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1065,12 +1093,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1080,7 +1108,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1090,7 +1123,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1125,6 +1163,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1136,7 +1179,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1146,7 +1189,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1159,7 +1202,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1174,7 +1217,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + + + + Name registered using Namecoin. @@ -1183,6 +1231,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2100,12 +2153,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2118,14 +2171,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit - + matures in %n more block(s) @@ -2137,9 +2190,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + + Name operation + + + + - + Debit @@ -2190,7 +2248,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet @@ -2519,7 +2577,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index 0bccf4cc2..e641664de 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -826,18 +826,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Adres defterinden adres seç @@ -853,31 +851,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -892,7 +915,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1062,6 +1085,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1074,12 +1102,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1089,7 +1117,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1099,7 +1132,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1134,6 +1172,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1145,7 +1188,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1155,7 +1198,7 @@ to the network and creates a pending name_firstupdate transaction. Virgülle ayrılmış değerler dosyası (*.csv) - + Error exporting Dışa aktarımda hata oluştu @@ -1168,7 +1211,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1183,7 +1226,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Adres + + + Name registered using Namecoin. @@ -1192,6 +1240,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2109,12 +2162,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To Alıcı - + own address kendi adresiniz @@ -2127,14 +2180,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Gider - + matures in %n more block(s) %n ek blok sonrasında olgunlaşacak @@ -2146,9 +2199,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ kabul edilmedi - + + Name operation + + + + - + Debit Gelir @@ -2199,7 +2257,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ Girdiler - + , has not been successfully broadcast yet , henüz başarılı bir şekilde yayınlanmadı @@ -2528,7 +2586,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 44fac10a0..b455ccda1 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -834,18 +834,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book Вибрати адресу з адресної книги @@ -861,31 +859,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -900,7 +923,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1071,6 +1094,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1083,12 +1111,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1098,7 +1126,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1108,7 +1141,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1143,6 +1181,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1154,7 +1197,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1164,7 +1207,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1177,7 +1220,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1192,7 +1235,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + Адреса + + + Name registered using Namecoin. @@ -1201,6 +1249,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2120,12 +2173,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To - + own address @@ -2138,14 +2191,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit Кредит - + matures in %n more block(s) @@ -2159,9 +2212,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ не прийнято - + + Name operation + + + + - + Debit Дебет @@ -2212,7 +2270,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + , has not been successfully broadcast yet , ще не було успішно розіслано @@ -2547,7 +2605,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 4a9e4a9b8..1dc9ade41 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -826,18 +826,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book 从地址簿选择地址 @@ -853,31 +851,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -892,7 +915,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1063,6 +1086,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1075,12 +1103,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1090,7 +1118,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1100,7 +1133,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1135,6 +1173,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1146,7 +1189,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1156,7 +1199,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting 导出错误 @@ -1169,7 +1212,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1184,7 +1227,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + 地址 + + + Name registered using Namecoin. @@ -1193,6 +1241,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2110,12 +2163,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To 到 - + own address 自己的地址 @@ -2128,14 +2181,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit 收入 - + matures in %n more block(s) 将在 %n 个数据块后成熟 @@ -2147,9 +2200,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ 未被接受 - + + Name operation + + + + - + Debit 支出 @@ -2200,7 +2258,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ 输入 - + , has not been successfully broadcast yet , 未被成功广播 @@ -2529,7 +2587,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index 5f71ba9f8..cc9ae08c8 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -825,18 +825,16 @@ p, li { white-space: pre-wrap; } - &Transfer to: + &Address: - - The Namecoin address to transfer domain to -(e.g. N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9). -Leave empty, if not needed. + + &Transfer to: - + Choose address from address book 從位址簿中選一個位址 @@ -852,31 +850,56 @@ Leave empty, if not needed. + Alt+P Alt+P - + + Namecoin address to which the name is assigned + + + + + Copy address to clipboard + + + + Domain name: - + + The Namecoin address to transfer +the domain to, e.g. +N1KHAL5C1CRzy58NdJwp1tbLze3XrkFxx9 + +Leave empty, if not needed. + + + + (can be left empty) - + (not a domain name) - + Name_firstupdate transaction will be queued and broadcasted when corresponding name_new is %1 blocks old - + + Do not close your client while the name is pending! + + + + Name_update transaction will be issued immediately @@ -891,7 +914,7 @@ Leave empty, if not needed. - + Valid JSON string @@ -1062,6 +1085,11 @@ to the network and creates a pending name_firstupdate transaction. Enter part of value to search for + + + Enter Namecoin address (or prefix of it) + + Double-click name to configure @@ -1074,12 +1102,12 @@ to the network and creates a pending name_firstupdate transaction. - + &Configure Name... - + Copy &Name @@ -1089,7 +1117,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Copy &Address + + + + Name filter @@ -1099,7 +1132,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address filter + + + + Name registration @@ -1134,6 +1172,11 @@ to the network and creates a pending name_firstupdate transaction. Are you sure you want to register non-domain name %1? + + + This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish. + + Confirm name registration @@ -1145,7 +1188,7 @@ to the network and creates a pending name_firstupdate transaction. - + Export Registered Names Data @@ -1155,7 +1198,7 @@ to the network and creates a pending name_firstupdate transaction. - + Error exporting @@ -1168,7 +1211,7 @@ to the network and creates a pending name_firstupdate transaction. NameTableModel - + Name @@ -1183,7 +1226,12 @@ to the network and creates a pending name_firstupdate transaction. - + + Address + 位址 + + + Name registered using Namecoin. @@ -1192,6 +1240,11 @@ to the network and creates a pending name_firstupdate transaction. Data associated with the name. + + + Namecoin address to which the name is registered. + + Number of blocks, after which the name will expire. Update name to renew it. @@ -2109,12 +2162,12 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - + To 目的 - + own address 自己的位址 @@ -2127,14 +2180,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ - - + + Credit 入帳 - + matures in %n more block(s) 將在 %n 個區塊產出後熟成 @@ -2146,9 +2199,14 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ 不被接受 - + + Name operation + + + + - + Debit 出帳 @@ -2199,7 +2257,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ 輸入 - + , has not been successfully broadcast yet , 尚未成功公告出去 @@ -2528,7 +2586,7 @@ Empty cell means pending (awaiting automatic name_firstupdate or awaiting networ WalletModel - + Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here. diff --git a/src/qt/managenamespage.cpp b/src/qt/managenamespage.cpp index 212995dca..089b71613 100644 --- a/src/qt/managenamespage.cpp +++ b/src/qt/managenamespage.cpp @@ -10,6 +10,7 @@ #include "../hook.h" #include "../wallet.h" #include "../namecoin.h" +#include "guiconstants.h" #include "ui_interface.h" #include "configurenamedialog.h" @@ -41,22 +42,32 @@ void NameFilterProxyModel::setValueSearch(const QString &search) invalidateFilter(); } +void NameFilterProxyModel::setAddressSearch(const QString &search) +{ + addressSearch = search; + invalidateFilter(); +} + bool NameFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const { QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); QString name = index.sibling(index.row(), NameTableModel::Name).data(Qt::EditRole).toString(); QString value = index.sibling(index.row(), NameTableModel::Value).data(Qt::EditRole).toString(); + QString address = index.sibling(index.row(), NameTableModel::Address).data(Qt::EditRole).toString(); Qt::CaseSensitivity case_sens = filterCaseSensitivity(); - return name.contains(nameSearch, case_sens) && value.contains(valueSearch, case_sens); + return name.contains(nameSearch, case_sens) + && value.contains(valueSearch, case_sens) + && address.startsWith(addressSearch, Qt::CaseSensitive); // Address is always case-sensitive } // // ManageNamesPage // -const static int COLUMN_WIDTH_NAME = 320, +const static int COLUMN_WIDTH_NAME = 300, + COLUMN_WIDTH_ADDRESS = 256, COLUMN_WIDTH_EXPIRES_IN = 100; ManageNamesPage::ManageNamesPage(QWidget *parent) : @@ -71,17 +82,20 @@ ManageNamesPage::ManageNamesPage(QWidget *parent) : // Context menu actions QAction *copyNameAction = new QAction(tr("Copy &Name"), this); QAction *copyValueAction = new QAction(tr("Copy &Value"), this); + QAction *copyAddressAction = new QAction(tr("Copy &Address"), this); QAction *configureNameAction = new QAction(tr("&Configure Name..."), this); // Build context menu contextMenu = new QMenu(); contextMenu->addAction(copyNameAction); contextMenu->addAction(copyValueAction); + contextMenu->addAction(copyAddressAction); contextMenu->addAction(configureNameAction); // Connect signals for context menu actions connect(copyNameAction, SIGNAL(triggered()), this, SLOT(onCopyNameAction())); connect(copyValueAction, SIGNAL(triggered()), this, SLOT(onCopyValueAction())); + connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(onCopyAddressAction())); connect(configureNameAction, SIGNAL(triggered()), this, SLOT(on_configureNameButton_clicked())); connect(ui->tableView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextualMenu(QPoint))); @@ -94,20 +108,24 @@ ManageNamesPage::ManageNamesPage(QWidget *parent) : ui->tableView->installEventFilter(this); ui->nameFilter->installEventFilter(this); ui->valueFilter->installEventFilter(this); + ui->addressFilter->installEventFilter(this); ui->configureNameButton->installEventFilter(this); ui->registerName->setMaxLength(MAX_NAME_LENGTH); ui->nameFilter->setMaxLength(MAX_NAME_LENGTH); - ui->valueFilter->setMaxLength(MAX_VALUE_LENGTH); - + ui->valueFilter->setMaxLength(GUI_MAX_VALUE_LENGTH); + GUIUtil::setupAddressWidget(ui->addressFilter, this, true); + #if QT_VERSION >= 0x040700 /* Do not move this to the XML file, Qt before 4.7 will choke on it */ ui->nameFilter->setPlaceholderText(tr("Name filter")); ui->valueFilter->setPlaceholderText(tr("Value filter")); + ui->addressFilter->setPlaceholderText(tr("Address filter")); #endif ui->nameFilter->setFixedWidth(COLUMN_WIDTH_NAME); + ui->addressFilter->setFixedWidth(COLUMN_WIDTH_ADDRESS); ui->horizontalSpacer_ExpiresIn->changeSize( COLUMN_WIDTH_EXPIRES_IN + ui->tableView->verticalScrollBar()->sizeHint().width() @@ -148,6 +166,8 @@ void ManageNamesPage::setModel(WalletModel *walletModel) NameTableModel::Name, COLUMN_WIDTH_NAME); ui->tableView->horizontalHeader()->setResizeMode( NameTableModel::Value, QHeaderView::Stretch); + ui->tableView->horizontalHeader()->resizeSection( + NameTableModel::Address, COLUMN_WIDTH_ADDRESS); ui->tableView->horizontalHeader()->resizeSection( NameTableModel::ExpiresIn, COLUMN_WIDTH_EXPIRES_IN); @@ -156,6 +176,7 @@ void ManageNamesPage::setModel(WalletModel *walletModel) connect(ui->nameFilter, SIGNAL(textChanged(QString)), this, SLOT(changedNameFilter(QString))); connect(ui->valueFilter, SIGNAL(textChanged(QString)), this, SLOT(changedValueFilter(QString))); + connect(ui->addressFilter, SIGNAL(textChanged(QString)), this, SLOT(changedAddressFilter(QString))); selectionChanged(); } @@ -174,6 +195,13 @@ void ManageNamesPage::changedValueFilter(const QString &filter) proxyModel->setValueSearch(filter); } +void ManageNamesPage::changedAddressFilter(const QString &filter) +{ + if (!proxyModel) + return; + proxyModel->setAddressSearch(filter); +} + void ManageNamesPage::on_submitNameButton_clicked() { if (!walletModel) @@ -213,11 +241,11 @@ void ManageNamesPage::on_submitNameButton_clicked() QString msg; if (name.startsWith("d/")) - msg = tr("Are you sure you want to register domain name %1, which corresponds to domain %2?").arg(name).arg(name.mid(2) + ".bit"); + msg = tr("Are you sure you want to register domain name %1, which corresponds to domain %2?").arg(GUIUtil::HtmlEscape(name)).arg(GUIUtil::HtmlEscape(name.mid(2) + ".bit")); else - msg = tr("Are you sure you want to register non-domain name %1?").arg(name); - msg += "\n\nThis will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish."; - + msg = tr("Are you sure you want to register non-domain name %1?").arg(GUIUtil::HtmlEscape(name)); + msg += "

" + tr("This will issue both a name_new and a postponed name_firstupdate. Let the program run for three hours to make sure the process can finish."); + if (QMessageBox::Yes != QMessageBox::question(this, tr("Confirm name registration"), msg, QMessageBox::Yes | QMessageBox::Cancel, @@ -244,17 +272,17 @@ void ManageNamesPage::on_submitNameButton_clicked() int newRowIndex; // FIXME: CT_NEW may have been sent from nameNew (via transaction). // Currently updateEntry is modified so it does not complain - model->updateEntry(name, "", NameTableEntry::NAME_NEW, CT_NEW, &newRowIndex); + model->updateEntry(name, "", res.address, NameTableEntry::NAME_NEW, CT_NEW, &newRowIndex); ui->tableView->selectRow(newRowIndex); ui->tableView->setFocus(); - ConfigureNameDialog dlg(name, "", true, this); + ConfigureNameDialog dlg(name, "", res.address, true, this); dlg.setModel(walletModel); if (dlg.exec() == QDialog::Accepted) { LOCK(cs_main); if (mapMyNameFirstUpdate.count(vchFromString(name.toStdString())) != 0) - model->updateEntry(name, dlg.getReturnData(), NameTableEntry::NAME_NEW, CT_UPDATED); + model->updateEntry(name, dlg.getReturnData(), res.address, NameTableEntry::NAME_NEW, CT_UPDATED); else { // name_firstupdate could have been sent, while the user was editing the value @@ -330,6 +358,11 @@ void ManageNamesPage::onCopyValueAction() GUIUtil::copyEntryData(ui->tableView, NameTableModel::Value); } +void ManageNamesPage::onCopyAddressAction() +{ + GUIUtil::copyEntryData(ui->tableView, NameTableModel::Address); +} + void ManageNamesPage::on_configureNameButton_clicked() { if(!ui->tableView->selectionModel()) @@ -342,18 +375,19 @@ void ManageNamesPage::on_configureNameButton_clicked() QString name = index.data(Qt::EditRole).toString(); QString value = index.sibling(index.row(), NameTableModel::Value).data(Qt::EditRole).toString(); + QString address = index.sibling(index.row(), NameTableModel::Address).data(Qt::EditRole).toString(); std::vector vchName = vchFromString(name.toStdString()); bool fFirstUpdate = mapMyNameFirstUpdate.count(vchName) != 0; - ConfigureNameDialog dlg(name, value, fFirstUpdate, this); + ConfigureNameDialog dlg(name, value, address, fFirstUpdate, this); dlg.setModel(walletModel); if (dlg.exec() == QDialog::Accepted && fFirstUpdate) { LOCK(cs_main); // name_firstupdate could have been sent, while the user was editing the value if (mapMyNameFirstUpdate.count(vchName) != 0) - model->updateEntry(name, dlg.getReturnData(), NameTableEntry::NAME_NEW, CT_UPDATED); + model->updateEntry(name, dlg.getReturnData(), address, NameTableEntry::NAME_NEW, CT_UPDATED); } } @@ -370,10 +404,11 @@ void ManageNamesPage::exportClicked() CSVModelWriter writer(filename); - // name, column, role writer.setModel(proxyModel); + // name, column, role writer.addColumn("Name", NameTableModel::Name, Qt::EditRole); writer.addColumn("Value", NameTableModel::Value, Qt::EditRole); + writer.addColumn("Address", NameTableModel::Address, Qt::EditRole); writer.addColumn("Expires In", NameTableModel::ExpiresIn, Qt::EditRole); if(!writer.write()) diff --git a/src/qt/managenamespage.h b/src/qt/managenamespage.h index 88b2b3984..2225b5069 100644 --- a/src/qt/managenamespage.h +++ b/src/qt/managenamespage.h @@ -26,12 +26,13 @@ class NameFilterProxyModel : public QSortFilterProxyModel void setNameSearch(const QString &search); void setValueSearch(const QString &search); + void setAddressSearch(const QString &search); protected: bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; private: - QString nameSearch, valueSearch; + QString nameSearch, valueSearch, addressSearch; }; /** Page for managing names */ @@ -57,6 +58,7 @@ public slots: void changedNameFilter(const QString &filter); void changedValueFilter(const QString &filter); + void changedAddressFilter(const QString &filter); private slots: void on_submitNameButton_clicked(); @@ -69,6 +71,7 @@ private slots: void onCopyNameAction(); void onCopyValueAction(); + void onCopyAddressAction(); void on_configureNameButton_clicked(); }; diff --git a/src/qt/nametablemodel.cpp b/src/qt/nametablemodel.cpp index b0f0255a0..8cd206282 100644 --- a/src/qt/nametablemodel.cpp +++ b/src/qt/nametablemodel.cpp @@ -16,6 +16,7 @@ extern std::map, PreparedNameFirstUpdate> mapMyNameFi static int column_alignments[] = { Qt::AlignLeft|Qt::AlignVCenter, // Name Qt::AlignLeft|Qt::AlignVCenter, // Value + Qt::AlignLeft|Qt::AlignVCenter, // Address Qt::AlignRight|Qt::AlignVCenter // Expires in }; @@ -122,7 +123,10 @@ class NameTablePriv if (mi != vNamesO.end() && !NameTableEntry::CompareHeight(mi->second.nHeight, nHeight)) continue; - vNamesO[vchName] = NameTableEntry(stringFromVch(vchName), stringFromVch(vchValue), nHeight, fTransferred); + std::string strAddress = ""; + GetNameAddress(tx, strAddress); + + vNamesO[vchName] = NameTableEntry(stringFromVch(vchName), stringFromVch(vchValue), strAddress, nHeight, fTransferred); } } @@ -133,7 +137,11 @@ class NameTablePriv // Add pending names (name_new) BOOST_FOREACH(const PAIRTYPE(std::vector, PreparedNameFirstUpdate)& item, mapMyNameFirstUpdate) - cachedNameTable.append(NameTableEntry(stringFromVch(item.first), stringFromVch(item.second.vchData), NameTableEntry::NAME_NEW)); + { + std::string strAddress = ""; + GetNameAddress(item.second.wtx, strAddress); + cachedNameTable.append(NameTableEntry(stringFromVch(item.first), stringFromVch(item.second.vchData), strAddress, NameTableEntry::NAME_NEW)); + } // qLowerBound() and qUpperBound() require our cachedNameTable list to be sorted in asc order qSort(cachedNameTable.begin(), cachedNameTable.end(), NameTableEntryLessThan()); @@ -143,7 +151,7 @@ class NameTablePriv { LOCK(cs_main); - NameTableEntry nameObj(stringFromVch(inName), std::string(""), NameTableEntry::NAME_NON_EXISTING); + NameTableEntry nameObj(stringFromVch(inName), std::string(), std::string(), NameTableEntry::NAME_NON_EXISTING); CRITICAL_BLOCK(wallet->cs_mapWallet) { @@ -216,8 +224,12 @@ class NameTablePriv printf("refreshName(\"%s\"): tx %s - skipped (more recent transaction exists)\n", qPrintable(nameObj.name), hash.GetHex().c_str()); continue; } + + std::string strAddress = ""; + GetNameAddress(tx, strAddress); nameObj.value = QString::fromStdString(stringFromVch(vchValue)); + nameObj.address = QString::fromStdString(strAddress); nameObj.nHeight = nHeight; nameObj.transferred = fTransferred; @@ -243,12 +255,12 @@ class NameTablePriv if (nameObj.nHeight != NameTableEntry::NAME_NON_EXISTING) { printf("refreshName result : %s - refreshed in the table\n", qPrintable(nameObj.name)); - updateEntry(nameObj.name, nameObj.value, nameObj.nHeight, CT_UPDATED); + updateEntry(nameObj, CT_UPDATED); } else { printf("refreshName result : %s - deleted from the table\n", qPrintable(nameObj.name)); - updateEntry(nameObj.name, nameObj.value, nameObj.nHeight, CT_DELETED); + updateEntry(nameObj, CT_DELETED); } } else @@ -258,7 +270,7 @@ class NameTablePriv if (nameObj.nHeight != NameTableEntry::NAME_NON_EXISTING) { printf("refreshName result : %s - added to the table\n", qPrintable(nameObj.name)); - updateEntry(nameObj.name, nameObj.value, nameObj.nHeight, CT_NEW); + updateEntry(nameObj, CT_NEW); } else { @@ -267,7 +279,12 @@ class NameTablePriv } } - void updateEntry(const QString &name, const QString &value, int nHeight, int status, int *outNewRowIndex = NULL) + void updateEntry(const NameTableEntry &nameObj, int status, int *outNewRowIndex = NULL) + { + updateEntry(nameObj.name, nameObj.value, nameObj.address, nameObj.nHeight, status, outNewRowIndex); + } + + void updateEntry(const QString &name, const QString &value, const QString &address, int nHeight, int status, int *outNewRowIndex = NULL) { // Find name in model QList::iterator lower = qLowerBound( @@ -294,7 +311,7 @@ class NameTablePriv break; } parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex); - cachedNameTable.insert(lowerIndex, NameTableEntry(name, value, nHeight)); + cachedNameTable.insert(lowerIndex, NameTableEntry(name, value, address, nHeight)); parent->endInsertRows(); if (outNewRowIndex) *outNewRowIndex = parent->index(lowerIndex, 0).row(); @@ -307,6 +324,7 @@ class NameTablePriv } lower->name = name; lower->value = value; + lower->address = address; lower->nHeight = nHeight; parent->emitDataChanged(lowerIndex); break; @@ -344,7 +362,7 @@ class NameTablePriv NameTableModel::NameTableModel(CWallet *wallet, WalletModel *parent) : QAbstractTableModel(parent), walletModel(parent), wallet(wallet), priv(0), cachedNumBlocks(0) { - columns << tr("Name") << tr("Value") << tr("Expires in"); + columns << tr("Name") << tr("Value") << tr("Address") << tr("Expires in"); priv = new NameTablePriv(wallet, this); priv->refreshNameTable(); @@ -375,7 +393,7 @@ void NameTableModel::updateExpiration() int nHeight = item->nHeight; if (nHeight + GetDisplayExpirationDepth(nHeight) - pindexBest->nHeight <= 0) { - priv->updateEntry(item->name, item->value, item->nHeight, CT_DELETED); + priv->updateEntry(item->name, item->value, item->address, item->nHeight, CT_DELETED); // Data array changed - restart scan n = priv->size(); i = -1; @@ -435,21 +453,35 @@ QVariant NameTableModel::data(const QModelIndex &index, int role) const if (role == Qt::DisplayRole || role == Qt::EditRole) { - switch(index.column()) + switch (index.column()) { case Name: return rec->name; case Value: return rec->value; + case Address: + return rec->address; case ExpiresIn: if (!rec->HeightValid()) - return QVariant(); + { + if (rec->nHeight == NameTableEntry::NAME_NEW) + return QString("pending (new)"); + return QString("pending (update)"); + } else return rec->nHeight + GetDisplayExpirationDepth(rec->nHeight) - pindexBest->nHeight; } } else if (role == Qt::TextAlignmentRole) return column_alignments[index.column()]; + else if (role == Qt::FontRole) + { + QFont font; + if (index.column() == Address) + font = GUIUtil::bitcoinAddressFont(); + return font; + } + return QVariant(); } @@ -467,12 +499,14 @@ QVariant NameTableModel::headerData(int section, Qt::Orientation orientation, in } else if (role == Qt::ToolTipRole) { - switch(section) + switch (section) { case Name: return tr("Name registered using Namecoin."); case Value: return tr("Data associated with the name."); + case Address: + return tr("Namecoin address to which the name is registered."); case ExpiresIn: return tr("Number of blocks, after which the name will expire. Update name to renew it.\nEmpty cell means pending (awaiting automatic name_firstupdate or awaiting network confirmation)."); } @@ -504,9 +538,9 @@ QModelIndex NameTableModel::index(int row, int column, const QModelIndex &parent } } -void NameTableModel::updateEntry(const QString &name, const QString &value, int nHeight, int status, int *outNewRowIndex /*= NULL*/) +void NameTableModel::updateEntry(const QString &name, const QString &value, const QString &address, int nHeight, int status, int *outNewRowIndex /*= NULL*/) { - priv->updateEntry(name, value, nHeight, status, outNewRowIndex); + priv->updateEntry(name, value, address, nHeight, status, outNewRowIndex); } void NameTableModel::emitDataChanged(int idx) diff --git a/src/qt/nametablemodel.h b/src/qt/nametablemodel.h index 8e2fb9d28..0057b04a8 100644 --- a/src/qt/nametablemodel.h +++ b/src/qt/nametablemodel.h @@ -22,7 +22,8 @@ class NameTableModel : public QAbstractTableModel enum ColumnIndex { Name = 0, Value = 1, - ExpiresIn = 2 + Address = 2, + ExpiresIn = 3 }; /** @name Methods overridden from QAbstractTableModel @@ -46,7 +47,7 @@ class NameTableModel : public QAbstractTableModel void emitDataChanged(int index); public slots: - void updateEntry(const QString &name, const QString &value, int nHeight, int status, int *outNewRowIndex = NULL); + void updateEntry(const QString &name, const QString &value, const QString &address, int nHeight, int status, int *outNewRowIndex = NULL); void updateExpiration(); void updateTransaction(const QString &hash, int status); @@ -57,6 +58,7 @@ struct NameTableEntry { QString name; QString value; + QString address; int nHeight; bool transferred; @@ -68,10 +70,10 @@ struct NameTableEntry static bool CompareHeight(int nOldHeight, int nNewHeight); // Returns true if new height is better NameTableEntry() : nHeight(NAME_NON_EXISTING), transferred(false) {} - NameTableEntry(const QString &name, const QString &value, int nHeight, bool transferred = false) : - name(name), value(value), nHeight(nHeight), transferred(transferred) {} - NameTableEntry(const std::string &name, const std::string &value, int nHeight, bool transferred = false) : - name(QString::fromStdString(name)), value(QString::fromStdString(value)), nHeight(nHeight), transferred(transferred) {} + NameTableEntry(const QString &name, const QString &value, const QString &address, int nHeight, bool transferred = false) : + name(name), value(value), address(address), nHeight(nHeight), transferred(transferred) {} + NameTableEntry(const std::string &name, const std::string &value, const std::string &address, int nHeight, bool transferred = false) : + name(QString::fromStdString(name)), value(QString::fromStdString(value)), address(QString::fromStdString(address)), nHeight(nHeight), transferred(transferred) {} }; #endif // NAMETABLEMODEL_H diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc index 18b7754f3..36b9ac7d1 100644 --- a/src/qt/res/bitcoin-qt.rc +++ b/src/qt/res/bitcoin-qt.rc @@ -8,7 +8,7 @@ IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico" #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 3 -#define CLIENT_VERSION_REVISION 66 +#define CLIENT_VERSION_REVISION 67 #define CLIENT_VERSION_BUILD 0 // Converts the parameter X to a string after macro replacement on X has been performed. diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index a774b1b79..62f65fc65 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -144,23 +144,53 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) else { bool fAllFromMe = true; + int64 nCarriedOverCoin = 0; BOOST_FOREACH(const CTxIn& txin, wtx.vin) - fAllFromMe = fAllFromMe && wallet->IsMine(txin); + { + if (!wallet->IsMine(txin)) + { + // Check whether transaction input is name_* operation - in this case consider it ours + CTransaction txPrev; + uint256 hash = 0; + CTxDestination address; + if (GetTransaction(txin.prevout.hash, txPrev, hash) && + txin.prevout.n < txPrev.vout.size() && + hooks->ExtractAddress(txPrev.vout[txin.prevout.n].scriptPubKey, address) + ) + { + // This is our name transaction + // Accumulate the coin carried from name_new, because it is not actually spent + nCarriedOverCoin += txPrev.vout[txin.prevout.n].nValue; + } + else + { + fAllFromMe = false; + break; + } + } + } bool fAllToMe = true; BOOST_FOREACH(const CTxOut& txout, wtx.vout) - fAllToMe = fAllToMe && wallet->IsMine(txout); + if (!wallet->IsMine(txout)) + { + fAllToMe = false; + break; + } if (fAllFromMe) { // // Debit // + int64 nTxFee = nDebit - (wtx.GetValueOut() - nCarriedOverCoin); BOOST_FOREACH(const CTxOut& txout, wtx.vout) { if (wallet->IsMine(txout)) continue; + int64 nValue = txout.nValue; + if (!wtx.mapValue.count("to") || wtx.mapValue["to"].empty()) { // Offline transaction @@ -173,9 +203,49 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString()); strHTML += "
"; } + else if (hooks->ExtractAddress(txout.scriptPubKey, address)) + { + strHTML += "" + tr("Name operation") + ": " + GUIUtil::HtmlEscape(address) + "
"; + + // Add carried coin (from name_new) + if (nCarriedOverCoin > 0) + { + // Note: we subtract nCarriedOverCoin equally from all name operations, + // until it becomes zero. It may fail for complex transactions, which + // update multiple names simultaneously (standard client never creates such transactions). + if (nValue >= nCarriedOverCoin) + { + nValue -= nCarriedOverCoin; + nCarriedOverCoin = 0; + } + else + { + nCarriedOverCoin -= nValue; + nValue = 0; + } + } + } + + // Carried over coin can be used to pay fee, if it the required + // amount was reserved in OP_NAME_NEW + if (nCarriedOverCoin > 0) + { + if (nTxFee >= nCarriedOverCoin) + { + nTxFee -= nCarriedOverCoin; + nCarriedOverCoin = 0; + } + else + { + nCarriedOverCoin -= nTxFee; + nTxFee = 0; + } + } + + } - strHTML += "" + tr("Debit") + ": " + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, -txout.nValue) + "
"; + strHTML += "" + tr("Debit") + ": " + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, -nValue) + "
"; } if (fAllToMe) @@ -187,7 +257,6 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) strHTML += "" + tr("Credit") + ": " + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, nValue) + "
"; } - int64 nTxFee = nDebit - wtx.GetValueOut(); if (nTxFee > 0) strHTML += "" + tr("Transaction fee") + ": " + BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, -nTxFee) + "
"; } diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 793d77dd6..bfee3ed52 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -120,9 +120,8 @@ QList TransactionRecord::decomposeTransaction(const CWallet * // int64 nTxFee = nDebit - (wtx.GetValueOut() - nCarriedOverCoin); - for (unsigned int nOut = 0; nOut < wtx.vout.size(); nOut++) + BOOST_FOREACH(const CTxOut& txout, wtx.vout) { - const CTxOut& txout = wtx.vout[nOut]; TransactionRecord sub(hash, nTime); sub.idx = parts.size(); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 67d5bafeb..c1e16d457 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -499,6 +499,7 @@ WalletModel::NameNewReturn WalletModel::nameNew(const QString &name) std::vector strPubKey = wallet->GetKeyFromKeyPool(); CScript scriptPubKeyOrig; scriptPubKeyOrig.SetBitcoinAddress(strPubKey); + ret.address = QString::fromStdString(scriptPubKeyOrig.GetBitcoinAddress()); CScript scriptPubKey; scriptPubKey << OP_NAME_NEW << hash << OP_2DROP; scriptPubKey += scriptPubKeyOrig; @@ -781,6 +782,8 @@ static void NotifyAddressBookChanged(WalletModel *walletmodel, CWallet *wallet, static void NotifyTransactionChanged(WalletModel *walletmodel, CWallet *wallet, const uint256 &hash, ChangeType status) { + if (!hash) + return; // Ignore coinbase transactions OutputDebugStringF("NotifyTransactionChanged %s status=%i\n", hash.GetHex().c_str(), status); QMetaObject::invokeMethod(walletmodel, "updateTransaction", Qt::QueuedConnection, Q_ARG(QString, QString::fromStdString(hash.GetHex())), diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index cee2a4322..910f01b4d 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -89,6 +89,7 @@ class WalletModel : public QObject { bool ok; QString err_msg; + QString address; std::vector vchName; uint256 hex; // Transaction hash in hex uint64 rand; // Secret number in hex diff --git a/src/rpc.cpp b/src/rpc.cpp index 4211d8fb2..504f241dd 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -941,7 +941,8 @@ Value getbalance(const Array& params, bool fHelp) string strSentAccount; list > listReceived; list > listSent; - wtx.GetAmounts(allGeneratedImmature, allGeneratedMature, listReceived, listSent, allFee, strSentAccount); + bool fNameTx; + wtx.GetAmounts(allGeneratedImmature, allGeneratedMature, listReceived, listSent, allFee, strSentAccount, fNameTx); if (wtx.GetDepthInMainChain() >= nMinDepth) BOOST_FOREACH(const PAIRTYPE(string,int64)& r, listReceived) nBalance += r.second; @@ -1271,7 +1272,8 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe string strSentAccount; list > listReceived; list > listSent; - wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount); + bool fNameTx; + wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount, fNameTx); bool fAllAccounts = (strAccount == string("*")); @@ -1296,20 +1298,39 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe } // Sent - if ((!listSent.empty() || nFee != 0) && (fAllAccounts || strAccount == strSentAccount)) + if ((!listSent.empty() || nFee != 0 || fNameTx) && (fAllAccounts || strAccount == strSentAccount)) { - BOOST_FOREACH(const PAIRTYPE(string, int64)& s, listSent) + if (listSent.empty()) { + // Name transaction, or some non-standard transaction with non-zero fee Object entry; entry.push_back(Pair("account", strSentAccount)); - entry.push_back(Pair("address", s.first)); + string strAddress = ""; + if (fNameTx) + GetNameAddress(wtx, strAddress); + entry.push_back(Pair("address", strAddress)); entry.push_back(Pair("category", "send")); - entry.push_back(Pair("amount", ValueFromAmount(-s.second))); + entry.push_back(Pair("amount", ValueFromAmount(0))); entry.push_back(Pair("fee", ValueFromAmount(-nFee))); if (fLong) WalletTxToJSON(wtx, entry); ret.push_back(entry); } + else + { + BOOST_FOREACH(const PAIRTYPE(string, int64)& s, listSent) + { + Object entry; + entry.push_back(Pair("account", strSentAccount)); + entry.push_back(Pair("address", s.first)); + entry.push_back(Pair("category", "send")); + entry.push_back(Pair("amount", ValueFromAmount(-s.second))); + entry.push_back(Pair("fee", ValueFromAmount(-nFee))); + if (fLong) + WalletTxToJSON(wtx, entry); + ret.push_back(entry); + } + } } // Received @@ -1450,7 +1471,8 @@ Value listaccounts(const Array& params, bool fHelp) string strSentAccount; list > listReceived; list > listSent; - wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount); + bool fNameTx; + wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount, fNameTx); mapAccountBalances[strSentAccount] -= nFee; BOOST_FOREACH(const PAIRTYPE(string, int64)& s, listSent) mapAccountBalances[strSentAccount] -= s.second; diff --git a/src/serialize.h b/src/serialize.h index 88070e354..ca54c10c7 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -35,7 +35,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 36600; +static const int VERSION = 36700; static const char* pszSubVer = ""; static const bool VERSION_IS_BETA = false; diff --git a/src/wallet.cpp b/src/wallet.cpp index 1822607cb..6d5dfb2f6 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -309,12 +309,13 @@ int CWalletTx::GetRequestCount() const } void CWalletTx::GetAmounts(int64& nGeneratedImmature, int64& nGeneratedMature, list >& listReceived, - list >& listSent, int64& nFee, string& strSentAccount) const + list >& listSent, int64& nFee, string& strSentAccount, bool &fNameTx) const { nGeneratedImmature = nGeneratedMature = nFee = 0; listReceived.clear(); listSent.clear(); strSentAccount = strFromAccount; + fNameTx = false; if (IsCoinBase()) { @@ -336,7 +337,9 @@ void CWalletTx::GetAmounts(int64& nGeneratedImmature, int64& nGeneratedMature, l // Compute the coin carried with the name operation // as difference of GetDebitInclName() and GetDebit() int64 nCarriedOverCoin = nDebit - GetDebit(); - + if (nCarriedOverCoin != 0) + fNameTx = true; + // Sent/received. Standard client will never generate a send-to-multiple-recipients, // but non-standard clients might (so return a list of address/amount pairs) BOOST_FOREACH(const CTxOut& txout, vout) @@ -404,7 +407,8 @@ void CWalletTx::GetAccountAmounts(const string& strAccount, int64& nGenerated, i string strSentAccount; list > listReceived; list > listSent; - GetAmounts(allGeneratedImmature, allGeneratedMature, listReceived, listSent, allFee, strSentAccount); + bool fNameTx; + GetAmounts(allGeneratedImmature, allGeneratedMature, listReceived, listSent, allFee, strSentAccount, fNameTx); if (strAccount == "") nGenerated = allGeneratedMature; @@ -665,7 +669,7 @@ int64 CWallet::GetBalance() const for (map::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; - if (!pcoin->IsConfirmed()) + if (!pcoin->IsFinal() || !pcoin->IsConfirmed()) continue; nTotal += pcoin->GetAvailableCredit(); } @@ -763,7 +767,7 @@ bool CWallet::SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfThe BOOST_FOREACH(const CWalletTx* pcoin, vCoins) { - if (!pcoin->IsConfirmed()) + if (!pcoin->IsFinal() || !pcoin->IsConfirmed()) continue; if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0) diff --git a/src/wallet.h b/src/wallet.h index 5f31243bd..66fd25847 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -575,7 +575,7 @@ class CWalletTx : public CMerkleTx } void GetAmounts(int64& nGeneratedImmature, int64& nGeneratedMature, std::list >& listReceived, - std::list >& listSent, int64& nFee, std::string& strSentAccount) const; + std::list >& listSent, int64& nFee, std::string& strSentAccount, bool &fNameTx) const; void GetAccountAmounts(const std::string& strAccount, int64& nGenerated, int64& nReceived, int64& nSent, int64& nFee) const;