diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-28 15:04:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-28 15:04:59 +0000 |
| commit | 26befa094147b542e48e36867eb41eaf424225f7 (patch) | |
| tree | 5131952196ff19744498bbbdc962635cecc94c4f /phpBB/language/en/common.php | |
| parent | 67accdb07263030c29eebba9edf944fd350879d1 (diff) | |
| download | forums-26befa094147b542e48e36867eb41eaf424225f7.tar forums-26befa094147b542e48e36867eb41eaf424225f7.tar.gz forums-26befa094147b542e48e36867eb41eaf424225f7.tar.bz2 forums-26befa094147b542e48e36867eb41eaf424225f7.tar.xz forums-26befa094147b542e48e36867eb41eaf424225f7.zip | |
- added confirmation to removing bbcodes
- added optional MX and DNSBL checks
- added backtrace (triggering sql error) on error within sql_in_set as well as making sure it is handling an array
- let users having f_list access to a forum actually see the forum without a topic list and not displaying an error message - this allows for giving people access to subforums but not the parent forum without the need to add the (sub-)forum to the index.
- some additional bugfixes
git-svn-id: file:///svn/phpbb/trunk@6414 89ea8834-ac86-4346-8a33-228a782c2dd0
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 00c272352e..a75aec2ee0 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -244,6 +244,7 @@ $lang = array_merge($lang, array( 'INVALID_DIGEST_CHALLENGE' => 'Invalid digest challenge', 'INVALID_EMAIL_LOG' => '<strong>%s</strong> possibly an invalid email address?', 'IP' => 'IP', + 'IP_BLACKLISTED' => 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.', 'JABBER' => 'Jabber', 'JOINED' => 'Joined', @@ -328,6 +329,7 @@ $lang = array_merge($lang, array( 'NO_IPS_DEFINED' => 'No IPs or Hostnames defined', 'NO_MEMBERS' => 'No members found for this search criteria', 'NO_MESSAGES' => 'No messages', + 'NO_MODE' => 'No mode specified', 'NO_MODERATORS' => 'No moderators assigned at this board.', 'NO_NEW_MESSAGES' => 'No new messages', 'NO_NEW_PM' => '<strong>0</strong> new messages', |