diff options
| author | Cesar G <prototech91@gmail.com> | 2014-06-02 13:48:01 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-06-02 13:48:01 -0700 |
| commit | a090260a73d11f09ebd1d5d07f6d8445f6c3c5d9 (patch) | |
| tree | b8bf2cb6b49aa39dafb204711502358f47b3a6a6 | |
| parent | c000520add375da94d75d24f05ceb34ef0538475 (diff) | |
| parent | 8ba083f886d26280915b8ce67f61abec7dbe4169 (diff) | |
| download | forums-a090260a73d11f09ebd1d5d07f6d8445f6c3c5d9.tar forums-a090260a73d11f09ebd1d5d07f6d8445f6c3c5d9.tar.gz forums-a090260a73d11f09ebd1d5d07f6d8445f6c3c5d9.tar.bz2 forums-a090260a73d11f09ebd1d5d07f6d8445f6c3c5d9.tar.xz forums-a090260a73d11f09ebd1d5d07f6d8445f6c3c5d9.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12566] Also changed for ucp_pm_viewmessage.php
[ticket/12566] "Private messages" should be "Send pivate message"
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 53c69ceeb7..fc568abc68 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -283,7 +283,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) $contact_fields = array( array( 'ID' => 'pm', - 'NAME' => $user->lang['PRIVATE_MESSAGE'], + 'NAME' => $user->lang['SEND_PRIVATE_MESSAGE'], 'U_CONTACT' => $u_pm, ), array( diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 385a4cfe55..789d53c676 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1809,7 +1809,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $contact_fields = array( array( 'ID' => 'pm', - 'NAME' => $user->lang['PRIVATE_MESSAGES'], + 'NAME' => $user->lang['SEND_PRIVATE_MESSAGE'], 'U_CONTACT' => $u_pm, ), array( |