Merge branch 'master' into networkIndication

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 - Added a network indicator mark in dropdown menu
 - Added network name next to network indicator
+- Unify wording for transaction approve/reject options on notifications and the extension.
+
+## 2.4.5 2016-06-29
+
 - Fixed bug where MetaMask interfered with PDF loading.
 - Moved switch account icon into menu bar.
 - Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions.

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "Metamask",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "manifest_version": 2,
   "description": "__MSG_appDescription__",
   "icons": {

app/scripts/lib/notifications.js

@@ -96,9 +96,9 @@ function showNotification (state) {
     title: state.title,
     message: '',
     buttons: [{
-      title: 'confirm',
+      title: 'Approve',
     }, {
-      title: 'cancel',
+      title: 'Reject',
     }],
   })
   notificationHandlers[id] = {

ui/app/components/pending-tx.js

@@ -36,10 +36,10 @@ PendingTx.prototype.render = function () {
       h('.flex-row.flex-space-around', [
         h('button', {
           onClick: state.cancelTransaction,
-        }, 'Cancel'),
+        }, 'Reject'),
         h('button', {
           onClick: state.sendTransaction,
-        }, 'Send'),
+        }, 'Approve'),
       ]),
 
     ])