Merge branch 'master' of github.com:spesmilo/electrum

RELEASE-NOTES

@@ -14,8 +14,8 @@
  * Multisig transactions can be signed with Trezor. When you create
    the multisig wallet, just enter the xpub of your existing Trezor
    wallet.
- * Transaction fees set manually in the GUI are retained when the user
-   uses the '!' shortcut.
+ * Transaction fees set manually in the GUI are retained, including
+   when the user uses the '!' shortcut.
  * New 'email' plugin, that enables sending and receiving payment
    requests by email.
 
@@ -214,7 +214,7 @@
   a Patrica tree of all UTXOs, an idea proposed by Alan Reiner in the
   bitcointalk forum. This property allows the client to directly
   request the balance of any address. The new commands are:
-     1. getaddressbalance <address> 
+     1. getaddressbalance <address>
      2. getaddressunspent <address>
      3. getutxoaddress <txid> <pos>
 
@@ -270,13 +270,13 @@ bugfixes: connection problems, transactions staying unverified
 
 # Release 1.8.1
 
-* Notification option when receiving new tranactions 
-* Confirm dialogue before sending large amounts 
+* Notification option when receiving new tranactions
+* Confirm dialogue before sending large amounts
 * Alternative datafile location for non-windows systems
 * Fix offline wallet creation
 * Remove enforced tx fee
 * Tray icon improvements
-* Various bugfixes 
+* Various bugfixes
 
 
 # Release 1.8
@@ -301,7 +301,7 @@ bugfixes: connection problems, transactions staying unverified
 * Classic GUI asks users to enter their seed on wallet creation
 
 
-# Release 1.7.2:  
+# Release 1.7.2:
 
 * Transactions that are in the same block are displayed in chronological order in the history.
 * The client computes transaction priority and rejects zero-fee transactions that need a fee.
@@ -342,17 +342,17 @@ https://bitcointalk.org/index.php?topic=144575.0
   For a single address, use the address menu (right-click).
   To export the keys of your entire wallet, use the settings dialog (import/export tab).
 
-* It is possible to create, sign and redeem multisig transaction using the 
+* It is possible to create, sign and redeem multisig transaction using the
 command line interface.  This is made possible by the following new commands:
     dumpprivkey, listunspent, createmultisig, createrawtransaction, decoderawtransaction, signrawtransaction
-The syntax of these commands is similar to their bitcoind counterpart. 
+The syntax of these commands is similar to their bitcoind counterpart.
 For an example, see Gavin's tutorial: https://gist.github.com/gavinandresen/3966071
 
-* Offline wallets now work in a way similar to Armory: 
+* Offline wallets now work in a way similar to Armory:
   1. user creates an unsigned transaction using the online (watching-only) wallet.
   2. unsigned transaction is copied to the offline computer, and signed by the offline wallet.
   3. signed transaction is copied to the online computer, broadcasted by the online client.
-  4. All these steps can be done via the command line interface or the classic GUI. 
+  4. All these steps can be done via the command line interface or the classic GUI.
 
 * Many command line commands have been renamed in order to make the syntax consistent with bitcoind.
 
@@ -383,23 +383,23 @@ For an example, see Gavin's tutorial: https://gist.github.com/gavinandresen/3966
 * (Bug) Under rare circumstances changing password with incorrect password could damage wallet
 
 == Lite GUI
-* (Chore) Use blockchain.info for exchange rate data 
+* (Chore) Use blockchain.info for exchange rate data
 * (Feature) added currency conversion for BRL, CNY, RUB
 * (Feature) Saraha theme
-* (Feature) csv import/export for transactions including labels 
+* (Feature) csv import/export for transactions including labels
 
 == Classic GUI
 * (Chore) pruning servers now called "p", full servers "f" to avoid confusion with terms
 * (Feature) Debits in history shown in red
-* (Feature) csv import/export for transactions including labels 
+* (Feature) csv import/export for transactions including labels
 
 # Release 1.5.8 (02-01-2013)
 
 == Core
-* (Bug) Fix pending address balance on received coins for pruning servers 
+* (Bug) Fix pending address balance on received coins for pruning servers
 * (Bug) Fix history command line option to show output again (regression by SPV)
 * (Chore) Add timeout to blockchain headers file download by HTTP
-* (Feature) new option: -L, --language: default language used in GUI. 
+* (Feature) new option: -L, --language: default language used in GUI.
 
 == Lite GUI
 * (Bug) Sending to auto-completed contacts works again
@@ -419,4 +419,3 @@ For an example, see Gavin's tutorial: https://gist.github.com/gavinandresen/3966
 * (Feature) Added a label dialog after sending a transaction.
 * (Feature) Reworked receiving addresses; instead of a random selection from one of your receiving addresses a new widget will show listing unused addresses.
 * (Chore)   Removed server selection. With all the new server options a simple menu item does not suffice anymore.
-

lib/util.py

@@ -204,6 +204,8 @@ def time_difference(distance_in_time, include_seconds):
 block_explorer_info = {
     'Biteasy.com': ('https://www.biteasy.com/blockchain',
                         {'tx': 'transactions', 'addr': 'addresses'}),
+    'Bitflyer.jp': ('https://chainflyer.bitflyer.jp',
+                        {'tx': 'Transaction', 'addr': 'Address'}),
     'Blockchain.info': ('https://blockchain.info',
                         {'tx': 'tx', 'addr': 'address'}),
     'Blockr.io': ('https://btc.blockr.io',