diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:37:52 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:37:52 -0500 |
| commit | 193670d7a9124a3bdd0fa3ae78733d80a26c5cbb (patch) | |
| tree | 476f63d44af5fcc28528eff2f2d746eb8100bdcc /phpBB | |
| parent | b1d3c1bf6990c8105c18eb9db06ebf9c974b0899 (diff) | |
| parent | 16aeaed7bda590268c621216a42818ec64c1f37b (diff) | |
| download | forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.tar forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.tar.gz forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.tar.bz2 forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.tar.xz forums-193670d7a9124a3bdd0fa3ae78733d80a26c5cbb.zip | |
Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11662] Typos: occured -> occurred
Conflicts:
tests/template/template_test.php
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 3d8e403f4b..b260ffad6e 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -249,7 +249,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 93f163364b..4c2002754f 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -601,7 +601,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 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', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 7607512eab..7b2a1138e9 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -364,7 +364,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', |