diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-12 16:30:50 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-12 16:30:50 -0600 |
| commit | 7ae5b62fc68017b6bdd5e55c9641e92a86a1f487 (patch) | |
| tree | 54e156815f13c40e9b880712de32ae13728ffdae /phpBB/language/en/common.php | |
| parent | 84284a9ccee7d5ccc658c3d1f751a5254b3b9175 (diff) | |
| parent | 9420647c43b300699afe6fe72f09d1746daf64a2 (diff) | |
| download | forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.gz forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.bz2 forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.xz forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 2040fd2951..36ad925a98 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -186,6 +186,8 @@ $lang = array_merge($lang, array( 'ERR_CONNECTING_SERVER' => 'Error connecting to the server.', 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.', 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.', + '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.', |