diff --git a/assets/contao/js/core-uncompressed.js b/assets/contao/js/core-uncompressed.js index deaa2d6754..1187b597b3 100644 --- a/assets/contao/js/core-uncompressed.js +++ b/assets/contao/js/core-uncompressed.js @@ -1007,7 +1007,7 @@ var Backend = }, /** - * Initialize the mootools color picker (backwards compatibility) + * Initialize the mootools colour picker (backwards compatibility) */ addColorPicker: function() { return true; diff --git a/system/config/default.php b/system/config/default.php index 8bfecf5a59..7ef234134b 100644 --- a/system/config/default.php +++ b/system/config/default.php @@ -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. @@ -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; diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md index 72ab7ba6d9..f3810f8237 100644 --- a/system/docs/CHANGELOG.md +++ b/system/docs/CHANGELOG.md @@ -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). @@ -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. diff --git a/system/helper/ide_compat.php b/system/helper/ide_compat.php index 655d4d9aa9..f2ab3b904d 100644 --- a/system/helper/ide_compat.php +++ b/system/helper/ide_compat.php @@ -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. */ diff --git a/system/modules/core/classes/DataContainer.php b/system/modules/core/classes/DataContainer.php index 93c7b73be7..586bc69a7a 100644 --- a/system/modules/core/classes/DataContainer.php +++ b/system/modules/core/classes/DataContainer.php @@ -353,7 +353,7 @@ protected function row($strPalette=null) '; } - // 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 . '"') . ' diff --git a/system/modules/core/classes/StyleSheets.php b/system/modules/core/classes/StyleSheets.php index af84e04de3..dcfc652af5 100644 --- a/system/modules/core/classes/StyleSheets.php +++ b/system/modules/core/classes/StyleSheets.php @@ -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) . ';'; @@ -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; @@ -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) . ';'; @@ -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 @@ -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 */ @@ -979,7 +979,7 @@ protected function shortenHexColor($color) /** - * Convert hex colors to rgb + * Convert hex colours to rgb * @param string * @param boolean * @param array diff --git a/system/modules/core/classes/Theme.php b/system/modules/core/classes/Theme.php index d456e3a05d..928f75f2fd 100644 --- a/system/modules/core/classes/Theme.php +++ b/system/modules/core/classes/Theme.php @@ -1068,7 +1068,7 @@ protected function addTemplatesToArchive(\ZipWriter $objArchive, $strFolder) /** - * Recursively synchronize the new folder + * Recursively synchronise the new folder * @param string * @param integer */ diff --git a/system/modules/core/dca/tl_log.php b/system/modules/core/dca/tl_log.php index cce1e20db0..7136ded466 100644 --- a/system/modules/core/dca/tl_log.php +++ b/system/modules/core/dca/tl_log.php @@ -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 diff --git a/system/modules/core/languages/en/default.php b/system/modules/core/languages/en/default.php index 4eb19c05a7..c19fb78062 100644 --- a/system/modules/core/languages/en/default.php +++ b/system/modules/core/languages/en/default.php @@ -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!'; @@ -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.'); @@ -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 files directory (page speed optimization).'); -$GLOBALS['TL_LANG']['MSC']['staticPlugins'] = array('Assets URL', 'The assets URL applies to the assets directory (page speed optimization).'); +$GLOBALS['TL_LANG']['MSC']['staticFiles'] = array('Files URL', 'The files URL applies to the files directory (page speed optimisation).'); +$GLOBALS['TL_LANG']['MSC']['staticPlugins'] = array('Assets URL', 'The assets URL applies to the assets directory (page speed optimisation).'); $GLOBALS['TL_LANG']['MSC']['shortcuts'] = array('Back end keyboard shortcuts', 'Learn more about speeding up your workflow by using keyboard shortcuts.'); $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"); @@ -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'; @@ -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'; diff --git a/system/modules/core/languages/en/modules.php b/system/modules/core/languages/en/modules.php index 836aa176ca..3d3ea90fad 100644 --- a/system/modules/core/languages/en/modules.php +++ b/system/modules/core/languages/en/modules.php @@ -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'); diff --git a/system/modules/core/languages/en/tl_article.php b/system/modules/core/languages/en/tl_article.php index adc169ded6..dc74179a72 100644 --- a/system/modules/core/languages/en/tl_article.php +++ b/system/modules/core/languages/en/tl_article.php @@ -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".'); diff --git a/system/modules/core/languages/en/tl_files.php b/system/modules/core/languages/en/tl_files.php index 8d5691b261..b7ccdaba48 100644 --- a/system/modules/core/languages/en/tl_files.php +++ b/system/modules/core/languages/en/tl_files.php @@ -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'); diff --git a/system/modules/core/languages/en/tl_form_field.php b/system/modules/core/languages/en/tl_form_field.php index 70ea4abe6d..fc29c17cd6 100644 --- a/system/modules/core/languages/en/tl_form_field.php +++ b/system/modules/core/languages/en/tl_form_field.php @@ -48,7 +48,7 @@ $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).'); @@ -56,7 +56,7 @@ $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.'); diff --git a/system/modules/core/languages/en/tl_settings.php b/system/modules/core/languages/en/tl_settings.php index edf20caa70..216a56e862 100644 --- a/system/modules/core/languages/en/tl_settings.php +++ b/system/modules/core/languages/en/tl_settings.php @@ -22,13 +22,13 @@ $GLOBALS['TL_LANG']['tl_settings']['timeZone'] = array('Time zone', 'Please select the server time zone.'); $GLOBALS['TL_LANG']['tl_settings']['websitePath'] = array('Relative path to the Contao directory', 'The relative path to the Contao directory is usually set automatically by the install tool.'); $GLOBALS['TL_LANG']['tl_settings']['characterSet'] = array('Character set', 'It is recommended to use UTF-8, so special characters are displayed correctly.'); -$GLOBALS['TL_LANG']['tl_settings']['customSections'] = array('Custom layout sections', 'Here you can enter a comma separated list of custom layout sections.'); +$GLOBALS['TL_LANG']['tl_settings']['customSections'] = array('Custom layout sections', 'Here you can enter a comma-separated list of custom layout sections.'); $GLOBALS['TL_LANG']['tl_settings']['disableCron'] = array('Disable the command scheduler', 'Disable the periodic command scheduler and execute the cron.php script by a real cron job (which you have to set up manually).'); $GLOBALS['TL_LANG']['tl_settings']['minifyMarkup'] = array('Minify the markup', 'Minify the HTML markup before it is sent to the browser (requires the PHP tidy extension).'); $GLOBALS['TL_LANG']['tl_settings']['gzipScripts'] = array('Compress scripts', 'Create a compressed version of the combined CSS and JavaScript files. Requires adjustments of the .htaccess file.'); $GLOBALS['TL_LANG']['tl_settings']['resultsPerPage'] = array('Items per page', 'Here you can define the number of items per page in the back end.'); $GLOBALS['TL_LANG']['tl_settings']['maxResultsPerPage'] = array('Maximum items per page', 'This overall limit takes effect if a user chooses the "show all records" option.'); -$GLOBALS['TL_LANG']['tl_settings']['fileSyncExclude'] = array('Exclude folders from synchronisation', 'Here you can enter a comma separated list of folders which will be exempt from the files synchronisation (e.g. attachments,music_academy). Note that excluded resources cannot be used in e.g. image or download elements!'); +$GLOBALS['TL_LANG']['tl_settings']['fileSyncExclude'] = array('Exclude folders from synchronisation', 'Here you can enter a comma-separated list of folders which will be exempt from the files synchronisation (e.g. attachments,music_academy). Note that excluded resources cannot be used in e.g. image or download elements!'); $GLOBALS['TL_LANG']['tl_settings']['doNotCollapse'] = array('Do not collapse elements', 'Do not collapse elements in the back end preview.'); $GLOBALS['TL_LANG']['tl_settings']['urlSuffix'] = array('URL suffix', 'The URL suffix will be added to the URI string to simulate static documents.'); $GLOBALS['TL_LANG']['tl_settings']['cacheMode'] = array('Cache mode', 'Here you can select the cache mode.'); @@ -49,22 +49,22 @@ $GLOBALS['TL_LANG']['tl_settings']['logErrors'] = array('Log error messages', 'Write error messages to the error log file (system/logs/error.log).'); $GLOBALS['TL_LANG']['tl_settings']['coreOnlyMode'] = array('Run in safe mode', 'Run Contao in safe mode and load only core modules.'); $GLOBALS['TL_LANG']['tl_settings']['disableIpCheck'] = array('Disable IP check', 'Do not bind sessions to IP addresses. Choosing this option is a potential security risk!'); -$GLOBALS['TL_LANG']['tl_settings']['allowedDownload'] = array('Download file types', 'Here you can enter a comma separated list of downloadable file types.'); -$GLOBALS['TL_LANG']['tl_settings']['validImageTypes'] = array('Image file types', 'Here you can enter a comma separated list of file types that can be handled by the image class.'); -$GLOBALS['TL_LANG']['tl_settings']['editableFiles'] = array('Editable file types', 'Here you can enter a comma separated list of file types that can be edited in the source editor.'); -$GLOBALS['TL_LANG']['tl_settings']['templateFiles'] = array('Template file types', 'Here you can enter a comma separated list of supported template file types.'); +$GLOBALS['TL_LANG']['tl_settings']['allowedDownload'] = array('Download file types', 'Here you can enter a comma-separated list of downloadable file types.'); +$GLOBALS['TL_LANG']['tl_settings']['validImageTypes'] = array('Image file types', 'Here you can enter a comma-separated list of file types that can be handled by the image class.'); +$GLOBALS['TL_LANG']['tl_settings']['editableFiles'] = array('Editable file types', 'Here you can enter a comma-separated list of file types that can be edited in the source editor.'); +$GLOBALS['TL_LANG']['tl_settings']['templateFiles'] = array('Template file types', 'Here you can enter a comma-separated list of supported template file types.'); $GLOBALS['TL_LANG']['tl_settings']['maxImageWidth'] = array('Maximum front end width', 'If the width of an image or movie exceeds this value, it will be adjusted automatically.'); $GLOBALS['TL_LANG']['tl_settings']['jpgQuality'] = array('JPG thumbnail quality', 'Here you can enter the JPG thumbnail quality in percent.'); $GLOBALS['TL_LANG']['tl_settings']['gdMaxImgWidth'] = array('Maximum GD image width', 'Here you can enter the maximum image width that the GD library shall try to handle.'); $GLOBALS['TL_LANG']['tl_settings']['gdMaxImgHeight'] = array('Maximum GD image height', 'Here you can enter the maximum image height that the GD library shall try to handle.'); $GLOBALS['TL_LANG']['tl_settings']['uploadPath'] = array('Files directory', 'Here you can set the relative path to the Contao files directory.'); -$GLOBALS['TL_LANG']['tl_settings']['uploadTypes'] = array('Upload file types', 'Here you can enter a comma separated list of uploadable file types.'); +$GLOBALS['TL_LANG']['tl_settings']['uploadTypes'] = array('Upload file types', 'Here you can enter a comma-separated list of uploadable file types.'); $GLOBALS['TL_LANG']['tl_settings']['uploadFields'] = array('Simultaneous file uploads', 'Here you can enter the maximum number of simultaneous file uploads.'); $GLOBALS['TL_LANG']['tl_settings']['maxFileSize'] = array('Maximum upload file size', 'Here you can enter the maximum upload file size in bytes (1 MB = 1000 kB = 1000000 byte).'); $GLOBALS['TL_LANG']['tl_settings']['imageWidth'] = array('Maximum image width', 'Here you can enter the maximum width for image uploads in pixels.'); $GLOBALS['TL_LANG']['tl_settings']['imageHeight'] = array('Maximum image height', 'Here you can enter the maximum height for image uploads in pixels.'); $GLOBALS['TL_LANG']['tl_settings']['enableSearch'] = array('Enable searching', 'Index pages so they can be searched.'); -$GLOBALS['TL_LANG']['tl_settings']['indexProtected'] = array('Index protected pages', 'Use this option carefully and always exclude personalized pages from being indexed!'); +$GLOBALS['TL_LANG']['tl_settings']['indexProtected'] = array('Index protected pages', 'Use this option carefully and always exclude personalised pages from being indexed!'); $GLOBALS['TL_LANG']['tl_settings']['useSMTP'] = array('Send e-mails via SMTP', 'Use an SMTP server instead of the PHP mail() function to send e-mails.'); $GLOBALS['TL_LANG']['tl_settings']['smtpHost'] = array('SMTP hostname', 'Please enter the host name of the SMTP server.'); $GLOBALS['TL_LANG']['tl_settings']['smtpUser'] = array('SMTP username', 'Here you can enter the SMTP username.'); diff --git a/system/modules/core/languages/en/tl_style.php b/system/modules/core/languages/en/tl_style.php index b65b76038e..c049578356 100644 --- a/system/modules/core/languages/en/tl_style.php +++ b/system/modules/core/languages/en/tl_style.php @@ -39,25 +39,25 @@ $GLOBALS['TL_LANG']['tl_style']['verticalalign'] = array('Vertical alignment', 'Here you can choose the vertical alignment.'); $GLOBALS['TL_LANG']['tl_style']['textalign'] = array('Text alignment', 'Here you can choose the horizontal text alignment.'); $GLOBALS['TL_LANG']['tl_style']['background'] = array('Background', 'Background-color, background-image, background-position, background-repeat, linear-gradient and box-shadow.'); -$GLOBALS['TL_LANG']['tl_style']['bgcolor'] = array('Background color and opacity', 'Here you can enter a hexadecimal background color (e.g. ff0000 for red) and an optional opacity in percent (e.g. 75).'); +$GLOBALS['TL_LANG']['tl_style']['bgcolor'] = array('Background colour and opacity', 'Here you can enter a hexadecimal background colour (e.g. ff0000 for red) and an optional opacity in percent (e.g. 75).'); $GLOBALS['TL_LANG']['tl_style']['bgimage'] = array('Background image', 'Here you can enter the path to a background image.'); $GLOBALS['TL_LANG']['tl_style']['bgposition'] = array('Background position', 'Here you can select the position of the background image.'); $GLOBALS['TL_LANG']['tl_style']['bgrepeat'] = array('Background repeat', 'Here you can select the repeating mode.'); $GLOBALS['TL_LANG']['tl_style']['shadowsize'] = array('Shadow size', 'Here you can enter the X and Y offset, an optional blur size and an optional spread radius.'); -$GLOBALS['TL_LANG']['tl_style']['shadowcolor'] = array('Shadow color and opacity', 'Here you can enter a hexadecimal shadow color (e.g. ff0000 for red) and an optional opacity in percent (e.g. 75).'); +$GLOBALS['TL_LANG']['tl_style']['shadowcolor'] = array('Shadow colour and opacity', 'Here you can enter a hexadecimal shadow colour (e.g. ff0000 for red) and an optional opacity in percent (e.g. 75).'); $GLOBALS['TL_LANG']['tl_style']['gradientAngle'] = array('Gradient angle', 'Here you can enter the gradient angle (e.g. -45deg) or the starting point (e.g. top or left bottom).'); -$GLOBALS['TL_LANG']['tl_style']['gradientColors'] = array('Gradient colors', 'Here you can enter up to four colors with an optional percentage (e.g. ffc 10% | f90 | f00).'); +$GLOBALS['TL_LANG']['tl_style']['gradientColors'] = array('Gradient colours', 'Here you can enter up to four colours with an optional percentage (e.g. ffc 10% | f90 | f00).'); $GLOBALS['TL_LANG']['tl_style']['border'] = array('Border', 'Border-width, border-style, border-color, border-radius, border-collapse and border-spacing.'); $GLOBALS['TL_LANG']['tl_style']['borderwidth'] = array('Border width', 'Here you can enter the top, right, bottom and left border width.'); $GLOBALS['TL_LANG']['tl_style']['borderstyle'] = array('Border style', 'Here you can choose the border style.'); -$GLOBALS['TL_LANG']['tl_style']['bordercolor'] = array('Border color and opacity', 'Here you can enter a hexadecimal border color (e.g. ff0000 for red) and an optional opacity in percent (e.g. 75).'); +$GLOBALS['TL_LANG']['tl_style']['bordercolor'] = array('Border colour and opacity', 'Here you can enter a hexadecimal border colour (e.g. ff0000 for red) and an optional opacity in percent (e.g. 75).'); $GLOBALS['TL_LANG']['tl_style']['borderradius'] = array('Border radius', 'Here you can enter the top, right, bottom and left border radius.'); $GLOBALS['TL_LANG']['tl_style']['bordercollapse'] = array('Border handling', 'Here you can choose the border handling.'); $GLOBALS['TL_LANG']['tl_style']['borderspacing'] = array('Border spacing', 'Here you can enter the border spacing.'); $GLOBALS['TL_LANG']['tl_style']['font'] = array('Font', 'Font-family, font-size, font-color, line-height, font-style and white-space.'); -$GLOBALS['TL_LANG']['tl_style']['fontfamily'] = array('Font family', 'Here you can enter a comma separated list of font types.'); +$GLOBALS['TL_LANG']['tl_style']['fontfamily'] = array('Font family', 'Here you can enter a comma-separated list of font types.'); $GLOBALS['TL_LANG']['tl_style']['fontsize'] = array('Font size', 'Here you can enter the font size.'); -$GLOBALS['TL_LANG']['tl_style']['fontcolor'] = array('Font color and opacity', 'Here you can enter a hexadecimal font color (e.g. ff0000 for red) and an optional opacity in percent (e.g. 75).'); +$GLOBALS['TL_LANG']['tl_style']['fontcolor'] = array('Font colour and opacity', 'Here you can enter a hexadecimal font colour (e.g. ff0000 for red) and an optional opacity in percent (e.g. 75).'); $GLOBALS['TL_LANG']['tl_style']['lineheight'] = array('Line height', 'Here you can define the line height.'); $GLOBALS['TL_LANG']['tl_style']['fontstyle'] = array('Font style', 'Here you can choose one or more font styles.'); $GLOBALS['TL_LANG']['tl_style']['whitespace'] = array('Disable automatic line feed', 'Do not wrap words automatically.'); @@ -106,7 +106,7 @@ $GLOBALS['TL_LANG']['tl_style']['lower-alpha'] = 'lower characters'; $GLOBALS['TL_LANG']['tl_style']['uppercase'] = 'uppercase'; $GLOBALS['TL_LANG']['tl_style']['lowercase'] = 'lowercase'; -$GLOBALS['TL_LANG']['tl_style']['capitalize'] = 'capitalize'; +$GLOBALS['TL_LANG']['tl_style']['capitalize'] = 'capitalise'; $GLOBALS['TL_LANG']['tl_style']['none'] = 'none'; diff --git a/system/modules/core/languages/en/tl_templates.php b/system/modules/core/languages/en/tl_templates.php index 354e58619e..cb86e8e1db 100644 --- a/system/modules/core/languages/en/tl_templates.php +++ b/system/modules/core/languages/en/tl_templates.php @@ -14,7 +14,7 @@ /** * Fields */ -$GLOBALS['TL_LANG']['tl_templates']['original'] = array('Original template', 'Here you can select the template that you want to customize.'); +$GLOBALS['TL_LANG']['tl_templates']['original'] = array('Original template', 'Here you can select the template that you want to customise.'); $GLOBALS['TL_LANG']['tl_templates']['target'] = array('Target folder', 'A copy of the selected template will be stored in the target folder.'); diff --git a/system/modules/core/library/Contao/Controller.php b/system/modules/core/library/Contao/Controller.php index 95695eccbe..3b4827dc29 100644 --- a/system/modules/core/library/Contao/Controller.php +++ b/system/modules/core/library/Contao/Controller.php @@ -3236,7 +3236,7 @@ protected function getBackendLanguages() /** - * Parse simple tokens that can be used to personalize newsletters + * Parse simple tokens that can be used to personalise newsletters * * @param string $strBuffer The text with the tokens to be replaced * @param array $arrData The replacement data as array diff --git a/system/modules/core/library/Contao/Image.php b/system/modules/core/library/Contao/Image.php index f834448ad9..b34483f9b4 100644 --- a/system/modules/core/library/Contao/Image.php +++ b/system/modules/core/library/Contao/Image.php @@ -27,13 +27,13 @@ * You can specify which part of the image will be preserved: * * * left_top: the left side of a landscape image and the top of a portrait image - * * center_top: the center of a landscape image and the top of a portrait image + * * center_top: the centre of a landscape image and the top of a portrait image * * right_top: the right side of a landscape image and the top of a portrait image - * * left_center: the left side of a landscape image and the center of a portrait image - * * center_center: the center of a landscape image and the center of a portrait image - * * right_center: the right side of a landscape image and the center of a portrait image + * * left_center: the left side of a landscape image and the centre of a portrait image + * * center_center: the centre of a landscape image and the centre of a portrait image + * * right_center: the right side of a landscape image and the centre of a portrait image * * left_bottom: the left side of a landscape image and the bottom of a portrait image - * * center_bottom: the center of a landscape image and the bottom of a portrait image + * * center_bottom: the centre of a landscape image and the bottom of a portrait image * * right_bottm: the right side of a landscape image and the bottom of a portrait image * * Usage: diff --git a/system/modules/core/library/Contao/String.php b/system/modules/core/library/Contao/String.php index c2da7f4bb5..5063965bdc 100644 --- a/system/modules/core/library/Contao/String.php +++ b/system/modules/core/library/Contao/String.php @@ -343,7 +343,7 @@ public static function highlight($strString, $strPhrase, $strOpeningTag=' -

To customize this notice, create a custom template file named templates/be_error.html5.

+

To customise this notice, create a custom template file named templates/be_error.html5.

\ No newline at end of file diff --git a/system/modules/core/templates/be_referer.html5 b/system/modules/core/templates/be_referer.html5 index 43c00178f3..45a23eef5b 100644 --- a/system/modules/core/templates/be_referer.html5 +++ b/system/modules/core/templates/be_referer.html5 @@ -23,7 +23,7 @@ p { line-height:1.5; } -

To customize this notice, create a custom template file named templates/be_referer.html5.

+

To customise this notice, create a custom template file named templates/be_referer.html5.

\ No newline at end of file diff --git a/system/modules/devtools/languages/en/tl_extension.php b/system/modules/devtools/languages/en/tl_extension.php index e60362906c..e7e317a302 100644 --- a/system/modules/devtools/languages/en/tl_extension.php +++ b/system/modules/devtools/languages/en/tl_extension.php @@ -19,24 +19,24 @@ $GLOBALS['TL_LANG']['tl_extension']['author'] = array('Author', 'Please enter the author\'s name and an optional e-mail address (e.g. Name [e-mail@address.com]).'); $GLOBALS['TL_LANG']['tl_extension']['copyright'] = array('Copyright', 'Please enter the copyright notice (e.g. Name 2012).'); $GLOBALS['TL_LANG']['tl_extension']['package'] = array('Package', 'Please enter the package name without spaces (e.g. MyCustomModule).'); -$GLOBALS['TL_LANG']['tl_extension']['license'] = array('License', 'Please enter the license type (e.g. GNU/LGPL).'); +$GLOBALS['TL_LANG']['tl_extension']['license'] = array('Licence', 'Please enter the licence type (e.g. GNU/LGPL).'); $GLOBALS['TL_LANG']['tl_extension']['addBeMod'] = array('Add a back end module', 'Add a back end module to the extension.'); -$GLOBALS['TL_LANG']['tl_extension']['beClasses'] = array('Back end classes', 'Here you can enter a comma separated list of back end classes.'); -$GLOBALS['TL_LANG']['tl_extension']['beTables'] = array('Back end tables', 'Here you can enter a comma separated list of back end tables.'); -$GLOBALS['TL_LANG']['tl_extension']['beTemplates'] = array('Back end templates', 'Here you can enter a comma separated list of back end templates.'); +$GLOBALS['TL_LANG']['tl_extension']['beClasses'] = array('Back end classes', 'Here you can enter a comma-separated list of back end classes.'); +$GLOBALS['TL_LANG']['tl_extension']['beTables'] = array('Back end tables', 'Here you can enter a comma-separated list of back end tables.'); +$GLOBALS['TL_LANG']['tl_extension']['beTemplates'] = array('Back end templates', 'Here you can enter a comma-separated list of back end templates.'); $GLOBALS['TL_LANG']['tl_extension']['addFeMod'] = array('Add a front end module', 'Add a front end module to the extension.'); -$GLOBALS['TL_LANG']['tl_extension']['feClasses'] = array('Front end classes', 'Here you can enter a comma separated list of front end classes.'); -$GLOBALS['TL_LANG']['tl_extension']['feTables'] = array('Front end tables', 'Here you can enter a comma separated list of front end tables.'); -$GLOBALS['TL_LANG']['tl_extension']['feTemplates'] = array('Front end templates', 'Here you can enter a comma separated list of front end templates.'); +$GLOBALS['TL_LANG']['tl_extension']['feClasses'] = array('Front end classes', 'Here you can enter a comma-separated list of front end classes.'); +$GLOBALS['TL_LANG']['tl_extension']['feTables'] = array('Front end tables', 'Here you can enter a comma-separated list of front end tables.'); +$GLOBALS['TL_LANG']['tl_extension']['feTemplates'] = array('Front end templates', 'Here you can enter a comma-separated list of front end templates.'); $GLOBALS['TL_LANG']['tl_extension']['addLanguage'] = array('Add language packs', 'Add one or more language packs to the extension.'); -$GLOBALS['TL_LANG']['tl_extension']['languages'] = array('Languages', 'Here you can enter a comma separated list of languages (e.g. en,de).'); +$GLOBALS['TL_LANG']['tl_extension']['languages'] = array('Languages', 'Here you can enter a comma-separated list of languages (e.g. en,de).'); /** * Legends */ $GLOBALS['TL_LANG']['tl_extension']['title_legend'] = 'Title and name'; -$GLOBALS['TL_LANG']['tl_extension']['license_legend'] = 'License information'; +$GLOBALS['TL_LANG']['tl_extension']['license_legend'] = 'Licence information'; $GLOBALS['TL_LANG']['tl_extension']['backend_legend'] = 'Back end resources'; $GLOBALS['TL_LANG']['tl_extension']['frontend_legend'] = 'Front end resources'; $GLOBALS['TL_LANG']['tl_extension']['language_legend'] = 'Language settings'; diff --git a/system/modules/devtools/modules/ModuleAutoload.php b/system/modules/devtools/modules/ModuleAutoload.php index bb1fe69866..fbc335e028 100644 --- a/system/modules/devtools/modules/ModuleAutoload.php +++ b/system/modules/devtools/modules/ModuleAutoload.php @@ -326,7 +326,7 @@ protected function compile() /** * 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. */ diff --git a/system/modules/listing/languages/en/tl_module.php b/system/modules/listing/languages/en/tl_module.php index ce2b734fe7..4210bd73c2 100644 --- a/system/modules/listing/languages/en/tl_module.php +++ b/system/modules/listing/languages/en/tl_module.php @@ -15,11 +15,11 @@ * Fields */ $GLOBALS['TL_LANG']['tl_module']['list_table'] = array('Table', 'Please choose the source table.'); -$GLOBALS['TL_LANG']['tl_module']['list_fields'] = array('Fields', 'Please enter a comma separated list of the fields you want to list.'); +$GLOBALS['TL_LANG']['tl_module']['list_fields'] = array('Fields', 'Please enter a comma-separated list of the fields you want to list.'); $GLOBALS['TL_LANG']['tl_module']['list_where'] = array('Condition', 'Here you can enter a condition to filter the results (e.g. published=1 or type!="admin").'); -$GLOBALS['TL_LANG']['tl_module']['list_search'] = array('Searchable fields', 'Here you can enter a comma seperated list of fields that you want to be searchable.'); -$GLOBALS['TL_LANG']['tl_module']['list_sort'] = array('Order by', 'Here you can enter a comma seperated list of fields to sort the results by.'); -$GLOBALS['TL_LANG']['tl_module']['list_info'] = array('Details page fields', 'Enter a comma separated list of the fields you want to show on the details page. Leave blank to disable the feature.'); +$GLOBALS['TL_LANG']['tl_module']['list_search'] = array('Searchable fields', 'Here you can enter a comma-seperated list of fields that you want to be searchable.'); +$GLOBALS['TL_LANG']['tl_module']['list_sort'] = array('Order by', 'Here you can enter a comma-seperated list of fields to sort the results by.'); +$GLOBALS['TL_LANG']['tl_module']['list_info'] = array('Details page fields', 'Enter a comma-separated list of the fields you want to show on the details page. Leave blank to disable the feature.'); $GLOBALS['TL_LANG']['tl_module']['list_info_where'] = array('Details page condition', 'Here you can enter a condition to filter the results (e.g. published=1 or type!="admin").'); $GLOBALS['TL_LANG']['tl_module']['list_layout'] = array('List template', 'Here you can select the list template.'); $GLOBALS['TL_LANG']['tl_module']['list_info_layout'] = array('Details page template', 'Here you can select the details page template.'); diff --git a/system/modules/newsletter/classes/Newsletter.php b/system/modules/newsletter/classes/Newsletter.php index c51a410ea4..a236feb90f 100644 --- a/system/modules/newsletter/classes/Newsletter.php +++ b/system/modules/newsletter/classes/Newsletter.php @@ -537,7 +537,7 @@ public function importRecipients() /** - * Synchronize newsletter subscription of new users + * Synchronise newsletter subscription of new users * @param object * @param array */ @@ -606,7 +606,7 @@ public function activateAccount($objUser) /** - * Synchronize newsletter subscription of existing users + * Synchronise newsletter subscription of existing users * @param mixed * @param object * @param object diff --git a/system/modules/repository/classes/RepositoryCatalog.php b/system/modules/repository/classes/RepositoryCatalog.php index 3cb9b5e8f2..f91889e5ad 100644 --- a/system/modules/repository/classes/RepositoryCatalog.php +++ b/system/modules/repository/classes/RepositoryCatalog.php @@ -13,7 +13,7 @@ /** - * Implements the extension catalog + * Implements the extension catalogue * @copyright Peter Koch 2008-2010 * @author Peter Koch, IBK Software AG * @author Leo Feyer diff --git a/system/modules/repository/classes/RepositoryManager.php b/system/modules/repository/classes/RepositoryManager.php index bdc6872ef0..c318228581 100644 --- a/system/modules/repository/classes/RepositoryManager.php +++ b/system/modules/repository/classes/RepositoryManager.php @@ -918,7 +918,7 @@ private function uninstallExtension($aName) } // uninstallExtension /** - * Create comma separated list of states + * Create comma-separated list of states * @param integer * @param integer * @param integer diff --git a/system/modules/repository/languages/en/modules.php b/system/modules/repository/languages/en/modules.php index 3ee7203220..bcfb7170c9 100644 --- a/system/modules/repository/languages/en/modules.php +++ b/system/modules/repository/languages/en/modules.php @@ -16,5 +16,5 @@ * Back end modules */ $GLOBALS['TL_LANG']['MOD']['repository'] = array('Extension Repository', 'The back end module of the Extension Repository'); -$GLOBALS['TL_LANG']['MOD']['repository_catalog'] = array('Extension catalog', 'Browse the repository and install extensions'); +$GLOBALS['TL_LANG']['MOD']['repository_catalog'] = array('Extension catalogue', 'Browse the repository and install extensions'); $GLOBALS['TL_LANG']['MOD']['repository_manager'] = array('Extension manager', 'Maintain or remove installed extensions'); diff --git a/system/modules/repository/languages/en/tl_repository.php b/system/modules/repository/languages/en/tl_repository.php index e994e61472..51cb71e671 100644 --- a/system/modules/repository/languages/en/tl_repository.php +++ b/system/modules/repository/languages/en/tl_repository.php @@ -20,7 +20,7 @@ $GLOBALS['TL_LANG']['tl_repository']['description'] = array('Description', 'These HTML tags are allowed: %s'); $GLOBALS['TL_LANG']['tl_repository']['extension'] = array('Extension', 'Name of the extension.'); $GLOBALS['TL_LANG']['tl_repository']['functionality'] = array('Functionality', 'Does the extension provide the expected functionality?'); -$GLOBALS['TL_LANG']['tl_repository']['license'] = array('License', 'Please enter a short license information. You may add full license information in a file LICENSE.txt.'); +$GLOBALS['TL_LANG']['tl_repository']['license'] = array('Licence', 'Please enter a short licence information. You may add full licence information in a file LICENSE.txt.'); $GLOBALS['TL_LANG']['tl_repository']['name'] = array('Name', 'Extension names must start with a-z, A-Z or 0-9, whereby lowercase names are prefered. Additionally, the characters _ and - are allowed within the name.'); $GLOBALS['TL_LANG']['tl_repository']['popularity'] = array('Popularity', '%s/%s (downloads/installs)'); $GLOBALS['TL_LANG']['tl_repository']['quality'] = array('Quality', 'How robust is the extension and how painless is installation and maintenance?'); @@ -29,7 +29,7 @@ $GLOBALS['TL_LANG']['tl_repository']['type'] = array('Type', 'Please select the extension type.'); $GLOBALS['TL_LANG']['tl_repository']['usability'] = array('Usability', 'Does the extension meet the Contao standards for usability and accessability?'); $GLOBALS['TL_LANG']['tl_repository']['version'] = array('Version', 'Version numbers must be in format n.n.n s, where n are integers and s is one of: alpha1, alpha2, alpha3, beta1, beta2, beta3, rc1, rc2, rc3, stable'); -$GLOBALS['TL_LANG']['tl_repository']['lickey'] = array('License key', 'Enter the license key that you got from the extension vendor.'); +$GLOBALS['TL_LANG']['tl_repository']['lickey'] = array('Licence key', 'Enter the licence key that you got from the extension vendor.'); $GLOBALS['TL_LANG']['tl_repository']['uninstprotect'] = array('Uninstall protection', 'Protect extension against accidental uninstallation.'); $GLOBALS['TL_LANG']['tl_repository']['updateprotect'] = array('Update protection', 'Protect extension against accidental update.'); @@ -67,7 +67,7 @@ $GLOBALS['TL_LANG']['tl_repository']['relusability'] = 'Release usability'; $GLOBALS['TL_LANG']['tl_repository']['save'] = 'Save'; $GLOBALS['TL_LANG']['tl_repository']['shop'] = 'Shop'; -$GLOBALS['TL_LANG']['tl_repository']['showpicture'] = 'Show full size picture'; +$GLOBALS['TL_LANG']['tl_repository']['showpicture'] = 'Show full-size picture'; $GLOBALS['TL_LANG']['tl_repository']['state'] = 'State'; $GLOBALS['TL_LANG']['tl_repository']['tag'] = 'Tag'; $GLOBALS['TL_LANG']['tl_repository']['thumbnail'] = 'Thumbnail picture'; @@ -107,7 +107,7 @@ $GLOBALS['TL_LANG']['tl_repository']['installextension'] = 'Install extension'; $GLOBALS['TL_LANG']['tl_repository']['installingext'] = 'Install %s %s build %s'; $GLOBALS['TL_LANG']['tl_repository']['installlogtitle'] = 'File installation/update log'; -$GLOBALS['TL_LANG']['tl_repository']['lickeyrequired'] = 'This extension requires a license key. Please visit the vendor\'s shop to purchase one.'; +$GLOBALS['TL_LANG']['tl_repository']['lickeyrequired'] = 'This extension requires a licence key. Please visit the vendor\'s shop to purchase one.'; $GLOBALS['TL_LANG']['tl_repository']['none'] = 'None'; $GLOBALS['TL_LANG']['tl_repository']['notfound'] = 'not found'; $GLOBALS['TL_LANG']['tl_repository']['ok'] = 'OK'; @@ -142,7 +142,7 @@ $GLOBALS['TL_LANG']['tl_repository_statext']['depmissing'] = 'Missing required extension %s'; $GLOBALS['TL_LANG']['tl_repository_statext']['extnotfound'] = 'Extension not found in repository'; $GLOBALS['TL_LANG']['tl_repository_statext']['vernotfound'] = 'Installed version not found in repository'; -$GLOBALS['TL_LANG']['tl_repository_statext']['extneedkey'] = 'License key required, install extension in advance'; +$GLOBALS['TL_LANG']['tl_repository_statext']['extneedkey'] = 'Licence key required, install extension in advance'; $GLOBALS['TL_LANG']['tl_repository_statext']['errorinstall'] = 'Corrupted, update/repair required'; diff --git a/system/modules/repository/languages/en/tl_settings.php b/system/modules/repository/languages/en/tl_settings.php index 9b36534d88..8e8f9c836a 100644 --- a/system/modules/repository/languages/en/tl_settings.php +++ b/system/modules/repository/languages/en/tl_settings.php @@ -16,9 +16,9 @@ * Fields */ $GLOBALS['TL_LANG']['tl_settings']['repository_wsdl'] = array('Extension repository URL', 'Here you can enter the URL of the extension repository WSDL file.'); -$GLOBALS['TL_LANG']['tl_settings']['repository_languages'] = array('Fallback languages', 'Here you can enter a comma separated list of ISO language codes to be used if an extension description is not available in the current back end language.'); +$GLOBALS['TL_LANG']['tl_settings']['repository_languages'] = array('Fallback languages', 'Here you can enter a comma-separated list of ISO language codes to be used if an extension description is not available in the current back end language.'); $GLOBALS['TL_LANG']['tl_settings']['repository_listsize'] = array('Extensions per page', 'Here you can define the number of extensions per page.'); -$GLOBALS['TL_LANG']['tl_settings']['repository_unsafe_catalog'] = array('Show incompatible extensions', 'Show incompatible extensions in the extension catalog. Note that installing incompatible extensions can break your Contao installation!'); +$GLOBALS['TL_LANG']['tl_settings']['repository_unsafe_catalog'] = array('Show incompatible extensions', 'Show incompatible extensions in the extension catalogue. Note that installing incompatible extensions can break your Contao installation!'); /** diff --git a/system/modules/repository/themes/default/backend_src.css b/system/modules/repository/themes/default/backend_src.css index c59494a075..3bdab29bd3 100644 --- a/system/modules/repository/themes/default/backend_src.css +++ b/system/modules/repository/themes/default/backend_src.css @@ -78,7 +78,7 @@ .buttonwrapper, .buttonwrapper * { vertical-align:middle; } .mod_repository_submit form { display:inline; } -/* Status colors */ +/* Status colours */ .mod_repository table.extension td.status-0, .mod_repository table.extension td.status-1, .mod_repository table.extension td.status-2 { background-color:#ffe0e0; } .mod_repository table.extension td.status-3, .mod_repository table.extension td.status-4, .mod_repository table.extension td.status-5, .mod_repository table.extension td.type-private { background-color:#ffffe0; } .mod_repository table.extension td.status-6, .mod_repository table.extension td.status-7, .mod_repository table.extension td.status-8, .mod_repository table.extension td.type-commercial { background-color:#d0e8ff; } diff --git a/system/themes/default/src/basic.css b/system/themes/default/src/basic.css index 448f72ed85..08ebdfc0cc 100644 --- a/system/themes/default/src/basic.css +++ b/system/themes/default/src/basic.css @@ -28,7 +28,7 @@ fieldset,form,input,optgroup,select,textarea { font-family:"Trebuchet MS",Verdana,sans-serif; } -/* Font size and color */ +/* Font size and colour */ a,body,div,label,legend,li,ol,p,td,th,ul,fieldset,form,input,optgroup,select,textarea { font-size:11px; color:#666966;