aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-04-15 14:48:36 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-04-15 14:48:36 +0000
commit84738055a25081070f570b40a19e05db21908237 (patch)
tree3bf59d91eba8d7b7b000ba5a5cd0e63e0e82b122 /phpBB/language
parent0562395c27cd6cafcaacd3798f6a51d8cc703c7a (diff)
downloadforums-84738055a25081070f570b40a19e05db21908237.tar
forums-84738055a25081070f570b40a19e05db21908237.tar.gz
forums-84738055a25081070f570b40a19e05db21908237.tar.bz2
forums-84738055a25081070f570b40a19e05db21908237.tar.xz
forums-84738055a25081070f570b40a19e05db21908237.zip
- fixed some bugs
- made sql schemas consistent - added correct sequences and generators to sql schemas - extended some rows to hold more data. This solves issues with multibyte characters and too short topic titles, names, etc. - allow multibyte characters in usernames git-svn-id: file:///svn/phpbb/trunk@5784 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/email/email_notify.txt2
-rw-r--r--phpBB/language/en/email/forum_notify.txt2
-rw-r--r--phpBB/language/en/email/newtopic_notify.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt
index 992af0987e..0543165627 100644
--- a/phpBB/language/en/email/email_notify.txt
+++ b/phpBB/language/en/email/email_notify.txt
@@ -11,7 +11,7 @@ You can find it at:
{U_TOPIC}
-A message from {USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this email please contact the board administrator {CONTACT_EMAIL}. Please quote the the message headers when contacting this address.
+A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this email please contact the board administrator at {BOARD_EMAIL}. Please quote the the message headers when contacting this address.
----------
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index f9ded9edf3..af9e9e3bab 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -7,7 +7,7 @@ You are receiving this email because you are watching the forum, "{FORUM_NAME}"
{U_NEWEST_POST}
-If you no longer wish to watch this forum you can either click the "Stop watching this forum link" found at the bottom of the forum above, or by clicking the following link:
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum link" found in the forum above, or by clicking the following link:
{U_STOP_WATCHING_FORUM}
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index 4977f82cd7..93c62fe9e2 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -7,7 +7,7 @@ You are receiving this email because you are watching the forum, "{FORUM_NAME}"
{U_FORUM}
-If you no longer wish to watch this forum you can either click the "Stop watching this forum link" found at the bottom of the forum above, or by clicking the following link:
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum link" found in the forum above, or by clicking the following link:
{U_STOP_WATCHING_FORUM}