diff options
| -rw-r--r-- | doc/readme-qt.rst | 19 | ||||
| -rw-r--r-- | src/checkqueue.h | 4 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 1 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 55 |
4 files changed, 35 insertions, 44 deletions
diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index b0fdd4d810..7283dc780b 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -41,25 +41,6 @@ An executable named `bitcoin-qt` will be built. .. _`Qt Creator`: http://qt-project.org/downloads/ -Windows --------- - -Windows build instructions: - -- Download the `Qt Windows SDK`_ and install it. You don't need the Symbian stuff, just the desktop Qt. - -- Download and extract the `dependencies archive`_ [#]_, or compile openssl, boost and dbcxx yourself. - -- Copy the contents of the folder "deps" to "X:\\QtSDK\\mingw", replace X:\\ with the location where you installed the Qt SDK. Make sure that the contents of "deps\\include" end up in the current "include" directory. - -- Open the bitcoin-qt.pro file in Qt Creator and build as normal (ctrl-B) - -.. _`Qt Windows SDK`: http://qt-project.org/downloads/ -.. _`dependencies archive`: https://download.visucore.com/bitcoin/qtgui_deps_1.zip -.. [#] PGP signature: https://download.visucore.com/bitcoin/qtgui_deps_1.zip.sig (signed with RSA key ID `610945D0`_) -.. _`610945D0`: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x610945D0 - - Mac OS X -------- diff --git a/src/checkqueue.h b/src/checkqueue.h index 36141dd74b..12dde36fe7 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -163,6 +163,10 @@ public: condQuit.wait(lock); } + ~CCheckQueue() { + Quit(); + } + friend class CCheckQueueControl<T>; }; diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 5bd1517091..2c3d859c82 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -100,6 +100,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), QT_TRANSLATE_NOOP("bitcoin-core", "Don't generate coins"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 18249b1669..39062d0a2c 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -2179,7 +2179,7 @@ Address: %4 <translation>Bitcoin version</translation> </message> <message> - <location line="+95"/> + <location line="+96"/> <source>Usage:</source> <translation>Usage:</translation> </message> @@ -2219,12 +2219,12 @@ Address: %4 <translation>Generate coins</translation> </message> <message> - <location line="-26"/> + <location line="-27"/> <source>Don't generate coins</source> <translation>Don't generate coins</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <source>Specify data directory</source> <translation>Specify data directory</translation> </message> @@ -2244,12 +2244,12 @@ Address: %4 <translation>Maintain at most <n> connections to peers (default: 125)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Connect to a node to retrieve peer addresses, and disconnect</translation> </message> <message> - <location line="+77"/> + <location line="+78"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> @@ -2259,7 +2259,7 @@ Address: %4 <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-129"/> + <location line="-130"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation> </message> @@ -2279,7 +2279,7 @@ Address: %4 <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Run in the background as a daemon and accept commands</source> <translation>Run in the background as a daemon and accept commands</translation> </message> @@ -2289,7 +2289,7 @@ Address: %4 <translation>Use the test network</translation> </message> <message> - <location line="-105"/> + <location line="-106"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> </message> @@ -2410,6 +2410,11 @@ If the file does not exist, create it with owner-readable-only file permissions. </message> <message> <location line="+3"/> + <source>Error initializing block database</source> + <translation>Error initializing block database</translation> + </message> + <message> + <location line="+1"/> <source>Error loading block database</source> <translation>Error loading block database</translation> </message> @@ -2659,22 +2664,22 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-65"/> + <location line="-66"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Allow JSON-RPC connections from specified IP address</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-117"/> + <location line="-118"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+139"/> + <location line="+140"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> @@ -2704,12 +2709,12 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="-147"/> + <location line="-148"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+159"/> + <location line="+160"/> <source>This help message</source> <translation>This help message</translation> </message> @@ -2719,7 +2724,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-83"/> + <location line="-84"/> <source>Connect through socks proxy</source> <translation>Connect through socks proxy</translation> </message> @@ -2729,7 +2734,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+54"/> + <location line="+55"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> @@ -2779,7 +2784,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Unknown -socks proxy version requested: %i</translation> </message> <message> - <location line="-88"/> + <location line="-89"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -2789,7 +2794,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+42"/> + <location line="+43"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> @@ -2814,7 +2819,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Loading block index...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Add a node to connect to and attempt to keep the connection open</translation> </message> @@ -2824,7 +2829,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation> </message> <message> - <location line="+65"/> + <location line="+66"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>Find peers using internet relay chat (default: 0)</translation> </message> @@ -2839,7 +2844,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Loading wallet...</translation> </message> <message> - <location line="-51"/> + <location line="-52"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> @@ -2854,17 +2859,17 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Cannot write default address</translation> </message> <message> - <location line="+61"/> + <location line="+62"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-55"/> + <location line="-56"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+78"/> + <location line="+79"/> <source>To use the %s option</source> <translation>To use the %s option</translation> </message> @@ -2874,7 +2879,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Error</translation> </message> <message> - <location line="-28"/> + <location line="-29"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> |