aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-11-13 20:34:53 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-11-13 20:34:53 +0100
commit1b003fd244a9377731f118b62850861210d0a9b0 (patch)
treeff313a530379df6d623604af1b2d39975cdeb16c /phpBB/language/en
parentd3a1b670bd555c33ccbea4c7f58ac404e294381b (diff)
parent0a5d2a84d158e23b1d2e724d569c183bb049892e (diff)
downloadforums-1b003fd244a9377731f118b62850861210d0a9b0.tar
forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.gz
forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.bz2
forums-1b003fd244a9377731f118b62850861210d0a9b0.tar.xz
forums-1b003fd244a9377731f118b62850861210d0a9b0.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/email/privmsg_notify.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
index d363df7973..d3a86cc73c 100644
--- a/phpBB/language/en/email/privmsg_notify.txt
+++ b/phpBB/language/en/email/privmsg_notify.txt
@@ -8,7 +8,7 @@ You have received a new private message from "{AUTHOR_NAME}" to your account on
You can view your new message by clicking on the following link:
-{U_INBOX}
+{U_VIEW_MESSAGE}
You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.