diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-20 19:50:29 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-20 19:50:29 -0400 |
| commit | f9307531a74a6b4162a8725faca22b9d70bb6f12 (patch) | |
| tree | 21b6befe79ea9a04996c16f2b995b7297ee851a9 /phpBB/language | |
| parent | 52c4726b5b8bf762b56d0fa06b24e09003d74811 (diff) | |
| parent | 8fa44cc3b9778f84ca20eab1c1d404c4f848eab4 (diff) | |
| download | forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.gz forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.bz2 forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.xz forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542:
[ticket/8542] Display custom profile fields in private messages
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index fe023958a9..084076d8dc 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -353,6 +353,7 @@ $lang = array_merge($lang, array( 'LIMIT_SESSIONS' => 'Limit sessions', 'LIMIT_SESSIONS_EXPLAIN' => 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.', 'LOAD_CPF_MEMBERLIST' => 'Allow styles to display custom profile fields in memberlist', + 'LOAD_CPF_PM' => 'Display custom profile fields in private messages', 'LOAD_CPF_VIEWPROFILE' => 'Display custom profile fields in user profiles', 'LOAD_CPF_VIEWTOPIC' => 'Display custom profile fields on topic pages', 'LOAD_USER_ACTIVITY' => 'Show user’s activity', diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 31a82fd38f..ea643157d8 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -66,6 +66,8 @@ $lang = array_merge($lang, array( 'DISPLAY_AT_PROFILE_EXPLAIN' => 'The user is able to change this profile field within the user control panel.', 'DISPLAY_AT_REGISTER' => 'Display on registration screen', 'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration.', + '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_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', |