aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-05-30 19:24:53 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-05-30 19:24:53 +0000
commit6aa42b69abe798388aad4f7e6bf943dfb608e896 (patch)
tree0b5f6dc0ed309bf7a59cf32714d14bf848b7637d /phpBB/language/en/common.php
parentae93b82e19612c9ab99c11ca9641c1fca32588d4 (diff)
downloadforums-6aa42b69abe798388aad4f7e6bf943dfb608e896.tar
forums-6aa42b69abe798388aad4f7e6bf943dfb608e896.tar.gz
forums-6aa42b69abe798388aad4f7e6bf943dfb608e896.tar.bz2
forums-6aa42b69abe798388aad4f7e6bf943dfb608e896.tar.xz
forums-6aa42b69abe798388aad4f7e6bf943dfb608e896.zip
- forum rules + link to forum rules
- three new (tiny) functions added to functions_posting responsible for handling text with bbcode/smilies/urls, use them at items all over across phpbb... - some bugfixes within admin_forums and other files - new admin_board layout (much safer, security wise) git-svn-id: file:///svn/phpbb/trunk@4903 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/common.php')
-rw-r--r--phpBB/language/en/common.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 3c6d26ff75..d325db31ed 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -46,6 +46,7 @@ $lang += array(
'ACP' => 'Administration Control Panel',
'ACTIVE_ERROR' => 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.',
'ALLOWED' => 'Allowed',
+ 'ALL_FORUMS' => 'All Forums',
'ALL_MESSAGES' => 'All Messages',
'ALL_POSTS' => 'All Posts',
'ALL_TIMES' => 'All times are %s %s',
@@ -82,6 +83,7 @@ $lang += array(
'DAY' => 'Day',
'DAYS' => 'Days',
'DELETE' => 'Delete',
+ 'DELETE_MARKED' => 'Delete Marked',
'DESCENDING' => 'Descending',
'DISABLED' => 'Disabled',
'DISPLAY_MESSAGES' => 'Display messages from previous',
@@ -111,6 +113,7 @@ $lang += array(
'FORUM_INDEX' => 'Board Index',
'FORUM_LOCATION' => 'Forum Location',
'FORUM_LOCKED' => 'Forum Locked',
+ 'FORUM_RULES' => 'Forum Rules',
'FROM' => 'from',
'GO' => 'Go',