diff options
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/ban.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/acp/extensions.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 286 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 31 | ||||
| -rw-r--r-- | phpBB/language/en/help_bbcode.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 6 |
10 files changed, 39 insertions, 306 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 2dc0489030..68a68ebe54 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -73,10 +73,10 @@ $lang = array_merge($lang, array( 'PERMANENT' => 'Permanent', 'UNTIL' => 'Until', - 'USER_BAN' => 'Ban one or more usernames', + 'USER_BAN' => 'Ban one or more users by username', '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 <span style="text-decoration: underline;">Find a member</span> 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 users by username', '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 are emphasised.', )); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 18968d6c97..1d2c979e0c 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -355,7 +355,7 @@ $lang = array_merge($lang, array( 'ACP_LOAD_SETTINGS_EXPLAIN' => 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.', 'ALLOW_CDN' => 'Allow usage of third party content delivery networks', - 'ALLOW_CDN_EXPLAIN' => 'If this setting is enabled, some files will be served from external third party servers instead of your server. This reduces the network bandwidth required by your server, but may present a privacy issue for some board administrators.', + 'ALLOW_CDN_EXPLAIN' => 'If this setting is enabled, some files will be served from external third party servers instead of your server. This reduces the network bandwidth required by your server, but may present a privacy issue for some board administrators. In a default phpBB installation, this includes loading “jQuery” and the font “Open Sans” from Google’s content delivery network.', 'CUSTOM_PROFILE_FIELDS' => 'Custom profile fields', 'LIMIT_LOAD' => 'Limit system load', '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 and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 428b9ffd3b..2dc58d8361 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -49,7 +49,7 @@ $lang = array_merge($lang, array( 'ACP_BAN' => 'Banning', 'ACP_BAN_EMAILS' => 'Ban emails', 'ACP_BAN_IPS' => 'Ban IPs', - 'ACP_BAN_USERNAMES' => 'Ban usernames', + 'ACP_BAN_USERNAMES' => 'Ban users', 'ACP_BBCODES' => 'BBCodes', 'ACP_BOARD_CONFIGURATION' => 'Board configuration', 'ACP_BOARD_FEATURES' => 'Board features', @@ -360,7 +360,7 @@ $lang = array_merge($lang, array( 'GZIP_COMPRESSION' => 'GZip compression', - 'NO_SEARCH_INDEX' => 'The selected search backend does not have a search index.<br >Please create the index for “%1$s” in the %2$ssearch index%3$s section.', + 'NO_SEARCH_INDEX' => 'The selected search backend does not have a search index.<br />Please create the index for “%1$s” in the %2$ssearch index%3$s section.', 'NOT_AVAILABLE' => 'Not available', 'NUMBER_FILES' => 'Number of attachments', 'NUMBER_POSTS' => 'Number of posts', @@ -676,6 +676,7 @@ $lang = array_merge($lang, array( 'LOG_PRUNE' => '<strong>Pruned forums</strong><br />» %s', 'LOG_AUTO_PRUNE' => '<strong>Auto-pruned forums</strong><br />» %s', + 'LOG_PRUNE_SHADOW' => '<strong>Auto-pruned shadow topics</strong><br />» %s', 'LOG_PRUNE_USER_DEAC' => '<strong>Users deactivated</strong><br />» %s', 'LOG_PRUNE_USER_DEL_DEL' => '<strong>Users pruned and posts deleted</strong><br />» %s', 'LOG_PRUNE_USER_DEL_ANON' => '<strong>Users pruned and posts retained</strong><br />» %s', diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 409b800ba6..baa7d01763 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -96,7 +96,7 @@ $lang = array_merge($lang, array( 'HOMEPAGE' => 'Homepage', 'PATH' => 'File Path', 'TIME' => 'Release Time', - 'LICENCE' => 'Licence', + 'LICENSE' => 'Licence', 'REQUIREMENTS' => 'Requirements', 'PHPBB_VERSION' => 'phpBB Version', diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 756cb7ae0f..d64380b6b6 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -101,6 +101,8 @@ $lang = array_merge($lang, array( 'FORUM_PASSWORD_OLD' => 'The forum password is using an old hashing method and should be changed.', 'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.', 'FORUM_PRUNE_SETTINGS' => 'Forum prune settings', + 'FORUM_PRUNE_SHADOW' => 'Enable auto-pruning of shadow topics', + 'FORUM_PRUNE_SHADOW_EXPLAIN' => 'Prunes the forum of shadow topics, set the frequency/age parameters below.', 'FORUM_RESYNCED' => 'Forum “%s” successfully resynced', 'FORUM_RULES_EXPLAIN' => 'Forum rules are displayed at any page within the given forum.', 'FORUM_RULES_LINK' => 'Link to forum rules', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index e7c149600d..76b1d5e7dd 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -36,332 +36,48 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ACP_STYLES_EXPLAIN' => 'Here you can manage the available styles on your board. You may alter existing styles, delete, deactivate, reactivate, install new ones. You can also see what a style will look like using the preview function. Also listed is the total user count for each style, note that overriding user styles will not be reflected here.', - 'ADD_TEMPLATE' => 'Create template', - 'ADD_TEMPLATE_EXPLAIN' => 'Here you can add a new template. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this template set on an existing one. You may also be able to upload or import (from the store directory) a template archive. If you upload or import an archive the template name can be optionally taken from the archive name (to do this leave the template name blank).', - 'ARCHIVE_FORMAT' => 'Archive file type', - 'AUTOMATIC_EXPLAIN' => 'Leave blank to attempt automatic detection.', - 'BACKGROUND' => 'Background', - 'BACKGROUND_COLOUR' => 'Background colour', - 'BACKGROUND_IMAGE' => 'Background image', - 'BACKGROUND_REPEAT' => 'Background repeat', - 'BOLD' => 'Bold', - - 'CACHE' => 'Cache', - 'CACHE_CACHED' => 'Cached', - 'CACHE_FILENAME' => 'Template file', - 'CACHE_FILESIZE' => 'File size', - 'CACHE_MODIFIED' => 'Modified', 'CANNOT_BE_INSTALLED' => 'Cannot be installed', - 'CONFIRM_TEMPLATE_CLEAR_CACHE' => 'Are you sure you wish to clear all cached versions of your template files?', - 'CONFIRM_DELETE_STYLES' => 'Are you sure you wish to delete selected styles?', 'CONFIRM_UNINSTALL_STYLES' => 'Are you sure you wish to uninstall selected styles?', 'COPYRIGHT' => 'Copyright', - 'CREATE_STYLE' => 'Create new style', - 'CREATE_TEMPLATE' => 'Create new template set', - 'CREATE_THEME' => 'Create new theme', - 'CURRENT_IMAGE' => 'Current image', 'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.', 'DELETE_FROM_FS' => 'Delete from filesystem', - 'DELETE_STYLE' => 'Delete style', - 'DELETE_STYLE_EXPLAIN' => 'Here you can remove the selected style. Take care in deleting styles, there is no undo capability.', 'DELETE_STYLE_FILES_FAILED' => 'Error deleting files for style "%s".', 'DELETE_STYLE_FILES_SUCCESS' => 'Files for style "%s" have been deleted.', - 'DELETE_TEMPLATE' => 'Delete template', - 'DELETE_TEMPLATE_EXPLAIN' => 'Here you can remove the selected template set from the database. Please note that there is no undo capability. It is recommended that you first export your set for possible future use.', 'DETAILS' => 'Details', - 'DIMENSIONS_EXPLAIN' => 'Selecting yes here will include width/height parameters.', - - - 'EDIT_DETAILS_STYLE' => 'Edit style', - 'EDIT_DETAILS_STYLE_EXPLAIN' => 'Using the form below you can modify this existing style. You may alter the combination of template and theme which define the style itself. You may also make the style the default one.', - 'EDIT_DETAILS_TEMPLATE' => 'Edit template details', - 'EDIT_DETAILS_TEMPLATE_EXPLAIN' => 'Here you can edit certain template details such as its name.', - 'EDIT_DETAILS_THEME' => 'Edit theme details', - 'EDIT_DETAILS_THEME_EXPLAIN' => 'Here you can edit certain theme details such as its name.', - 'EDIT_TEMPLATE' => 'Edit template', - 'EDIT_TEMPLATE_EXPLAIN' => 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.', - 'EDIT_THEME' => 'Edit theme', - 'EDIT_THEME_EXPLAIN' => 'Here you can edit the selected theme, changing colours, images, etc.', - 'EDITOR_DISABLED' => 'The template editor is disabled.', - 'EXPORT' => 'Export', - - 'FOREGROUND' => 'Foreground', - 'FONT_COLOUR' => 'Font colour', - 'FONT_FACE' => 'Font face', - 'FONT_FACE_EXPLAIN' => 'You can specify multiple fonts separated by commas. If a user doesn’t have the first font installed the first other working font will be chosen.', - 'FONT_SIZE' => 'Font size', - - 'GLOBAL_IMAGES' => 'Global', - - 'HIDE_CSS' => 'Hide raw CSS', - - 'IMAGE_WIDTH' => 'Image width', - 'IMAGE_HEIGHT' => 'Image height', - 'IMAGE' => 'Image', - 'IMAGE_NAME' => 'Image name', - 'IMAGE_PARAMETER' => 'Parameter', - 'IMAGE_VALUE' => 'Value', - - 'ITALIC' => 'Italic', - - 'IMG_CAT_BUTTONS' => 'Localised buttons', - 'IMG_CAT_CUSTOM' => 'Custom images', - 'IMG_CAT_FOLDERS' => 'Topic icons', - 'IMG_CAT_FORUMS' => 'Forum icons', - 'IMG_CAT_ICONS' => 'General icons', - 'IMG_CAT_LOGOS' => 'Logos', - 'IMG_CAT_POLLS' => 'Polling images', - 'IMG_CAT_UI' => 'General user interface elements', - 'IMG_CAT_USER' => 'Additional images', - - 'IMG_SITE_LOGO' => 'Main logo', - 'IMG_UPLOAD_BAR' => 'Upload progress bar', - 'IMG_POLL_LEFT' => 'Poll left end', - 'IMG_POLL_CENTER' => 'Poll centre', - 'IMG_POLL_RIGHT' => 'Poll right end', - 'IMG_ICON_FRIEND' => 'Add as friend', - 'IMG_ICON_FOE' => 'Add as foe', - - 'IMG_FORUM_LINK' => 'Forum link', - 'IMG_FORUM_READ' => 'Forum', - 'IMG_FORUM_READ_LOCKED' => 'Forum locked', - 'IMG_FORUM_READ_SUBFORUM' => 'Subforum', - 'IMG_FORUM_UNREAD' => 'Forum unread posts', - 'IMG_FORUM_UNREAD_LOCKED' => 'Forum unread posts locked', - 'IMG_FORUM_UNREAD_SUBFORUM' => 'Subforum unread posts', - 'IMG_SUBFORUM_READ' => 'Legend subforum', - 'IMG_SUBFORUM_UNREAD' => 'Legend subforum unread posts', - - 'IMG_TOPIC_MOVED' => 'Topic moved', - - 'IMG_TOPIC_READ' => 'Topic', - 'IMG_TOPIC_READ_MINE' => 'Topic posted to', - 'IMG_TOPIC_READ_HOT' => 'Topic popular', - 'IMG_TOPIC_READ_HOT_MINE' => 'Topic popular posted to', - 'IMG_TOPIC_READ_LOCKED' => 'Topic locked', - 'IMG_TOPIC_READ_LOCKED_MINE' => 'Topic locked posted to', - - 'IMG_TOPIC_UNREAD' => 'Topic unread posts', - 'IMG_TOPIC_UNREAD_MINE' => 'Topic posted to unread', - 'IMG_TOPIC_UNREAD_HOT' => 'Topic popular unread posts', - 'IMG_TOPIC_UNREAD_HOT_MINE' => 'Topic popular posted to unread', - 'IMG_TOPIC_UNREAD_LOCKED' => 'Topic locked unread', - 'IMG_TOPIC_UNREAD_LOCKED_MINE' => 'Topic locked posted to unread', - - 'IMG_STICKY_READ' => 'Sticky topic', - 'IMG_STICKY_READ_MINE' => 'Sticky topic posted to', - 'IMG_STICKY_READ_LOCKED' => 'Sticky topic locked', - 'IMG_STICKY_READ_LOCKED_MINE' => 'Sticky topic locked posted to', - 'IMG_STICKY_UNREAD' => 'Sticky topic unread posts', - 'IMG_STICKY_UNREAD_MINE' => 'Sticky topic posted to unread', - 'IMG_STICKY_UNREAD_LOCKED' => 'Sticky topic locked unread posts', - 'IMG_STICKY_UNREAD_LOCKED_MINE' => 'Sticky topic locked posted to unread', - - 'IMG_ANNOUNCE_READ' => 'Announcement', - 'IMG_ANNOUNCE_READ_MINE' => 'Announcement posted to', - 'IMG_ANNOUNCE_READ_LOCKED' => 'Announcement locked', - 'IMG_ANNOUNCE_READ_LOCKED_MINE' => 'Announcement locked posted to', - 'IMG_ANNOUNCE_UNREAD' => 'Announcement unread posts', - 'IMG_ANNOUNCE_UNREAD_MINE' => 'Announcement posted to unread', - 'IMG_ANNOUNCE_UNREAD_LOCKED' => 'Announcement locked unread posts', - 'IMG_ANNOUNCE_UNREAD_LOCKED_MINE' => 'Announcement locked posted to unread', - 'IMG_GLOBAL_READ' => 'Global', - 'IMG_GLOBAL_READ_MINE' => 'Global posted to', - 'IMG_GLOBAL_READ_LOCKED' => 'Global locked', - 'IMG_GLOBAL_READ_LOCKED_MINE' => 'Global locked posted to', - 'IMG_GLOBAL_UNREAD' => 'Global unread posts', - 'IMG_GLOBAL_UNREAD_MINE' => 'Global posted to unread', - 'IMG_GLOBAL_UNREAD_LOCKED' => 'Global locked unread posts', - 'IMG_GLOBAL_UNREAD_LOCKED_MINE' => 'Global locked posted to unread', - - 'IMG_PM_READ' => 'Read private message', - 'IMG_PM_UNREAD' => 'Unread private message', - - 'IMG_ICON_BACK_TOP' => 'Top', - - 'IMG_ICON_CONTACT_EMAIL' => 'Send email', - 'IMG_ICON_CONTACT_JABBER' => 'Jabber', - 'IMG_ICON_CONTACT_PM' => 'Send message', - - 'IMG_ICON_POST_DELETE' => 'Delete post', - 'IMG_ICON_POST_EDIT' => 'Edit post', - 'IMG_ICON_POST_INFO' => 'Show post details', - 'IMG_ICON_POST_QUOTE' => 'Quote post', - 'IMG_ICON_POST_REPORT' => 'Report post', - 'IMG_ICON_POST_TARGET' => 'Minipost', - 'IMG_ICON_POST_TARGET_UNREAD' => 'New minipost', - - - 'IMG_ICON_TOPIC_ATTACH' => 'Attachment', - 'IMG_ICON_TOPIC_LATEST' => 'Last post', - 'IMG_ICON_TOPIC_NEWEST' => 'Last unread post', - 'IMG_ICON_TOPIC_REPORTED' => 'Post reported', - 'IMG_ICON_TOPIC_UNAPPROVED' => 'Post unapproved', - - 'IMG_ICON_USER_ONLINE' => 'User online', - 'IMG_ICON_USER_OFFLINE' => 'User offline', - 'IMG_ICON_USER_PROFILE' => 'Show profile', - 'IMG_ICON_USER_SEARCH' => 'Search posts', - 'IMG_ICON_USER_WARN' => 'Warn user', - - 'IMG_BUTTON_PM_FORWARD' => 'Forward private message', - 'IMG_BUTTON_PM_NEW' => 'New private message', - 'IMG_BUTTON_PM_REPLY' => 'Reply private message', - 'IMG_BUTTON_TOPIC_LOCKED' => 'Topic locked', - 'IMG_BUTTON_TOPIC_NEW' => 'New topic', - 'IMG_BUTTON_TOPIC_REPLY' => 'Reply topic', - - 'IMG_USER_ICON1' => 'User defined image 1', - 'IMG_USER_ICON2' => 'User defined image 2', - 'IMG_USER_ICON3' => 'User defined image 3', - 'IMG_USER_ICON4' => 'User defined image 4', - 'IMG_USER_ICON5' => 'User defined image 5', - 'IMG_USER_ICON6' => 'User defined image 6', - 'IMG_USER_ICON7' => 'User defined image 7', - 'IMG_USER_ICON8' => 'User defined image 8', - 'IMG_USER_ICON9' => 'User defined image 9', - 'IMG_USER_ICON10' => 'User defined image 10', - - 'INACTIVE_STYLES' => 'Inactive styles', - 'INCLUDE_DIMENSIONS' => 'Include dimensions', - 'INCLUDE_TEMPLATE' => 'Include template', - 'INCLUDE_THEME' => 'Include theme', 'INHERITING_FROM' => 'Inherits from', 'INSTALL_STYLE' => 'Install style', 'INSTALL_STYLES' => 'Install styles', 'INSTALL_STYLES_EXPLAIN' => 'Here you can install new styles.<br />If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.', - 'INSTALLED_STYLE' => 'Installed styles', 'INVALID_STYLE_ID' => 'Invalid style ID.', - 'LINE_SPACING' => 'Line spacing', - 'LOCALISED_IMAGES' => 'Localised', - - 'NO_CLASS' => 'Cannot find class in stylesheet.', - 'NO_IMAGE' => 'No image', - 'NO_IMAGE_ERROR' => 'Cannot find image on filesystem.', 'NO_MATCHING_STYLES_FOUND' => 'No styles match your query.', - 'NO_STYLE' => 'Cannot find style on filesystem.', - 'NO_TEMPLATE' => 'Cannot find template on filesystem.', - 'NO_THEME' => 'Cannot find theme on filesystem.', 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected.', - 'NO_UNIT' => 'None', - - 'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it.', - 'PARENT_STYLE_NOT_FOUND' => 'Parent style was not found. This style may not work correctly. Please uninstall it.', 'PURGED_CACHE' => 'Cache was purged.', - 'REFRESH' => 'Refresh', - 'REPEAT_NO' => 'None', - 'REPEAT_X' => 'Only horizontally', - 'REPEAT_Y' => 'Only vertically', - 'REPEAT_ALL' => 'Both directions', - 'REPLACE_STYLE' => 'Replace style with', - 'REPLACE_STYLE_EXPLAIN' => 'This style will replace the one being deleted for members that use it.', - 'REPLACE_TEMPLATE' => 'Replace template with', - 'REPLACE_TEMPLATE_EXPLAIN' => 'This template set will replace the one you are deleting in any styles that use it.', - 'REPLACE_THEME' => 'Replace theme with', - 'REPLACE_THEME_EXPLAIN' => 'This theme will replace the one you are deleting in any styles that use it.', - 'REPLACE_WITH_OPTION' => 'Replace with “%s”', 'REQUIRES_STYLE' => 'This style requires the style "%s" to be installed.', - 'SELECT_IMAGE' => 'Select image', - 'SELECT_TEMPLATE' => 'Select template file', - 'SELECT_THEME' => 'Select theme file', - 'SELECTED_IMAGE' => 'Selected image', - 'SELECTED_TEMPLATE' => 'Selected template', - 'SELECTED_TEMPLATE_FILE' => 'Selected template file', - 'SELECTED_THEME' => 'Selected theme', - 'SELECTED_THEME_FILE' => 'Selected theme file', - 'STORE_FILESYSTEM' => 'Filesystem', 'STYLE_ACTIVATE' => 'Activate', - 'STYLE_ACTIVATED' => 'Style activated successfully', 'STYLE_ACTIVE' => 'Active', - 'STYLE_ADDED' => 'Style added successfully.', 'STYLE_DEACTIVATE' => 'Deactivate', - 'STYLE_DEACTIVATED' => 'Style deactivated successfully', 'STYLE_DEFAULT' => 'Make default style', - 'STYLE_DEFAULT_CHANGE' => 'Change default style', 'STYLE_DEFAULT_CHANGE_INACTIVE' => 'You must activate style before making it default style.', - 'STYLE_DELETED' => 'Style "%s" deleted successfully.', - 'STYLE_DETAILS_UPDATED' => 'Style edited successfully.', - 'STYLE_ERR_ARCHIVE' => 'Please select an archive method.', - 'STYLE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.', 'STYLE_ERR_INVALID_PARENT' => 'Invalid parent style.', - 'STYLE_ERR_MORE_ELEMENTS' => 'You must select at least one style element.', - 'STYLE_ERR_NAME_CHARS' => 'The style name can only contain alphanumeric characters, -, +, _ and space.', 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', - 'STYLE_ERR_NAME_LONG' => 'The style name can be no longer than 30 characters.', - '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_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 for a commonly used template you could simply export the theme and omit 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 successfully and stored in %s.', 'STYLE_INSTALLED' => 'Style "%s" has been installed.', - 'STYLE_INSTALLED_EDIT_DETAILS' => '<a href="%s">Click here</a> to edit style details or to change default style.', 'STYLE_INSTALLED_RETURN_STYLES' => '<a href="%s">Click here</a> to return to installed styles list.', 'STYLE_INSTALLED_RETURN_UNINSTALLED' => '<a href="%s">Click here</a> to install more styles.', 'STYLE_NAME' => 'Style name', 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', - 'STYLE_PATH' => 'Style path:', - 'STYLE_PARENT' => 'Parent style:', - 'STYLE_TEMPLATE' => 'Template', - 'STYLE_THEME' => 'Theme', + 'STYLE_PATH' => 'Style path', 'STYLE_UNINSTALL' => 'Uninstall', 'STYLE_UNINSTALL_DEPENDENT' => 'Style "%s" cannot be uninstalled because it has one or more child styles.', 'STYLE_UNINSTALLED' => 'Style "%s" uninstalled successfully.', 'STYLE_USED_BY' => 'Used by (including robots)', - 'TEMPLATE_ADDED' => 'Template set added.', - 'TEMPLATE_CACHE' => 'Template cache', - 'TEMPLATE_CACHE_EXPLAIN' => 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.', - 'TEMPLATE_CACHE_CLEARED' => 'Template cache cleared successfully.', - 'TEMPLATE_CACHE_EMPTY' => 'There are no cached templates.', - 'TEMPLATE_DELETED_FS' => 'Template set removed from database but files remain on the filesystem.', - 'TEMPLATE_DETAILS_UPDATED' => 'Template details successfully updated.', - 'TEMPLATE_EDITOR' => 'Raw HTML template editor', - 'TEMPLATE_EDITOR_HEIGHT' => 'Template editor height', - 'TEMPLATE_ERR_ARCHIVE' => 'Please select an archive method.', - 'TEMPLATE_ERR_CACHE_READ' => 'The cache directory used to store cached versions of template files could not be opened.', - 'TEMPLATE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.', - 'TEMPLATE_ERR_NAME_CHARS' => 'The template name can only contain alphanumeric characters, -, +, _ and space.', - 'TEMPLATE_ERR_NAME_LONG' => 'The template name can be no longer than 30 characters.', - 'TEMPLATE_ERR_STYLE_NAME' => 'You must supply a name for this template.', - 'TEMPLATE_EXPORT_EXPLAIN' => 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates 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.', - 'TEMPLATE_EXPORTED' => 'Templates exported successfully and stored in %s.', - 'TEMPLATE_FILE' => 'Template file', - 'TEMPLATE_FILE_UPDATED' => 'Template file updated successfully.', - 'TEMPLATE_NAME' => 'Template name', - 'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.', - - 'THEME_ADDED' => 'New theme added.', - 'THEME_CLASS_ADDED' => 'Custom class added successfully.', - 'THEME_DELETED' => 'Theme deleted successfully.', - 'THEME_DELETED_FS' => 'Theme removed from database but files remain on the filesystem.', - 'THEME_DETAILS_UPDATED' => 'Theme details successfully updated.', - 'THEME_EDITOR' => 'Theme editor', - 'THEME_EDITOR_HEIGHT' => 'Theme editor height', - 'THEME_ERR_ARCHIVE' => 'Please select an archive method.', - 'THEME_ERR_CLASS_CHARS' => 'Only alphanumeric characters plus ., :, -, _ and # are valid in class names.', - 'THEME_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.', - 'THEME_ERR_NAME_CHARS' => 'The theme name can only contain alphanumeric characters, -, +, _ and space.', - 'THEME_ERR_NAME_EXIST' => 'A theme with that name already exists.', - 'THEME_ERR_NAME_LONG' => 'The theme name can be no longer than 30 characters.', - 'THEME_ERR_NOT_THEME' => 'The archive you specified does not contain a valid theme.', - 'THEME_ERR_STYLE_NAME' => 'You must supply a name for this theme.', - 'THEME_FILE' => 'Theme file', - 'THEME_FILE_NOT_WRITABLE' => 'Unable to write to theme file %s. Please check the permissions for the directory and the files.', - 'THEME_EXPORT' => 'Export Theme', - 'THEME_EXPORT_EXPLAIN' => 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme 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.', - 'THEME_EXPORTED' => 'Theme exported successfully and stored in %s.', - 'THEME_NAME' => 'Theme name', - 'THEME_UPDATED' => 'Theme updated successfully.', - - 'UNDERLINE' => 'Underline', 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', - 'UNSET' => 'Undefined', - )); diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 360d6be1e0..501195de72 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -210,8 +210,6 @@ $lang = array_merge($lang, array( 'ERR_CONNECTING_SERVER' => 'Error connecting to the server.', 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.', 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.', - 'ERR_TEMPLATE_EVENT_LOCATION' => 'The specified template event location <em>[%s]</em> is improperly formatted.', - 'ERR_TEMPLATE_COMPILATION' => 'The file could not be compiled: %s', 'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.', 'ERR_UNWATCHING' => 'An error occurred while trying to unsubscribe.', 'ERR_WATCHING' => 'An error occurred while trying to subscribe.', @@ -424,18 +422,29 @@ $lang = array_merge($lang, array( 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NOTIFICATIONS' => 'Notifications', - 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', - 'NOTIFICATION_BOOKMARK_TRIMMED' => '%1$s and %3$d others replied to the topic “%2$s” you have bookmarked.', + // This applies for NOTIFICATION_BOOKMARK, NOTIFICATION_POST, and NOTIFICATION_QUOTE. + // %1$s will return a list of users that's concatenated using "," and "and" - see STRING_LIST + // Once the user count reaches 5 users or more, the list is trimmed using NOTIFICATION_X_OTHERS + // Examples: + // A replied... + // A and B replied... + // A, B and C replied... + // A, B, C and 2 others replied... + 'NOTIFICATION_BOOKMARK' => array( + 1 => '%1$s replied to the topic “%2$s” you have bookmarked.', + ), 'NOTIFICATION_GROUP_REQUEST' => '%1$s is requesting to join the group %2$s.', 'NOTIFICATION_GROUP_REQUEST_APPROVED' => 'Your request to join the group %1$s has been approved.', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', - 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', - 'NOTIFICATION_POST_TRIMMED' => '%1$s and %3$d others replied to the topic “%2$s”', + 'NOTIFICATION_POST' => array( + 1 => '%1$s replied to the topic “%2$s”.', + ), 'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".', 'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved for reason: "%2$s".', 'NOTIFICATION_POST_IN_QUEUE' => 'A new post titled "%2$s" was posted by %1$s and needs approval.', - 'NOTIFICATION_QUOTE' => '%1$s quoted you in the post "%2$s".', - 'NOTIFICATION_QUOTE_TRIMMED' => '%1$s and %3$d others replied to the topic “%2$s”', + 'NOTIFICATION_QUOTE' => array( + 1 => '%1$s quoted you in the post “%2$s”.', + ), 'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" for reason: "%3$s".', 'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" for reason: "%3$s".', 'NOTIFICATION_REPORT_CLOSED' => '%1$s closed the report you made for "%2$s".', @@ -445,6 +454,10 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by %1$s and needs approval.', 'NOTIFICATION_TYPE_NOT_EXIST' => 'The notification type "%s" is missing from the file system.', 'NOTIFICATION_ADMIN_ACTIVATE_USER' => 'The user “%1$s” is newly registered and requires activation.', + // Used in conjuction with NOTIFICATION_BOOKMARK, NOTIFICATION_POST, and NOTIFICATION_QUOTE. + 'NOTIFICATION_X_OTHERS' => array( + 2 => '%d others', + ), 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', @@ -668,6 +681,8 @@ $lang = array_merge($lang, array( 'START_WATCHING_TOPIC' => 'Subscribe topic', 'STOP_WATCHING_FORUM' => 'Unsubscribe forum', 'STOP_WATCHING_TOPIC' => 'Unsubscribe topic', + 'STRING_LIST_MULTI' => '%1$s, and %2$s', + 'STRING_LIST_SIMPLE' => '%1$s and %2$s', 'SUBFORUM' => 'Subforum', 'SUBFORUMS' => 'Subforums', 'SUBJECT' => 'Subject', diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index e0cda9df04..d627ac3908 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -88,7 +88,7 @@ $help = array( ), array( 0 => 'Linking to another site', - 1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.' + 1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.' ), array( 0 => '--', @@ -96,7 +96,7 @@ $help = array( ), array( 0 => 'Adding an image to a post', - 1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.google.com/"><img src="http://www.google.com/intl/en_ALL/images/logo.gif" alt="" /></a>' + 1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.phpbb.com/"><img src="http://www.phpbb.com/theme/images/logos/blue/160x52.png" alt="" /></a>' ), array( 0 => 'Adding attachments into a post', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 83f5e4107e..95efe35b7d 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -90,7 +90,7 @@ $lang = array_merge($lang, array( 1 => '%d user', 2 => '%d users', ), - 'LOGIN_EXPLAIN_LEADERS' => 'The board requires you to be registered and logged in to view the team listing.', + 'LOGIN_EXPLAIN_TEAM' => 'The board requires you to be registered and logged in to view the team listing.', 'LOGIN_EXPLAIN_MEMBERLIST' => 'The board requires you to be registered and logged in to access the memberlist.', 'LOGIN_EXPLAIN_SEARCHUSER' => 'The board requires you to be registered and logged in to search users.', 'LOGIN_EXPLAIN_VIEWPROFILE' => 'The board requires you to be registered and logged in to view profiles.', @@ -135,5 +135,4 @@ $lang = array_merge($lang, array( 'USERS_PER_PAGE' => 'Users per page', 'VIEWING_PROFILE' => 'Viewing profile - %s', - 'VISITED' => 'Last visited', )); diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index ab851638ae..c1d8cef7de 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -194,9 +194,9 @@ $lang = array_merge($lang, array( 'POST_APPROVAL_NOTIFY' => 'You will be notified when your post has been approved.', 'POST_CONFIRMATION' => 'Confirmation of post', 'POST_CONFIRM_EXPLAIN' => 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', - 'POST_DELETED' => 'This message has been deleted successfully.', - 'POST_EDITED' => 'This message has been edited successfully.', - 'POST_EDITED_MOD' => 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.', + 'POST_DELETED' => 'This post has been deleted successfully.', + 'POST_EDITED' => 'This post has been edited successfully.', + 'POST_EDITED_MOD' => 'This post has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.', 'POST_GLOBAL' => 'Global', 'POST_ICON' => 'Post icon', 'POST_NORMAL' => 'Normal', |