1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00

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
This commit is contained in:
Cesar G
2014-04-25 07:33:22 -07:00
10 changed files with 19 additions and 41 deletions

View File

@@ -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 couldnt be added as they have disabled private message receipt.',
'POST_EDIT_PM' => 'Edit message',
'POST_FORWARD_PM' => 'Forward message',

View File

@@ -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.',