aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-09-17 18:18:11 -0700
committerCesar G <prototech91@gmail.com>2014-09-17 18:18:11 -0700
commitdf220e5c0a2f5a6c25e4dc59cc217a3babdc6877 (patch)
treee1d78ddc1090a2595829035bd996150973179e71 /phpBB
parent5a46ed398b75a32d577b920d284516b2b5285971 (diff)
parent53e028ff1485bac571982a56200412fadb72dc83 (diff)
downloadforums-df220e5c0a2f5a6c25e4dc59cc217a3babdc6877.tar
forums-df220e5c0a2f5a6c25e4dc59cc217a3babdc6877.tar.gz
forums-df220e5c0a2f5a6c25e4dc59cc217a3babdc6877.tar.bz2
forums-df220e5c0a2f5a6c25e4dc59cc217a3babdc6877.tar.xz
forums-df220e5c0a2f5a6c25e4dc59cc217a3babdc6877.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
Diffstat (limited to 'phpBB')
-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 67813bcba4..d27deed602 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 with in 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.',
'FIELD_LENGTH' => 'Length of input box',
'FIELD_NOT_FOUND' => 'Profile field not found.',
'FIELD_STRING' => 'Single text field',