aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-11-13 16:09:10 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-11-13 16:09:10 +0000
commitd1fd694282e3ebaf2046e3aee6a0d5dd92cb6659 (patch)
tree36918a361f192687384e8a32edf99104f8eff6f5 /phpBB/language
parent75fadebad1e17176c82be17c7041846e4a3122df (diff)
downloadforums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.tar
forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.tar.gz
forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.tar.bz2
forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.tar.xz
forums-d1fd694282e3ebaf2046e3aee6a0d5dd92cb6659.zip
Added global PM disable + modded emailer to allow lang select + re-added back box limits my dumbness removed recently
git-svn-id: file:///svn/phpbb/trunk@1305 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/lang_english/lang_main.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index 702e58ef37..47ab5b13c7 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -87,6 +87,7 @@ $lang['Year'] = "Year";
$lang['Years'] = "Years";
$lang['Enabled'] = "Enabled";
+$lang['Disabled'] = "Disabled";
$lang['Next'] = "Next";
$lang['Previous'] = "Previous";
$lang['Goto_page'] = "Goto page";
@@ -121,7 +122,6 @@ $lang['Jump_to'] = "Jump to";
$lang['Select_forum'] = "Select a forum";
$lang['Success'] = "Success";
-$lang['Private_messaging'] = "Send a Private Message";
//
@@ -358,6 +358,7 @@ $lang['Topic_reply_notification'] = "Topic Reply Notification";
// Private Messaging
//
$lang['Private_Messaging'] = "Private Messaging";
+$lang['PM_disabled'] = "Private messaging has been disabled on this board";
$lang['Login_check_pm'] = "Login to check your private messages";
$lang['New_pms'] = "You have %d new messages"; // You have 2 new messages
@@ -944,6 +945,11 @@ $lang['Site_name'] = "Site name";
$lang['Site_desc'] = "Site description";
$lang['Acct_activation'] = "Enable account activation";
+$lang['Disable_privmsg'] = "Disable Private Messaging";
+$lang['Inbox_limits'] = "Max posts in Inbox";
+$lang['Sentbox_limits'] = "Max posts in Sentbox";
+$lang['Savebox_limits'] = "Max posts in Savebox";
+
//
// Forum Management