mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Combined theme/templates in profile as suggested, added META refresh and made a couple of other changes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1018 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2001-09-09 23:22:29 +00:00
parent 375e4d9903
commit c0ac873a08
8 changed files with 247 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/language/email/activate_english.tpl
View File

@@ -1,6 +1,6 @@
Your account on {SITENAME} has been deactivated, most likily due to changes
made to your profile. In order to reactivate your account you must click
on the link below:
Hello {USERNAME},
Your account on {SITENAME} has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
{U_ACTIVATE}

9
phpBB/language/email/welcome_inactive_english.tpl
View File

@@ -1,8 +1,6 @@
{WELCOME_MSG}
Please keep this email for your records.
Your account information is as follows:
Please keep this email for your records. Your account information is as follows:
----------------------------
Username: {USERNAME}
@@ -11,10 +9,9 @@ Password: {PASSWORD}
Your account is currently inactive. You cannot use it until you visit the following link:
{ACTIVATE_URL}
{U_ACTIVATE}
Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you.
However, should you forget your password you can request a new one which will be activated in the same way as this account.
Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
Thank you for registering.

6
phpBB/language/lang_english.php
View File

@@ -415,8 +415,7 @@ $lang['Always_add_sig'] = "Always attach my signature";
$lang['Always_notify'] = "Always notify me of replies";
$lang['Always_notify_explain'] = "Sends an email when someone replies to a topic you have posted in. This can be changed whenever you post";
$lang['Board_template'] = "Board Template";
$lang['Board_theme'] = "Board Theme";
$lang['Board_style'] = "Board Style";
$lang['Board_lang'] = "Board Language";
$lang['No_themes'] = "No Themes In database";
$lang['Timezone'] = "Timezone";
@@ -452,7 +451,8 @@ $lang['Current_Image'] = "Current Image";
$lang['Notify_on_privmsg'] = "Notify on Private Message";
$lang['Hide_user'] = "Hide your online status";
$lang['Profile_updated'] = "Your profile has been updated<br /><br />" . $lang['Click_index'];
$lang['Profile_updated'] = "Your profile has been updated";
$lang['to_return_index'] = "to return to the index";
$lang['Password_mismatch'] = "The passwords you entered did not match";
$lang['Invalid_username'] = "The username you requested has been taken or disallowed";