aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-05-16 20:04:34 -0700
committerCesar G <prototech91@gmail.com>2014-05-16 20:04:34 -0700
commit747eb198efdf30063e74f656c56a3b047a81766a (patch)
treee818335e17941956ae114d2d7b339803ecbed7dc /phpBB/language/en
parent5dc0605b6bebee0621311e9e1479e35c8e3e7cfe (diff)
parenta1143332098aa2dd99bf16a1eb0b0301d5b0c5d5 (diff)
downloadforums-747eb198efdf30063e74f656c56a3b047a81766a.tar
forums-747eb198efdf30063e74f656c56a3b047a81766a.tar.gz
forums-747eb198efdf30063e74f656c56a3b047a81766a.tar.bz2
forums-747eb198efdf30063e74f656c56a3b047a81766a.tar.xz
forums-747eb198efdf30063e74f656c56a3b047a81766a.zip
Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeus
* n-aleha/ticket/12525: [ticket/12525] Add string argument to contact and email user language variables
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/common.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 982ca4cf5a..30b3078a41 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -167,7 +167,8 @@ $lang = array_merge($lang, array(
'CONGRATULATIONS' => 'Congratulations to',
'CONNECTION_FAILED' => 'Connection failed.',
'CONNECTION_SUCCESS' => 'Connection was successful!',
- 'CONTACT_USER' => 'Contact',
+ 'CONTACT' => 'Contact',
+ 'CONTACT_USER' => 'Contact %s',
'COOKIES_DELETED' => 'All board cookies successfully deleted.',
'CURRENT_TIME' => 'It is currently %s',
@@ -664,7 +665,7 @@ $lang = array_merge($lang, array(
'SELECT_DESTINATION_FORUM' => 'Please select a destination forum',
'SELECT_FORUM' => 'Select a forum',
'SEND_EMAIL' => 'Email', // Used for submit buttons
- 'SEND_EMAIL_USER' => 'Email', // Used as: {L_SEND_EMAIL_USER} {USERNAME} -> Email UserX
+ 'SEND_EMAIL_USER' => 'Email %s',
'SEND_PRIVATE_MESSAGE' => 'Send private message',
'SETTINGS' => 'Settings',
'SIGNATURE' => 'Signature',