diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-10-08 11:13:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-10-08 11:13:01 +0000 |
| commit | 2fcb764f3e4cba372e44397395b395f3a928ad03 (patch) | |
| tree | 423c13e49dbbad096a6279075295284ba67b9a86 /phpBB/language | |
| parent | 3f85d0134174a453d707de1a1b6975c6bf54ae14 (diff) | |
| download | forums-2fcb764f3e4cba372e44397395b395f3a928ad03.tar forums-2fcb764f3e4cba372e44397395b395f3a928ad03.tar.gz forums-2fcb764f3e4cba372e44397395b395f3a928ad03.tar.bz2 forums-2fcb764f3e4cba372e44397395b395f3a928ad03.tar.xz forums-2fcb764f3e4cba372e44397395b395f3a928ad03.zip | |
- more pm updates
git-svn-id: file:///svn/phpbb/trunk@4998 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/ucp.php | 38 | ||||
| -rw-r--r-- | phpBB/language/en/viewforum.php | 2 |
2 files changed, 36 insertions, 4 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 164f862e43..f107e4ac0e 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -37,7 +37,7 @@ $lang += array( 'ADD_BCC' => 'Add [Bcc]', 'ADD_FOES' => 'Add new foes', 'ADD_FOES_EXPLAIN' => 'You may enter several usernames each on a different line', - 'ADD_FOLDER' => 'Add Folder', + 'ADD_FOLDER' => 'Add folder', 'ADD_FRIENDS' => 'Add new friends', 'ADD_FRIENDS_EXPLAIN' => 'You may enter several usernames each on a different line', 'ADD_NEW_RULE' => 'Add new Rule', @@ -68,6 +68,10 @@ $lang += array( 'BOOKMARKS_DISABLED' => 'Bookmarks are disabled on this board', 'BOOKMARKS_REMOVED' => 'Bookmarks removed successfully', + 'CANNOT_EDIT_MESSAGE_TIME' => 'You can no longer edit or delete that message', + 'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages can not be moved to the folder which will be removed.', + 'CANNOT_RENAME_FOLDER' => 'This folder can not be renamed.', + 'CANNOT_REMOVE_FOLDER' => 'This folder can not be removed.', 'CHANGE_PASSWORD' => 'Change password', 'CHANGE_PASSWORD_EXPLAIN' => 'Must be between %1$d and %2$d characters.', 'CLICK_RETURN_FOLDER' => 'Click %1$sHere%2$s to return to your "%3$s" Folder', @@ -107,7 +111,9 @@ $lang += array( 'DELETE_MARKED_PM' => 'Delete Marked Messages', 'DELETE_MARKED_PM_CONFIRM' => 'Are you sure you want to delete all marked messages?', 'DELETE_OLDEST_MESSAGES' => 'Delete Oldest Messages', - 'DELETE_PM' => 'Delete PM', + 'DELETE_MESSAGE' => 'Delete Message', + 'DELETE_MESSAGE_CONFIRM' => 'Are you sure you want to delete this private message?', + 'DELETE_MESSAGES_IN_FOLDER' => 'Delete all messages within removed folder', 'DELETE_RULE' => 'Delete Rule', 'DELETE_RULE_CONFIRM' => 'Are you sure you want to delete this rule?', 'DISABLE_CENSORS' => 'Enable Word censoring', @@ -144,6 +150,8 @@ $lang += array( 'FOLDER_MESSAGE_STATUS' => '%1$d from %2$d messages stored', 'FOLDER_NAME_EXIST' => 'Folder <b>%s</b> already exist', 'FOLDER_OPTIONS' => 'Folder Options', + 'FOLDER_RENAMED' => 'Folder successfully renamed', + 'FOLDER_REMOVED' => 'Folder successfully removed', 'FOLDER_STATUS_MSG' => 'Folder is %1$d%% full (%2$d from %3$d messages stored)', 'FORWARD_PM' => 'Forward PM', 'FRIEND_MESSAGE' => 'Message from friend', @@ -179,16 +187,18 @@ $lang += array( 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folder reached', 'MESSAGE_COLOURS' => 'Message Colours', 'MESSAGE_HISTORY' => 'Message History', + 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by it\'s author before it was delivered', 'MESSAGE_REPORTED' => 'Click to view reports', 'MESSAGE_REPORTED_MESSAGE' => 'Reported Message', 'MESSAGE_STORED' => 'The message has been send successfully', - 'MINIMUM_KARMA' => 'Minimum User Karma', - 'MINIMUM_KARMA_EXPLAIN' => 'Posts by users with Karma less than this will be ignored.', + 'MOVE_DELETED_MESSAGES_TO' => 'Move messages from removed folder to', 'MOVE_DOWN' => 'Move down', + 'MOVE_PM_ERROR' => 'An error occurred while moving the messages to the new folder, only %1d from %2d messages were moved.', 'MOVE_TO_FOLDER' => 'Move to Folder', 'MOVE_UP' => 'Move up', 'NEW_EMAIL_ERROR' => 'The email addresses you entered do not match.', + 'NEW_FOLDER_NAME' => 'New folder name', 'NEW_PASSWORD' => 'Password', 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', 'NEW_PASSWORD_EXPLAIN' => 'Must be between %1$d and %2$d characters.', @@ -202,10 +212,26 @@ $lang += array( 'NOT_ENOUGH_SPACE_FOLDER' => 'The Destination Folder "%s" seems to be full. The requested action has not been taken.', 'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.', 'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.', + 'NO_ACTION_MODE' => 'No message action specified', + 'NO_AUTHOR' => 'No author defined for this message', + + 'NO_AUTH_DELETE_MESSAGE' => 'You are not authorized to delete private messages.', + 'NO_AUTH_EDIT_MESSAGE' => 'You are not authorized to edit private messages.', + 'NO_AUTH_FORWARD_MESSAGE' => 'You are not authorized to forward private messages.', + 'NO_AUTH_GROUP_MESSAGE' => 'You are not authorized to send private messages to groups.', + 'NO_AUTH_QUOTE_MESSAGE' => 'You are not authorized to quote private messages.', + 'NO_AUTH_READ_MESSAGE' => 'You are not authorized to read private messages.', + 'NO_AUTH_READ_REMOVED_MESSAGE' => 'You are not able to read this message because it was removed by the author.', + 'NO_AUTH_REPLY_MESSAGE' => 'You are not authorized to reply to private messages.', + 'NO_AUTH_SEND_MESSAGE' => 'You are not authorized sending private messages.', + + 'NO_BOOKMARKS_SELECTED' => 'You have selected no bookmarks', 'NO_FOES' => 'No foes currently defined', 'NO_FRIENDS' => 'No friends currently defined', 'NO_FRIENDS_OFFLINE' => 'No friends offline', 'NO_FRIENDS_ONLINE' => 'No friends online', + 'NO_MESSAGE' => 'Private Message could not be found', + 'NO_NEW_FOLDER_NAME' => 'You have to specify a new folder name', 'NO_NEWER_PM' => 'No newer messages', 'NO_OLDER_PM' => 'No older messages', 'NO_RECIPIENT' => 'No recipient defined', @@ -245,10 +271,14 @@ $lang += array( 'REMOVE_SELECTED_BOOKMARKS_CONFIRM' => 'Are you sure you want to delete all selected bookmarks?', 'REMOVE_BOOKMARK_MARKED' => 'Remove marked bookmarks', 'REMOVE_FOLDER' => 'Remove folder', + 'REMOVE_FOLDER_CONFIRM' => 'Are you sure you want to remove this folder?', + 'RENAME' => 'Rename', + 'RENAME_FOLDER' => 'Rename folder', 'REPLIED_MESSAGE' => 'Replied to Message', 'REPORT_PM' => 'Report PM', 'REPORT_PM_NOTIFY' => 'Send report notifications as PM', 'REPORT_PM_NOTIFY_EXPLAIN' => 'If enabled, notifications and status updates to new reports get send as PM instead of emailing them.', + 'RETURN_FOLDER' => 'Click %1$sHere%2$s to return to folder', 'RETURN_UCP' => 'Click %sHere%s to return to the User Control Panel', 'RULE_ADDED' => 'Rule successfully added', 'RULE_ALREADY_DEFINED' => 'This rule was defined previously', diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php index 0769970918..ff8f4d1e40 100644 --- a/phpBB/language/en/viewforum.php +++ b/phpBB/language/en/viewforum.php @@ -47,6 +47,8 @@ $lang += array( 'POST_FORUM_LOCKED' => 'Forum is locked', 'POST_NEW_TOPIC' => 'Post new topic', + 'SORRY_AUTH_READ' => 'You are not authorized to read this forum', + 'TOPICS_MARKED' => 'The topics for this forum have now been marked read', 'VIEW_FORUM' => 'View Forum', |