mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

some fixes. :P

Browse Source 
- language authors may review their email template files...


git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-09-18 14:49:19 +00:00
parent 36e99af959
commit 951f793dae
28 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/language/en/email/admin_welcome_inactive.txt
View File

@@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD}
Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
@@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
----------------------------
Username: {USERNAME}
Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.

4
phpBB/language/en/email/coppa_resend_inactive.txt
View File

@@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD}
Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
@@ -13,7 +13,7 @@ OR mail it to:
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
Permission to participate at "{SITENAME}"
Permission to participate at "{SITENAME}" - {U_BOARD}
Username: {USERNAME}
E-mail: {EMAIL_ADDRESS}

4
phpBB/language/en/email/coppa_welcome_inactive.txt
View File

@@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD}
Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
@@ -13,7 +13,7 @@ OR mail it to:
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
Permission to participate at "{SITENAME}"
Permission to participate at "{SITENAME}" - {U_BOARD}
Username: {USERNAME}
Password: {PASSWORD}

2
phpBB/language/en/email/user_reactivate_account.txt
View File

@@ -1,4 +1,4 @@
Subject: Reactivate your account on "{SITENAME}" - {U_BOARD}
Subject: Reactivate your account on "{SITENAME}"
A board administrator requested that your account be reactivated. Your account is currently inactive.
Please follow the steps listed here to reactivate your account.

2
phpBB/language/en/email/user_resend_inactive.txt
View File

@@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD}
Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}

4
phpBB/language/en/email/user_welcome.txt
View File

@@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD}
Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
@@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
----------------------------
Username: {USERNAME}
Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
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.

4
phpBB/language/en/email/user_welcome_inactive.txt
View File

@@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD}
Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
@@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
----------------------------
Username: {USERNAME}
Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
Your account is currently inactive. You cannot use it until you visit the following link:

4
phpBB/language/en/install.php
View File

@@ -79,8 +79,9 @@ $lang = array_merge($lang, array(
'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
'CONVERT_NEW_CONVERSION' => 'New conversion',
'CONVERT_NOT_EXIST' => 'The specified convertor does not exist.',
'CONVERT_OPTIONS' => 'Options',
'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion process, push the button below to begin.',
'CONV_ERR_FATAL' => 'Fatal conversion error',
'CONV_ERR_FATAL' => 'Fatal conversion error',
'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.',
@@ -350,6 +351,7 @@ $lang = array_merge($lang, array(
'UNWRITABLE' => 'Unwritable',
'UPDATE_TOPICS_POSTED' => 'Generating topics posted information',
'UPDATE_TOPICS_POSTED_ERR' => 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
'VERIFY_OPTIONS' => 'Verifying conversion options',
'VERSION' => 'Version',
'WELCOME_INSTALL' => 'Welcome to phpBB3 Installation',