aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Stanley <shs@users.sourceforge.net>2007-04-16 17:14:18 +0000
committerJonathan Stanley <shs@users.sourceforge.net>2007-04-16 17:14:18 +0000
commit79120b0178c341c7b96acd00b86cd9916f6e2ea6 (patch)
tree8a4b53654e0ef09be347b7ca9f74f38c15903116
parentb6859730c828f4e94767357704d0706b0164af86 (diff)
downloadforums-79120b0178c341c7b96acd00b86cd9916f6e2ea6.tar
forums-79120b0178c341c7b96acd00b86cd9916f6e2ea6.tar.gz
forums-79120b0178c341c7b96acd00b86cd9916f6e2ea6.tar.bz2
forums-79120b0178c341c7b96acd00b86cd9916f6e2ea6.tar.xz
forums-79120b0178c341c7b96acd00b86cd9916f6e2ea6.zip
#9889
When did these unwanted guests creep in? @_@ git-svn-id: file:///svn/phpbb/trunk@7365 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/language/en/acp/board.php2
-rw-r--r--phpBB/language/en/acp/posting.php8
-rw-r--r--phpBB/language/en/search_synonyms.php4
3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 529ae051fa..4718d691c5 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -362,7 +362,7 @@ $lang = array_merge($lang, array(
'PASS_TYPE_CASE' => 'Must be mixed case',
'PASS_TYPE_SYMBOL' => 'Must contain symbols',
'TPL_ALLOW_PHP' => 'Allow php in templates',
- 'TPL_ALLOW_PHP_EXPLAIN' => 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognized and parsed in templates.',
+ 'TPL_ALLOW_PHP_EXPLAIN' => 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognised and parsed in templates.',
));
// Email Settings
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index fba23e233f..a517afa85d 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -215,12 +215,12 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'ACP_REASONS_EXPLAIN' => 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
'ADD_NEW_REASON' => 'Add new reason',
- 'AVAILABLE_TITLES' => 'Available localized reason titles',
+ 'AVAILABLE_TITLES' => 'Available localised reason titles',
'IS_NOT_TRANSLATED' => 'Reason has <strong>not</strong> been localised.',
- 'IS_NOT_TRANSLATED_EXPLAIN' => 'Reason has <strong>not</strong> been localised. If you want to provide the localized form, specify the correct key from the language files report reasons section.',
+ 'IS_NOT_TRANSLATED_EXPLAIN' => 'Reason has <strong>not</strong> been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.',
'IS_TRANSLATED' => 'Reason has been localised.',
- 'IS_TRANSLATED_EXPLAIN' => 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localized form of the title and description will be used.',
+ 'IS_TRANSLATED_EXPLAIN' => 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.',
'NO_REASON' => 'Reason could not be found.',
'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.',
@@ -232,7 +232,7 @@ $lang = array_merge($lang, array(
'REASON_DESCRIPTION' => 'Reason description',
'REASON_DESC_TRANSLATED' => 'Displayed reason description',
'REASON_EDIT' => 'Edit report/denial reason',
- 'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localized version is used instead of the description entered here.',
+ 'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localised version is used instead of the description entered here.',
'REASON_REMOVED' => 'Report/denial reason successfully removed.',
'REASON_TITLE' => 'Reason title',
'REASON_TITLE_TRANSLATED' => 'Displayed reason title',
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
index 18f0ba40f8..886e1f1289 100644
--- a/phpBB/language/en/search_synonyms.php
+++ b/phpBB/language/en/search_synonyms.php
@@ -119,8 +119,8 @@ $synonyms = array(
'offense' => 'offence',
'ommision' => 'omission',
'ommission' => 'omission',
- 'optimize' => 'optimize',
- 'organise' => 'organize',
+ 'optimize' => 'optimise',
+ 'organize' => 'organise',
'pajamas' => 'pyjamas',
'paleography' => 'palaeography',