aboutsummaryrefslogtreecommitdiff
path: root/src/qt/locale/bitcoin_en.ts
diff options
context:
space:
mode:
Diffstat (limited to 'src/qt/locale/bitcoin_en.ts')
-rw-r--r--src/qt/locale/bitcoin_en.ts46
1 files changed, 28 insertions, 18 deletions
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 78eaf51002..02a6888998 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -685,7 +685,7 @@
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+516"/>
+ <location filename="../bitcoin.cpp" line="+518"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"></translation>
</message>
@@ -2854,7 +2854,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+3"/>
+ <source>Confirm custom change address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>(no label)</source>
<translation type="unfinished"></translation>
</message>
@@ -3852,7 +3862,7 @@
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+302"/>
+ <location filename="../bitcoinstrings.cpp" line="+304"/>
<source>Options:</source>
<translation>Options:</translation>
</message>
@@ -3877,7 +3887,7 @@
<translation>Accept command line and JSON-RPC commands</translation>
</message>
<message>
- <location line="-205"/>
+ <location line="-207"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source>
<translation type="unfinished"></translation>
</message>
@@ -3917,7 +3927,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+127"/>
+ <location line="+129"/>
<source>Error: A fatal internal error occurred, see debug.log for details</source>
<translation type="unfinished"></translation>
</message>
@@ -3942,7 +3952,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-344"/>
+ <location line="-346"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
@@ -4037,7 +4047,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+8"/>
+ <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=&lt;USERNAME&gt;/rpcpassword=&lt;PASSWORD&gt; pair of arguments. This option can be specified multiple times</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
<translation type="unfinished"></translation>
</message>
@@ -4382,7 +4397,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-342"/>
+ <location line="-344"/>
<source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source>
<translation type="unfinished"></translation>
</message>
@@ -4457,7 +4472,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+31"/>
<source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source>
<translation type="unfinished"></translation>
</message>
@@ -4647,12 +4662,12 @@
<translation>Password for JSON-RPC connections</translation>
</message>
<message>
- <location line="-226"/>
+ <location line="-228"/>
<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="+154"/>
+ <location line="+156"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
</message>
@@ -4662,7 +4677,7 @@
<translation>Loading addresses...</translation>
</message>
<message>
- <location line="-275"/>
+ <location line="-277"/>
<source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
<translation type="unfinished"></translation>
</message>
@@ -4762,12 +4777,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
+ <location line="+15"/>
<source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
<translation type="unfinished"></translation>
</message>