aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2011-07-14 20:46:08 +0200
committerJoas Schilling <nickvergessen@gmx.de>2011-07-14 20:46:08 +0200
commit0b1ed71b8a2486383e264a98fc31b22a3404c41c (patch)
tree57054a192b4dc86f14fcc6b666800f1c7707a673
parent381e31d73818de10ad8df227f20dd3d9350ad37f (diff)
parent1ace10ab92a19a56bcbfda665c3bd154fd5a1c2c (diff)
downloadforums-0b1ed71b8a2486383e264a98fc31b22a3404c41c.tar
forums-0b1ed71b8a2486383e264a98fc31b22a3404c41c.tar.gz
forums-0b1ed71b8a2486383e264a98fc31b22a3404c41c.tar.bz2
forums-0b1ed71b8a2486383e264a98fc31b22a3404c41c.tar.xz
forums-0b1ed71b8a2486383e264a98fc31b22a3404c41c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.
-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 2859b05909..96970dcb23 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -495,7 +495,7 @@ $lang = array_merge($lang, array(
'SHOW_DIFF_NEW' => 'Show file contents',
'SHOW_DIFF_NEW_CONFLICT' => 'Show differences',
'SHOW_DIFF_NOT_MODIFIED' => 'Show differences',
- 'SOME_QUERIES_FAILED' => 'Some queries failed, the statements and errors are listing below.',
+ 'SOME_QUERIES_FAILED' => 'Some queries failed, the statements and errors are listed below.',
'SQL' => 'SQL',
'SQL_FAILURE_EXPLAIN' => 'This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our support forums. See <a href="../docs/README.html">README</a> for details on how to obtain advice.',
'STAGE_FILE_CHECK' => 'Check files',