Browse Source

Merge pull request #5036

eb6b3b2 Update English translation (Wladimir J. van der Laan)
b9b2e3f Don't translate state.Abort() messages (Wladimir J. van der Laan)
pull/1/head
Wladimir J. van der Laan 8 years ago
parent
commit
5505a1b13f
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 38
      src/main.cpp
  2. 2
      src/main.h
  3. 16
      src/qt/bitcoinstrings.cpp
  4. 346
      src/qt/locale/bitcoin_en.ts

38
src/main.cpp

@ -1687,7 +1687,7 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C @@ -1687,7 +1687,7 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
if (!FindUndoPos(state, pindex->nFile, pos, ::GetSerializeSize(blockundo, SER_DISK, CLIENT_VERSION) + 40))
return error("ConnectBlock() : FindUndoPos failed");
if (!blockundo.WriteToDisk(pos, pindex->pprev->GetBlockHash()))
return state.Abort(_("Failed to write undo data"));
return state.Abort("Failed to write undo data");
// update nUndoPos in block index
pindex->nUndoPos = pos.nPos;
@ -1698,12 +1698,12 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C @@ -1698,12 +1698,12 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
CDiskBlockIndex blockindex(pindex);
if (!pblocktree->WriteBlockIndex(blockindex))
return state.Abort(_("Failed to write block index"));
return state.Abort("Failed to write block index");
}
if (fTxIndex)
if (!pblocktree->WriteTxIndex(vPos))
return state.Abort(_("Failed to write transaction index"));
return state.Abort("Failed to write transaction index");
// add this block to the view's block chain
bool ret;
@ -1738,7 +1738,7 @@ bool static WriteChainState(CValidationState &state) { @@ -1738,7 +1738,7 @@ bool static WriteChainState(CValidationState &state) {
FlushBlockFile();
pblocktree->Sync();
if (!pcoinsTip->Flush())
return state.Abort(_("Failed to write to coin database"));
return state.Abort("Failed to write to coin database");
nLastWrite = GetTimeMicros();
}
return true;
@ -1786,7 +1786,7 @@ bool static DisconnectTip(CValidationState &state) { @@ -1786,7 +1786,7 @@ bool static DisconnectTip(CValidationState &state) {
// Read block from disk.
CBlock block;
if (!ReadBlockFromDisk(block, pindexDelete))
return state.Abort(_("Failed to read block"));
return state.Abort("Failed to read block");
// Apply the block atomically to the chain state.
int64_t nStart = GetTimeMicros();
{
@ -1835,7 +1835,7 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * @@ -1835,7 +1835,7 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock *
CBlock block;
if (!pblock) {
if (!ReadBlockFromDisk(block, pindexNew))
return state.Abort(_("Failed to read block"));
return state.Abort("Failed to read block");
pblock = █
}
// Apply the block atomically to the chain state.
@ -1989,7 +1989,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo @@ -1989,7 +1989,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
CheckForkWarningConditions();
if (!pblocktree->Flush())
return state.Abort(_("Failed to sync block index"));
return state.Abort("Failed to sync block index");
return true;
}
@ -2096,7 +2096,7 @@ bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBl @@ -2096,7 +2096,7 @@ bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBl
setBlockIndexValid.insert(pindexNew);
if (!pblocktree->WriteBlockIndex(CDiskBlockIndex(pindexNew)))
return state.Abort(_("Failed to write block index"));
return state.Abort("Failed to write block index");
return true;
}
@ -2148,7 +2148,7 @@ bool FindBlockPos(CValidationState &state, CDiskBlockPos &pos, unsigned int nAdd @@ -2148,7 +2148,7 @@ bool FindBlockPos(CValidationState &state, CDiskBlockPos &pos, unsigned int nAdd
}
if (!pblocktree->WriteBlockFileInfo(nLastBlockFile, infoLastBlockFile))
return state.Abort(_("Failed to write file info"));
return state.Abort("Failed to write file info");
if (fUpdatedLast)
pblocktree->WriteLastBlockFile(nLastBlockFile);
@ -2166,15 +2166,15 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne @@ -2166,15 +2166,15 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
pos.nPos = infoLastBlockFile.nUndoSize;
nNewSize = (infoLastBlockFile.nUndoSize += nAddSize);
if (!pblocktree->WriteBlockFileInfo(nLastBlockFile, infoLastBlockFile))
return state.Abort(_("Failed to write block info"));
return state.Abort("Failed to write block info");
} else {
CBlockFileInfo info;
if (!pblocktree->ReadBlockFileInfo(nFile, info))
return state.Abort(_("Failed to read block info"));
return state.Abort("Failed to read block info");
pos.nPos = info.nUndoSize;
nNewSize = (info.nUndoSize += nAddSize);
if (!pblocktree->WriteBlockFileInfo(nFile, info))
return state.Abort(_("Failed to write block info"));
return state.Abort("Failed to write block info");
}
unsigned int nOldChunks = (pos.nPos + UNDOFILE_CHUNK_SIZE - 1) / UNDOFILE_CHUNK_SIZE;
@ -2391,11 +2391,11 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex, @@ -2391,11 +2391,11 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
return error("AcceptBlock() : FindBlockPos failed");
if (dbp == NULL)
if (!WriteBlockToDisk(block, blockPos))
return state.Abort(_("Failed to write block"));
return state.Abort("Failed to write block");
if (!ReceivedBlockTransactions(block, state, pindex, blockPos))
return error("AcceptBlock() : ReceivedBlockTransactions failed");
} catch(std::runtime_error &e) {
return state.Abort(_("System error: ") + e.what());
return state.Abort(std::string("System error: ") + e.what());
}
return true;
@ -2718,10 +2718,12 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) { @@ -2718,10 +2718,12 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) {
bool AbortNode(const std::string &strMessage) {
bool AbortNode(const std::string &strMessage, const std::string &userMessage) {
strMiscWarning = strMessage;
LogPrintf("*** %s\n", strMessage);
uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR);
uiInterface.ThreadSafeMessageBox(
userMessage.empty() ? _("Error: A fatal internal error occured, see debug.log for details") : userMessage,
"", CClientUIInterface::MSG_ERROR);
StartShutdown();
return false;
}
@ -2732,7 +2734,7 @@ bool CheckDiskSpace(uint64_t nAdditionalBytes) @@ -2732,7 +2734,7 @@ bool CheckDiskSpace(uint64_t nAdditionalBytes)
// Check for nMinDiskSpace bytes (currently 50MB)
if (nFreeBytesAvailable < nMinDiskSpace + nAdditionalBytes)
return AbortNode(_("Error: Disk space is low!"));
return AbortNode("Disk space is low!", _("Error: Disk space is low!"));
return true;
}
@ -3142,7 +3144,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp) @@ -3142,7 +3144,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
}
}
} catch(std::runtime_error &e) {
AbortNode(_("Error: system error: ") + e.what());
AbortNode(std::string("System error: ") + e.what());
}
if (nLoaded > 0)
LogPrintf("Loaded %i blocks from external file in %dms\n", nLoaded, GetTimeMillis() - nStart);

2
src/main.h

@ -178,7 +178,7 @@ CAmount GetBlockValue(int nHeight, const CAmount& nFees); @@ -178,7 +178,7 @@ CAmount GetBlockValue(int nHeight, const CAmount& nFees);
/** Create a new block index entry for a given block hash */
CBlockIndex * InsertBlockIndex(uint256 hash);
/** Abort with a message */
bool AbortNode(const std::string &msg);
bool AbortNode(const std::string &msg, const std::string &userMessage="");
/** Get statistics from node state */
bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);
/** Increase a node's misbehavior score. */

16
src/qt/bitcoinstrings.cpp

@ -195,21 +195,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"), @@ -195,21 +195,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin Core"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: A fatal internal error occured, see debug.log for details"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unsupported argument -tor found, use -onion."),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction!"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error: system error: "),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to read block info"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to read block"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to sync block index"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write block index"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write block info"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write block"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write file info"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write to coin database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write transaction index"),
QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data"),
QT_TRANSLATE_NOOP("bitcoin-core", "Fee (in BTC/kB) to add to transactions you send (default: %s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Force safe mode (default: 0)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins (default: 0)"),
@ -231,6 +221,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'") @@ -231,6 +221,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'")
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"),
QT_TRANSLATE_NOOP("bitcoin-core", "Invalid netmask specified in -whitelist: '%s'"),
QT_TRANSLATE_NOOP("bitcoin-core", "Keep at most <n> unconnectable blocks in memory (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Keep at most <n> unconnectable transactions in memory (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Limit size of signature cache to <n> entries (default: 50000)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."),
@ -245,7 +236,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'" @@ -245,7 +236,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"
QT_TRANSLATE_NOOP("bitcoin-core", "Node relay options:"),
QT_TRANSLATE_NOOP("bitcoin-core", "Not enough file descriptors available."),
QT_TRANSLATE_NOOP("bitcoin-core", "Only accept block chain matching built-in checkpoints (default: 1)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network <net> (IPv4, IPv6 or Tor)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network <net> (ipv4, ipv6 or onion)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Options:"),
QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"),
QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp (default: 1)"),
@ -282,7 +273,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)") @@ -282,7 +273,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)")
QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: 1)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Stop running after importing blocks from disk (default: 0)"),
QT_TRANSLATE_NOOP("bitcoin-core", "System error: "),
QT_TRANSLATE_NOOP("bitcoin-core", "This help message"),
QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
QT_TRANSLATE_NOOP("bitcoin-core", "This is intended for regression testing tools and app development."),

346
src/qt/locale/bitcoin_en.ts

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<location line="+14"/>
<source>Copy the currently selected address to the system clipboard</source>
<translation>Copy the currently selected address to the system clipboard</translation>
</message>
@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+58"/>
<location line="+67"/>
<source>C&amp;lose</source>
<translation type="unfinished"></translation>
</message>
@ -39,12 +39,12 @@ @@ -39,12 +39,12 @@
<translation>&amp;Copy Address</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="-47"/>
<location filename="../forms/addressbookpage.ui" line="-53"/>
<source>Delete the currently selected address from the list</source>
<translation>Delete the currently selected address from the list</translation>
</message>
<message>
<location line="+27"/>
<location line="+30"/>
<source>Export the data in the current tab to a file</source>
<translation>Export the data in the current tab to a file</translation>
</message>
@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
<translation>&amp;Export</translation>
</message>
<message>
<location line="-27"/>
<location line="-30"/>
<source>&amp;Delete</source>
<translation>&amp;Delete</translation>
</message>
@ -286,17 +286,17 @@ @@ -286,17 +286,17 @@
<context>
<name>BitcoinGUI</name>
<message>
<location filename="../bitcoingui.cpp" line="+300"/>
<location filename="../bitcoingui.cpp" line="+327"/>
<source>Sign &amp;message...</source>
<translation>Sign &amp;message...</translation>
</message>
<message>
<location line="+339"/>
<location line="+348"/>
<source>Synchronizing with network...</source>
<translation>Synchronizing with network...</translation>
</message>
<message>
<location line="-411"/>
<location line="-420"/>
<source>&amp;Overview</source>
<translation>&amp;Overview</translation>
</message>
@ -377,13 +377,13 @@ @@ -377,13 +377,13 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+168"/>
<location line="+175"/>
<location line="+5"/>
<source>Bitcoin Core client</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+156"/>
<location line="+158"/>
<source>Importing blocks from disk...</source>
<translation>Importing blocks from disk...</translation>
</message>
@ -393,7 +393,7 @@ @@ -393,7 +393,7 @@
<translation>Reindexing blocks on disk...</translation>
</message>
<message>
<location line="-409"/>
<location line="-418"/>
<source>Send coins to a Bitcoin address</source>
<translation>Send coins to a Bitcoin address</translation>
</message>
@ -428,12 +428,12 @@ @@ -428,12 +428,12 @@
<translation>&amp;Verify message...</translation>
</message>
<message>
<location line="+437"/>
<location line="+446"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
<location line="-655"/>
<location line="-664"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
@ -500,12 +500,12 @@ @@ -500,12 +500,12 @@
</message>
<message>
<location line="-289"/>
<location line="+386"/>
<location line="+393"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
<location line="-411"/>
<location line="-418"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
@ -546,7 +546,7 @@ @@ -546,7 +546,7 @@
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location line="+310"/>
<location line="+316"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation>
<numerusform>%n active connection to Bitcoin network</numerusform>
@ -554,7 +554,7 @@ @@ -554,7 +554,7 @@
</translation>
</message>
<message>
<location line="+22"/>
<location line="+25"/>
<source>No block source available...</source>
<translation>No block source available...</translation>
</message>
@ -665,7 +665,7 @@ Address: %4 @@ -665,7 +665,7 @@ Address: %4
</translation>
</message>
<message>
<location line="+69"/>
<location line="+68"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</translation>
</message>
@ -678,7 +678,7 @@ Address: %4 @@ -678,7 +678,7 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
<location filename="../clientmodel.cpp" line="+138"/>
<location filename="../clientmodel.cpp" line="+139"/>
<source>Network Alert</source>
<translation>Network Alert</translation>
</message>
@ -736,7 +736,7 @@ Address: %4 @@ -736,7 +736,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
<location line="+16"/>
<source>Tree mode</source>
<translation type="unfinished"></translation>
</message>
@ -1059,7 +1059,7 @@ Address: %4 @@ -1059,7 +1059,7 @@ Address: %4
<context>
<name>HelpMessageDialog</name>
<message>
<location filename="../utilitydialog.cpp" line="+29"/>
<location filename="../utilitydialog.cpp" line="+31"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
@ -1201,7 +1201,7 @@ Address: %4 @@ -1201,7 +1201,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<location line="+10"/>
<source>Select payment request file</source>
<translation type="unfinished"></translation>
</message>
@ -1430,12 +1430,12 @@ Address: %4 @@ -1430,12 +1430,12 @@ Address: %4
<translation>&amp;OK</translation>
</message>
<message>
<location line="+7"/>
<location line="+13"/>
<source>&amp;Cancel</source>
<translation>&amp;Cancel</translation>
</message>
<message>
<location filename="../optionsdialog.cpp" line="+68"/>
<location filename="../optionsdialog.cpp" line="+71"/>
<source>default</source>
<translation>default</translation>
</message>
@ -1479,23 +1479,18 @@ Address: %4 @@ -1479,23 +1479,18 @@ Address: %4
<translation>Form</translation>
</message>
<message>
<location line="+52"/>
<location line="+394"/>
<location line="+53"/>
<location line="+372"/>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
<translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation>
</message>
<message>
<location line="-401"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
<location line="+33"/>
<location line="-133"/>
<source>Watch-only:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+43"/>
<location line="+10"/>
<source>Available:</source>
<translation type="unfinished"></translation>
</message>
@ -1505,62 +1500,72 @@ Address: %4 @@ -1505,62 +1500,72 @@ Address: %4
<translation>Your current spendable balance</translation>
</message>
<message>
<location line="+16"/>
<location line="+41"/>
<source>Pending:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<location line="-236"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</translation>
</message>
<message>
<location line="+16"/>
<location line="+112"/>
<source>Immature:</source>
<translation>Immature:</translation>
</message>
<message>
<location line="+16"/>
<location line="-29"/>
<source>Mined balance that has not yet matured</source>
<translation>Mined balance that has not yet matured</translation>
</message>
<message>
<location line="+23"/>
<location line="-163"/>
<source>Balances</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+147"/>
<source>Total:</source>
<translation>Total:</translation>
</message>
<message>
<location line="+16"/>
<location line="+61"/>
<source>Your current total balance</source>
<translation>Your current total balance</translation>
</message>
<message>
<location line="+38"/>
<location line="+92"/>
<source>Your current balance in watch-only addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+25"/>
<location line="+23"/>
<source>Spendable:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+49"/>
<source>Recent transactions</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-317"/>
<source>Unconfirmed transactions to watch-only addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+25"/>
<location line="+50"/>
<source>Mined balance in watch-only addresses that has not yet matured</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+128"/>
<source>Current total balance in watch-only addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+67"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Recent transactions&lt;/b&gt;</translation>
</message>
<message>
<location filename="../overviewpage.cpp" line="+123"/>
<location filename="../overviewpage.cpp" line="+131"/>
<location line="+1"/>
<source>out of sync</source>
<translation>out of sync</translation>
@ -1569,7 +1574,7 @@ Address: %4 @@ -1569,7 +1574,7 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
<location filename="../paymentserver.cpp" line="+405"/>
<location filename="../paymentserver.cpp" line="+410"/>
<location line="+14"/>
<location line="+7"/>
<source>URI handling</source>
@ -1681,7 +1686,7 @@ Address: %4 @@ -1681,7 +1686,7 @@ Address: %4
<context>
<name>PeerTableModel</name>
<message>
<location filename="../peertablemodel.cpp" line="+112"/>
<location filename="../peertablemodel.cpp" line="+118"/>
<source>User Agent</source>
<translation type="unfinished"></translation>
</message>
@ -1699,17 +1704,17 @@ Address: %4 @@ -1699,17 +1704,17 @@ Address: %4
<context>
<name>QObject</name>
<message>
<location filename="../bitcoinunits.cpp" line="+200"/>
<location filename="../bitcoinunits.cpp" line="+196"/>
<source>Amount</source>
<translation type="unfinished">Amount</translation>
</message>
<message>
<location filename="../guiutil.cpp" line="+97"/>
<location filename="../guiutil.cpp" line="+106"/>
<source>Enter a Bitcoin address (e.g. %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+673"/>
<location line="+698"/>
<source>%1 d</source>
<translation type="unfinished"></translation>
</message>
@ -1795,7 +1800,7 @@ Address: %4 @@ -1795,7 +1800,7 @@ Address: %4
<location line="+23"/>
<location line="+36"/>
<location line="+23"/>
<location line="+462"/>
<location line="+465"/>
<location line="+23"/>
<location line="+23"/>
<location line="+23"/>
@ -1813,7 +1818,7 @@ Address: %4 @@ -1813,7 +1818,7 @@ Address: %4
<translation>N/A</translation>
</message>
<message>
<location line="-987"/>
<location line="-990"/>
<source>Client version</source>
<translation>Client version</translation>
</message>
@ -1873,7 +1878,7 @@ Address: %4 @@ -1873,7 +1878,7 @@ Address: %4
<translation>Current number of blocks</translation>
</message>
<message>
<location line="+300"/>
<location line="+303"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
@ -1889,7 +1894,7 @@ Address: %4 @@ -1889,7 +1894,7 @@ Address: %4
</message>
<message>
<location line="+39"/>
<location filename="../rpcconsole.cpp" line="+234"/>
<location filename="../rpcconsole.cpp" line="+236"/>
<location line="+327"/>
<source>Select a peer to view detailed information.</source>
<translation type="unfinished"></translation>
@ -1965,7 +1970,7 @@ Address: %4 @@ -1965,7 +1970,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="-761"/>
<location line="-764"/>
<source>Last block time</source>
<translation>Last block time</translation>
</message>
@ -1990,7 +1995,7 @@ Address: %4 @@ -1990,7 +1995,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
<location line="+16"/>
<source>Totals</source>
<translation type="unfinished"></translation>
</message>
@ -2005,7 +2010,7 @@ Address: %4 @@ -2005,7 +2010,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/rpcconsole.ui" line="-354"/>
<location filename="../forms/rpcconsole.ui" line="-357"/>
<source>Build date</source>
<translation>Build date</translation>
</message>
@ -2163,12 +2168,12 @@ Address: %4 @@ -2163,12 +2168,12 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="+78"/>
<location line="+75"/>
<source>Requested payments history</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-98"/>
<location line="-95"/>
<source>&amp;Request payment</source>
<translation type="unfinished"></translation>
</message>
@ -2183,7 +2188,7 @@ Address: %4 @@ -2183,7 +2188,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<location line="+17"/>
<source>Remove the selected entries from the list</source>
<translation type="unfinished"></translation>
</message>
@ -2221,12 +2226,12 @@ Address: %4 @@ -2221,12 +2226,12 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<location line="+10"/>
<source>Copy &amp;Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<location line="+10"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"></translation>
</message>
@ -2279,7 +2284,7 @@ Address: %4 @@ -2279,7 +2284,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
<location filename="../recentrequeststablemodel.cpp" line="+24"/>
<location filename="../recentrequeststablemodel.cpp" line="+26"/>
<source>Date</source>
<translation type="unfinished">Date</translation>
</message>
@ -2333,7 +2338,7 @@ Address: %4 @@ -2333,7 +2338,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<location line="+10"/>
<source>automatically selected</source>
<translation type="unfinished"></translation>
</message>
@ -2398,22 +2403,22 @@ Address: %4 @@ -2398,22 +2403,22 @@ Address: %4
<translation>Add &amp;Recipient</translation>
</message>
<message>
<location line="-23"/>
<location line="-20"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-271"/>
<location line="-274"/>
<source>Dust:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+274"/>
<location line="+277"/>
<source>Clear &amp;All</source>
<translation>Clear &amp;All</translation>
</message>
<message>
<location line="+58"/>
<location line="+55"/>
<source>Balance:</source>
<translation>Balance:</translation>
</message>
@ -2653,7 +2658,7 @@ Address: %4 @@ -2653,7 +2658,7 @@ Address: %4
<context>
<name>ShutdownWindow</name>
<message>
<location filename="../utilitydialog.cpp" line="+51"/>
<location filename="../utilitydialog.cpp" line="+47"/>
<source>Bitcoin Core is shutting down...</source>
<translation type="unfinished"></translation>
</message>
@ -2671,7 +2676,7 @@ Address: %4 @@ -2671,7 +2676,7 @@ Address: %4
<translation>Signatures - Sign / Verify a Message</translation>
</message>
<message>
<location line="+10"/>
<location line="+13"/>
<source>&amp;Sign Message</source>
<translation>&amp;Sign Message</translation>
</message>
@ -2848,7 +2853,7 @@ Address: %4 @@ -2848,7 +2853,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
<location filename="../splashscreen.cpp" line="+32"/>
<location filename="../splashscreen.cpp" line="+34"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
@ -2874,7 +2879,7 @@ Address: %4 @@ -2874,7 +2879,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
<location filename="../transactiondesc.cpp" line="+33"/>
<location filename="../transactiondesc.cpp" line="+34"/>
<source>Open until %1</source>
<translation>Open until %1</translation>
</message>
@ -3098,7 +3103,7 @@ Address: %4 @@ -3098,7 +3103,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
<location filename="../transactiontablemodel.cpp" line="+237"/>
<location filename="../transactiontablemodel.cpp" line="+235"/>
<source>Date</source>
<translation>Date</translation>
</message>
@ -3166,7 +3171,7 @@ Address: %4 @@ -3166,7 +3171,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="+51"/>
<location line="+48"/>
<source>Received with</source>
<translation>Received with</translation>
</message>
@ -3191,12 +3196,17 @@ Address: %4 @@ -3191,12 +3196,17 @@ Address: %4
<translation>Mined</translation>
</message>
<message>
<location line="+41"/>
<location line="+28"/>
<source>watch-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>(n/a)</source>
<translation>(n/a)</translation>
</message>
<message>
<location line="+193"/>
<location line="+210"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
<translation>Transaction status. Hover over this field to show number of confirmations.</translation>
</message>
@ -3210,6 +3220,11 @@ Address: %4 @@ -3210,6 +3220,11 @@ Address: %4
<source>Type of transaction.</source>
<translation>Type of transaction.</translation>
</message>
<message>
<location line="+2"/>
<source>Whether or not a watch-only address is involved in this transaction.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Destination address of transaction.</source>
@ -3224,7 +3239,7 @@ Address: %4 @@ -3224,7 +3239,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
<location filename="../transactionview.cpp" line="+60"/>
<location filename="../transactionview.cpp" line="+67"/>
<location line="+16"/>
<source>All</source>
<translation>All</translation>
@ -3325,12 +3340,17 @@ Address: %4 @@ -3325,12 +3340,17 @@ Address: %4
<translation>Show transaction details</translation>
</message>
<message>
<location line="+163"/>
<location line="+179"/>
<source>Export Transaction History</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<location line="+12"/>
<source>Watch-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<source>Exporting Failed</source>
<translation type="unfinished"></translation>
</message>
@ -3350,7 +3370,7 @@ Address: %4 @@ -3350,7 +3370,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
<location line="-22"/>
<location line="-24"/>
<source>Comma separated file (*.csv)</source>
<translation>Comma separated file (*.csv)</translation>
</message>
@ -3360,7 +3380,7 @@ Address: %4 @@ -3360,7 +3380,7 @@ Address: %4
<translation>Confirmed</translation>
</message>
<message>
<location line="+1"/>
<location line="+3"/>
<source>Date</source>
<translation>Date</translation>
</message>
@ -3398,7 +3418,7 @@ Address: %4 @@ -3398,7 +3418,7 @@ Address: %4
<context>
<name>UnitDisplayStatusBarControl</name>
<message>
<location filename="../bitcoingui.cpp" line="+101"/>
<location filename="../bitcoingui.cpp" line="+103"/>
<source>Unit to show amounts in. Click to select another unit.</source>
<translation type="unfinished"></translation>
</message>
@ -3465,7 +3485,7 @@ Address: %4 @@ -3465,7 +3485,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
<location filename="../bitcoinstrings.cpp" line="+249"/>
<location filename="../bitcoinstrings.cpp" line="+240"/>
<source>Options:</source>
<translation>Options:</translation>
</message>
@ -3495,22 +3515,22 @@ Address: %4 @@ -3495,22 +3515,22 @@ Address: %4
<translation>Maintain at most &lt;n&gt; connections to peers (default: 125)</translation>
</message>
<message>
<location line="-62"/>
<location line="-53"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
</message>
<message>
<location line="+103"/>
<location line="+94"/>
<source>Specify your own public address</source>
<translation>Specify your own public address</translation>
</message>
<message>
<location line="+7"/>
<location line="+6"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Threshold for disconnecting misbehaving peers (default: 100)</translation>
</message>
<message>
<location line="-181"/>
<location line="-171"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation>
</message>
@ -3525,17 +3545,17 @@ Address: %4 @@ -3525,17 +3545,17 @@ Address: %4
<translation>Accept command line and JSON-RPC commands</translation>
</message>
<message>
<location line="+99"/>
<location line="+90"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Run in the background as a daemon and accept commands</translation>
</message>
<message>
<location line="+36"/>
<location line="+35"/>
<source>Use the test network</source>
<translation>Use the test network</translation>
</message>
<message>
<location line="-134"/>
<location line="-124"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation>
</message>
@ -3756,6 +3776,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -3756,6 +3776,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+2"/>
<source>Error: A fatal internal error occured, see debug.log for details</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Error: Disk space is low!</source>
<translation>Error: Disk space is low!</translation>
</message>
@ -3764,66 +3789,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -3764,66 +3789,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<source>Error: Wallet locked, unable to create transaction!</source>
<translation>Error: Wallet locked, unable to create transaction!</translation>
</message>
<message>
<location line="+1"/>
<source>Error: system error: </source>
<translation>Error: system error: </translation>
</message>
<message>
<location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
<translation>Failed to listen on any port. Use -listen=0 if you want this.</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to read block info</source>
<translation>Failed to read block info</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to read block</source>
<translation>Failed to read block</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to sync block index</source>
<translation>Failed to sync block index</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block index</source>
<translation>Failed to write block index</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block info</source>
<translation>Failed to write block info</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block</source>
<translation>Failed to write block</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write file info</source>
<translation>Failed to write file info</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write to coin database</source>
<translation>Failed to write to coin database</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write transaction index</source>
<translation>Failed to write transaction index</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write undo data</source>
<translation>Failed to write undo data</translation>
</message>
<message>
<location line="+2"/>
<source>Force safe mode (default: 0)</source>
@ -3860,12 +3830,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -3860,12 +3830,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+21"/>
<location line="+22"/>
<source>Not enough file descriptors available.</source>
<translation>Not enough file descriptors available.</translation>
</message>
<message>
<location line="+5"/>
<location line="+2"/>
<source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>Prepend debug output with timestamp (default: 1)</source>
<translation type="unfinished"></translation>
</message>
@ -3905,7 +3880,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -3905,7 +3880,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+3"/>
<source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"></translation>
</message>
@ -3940,7 +3915,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -3940,7 +3915,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Imports blocks from external blk000??.dat file</translation>
</message>
<message>
<location line="-195"/>
<location line="-185"/>
<source>(default: 1, 1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
<translation type="unfinished"></translation>
</message>
@ -4080,12 +4055,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -4080,12 +4055,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<location line="+5"/>
<source>Error: Unsupported argument -tor found, use -onion.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
<location line="+3"/>
<source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source>
<translation type="unfinished"></translation>
</message>
@ -4129,6 +4104,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -4129,6 +4104,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<source>Keep at most &lt;n&gt; unconnectable blocks in memory (default: %u)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Limit size of signature cache to &lt;n&gt; entries (default: 50000)</source>
@ -4170,12 +4150,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -4170,12 +4150,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Only accept block chain matching built-in checkpoints (default: 1)</translation>
</message>
<message>
<location line="+1"/>
<source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
<translation>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</translation>
</message>
<message>
<location line="+4"/>
<location line="+5"/>
<source>Print block on startup, if found in block index</source>
<translation type="unfinished"></translation>
</message>
@ -4255,12 +4230,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -4255,12 +4230,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Specify connection timeout in milliseconds (default: 5000)</translation>
</message>
<message>
<location line="+7"/>
<source>System error: </source>
<translation>System error: </translation>
</message>
<message>
<location line="+2"/>
<location line="+8"/>
<source>This is experimental software.</source>
<translation type="unfinished"></translation>
</message>
@ -4340,22 +4310,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -4340,22 +4310,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>wallet.dat corrupt, salvage failed</translation>
</message>
<message>
<location line="-64"/>
<location line="-63"/>
<source>Password for JSON-RPC connections</source>
<translation>Password for JSON-RPC connections</translation>
</message>
<message>
<location line="-164"/>
<location line="-155"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation>
</message>
<message>
<location line="+210"/>
<location line="+200"/>
<source>Upgrade wallet to latest format</source>
<translation>Upgrade wallet to latest format</translation>
</message>
<message>
<location line="-27"/>
<location line="-26"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Set key pool size to &lt;n&gt; (default: 100)</translation>
</message>
@ -4365,12 +4335,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -4365,12 +4335,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Rescan the block chain for missing wallet transactions</translation>
</message>
<message>
<location line="+36"/>
<location line="+35"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
<translation>Use OpenSSL (https) for JSON-RPC connections</translation>
</message>
<message>
<location line="-31"/>
<location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Server certificate file (default: server.cert)</translation>
</message>
@ -4380,22 +4350,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo. @@ -4380,22 +4350,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Server private key (default: server.pem)</translation>
</message>
<message>
<location line="+19"/>
<location line="+18"/>
<source>This help message</source>
<translation>This help message</translation>