diff --git a/.travis.yml b/.travis.yml
index 07c1ba2c9a7..8d6643eba9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ os:
   - linux
   - osx
 
+env:
+  - VSCODE_BUILD_VERBOSE=true
+
 addons:
   apt:
     sources:
diff --git a/appveyor.yml b/appveyor.yml
index 459e550af38..86d73d0671f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,6 @@
 environment:
   ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
+  VSCODE_BUILD_VERBOSE: true
 
 install:
   - ps: Install-Product node 5.10.1 x64
diff --git a/build/gulpfile.common.js b/build/gulpfile.common.js
index 8939fa31b17..837ce7ac2c7 100644
--- a/build/gulpfile.common.js
+++ b/build/gulpfile.common.js
@@ -143,7 +143,9 @@ exports.optimizeTask = function(opts) {
 			var filteredResources = [];
 			filteredResources = filteredResources.concat(resources);
 			result.cssInlinedResources.forEach(function(resource) {
-				log('optimizer', 'excluding inlined: ' + resource);
+				if (process.env['VSCODE_BUILD_VERBOSE']) {
+					log('optimizer', 'excluding inlined: ' + resource);
+				}
 				filteredResources.push('!' + resource);
 			});
 			gulp.src(filteredResources, { base: 'out-build' }).pipe(resourcesStream);
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index b3be39a2c51..9585915e14f 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -14,7 +14,7 @@ function log(message) {
     for (var _i = 1; _i < arguments.length; _i++) {
         rest[_i - 1] = arguments[_i];
     }
-    util.log.apply(util, [util.colors.cyan('[i18n]'), message].concat(rest));
+    util.log.apply(util, [util.colors.green('[i18n]'), message].concat(rest));
 }
 var LocalizeInfo;
 (function (LocalizeInfo) {
@@ -187,7 +187,9 @@ function processCoreBundleFormat(fileHeader, json, emitter) {
         if (!language.iso639_2) {
             return;
         }
-        log("Generating nls bundles for: " + language.iso639_2);
+        if (process.env['VSCODE_BUILD_VERBOSE']) {
+            log("Generating nls bundles for: " + language.iso639_2);
+        }
         statistics[language.iso639_2] = 0;
         var localizedModules = Object.create(null);
         var cwd = path.join(languageDirectory, language.name, 'src');
@@ -200,7 +202,9 @@ function processCoreBundleFormat(fileHeader, json, emitter) {
                 messages = JSON.parse(content);
             }
             else {
-                // log(`No localized messages found for module ${module}. Using default messages.`);
+                if (process.env['VSCODE_BUILD_VERBOSE']) {
+                    log("No localized messages found for module " + module + ". Using default messages.");
+                }
                 messages = defaultMessages[module];
                 statistics[language.iso639_2] = statistics[language.iso639_2] + Object.keys(messages).length;
             }
@@ -215,7 +219,9 @@ function processCoreBundleFormat(fileHeader, json, emitter) {
                 }
                 var message = messages[key];
                 if (!message) {
-                    log("No localized message found for key " + key + " in module " + module + ". Using default message.");
+                    if (process.env['VSCODE_BUILD_VERBOSE']) {
+                        log("No localized message found for key " + key + " in module " + module + ". Using default message.");
+                    }
                     message = defaultMessages[module][key];
                     statistics[language.iso639_2] = statistics[language.iso639_2] + 1;
                 }
@@ -245,10 +251,9 @@ function processCoreBundleFormat(fileHeader, json, emitter) {
             emitter.emit('data', new File({ path: bundle + '.nls.' + language.iso639_2 + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') }));
         });
     });
-    log("Statistics (total " + total + "):");
     Object.keys(statistics).forEach(function (key) {
         var value = statistics[key];
-        log("\t" + value + " untranslated strings for locale " + key + " found.");
+        log(key + " has " + value + " untranslated strings.");
     });
     vscodeLanguages.forEach(function (language) {
         var iso639_2 = iso639_3_to_2[language];
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index fdc65def6e1..ec886fb47a7 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -12,8 +12,9 @@ import File = require('vinyl');
 import * as Is from 'is';
 
 var util = require('gulp-util');
+
 function log(message: any, ...rest: any[]): void {
-	util.log(util.colors.cyan('[i18n]'), message, ...rest);
+	util.log(util.colors.green('[i18n]'), message, ...rest);
 }
 
 interface Map<V> {
@@ -211,7 +212,10 @@ function processCoreBundleFormat(fileHeader:string, json: BundledFormat, emitter
 			return;
 		}
 
-		log(`Generating nls bundles for: ${language.iso639_2}`);
+		if (process.env['VSCODE_BUILD_VERBOSE']) {
+			log(`Generating nls bundles for: ${language.iso639_2}`);
+		}
+
 		statistics[language.iso639_2] = 0;
 		let localizedModules: Map<string[]> = Object.create(null);
 		let cwd = path.join(languageDirectory, language.name, 'src');
@@ -223,7 +227,9 @@ function processCoreBundleFormat(fileHeader:string, json: BundledFormat, emitter
 				let content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
 				messages = JSON.parse(content);
 			} else {
-				// log(`No localized messages found for module ${module}. Using default messages.`);
+				if (process.env['VSCODE_BUILD_VERBOSE']) {
+					log(`No localized messages found for module ${module}. Using default messages.`);
+				}
 				messages = defaultMessages[module];
 				statistics[language.iso639_2] = statistics[language.iso639_2] + Object.keys(messages).length;
 			}
@@ -237,7 +243,9 @@ function processCoreBundleFormat(fileHeader:string, json: BundledFormat, emitter
 				}
 				let message: string = messages[key];
 				if (!message) {
-					log(`No localized message found for key ${key} in module ${module}. Using default message.`);
+					if (process.env['VSCODE_BUILD_VERBOSE']) {
+						log(`No localized message found for key ${key} in module ${module}. Using default message.`);
+					}
 					message = defaultMessages[module][key];
 					statistics[language.iso639_2] = statistics[language.iso639_2] + 1;
 				}
@@ -267,10 +275,9 @@ function processCoreBundleFormat(fileHeader:string, json: BundledFormat, emitter
 			emitter.emit('data', new File( { path: bundle + '.nls.' + language.iso639_2 + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') }));
 		});
 	});
-	log(`Statistics (total ${total}):`);
 	Object.keys(statistics).forEach(key => {
 		let value = statistics[key];
-		log(`\t${value} untranslated strings for locale ${key} found.`);
+		log(`${key} has ${value} untranslated strings.`);
 	});
 	vscodeLanguages.forEach(language => {
 		let iso639_2 = iso639_3_to_2[language];
@@ -279,7 +286,7 @@ function processCoreBundleFormat(fileHeader:string, json: BundledFormat, emitter
 		} else {
 			let stats = statistics[iso639_2];
 			if (Is.undef(stats)) {
-				log(`\tNo translations found for language ${language}. Using default language instead.`)
+				log(`\tNo translations found for language ${language}. Using default language instead.`);
 			}
 		}
 	});
@@ -293,7 +300,7 @@ export function processNlsFiles(opts:{fileHeader:string;}): ThroughStream {
 			if (file.isBuffer()) {
 				json = JSON.parse(file.contents.toString('utf8'));
 			} else {
-				this.emit('error', `Failed to read component file: ${file.relative}`)
+				this.emit('error', `Failed to read component file: ${file.relative}`);
 			}
 			if (BundledFormat.is(json)) {
 				processCoreBundleFormat(opts.fileHeader, json, this);