diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 53ba23b11..c48de170a 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -15,7 +15,7 @@
-
+
Copyright © 2009-2012 Bitcoin Developers
This is experimental software.
@@ -39,92 +39,82 @@ This product includes software developed by the OpenSSL Project for use in the O
-
+
Double-click to edit address or label
-
+
Create a new address
-
- &New Address...
+
+ Copy the currently selected address to the system clipboard
-
- Copy the currently selected address to the system clipboard
+
+ &New Address
-
- &Copy to Clipboard
+
+ &Copy Address
-
+
Show &QR Code
-
+
Sign a message to prove you own this address
-
+
&Sign Message
-
+
Delete the currently selected address from the list. Only sending addresses can be deleted.
-
+
&Delete
-
- Copy address
-
-
-
-
- Copy label
-
-
-
-
- Edit
+
+ Copy &Label
-
- Delete
+
+ &Edit
-
+
Export Address Book Data
-
+
Comma separated file (*.csv)
-
+
Error exporting
-
+
Could not write to file %1.
@@ -132,17 +122,17 @@ This product includes software developed by the OpenSSL Project for use in the O
AddressTableModel
-
+
Label
-
+
Address
-
+
(no label)
@@ -288,122 +278,137 @@ Are you sure you wish to encrypt your wallet?
BitcoinGUI
-
+
Bitcoin Wallet
-
+
+ Sign &message...
+
+
+
+
Show/Hide &Bitcoin
-
+
Synchronizing with network...
-
+
&Overview
-
+
Show general overview of wallet
-
+
&Transactions
-
+
Browse transaction history
-
+
&Address Book
-
+
Edit the list of stored addresses and labels
-
+
&Receive coins
-
+
Show the list of addresses for receiving payments
-
+
&Send coins
-
+
Send coins to a bitcoin address
-
- Sign &message
-
-
-
-
+
Prove you control an address
-
+
E&xit
-
+
Quit application
-
+
&About %1
-
+
Show information about Bitcoin
-
+
About &Qt
-
+
Show information about Qt
-
+
&Options...
-
+
Modify configuration options for bitcoin
+
+
+ &Encrypt Wallet...
+
+
+
+
+ &Backup Wallet...
+
+
+
+
+ &Change Passphrase...
+
+
-
+
~%n block(s) remaining
~%n block remaining
@@ -411,97 +416,92 @@ Are you sure you wish to encrypt your wallet?
-
+
Downloaded %1 of %2 blocks of transaction history (%3% done).
-
+
&Export...
-
+
Show or hide the Bitcoin window
-
+
Export the data in the current tab to a file
-
- &Encrypt Wallet
-
-
-
-
+
Encrypt or decrypt wallet
-
- &Backup Wallet
+
+ Backup wallet to another location
-
- Backup wallet to another location
+
+ Change the passphrase used for wallet encryption
-
- &Change Passphrase
+
+ &Debug window
-
- Change the passphrase used for wallet encryption
+
+ Open debugging and diagnostic console
-
+
&File
-
+
&Settings
-
+
&Help
-
+
Tabs toolbar
-
+
Actions toolbar
-
+
[testnet]
-
+
Bitcoin client
-
+
bitcoin-qt
-
+
%n active connection(s) to Bitcoin network
%n active connection to Bitcoin network
@@ -509,12 +509,12 @@ Are you sure you wish to encrypt your wallet?
-
+
Downloaded %1 blocks of transaction history.
-
+
%n second(s) ago
%n second ago
@@ -522,7 +522,7 @@ Are you sure you wish to encrypt your wallet?
-
+
%n minute(s) ago
%n minute ago
@@ -530,7 +530,7 @@ Are you sure you wish to encrypt your wallet?
-
+
%n hour(s) ago
%n hour ago
@@ -538,7 +538,7 @@ Are you sure you wish to encrypt your wallet?
-
+
%n day(s) ago
%n day ago
@@ -546,42 +546,42 @@ Are you sure you wish to encrypt your wallet?
-
+
Up to date
-
+
Catching up...
-
+
Last received block was generated %1.
-
+
This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?
-
- Sending...
+
+ Confirm transaction fee
-
+
Sent transaction
-
+
Incoming transaction
-
+
Date: %1
Amount: %2
Type: %3
@@ -590,51 +590,61 @@ Address: %4
-
+
Wallet is <b>encrypted</b> and currently <b>unlocked</b>
-
+
Wallet is <b>encrypted</b> and currently <b>locked</b>
-
+
Backup Wallet
-
+
Wallet Data (*.dat)
-
+
Backup Failed
-
+
There was an error trying to save the wallet data to the new location.
+
+
+ A fatal error occured. Bitcoin can no longer continue safely and will quit.
+
+
DisplayOptionsPage
-
+
&Unit to show amounts in:
-
+
Choose the default subdivision unit to show in the interface, and when sending coins
-
- Display addresses in transaction list
+
+ &Display addresses in transaction list
+
+
+
+
+ Whether to show Bitcoin addresses in the transaction list
@@ -709,87 +719,92 @@ Address: %4
MainOptionsPage
-
+
&Start Bitcoin on window system startup
-
+
Automatically start Bitcoin after the computer is turned on
-
+
&Minimize to the tray instead of the taskbar
-
+
Show only a tray icon after minimizing the window
-
+
Map port using &UPnP
-
+
Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.
-
+
M&inimize on close
-
+
Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.
-
+
&Connect through SOCKS4 proxy:
-
+
Connect to the Bitcon network through a SOCKS4 proxy (e.g. when connecting through Tor)
-
+
Proxy &IP:
-
+
IP address of the proxy (e.g. 127.0.0.1)
-
+
&Port:
-
+
Port of the proxy (e.g. 1234)
-
- Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.
+
+ Detach databases at shutdown
+
+
+
+
+ Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.
-
+
Pay transaction &fee
-
+
Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.
@@ -837,49 +852,59 @@ Address: %4
-
- Click "Sign Message" to get signature
+
+ Copy the current signature to the system clipboard
-
- Sign a message to prove you own this address
+
+ &Copy Signature
-
- &Sign Message
+
+ Reset all sign message fields
-
- Copy the currently selected address to the system clipboard
+
+ Clear &All
+
+
+
+
+ Click "Sign Message" to get signature
+
+
+
+
+ Sign a message to prove you own this address
-
- &Copy to Clipboard
+
+ &Sign Message
-
-
-
+
+
+
Error signing
-
+
%1 is not a valid address.
-
+
Private key for %1 is not available.
-
+
Sign failed
@@ -887,17 +912,17 @@ Address: %4
OptionsDialog
-
+
Main
-
+
Display
-
+
Options
@@ -940,16 +965,12 @@ Address: %4
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Wallet</span></p></body></html>
+
+ Wallet
-
+
<b>Recent transactions</b>
@@ -973,7 +994,7 @@ p, li { white-space: pre-wrap; }
QRCodeDialog
- Dialog
+ QR-Code Dialog
@@ -1012,21 +1033,140 @@ p, li { white-space: pre-wrap; }
-
+
+ Error encoding URI into QR Code.
+
+
+
+
Resulting URI too long, try to reduce the text for label / message.
-
- Save Image...
+
+ Save QR Code
-
+
PNG Images (*.png)
+
+ RPCConsole
+
+
+ Bitcoin debug window
+
+
+
+
+ Information
+
+
+
+
+ Client name
+
+
+
+
+
+
+
+
+
+
+ N/A
+
+
+
+
+ Client version
+
+
+
+
+ Version
+
+
+
+
+ Network
+
+
+
+
+ Number of connections
+
+
+
+
+ On testnet
+
+
+
+
+ Block chain
+
+
+
+
+ Current number of blocks
+
+
+
+
+ Estimated total blocks
+
+
+
+
+ Last block time
+
+
+
+
+ Build date
+
+
+
+
+ Console
+
+
+
+
+ >
+
+
+
+
+ Clear console
+
+
+
+
+ &Copy
+
+
+
+
+ Welcome to the bitcoin RPC console.
+
+
+
+
+ Use up and down arrows to navigate history, and Ctrl-L to clear screen.
+
+
+
+
+ Type "help" for an overview of available commands.
+
+
+
SendCoinsDialog
@@ -1048,7 +1188,7 @@ p, li { white-space: pre-wrap; }
- &Add recipient...
+ &Add Recipient
@@ -1156,7 +1296,7 @@ p, li { white-space: pre-wrap; }
-
+
Enter a label for this address to add it to your address book
@@ -1196,7 +1336,7 @@ p, li { white-space: pre-wrap; }
-
+
Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)
@@ -1204,140 +1344,140 @@ p, li { white-space: pre-wrap; }
TransactionDesc
-
+
Open for %1 blocks
-
+
Open until %1
-
+
%1/offline?
-
+
%1/unconfirmed
-
+
%1 confirmations
-
+
<b>Status:</b>
-
+
, has not been successfully broadcast yet
-
+
, broadcast through %1 node
-
+
, broadcast through %1 nodes
-
+
<b>Date:</b>
-
+
<b>Source:</b> Generated<br>
-
-
+
+
<b>From:</b>
-
+
unknown
-
-
-
+
+
+
<b>To:</b>
-
+
(yours, label:
-
+
(yours)
-
-
-
-
+
+
+
+
<b>Credit:</b>
-
+
(%1 matures in %2 more blocks)
-
+
(not accepted)
-
-
-
+
+
+
<b>Debit:</b>
-
+
<b>Transaction fee:</b>
-
+
<b>Net amount:</b>
-
+
Message:
-
+
Comment:
-
+
Transaction ID:
-
+
Generated coins must wait 120 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, it will change to "not accepted" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.
@@ -1358,27 +1498,27 @@ p, li { white-space: pre-wrap; }
TransactionTableModel
-
+
Date
-
+
Type
-
+
Address
-
+
Amount
-
+
Open for %n block(s)
Open for %n block
@@ -1386,27 +1526,27 @@ p, li { white-space: pre-wrap; }
-
+
Open until %1
-
+
Offline (%1 confirmations)
-
+
Unconfirmed (%1 of %2 confirmations)
-
+
Confirmed (%1 confirmations)
-
+
Mined balance will be available in %n more blocks
Mined balance will be available in %n more block
@@ -1414,67 +1554,67 @@ p, li { white-space: pre-wrap; }
-
+
This block was not received by any other nodes and will probably not be accepted!
-
+
Generated but not accepted
-
+
Received with
-
+
Received from
-
+
Sent to
-
+
Payment to yourself
-
+
Mined
-
+
(n/a)
-
+
Transaction status. Hover over this field to show number of confirmations.
-
+
Date and time that the transaction was received.
-
+
Type of transaction.
-
+
Destination address of transaction.
-
+
Amount removed from or added to balance.
@@ -1574,7 +1714,7 @@ p, li { white-space: pre-wrap; }
- Show details...
+ Show transaction details
@@ -1646,7 +1786,7 @@ p, li { white-space: pre-wrap; }
WalletModel
-
+
Sending...
@@ -1654,448 +1794,448 @@ p, li { white-space: pre-wrap; }
bitcoin-core
-
+
Bitcoin version
-
+
Usage:
-
+
Send command to -server or bitcoind
-
+
List commands
-
+
Get help for a command
-
+
Options:
-
+
Specify configuration file (default: bitcoin.conf)
-
+
Specify pid file (default: bitcoind.pid)
-
+
Generate coins
-
+
Don't generate coins
-
+
Start minimized
-
+
Show splash screen on startup (default: 1)
-
+
Specify data directory
-
+
Set database cache size in megabytes (default: 25)
-
+
Set database disk log size in megabytes (default: 100)
-
+
Specify connection timeout (in milliseconds)
-
+
Connect through socks4 proxy
-
+
Allow DNS lookups for addnode and connect
-
+
Listen for connections on <port> (default: 8333 or testnet: 18333)
-
+
Maintain at most <n> connections to peers (default: 125)
-
+
Connect only to the specified node
-
+
Threshold for disconnecting misbehaving peers (default: 100)
-
+
Number of seconds to keep misbehaving peers from reconnecting (default: 86400)
-
+
Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)
-
+
Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)
-
+
Accept command line and JSON-RPC commands
-
+
Run in the background as a daemon and accept commands
-
+
Use the test network
-
+
Output extra debugging information
-
+
Prepend debug output with timestamp
-
+
Send trace/debug info to console instead of debug.log file
-
+
Send trace/debug info to debugger
-
+
Username for JSON-RPC connections
-
+
Password for JSON-RPC connections
-
+
Listen for JSON-RPC connections on <port> (default: 8332)
-
+
Allow JSON-RPC connections from specified IP address
-
+
Send commands to node running on <ip> (default: 127.0.0.1)
-
+
Execute command when the best block changes (%s in cmd is replaced by block hash)
-
+
Upgrade wallet to latest format
-
+
Set key pool size to <n> (default: 100)
-
+
Rescan the block chain for missing wallet transactions
-
+
How many blocks to check at startup (default: 2500, 0 = all)
-
+
How thorough the block verification is (0-6, default: 1)
-
+
SSL options: (see the Bitcoin Wiki for SSL setup instructions)
-
+
Use OpenSSL (https) for JSON-RPC connections
-
+
Server certificate file (default: server.cert)
-
+
Server private key (default: server.pem)
-
+
Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-
+
This help message
-
+
Usage
-
+
Cannot obtain a lock on data directory %s. Bitcoin is probably already running.
-
+
Bitcoin
-
+
Loading addresses...
-
+
Error loading addr.dat
-
+
Error loading blkindex.dat
-
+
Error loading wallet.dat: Wallet corrupted
-
+
Error loading wallet.dat: Wallet requires newer version of Bitcoin
-
+
Wallet needed to be rewritten: restart Bitcoin to complete
-
+
Error loading wallet.dat
-
+
Error: Wallet locked, unable to create transaction
-
+
Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds
-
+
Error: Transaction creation failed
-
+
Sending...
-
+
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.
-
+
Invalid amount
-
+
Insufficient funds
-
+
Loading block index...
-
+
Add a node to connect to and attempt to keep the connection open
-
+
Find peers using internet relay chat (default: 0)
-
+
Accept connections from outside (default: 1)
-
+
Set language, for example "de_DE" (default: system locale)
-
+
Find peers using DNS lookup (default: 1)
-
+
Use Universal Plug and Play to map the listening port (default: 1)
-
+
Use Universal Plug and Play to map the listening port (default: 0)
-
+
Fee per KB to add to transactions you send
-
+
Loading wallet...
-
+
Cannot downgrade wallet
-
+
Cannot initialize keypool
-
+
Cannot write default address
-
+
Rescanning...
-
+
Done loading
-
+
Invalid -proxy address
-
+
Invalid amount for -paytxfee=<amount>
-
+
Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.
-
+
Error: CreateThread(StartNode) failed
-
+
Warning: Disk space is low
-
+
Unable to bind to port %d on this computer. Bitcoin is probably already running.
-
+
To use the %s option
-
+
%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2107,24 +2247,24 @@ If the file does not exist, create it with owner-readable-only file permissions.
-
+
Error
-
+
An error occured while setting up the RPC port %i for listening: %s
-
+
You must set rpcpassword=<password> in the configuration file:
%s
If the file does not exist, create it with owner-readable-only file permissions.
-
+
Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.