aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2001-10-22 01:11:48 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2001-10-22 01:11:48 +0000
commitfa7313eb84af5dad79291a2c8d290d882854bba2 (patch)
tree8f8f82e2990ed6fe88e2e3fc2cc8edc7cf671492 /phpBB/language
parentf09f5669976d0954a8bbbe61afa3093ee6a6fba5 (diff)
downloadforums-fa7313eb84af5dad79291a2c8d290d882854bba2.tar
forums-fa7313eb84af5dad79291a2c8d290d882854bba2.tar.gz
forums-fa7313eb84af5dad79291a2c8d290d882854bba2.tar.bz2
forums-fa7313eb84af5dad79291a2c8d290d882854bba2.tar.xz
forums-fa7313eb84af5dad79291a2c8d290d882854bba2.zip
Fixed bug in profile where account reactivation email had wrong link
git-svn-id: file:///svn/phpbb/trunk@1241 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/lang_english/lang_main.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index fad8c06e11..441e306794 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -503,6 +503,8 @@ $lang['Notify_on_privmsg'] = "Notify on Private Message";
$lang['Hide_user'] = "Hide your online status";
$lang['Profile_updated'] = "Your profile has been updated";
+$lang['Profile_updated_inactive'] = "Your profile has been updated, however you have changed vital details thus your account is now inactive. Check your email to find out how to reactivate your account, or if admin activation is require wait for the administrator to reactivate your account";
+
$lang['to_return_index'] = "to return to the index";
$lang['Password_mismatch'] = "The passwords you entered did not match";
@@ -1116,6 +1118,15 @@ $lang['add_disallow_explain'] = "You can disallow a username using the wildcard
$lang['no_disallowed'] = "No Disallowed Usernames";
//
+// Styles Admin
+//
+$lang['Styles_admin'] = "Styles Administration";
+$lang['Styles_explain'] = "In this panel you can edit or remove styles from your forum. To import a new styles click on 'Add New' in the left hand panel, to create a new styles click on 'Create New'";
+$lang['Style'] = "Style";
+$lang['Template'] = "Template";
+
+
+//
// That's all Folks!
// -------------------------------------------------