Merge "American spelling - recognize/customize"

diff --combined languages/messages/MessagesEn.php
index a7fd85d,899c220..4debb3f
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -13,7 -13,7 +13,7 @@@
   */
  
  /**
 - * Fallback language, used for all unspecified messages and behaviour. This
 + * Fallback language, used for all unspecified messages and behavior. This
   * is English by default, for all files other than this one.
   *
   * Do NOT set this to false in any other message file! Leave the line out to
@@@ -188,7 -188,7 +188,7 @@@ $bookstoreList = array
  
  /**
   * Magic words
-  * Customisable syntax for wikitext and elsewhere.
+  * Customizable syntax for wikitext and elsewhere.
   *
   * IDs must be valid identifiers, they cannot contain hyphens.
   * CASE is 0 to match all case variants, 1 for case-sensitive
@@@ -620,7 -620,7 +620,7 @@@ $messages = array
  /*
  The sidebar for MonoBook is generated from this message, lines that do not
  begin with * or ** are discarded, furthermore lines that do begin with ** and
 -do not contain | are also discarded, but do not depend on this behaviour for
 +do not contain | are also discarded, but do not depend on this behavior for
  future releases. Also note that since each list value is wrapped in a unique
  XHTML id it should only appear once and include characters that are legal
  XHTML id names.
@@@ -3198,7 -3198,7 +3198,7 @@@ Fill in a specific reason below (for ex
  ** Removing content from pages
  ** Spamming links to external sites
  ** Inserting nonsense/gibberish into pages
 -** Intimidating behaviour/harassment
 +** Intimidating behavior/harassment
  ** Abusing multiple accounts
  ** Unacceptable username',
  'ipb-hardblock'                   => 'Prevent logged-in users from editing from this IP address',
@@@ -3463,7 -3463,7 +3463,7 @@@ In the latter case you can also use a l
  Please visit [//www.mediawiki.org/wiki/Localisation MediaWiki Localisation] and [//translatewiki.net translatewiki.net] if you wish to contribute to the generic MediaWiki localisation.',
  'allmessagesnotsupportedDB'     => "This page cannot be used because '''\$wgUseDatabaseMessages''' has been disabled.",
  'allmessages-filter-legend'     => 'Filter',
- 'allmessages-filter'            => 'Filter by customisation state:',
+ 'allmessages-filter'            => 'Filter by customization state:',
  'allmessages-filter-unmodified' => 'Unmodified',
  'allmessages-filter-all'        => 'All',
  'allmessages-filter-modified'   => 'Modified',