diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-08-09 17:05:20 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-08-09 17:05:20 +0000 |
| commit | bd3a6850aab60c5e76e1f96a88609115d740d734 (patch) | |
| tree | 14c2dec5026ea07ca71b29ffab15cfda0a93af0d /phpBB/language | |
| parent | 53150c6803e05b87975f7eb43d1eefe56f12e8b6 (diff) | |
| download | forums-bd3a6850aab60c5e76e1f96a88609115d740d734.tar forums-bd3a6850aab60c5e76e1f96a88609115d740d734.tar.gz forums-bd3a6850aab60c5e76e1f96a88609115d740d734.tar.bz2 forums-bd3a6850aab60c5e76e1f96a88609115d740d734.tar.xz forums-bd3a6850aab60c5e76e1f96a88609115d740d734.zip | |
Improved index folder mark code
git-svn-id: file:///svn/phpbb/trunk@821 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rwxr-xr-x | phpBB/language/lang_english.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 9fcab40e73..d563892a24 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -6,7 +6,11 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * +<<<<<<< lang_english.php * $Id$ +======= + * $Id$ +>>>>>>> 1.104 * * ***************************************************************************/ @@ -141,6 +145,9 @@ $lang['Usergroups'] = "Usergroups"; $lang['Last_Post'] = "Last Post"; $lang['Moderator'] = "Moderator/s"; +$lang['Mark_all_topics'] = "Mark all topics read"; +$lang['Mark_all_forums'] = "Mark all forums read"; + // // Stats block text // @@ -188,8 +195,8 @@ $lang['Reached_on_error'] = "You have reached this page in error, please go back $lang['Display_topics'] = "Display topics from previous"; $lang['All_Topics'] = "All Topics"; -$lang['Annoucement'] = "<b>Annoucement:</b>"; -$lang['Sticky'] = "<b>Sticky:</b>"; +$lang['Topic_Announcement'] = "<b>Announcement:</b>"; +$lang['Topic_Sticky'] = "<b>Sticky:</b>"; // // Viewtopic @@ -242,7 +249,7 @@ $lang['Post_a_reply'] = "Post a reply"; $lang['Post_topic_as'] = "Post topic as"; $lang['Edit_Post'] = "Edit post"; $lang['Post_Normal'] = "Normal"; -$lang['Post_Annoucement'] = "Announcement"; +$lang['Post_Announcement'] = "Announcement"; $lang['Post_Sticky'] = "Sticky"; $lang['Options'] = "Options"; @@ -547,6 +554,7 @@ $lang['this_forum'] = " this forum"; // $lang['Who_is_online'] = "Who is online"; $lang['Online_explain'] = "This data is based on users active over the past five minutes"; +$lang['No_users_browsing'] = "There are no users currently browsing this forum"; $lang['Location'] = "Location"; $lang['Last_updated'] = "Last Updated"; @@ -911,4 +919,4 @@ $l_emailpass = "Email Lost Password"; $l_passexplain = "Please fill out the form, a new password will be sent to your Email address"; $l_sendpass = "Send Password"; -?> +?>
\ No newline at end of file |