Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
First step of switching from American English to British English spel…
Browse files Browse the repository at this point in the history
…ling
  • Loading branch information
xchs committed Aug 19, 2012
1 parent cd0ac28 commit 0e8f1e8
Show file tree
Hide file tree
Showing 34 changed files with 87 additions and 87 deletions.
2 changes: 1 addition & 1 deletion assets/contao/js/core-uncompressed.js
Expand Up @@ -1007,7 +1007,7 @@ var Backend =
},

/**
* Initialize the mootools color picker (backwards compatibility)
* Initialize the mootools colour picker (backwards compatibility)
*/
addColorPicker: function() {
return true;
Expand Down
4 changes: 2 additions & 2 deletions system/config/default.php
Expand Up @@ -258,7 +258,7 @@
* end. It does not apply to the search engine.
*
* If you need custom page sections (in addition to "header", "left", "main",
* "right" and "footer", you can define a comma separated list here.
* "right" and "footer", you can define a comma-separated list here.
*
* If you enter a maximum image width, images and media files cannot be wider
* than this value and will not break your page layout.
Expand All @@ -272,7 +272,7 @@
* Default page permissions: allow everything for the owner (u1 - u6) of a page.
* See back end module "Navigation" for more information.
*
* Please enter a comma separated list of allowed image types, editable files
* Please enter a comma-separated list of allowed image types, editable files
* and all all file types that are allowed to be downloaded.
*/
$GLOBALS['TL_CONFIG']['loginCount'] = 3;
Expand Down
4 changes: 2 additions & 2 deletions system/docs/CHANGELOG.md
Expand Up @@ -369,7 +369,7 @@ Better page layout edit screen: row icons, separate analytics templates, jQuery
and MooTools configuration in subpalettes.

### Changed
The color picker can now be activated in the data container (see #3874).
The colour picker can now be activated in the data container (see #3874).

### Improved
Added an `addMultiple()` method to the Combiner (see #3814).
Expand Down Expand Up @@ -463,7 +463,7 @@ calendar module). Feeds are no longer bound to a news archive and can include
multiple archives now.

### New
Added a nicer dialog script in the back end.
Added a nicer dialogue script in the back end.

### New
Added `mootools-mobile.js` and swipe support to the mediabox and slimbox.
Expand Down
2 changes: 1 addition & 1 deletion system/helper/ide_compat.php
Expand Up @@ -12,7 +12,7 @@

/**
* This file is not used in Contao. Its only purpose is to make
* PHP IDEs like Eclipse, Zend Studio or PHPStorm realize the
* PHP IDEs like Eclipse, Zend Studio or PHPStorm realise the
* class origins, since the dynamic class aliasing we are using
* is a bit too complex for them to understand.
*/
Expand Down
2 changes: 1 addition & 1 deletion system/modules/core/classes/DataContainer.php
Expand Up @@ -353,7 +353,7 @@ protected function row($strPalette=null)
</script>';
}

// Color picker
// Colour picker
if ($arrData['eval']['colorpicker'])
{
$wizard .= ' ' . $this->generateImage('pickcolor.gif', $GLOBALS['TL_LANG']['MSC']['colorpicker'], 'style="vertical-align:top;cursor:pointer" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['colorpicker']).'" id="moo_' . $this->strField . '"') . '
Expand Down
12 changes: 6 additions & 6 deletions system/modules/core/classes/StyleSheets.php
Expand Up @@ -474,7 +474,7 @@ public function compileDefinition($row, $blnWriteToFile=false, $vars=array(), $p
}
else
{
// Background color
// Background colour
if ($bgColor[0] != '')
{
$return .= $lb . 'background-color:' . $this->compileColor($bgColor, $blnWriteToFile, $vars) . ';';
Expand Down Expand Up @@ -536,7 +536,7 @@ public function compileDefinition($row, $blnWriteToFile=false, $vars=array(), $p

$row['gradientColors'] = array_values(array_filter($row['gradientColors']));

// Add a hash tag to the color values
// Add a hash tag to the colour values
foreach ($row['gradientColors'] as $k=>$v)
{
$row['gradientColors'][$k] = '#' . $v;
Expand Down Expand Up @@ -810,7 +810,7 @@ public function compileDefinition($row, $blnWriteToFile=false, $vars=array(), $p

$fnColor = deserialize($row['fontcolor'], true);

// Font color
// Font colour
if ($fnColor[0] != '')
{
$return .= $lb . 'color:' . $this->compileColor($fnColor, $blnWriteToFile, $vars) . ';';
Expand Down Expand Up @@ -939,7 +939,7 @@ public function compileDefinition($row, $blnWriteToFile=false, $vars=array(), $p


/**
* Compile a color value and return a hex or rgba color
* Compile a colour value and return a hex or rgba colour
* @param mixed
* @param boolean
* @param array
Expand All @@ -963,7 +963,7 @@ protected function compileColor($color, $blnWriteToFile=false, $vars=array())


/**
* Try to shorten a hex color
* Try to shorten a hex colour
* @param string
* @return string
*/
Expand All @@ -979,7 +979,7 @@ protected function shortenHexColor($color)


/**
* Convert hex colors to rgb
* Convert hex colours to rgb
* @param string
* @param boolean
* @param array
Expand Down
2 changes: 1 addition & 1 deletion system/modules/core/classes/Theme.php
Expand Up @@ -1068,7 +1068,7 @@ protected function addTemplatesToArchive(\ZipWriter $objArchive, $strFolder)


/**
* Recursively synchronize the new folder
* Recursively synchronise the new folder
* @param string
* @param integer
*/
Expand Down
2 changes: 1 addition & 1 deletion system/modules/core/dca/tl_log.php
Expand Up @@ -159,7 +159,7 @@ class tl_log extends Backend
{

/**
* Colorize the log entries depending on their category
* Colourise the log entries depending on their category
* @param array
* @param string
* @return string
Expand Down
22 changes: 11 additions & 11 deletions system/modules/core/languages/en/default.php
Expand Up @@ -47,7 +47,7 @@
$GLOBALS['TL_LANG']['ERR']['passwordMatch'] = 'The passwords did not match!';
$GLOBALS['TL_LANG']['ERR']['accountLocked'] = 'This account has been locked! You can log in again in %d minutes.';
$GLOBALS['TL_LANG']['ERR']['invalidLogin'] = 'Login failed!';
$GLOBALS['TL_LANG']['ERR']['invalidColor'] = 'Invalid color format!';
$GLOBALS['TL_LANG']['ERR']['invalidColor'] = 'Invalid colour format!';
$GLOBALS['TL_LANG']['ERR']['all_fields'] = 'Please select at least one field!';
$GLOBALS['TL_LANG']['ERR']['aliasExists'] = 'The alias "%s" already exists!';
$GLOBALS['TL_LANG']['ERR']['importFolder'] = 'The folder "%s" cannot be imported!';
Expand Down Expand Up @@ -344,13 +344,13 @@
$GLOBALS['TL_LANG']['MSC']['box'] = array('Fit the box', 'The shorter side of the image is adjusted to the given dimensions and the image is resized proportionally.');
$GLOBALS['TL_LANG']['MSC']['crop'] = 'Exact dimensions';
$GLOBALS['TL_LANG']['MSC']['left_top'] = array('Left | Top', 'Preserves the left part of a landscape image and the top part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['center_top'] = array('Center | Top', 'Preserves the center part of a landscape image and the top part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['center_top'] = array('Centre | Top', 'Preserves the centre part of a landscape image and the top part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['right_top'] = array('Right | Top', 'Preserves the right part of a landscape image and the top part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['left_center'] = array('Left | Center', 'Preserves the left part of a landscape image and the center part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['center_center'] = array('Center | Center', 'Preserves the center part of a landscape image and the center part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['right_center'] = array('Right | Center', 'Preserves the right part of a landscape image and the center part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['left_center'] = array('Left | Centre', 'Preserves the left part of a landscape image and the centre part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['center_center'] = array('Centre | Centre', 'Preserves the centre part of a landscape image and the centre part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['right_center'] = array('Right | Centre', 'Preserves the right part of a landscape image and the centre part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['left_bottom'] = array('Left | Bottom', 'Preserves the left part of a landscape image and the bottom part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['center_bottom'] = array('Center | Bottom', 'Preserves the center part of a landscape image and the bottom part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['center_bottom'] = array('Centre | Bottom', 'Preserves the centre part of a landscape image and the bottom part of a portrait image.');
$GLOBALS['TL_LANG']['MSC']['right_bottom'] = array('Right | Bottom', 'Preserves the right part of a landscape image and the bottom part of a portrait image.');


Expand All @@ -369,8 +369,8 @@
$GLOBALS['TL_LANG']['MSC']['lastLogin'] = array('Last login', 'Last login: %s');
$GLOBALS['TL_LANG']['MSC']['move_up'] = array('Move up', 'Move the item one position up');
$GLOBALS['TL_LANG']['MSC']['move_down'] = array('Move down', 'Move the item one position down');
$GLOBALS['TL_LANG']['MSC']['staticFiles'] = array('Files URL', 'The files URL applies to the <em>files</em> directory (page speed optimization).');
$GLOBALS['TL_LANG']['MSC']['staticPlugins'] = array('Assets URL', 'The assets URL applies to the <em>assets</em> directory (page speed optimization).');
$GLOBALS['TL_LANG']['MSC']['staticFiles'] = array('Files URL', 'The files URL applies to the <em>files</em> directory (page speed optimisation).');
$GLOBALS['TL_LANG']['MSC']['staticPlugins'] = array('Assets URL', 'The assets URL applies to the <em>assets</em> directory (page speed optimisation).');
$GLOBALS['TL_LANG']['MSC']['shortcuts'] = array('Back end keyboard shortcuts', 'Learn more about speeding up your workflow by using <a href="http://contao.org/en/keyboard-shortcuts.html" title="Keyboard shortcuts overview on contao.org" target="_blank">keyboard shortcuts</a>.');
$GLOBALS['TL_LANG']['MSC']['toggleAll'] = array('Toggle all', 'Expand or collapse all nodes');
$GLOBALS['TL_LANG']['MSC']['lockedAccount'] = array('A Contao account has been locked', "The following Contao account has been locked for security reasons.\n\nUsername: %s\nReal name: %s\nWebsite: %s\n\nThe account has been locked for %d minutes, because the user has entered an invalid password three times in a row. After this period of time, the account will be unlocked automatically.\n\nThis e-mail has been generated by Contao. You can not reply to it directly.\n");
Expand Down Expand Up @@ -423,9 +423,9 @@
$GLOBALS['TL_LANG']['MSC']['pw_changed'] = 'The password has been updated.';
$GLOBALS['TL_LANG']['MSC']['fallback'] = 'default';
$GLOBALS['TL_LANG']['MSC']['view'] = 'View in a new window';
$GLOBALS['TL_LANG']['MSC']['fullsize'] = 'Open full size image in a new window';
$GLOBALS['TL_LANG']['MSC']['fullsize'] = 'Open full-size image in a new window';
$GLOBALS['TL_LANG']['MSC']['datepicker'] = 'Date picker';
$GLOBALS['TL_LANG']['MSC']['colorpicker'] = 'Color picker';
$GLOBALS['TL_LANG']['MSC']['colorpicker'] = 'Colour picker';
$GLOBALS['TL_LANG']['MSC']['pagepicker'] = 'Page picker';
$GLOBALS['TL_LANG']['MSC']['filepicker'] = 'File picker';
$GLOBALS['TL_LANG']['MSC']['ppHeadline'] = 'Contao pages';
Expand All @@ -442,7 +442,7 @@
$GLOBALS['TL_LANG']['MSC']['entries'] = '%s entries';
$GLOBALS['TL_LANG']['MSC']['files'] = '%s file(s)';
$GLOBALS['TL_LANG']['MSC']['left'] = 'left';
$GLOBALS['TL_LANG']['MSC']['center'] = 'center';
$GLOBALS['TL_LANG']['MSC']['center'] = 'centre';
$GLOBALS['TL_LANG']['MSC']['right'] = 'right';
$GLOBALS['TL_LANG']['MSC']['justify'] = 'justified';
$GLOBALS['TL_LANG']['MSC']['filetree'] = 'File system';
Expand Down
2 changes: 1 addition & 1 deletion system/modules/core/languages/en/modules.php
Expand Up @@ -28,7 +28,7 @@
$GLOBALS['TL_LANG']['MOD']['group'] = array('User groups', 'Manage user groups (back end user groups)');
$GLOBALS['TL_LANG']['MOD']['system'] = 'System';
$GLOBALS['TL_LANG']['MOD']['files'] = array('File manager', 'Manage files and folders or upload new files to the server');
$GLOBALS['TL_LANG']['MOD']['log'] = array('System log', 'Browse the system log and analyze the activity on the website');
$GLOBALS['TL_LANG']['MOD']['log'] = array('System log', 'Browse the system log and analyse the activity on the website');
$GLOBALS['TL_LANG']['MOD']['settings'] = array('Settings', 'Check and optimize the Contao configuration');
$GLOBALS['TL_LANG']['MOD']['maintenance'] = array('Maintenance', 'Maintain or update Contao');
$GLOBALS['TL_LANG']['MOD']['undo'] = array('Restore', 'Restore deleted records');
Expand Down
2 changes: 1 addition & 1 deletion system/modules/core/languages/en/tl_article.php
Expand Up @@ -18,7 +18,7 @@
$GLOBALS['TL_LANG']['tl_article']['alias'] = array('Article alias', 'The article alias is a unique reference to the article which can be called instead of its numeric ID.');
$GLOBALS['TL_LANG']['tl_article']['author'] = array('Author', 'Here you can change the author of the article.');
$GLOBALS['TL_LANG']['tl_article']['inColumn'] = array('Display in', 'Please choose the layout section you want the article to be displayed in.');
$GLOBALS['TL_LANG']['tl_article']['keywords'] = array('Meta keywords', 'Here you can enter a list of comma separated keywords. Keywords, however, are no longer relevant to most search engines (including Google).');
$GLOBALS['TL_LANG']['tl_article']['keywords'] = array('Meta keywords', 'Here you can enter a list of comma-separated keywords. Keywords, however, are no longer relevant to most search engines (including Google).');
$GLOBALS['TL_LANG']['tl_article']['teaserCssID'] = array('Teaser CSS ID/class', 'Here you can set an ID and one or more classes for the teaser element.');
$GLOBALS['TL_LANG']['tl_article']['showTeaser'] = array('Show teaser', 'Show the article teaser if there are multiple articles.');
$GLOBALS['TL_LANG']['tl_article']['teaser'] = array('Article teaser', 'The article teaser can also be displayed with the content element "article teaser".');
Expand Down
2 changes: 1 addition & 1 deletion system/modules/core/languages/en/tl_files.php
Expand Up @@ -53,4 +53,4 @@
$GLOBALS['TL_LANG']['tl_files']['unlock'] = array('Remove protection', 'Unprotect folder "%s"');
$GLOBALS['TL_LANG']['tl_files']['move'] = array('File upload', 'Upload files to the server');
$GLOBALS['TL_LANG']['tl_files']['pasteinto'] = array('Paste into', 'Paste into this folder');
$GLOBALS['TL_LANG']['tl_files']['sync'] = array('Synchronize', 'Synchronize the file system and the database');
$GLOBALS['TL_LANG']['tl_files']['sync'] = array('Synchronise', 'Synchronise the file system and the database');
4 changes: 2 additions & 2 deletions system/modules/core/languages/en/tl_form_field.php
Expand Up @@ -48,15 +48,15 @@
$GLOBALS['TL_LANG']['tl_form_field']['date'] = array('Date', 'Checks whether the input matches the global date format.');
$GLOBALS['TL_LANG']['tl_form_field']['time'] = array('Time', 'Checks whether the input matches the global time format.');
$GLOBALS['TL_LANG']['tl_form_field']['datim'] = array('Date and time', 'Checks whether the input matches the global date and time format.');
$GLOBALS['TL_LANG']['tl_form_field']['phone'] = array('Phone number', 'Allows numeric characters, plus (+), minus (-), slash (/), parentheses () and space ( ).');
$GLOBALS['TL_LANG']['tl_form_field']['phone'] = array('Phone number', 'Allows numeric characters, plus (+), minus (-), slash (/), round brackets () and space ( ).');
$GLOBALS['TL_LANG']['tl_form_field']['email'] = array('E-mail address', 'Checks whether the input is a valid e-mail address.');
$GLOBALS['TL_LANG']['tl_form_field']['url'] = array('URL format', 'Checks whether the input is a valid URL.');
$GLOBALS['TL_LANG']['tl_form_field']['placeholder'] = array('Placeholder', 'Show this text as long as the field is empty (requires HTML5).');
$GLOBALS['TL_LANG']['tl_form_field']['maxlength'] = array('Maximum length', 'Limit the field length to a certain number of characters (text) or bytes (file uploads).');
$GLOBALS['TL_LANG']['tl_form_field']['size'] = array('Rows and columns', 'The number of rows and columns of the textarea.');
$GLOBALS['TL_LANG']['tl_form_field']['multiple'] = array('Multiple selection', 'Allow visitors to select more than one option.');
$GLOBALS['TL_LANG']['tl_form_field']['mSize'] = array('List size', 'Here you can enter the size of the select box.');
$GLOBALS['TL_LANG']['tl_form_field']['extensions'] = array('Allowed file types', 'A comma separated list of valid file extensions.');
$GLOBALS['TL_LANG']['tl_form_field']['extensions'] = array('Allowed file types', 'A comma-separated list of valid file extensions.');
$GLOBALS['TL_LANG']['tl_form_field']['storeFile'] = array('Store uploaded files', 'Move the uploaded files to a folder on the server.');
$GLOBALS['TL_LANG']['tl_form_field']['uploadFolder'] = array('Target folder', 'Please select the target folder from the files directory.');
$GLOBALS['TL_LANG']['tl_form_field']['useHomeDir'] = array('Use home directory', 'Store the file in the home directory if there is an authenticated user.');
Expand Down

0 comments on commit 0e8f1e8

Please sign in to comment.