Merge default.

--HG--
branch : bootstrapped

common/content/configbase.js

@@ -103,7 +103,7 @@ const ConfigBase = Class(ModuleBase, {
     host: null,
 
     /**
-     * @property {Object} A map between key names for key events should be ignored,
+     * @property {Object} A map between key names for key events which should be ignored,
      *     and a mask of the modes in which they should be ignored.
      */
     ignoreKeys: {}, // NOTE: be aware you can't put useful values in here, as "modes.NORMAL" etc. are not defined at this time
@@ -199,7 +199,7 @@ const ConfigBase = Class(ModuleBase, {
         !CmdLine;>*       font-family: monospace !important; padding: 1px !important;
         CmdPrompt;.dactyl-commandline-prompt
         CmdInput;.dactyl-commandline-command
-        CmdOutput    white-space: pre;
+        CmdOutput         white-space: pre;
 
 
         CompGroup

common/content/mappings.js

@@ -481,7 +481,7 @@ const Mappings = Module("mappings", {
                     options: [ update({}, modeFlag, {
                             names: ["-modes", "-mode", "-m"],
                             type: CommandOption.LIST,
-                            description: "Clear mappings from the given modes",
+                            description: "Remove all mappings from the given modes",
                             default: mapmodes || ["n", "v"],
                         }),
                     ]

common/locale/en-US/options.xml

@@ -725,7 +725,7 @@
     <type>number</type>
     <default>0</default>
     <description>
-        <p>Changes how soon matching hints are followed in in Hints mode.</p>
+        <p>Changes how soon matching hints are followed in Hints mode.</p>
 
         <p>Possible values:</p>
 

common/locale/en-US/various.xml

@@ -38,7 +38,7 @@
         <p>Fake key events.</p>
 
         <dl>
-            <dt>-mode</dt> <dd>The in which to feed the keys (short name: <em>-m</em>)</dd>
+            <dt>-mode</dt> <dd>The mode in which to feed the keys (short name: <em>-m</em>)</dd>
         </dl>
     </description>
 </item>

common/modules/base.jsm

@@ -1134,7 +1134,7 @@ const array = Class("array", Array, {
      * Returns the nth member of the given array that matches the
      * given predicate.
      */
-    nth: function first(ary, pred, n, self) {
+    nth: function nth(ary, pred, n, self) {
         for (let elem in values(ary))
             if (pred.call(self, elem) && n-- === 0)
                 return elem;

common/modules/util.jsm

@@ -267,7 +267,7 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         return stack.top;
     },
 
-    compileMacro: function compileFormat(macro, keepUnknown) {
+    compileMacro: function compileMacro(macro, keepUnknown) {
         let stack = [frame()];
         stack.__defineGetter__("top", function () this[this.length - 1]);