Skip to content

Commit b1347d5

Browse files
committed
Merge pull request #3532
f087ce8 qt: English translation update (Wladimir J. van der Laan)
2 parents c7930c8 + f087ce8 commit b1347d5

File tree

2 files changed

+286
-209
lines changed

2 files changed

+286
-209
lines changed

src/qt/bitcoinstrings.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
4040
"be solved instantly. This is intended for regression testing tools and app "
4141
"development."),
4242
QT_TRANSLATE_NOOP("bitcoin-core", ""
43+
"Enter regression test mode, which uses a special chain in which blocks can "
44+
"be solved instantly."),
45+
QT_TRANSLATE_NOOP("bitcoin-core", ""
4346
"Error: The transaction was rejected! This might happen if some of the coins "
4447
"in your wallet were already spent, such as if you used a copy of wallet.dat "
4548
"and coins were spent in the copy but not marked as spent here."),
@@ -119,6 +122,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Connect to JSON-RPC on <port> (default: 8332
119122
QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"),
120123
QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"),
121124
QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"),
125+
QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"),
122126
QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
123127
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
124128
QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing block database"),
@@ -185,7 +189,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Select SOCKS version for -proxy (4 or 5, defa
185189
QT_TRANSLATE_NOOP("bitcoin-core", "Send command to Bitcoin server"),
186190
QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"),
187191
QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"),
188-
QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to debugger"),
189192
QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"),
190193
QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"),
191194
QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"),
@@ -204,6 +207,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
204207
QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin server"),
205208
QT_TRANSLATE_NOOP("bitcoin-core", "System error: "),
206209
QT_TRANSLATE_NOOP("bitcoin-core", "This help message"),
210+
QT_TRANSLATE_NOOP("bitcoin-core", "This is intended for regression testing tools and app development."),
207211
QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)"),
208212
QT_TRANSLATE_NOOP("bitcoin-core", "To use the %s option"),
209213
QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"),
@@ -225,6 +229,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."),
225229
QT_TRANSLATE_NOOP("bitcoin-core", "Wait for RPC server to start"),
226230
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s"),
227231
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"),
232+
QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"),
228233
QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
229234
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignored, use -debug=net"),
230235
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"),

0 commit comments

Comments
 (0)