aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-09-18 14:49:19 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-09-18 14:49:19 +0000
commit951f793daeb358eace97cdd0b1c321766da55d48 (patch)
tree37ed80ac95e82e70ea9560ae3256d53fb423801a /phpBB/language/en
parent36e99af959799eab6610fc6f3ca0e2c76ba4020f (diff)
downloadforums-951f793daeb358eace97cdd0b1c321766da55d48.tar
forums-951f793daeb358eace97cdd0b1c321766da55d48.tar.gz
forums-951f793daeb358eace97cdd0b1c321766da55d48.tar.bz2
forums-951f793daeb358eace97cdd0b1c321766da55d48.tar.xz
forums-951f793daeb358eace97cdd0b1c321766da55d48.zip
some fixes. :P
- language authors may review their email template files... git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/email/admin_welcome_inactive.txt4
-rw-r--r--phpBB/language/en/email/coppa_resend_inactive.txt4
-rw-r--r--phpBB/language/en/email/coppa_welcome_inactive.txt4
-rw-r--r--phpBB/language/en/email/user_reactivate_account.txt2
-rw-r--r--phpBB/language/en/email/user_resend_inactive.txt2
-rw-r--r--phpBB/language/en/email/user_welcome.txt4
-rw-r--r--phpBB/language/en/email/user_welcome_inactive.txt4
-rwxr-xr-xphpBB/language/en/install.php4
8 files changed, 18 insertions, 10 deletions
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index 0d75f33c18..746d13da7a 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -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.
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
index ab8363b350..9d43ca4f85 100644
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ b/phpBB/language/en/email/coppa_resend_inactive.txt
@@ -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}
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
index f34479a6fe..f079ddb838 100644
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ b/phpBB/language/en/email/coppa_welcome_inactive.txt
@@ -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}
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
index 260e69c380..b5639d0b7a 100644
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -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.
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
index f0a0034aa5..5635801b80 100644
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -1,4 +1,4 @@
-Subject: Welcome to "{SITENAME}" - {U_BOARD}
+Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
index 52957082fb..6c3cee0b50 100644
--- a/phpBB/language/en/email/user_welcome.txt
+++ b/phpBB/language/en/email/user_welcome.txt
@@ -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.
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
index 3cd5e3c2ea..4b6d96ddd8 100644
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ b/phpBB/language/en/email/user_welcome_inactive.txt
@@ -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:
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 945e25297c..df45be62c3 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -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',
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-25 04:20:14 +0000