diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:33:45 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:33:45 -0500 |
| commit | 16aeaed7bda590268c621216a42818ec64c1f37b (patch) | |
| tree | 5aaae3387ef3b13a5edc8b1d9b5bf8a634f24b9e /phpBB | |
| parent | a7edbf9258253dd694857af80273f6cddfe91274 (diff) | |
| parent | f4b7cbd9766fff3e4232c5514da18c8fc3ff102b (diff) | |
| download | forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.gz forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.bz2 forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.xz forums-16aeaed7bda590268c621216a42818ec64c1f37b.zip | |
Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11662:
[ticket/11662] Typos: occured -> occurred
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 2 |
4 files changed, 6 insertions, 6 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', |