aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-05-04 13:55:14 -0700
committerCesar G <prototech91@gmail.com>2014-05-04 13:55:14 -0700
commit0cc5cf57b23c7944ed04e61cf494f0f4c5465e38 (patch)
tree7db7e2f098aaaef2e1e7a90b8a4f5a8ecd3a71d1 /phpBB/language
parent0f4bff610165ad7f8fea03808277a1df0f1c49ab (diff)
parenteccdc7447834dc7d59dcd6ffa879cbcce7a6eb00 (diff)
downloadforums-0cc5cf57b23c7944ed04e61cf494f0f4c5465e38.tar
forums-0cc5cf57b23c7944ed04e61cf494f0f4c5465e38.tar.gz
forums-0cc5cf57b23c7944ed04e61cf494f0f4c5465e38.tar.bz2
forums-0cc5cf57b23c7944ed04e61cf494f0f4c5465e38.tar.xz
forums-0cc5cf57b23c7944ed04e61cf494f0f4c5465e38.zip
Merge remote-tracking branch 'MGaetan89/ticket/12415' into develop-ascraeus
* MGaetan89/ticket/12415: [ticket/12415] Use private message instead of "pm" accronym
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/profile.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index dc42693ca7..ab4db02053 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -68,8 +68,8 @@ $lang = array_merge($lang, array(
'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration.',
'DISPLAY_ON_MEMBERLIST' => 'Display on memberlist screen',
'DISPLAY_ON_MEMBERLIST_EXPLAIN' => 'If this option is enabled, the field will be displayed in the user rows on the memberlist screen.',
- 'DISPLAY_ON_PM' => 'Display on view pm screen',
- 'DISPLAY_ON_PM_EXPLAIN' => 'If this option is enabled, the field will be displayed in the mini-profile on the pm screen.',
+ 'DISPLAY_ON_PM' => 'Display on view private message screen',
+ 'DISPLAY_ON_PM_EXPLAIN' => 'If this option is enabled, the field will be displayed in the mini-profile on the private message screen.',
'DISPLAY_ON_VT' => 'Display on viewtopic screen',
'DISPLAY_ON_VT_EXPLAIN' => 'If this option is enabled, the field will be displayed in the mini-profile on the topic screen.',
'DISPLAY_PROFILE_FIELD' => 'Publicly display profile field',