aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2001-06-07 07:56:45 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2001-06-07 07:56:45 +0000
commit1010b488ca951c141aa924d814755d97d1599e9b (patch)
tree36b167ccc4ae0b5df18c9db0a58bbaf7d3da203a /phpBB/language
parentf49da7909befa8cb1745236bcb6e0b4d1ad87762 (diff)
downloadforums-1010b488ca951c141aa924d814755d97d1599e9b.tar
forums-1010b488ca951c141aa924d814755d97d1599e9b.tar.gz
forums-1010b488ca951c141aa924d814755d97d1599e9b.tar.bz2
forums-1010b488ca951c141aa924d814755d97d1599e9b.tar.xz
forums-1010b488ca951c141aa924d814755d97d1599e9b.zip
Forum level annoucements and sticky topics are done.
Added topic_type field to the topics database in order to handle ordering. Would have used topic_status but that would have messed up the ordering when topics were locked git-svn-id: file:///svn/phpbb/trunk@437 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rwxr-xr-xphpBB/language/lang_english.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 44e6322d13..18d057c021 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -126,6 +126,8 @@ $lang['Forum_Index'] = "Forum Index";
//
// Viewforum
//
+$lang['Annoucement'] = "<b>Annoucement:</b>";
+$lang['Sticky'] = "<b>Sticky:</b>";
//
// Viewtopic
@@ -140,6 +142,9 @@ $lang['Empty_subj'] = "You must specifiy a subject when posting a new topic.";
$lang['Empty_msg'] = "You must enter a message when posting!";
$lang['Postnew'] = "Post New Topic";
$lang['Post_new_in'] = "Post New Topic in:"; // Followed by forum name
+$lang['Post_Annoucement'] = "Post as an annoucement";
+$lang['Post_Sticky'] = "Stick this topic";
+$lang['Annouce_and_sticky'] = "You cannot post a topic that is both an annoucement and a sticky topic";
//