Merge branch 'tmxs-develop' into 'develop'

Error correction

See merge request !101

src/app/components/modules/Modals.jsx

@@ -89,7 +89,7 @@ class Modals extends React.Component {
             const new_window = window.open();
             new_window.opener = null;
             new_window.location =
-                'https://blocktrades.us/?input_coin_type=eth&output_coin_type=steem_power&receive_address=' +
+                'https://blocktrades.us/en/trade' +
                 username;
         };
 
@@ -159,7 +159,7 @@ class Modals extends React.Component {
                                 </li>
                             </ol>
                             <button className="button" onClick={buyHivePower}>
-                                {tt('g.buy_steem_power')}
+                                {tt('g.buy_hive_power')}
                             </button>
                         </div>
                     </Reveal>

src/app/locales/en.json

@@ -764,7 +764,7 @@
         "out_of_bandwidth_option_1": "Buy and hold more Hive Power",
         "out_of_bandwidth_option_2": "Wait until your Resource Credits recharge",
         "out_of_bandwidth_option_3": "Wait until the network usage decreases",
-        "out_of_bandwidth_option_4": "Power up more Steem"
+        "out_of_bandwidth_option_4": "Power up more HIVE"
     },
     "sanitizedlink_jsx": {
         "phishylink_caution": "Link hidden; phishing attempt",