#590 (#617)

* Update README.md

* Issue 315 - Add Chart Clamp To Settings Dropdown (#373)

* Add Chart Clamp To Settings Dropdown

* Removed Unused Variable

Merging as is and then we'll see about handling the redraw bug in the next sprint.

* resolve conflict

* Update README.md

* adopt 'Burn asset' nomenclature #590

* update README

README.md

@@ -46,11 +46,11 @@ npm install
 
 ## Running the dev server 运行开发服务器
 
-The dev server uses Express in combination with Webpack 2.
+The dev server uses Express in combination with Webpack.
 
 Once all the packages have been installed you can start the development server by running:
 
->开发服务器使用了EXPRSS和Webpack 2.
+>开发服务器使用了EXPRESS和Webpack.
 
 >一旦所有的封包被安装了，你就可以通过'web'文件夹并且输入下列代码，开始启动开发服务器
 ```

app/assets/locales/locale-en.json

@@ -439,7 +439,7 @@
     "limit_order_buy": "{account} placed an order to buy {amount} at {price}",
     "limit_order_cancel": "{account} cancelled order #%(order)s",
     "call_order_update": "{account} changed {debtSymbol} debt by {debt} and collateral by {collateral}",
-    "asset_reserve": "{account} reserved (burnt) {amount}",
+    "asset_reserve": "{account} burned (reserved) {amount}",
     "asset_issue": "{account} issued {amount} to {to}",
     "asset_fund_fee_pool": "{account} funded {asset} fee pool with {amount}",
     "asset_create": "{account} created the asset {asset}",
@@ -486,7 +486,7 @@
     "reject": "Reject",
     "override_transfer": "Transfer {amount} from {from} to {to} by authority of {issuer}",
     "asset_issue": "Issue {amount} to {to} using {account}",
-    "asset_reserve": "Reserve (burn) {amount} using {account}",
+    "asset_reserve": "Burn (reserve) {amount} using {account}",
     "vesting_balance_withdraw": "Withdraw {amount} from vesting balance of {account}",
     "feed_producer": "Update the feed producers for the asset {asset} using the account {account}",
     "call_order_update": "Change {account} {debtSymbol} debt by {debt} and collateral by {collateral}"
@@ -555,7 +555,7 @@
     "outputs": "Outputs",
     "inputs": "Inputs",
     "settlement_date": "Settlement date",
-    "asset_reserve": "reserved asset amount",
+    "asset_reserve": "burned asset amount",
     "trxTypes": {
       "all": "Show all",
       "transfer": "Transfer",
@@ -572,7 +572,7 @@
       "asset_update_bitasset": "Update SmartCoin",
       "asset_update_feed_producers": "Update asset feed producers",
       "asset_issue": "Issue asset",
-      "asset_reserve": "Reserve asset",
+      "asset_reserve": "Burn asset",
       "asset_fund_fee_pool": "Fund asset fee pool",
       "asset_settle": "Asset settlement",
       "asset_global_settle": "Global asset settlement",
@@ -1202,10 +1202,10 @@
       "submit": "Settle asset"
     },
     "reserve": {
-      "title": "Reserve (burn) asset",
-      "amount": "Amount to reserve",
-      "from": "Account to reserve from",
-      "submit": "Reserve"
+      "title": "Burn (reserve) asset",
+      "amount": "Amount to burn",
+      "from": "Account to burn from",
+      "submit": "Burn"
     },
     "confirmation": {
       "title": "The address you entered does not appear valid, are you sure you want to make the withdrawal?",