Merge branch 'UpdateReadmeSupportLink' into UpdateSupportLinks

6 files changed, 30 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cacc4b522..4b4218210 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+## 3.13.4 2018-1-9
+
 - Remove recipient field if application initializes a tx with an empty string, or 0x, and tx data. Throw an error with the same condition, but without tx data.
 - Improve gas price suggestion to be closer to the lowest that will be accepted.
 - Throw an error if a application tries to submit a tx whose value is a decimal, and inform that it should be in wei.
diff --git a/README.md b/README.md
index 913723ad5..c9893d14a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ## Support
 
-If you're a user seeking support, [here is our support site](http://metamask.consensyssupport.happyfox.com).
+If you're a user seeking support, [here is our support site](http://metamask.helpscoutdocs.com/).
 
 ## Developing Compatible Dapps
 
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
new file mode 100644
index 000000000..c58af4b80
--- /dev/null
+++ b/app/_locales/ko/messages.json
@@ -0,0 +1,10 @@
+{
+  "appName": {
+    "message": "MetaMask",
+    "description": "The name of the application"
+  },
+  "appDescription": {
+    "message": "이더리움 계좌 관리",
+    "description": "The description of the application"
+  }
+}
diff --git a/app/manifest.json b/app/manifest.json
index d6c57d681..df7b1f1aa 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "3.13.3",
+  "version": "3.13.4",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
diff --git a/gulpfile.js b/gulpfile.js
index 293179892..4c36ff7d4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -19,6 +19,8 @@ var manifest = require('./app/manifest.json')
 var gulpif = require('gulp-if')
 var replace = require('gulp-replace')
 var mkdirp = require('mkdirp')
+var asyncEach = require('async/each')
+var exec = require('child_process').exec
 
 var disableDebugTools = gutil.env.disableDebugTools
 var debug = gutil.env.debug
@@ -153,6 +155,18 @@ gulp.task('copy:watch', function(){
   gulp.watch(['./app/{_locales,images}/*', './app/scripts/chromereload.js', './app/*.{html,json}'], gulp.series('copy'))
 })
 
+// record deps
+
+gulp.task('deps', function (cb) {
+  exec('npm ls', (err, stdoutOutput, stderrOutput) => {
+    if (err) return cb(err)
+    const browsers = ['firefox','chrome','edge','opera']
+    asyncEach(browsers, (target, done) => {
+      fs.writeFile(`./dist/${target}/deps.txt`, stdoutOutput, done)
+    }, cb)
+  })
+})
+
 // lint js
 
 gulp.task('lint', function () {
@@ -234,7 +248,7 @@ gulp.task('zip', gulp.parallel('zip:chrome', 'zip:firefox', 'zip:edge', 'zip:ope
 
 gulp.task('dev', gulp.series('dev:js', 'copy', gulp.parallel('copy:watch', 'dev:reload')))
 
-gulp.task('build', gulp.series('clean', gulp.parallel('build:js', 'copy')))
+gulp.task('build', gulp.series('clean', gulp.parallel('build:js', 'copy', 'deps')))
 gulp.task('dist', gulp.series('build', 'zip'))
 
 // task generators
diff --git a/package.json b/package.json
index 1d054b2ec..8b846803b 100644
--- a/package.json
+++ b/package.json
@@ -93,8 +93,6 @@
     "extensionizer": "^1.0.0",
     "fast-json-patch": "^2.0.4",
     "fast-levenshtein": "^2.0.6",
-    "gulp": "github:gulpjs/gulp#4.0",
-    "gulp-eslint": "^4.0.0",
     "hat": "0.0.3",
     "human-standard-token-abi": "^1.0.2",
     "idb-global": "^2.1.0",
@@ -190,6 +188,7 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "gulp-zip": "^4.0.0",
+    "gulp-eslint": "^4.0.0",
     "isomorphic-fetch": "^2.2.1",
     "jsdom": "^11.1.0",
     "jsdom-global": "^3.0.2",