diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index cb09e93e7..534e4f3d4 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -186,6 +186,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin. QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), QT_TRANSLATE_NOOP("bitcoin-core", "System error: "), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), @@ -207,6 +208,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."), QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s\n"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 61af88d05..d7d792a45 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -324,17 +324,17 @@ This product includes software developed by the OpenSSL Project for use in the O BitcoinGUI - + Sign &message... Sign &message... - + Synchronizing with network... Synchronizing with network... - + &Overview &Overview @@ -409,7 +409,7 @@ This product includes software developed by the OpenSSL Project for use in the O &Change Passphrase... - + Importing blocks from disk... Importing blocks from disk... @@ -419,7 +419,7 @@ This product includes software developed by the OpenSSL Project for use in the O Reindexing blocks on disk... - + Send coins to a Bitcoin address Send coins to a Bitcoin address @@ -456,12 +456,12 @@ This product includes software developed by the OpenSSL Project for use in the O - + Bitcoin Bitcoin - + Wallet Wallet @@ -546,7 +546,7 @@ This product includes software developed by the OpenSSL Project for use in the O Bitcoin client - + %n active connection(s) to Bitcoin network %n active connection to Bitcoin network @@ -688,7 +688,7 @@ Address: %4 Wallet is <b>encrypted</b> and currently <b>locked</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -772,14 +772,19 @@ Address: %4 FreespaceChecker - + A new data directory will be created. A new data directory will be created. - - Directory already exists. Add <code>%1name</code> if you intend to create a new directory here. - Directory already exists. Add <code>%1name</code> if you intend to create a new directory here. + + name + name + + + + Directory already exists. Add %1 if you intend to create a new directory here. + Directory already exists. Add %1 if you intend to create a new directory here. @@ -795,7 +800,7 @@ Address: %4 GUIUtil::HelpMessageBox - + Bitcoin-Qt Bitcoin-Qt @@ -1172,7 +1177,7 @@ Address: %4 PaymentServer - + Cannot start bitcoin: click-to-pay handler Cannot start bitcoin: click-to-pay handler @@ -1271,7 +1276,7 @@ Address: %4 - + N/A N/A @@ -1772,7 +1777,7 @@ Address: %4 SplashScreen - + The Bitcoin developers The Bitcoin developers @@ -2330,12 +2335,12 @@ Address: %4 Bitcoin version - + Usage: Usage: - + Send command to -server or bitcoind Send command to -server or bitcoind @@ -2390,7 +2395,7 @@ Address: %4 Connect to a node to retrieve peer addresses, and disconnect - + Specify your own public address Specify your own public address @@ -2400,7 +2405,7 @@ Address: %4 Threshold for disconnecting misbehaving peers (default: 100) - + Number of seconds to keep misbehaving peers from reconnecting (default: 86400) Number of seconds to keep misbehaving peers from reconnecting (default: 86400) @@ -2425,12 +2430,12 @@ Address: %4 Run in the background as a daemon and accept commands - + Use the test network Use the test network - + Accept connections from outside (default: 1 if no -proxy or -connect) Accept connections from outside (default: 1 if no -proxy or -connect) @@ -2695,7 +2700,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Set the number of threads to service RPC calls (default: 4) - + + Specify wallet file (within data directory) + Specify wallet file (within data directory) + + + Verifying blocks... Verifying blocks... @@ -2704,13 +2714,20 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Verifying wallet... Verifying wallet... + + + Wallet %s resides outside data directory %s + + Wallet %s resides outside data directory %s + + You need to rebuild the database using -reindex to change -txindex You need to rebuild the database using -reindex to change -txindex - + Imports blocks from external blk000??.dat file Imports blocks from external blk000??.dat file @@ -2825,7 +2842,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Specify connection timeout in milliseconds (default: 5000) - + System error: System error: @@ -2865,7 +2882,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Username for JSON-RPC connections - + Warning Warning @@ -2880,7 +2897,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. wallet.dat corrupt, salvage failed - + Password for JSON-RPC connections Password for JSON-RPC connections @@ -2900,12 +2917,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Execute command when the best block changes (%s in cmd is replaced by block hash) - + Upgrade wallet to latest format Upgrade wallet to latest format - + Set key pool size to <n> (default: 100) Set key pool size to <n> (default: 100) @@ -2915,12 +2932,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Rescan the block chain for missing wallet transactions - + Use OpenSSL (https) for JSON-RPC connections Use OpenSSL (https) for JSON-RPC connections - + Server certificate file (default: server.cert) Server certificate file (default: server.cert) @@ -2935,7 +2952,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) - + This help message This help message @@ -2945,7 +2962,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unable to bind to %s on this computer (bind returned error %d, %s) - + Connect through socks proxy Connect through socks proxy @@ -2970,12 +2987,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Error loading wallet.dat: Wallet requires newer version of Bitcoin - + Wallet needed to be rewritten: restart Bitcoin to complete Wallet needed to be rewritten: restart Bitcoin to complete - + Error loading wallet.dat Error loading wallet.dat @@ -2985,7 +3002,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Invalid -proxy address: '%s' - + Unknown network specified in -onlynet: '%s' Unknown network specified in -onlynet: '%s' @@ -2995,7 +3012,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Unknown -socks proxy version requested: %i - + Cannot resolve -bind address: '%s' Cannot resolve -bind address: '%s' @@ -3065,12 +3082,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. Done loading - + To use the %s option To use the %s option - + Error Error