1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

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
This commit is contained in:
Nils Adermann
2013-04-24 19:16:46 +02:00
7 changed files with 12 additions and 8 deletions

View File

@@ -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?',