From 6eb34da56da5f7dfb3fd57a1d7394b59aa224beb Mon Sep 17 00:00:00 2001 From: shirayuki Date: Wed, 6 Mar 2013 08:28:07 +0900 Subject: [PATCH] American spelling - recognize/customize Change-Id: I41b2f8113cf84e16430c1f59a76acbb539269833 --- includes/installer/Installer.i18n.php | 2 +- languages/messages/MessagesEn.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php index 85f94d8ba3..65870a8878 100644 --- a/includes/installer/Installer.i18n.php +++ b/includes/installer/Installer.i18n.php @@ -317,7 +317,7 @@ This is '''not recommended''' unless you are having problems with your wiki.", You can now [$1 start using your wiki].", 'config-regenerate' => 'Regenerate LocalSettings.php →', 'config-show-table-status' => 'SHOW TABLE STATUS query failed!', - 'config-unknown-collation' => "'''Warning:''' Database is using unrecognised collation.", + 'config-unknown-collation' => "'''Warning:''' Database is using unrecognized collation.", 'config-db-web-account' => 'Database account for web access', 'config-db-web-help' => 'Select the username and password that the web server will use to connect to the database server, during ordinary operation of the wiki.', 'config-db-web-account-same' => 'Use the same account as for installation', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index d7f6016dc6..899c220727 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -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 @@ -3463,7 +3463,7 @@ In the latter case you can also use a link, for example [[{{#Special:Export}}/{{ 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', -- 2.20.1