diff options
| author | Cesar G <prototech91@gmail.com> | 2014-04-25 07:33:22 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-04-25 07:33:22 -0700 |
| commit | b305ec5611f8f1ad16f4fa55699059c658370ecd (patch) | |
| tree | 049c836ade974d627d6ea85da51b5f49acc3f4d9 /phpBB/language/en | |
| parent | fefd6b7423654dd7297667132e1fd232954ccd3c (diff) | |
| parent | 65c8280fb6a7ca9382d3d57c51bcd2aeecb128c8 (diff) | |
| download | forums-b305ec5611f8f1ad16f4fa55699059c658370ecd.tar forums-b305ec5611f8f1ad16f4fa55699059c658370ecd.tar.gz forums-b305ec5611f8f1ad16f4fa55699059c658370ecd.tar.bz2 forums-b305ec5611f8f1ad16f4fa55699059c658370ecd.tar.xz forums-b305ec5611f8f1ad16f4fa55699059c658370ecd.zip | |
Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeus
* PayBas/ticket/12389:
[ticket/12389] Change "PM" to "Message"
[ticket/12389] Moved PM tools to UCP template
[ticket/12389] Replace email and print icons.
[ticket/12389] Change language of email friend
[ticket/12389] Move print topic & email topic icons to topic tools
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/viewtopic.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 40c8bd9f8e..5148589471 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -412,6 +412,7 @@ $lang = array_merge($lang, array( 'PM_SENTBOX' => 'Sent messages', 'PM_SUBJECT' => 'Message subject', 'PM_TO' => 'Send to', + 'PM_TOOLS' => 'Message tools', 'PM_USERS_REMOVED_NO_PM' => 'Some users couldn’t be added as they have disabled private message receipt.', 'POST_EDIT_PM' => 'Edit message', 'POST_FORWARD_PM' => 'Forward message', diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index b566f4b5c0..afbad5a0d6 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -58,7 +58,7 @@ $lang = array_merge($lang, array( 1 => 'Last edited by %2$s on %3$s, edited %1$d time in total.', 2 => 'Last edited by %2$s on %3$s, edited %1$d times in total.', ), - 'EMAIL_TOPIC' => 'Email friend', + 'EMAIL_TOPIC' => 'Email topic', 'ERROR_NO_ATTACHMENT' => 'The selected attachment does not exist anymore.', 'FILE_NOT_FOUND_404' => 'The file <strong>%s</strong> does not exist.', |