Merge branch 'master' into selenium-e2e

1 files changed, 4 insertions, 3 deletions

diff --git a/app/manifest.json b/app/manifest.json
index 0c89c2b3e..6fcf6cd7c 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,10 +1,10 @@
 {
-  "name": "MetaMask",
-  "short_name": "Metamask",
+  "name": "__MSG_appName__",
+  "short_name": "__MSG_appName__",
   "version": "4.2.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
-  "description": "Ethereum Browser Extension",
+  "description": "__MSG_appDescription__",
   "commands": {
     "_execute_browser_action": {
       "suggested_key": {
@@ -56,6 +56,7 @@
   ],
   "permissions": [
     "storage",
+    "unlimitedStorage",
     "clipboardWrite",
     "http://localhost:8545/",
     "https://*.infura.io/"