5 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 16dce16a72..2054124a4e 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -250,7 +250,7 @@ class jabber
 			return true;
 		}
 
-		// Apparently an error occured...
+		// Apparently an error occurred...
 		$this->add_to_log('Error: open_socket() - ' . $errorstr);
 		return false;
 	}
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index e64ba3c371..00155dd335 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -572,7 +572,7 @@ $lang = array_merge($lang, array(
 	'LOG_FORUM_MOVE_UP'						=> '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
 	'LOG_FORUM_SYNC'						=> '<strong>Re-synchronised forum</strong><br />» %s',
 
-	'LOG_GENERAL_ERROR'	=> '<strong>A general error occured</strong>: %1$s <br />» %2$s',
+	'LOG_GENERAL_ERROR'	=> '<strong>A general error occurred</strong>: %1$s <br />» %2$s',
 
 	'LOG_GROUP_CREATED'		=> '<strong>New usergroup created</strong><br />» %s',
 	'LOG_GROUP_DEFAULTS'	=> '<strong>Group “%1$s” made default for members</strong><br />» %2$s',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c986e8213d..f37f6d3b30 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -172,8 +172,8 @@ $lang = array_merge($lang, array(
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
 	'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.',
 	'EXPAND_VIEW'						=> 'Expand view',
 	'EXTENSION'							=> 'Extension',
@@ -298,7 +298,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',
 	'LOCATION'							=> 'Location',
 	'LOCK_POST'							=> 'Lock post',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index bbf407f1dc..bdc51a5712 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -363,7 +363,7 @@ $lang = array_merge($lang, array(
 	'UNAVAILABLE'				=> 'Unavailable',
 	'UNWRITABLE'				=> 'Unwritable',
 	'UPDATE_TOPICS_POSTED'		=> 'Generating topics posted information',
-	'UPDATE_TOPICS_POSTED_ERR'	=> 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
+	'UPDATE_TOPICS_POSTED_ERR'	=> 'An error occurred while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
 	'VERIFY_OPTIONS'			=> 'Verifying conversion options',
 	'VERSION'					=> 'Version',
 
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index fd68124c89..94ec2ab8a7 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -32,7 +32,7 @@ class phpbb_template_template_test extends phpbb_test_case
 		}
 		catch (Exception $exception)
 		{
-			// reset the error level even when an error occured
+			// reset the error level even when an error occurred
 			// PHPUnit turns trigger_error into exceptions as well
 			error_reporting($error_level);
 			ob_end_clean();