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 | |
| 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')
| -rw-r--r-- | phpBB/language/en/captcha_recaptcha.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php index c72957ca16..3d91a9d110 100644 --- a/phpBB/language/en/captcha_recaptcha.php +++ b/phpBB/language/en/captcha_recaptcha.php @@ -46,4 +46,5 @@ $lang = array_merge($lang, array( 'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.', 'RECAPTCHA_EXPLAIN' => 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed into the text field underneath.', + 'RECAPTCHA_SOCKET_ERROR' => 'There was a problem connecting to the RECAPTCHA service: could not open socket. Try again later.', )); 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?', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index eaa2d7e3a5..29f418183f 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -250,6 +250,8 @@ $lang = array_merge($lang, array( 'ONLY_TOPIC' => 'Only topic “%s”', 'OTHER_USERS' => 'Other users posting from this IP', + 'QUICKMOD_ACTION_NOT_ALLOWED' => "%s not allowed as quickmod", + 'PM_REPORT_CLOSED_SUCCESS' => 'The selected PM report has been closed successfully.', 'PM_REPORT_DELETED_SUCCESS' => 'The selected PM report has been deleted successfully.', 'PM_REPORTED_SUCCESS' => 'This private message has been successfully reported.', |