diff options
Diffstat (limited to 'phpBB')
23 files changed, 237 insertions, 237 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 77b1edcb67..c906834f5d 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -50,20 +50,20 @@ $lang = array_merge($lang, array( 'ATTACH_EXTENSIONS_URL' => 'Extensions', 'ATTACH_EXT_GROUPS_URL' => 'Extension groups', 'ATTACH_MAX_FILESIZE' => 'Maximum filesize', - 'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum size of each file, 0 is unlimited.', + 'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum size of each file, with 0 being unlimited.', 'ATTACH_MAX_PM_FILESIZE' => 'Maximum filesize messaging', - 'ATTACH_MAX_PM_FILESIZE_EXPLAIN' => 'Maximum drive space available per user for private message attachments, 0 is unlimited.', + 'ATTACH_MAX_PM_FILESIZE_EXPLAIN' => 'Maximum drive space available per user for private message attachments, with 0 being unlimited.', 'ATTACH_ORPHAN_URL' => 'Orphan attachments', 'ATTACH_POST_ID' => 'Post ID', 'ATTACH_QUOTA' => 'Total attachment quota', 'ATTACH_QUOTA_EXPLAIN' => 'Maximum drive space available for attachments for the whole board, with 0 being unlimited.', 'ATTACH_TO_POST' => 'Attach file to post', - 'CAT_FLASH_FILES' => 'Flash Files', + 'CAT_FLASH_FILES' => 'Flash files', 'CAT_IMAGES' => 'Images', - 'CAT_QUICKTIME_FILES' => 'Quicktime Media', - 'CAT_RM_FILES' => 'Real Media Streams', - 'CAT_WM_FILES' => 'Window Media Streams', + 'CAT_QUICKTIME_FILES' => 'Quicktime media files', + 'CAT_RM_FILES' => 'RealMedia media files', + 'CAT_WM_FILES' => 'Windows Media media files', 'CREATE_GROUP' => 'Create new group', 'CREATE_THUMBNAIL' => 'Create thumbnail', 'CREATE_THUMBNAIL_EXPLAIN' => 'Create a thumbnail in all possible situations.', @@ -94,7 +94,7 @@ $lang = array_merge($lang, array( 'GROUP_NAME' => 'Group name', 'IMAGE_LINK_SIZE' => 'Image link dimensions', - 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this, set to 0px by 0px to disable.', + 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', 'IMAGICK_PATH' => 'Imagemagick path', 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>', @@ -102,7 +102,7 @@ $lang = array_merge($lang, array( 'MAX_ATTACHMENTS_PM' => 'Max attachments per message', 'MAX_EXTGROUP_FILESIZE' => 'Maximum filesize', 'MAX_IMAGE_SIZE' => 'Maximum image dimensions', - 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments, set to 0px by 0px to disable dimension checking.', + 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.', 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width in pixel', 'MAX_THUMB_WIDTH_EXPLAIN' => 'A generated thumbnail will not exceed the width set here', 'MIN_THUMB_FILESIZE' => 'Minimum thumbnail filesize', @@ -137,14 +137,14 @@ $lang = array_merge($lang, array( 'SECURE_EMPTY_REFERRER' => 'Allow empty referrer', 'SECURE_EMPTY_REFERRER_EXPLAIN' => 'Secure downloads are based on referrers. Do you want to allow downloads for those ommitting the referrer?', 'SETTINGS_CAT_IMAGES' => 'Image category settings', - 'SPECIAL_CATEGORY' => 'Special Category', - 'SPECIAL_CATEGORY_EXPLAIN' => 'Special Categories differ between the way presented within posts.', + 'SPECIAL_CATEGORY' => 'Special category', + 'SPECIAL_CATEGORY_EXPLAIN' => 'Special categories differ between the way presented within posts.', 'SUCCESSFULLY_UPLOADED' => 'Succeessfully uploaded', 'SUCCESS_EXTENSION_GROUP_ADD' => 'Extension group successfully added', 'SUCCESS_EXTENSION_GROUP_EDIT' => 'Extension group successfully updated', 'UPLOADING_FILES' => 'Uploading files', - 'UPLOADING_FILE_TO' => 'Uploading file “%1$s” to Post Number %2$d…', + 'UPLOADING_FILE_TO' => 'Uploading file “%1$s” to post number %2$d…', 'UPLOAD_DENIED_FORUM' => 'You do not have the permission to upload files to forum “%s”', 'UPLOAD_DIR' => 'Upload directory', 'UPLOAD_DIR_EXPLAIN' => 'Storage path for attachments.', diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 278171ccdd..dd21ee8ad0 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -56,7 +56,7 @@ $lang = array_merge($lang, array( 'IP_BAN_EXPLAIN' => 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *', 'IP_HOSTNAME' => 'IP addresses or hostnames', 'IP_NO_BANNED' => 'No banned IP addresses', - 'IP_UNBAN' => 'Un-ban or Un-exclude IPs', + 'IP_UNBAN' => 'Un-ban or un-exclude IPs', 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs have a marked background.', 'PERMANENT' => 'Permanent', @@ -66,7 +66,7 @@ $lang = array_merge($lang, array( 'USER_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered users from all current bans.', 'USER_BAN_EXPLAIN' => 'You can ban multiple users in one go by entering each name on a new line. Use the <u>Find a member</u> facility to look up and add one or more users automatically.', 'USER_NO_BANNED' => 'No banned usernames', - 'USER_UNBAN' => 'Un-ban or Un-exclude usernames', + 'USER_UNBAN' => 'Un-ban or un-exclude usernames', 'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a marked background.', )); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index c3cecbc543..02dabb9775 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -35,14 +35,14 @@ $lang = array_merge($lang, array( 'ACP_BOARD_SETTINGS_EXPLAIN' => 'Here you can determine the basic operation of your board, from the site name through user registration to private messaging.', 'CUSTOM_DATEFORMAT' => 'Custom…', - 'DEFAULT_DATE_FORMAT' => 'Date Format', + 'DEFAULT_DATE_FORMAT' => 'Date format', 'DEFAULT_DATE_FORMAT_EXPLAIN' => 'The date format is the same as the PHP <code>date</code> function.', 'DEFAULT_LANGUAGE' => 'Default language', 'DEFAULT_STYLE' => 'Default style', 'DISABLE_BOARD' => 'Disable board', 'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.', 'OVERRIDE_STYLE' => 'Override user style', - 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces users style with the default.', + 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.', 'RELATIVE_DAYS' => 'Relative days', 'SITE_DESC' => 'Site description', 'SITE_NAME' => 'Site name', @@ -62,15 +62,15 @@ $lang = array_merge($lang, array( 'ALLOW_BBCODE' => 'Allow BBCode', 'ALLOW_FORUM_NOTIFY' => 'Allow forum watching', 'ALLOW_NAME_CHANGE' => 'Allow username changes', - 'ALLOW_NO_CENSORS' => 'Allow disable of censors', - 'ALLOW_NO_CENSORS_EXPLAIN' => 'User can disable word censoring.', + 'ALLOW_NO_CENSORS' => 'Allow disabling of word censoring', + 'ALLOW_NO_CENSORS_EXPLAIN' => 'Users can choose to disable the automatic word censoring of posts and private messages.', 'ALLOW_PM_ATTACHMENTS' => 'Allow attachments in private messages', 'ALLOW_SIG' => 'Allow signatures', 'ALLOW_SIG_BBCODE' => 'Allow BBCode in user signatures', 'ALLOW_SIG_FLASH' => 'Allow use of <code>[FLASH]</code> BBCode tag in user signatures', 'ALLOW_SIG_IMG' => 'Allow use of <code>[IMG]</code> BBCode tag in user signatures', 'ALLOW_SIG_LINKS' => 'Allow use of links in user signatures', - 'ALLOW_SIG_LINKS_EXPLAIN' => 'If disallowed the <code>[URL]</code> bbcode tag and automatic/magic URLs are disabled.', + 'ALLOW_SIG_LINKS_EXPLAIN' => 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.', 'ALLOW_SIG_SMILIES' => 'Allow use of smilies in user signatures', 'ALLOW_SMILIES' => 'Allow smilies', 'ALLOW_TOPIC_NOTIFY' => 'Allow topic watching', @@ -87,9 +87,9 @@ $lang = array_merge($lang, array( 'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website', 'ALLOW_UPLOAD' => 'Enable avatar uploading', 'AVATAR_GALLERY_PATH' => 'Avatar gallery path', - 'AVATAR_GALLERY_PATH_EXPLAIN' => 'Path under your phpBB root dir for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>', + 'AVATAR_GALLERY_PATH_EXPLAIN' => 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>', 'AVATAR_STORAGE_PATH' => 'Avatar storage path', - 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. <samp>images/avatars/upload</samp>', + 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>', 'MAX_AVATAR_SIZE' => 'Maximum avatar dimensions', 'MAX_AVATAR_SIZE_EXPLAIN' => '(Height x Width in pixels)', 'MAX_FILESIZE' => 'Maximum avatar file size', @@ -111,51 +111,51 @@ $lang = array_merge($lang, array( 'ALLOW_QUOTE_PM' => 'Allow quotes in private messages', 'ALLOW_SIG_PM' => 'Allow signature in private messages', 'ALLOW_SMILIES_PM' => 'Allow smilies in 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.', - 'BOXES_MAX' => 'Max private message folders', + 'BOXES_LIMIT' => 'Maximum private messages per box', + 'BOXES_LIMIT_EXPLAIN' => 'Users may receive no more than this many messages in each of their private message boxes. Set this value to 0 to allow unlimited messages.', + 'BOXES_MAX' => 'Maximum private message folders', 'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages.', 'ENABLE_PM_ICONS' => 'Enable use of topic icons in private messages', 'FULL_FOLDER_ACTION' => 'Full folder default action', 'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default action to take if a user’s folder is full assuming the user’s folder action, if set at all, is not applicable. The only exception is for the “Sent messages” folder where the default action is always to delete old messages.', 'HOLD_NEW_MESSAGES' => 'Hold new messages', 'PM_EDIT_TIME' => 'Limit editing time', - 'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered, zero equals infinity', + 'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered. Setting the value to 0 disables this behaviour.', )); // Post Settings $lang = array_merge($lang, array( 'ACP_POST_SETTINGS_EXPLAIN' => 'Here you can set all default settings for posting', 'ALLOW_POST_LINKS' => 'Allow links in posts/private messages', - 'ALLOW_POST_LINKS_EXPLAIN' => 'If disallowed the URL bbcode tag and automatic/magic urls are disabled.', + 'ALLOW_POST_LINKS_EXPLAIN' => 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.', - 'BUMP_INTERVAL' => 'Bump Interval', + 'BUMP_INTERVAL' => 'Bump interval', 'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.', - 'CHAR_LIMIT' => 'Max characters per post', - 'CHAR_LIMIT_EXPLAIN' => 'Set to 0 for unlimited characters.', + 'CHAR_LIMIT' => 'Maximum characters per post', + 'CHAR_LIMIT_EXPLAIN' => 'The number of characters allowed within a post. Set to 0 for unlimited characters.', 'DISPLAY_LAST_EDITED' => 'Display last edited time information', 'DISPLAY_LAST_EDITED_EXPLAIN' => 'Choose if the last edited by information to be displayed on posts', 'EDIT_TIME' => 'Limit editing time', - 'EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a new post, zero equals infinity', - 'FLOOD_INTERVAL' => 'Flood Interval', + 'EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a new post. Setting the value to 0 disables this behaviour.', + 'FLOOD_INTERVAL' => 'Flood interval', 'FLOOD_INTERVAL_EXPLAIN' => 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.', - 'HOT_THRESHOLD' => 'Posts for Popular Threshold, Set to 0 to disable hot topics.', - 'MAX_POLL_OPTIONS' => 'Max number of poll options', - 'MAX_POST_FONT_SIZE' => 'Max font size per post', - 'MAX_POST_FONT_SIZE_EXPLAIN' => 'Set to 0 for unlimited font size.', - 'MAX_POST_IMG_HEIGHT' => 'Max image height per post', + 'HOT_THRESHOLD' => 'Posts per topic threshold required for the hot topic annotation. Set to 0 to disable hot topics.', + 'MAX_POLL_OPTIONS' => 'Maximum number of poll options', + 'MAX_POST_FONT_SIZE' => 'Maximum font size per post', + 'MAX_POST_FONT_SIZE_EXPLAIN' => 'Maximum font size allowed in a post. Set to 0 for unlimited font size.', + 'MAX_POST_IMG_HEIGHT' => 'Maximum image height per post', 'MAX_POST_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image/flash file in postings. Set to 0 for unlimited size.', - 'MAX_POST_IMG_WIDTH' => 'Max image width per post', + 'MAX_POST_IMG_WIDTH' => 'Maximum image width per post', 'MAX_POST_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image/flash file in postings. Set to 0 for unlimited size.', - 'MAX_POST_URLS' => 'Max links per post', - 'MAX_POST_URLS_EXPLAIN' => 'Set to 0 for unlimited links.', + 'MAX_POST_URLS' => 'Maximum links per post', + 'MAX_POST_URLS_EXPLAIN' => 'Maximum number of URLs in a post. Set to 0 for unlimited links.', 'POSTING' => 'Posting', - 'POSTS_PER_PAGE' => 'Posts Per Page', - 'QUOTE_DEPTH_LIMIT' => 'Max nested quotes per post', - 'QUOTE_DEPTH_LIMIT_EXPLAIN' => 'Set to 0 for unlimited depth.', - 'SMILIES_LIMIT' => 'Max smilies per post', - 'SMILIES_LIMIT_EXPLAIN' => 'Set to 0 for unlimited smilies.', - 'TOPICS_PER_PAGE' => 'Topics Per Page', + 'POSTS_PER_PAGE' => 'Posts per page', + 'QUOTE_DEPTH_LIMIT' => 'Maximum nested quotes per post', + 'QUOTE_DEPTH_LIMIT_EXPLAIN' => 'Maximum number of nested quotes in a post. Set to 0 for unlimited depth.', + 'SMILIES_LIMIT' => 'Maximum smilies per post', + 'SMILIES_LIMIT_EXPLAIN' => 'Maximum number of smilies in a post. Set to 0 for unlimited smilies.', + 'TOPICS_PER_PAGE' => 'Topics per page', )); // Signature Settings @@ -189,7 +189,7 @@ $lang = array_merge($lang, array( // 'ACC_USER_ADMIN' => 'User + Admin', 'ALLOW_EMAIL_REUSE' => 'Allow email address re-use', 'ALLOW_EMAIL_REUSE_EXPLAIN' => 'Different users can register with the same email address.', - 'COPPA' => 'Coppa', + 'COPPA' => 'COPPA', 'COPPA_FAX' => 'COPPA fax number', 'COPPA_MAIL' => 'COPPA mailing address', 'COPPA_MAIL_EXPLAIN' => 'This is the mailing address where parents will send COPPA registration forms', @@ -216,7 +216,7 @@ $lang = array_merge($lang, array( 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and captcha settings.', 'CAPTCHA_GD' => 'GD CAPTCHA', - 'CAPTCHA_GD_NOISE' => 'GD CAPTCHA Noise', + 'CAPTCHA_GD_NOISE' => 'GD CAPTCHA noise', 'CAPTCHA_GD_EXPLAIN' => 'Use GD to make a more advanced CAPTCHA', 'CAPTCHA_GD_NOISE_EXPLAIN' => 'Use noise to make the GD based CAPTCHA harder', 'VISUAL_CONFIRM_POST' => 'Enable visual confirmation for guest postings', @@ -235,7 +235,7 @@ $lang = array_merge($lang, array( 'COOKIE_SECURE' => 'Cookie secure', 'COOKIE_SECURE_EXPLAIN' => 'If your server is running via SSL set this to enabled else leave as disabled. Having this enabled and not running via SSL will result in server errors during redirects.', 'ONLINE_LENGTH' => 'View online time span', - 'ONLINE_LENGTH_EXPLAIN' => 'Time in minutes after which inactive users will not appear in viewonline listings, lower equals less processing.', + 'ONLINE_LENGTH_EXPLAIN' => 'Number of minutes after which inactive users will not appear in “Who is online” listings. The higher this value the greater is the processing required to generate the listing.', 'SESSION_LENGTH' => 'Session length', 'SESSION_LENGTH_EXPLAIN' => 'Sessions will expire after this time, in seconds.', )); @@ -246,26 +246,26 @@ $lang = array_merge($lang, array( 'CUSTOM_PROFILE_FIELDS' => 'Custom profile fields', 'LIMIT_LOAD' => 'Limit system load', - 'LIMIT_LOAD_EXPLAIN' => 'If the 1 minute system load exceeds this value the board will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.', + 'LIMIT_LOAD_EXPLAIN' => 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.', 'LIMIT_SESSIONS' => 'Limit sessions', 'LIMIT_SESSIONS_EXPLAIN' => 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.', 'LOAD_CPF_MEMBERLIST' => 'Allow styles to display custom profile fields in memberlist', 'LOAD_CPF_VIEWPROFILE' => 'Display custom profile fields in user profiles', 'LOAD_CPF_VIEWTOPIC' => 'Display custom profile fields on viewtopic', - 'LOAD_USER_ACTIVITY' => 'Show users activity', + 'LOAD_USER_ACTIVITY' => 'Show user’s activity', 'LOAD_USER_ACTIVITY_EXPLAIN' => 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.', 'RECOMPILE_TEMPLATES' => 'Recompile stale templates', 'RECOMPILE_TEMPLATES_EXPLAIN' => 'Check for updated template files on filesystem and recompile.', 'YES_ANON_READ_MARKING' => 'Enable topic marking for guests', 'YES_ANON_READ_MARKING_EXPLAIN' => 'Stores read/unread status information for guests. If disabled posts are always read for guests.', 'YES_BIRTHDAYS' => 'Enable birthday listing', - 'YES_JUMPBOX' => 'Enable display of Jumpbox', - 'YES_MODERATORS' => 'Enable display of Moderators', + 'YES_JUMPBOX' => 'Enable display of jumpbox', + 'YES_MODERATORS' => 'Enable display of moderators', 'YES_ONLINE' => 'Enable online user listings', 'YES_ONLINE_EXPLAIN' => 'Display online user information on index, forum and topic pages.', 'YES_ONLINE_GUESTS' => 'Enable online guest listings in viewonline', 'YES_ONLINE_GUESTS_EXPLAIN' => 'Allow display of guest user information in viewonline.', - 'YES_ONLINE_TRACK' => 'Enable display of user online img', + 'YES_ONLINE_TRACK' => 'Enable display of user online/offline information', 'YES_ONLINE_TRACK_EXPLAIN' => 'Display online information for user in profiles and viewtopic.', 'YES_POST_MARKING' => 'Enable dotted topics', 'YES_POST_MARKING_EXPLAIN' => 'Indicates whether user has posted to a topic.', @@ -302,29 +302,29 @@ $lang = array_merge($lang, array( $lang = array_merge($lang, array( 'ACP_SERVER_SETTINGS_EXPLAIN' => 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in emails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.', - 'ENABLE_GZIP' => 'Enable GZip Compression', + 'ENABLE_GZIP' => 'Enable GZip compression', 'FORCE_SERVER_VARS' => 'Force server URL settings', 'FORCE_SERVER_VARS_EXPLAIN' => 'If set to yes the server settings defined here will be used in favour of the automatically determined values', 'ICONS_PATH' => 'Post icons storage path', - 'ICONS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. <samp>images/icons</samp>', + 'ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>', 'PATH_SETTINGS' => 'Path settings', 'RANKS_PATH' => 'Rank image storage path', - 'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. <samp>images/ranks</samp>', + 'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>', 'SCRIPT_PATH' => 'Script path', 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>', 'SEND_ENCODING' => 'Send encoding', - 'SEND_ENCODING_EXPLAIN' => 'Send the file encoding from phpBB via HTTP overriding the webserver configuration', + 'SEND_ENCODING_EXPLAIN' => 'Send the file encoding from phpBB via HTTP overriding the webserver’s configuration', 'SERVER_NAME' => 'Domain name', 'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: <samp>www.foo.bar</samp>)', - 'SERVER_PORT' => 'Server Port', + 'SERVER_PORT' => 'Server port', 'SERVER_PORT_EXPLAIN' => 'The port your server is running on, usually 80, only change if different', 'SERVER_PROTOCOL' => 'Server protocol', 'SERVER_PROTOCOL_EXPLAIN' => 'This is used as the server protocol if these settings are forced. If empty or not forced the protocol is determined by the cookie secure settings (<samp>http://</samp> or <samp>https://</samp>)', 'SERVER_URL_SETTINGS' => 'Server URL settings', 'SMILIES_PATH' => 'Smilies storage path', - 'SMILIES_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. <samp>images/smilies</samp>', + 'SMILIES_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/smilies</samp>', 'UPLOAD_ICONS_PATH' => 'Extension group icons storage path', - 'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. <samp>images/upload_icons</samp>', + 'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>', )); // Security Settings @@ -339,15 +339,15 @@ $lang = array_merge($lang, array( 'BROWSER_VALID' => 'Validate browser', 'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session improving security.', 'CHECK_DNSBL' => 'Check IP against DNS Blackhole List', - 'CHECK_DNSBL_EXPLAIN' => 'If enabled the IP is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a>, <a href="http://dsbl.org">dsbl.org</a> and <a href="http://spamhaus.org">spamhaus.org</a>. This lookup may take a bit, depending on the servers configuration. If slowdowns are experienced or too much false positives reported it is recommended to disable this check.', + 'CHECK_DNSBL_EXPLAIN' => 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a>, <a href="http://dsbl.org">dsbl.org</a> and <a href="http://spamhaus.org">spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.', 'CLASS_B' => 'A.B', 'CLASS_C' => 'A.B.C', - 'EMAIL_CHECK_MX' => 'Check email domain for valid MX Record', + 'EMAIL_CHECK_MX' => 'Check email domain for valid MX record', 'EMAIL_CHECK_MX_EXPLAIN' => 'If enabled, the email domain provided on registration and profile changes is checked for a valid MX record.', 'FORCE_PASS_CHANGE' => 'Force password change', - 'FORCE_PASS_CHANGE_EXPLAIN' => 'Require user to change their password after a set number of days or zero to disable.', - 'FORWARDED_FOR_VALID' => 'Validated X_FORWARDED_FOR header', - 'FORWARDED_FOR_VALID_EXPLAIN' => 'Sessions will only be continued if the sent X_FORWARDED_FOR header equals the one sent with the previous request. Bans will be checked against IPs in X_FORWARDED_FOR too.', + 'FORCE_PASS_CHANGE_EXPLAIN' => 'Require user to change their password after a set number of days. Set this value to 0 disables this behaviour.', + 'FORWARDED_FOR_VALID' => 'Validated <var>X_FORWARDED_FOR</var> header', + 'FORWARDED_FOR_VALID_EXPLAIN' => 'Sessions will only be continued if the sent <var>X_FORWARDED_FOR</var> header equals the one sent with the previous request. Bans will be checked against IPs in <var>X_FORWARDED_FOR</var> too.', 'IP_VALID' => 'Session IP validation', 'IP_VALID_EXPLAIN' => 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking.', 'MAX_LOGIN_ATTEMPTS' => 'Maximum number of login attempts', @@ -388,17 +388,17 @@ $lang = array_merge($lang, array( 'SMTP_CRAM_MD5' => 'CRAM-MD5', 'SMTP_DIGEST_MD5' => 'DIGEST-MD5', 'SMTP_LOGIN' => 'LOGIN', - 'SMTP_PASSWORD' => 'SMTP Password', + 'SMTP_PASSWORD' => 'SMTP password', 'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your SMTP server requires it.', 'SMTP_PLAIN' => 'PLAIN', 'SMTP_POP_BEFORE_SMTP' => 'POP-BEFORE-SMTP', - 'SMTP_PORT' => 'SMTP Server Port', + 'SMTP_PORT' => 'SMTP server port', 'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different port.', - 'SMTP_SERVER' => 'SMTP Server Address', - 'SMTP_SETTINGS' => 'SMTP Settings', - 'SMTP_USERNAME' => 'SMTP Username', - 'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.', - 'USE_SMTP' => 'Use SMTP Server for email', + 'SMTP_SERVER' => 'SMTP server address', + 'SMTP_SETTINGS' => 'SMTP settings', + 'SMTP_USERNAME' => 'SMTP username', + 'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.', + 'USE_SMTP' => 'Use SMTP server for email', 'USE_SMTP_EXPLAIN' => 'Select “Yes” if you want or have to send email via a named server instead of the local mail function.', )); @@ -417,7 +417,7 @@ $lang = array_merge($lang, array( 'JAB_ENABLE' => 'Enable Jabber', 'JAB_ENABLE_EXPLAIN' => 'Enables use of jabber messaging and notifications', 'JAB_PACKAGE_SIZE' => 'Jabber package size', - 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediatly and gets not queued for later sending.', + 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and gets not queued for later sending.', 'JAB_PASSWORD' => 'Jabber password', 'JAB_PASS_CHANGED' => 'Jabber password changed successfully.', 'JAB_PORT' => 'Jabber port', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 6b380a8ea6..22d32831bf 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -101,7 +101,7 @@ $lang = array_merge($lang, array( 'ACP_ICONS_SMILIES' => 'Topic icons/smilies', 'ACP_IMAGESETS' => 'Imagesets', 'ACP_INACTIVE_USERS' => 'Inactive users', - 'ACP_INDEX' => 'Admin index', + 'ACP_INDEX' => 'ACP index', 'ACP_JABBER_SETTINGS' => 'Jabber settings', @@ -110,7 +110,7 @@ $lang = array_merge($lang, array( 'ACP_LOAD_SETTINGS' => 'Load settings', 'ACP_LOGGING' => 'Logging', - 'ACP_MAIN' => 'Admin index', + 'ACP_MAIN' => 'ACP index', 'ACP_MANAGE_EXTENSIONS' => 'Manage extensions', 'ACP_MANAGE_FORUMS' => 'Manage forums', 'ACP_MANAGE_RANKS' => 'Manage ranks', @@ -139,7 +139,7 @@ $lang = array_merge($lang, array( 'ACP_QUICK_ACCESS' => 'Quick access', 'ACP_RANKS' => 'Ranks', - 'ACP_REASONS' => 'Report/Denial reasons', + 'ACP_REASONS' => 'Report/denial reasons', 'ACP_REGISTER_SETTINGS' => 'User registration settings', 'ACP_RESTORE' => 'Restore', @@ -258,7 +258,7 @@ $lang = array_merge($lang, array( 'RESYNC' => 'Resyncronise', 'RETURN_TO' => 'Return to…', - 'SELECT_ANONYMOUS' => 'Select Anonymous User', + 'SELECT_ANONYMOUS' => 'Select anonymous user', 'SELECT_OPTION' => 'Select option', 'UCP' => 'User Control Panel', @@ -270,7 +270,7 @@ $lang = array_merge($lang, array( // PHP info $lang = array_merge($lang, array( - 'ACP_PHP_INFO_EXPLAIN' => 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by support or other Team Member on the support forums.', + 'ACP_PHP_INFO_EXPLAIN' => 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by <a href="http://www.phpbb.com/about/">official team members</a> on the support forums.', 'NO_PHPINFO_AVAILABLE' => 'The PHP informations are unable to be determined. Phpinfo() has been disabled for security reasons.', )); @@ -347,7 +347,7 @@ $lang = array_merge($lang, array( 'INACTIVE_REASON_REGISTER' => 'Newly registered account', 'INACTIVE_REASON_REMIND' => 'Forced user account reactivation', 'INACTIVE_REASON_UNKNOWN' => 'Unknown', - 'INACTIVE_USERS' => 'Inactive Users', + 'INACTIVE_USERS' => 'Inactive users', 'INACTIVE_USERS_EXPLAIN' => 'This is a list of users who have registered but whos accounts are inactive. You can activate, delete or remind (by sending an email) these users if you wish.', 'INACTIVE_USERS_EXPLAIN_INDEX' => 'This is a list of the last 10 registered users who have inactive accounts. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an email) these users if you wish.', @@ -367,8 +367,8 @@ $lang = array_merge($lang, array( 'LOG_ACL_ADD_GROUP_GLOBAL_U_' => '<strong>Added or edited groups user permissions</strong><br />» %s', 'LOG_ACL_ADD_USER_GLOBAL_M_' => '<strong>Added or edited users global moderator permissions</strong><br />» %s', 'LOG_ACL_ADD_GROUP_GLOBAL_M_' => '<strong>Added or edited groups global moderator permissions</strong><br />» %s', - 'LOG_ACL_ADD_USER_GLOBAL_A_' => '<strong>Added or edited users admin permissions</strong><br />» %s', - 'LOG_ACL_ADD_GROUP_GLOBAL_A_' => '<strong>Added or edited groups admin permissions</strong><br />» %s', + 'LOG_ACL_ADD_USER_GLOBAL_A_' => '<strong>Added or edited users administrator permissions</strong><br />» %s', + 'LOG_ACL_ADD_GROUP_GLOBAL_A_' => '<strong>Added or edited groups administrator permissions</strong><br />» %s', 'LOG_ACL_ADD_ADMIN_GLOBAL_A_' => '<strong>Added or edited Administrators</strong><br />» %s', 'LOG_ACL_ADD_MOD_GLOBAL_M_' => '<strong>Added or edited Global Moderators</strong><br />» %s', @@ -379,12 +379,12 @@ $lang = array_merge($lang, array( 'LOG_ACL_ADD_GROUP_LOCAL_M_' => '<strong>Added or edited groups forum moderator access</strong> from %1$s<br />» %2$s', 'LOG_ACL_ADD_MOD_LOCAL_M_' => '<strong>Added or edited Moderators</strong> from %1$s<br />» %2$s', - 'LOG_ACL_ADD_FORUM_LOCAL_F_' => '<strong>Added or edited Forum Permissions</strong> from %1$s<br />» %2$s', + 'LOG_ACL_ADD_FORUM_LOCAL_F_' => '<strong>Added or edited forum permissions</strong> from %1$s<br />» %2$s', 'LOG_ACL_DEL_ADMIN_GLOBAL_A_' => '<strong>Removed Administrators</strong><br />» %s', 'LOG_ACL_DEL_MOD_GLOBAL_M_' => '<strong>Removed Global Moderators</strong><br />» %s', 'LOG_ACL_DEL_MOD_LOCAL_M_' => '<strong>Removed Moderators</strong> from %1$s<br />» %2$s', - 'LOG_ACL_DEL_FORUM_LOCAL_F_' => '<strong>Removed User/Group Forum Permissions</strong> from %1$s<br />» %2$s', + 'LOG_ACL_DEL_FORUM_LOCAL_F_' => '<strong>Removed User/Group forum permissions</strong> from %1$s<br />» %2$s', 'LOG_ACL_TRANSFER_PERMISSIONS' => '<strong>Permissions transfered from</strong><br />» %s', 'LOG_ACL_RESTORE_PERMISSIONS' => '<strong>Own permissions restored after using permissions from</strong><br />» %s', @@ -404,11 +404,11 @@ $lang = array_merge($lang, array( 'LOG_BAN_EXCLUDE_USER' => '<strong>Excluded user from ban</strong> for reason "<em>%1$s</em>"<br />» %2$s ', 'LOG_BAN_EXCLUDE_IP' => '<strong>Excluded IP from ban</strong> for reason "<em>%1$s</em>"<br />» %2$s ', 'LOG_BAN_EXCLUDE_EMAIL' => '<strong>Excluded email from ban</strong> for reason "<em>%1$s</em>"<br />» %2$s ', - 'LOG_BAN_USER' => '<strong>Banned User</strong> for reason "<em>%1$s</em>"<br />» %2$s ', + 'LOG_BAN_USER' => '<strong>Banned user</strong> for reason "<em>%1$s</em>"<br />» %2$s ', 'LOG_BAN_IP' => '<strong>Banned IP</strong> for reason "<em>%1$s</em>"<br />» %2$s', 'LOG_BAN_EMAIL' => '<strong>Banned email</strong> for reason "<em>%1$s</em>"<br />» %2$s', 'LOG_UNBAN_USER' => '<strong>Unbanned user</strong><br />» %s', - 'LOG_UNBAN_IP' => '<strong>Unbanned ip</strong><br />» %s', + 'LOG_UNBAN_IP' => '<strong>Unbanned IP</strong><br />» %s', 'LOG_UNBAN_EMAIL' => '<strong>Unbanned email</strong><br />» %s', 'LOG_BBCODE_ADD' => '<strong>Added new BBCode</strong><br />» %s', diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php index 9fbf6f3d45..f959eb21bb 100644 --- a/phpBB/language/en/acp/email.php +++ b/phpBB/language/en/acp/email.php @@ -37,7 +37,7 @@ $lang = array_merge($lang, array( 'COMPOSE' => 'Compose', - 'EMAIL_SEND_ERROR' => 'There were one or more errors while sending the email. Please check the %sError Log%s for detailed error messages.', + 'EMAIL_SEND_ERROR' => 'There were one or more errors while sending the email. Please check the %sError log%s for detailed error messages.', 'EMAIL_SENT' => 'This message has been sent.', 'EMAIL_SENT_QUEUE' => 'This message has been queued for sending.', diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index ef67df40ed..48d4374056 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -46,7 +46,7 @@ $lang = array_merge($lang, array( 'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum', 'DECIDE_MOVE_DELETE_SUBFORUMS' => 'Delete subforums or move to forum', - 'DEFAULT_STYLE' => 'Default Style', + 'DEFAULT_STYLE' => 'Default style', 'DELETE_ALL_POSTS' => 'Delete posts', 'DELETE_SUBFORUMS' => 'Delete subforums and posts', 'DISPLAY_ACTIVE_TOPICS' => 'Enable active topics', @@ -59,7 +59,7 @@ $lang = array_merge($lang, array( 'ENABLE_POST_REVIEW_EXPLAIN' => 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.', 'ENABLE_RECENT' => 'Display active topics', 'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.', - 'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons', + 'ENABLE_TOPIC_ICONS' => 'Enable topic icons', 'FORUM_ADMIN' => 'Forum administration', 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 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.', @@ -73,7 +73,7 @@ $lang = array_merge($lang, array( 'FORUM_DESC' => 'Description', 'FORUM_DESC_EXPLAIN' => 'Any markup entered here will displayed as is.', '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_IMAGE' => 'Forum Image', + 'FORUM_IMAGE' => 'Forum image', 'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.', 'FORUM_LINK_EXPLAIN' => 'Full URL (including the protocol, for example <samp>http://</samp>) to location clicking this forum will take the user.', 'FORUM_LINK_TRACK' => 'Track link redirects', diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php index 1707fbaa3c..afd79e4301 100644 --- a/phpBB/language/en/acp/language.php +++ b/phpBB/language/en/acp/language.php @@ -46,7 +46,7 @@ $lang = array_merge($lang, array( 'INVALID_UPLOAD_METHOD' => 'The selected upload method is not valid, please choose a different method.', 'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated.', - 'LANGUAGE_ENTRIES' => 'Language Entries', + 'LANGUAGE_ENTRIES' => 'Language entries', 'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.<br /><strong>Note:</strong> Once you changed a language file, the changes will be stored within a seperate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).', 'LANGUAGE_FILES' => 'Language files', 'LANGUAGE_KEY' => 'Language key', @@ -59,13 +59,13 @@ $lang = array_merge($lang, array( 'LANGUAGE_PACK_NAME' => 'Name', 'LANGUAGE_PACK_NOT_EXIST' => 'The selected language pack does not exist.', 'LANGUAGE_PACK_USED_BY' => 'Used by (including robots)', - 'LANGUAGE_VARIABLE' => 'Language Variable', - 'LANG_AUTHOR' => 'Language Pack Author', + 'LANGUAGE_VARIABLE' => 'Language variable', + 'LANG_AUTHOR' => 'Language pack author', 'LANG_ENGLISH_NAME' => 'English name', - 'LANG_ISO_CODE' => 'ISO Code', + 'LANG_ISO_CODE' => 'ISO code', 'LANG_LOCAL_NAME' => 'Local name', - 'MISSING_LANGUAGE_FILE' => 'Missing Language File: <strong style="color:red">%s</strong>', + 'MISSING_LANGUAGE_FILE' => 'Missing language file: <strong style="color:red">%s</strong>', 'MISSING_LANG_VARIABLES' => 'Missing language variables', 'MODS_FILES' => 'MODs language files', diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index d37001c977..e17b31b8ef 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -134,7 +134,7 @@ $lang = array_merge($lang, array( 'ONLY_FORUM_DEFINED' => 'You only defined forums in your selection. Please also select at least one user or one group.', - 'PERMISSION_APPLIED_TO_ALL' => 'Permissions and Role will also be applied to all checked objects', + 'PERMISSION_APPLIED_TO_ALL' => 'Permissions and role will also be applied to all checked objects', 'PLUS_SUBFORUMS' => '+Subforums', 'REMOVE_PERMISSIONS' => 'Remove permissions', diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 13dae541ac..cb16abfe47 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -100,7 +100,7 @@ $lang = array_merge($lang, array( 'FIRST' => 'First', - 'ICONS_ADD' => 'Add a new Icon', + 'ICONS_ADD' => 'Add a new icon', 'ICONS_ADDED' => 'The icon has been added successfully.', 'ICONS_CONFIG' => 'Icon configuration', 'ICONS_DELETED' => 'The icon has been removed successfully.', @@ -137,7 +137,7 @@ $lang = array_merge($lang, array( 'SMILIES_CODE' => 'Smiley code', 'SMILIES_CONFIG' => 'Smiley configuration', 'SMILIES_DELETED' => 'The smiley has been removed successfully.', - 'SMILIES_EDIT' => 'Edit Smiley', + 'SMILIES_EDIT' => 'Edit smiley', 'SMILIES_EDITED' => 'The smiley has been updated successfully.', 'SMILIES_EMOTION' => 'Emotion', 'SMILIES_HEIGHT' => 'Smiley height', diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 1866d59490..dcdb5bec18 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -45,7 +45,7 @@ $lang = array_merge($lang, array( 'CHECKBOX' => 'Checkbox', 'COLUMNS' => 'Columns', 'CP_LANG_DEFAULT_VALUE' => 'Default value', - 'CP_LANG_EXPLAIN' => 'Field Description', + 'CP_LANG_EXPLAIN' => 'Field description', 'CP_LANG_EXPLAIN_EXPLAIN' => 'The explanation for this field presented to the user', 'CP_LANG_NAME' => 'Field name/title presented to the user', 'CP_LANG_OPTIONS' => 'Options', @@ -90,7 +90,7 @@ $lang = array_merge($lang, array( 'FIRST_OPTION' => 'First option', 'HIDE_PROFILE_FIELD' => 'Hide profile field', - 'HIDE_PROFILE_FIELD_EXPLAIN' => 'Only Administrators and Moderators are able to see/fill out this profile field. If this option is enabled, the profile field will be only displayed in user profiles.', + 'HIDE_PROFILE_FIELD_EXPLAIN' => 'Only administrators and moderators are able to see/fill out this profile field. If this option is enabled, the profile field will be only displayed in users’ profiles.', 'INVALID_CHARS_FIELD_IDENT' => 'Field identification can only contain lowercase a-z and _', 'INVALID_FIELD_IDENT_LEN' => 'Field identification can only be 17 characters long', @@ -119,7 +119,7 @@ $lang = array_merge($lang, array( 'RADIO_BUTTONS' => 'Radio buttons', 'REMOVED_PROFILE_FIELD' => 'Successfully removed profile field.', - 'REQUIRED_FIELD' => 'Required Field', + 'REQUIRED_FIELD' => 'Required field', 'REQUIRED_FIELD_EXPLAIN' => 'Force profile field to be filled out or specified by user. This will display the profile field at registration and within the user control panel.', 'ROWS' => 'Rows', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 4456325bd3..14ae1a5d29 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -132,10 +132,10 @@ $lang = array_merge($lang, array( 'IMAGESET_ERR_NAME_LONG' => 'The imageset name can be no longer than 30 characters.', 'IMAGESET_ERR_NOT_IMAGESET' => 'The archive you specified does not contain a valid imageset.', 'IMAGESET_ERR_STYLE_NAME' => 'You must supply a name for this imageset.', - 'IMAGESET_EXPORT' => 'Export Imageset', + 'IMAGESET_EXPORT' => 'Export imageset', 'IMAGESET_EXPORT_EXPLAIN' => 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'IMAGESET_EXPORTED' => 'Imageset exported succesfully and stored in %s.', - 'IMAGESET_NAME' => 'Imageset Name', + 'IMAGESET_NAME' => 'Imageset name', 'IMAGESET_REFRESHED' => 'Imageset refreshed successfully.', 'IMAGESET_UPDATED' => 'Imageset updated successfully.', 'ITALIC' => 'Italic', @@ -150,7 +150,7 @@ $lang = array_merge($lang, array( 'IMG_CAT_UI' => 'General user interface elements', 'IMG_CAT_USER' => 'Additional images', - 'IMG_SITE_LOGO' => 'Main Logo', + 'IMG_SITE_LOGO' => 'Main logo', 'IMG_UPLOAD_BAR' => 'Upload progress bar', 'IMG_POLL_LEFT' => 'Poll left end', 'IMG_POLL_CENTER' => 'Poll centre', @@ -264,13 +264,13 @@ $lang = array_merge($lang, array( 'INCLUDE_IMAGESET' => 'Include imageset', 'INCLUDE_TEMPLATE' => 'Include template', 'INCLUDE_THEME' => 'Include theme', - 'INSTALL_IMAGESET' => 'Install Imageset', + 'INSTALL_IMAGESET' => 'Install imageset', 'INSTALL_IMAGESET_EXPLAIN' => 'Here you can install your selected imageset. You can edit certain details if you wish or use the installation defaults.', - 'INSTALL_STYLE' => 'Install Style', + 'INSTALL_STYLE' => 'Install style', 'INSTALL_STYLE_EXPLAIN' => 'Here you can install a new style and if appropriate the corresponding style elements. If you already have the relevant style elements installed they will not be overwritten. Some styles require existing style elements to already be installed. If you try installing such a style and do not have the required elements you will be notified.', 'INSTALL_TEMPLATE' => 'Install Template', 'INSTALL_TEMPLATE_EXPLAIN' => 'Here you can install a new template set. Depending on your server configuration you may have a number of options here.', - 'INSTALL_THEME' => 'Install Theme', + 'INSTALL_THEME' => 'Install theme', 'INSTALL_THEME_EXPLAIN' => 'Here you can install your selected theme. You can edit certain details if you wish or use the installation defaults.', 'INSTALLED_IMAGESET' => 'Installed imagesets', 'INSTALLED_STYLE' => 'Installed styles', @@ -284,7 +284,7 @@ $lang = array_merge($lang, array( 'NO_CLASS' => 'Cannot find class in stylesheet.', 'NO_IMAGESET' => 'Cannot find imageset on filesystem.', - 'NO_IMAGE' => 'No Image', + 'NO_IMAGE' => 'No image', 'NO_STYLE' => 'Cannot find style on filesystem.', 'NO_TEMPLATE' => 'Cannot find template on filesystem.', 'NO_THEME' => 'Cannot find theme on filesystem.', @@ -347,7 +347,7 @@ $lang = array_merge($lang, array( 'STYLE_ERR_NO_IDS' => 'You must select a template, theme and imageset for this style.', 'STYLE_ERR_NOT_STYLE' => 'The imported or uploaded file did not contain a valid style archive.', 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', - 'STYLE_EXPORT' => 'Export Style', + 'STYLE_EXPORT' => 'Export style', 'STYLE_EXPORT_EXPLAIN' => 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and ommit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'STYLE_EXPORTED' => 'Style exported succesfully and stored in %s.', 'STYLE_IMAGESET' => 'Imageset', @@ -407,7 +407,7 @@ $lang = array_merge($lang, array( 'THEME_EXPORTED' => 'Theme exported succesfully and stored in %s.', 'THEME_LOCATION' => 'Store stylesheet in', 'THEME_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.', - 'THEME_NAME' => 'Theme Name', + 'THEME_NAME' => 'Theme name', 'THEME_REFRESHED' => 'Theme refreshed successfully.', 'THEME_UPDATED' => 'Class updated successfully.', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 08bebf2d66..6b8935334c 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -79,7 +79,7 @@ $lang = array_merge($lang, array( 'RETAIN_POSTS' => 'Retain posts', 'SELECT_FORM' => 'Select form', - 'SELECT_USER' => 'Select User', + 'SELECT_USER' => 'Select user', 'USER_ADMIN' => 'User administration', 'USER_ADMIN_ACTIVATE' => 'Activate account', @@ -113,9 +113,9 @@ $lang = array_merge($lang, array( 'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user.', 'USER_POSTS_MOVED' => 'Successfully moved users posts to target forum.', 'USER_PREFS_UPDATED' => 'User preferences updated.', - 'USER_PROFILE' => 'User Profile', + 'USER_PROFILE' => 'User profile', 'USER_PROFILE_UPDATED' => 'User profile updated.', - 'USER_RANK' => 'User Rank', + 'USER_RANK' => 'User rank', 'USER_RANK_UPDATED' => 'User rank updated.', 'USER_SIG_UPDATED' => 'User signature successfully updated.', 'USER_TOOLS' => 'Basic tools', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 384fd80340..f31968f885 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -85,7 +85,7 @@ $lang = array_merge($lang, array( 'BACK_TO_TOP' => 'Top', 'BACK_TO_PREV' => 'Back to previous page', 'BAN_TRIGGERED_BY_EMAIL'=> 'This ban has been issued on your email address.', - 'BAN_TRIGGERED_BY_IP' => 'This ban has been issued on your ip address.', + 'BAN_TRIGGERED_BY_IP' => 'This ban has been issued on your IP address.', 'BAN_TRIGGERED_BY_USER' => 'This ban has been issued on your username.', 'BBCODE_GUIDE' => 'BBCode guide', 'BCC' => 'BCC', @@ -218,9 +218,9 @@ $lang = array_merge($lang, array( 'G_ADMINISTRATORS' => 'Administrators', 'G_BOTS' => 'Bots', 'G_GUESTS' => 'Guests', - 'G_REGISTERED' => 'Registered Users', - 'G_REGISTERED_COPPA' => 'Registered COPPA Users', - 'G_GLOBAL_MODERATORS' => 'Global Moderators', + 'G_REGISTERED' => 'Registered users', + 'G_REGISTERED_COPPA' => 'Registered COPPA users', + 'G_GLOBAL_MODERATORS' => 'Global moderators', 'HIDDEN_USERS_ONLINE' => '%d hidden users online', 'HIDDEN_USERS_TOTAL' => '%d hidden and ', @@ -289,7 +289,7 @@ $lang = array_merge($lang, array( 'MCP' => 'Moderator Control Panel', 'MEMBERLIST' => 'Members', 'MEMBERLIST_EXPLAIN' => 'View complete list of members', - 'MERGE_TOPIC' => 'Merge Topic', + 'MERGE_TOPIC' => 'Merge topic', 'MESSAGE' => 'Message', 'MESSAGES' => 'Messages', 'MESSAGE_BODY' => 'Message body', @@ -303,8 +303,8 @@ $lang = array_merge($lang, array( 'NA' => 'N/A', 'NEWEST_USER' => 'Our newest member <strong>%s%s%s</strong>', - 'NEW_MESSAGE' => 'New Message', - 'NEW_MESSAGES' => 'New Messages', + 'NEW_MESSAGE' => 'New message', + 'NEW_MESSAGES' => 'New messages', 'NEW_PM' => '<strong>%d</strong> new message', 'NEW_PMS' => '<strong>%d</strong> new messages', 'NEW_POST' => 'New post', @@ -312,7 +312,7 @@ $lang = array_merge($lang, array( 'NEXT' => 'Next', 'NEVER' => 'Never', 'NO' => 'No', - 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group from the administration control panel.', + 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group from the “Administration Control Panel”.', 'NOT_AUTHORIZED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', @@ -331,7 +331,7 @@ $lang = array_merge($lang, array( 'NO_FORUMS' => 'This board has no forums', 'NO_GROUP' => 'The requested usergroup does not exist.', 'NO_GROUP_MEMBERS' => 'This group currently has no members', - 'NO_IPS_DEFINED' => 'No IPs or Hostnames defined', + 'NO_IPS_DEFINED' => 'No IP addresses or hostnames defined', 'NO_MEMBERS' => 'No members found for this search criteria', 'NO_MESSAGES' => 'No messages', 'NO_MODE' => 'No mode specified.', @@ -356,7 +356,7 @@ $lang = array_merge($lang, array( 'OCCUPATION' => 'Occupation', 'OFFLINE' => 'Offline', 'ONLINE' => 'Online', - 'ONLINE_BUDDIES' => 'Online Buddies', + 'ONLINE_BUDDIES' => 'Online friends', 'ONLINE_USERS_TOTAL' => 'In total there are <strong>%d</strong> users online :: ', 'ONLINE_USERS_ZERO_TOTAL' => 'In total there are <strong>0</strong> users online :: ', 'ONLINE_USER_TOTAL' => 'In total there is <strong>%d</strong> user online :: ', @@ -364,7 +364,7 @@ $lang = array_merge($lang, array( 'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>', 'PASSWORD' => 'Password', - 'PLAY_QUICKTIME_FILE' => 'Play quicktime file', + 'PLAY_QUICKTIME_FILE' => 'Play Quicktime file', 'PM' => 'PM', 'POSTING_MESSAGE' => 'Posting message in %s', 'POST' => 'Post', @@ -389,9 +389,9 @@ $lang = array_merge($lang, array( 'PREVIEW' => 'Preview', 'PREVIOUS' => 'Previous', 'PRIVACY' => 'Privacy policy', - 'PRIVATE_MESSAGE' => 'Private Message', - 'PRIVATE_MESSAGES' => 'Private Messages', - 'PRIVATE_MESSAGING' => 'Private Messaging', + 'PRIVATE_MESSAGE' => 'Private message', + 'PRIVATE_MESSAGES' => 'Private messages', + 'PRIVATE_MESSAGING' => 'Private messaging', 'PROFILE' => 'User Control Panel', 'READING_FORUM' => 'Viewing topics in %s', @@ -413,7 +413,7 @@ $lang = array_merge($lang, array( 'REMOVE_INSTALL' => 'Please delete, move or rename the install directory before you use your forum. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.', 'REPLIES' => 'Replies', 'REPLY_WITH_QUOTE' => 'Reply with quote', - 'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to Global Announcement', + 'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement', 'REPLYING_MESSAGE' => 'Replying to message in %s', 'REPORT_BY' => 'Report by', 'REPORT_POST' => 'Report this post', @@ -496,9 +496,9 @@ $lang = array_merge($lang, array( 'TOO_LONG_CONFIRM_CODE' => 'The confirm code you entered is too long.', 'TOO_LONG_ICQ' => 'The ICQ number you entered is too long.', 'TOO_LONG_INTERESTS' => 'The interests you entered is too long.', - 'TOO_LONG_JABBER' => 'The jabber account name you entered is too long.', + 'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.', 'TOO_LONG_LOCATION' => 'The location you entered is too long.', - 'TOO_LONG_MSN' => 'The MSN name you entered is too long.', + 'TOO_LONG_MSN' => 'The MSNM/WLM name you entered is too long.', 'TOO_LONG_NEW_PASSWORD' => 'The password you entered is too long.', 'TOO_LONG_OCCUPATION' => 'The occupation you entered is too long.', 'TOO_LONG_PASSWORD_CONFIRM' => 'The password confirmation you entered is too long.', @@ -507,7 +507,7 @@ $lang = array_merge($lang, array( 'TOO_LONG_EMAIL' => 'The email address you entered is too long.', 'TOO_LONG_EMAIL_CONFIRM' => 'The email address confirmation you entered is too long.', 'TOO_LONG_WEBSITE' => 'The website address you entered is too long.', - 'TOO_LONG_YIM' => 'The yahoo messenger name you entered is too long.', + 'TOO_LONG_YIM' => 'The Yahoo! Messenger name you entered is too long.', 'TOO_MANY_VOTE_OPTIONS' => 'You have tried to vote for too many options.', @@ -515,9 +515,9 @@ $lang = array_merge($lang, array( 'TOO_SHORT_CONFIRM_CODE' => 'The confirm code you entered is too short.', 'TOO_SHORT_ICQ' => 'The ICQ number you entered is too short.', 'TOO_SHORT_INTERESTS' => 'The interests you entered is too short.', - 'TOO_SHORT_JABBER' => 'The jabber account name you entered is too short.', + 'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.', 'TOO_SHORT_LOCATION' => 'The location you entered is too short.', - 'TOO_SHORT_MSN' => 'The MSN name you entered is too short.', + 'TOO_SHORT_MSN' => 'The MSNM/WLM name you entered is too short.', 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_OCCUPATION' => 'The occupation you entered is too short.', 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', @@ -526,7 +526,7 @@ $lang = array_merge($lang, array( 'TOO_SHORT_EMAIL' => 'The email address you entered is too short.', 'TOO_SHORT_EMAIL_CONFIRM' => 'The email address confirmation you entered is too short.', 'TOO_SHORT_WEBSITE' => 'The website address you entered is too short.', - 'TOO_SHORT_YIM' => 'The yahoo messenger name you entered is too short.', + 'TOO_SHORT_YIM' => 'The Yahoo! Messenger name you entered is too short.', 'TOPIC' => 'Topic', 'TOPICS' => 'Topics', @@ -606,10 +606,10 @@ $lang = array_merge($lang, array( 'WHO_IS_ONLINE' => 'Who is online', 'WRONG_PASSWORD' => 'You entered an incorrect password.', - 'WRONG_DATA_ICQ' => 'The number you entered is not a valid icq number.', - 'WRONG_DATA_JABBER' => 'The name you entered is not a valid jabber account name.', + 'WRONG_DATA_ICQ' => 'The number you entered is not a valid ICQ number.', + 'WRONG_DATA_JABBER' => 'The name you entered is not a valid Jabber account name.', 'WRONG_DATA_LANG' => 'The language you specified is not valid.', - 'WRONG_DATA_WEBSITE' => 'The website address has to be a valid url, including the protocol. For example http://www.example.com/.', + 'WRONG_DATA_WEBSITE' => 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.', 'YEAR' => 'Year', 'YES' => 'Yes', diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt index f0969dfc9f..1bbe058351 100644 --- a/phpBB/language/en/email/user_remind_inactive.txt +++ b/phpBB/language/en/email/user_remind_inactive.txt @@ -2,7 +2,7 @@ Subject: Inactive account reminder Hello {USERNAME}, -On {REGISTER_DATE} you registered a new account at “{SITENAME}”. So far you have not activated this account, you must do this before you can login. For your convenience the activation link is repeated below. +On {REGISTER_DATE} you registered a new account at “{SITENAME}”. To date you have not activated this account which is a prerequisite for forum login. For your convenience the activation link is repeated below. {U_ACTIVATE} diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php index a936058162..2f9f6826e9 100644 --- a/phpBB/language/en/groups.php +++ b/phpBB/language/en/groups.php @@ -42,7 +42,7 @@ $lang = array_merge($lang, array( 'GROUP_DESC' => 'Group description', 'GROUP_HIDDEN' => 'Hidden', 'GROUP_INFORMATION' => 'Usergroup information', - 'GROUP_IS_CLOSED' => 'This is a closed group, new members cannot automatically join.', + 'GROUP_IS_CLOSED' => 'This is a closed group, where new members cannot automatically join and only upon invitation of a group leader.', 'GROUP_IS_FREE' => 'This is a freely open group, all new members are welcome.', 'GROUP_IS_HIDDEN' => 'This is a hidden group, only members of this group can view its membership.', 'GROUP_IS_OPEN' => 'This is an open group, members can apply to join.', diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index 7909a2a148..544b68f5b4 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -44,7 +44,7 @@ $help = array( ), array( 0 => 'How to change the text colour or size', - 1 => 'To alter the color or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <strong>[color=][/color]</strong>. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, eg. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><strong>[color=red]</strong>Hello!<strong>[/color]</strong><br /><br />or<br /><br /><strong>[color=#FF0000]</strong>Hello!<strong>[/color]</strong><br /><br />will both output <span style="color:red">Hello!</span></li><li>Changing the text size is achieved in a similar way using <strong>[size=][/size]</strong>. This tag is dependent on the template you are using but the recommended format is a numerical value representing the text size in pixels, starting at 1 (so tiny you will not see it) through to 29 (very large). For example:<br /><br /><strong>[size=9]</strong>SMALL<strong>[/size]</strong><br /><br />will generally be <span style="font-size:9px;">SMALL</span><br /><br />whereas:<br /><br /><strong>[size=24]</strong>HUGE!<strong>[/size]</strong><br /><br />will be <span style="font-size:24px;">HUGE!</span></li></ul>' + 1 => 'To alter the color or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <strong>[color=][/color]</strong>. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, eg. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><strong>[color=red]</strong>Hello!<strong>[/color]</strong><br /><br />or<br /><br /><strong>[color=#FF0000]</strong>Hello!<strong>[/color]</strong><br /><br />will both output <span style="color:red">Hello!</span></li><li>Changing the text size is achieved in a similar way using <strong>[size=][/size]</strong>. This tag is dependent on the template the user has selected but the recommended format is a numerical value representing the text size in pixels, starting at 1 (so tiny you will not see it) through to 29 (very large). For example:<br /><br /><strong>[size=9]</strong>SMALL<strong>[/size]</strong><br /><br />will generally be <span style="font-size:9px;">SMALL</span><br /><br />whereas:<br /><br /><strong>[size=24]</strong>HUGE!<strong>[/size]</strong><br /><br />will be <span style="font-size:24px;">HUGE!</span></li></ul>' ), array( 0 => 'Can I combine formatting tags?', diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 39903fc14b..c0b8549486 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -44,7 +44,7 @@ $help = array( ), array( 0 => 'How do I prevent my username appearing in the online user listings?', - 1 => 'In your profile you will find an option <em>Hide your online status</em>, if you switch this <em>on</em> you’ll only appear to board administrators, moderators, or to yourself. You will be counted as a hidden user.' + 1 => 'Within the UCP under “Forum preferences” you will find an option <em>Hide your online status</em>, if you enable this option with <samp>Yes</samp>, you’ll only appear to the administrators, moderators or yourself. You will be counted as a hidden user.' ), array( 0 => 'I’ve lost my password!', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 9ea4cd4057..c4fc43731b 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -31,7 +31,7 @@ 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_merge($lang, array( - 'ADMIN_CONFIG' => 'Admin Configuration', + 'ADMIN_CONFIG' => 'Administrator configuration', 'ADMIN_PASSWORD' => 'Administrator password', 'ADMIN_PASSWORD_CONFIRM' => 'Confirm administrator password', 'ADMIN_PASSWORD_EXPLAIN' => '(Please enter a password between 6 and 30 characters in length)', @@ -39,9 +39,9 @@ $lang = array_merge($lang, array( 'ADMIN_USERNAME' => 'Administrator username', 'ADMIN_USERNAME_EXPLAIN' => '(Please enter a username between 3 and 20 characters in length)', 'APP_MAGICK' => 'Imagemagick support [ Attachments ]', - 'AUTHOR_NOTES' => 'Author Notes<br />» %s', + 'AUTHOR_NOTES' => 'Author notes<br />» %s', 'AVAILABLE' => 'Available', - 'AVAILABLE_CONVERTORS' => 'Available Convertors', + 'AVAILABLE_CONVERTORS' => 'Available convertors', 'BEGIN_CONVERT' => 'Begin conversion', 'BLANK_PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using no table prefix.', @@ -73,7 +73,7 @@ $lang = array_merge($lang, array( 'CONVERT_NOT_EXIST' => 'The specified convertor does not exist', 'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion progress, push the button below to begin', - 'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP Upload for Attachments is enabled at the old board. Please copy all Attachment files to a directory accessible, disable ftp uploading and make sure a valid upload dir is specified. If you have done this, restart the convertor.', + 'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.', 'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.', 'CONV_ERROR_FORUM_ACCESS' => 'Unable to get forum access information.', 'CONV_ERROR_GET_CATEGORIES' => 'Unable to get categories.', @@ -98,14 +98,14 @@ $lang = array_merge($lang, array( 'CONV_ERROR_REPLACE_FORUM' => 'Unable to insert new forum replacing old forum.', 'CONV_ERROR_USER_ACCESS' => 'Unable to get user authentication information.', 'CONV_ERROR_WRONG_GROUP' => 'Wrong group "%1$s" defined in %2$s.', - 'CONV_SAVED_MESSAGES' => 'Saved Messages', + 'CONV_SAVED_MESSAGES' => 'Saved messages', 'COULD_NOT_COPY' => 'Could not copy file <strong>%1$s</strong> to <strong>%2$s</strong><br /><br />Please check that the target directory exists and is writable by the webserver', 'COULD_NOT_FIND_PATH' => 'Could not find path to your former forum. Please check your settings and try again.<br />» Specified source path was %s', 'DBMS' => 'Database type', - 'DB_CONFIG' => 'Database Configuration', - 'DB_CONNECTION' => 'Database Connection', + 'DB_CONFIG' => 'Database configuration', + 'DB_CONNECTION' => 'Database connection', 'DB_ERR_INSERT' => 'Error while processing <code>INSERT</code> query', 'DB_ERR_LAST' => 'Error while processing <var>query_last</var>', 'DB_ERR_QUERY_FIRST' => 'Error while executing <var>query_first</var>', @@ -118,7 +118,7 @@ $lang = array_merge($lang, array( 'DB_PORT' => 'Database server port', 'DB_PORT_EXPLAIN' => 'Leave this blank unless you know the server operates on a non-standard port.', 'DB_USERNAME' => 'Database username', - 'DB_TEST' => 'Test Connection', + 'DB_TEST' => 'Test connection', 'DEFAULT_LANG' => 'Default board language', 'DEFAULT_PREFIX_IS' => 'The default table prefix for %1$s is <strong>%2$s</strong>', 'DEV_NO_TEST_FILE' => 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source forum to allow the path to it to be verified.', @@ -144,27 +144,27 @@ $lang = array_merge($lang, array( 'ENABLE_KEYS' => 'Re-enabling keys. This can take a while', - 'FILES_OPTIONAL' => 'Optional Files and Directories', + 'FILES_OPTIONAL' => 'Optional files and directories', 'FILES_OPTIONAL_EXPLAIN' => '<strong>Optional</strong> - These files, directories or permissions are not required. The installation routines will attempt to use various techniques to complete if they do not exist or cannot be written to. However, the presence of these files, directories or permissions will speed installation.', 'FILES_REQUIRED' => 'Files and Directories', 'FILES_REQUIRED_EXPLAIN' => '<strong>Required</strong> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found” you need to create the relevant file or directory. If you see “Unwriteable” you need to change the permissions on the file or directory to allow phpBB to write to it.', 'FILLING_TABLE' => 'Filling table <strong>%s</strong>', - 'FILLING_TABLES' => 'Filling Tables', - 'FINAL_STEP' => 'Process Final Step', + 'FILLING_TABLES' => 'Filling tables', + 'FINAL_STEP' => 'Processing final step', 'FORUM_ADDRESS' => 'Forum address', - 'FORUM_ADDRESS_EXPLAIN' => 'This is the http address of your former forum, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new forum address within messages, private messages and signatures.', + 'FORUM_ADDRESS_EXPLAIN' => 'This is the URL of your former forum, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new forum address within messages, private messages and signatures.', 'FORUM_PATH' => 'Forum path', 'FORUM_PATH_EXPLAIN' => 'This is the <strong>relative</strong> path on disk to your former forum from the <strong>root of your phpBB install</strong>', 'FOUND' => 'Found', 'FTP_CONFIG' => 'Transfer config by FTP', 'FTP_CONFIG_EXPLAIN' => 'phpBB has detected the presence of the FTP module on this server. You may attempt to install your config.php via this if you wish. You will need to supply the information listed below. Remember your username and password are those to your server! (ask your hosting provider for details if you are unsure what these are)', - 'FTP_PATH' => 'FTP Path', + 'FTP_PATH' => 'FTP path', 'FTP_PATH_EXPLAIN' => 'This is the path from your root directory to that of phpBB, e.g. htdocs/phpBB3/', 'FTP_UPLOAD' => 'Upload', 'GPL' => 'General Public License', - 'INITIAL_CONFIG' => 'Basic Configuration', + 'INITIAL_CONFIG' => 'Basic configuration', 'INITIAL_CONFIG_EXPLAIN' => 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.', 'INSTALL_CONGRATS' => 'Congratulations', 'INSTALL_CONGRATS_EXPLAIN' => 'You have now successfully installed phpBB 3.0. Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Userguide</a> and the <a href="http://www.phpbb.com/phpBB/viewforum.php?f=46">Beta support forum</a>, see the %sREADME%s for further information.<br /><br /><strong>Please now delete, move or rename the install directory before you use your forum. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.</strong>', @@ -183,8 +183,8 @@ $lang = array_merge($lang, array( 'INSTALL_NEXT_PASS' => 'All the basic tests have been passed and you may proceed to the next stage of installation. If you have changed any permissions, modules, etc. and wish to re-test you can do so if you wish.', 'INSTALL_PANEL' => 'Installation Panel', 'INSTALL_SEND_CONFIG' => 'Unfortunately phpBB could not write the configuration information directly to your config.php. This may be because the file does not exist or is not writeable. A number of options will be listed below enabling you to complete installation of config.php.', - 'INSTALL_START' => 'Start Install', - 'INSTALL_TEST' => 'Test Again', + 'INSTALL_START' => 'Start install', + 'INSTALL_TEST' => 'Test again', 'INST_ERR' => 'Installation error', 'INST_ERR_DB_CONNECT' => 'Could not connect to the database, see error message below', 'INST_ERR_DB_FORUM_PATH' => 'The database file specified is within your forum directory tree. You should put this file in a non web-accessible location', @@ -214,16 +214,16 @@ $lang = array_merge($lang, array( 'INVALID_PRIMARY_KEY' => 'Invalid primary key : %s', // mbstring - 'MBSTRING_CHECK' => 'mbstring Extension Check', - 'MBSTRING_CHECK_EXPLAIN' => 'mbstring is a PHP extension that provides multibyte string functions. Certain features of mbstring are not compatible with phpBB and must be disabled', + 'MBSTRING_CHECK' => '<samp>mbstring</samp> extension check', + 'MBSTRING_CHECK_EXPLAIN' => '<samp>mbstring</samp> is a PHP extension that provides multibyte string functions. Certain features of mbstring are not compatible with phpBB and must be disabled', 'MBSTRING_FUNC_OVERLOAD' => 'Function overloading', - 'MBSTRING_FUNC_OVERLOAD_EXPLAIN' => 'mbstring.func_overload must be set to either 0 or 4', + 'MBSTRING_FUNC_OVERLOAD_EXPLAIN' => '<var>mbstring.func_overload</var> must be set to either 0 or 4', 'MBSTRING_ENCODING_TRANSLATION' => 'Transparent character encoding', - 'MBSTRING_ENCODING_TRANSLATION_EXPLAIN' => 'mbstring.encoding_translation must be set to 0', + 'MBSTRING_ENCODING_TRANSLATION_EXPLAIN' => '<var>mbstring.encoding_translation</var> must be set to 0', 'MBSTRING_HTTP_INPUT' => 'HTTP input character conversion', - 'MBSTRING_HTTP_INPUT_EXPLAIN' => 'mbstring.http_input must be set to pass', + 'MBSTRING_HTTP_INPUT_EXPLAIN' => '<var>mbstring.http_input</var> must be set to pass', 'MBSTRING_HTTP_OUTPUT' => 'HTTP output character conversion', - 'MBSTRING_HTTP_OUTPUT_EXPLAIN' => 'mbstring.http_output must be set to pass', + 'MBSTRING_HTTP_OUTPUT_EXPLAIN' => '<var>mbstring.http_output</var> must be set to pass', 'MAKE_FOLDER_WRITABLE' => 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>', 'MAKE_FOLDERS_WRITABLE' => 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>', @@ -238,26 +238,26 @@ $lang = array_merge($lang, array( 'NO_TABLES_FOUND' => 'No tables found.', // TODO: Write some explanatory introduction text 'OVERVIEW_BODY' => 'Welcome to our public beta of the next-generation of phpBB after 2.0.x, phpBB 3.0! This beta release is intended for advanced users to try out on dedicated development enviroments to help us finish creating the best Opensource Bulletin Board solution available.</p><p><strong style="text-transform: uppercase;">Note:</strong> This release is <strong style="text-transform: uppercase;">not final</strong> and made available for testing purposes <strong style="text-transform: uppercase;">only</strong>.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above.', - 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 Support', + 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support', 'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension', - 'PHP_OPTIONAL_MODULE' => 'Optional Modules', + 'PHP_OPTIONAL_MODULE' => 'Optional modules', 'PHP_OPTIONAL_MODULE_EXPLAIN' => '<strong>Optional</strong> - These modules or applications are optional, you do not need these to use phpBB 3.0. However if you have them available they will enable greater functionality.', - 'PHP_SUPPORTED_DB' => 'Supported Databases', + 'PHP_SUPPORTED_DB' => 'Supported databases', 'PHP_SUPPORTED_DB_EXPLAIN' => '<strong>Required</strong> - You must have support for at least one compatible database within PHP. If no database modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice.', 'PHP_REGISTER_GLOBALS' => 'PHP setting <var>register_globals</var> is disabled', 'PHP_REGISTER_GLOBALS_EXPLAIN' => 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.', - 'PHP_SAFE_MODE' => 'Safe Mode', - 'PHP_SETTINGS' => 'PHP Version and Settings', + 'PHP_SAFE_MODE' => 'Safe mode', + 'PHP_SETTINGS' => 'PHP version and settings', 'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', 'PHP_VERSION_REQD' => 'PHP version >= 4.3.3', - 'POST_ID' => 'Post id', + 'POST_ID' => 'Post ID', 'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.', 'PREPROCESS_STEP' => 'Executing pre-processing functions/queries', 'PRE_CONVERT_COMPLETE' => 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process.', 'PROCESS_LAST' => 'Processing last statements', // 'REQUIRED' => 'Required', - 'REQUIREMENTS_TITLE' => 'Installation Compatibility', + 'REQUIREMENTS_TITLE' => 'Installation compatibility', 'REQUIREMENTS_EXPLAIN' => 'Before proceeding with full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed. If you wish to enable any of the functionality listed by the optional tests, you should ensure that these tests are passed also.', 'RETRY_WRITE' => 'Retry writing config', 'RETRY_WRITE_EXPLAIN' => 'If you wish you can change the permissions on config.php to allow phpBB to write to it. Should you wish to do that you can click Retry below to try again. Remember to return the permissions on config.php after phpBB has finished installation.', @@ -265,32 +265,32 @@ $lang = array_merge($lang, array( 'SCRIPT_PATH' => 'Script path', 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>', 'SELECT_LANG' => 'Select language', - 'SERVER_CONFIG' => 'Server Configuration', - 'SOFTWARE' => 'Forum Software', - 'SPECIFY_OPTIONS' => 'Specify Conversion Options', - 'STAGE_ADMINISTRATOR' => 'Administrator Details', - 'STAGE_ADVANCED' => 'Advanced Settings', + 'SERVER_CONFIG' => 'Server configuration', + 'SOFTWARE' => 'Forum software', + 'SPECIFY_OPTIONS' => 'Specify conversion options', + 'STAGE_ADMINISTRATOR' => 'Administrator details', + 'STAGE_ADVANCED' => 'Advanced settings', 'STAGE_ADVANCED_EXPLAIN' => 'The settings on this page are only necessary to set if you know that you require something different from the default. If unsure, just proceed to the next page, this can be altered from the Administration Panel later.', - 'STAGE_CONFIG_FILE' => 'Configuration File', - 'STAGE_CREATE_TABLE' => 'Create Database Tables', + 'STAGE_CONFIG_FILE' => 'Configuration file', + 'STAGE_CREATE_TABLE' => 'Create database tables', 'STAGE_CREATE_TABLE_EXPLAIN' => 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.', - 'STAGE_DATABASE' => 'Database Settings', - 'STAGE_FINAL' => 'Final Stage', + 'STAGE_DATABASE' => 'Database settings', + 'STAGE_FINAL' => 'Final stage', 'STAGE_INTRO' => 'Introduction', 'STAGE_IN_PROGRESS' => 'Conversion in progress', 'STAGE_REQUIREMENTS' => 'Requirements', 'STAGE_SETTINGS' => 'Settings', - 'STARTING_CONVERT' => 'Starting Conversion Process', + 'STARTING_CONVERT' => 'Starting conversion process', 'STEP_PERCENT_COMPLETED' => 'Step <strong>%d</strong> of <strong>%d</strong>', 'SUB_INTRO' => 'Introduction', 'SUB_LICENSE' => 'License', 'SUB_SUPPORT' => 'Support', - 'SUCCESSFUL_CONNECT' => 'Successful Connection', + 'SUCCESSFUL_CONNECT' => 'Successful connection', // TODO: Write some text on obtaining support 'SUPPORT_BODY' => 'During the beta phase a minimal level of support will be given at <a href="http://www.phpbb.com/phpBB/viewforum.php?f=46">the phpBB 3.0 Beta support forum</a>. We will provide answers to general setup questions, configuration problems and support for determining common problems mostly related to bugs. We will not support modifications, custom code/style additions or any users using the beta packages within a live environment.</p><p>For additional assistance, please refer to our <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a>.</p><p>To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/">subscribe to our mailing list</a>', 'SYNC_FORUMS' => 'Starting to sync forums', 'SYNC_TOPICS' => 'Starting to sync topics', - 'SYNC_TOPIC_ID' => 'Synchronising topics from topic_id %1$s to %2$s', + 'SYNC_TOPIC_ID' => 'Synchronising topics from <var>topic_id</var> %1$s to %2$s', 'TABLES_MISSING' => 'Could not find these tables<br />» <strong>%s</strong>.', 'TABLE_PREFIX' => 'Prefix for tables in database', @@ -361,8 +361,8 @@ $lang = array_merge($lang, array( 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files were not modified and represent the original phpBB files from the version you want to update from.', 'FILES_UP_TO_DATE' => 'Already updated files', 'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.', - 'FTP_SETTINGS' => 'FTP Settings', - 'FTP_UPDATE_METHOD' => 'FTP Upload', + 'FTP_SETTINGS' => 'FTP settings', + 'FTP_UPDATE_METHOD' => 'FTP upload', 'INCOMPATIBLE_UPDATE_FILES' => 'The update files found are incompatible with your installed version. Your installed version is %1$s and the update file is for updating phpBB %2$s to %3$s.', 'INCOMPLETE_UPDATE_FILES' => 'The update files are incomplete', @@ -407,7 +407,7 @@ $lang = array_merge($lang, array( 'SELECT_DIFF_MODE' => 'Select diff mode', 'SELECT_DOWNLOAD_FORMAT' => 'Select download archive format', - 'SELECT_FTP_SETTINGS' => 'Select FTP Settings', + 'SELECT_FTP_SETTINGS' => 'Select FTP settings', 'SHOW_DIFF_CONFLICT' => 'Show differences/conflicts', 'SHOW_DIFF_FINAL' => 'Show resulting file', 'SHOW_DIFF_MODIFIED' => 'Show merged differences', @@ -420,7 +420,7 @@ $lang = array_merge($lang, array( 'STAGE_FILE_CHECK' => 'Check files', 'STAGE_UPDATE_DB' => 'Update database', 'STAGE_UPDATE_FILES' => 'Update files', - 'STAGE_VERSION_CHECK' => 'Version Check', + 'STAGE_VERSION_CHECK' => 'Version check', 'STATUS_CONFLICT' => 'Modified file producing conflicts', 'STATUS_MODIFIED' => 'Modified file', 'STATUS_NEW' => 'New file', @@ -434,7 +434,7 @@ $lang = array_merge($lang, array( 'UPDATE_DATABASE_SCHEMA' => 'Updating database schema', 'UPDATE_FILES' => 'Update files', 'UPDATE_FILES_NOTICE' => 'Please make sure you have updated your board files too, this file is only updating your database.', - 'UPDATE_INSTALLATION' => 'Update phpBB Installation', + 'UPDATE_INSTALLATION' => 'Update phpBB installation', 'UPDATE_INSTALLATION_EXPLAIN' => 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />', 'UPDATE_INSTRUCTIONS' => ' @@ -461,7 +461,7 @@ $lang = array_merge($lang, array( </p> ', 'UPDATE_METHOD' => 'Update method', - 'UPDATE_METHOD_EXPLAIN' => 'You are now able to choose your preferred update method. Using the FTP Upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.', + 'UPDATE_METHOD_EXPLAIN' => 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.', 'UPDATE_SUCCESS' => 'Update was successful', 'UPDATE_SUCCESS_EXPLAIN' => 'Successfully updated all files. The next step involves checking all files again to make sure the files got updated correctly.', 'UPDATE_VERSION_OPTIMIZE' => 'Updating version and optimizing tables', @@ -472,7 +472,7 @@ $lang = array_merge($lang, array( 'UPDATE_DB_SUCCESS' => 'Database update was successful', - 'VERSION_CHECK' => 'Version Check', + 'VERSION_CHECK' => 'Version check', 'VERSION_CHECK_EXPLAIN' => 'Checks to see if the version of phpBB you are currently running is up to date.', 'VERSION_NOT_UP_TO_DATE' => 'Your version of phpBB is not up to date. Please continue the update process.', 'VERSION_NOT_UP_TO_DATE_ACP'=> 'Your version of phpBB is not up to date.<br />Below you will find a link to the release announcement for the latest version as well as instructions on how to perform the update.', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 1b7f430806..8c3e3e049f 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -92,9 +92,9 @@ $lang = array_merge($lang, array( 'FORUM_STATUS' => 'Forum status', 'FORUM_STYLE' => 'Forum style', - 'GLOBAL_ANNOUNCEMENT' => 'Global Announcement', + 'GLOBAL_ANNOUNCEMENT' => 'Global announcement', - 'IP_INFO' => 'IP Information', + 'IP_INFO' => 'IP address information', 'IPS_POSTED_FROM' => 'IP addresses this user has posted from', 'LATEST_LOGS' => 'Latest 5 logged actions', @@ -126,7 +126,7 @@ $lang = array_merge($lang, array( 'MCP_ADD' => 'Add a warning', 'MCP_BAN' => 'Banning', - 'MCP_BAN_EMAILS' => 'Ban Emails', + 'MCP_BAN_EMAILS' => 'Ban emails', 'MCP_BAN_IPS' => 'Ban IPs', 'MCP_BAN_USERNAMES' => 'Ban Usernames', @@ -140,22 +140,22 @@ $lang = array_merge($lang, array( 'MCP_MAIN_FRONT' => 'Front page', 'MCP_MAIN_POST_DETAILS' => 'Post details', 'MCP_MAIN_TOPIC_VIEW' => 'View topic', - 'MCP_MAKE_ANNOUNCEMENT' => 'Make Announcement', - 'MCP_MAKE_ANNOUNCEMENT_CONFIRM' => 'Are you sure you want to change this topic to an Announcement?', - 'MCP_MAKE_ANNOUNCEMENTS' => 'Make Announcements', - 'MCP_MAKE_ANNOUNCEMENTS_CONFIRM'=> 'Are you sure you want to change the selected topics to Announcements?', - 'MCP_MAKE_GLOBAL' => 'Make Global Announcement', - 'MCP_MAKE_GLOBAL_CONFIRM' => 'Are you sure you want to change this topic to a Global Announcement?', - 'MCP_MAKE_GLOBALS' => 'Make Global Announcements', - 'MCP_MAKE_GLOBALS_CONFIRM' => 'Are you sure you want to change the selected topics to Global Announcements?', - 'MCP_MAKE_STICKY' => 'Make Sticky', - 'MCP_MAKE_STICKY_CONFIRM' => 'Are you sure you want to change this topic to a Sticky?', - 'MCP_MAKE_STICKIES' => 'Make Stickies', - 'MCP_MAKE_STICKIES_CONFIRM' => 'Are you sure you want to change the selected topics to Stickies?', - 'MCP_MAKE_NORMAL' => 'Make Standard Topic', - 'MCP_MAKE_NORMAL_CONFIRM' => 'Are you sure you want to change this topic to a Standard Topic?', - 'MCP_MAKE_NORMALS' => 'Make Standard Topics', - 'MCP_MAKE_NORMALS_CONFIRM' => 'Are you sure you want to change the selected topics to Standard Topics?', + 'MCP_MAKE_ANNOUNCEMENT' => 'Modify to “Announcement”', + 'MCP_MAKE_ANNOUNCEMENT_CONFIRM' => 'Are you sure you want to change this topic to an “Announcement”?', + 'MCP_MAKE_ANNOUNCEMENTS' => 'Modify to “Announcements”', + 'MCP_MAKE_ANNOUNCEMENTS_CONFIRM'=> 'Are you sure you want to change the selected topics to “Announcements”?', + 'MCP_MAKE_GLOBAL' => 'Modify to “Global announcement”', + 'MCP_MAKE_GLOBAL_CONFIRM' => 'Are you sure you want to change this topic to a “Global announcement”?', + 'MCP_MAKE_GLOBALS' => 'Modify to “Global announcements”', + 'MCP_MAKE_GLOBALS_CONFIRM' => 'Are you sure you want to change the selected topics to “Global announcements”?', + 'MCP_MAKE_STICKY' => 'Modify to “Sticky”', + 'MCP_MAKE_STICKY_CONFIRM' => 'Are you sure you want to change this topic to a “Sticky”?', + 'MCP_MAKE_STICKIES' => 'Modify to “Stickie”s', + 'MCP_MAKE_STICKIES_CONFIRM' => 'Are you sure you want to change the selected topics to “Stickies”?', + 'MCP_MAKE_NORMAL' => 'Modify to “Standard Topic”', + 'MCP_MAKE_NORMAL_CONFIRM' => 'Are you sure you want to change this topic to a “Standard Topic”?', + 'MCP_MAKE_NORMALS' => 'Modify to “Standard Topics”', + 'MCP_MAKE_NORMALS_CONFIRM' => 'Are you sure you want to change the selected topics to “Standard Topics”?', 'MCP_NOTES' => 'User notes', 'MCP_NOTES_FRONT' => 'Front page', @@ -186,7 +186,7 @@ $lang = array_merge($lang, array( 'MERGE_POSTS' => 'Merge posts', 'MERGE_POSTS_CONFIRM' => 'Are you sure you want to merge the selected posts?', 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on the "Select" button to search for one', - 'MERGE_TOPIC_ID' => 'Destination topic id', + 'MERGE_TOPIC_ID' => 'Destination topic identification number', 'MODERATE_FORUM' => 'Moderate forum', 'MOD_OPTIONS' => 'Moderator options', 'MORE_INFO' => 'Further information', @@ -331,7 +331,7 @@ $lang = array_merge($lang, array( 'WARNED_USERS' => 'Warned users', 'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them', 'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]', - 'WARNING_PM_SUBJECT' => 'Board Warning Issued', + 'WARNING_PM_SUBJECT' => 'Board warning issued', 'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s', 'WARNINGS_ZERO_TOTAL' => 'No warnings exists', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index d84987a590..b87b29b7d6 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -164,7 +164,7 @@ $lang = array_merge($lang, array( 'SAVE' => 'Save', 'SAVE_DATE' => 'Saved at', - 'SAVE_DRAFT' => 'Save Draft', + 'SAVE_DRAFT' => 'Save draft', 'SAVE_DRAFT_CONFIRM' => 'Please note that saved drafts only include the subject and the message, any other element will be removed. Do you want to save your draft now?', 'SMILIES' => 'Smilies', 'SMILIES_ARE_OFF' => 'Smilies are <em>OFF</em>', @@ -179,12 +179,12 @@ $lang = array_merge($lang, array( 'TOO_MANY_ATTACHMENTS' => 'Cannot add another attachment, %d is the maxmimum.', 'TOO_MANY_CHARS' => 'Your message contains too many characters.', 'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options', - 'TOO_MANY_SMILIES' => 'Your message contains too many smilies. A maximum of %d smilies are allowed.', - 'TOO_MANY_URLS' => 'Your message contains too many urls. A maximum of %d urls are allowed.', - 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more Options per User than existing poll options', + 'TOO_MANY_SMILIES' => 'Your message contains too many smilies. The maximum number of smilies allowed is %d.', + 'TOO_MANY_URLS' => 'Your message contains too many URLs. The maximum number of URLs allowed is %d.', + 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more options per user than existing poll options', 'TOPIC_BUMPED' => 'Topic has been bumped successfully', - 'UNAUTHORISED_BBCODE' => 'You cannot use certain bbcodes: ', + 'UNAUTHORISED_BBCODE' => 'You cannot use certain BBCodes: ', 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.', 'UPDATE_COMMENT' => 'Update comment', 'URL_INVALID' => 'The URL you specified is invalid.', diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index 9b63bf6f38..cd7b8c50e5 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -72,8 +72,8 @@ $lang = array_merge($lang, array( 'SEARCH_IN_RESULTS' => 'Search these results', 'SEARCH_KEYWORDS_EXPLAIN' => 'Place <strong>+</strong> in front of a word which must be found and <strong>-</strong> in front of a word which must not be found. Put a list of words seperated by <strong>|</strong> into brackets if only one of the words must be found. Use * as a wildcard for partial matches.', 'SEARCH_MSG_ONLY' => 'Message text only', - 'SEARCH_OPTIONS' => 'Search Options', - 'SEARCH_QUERY' => 'Search Query', + 'SEARCH_OPTIONS' => 'Search options', + 'SEARCH_QUERY' => 'Search query', 'SEARCH_SUBFORUMS' => 'Search subforums', 'SEARCH_TITLE_MSG' => 'Post subjects and message text', 'SEARCH_TITLE_ONLY' => 'Topic titles only', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 41ee1ccc7f..92d5225743 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -84,15 +84,15 @@ $lang = array_merge($lang, array( '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_RULE' => 'Add Rule', + 'ADD_NEW_RULE' => 'Add new rule', + 'ADD_RULE' => 'Add 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', - 'ALLOW_PM_EXPLAIN' => 'Note that admins and moderators will always be able to send you messages.', + 'ALLOW_PM_EXPLAIN' => 'Note that administrators and moderators will always be able to send you messages.', 'ALREADY_ACTIVATED' => 'You have already activated your account', - 'ATTACHMENTS_EXPLAIN' => 'This is a list of attachements you have made in posts to this forum.', + 'ATTACHMENTS_EXPLAIN' => 'This is a list of attachments you have made in posts to this forum.', 'ATTACHMENTS_DELETED' => 'Attachments successfully deleted.', 'ATTACHMENT_DELETED' => 'Attachment successfully deleted.', 'AVATAR_CATEGORY' => 'Category', @@ -183,7 +183,7 @@ $lang = array_merge($lang, array( 'EXPORT_AS_CSV_EXCEL' => 'Export as CSV (Excel)', 'EXPORT_AS_TXT' => 'Export as TXT', 'EXPORT_AS_MSG' => 'Export as MSG', - 'EXPORT_FOLDER' => 'Export Folder', + 'EXPORT_FOLDER' => 'Export folder', 'FIELD_REQUIRED' => 'The field “%s” must be completed.', 'FIELD_TOO_SHORT' => 'The field “%1$s” is too short, a minimum of %2$d characters is required.', @@ -213,14 +213,14 @@ $lang = array_merge($lang, array( 'FRIENDS_OFFLINE' => 'Offline', 'FRIENDS_ONLINE' => 'Online', 'FRIENDS_UPDATED' => 'Your friends list has been updated successfully', - 'FULL_FOLDER_OPTION_CHANGED'=> 'Full Folder Option changed successfully', + 'FULL_FOLDER_OPTION_CHANGED'=> 'The action to take when a folder is full have been changed successfully', 'FWD_ORIGINAL_MESSAGE' => '-------- Original Message --------', 'FWD_SUBJECT' => 'Subject: %s', 'FWD_DATE' => 'Date: %s', 'FWD_FROM' => 'From: %s', 'FWD_TO' => 'To: %s', - 'GLOBAL_ANNOUNCEMENT' => 'Global Announcement', + 'GLOBAL_ANNOUNCEMENT' => 'Global announcement', 'HIDE_ONLINE' => 'Hide my online status', 'HOLD_NEW_MESSAGES' => 'Do not accept new messages (New messages will be held back until enough space is available)', @@ -236,7 +236,7 @@ $lang = array_merge($lang, array( 'LANGUAGE' => 'Language', 'LINK_REMOTE_AVATAR' => 'Link off-site', - 'LINK_REMOTE_AVATAR_EXPLAIN'=> 'Enter the URL of the location containing the Avatar image you wish to link to.', + 'LINK_REMOTE_AVATAR_EXPLAIN'=> 'Enter the URL of the location containing the avatar image you wish to link to.', 'LINK_REMOTE_SIZE' => 'Avatar dimensions', 'LINK_REMOTE_SIZE_EXPLAIN' => 'Specify the width and height of the avatar, leave blank to attempt automatic verification.', 'LOGIN_EXPLAIN_UCP' => 'Please login in order to access the User Control Panel', @@ -259,7 +259,7 @@ $lang = array_merge($lang, array( 'MOVE_DOWN' => 'Move down', 'MOVE_MARKED_TO_FOLDER' => 'Move marked to %s', '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_TO_FOLDER' => 'Move to folder', 'MOVE_UP' => 'Move up', 'NEW_EMAIL_ERROR' => 'The email addresses you entered do not match.', @@ -306,7 +306,7 @@ $lang = array_merge($lang, array( 'NO_FRIENDS_ONLINE' => 'No friends online', 'NO_GROUP_SELECTED' => 'No group specified', 'NO_IMPORTANT_NEWS' => 'No important announcements present', - 'NO_MESSAGE' => 'Private Message could not be found', + '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', @@ -332,18 +332,18 @@ $lang = array_merge($lang, array( 'PM_ICON' => 'PM icon', 'PM_INBOX' => 'Inbox', 'PM_OUTBOX' => 'Outbox', - 'PM_SENTBOX' => 'Sent Messages', + 'PM_SENTBOX' => 'Sent messages', 'PM_SUBJECT' => 'Message subject', '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_PM_LOCKED' => 'Private messaging is locked', 'POST_PM_POST' => 'Quote post', 'POST_QUOTE_PM' => 'Quote message', 'POST_REPLY_PM' => 'Reply to message', - 'PRINT_PM' => 'Print View', + '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.', @@ -399,7 +399,7 @@ $lang = array_merge($lang, array( 'UCP_AIM' => 'AOL Instant Messenger', 'UCP_ATTACHMENTS' => 'Attachments', 'UCP_COPPA_BEFORE' => 'Before %s', - 'UCP_COPPA_ON_AFTER' => 'On or After %s', + 'UCP_COPPA_ON_AFTER' => 'On or after %s', '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_ICQ' => 'ICQ number', 'UCP_JABBER' => 'Jabber address', diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 44276689a7..1361a345f7 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -32,7 +32,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ATTACHMENT' => 'Attachment', - 'ATTACHMENT_FUNCTIONALITY_DISABLED' => 'Attachment has been disabled', + 'ATTACHMENT_FUNCTIONALITY_DISABLED' => 'The attachments feature has been disabled', 'BOOKMARK_ADDED' => 'Bookmarked topic successfully.', 'BOOKMARK_REMOVED' => 'Removed bookmarked topic successfully.', @@ -49,7 +49,7 @@ $lang = array_merge($lang, array( 'EDITED_TIMES_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d times in total', 'EDITED_TIME_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d time in total', 'EMAIL_TOPIC' => 'Email friend', - 'ERROR_NO_ATTACHMENT' => 'The selected Attachment does not exist anymore', + 'ERROR_NO_ATTACHMENT' => 'The selected attachment does not exist anymore', 'FILE_NOT_FOUND_404' => 'The file <strong>%s</strong> does not exist.', 'FORK_TOPIC' => 'Copy topic', @@ -58,10 +58,10 @@ $lang = array_merge($lang, array( 'LOGIN_NOTIFY_TOPIC' => 'You have been notified about this topic, please login to view it.', 'LOGIN_VIEWTOPIC' => 'The board administrator requires you to be registered and logged in to view this topic.', - 'MAKE_ANNOUNCE' => 'Change to Announcement', - 'MAKE_GLOBAL' => 'Change to Global', - 'MAKE_NORMAL' => 'Change to Standard Topic', - 'MAKE_STICKY' => 'Change to Sticky', + 'MAKE_ANNOUNCE' => 'Change to “Announcement”', + 'MAKE_GLOBAL' => 'Change to “Global”', + 'MAKE_NORMAL' => 'Change to “Standard Topic”', + 'MAKE_STICKY' => 'Change to “Sticky”', 'MAX_OPTIONS_SELECT' => 'You may select up to <strong>%d</strong> options', 'MAX_OPTION_SELECT' => 'You may select <strong>1</strong> option', 'MISSING_INLINE_ATTACHMENT' => 'The attachment <strong>%s</strong> is no longer available', @@ -95,8 +95,8 @@ $lang = array_merge($lang, array( 'VIEW_NEXT_TOPIC' => 'Next topic', 'VIEW_PREVIOUS_TOPIC' => 'Previous topic', 'VIEW_RESULTS' => 'View results', - 'VIEW_TOPIC_POST' => '1 Post', - 'VIEW_TOPIC_POSTS' => '%d Posts', + 'VIEW_TOPIC_POST' => '1 post', + 'VIEW_TOPIC_POSTS' => '%d posts', 'VIEW_UNREAD_POST' => 'First unread post', 'VISIT_WEBSITE' => 'WWW', 'VOTE_SUBMITTED' => 'Your vote has been cast', |