aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/install.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-12 10:33:45 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-12 10:33:45 -0500
commit16aeaed7bda590268c621216a42818ec64c1f37b (patch)
tree5aaae3387ef3b13a5edc8b1d9b5bf8a634f24b9e /phpBB/language/en/install.php
parenta7edbf9258253dd694857af80273f6cddfe91274 (diff)
parentf4b7cbd9766fff3e4232c5514da18c8fc3ff102b (diff)
downloadforums-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/language/en/install.php')
-rw-r--r--phpBB/language/en/install.php2
1 files changed, 1 insertions, 1 deletions
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',