diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-04-24 19:16:46 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-04-24 19:16:46 +0200 |
| commit | b8c2bf6ce4be97c0ae100f746afe465a5765dae1 (patch) | |
| tree | 25f6d482b43e4e99485057f0c1e43ef94f1ce175 /phpBB/language/en/common.php | |
| parent | b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd (diff) | |
| parent | 9f545a7f6ba7ddd54fae083563b5b582e05f5c1c (diff) | |
| download | forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.gz forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.bz2 forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.tar.xz forums-b8c2bf6ce4be97c0ae100f746afe465a5765dae1.zip | |
Merge remote-tracking branch 'github-asperous/ticket/9975' into develop
* github-asperous/ticket/9975:
[ticket/9975] Moved a few E_USER_ERROR errors to /language
Conflicts:
phpBB/includes/user.php
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index ebf121bf90..c1d6ef4af3 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -313,6 +313,7 @@ $lang = array_merge($lang, array( 'IN' => 'in', 'INDEX' => 'Index page', 'INFORMATION' => 'Information', + 'INSECURE_REDIRECT' => 'Tried to redirect to potentially insecure url.', 'INTERESTS' => 'Interests', 'INVALID_DIGEST_CHALLENGE' => 'Invalid digest challenge.', 'INVALID_EMAIL_LOG' => '<strong>%s</strong> possibly an invalid email address?', |