aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/admin.php34
-rw-r--r--phpBB/language/en/common.php49
-rw-r--r--phpBB/language/en/email/privmsg_notify.txt8
-rw-r--r--phpBB/language/en/mcp.php1
-rw-r--r--phpBB/language/en/posting.php4
-rw-r--r--phpBB/language/en/ucp.php125
-rw-r--r--phpBB/language/en/viewforum.php4
7 files changed, 180 insertions, 45 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php
index 6871b738c4..ae6683d754 100644
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -55,6 +55,7 @@ $lang += array(
'BOARD_DEFAULTS' => 'Board Defaults',
'BOARD_SETTINGS' => 'Board Settings',
'COOKIE_SETTINGS' => 'Cookie Settings',
+ 'MESSAGE_SETTINGS' => 'Message Settings',
'EMAIL_SETTINGS' => 'Email Settings',
'MASS_EMAIL' => 'Mass Email',
'SERVER_SETTINGS' => 'Server Settings',
@@ -500,7 +501,22 @@ $lang += array(
'acl_u_search' => 'Can search board',
'acl_u_savedrafts' => 'Can save drafts',
'acl_u_download' => 'Can download files',
- 'acl_u_attach' => 'Can attach files'
+ 'acl_u_attach' => 'Can attach files',
+
+ 'acl_u_pm_attach' => 'Can attach files in private messages',
+ 'acl_u_pm_html' => 'Can post HTML in private messages',
+ 'acl_u_pm_bbcode' => 'Can post BBCode in private messages',
+ 'acl_u_pm_smilies' => 'Can post smilies in private messages',
+ 'acl_u_pm_download' => 'Can download files in private messages',
+ 'acl_u_pm_sig' => 'Can use signature in private messages',
+ 'acl_u_pm_report' => 'Can report private messages',
+ 'acl_u_pm_edit' => 'Can edit own private messages',
+ 'acl_u_pm_printpm' => 'Can print private messages',
+ 'acl_u_pm_emailpm' => 'Can email private messages',
+ 'acl_u_pm_forward' => 'Can forward private messages',
+ 'acl_u_pm_delete' => 'Can remove private messages from own folder',
+ 'acl_u_pm_img' => 'Can post images in private messages',
+ 'acl_u_pm_flash' => 'Can post Flash in private messages'
);
// User pruning
@@ -584,6 +600,14 @@ $lang += array(
'ERR_JAB_PASSFAIL' => 'Password update failed, %s',
);
+// Message Settings
+$lang += array(
+ 'BOXES_MAX' => 'Max private message folders',
+ 'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages..',
+ 'BOXES_LIMIT' => 'Max private messages per box',
+ 'BOXES_LIMIT_EXPLAIN' => 'Users may receive no more than this many messages in each of their private message boxes or zero for unlimited messages.',
+);
+
// Cookie settings
$lang += array(
'COOKIE_SETTINGS_EXPLAIN' => 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
@@ -803,10 +827,6 @@ $lang += array(
'DEFAULT_DATE_FORMAT_EXPLAIN'=> 'The date format is the same as the PHP date function.',
'SYSTEM_TIMEZONE' => 'System Timezone',
'SYSTEM_DST' => 'Enable Daylight Savings Time',
- 'BOXES_MAX' => 'Max private message folders',
- 'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages..',
- 'BOXES_LIMIT' => 'Max private messages per box',
- 'BOXES_LIMIT_EXPLAIN' => 'Users may receive no more than this many messages in each of their private message boxes or zero for unlimited messages.',
'ALLOW_TOPIC_NOTIFY' => 'Allow Topic Watching',
'ALLOW_FORUM_NOTIFY' => 'Allow Forum Watching',
'ALLOW_NAME_CHANGE' => 'Allow Username changes',
@@ -824,7 +844,7 @@ $lang += array(
'MAX_SIG_LENGTH' => 'Maximum signature length',
'MAX_SIG_LENGTH_EXPLAIN' => 'Maximum number of characters in user signatures.',
'ALLOW_NO_CENSORS' => 'Allow Disable of Censors',
- 'ALLOW_NO_CENSORS_EXPLAINS' => 'User can disable word censoring.',
+ 'ALLOW_NO_CENSORS_EXPLAIN' => 'User can disable word censoring.',
);
// Karma settings
@@ -854,6 +874,7 @@ $lang += array(
// Forum admin
$lang += array(
+ 'FORUM_ADMIN' => 'Forum Administration',
'FORUM_ADMIN_EXPLAIN' => 'In phpBB 2.2 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.',
'FORUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
'FORUM_DELETE' => 'Delete Forum',
@@ -1759,6 +1780,7 @@ $lang += array(
'EXTENSION_GROUP_DELETED' => 'Extension Group successfully deleted',
'ALLOWED_FORUMS' => 'Allowed Forums',
'ALLOWED_FORUMS_EXPLAIN' => 'Able to post the assigned extensions at the following forums',
+ 'ALLOW_IN_PM' => 'Allowed in private messaging',
'ALLOW_ALL_FORUMS' => 'Allow All Forums',
'ALLOW_SELECTED_FORUMS' => 'Only Forums selected below',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a2483ec7a3..21923710f0 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -46,9 +46,11 @@ $lang += array(
'ACP' => 'Administration Control Panel',
'ACTIVE_ERROR' => 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.',
'ALLOWED' => 'Allowed',
+ 'ALL_MESSAGES' => 'All Messages',
'ALL_POSTS' => 'All Posts',
'ALL_TIMES' => 'All times are %s %s',
'ALL_TOPICS' => 'All Topics',
+ 'AND' => 'And',
'ARE_WATCHING_FORUM' => 'You have subscribed to receive updates on this forum',
'ARE_WATCHING_TOPIC' => 'You have subscribed to receive updates on this topic.',
'ASCENDING' => 'Ascending',
@@ -72,13 +74,17 @@ $lang += array(
'BYTES' => 'Bytes',
'CANCEL' => 'Cancel',
+ 'CLICK_VIEW_PRIVMSG' => 'Click %sHere%s to visit your Inbox',
'CONFIRM' => 'Confirm',
'CONGRATULATIONS' => 'Congratulations to',
'CURRENT_TIME' => 'The time is %s',
'DAY' => 'Day',
+ 'DAYS' => 'Days',
'DELETE' => 'Delete',
'DESCENDING' => 'Descending',
+ 'DISABLED' => 'Disabled',
+ 'DISPLAY_MESSAGES' => 'Display messages from previous',
'DISPLAY_POSTS' => 'Display posts from previous',
'DISPLAY_TOPICS' => 'Display topics from previous',
'DOWNLOADED' => 'Downloaded',
@@ -89,6 +95,8 @@ $lang += array(
'EMAIL' => 'Email',
'EMAIL_ADDRESS' => 'Email address',
'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.',
+ 'ENABLED' => 'Enabled',
+ 'EXTENSION' => 'Extension',
'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension <b>%s</b> has been deactivated and can no longer be displayed',
'FAQ' => 'FAQ',
@@ -96,6 +104,7 @@ $lang += array(
'FILESIZE' => 'Filesize',
'FILE_COMMENT' => 'File comment',
'FIND_USERNAME' => 'Find a member',
+ 'FOLDER' => 'Folder',
'FORGOT_PASS' => 'I forgot my password',
'FORUM' => 'Forum',
'FORUMS_MARKED' => 'All forums have been marked read',
@@ -136,7 +145,9 @@ $lang += array(
'HOURS' => 'Hours',
'ICQ_STATUS' => 'ICQ Status',
+ 'IF' => 'If',
'INDEX' => 'Index page',
+ 'INFORMATION' => 'Information',
'INTERESTS' => 'Interests',
'INVALID_EMAIL_LOG' => '<b>%s</b> possibly an invalid email address?',
'IP' => 'IP',
@@ -174,6 +185,7 @@ $lang += array(
'LOCK_POST_EXPLAIN' => 'Prevent editing',
'LOCK_TOPIC' => 'Lock Topic',
'LOGIN' => 'Login',
+ 'LOGIN_CHECK_PM' => 'Log in to check your private messages',
'LOGIN_ERROR' => 'You have specified an incorrect username or password. Please check them both and try again. If you continue to have problems please contact a board administrator.',
'LOGIN_FORUM' => 'To view or post in this forum you must enter a password.',
'LOGIN_INFO' => 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilies. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
@@ -199,6 +211,8 @@ $lang += array(
'MOVE' => 'Move',
'NEWEST_USER' => 'Our newest member <b>%s%s%s</b>',
+ 'NEW_MESSAGE' => 'New Message',
+ 'NEW_MESSAGES' => 'New Messages',
'NEW_PM' => '<b>%d</b> new message',
'NEW_PMS' => '<b>%d</b> new messages',
'NEW_POST' => 'New post',
@@ -213,6 +227,8 @@ $lang += array(
'NO_FORUMS' => 'This board has no forums',
'NO_GROUP' => 'The requested usergroup does not exist.',
'NO_MEMBERS' => 'No members found for this search criteria',
+ 'NO_MESSAGES' => 'No Messages',
+ 'NO_NEW_MESSAGES' => 'No new messages',
'NO_NEW_PM' => '<b>0</b> new messages',
'NO_NEW_POSTS' => 'No new posts',
'NO_POSTS' => 'No Posts',
@@ -245,6 +261,9 @@ $lang += array(
'PREVIEW' => 'Preview',
'PREVIOUS' => 'Previous',
'PRIVACY' => 'Privacy Policy',
+ 'PRIVATE_MESSAGE' => 'Private Message',
+ 'PRIVATE_MESSAGES' => 'Private Messages',
+ 'PRIVATE_MESSAGING' => 'Private Messaging',
'PROFILE' => 'User Control Panel',
'READING_FORUM' => 'Viewing topics in %s',
@@ -311,6 +330,7 @@ $lang += array(
'SUBMIT' => 'Submit',
'TERMS_USE' => 'Terms of Use',
+ 'TIME' => 'Time',
'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.',
'TOO_MANY_VOTE_OPTIONS' => 'You have tried to vote for too many options.',
'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.',
@@ -334,12 +354,15 @@ $lang += array(
'TOTAL_USERS_OTHER' => 'Total members <b>%d</b>',
'TOTAL_USERS_ZERO' => 'Total members <b>0</b>',
+ 'UNKNOWN_BROWSER' => 'Unknown Browser',
'UNMARK_ALL' => 'Unmark all',
+ 'UNREAD_MESSAGES' => 'Unread Messages',
'UNREAD_PM' => '<b>%d</b> unread message',
'UNREAD_PMS' => '<b>%d</b> unread messages',
'URL_REDIRECT' => 'If your browser does not support meta redirection please click %sHERE%s to be redirected.',
'USERGROUPS' => 'Groups',
'USERNAME' => 'Username',
+ 'USERNAMES' => 'Usernames',
'USER_POST' => '%d Post',
'USER_POSTS' => '%d Posts',
@@ -368,6 +391,9 @@ $lang += array(
'YEAR' => 'Year',
'YES' => 'Yes',
'YOU_LAST_VISIT' => 'Last visit on %s',
+ 'YOU_NEW_PM' => 'A new private message is waiting for you in your Inbox',
+ 'YOU_NEW_PMS' => 'New private messages are waiting for you in your Inbox',
+ 'YOU_NO_NEW_PM' => 'No new private messages are waiting for you',
'datetime' => array(
'Sunday' => 'Sunday',
@@ -467,8 +493,6 @@ $unused = array(
'CANNOT_SPLIT_FIRST_POST' => 'You cannot split the first post of a topic',
'CONTACT' => 'Contact',
'Cannot_send_privmsg' => 'Sorry but the administrator has prevented you from sending private messages',
- 'Click_return_inbox' => 'Click %sHere%s to return to your Inbox',
- 'Click_view_privmsg' => 'Click %sHere%s to visit your Inbox',
'Confirm_delete_pm' => 'Are you sure you want to delete this message?',
'Confirm_delete_pms' => 'Are you sure you want to delete these messages?',
'Confirm_unsub' => 'Are you sure you want to unsubscribe from this group?',
@@ -477,7 +501,6 @@ $unused = array(
'Could_not_anon_user' => 'You cannot make Anonymous a group member',
'Current_memberships' => 'Current memberships',
'DESCRIPTION' => 'Description',
- 'DISABLED' => 'Disabled',
'DOWNLOAD' => 'Download',
'Date' => 'Date',
'Delete_all' => 'Delete All',
@@ -488,11 +511,8 @@ $unused = array(
'Display_messages' => 'Display messages from previous',
'EDIT_OWN_POSTS' => 'Sorry but you can only edit your own posts.',
'EMAIL_TAKEN_EMAIL' => 'The email address you specified is already in use, please select an alternative.',
- 'ENABLED' => 'Enabled',
'ERROR' => 'Error',
- 'EXTENSION' => 'Extension',
'Edit_message' => 'Edit private message',
- 'Edit_pm' => 'Edit message',
'Find' => 'Find',
'Flag' => 'Flag',
'From' => 'From',
@@ -549,12 +569,6 @@ $unused = array(
'POST_TOPIC_LOCKED' => 'Topic is locked',
'Pending_members' => 'Pending Members',
'Pending_this_group' => 'Your membership of this group is pending',
- 'Post_new_pm' => 'Post message',
- 'Post_quote_pm' => 'Quote message',
- 'Post_reply_pm' => 'Reply to message',
- 'Private_Message' => 'Private Message',
- 'Private_Messages' => 'Private Messages',
- 'Private_Messaging' => 'Private Messaging',
'RATING' => 'Rating',
'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement',
'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement',
@@ -580,13 +594,10 @@ $unused = array(
'Send_a_new_message' => 'Send a new private message',
'Send_a_reply' => 'Reply to a private message',
'Sent' => 'Sent',
- 'Sentbox' => 'Sentbox',
'Sentbox_size' => 'Your Sentbox is %d%% full',
- 'Subscribe' => 'Subscribe',
'This_closed_group' => 'This is a closed group, no more users accepted',
'This_hidden_group' => 'This is a hidden group, automatic user addition is not allowed',
'This_open_group' => 'This is an open group, click to request membership',
- 'To' => 'To',
'To_long_subject' => 'The subject is too long it must be 60 characters or less.',
'UNREAD_NO_PM' => 'You have no unread private messages',
'UNWATCHED_FORUMS' => 'You are no longer watching the selected forums.',
@@ -595,16 +606,10 @@ $unused = array(
'UPDATE' => 'Update',
'USERS' => 'Users',
'USER_OFFLINE' => 'Offline',
- 'Unread_message' => 'Unread message',
'Unsub_success' => 'You have been un-subscribed from this group.',
- 'Unsubscribe' => 'Unsubscribe',
'User_is_member_group' => 'User is already a member of this group',
'VIEWING_MESSAGES' => 'Viewing Private Messages',
- 'View_Information' => 'View Information',
- 'View_forum' => 'View Forum',
- 'YOU_NEW_PM' => 'A new private message is waiting for you in your Inbox',
- 'YOU_NEW_PMS' => 'New private messages are waiting for you in your Inbox',
- 'YOU_NO_NEW_PM' => 'No new private messages are waiting for you',
+ 'View_Information' => 'View Information'
);
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
index 2a96ee8c61..7dae75ecc9 100644
--- a/phpBB/language/en/email/privmsg_notify.txt
+++ b/phpBB/language/en/email/privmsg_notify.txt
@@ -3,10 +3,14 @@ Charset: iso-8859-1
Hello {USERNAME},
-You have received a new private message to your account on "{SITENAME}" and you have requested that you be notified on this event. You can view your new message by clicking on the following link:
+You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject:
+
+{SUBJECT}
+
+You can view your new message by clicking on the following link:
{U_INBOX}
-Remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
+You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
{EMAIL_SIG} \ No newline at end of file
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index b694d1b39e..5f1bcabdbc 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -148,7 +148,6 @@ $lang += array(
'SPLIT_TOPIC_EXPLAIN' => 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post',
'THIS_POST_IP' => 'IP for this post',
- 'TIME' => 'Time',
'TOPICS_APPROVED_SUCCESS' => 'The selected topics have been approved',
'TOPICS_DELETED_SUCCESS'=> 'The selected topics have been successfully removed from the database',
'TOPICS_FORKED_SUCCESS' => 'The selected topics have been copied successfully',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 1d673cf4f6..d0f55185e8 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -71,8 +71,10 @@ $lang += array(
'DAYS' => 'Days',
'DELETE_FILE' => 'Delete File',
'DELETE_MESSAGE' => 'Delete Message',
+ 'DELETE_MESSAGE_CONFIRM' => 'Are you sure you want to delete this message?',
'DELETE_OWN_POSTS' => 'Sorry but you can only delete your own posts.',
'DELETE_POST' => 'Delete',
+ 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this message?',
'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered',
'DISABLE_BBCODE' => 'Disable BBCode',
'DISABLE_HTML' => 'Disable HTML',
@@ -107,7 +109,6 @@ $lang += array(
'IMAGES_ARE_OFF' => '[img] is <u>OFF</u>',
'IMAGES_ARE_ON' => '[img] is <u>ON</u>',
- 'INFORMATION' => 'Information',
'INVALID_FILENAME' => '%s is an invalid filename',
'KARMA_LEVEL' => 'Karma Level',
@@ -117,6 +118,7 @@ $lang += array(
'LOAD_DRAFT_EXPLAIN' => 'Here you are able to select the draft you want to continue writing. Your current post will be canceled, all current post contents will be deleted. View, edit and delete drafts within your User Control Panel.',
'MESSAGE_BODY_EXPLAIN' => 'Enter your message here, it may contain no more than <b>%d</b> characters.',
+ 'MESSAGE_DELETED' => 'Your message has been deleted successfully',
'MORE_EMOTICONS' => 'View more Emoticons',
'NOTIFY_REPLY' => 'Send me an email when a reply is posted',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 8925bfc5ab..5f33ca3efe 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -33,10 +33,15 @@ $lang += array(
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information',
'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this forum requires account activation by the administrator. An email has been sent to them and you will be informed when your account has been activated',
+ 'ADD' => 'Add',
+ '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_FRIENDS' => 'Add new friends',
'ADD_FRIENDS_EXPLAIN' => 'You may enter several usernames each on a different line',
+ 'ADD_NEW_RULE' => 'Add new Rule',
+ 'ADD_TO' => 'Add [To]',
'ADMIN_EMAIL' => 'Administrators can email me information',
'AGREE' => 'I agree to these terms',
'ALLOW_PM' => 'Allow users to send you private messages',
@@ -61,6 +66,7 @@ $lang += array(
'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',
'CONFIRMATION' => 'Confirmation of registration',
'CONFIRM_CODE' => 'Confirmation code',
'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as you see it in the image, it is case sensitive, zero has a diagonal line through it.',
@@ -75,6 +81,7 @@ $lang += array(
'COPPA_BIRTHDAY' => 'To continue with the registration procedure please tell us when you were born.',
'COPPA_COMPLIANCE' => 'COPPA Compliance',
'COPPA_EXPLAIN' => 'Please note that clicking submit will create your account. However it cannot be activated until a parent or guardian approves your registration. You will be emailed a copy of the necessary form with details of where to send it.',
+ 'CREATE_FOLDER' => 'Add Folder...',
'CURRENT_IMAGE' => 'Current Image',
'CURRENT_PASSWORD' => 'Current password',
'CURRENT_PASSWORD_EXPLAIN' => 'You must confirm your current password if you wish to change it, alter your email address or username.',
@@ -85,9 +92,12 @@ $lang += array(
'DEFAULT_HTML' => 'Enable HTML by default',
'DEFAULT_NOTIFY' => 'Notify me upon replies by default',
'DEFAULT_SMILE' => 'Enable smilies by default',
+ 'DEFINED_RULES' => 'Defined Rules',
'DELETE_ALL' => 'Delete all',
'DELETE_AVATAR' => 'Delete Image',
'DELETE_MARKED' => 'Delete Marked',
+ 'DELETE_RULE' => 'Delete Rule',
+ 'DELETE_RULE_CONFIRM' => 'Are you sure you want to delete this rule?',
'DISABLE_CENSORS' => 'Enable Word censoring',
'DISPLAY_GALLERY' => 'Display gallery',
'DOWNLOADS' => 'Downloads',
@@ -99,9 +109,16 @@ $lang += array(
'EMAIL_REMIND' => 'This must be the email address you supplied when registering.',
'EMPTY_DRAFT' => 'You must enter a message to submit your changes',
'EMPTY_DRAFT_TITLE' => 'You must enter a draft title',
+ 'EXPORT_AS_XML' => 'Export as XML',
+ 'EXPORT_AS_CSV' => 'Export as CSV',
+ 'EXPORT_AS_TXT' => 'Export as TXT',
+ 'EXPORT_AS_MSG' => 'Export as MSG',
'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible and personal messages will not be permitted. Please note that you cannot ignore moderators or administrators.',
'FOES_UPDATED' => 'Your foes list has been updated successfully',
+ 'FOLDER_MESSAGE_STATUS' => '%1$d from %2$d messages stored',
+ 'FOLDER_STATUS_MSG' => 'Folder is %1$d%% full (%2$d from %3$d messages stored)',
+ 'FORWARD_PM' => 'Forward PM',
'FRIENDS' => 'Friends',
'FRIENDS_EXPLAIN' => 'Friends enable you quick access to members you communicate with frequently. If the template has relevant support any posts made by a friend may be highlighted.',
'FRIENDS_OFFLINE' => 'Offline',
@@ -120,6 +137,12 @@ $lang += array(
'LOGIN_REDIRECT' => 'You have been successfully logged in.',
'LOGOUT_REDIRECT' => 'You have been successfully logged out.',
+ 'MARK_IMPORTANT' => 'Mark as Important',
+ 'MARKED_MESSAGE' => 'Marked Message',
+ 'MESSAGE_COLOURS' => 'Message Colours',
+ 'MESSAGE_FROM_FOE' => 'Message from foe',
+ 'MESSAGE_FROM_FRIEND' => 'Message from friend',
+ 'MESSAGE_HISTORY' => 'Message History',
'MINIMUM_KARMA' => 'Minimum User Karma',
'MINIMUM_KARMA_EXPLAIN' => 'Posts by users with Karma less than this will be ignored.',
@@ -134,27 +157,56 @@ $lang += array(
'NOTIFY_METHOD_IM' => 'Jabber only',
'NOTIFY_ON_PM' => 'Email me on new private messages',
'NOT_AGREE' => 'I do not agree to these terms',
+ '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_FOES' => 'No foes currently defined',
'NO_FRIENDS' => 'No friends currently defined',
'NO_FRIENDS_OFFLINE' => 'No friends offline',
'NO_FRIENDS_ONLINE' => 'No friends online',
+ 'NO_NEWER_PM' => 'No newer messages',
+ 'NO_OLDER_PM' => 'No older messages',
+ 'NO_RECIPIENT' => 'No recipient defined',
+ 'NO_RULES_DEFINED' => 'No rules defined',
+ 'NO_SAVED_DRAFTS' => 'No drafts saved',
'NO_WATCHED_FORUMS' => 'You are not watching any forums.',
'NO_WATCHED_TOPICS' => 'You are not watching any topics.',
'PASSWORD_ACTIVATED' => 'Your new password has been activated',
'PASSWORD_UPDATED' => 'Your password has been sent successfully to your original email address.',
'PM_DISABLED' => 'Private messaging has been disabled on this board',
+ 'PM_ICON' => 'PM Icon',
+ 'PM_INBOX' => 'Inbox',
+ 'PM_OUTBOX' => 'Outbox',
+ 'PM_SENTBOX' => 'Sentbox',
+ 'PM_TO' => 'Send To',
'POPUP_ON_PM' => 'Pop up window on new private message',
+ 'POST_EDIT_PM' => 'Edit message',
+ 'POST_FORWARD_PM' => 'Forward message',
+ 'POST_NEW_PM' => 'Post message',
+ 'POST_PM_LOCKED' => 'Private Messaging is locked',
+ 'POST_QUOTE_PM' => 'Quote message',
+ 'POST_REPLY_PM' => 'Reply to message',
+ 'PRINT_PM' => 'Print View',
'PREFERENCES_UPDATED' => 'Your preferences have been updated.',
'PROFILE_INFO_NOTICE' => 'Please note that this information will be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
'PROFILE_UPDATED' => 'Your profile has been updated.',
+ 'RECIPIENT' => 'Recipient',
+ 'RECIPIENTS' => 'Recipients',
'REGISTRATION' => 'Registration',
+ 'RELEASE_MESSAGES' => 'Click %sHere%s to release the on-hold messages, they will be re-sorted into the appropiate folder if enough space is made available.',
+ 'REMOVE_ADDRESS' => 'Remove address',
+ 'REMOVE_FOLDER' => 'Remove folder',
+ 'REPLIED_MESSAGE' => 'Replied to Message',
+ 'REPORTED_MESSAGE' => 'Reported Message',
'RETURN_PAGE' => 'Click %sHere%s to return to the previous page',
'RETURN_UCP' => 'Click %sHere%s to return to the User Control Panel',
+ 'RULE_DELETED' => 'Rule successfully removed',
'SEARCH_YOUR_POSTS' => 'Show your posts',
'SEND_PASSWORD' => 'Send password',
+ 'SENT_AT' => 'Sent At',
'SHOW_EMAIL' => 'Users can contact me by email',
'SIGNATURE_EXPLAIN' => 'This is a block of text that can be added to posts you make. There is a %d character limit',
'SIGNATURE_PREVIEW' => 'Your signature will appear like this in posts',
@@ -168,38 +220,48 @@ $lang += array(
'SORT_SIZE' => 'Filesize',
'TIMEZONE' => 'Timezone',
+ 'TO' => 'To',
+ 'TOO_MANY_RECIPIENTS' => 'Too many recipients',
'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
'UCP' => 'User Control Panel',
'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will an email at the address you specified.',
'UCP_AGREEMENT' => 'While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.',
'UCP_AIM' => 'AOL Instant Messenger',
- 'UCP_AVATAR' => 'Your avatar',
'UCP_COPPA_BEFORE' => 'Before %s',
'UCP_COPPA_ON_AFTER' => 'On or After %s',
- 'UCP_DRAFTS' => 'Saved drafts',
'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. You will recieve an email at the address you provide that contains an account activation link.',
- 'UCP_FOES' => 'Foes',
- 'UCP_FRIENDS' => 'Friends',
- 'UCP_FRONT' => 'Front page',
'UCP_ICQ' => 'ICQ Number',
'UCP_JABBER' => 'Jabber Address',
'UCP_MAIN' => 'Overview',
+ 'UCP_MAIN_DRAFTS' => 'Saved drafts',
+ 'UCP_MAIN_FRONT' => 'Front page',
+ 'UCP_MAIN_SUBSCRIBED' => 'Subscribed',
'UCP_MSNM' => 'MSN Messenger',
'UCP_NO_ATTACHMENTS' => 'You have posted no files',
- 'UCP_OPTIONS' => 'Options',
- 'UCP_PERSONAL' => 'Personal Settings',
- 'UCP_POST' => 'Posting Messages',
'UCP_PREFS' => 'Preferences',
+ 'UCP_PREFS_PERSONAL' => 'Personal Settings',
+ 'UCP_PREFS_POST' => 'Posting Messages',
+ 'UCP_PREFS_VIEW' => 'Viewing Posts',
+ 'UCP_PM' => 'Private Messages',
+ 'UCP_PM_COMPOSE' => 'Compose Message',
+ 'UCP_PM_DRAFTS' => 'PM Drafts',
+ 'UCP_PM_OPTIONS' => 'Options',
+ 'UCP_PM_UNREAD' => 'Unread Messages',
+ 'UCP_PM_VIEW_MESSAGES' => 'View Messages',
'UCP_PROFILE' => 'Profile',
- 'UCP_PROFILE_INFO' => 'Your Profile',
- 'UCP_REG_DETAILS' => 'Registration details',
- 'UCP_SIGNATURE' => 'Your signature',
- 'UCP_VIEW' => 'Viewing Posts',
+ 'UCP_PROFILE_AVATAR' => 'Your avatar',
+ 'UCP_PROFILE_PROFILE_INFO' => 'Your Profile',
+ 'UCP_PROFILE_REG_DETAILS' => 'Registration details',
+ 'UCP_PROFILE_SIGNATURE' => 'Your signature',
'UCP_WATCHED' => 'Watched items',
'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
'UCP_YIM' => 'Yahoo Messenger',
'UCP_ZEBRA' => 'Friends and Foes',
+ 'UCP_ZEBRA_FOES' => 'Foes',
+ 'UCP_ZEBRA_FRIENDS' => 'Friends',
+ 'UNKNOWN_FOLDER' => 'Unknown Folder',
+ 'UNREAD_MESSAGES' => 'Unread Messages',
'UNWATCH_MARKED' => 'Unwatch marked',
'UPLOAD_AVATAR_FILE' => 'Upload from your machine',
'UPLOAD_AVATAR_URL' => 'Upload from a URL',
@@ -213,6 +275,13 @@ $lang += array(
'VIEW_EDIT' => 'View/Edit',
'VIEW_FLASH' => 'Display Flash animations',
'VIEW_IMAGES' => 'Display Images within posts',
+ 'VIEW_NEXT_HISTORY' => 'Next PM in history',
+ 'VIEW_NEXT_PM' => 'Next PM',
+ 'VIEW_PM' => 'View Message',
+ 'VIEW_PM_MESSAGE' => '1 Message',
+ 'VIEW_PM_MESSAGES' => '%d Messages',
+ 'VIEW_PREVIOUS_HISTORY' => 'Previous PM in history',
+ 'VIEW_PREVIOUS_PM' => 'Previous PM',
'VIEW_SIGS' => 'Display Signatures',
'VIEW_SMILIES' => 'Display Smileys as images',
'VIEW_TOPICS_DAYS' => 'Display topics from previous days',
@@ -230,6 +299,38 @@ $lang += array(
'YOUR_FRIENDS_EXPLAIN' => 'To remove usernames select them and click submit',
'YOUR_KARMA' => 'Your Karma level',
'YOUR_WARNINGS' => 'Your Warning level',
+
+ 'PM_ACTION' => array(
+ 'PLACE_INTO_FOLDER' => 'Place into folder',
+ 'MARK_AS_READ' => 'Mark as read',
+ 'MARK_AS_IMPORTANT' => 'Mark Message',
+ 'DELETE_MESSAGE' => 'Delete Message'
+ ),
+ 'PM_CHECK' => array(
+ 'SUBJECT' => 'Subject',
+ 'SENDER' => 'Sender',
+ 'MESSAGE' => 'Message',
+ 'STATUS' => 'Message Status',
+ 'TO' => 'Sent To'
+ ),
+ 'PM_RULE' => array(
+ 'IS_LIKE' => 'Is Like',
+ 'IS_NOT_LIKE' => 'Is Not Like',
+ 'IS' => 'Is',
+ 'IS_NOT' => 'Is Not',
+ 'BEGINS_WITH' => 'Begins with',
+ 'ENDS_WITH' => 'Ends with',
+ 'IS_FRIEND' => 'Is Friend',
+ 'IS_FOE' => 'Is Foe',
+ 'IS_USER' => 'Is User',
+ 'IS_GROUP' => 'Is In Usergroup',
+ 'ANSWERED' => 'Answered',
+ 'FORWARDED' => 'Forwarded',
+ 'REPORTED' => 'Reported',
+ 'TO_GROUP' => 'Usergroup',
+ 'TO_ME' => 'Me'
+ )
+
);
?> \ No newline at end of file
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 26eb392ebf..aee06fd249 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -28,8 +28,9 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
$lang += array(
+ 'ACTIVE_TOPICS' => 'Active Topics',
'ANNOUNCEMENTS' => 'Announcements',
-
+
'LOGIN_NOTIFY_FORUM' => 'You have been notified about this forum, please login to view it.',
'MARK_TOPICS_READ' => 'Mark Topics Read',
@@ -44,6 +45,7 @@ $lang += array(
'TOPICS_MARKED' => 'The topics for this forum have now been marked read',
+ 'VIEW_FORUM' => 'View Forum',
'VIEW_FORUM_TOPIC' => '1 Topic',
'VIEW_FORUM_TOPICS' => '%d Topics',
);