Merge branch 'dev-channel'

CHANGELOG.md

@@ -8,10 +8,11 @@
 - Added menu item to clear all cookies and site data.
 - Multi language support.  Initially this includes: en-US, nl-NL, and pt-Br.
 - Ability to open html files when Brave is the default on OS X.
-- Block 'javascript:' URLs from being loaded when entered in URL bar
+- Block 'javascript:' URLs from being loaded when entered in URL bar.
 - Printing fixed.
 - Fixed various bugs.
 - Upgrade to libchromiumcontent 49.0.2623.112.
+- Upgrade to Electron 0.37.6.
 
 ## [0.9.1](https://github.com/brave/browser-laptop/releases/v0.9.1dev)
 - Undo closed tab now focuses the webview.

app/locale.js

@@ -195,12 +195,19 @@ exports.init = function (language, cb) {
     return { code: lang }
   })
 
-  // Property files to parse (only ones containing menu specific identifiers)
-  const propertyFiles = [
-    path.join(__dirname, 'extensions', 'brave', 'locales', lang, 'menu.properties'),
-    path.join(__dirname, 'extensions', 'brave', 'locales', lang, 'app.properties'),
-    path.join(__dirname, 'extensions', 'brave', 'locales', lang, 'password.properties')
-  ]
+  const propertyFiles = []
+  const appendLangProperties = (lang) => {
+    // Property files to parse (only ones containing menu specific identifiers)
+    propertyFiles.push(path.join(__dirname, 'extensions', 'brave', 'locales', lang, 'menu.properties'),
+      path.join(__dirname, 'extensions', 'brave', 'locales', lang, 'app.properties'),
+      path.join(__dirname, 'extensions', 'brave', 'locales', lang, 'password.properties'))
+  }
+
+  appendLangProperties(lang)
+  if (lang !== DEFAULT_LANGUAGE) {
+    // Pass in the default locale as well
+    appendLangProperties(DEFAULT_LANGUAGE)
+  }
 
   // If langs change a new context must be created
   const env = new L20n.Env(L20n.fetchResource)