aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-07 11:42:05 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-10-07 11:42:05 +0200
commit202e43b11b8ff9567bea676a96f7db0607867bae (patch)
tree46269f620bf3dd0b3423d98d6980f6775758d2ef
parent441db59db0a1ce7739d847538a5d0728dd526af1 (diff)
parent61601a052c0f04e1792fff2d4d0d2ad3a8a0ff99 (diff)
downloadforums-202e43b11b8ff9567bea676a96f7db0607867bae.tar
forums-202e43b11b8ff9567bea676a96f7db0607867bae.tar.gz
forums-202e43b11b8ff9567bea676a96f7db0607867bae.tar.bz2
forums-202e43b11b8ff9567bea676a96f7db0607867bae.tar.xz
forums-202e43b11b8ff9567bea676a96f7db0607867bae.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/language/en/acp/profile.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 5972f8a18e..d365aeb183 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
'FIELD_IDENT_EXPLAIN' => 'The field identification is a name to identify the profile field within the database and the templates.',
'FIELD_INT' => 'Numbers',
'FIELD_IS_CONTACT' => 'Display field as a contact field',
- 'FIELD_IS_CONTACT_EXPLAIN' => 'Contact fields are displayed within the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages.',
+ 'FIELD_IS_CONTACT_EXPLAIN' => 'Contact fields are displayed within the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages. You can use <samp>%s</samp> as a placeholder variable which will be replaced by a value provided by the user.',
'FIELD_LENGTH' => 'Length of input box',
'FIELD_NOT_FOUND' => 'Profile field not found.',
'FIELD_STRING' => 'Single text field',