diff options
| author | Cesar G <prototech91@gmail.com> | 2014-10-16 19:32:11 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-10-16 19:32:11 -0700 |
| commit | 39e51e559980d239a08a59e789a1165cc2bbcfff (patch) | |
| tree | 23bb90d895d1c36096de66451e536805591d6d31 /phpBB/language/en | |
| parent | 6768490f692df82d050d84755b0e40df8ee903d4 (diff) | |
| parent | 1a128f9a768fac8e27c960172153b0be9cc53b61 (diff) | |
| download | forums-39e51e559980d239a08a59e789a1165cc2bbcfff.tar forums-39e51e559980d239a08a59e789a1165cc2bbcfff.tar.gz forums-39e51e559980d239a08a59e789a1165cc2bbcfff.tar.bz2 forums-39e51e559980d239a08a59e789a1165cc2bbcfff.tar.xz forums-39e51e559980d239a08a59e789a1165cc2bbcfff.zip | |
Merge remote-tracking branch 'PayBas/ticket/12796' into develop-ascraeus
* PayBas/ticket/12796:
[ticket/12796] Use dedicated lang vars
[ticket/12796] Use & in path
[ticket/12796] Add view own profile to UCP (and vice versa)
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/memberlist.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 1a05975892..b8c626d331 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -54,6 +54,8 @@ $lang = array_merge($lang, array( 'DEST_LANG' => 'Language', 'DEST_LANG_EXPLAIN' => 'Select an appropriate language (if available) for the recipient of this message.', + 'EDIT_PROFILE' => 'Edit profile', + 'EMAIL_BODY_EXPLAIN' => 'This message will be sent as plain text, do not include any HTML or BBCode. The return address for this message will be set to your email address.', 'EMAIL_DISABLED' => 'Sorry but all email related functions have been disabled.', 'EMAIL_SENT' => 'The email has been sent.', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 101292e171..ad7063d3f9 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -589,6 +589,7 @@ $lang = array_merge($lang, array( ), 'VIEW_PREVIOUS_HISTORY' => 'Previous PM in history', 'VIEW_PREVIOUS_PM' => 'Previous PM', + 'VIEW_PROFILE' => 'View profile', 'VIEW_SIGS' => 'Display signatures', 'VIEW_SMILIES' => 'Display smilies as images', 'VIEW_TOPICS_DAYS' => 'Display topics from previous days', |