Warn about downgrading to 0.8.x

Fixes #3782
Fix release notes transaction fees
2026-01-22 00:00:55 +01:00 · 2014-03-12 11:30:14 -04:00 · 2014-03-12 11:22:34 -04:00 · 2014-03-12 11:10:03 -04:00 · 2014-03-11 18:05:23 +01:00 · 2014-03-11 17:04:58 +01:00
29 changed files with 1613 additions and 1124 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -137,6 +137,23 @@ AC_PATH_PROG(XGETTEXT,xgettext)
 AC_PATH_PROG(HEXDUMP,hexdump)
 PKG_PROG_PKG_CONFIG

+# Enable debug 
+AC_ARG_ENABLE([debug],
+    [AS_HELP_STRING([--enable-debug],
+                    [use debug compiler flags and macros (default is no)])],
+    [enable_debug=$enableval],
+    [enable_debug=no])
+
+if test "x$enable_debug" = xyes; then
+    if test "x$GCC" = xyes; then
+        CFLAGS="-g3 -O0 -DDEBUG"
+    fi
+    
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="-g3 -O0 -DDEBUG"
+    fi
+fi 
+
 ## TODO: Remove these hard-coded paths and flags. They are here for the sake of
 ##       compatibility with the legacy buildsystem.
 ##
--- a/contrib/bitcoind.bash-completion
+++ b/contrib/bitcoind.bash-completion
@@ -1,5 +1,5 @@
-# bash programmable completion for bitcoind(1)
-# Copyright (c) 2012 Christian von Roques <roques@mti.ag>
+# bash programmable completion for bitcoind(1) and bitcoin-cli(1)
+# Copyright (c) 2012,2014 Christian von Roques <roques@mti.ag>
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -37,9 +37,35 @@ _bitcoind() {
    COMPREPLY=()
    _get_comp_words_by_ref -n = cur prev words cword

+    if ((cword > 4)); then
+        case ${words[cword-4]} in
+            signrawtransaction)
+                COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) )
+                return 0
+                ;;
+        esac
+    fi
+
+    if ((cword > 3)); then
+        case ${words[cword-3]} in
+            addmultisigaddress)
+                _bitcoin_accounts
+                return 0
+                ;;
+            gettxout|importprivkey)
+                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
+                return 0
+                ;;
+        esac
+    fi
+
    if ((cword > 2)); then
        case ${words[cword-2]} in
-            listreceivedbyaccount|listreceivedbyaddress)
+            addnode)
+                COMPREPLY=( $( compgen -W "add remove onetry" -- "$cur" ) )
+                return 0
+                ;;
+            getblock|getrawtransaction|listreceivedbyaccount|listreceivedbyaddress|sendrawtransaction)
                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
                return 0
                ;;
@@ -51,11 +77,11 @@ _bitcoind() {
    fi

    case "$prev" in
-        backupwallet)
+        backupwallet|dumpwallet|importwallet)
            _filedir
            return 0
            ;;
-        setgenerate)
+        getmempool|lockunspent|setgenerate)
            COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
            return 0
            ;;
@@ -66,7 +92,7 @@ _bitcoind() {
    esac

    case "$cur" in
-        -conf=*|-pid=*|-rpcsslcertificatechainfile=*|-rpcsslprivatekeyfile=*)
+        -conf=*|-pid=*|-loadblock=*|-wallet=*|-rpcsslcertificatechainfile=*|-rpcsslprivatekeyfile=*)
            cur="${cur#*=}"
            _filedir
            return 0
@@ -103,7 +129,7 @@ _bitcoind() {
    esac
 }

-complete -F _bitcoind bitcoind
+complete -F _bitcoind bitcoind bitcoin-cli
 }

 # Local variables:
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -14,21 +14,21 @@ This will build bitcoin-qt as well if the dependencies are met.
 Dependencies
 ---------------------

- Library     Purpose           Description
- -------     -------           -----------
- libssl      SSL Support       Secure communications
- libdb4.8    Berkeley DB       Wallet storage
- libboost    Boost             C++ Library
- miniupnpc   UPnP Support      Optional firewall-jumping support
- qt          GUI               GUI toolkit
- protobuf    Payments in GUI   Data interchange format used for payment protocol
- libqrencode QR codes in GUI   Optional for generating QR codes
+ Library     | Purpose          | Description
+ ------------|------------------|----------------------
+ libssl      | SSL Support      | Secure communications
+ libdb4.8    | Berkeley DB      | Wallet storage
+ libboost    | Boost            | C++ Library
+ miniupnpc   | UPnP Support     | Optional firewall-jumping support
+ qt          | GUI              | GUI toolkit
+ protobuf    | Payments in GUI  | Data interchange format used for payment protocol
+ libqrencode | QR codes in GUI  | Optional for generating QR codes

 [miniupnpc](http://miniupnp.free.fr/) may be used for UPnP port mapping.  It can be downloaded from [here](
 http://miniupnp.tuxfamily.org/files/).  UPnP support is compiled in and
 turned off by default.  See the configure options for upnp behavior desired:

-	--with-miniupnpc         No UPnP support miniupnp not required
+	--without-miniupnpc      No UPnP support miniupnp not required
 	--disable-upnp-default   (the default) UPnP support turned off by default at runtime
 	--enable-upnp-default    UPnP support turned on by default at runtime

--- a/doc/coding.md
+++ b/doc/coding.md
@@ -63,32 +63,32 @@ and its cs_KeyStore lock for example).
 -------
 Threads

+- ThreadScriptCheck : Verifies block scripts.
+
+- ThreadImport : Loads blocks from blk*.dat files or bootstrap.dat.
+
 - StartNode : Starts other threads.

- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it. 
+- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.
+
+- ThreadDNSAddressSeed : Loads addresses of peers from the DNS.
+
+- ThreadMapPort : Universal plug-and-play startup/shutdown

 - ThreadSocketHandler : Sends/Receives data from peers on port 8333.
- 
- ThreadMessageHandler : Higher-level message handling (sending and receiving).
- 
+
+- ThreadOpenAddedConnections : Opens network connections to added nodes.
+
 - ThreadOpenConnections : Initiates new connections to peers.

- ThreadTopUpKeyPool : replenishes the keystore's keypool.
- 
- ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time. 
- 
- SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete)
- 
- ThreadDelayedRepaint : repaint the gui 
+- ThreadMessageHandler : Higher-level message handling (sending and receiving).
+
+- DumpAddresses : Dumps IP addresses of nodes to peers.dat.

 - ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.
- 
+
 - ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.
- 
- ThreadBitcoinMiner : Generates bitcoins
-  
- ThreadMapPort : Universal plug-and-play startup/shutdown
- 
- Shutdown : Does an orderly shutdown of everything
- 
- ExitTimeout : Windows-only, sleeps 5 seconds then exits application
+
+- BitcoinMiner : Generates bitcoins (if wallet is enabled).
+
+- Shutdown : Does an orderly shutdown of everything.
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,6 +1,6 @@
-Bitcoin Core version 0.9.0rc1 is now available from:
+Bitcoin Core version 0.9.0rc3 is now available from:

-  http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.9.0rc1/
+  https://bitcoin.org/bin/0.9.0/test/

 This is a release candidate for a new major version. A major version brings
 both new features and bug fixes.
@@ -18,7 +18,7 @@ earlier versions of Bitcoin, then run the installer (on Windows) or just copy
 over /Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).

 If you are upgrading from version 0.7.2 or earlier, the first time you run
-0.9.0 your blockchain files will be re-indexed, which will take anywhere from
+0.9.0 your blockchain files will be re-indexed, which will take anywhere from 
 30 minutes to several hours, depending on the speed of your machine.

 On Windows, do not forget to uninstall all earlier versions of the Bitcoin
@@ -32,6 +32,33 @@ frequent reports of users running out of virtual memory on 32-bit systems
 during the initial sync. Because of this it is recommended to install the
 64-bit version if your system supports it.

+NOTE: Release candidate 2 Windows binaries are not code-signed; use PGP
+and the SHA256SUMS.asc file to make sure your binaries are correct.
+In the final 0.9.0 release, Windows setup.exe binaries will be code-signed.
+
+OSX 10.5 / 32-bit no longer supported
+-------------------------------------
+
+0.9.0 drops support for older Macs. The minimum requirements are now:
+* A 64-bit-capable CPU (see http://support.apple.com/kb/ht3696);
+* Mac OS 10.6 or later (see https://support.apple.com/kb/ht1633).
+
+Downgrading warnings
+--------------------
+
+The 'chainstate' for this release is not always compatible with previous
+releases, so if you run 0.9 and then decide to switch back to a
+0.8.x release you might get a blockchain validation error when starting the
+old release (due to 'pruned outputs' being omitted from the index of
+unspent transaction outputs).
+
+Running the old release with the -reindex option will rebuild the chainstate
+data structures and correct the problem.
+
+Also, the first time you run a 0.8.x release on a 0.9 wallet it will rescan
+the blockchain for missing spent coins, which will take a long time (tens
+of minutes on a typical machine).
+
 Rebranding to Bitcoin Core
 ---------------------------

@@ -44,8 +71,8 @@ Autotools build system
 For 0.9.0 we switched to an autotools-based build system instead of individual
 (q)makefiles.

-Using the standard “./autogen.sh; ./configure; make” to build Bitcoin-Qt and
-bitcoind makes it easier for experienced open source developers to contribute
+Using the standard "./autogen.sh; ./configure; make" to build Bitcoin-Qt and
+bitcoind makes it easier for experienced open source developers to contribute 
 to the project.

 Be sure to check doc/build-*.md for your platform before building from source.
@@ -55,7 +82,7 @@ Bitcoin-cli

 Another change in the 0.9 release is moving away from the bitcoind executable
 functioning both as a server and as a RPC client. The RPC client functionality
-(“tell the running bitcoin daemon to do THIS”) was split into a separate
+("tell the running bitcoin daemon to do THIS") was split into a separate
 executable, 'bitcoin-cli'. The RPC client code will eventually be removed from
 bitcoind, but will be kept for backwards compatibility for a release or two.

@@ -80,12 +107,53 @@ the old one:
    > walletpassphrase 10
    walletunlocktime = now + 10 (overriding the old unlock time)

-0.9.0rc1 Release notes
+Transaction malleability-related fixes
+--------------------------------------
+
+This release contains a few fixes for transaction ID (TXID) malleability 
+issues:
+
+- -nospendzeroconfchange command-line option, to avoid spending
+  zero-confirmation change
+- IsStandard() transaction rules tightened to prevent relaying and mining of
+  mutated transactions
+- Additional information in listtransactions/gettransaction output to
+  report wallet transactions that conflict with each other because
+  they spend the same outputs.
+- Bug fixes to the getbalance/listaccounts RPC commands, which would report
+  incorrect balances for double-spent (or mutated) transactions.
+- New option: -zapwallettxes to rebuild the wallet's transaction information
+
+Transaction Fees
+----------------
+
+This release drops the default fee required to relay transactions across the
+network and for miners to consider the transaction in their blocks to
+0.01mBTC per kilobyte.
+
+Note that getting a transaction relayed across the network does NOT guarantee
+that the transaction will be accepted by a miner; by default, miners fill
+their blocks with 50 kilobytes of high-priority transactions, and then with
+700 kilobytes of the highest-fee-per-kilobyte transactions.
+
+The minimum relay/mining fee-per-kilobyte may be changed with the
+minrelaytxfee option. Note that previous releases incorrectly used
+the mintxfee setting to determine which low-priority transactions should
+be considered for inclusion in blocks.
+
+The wallet code still uses a default fee for low-priority transactions of
+0.1mBTC per kilobyte. During periods of heavy transaction volume, even this
+fee may not be enough to get transactions confirmed quickly; the mintxfee
+option may be used to override the default.
+
+0.9.0rc3 Release notes
 =======================

 RPC:

+- New notion of 'conflicted' transactions, reported as confirmations: -1
 - 'listreceivedbyaddress' now provides tx ids
+- Add raw transaction hex to 'gettransaction' output
 - Updated help and tests for 'getreceivedby(account|address)'
 - In 'getblock', accept 2nd 'verbose' parameter, similar to getrawtransaction,
  but defaulting to 1 for backward compatibility
@@ -112,6 +180,8 @@ RPC:

 Command-line options:

+- New option: -nospendzeroconfchange to never spend unconfirmed change outputs
+- New option: -zapwallettxes to rebuild the wallet's transaction information
 - Rename option '-tor' to '-onion' to better reflect what it does
 - Add '-disablewallet' mode to let bitcoind run entirely without wallet (when
  built with wallet)
@@ -135,6 +205,8 @@ Block-chain handling and storage:

 Wallet:

+- Bug fixes and new regression tests to correctly compute
+  the balance of wallets containing double-spent (or mutated) transactions
 - Store key creation time. Calculate whole-wallet birthday.
 - Optimize rescan to skip blocks prior to birthday
 - Let user select wallet file with -wallet=foo.dat
@@ -143,17 +215,20 @@ Wallet:
 - Don't count txins for priority to encourage sweeping
 - Don't create empty transactions when reading a corrupted wallet
 - Fix rescan to start from beginning after importprivkey
- Only create signatures with low S values.
+- Only create signatures with low S values

 Mining:

 - Increase default -blockmaxsize/prioritysize to 750K/50K
 - 'getblocktemplate' does not require a key to create a block template
+- Mining code fee policy now matches relay fee policy

 Protocol and network:

+- Drop the fee required to relay a transaction to 0.01mBTC per kilobyte
 - Send tx relay flag with version
- New 'reject' P2P message (BIP 0061, see https://gist.github.com/gavinandresen/7079034 for draft)
+- New 'reject' P2P message (BIP 0061, see
+  https://gist.github.com/gavinandresen/7079034 for draft)
 - Dump addresses every 15 minutes instead of 10 seconds
 - Relay OP_RETURN data TxOut as standard transaction type
 - Remove CENT-output free transaction rule when relaying
@@ -181,8 +256,8 @@ Validation:
 Build system:

 - Switch to autotools-based build system
- Build without wallet by passing `--disable-wallet` to configure, this removes
-  the BerkeleyDB dependency
+- Build without wallet by passing `--disable-wallet` to configure, this 
+  removes the BerkeleyDB dependency
 - Upgrade gitian dependencies (libpng, libz, libupnpc, boost, openssl) to more
  recent versions
 - Windows 64-bit build support
@@ -207,17 +282,17 @@ GUI:
 - Improve receive coins workflow: make the 'Receive' tab into a form to request
  payments, and move historical address list functionality to File menu.
 - Rebrand to `Bitcoin Core`
- Move initialization/shutdown to a thread. This prevents “Not responding”
+- Move initialization/shutdown to a thread. This prevents "Not responding"
  messages during startup. Also show a window during shutdown.
 - Don't regenerate autostart link on every client startup
 - Show and store message of normal bitcoin:URI
 - Fix richtext detection hang issue on very old Qt versions
- osx: Make use of the 10.8+ user notification center to display growl like
-       notifications
- osx: Added NSHighResolutionCapable flag to Info.plist for better font
-       rendering on Retina displays.
- osx: Fix bitcoin-qt startup crash when clicking dock icon
- linux: Fix Gnome bitcoin: URI handler
+- OS X: Make use of the 10.8+ user notification center to display Growl-like 
+  notifications
+- OS X: Added NSHighResolutionCapable flag to Info.plist for better font
+  rendering on Retina displays.
+- OS X: Fix bitcoin-qt startup crash when clicking dock icon
+- Linux: Fix Gnome bitcoin: URI handler

 Miscellaneous:

@@ -233,28 +308,38 @@ Credits
 Thanks to everyone who contributed to this release:

 - Andrey
+- Ashley Holman
+- b6393ce9-d324-4fe1-996b-acf82dbc3d53
 - bitsofproof
 - Brandon Dahler
+- Calvin Tam
 - Christian Decker
+- Christian von Roques
 - Christopher Latham
 - Chuck
 - coblee
 - constantined
 - Cory Fields
 - Cozz Lovan
+- daniel
 - Daniel Larimer
 - David Hill
 - Dmitry Smirnov
+- Drak
 - Eric Lombrozo
 - fanquake
 - fcicq
 - Florin
+- frewil
 - Gavin Andresen
 - Gregory Maxwell
+- gubatron
 - Guillermo Céspedes Tabárez
+- Haakon Nilsen
 - HaltingState
 - Han Lin Yap
 - harry
+- Ian Kelling
 - Jeff Garzik
 - Johnathan Corgan
 - Jonas Schnelli
@@ -269,17 +354,21 @@ Thanks to everyone who contributed to this release:
 - Michael Bauer
 - Michael Ford
 - Michagogo
+- Midnight Magic
 - Mike Hearn
 - Nils Schneider
+- Noel Tiernan
 - Olivier Langlois
 - patrick s
 - Patrick Strateman
+- paveljanik
 - Peter Todd
 - phantomcircuit
 - phelixbtc
 - Philip Kaufmann
 - Pieter Wuille
 - Rav3nPL
+- R E Broadley
 - regergregregerrge
 - Robert Backhaus
 - Roman Mindalev
@@ -291,14 +380,18 @@ Thanks to everyone who contributed to this release:
 - Shawn Wilkinson
 - Sined
 - sje
+- Subo1978
 - super3
 - Tamas Blummer
 - theuni
 - Thomas Holenstein
 - Timon Rapp
 - Timothy Stranex
+- Tom Geller
+- Torstein Husebø
 - Vaclav Vobornik
 - vhf / victor felder
 - Vinnie Falco
 - Warren Togami
+- Wil Bown
 - Wladimir J. van der Laan
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -593,6 +593,7 @@ bool AppInit2(boost::thread_group& threadGroup)
    // ********************************************************* Step 5: verify wallet database integrity
 #ifdef ENABLE_WALLET
    if (!fDisableWallet) {
+        LogPrintf("Using wallet %s\n", strWalletFile);
        uiInterface.InitMessage(_("Verifying wallet..."));

        if (!bitdb.Open(GetDataDir()))
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -51,7 +51,7 @@ unsigned int nCoinCacheSize = 5000;

 /** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */
 int64_t CTransaction::nMinTxFee = 10000;  // Override with -mintxfee
-/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */
+/** Fees smaller than this (in satoshi) are considered zero fee (for relaying and mining) */
 int64_t CTransaction::nMinRelayTxFee = 1000;

 static CMedianFilter<int> cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have
@@ -2764,9 +2764,10 @@ bool static LoadBlockIndexDB()
    if (it == mapBlockIndex.end())
        return true;
    chainActive.SetTip(it->second);
-    LogPrintf("LoadBlockIndexDB(): hashBestChain=%s  height=%d date=%s\n",
+    LogPrintf("LoadBlockIndexDB(): hashBestChain=%s height=%d date=%s progress=%f\n",
        chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(),
-        DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()));
+        DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
+        Checkpoints::GuessVerificationProgress(chainActive.Tip()));

    return true;
 }
--- a/src/main.h
+++ b/src/main.h
@@ -35,8 +35,9 @@ class CInv;

 /** The maximum allowed size for a serialized block, in bytes (network rule) */
 static const unsigned int MAX_BLOCK_SIZE = 1000000;
-/** Default for -blockmaxsize, maximum size for mined blocks **/
+/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/
 static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
+static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
 /** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
 static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000;
 /** The maximum size for transactions we're willing to relay/mine */
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -136,7 +136,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)

    // Minimum block size you want to create; block will be filled with free transactions
    // until there are no more or the block reaches this size:
-    unsigned int nBlockMinSize = GetArg("-blockminsize", 0);
+    unsigned int nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE);
    nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);

    // Collect memory pool transactions into the block
@@ -254,7 +254,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
                continue;

            // Skip free transactions if we're past the minimum block size:
-            if (fSortedByFee && (dFeePerKb < CTransaction::nMinTxFee) && (nBlockSize + nTxSize >= nBlockMinSize))
+            if (fSortedByFee && (dFeePerKb < CTransaction::nMinRelayTxFee) && (nBlockSize + nTxSize >= nBlockMinSize))
                continue;

            // Prioritize by fee once past the priority size or we run out of high-priority
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1653,7 +1653,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
    {
        int nErr = WSAGetLastError();
        if (nErr == WSAEADDRINUSE)
-            strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin is probably already running."), addrBind.ToString());
+            strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core Daemon is probably already running."), addrBind.ToString());
        else
            strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString(), nErr, strerror(nErr));
        LogPrintf("%s\n", strError);
@@ -1664,7 +1664,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
    // Listen for incoming connections
    if (listen(hListenSocket, SOMAXCONN) == SOCKET_ERROR)
    {
-        strError = strprintf("Error: Listening for incoming connections failed (listen returned error %d)", WSAGetLastError());
+        strError = strprintf(_("Error: Listening for incoming connections failed (listen returned error %d)"), WSAGetLastError());
        LogPrintf("%s\n", strError);
        return false;
    }
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -78,6 +78,12 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
 {
    QSettings settings;

+    // Remove old translators
+    QApplication::removeTranslator(&qtTranslatorBase);
+    QApplication::removeTranslator(&qtTranslator);
+    QApplication::removeTranslator(&translatorBase);
+    QApplication::removeTranslator(&translator);
+
    // Get desired locale (e.g. "de_DE")
    // 1) System default language
    QString lang_territory = QLocale::system().name();
@@ -439,21 +445,9 @@ void BitcoinApplication::handleRunawayException(const QString &message)
 #ifndef BITCOIN_QT_TEST
 int main(int argc, char *argv[])
 {
-    bool fSelParFromCLFailed = false;
    /// 1. Parse command-line options. These take precedence over anything else.
    // Command-line options take precedence:
    ParseParameters(argc, argv);
-    // Check for -testnet or -regtest parameter (TestNet() calls are only valid after this clause)
-    if (!SelectParamsFromCommandLine()) {
-        fSelParFromCLFailed = true;
-    }
-#ifdef ENABLE_WALLET
-    // Parse URIs on command line -- this can affect TestNet() / RegTest() mode
-    if (!PaymentServer::ipcParseCommandLine(argc, argv))
-        exit(0);
-#endif
-
-    bool isaTestNet = TestNet() || RegTest();

    // Do not refer to data directory yet, this can be overridden by Intro::pickDataDirectory

@@ -480,12 +474,9 @@ int main(int argc, char *argv[])
    /// 3. Application identification
    // must be set before OptionsModel is initialized or translations are loaded,
    // as it is used to locate QSettings
-    QApplication::setOrganizationName("Bitcoin");
-    QApplication::setOrganizationDomain("bitcoin.org");
-    if (isaTestNet) // Separate UI settings for testnets
-        QApplication::setApplicationName("Bitcoin-Qt-testnet");
-    else
-        QApplication::setApplicationName("Bitcoin-Qt");
+    QApplication::setOrganizationName(QAPP_ORG_NAME);
+    QApplication::setOrganizationDomain(QAPP_ORG_DOMAIN);
+    QApplication::setApplicationName(QAPP_APP_NAME_DEFAULT);

    /// 4. Initialization of translations, so that intro dialog is in user's language
    // Now that QSettings are accessible, initialize translations
@@ -501,17 +492,13 @@ int main(int argc, char *argv[])
        help.showOrPrint();
        return 1;
    }
-    // Now that translations are initialized, check for earlier errors and show a translatable error message
-    if (fSelParFromCLFailed) {
-        QMessageBox::critical(0, QObject::tr("Bitcoin"), QObject::tr("Error: Invalid combination of -regtest and -testnet."));
-        return 1;
-    }

    /// 5. Now that settings and translations are available, ask user for data directory
    // User language is set up: pick a data directory
-    Intro::pickDataDirectory(isaTestNet);
+    Intro::pickDataDirectory();

    /// 6. Determine availability of data directory and parse bitcoin.conf
+    /// - Do not call GetDataDir(true) before this step finishes
    if (!boost::filesystem::is_directory(GetDataDir(false)))
    {
        QMessageBox::critical(0, QObject::tr("Bitcoin"),
@@ -520,8 +507,33 @@ int main(int argc, char *argv[])
    }
    ReadConfigFile(mapArgs, mapMultiArgs);

+    /// 7. Determine network (and switch to network specific options)
+    // - Do not call Params() before this step
+    // - Do this after parsing the configuration file, as the network can be switched there
+    // - QSettings() will use the new application name after this, resulting in network-specific settings
+    // - Needs to be done before createOptionsModel
+
+    // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
+    if (!SelectParamsFromCommandLine()) {
+        QMessageBox::critical(0, QObject::tr("Bitcoin"), QObject::tr("Error: Invalid combination of -regtest and -testnet."));
+        return 1;
+    }
 #ifdef ENABLE_WALLET
-    /// 7. URI IPC sending
+    // Parse URIs on command line -- this can affect Params()
+    if (!PaymentServer::ipcParseCommandLine(argc, argv))
+        exit(0);
+#endif
+    bool isaTestNet = Params().NetworkID() != CChainParams::MAIN;
+    // Allow for separate UI settings for testnets
+    if (isaTestNet)
+        QApplication::setApplicationName(QAPP_APP_NAME_TESTNET);
+    else
+        QApplication::setApplicationName(QAPP_APP_NAME_DEFAULT);
+    // Re-initialize translations after changing application name (language in network-specific settings can be different)
+    initTranslations(qtTranslatorBase, qtTranslator, translatorBase, translator);
+
+#ifdef ENABLE_WALLET
+    /// 8. URI IPC sending
    // - Do this early as we don't want to bother initializing if we are just calling IPC
    // - Do this *after* setting up the data directory, as the data directory hash is used in the name
    // of the server.
@@ -535,7 +547,7 @@ int main(int argc, char *argv[])
    app.createPaymentServer();
 #endif

-    /// 8. Main GUI initialization
+    /// 9. Main GUI initialization
    // Install global event filter that makes sure that long tooltips can be word-wrapped
    app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));
    // Install qDebug() message handler to route to debug.log
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -151,8 +151,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
    // Status bar notification icons
    QFrame *frameBlocks = new QFrame();
    frameBlocks->setContentsMargins(0,0,0,0);
-    frameBlocks->setMinimumWidth(56);
-    frameBlocks->setMaximumWidth(56);
+    frameBlocks->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
    QHBoxLayout *frameBlocksLayout = new QHBoxLayout(frameBlocks);
    frameBlocksLayout->setContentsMargins(3,0,3,0);
    frameBlocksLayout->setSpacing(3);
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -125,6 +125,7 @@ CoinControlDialog::CoinControlDialog(QWidget *parent) :
    ui->treeWidget->setColumnHidden(COLUMN_VOUT_INDEX, true);     // store vout index in this column, but dont show it
    ui->treeWidget->setColumnHidden(COLUMN_AMOUNT_INT64, true);   // store amount int64 in this column, but dont show it
    ui->treeWidget->setColumnHidden(COLUMN_PRIORITY_INT64, true); // store priority int64 in this column, but dont show it
+    ui->treeWidget->setColumnHidden(COLUMN_DATE_INT64, true);     // store date int64 in this column, but dont show it

    // default view is sorted by amount desc
    sortView(COLUMN_AMOUNT_INT64, Qt::DescendingOrder);
@@ -327,7 +328,7 @@ void CoinControlDialog::sortView(int column, Qt::SortOrder order)
    sortColumn = column;
    sortOrder = order;
    ui->treeWidget->sortItems(column, order);
-    ui->treeWidget->header()->setSortIndicator((sortColumn == COLUMN_AMOUNT_INT64 ? COLUMN_AMOUNT : (sortColumn == COLUMN_PRIORITY_INT64 ? COLUMN_PRIORITY : sortColumn)), sortOrder);
+    ui->treeWidget->header()->setSortIndicator(getMappedColumn(sortColumn), sortOrder);
 }

 // treeview: clicked on header
@@ -335,22 +336,18 @@ void CoinControlDialog::headerSectionClicked(int logicalIndex)
 {
    if (logicalIndex == COLUMN_CHECKBOX) // click on most left column -> do nothing
    {
-        ui->treeWidget->header()->setSortIndicator((sortColumn == COLUMN_AMOUNT_INT64 ? COLUMN_AMOUNT : (sortColumn == COLUMN_PRIORITY_INT64 ? COLUMN_PRIORITY : sortColumn)), sortOrder);
+        ui->treeWidget->header()->setSortIndicator(getMappedColumn(sortColumn), sortOrder);
    }
    else
    {
-        if (logicalIndex == COLUMN_AMOUNT) // sort by amount
-            logicalIndex = COLUMN_AMOUNT_INT64;
-
-        if (logicalIndex == COLUMN_PRIORITY) // sort by priority
-            logicalIndex = COLUMN_PRIORITY_INT64;
+        logicalIndex = getMappedColumn(logicalIndex, false);

        if (sortColumn == logicalIndex)
            sortOrder = ((sortOrder == Qt::AscendingOrder) ? Qt::DescendingOrder : Qt::AscendingOrder);
        else
        {
            sortColumn = logicalIndex;
-            sortOrder = ((sortColumn == COLUMN_AMOUNT_INT64 || sortColumn == COLUMN_PRIORITY_INT64 || sortColumn == COLUMN_DATE || sortColumn == COLUMN_CONFIRMATIONS) ? Qt::DescendingOrder : Qt::AscendingOrder); // if amount,date,conf,priority then default => desc, else default => asc
+            sortOrder = ((sortColumn == COLUMN_LABEL || sortColumn == COLUMN_ADDRESS) ? Qt::AscendingOrder : Qt::DescendingOrder); // if label or address then default => asc, else default => desc
        }

        sortView(sortColumn, sortOrder);
@@ -731,6 +728,7 @@ void CoinControlDialog::updateView()

            // date
            itemOutput->setText(COLUMN_DATE, GUIUtil::dateTimeStr(out.tx->GetTxTime()));
+            itemOutput->setText(COLUMN_DATE_INT64, strPad(QString::number(out.tx->GetTxTime()), 20, " "));

            // confirmations
            itemOutput->setText(COLUMN_CONFIRMATIONS, strPad(QString::number(out.nDepth), 8, " "));
--- a/src/qt/coincontroldialog.h
+++ b/src/qt/coincontroldialog.h
@@ -65,9 +65,35 @@ private:
        COLUMN_TXHASH,
        COLUMN_VOUT_INDEX,
        COLUMN_AMOUNT_INT64,
-        COLUMN_PRIORITY_INT64
+        COLUMN_PRIORITY_INT64,
+        COLUMN_DATE_INT64
    };

+    // some columns have a hidden column containing the value used for sorting
+    int getMappedColumn(int column, bool fVisibleColumn = true)
+    {
+        if (fVisibleColumn)
+        {
+            if (column == COLUMN_AMOUNT_INT64)
+                return COLUMN_AMOUNT;
+            else if (column == COLUMN_PRIORITY_INT64)
+                return COLUMN_PRIORITY;
+            else if (column == COLUMN_DATE_INT64)
+                return COLUMN_DATE;
+        }
+        else
+        {
+            if (column == COLUMN_AMOUNT)
+                return COLUMN_AMOUNT_INT64;
+            else if (column == COLUMN_PRIORITY)
+                return COLUMN_PRIORITY_INT64;
+            else if (column == COLUMN_DATE)
+                return COLUMN_DATE_INT64;
+        }
+
+        return column;
+    }
+
 private slots:
    void showMenu(const QPoint &);
    void copyAmount();
--- a/src/qt/forms/addressbookpage.ui
+++ b/src/qt/forms/addressbookpage.ui
@@ -122,6 +122,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="closeButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
       <property name="text">
        <string>C&amp;lose</string>
       </property>
--- a/src/qt/forms/coincontroldialog.ui
+++ b/src/qt/forms/coincontroldialog.ui
@@ -428,7 +428,7 @@
      <bool>false</bool>
     </property>
     <property name="columnCount">
-      <number>11</number>
+      <number>12</number>
     </property>
     <attribute name="headerShowSortIndicator" stdset="0">
      <bool>true</bool>
@@ -494,6 +494,11 @@
       <string/>
      </property>
     </column>
+     <column>
+      <property name="text">
+       <string/>
+      </property>
+     </column>
    </widget>
   </item>
   <item>
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -742,6 +742,12 @@
       </property>
       <item>
        <widget class="QLabel" name="label">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
         <property name="text">
          <string>Balance:</string>
         </property>
@@ -749,6 +755,12 @@
       </item>
       <item>
        <widget class="QLabel" name="labelBalance">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
         <property name="cursor">
          <cursorShape>IBeamCursor</cursorShape>
         </property>
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -41,4 +41,9 @@ static const int MAX_PAYMENT_REQUEST_SIZE = 50000; // bytes
 /* Number of frames in spinner animation */
 #define SPINNER_FRAMES 35

+#define QAPP_ORG_NAME "Bitcoin"
+#define QAPP_ORG_DOMAIN "bitcoin.org"
+#define QAPP_APP_NAME_DEFAULT "Bitcoin-Qt"
+#define QAPP_APP_NAME_TESTNET "Bitcoin-Qt-testnet"
+
 #endif // GUICONSTANTS_H
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -14,7 +14,7 @@

 /* Minimum free space (in bytes) needed for data directory */
 static const uint64_t GB_BYTES = 1000000000LL;
-static const uint64_t BLOCK_CHAIN_SIZE = 10LL * GB_BYTES;
+static const uint64_t BLOCK_CHAIN_SIZE = 20LL * GB_BYTES;

 /* Check free space asynchronously to prevent hanging the UI thread.

@@ -146,7 +146,7 @@ QString Intro::getDefaultDataDirectory()
    return QString::fromStdString(GetDefaultDataDir().string());
 }

-void Intro::pickDataDirectory(bool fIsTestnet)
+void Intro::pickDataDirectory()
 {
    namespace fs = boost::filesystem;
    QSettings settings;
@@ -164,10 +164,7 @@ void Intro::pickDataDirectory(bool fIsTestnet)
        /* If current default data directory does not exist, let the user choose one */
        Intro intro;
        intro.setDataDirectory(dataDir);
-        if (!fIsTestnet)
-            intro.setWindowIcon(QIcon(":icons/bitcoin"));
-        else
-            intro.setWindowIcon(QIcon(":icons/bitcoin_testnet"));
+        intro.setWindowIcon(QIcon(":icons/bitcoin"));

        while(true)
        {
--- a/src/qt/intro.h
+++ b/src/qt/intro.h
@@ -36,7 +36,7 @@ public:
     * @note do NOT call global GetDataDir() before calling this function, this
     * will cause the wrong path to be cached.
     */
-    static void pickDataDirectory(bool fIsTestnet);
+    static void pickDataDirectory();

    /**
     * Determine default data directory for operating system.
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -4,7 +4,7 @@
    <message>
        <location filename="../forms/aboutdialog.ui" line="+14"/>
        <source>About Bitcoin Core</source>
-        <translation>Acerca del Núcleo de Bitcoin</translation>
+        <translation>Acerca de Bitcoin Core</translation>
    </message>
    <message>
        <location line="+39"/>
@@ -39,6 +39,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
        <source>The Bitcoin Core developers</source>
        <translation>Los desarrolladores del Núcleo de Bitcoin</translation>
    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+2"/>
+        <source> (%1-bit)</source>
+        <translation> (%1-bit)</translation>
+    </message>
 </context>
 <context>
    <name>AddressBookPage</name>
@@ -100,12 +106,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
    <message>
        <location filename="../addressbookpage.cpp" line="-30"/>
        <source>Choose the address to send coins to</source>
-        <translation>Escoja la dirección para enviar monedas</translation>
+        <translation>Escoja la dirección a la que enviar bitcoins</translation>
    </message>
    <message>
        <location line="+1"/>
        <source>Choose the address to receive coins with</source>
-        <translation>Escoja la dirección para recibir monedas</translation>
+        <translation>Escoja la dirección de la que recibir bitcoins</translation>
    </message>
    <message>
        <location line="+5"/>
@@ -115,17 +121,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
    <message>
        <location line="+6"/>
        <source>Sending addresses</source>
-        <translation>Enviando dirección</translation>
+        <translation>Direcciones de envío</translation>
    </message>
    <message>
        <location line="+1"/>
        <source>Receiving addresses</source>
-        <translation>Recibiendo dirección</translation>
+        <translation>Direcciones de recepción</translation>
    </message>
    <message>
        <location line="+7"/>
        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation>Estas son sus direcciones Bitcoin para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de transferir monedas.</translation>
+        <translation>Estas son sus direcciones Bitcoin para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de enviar bitcoins.</translation>
    </message>
    <message>
        <location line="+4"/>
@@ -408,12 +414,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
    <message>
        <location line="+10"/>
        <source>&amp;Sending addresses...</source>
-        <translation>&amp;Enviando direcciones...</translation>
+        <translation>Direcciones de &amp;envío...</translation>
    </message>
    <message>
        <location line="+2"/>
        <source>&amp;Receiving addresses...</source>
-        <translation>&amp;Recibiendo direcciones...</translation>
+        <translation>Direcciones de &amp;recepción...</translation>
    </message>
    <message>
        <location line="+3"/>
@@ -433,7 +439,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
    <message>
        <location line="-405"/>
        <source>Send coins to a Bitcoin address</source>
-        <translation>Enviar monedas a una dirección Bitcoin</translation>
+        <translation>Enviar bitcoins a una dirección Bitcoin</translation>
    </message>
    <message>
        <location line="+49"/>
@@ -540,7 +546,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
    <message>
        <location line="-401"/>
        <source>Bitcoin Core</source>
-        <translation>Núcleo de Bitcoin</translation>
+        <translation>Bitcoin Core</translation>
    </message>
    <message>
        <location line="+163"/>
@@ -551,7 +557,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
        <location line="+29"/>
        <location line="+2"/>
        <source>&amp;About Bitcoin Core</source>
-        <translation>&amp;Acerca del Núcleo de Bitcoin</translation>
+        <translation>&amp;Acerca de Bitcoin Core</translation>
    </message>
    <message>
        <location line="+35"/>
@@ -622,7 +628,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
    <message>
        <location line="+4"/>
        <source>%1 behind</source>
-        <translation>%1 atrás</translation>
+        <translation>%1 por detrás</translation>
    </message>
    <message>
        <location line="+21"/>
@@ -693,7 +699,7 @@ Dirección: %4
        <translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../bitcoin.cpp" line="+438"/>
+        <location filename="../bitcoin.cpp" line="+435"/>
        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
        <translation>Ha ocurrido un error crítico. Bitcoin ya no puede continuar con seguridad y se cerrará.</translation>
    </message>
@@ -711,7 +717,7 @@ Dirección: %4
    <message>
        <location filename="../forms/coincontroldialog.ui" line="+14"/>
        <source>Coin Control Address Selection</source>
-        <translation>Selección de la dirección de control de la moneda</translation>
+        <translation>Selección de direcciones bajo Coin Control</translation>
    </message>
    <message>
        <location line="+34"/>
@@ -754,7 +760,7 @@ Dirección: %4
        <translation>Cambio:</translation>
    </message>
    <message>
-        <location line="+63"/>
+        <location line="+56"/>
        <source>(un)select all</source>
        <translation>(des)selecciona todos</translation>
    </message>
@@ -769,7 +775,7 @@ Dirección: %4
        <translation>Modo lista</translation>
    </message>
    <message>
-        <location line="+52"/>
+        <location line="+53"/>
        <source>Amount</source>
        <translation>Cantidad</translation>
    </message>
@@ -920,7 +926,7 @@ Dirección: %4
        <translation>nada</translation>
    </message>
    <message>
-        <location line="+140"/>
+        <location line="+141"/>
        <source>Dust</source>
        <translation>Basura</translation>
    </message>
@@ -979,7 +985,7 @@ Dirección: %4
    <message>
        <location line="+2"/>
        <source>This label turns red, if the change is smaller than %1.</source>
-        <translation>Esta etiqueta se vuelve roja si la cantidad de monedas es menor a %1</translation>
+        <translation>Esta etiqueta se vuelve roja si el cambio es menor que %1</translation>
    </message>
    <message>
        <location line="+43"/>
@@ -1102,7 +1108,7 @@ Dirección: %4
        <translation>Bitcoin Core - opciones de línea de comandos</translation>
    </message>
    <message>
-        <location filename="../utilitydialog.cpp" line="+38"/>
+        <location filename="../utilitydialog.cpp" line="+24"/>
        <source>Bitcoin Core</source>
        <translation>Núcleo de Bitcoin</translation>
    </message>
@@ -1246,7 +1252,7 @@ Dirección: %4
        <translation>&amp;Principal</translation>
    </message>
    <message>
-        <location line="+6"/>
+        <location line="+122"/>
        <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
        <translation>Tarifa de transacción opcional por kB que ayuda a asegurar que sus transacciones sean procesadas rápidamente. La mayoría de transacciones son de 1kB.</translation>
    </message>
@@ -1256,7 +1262,7 @@ Dirección: %4
        <translation>Comisión de &amp;transacciones</translation>
    </message>
    <message>
-        <location line="+31"/>
+        <location line="-131"/>
        <source>Automatically start Bitcoin after logging in to the system.</source>
        <translation>Iniciar Bitcoin automáticamente al encender el sistema.</translation>
    </message>
@@ -1271,12 +1277,7 @@ Dirección: %4
        <translation>Tamaño de cache de la &amp;base de datos</translation>
    </message>
    <message>
-        <location line="+13"/>
-        <source>Set database cache size in megabytes (default: 25)</source>
-        <translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+16"/>
        <source>MB</source>
        <translation>MB</translation>
    </message>
@@ -1291,7 +1292,12 @@ Dirección: %4
        <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, &lt;0 = leave that many cores free, por fecto: 0)</translation>
    </message>
    <message>
-        <location line="+58"/>
+        <location line="+107"/>
+        <source>&amp;Spend unconfirmed change (experts only)</source>
+        <translation>&amp;Gastar cambio no confirmado (solo expertos)</translation>
+    </message>
+    <message>
+        <location line="+37"/>
        <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
        <translation>Conectarse a la red Bitcoin a través de un proxy SOCKS.</translation>
    </message>
@@ -1326,7 +1332,17 @@ Dirección: %4
        <translation>&amp;Red</translation>
    </message>
    <message>
-        <location line="+6"/>
+        <location line="-86"/>
+        <source>W&amp;allet</source>
+        <translation>&amp;Monedero</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+        <translation>Si desactiva el gasto del cambio no confirmado, no se podrá usar el cambio de una transacción hasta que se alcance al menos una confirmación. Esto afecta también a cómo se calcula su saldo.</translation>
+    </message>
+    <message>
+        <location line="+40"/>
        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
        <translation>Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado.</translation>
    </message>
@@ -1358,7 +1374,7 @@ Dirección: %4
    <message>
        <location line="+13"/>
        <source>SOCKS version of the proxy (e.g. 5)</source>
-        <translation>Versión del proxy SOCKS (ej. 5)</translation>
+        <translation>Versión SOCKS del proxy (ej. 5)</translation>
    </message>
    <message>
        <location line="+36"/>
@@ -1408,7 +1424,7 @@ Dirección: %4
    <message>
        <location line="+13"/>
        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation>Elegir la subdivisión predeterminada para mostrar cantidades en la interfaz y cuando se envían monedas.</translation>
+        <translation>Elegir la subdivisión predeterminada para mostrar cantidades en la interfaz y cuando se envían bitcoins.</translation>
    </message>
    <message>
        <location line="+9"/>
@@ -1423,12 +1439,12 @@ Dirección: %4
    <message>
        <location line="+7"/>
        <source>Whether to show coin control features or not.</source>
-        <translation>Mostrar o no características de control de moneda</translation>
+        <translation>Mostrar o no funcionalidad de Coin Control</translation>
    </message>
    <message>
        <location line="+3"/>
        <source>Display coin &amp;control features (experts only)</source>
-        <translation>Mostrar moneda y características de control (Avanzado)</translation>
+        <translation>Mostrar funcionalidad de Coin Control (solo expertos)</translation>
    </message>
    <message>
        <location line="+136"/>
@@ -1441,17 +1457,17 @@ Dirección: %4
        <translation>&amp;Cancelar</translation>
    </message>
    <message>
-        <location filename="../optionsdialog.cpp" line="+67"/>
+        <location filename="../optionsdialog.cpp" line="+70"/>
        <source>default</source>
        <translation>predeterminado</translation>
    </message>
    <message>
-        <location line="+57"/>
+        <location line="+58"/>
        <source>none</source>
        <translation>nada</translation>
    </message>
    <message>
-        <location line="+75"/>
+        <location line="+78"/>
        <source>Confirm options reset</source>
        <translation>Confirme el restablecimiento de las opciones</translation>
    </message>
@@ -1491,19 +1507,14 @@ Dirección: %4
        <translation>La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión, pero este proceso aún no se ha completado.</translation>
    </message>
    <message>
-        <location line="-155"/>
-        <source>Unconfirmed:</source>
-        <translation>No confirmado(s):</translation>
-    </message>
-    <message>
-        <location line="-83"/>
+        <location line="-238"/>
        <source>Wallet</source>
        <translation>Monedero</translation>
    </message>
    <message>
        <location line="+51"/>
-        <source>Confirmed:</source>
-        <translation>Confirmado:</translation>
+        <source>Available:</source>
+        <translation>Disponible:</translation>
    </message>
    <message>
        <location line="+16"/>
@@ -1511,7 +1522,12 @@ Dirección: %4
        <translation>Su balance actual gastable</translation>
    </message>
    <message>
-        <location line="+32"/>
+        <location line="+16"/>
+        <source>Pending:</source>
+        <translation>Pendiente:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
        <translation>Total de transacciones que deben ser confirmadas, y que no cuentan con el balance gastable necesario</translation>
    </message>
@@ -1803,12 +1819,12 @@ Dirección: %4
    <message>
        <location line="+64"/>
        <source>In:</source>
-        <translation>Dentro:</translation>
+        <translation>Entrante:</translation>
    </message>
    <message>
        <location line="+80"/>
        <source>Out:</source>
-        <translation>Fuera:</translation>
+        <translation>Saliente:</translation>
    </message>
    <message>
        <location line="-521"/>
@@ -2090,7 +2106,7 @@ Dirección: %4
    <message>
        <location line="+8"/>
        <source>(no amount)</source>
-        <translation>(sin monto)</translation>
+        <translation>(sin cantidad)</translation>
    </message>
 </context>
 <context>
@@ -2100,12 +2116,12 @@ Dirección: %4
        <location filename="../sendcoinsdialog.cpp" line="+380"/>
        <location line="+80"/>
        <source>Send Coins</source>
-        <translation>Enviar monedas</translation>
+        <translation>Enviar bitcoins</translation>
    </message>
    <message>
        <location line="+76"/>
        <source>Coin Control Features</source>
-        <translation>Características de control de la moneda</translation>
+        <translation>Características de Coin Control</translation>
    </message>
    <message>
        <location line="+20"/>
@@ -2165,7 +2181,7 @@ Dirección: %4
    <message>
        <location line="+44"/>
        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation>Al activarse, si la dirección esta vacía o es inválida, las monedas serán enviadas a una nueva dirección generada.</translation>
+        <translation>Si esto se activa pero la dirección de cambio está vacía o es inválida, el cambio se enviará a una nueva dirección recién generada.</translation>
    </message>
    <message>
        <location line="+3"/>
@@ -2210,7 +2226,7 @@ Dirección: %4
    <message>
        <location filename="../sendcoinsdialog.cpp" line="-229"/>
        <source>Confirm send coins</source>
-        <translation>Confirmar el envío de monedas</translation>
+        <translation>Confirmar el envío de bitcoins</translation>
    </message>
    <message>
        <location line="-74"/>
@@ -2303,7 +2319,7 @@ Dirección: %4
    <message>
        <location line="+4"/>
        <source>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.</source>
-        <translation>La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui.</translation>
+        <translation>¡La transacción fue rechazada! Esto puede haber ocurrido si alguno de los bitcoins de su monedero ya estaba gastado o si ha usado una copia de wallet.dat y los bitcoins estaban gastados en la copia pero no se habían marcado como gastados aqui.</translation>
    </message>
    <message>
        <location line="+113"/>
@@ -2451,7 +2467,7 @@ Dirección: %4
    <message>
        <location line="+1"/>
        <source>Do not shut down the computer until this window disappears.</source>
-        <translation>No apague la máquina hasta que desaparezca esta ventana.</translation>
+        <translation>No apague el equipo hasta que desaparezca esta ventana.</translation>
    </message>
 </context>
 <context>
@@ -2676,6 +2692,11 @@ Dirección: %4
    </message>
    <message>
        <location line="+6"/>
+        <source>conflicted</source>
+        <translation>en conflicto</translation>
+    </message>
+    <message>
+        <location line="+2"/>
        <source>%1/offline</source>
        <translation>%1/fuera de línea</translation>
    </message>
@@ -2799,7 +2820,7 @@ Dirección: %4
    <message>
        <location line="+7"/>
        <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <translation>Las monedas generadas deben madurar %1 bloques antes de que puedan ser gastadas. Una vez que generas este bloque, es propagado por la red para ser añadido a la cadena de bloques. Si falla el intento de meterse en la cadena, su estado cambiará a &quot;no aceptado&quot; y ya no se puede gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del tuyo.</translation>
+        <translation>Los bitcoins generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a &quot;no aceptado&quot; y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo.</translation>
    </message>
    <message>
        <location line="+8"/>
@@ -2837,12 +2858,12 @@ Dirección: %4
        <translation>, todavía no se ha sido difundido satisfactoriamente</translation>
    </message>
    <message numerus="yes">
-        <location line="-35"/>
+        <location line="-37"/>
        <source>Open for %n more block(s)</source>
        <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
    </message>
    <message>
-        <location line="+70"/>
+        <location line="+72"/>
        <source>unknown</source>
        <translation>desconocido</translation>
    </message>
@@ -2883,12 +2904,12 @@ Dirección: %4
        <translation>Cantidad</translation>
    </message>
    <message>
-        <location line="+59"/>
+        <location line="+78"/>
        <source>Immature (%1 confirmations, will be available after %2)</source>
        <translation>No vencidos (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation>
    </message>
    <message numerus="yes">
-        <location line="+16"/>
+        <location line="-21"/>
        <source>Open for %n more block(s)</source>
        <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
    </message>
@@ -2898,23 +2919,12 @@ Dirección: %4
        <translation>Abierto hasta %1</translation>
    </message>
    <message>
-        <location line="+3"/>
-        <source>Offline (%1 confirmations)</source>
-        <translation>Fuera de línea (%1 confirmaciones)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Unconfirmed (%1 of %2 confirmations)</source>
-        <translation>No confirmado (%1 de %2 confirmaciones)</translation>
-    </message>
-    <message>
-        <location line="-22"/>
-        <location line="+25"/>
+        <location line="+12"/>
        <source>Confirmed (%1 confirmations)</source>
        <translation>Confirmado (%1 confirmaciones)</translation>
    </message>
    <message>
-        <location line="-22"/>
+        <location line="+9"/>
        <source>This block was not received by any other nodes and will probably not be accepted!</source>
        <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation>
    </message>
@@ -2924,7 +2934,27 @@ Dirección: %4
        <translation>Generado pero no aceptado</translation>
    </message>
    <message>
-        <location line="+62"/>
+        <location line="-21"/>
+        <source>Offline</source>
+        <translation>Sin conexión</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unconfirmed</source>
+        <translation>Sin confirmar</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmando (%1 de %2 confirmaciones recomendadas)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Conflicted</source>
+        <translation>En conflicto</translation>
+    </message>
+    <message>
+        <location line="+51"/>
        <source>Received with</source>
        <translation>Recibido con</translation>
    </message>
@@ -2954,7 +2984,7 @@ Dirección: %4
        <translation>(nd)</translation>
    </message>
    <message>
-        <location line="+199"/>
+        <location line="+190"/>
        <source>Transaction status. Hover over this field to show number of confirmations.</source>
        <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation>
    </message>
@@ -3171,7 +3201,7 @@ Dirección: %4
    <message>
        <location filename="../walletmodel.cpp" line="+245"/>
        <source>Send Coins</source>
-        <translation>Enviar monedas</translation>
+        <translation>Enviar bitcoins</translation>
    </message>
 </context>
 <context>
@@ -3220,12 +3250,12 @@ Dirección: %4
 <context>
    <name>bitcoin-core</name>
    <message>
-        <location filename="../bitcoinstrings.cpp" line="+221"/>
+        <location filename="../bitcoinstrings.cpp" line="+223"/>
        <source>Usage:</source>
        <translation>Uso:</translation>
    </message>
    <message>
-        <location line="-54"/>
+        <location line="-55"/>
        <source>List commands</source>
        <translation>Muestra comandos
 </translation>
@@ -3285,12 +3315,12 @@ Dirección: %4
        <translation>Especifique su propia dirección pública</translation>
    </message>
    <message>
-        <location line="+5"/>
+        <location line="+6"/>
        <source>Threshold for disconnecting misbehaving peers (default: 100)</source>
        <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: 100)</translation>
    </message>
    <message>
-        <location line="-148"/>
+        <location line="-150"/>
        <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
        <translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: 86400)</translation>
    </message>
@@ -3311,19 +3341,19 @@ Dirección: %4
 </translation>
    </message>
    <message>
-        <location line="+80"/>
+        <location line="+81"/>
        <source>Run in the background as a daemon and accept commands</source>
        <translation>Ejecutar en segundo plano como daemon y aceptar comandos
 </translation>
    </message>
    <message>
-        <location line="+39"/>
+        <location line="+40"/>
        <source>Use the test network</source>
        <translation>Usar la red de pruebas
 </translation>
    </message>
    <message>
-        <location line="-118"/>
+        <location line="-120"/>
        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
        <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation>
    </message>
@@ -3355,7 +3385,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+12"/>
        <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source>
-        <translation>Cifradores aceptables (por defecto: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation>
+        <translation>Cifrados aceptables (predeterminados: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation>
    </message>
    <message>
        <location line="+5"/>
@@ -3385,12 +3415,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+3"/>
        <source>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.</source>
-        <translation>¡Error: se ha rechazado la transacción! Esto puede ocurrir si ya se han gastado algunas de las monedas del monedero, como ocurriría si hubiera hecho una copia de wallet.dat y se hubieran gastado monedas a partir de la copia, con lo que no se habrían marcado aquí como gastadas.</translation>
+        <translation>¡Error: se ha rechazado la transacción! Esto puede ocurrir si ya se han gastado algunos de los bitcoins del monedero, como ocurriría si hubiera hecho una copia de wallet.dat y se hubieran gastado bitcoins a partir de la copia, con lo que no se habrían marcado aquí como gastados.</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
-        <translation>¡Error: Esta transacción requiere una comisión de al menos %s debido a su monto, complejidad, o al uso de fondos recién recibidos!</translation>
+        <translation>¡Error: Esta transacción requiere una comisión de al menos %s debido a su cantidad, complejidad, o al uso de fondos recién recibidos!</translation>
    </message>
    <message>
        <location line="+6"/>
@@ -3405,7 +3435,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+5"/>
        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
-        <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: -proxy)</translation>
+        <translation>Usar proxy SOCKS5 distinto para comunicarse vía Tor de forma anónima (Predeterminado: -proxy)</translation>
    </message>
    <message>
        <location line="+3"/>
@@ -3450,7 +3480,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+1"/>
        <source>Bitcoin Core Daemon</source>
-        <translation>Proceso Bitcoin-QT</translation>
+        <translation>Proceso Bitcoin Core</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3464,6 +3494,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    </message>
    <message>
        <location line="+5"/>
+        <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+        <translation>Vaciar lista de transacciones del monedero (herramienta de diagnóstico; implica -rescan)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
        <source>Connect only to the specified node(s)</source>
        <translation>Conectar sólo a los nodos (o nodo) especificados</translation>
    </message>
@@ -3575,7 +3610,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+1"/>
        <source>Failed to write to coin database</source>
-        <translation>No se ha podido escribir en la base de datos de monedas</translation>
+        <translation>No se ha podido escribir en la base de datos de bitcoins</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3600,7 +3635,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+1"/>
        <source>Generate coins (default: 0)</source>
-        <translation>Generar monedas (por defecto: 0)</translation>
+        <translation>Generar bitcoins (predeterminado: 0)</translation>
    </message>
    <message>
        <location line="+2"/>
@@ -3610,7 +3645,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+1"/>
        <source>How thorough the block verification is (0-4, default: 3)</source>
-        <translation>Como es de exhaustiva la verificación de bloques (0-4, por defecto 3)</translation>
+        <translation>Cómo es de exhaustiva la verificación de bloques (0-4, predeterminado 3)</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3635,7 +3670,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+5"/>
        <source>Prepend debug output with timestamp (default: 1)</source>
-        <translation>Anteponer marca temporal a la información de depuración (por defecto: 1)</translation>
+        <translation>Anteponer marca temporal a la información de depuración (predeterminado: 1)</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3650,7 +3685,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+5"/>
        <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
-        <translation>Seleccionar version de SOCKS para -proxy (4 o 5, por defecto: 5)</translation>
+        <translation>Seleccionar versión de SOCKS para -proxy (4 o 5, predeterminado: 5)</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3660,7 +3695,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+7"/>
        <source>Set maximum block size in bytes (default: %d)</source>
-        <translation>Establecer tamaño máximo de bloque en bytes (por defecto: %d)</translation>
+        <translation>Establecer tamaño máximo de bloque en bytes (predeterminado: %d)</translation>
    </message>
    <message>
        <location line="+2"/>
@@ -3674,6 +3709,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    </message>
    <message>
        <location line="+2"/>
+        <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+        <translation>Gastar cambio no confirmado al enviar transacciones (predeterminado: 1)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
        <source>Start Bitcoin server</source>
        <translation>Iniciar servidor Bitcoin</translation>
    </message>
@@ -3723,24 +3763,24 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation>
    </message>
    <message>
-        <location line="-79"/>
+        <location line="-80"/>
        <source>Imports blocks from external blk000??.dat file</source>
        <translation>Importa los bloques desde un archivo blk000??.dat externo</translation>
    </message>
    <message>
-        <location line="-105"/>
+        <location line="-106"/>
        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
        <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation>
    </message>
    <message>
        <location line="+14"/>
        <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
-        <translation>Mostrar depuración (por defecto: 0, proporcionar &lt;category&gt; es opcional)</translation>
+        <translation>Mostrar información de depuración (predeterminado: 0, proporcionar &lt;category&gt; es opcional)</translation>
    </message>
    <message>
        <location line="+2"/>
        <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
-        <translation>Establecer tamaño máximo de las transacciones de alta prioridad/comisión baja en bytes (por defecto: %d)</translation>
+        <translation>Establecer tamaño máximo de las transacciones de alta prioridad/baja comisión en bytes (predeterminado: %d)</translation>
    </message>
    <message>
        <location line="+2"/>
@@ -3748,19 +3788,19 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, &lt;0 = leave that many cores free, por fecto: 0)</translation>
    </message>
    <message>
-        <location line="+89"/>
+        <location line="+90"/>
        <source>Information</source>
        <translation>Información</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <translation>Inválido por el monto -minrelaytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
+        <translation>Cantidad inválida para -minrelaytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
    </message>
    <message>
        <location line="+1"/>
        <source>Invalid amount for -mintxfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <translation>Inválido por el monto -mintxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
+        <translation>Cantidad inválida para -mintxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
    </message>
    <message>
        <location line="+8"/>
@@ -3818,19 +3858,19 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Especificar el tiempo máximo de conexión en milisegundos (predeterminado: 5000)</translation>
    </message>
    <message>
-        <location line="+6"/>
+        <location line="+7"/>
        <source>System error: </source>
        <translation>Error de sistema: </translation>
    </message>
    <message>
        <location line="+5"/>
        <source>Transaction amount too small</source>
-        <translation>Monto de la transacción muy pequeño</translation>
+        <translation>Cantidad de la transacción demasiado pequeña</translation>
    </message>
    <message>
        <location line="+1"/>
        <source>Transaction amounts must be positive</source>
-        <translation>Montos de transacciones deben ser positivos</translation>
+        <translation>Las cantidades en las transacciones deben ser positivas</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3865,6 +3905,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    </message>
    <message>
        <location line="+2"/>
+        <source>Zapping all transactions from wallet...</source>
+        <translation>Eliminando todas las transacciones del monedero...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
        <source>version</source>
        <translation>versión</translation>
    </message>
@@ -3874,35 +3919,35 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation>
    </message>
    <message>
-        <location line="-58"/>
+        <location line="-60"/>
        <source>Password for JSON-RPC connections</source>
        <translation>Contraseña para las conexiones JSON-RPC
 </translation>
    </message>
    <message>
-        <location line="-70"/>
+        <location line="-71"/>
        <source>Allow JSON-RPC connections from specified IP address</source>
        <translation>Permitir conexiones JSON-RPC desde la dirección IP especificada
 </translation>
    </message>
    <message>
-        <location line="+80"/>
+        <location line="+81"/>
        <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
        <translation>Enviar comando al nodo situado en &lt;ip&gt; (predeterminado: 127.0.0.1)
 </translation>
    </message>
    <message>
-        <location line="-132"/>
+        <location line="-133"/>
        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
        <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation>
    </message>
    <message>
-        <location line="+161"/>
+        <location line="+163"/>
        <source>Upgrade wallet to latest format</source>
        <translation>Actualizar el monedero al último formato</translation>
    </message>
    <message>
-        <location line="-24"/>
+        <location line="-25"/>
        <source>Set key pool size to &lt;n&gt; (default: 100)</source>
        <translation>Ajustar el número de claves en reserva &lt;n&gt; (predeterminado: 100)
 </translation>
@@ -3913,13 +3958,13 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation>
    </message>
    <message>
-        <location line="+38"/>
+        <location line="+39"/>
        <source>Use OpenSSL (https) for JSON-RPC connections</source>
        <translation>Usar OpenSSL (https) para las conexiones JSON-RPC
 </translation>
    </message>
    <message>
-        <location line="-30"/>
+        <location line="-31"/>
        <source>Server certificate file (default: server.cert)</source>
        <translation>Certificado del servidor (predeterminado: server.cert)
 </translation>
@@ -3931,7 +3976,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
 </translation>
    </message>
    <message>
-        <location line="+16"/>
+        <location line="+17"/>
        <source>This help message</source>
        <translation>Este mensaje de ayuda
 </translation>
@@ -3942,12 +3987,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>No es posible conectar con %s en este sistema (bind ha dado el error %d, %s)</translation>
    </message>
    <message>
-        <location line="-107"/>
+        <location line="-109"/>
        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
        <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation>
    </message>
    <message>
-        <location line="+60"/>
+        <location line="+61"/>
        <source>Loading addresses...</source>
        <translation>Cargando direcciones...</translation>
    </message>
@@ -3962,12 +4007,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation>
    </message>
    <message>
-        <location line="+98"/>
+        <location line="+99"/>
        <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
        <translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation>
    </message>
    <message>
-        <location line="-100"/>
+        <location line="-101"/>
        <source>Error loading wallet.dat</source>
        <translation>Error al cargar wallet.dat</translation>
    </message>
@@ -3977,7 +4022,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Dirección -proxy inválida: &apos;%s&apos;</translation>
    </message>
    <message>
-        <location line="+56"/>
+        <location line="+57"/>
        <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
        <translation>La red especificada en -onlynet &apos;%s&apos; es desconocida</translation>
    </message>
@@ -3987,7 +4032,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Solicitada versión de proxy -socks desconocida: %i</translation>
    </message>
    <message>
-        <location line="-101"/>
+        <location line="-103"/>
        <source>Cannot resolve -bind address: &apos;%s&apos;</source>
        <translation>No se puede resolver la dirección de -bind: &apos;%s&apos;</translation>
    </message>
@@ -3997,7 +4042,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>No se puede resolver la dirección de -externalip: &apos;%s&apos;</translation>
    </message>
    <message>
-        <location line="+48"/>
+        <location line="+49"/>
        <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
        <translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
    </message>
@@ -4017,7 +4062,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Cargando el índice de bloques...</translation>
    </message>
    <message>
-        <location line="-62"/>
+        <location line="-63"/>
        <source>Add a node to connect to and attempt to keep the connection open</source>
        <translation>Añadir un nodo al que conectarse y tratar de mantener la conexión abierta</translation>
    </message>
@@ -4027,12 +4072,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose.</translation>
    </message>
    <message>
-        <location line="+95"/>
+        <location line="+96"/>
        <source>Loading wallet...</source>
        <translation>Cargando monedero...</translation>
    </message>
    <message>
-        <location line="-56"/>
+        <location line="-57"/>
        <source>Cannot downgrade wallet</source>
        <translation>No se puede rebajar el monedero</translation>
    </message>
@@ -4042,7 +4087,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>No se puede escribir la dirección predeterminada</translation>
    </message>
    <message>
-        <location line="+67"/>
+        <location line="+68"/>
        <source>Rescanning...</source>
        <translation>Reexplorando...</translation>
    </message>
@@ -4052,17 +4097,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Generado pero no aceptado</translation>
    </message>
    <message>
-        <location line="+85"/>
+        <location line="+86"/>
        <source>To use the %s option</source>
        <translation>Para utilizar la opción %s</translation>
    </message>
    <message>
-        <location line="-77"/>
+        <location line="-78"/>
        <source>Error</source>
        <translation>Error</translation>
    </message>
    <message>
-        <location line="-35"/>
+        <location line="-36"/>
        <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
 %s
 If the file does not exist, create it with owner-readable-only file permissions.</source>
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -34,6 +34,12 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
    <message>
        <location line="+0"/>
        <source>The Bitcoin Core developers</source>
+        <translation>Dezvoltatorii Bitcoin Core</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+2"/>
+        <source> (%1-bit)</source>
        <translation type="unfinished"/>
    </message>
 </context>
@@ -157,7 +163,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
    <message>
        <location line="+1"/>
        <source>There was an error trying to save the address list to %1.</source>
-        <translation type="unfinished"/>
+        <translation>A apărut o eroare încercând să se salveze lista de adrese la %1.</translation>
    </message>
 </context>
 <context>
@@ -339,7 +345,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
    <message>
        <location line="-137"/>
        <source>Node</source>
-        <translation type="unfinished"/>
+        <translation>Nod</translation>
    </message>
    <message>
        <location line="+138"/>
@@ -415,7 +421,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
    <message>
        <location line="+3"/>
        <source>Open &amp;URI...</source>
-        <translation type="unfinished"/>
+        <translation>Vizitaţi &amp;URI...</translation>
    </message>
    <message>
        <location line="+325"/>
@@ -690,7 +696,7 @@ Adresa: %4
        <translation>Portofelul este &lt;b&gt;criptat&lt;/b&gt; iar în momentul de față este &lt;b&gt;blocat&lt;/b&gt;</translation>
    </message>
    <message>
-        <location filename="../bitcoin.cpp" line="+438"/>
+        <location filename="../bitcoin.cpp" line="+435"/>
        <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
        <translation>A survenit o eroare fatala. Bitcoin nu mai poate continua in siguranta si se va opri.</translation>
    </message>
@@ -751,7 +757,7 @@ Adresa: %4
        <translation>Schimb:</translation>
    </message>
    <message>
-        <location line="+63"/>
+        <location line="+56"/>
        <source>(un)select all</source>
        <translation>(de)selectaţi tot</translation>
    </message>
@@ -766,7 +772,7 @@ Adresa: %4
        <translation>Modul lista</translation>
    </message>
    <message>
-        <location line="+52"/>
+        <location line="+53"/>
        <source>Amount</source>
        <translation>Sumă</translation>
    </message>
@@ -917,7 +923,7 @@ Adresa: %4
        <translation type="unfinished"/>
    </message>
    <message>
-        <location line="+140"/>
+        <location line="+141"/>
        <source>Dust</source>
        <translation>Praf</translation>
    </message>
@@ -1096,10 +1102,10 @@ Adresa: %4
    <message>
        <location filename="../forms/helpmessagedialog.ui" line="+19"/>
        <source>Bitcoin Core - Command-line options</source>
-        <translation type="unfinished"/>
+        <translation>Bitcoin Core - Opţiuni Linie de comandă</translation>
    </message>
    <message>
-        <location filename="../utilitydialog.cpp" line="+38"/>
+        <location filename="../utilitydialog.cpp" line="+24"/>
        <source>Bitcoin Core</source>
        <translation>Bitcoin Core</translation>
    </message>
@@ -1243,7 +1249,7 @@ Adresa: %4
        <translation>&amp;Principal</translation>
    </message>
    <message>
-        <location line="+6"/>
+        <location line="+122"/>
        <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source>
        <translation>Taxa optionala de tranzactie per kB care ajuta ca tranzactiile dumneavoastra sa fie procesate rapid. Majoritatea tranzactiilor sunt 1 kB.</translation>
    </message>
@@ -1253,7 +1259,7 @@ Adresa: %4
        <translation>Plăteşte comision pentru tranzacţie &amp;f</translation>
    </message>
    <message>
-        <location line="+31"/>
+        <location line="-131"/>
        <source>Automatically start Bitcoin after logging in to the system.</source>
        <translation>Porneşte automat programul Bitcoin la pornirea computerului.</translation>
    </message>
@@ -1268,12 +1274,7 @@ Adresa: %4
        <translation type="unfinished"/>
    </message>
    <message>
-        <location line="+13"/>
-        <source>Set database cache size in megabytes (default: 25)</source>
-        <translation>Setează mărimea cache a bazei de date în megabiți (implicit: 25)</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+16"/>
        <source>MB</source>
        <translation type="unfinished"/>
    </message>
@@ -1288,7 +1289,12 @@ Adresa: %4
        <translation type="unfinished"/>
    </message>
    <message>
-        <location line="+58"/>
+        <location line="+107"/>
+        <source>&amp;Spend unconfirmed change (experts only)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location line="+37"/>
        <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
        <translation type="unfinished"/>
    </message>
@@ -1323,7 +1329,17 @@ Adresa: %4
        <translation>&amp;Retea</translation>
    </message>
    <message>
-        <location line="+6"/>
+        <location line="-86"/>
+        <source>W&amp;allet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location line="+40"/>
        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source>
        <translation>Deschide automat în router portul aferent clientului Bitcoin. Funcţionează doar în cazul în care routerul e compatibil UPnP şi opţiunea e activată.</translation>
    </message>
@@ -1438,17 +1454,17 @@ Adresa: %4
        <translation>&amp; Renunta</translation>
    </message>
    <message>
-        <location filename="../optionsdialog.cpp" line="+67"/>
+        <location filename="../optionsdialog.cpp" line="+70"/>
        <source>default</source>
        <translation>Initial</translation>
    </message>
    <message>
-        <location line="+57"/>
+        <location line="+58"/>
        <source>none</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location line="+75"/>
+        <location line="+78"/>
        <source>Confirm options reset</source>
        <translation>Confirmă resetarea opțiunilor</translation>
    </message>
@@ -1456,17 +1472,17 @@ Adresa: %4
        <location line="+1"/>
        <location line="+29"/>
        <source>Client restart required to activate changes.</source>
-        <translation type="unfinished"/>
+        <translation>Este necesar un restart al clientului pentru a activa schimbările.</translation>
    </message>
    <message>
        <location line="-29"/>
        <source>Client will be shutdown, do you want to proceed?</source>
-        <translation type="unfinished"/>
+        <translation>Clientul va fi închis, doriţi să continuaţi?</translation>
    </message>
    <message>
        <location line="+33"/>
        <source>This change would require a client restart.</source>
-        <translation type="unfinished"/>
+        <translation>Această schimbare va necesita un restart al clientului.</translation>
    </message>
    <message>
        <location line="+34"/>
@@ -1488,19 +1504,14 @@ Adresa: %4
        <translation>Informațiile afișate pot neactualizate. Portofelul tău se sincronizează automat cu rețeaua Bitcoin după ce o conexiune este stabilită, dar acest proces nu a fost finalizat încă.</translation>
    </message>
    <message>
-        <location line="-155"/>
-        <source>Unconfirmed:</source>
-        <translation>Neconfirmat:</translation>
-    </message>
-    <message>
-        <location line="-83"/>
+        <location line="-238"/>
        <source>Wallet</source>
        <translation>Portofel</translation>
    </message>
    <message>
        <location line="+51"/>
-        <source>Confirmed:</source>
-        <translation>Confirmat:</translation>
+        <source>Available:</source>
+        <translation>Disponibil:</translation>
    </message>
    <message>
        <location line="+16"/>
@@ -1508,7 +1519,12 @@ Adresa: %4
        <translation>Balanța ta curentă de cheltuieli</translation>
    </message>
    <message>
-        <location line="+32"/>
+        <location line="+16"/>
+        <source>Pending:</source>
+        <translation>În aşteptare:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
        <translation>Totalul tranzacțiilor care nu sunt confirmate încă și care nu sunt încă adunate la balanța de cheltuieli</translation>
    </message>
@@ -1725,7 +1741,7 @@ Adresa: %4
    <message>
        <location line="+25"/>
        <source>General</source>
-        <translation type="unfinished"/>
+        <translation>General</translation>
    </message>
    <message>
        <location line="+53"/>
@@ -1920,7 +1936,7 @@ Adresa: %4
    <message>
        <location line="-7"/>
        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
-        <translation type="unfinished"/>
+        <translation>Folosește acest formular pentru a solicita plăți. Toate câmpurile sunt &lt;b&gt;opționale&lt;/b&gt;.</translation>
    </message>
    <message>
        <location line="+23"/>
@@ -1976,7 +1992,7 @@ Adresa: %4
    <message>
        <location line="+1"/>
        <source>Copy message</source>
-        <translation type="unfinished"/>
+        <translation>Copiaţi mesajul</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -2375,7 +2391,7 @@ Adresa: %4
    <message>
        <location line="-40"/>
        <source>This is a normal payment.</source>
-        <translation type="unfinished"/>
+        <translation>Aceasta este o tranzacţie normală.</translation>
    </message>
    <message>
        <location line="+50"/>
@@ -2442,12 +2458,12 @@ Adresa: %4
    <message>
        <location filename="../utilitydialog.cpp" line="+48"/>
        <source>Bitcoin Core is shutting down...</source>
-        <translation type="unfinished"/>
+        <translation>Bitcoin Core se închide...</translation>
    </message>
    <message>
        <location line="+1"/>
        <source>Do not shut down the computer until this window disappears.</source>
-        <translation type="unfinished"/>
+        <translation>Nu închide calculatorul până ce această fereastră nu dispare.</translation>
    </message>
 </context>
 <context>
@@ -2647,7 +2663,7 @@ Adresa: %4
    <message>
        <location line="+2"/>
        <source>The Bitcoin Core developers</source>
-        <translation type="unfinished"/>
+        <translation>Dezvoltatorii Bitcoin Core</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -2672,6 +2688,11 @@ Adresa: %4
    </message>
    <message>
        <location line="+6"/>
+        <source>conflicted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location line="+2"/>
        <source>%1/offline</source>
        <translation>%1/deconectat</translation>
    </message>
@@ -2833,12 +2854,12 @@ Adresa: %4
        <translation>, nu s-a propagat încă</translation>
    </message>
    <message numerus="yes">
-        <location line="-35"/>
+        <location line="-37"/>
        <source>Open for %n more block(s)</source>
        <translation><numerusform>Deschis pentru încă %1 bloc</numerusform><numerusform>Deschis pentru încă %1 blocuri</numerusform><numerusform>Deschis pentru încă %1 de blocuri</numerusform></translation>
    </message>
    <message>
-        <location line="+70"/>
+        <location line="+72"/>
        <source>unknown</source>
        <translation>necunoscut</translation>
    </message>
@@ -2879,12 +2900,12 @@ Adresa: %4
        <translation>Cantitate</translation>
    </message>
    <message>
-        <location line="+59"/>
+        <location line="+78"/>
        <source>Immature (%1 confirmations, will be available after %2)</source>
        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
-        <location line="+16"/>
+        <location line="-21"/>
        <source>Open for %n more block(s)</source>
        <translation><numerusform>Deschis pentru încă %1 bloc</numerusform><numerusform>Deschis pentru încă %1 blocuri</numerusform><numerusform>Deschis pentru încă %1 de blocuri</numerusform></translation>
    </message>
@@ -2894,23 +2915,12 @@ Adresa: %4
        <translation>Deschis până la %1</translation>
    </message>
    <message>
-        <location line="+3"/>
-        <source>Offline (%1 confirmations)</source>
-        <translation>Neconectat (%1 confirmări)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Unconfirmed (%1 of %2 confirmations)</source>
-        <translation>Neconfirmat (%1 din %2 confirmări)</translation>
-    </message>
-    <message>
-        <location line="-22"/>
-        <location line="+25"/>
+        <location line="+12"/>
        <source>Confirmed (%1 confirmations)</source>
        <translation>Confirmat (%1 confirmări)</translation>
    </message>
    <message>
-        <location line="-22"/>
+        <location line="+9"/>
        <source>This block was not received by any other nodes and will probably not be accepted!</source>
        <translation>Acest bloc nu a fost recepționat de niciun alt nod și probabil nu va fi acceptat!</translation>
    </message>
@@ -2920,7 +2930,27 @@ Adresa: %4
        <translation>Generat dar neacceptat</translation>
    </message>
    <message>
-        <location line="+62"/>
+        <location line="-21"/>
+        <source>Offline</source>
+        <translation>Deconectat</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unconfirmed</source>
+        <translation>Neconfirmat</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation>Confirmare (%1 dintre %2 confirmări recomandate)</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Conflicted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location line="+51"/>
        <source>Received with</source>
        <translation>Recepționat cu</translation>
    </message>
@@ -2950,7 +2980,7 @@ Adresa: %4
        <translation>(n/a)</translation>
    </message>
    <message>
-        <location line="+199"/>
+        <location line="+190"/>
        <source>Transaction status. Hover over this field to show number of confirmations.</source>
        <translation>Starea tranzacției. Treci cu mausul peste acest câmp pentru afișarea numărului de confirmări.</translation>
    </message>
@@ -3081,27 +3111,27 @@ Adresa: %4
    <message>
        <location line="+142"/>
        <source>Export Transaction History</source>
-        <translation type="unfinished"/>
+        <translation>Exportare Istoric Tranzacţii</translation>
    </message>
    <message>
        <location line="+19"/>
        <source>Exporting Failed</source>
-        <translation>Exportare esuata</translation>
+        <translation>Exportare Eşuată</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation type="unfinished"/>
+        <translation>S-a produs o eroare încercând să se salveze istoricul tranzacţiilor la %1.</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>Exporting Successful</source>
-        <translation type="unfinished"/>
+        <translation>Exportare Reuşită</translation>
    </message>
    <message>
        <location line="+0"/>
        <source>The transaction history was successfully saved to %1.</source>
-        <translation type="unfinished"/>
+        <translation>Istoricul tranzacţiilor a fost salvat cu succes la %1.</translation>
    </message>
    <message>
        <location line="-22"/>
@@ -3159,7 +3189,7 @@ Adresa: %4
    <message>
        <location filename="../walletframe.cpp" line="+26"/>
        <source>No wallet has been loaded.</source>
-        <translation type="unfinished"/>
+        <translation>Nu a fost încărcat niciun portofel.</translation>
    </message>
 </context>
 <context>
@@ -3200,12 +3230,12 @@ Adresa: %4
    <message>
        <location line="+0"/>
        <source>There was an error trying to save the wallet data to %1.</source>
-        <translation type="unfinished"/>
+        <translation>S-a produs o eroare încercând să se salveze datele portofelului la %1.</translation>
    </message>
    <message>
        <location line="+4"/>
        <source>The wallet data was successfully saved to %1.</source>
-        <translation type="unfinished"/>
+        <translation>Datele portofelului s-au salvat cu succes la %1.</translation>
    </message>
    <message>
        <location line="+0"/>
@@ -3216,12 +3246,12 @@ Adresa: %4
 <context>
    <name>bitcoin-core</name>
    <message>
-        <location filename="../bitcoinstrings.cpp" line="+221"/>
+        <location filename="../bitcoinstrings.cpp" line="+223"/>
        <source>Usage:</source>
        <translation>Uz:</translation>
    </message>
    <message>
-        <location line="-54"/>
+        <location line="-55"/>
        <source>List commands</source>
        <translation>Listă de comenzi</translation>
    </message>
@@ -3276,12 +3306,12 @@ Adresa: %4
        <translation>Specifică adresa ta publică</translation>
    </message>
    <message>
-        <location line="+5"/>
+        <location line="+6"/>
        <source>Threshold for disconnecting misbehaving peers (default: 100)</source>
        <translation>Prag pentru deconectarea partenerilor care nu funcționează corect (implicit: 100)</translation>
    </message>
    <message>
-        <location line="-148"/>
+        <location line="-150"/>
        <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
        <translation>Numărul de secunde pentru a preveni reconectarea partenerilor care nu funcționează corect (implicit: 86400)</translation>
    </message>
@@ -3301,17 +3331,17 @@ Adresa: %4
        <translation>Se acceptă comenzi din linia de comandă și comenzi JSON-RPC</translation>
    </message>
    <message>
-        <location line="+80"/>
+        <location line="+81"/>
        <source>Run in the background as a daemon and accept commands</source>
        <translation>Rulează în fundal ca un demon și acceptă comenzi</translation>
    </message>
    <message>
-        <location line="+39"/>
+        <location line="+40"/>
        <source>Use the test network</source>
        <translation>Utilizează rețeaua de test</translation>
    </message>
    <message>
-        <location line="-118"/>
+        <location line="-120"/>
        <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
        <translation>Acceptă conexiuni din afară (implicit: 1  dacă nu se folosește -proxy sau -connect)</translation>
    </message>
@@ -3383,7 +3413,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+5"/>
        <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
-        <translation type="unfinished"/>
+        <translation>Utilizare proxy SOCKS5 separat pentru a ajunge la servicii ascunse TOR (implicit: -proxy)</translation>
    </message>
    <message>
        <location line="+3"/>
@@ -3418,7 +3448,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+9"/>
        <source>&lt;category&gt; can be:</source>
-        <translation type="unfinished"/>
+        <translation>&lt;category&gt; poate fi:</translation>
    </message>
    <message>
        <location line="+6"/>
@@ -3428,7 +3458,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+1"/>
        <source>Bitcoin Core Daemon</source>
-        <translation type="unfinished"/>
+        <translation>Daemon-ul Bitcoin Core</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3442,13 +3472,18 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    </message>
    <message>
        <location line="+5"/>
+        <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location line="+1"/>
        <source>Connect only to the specified node(s)</source>
        <translation>Conecteaza-te doar la nod(urile) specifice</translation>
    </message>
    <message>
        <location line="+1"/>
        <source>Connect through SOCKS proxy</source>
-        <translation type="unfinished"/>
+        <translation>Conectare prin proxy SOCKS</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3618,7 +3653,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+1"/>
        <source>RPC client options:</source>
-        <translation type="unfinished"/>
+        <translation>Opţiuni client RPC:</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3628,7 +3663,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+5"/>
        <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
-        <translation type="unfinished"/>
+        <translation>Selectaţi versiunea SOCKS pentru -proxy (4 din 5; iniţial: 5)</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3638,7 +3673,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+7"/>
        <source>Set maximum block size in bytes (default: %d)</source>
-        <translation type="unfinished"/>
+        <translation>Setaţi dimensiunea maximă a unui block în bytes (implicit: %d)</translation>
    </message>
    <message>
        <location line="+2"/>
@@ -3652,6 +3687,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    </message>
    <message>
        <location line="+2"/>
+        <source>Spend unconfirmed change when sending transactions (default: 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location line="+1"/>
        <source>Start Bitcoin server</source>
        <translation>A porni serverul Bitcoin</translation>
    </message>
@@ -3678,7 +3718,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    <message>
        <location line="+1"/>
        <source>Wait for RPC server to start</source>
-        <translation type="unfinished"/>
+        <translation>Aşteptaţi serverul RPC să pornească</translation>
    </message>
    <message>
        <location line="+1"/>
@@ -3701,12 +3741,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Trebuie să reconstruiești baza de date folosind -reindex pentru a schimba -txindex</translation>
    </message>
    <message>
-        <location line="-79"/>
+        <location line="-80"/>
        <source>Imports blocks from external blk000??.dat file</source>
        <translation>Importă blocuri dintr-un fișier extern blk000??.dat</translation>
    </message>
    <message>
-        <location line="-105"/>
+        <location line="-106"/>
        <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
        <translation>Executati comanda cand o alerta relevanta este primita sau vedem o bifurcatie foarte lunga (%s in cmd este inlocuti de mesaj)</translation>
    </message>
@@ -3726,7 +3766,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation type="unfinished"/>
    </message>
    <message>
-        <location line="+89"/>
+        <location line="+90"/>
        <source>Information</source>
        <translation>Informație</translation>
    </message>
@@ -3796,7 +3836,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Specifică intervalul maxim de conectare în milisecunde (implicit: 5000)</translation>
    </message>
    <message>
-        <location line="+6"/>
+        <location line="+7"/>
        <source>System error: </source>
        <translation>Eroare de sistem:</translation>
    </message>
@@ -3842,6 +3882,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
    </message>
    <message>
        <location line="+2"/>
+        <source>Zapping all transactions from wallet...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location line="+1"/>
        <source>version</source>
        <translation>versiunea</translation>
    </message>
@@ -3851,32 +3896,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>wallet.dat corupt, recuperare eșuată</translation>
    </message>
    <message>
-        <location line="-58"/>
+        <location line="-60"/>
        <source>Password for JSON-RPC connections</source>
        <translation>Parola pentru conexiunile JSON-RPC</translation>
    </message>
    <message>
-        <location line="-70"/>
+        <location line="-71"/>
        <source>Allow JSON-RPC connections from specified IP address</source>
        <translation>Permite conexiuni JSON-RPC de la adresa IP specificată</translation>
    </message>
    <message>
-        <location line="+80"/>
+        <location line="+81"/>
        <source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
        <translation>Trimite comenzi la nodul care rulează la &lt;ip&gt; (implicit: 127.0.0.1)</translation>
    </message>
    <message>
-        <location line="-132"/>
+        <location line="-133"/>
        <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
        <translation>Execută comanda când cel mai bun bloc se modifică (%s în cmd este înlocuit cu hash-ul blocului)</translation>
    </message>
    <message>
-        <location line="+161"/>
+        <location line="+163"/>
        <source>Upgrade wallet to latest format</source>
        <translation>Actualizează portofelul la ultimul format</translation>
    </message>
    <message>
-        <location line="-24"/>
+        <location line="-25"/>
        <source>Set key pool size to &lt;n&gt; (default: 100)</source>
        <translation>Setează mărimea bazinului de chei la &lt;n&gt; (implicit: 100)</translation>
    </message>
@@ -3886,12 +3931,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Rescanează lanțul de bloc pentru tranzacțiile portofel lipsă</translation>
    </message>
    <message>
-        <location line="+38"/>
+        <location line="+39"/>
        <source>Use OpenSSL (https) for JSON-RPC connections</source>
        <translation>Folosește OpenSSL (https) pentru conexiunile JSON-RPC</translation>
    </message>
    <message>
-        <location line="-30"/>
+        <location line="-31"/>
        <source>Server certificate file (default: server.cert)</source>
        <translation>Certificatul serverului (implicit: server.cert)</translation>
    </message>
@@ -3901,7 +3946,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Cheia privată a serverului (implicit: server.pem)</translation>
    </message>
    <message>
-        <location line="+16"/>
+        <location line="+17"/>
        <source>This help message</source>
        <translation>Acest mesaj de ajutor</translation>
    </message>
@@ -3911,12 +3956,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Nu se poate folosi %s pe acest calculator (eroarea returnată este %d, %s)</translation>
    </message>
    <message>
-        <location line="-107"/>
+        <location line="-109"/>
        <source>Allow DNS lookups for -addnode, -seednode and -connect</source>
        <translation>Permite căutări DNS pentru -addnode, -seednode și -connect</translation>
    </message>
    <message>
-        <location line="+60"/>
+        <location line="+61"/>
        <source>Loading addresses...</source>
        <translation>Încarc adrese...</translation>
    </message>
@@ -3931,12 +3976,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Eroare la încărcarea wallet.dat: Portofelul are nevoie de o versiune Bitcoin mai nouă</translation>
    </message>
    <message>
-        <location line="+98"/>
+        <location line="+99"/>
        <source>Wallet needed to be rewritten: restart Bitcoin to complete</source>
        <translation>Portofelul trebuie rescris: repornește Bitcoin pentru finalizare</translation>
    </message>
    <message>
-        <location line="-100"/>
+        <location line="-101"/>
        <source>Error loading wallet.dat</source>
        <translation>Eroare la încărcarea wallet.dat</translation>
    </message>
@@ -3946,7 +3991,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Adresa -proxy nevalidă: &apos;%s&apos;</translation>
    </message>
    <message>
-        <location line="+56"/>
+        <location line="+57"/>
        <source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
        <translation>Rețeaua specificată în -onlynet este necunoscută: &apos;%s&apos;</translation>
    </message>
@@ -3956,7 +4001,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>S-a cerut o versiune necunoscută de proxy -socks: %i</translation>
    </message>
    <message>
-        <location line="-101"/>
+        <location line="-103"/>
        <source>Cannot resolve -bind address: &apos;%s&apos;</source>
        <translation>Nu se poate rezolva adresa -bind: &apos;%s&apos;</translation>
    </message>
@@ -3966,7 +4011,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Nu se poate rezolva adresa -externalip: &apos;%s&apos;</translation>
    </message>
    <message>
-        <location line="+48"/>
+        <location line="+49"/>
        <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
        <translation>Suma nevalidă pentru -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
    </message>
@@ -3986,7 +4031,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Încarc indice bloc...</translation>
    </message>
    <message>
-        <location line="-62"/>
+        <location line="-63"/>
        <source>Add a node to connect to and attempt to keep the connection open</source>
        <translation>Adaugă un nod la care te poți conecta pentru a menține conexiunea deschisă</translation>
    </message>
@@ -3996,12 +4041,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Imposibilitatea de a lega la% s pe acest computer. Bitcoin este, probabil, deja în execuție.</translation>
    </message>
    <message>
-        <location line="+95"/>
+        <location line="+96"/>
        <source>Loading wallet...</source>
        <translation>Încarc portofel...</translation>
    </message>
    <message>
-        <location line="-56"/>
+        <location line="-57"/>
        <source>Cannot downgrade wallet</source>
        <translation>Nu se poate retrograda portofelul</translation>
    </message>
@@ -4011,7 +4056,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Nu se poate scrie adresa implicită</translation>
    </message>
    <message>
-        <location line="+67"/>
+        <location line="+68"/>
        <source>Rescanning...</source>
        <translation>Rescanez...</translation>
    </message>
@@ -4021,17 +4066,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
        <translation>Încărcare terminată</translation>
    </message>
    <message>
-        <location line="+85"/>
+        <location line="+86"/>
        <source>To use the %s option</source>
        <translation>Pentru a folosi opțiunea %s</translation>
    </message>
    <message>
-        <location line="-77"/>
+        <location line="-78"/>
        <source>Error</source>
        <translation>Eroare</translation>
    </message>
    <message>
-        <location line="-35"/>
+        <location line="-36"/>
        <source>You must set rpcpassword=&lt;password&gt; in the configuration file:
 %s
 If the file does not exist, create it with owner-readable-only file permissions.</source>
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -45,6 +45,7 @@ test_bitcoin_SOURCES = \
  DoS_tests.cpp \
  getarg_tests.cpp \
  key_tests.cpp \
+  main_tests.cpp \
  miner_tests.cpp \
  mruset_tests.cpp \
  multisig_tests.cpp \
--- a/src/test/main_tests.cpp
+++ b/src/test/main_tests.cpp
@@ -0,0 +1,20 @@
+#include "core.h"
+#include "main.h"
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_AUTO_TEST_SUITE(main_tests)
+
+BOOST_AUTO_TEST_CASE(subsidy_limit_test)
+{
+    uint64_t nSum = 0;
+    for (int nHeight = 0; nHeight < 7000000; nHeight += 1000) {
+        uint64_t nSubsidy = GetBlockValue(nHeight, 0);
+        BOOST_CHECK(nSubsidy <= 50 * COIN);
+        nSum += nSubsidy * 1000;
+        BOOST_CHECK(MoneyRange(nSum));
+    }
+    BOOST_CHECK(nSum == 2099999997690000ULL);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -8,6 +8,7 @@
 #include "base58.h"
 #include "coincontrol.h"
 #include "net.h"
+#include "checkpoints.h"

 #include <boost/algorithm/string/replace.hpp>
 #include <openssl/rand.h>
@@ -830,6 +831,7 @@ bool CWalletTx::WriteToDisk()
 int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
 {
    int ret = 0;
+    int64_t nNow = GetTime();

    CBlockIndex* pindex = pindexStart;
    {
@@ -851,6 +853,10 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
                    ret++;
            }
            pindex = chainActive.Next(pindex);
+            if (GetTime() >= nNow + 60) {
+                nNow = GetTime();
+                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, Checkpoints::GuessVerificationProgress(pindex));
+            }
        }
    }
    return ret;
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -675,8 +675,10 @@ public:
        {
            // Transactions not sent by us: not trusted
            const CWalletTx* parent = pwallet->GetWalletTx(txin.prevout.hash);
+            if (parent == NULL)
+                return false;
            const CTxOut& parentOut = parent->vout[txin.prevout.n];
-            if (parent == NULL || !pwallet->IsMine(parentOut))
+            if (!pwallet->IsMine(parentOut))
                return false;
        }
        return true;
Author	SHA1	Message	Date
Gavin Andresen	af57c1b1a7	Warn about downgrading to 0.8.x Fixes #3782	2014-03-12 11:30:14 -04:00
Gavin Andresen	e4583071ef	Fix release notes transaction fees	2014-03-12 11:22:34 -04:00
paveljanik	a0cb3779ac	Update the list of threads to the current state.	2014-03-12 11:10:03 -04:00
Wladimir J. van der Laan	32e27993c4	Update release notes for mining change Mining code fee policy now matches relay fee policy (`1eedbbb`)	2014-03-11 18:05:23 +01:00
Wladimir J. van der Laan	17d955fef5	qt: Make it possible again to specify -testnet in config file Changes for the datadir chooser have made it impossible to specify the network (testnet/regtest) in the configuration file for the GUI. Reorganize the initialization sequence to make this possible again. - Moves the "datadir" QSetting so that is no longer dependent on the network-specific application name (doing otherwise would create a chicken-and-egg problem). - Re-initialize translations after choosing network. There may be a different language configured in network-specific settings (slim chance, but handle it for sanity). Fixes point 1 of #3840. Rebased-From: `c52c4e5`	2014-03-11 17:04:58 +01:00
Mike Hearn	1eedbbb3a6	Make mining fee policy match relay fee policy. This resolves a case in which a mismatch could be used to bloat up the mempool by sending transactions that pay enough fee to relay, but not to be mined, with the default policies. Rebased-From: `037b4f1`	2014-03-11 16:45:54 +01:00
R E Broadley	ff882789af	Add progress to initial display of latest block downloaded. Rebased-From: `c4656e0`	2014-03-11 09:24:12 +01:00
R E Broadley	4568254568	Display progress of rescan. Rebased-From: `75b8953`	2014-03-11 09:23:23 +01:00
Wladimir J. van der Laan	7dee83aa89	qt: Remove control characters from ko_KR translation Last Transifex pull (`064a690`) introduced a few control characters into the Korean translation, which sometimes causes the build to fail. Manually remove these characters for now to get the build working -- they should still be removed at Transifex too. Rebased-From: `0ffd87f`	2014-03-10 17:13:12 +01:00
Wladimir J. van der Laan	94e93531f5	Update release notes for 0.9.0rc3 No new features/bugfixes to be mentioned, but some authors have contributed minor changes so add them to the credits.	2014-03-10 16:00:16 +01:00
Torstein Husebø	0085891749	doc/build-unix.md use github flavored md for table Rebased-From: `a75cacd`	2014-03-10 14:26:58 +01:00
Wladimir J. van der Laan	f55bf39de4	Transifex pull pre-0.9.0rc3/final Rebased-From: `064a6905`	2014-03-10 14:23:33 +01:00
daniel	c41736d0df	add --enable-debug for configure Rebased-From: `f5f157b`	2014-03-10 12:35:52 +01:00
Wladimir J. van der Laan	17ca4fd40b	qt: Adjust BLOCK_CHAIN_SIZE to 20GB This increases the space requirement for selecting a data directory in the UI. As suggested by @bardiharborow, fixes #3830. Rebased-From: `70b8cb9`	2014-03-10 10:46:58 +01:00
Rune K. Svendsen	57ae367fe9	Fix typo in doc/build-unix.md regarding building without UPnP Rebased-From: `947e23d`	2014-03-10 10:46:32 +01:00
Christian von Roques	1ff620e975	update bash-completion for v0.9 Recognize completable arguments of new and expanded commands. Now that bitcoin-cli(1) exists, add completion for it as well. Rebased-From: `16bfd68`	2014-03-07 09:26:35 +01:00
Pieter Wuille	12858f5234	Total money limit test Added bounds check by @il--ya. Updated-by: Wladimir van der Laan <laanwj@gmail.com> Rebased-From: 1156167	2014-03-07 09:00:03 +01:00
Wladimir J. van der Laan	adf6d4d428	Log which wallet is used during init Now that the wallet can be selected using -wallet it is important to log which wallet is being used for later troubleshooting. Rebased-From: `8a6894ca`	2014-03-07 07:52:35 +01:00
Wladimir J. van der Laan	46bf675f98	gui: Prevent status icons from being cut off After the Qt5 switch, status icons were being cut off by 1-2px. Also fixes some other cases where the UI is slightly off mentioned in #3800. Fixes #3800. Rebased-from: `1bcf81e0`	2014-03-06 15:01:17 +01:00
Cozz Lovan	8b68263ed3	Fix null pointer in IsTrusted() Rebased-From: `ba51c7d`	2014-03-05 19:40:22 +01:00
paveljanik	d307681b18	Clarify the error message when unable to bind to port When bitcoind can't bind, bitcoin server (or Bitcoin Core Daemon) is probably already running. Add the missing word "server". Bitcoin itself is definitely running ;-) Add _(...) so the string can be localized. Rebased-From: `094eeff`, `2d2d8fa`	2014-03-05 12:00:10 +01:00
Wladimir J. van der Laan	7f6a86f4e9	Merge pull request #3797 from tgeller/patch-2 Text and language editing of release-notes.md	2014-03-05 11:24:42 +01:00
Tom Geller	5bde2ae4eb	Text and language editing of release-notes.md Added changes taken from Gavin's notes; fixed line wrapping; some small language changes.	2014-03-04 13:55:27 -05:00
Cozz Lovan	79ce7e9117	Fix coin control sorts date as text	2014-03-04 15:15:51 +01:00