diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-19 21:07:15 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-19 21:07:15 +0100 |
| commit | 2d1e6975b47afb4466f865fc0c285498edefb2b0 (patch) | |
| tree | 9a2ebf3ef5470f2155c58e197477cca4eef0af51 /phpBB/language/en | |
| parent | 76d7d38dea10d6355e680c448579369ca8bd48d2 (diff) | |
| parent | a8274ae137a0530c7eea3dc82978e50ca4cf9db7 (diff) | |
| download | forums-2d1e6975b47afb4466f865fc0c285498edefb2b0.tar forums-2d1e6975b47afb4466f865fc0c285498edefb2b0.tar.gz forums-2d1e6975b47afb4466f865fc0c285498edefb2b0.tar.bz2 forums-2d1e6975b47afb4466f865fc0c285498edefb2b0.tar.xz forums-2d1e6975b47afb4466f865fc0c285498edefb2b0.zip | |
Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into develop
* netdeamon/ticket/12198-Language-issue:
[ticket/12198] Language issue in en/common.php
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 360d6be1e0..fba78d34aa 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -210,8 +210,6 @@ $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 occurred while trying to unsubscribe.', 'ERR_WATCHING' => 'An error occurred while trying to subscribe.', |