aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-07-13 11:33:49 -0400
committerDavid King <imkingdavid@gmail.com>2013-07-13 11:33:49 -0400
commit2bc918d3f9282de887cc09f830ff35073865366e (patch)
treeaf266a7b312ae4e4f9fdddb952d2f53e5d240c06 /phpBB/language/en/common.php
parent068d35065278bf52e85fcc96b629d25712f19c26 (diff)
parentfd10d97cb1e6c43b88b923bab1015cafe03d379c (diff)
downloadforums-2bc918d3f9282de887cc09f830ff35073865366e.tar
forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.gz
forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.bz2
forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.xz
forums-2bc918d3f9282de887cc09f830ff35073865366e.zip
Merge branch 'develop' into ticket/11215
* develop: (53 commits) [ticket/11671] Update composer.lock [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps [ticket/11668] Move lint test to the end for travis [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred ...
Diffstat (limited to 'phpBB/language/en/common.php')
-rw-r--r--phpBB/language/en/common.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index cdfd3416f5..7c7afd83f4 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -204,8 +204,8 @@ $lang = array_merge($lang, array(
'ERR_TEMPLATE_EVENT_LOCATION' => 'The specified template event location <em>[%s]</em> is improperly formatted.',
'ERR_TEMPLATE_COMPILATION' => 'The file could not be compiled: %s',
'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.',
- 'ERR_UNWATCHING' => 'An error occured while trying to unsubscribe.',
- 'ERR_WATCHING' => 'An error occured while trying to subscribe.',
+ 'ERR_UNWATCHING' => 'An error occurred while trying to unsubscribe.',
+ 'ERR_WATCHING' => 'An error occurred while trying to subscribe.',
'ERR_WRONG_PATH_TO_PHPBB' => 'The phpBB path specified appears to be invalid.',
'ERROR' => 'Error',
'EXPAND_VIEW' => 'Expand view',
@@ -338,7 +338,7 @@ $lang = array_merge($lang, array(
'LAST_VISIT' => 'Last visit',
'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not available.',
'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server.',
- 'LDAP_SEARCH_FAILED' => 'An error occured while searching the LDAP directory.',
+ 'LDAP_SEARCH_FAILED' => 'An error occurred while searching the LDAP directory.',
'LEGEND' => 'Legend',
'LOADING' => 'Loading',
'LOCATION' => 'Location',