aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:34 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:34 +0100
commit07633a66e8c9bbb2b288a286bfbea6f562eeca4d (patch)
treea255efa70ed6f202542649148c0445445504d181 /phpBB/language/en
parentee82970d96e0a6772b24c48aab8ebd1888ec5216 (diff)
parent5cfa0ec0c32ddc424f9651d8766db3e4ced59f96 (diff)
downloadforums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar
forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.gz
forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.bz2
forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.tar.xz
forums-07633a66e8c9bbb2b288a286bfbea6f562eeca4d.zip
Merge commit 'release-3.0-B3'
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/attachments.php112
-rw-r--r--phpBB/language/en/acp/ban.php24
-rw-r--r--phpBB/language/en/acp/board.php185
-rw-r--r--phpBB/language/en/acp/bots.php16
-rw-r--r--phpBB/language/en/acp/common.php810
-rw-r--r--phpBB/language/en/acp/database.php45
-rw-r--r--phpBB/language/en/acp/email.php12
-rw-r--r--phpBB/language/en/acp/forums.php73
-rw-r--r--phpBB/language/en/acp/groups.php31
-rw-r--r--phpBB/language/en/acp/index.htm10
-rw-r--r--phpBB/language/en/acp/language.php46
-rw-r--r--phpBB/language/en/acp/modules.php30
-rw-r--r--phpBB/language/en/acp/permissions.php191
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php74
-rw-r--r--phpBB/language/en/acp/posting.php102
-rw-r--r--phpBB/language/en/acp/profile.php87
-rw-r--r--phpBB/language/en/acp/prune.php28
-rw-r--r--phpBB/language/en/acp/search.php28
-rw-r--r--phpBB/language/en/acp/styles.php194
-rw-r--r--phpBB/language/en/acp/users.php52
-rw-r--r--phpBB/language/en/common.php282
-rw-r--r--phpBB/language/en/email/admin_activate.txt3
-rw-r--r--phpBB/language/en/email/admin_send_email.txt1
-rw-r--r--phpBB/language/en/email/admin_welcome_activated.txt3
-rw-r--r--phpBB/language/en/email/admin_welcome_inactive.txt3
-rw-r--r--phpBB/language/en/email/coppa_resend_inactive.txt7
-rw-r--r--phpBB/language/en/email/coppa_welcome_inactive.txt7
-rw-r--r--phpBB/language/en/email/email_notify.txt1
-rw-r--r--phpBB/language/en/email/forum_notify.txt7
-rw-r--r--phpBB/language/en/email/group_added.txt1
-rw-r--r--phpBB/language/en/email/group_approved.txt1
-rw-r--r--phpBB/language/en/email/group_request.txt1
-rw-r--r--phpBB/language/en/email/installed.txt7
-rw-r--r--phpBB/language/en/email/newtopic_notify.txt7
-rw-r--r--phpBB/language/en/email/post_approved.txt7
-rw-r--r--phpBB/language/en/email/post_disapproved.txt5
-rw-r--r--phpBB/language/en/email/privmsg_notify.txt3
-rw-r--r--phpBB/language/en/email/profile_send_email.txt1
-rw-r--r--phpBB/language/en/email/profile_send_im.txt1
-rw-r--r--phpBB/language/en/email/report_closed.txt5
-rw-r--r--phpBB/language/en/email/report_deleted.txt5
-rw-r--r--phpBB/language/en/email/topic_approved.txt5
-rw-r--r--phpBB/language/en/email/topic_disapproved.txt5
-rw-r--r--phpBB/language/en/email/topic_notify.txt7
-rw-r--r--phpBB/language/en/email/user_activate.txt1
-rw-r--r--phpBB/language/en/email/user_activate_inactive.txt1
-rw-r--r--phpBB/language/en/email/user_activate_passwd.txt3
-rw-r--r--phpBB/language/en/email/user_remind_inactive.txt1
-rw-r--r--phpBB/language/en/email/user_resend_inactive.txt3
-rw-r--r--phpBB/language/en/email/user_welcome.txt3
-rw-r--r--phpBB/language/en/email/user_welcome_inactive.txt3
-rw-r--r--phpBB/language/en/groups.php15
-rw-r--r--phpBB/language/en/help_bbcode.php8
-rw-r--r--phpBB/language/en/help_faq.php196
-rwxr-xr-xphpBB/language/en/install.php235
-rw-r--r--phpBB/language/en/mcp.php227
-rw-r--r--phpBB/language/en/memberlist.php21
-rw-r--r--phpBB/language/en/posting.php18
-rw-r--r--phpBB/language/en/search.php58
-rw-r--r--phpBB/language/en/search_ignore_words.php3
-rw-r--r--phpBB/language/en/ucp.php241
-rw-r--r--phpBB/language/en/viewforum.php4
-rw-r--r--phpBB/language/en/viewtopic.php7
63 files changed, 1996 insertions, 1577 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 4d49e1c8c3..4f8167f13a 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -29,76 +31,80 @@ 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(
- 'ACP_ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the Main Settings for Attachments and the associated Special Categories.',
- 'ACP_EXTENSION_GROUPS_EXPLAIN' => 'Here you can add, delete and modify your Extension Groups, you can disable Extension Groups, assign a special Category to them, change the download mechanism and you can define an Upload Icon which will be displayed in front of an Attachment belonging to the Group.',
- 'ACP_MANAGE_EXTENSIONS_EXPLAIN' => 'Here you can manage your allowed extensions. To activate your Extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as php, php3, php4, phtml, pl, cgi, asp, aspx...)',
- 'ACP_ORPHAN_ATTACHMENTS_EXPLAIN' => 'Here you are able to see files within the Attachments upload directory but not assigned to posts. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post id, you have to determine this id by yourself, this feature is mainly for those people wanting to upload files with another program and assigning those (mostly large) files to an existing post.',
+ 'ACP_ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the main settings for attachments and the associated special categories.',
+ 'ACP_EXTENSION_GROUPS_EXPLAIN' => 'Here you can add, delete, modify or disable your extension groups. Further options include the assignment of a special category to them, changing the download mechanism and defining an upload icon which will be displayed in front of the attachment which belongs to the group.',
+ 'ACP_MANAGE_EXTENSIONS_EXPLAIN' => 'Here you can manage your allowed extensions. To activate your extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as <code>php</code>, <code>php3</code>, <code>php4</code>, <code>phtml</code>, <code>pl</code>, <code>cgi</code>, <code>py</code>, <code>rb</code>, <code>asp</code>, <code>aspx</code>, and so forth…)',
+ 'ACP_ORPHAN_ATTACHMENTS_EXPLAIN' => 'Here you are able to see files within the attachments upload directory but not assigned to posts. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this id by yourself, this feature is mainly for those people wanting to upload files with another program and assigning those (mostly large) files to an existing post.',
'ADD_EXTENSION' => 'Add extension',
- 'ADD_EXTENSION_GROUP' => 'Add Extension Group',
+ 'ADD_EXTENSION_GROUP' => 'Add extension group',
'ADMIN_UPLOAD_ERROR' => 'Errors while trying to attach file: %s',
- 'ALLOWED_FORUMS' => 'Allowed Forums',
+ 'ALLOWED_FORUMS' => 'Allowed forums',
'ALLOWED_FORUMS_EXPLAIN' => 'Able to post the assigned extensions at the selected (or all if selected) forums',
- 'ALLOW_ATTACHMENTS' => 'Allow Attachments',
- 'ALLOW_ALL_FORUMS' => 'Allow All Forums',
+ 'ALLOW_ATTACHMENTS' => 'Allow attachments',
+ 'ALLOW_ALL_FORUMS' => 'Allow all forums',
'ALLOW_IN_PM' => 'Allowed in private messaging',
- 'ALLOW_PM_ATTACHMENTS' => 'Allow Attachments in Private Messages',
- 'ALLOW_SELECTED_FORUMS' => 'Only Forums selected below',
- 'ASSIGNED_EXTENSIONS' => 'Assigned Extensions',
- 'ASSIGNED_GROUP' => 'Assigned Group',
+ 'ALLOW_PM_ATTACHMENTS' => 'Allow attachments in private messages',
+ 'ALLOW_SELECTED_FORUMS' => 'Only forums selected below',
+ 'ASSIGNED_EXTENSIONS' => 'Assigned extensions',
+ 'ASSIGNED_GROUP' => 'Assigned extension group',
'ATTACH_EXTENSIONS_URL' => 'Extensions',
- 'ATTACH_EXT_GROUPS_URL' => 'Extension Groups',
+ '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_PM_FILESIZE' => 'Maximum filesize messaging',
'ATTACH_MAX_PM_FILESIZE_EXPLAIN' => 'Maximum drive space available per user for private message attachments, 0 is unlimited.',
- 'ATTACH_ORPHAN_URL' => 'Orphan Attachments',
+ 'ATTACH_ORPHAN_URL' => 'Orphan attachments',
'ATTACH_POST_ID' => 'Post ID',
'ATTACH_QUOTA' => 'Total attachment quota',
'ATTACH_QUOTA_EXPLAIN' => 'Maximum drive space available for attachments in total, 0 is unlimited.',
'ATTACH_TO_POST' => 'Attach file to post',
+ 'CAT_FLASH_FILES' => 'Flash Files',
'CAT_IMAGES' => 'Images',
+ 'CAT_QUICKTIME_FILES' => 'Quicktime Media',
'CAT_RM_FILES' => 'Real Media Streams',
- 'CAT_WM_FILES' => 'Win Media Streams',
+ 'CAT_WM_FILES' => 'Window Media Streams',
'CREATE_GROUP' => 'Create new group',
'CREATE_THUMBNAIL' => 'Create thumbnail',
'CREATE_THUMBNAIL_EXPLAIN' => 'Create a thumbnail in all possible situations.',
- 'DEFINE_ALLOWED_IPS' => 'Define allowed IPs/Hostnames',
- 'DEFINE_DISALLOWED_IPS' => 'Define disallowed IPs/Hostnames',
- 'DOWNLOAD_ADD_IPS_EXPLAIN' => 'To specify several different IP\'s 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 *',
- 'DOWNLOAD_MODE' => 'Download Mode',
- 'DOWNLOAD_MODE_EXPLAIN' => 'If you experience problems downloading files, set this to "physical", the user will be directed to the file directly. Do not set it to physical if not really needed, it discloses the filename.',
- 'DOWNLOAD_REMOVE_IPS_EXPLAIN' => 'You can remove (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IP\'s have a blue background.',
+ 'DEFINE_ALLOWED_IPS' => 'Define allowed IPs/hostnames',
+ 'DEFINE_DISALLOWED_IPS' => 'Define disallowed IPs/hostnames',
+ 'DOWNLOAD_ADD_IPS_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 *',
+ 'DOWNLOAD_MODE' => 'Download mode',
+ 'DOWNLOAD_MODE_EXPLAIN' => 'If you experience problems downloading files, set this to “physical”, the user will be directed to the file directly. Do not set it to physical if not really needed, it discloses the filename.',
+ 'DOWNLOAD_REMOVE_IPS_EXPLAIN' => 'You can remove (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 blue background.',
'DISPLAY_INLINED' => 'Display images inline',
'DISPLAY_INLINED_EXPLAIN' => 'If set to No image attachments will show as a link.',
- 'DISPLAY_ORDER' => 'Attachment Display Order',
+ 'DISPLAY_ORDER' => 'Attachment display order',
'DISPLAY_ORDER_EXPLAIN' => 'Display attachments ordered by time.',
- 'EDIT_EXTENSION_GROUP' => 'Edit Extension Group',
- 'EXCLUDE_ENTERED_IP' => 'Enable this to exclude the entered IP/Hostname.',
- 'EXCLUDE_FROM_ALLOWED_IP' => 'Exclude IP from allowed IPs/Hostnames',
- 'EXCLUDE_FROM_DISALLOWED_IP' => 'Exclude IP from disallowed IPs/Hostnames',
+ 'EDIT_EXTENSION_GROUP' => 'Edit extension group',
+ 'EXCLUDE_ENTERED_IP' => 'Enable this to exclude the entered IP/hostname.',
+ 'EXCLUDE_FROM_ALLOWED_IP' => 'Exclude IP from allowed IPs/hostnames',
+ 'EXCLUDE_FROM_DISALLOWED_IP' => 'Exclude IP from disallowed IPs/hostnames',
'EXTENSIONS_UPDATED' => 'Extensions successfully updated',
- 'EXTENSION_EXIST' => 'The Extension %s already exist',
- 'EXTENSION_GROUP' => 'Extension Group',
- 'EXTENSION_GROUPS' => 'Extension Groups',
- 'EXTENSION_GROUP_DELETED' => 'Extension Group successfully deleted',
- 'EXTENSION_GROUP_EXIST' => 'The Extension Group %s already exist',
+ 'EXTENSION_EXIST' => 'The extension %s already exist',
+ 'EXTENSION_GROUP' => 'Extension group',
+ 'EXTENSION_GROUPS' => 'Extension groups',
+ 'EXTENSION_GROUP_DELETED' => 'Extension group successfully deleted.',
+ 'EXTENSION_GROUP_EXIST' => 'The extension group %s already exist',
- 'GO_TO_EXTENSIONS' => 'Go to Extension Management Screen',
+ 'GO_TO_EXTENSIONS' => 'Go to extension management screen',
'GROUP_NAME' => 'Group name',
- 'IMAGE_LINK_SIZE' => 'Image Link Dimensions',
+ 'IMAGE_LINK_SIZE' => 'Image link dimensions',
'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as link if image is larger than this, set to 0px by 0px to disable.',
'IMAGICK_PATH' => 'Imagemagick path',
- 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. /usr/bin/',
+ 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>',
'MAX_ATTACHMENTS' => 'Max attachments per post',
'MAX_ATTACHMENTS_PM' => 'Max attachments per message',
- 'MAX_EXTGROUP_FILESIZE' => 'Maximum Filesize',
- 'MAX_IMAGE_SIZE' => 'Maximum Image Dimensions',
+ 'MAX_EXTGROUP_FILESIZE' => 'Maximum filesize',
+ 'MAX_IMAGE_SIZE' => 'Maximum image dimensions',
'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments, 0px by 0px disables image attachments.',
+ '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',
'MIN_THUMB_FILESIZE_EXPLAIN' => 'Do not create a thumbnail for images smaller than this.',
'MODE_INLINE' => 'Inline',
@@ -107,10 +113,10 @@ $lang = array_merge($lang, array(
'NOT_ALLOWED_IN_PM' => 'Not allowed in private messages',
'NOT_ASSIGNED' => 'Not assigned',
'NO_EXT_GROUP' => 'None',
- 'NO_EXT_GROUP_NAME' => 'No Group Name entered',
- 'NO_EXT_GROUP_SPECIFIED' => 'No Extension Group specified',
+ 'NO_EXT_GROUP_NAME' => 'No group name entered',
+ 'NO_EXT_GROUP_SPECIFIED' => 'No extension group specified.',
'NO_FILE_CAT' => 'None',
- 'NO_IMAGE' => 'No Image',
+ 'NO_IMAGE' => 'No image',
'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled because there is no supported GD library available and the imagemagick executable could not be found.',
'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.',
'NO_WRITE_UPLOAD' => 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',
@@ -118,31 +124,31 @@ $lang = array_merge($lang, array(
'ORDER_ALLOW_DENY' => 'Allow',
'ORDER_DENY_ALLOW' => 'Deny',
- 'REMOVE_ALLOWED_IPS' => 'Remove or Un-exclude allowed IPs/Hostnames',
- 'REMOVE_DISALLOWED_IPS' => 'Remove or Un-exclude disallowed IPs/Hostnames',
+ 'REMOVE_ALLOWED_IPS' => 'Remove or un-exclude allowed IPs/hostnames',
+ 'REMOVE_DISALLOWED_IPS' => 'Remove or un-exclude disallowed IPs/hostnames',
'SEARCH_IMAGICK' => 'Search for Imagemagick',
- 'SECURE_ALLOW_DENY' => 'Allow/Deny List',
+ 'SECURE_ALLOW_DENY' => 'Allow/Deny list',
'SECURE_ALLOW_DENY_EXPLAIN' => 'Allow or Deny the list of addresses, this setting only applies to downloading files',
'SECURE_DOWNLOADS' => 'Enable secure downloads',
- 'SECURE_DOWNLOADS_EXPLAIN' => 'With this option enabled, downloads are limited to IP\'s/hostnames you defined.',
+ 'SECURE_DOWNLOADS_EXPLAIN' => 'With this option enabled, downloads are limited to IP’s/hostnames you defined.',
'SECURE_DOWNLOAD_NOTICE' => 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.',
- 'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully',
+ 'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully.',
'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.',
'SUCCESSFULLY_UPLOADED' => 'Succeessfully uploaded',
- 'SUCCESS_EXTENSION_GROUP_ADD' => 'Extension Group successfully added',
- 'SUCCESS_EXTENSION_GROUP_EDIT' => 'Extension Group successfully updated',
+ '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...',
- '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.',
- 'UPLOAD_ICON' => 'Upload Icon',
+ 'UPLOADING_FILES' => 'Uploading files',
+ '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.',
+ 'UPLOAD_ICON' => 'Upload icon',
'UPLOAD_NOT_DIR' => 'The upload location you specified does not appear to be a directory.',
));
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 51df843158..278171ccdd 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -30,9 +32,9 @@ if (empty($lang) || !is_array($lang))
// Banning
$lang = array_merge($lang, array(
- '1_HOUR' => '1 Hour',
- '30_MINS' => '30 Minutes',
- '6_HOURS' => '6 Hours',
+ '1_HOUR' => '1 hour',
+ '30_MINS' => '30 minutes',
+ '6_HOURS' => '6 hours',
'ACP_BAN_EXPLAIN' => 'Here you can control the banning of users by name, IP or email address. These methods prevent a user reaching any part of the board. You can give a short (255 character) reason for the ban if you wish. This will be displayed in the admin log. The length of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <u>Until</u> for the ban length and enter a date in yyyy-mm-dd format.',
@@ -40,29 +42,29 @@ $lang = array_merge($lang, array(
'BAN_LENGTH' => 'Length of ban',
'BAN_REASON' => 'Reason for ban',
'BAN_GIVE_REASON' => 'Reason shown to the banned',
- 'BAN_UPDATE_SUCCESSFUL' => 'The banlist has been updated successfully',
+ 'BAN_UPDATE_SUCCESSFUL' => 'The banlist has been updated successfully.',
'EMAIL_BAN' => 'Ban one or more email addresses',
'EMAIL_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered email address from all current bans.',
- 'EMAIL_BAN_EXPLAIN' => 'To specify more than one email address enter each on a new line. To match partial addresses use * as the wildcard, e.g. *@hotmail.com, *@*.domain.tld, etc.',
+ 'EMAIL_BAN_EXPLAIN' => 'To specify more than one email address enter each on a new line. To match partial addresses use * as the wildcard, e.g. <samp>*@hotmail.com</samp>, <samp>*@*.domain.tld</samp>, etc.',
'EMAIL_NO_BANNED' => 'No banned email addresses',
- 'EMAIL_UNBAN' => 'Un-ban or Un-exclude Emails',
+ 'EMAIL_UNBAN' => 'Un-ban or un-exclude emails',
'EMAIL_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded email addresses have a marked background.',
- 'IP_BAN' => 'Ban one or more ips',
+ 'IP_BAN' => 'Ban one or more IPs',
'IP_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered IP from all current bans.',
- 'IP_BAN_EXPLAIN' => 'To specify several different IP\'s 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_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_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 IP\'s have a marked background.',
+ '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',
'UNTIL' => 'Until',
'USER_BAN' => 'Ban one or more usernames',
'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 Username</u> facility to look up and add one or more users automatically.',
+ '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_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 bf47c1e709..e2d2f30e6b 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -32,11 +32,11 @@ if (empty($lang) || !is_array($lang))
$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...',
+ 'CUSTOM_DATEFORMAT' => 'Custom…',
'DEFAULT_DATE_FORMAT' => 'Date Format',
- 'DEFAULT_DATE_FORMAT_EXPLAIN' => 'The date format is the same as the PHP date function.',
- 'DEFAULT_LANGUAGE' => 'Default Language',
- 'DEFAULT_STYLE' => 'Default Style',
+ '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',
@@ -45,32 +45,34 @@ $lang = array_merge($lang, array(
'SITE_DESC' => 'Site description',
'SITE_NAME' => 'Site name',
'SYSTEM_DST' => 'Enable Daylight Savings Time',
- 'SYSTEM_TIMEZONE' => 'System Timezone',
+ 'SYSTEM_TIMEZONE' => 'System timezone',
'WARNINGS_EXPIRE' => 'Warning duration',
- 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days after it is issued before a warning will expire from a user\'s record',
+ 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days after it is issued before a warning will expire from a user’s record',
));
// Board Features
$lang = array_merge($lang, array(
'ACP_BOARD_FEATURES_EXPLAIN' => 'Here you can enable/disable several board features',
- 'ALLOW_ATTACHMENTS' => 'Allow Attachments',
+ 'ALLOW_ATTACHMENTS' => 'Allow attachments',
'ALLOW_BOOKMARKS' => 'Allow bookmarking topics',
'ALLOW_BOOKMARKS_EXPLAIN' => 'User is able to store personal bookmarks',
'ALLOW_BBCODE' => 'Allow BBCode',
- 'ALLOW_FORUM_NOTIFY' => 'Allow Forum Watching',
- 'ALLOW_NAME_CHANGE' => 'Allow Username changes',
- 'ALLOW_NO_CENSORS' => 'Allow Disable of Censors',
+ '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_PM_ATTACHMENTS' => 'Allow Attachments in Private Messages',
- 'ALLOW_SIG' => 'Allow Signatures',
+ '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 FLASH BBCode Tag in user signatures',
- 'ALLOW_SIG_IMG' => 'Allow use of IMG BBCode Tag 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_SMILIES' => 'Allow use of smilies in user signatures',
- 'ALLOW_SMILIES' => 'Allow Smilies',
- 'ALLOW_TOPIC_NOTIFY' => 'Allow Topic Watching',
- 'BOARD_PM' => 'Private Messaging',
+ 'ALLOW_SMILIES' => 'Allow smilies',
+ 'ALLOW_TOPIC_NOTIFY' => 'Allow topic watching',
+ 'BOARD_PM' => 'Private messaging',
'BOARD_PM_EXPLAIN' => 'Enable or disable private messaging for all users.',
));
@@ -82,15 +84,15 @@ $lang = array_merge($lang, array(
'ALLOW_REMOTE' => 'Enable remote avatars',
'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. images/avatars/gallery',
- 'AVATAR_STORAGE_PATH' => 'Avatar Storage Path',
- 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/avatars/upload',
- 'MAX_AVATAR_SIZE' => 'Maximum Avatar Dimensions',
+ '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_STORAGE_PATH' => 'Avatar storage path',
+ 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root dir, 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',
+ 'MAX_FILESIZE' => 'Maximum avatar file size',
'MAX_FILESIZE_EXPLAIN' => 'For uploaded avatar files',
- 'MIN_AVATAR_SIZE' => 'Minimum Avatar Dimensions',
+ 'MIN_AVATAR_SIZE' => 'Minimum avatar dimensions',
'MIN_AVATAR_SIZE_EXPLAIN' => '(Height x Width in pixels)',
));
@@ -99,9 +101,9 @@ $lang = array_merge($lang, array(
'ACP_MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging',
'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages',
- 'ALLOW_FLASH_PM' => 'Allow use of FLASH BBCode Tag',
+ 'ALLOW_FLASH_PM' => 'Allow use of <code>[FLASH]</code> BBCode tag',
'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages',
- 'ALLOW_IMG_PM' => 'Allow use of IMG BBCode Tag',
+ 'ALLOW_IMG_PM' => 'Allow use of <code>[IMG]</code> BBCode tag',
'ALLOW_MASS_PM' => 'Allow sending of private messages to multiple users and groups',
'ALLOW_PRINT_PM' => 'Allow print view in private messaging',
'ALLOW_QUOTE_PM' => 'Allow quotes in private messages',
@@ -113,7 +115,7 @@ $lang = array_merge($lang, array(
'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 an users folder is full and if the users folder action set is not applicable. For the "sent messages" folder the default action is always deleting old messages.',
+ 'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default Action to take if a user’s folder is full and if the users folder action set is not applicable. For the “sent messages” folder the default action is always deleting 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',
@@ -122,6 +124,8 @@ $lang = array_merge($lang, array(
// 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.',
'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.',
@@ -181,16 +185,17 @@ $lang = array_merge($lang, array(
'ACC_NONE' => 'None',
'ACC_USER' => 'User',
// 'ACC_USER_ADMIN' => 'User + Admin',
- 'ALLOW_EMAIL_REUSE' => 'Allow Email address re-use',
+ 'ALLOW_EMAIL_REUSE' => 'Allow email address re-use',
'ALLOW_EMAIL_REUSE_EXPLAIN' => 'Different users can register with the same email address.',
'COPPA' => 'Coppa',
- 'COPPA_FAX' => 'COPPA Fax Number',
- 'COPPA_MAIL' => 'COPPA Mailing Address',
+ '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',
'ENABLE_COPPA' => 'Enable COPPA',
- 'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA act. If this is disabled the COPPA specific groups will no longer be displayed.',
+ 'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA Act. If this is disabled the COPPA specific groups will no longer be displayed.',
'MAX_CHARS' => 'Max',
'MIN_CHARS' => 'Min',
+ 'NO_AUTH_PLUGIN' => 'No suitable auth plugin found.',
'PASSWORD_LENGTH' => 'Password length',
'PASSWORD_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in passwords.',
'REG_LIMIT' => 'Registration attempts',
@@ -208,28 +213,10 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and captcha settings.',
- 'BAD_POLICY' => 'The policy you selected is invalid.',
- 'CAPTCHA_3DBITMAP' => '3D Bitmap',
- 'CAPTCHA_CELLS' => 'Cells',
- 'CAPTCHA_COMPOSITE' => 'Composite',
- 'CAPTCHA_ENTROPY' => 'Entropy',
- 'CAPTCHA_OPTIONS' => 'Captcha Options',
- 'CAPTCHA_OVERLAP' => 'Overlap',
- 'CAPTCHA_SHAPE' => 'Shape',
- 'CAPTCHA_STENCIL' => 'Stencil',
- 'CAPTCHA_EXPLAIN' => 'Click %shere%s to preview this CAPTCHA policy.',
- 'ENTROPY_NOISE_LINE' => 'Entropy line noise',
- 'ENTROPY_NOISE_PIXEL' => 'Entropy pixel noise',
- 'HEAVY' => 'Heavy',
- 'LIGHT' => 'Light',
- 'MEDIUM' => 'Medium',
- 'NO_GD' => 'The server does not support GD, an extension required to enable the advanced CAPTCHA policies. A fall-back method will be used if you decide to enable Visual Confirmation features.',
- 'NO_NOISE' => 'None',
- 'NO_TTF' => 'The policy you selected requires TTF enabled, the server has TTF disabled. If this policy is enabled, it will be skipped and another policy will be used in its place. If no valid policies are enabled, a fall-back method will be used if you decide to enable Visual Confirmation features.',
- 'OVERLAP_NOISE_LINE' => 'Overlap line noise',
- 'OVERLAP_NOISE_PIXEL' => 'Overlap pixel noise',
- 'SHAPE_NOISE_LINE' => 'Shape line noise',
- 'SHAPE_NOISE_PIXEL' => 'Shape pixel noise',
+ 'CAPTCHA_GD' => 'GD CAPTCHA',
+ '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',
'VISUAL_CONFIRM_POST_EXPLAIN' => 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.',
'VISUAL_CONFIRM_REG' => 'Enable visual confirmation for registrations',
@@ -240,11 +227,11 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'ACP_COOKIE_SETTINGS_EXPLAIN' => 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
- 'COOKIE_DOMAIN' => 'Cookie domain',
- 'COOKIE_NAME' => 'Cookie name',
- 'COOKIE_PATH' => 'Cookie path',
- '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.',
+ 'COOKIE_DOMAIN' => 'Cookie domain',
+ 'COOKIE_NAME' => 'Cookie name',
+ 'COOKIE_PATH' => 'Cookie path',
+ '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.',
'SESSION_LENGTH' => 'Session length',
@@ -255,7 +242,7 @@ $lang = array_merge($lang, array(
$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.',
- 'CUSTOM_PROFILE_FIELDS' => 'Custom Profile Fields',
+ '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_SESSIONS' => 'Limit sessions',
@@ -292,16 +279,16 @@ $lang = array_merge($lang, array(
'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username.',
- 'LDAP_DN' => 'LDAP base dn',
- 'LDAP_DN_EXPLAIN' => 'This is the Distinguished Name, locating the user information, e.g. o=My Company,c=US',
+ 'LDAP_DN' => 'LDAP base <var>dn</var>',
+ 'LDAP_DN_EXPLAIN' => 'This is the Distinguished Name, locating the user information, e.g. <samp>o=My Company,c=US</samp>',
'LDAP_EMAIL' => 'LDAP email attribute',
'LDAP_EMAIL_EXPLAIN' => 'Set this to the name of your user entry email attribute (if one exists) in order to automatically set the email address for new users. Leaving this empty results in empty email address for users who log in for the first time.',
'LDAP_NO_EMAIL' => 'The specified email attribute does not exist.',
'LDAP_NO_IDENTITY' => 'Could not find a login identity for %s',
'LDAP_SERVER' => 'LDAP server name',
'LDAP_SERVER_EXPLAIN' => 'If using LDAP this is the name or IP address of the server.',
- 'LDAP_UID' => 'LDAP uid',
- 'LDAP_UID_EXPLAIN' => 'This is the key under which to search for a given login identity, e.g. uid, sn, etc.',
+ 'LDAP_UID' => 'LDAP <var>uid</var>',
+ 'LDAP_UID_EXPLAIN' => 'This is the key under which to search for a given login identity, e.g. <var>uid</var>, <var>sn</var>, etc.',
));
// Server Settings
@@ -309,26 +296,26 @@ $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',
- 'FORCE_SERVER_VARS' => 'Force server url settings',
- 'FORCE_SERVER_VARS_EXPLAIN' => 'If set to yes the server settings defined here will be used in favor of the automatically determined values',
+ '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. images/icons',
- 'PATH_SETTINGS' => 'Path Settings',
+ 'ICONS_PATH_EXPLAIN' => 'Path under your phpBB root dir, 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. images/ranks',
- 'SEND_ENCODING' => 'Send Encoding',
+ 'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. <samp>images/ranks</samp>',
+ 'SEND_ENCODING' => 'Send encoding',
'SEND_ENCODING_EXPLAIN' => 'Send the file encoding from phpBB via HTTP overriding the webserver configuration',
- 'SERVER_NAME' => 'Domain Name',
- 'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: www.foo.bar)',
+ '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_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 (http:// or https://)',
- 'SERVER_URL_SETTINGS' => 'Server URL Settings',
+ '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. images/smilies',
+ 'SMILIES_PATH_EXPLAIN' => 'Path under your phpBB root dir, 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. images/upload_icons',
+ 'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. <samp>images/upload_icons</samp>',
));
// Security Settings
@@ -338,16 +325,20 @@ $lang = array_merge($lang, array(
'ALL' => 'All',
'ALLOW_AUTOLOGIN' => 'Allow persistent logins',
'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users can autologin when they visit the board.',
- 'AUTOLOGIN_LENGTH' => 'Persistent login key expiry days',
+ 'AUTOLOGIN_LENGTH' => 'Persistent login key expiration length (in days)',
'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which persistent login keys are removed or zero to disable.',
'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.',
'CLASS_B' => 'A.B',
'CLASS_C' => 'A.B.C',
+ '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.',
'IP_VALID' => 'Session IP validation',
- 'IP_VALID_EXPLAIN' => 'Determines how much of the users IP is used to validate a session; All compares the complete address, A.B.C the first x.x.x, A.B the first x.x, None disables checking.',
+ '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',
'MAX_LOGIN_ATTEMPTS_EXPLAIN' => 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation)',
'NO_IP_VALIDATION' => 'None',
@@ -358,14 +349,14 @@ $lang = array_merge($lang, array(
'PASS_TYPE_CASE' => 'Must be mixed case',
'PASS_TYPE_SYMBOL' => 'Must contain symbols',
'TPL_ALLOW_PHP' => 'Allow php in templates',
- 'TPL_ALLOW_PHP_EXPLAIN' => 'If this option is enabled, PHP and INCLUDEPHP statements will be recognized and parsed in templates.',
+ 'TPL_ALLOW_PHP_EXPLAIN' => 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognized and parsed in templates.',
));
// Email Settings
$lang = array_merge($lang, array(
'ACP_EMAIL_SETTINGS_EXPLAIN' => 'This information is used when the board sends emails to your users. Please ensure the email address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) email service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary), do not specify any old name here! If the server requires authentication (and only if it does) enter the necessary username and password. Please note only basic authentication is offered, different authentication implementations are not currently supported.',
- 'ADMIN_EMAIL' => 'Return Email Address',
+ 'ADMIN_EMAIL' => 'Return email address',
'ADMIN_EMAIL_EXPLAIN' => 'This will be used as the return address on all emails.',
'BOARD_EMAIL_FORM' => 'Users send email via board',
'BOARD_EMAIL_FORM_EXPLAIN' => 'Instead of showing the users email address users are able to send emails via the board.',
@@ -373,11 +364,11 @@ $lang = array_merge($lang, array(
'BOARD_HIDE_EMAILS_EXPLAIN' => 'This function keeps email addresses completely private.',
'CONTACT_EMAIL' => 'Contact email address',
'CONTACT_EMAIL_EXPLAIN' => 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc.',
- 'EMAIL_FUNCTION_NAME' => 'Email Function Name',
+ 'EMAIL_FUNCTION_NAME' => 'Email function name',
'EMAIL_FUNCTION_NAME_EXPLAIN' => 'The email function used to send mails through PHP.',
- 'EMAIL_PACKAGE_SIZE' => 'Email Package Size',
+ 'EMAIL_PACKAGE_SIZE' => 'Email package size',
'EMAIL_PACKAGE_SIZE_EXPLAIN' => 'This is the number of emails sent in one package.',
- 'EMAIL_SIG' => 'Email Signature',
+ 'EMAIL_SIG' => 'Email signature',
'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all emails the board sends.',
'ENABLE_EMAIL' => 'Enable board-wide emails',
'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no emails will be sent by the board at all.',
@@ -387,7 +378,7 @@ $lang = array_merge($lang, array(
'SMTP_DIGEST_MD5' => 'DIGEST-MD5',
'SMTP_LOGIN' => 'LOGIN',
'SMTP_PASSWORD' => 'SMTP Password',
- 'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your smtp server requires it.',
+ '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',
@@ -395,37 +386,37 @@ $lang = array_merge($lang, array(
'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.',
+ 'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.',
'USE_SMTP' => 'Use SMTP Server for email',
- 'USE_SMTP_EXPLAIN' => 'Say yes if you want or have to send email via a named server instead of the local mail function.',
+ 'USE_SMTP_EXPLAIN' => 'Select “Yes” if you want or have to send email via a named server instead of the local mail function.',
));
// Jabber settings
$lang = array_merge($lang, array(
'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use Jabber for instant messaging and board notices. Jabber is an opensource protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Note that it may take several seconds to update Jabber account details, do not stop the script till completed!',
- 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server',
- 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server',
- 'ERR_JAB_PASSCHG' => 'Could not change password',
- 'ERR_JAB_PASSFAIL' => 'Password update failed, %s',
- 'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s',
+ 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.',
+ 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.',
+ 'ERR_JAB_PASSCHG' => 'Could not change password.',
+ 'ERR_JAB_PASSFAIL' => 'Password update failed, %s.',
+ 'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s.',
'ERR_JAB_USERNAME' => 'The username specified already exists, please choose an alternative.',
- 'JAB_CHANGED' => 'Jabber account changed successfully',
+ 'JAB_CHANGED' => 'Jabber account changed successfully.',
'JAB_ENABLE' => 'Enable Jabber',
'JAB_ENABLE_EXPLAIN' => 'Enables use of jabber messaging and notifications',
- 'JAB_PACKAGE_SIZE' => 'Jabber Package Size',
+ '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_PASSWORD' => 'Jabber password',
- 'JAB_PASS_CHANGED' => 'Jabber password changed successfully',
+ 'JAB_PASS_CHANGED' => 'Jabber password changed successfully.',
'JAB_PORT' => 'Jabber port',
- 'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not 5222',
- 'JAB_REGISTERED' => 'New account registered successfully',
+ 'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not port 5222',
+ 'JAB_REGISTERED' => 'New account registered successfully.',
'JAB_RESOURCE' => 'Jabber resource',
'JAB_RESOURCE_EXPLAIN' => 'The resource locates this particular connection, e.g. board, home, etc.',
'JAB_SERVER' => 'Jabber server',
'JAB_SERVER_EXPLAIN' => 'See %sjabber.org%s for a list of servers',
- 'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully',
+ 'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully.',
'JAB_USERNAME' => 'Jabber username',
'JAB_USERNAME_EXPLAIN' => 'If this user is not registered it will be created if possible.',
));
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
index 45bbdfbad9..dda1dcf73f 100644
--- a/phpBB/language/en/acp/bots.php
+++ b/phpBB/language/en/acp/bots.php
@@ -30,16 +30,16 @@ if (empty($lang) || !is_array($lang))
// Bot settings
$lang = array_merge($lang, array(
- 'BOTS' => 'Manage Bots',
+ 'BOTS' => 'Manage bots',
'BOTS_EXPLAIN' => 'Bots or crawlers are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
'BOT_ACTIVATE' => 'Activate',
'BOT_ACTIVE' => 'Bot active',
'BOT_ADD' => 'Add bot',
- 'BOT_ADDED' => 'New bot successfully added',
+ 'BOT_ADDED' => 'New bot successfully added.',
'BOT_AGENT' => 'Agent match',
'BOT_AGENT_EXPLAIN' => 'A string matching the bots browser agent, partial matches are allowed.',
'BOT_DEACTIVATE' => 'Deactivate',
- 'BOT_DELETED' => 'Bot deleted successfully',
+ 'BOT_DELETED' => 'Bot deleted successfully.',
'BOT_EDIT' => 'Edit bots',
'BOT_EDIT_EXPLAIN' => 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.',
'BOT_LANG' => 'Bot language',
@@ -52,14 +52,16 @@ $lang = array_merge($lang, array(
'BOT_NEVER' => 'Never',
'BOT_STYLE' => 'Bot style',
'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot.',
- 'BOT_UPDATED' => 'Existing bot updated successfully',
+ 'BOT_UPDATED' => 'Existing bot updated successfully.',
'BOT_VIS' => 'Bot visible',
'BOT_VIS_EXPLAIN' => 'Allow bot to be seen by all users in online lists.',
- 'ERR_BOT_NO_IP' => 'The IP addresses you supplied were invalid or the hostname could not be resolved.',
- 'ERR_BOT_NO_MATCHES' => 'You must supply at least one of an agent or IP for this bot match.',
+ 'ERR_BOT_AGENT_MATCHES_UA' => 'The bot agent you supplied is similar to the one you are currently using. Please adjust the agent for this bot.',
+ 'ERR_BOT_NO_IP' => 'The IP addresses you supplied were invalid or the hostname could not be resolved.',
+ 'ERR_BOT_NO_MATCHES' => 'You must supply at least one of an agent or IP for this bot match.',
- 'NO_BOT' => 'Found no bot with the specified ID',
+ 'NO_BOT' => 'Found no bot with the specified ID.',
+ 'NO_BOT_GROUP' => 'Unable to find special bot group.',
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 0847ff44c9..77b9a5d5a1 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -31,26 +31,26 @@ if (empty($lang) || !is_array($lang))
// Common
$lang = array_merge($lang, array(
'ACP_ADMINISTRATORS' => 'Administrators',
- 'ACP_ADMIN_LOGS' => 'Admin Log',
- 'ACP_ADMIN_ROLES' => 'Admin Roles',
+ 'ACP_ADMIN_LOGS' => 'Admin log',
+ 'ACP_ADMIN_ROLES' => 'Admin roles',
'ACP_ATTACHMENTS' => 'Attachments',
- 'ACP_ATTACHMENT_SETTINGS' => 'Attachment Settings',
+ 'ACP_ATTACHMENT_SETTINGS' => 'Attachment settings',
'ACP_AUTH_SETTINGS' => 'Authentication',
'ACP_AUTOMATION' => 'Automation',
- 'ACP_AVATAR_SETTINGS' => 'Avatar Settings',
+ 'ACP_AVATAR_SETTINGS' => 'Avatar settings',
'ACP_BACKUP' => 'Backup',
'ACP_BAN' => 'Banning',
- 'ACP_BAN_EMAILS' => 'Ban Emails',
+ 'ACP_BAN_EMAILS' => 'Ban emails',
'ACP_BAN_IPS' => 'Ban IPs',
- 'ACP_BAN_USERNAMES' => 'Ban Usernames',
- 'ACP_BASIC_PERMISSIONS' => 'Basic Permissions',
+ 'ACP_BAN_USERNAMES' => 'Ban usernames',
+ 'ACP_BASIC_PERMISSIONS' => 'Basic permissions',
'ACP_BBCODES' => 'BBCodes',
- 'ACP_BOARD_CONFIGURATION' => 'Board Configuration',
- 'ACP_BOARD_DEFAULTS' => 'Board Defaults',
- 'ACP_BOARD_FEATURES' => 'Board Features',
- 'ACP_BOARD_MANAGEMENT' => 'Board Management',
- 'ACP_BOARD_SETTINGS' => 'Board Settings',
+ 'ACP_BOARD_CONFIGURATION' => 'Board configuration',
+ 'ACP_BOARD_DEFAULTS' => 'Board defaults',
+ 'ACP_BOARD_FEATURES' => 'Board features',
+ 'ACP_BOARD_MANAGEMENT' => 'Board management',
+ 'ACP_BOARD_SETTINGS' => 'Board settings',
'ACP_BOTS' => 'Spiders/Robots',
'ACP_CAPTCHA' => 'CAPTCHA',
@@ -64,161 +64,165 @@ $lang = array_merge($lang, array(
'ACP_CAT_POSTING' => 'Posting',
'ACP_CAT_STYLES' => 'Styles',
'ACP_CAT_SYSTEM' => 'System',
- 'ACP_CAT_USERGROUP' => 'Users and Groups',
+ 'ACP_CAT_USERGROUP' => 'Users and groups',
'ACP_CAT_USERS' => 'Users',
- 'ACP_CLIENT_COMMUNICATION' => 'Client Communication',
- 'ACP_COOKIE_SETTINGS' => 'Cookie Settings',
- 'ACP_CRITICAL_LOGS' => 'Error Log',
- 'ACP_CUSTOM_PROFILE_FIELDS' => 'Custom Profile Fields',
+ 'ACP_CLIENT_COMMUNICATION' => 'Client communication',
+ 'ACP_COOKIE_SETTINGS' => 'Cookie settings',
+ 'ACP_CRITICAL_LOGS' => 'Error log',
+ 'ACP_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields',
- 'ACP_DATABASE' => 'Database Management',
+ 'ACP_DATABASE' => 'Database management',
'ACP_DISALLOW' => 'Disallow',
- 'ACP_DISALLOW_USERNAMES' => 'Disallow Usernames',
+ 'ACP_DISALLOW_USERNAMES' => 'Disallow usernames',
- 'ACP_EMAIL_SETTINGS' => 'Email Settings',
- 'ACP_EXTENSION_GROUPS' => 'Manage Extension Groups',
+ 'ACP_EMAIL_SETTINGS' => 'Email settings',
+ 'ACP_EXTENSION_GROUPS' => 'Manage extension groups',
- 'ACP_FORUM_BASED_PERMISSIONS' => 'Forum Based Permissions',
- 'ACP_FORUM_LOGS' => 'Forum Logs',
- 'ACP_FORUM_MANAGEMENT' => 'Forum Management',
- 'ACP_FORUM_MODERATORS' => 'Forum Moderators',
- 'ACP_FORUM_PERMISSIONS' => 'Forum Permissions',
- 'ACP_FORUM_ROLES' => 'Forum Roles',
-
- 'ACP_GENERAL_CONFIGURATION' => 'General Configuration',
- 'ACP_GENERAL_TASKS' => 'General Tasks',
- 'ACP_GLOBAL_MODERATORS' => 'Global Moderators',
- 'ACP_GLOBAL_PERMISSIONS' => 'Global Permissions',
+ 'ACP_FORUM_BASED_PERMISSIONS' => 'Forum based permissions',
+ 'ACP_FORUM_LOGS' => 'Forum logs',
+ 'ACP_FORUM_MANAGEMENT' => 'Forum management',
+ 'ACP_FORUM_MODERATORS' => 'Forum moderators',
+ 'ACP_FORUM_PERMISSIONS' => 'Forum permissions',
+ 'ACP_FORUM_ROLES' => 'Forum roles',
+
+ 'ACP_GENERAL_CONFIGURATION' => 'General configuration',
+ 'ACP_GENERAL_TASKS' => 'General tasks',
+ 'ACP_GLOBAL_MODERATORS' => 'Global moderators',
+ 'ACP_GLOBAL_PERMISSIONS' => 'Global permissions',
'ACP_GROUPS' => 'Groups',
- 'ACP_GROUPS_FORUM_PERMISSIONS' => 'Groups Forum Permissions',
- 'ACP_GROUPS_MANAGE' => 'Manage Groups',
- 'ACP_GROUPS_MANAGEMENT' => 'Group Management',
- 'ACP_GROUPS_PERMISSIONS' => 'Groups Permissions',
+ 'ACP_GROUPS_FORUM_PERMISSIONS' => 'Groups forum permissions',
+ 'ACP_GROUPS_MANAGE' => 'Manage groups',
+ 'ACP_GROUPS_MANAGEMENT' => 'Group management',
+ 'ACP_GROUPS_PERMISSIONS' => 'Groups permissions',
- 'ACP_ICONS' => 'Topic Icons',
- 'ACP_ICONS_SMILIES' => 'Topic Icons/Smilies',
+ 'ACP_ICONS' => 'Topic icons',
+ 'ACP_ICONS_SMILIES' => 'Topic icons/smilies',
'ACP_IMAGESETS' => 'Imagesets',
+ 'ACP_INACTIVE_USERS' => 'Inactive users',
'ACP_INDEX' => 'Admin index',
- 'ACP_JABBER_SETTINGS' => 'Jabber Settings',
+ 'ACP_JABBER_SETTINGS' => 'Jabber settings',
- 'ACP_LANGUAGE' => 'Language Management',
- 'ACP_LANGUAGE_PACKS' => 'Language Packs',
- 'ACP_LOAD_SETTINGS' => 'Load Settings',
+ 'ACP_LANGUAGE' => 'Language management',
+ 'ACP_LANGUAGE_PACKS' => 'Language packs',
+ 'ACP_LOAD_SETTINGS' => 'Load settings',
'ACP_LOGGING' => 'Logging',
'ACP_MAIN' => 'Admin index',
- 'ACP_MANAGE_EXTENSIONS' => 'Manage Extensions',
- 'ACP_MANAGE_FORUMS' => 'Manage Forums',
- 'ACP_MANAGE_RANKS' => 'Manage Ranks',
- 'ACP_MANAGE_REASONS' => 'Manage Report/Denial Reasons',
- 'ACP_MANAGE_USERS' => 'Manage Users',
- 'ACP_MASS_EMAIL' => 'Mass Email',
+ 'ACP_MANAGE_EXTENSIONS' => 'Manage extensions',
+ 'ACP_MANAGE_FORUMS' => 'Manage forums',
+ 'ACP_MANAGE_RANKS' => 'Manage ranks',
+ 'ACP_MANAGE_REASONS' => 'Manage report/denial reasons',
+ 'ACP_MANAGE_USERS' => 'Manage users',
+ 'ACP_MASS_EMAIL' => 'Mass email',
'ACP_MESSAGES' => 'Messages',
- 'ACP_MESSAGE_SETTINGS' => 'Private Message Settings',
- 'ACP_MODULE_MANAGEMENT' => 'Module Management',
- 'ACP_MOD_LOGS' => 'Moderator Log',
- 'ACP_MOD_ROLES' => 'Moderator Roles',
+ 'ACP_MESSAGE_SETTINGS' => 'Private message settings',
+ 'ACP_MODULE_MANAGEMENT' => 'Module management',
+ 'ACP_MOD_LOGS' => 'Moderator log',
+ 'ACP_MOD_ROLES' => 'Moderator roles',
- 'ACP_ORPHAN_ATTACHMENTS' => 'Orphan Attachments',
+ 'ACP_ORPHAN_ATTACHMENTS' => 'Orphaned attachments',
'ACP_PERMISSIONS' => 'Permissions',
- 'ACP_PERMISSION_MASKS' => 'Permission Masks',
- 'ACP_PERMISSION_ROLES' => 'Permission Roles',
- 'ACP_PERMISSION_SETTINGS' => 'Permission Settings',
- 'ACP_PERMISSION_TRACE' => 'Permission Trace',
- 'ACP_PHP_INFO' => 'PHP Information',
- 'ACP_POST_SETTINGS' => 'Post Settings',
- 'ACP_PRUNE_FORUMS' => 'Prune Forums',
- 'ACP_PRUNE_USERS' => 'Prune Users',
+ 'ACP_PERMISSION_MASKS' => 'Permission masks',
+ 'ACP_PERMISSION_ROLES' => 'Permission roles',
+ 'ACP_PERMISSION_SETTINGS' => 'Permission settings',
+ 'ACP_PERMISSION_TRACE' => 'Permission trace',
+ 'ACP_PHP_INFO' => 'PHP information',
+ 'ACP_POST_SETTINGS' => 'Post settings',
+ 'ACP_PRUNE_FORUMS' => 'Prune forums',
+ 'ACP_PRUNE_USERS' => 'Prune users',
'ACP_PRUNING' => 'Pruning',
- 'ACP_QUICK_ACCESS' => 'Quick Access',
+ 'ACP_QUICK_ACCESS' => 'Quick access',
'ACP_RANKS' => 'Ranks',
- 'ACP_REASONS' => 'Report/Denial Reasons',
- 'ACP_REGISTER_SETTINGS' => 'User Registration Settings',
+ 'ACP_REASONS' => 'Report/Denial reasons',
+ 'ACP_REGISTER_SETTINGS' => 'User registration settings',
'ACP_RESTORE' => 'Restore',
- 'ACP_SEARCH' => 'Search Configuration',
- 'ACP_SEARCH_INDEX' => 'Search Index',
- 'ACP_SEARCH_SETTINGS' => 'Search Settings',
+ 'ACP_SEARCH' => 'Search configuration',
+ 'ACP_SEARCH_INDEX' => 'Search index',
+ 'ACP_SEARCH_SETTINGS' => 'Search settings',
- 'ACP_SECURITY_SETTINGS' => 'Security Settings',
- 'ACP_SERVER_CONFIGURATION' => 'Server Configuration',
- 'ACP_SERVER_SETTINGS' => 'Server Settings',
- 'ACP_SIGNATURE_SETTINGS' => 'Signature Settings',
+ 'ACP_SECURITY_SETTINGS' => 'Security settings',
+ 'ACP_SERVER_CONFIGURATION' => 'Server configuration',
+ 'ACP_SERVER_SETTINGS' => 'Server settings',
+ 'ACP_SIGNATURE_SETTINGS' => 'Signature settings',
'ACP_SMILIES' => 'Smilies',
- 'ACP_SPECIAL_PERMISSIONS' => 'Special Permissions',
- 'ACP_STYLE_COMPONENTS' => 'Style Components',
- 'ACP_STYLE_MANAGEMENT' => 'Style Management',
+ 'ACP_SPECIAL_PERMISSIONS' => 'Special permissions',
+ 'ACP_STYLE_COMPONENTS' => 'Style components',
+ 'ACP_STYLE_MANAGEMENT' => 'Style management',
'ACP_STYLES' => 'Styles',
'ACP_TEMPLATES' => 'Templates',
'ACP_THEMES' => 'Themes',
'ACP_UPDATE' => 'Updating',
- 'ACP_USERS_FORUM_PERMISSIONS' => 'Users Forum Permissions',
- 'ACP_USERS_LOGS' => 'User Logs',
- 'ACP_USERS_PERMISSIONS' => 'Users Permissions',
+ 'ACP_USERS_FORUM_PERMISSIONS' => 'Users forum permissions',
+ 'ACP_USERS_LOGS' => 'User logs',
+ 'ACP_USERS_PERMISSIONS' => 'Users permissions',
'ACP_USER_ATTACH' => 'Attachments',
'ACP_USER_AVATAR' => 'Avatar',
'ACP_USER_FEEDBACK' => 'Feedback',
'ACP_USER_GROUPS' => 'Groups',
- 'ACP_USER_MANAGEMENT' => 'User Management',
+ 'ACP_USER_MANAGEMENT' => 'User management',
'ACP_USER_OVERVIEW' => 'Overview',
'ACP_USER_PERM' => 'Permissions',
'ACP_USER_PREFS' => 'Preferences',
'ACP_USER_PROFILE' => 'Profile',
'ACP_USER_RANK' => 'Rank',
- 'ACP_USER_ROLES' => 'User Roles',
- 'ACP_USER_SECURITY' => 'User Security',
+ 'ACP_USER_ROLES' => 'User roles',
+ 'ACP_USER_SECURITY' => 'User security',
'ACP_USER_SIG' => 'Signature',
- 'ACP_VC_SETTINGS' => 'Visual Confirmation Settings',
- 'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA Image Preview',
- 'ACP_VERSION_CHECK' => 'Check for Updates',
- 'ACP_VIEW_ADMIN_PERMISSIONS' => 'View Admin Permissions',
- 'ACP_VIEW_FORUM_MOD_PERMISSIONS' => 'View Forum Moderator Permissions',
- 'ACP_VIEW_FORUM_PERMISSIONS' => 'View Forum Permissions',
- 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS' => 'View Global Moderator Permissions',
- 'ACP_VIEW_USER_PERMISSIONS' => 'View User Permissions',
+ 'ACP_VC_SETTINGS' => 'Visual confirmation settings',
+ 'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA image preview',
+ 'ACP_VERSION_CHECK' => 'Check for updates',
+ 'ACP_VIEW_ADMIN_PERMISSIONS' => 'View administrative permissions',
+ 'ACP_VIEW_FORUM_MOD_PERMISSIONS' => 'View forum moderation permissions',
+ 'ACP_VIEW_FORUM_PERMISSIONS' => 'View forum-based permissions',
+ 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS' => 'View global moderatoration permissions',
+ 'ACP_VIEW_USER_PERMISSIONS' => 'View user-based permissions',
- 'ACP_WORDS' => 'Word Censoring',
+ 'ACP_WORDS' => 'Word censoring',
'ACTION' => 'Action',
'ACTIONS' => 'Actions',
'ACTIVATE' => 'Activate',
'ADD' => 'Add',
'ADMIN' => 'Administration',
- 'ADMIN_INDEX' => 'Admin Index',
+ 'ADMIN_INDEX' => 'Admin index',
'ADMIN_PANEL' => 'Administration Control Panel',
'BACK' => 'Back',
'COLOUR_SWATCH' => 'Web-safe colour swatch',
- 'CONFIG_UPDATED' => 'Configuration updated successfully',
+ 'CONFIG_UPDATED' => 'Configuration updated successfully.',
'CONFIRM_OPERATION' => 'Are you sure you wish to carry out this operation?',
'DEACTIVATE' => 'Deactivate',
'DIMENSIONS' => 'Dimensions',
+ 'DIRECTORY_DOES_NOT_EXIST' => 'The entered path "%s" does not exist.',
+ 'DIRECTORY_NOT_DIR' => 'The entered path "%s" is not a directory.',
+ 'DIRECTORY_NOT_WRITEABLE' => 'The entered path "%s" is not writeable.',
'DISABLE' => 'Disable',
'DOWNLOAD' => 'Download',
'DOWNLOAD_AS' => 'Download as',
- 'DOWNLOAD_STORE' => 'Download or Store file',
- 'DOWNLOAD_STORE_EXPLAIN' => 'You may directly download the file or save it in your store/ folder.',
+ 'DOWNLOAD_STORE' => 'Download or store file',
+ 'DOWNLOAD_STORE_EXPLAIN' => 'You may directly download the file or save it in your <samp>store/</samp> folder.',
'EDIT' => 'Edit',
'ENABLE' => 'Enable',
'EXPORT_DOWNLOAD' => 'Download',
'EXPORT_STORE' => 'Store',
- 'FORUM_INDEX' => 'Forum Index',
+ 'FORUM_INDEX' => 'Forum index',
- 'GENERAL_OPTIONS' => 'General Options',
- 'GENERAL_SETTINGS' => 'General Settings',
- 'GLOBAL_MASK' => 'Global Permission Mask',
+ 'GENERAL_OPTIONS' => 'General options',
+ 'GENERAL_SETTINGS' => 'General settings',
+ 'GLOBAL_MASK' => 'Global permission mask',
'INSTALL' => 'Install',
'IP' => 'User IP',
@@ -228,27 +232,30 @@ $lang = array_merge($lang, array(
'LOGIN_ADMIN' => 'To administer the board you must be an authenticated user.',
'LOGIN_ADMIN_CONFIRM' => 'To administer the board you must re-authenticate yourself.',
'LOGIN_ADMIN_SUCCESS' => 'You have successfully authenticated and will now be redirected to the Administration Control Panel',
- 'LOOK_UP_FORUM' => 'Select a Forum',
+ 'LOOK_UP_FORUM' => 'Select a forum',
'MANAGE' => 'Manage',
- 'MOVE_DOWN' => 'Move Down',
- 'MOVE_UP' => 'Move Up',
+ 'MOVE_DOWN' => 'Move down',
+ 'MOVE_UP' => 'Move up',
'NOTIFY' => 'Notification',
- 'NO_ADMIN' => 'You are not authorised to administer this board.',
+ 'NO_ADMIN' => 'You are not authorised to administrate this board.',
'NO_EMAILS_DEFINED' => 'No valid email addresses found',
- 'OFF' => 'OFF',
- 'ON' => 'ON',
+ 'OFF' => 'Off',
+ 'ON' => 'On',
- 'PARSE_BBCODE' => 'Parse BBCode',
- 'PARSE_SMILIES' => 'Parse Smilies',
- 'PARSE_URLS' => 'Parse Links',
- 'PROCEED_TO_ACP' => '%sProceed to the ACP%s',
- 'REMIND' => 'Remind',
- 'REORDER' => 'Reorder',
- 'RESYNC' => 'Sync',
- 'RETURN_TO' => 'Return to ...',
+ 'PARSE_BBCODE' => 'Parse BBCode',
+ 'PARSE_SMILIES' => 'Parse smilies',
+ 'PARSE_URLS' => 'Parse links',
+ 'PERMISSIONS_TRANSFERED' => 'Permissions transfered',
+ 'PERMISSIONS_TRANSFERED_EXPLAIN' => 'You are currently having the permissions from %1$s. You are able to browse the forum with the users permissions but not access the administration control panel since admin permissions were not transfered. You are able to <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
+ 'PROCEED_TO_ACP' => '%sProceed to the ACP%s',
+
+ 'REMIND' => 'Remind',
+ 'REORDER' => 'Reorder',
+ 'RESYNC' => 'Resyncronise',
+ 'RETURN_TO' => 'Return to…',
'SELECT_ANONYMOUS' => 'Select Anonymous User',
'SELECT_OPTION' => 'Select option',
@@ -258,8 +265,6 @@ $lang = array_merge($lang, array(
'USER_CONTROL_PANEL' => 'User Control Panel',
'WARNING' => 'Warning',
-
- 'DEBUG_EXTRA_WARNING' => 'The DEBUG_EXTRA constant is defined which is only meant for development purposes by the developers.<br />The board is running additional code to display sql reports, which slows down the board in a significant manner. Additionally sql errors are always displayed with a full backtrace to all users instead of displaying it solely to administrators, which is the default setting.<br /><br />With this said, please be aware that you are currently running your installation in <b>Debug Mode</b> and should you take this board live, please remove the constant from the config file.',
));
// PHP info
@@ -297,311 +302,330 @@ $lang = array_merge($lang, array(
'DATABASE_SIZE' => 'Database size',
'FILES_PER_DAY' => 'Attachments per day',
- 'FORUM_STATS' => 'Forum Statistics',
-
- 'GZIP_COMPRESSION' => 'Gzip compression',
+ 'FORUM_STATS' => 'Forum statistics',
- '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.',
+ 'GZIP_COMPRESSION' => 'GZip compression',
- 'NO_INACTIVE_USERS' => 'No inactive users',
'NOT_AVAILABLE' => 'Not available',
- 'NUMBER_FILES' => 'Number of Attachments',
+ 'NUMBER_FILES' => 'Number of attachments',
'NUMBER_POSTS' => 'Number of posts',
'NUMBER_TOPICS' => 'Number of topics',
'NUMBER_USERS' => 'Number of users',
+ 'NUMBER_ORPHAN' => 'Orphan attachments',
'POSTS_PER_DAY' => 'Posts per day',
- 'RESET_DATE' => 'Reset Date',
- 'RESET_ONLINE' => 'Reset Online',
- 'RESYNC_POSTCOUNTS' => 'Resync Postcounts',
- 'RESYNC_POST_MARKING' => 'Resync dotted topics',
- 'RESYNC_STATS' => 'Resync Stats',
+ 'RESET_DATE' => 'Reset date',
+ 'RESET_ONLINE' => 'Reset online',
+ 'RESYNC_POSTCOUNTS' => 'Resyncronise post counts',
+ 'RESYNC_POST_MARKING' => 'Resyncronise dotted topics',
+ 'RESYNC_STATS' => 'Resyncronise statistics',
'STATISTIC' => 'Statistic',
'TOPICS_PER_DAY' => 'Topics per day',
- 'UPLOAD_DIR_SIZE' => 'Upload directory size',
+ 'UPLOAD_DIR_SIZE' => 'Size of posted attachments',
'USERS_PER_DAY' => 'Users per day',
- 'VALUE' => 'Value',
- 'VIEW_ADMIN_LOG' => 'View administrator log',
+ 'VALUE' => 'Value',
+ 'VIEW_ADMIN_LOG' => 'View administrator log',
+ 'VIEW_INACTIVE_USERS' => 'View inactive users',
'WELCOME_PHPBB' => 'Welcome to phpBB',
));
+// Inactive Users
+$lang = array_merge($lang, array(
+ 'INACTIVE_DATE' => 'Inactive date',
+ 'INACTIVE_REASON' => 'Reason',
+ 'INACTIVE_REASON_MANUAL' => 'Account deactivated by administrator',
+ 'INACTIVE_REASON_PROFILE' => 'Profile details changed',
+ 'INACTIVE_REASON_REGISTER' => 'Newly registered account',
+ 'INACTIVE_REASON_REMIND' => 'Forced user account reactivation',
+ 'INACTIVE_REASON_UNKNOWN' => 'Unknown',
+ '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.',
+
+ 'NO_INACTIVE_USERS' => 'No inactive users',
+
+ 'SORT_INACTIVE' => 'Inactive date',
+ 'SORT_LAST_VISIT' => 'Last visit',
+ 'SORT_REASON' => 'Reason',
+ 'SORT_REG_DATE' => 'Registration date',
+));
+
// Log Entries
$lang = array_merge($lang, array(
- 'LOG_ACL_ADD_USER_GLOBAL_U_' => '<b>Added or edited users user permissions</b><br />&#187; %s',
- 'LOG_ACL_ADD_GROUP_GLOBAL_U_' => '<b>Added or edited groups user permissions</b><br />&#187; %s',
- 'LOG_ACL_ADD_USER_GLOBAL_M_' => '<b>Added or edited users global moderator permissions</b><br />&#187; %s',
- 'LOG_ACL_ADD_GROUP_GLOBAL_M_' => '<b>Added or edited groups global moderator permissions</b><br />&#187; %s',
- 'LOG_ACL_ADD_USER_GLOBAL_A_' => '<b>Added or edited users admin permissions</b><br />&#187; %s',
- 'LOG_ACL_ADD_GROUP_GLOBAL_A_' => '<b>Added or edited groups admin permissions</b><br />&#187; %s',
-
- 'LOG_ACL_ADD_ADMIN_GLOBAL_A_' => '<b>Added or edited Administrators</b><br />&#187; %s',
- 'LOG_ACL_ADD_MOD_GLOBAL_M_' => '<b>Added or edited Global Moderators</b><br />&#187; %s',
-
- 'LOG_ACL_ADD_USER_LOCAL_F_' => '<b>Added or edited users forum access</b> from %1$s<br />&#187; %2$s',
- 'LOG_ACL_ADD_USER_LOCAL_M_' => '<b>Added or edited users forum moderator access</b> from %1$s<br />&#187; %2$s',
- 'LOG_ACL_ADD_GROUP_LOCAL_F_' => '<b>Added or edited groups forum access</b> from %1$s<br />&#187; %2$s',
- 'LOG_ACL_ADD_GROUP_LOCAL_M_' => '<b>Added or edited groups forum moderator access</b> from %1$s<br />&#187; %2$s',
-
- 'LOG_ACL_ADD_MOD_LOCAL_M_' => '<b>Added or edited Moderators</b> from %1$s<br />&#187; %2$s',
- 'LOG_ACL_ADD_FORUM_LOCAL_F_' => '<b>Added or edited Forum Permissions</b> from %1$s<br />&#187; %2$s',
-
- 'LOG_ACL_DEL_ADMIN_GLOBAL_A_' => '<b>Removed Administrators</b><br />&#187; %s',
- 'LOG_ACL_DEL_MOD_GLOBAL_M_' => '<b>Removed Global Moderators</b><br />&#187; %s',
- 'LOG_ACL_DEL_MOD_LOCAL_M_' => '<b>Removed Moderators</b> from %1$s<br />&#187; %2$s',
- 'LOG_ACL_DEL_FORUM_LOCAL_F_' => '<b>Removed User/Group Forum Permissions</b> from %1$s<br />&#187; %2$s',
-
- 'LOG_ACL_TRANSFER_PERMISSIONS' => '<b>Permissions transfered from</b><br />&#187; %s',
- 'LOG_ACL_RESTORE_PERMISSIONS' => '<b>Own permissions restored after using permissions from</b><br />&#187; %s',
+ 'LOG_ACL_ADD_USER_GLOBAL_U_' => '<strong>Added or edited users user permissions</strong><br />» %s',
+ '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_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',
+
+ 'LOG_ACL_ADD_USER_LOCAL_F_' => '<strong>Added or edited users forum access</strong> from %1$s<br />» %2$s',
+ 'LOG_ACL_ADD_USER_LOCAL_M_' => '<strong>Added or edited users forum moderator access</strong> from %1$s<br />» %2$s',
+ 'LOG_ACL_ADD_GROUP_LOCAL_F_' => '<strong>Added or edited groups forum access</strong> from %1$s<br />» %2$s',
+ '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_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_TRANSFER_PERMISSIONS' => '<strong>Permissions transfered from</strong><br />» %s',
+ 'LOG_ACL_RESTORE_PERMISSIONS' => '<strong>Own permissions restored after using permissions from</strong><br />» %s',
- 'LOG_ADMIN_AUTH_FAIL' => '<b>Failed administration login attempt</b>',
- 'LOG_ADMIN_AUTH_SUCCESS' => '<b>Successful administration login</b>',
-
- 'LOG_ATTACH_EXT_ADD' => '<b>Added or edited attachment extension</b><br />&#187; %s',
- 'LOG_ATTACH_EXT_DEL' => '<b>Removed attachment extension</b><br />&#187; %s',
- 'LOG_ATTACH_EXT_UPDATE' => '<b>Updated attachment extension</b><br />&#187; %s',
- 'LOG_ATTACH_EXTGROUP_ADD' => '<b>Added extension group</b><br />&#187; %s',
- 'LOG_ATTACH_EXTGROUP_EDIT' => '<b>Edited extension group</b><br />&#187; %s',
- 'LOG_ATTACH_EXTGROUP_DEL' => '<b>Removed extension group</b><br />&#187; %s',
- 'LOG_ATTACH_FILEUPLOAD' => '<b>Orphan File uploaded to Post</b><br />&#187; ID %1$d - %2$s',
- 'LOG_ATTACH_ORPHAN_DEL' => '<b>Orphan Files deleted</b><br />&#187; %s',
-
- 'LOG_BAN_EXCLUDE_USER' => '<b>Excluded user from ban</b> for reason "<i>%1$s</i>"<br />&#187; %2$s ',
- 'LOG_BAN_EXCLUDE_IP' => '<b>Excluded ip from ban</b> for reason "<i>%1$s</i>"<br />&#187; %2$s ',
- 'LOG_BAN_EXCLUDE_EMAIL' => '<b>Excluded email from ban</b> for reason "<i>%1$s</i>"<br />&#187; %2$s ',
- 'LOG_BAN_USER' => '<b>Banned User</b> for reason "<i>%1$s</i>"<br />&#187; %2$s ',
- 'LOG_BAN_IP' => '<b>Banned ip</b> for reason "<i>%1$s</i>"<br />&#187; %2$s',
- 'LOG_BAN_EMAIL' => '<b>Banned email</b> for reason "<i>%1$s</i>"<br />&#187; %2$s',
- 'LOG_UNBAN_USER' => '<b>Unbanned user</b><br />&#187; %s',
- 'LOG_UNBAN_IP' => '<b>Unbanned ip</b><br />&#187; %s',
- 'LOG_UNBAN_EMAIL' => '<b>Unbanned email</b><br />&#187; %s',
-
- 'LOG_BBCODE_ADD' => '<b>Added new BBCode</b><br />&#187; %s',
- 'LOG_BBCODE_EDIT' => '<b>Edited BBCode</b><br />&#187; %s',
- 'LOG_BBCODE_DELETE' => '<b>Deleted BBCode</b><br />&#187; %s',
-
- 'LOG_BOT_ADDED' => '<b>New bot added</b><br />&#187; %s',
- 'LOG_BOT_DELETE' => '<b>Deleted bot</b><br />&#187; %s',
- 'LOG_BOT_UPDATED' => '<b>Existing bot updated</b><br />&#187; %s',
-
- 'LOG_CLEAR_ADMIN' => '<b>Cleared admin log</b>',
- 'LOG_CLEAR_CRITICAL' => '<b>Cleared error log</b>',
- 'LOG_CLEAR_MOD' => '<b>Cleared moderator log</b>',
- 'LOG_CLEAR_USER' => '<b>Cleared user log</b><br />&#187; %s',
- 'LOG_CLEAR_USERS' => '<b>Cleared user logs</b>',
-
- 'LOG_CONFIG_ATTACH' => '<b>Altered attachment settings</b>',
- 'LOG_CONFIG_AUTH' => '<b>Altered authentication settings</b>',
- 'LOG_CONFIG_AVATAR' => '<b>Altered avatar settings</b>',
- 'LOG_CONFIG_COOKIE' => '<b>Altered cookie settings</b>',
- 'LOG_CONFIG_EMAIL' => '<b>Altered email settings</b>',
- 'LOG_CONFIG_FEATURES' => '<b>Altered board features</b>',
- 'LOG_CONFIG_LOAD' => '<b>Altered load settings</b>',
- 'LOG_CONFIG_MESSAGE' => '<b>Altered private message settings</b>',
- 'LOG_CONFIG_POST' => '<b>Altered post settings</b>',
- 'LOG_CONFIG_REGISTRATION' => '<b>Altered user registration settings</b>',
- 'LOG_CONFIG_SEARCH' => '<b>Altered search settings</b>',
- 'LOG_CONFIG_SECURITY' => '<b>Altered security settings</b>',
- 'LOG_CONFIG_SERVER' => '<b>Altered server settings</b>',
- 'LOG_CONFIG_SETTINGS' => '<b>Altered board settings</b>',
- 'LOG_CONFIG_SIGNATURE' => '<b>Altered signature settings</b>',
- 'LOG_CONFIG_VISUAL' => '<b>Altered visual confirmation settings</b>',
-
- 'LOG_APPROVE_TOPIC' => '<b>Approved topic</b><br />&#187; %s',
- 'LOG_BUMP_TOPIC' => '<b>User bumped topic</b><br />&#187; %s',
- 'LOG_DELETE_POST' => '<b>Deleted post</b><br />&#187; %s',
- 'LOG_DELETE_TOPIC' => '<b>Deleted topic</b><br />&#187; %s',
- 'LOG_FORK' => '<b>Copied topic</b><br />&#187; from %s',
- 'LOG_LOCK' => '<b>Locked topic</b><br />&#187; %s',
- 'LOG_LOCK_POST' => '<b>Locked post</b><br />&#187; %s',
- 'LOG_MERGE' => '<b>Merged posts</b> into topic<br />&#187;%s',
- 'LOG_MOVE' => '<b>Moved topic</b><br />&#187; from %s',
- 'LOG_TOPIC_DELETED' => '<b>Deleted topic</b><br />&#187; %s',
- 'LOG_TOPIC_RESYNC' => '<b>Resynchronised topic counters</b><br />&#187; %s',
- 'LOG_TOPIC_TYPE_CHANGED' => '<b>Changed topic type</b><br />&#187; %s',
- 'LOG_UNLOCK' => '<b>Unlocked topic</b><br />&#187; %s',
- 'LOG_UNLOCK_POST' => '<b>Unlocked post</b><br />&#187; %s',
-
- 'LOG_DISALLOW_ADD' => '<b>Added disallowed username</b><br />&#187; %s',
- 'LOG_DISALLOW_DELETE' => '<b>Deleted disallowed username</b>',
-
- 'LOG_DB_BACKUP' => '<b>Database backup</b>',
- 'LOG_DB_RESTORE' => '<b>Database restore</b>',
-
- 'LOG_DOWNLOAD_EXCLUDE_IP' => '<b>Exluded ip/hostname from download list</b><br />&#187; %s',
- 'LOG_DOWNLOAD_IP' => '<b>Added ip/hostname to download list</b><br />&#187; %s',
- 'LOG_DOWNLOAD_REMOVE_IP' => '<b>Removed ip/hostname from download list</b><br />&#187; %s',
-
- 'LOG_ERROR_JABBER' => '<b>Jabber Error</b><br />&#187; %s',
- 'LOG_ERROR_EMAIL' => '<b>Email Error</b><br />&#187; %s',
+ 'LOG_ADMIN_AUTH_FAIL' => '<strong>Failed administration login attempt</strong>',
+ 'LOG_ADMIN_AUTH_SUCCESS' => '<strong>Successful administration login</strong>',
+
+ 'LOG_ATTACH_EXT_ADD' => '<strong>Added or edited attachment extension</strong><br />» %s',
+ 'LOG_ATTACH_EXT_DEL' => '<strong>Removed attachment extension</strong><br />» %s',
+ 'LOG_ATTACH_EXT_UPDATE' => '<strong>Updated attachment extension</strong><br />» %s',
+ 'LOG_ATTACH_EXTGROUP_ADD' => '<strong>Added extension group</strong><br />» %s',
+ 'LOG_ATTACH_EXTGROUP_EDIT' => '<strong>Edited extension group</strong><br />» %s',
+ 'LOG_ATTACH_EXTGROUP_DEL' => '<strong>Removed extension group</strong><br />» %s',
+ 'LOG_ATTACH_FILEUPLOAD' => '<strong>Orphan File uploaded to Post</strong><br />» ID %1$d - %2$s',
+ 'LOG_ATTACH_ORPHAN_DEL' => '<strong>Orphan Files deleted</strong><br />» %s',
+
+ '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_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_EMAIL' => '<strong>Unbanned email</strong><br />» %s',
+
+ 'LOG_BBCODE_ADD' => '<strong>Added new BBCode</strong><br />» %s',
+ 'LOG_BBCODE_EDIT' => '<strong>Edited BBCode</strong><br />» %s',
+ 'LOG_BBCODE_DELETE' => '<strong>Deleted BBCode</strong><br />» %s',
+
+ 'LOG_BOT_ADDED' => '<strong>New bot added</strong><br />» %s',
+ 'LOG_BOT_DELETE' => '<strong>Deleted bot</strong><br />» %s',
+ 'LOG_BOT_UPDATED' => '<strong>Existing bot updated</strong><br />» %s',
+
+ 'LOG_CLEAR_ADMIN' => '<strong>Cleared admin log</strong>',
+ 'LOG_CLEAR_CRITICAL' => '<strong>Cleared error log</strong>',
+ 'LOG_CLEAR_MOD' => '<strong>Cleared moderator log</strong>',
+ 'LOG_CLEAR_USER' => '<strong>Cleared user log</strong><br />» %s',
+ 'LOG_CLEAR_USERS' => '<strong>Cleared user logs</strong>',
+
+ 'LOG_CONFIG_ATTACH' => '<strong>Altered attachment settings</strong>',
+ 'LOG_CONFIG_AUTH' => '<strong>Altered authentication settings</strong>',
+ 'LOG_CONFIG_AVATAR' => '<strong>Altered avatar settings</strong>',
+ 'LOG_CONFIG_COOKIE' => '<strong>Altered cookie settings</strong>',
+ 'LOG_CONFIG_EMAIL' => '<strong>Altered email settings</strong>',
+ 'LOG_CONFIG_FEATURES' => '<strong>Altered board features</strong>',
+ 'LOG_CONFIG_LOAD' => '<strong>Altered load settings</strong>',
+ 'LOG_CONFIG_MESSAGE' => '<strong>Altered private message settings</strong>',
+ 'LOG_CONFIG_POST' => '<strong>Altered post settings</strong>',
+ 'LOG_CONFIG_REGISTRATION' => '<strong>Altered user registration settings</strong>',
+ 'LOG_CONFIG_SEARCH' => '<strong>Altered search settings</strong>',
+ 'LOG_CONFIG_SECURITY' => '<strong>Altered security settings</strong>',
+ 'LOG_CONFIG_SERVER' => '<strong>Altered server settings</strong>',
+ 'LOG_CONFIG_SETTINGS' => '<strong>Altered board settings</strong>',
+ 'LOG_CONFIG_SIGNATURE' => '<strong>Altered signature settings</strong>',
+ 'LOG_CONFIG_VISUAL' => '<strong>Altered visual confirmation settings</strong>',
+
+ 'LOG_APPROVE_TOPIC' => '<strong>Approved topic</strong><br />» %s',
+ 'LOG_BUMP_TOPIC' => '<strong>User bumped topic</strong><br />» %s',
+ 'LOG_DELETE_POST' => '<strong>Deleted post</strong><br />» %s',
+ 'LOG_DELETE_TOPIC' => '<strong>Deleted topic</strong><br />» %s',
+ 'LOG_FORK' => '<strong>Copied topic</strong><br />» from %s',
+ 'LOG_LOCK' => '<strong>Locked topic</strong><br />» %s',
+ 'LOG_LOCK_POST' => '<strong>Locked post</strong><br />» %s',
+ 'LOG_MERGE' => '<strong>Merged posts</strong> into topic<br />»%s',
+ 'LOG_MOVE' => '<strong>Moved topic</strong><br />» from %s',
+ 'LOG_TOPIC_DELETED' => '<strong>Deleted topic</strong><br />» %s',
+ 'LOG_TOPIC_RESYNC' => '<strong>Resynchronised topic counters</strong><br />» %s',
+ 'LOG_TOPIC_TYPE_CHANGED' => '<strong>Changed topic type</strong><br />» %s',
+ 'LOG_UNLOCK' => '<strong>Unlocked topic</strong><br />» %s',
+ 'LOG_UNLOCK_POST' => '<strong>Unlocked post</strong><br />» %s',
+
+ 'LOG_DISALLOW_ADD' => '<strong>Added disallowed username</strong><br />» %s',
+ 'LOG_DISALLOW_DELETE' => '<strong>Deleted disallowed username</strong>',
+
+ 'LOG_DB_BACKUP' => '<strong>Database backup</strong>',
+ 'LOG_DB_RESTORE' => '<strong>Database restore</strong>',
+
+ 'LOG_DOWNLOAD_EXCLUDE_IP' => '<strong>Exluded IP/hostname from download list</strong><br />» %s',
+ 'LOG_DOWNLOAD_IP' => '<strong>Added IP/hostname to download list</strong><br />» %s',
+ 'LOG_DOWNLOAD_REMOVE_IP' => '<strong>Removed IP/hostname from download list</strong><br />» %s',
+
+ 'LOG_ERROR_JABBER' => '<strong>Jabber error</strong><br />» %s',
+ 'LOG_ERROR_EMAIL' => '<strong>Email error</strong><br />» %s',
- 'LOG_FORUM_ADD' => '<b>Created new forum</b><br />&#187; %s',
- 'LOG_FORUM_DEL_FORUM' => '<b>Deleted forum</b><br />&#187; %s',
- 'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />&#187; %s',
- 'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %1$s<br />&#187; %2$s',
- 'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %1$s<br />&#187; %2$s',
- 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %1$s<br />&#187; %2$s',
- 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %1$s <b>and subforums</b> to %2$s<br />&#187; %3$s',
- 'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />&#187; %s',
- 'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />&#187; %s',
- 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %1$s<br />&#187; %2$s',
- 'LOG_FORUM_EDIT' => '<b>Edited forum details</b><br />&#187; %s',
- 'LOG_FORUM_MOVE_DOWN' => '<b>Moved forum</b> %1$s <b>below</b> %2$s',
- 'LOG_FORUM_MOVE_UP' => '<b>Moved forum</b> %1$s <b>above</b> %2$s',
- 'LOG_FORUM_SYNC' => '<b>Re-synchronised forum</b><br />&#187; %s',
-
- 'LOG_GROUP_CREATED' => '<b>New usergroup created</b><br />&#187; %s',
- 'LOG_GROUP_DEFAULTS' => '<b>Group made default for members</b><br />&#187; %s',
- 'LOG_GROUP_DELETE' => '<b>Usergroup deleted</b><br />&#187; %s',
- 'LOG_GROUP_DEMOTED' => '<b>Leaders demoted in usergroup</b> %1$s<br />&#187; %2$s',
- 'LOG_GROUP_PROMOTED' => '<b>Members promoted to leader in usergroup</b> %1$s<br />&#187; %2$s',
- 'LOG_GROUP_REMOVE' => '<b>Members removed from usergroup</b> %1$s<br />&#187; %2$s',
- 'LOG_GROUP_UPDATED' => '<b>Usergroup details updated</b><br />&#187; %s',
- 'LOG_MODS_ADDED' => '<b>Added new leaders to usergroup</b> %1$s<br />&#187; %2$s',
- 'LOG_USERS_APPROVED' => '<b>Users approved in usergroup</b> %1$s<br />&#187; %2$s',
- 'LOG_USERS_ADDED' => '<b>Added new members to usergroup</b> %1$s<br />&#187; %2$s',
-
- 'LOG_IMAGESET_ADD_DB' => '<b>Added new imageset to database</b><br />&#187; %s',
- 'LOG_IMAGESET_ADD_FS' => '<b>Add new imageset on filesystem</b><br />&#187; %s',
- 'LOG_IMAGESET_DELETE' => '<b>Deleted imageset</b><br />&#187; %s',
- 'LOG_IMAGESET_EDIT_DETAILS' => '<b>Edited imageset details</b><br />&#187; %s',
- 'LOG_IMAGESET_EDIT' => '<b>Edited imageset</b><br />&#187; %s',
- 'LOG_IMAGESET_EXPORT' => '<b>Exported imageset</b><br />&#187; %s',
- 'LOG_IMAGESET_REFRESHED' => '<b>Refreshed imageset</b><br />&#187; %s',
-
- 'LOG_INDEX_ACTIVATE' => '<b>Activated inactive users</b><br />&#187; %s',
- 'LOG_INDEX_DELETE' => '<b>Deleted inactive users</b><br />&#187; %s',
- 'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />&#187; %s',
- 'LOG_INSTALL_CONVERTED' => '<b>Converted from %1$s to phpBB %2$s</b>',
- 'LOG_INSTALL_INSTALLED' => '<b>Installed phpBB %s</b>',
-
- 'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />&#187;User IP "<i>%1$s</i>" checked against session IP "<i>%2$s</i>" and user browser string "<i>%3$s</i>" checked against session browser string "<i>%4$s</i>".',
-
- 'LOG_JAB_CHANGED' => '<b>Jabber account changed</b>',
- 'LOG_JAB_PASSCHG' => '<b>Jabber password changed</b>',
- 'LOG_JAB_REGISTER' => '<b>Jabber account registered</b>',
- 'LOG_JAB_SETTINGS_CHANGED' => '<b>Jabber settings changed</b>',
-
- 'LOG_LANGUAGE_PACK_DELETED' => '<b>Deleted language pack</b><br />&#187; %s',
- 'LOG_LANGUAGE_PACK_INSTALLED' => '<b>Installed language pack</b><br />&#187; %s',
- 'LOG_LANGUAGE_PACK_UPDATED' => '<b>Updated language pack details</b><br />&#187; %s',
- 'LOG_LANGUAGE_FILE_REPLACED' => '<b>Replaced language file</b><br />&#187; %s',
-
- 'LOG_MASS_EMAIL' => '<b>Sent mass email</b><br />&#187; %s',
-
- 'LOG_MCP_CHANGE_POSTER' => '<b>Changed poster in topic "%1$s"</b><br />&#187; from %2$s to %3$s',
-
- 'LOG_MODULE_DISABLE' => '<b>Module disabled</b>',
- 'LOG_MODULE_ENABLE' => '<b>Module enabled</b>',
- 'LOG_MODULE_MOVE_DOWN' => '<b>Module moved down</b><br />&#187; %s',
- 'LOG_MODULE_MOVE_UP' => '<b>Module moved up</b><br />&#187; %s',
- 'LOG_MODULE_REMOVED' => '<b>Module removed</b><br />&#187; %s',
- 'LOG_MODULE_ADD' => '<b>Module added</b><br />&#187; %s',
- 'LOG_MODULE_EDIT' => '<b>Module edited</b><br />&#187; %s',
-
- 'LOG_A_ROLE_ADD' => '<b>Admin Role added</b><br />&#187; %s',
- 'LOG_A_ROLE_EDIT' => '<b>Admin Role edited</b><br />&#187; %s',
- 'LOG_A_ROLE_REMOVED' => '<b>Admin Role removed</b><br />&#187; %s',
- 'LOG_F_ROLE_ADD' => '<b>Forum Role added</b><br />&#187; %s',
- 'LOG_F_ROLE_EDIT' => '<b>Forum Role edited</b><br />&#187; %s',
- 'LOG_F_ROLE_REMOVED' => '<b>Forum Role removed</b><br />&#187; %s',
- 'LOG_M_ROLE_ADD' => '<b>Moderator Role added</b><br />&#187; %s',
- 'LOG_M_ROLE_EDIT' => '<b>Moderator Role edited</b><br />&#187; %s',
- 'LOG_M_ROLE_REMOVED' => '<b>Moderator Role removed</b><br />&#187; %s',
- 'LOG_U_ROLE_ADD' => '<b>User Role added</b><br />&#187; %s',
- 'LOG_U_ROLE_EDIT' => '<b>User Role edited</b><br />&#187; %s',
- 'LOG_U_ROLE_REMOVED' => '<b>User Role removed</b><br />&#187; %s',
-
- 'LOG_PROFILE_FIELD_ACTIVATE' => '<b>Profile field activated</b><br />&#187; %s',
- 'LOG_PROFILE_FIELD_CREATE' => '<b>Profile field added</b><br />&#187; %s',
- 'LOG_PROFILE_FIELD_DEACTIVATE' => '<b>Profile field deactivated</b><br />&#187; %s',
- 'LOG_PROFILE_FIELD_EDIT' => '<b>Profile field changed</b><br />&#187; %s',
- 'LOG_PROFILE_FIELD_REMOVED' => '<b>Profile field removed</b><br />&#187; %s',
-
- 'LOG_PRUNE' => '<b>Pruned forums</b><br />&#187; %s',
- 'LOG_AUTO_PRUNE' => '<b>Auto-pruned forums</b><br />&#187; %s',
- 'LOG_PRUNE_USER_DEAC' => '<b>Users deactivated</b><br />&#187; %s',
- 'LOG_PRUNE_USER_DEL_DEL' => '<b>Users pruned and posts deleted</b><br />&#187; %s',
- 'LOG_PRUNE_USER_DEL_ANON' => '<b>Users pruned and posts retained</b><br />&#187; %s',
-
- 'LOG_REASON_ADDED' => '<b>Added report/denial reason</b><br />&#187; %s',
- 'LOG_REASON_REMOVED' => '<b>Removed report/denial reason</b><br />&#187; %s',
- 'LOG_REASON_UPDATED' => '<b>Updated report/denial reason</b><br />&#187; %s',
-
- 'LOG_RESET_DATE' => '<b>Board start date reset</b>',
- 'LOG_RESET_ONLINE' => '<b>Most users online reset</b>',
- 'LOG_RESYNC_POSTCOUNTS' => '<b>User postcounts synced</b>',
- 'LOG_RESYNC_POST_MARKING' => '<b>Dotted topics synced</b>',
- 'LOG_RESYNC_STATS' => '<b>Post, topic and user stats reset</b>',
-
- 'LOG_STYLE_ADD' => '<b>Added new style</b><br />&#187; %s',
- 'LOG_STYLE_DELETE' => '<b>Deleted style</b><br />&#187; %s',
- 'LOG_STYLE_EDIT_DETAILS' => '<b>Edited style</b><br />&#187; %s',
- 'LOG_STYLE_EXPORT' => '<b>Exported style</b><br />&#187; %s',
-
- 'LOG_TEMPLATE_ADD_DB' => '<b>Added new template set to database</b><br />&#187; %s',
- 'LOG_TEMPLATE_ADD_FS' => '<b>Add new template set on filesystem</b><br />&#187; %s',
- 'LOG_TEMPLATE_CACHE_CLEARED' => '<b>Deleted cached versions of template files in template set <i>%1$s</i></b><br />&#187; %2$s',
- 'LOG_TEMPLATE_DELETE' => '<b>Deleted template set</b><br />&#187; %s',
- 'LOG_TEMPLATE_EDIT' => '<b>Edited template set <i>%1$s</i></b><br />&#187; %2$s',
- 'LOG_TEMPLATE_EDIT_DETAILS' => '<b>Edited template details</b><br />&#187; %s',
- 'LOG_TEMPLATE_EXPORT' => '<b>Exported template set</b><br />&#187; %s',
- 'LOG_TEMPLATE_REFRESHED' => '<b>Refreshed template set</b><br />&#187; %s',
-
- 'LOG_THEME_ADD_DB' => '<b>Added new theme to database</b><br />&#187; %s',
- 'LOG_THEME_ADD_FS' => '<b>Add new theme on filesystem</b><br />&#187; %s',
- 'LOG_THEME_DELETE' => '<b>Theme deleted</b><br />&#187; %s',
- 'LOG_THEME_EDIT_DETAILS' => '<b>Edited theme details</b><br />&#187; %s',
- 'LOG_THEME_EDIT' => '<b>Edited theme <i>%1$s</i></b><br />&#187; Modified class <i>%2$s</i>',
- 'LOG_THEME_EDIT_ADD' => '<b>Edited theme <i>%1$s</i></b><br />&#187; Added class <i>%2$s</i>',
- 'LOG_THEME_EXPORT' => '<b>Exported theme</b><br />&#187; %s',
- 'LOG_THEME_REFRESHED' => '<b>Refreshed theme</b><br />&#187; %s',
-
- 'LOG_USER_ACTIVE' => '<b>User activated</b><br />&#187; %s',
- 'LOG_USER_BAN_USER' => '<b>Banned User via user management</b> for reason "<i>%1$s</i>"<br />&#187; %2$s',
- 'LOG_USER_BAN_IP' => '<b>Banned ip via user management</b> for reason "<i>%1$s</i>"<br />&#187; %2$s',
- 'LOG_USER_BAN_EMAIL' => '<b>Banned email via user management</b> for reason "<i>%1$s</i>"<br />&#187; %2$s',
- 'LOG_USER_DELETED' => '<b>Deleted user</b><br />&#187; %s',
- 'LOG_USER_DEL_ATTACH' => '<b>Removed all attachments made by the user</b><br />&#187; %s',
- 'LOG_USER_DEL_AVATAR' => '<b>Removed user avatar</b><br />&#187; %s',
- 'LOG_USER_DEL_POSTS' => '<b>Removed all posts made by the user</b><br />&#187; %s',
- 'LOG_USER_DEL_SIG' => '<b>Removed user signature</b><br />&#187; %s',
- 'LOG_USER_INACTIVE' => '<b>User deactivated</b><br />&#187; %s',
- 'LOG_USER_MOVE_POSTS' => '<b>Moved user posts</b><br />&#187; posts by "%1$s" to forum "%2$s"',
- 'LOG_USER_NEW_PASSWORD' => '<b>Changed user password</b><br />&#187; %s',
- 'LOG_USER_REACTIVATE' => '<b>Forced user account re-activation</b><br />&#187; %s',
- 'LOG_USER_UPDATE_EMAIL' => '<b>User "%1$s" changed email</b><br />&#187; from "%2$s" to "%3$s"',
- 'LOG_USER_UPDATE_NAME' => '<b>Changed username</b><br />&#187; from "%1$s" to "%2$s"',
- 'LOG_USER_USER_UPDATE' => '<b>Updated user details</b><br />&#187; %s',
-
- 'LOG_USER_ACTIVE_USER' => '<b>User account activated</b>',
- 'LOG_USER_DEL_AVATAR_USER' => '<b>User avatar removed</b>',
- 'LOG_USER_DEL_SIG_USER' => '<b>User signature removed</b>',
- 'LOG_USER_FEEDBACK' => '<b>Added user feedback</b><br />&#187; %s',
+ 'LOG_FORUM_ADD' => '<strong>Created new forum</strong><br />» %s',
+ 'LOG_FORUM_DEL_FORUM' => '<strong>Deleted forum</strong><br />» %s',
+ 'LOG_FORUM_DEL_FORUMS' => '<strong>Deleted forum and its subforums</strong><br />» %s',
+ 'LOG_FORUM_DEL_MOVE_FORUMS' => '<strong>Deleted forum and moved subforums</strong> to %1$s<br />» %2$s',
+ 'LOG_FORUM_DEL_MOVE_POSTS' => '<strong>Deleted forum and moved posts </strong> to %1$s<br />» %2$s',
+ 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<strong>Deleted forum and its subforums, moved messages</strong> to %1$s<br />» %2$s',
+ 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<strong>Deleted forum, moved posts</strong> to %1$s <strong>and subforums</strong> to %2$s<br />» %3$s',
+ 'LOG_FORUM_DEL_POSTS' => '<strong>Deleted forum and its messages</strong><br />» %s',
+ 'LOG_FORUM_DEL_POSTS_FORUMS' => '<strong>Deleted forum, its messages and subforums</strong><br />» %s',
+ 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<strong>Deleted forum and its messages, moved subforums</strong> to %1$s<br />» %2$s',
+ 'LOG_FORUM_EDIT' => '<strong>Edited forum details</strong><br />» %s',
+ 'LOG_FORUM_MOVE_DOWN' => '<strong>Moved forum</strong> %1$s <strong>below</strong> %2$s',
+ 'LOG_FORUM_MOVE_UP' => '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
+ 'LOG_FORUM_SYNC' => '<strong>Re-synchronised forum</strong><br />» %s',
+
+ 'LOG_GROUP_CREATED' => '<strong>New usergroup created</strong><br />» %s',
+ 'LOG_GROUP_DEFAULTS' => '<strong>Group made default for members</strong><br />» %s',
+ 'LOG_GROUP_DELETE' => '<strong>Usergroup deleted</strong><br />» %s',
+ 'LOG_GROUP_DEMOTED' => '<strong>Leaders demoted in usergroup</strong> %1$s<br />» %2$s',
+ 'LOG_GROUP_PROMOTED' => '<strong>Members promoted to leader in usergroup</strong> %1$s<br />» %2$s',
+ 'LOG_GROUP_REMOVE' => '<strong>Members removed from usergroup</strong> %1$s<br />» %2$s',
+ 'LOG_GROUP_UPDATED' => '<strong>Usergroup details updated</strong><br />» %s',
+ 'LOG_MODS_ADDED' => '<strong>Added new leaders to usergroup</strong> %1$s<br />» %2$s',
+ 'LOG_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
+ 'LOG_USERS_ADDED' => '<strong>Added new members to usergroup</strong> %1$s<br />» %2$s',
+
+ 'LOG_IMAGESET_ADD_DB' => '<strong>Added new imageset to database</strong><br />» %s',
+ 'LOG_IMAGESET_ADD_FS' => '<strong>Add new imageset on filesystem</strong><br />» %s',
+ 'LOG_IMAGESET_DELETE' => '<strong>Deleted imageset</strong><br />» %s',
+ 'LOG_IMAGESET_EDIT_DETAILS' => '<strong>Edited imageset details</strong><br />» %s',
+ 'LOG_IMAGESET_EDIT' => '<strong>Edited imageset</strong><br />» %s',
+ 'LOG_IMAGESET_EXPORT' => '<strong>Exported imageset</strong><br />» %s',
+ 'LOG_IMAGESET_REFRESHED' => '<strong>Refreshed imageset</strong><br />» %s',
+
+ 'LOG_INACTIVE_ACTIVATE' => '<strong>Activated inactive users</strong><br />» %s',
+ 'LOG_INACTIVE_DELETE' => '<strong>Deleted inactive users</strong><br />» %s',
+ 'LOG_INACTIVE_REMIND' => '<strong>Sent reminder emails to inactive users</strong><br />» %s',
+ 'LOG_INSTALL_CONVERTED' => '<strong>Converted from %1$s to phpBB %2$s</strong>',
+ 'LOG_INSTALL_INSTALLED' => '<strong>Installed phpBB %s</strong>',
+
+ 'LOG_IP_BROWSER_CHECK' => '<strong>Session IP/browser check failed</strong><br />»User IP "<em>%1$s</em>" checked against session IP "<em>%2$s</em>" and user browser string "<em>%3$s</em>" checked against session browser string "<em>%4$s</em>".',
+
+ 'LOG_JAB_CHANGED' => '<strong>Jabber account changed</strong>',
+ 'LOG_JAB_PASSCHG' => '<strong>Jabber password changed</strong>',
+ 'LOG_JAB_REGISTER' => '<strong>Jabber account registered</strong>',
+ 'LOG_JAB_SETTINGS_CHANGED' => '<strong>Jabber settings changed</strong>',
+
+ 'LOG_LANGUAGE_PACK_DELETED' => '<strong>Deleted language pack</strong><br />» %s',
+ 'LOG_LANGUAGE_PACK_INSTALLED' => '<strong>Installed language pack</strong><br />» %s',
+ 'LOG_LANGUAGE_PACK_UPDATED' => '<strong>Updated language pack details</strong><br />» %s',
+ 'LOG_LANGUAGE_FILE_REPLACED' => '<strong>Replaced language file</strong><br />» %s',
+
+ 'LOG_MASS_EMAIL' => '<strong>Sent mass email</strong><br />» %s',
+
+ 'LOG_MCP_CHANGE_POSTER' => '<strong>Changed poster in topic "%1$s"</strong><br />» from %2$s to %3$s',
+
+ 'LOG_MODULE_DISABLE' => '<strong>Module disabled</strong>',
+ 'LOG_MODULE_ENABLE' => '<strong>Module enabled</strong>',
+ 'LOG_MODULE_MOVE_DOWN' => '<strong>Module moved down</strong><br />» %s',
+ 'LOG_MODULE_MOVE_UP' => '<strong>Module moved up</strong><br />» %s',
+ 'LOG_MODULE_REMOVED' => '<strong>Module removed</strong><br />» %s',
+ 'LOG_MODULE_ADD' => '<strong>Module added</strong><br />» %s',
+ 'LOG_MODULE_EDIT' => '<strong>Module edited</strong><br />» %s',
+
+ 'LOG_A_ROLE_ADD' => '<strong>Admin role added</strong><br />» %s',
+ 'LOG_A_ROLE_EDIT' => '<strong>Admin role edited</strong><br />» %s',
+ 'LOG_A_ROLE_REMOVED' => '<strong>Admin role removed</strong><br />» %s',
+ 'LOG_F_ROLE_ADD' => '<strong>Forum role added</strong><br />» %s',
+ 'LOG_F_ROLE_EDIT' => '<strong>Forum role edited</strong><br />» %s',
+ 'LOG_F_ROLE_REMOVED' => '<strong>Forum role removed</strong><br />» %s',
+ 'LOG_M_ROLE_ADD' => '<strong>Moderator role added</strong><br />» %s',
+ 'LOG_M_ROLE_EDIT' => '<strong>Moderator role edited</strong><br />» %s',
+ 'LOG_M_ROLE_REMOVED' => '<strong>Moderator role removed</strong><br />» %s',
+ 'LOG_U_ROLE_ADD' => '<strong>User role added</strong><br />» %s',
+ 'LOG_U_ROLE_EDIT' => '<strong>User role edited</strong><br />» %s',
+ 'LOG_U_ROLE_REMOVED' => '<strong>User role removed</strong><br />» %s',
+
+ 'LOG_PROFILE_FIELD_ACTIVATE' => '<strong>Profile field activated</strong><br />» %s',
+ 'LOG_PROFILE_FIELD_CREATE' => '<strong>Profile field added</strong><br />» %s',
+ 'LOG_PROFILE_FIELD_DEACTIVATE' => '<strong>Profile field deactivated</strong><br />» %s',
+ 'LOG_PROFILE_FIELD_EDIT' => '<strong>Profile field changed</strong><br />» %s',
+ 'LOG_PROFILE_FIELD_REMOVED' => '<strong>Profile field removed</strong><br />» %s',
+
+ 'LOG_PRUNE' => '<strong>Pruned forums</strong><br />» %s',
+ 'LOG_AUTO_PRUNE' => '<strong>Auto-pruned forums</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',
+
+ 'LOG_REASON_ADDED' => '<strong>Added report/denial reason</strong><br />» %s',
+ 'LOG_REASON_REMOVED' => '<strong>Removed report/denial reason</strong><br />» %s',
+ 'LOG_REASON_UPDATED' => '<strong>Updated report/denial reason</strong><br />» %s',
+
+ 'LOG_RESET_DATE' => '<strong>Board start date reset</strong>',
+ 'LOG_RESET_ONLINE' => '<strong>Most users online reset</strong>',
+ 'LOG_RESYNC_POSTCOUNTS' => '<strong>User post counts resyncronised</strong>',
+ 'LOG_RESYNC_POST_MARKING' => '<strong>Dotted topics resyncronised</strong>',
+ 'LOG_RESYNC_STATS' => '<strong>Post, topic and user statistics resyncronised</strong>',
+
+ 'LOG_STYLE_ADD' => '<strong>Added new style</strong><br />» %s',
+ 'LOG_STYLE_DELETE' => '<strong>Deleted style</strong><br />» %s',
+ 'LOG_STYLE_EDIT_DETAILS' => '<strong>Edited style</strong><br />» %s',
+ 'LOG_STYLE_EXPORT' => '<strong>Exported style</strong><br />» %s',
+
+ 'LOG_TEMPLATE_ADD_DB' => '<strong>Added new template set to database</strong><br />» %s',
+ 'LOG_TEMPLATE_ADD_FS' => '<strong>Add new template set on filesystem</strong><br />» %s',
+ 'LOG_TEMPLATE_CACHE_CLEARED' => '<strong>Deleted cached versions of template files in template set <em>%1$s</em></strong><br />» %2$s',
+ 'LOG_TEMPLATE_DELETE' => '<strong>Deleted template set</strong><br />» %s',
+ 'LOG_TEMPLATE_EDIT' => '<strong>Edited template set <em>%1$s</em></strong><br />» %2$s',
+ 'LOG_TEMPLATE_EDIT_DETAILS' => '<strong>Edited template details</strong><br />» %s',
+ 'LOG_TEMPLATE_EXPORT' => '<strong>Exported template set</strong><br />» %s',
+ 'LOG_TEMPLATE_REFRESHED' => '<strong>Refreshed template set</strong><br />» %s',
+
+ 'LOG_THEME_ADD_DB' => '<strong>Added new theme to database</strong><br />» %s',
+ 'LOG_THEME_ADD_FS' => '<strong>Add new theme on filesystem</strong><br />» %s',
+ 'LOG_THEME_DELETE' => '<strong>Theme deleted</strong><br />» %s',
+ 'LOG_THEME_EDIT_DETAILS' => '<strong>Edited theme details</strong><br />» %s',
+ 'LOG_THEME_EDIT' => '<strong>Edited theme <em>%1$s</em></strong><br />» Modified class <em>%2$s</em>',
+ 'LOG_THEME_EDIT_ADD' => '<strong>Edited theme <em>%1$s</em></strong><br />» Added class <em>%2$s</em>',
+ 'LOG_THEME_EXPORT' => '<strong>Exported theme</strong><br />» %s',
+ 'LOG_THEME_REFRESHED' => '<strong>Refreshed theme</strong><br />» %s',
+
+ 'LOG_USER_ACTIVE' => '<strong>User activated</strong><br />» %s',
+ 'LOG_USER_BAN_USER' => '<strong>Banned User via user management</strong> for reason "<em>%1$s</em>"<br />» %2$s',
+ 'LOG_USER_BAN_IP' => '<strong>Banned IP via user management</strong> for reason "<em>%1$s</em>"<br />» %2$s',
+ 'LOG_USER_BAN_EMAIL' => '<strong>Banned email via user management</strong> for reason "<em>%1$s</em>"<br />» %2$s',
+ 'LOG_USER_DELETED' => '<strong>Deleted user</strong><br />» %s',
+ 'LOG_USER_DEL_ATTACH' => '<strong>Removed all attachments made by the user</strong><br />» %s',
+ 'LOG_USER_DEL_AVATAR' => '<strong>Removed user avatar</strong><br />» %s',
+ 'LOG_USER_DEL_POSTS' => '<strong>Removed all posts made by the user</strong><br />» %s',
+ 'LOG_USER_DEL_SIG' => '<strong>Removed user signature</strong><br />» %s',
+ 'LOG_USER_INACTIVE' => '<strong>User deactivated</strong><br />» %s',
+ 'LOG_USER_MOVE_POSTS' => '<strong>Moved user posts</strong><br />» posts by "%1$s" to forum "%2$s"',
+ 'LOG_USER_NEW_PASSWORD' => '<strong>Changed user password</strong><br />» %s',
+ 'LOG_USER_REACTIVATE' => '<strong>Forced user account re-activation</strong><br />» %s',
+ 'LOG_USER_UPDATE_EMAIL' => '<strong>User "%1$s" changed email</strong><br />» from "%2$s" to "%3$s"',
+ 'LOG_USER_UPDATE_NAME' => '<strong>Changed username</strong><br />» from "%1$s" to "%2$s"',
+ 'LOG_USER_USER_UPDATE' => '<strong>Updated user details</strong><br />» %s',
+
+ 'LOG_USER_ACTIVE_USER' => '<strong>User account activated</strong>',
+ 'LOG_USER_DEL_AVATAR_USER' => '<strong>User avatar removed</strong>',
+ 'LOG_USER_DEL_SIG_USER' => '<strong>User signature removed</strong>',
+ 'LOG_USER_FEEDBACK' => '<strong>Added user feedback</strong><br />» %s',
'LOG_USER_GENERAL' => '%s',
- 'LOG_USER_INACTIVE_USER' => '<b>User account de-activated</b>',
- 'LOG_USER_LOCK' => '<b>User locked own topic</b><br />&#187; %s',
- 'LOG_USER_MOVE_POSTS_USER' => '<b>Moved all posts to forum "%s"</b>',
- 'LOG_USER_REACTIVATE_USER' => '<b>Forced user account re-activation</b>',
- 'LOG_USER_UNLOCK' => '<b>User unlocked own topic</b><br />&#187; %s',
- 'LOG_USER_WARNING' => '<b>Added user warning</b><br />&#187;%s',
- 'LOG_USER_WARNING_BODY' => '<b>The following warning was issued to this user</b><br />&#187;%s',
-
- 'LOG_USER_GROUP_CHANGE' => '<b>User changed default group</b><br />&#187; %s',
- 'LOG_USER_GROUP_DEMOTE' => '<b>User demoted as leaders from usergroup</b><br />&#187; %s',
- 'LOG_USER_GROUP_JOIN' => '<b>User joined group</b><br />&#187; %s',
- 'LOG_USER_GROUP_JOIN_PENDING' => '<b>User joined group and needs to be approved</b><br />&#187; %s',
- 'LOG_USER_GROUP_RESIGN' => '<b>User resigned membership from group</b><br />&#187; %s',
-
- 'LOG_WORD_ADD' => '<b>Added word censor</b><br />&#187; %s',
- 'LOG_WORD_DELETE' => '<b>Deleted word censor</b><br />&#187; %s',
- 'LOG_WORD_EDIT' => '<b>Edited word censor</b><br />&#187; %s',
+ 'LOG_USER_INACTIVE_USER' => '<strong>User account de-activated</strong>',
+ 'LOG_USER_LOCK' => '<strong>User locked own topic</strong><br />» %s',
+ 'LOG_USER_MOVE_POSTS_USER' => '<strong>Moved all posts to forum "%s"</strong>',
+ 'LOG_USER_REACTIVATE_USER' => '<strong>Forced user account re-activation</strong>',
+ 'LOG_USER_UNLOCK' => '<strong>User unlocked own topic</strong><br />» %s',
+ 'LOG_USER_WARNING' => '<strong>Added user warning</strong><br />»%s',
+ 'LOG_USER_WARNING_BODY' => '<strong>The following warning was issued to this user</strong><br />»%s',
+
+ 'LOG_USER_GROUP_CHANGE' => '<strong>User changed default group</strong><br />» %s',
+ 'LOG_USER_GROUP_DEMOTE' => '<strong>User demoted as leaders from usergroup</strong><br />» %s',
+ 'LOG_USER_GROUP_JOIN' => '<strong>User joined group</strong><br />» %s',
+ 'LOG_USER_GROUP_JOIN_PENDING' => '<strong>User joined group and needs to be approved</strong><br />» %s',
+ 'LOG_USER_GROUP_RESIGN' => '<strong>User resigned membership from group</strong><br />» %s',
+
+ 'LOG_WORD_ADD' => '<strong>Added word censor</strong><br />» %s',
+ 'LOG_WORD_DELETE' => '<strong>Deleted word censor</strong><br />» %s',
+ 'LOG_WORD_EDIT' => '<strong>Edited word censor</strong><br />» %s',
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index 16e10978ff..b03348ba46 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -28,33 +28,38 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-// Banning
+// Database Backup/Restore
$lang = array_merge($lang, array(
- 'DATABASE' => 'Database Utilities',
- 'ACP_BACKUP_EXPLAIN' => 'Here you can backup all your phpBB related data. You may store the resulting archive in your store/ folder or download it directly. Depending on your server configuration you be able to compress the file in a number of formats. If you wish to include any additional "custom" tables please list them in the additional tables field, separated by commas. ',
+ 'ACP_BACKUP_EXPLAIN' => 'Here you can backup all your phpBB related data. You may store the resulting archive in your <samp>store/</samp> folder or download it directly. Depending on your server configuration you be able to compress the file in a number of formats.',
+ 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <strong>WARNING</strong> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.',
+
+ 'BACKUP_DELETE' => 'The backup file has been deleted successfully.',
+ 'BACKUP_INVALID' => 'The selected file to backup is invalid.',
'BACKUP_OPTIONS' => 'Backup options',
+ 'BACKUP_SUCCESS' => 'The backup file has been created successfully.',
'BACKUP_TYPE' => 'Backup type',
- 'BACKUP_INVALID' => 'The selected file to backup is invalid',
- 'START_BACKUP' => 'Start Backup',
- 'FULL_BACKUP' => 'Full',
- 'STRUCTURE_ONLY' => 'Structure Only',
+
+ 'DATABASE' => 'Database utilities',
'DATA_ONLY' => 'Data only',
- 'TABLE_SELECT' => 'Table Select',
- 'FILE_TYPE' => 'File Type',
- 'STORE_LOCAL' => 'Store file locally',
- 'SELECT_ALL' => 'Select all',
+ 'DELETE_BACKUP' => 'Delete backup',
'DESELECT_ALL' => 'Deselect all',
- 'BACKUP_SUCCESS' => 'The backup file has been created successfully',
- 'BACKUP_DELETE' => 'The backup file has been deleted successfully',
+ 'DOWNLOAD_BACKUP' => 'Download backup',
+
+ 'FILE_TYPE' => 'File type',
+ 'FULL_BACKUP' => 'Full',
- 'STORE_AND_DOWNLOAD' => 'Store and Download',
- 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.',
- 'SELECT_FILE' => 'Select a file',
'RESTORE_OPTIONS' => 'Restore options',
- 'START_RESTORE' => 'Start Restore',
- 'DELETE_BACKUP' => 'Delete Backup',
- 'DOWNLOAD_BACKUP' => 'Download Backup',
- 'RESTORE_SUCCESS' => 'The Database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.',
+ 'RESTORE_SUCCESS' => 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.',
+
+ 'SELECT_ALL' => 'Select all',
+ 'SELECT_FILE' => 'Select a file',
+ 'START_BACKUP' => 'Start backup',
+ 'START_RESTORE' => 'Start restore',
+ 'STORE_AND_DOWNLOAD' => 'Store and download',
+ 'STORE_LOCAL' => 'Store file locally',
+ 'STRUCTURE_ONLY' => 'Structure only',
+
+ 'TABLE_SELECT' => 'Table select',
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index c72bdbcb68..1bb377fc2f 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -30,8 +32,8 @@ if (empty($lang) || !is_array($lang))
// Bot settings
$lang = array_merge($lang, array(
- 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users, or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed',
- 'ALL_USERS' => 'All Users',
+ 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed',
+ 'ALL_USERS' => 'All users',
'COMPOSE' => 'Compose',
@@ -41,7 +43,7 @@ $lang = array_merge($lang, array(
'LOG_SESSION' => 'Log mail session to critical log',
- 'SEND_IMMEDIATLY' => 'Send immediatly',
+ 'SEND_IMMEDIATLY' => 'Send immediately',
'SEND_TO_GROUP' => 'Send to group',
'SEND_TO_USERS' => 'Send to users',
'SEND_TO_USERS_EXPLAIN' => 'Entering names here will override any group selected above. Enter each username on a new line.',
@@ -49,7 +51,7 @@ $lang = array_merge($lang, array(
'MAIL_HIGH_PRIORITY' => 'High',
'MAIL_LOW_PRIORITY' => 'Low',
'MAIL_NORMAL_PRIORITY' => 'Normal',
- 'MAIL_PRIORITY' => 'Mail Priority',
+ 'MAIL_PRIORITY' => 'Mail priority',
'MASS_MESSAGE' => 'Your message',
'MASS_MESSAGE_EXPLAIN' => 'Please note that you may enter only plain text. All markup will be removed before sending.',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index eec59c446b..21ddc34558 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -30,11 +32,11 @@ if (empty($lang) || !is_array($lang))
// Forum Admin
$lang = array_merge($lang, array(
- 'AUTO_PRUNE_DAYS' => 'Auto-prune Post Age',
+ 'AUTO_PRUNE_DAYS' => 'Auto-prune post age',
'AUTO_PRUNE_DAYS_EXPLAIN' => 'Number of days since last post after which topic is removed.',
- 'AUTO_PRUNE_FREQ' => 'Auto-prune Frequency',
+ 'AUTO_PRUNE_FREQ' => 'Auto-prune frequency',
'AUTO_PRUNE_FREQ_EXPLAIN' => 'Time in days between pruning events.',
- 'AUTO_PRUNE_VIEWED' => 'Auto-prune Post Viewed Age',
+ 'AUTO_PRUNE_VIEWED' => 'Auto-prune post viewed age',
'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.',
'COPY_PERMISSIONS' => 'Copy permissions from',
@@ -58,50 +60,50 @@ $lang = array_merge($lang, array(
'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',
- 'FORUM_ADMIN' => 'Forum Administration',
+ '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.',
- 'FORUM_AUTO_PRUNE' => 'Enable Auto-Pruning',
+ 'FORUM_AUTO_PRUNE' => 'Enable auto-pruning',
'FORUM_AUTO_PRUNE_EXPLAIN' => 'Prunes the forum of topics, set the frequency/age parameters below.',
'FORUM_CREATED' => 'Forum created successfully.',
'FORUM_DATA_NEGATIVE' => 'Pruning parameters cannot be negative.',
- 'FORUM_DELETE' => 'Delete Forum',
+ 'FORUM_DELETE' => 'Delete forum',
'FORUM_DELETE_EXPLAIN' => 'The form below will allow you to delete a forum and decide where you want to put all topics (or forums) it contained.',
- 'FORUM_DELETED' => 'Forum successfully deleted',
+ 'FORUM_DELETED' => 'Forum successfully deleted.',
'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_EXPLAIN' => 'Location, relative to the phpBB root directory, of an image to associate with this forum.',
- 'FORUM_LINK_EXPLAIN' => 'Full URL (including the protocol, for example http://) to location clicking this forum will take the user.',
- 'FORUM_LINK_TRACK' => 'Track Link Redirects',
+ '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',
'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.',
- 'FORUM_NAME' => 'Forum Name',
+ 'FORUM_NAME' => 'Forum name',
'FORUM_NAME_EMPTY' => 'You must enter a name for this forum.',
- 'FORUM_PARENT' => 'Parent Forum',
- 'FORUM_PASSWORD' => 'Forum Password',
- 'FORUM_PASSWORD_CONFIRM' => 'Confirm Forum Password',
+ 'FORUM_PARENT' => 'Parent forum',
+ 'FORUM_PASSWORD' => 'Forum password',
+ 'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password',
'FORUM_PASSWORD_CONFIRM_EXPLAIN' => 'Only needs to be set if a forum password is entered.',
'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.',
'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.',
'FORUM_PRUNE_SETTINGS' => 'Forum prune settings',
'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',
- 'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the Forum Rules text you specified.',
- 'FORUM_RULES_PREVIEW' => 'Forum Rules preview',
- 'FORUM_SETTINGS' => 'Forum Settings',
- 'FORUM_STATUS' => 'Forum Status',
- 'FORUM_STYLE' => 'Forum Style',
- 'FORUM_TOPICS_PAGE' => 'Topics Per Page',
+ 'FORUM_RULES_EXPLAIN' => 'Forum rules are displayed at any page within the given forum.',
+ 'FORUM_RULES_LINK' => 'Link to forum rules',
+ 'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.',
+ 'FORUM_RULES_PREVIEW' => 'Forum rules preview',
+ 'FORUM_SETTINGS' => 'Forum settings',
+ 'FORUM_STATUS' => 'Forum status',
+ 'FORUM_STYLE' => 'Forum style',
+ 'FORUM_TOPICS_PAGE' => 'Topics per page',
'FORUM_TOPICS_PAGE_EXPLAIN' => 'If non-zero this value will override the default topics per page setting.',
- 'FORUM_TYPE' => 'Forum Type',
+ 'FORUM_TYPE' => 'Forum type',
'FORUM_UPDATED' => 'Forum informations updated successfully.',
- 'GENERAL_FORUM_SETTINGS' => 'General Forum Settings',
+ 'GENERAL_FORUM_SETTINGS' => 'General forum settings',
'LINK' => 'Link',
- 'LIST_INDEX' => 'List Forum On Index',
- 'LIST_INDEX_EXPLAIN' => 'Displays a link to this forum under the root parent forum on the index.',
+ 'LIST_INDEX' => 'List forum in subforum listings',
+ 'LIST_INDEX_EXPLAIN' => 'Displays a link to this forum under the parent forums subforum listing if one exist.',
'LOCKED' => 'Locked',
'MOVE_POSTS_TO' => 'Move posts',
@@ -109,19 +111,22 @@ $lang = array_merge($lang, array(
'NO_DESTINATION_FORUM' => 'You have not specified a forum to move content to',
'NO_FORUM_ACTION' => 'No action defined for what happens with the forum content',
- 'NO_PARENT' => 'No Parent',
+ 'NO_PARENT' => 'No parent',
'NO_PERMISSIONS' => 'Do not copy permissions',
- 'NO_PERMISSION_FORUM_ADD' => 'You do not have the neccessary permissions to add forums',
- 'NO_PERMISSION_FORUM_DELETE' => 'You do not have the neccessary permissions to delete forums',
+ 'NO_PERMISSION_FORUM_ADD' => 'You do not have the necessary permissions to add forums.',
+ 'NO_PERMISSION_FORUM_DELETE' => 'You do not have the necessary permissions to delete forums.',
- 'PARENT_NOT_EXIST' => 'Parent does not exist',
- 'PRUNE_ANNOUNCEMENTS' => 'Prune Announcements',
- 'PRUNE_STICKY' => 'Prune Stickies',
- 'PRUNE_OLD_POLLS' => 'Prune Old Polls',
+ 'PARENT_NOT_EXIST' => 'Parent does not exist.',
+ 'PRUNE_ANNOUNCEMENTS' => 'Prune announcements',
+ 'PRUNE_STICKY' => 'Prune stickies',
+ 'PRUNE_OLD_POLLS' => 'Prune old polls',
'PRUNE_OLD_POLLS_EXPLAIN' => 'Removes topics with polls not voted in for post age days.',
'REDIRECT_ACL' => 'Now you are able to %sset permissions%s for this forum.',
+ 'SYNC_IN_PROGRESS' => 'Synchronizing forum',
+ 'SYNC_IN_PROGRESS_EXPLAIN' => 'Currently resyncing topic range %1$d/%2$d.',
+
'TYPE_CAT' => 'Category',
'TYPE_FORUM' => 'Forum',
'TYPE_LINK' => 'Link',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 03c02b97fc..582dbb3465 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -29,8 +31,8 @@ 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(
- 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administer all your usergroups, you can delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description.',
- 'ADD_USERS' => 'Add Users',
+ 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administrate all your usergroups, you can delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description.',
+ 'ADD_USERS' => 'Add users',
'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a seperate line.',
'COPY_PERMISSIONS' => 'Copy permissions from',
@@ -40,17 +42,17 @@ $lang = array_merge($lang, array(
'GROUPS_NO_MEMBERS' => 'This group has no members',
'GROUPS_NO_MODS' => 'No group leaders defined',
'GROUP_APPROVE' => 'Approve',
- 'GROUP_APPROVED' => 'Approved Members',
+ 'GROUP_APPROVED' => 'Approved members',
'GROUP_AVATAR' => 'Group avatar',
'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel.',
'GROUP_CLOSED' => 'Closed',
'GROUP_COLOR' => 'Group colour',
'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank for user default.',
- 'GROUP_CREATED' => 'Group has been created successfully',
+ 'GROUP_CREATED' => 'Group has been created successfully.',
'GROUP_DEFAULT' => 'Default',
- 'GROUP_DEFS_UPDATED' => 'Default group set for all selected members',
+ 'GROUP_DEFS_UPDATED' => 'Default group set for all selected members.',
'GROUP_DELETE' => 'Delete',
- 'GROUP_DELETED' => 'Group deleted and user default groups set successfully',
+ 'GROUP_DELETED' => 'Group deleted and user default groups set successfully.',
'GROUP_DEMOTE' => 'Demote',
'GROUP_DESC' => 'Group description',
'GROUP_DETAILS' => 'Group details',
@@ -69,11 +71,11 @@ $lang = array_merge($lang, array(
'GROUP_MESSAGE_LIMIT' => 'Group private message limit per folder',
'GROUP_MESSAGE_LIMIT_EXPLAIN' => 'This setting overrides the per-user folder message limit. A value of 0 means the user default limit will be used.',
'GROUP_MODS_ADDED' => 'New group moderators added successfully.',
- 'GROUP_MODS_DEMOTED' => 'Group leaders demoted successfully',
- 'GROUP_MODS_PROMOTED' => 'Group members promoted successfully',
+ 'GROUP_MODS_DEMOTED' => 'Group leaders demoted successfully.',
+ 'GROUP_MODS_PROMOTED' => 'Group members promoted successfully.',
'GROUP_NAME' => 'Group name',
'GROUP_OPEN' => 'Open',
- 'GROUP_PENDING' => 'Pending Members',
+ 'GROUP_PENDING' => 'Pending members',
'GROUP_PROMOTE' => 'Promote',
'GROUP_RANK' => 'Group rank',
'GROUP_RECEIVE_PM' => 'Group able to receive private messages',
@@ -87,23 +89,24 @@ $lang = array_merge($lang, array(
'GROUP_UPDATED' => 'Group preferences updated successfully.',
'GROUP_USERS_ADDED' => 'New users added to group successfully.',
'GROUP_USERS_EXIST' => 'The selected users are already members.',
- 'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully',
+ 'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully.',
'MAKE_DEFAULT_FOR_ALL' => 'Make default group for every member',
'MEMBERS' => 'Members',
- 'NO_GROUP' => 'No group specified',
+ 'NO_GROUP' => 'No group specified.',
'NO_PERMISSIONS' => 'Do not copy permissions',
+ 'NO_USERS' => 'You haven’t entered any users.',
'SPECIAL_GROUPS' => 'Predefined groups',
- 'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings. By clicking "Default" you can set the relevant group to the default for all its members.',
+ 'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings. By clicking “Default” you can set the relevant group to the default for all its members.',
'TOTAL_MEMBERS' => 'Members',
'USERS_APPROVED' => 'Users approved successfully.',
'USER_DEFAULT' => 'User default',
'USER_DEF_GROUPS' => 'User defined groups',
- 'USER_DEF_GROUPS_EXPLAIN' => 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group. By clicking "Default" you can set the relevant group to the default for all its members.',
+ 'USER_DEF_GROUPS_EXPLAIN' => 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group. By clicking “Default” you can set the relevant group to the default for all its members.',
'USER_GROUP_DEFAULT' => 'Set as default group',
'USER_GROUP_DEFAULT_EXPLAIN' => 'Saying yes here will set this group as the default group for the added users',
'USER_GROUP_LEADER' => 'Set as group leader',
diff --git a/phpBB/language/en/acp/index.htm b/phpBB/language/en/acp/index.htm
new file mode 100644
index 0000000000..ee1f723a7d
--- /dev/null
+++ b/phpBB/language/en/acp/index.htm
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 9aa8c06b9a..acfc45e916 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -29,29 +31,29 @@ 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(
- 'ACP_FILES' => 'Admin Language Files',
+ 'ACP_FILES' => 'Admin language files',
'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs',
- 'EMAIL_FILES' => 'Email Templates',
+ 'EMAIL_FILES' => 'Email templates',
- 'FILE_CONTENTS' => 'File Contents',
+ 'FILE_CONTENTS' => 'File contents',
'FILE_FROM_STORAGE' => 'File from storage folder',
- 'HELP_FILES' => 'Help Files',
+ 'HELP_FILES' => 'Help files',
'INSTALLED_LANGUAGE_PACKS' => 'Installed language packs',
'INVALID_LANGUAGE_PACK' => 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.',
'INVALID_UPLOAD_METHOD' => 'The selected upload method is not valid, please choose a different method.',
- 'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated',
+ 'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated.',
'LANGUAGE_ENTRIES' => 'Language Entries',
- 'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.<br /><b>Note:</b> 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',
+ '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',
'LANGUAGE_PACK_ALREADY_INSTALLED' => 'This language pack is already installed.',
- 'LANGUAGE_PACK_DELETED' => 'The language pack <b>%s</b> has been removed successfully. All users using this language have been resetted to the boards default language.',
- 'LANGUAGE_PACK_DETAILS' => 'Language Pack Details',
- 'LANGUAGE_PACK_INSTALLED' => 'The language pack <b>%s</b> has been successfully installed.',
+ 'LANGUAGE_PACK_DELETED' => 'The language pack <strong>%s</strong> has been removed successfully. All users using this language have been resetted to the boards default language.',
+ 'LANGUAGE_PACK_DETAILS' => 'Language pack details',
+ 'LANGUAGE_PACK_INSTALLED' => 'The language pack <strong>%s</strong> has been successfully installed.',
'LANGUAGE_PACK_ISO' => 'ISO',
'LANGUAGE_PACK_LOCALNAME' => 'Local name',
'LANGUAGE_PACK_NAME' => 'Name',
@@ -63,30 +65,32 @@ $lang = array_merge($lang, array(
'LANG_ISO_CODE' => 'ISO Code',
'LANG_LOCAL_NAME' => 'Local name',
- 'MISSING_LANGUAGE_FILE' => 'Missing Language File: <span style="color:red">%s</span>',
- 'MISSING_LANG_VARIABLES' => 'Missing Language Variables',
- 'MODS_FILES' => 'Mods Language Files',
+ 'MISSING_LANGUAGE_FILE' => 'Missing Language File: <strong style="color:red">%s</strong>',
+ 'MISSING_LANG_VARIABLES' => 'Missing language variables',
+ 'MODS_FILES' => 'MODs language files',
- 'NO_LANG_ID' => 'You haven\'t specified a language pack',
+ 'NO_FILE_SELECTED' => 'You haven’t specified a language file.',
+ 'NO_LANG_ID' => 'You haven’t specified a language pack.',
'NO_REMOVE_DEFAULT_LANG' => 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your boards default language first.',
'NO_UNINSTALLED_LANGUAGE_PACKS' => 'No uninstalled language packs',
'REMOVE_FROM_STORAGE_FOLDER' => 'Remove from storage folder',
'SELECT_DOWNLOAD_FORMAT' => 'Select download format',
- 'SUBMIT_AND_DOWNLOAD' => 'Submit and Download File',
- 'SUBMIT_AND_UPLOAD' => 'Submit and Upload File',
+ 'SUBMIT_AND_DOWNLOAD' => 'Submit and download file',
+ 'SUBMIT_AND_UPLOAD' => 'Submit and upload file',
'THOSE_MISSING_LANG_FILES' => 'The following language files are missing from the %s language folder',
- 'THOSE_MISSING_LANG_VARIABLES' => 'The following language variables are missing from the <b>%s</b> language pack',
+ 'THOSE_MISSING_LANG_VARIABLES' => 'The following language variables are missing from the <strong>%s</strong> language pack',
'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs',
- 'UPLOAD_COMPLETED' => 'The upload has completed',
+ 'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.',
+ 'UPLOAD_COMPLETED' => 'The upload was completed successfully.',
'UPLOAD_METHOD' => 'Upload method',
'UPLOAD_SETTINGS' => 'Upload settings',
- 'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid',
+ 'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid.',
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
index b5055570c1..5a0d98c63b 100644
--- a/phpBB/language/en/acp/modules.php
+++ b/phpBB/language/en/acp/modules.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -29,16 +31,16 @@ 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(
- 'ACP_MODULE_MANAGEMENT_EXPLAIN' => 'Here you are able to manage all kind of modules. Please note that if you place the same module under different categories, the category selected will be the first one found within the tree.',
+ 'ACP_MODULE_MANAGEMENT_EXPLAIN' => 'Here you are able to manage all kind of modules. Please note that the ACP has a three-level menu structure (Category -> Category -> Module) whereby the others having a two-level menu structure (Category -> Module) which must be kept. Please also be aware that you may lock out yourself if you disable or delete the modules responsible for the module management itself.',
'ADD_MODULE' => 'Add module',
'ADD_MODULE_CONFIRM' => 'Are you sure you want to add the selected module with the selected mode?',
- 'ADD_MODULE_TITLE' => 'Add Module',
+ 'ADD_MODULE_TITLE' => 'Add module',
'CANNOT_REMOVE_MODULE' => 'Unable to remove module, it has assigned childs. Please remove or move all childs before performing this action',
'CATEGORY' => 'Category',
- 'CHOOSE_MODE' => 'Choose Module Mode',
+ 'CHOOSE_MODE' => 'Choose module mode',
'CHOOSE_MODE_EXPLAIN' => 'Choose the modules mode being used.',
- 'CHOOSE_MODULE' => 'Choose Module',
+ 'CHOOSE_MODULE' => 'Choose module',
'CHOOSE_MODULE_EXPLAIN' => 'Choose the file being called by this module.',
'CREATE_MODULE' => 'Create new module',
@@ -49,27 +51,27 @@ $lang = array_merge($lang, array(
'EDIT_MODULE' => 'Edit module',
'EDIT_MODULE_EXPLAIN' => 'Here you are able to enter module specific settings',
- 'HIDDEN_MODULE' => 'Hidden Module',
+ 'HIDDEN_MODULE' => 'Hidden module',
'MODULE' => 'Module',
- 'MODULE_ADDED' => 'Module successfully added',
- 'MODULE_DELETED' => 'Module successfully removed',
+ 'MODULE_ADDED' => 'Module successfully added.',
+ 'MODULE_DELETED' => 'Module successfully removed.',
'MODULE_DISPLAYED' => 'Module displayed',
'MODULE_DISPLAYED_EXPLAIN' => 'If you do not wish to display this module, but want to use it, set this to no.',
- 'MODULE_EDITED' => 'Module successfully edited',
+ 'MODULE_EDITED' => 'Module successfully edited.',
'MODULE_ENABLED' => 'Module enabled',
- 'MODULE_LANGNAME' => 'Module Language Name',
+ 'MODULE_LANGNAME' => 'Module language name',
'MODULE_LANGNAME_EXPLAIN' => 'Enter the displayed module name. Use language constant if name is served from language file.',
'MODULE_TYPE' => 'Module type',
'NO_CATEGORY_TO_MODULE' => 'Unable to turn category into module. Please remove/move all childs before performing this action.',
- 'NO_MODULE' => 'No module found',
- 'NO_MODULE_ID' => 'No module id specified',
- 'NO_MODULE_LANGNAME' => 'No module language name specified',
+ 'NO_MODULE' => 'No module found.',
+ 'NO_MODULE_ID' => 'No module id specified.',
+ 'NO_MODULE_LANGNAME' => 'No module language name specified.',
'NO_PARENT' => 'No Parent',
'PARENT' => 'Parent',
- 'PARENT_NO_EXIST' => 'Parent does not exist',
+ 'PARENT_NO_EXIST' => 'Parent does not exist.',
'SELECT_MODULE' => 'Select a module',
));
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 1b0513b2f3..b66389907c 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -50,23 +52,23 @@ $lang = array_merge($lang, array(
',
'ACL_NEVER' => 'Never',
- 'ACL_SET' => 'Setting Permissions',
- 'ACL_SET_EXPLAIN' => 'Permissions are based on a simple YES/NO system. Setting an option to NEVER for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select NO. If values are assigned for this option elsewhere they will be used in preference, else NEVER is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.',
+ 'ACL_SET' => 'Setting permissions',
+ 'ACL_SET_EXPLAIN' => 'Permissions are based on a simple <samp>YES</samp>/<samp>NO</samp> system. Setting an option to <samp>NEVER</samp> for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select <samp>NO</samp>. If values are assigned for this option elsewhere they will be used in preference, else <samp>NEVER</samp> is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.',
'ACL_SETTING' => 'Setting',
- 'ACL_TYPE_A_' => 'Administrative Permissions',
- 'ACL_TYPE_F_' => 'Forum Permissions',
- 'ACL_TYPE_M_' => 'Moderative Permissions',
- 'ACL_TYPE_U_' => 'User Permissions',
+ 'ACL_TYPE_A_' => 'Administrative permissions',
+ 'ACL_TYPE_F_' => 'Forum permissions',
+ 'ACL_TYPE_M_' => 'Moderative permissions',
+ 'ACL_TYPE_U_' => 'User permissions',
- 'ACL_TYPE_GLOBAL_A_' => 'Administrative Permissions',
- 'ACL_TYPE_GLOBAL_U_' => 'User Permissions',
- 'ACL_TYPE_GLOBAL_M_' => 'Global Moderator Permissions',
- 'ACL_TYPE_LOCAL_M_' => 'Forum Moderator Permissions',
- 'ACL_TYPE_LOCAL_F_' => 'Forum Permissions',
+ 'ACL_TYPE_GLOBAL_A_' => 'Administrative permissions',
+ 'ACL_TYPE_GLOBAL_U_' => 'User permissions',
+ 'ACL_TYPE_GLOBAL_M_' => 'Global Moderator permissions',
+ 'ACL_TYPE_LOCAL_M_' => 'Forum Moderator permissions',
+ 'ACL_TYPE_LOCAL_F_' => 'Forum permissions',
'ACL_NO' => 'No',
- 'ACL_VIEW' => 'Viewing Permissions',
+ 'ACL_VIEW' => 'Viewing permissions',
'ACL_VIEW_EXPLAIN' => 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.',
'ACL_YES' => 'Yes',
@@ -76,10 +78,10 @@ $lang = array_merge($lang, array(
'ACP_GLOBAL_MODERATORS_EXPLAIN' => 'Here you can assign global moderator rights to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to groups.',
'ACP_GROUPS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to groups - user permissions, global moderator permissions and admin permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. Individual users permissions should only be changed in rare occassions, the preferred method is putting users in groups and assigning the groups permissions.',
- 'ACP_ADMIN_ROLES_EXPLAIN' => 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it\'s permissions too.',
- 'ACP_FORUM_ROLES_EXPLAIN' => 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it\'s permissions too.',
- 'ACP_MOD_ROLES_EXPLAIN' => 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it\'s permissions too.',
- 'ACP_USER_ROLES_EXPLAIN' => 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it\'s permissions too.',
+ 'ACP_ADMIN_ROLES_EXPLAIN' => 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
+ 'ACP_FORUM_ROLES_EXPLAIN' => 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
+ 'ACP_MOD_ROLES_EXPLAIN' => 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
+ 'ACP_USER_ROLES_EXPLAIN' => 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to users.',
'ACP_USERS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to users - user permissions, global moderator permissions and admin permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. To alter these settings for large numbers of users the Group permissions system is the prefered method. Users permissions should only be changed in rare occassions, the preferred method is putting users in groups and assigning the groups permissions.',
'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN' => 'Here you can view the effective administrative permissions assigned to the selected users/groups',
@@ -88,128 +90,129 @@ $lang = array_merge($lang, array(
'ACP_VIEW_FORUM_MOD_PERMISSIONS_EXPLAIN' => 'Here you can view the forum moderator permissions assigned to the selected users/groups and forums',
'ACP_VIEW_USER_PERMISSIONS_EXPLAIN' => 'Here you can view the effective user permissions assigned to the selected users/groups',
- 'ADD_GROUPS' => 'Add Groups',
- 'ADD_PERMISSIONS' => 'Add Permissions',
- 'ADD_USERS' => 'Add Users',
+ 'ADD_GROUPS' => 'Add groups',
+ 'ADD_PERMISSIONS' => 'Add permissions',
+ 'ADD_USERS' => 'Add users',
'ALL_GROUPS' => 'Select all groups',
- 'ALL_NEVER' => 'All Never',
- 'ALL_NO' => 'All No',
+ 'ALL_NEVER' => 'All <samp>NEVER</samp>',
+ 'ALL_NO' => 'All <samp>NO</samp>',
'ALL_USERS' => 'Select all users',
- 'ALL_YES' => 'All Yes',
- 'APPLY_ALL_PERMISSIONS' => 'Apply all Permissions',
- 'APPLY_PERMISSIONS' => 'Apply Permissions',
- 'APPLY_PERMISSIONS_EXPLAIN' => 'The Permissions and Role defined for this item will only be applied to this item and all checked items.',
- 'AUTH_UPDATED' => 'Permissions have been updated',
+ 'ALL_YES' => 'All <samp>YES</samp>',
+ 'APPLY_ALL_PERMISSIONS' => 'Apply all permissions',
+ 'APPLY_PERMISSIONS' => 'Apply permissions',
+ 'APPLY_PERMISSIONS_EXPLAIN' => 'The permissions and role defined for this item will only be applied to this item and all checked items.',
+ 'AUTH_UPDATED' => 'Permissions have been updated.',
- 'CREATE_ROLE' => 'Create Role',
- 'CREATE_ROLE_FROM' => 'Use settings from...',
- 'CUSTOM' => 'Custom...',
+ 'CREATE_ROLE' => 'Create role',
+ 'CREATE_ROLE_FROM' => 'Use settings from…',
+ 'CUSTOM' => 'Custom…',
'DEFAULT' => 'Default',
'DELETE_ROLE' => 'Delete role',
'DELETE_ROLE_CONFIRM' => 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> loosing their permission settings.',
- 'DISPLAY_ROLE_ITEMS' => 'View Items using this role',
+ 'DISPLAY_ROLE_ITEMS' => 'View items using this role',
- 'EDIT_PERMISSIONS' => 'Edit Permissions',
- 'EDIT_ROLE' => 'Edit Role',
+ 'EDIT_PERMISSIONS' => 'Edit permissions',
+ 'EDIT_ROLE' => 'Edit role',
'GROUPS_NOT_ASSIGNED' => 'No group assigned to this role',
'LOOK_UP_FORUMS_EXPLAIN' => 'You are able to select more than one forum',
- 'LOOK_UP_GROUP' => 'Look up Usergroup',
- 'LOOK_UP_USER' => 'Look up User',
+ 'LOOK_UP_GROUP' => 'Look up usergroup',
+ 'LOOK_UP_USER' => 'Look up user',
- 'MANAGE_GROUPS' => 'Manage Groups',
- 'MANAGE_USERS' => 'Manage Users',
+ 'MANAGE_GROUPS' => 'Manage groups',
+ 'MANAGE_USERS' => 'Manage users',
'NO_AUTH_SETTING_FOUND' => 'Permission settings not defined.',
- 'NO_ROLE_ASSIGNED' => 'No role assigned...',
- 'NO_ROLE_ASSIGNED_EXPLAIN' => 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the "All No" link.',
+ 'NO_ROLE_ASSIGNED' => 'No role assigned…',
+ 'NO_ROLE_ASSIGNED_EXPLAIN' => 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the “All <samp>NO</samp>” link.',
'NO_ROLE_AVAILABLE' => 'No role available',
'NO_ROLE_NAME_SPECIFIED' => 'Please give the role a name.',
'NO_ROLE_SELECTED' => 'Role could not be found.',
- 'NO_USER_GROUP_SELECTED' => 'You haven\'t selected any user or group.',
+ 'NO_USER_GROUP_SELECTED' => 'You haven’t selected any user or group.',
'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',
'PLUS_SUBFORUMS' => '+Subforums',
- 'REMOVE_PERMISSIONS' => 'Remove Permissions',
- 'REMOVE_ROLE' => 'Remove Role',
+ 'REMOVE_PERMISSIONS' => 'Remove permissions',
+ 'REMOVE_ROLE' => 'Remove role',
'ROLE' => 'Role',
'ROLE_ADD_SUCCESS' => 'Role successfully added.',
'ROLE_ASSIGNED_TO' => 'Users/Groups assigned to %s',
'ROLE_DELETED' => 'Role successfully removed.',
- 'ROLE_DESCRIPTION' => 'Role Description',
-
- 'ROLE_DESCRIPTION_ADMIN_FORUM' => 'Can access the forum management and forum permission settings.',
- 'ROLE_DESCRIPTION_ADMIN_FULL' => 'Has access to all admin functions of this forum.<br />Not recommended.',
- 'ROLE_DESCRIPTION_ADMIN_STANDARD' => 'Has access to most admin features but is not allowed to use server or system related tools.',
- 'ROLE_DESCRIPTION_ADMIN_USERGROUP' => 'Can manage groups and users: Can change permissions, settings, manage bans, and manage ranks.',
- 'ROLE_DESCRIPTION_FORUM_BOT' => 'This role is recommended for bots and search spiders.',
- 'ROLE_DESCRIPTION_FORUM_FULL' => 'Can use all forum features, including posting of announcements and stickies. Can also ignore the flood limit.<br />Not recommended for normal users.',
- 'ROLE_DESCRIPTION_FORUM_LIMITED' => 'Can use some forum features, but cannot attach files or use post icons.',
- 'ROLE_DESCRIPTION_FORUM_NOACCESS' => 'Can neither see nor access the forum.',
- 'ROLE_DESCRIPTION_FORUM_ONQUEUE' => 'Can use most forum features including attachments, but posts and topics need to be approved by a moderator.',
- 'ROLE_DESCRIPTION_FORUM_POLLS' => 'Like Standard Access but can also create polls.',
- 'ROLE_DESCRIPTION_FORUM_READONLY' => 'Can read the forum, but cannot create new topics or reply to posts.',
- 'ROLE_DESCRIPTION_FORUM_STANDARD' => 'Can use most forum features including attachments, but cannot lock or delete own topics, and cannot create polls.',
- 'ROLE_DESCRIPTION_MOD_FULL' => 'Can use all moderating features, including banning.',
- 'ROLE_DESCRIPTION_MOD_QUEUE' => 'Can use the Moderation Queue to validate and edit posts, but nothing else.',
- 'ROLE_DESCRIPTION_MOD_SIMPLE' => 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',
- 'ROLE_DESCRIPTION_MOD_STANDARD' => 'Can use most moderating tools, but cannot ban users or change the post author.',
- 'ROLE_DESCRIPTION_USER_FULL' => 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br />Not recommended.',
- 'ROLE_DESCRIPTION_USER_LIMITED' => 'Can access some of the user features. Attachments, e-mails, or instant messages are not allowed.',
- 'ROLE_DESCRIPTION_USER_NOAVATAR' => 'Has a limited feature set and is not allowed to use the Avatar feature.',
- 'ROLE_DESCRIPTION_USER_NOPM' => 'Has a limited feature set, and is not allowed to use Private Messages.',
- 'ROLE_DESCRIPTION_USER_STANDARD' => 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.',
+ 'ROLE_DESCRIPTION' => 'Role description',
+
+ 'ROLE_DESCRIPTION_ADMIN_FORUM' => 'Can access the forum management and forum permission settings.',
+ 'ROLE_DESCRIPTION_ADMIN_FULL' => 'Has access to all admin functions of this forum.<br />Not recommended.',
+ 'ROLE_DESCRIPTION_ADMIN_STANDARD' => 'Has access to most admin features but is not allowed to use server or system related tools.',
+ 'ROLE_DESCRIPTION_ADMIN_USERGROUP' => 'Can manage groups and users: Able to change permissions, settings, manage bans, and manage ranks.',
+ 'ROLE_DESCRIPTION_FORUM_BOT' => 'This role is recommended for bots and search spiders.',
+ 'ROLE_DESCRIPTION_FORUM_FULL' => 'Can use all forum features, including posting of announcements and stickies. Can also ignore the flood limit.<br />Not recommended for normal users.',
+ 'ROLE_DESCRIPTION_FORUM_LIMITED' => 'Can use some forum features, but cannot attach files or use post icons.',
+ 'ROLE_DESCRIPTION_FORUM_LIMITED_POLLS' => 'As per Limited Access but can also create polls.',
+ 'ROLE_DESCRIPTION_FORUM_NOACCESS' => 'Can neither see nor access the forum.',
+ 'ROLE_DESCRIPTION_FORUM_ONQUEUE' => 'Can use most forum features including attachments, but posts and topics need to be approved by a moderator.',
+ 'ROLE_DESCRIPTION_FORUM_POLLS' => 'Like Standard Access but can also create polls.',
+ 'ROLE_DESCRIPTION_FORUM_READONLY' => 'Can read the forum, but cannot create new topics or reply to posts.',
+ 'ROLE_DESCRIPTION_FORUM_STANDARD' => 'Can use most forum features including attachments, but cannot lock or delete own topics, and cannot create polls.',
+ 'ROLE_DESCRIPTION_MOD_FULL' => 'Can use all moderating features, including banning.',
+ 'ROLE_DESCRIPTION_MOD_QUEUE' => 'Can use the Moderation Queue to validate and edit posts, but nothing else.',
+ 'ROLE_DESCRIPTION_MOD_SIMPLE' => 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',
+ 'ROLE_DESCRIPTION_MOD_STANDARD' => 'Can use most moderating tools, but cannot ban users or change the post author.',
+ 'ROLE_DESCRIPTION_USER_FULL' => 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br />Not recommended.',
+ 'ROLE_DESCRIPTION_USER_LIMITED' => 'Can access some of the user features. Attachments, e-mails, or instant messages are not allowed.',
+ 'ROLE_DESCRIPTION_USER_NOAVATAR' => 'Has a limited feature set and is not allowed to use the Avatar feature.',
+ 'ROLE_DESCRIPTION_USER_NOPM' => 'Has a limited feature set, and is not allowed to use Private Messages.',
+ 'ROLE_DESCRIPTION_USER_STANDARD' => 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.',
'ROLE_DESCRIPTION_EXPLAIN' => 'You are able to enter a short explanation of what the role is doing or for what it is meant for. The text you enter here will be displayed within the permissions screens too.',
- 'ROLE_DETAILS' => 'Role Details',
+ 'ROLE_DETAILS' => 'Role details',
'ROLE_EDIT_SUCCESS' => 'Role successfully edited.',
- 'ROLE_NAME' => 'Role Name',
+ 'ROLE_NAME' => 'Role name',
'ROLE_NAME_ALREADY_EXIST' => 'A role named <strong>%s</strong> already exist for the specified permission type.',
'ROLE_NOT_ASSIGNED' => 'Role has not been assigned yet.',
- 'SELECTED_FORUM_NOT_EXIST' => 'The selected forum(s) do not exist',
- 'SELECTED_GROUP_NOT_EXIST' => 'The selected group(s) do not exist',
- 'SELECTED_USER_NOT_EXIST' => 'The selected user(s) do not exist',
+ 'SELECTED_FORUM_NOT_EXIST' => 'The selected forum(s) do not exist.',
+ 'SELECTED_GROUP_NOT_EXIST' => 'The selected group(s) do not exist.',
+ 'SELECTED_USER_NOT_EXIST' => 'The selected user(s) do not exist.',
'SELECT_FORUM_SUBFORUM_EXPLAIN' => 'The forum you select here will include all subforums into the selection',
- 'SELECT_ROLE' => 'Select role...',
+ 'SELECT_ROLE' => 'Select role…',
'SELECT_TYPE' => 'Select type',
'SET_PERMISSIONS' => 'Set permissions',
'SET_ROLE_PERMISSIONS' => 'Set role permissions',
'SET_USERS_PERMISSIONS' => 'Set users permissions',
'SET_USERS_FORUM_PERMISSIONS' => 'Set users forum permissions',
- 'TRACE_DEFAULT' => 'By default every permission is NO (unset). So the permission can be overwritten by other settings.',
+ 'TRACE_DEFAULT' => 'By default every permission is <samp>NO</samp> (unset). So the permission can be overwritten by other settings.',
'TRACE_FOR' => 'Trace for',
'TRACE_GLOBAL_SETTING' => '%s (global)',
- 'TRACE_GROUP_NEVER_TOTAL_NEVER' => 'This group\'s permission is set to NEVER like the total result so the old result is kept.',
- 'TRACE_GROUP_NEVER_TOTAL_NO' => 'This group\'s permission is set to NEVER which becomes the new total value because it wasn\'t set yet (set to NO).',
- 'TRACE_GROUP_NEVER_TOTAL_YES' => 'This group\'s permission is set to NEVER which overwrites the total YES to a NEVER for this user.',
- 'TRACE_GROUP_NO' => 'The permission is NO for this group so the old total value is kept.',
- 'TRACE_GROUP_YES_TOTAL_NEVER' => 'This group\'s permission is set to YES but the total NEVER cannot be overwritten.',
- 'TRACE_GROUP_YES_TOTAL_NO' => 'This group\'s permission is set to YES which becomes the new total value because it wasn\'t set yet (set to NO).',
- 'TRACE_GROUP_YES_TOTAL_YES' => 'This group\'s permission is set to YES and the total permission is already set to YES, so the total result is kept.',
+ 'TRACE_GROUP_NEVER_TOTAL_NEVER' => 'This group’s permission is set to <samp>NEVER</samp> like the total result so the old result is kept.',
+ 'TRACE_GROUP_NEVER_TOTAL_NO' => 'This group’s permission is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
+ 'TRACE_GROUP_NEVER_TOTAL_YES' => 'This group’s permission is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
+ 'TRACE_GROUP_NO' => 'The permission is <samp>NO</samp> for this group so the old total value is kept.',
+ 'TRACE_GROUP_YES_TOTAL_NEVER' => 'This group’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
+ 'TRACE_GROUP_YES_TOTAL_NO' => 'This group’s permission is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
+ 'TRACE_GROUP_YES_TOTAL_YES' => 'This group’s permission is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
'TRACE_PERMISSION' => 'Trace permission - %s',
'TRACE_SETTING' => 'Trace setting',
- 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the the total result is kept. %sTrace global permission%s',
- 'TRACE_USER_GLOBAL_YES_TOTAL_NEVER' => 'The forum independent user permission evaluates to YES which overwrites the current local result NEVER. %sTrace global permission%s',
- 'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT' => 'The forum independent user permission evaluates to NEVER which doesn\'t influence the local permission. %sTrace global permission%s',
- 'TRACE_USER_FOUNDER' => 'The user has the founder type set, therefore admin permissions are set to YES by default.',
- 'TRACE_USER_KEPT' => 'The user permission is NO so the old total value is kept.',
- 'TRACE_USER_NEVER_TOTAL_NEVER' => 'The user permission is set to NEVER and the total value is set to NEVER, so nothing is changed.',
- 'TRACE_USER_NEVER_TOTAL_NO' => 'The user permission is set to NEVER which becomes the total value because it was set to NO.',
- 'TRACE_USER_NEVER_TOTAL_YES' => 'The user permission is set to NEVER and overwrites the previous YES.',
- 'TRACE_USER_NO_TOTAL_NO' => 'The user permission is NO and the total value was set to NO so it defaults to NEVER.',
- 'TRACE_USER_YES_TOTAL_NEVER' => 'The user permission is set to YES but the total NEVER cannot be overwritten.',
- 'TRACE_USER_YES_TOTAL_NO' => 'The user permission is set to YES which becomes the total value because it was set to NO.',
- 'TRACE_USER_YES_TOTAL_YES' => 'The user permission is set to YES and the total value is set to YES, so nothing is changed.',
- 'TRACE_WHO' => 'Who',
- 'TRACE_TOTAL' => 'Total',
+ 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to <samp>YES</samp> but the total permission is already set to <samp>YES</samp>, so the the total result is kept. %sTrace global permission%s',
+ 'TRACE_USER_GLOBAL_YES_TOTAL_NEVER' => 'The forum independent user permission evaluates to <samp>YES</samp> which overwrites the current local result <samp>NEVER</samp>. %sTrace global permission%s',
+ 'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT' => 'The forum independent user permission evaluates to <samp>NEVER</samp> which doesn’t influence the local permission. %sTrace global permission%s',
+ 'TRACE_USER_FOUNDER' => 'The user has the founder type set, therefore admin permissions are set to <samp>YES</samp> by default.',
+ 'TRACE_USER_KEPT' => 'The user permission is <samp>NO</samp> so the old total value is kept.',
+ 'TRACE_USER_NEVER_TOTAL_NEVER' => 'The user permission is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
+ 'TRACE_USER_NEVER_TOTAL_NO' => 'The user permission is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
+ 'TRACE_USER_NEVER_TOTAL_YES' => 'The user permission is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
+ 'TRACE_USER_NO_TOTAL_NO' => 'The user permission is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
+ 'TRACE_USER_YES_TOTAL_NEVER' => 'The user permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
+ 'TRACE_USER_YES_TOTAL_NO' => 'The user permission is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
+ 'TRACE_USER_YES_TOTAL_YES' => 'The user permission is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
+ 'TRACE_WHO' => 'Who',
+ 'TRACE_TOTAL' => 'Total',
'USERS_NOT_ASSIGNED' => 'No user assigned to this role',
'USER_IS_MEMBER_OF_DEFAULT' => 'is a member of the following default groups',
@@ -218,7 +221,7 @@ $lang = array_merge($lang, array(
'VIEW_ASSIGNED_ITEMS' => 'View assigned items',
'VIEW_PERMISSIONS' => 'View permissions',
- 'WRONG_PERMISSION_TYPE' => 'Wrong permission type selected',
+ 'WRONG_PERMISSION_TYPE' => 'Wrong permission type selected.',
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index b0bc770a74..df2d9e8c6f 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -1,13 +1,11 @@
<?php
/**
-*
* acp_permissions (phpBB Permission Set) [English]
*
* @package language
* @version $Id$
* @copyright (c) 2005 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
*/
/**
@@ -18,7 +16,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -28,26 +28,35 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-/*
- MODDERS PLEASE NOTE
-
- Please add your permission settings this way:
-
- // Adding new category
- $lang['permission_cats']['bugs'] = 'Bugs';
-
- // Adding new permission set
- $lang['permission_sets']['bug_'] = 'Bug Permissions';
-
- // Adding the permissions
- $lang = array_merge($lang, array(
- 'acl_bug_view' => array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
- 'acl_bug_post' => array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
- ));
-
- TODO:
- You are able to put your permission sets into a seperate file too by
- prefixing it with permissions_ and putting it into the acp language folder.
+/**
+* MODDERS PLEASE NOTE
+*
+* You are able to put your permission sets into a seperate file too by
+* prefixing the new file with permissions_ and putting it into the acp
+* language folder.
+*
+* An example of how the file could look like:
+*
+* <code>
+*
+* if (empty($lang) || !is_array($lang))
+* {
+* $lang = array();
+* }
+*
+* // Adding new category
+* $lang['permission_cat']['bugs'] = 'Bugs';
+*
+* // Adding new permission set
+* $lang['permission_type']['bug_'] = 'Bug Permissions';
+*
+* // Adding the permissions
+* $lang = array_merge($lang, array(
+* 'acl_bug_view' => array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
+* 'acl_bug_post' => array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
+* ));
+*
+* </code>
*/
// Define categories and permission types
@@ -58,22 +67,22 @@ $lang = array_merge($lang, array(
'forums' => 'Forums',
'misc' => 'Misc',
'permissions' => 'Permissions',
- 'pm' => 'Private Messages',
+ 'pm' => 'Private messages',
'polls' => 'Polls',
'post' => 'Post',
- 'post_actions' => 'Post Actions',
+ 'post_actions' => 'Post actions',
'posting' => 'Posting',
'profile' => 'Profile',
'settings' => 'Settings',
- 'topic_actions' => 'Topic Actions',
+ 'topic_actions' => 'Topic actions',
'user_group' => 'Users &amp; Groups',
),
'permission_type' => array(
- 'u_' => 'User Permissions',
- 'a_' => 'Admin Permissions',
- 'm_' => 'Moderator Permissions',
- 'f_' => 'Forum Permissions',
+ 'u_' => 'User permissions',
+ 'a_' => 'Admin permissions',
+ 'm_' => 'Moderator permissions',
+ 'f_' => 'Forum permissions',
),
));
@@ -174,7 +183,7 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'acl_a_board' => array('lang' => 'Can alter board settings', 'cat' => 'settings'),
'acl_a_server' => array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
- 'acl_a_jabber' => array('lang' => 'Can alter jabber settings', 'cat' => 'settings'),
+ 'acl_a_jabber' => array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
'acl_a_phpinfo' => array('lang' => 'Can view php settings', 'cat' => 'settings'),
'acl_a_forum' => array('lang' => 'Can manage forums', 'cat' => 'forums'),
@@ -215,8 +224,7 @@ $lang = array_merge($lang, array(
'acl_a_email' => array('lang' => 'Can send mass email', 'cat' => 'misc'),
'acl_a_bots' => array('lang' => 'Can manage bots', 'cat' => 'misc'),
'acl_a_reasons' => array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
- 'acl_a_backup' => array('lang' => 'Can backup database', 'cat' => 'misc'),
-# 'acl_a_restore' => array('lang' => 'Can restore database', 'cat' => 'misc'),
+ 'acl_a_backup' => array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
'acl_a_search' => array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
));
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index e1941b7f8d..a1feb2acac 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -34,10 +36,10 @@ $lang = array_merge($lang, array(
'ACP_BBCODES_EXPLAIN' => 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. From this page you can add, remove and edit custom BBCodes',
'ADD_BBCODE' => 'Add a new BBCode',
- 'BBCODE_ADDED' => 'BBCode added successfully',
- 'BBCODE_EDITED' => 'BBCode edited successfully',
- 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected is invalid',
- 'BBCODE_NOT_EXIST' => 'The BBCode you selected does not exist',
+ 'BBCODE_ADDED' => 'BBCode added successfully.',
+ 'BBCODE_EDITED' => 'BBCode edited successfully.',
+ 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.',
+ 'BBCODE_NOT_EXIST' => 'The BBCode you selected does not exist.',
'BBCODE_HELPLINE' => 'Helpline',
'BBCODE_HELPLINE_EXPLAIN' => 'This field contains the mouseover text of the BBCode',
'BBCODE_HELPLINE_TEXT' => 'Helpline text',
@@ -56,17 +58,17 @@ $lang = array_merge($lang, array(
'TOKEN' => 'Token',
'TOKENS' => 'Tokens',
- 'TOKENS_EXPLAIN' => 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {USERNAME1}, {USERNAME2}.<br /><br />In addition to these tokens you can use any of lang string present in your language/ directory like this: {L_<i>&lt;stringname&gt;</i>} where <i>&lt;stringname&gt;</i> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as "wrote" or its translation according to user\'s locale',
+ 'TOKENS_EXPLAIN' => 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {USERNAME1}, {USERNAME2}.<br /><br />In addition to these tokens you can use any of lang string present in your language/ directory like this: {L_<em>&lt;stringname&gt;</em>} where <em>&lt;stringname&gt;</em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as "wrote" or its translation according to user’s locale',
'TOKEN_DEFINITION' => 'What can it be?',
- 'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again',
+ 'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
'tokens' => array(
- 'TEXT' => 'Any text, including foreign characters, numbers, etc...',
+ 'TEXT' => 'Any text, including foreign characters, numbers, etc…',
'NUMBER' => 'Any series of digits',
'EMAIL' => 'A valid email address',
- 'URL' => 'A valid URL using any protocol (http, ftp, etc... cannot be used for javascript exploits). If none is given, "http://" is prepended to to the string',
+ 'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, "http://" is prepended to to the string',
'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol',
- 'COLOR' => 'A HTML color, can be either in the numeric form #FF1234 or an english name such as "blue"'
+ 'COLOR' => 'A HTML color, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
)
));
@@ -87,13 +89,13 @@ $lang = array_merge($lang, array(
'DISPLAY_ON_POSTING' => 'Display on posting',
- 'EDIT_ICONS' => 'Edit Icons',
+ 'EDIT_ICONS' => 'Edit icons',
'EDIT_SMILIES' => 'Edit smilies',
'EMOTION' => 'Emotion',
- 'EXPORT_ICONS' => 'Create icons pak',
- 'EXPORT_ICONS_EXPLAIN' => 'To create a package of your currently installed icons, click %sHERE%s to download the icons package file. Once downloaded create a zip or tgz file containing all of your icons plus this .pak configuration file.',
- 'EXPORT_SMILIES' => 'Create smilies pak',
- 'EXPORT_SMILIES_EXPLAIN' => 'To create a package of your currently installed smilies, click %sHERE%s to download the smilies.pak file. Once downloaded create a zip or tgz file containing all of your smilies plus this .pak configuration file.',
+ 'EXPORT_ICONS' => 'Export and download icons.pak',
+ 'EXPORT_ICONS_EXPLAIN' => '%sOn clicking this link, the configuration for your installed icons will be packaged into <samp>icons.pak</samp> which once downloaded can be used to create a <samp>.zip</samp> or <samp>.tgz</samp> file containing all of your icons plus this <samp>icons.pak</samp> configuration file%s.',
+ 'EXPORT_SMILIES' => 'Export and download smilies.pak',
+ 'EXPORT_SMILIES_EXPLAIN' => '%sOn clicking this link, the configuration for your installed smilies will be packaged into <samp>smilies.pak</samp> which once downloaded can be used to create a <samp>.zip</samp> or <samp>.tgz</samp> file containing all of your smilies plus this <samp>icons.pak</samp> configuration file%s.',
'FIRST' => 'First',
@@ -101,12 +103,12 @@ $lang = array_merge($lang, array(
'ICONS_ADDED' => 'The icon has been added successfully.',
'ICONS_CONFIG' => 'Icon configuration',
'ICONS_DELETED' => 'The icon has been removed successfully.',
- 'ICONS_EDIT' => 'Edit Icon',
+ 'ICONS_EDIT' => 'Edit icon',
'ICONS_EDITED' => 'The icon has been updated successfully.',
'ICONS_HEIGHT' => 'Icon height',
'ICONS_IMAGE' => 'Icon image',
'ICONS_IMPORTED' => 'The icons pack has been installed successfully.',
- 'ICONS_IMPORT_SUCCESS' => 'The icons pack was imported successfully',
+ 'ICONS_IMPORT_SUCCESS' => 'The icons pack was imported successfully.',
'ICONS_LOCATION' => 'Icon location',
'ICONS_NOT_DISPLAYED' => 'The following icons are not displayed on the posting page',
'ICONS_ORDER' => 'Icon order',
@@ -124,12 +126,12 @@ $lang = array_merge($lang, array(
'NO_SMILIES_EXPORT' => 'You have no smilies with which to create a package.',
'NO_SMILIES_PAK' => 'No smiley packages found.',
- 'PAK_FILE_NOT_READABLE' => 'Could not read pak file',
+ 'PAK_FILE_NOT_READABLE' => 'Could not read pak file.',
'REPLACE_MATCHES' => 'Replace matches',
'SELECT_PACKAGE' => 'Select a package file',
- 'SMILIES_ADD' => 'Add a new Smiley',
+ 'SMILIES_ADD' => 'Add a new smiley',
'SMILIES_ADDED' => 'The smiley has been added successfully.',
'SMILIES_CODE' => 'Smiley code',
'SMILIES_CONFIG' => 'Smiley configuration',
@@ -140,7 +142,7 @@ $lang = array_merge($lang, array(
'SMILIES_HEIGHT' => 'Smiley height',
'SMILIES_IMAGE' => 'Smiley image',
'SMILIES_IMPORTED' => 'The smilies pack has been installed successfully.',
- 'SMILIES_IMPORT_SUCCESS' => 'The smilies pack was imported successfully',
+ 'SMILIES_IMPORT_SUCCESS' => 'The smilies pack was imported successfully.',
'SMILIES_LOCATION' => 'Smiley location',
'SMILIES_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page',
'SMILIES_ORDER' => 'Smiley order',
@@ -156,18 +158,18 @@ $lang = array_merge($lang, array(
'ADD_WORD' => 'Add new word',
'EDIT_WORD' => 'Edit word censor',
- 'ENTER_WORD' => 'You must enter a word and its replacement',
+ 'ENTER_WORD' => 'You must enter a word and its replacement.',
- 'NO_WORD' => 'No word selected for editing',
+ 'NO_WORD' => 'No word selected for editing.',
'REPLACEMENT' => 'Replacement',
'UPDATE_WORD' => 'Update word censor',
'WORD' => 'Word',
- 'WORD_ADDED' => 'The word censor has been successfully added',
- 'WORD_REMOVED' => 'The selected word censor has been successfully removed',
- 'WORD_UPDATED' => 'The selected word censor has been successfully updated',
+ 'WORD_ADDED' => 'The word censor has been successfully added.',
+ 'WORD_REMOVED' => 'The selected word censor has been successfully removed.',
+ 'WORD_UPDATED' => 'The selected word censor has been successfully updated.',
));
// Ranks
@@ -178,16 +180,16 @@ $lang = array_merge($lang, array(
'MUST_SELECT_RANK' => 'You must select a rank.',
'NO_ASSIGNED_RANK' => 'No special rank assigned.',
- 'NO_RANK_TITLE' => 'You haven\'t specified a title for the rank.',
+ 'NO_RANK_TITLE' => 'You haven’t specified a title for the rank.',
'NO_UPDATE_RANKS' => 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.',
'RANK_ADDED' => 'The rank was successfully added.',
- 'RANK_IMAGE' => 'Rank Image',
+ 'RANK_IMAGE' => 'Rank image',
'RANK_IMAGE_EXPLAIN' => 'Use this to define a small image associated with the rank. The path is relative to the root phpBB directory.',
- 'RANK_MINIMUM' => 'Minimum Posts',
+ 'RANK_MINIMUM' => 'Minimum posts',
'RANK_REMOVED' => 'The rank was successfully deleted.',
- 'RANK_SPECIAL' => 'Set as Special Rank',
- 'RANK_TITLE' => 'Rank Title',
+ 'RANK_SPECIAL' => 'Set as special rank',
+ 'RANK_TITLE' => 'Rank title',
'RANK_UPDATED' => 'The rank was successfully updated.',
));
@@ -198,37 +200,41 @@ $lang = array_merge($lang, array(
'ADD_DISALLOW_TITLE' => 'Add a disallowed username',
'DELETE_DISALLOW_EXPLAIN' => 'You can remove a disallowed username by selecting the username from this list and clicking submit',
- 'DELETE_DISALLOW_TITLE' => 'Remove a Disallowed Username',
+ 'DELETE_DISALLOW_TITLE' => 'Remove a disallowed username',
'DISALLOWED_ALREADY' => 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.',
- 'DISALLOWED_DELETED' => 'The disallowed username has been successfully removed',
- 'DISALLOW_SUCCESSFUL' => 'The disallowed username has been successfully added',
+ 'DISALLOWED_DELETED' => 'The disallowed username has been successfully removed.',
+ 'DISALLOW_SUCCESSFUL' => 'The disallowed username has been successfully added.',
- 'NO_DISALLOWED' => 'No Disallowed Usernames',
- 'NO_USERNAME_SPECIFIED' => 'You haven\'t selected or entered a username to operate with.',
+ 'NO_DISALLOWED' => 'No disallowed usernames',
+ 'NO_USERNAME_SPECIFIED' => 'You haven’t selected or entered a username to operate with.',
));
// Reasons
$lang = array_merge($lang, array(
'ACP_REASONS_EXPLAIN' => 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
-
'ADD_NEW_REASON' => 'Add new reason',
+ 'AVAILABLE_TITLES' => 'Available localized reason titles',
- 'IS_NOT_TRANSLATED' => 'Reason has not been localized',
- 'IS_TRANSLATED' => 'Reason has been localized',
+ 'IS_NOT_TRANSLATED' => 'Reason has <samp>not</samp> been localised.',
+ 'IS_NOT_TRANSLATED_EXPLAIN' => 'Reason has <samp>not</samp> been localised. If you want to provide the localized form, specify the correct key from the language files report reasons section.',
+ 'IS_TRANSLATED' => 'Reason has been localised.',
+ 'IS_TRANSLATED_EXPLAIN' => 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localized form of the title and description will be used.',
- 'NO_REASON' => 'Reason could not be found',
+ 'NO_REASON' => 'Reason could not be found.',
'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.',
'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason "Other".',
- 'REASON_ADD' => 'Add report/denial reason',
- 'REASON_ADDED' => 'Report/denial reason successfully added',
- 'REASON_ALREADY_EXIST' => 'A reason with this title already exist, please enter another title for this reason.',
- 'REASON_DESCRIPTION' => 'Reason Description',
- 'REASON_EDIT' => 'Edit report/denial reason',
- 'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localized version is used instead of the description entered here.',
- 'REASON_REMOVED' => 'Report/denial reason successfully removed',
- 'REASON_TITLE' => 'Reason Title',
- 'REASON_UPDATED' => 'Report/denial reason successfully updated',
+ 'REASON_ADD' => 'Add report/denial reason',
+ 'REASON_ADDED' => 'Report/denial reason successfully added.',
+ 'REASON_ALREADY_EXIST' => 'A reason with this title already exist, please enter another title for this reason.',
+ 'REASON_DESCRIPTION' => 'Reason description',
+ 'REASON_DESC_TRANSLATED' => 'Displayed reason description',
+ 'REASON_EDIT' => 'Edit report/denial reason',
+ 'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localized version is used instead of the description entered here.',
+ 'REASON_REMOVED' => 'Report/denial reason successfully removed.',
+ 'REASON_TITLE' => 'Reason title',
+ 'REASON_TITLE_TRANSLATED' => 'Displayed reason title',
+ 'REASON_UPDATED' => 'Report/denial reason successfully updated.',
'USED_IN_REPORTS' => 'Used in reports',
));
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index e8ab61fea2..6e86da03a7 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -30,27 +32,29 @@ if (empty($lang) || !is_array($lang))
// Custom profile fields
$lang = array_merge($lang, array(
- 'ADDED_PROFILE_FIELD' => 'Successfully added custom profile field',
+ 'ADDED_PROFILE_FIELD' => 'Successfully added custom profile field.',
'ALPHA_ONLY' => 'Alphanumeric only',
'ALPHA_SPACERS' => 'Alphanumeric and spacers',
'ALWAYS_TODAY' => 'Always the current date',
'BOOL_ENTRIES_EXPLAIN' => 'Enter your options now',
- 'BOOL_TYPE_EXPLAIN' => 'Define the Type, either a checkbox or radio buttons',
+ 'BOOL_TYPE_EXPLAIN' => 'Define the type, either a checkbox or radio buttons',
- 'CHANGED_PROFILE_FIELD' => 'Successfully changed profile field',
+ 'CHANGED_PROFILE_FIELD' => 'Successfully changed profile field.',
'CHARS_ANY' => 'Any character',
'CHECKBOX' => 'Checkbox',
- 'CP_LANG_DEFAULT_VALUE' => 'Default Value',
+ 'COLUMNS' => 'Columns',
+ 'CP_LANG_DEFAULT_VALUE' => 'Default value',
'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_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',
- 'CREATE_NEW_FIELD' => 'Create New Field',
- 'COLUMNS' => 'Columns',
+ 'CREATE_NEW_FIELD' => 'Create new field',
+ 'CUSTOM_FIELDS_NOT_TRANSLATED' => 'At least one custom profile field has not yet been translated. Please enter the required information by clicking on the &quot;Translate&quot; link.',
- 'DEFAULT_ISO_LANGUAGE' => 'Default Language [%s]',
- 'DEFAULT_VALUE' => 'Default Value',
+ 'DEFAULT_ISO_LANGUAGE' => 'Default language [%s]',
+ 'DEFAULT_LANGUAGE_NOT_FILLED' => 'The language entries for the default language are not filled for this profile field.',
+ 'DEFAULT_VALUE' => 'Default value',
'DELETE_PROFILE_FIELD' => 'Remove profile field',
'DELETE_PROFILE_FIELD_CONFIRM' => 'Are you sure you want to delete this profile field?',
'DISPLAY_AT_PROFILE' => 'Display in user control panel',
@@ -69,76 +73,79 @@ $lang = array_merge($lang, array(
'FIELD_BOOL' => 'Boolean (Yes/No)',
'FIELD_DATE' => 'Date',
- 'FIELD_DESCRIPTION' => 'Field Description',
- 'FIELD_DESCRIPTION_EXPLAIN' => 'The Explanation for this field presented to the user',
- 'FIELD_DROPDOWN' => 'Dropdown Box',
- 'FIELD_IDENT' => 'Field Identification',
- 'FIELD_IDENT_EXPLAIN' => 'The field Identification is a name to identify the profile field within the database and the templates.',
+ 'FIELD_DESCRIPTION' => 'Field description',
+ 'FIELD_DESCRIPTION_EXPLAIN' => 'The explanation for this field presented to the user',
+ 'FIELD_DROPDOWN' => 'Dropdown box',
+ 'FIELD_IDENT' => 'Field identification',
+ 'FIELD_IDENT_ALREADY_EXIST' => 'The chosen field identification already exist. Please choose another name.',
+ 'FIELD_IDENT_EXPLAIN' => 'The field identification is a name to identify the profile field within the database and the templates.',
'FIELD_INT' => 'Numbers',
'FIELD_LENGTH' => 'Length of input box',
- 'FIELD_NOT_FOUND' => 'Profile field not found',
- 'FIELD_STRING' => 'Single Textfield',
+ 'FIELD_NOT_FOUND' => 'Profile field not found.',
+ 'FIELD_STRING' => 'Single textfield',
'FIELD_TEXT' => 'Textarea',
- 'FIELD_TYPE' => 'Field Type',
+ 'FIELD_TYPE' => 'Field type',
'FIELD_TYPE_EXPLAIN' => 'You are not able to change the field type later.',
- 'FIELD_VALIDATION' => 'Field Validation',
- 'FIRST_OPTION' => 'First Option',
+ 'FIELD_VALIDATION' => 'Field validation',
+ 'FIRST_OPTION' => 'First option',
- 'HIDE_PROFILE_FIELD' => 'Hide Profile Field',
+ '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.',
'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',
'ISO_LANGUAGE' => 'Language [%s]',
- 'LANG_SPECIFIC_OPTIONS' => 'Language specific options [<b>%s</b>]',
+ 'LANG_SPECIFIC_OPTIONS' => 'Language specific options [<strong>%s</strong>]',
'MAX_FIELD_CHARS' => 'Maximum number of characters',
'MAX_FIELD_NUMBER' => 'Highest allowed number',
'MIN_FIELD_CHARS' => 'Minimum number of characters',
'MIN_FIELD_NUMBER' => 'Lowest allowed number',
- 'NO_FIELD_ENTRIES' => 'No Entries defined',
- 'NO_FIELD_ID' => 'No field id specified',
- 'NO_FIELD_TYPE' => 'No Field type specified',
+ 'NO_FIELD_ENTRIES' => 'No entries defined',
+ 'NO_FIELD_ID' => 'No field id specified.',
+ 'NO_FIELD_TYPE' => 'No Field type specified.',
'NO_VALUE_OPTION' => 'Option equal to non entered value',
'NO_VALUE_OPTION_EXPLAIN' => 'Value for a non-entry. If the field is required, the user gets an error if he choose the option selected here',
'NUMBERS_ONLY' => 'Only numbers (0-9)',
- 'PREVIEW_PROFILE_FIELD' => 'Preview Profile Field',
- 'PROFILE_BASIC_OPTIONS' => 'Basic Options',
- 'PROFILE_FIELD_ACTIVATED' => 'Profile field successfully activated',
- 'PROFILE_FIELD_DEACTIVATED' => 'Profile field successfully deactivated',
+ 'PREVIEW_PROFILE_FIELD' => 'Preview profile field',
+ 'PROFILE_BASIC_OPTIONS' => 'Basic options',
+ 'PROFILE_FIELD_ACTIVATED' => 'Profile field successfully activated.',
+ 'PROFILE_FIELD_DEACTIVATED' => 'Profile field successfully deactivated.',
'PROFILE_LANG_OPTIONS' => 'Language specific options',
'PROFILE_TYPE_OPTIONS' => 'Profile type specific options',
- 'RADIO_BUTTONS' => 'Radio Buttons',
+ 'RADIO_BUTTONS' => 'Radio buttons',
'REMOVED_PROFILE_FIELD' => 'Successfully removed profile 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',
'SAVE' => 'Save',
- 'SECOND_OPTION' => 'Second Option',
+ 'SECOND_OPTION' => 'Second option',
'STEP_1_EXPLAIN_CREATE' => 'Here you can enter the first basic parameters of your new profile field. These informations are needed for the second step where you are able to set remaining options and where you are able to preview and tweak your profile field further.',
'STEP_1_EXPLAIN_EDIT' => 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step, where you are able to preview and test the changed settings.',
- 'STEP_1_TITLE_CREATE' => 'Add Profile Field',
- 'STEP_1_TITLE_EDIT' => 'Edit Profile Field',
+ 'STEP_1_TITLE_CREATE' => 'Add profile field',
+ 'STEP_1_TITLE_EDIT' => 'Edit profile field',
'STEP_2_EXPLAIN_CREATE' => 'Here you are able to define some common options. Further you are able to preview the field you generated, as the user will see it. Play around with it until you are satisfied as how the field behaves.',
- 'STEP_2_EXPLAIN_EDIT' => 'Here you are able to change some common options. Further you are able to preview the changed field, as the user will see it. Play around with it until you are satisfied as how the field behaves.<br /><b>Please note that changes to profile fields will not affect existing profile fields entered by your users.</b>',
+ 'STEP_2_EXPLAIN_EDIT' => 'Here you are able to change some common options. Further you are able to preview the changed field, as the user will see it. Play around with it until you are satisfied as how the field behaves.<br /><strong>Please note that changes to profile fields will not affect existing profile fields entered by your users.</strong>',
'STEP_2_TITLE_CREATE' => 'Profile type specific options',
'STEP_2_TITLE_EDIT' => 'Profile type specific options',
'STEP_3_EXPLAIN_CREATE' => 'Since you have more than one board language installed, you have to fill out the remaining language items too. The profile field will work with the default language enabled, you are able to fill out the remaining language items later too.',
'STEP_3_EXPLAIN_EDIT' => 'Since you have more than one board language installed, you now can change or add the remaining language items too. The profile field will work with the default language enabled.',
- 'STEP_3_TITLE_CREATE' => 'Remaining Language Definitions',
- 'STEP_3_TITLE_EDIT' => 'Language Definitions',
+ 'STEP_3_TITLE_CREATE' => 'Remaining language definitions',
+ 'STEP_3_TITLE_EDIT' => 'Language definitions',
'STRING_DEFAULT_VALUE_EXPLAIN' => 'Enter a default phrase to be displayed, a default value. Leave empty if you want to show it empty at the first place.',
'TEXT_DEFAULT_VALUE_EXPLAIN' => 'Enter a default text to be displayed, a default value. Leave empty if you want to show it empty at the first place.',
+ 'TRANSLATE' => 'Translate',
- 'UPDATE_PREVIEW' => 'Update Preview',
- 'USER_FIELD_NAME' => 'Field Name/Title presented to the user',
+ 'UPDATE_PREVIEW' => 'Update preview',
+ 'USER_FIELD_NAME' => 'Field name/title presented to the user',
- 'VISIBILITY_OPTION' => 'Visibility Option',
+ 'VISIBILITY_OPTION' => 'Visibility option',
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 71f4169fbb..4452deafc9 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -38,36 +40,36 @@ $lang = array_merge($lang, array(
'DELETE_USER_POSTS' => 'Delete pruned user posts',
'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
- 'JOINED_EXPLAIN' => 'Enter a date in YYYY-MM-DD format.',
+ 'JOINED_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
- 'LAST_ACTIVE_EXPLAIN' => 'Enter a date in YYYY-MM-DD format.',
+ 'LAST_ACTIVE_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here, they will be used in preference to the criteria above.',
- 'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully',
- 'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully',
+ 'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully.',
+ 'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully.',
));
// Forum Pruning
$lang = array_merge($lang, array(
- 'ACP_PRUNE_FORUMS_EXPLAIN' => 'This will delete any topic which has not been posted to within the number of days you select. If you do not enter a number then all topics will be deleted. It will not remove topics in which polls are still running nor will it remove announcements. You will need to remove these topics manually.',
+ 'ACP_PRUNE_FORUMS_EXPLAIN' => 'This will delete any topic which has not been posted to or viewed within the number of days you select. If you do not enter a number then all topics will be deleted. By default, it will not remove topics in which polls are still running nor will it remove stickies and announcements.',
- 'FORUM_PRUNE' => 'Forum Prune',
+ 'FORUM_PRUNE' => 'Forum prune',
'NO_PRUNE' => 'No forums pruned',
- 'SELECTED_FORUM' => 'Selected Forum',
- 'SELECTED_FORUMS' => 'Selected Forums',
+ 'SELECTED_FORUM' => 'Selected forum',
+ 'SELECTED_FORUMS' => 'Selected forums',
'POSTS_PRUNED' => 'Posts pruned',
- 'PRUNE_ANNOUNCEMENTS' => 'Prune Announcements',
- 'PRUNE_FINISHED_POLLS' => 'Prune Closed Polls',
+ 'PRUNE_ANNOUNCEMENTS' => 'Prune announcements',
+ 'PRUNE_FINISHED_POLLS' => 'Prune closed polls',
'PRUNE_FINISHED_POLLS_EXPLAIN' => 'Removes topics with polls which have ended.',
'PRUNE_NOT_POSTED' => 'Days since last posted',
'PRUNE_NOT_VIEWED' => 'Days since last viewed',
- 'PRUNE_OLD_POLLS' => 'Prune Old Polls',
+ 'PRUNE_OLD_POLLS' => 'Prune old polls',
'PRUNE_OLD_POLLS_EXPLAIN' => 'Removes topics with polls not voted in for post age days.',
- 'PRUNE_STICKY' => 'Prune Stickies',
+ 'PRUNE_STICKY' => 'Prune stickies',
'PRUNE_SUCCESS' => 'Pruning of forums was successful',
'TOPICS_PRUNED' => 'Topics pruned',
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index ab6e55a0d4..4d6b01cb6c 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -29,17 +31,17 @@ 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(
- 'ACP_SEARCH_INDEX_EXPLAIN' => 'Here you can manage the search backend\'s indexes. Since you normally use only one backend you should delete all indexes that you do not make use of. After altering some of the search settings (e.g. the number of minimum/maximum chars) it might be worth recreating the index so it reflects those changes.',
+ 'ACP_SEARCH_INDEX_EXPLAIN' => 'Here you can manage the search backend’s indexes. Since you normally use only one backend you should delete all indexes that you do not make use of. After altering some of the search settings (e.g. the number of minimum/maximum chars) it might be worth recreating the index so it reflects those changes.',
'ACP_SEARCH_SETTINGS_EXPLAIN' => 'Here you can define what search backend will be used for indexing posts and performing searches. You can set various options that can influence how much processing these actions require. Some of these settings are the same for all search engine backends.',
- 'CONFIRM_SEARCH_BACKEND' => 'Are you sure you wish to switch to a different search backend? After changing the search backend you will have to create an index for the new search backend. If you don\'t plan on switching back to the old search backend you can also delete the old backend\'s index in order to free system resources.',
+ 'CONFIRM_SEARCH_BACKEND' => 'Are you sure you wish to switch to a different search backend? After changing the search backend you will have to create an index for the new search backend. If you don’t plan on switching back to the old search backend you can also delete the old backend’s index in order to free system resources.',
'CONTINUE_DELETING_INDEX' => 'Continue previous index deleting process',
'CONTINUE_DELETING_INDEX_EXPLAIN' => 'An index deleting process has been started. In order to access the search index page again you need to complete it first.',
'CONTINUE_INDEXING' => 'Continue previous indexing process',
'CONTINUE_INDEXING_EXPLAIN' => 'An indexing process has been started. In order to access the search index page again you need to complete it first.',
- 'CREATE_INDEX' => 'Create Index',
+ 'CREATE_INDEX' => 'Create index',
- 'DELETE_INDEX' => 'Delete Index',
+ 'DELETE_INDEX' => 'Delete index',
'DELETING_INDEX_IN_PROGRESS' => 'Deleting the index in progress',
'DELETING_INDEX_IN_PROGRESS_EXPLAIN' => 'The search backend is currently cleaning its index. This can take a few minutes.',
@@ -49,12 +51,12 @@ $lang = array_merge($lang, array(
'FULLTEXT_MYSQL_TEXT_CARDINALITY' => 'Cardinality of the post_text fulltext index (estimate of unique values)',
'FULLTEXT_MYSQL_TOTAL_POSTS' => 'Total number of indexed posts',
- 'GENERAL_SEARCH_SETTINGS' => 'General Search Settings',
+ 'GENERAL_SEARCH_SETTINGS' => 'General search settings',
'GO_TO_SEARCH_INDEX' => 'Go to search index page',
- 'INDEX_STATS' => 'Index Statistics',
+ 'INDEX_STATS' => 'Index statistics',
'INDEXING_IN_PROGRESS' => 'Indexing in progress',
- 'INDEXING_IN_PROGRESS_EXPLAIN' => 'The search backend is currently indexing all posts on the board. This can take from a few minutes to a few hours depending on your board\'s size.',
+ 'INDEXING_IN_PROGRESS_EXPLAIN' => 'The search backend is currently indexing all posts on the board. This can take from a few minutes to a few hours depending on your board’s size.',
'LIMIT_SEARCH_LOAD' => 'Search page system load limit',
'LIMIT_SEARCH_LOAD_EXPLAIN' => 'If the 1 minute system load exceeds this value the search page will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
@@ -64,20 +66,20 @@ $lang = array_merge($lang, array(
'MIN_SEARCH_CHARS' => 'Min characters indexed by search',
'MIN_SEARCH_CHARS_EXPLAIN' => 'Words with at least this many characters will be indexed for searching.',
'MIN_SEARCH_AUTHOR_CHARS' => 'Min author name characters',
- 'MIN_SEARCH_AUTHOR_CHARS_EXPLAIN' => 'Users have to enter at least this many characters of the name when performing a wildcard author search. If the author\'s username is shorter than this number you can still search for the author\'s posts by entering the complete username.',
+ 'MIN_SEARCH_AUTHOR_CHARS_EXPLAIN' => 'Users have to enter at least this many characters of the name when performing a wildcard author search. If the author’s username is shorter than this number you can still search for the author’s posts by entering the complete username.',
'PROGRESS_BAR' => 'Progress bar',
'SEARCH_GUEST_INTERVAL' => 'Guest search flood interval',
'SEARCH_GUEST_INTERVAL_EXPLAIN' => 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.',
- 'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database',
- 'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend',
+ 'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database.',
+ 'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend.',
'SEARCH_INTERVAL' => 'User search flood interval',
'SEARCH_INTERVAL_EXPLAIN' => 'Number of seconds users must wait between searches. This interval is checked independendly for each user.',
'SEARCH_STORE_RESULTS' => 'Search result cache length',
'SEARCH_STORE_RESULTS_EXPLAIN' => 'Cached search results will expire after this time, in seconds. Set to 0 if you want to disable search cache.',
- 'SEARCH_TYPE' => 'Search Backend',
- 'SEARCH_TYPE_EXPLAIN' => 'phpBB allows you to choose the backend that is used for searching text in post contents. By default the search will use phpBB\'s own fulltext search.',
+ 'SEARCH_TYPE' => 'Search backend',
+ 'SEARCH_TYPE_EXPLAIN' => 'phpBB allows you to choose the backend that is used for searching text in post contents. By default the search will use phpBB’s own fulltext search.',
'SWITCHED_SEARCH_BACKEND' => 'You switched the search backend. In order to use the new search backend you should make sure that there is an index for the backend you chose.',
'TOTAL_WORDS' => 'Total number of indexed words',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index abf3685cf0..27ecbdb261 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -31,15 +33,15 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACP_IMAGESETS_EXPLAIN' => 'Imagesets comprise all the button, forum, folder, etc. and other non-style specific images used by the board. Here you can edit, export or delete existing imagesets and import or activate new sets.',
'ACP_STYLES_EXPLAIN' => 'Here you can manage the available styles on your board. A style consists off a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterix (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
- 'ACP_TEMPLATES_EXPLAIN' => 'A Template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.',
- 'ACP_THEMES_EXPLAIN' => 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your forum. The range of options open to you depends on the configuration of your server and phpBB installation, see the Manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.',
- 'ADD_IMAGESET' => 'Create Imageset',
+ 'ACP_TEMPLATES_EXPLAIN' => 'A template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.',
+ 'ACP_THEMES_EXPLAIN' => 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your forum. The range of options open to you depends on the configuration of your server and phpBB installation, see the manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.',
+ 'ADD_IMAGESET' => 'Create imageset',
'ADD_IMAGESET_EXPLAIN' => 'Here you can create a new imageset. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this imageset on an existing one. You may also be able to upload or import (from the store directory) a imageset archive. If you upload or import an archive the imageset name can be optionally taken from the archive name (to do this leave the imageset name blank).',
- 'ADD_STYLE' => 'Create Style',
+ 'ADD_STYLE' => 'Create style',
'ADD_STYLE_EXPLAIN' => 'Here you can create a new style. Depending on your server configuration and file permissions you may have additional options. For example you may be able to base this style on an existing one. You may also be able to upload or import (from the store directory) a style archive. If you upload or import an archive the style name will be determined automatically.',
- 'ADD_TEMPLATE' => 'Create Template',
+ '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).',
- 'ADD_THEME' => 'Create Theme',
+ 'ADD_THEME' => 'Create theme',
'ADD_THEME_EXPLAIN' => 'Here you can add a new theme. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this theme on an existing one. You may also be able to upload or import (from the store directory) a theme archive. If you upload or import an archive the theme name can be optionally taken from the archive name (to do this leave the theme name blank).',
'ARCHIVE_FORMAT' => 'Archive file type',
@@ -49,33 +51,33 @@ $lang = array_merge($lang, array(
'BACKGROUND_REPEAT' => 'Background repeat',
'BOLD' => 'Bold',
- 'CACHE' => 'Cache',
- 'CACHE_CACHED' => 'Cached',
- 'CACHE_FILENAME' => 'Template file',
- 'CACHE_FILESIZE' => 'Filesize',
- 'CACHE_MODIFIED' => 'Modified',
- 'CONFIRM_IMAGESET_REFRESH' => 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.',
+ 'CACHE' => 'Cache',
+ 'CACHE_CACHED' => 'Cached',
+ 'CACHE_FILENAME' => 'Template file',
+ 'CACHE_FILESIZE' => 'Filesize',
+ 'CACHE_MODIFIED' => 'Modified',
+ 'CONFIRM_IMAGESET_REFRESH' => 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.',
'CONFIRM_TEMPLATE_CLEAR_CACHE' => 'Are you sure you wish to clear all cached versions of your template files?',
- 'CONFIRM_TEMPLATE_REFRESH' => 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.',
- 'CONFIRM_THEME_REFRESH' => 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
- 'COPYRIGHT' => 'Copyright',
- 'CREATE_IMAGESET' => 'Create new imageset',
- 'CREATE_STYLE' => 'Create new style',
- 'CREATE_TEMPLATE' => 'Create new template set',
- 'CREATE_THEME' => 'Create new theme',
- 'CSS_CLASS_NAME' => 'CSS class name',
- 'CSS_COLOUR_EXPLAIN' => 'You can either enter a hex number for the colour or use the web safe colour swatch to select one.',
- 'CURRENT_IMAGE' => 'Current Image',
- 'CUSTOM_CLASS' => 'Custom class',
- 'CUSTOM_CLASS_EXPLAIN' => 'You can add additional classes to this theme if you wish. You must provide the actual CSS class name below, it must be the same as that you have or will use in your template. Please remember that class names may contain only alphanumeric characters, periods (.), colons (:), dash (-) and number/hash/pound (#). The new class will be added to class selection above.',
+ 'CONFIRM_TEMPLATE_REFRESH' => 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.',
+ 'CONFIRM_THEME_REFRESH' => 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
+ 'COPYRIGHT' => 'Copyright',
+ 'CREATE_IMAGESET' => 'Create new imageset',
+ 'CREATE_STYLE' => 'Create new style',
+ 'CREATE_TEMPLATE' => 'Create new template set',
+ 'CREATE_THEME' => 'Create new theme',
+ 'CSS_CLASS_NAME' => 'CSS class name',
+ 'CSS_COLOUR_EXPLAIN' => 'You can either enter a hexidecimal number for the colour or use the web safe colour swatch to select one.',
+ 'CURRENT_IMAGE' => 'Current image',
+ 'CUSTOM_CLASS' => 'Custom class',
+ 'CUSTOM_CLASS_EXPLAIN' => 'You can add additional classes to this theme if you wish. You must provide the actual CSS class name below, it must be the same as that you have or will use in your template. Please remember that class names may contain only alphanumeric characters, periods (.), colons (:), dash (-) and number/hash/pound (#). The new class will be added to class selection above.',
'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.',
'DELETE_FROM_FS' => 'Delete from filesystem',
- 'DELETE_IMAGESET' => 'Delete Imageset',
+ 'DELETE_IMAGESET' => 'Delete imageset',
'DELETE_IMAGESET_EXPLAIN' => 'Here you can remove the selected imageset from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the imageset is deleted it is gone for good. It is recommended that you first export your set for possible future use.',
'DELETE_STYLE' => 'Delete style',
'DELETE_STYLE_EXPLAIN' => 'Here you can remove the selected style. You cannot remove all the style elements from here. These must be deleted individually via their respective forms. Take care in deleting styles there is no undo facility.',
- 'DELETE_TEMPLATE' => 'Delete Template',
+ 'DELETE_TEMPLATE' => 'Delete template',
'DELETE_TEMPLATE_EXPLAIN' => 'Here you can remove the selected template set from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the templates are deleted they are gone for good. It is recommended that you first export your set for possible future use.',
'DELETE_THEME' => 'Delete theme',
'DELETE_THEME_EXPLAIN' => 'Here you can remove the selected theme from the database. Additionally, if you have permission you can elect to remove the theme from the filesystem. Please note that there is no undo capability. When the theme is deleted it is gone for good. It is recommended that you first export your theme for possible future use.',
@@ -84,7 +86,7 @@ $lang = array_merge($lang, array(
'EDIT_DETAILS_IMAGESET' => 'Edit imageset details',
'EDIT_DETAILS_IMAGESET_EXPLAIN' => 'Here you can edit certain imageset details such as its name.',
- 'EDIT_DETAILS_STYLE' => 'Edit Style',
+ '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, theme and imageset 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 templates details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your template set can be written to by the webserver.',
@@ -103,7 +105,7 @@ $lang = array_merge($lang, array(
'FOREGROUND' => 'Foreground',
'FONT_COLOUR' => 'Font colour',
'FONT_FACE' => 'Font face',
- 'FONT_FACE_EXPLAIN' => 'You can specify multiple fonts seperated by commas. If a user doesn\'t have the first font installed the first other working font will be chosen.',
+ 'FONT_FACE_EXPLAIN' => 'You can specify multiple fonts seperated 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',
@@ -118,24 +120,24 @@ $lang = array_merge($lang, array(
'IMAGE_NAME' => 'Image name',
'IMAGE_PARAMETER' => 'Parameter',
'IMAGE_VALUE' => 'Value',
- 'IMAGESET_ADDED' => 'New imageset added on filesystem',
- 'IMAGESET_ADDED_DB' => 'New imageset added to database',
- 'IMAGESET_DELETED' => 'Imageset deleted successfully',
- 'IMAGESET_DELETED_FS' => 'Imageset removed from database but some files may remain on the filesystem',
- 'IMAGESET_DETAILS_UPDATED' => 'Imageset details successfully updated',
- 'IMAGESET_ERR_ARCHIVE' => 'Please select an archive method',
- 'IMAGESET_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters',
- 'IMAGESET_ERR_NAME_CHARS' => 'The imageset name can only contain alphanumeric characters, -, +, _ and space',
- 'IMAGESET_ERR_NAME_EXIST' => 'A imageset with that name already exists',
- 'IMAGESET_ERR_NAME_LONG' => 'The imageset name can be no longer than 30 characters',
+ 'IMAGESET_ADDED' => 'New imageset added on filesystem.',
+ 'IMAGESET_ADDED_DB' => 'New imageset added to database.',
+ 'IMAGESET_DELETED' => 'Imageset deleted successfully.',
+ 'IMAGESET_DELETED_FS' => 'Imageset removed from database but some files may remain on the filesystem.',
+ 'IMAGESET_DETAILS_UPDATED' => 'Imageset details successfully updated.',
+ 'IMAGESET_ERR_ARCHIVE' => 'Please select an archive method.',
+ 'IMAGESET_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.',
+ 'IMAGESET_ERR_NAME_CHARS' => 'The imageset name can only contain alphanumeric characters, -, +, _ and space.',
+ 'IMAGESET_ERR_NAME_EXIST' => 'A imageset with that name already exists.',
+ '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_ERR_STYLE_NAME' => 'You must supply a name for this 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_EXPORTED' => 'Imageset exported succesfully and stored in %s.',
'IMAGESET_NAME' => 'Imageset Name',
- 'IMAGESET_REFRESHED' => 'Imageset refreshed successfully',
- 'IMAGESET_UPDATED' => 'Imageset updated successfully',
+ 'IMAGESET_REFRESHED' => 'Imageset refreshed successfully.',
+ 'IMAGESET_UPDATED' => 'Imageset updated successfully.',
'ITALIC' => 'Italic',
'IMG_CAT_BUTTONS' => 'Localised buttons',
@@ -280,22 +282,22 @@ $lang = array_merge($lang, array(
'EDITED_IMAGESET' => 'Edited imageset',
- 'NO_CLASS' => 'Cannot find class in stylesheet',
- 'NO_IMAGESET' => 'Cannot find imageset on filesystem',
+ 'NO_CLASS' => 'Cannot find class in stylesheet.',
+ 'NO_IMAGESET' => 'Cannot find imageset on filesystem.',
'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',
+ 'NO_STYLE' => 'Cannot find style on filesystem.',
+ 'NO_TEMPLATE' => 'Cannot find template on filesystem.',
+ 'NO_THEME' => 'Cannot find theme on filesystem.',
'NO_UNINSTALLED_IMAGESET' => 'No uninstalled imagesets detected',
'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected',
'NO_UNINSTALLED_TEMPLATE' => 'No uninstalled templates detected',
'NO_UNINSTALLED_THEME' => 'No uninstalled themes detected',
'NO_UNIT' => 'None',
- 'ONLY_IMAGESET' => 'This is the only remaining imageset, you cannot delete it',
- 'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it',
- 'ONLY_TEMPLATE' => 'This is the only remaining template set, you cannot delete it',
- 'ONLY_THEME' => 'This is the only remaining theme, you cannot delete it',
+ 'ONLY_IMAGESET' => 'This is the only remaining imageset, you cannot delete it.',
+ 'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it.',
+ 'ONLY_TEMPLATE' => 'This is the only remaining template set, you cannot delete it.',
+ 'ONLY_THEME' => 'This is the only remaining theme, you cannot delete it.',
'OPTIONAL_BASIS' => 'Optional basis',
'REFRESH' => 'Refresh',
@@ -318,7 +320,7 @@ $lang = array_merge($lang, array(
'SELECT_IMAGE' => 'Select image',
'SELECT_TEMPLATE' => 'Select template file',
'SELECT_CLASS' => 'Select CSS class',
- 'SELECTED_IMAGE' => 'Selected Image',
+ 'SELECTED_IMAGE' => 'Selected image',
'SELECTED_IMAGESET' => 'Selected imageset',
'SELECTED_TEMPLATE' => 'Selected template',
'SELECTED_TEMPLATE_FILE' => 'Selected template file',
@@ -331,83 +333,83 @@ $lang = array_merge($lang, array(
'STORE_FILESYSTEM' => 'Filesystem',
'STYLE_ACTIVATE' => 'Activate',
'STYLE_ACTIVE' => 'Active',
- 'STYLE_ADDED' => 'Style added successfully',
+ 'STYLE_ADDED' => 'Style added successfully.',
'STYLE_DEACTIVATE' => 'Deactivate',
'STYLE_DEFAULT' => 'Make default style',
- 'STYLE_DELETED' => 'Style 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_DELETED' => 'Style 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_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_NO_IDS' => 'You must select a template, theme and imageset for this style',
+ '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_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_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 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_EXPORTED' => 'Style exported succesfully and stored in %s.',
'STYLE_IMAGESET' => 'Imageset',
'STYLE_NAME' => 'Style name',
'STYLE_TEMPLATE' => 'Template',
'STYLE_THEME' => 'Theme',
'STYLE_USED_BY' => 'Used by',
- 'TEMPLATE_ADDED' => 'Template set added and stored on filesystem',
- 'TEMPLATE_ADDED_DB' => 'Template set added and stored in database',
+ 'TEMPLATE_ADDED' => 'Template set added and stored on filesystem.',
+ 'TEMPLATE_ADDED_DB' => 'Template set added and stored in database.',
'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_CLEARED' => 'Template cache cleared successfully.',
'TEMPLATE_CACHE_EMPTY' => 'There are no cached templates.',
- 'TEMPLATE_DELETED' => 'Template set deleted successfully',
- 'TEMPLATE_DELETED_FS' => 'Template set removed from database but some files may remain on the filesystem',
- 'TEMPLATE_DETAILS_UPDATED' => 'Template details successfully updated',
+ 'TEMPLATE_DELETED' => 'Template set deleted successfully.',
+ 'TEMPLATE_DELETED_FS' => 'Template set removed from database but some files may 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_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_EXIST' => 'A template set with that name already exists',
- 'TEMPLATE_ERR_NAME_LONG' => 'The template name can be no longer than 30 characters',
+ '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_EXIST' => 'A template set with that name already exists.',
+ 'TEMPLATE_ERR_NAME_LONG' => 'The template name can be no longer than 30 characters.',
'TEMPLATE_ERR_NOT_TEMPLATE' => 'The archive you specified does not contain a valid template set.',
- 'TEMPLATE_ERR_STYLE_NAME' => 'You must supply a name for this templates',
- 'TEMPLATE_EXPORT' => 'Export Templates',
+ 'TEMPLATE_ERR_STYLE_NAME' => 'You must supply a name for this templates.',
+ 'TEMPLATE_EXPORT' => 'Export templates',
'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 succesfully and stored in %s',
+ 'TEMPLATE_EXPORTED' => 'Templates exported succesfully and stored in %s.',
'TEMPLATE_FILE' => 'Template file',
- 'TEMPLATE_FILE_UPDATED' => 'Template file updated successfully',
+ 'TEMPLATE_FILE_UPDATED' => 'Template file updated successfully.',
'TEMPLATE_LOCATION' => 'Store templates in',
'TEMPLATE_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.',
'TEMPLATE_NAME' => 'Template name',
- 'TEMPLATE_REFRESHED' => 'Template refreshed successfully',
-
- 'THEME_ADDED' => 'New theme added on filesystem',
- 'THEME_ADDED_DB' => 'New theme added to database',
- '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',
+ 'TEMPLATE_REFRESHED' => 'Template refreshed successfully.',
+
+ 'THEME_ADDED' => 'New theme added on filesystem.',
+ 'THEME_ADDED_DB' => 'New theme added to database.',
+ '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' => 'Raw CSS theme editor',
'THEME_EDITOR_HEIGHT' => 'Theme editor height',
- 'THEME_ERR_ARCHIVE' => 'Please select an archive method',
+ '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_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_REFRESH_FS' => 'This theme is stored on the filesystem so there is no need to refresh it.',
- 'THEME_ERR_STYLE_NAME' => 'You must supply a name for this theme',
+ 'THEME_ERR_STYLE_NAME' => 'You must supply a name for this theme.',
'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 succesfully and stored in %s',
+ '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_REFRESHED' => 'Theme refreshed successfully',
- 'THEME_UPDATED' => 'Class updated successfully',
+ 'THEME_REFRESHED' => 'Theme refreshed successfully.',
+ 'THEME_UPDATED' => 'Class updated successfully.',
'UNDERLINE' => 'Underline',
'UNINSTALLED_IMAGESET' => 'Uninstalled imagesets',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 6398ff8f70..afa1697534 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -30,24 +32,31 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ADMIN_SIG_PREVIEW' => 'Signature preview',
- 'AT_LEAST_ONE_FOUNDER' => 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status promote another user to be a founder first.',
+ 'AT_LEAST_ONE_FOUNDER' => 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status, promote another user to be a founder first.',
- 'BAN_SUCCESSFUL' => 'Ban entered successfully',
+ 'BAN_SUCCESSFUL' => 'Ban entered successfully.',
+ 'CANNOT_BAN_FOUNDER' => 'You are not allowed to ban founder accounts.',
'CANNOT_BAN_YOURSELF' => 'You are not allowed to ban yourself.',
+ 'CANNOT_DEACTIVATE_BOT' => 'You are not allowed to deactivate bot accounts. Please deactivate the bot instead.',
+ 'CANNOT_DEACTIVATE_FOUNDER' => 'You are not allowed to deactivate founder accounts.',
'CANNOT_DEACTIVATE_YOURSELF' => 'You are not allowed to deactivate your own account.',
+ 'CANNOT_FORCE_REACT_BOT' => 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot instead.',
+ 'CANNOT_FORCE_REACT_FOUNDER' => 'You are not allowed to force reactivation on founder accounts.',
'CANNOT_FORCE_REACT_YOURSELF' => 'You are not allowed to force reactivation of your own account.',
'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.',
'CANNOT_REMOVE_YOURSELF' => 'You are not allowed to remove your own user account.',
+ 'CANNOT_SET_FOUNDER_BOT' => 'You are not able to promote ignored users to be founders.',
+ 'CANNOT_SET_FOUNDER_INACTIVE' => 'You need to activate users before you promote them to founders, only activated users are able to be promoted.',
'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing the users email address.',
-
+
'DELETE_POSTS' => 'Delete posts',
'DELETE_USER' => 'Delete user',
'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered',
- 'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced re-activation',
+ 'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced re-activation.',
'FOUNDER' => 'Founder',
- 'FOUNDER_EXPLAIN' => 'Founders can never be banned, deleted or altered by non-founder members',
+ 'FOUNDER_EXPLAIN' => 'Founders have all admin permissions and can never be banned, deleted or altered by non-founder members',
'GROUP_DEFAULT' => 'Default',
'GROUP_DELETE' => 'Delete',
@@ -72,10 +81,10 @@ $lang = array_merge($lang, array(
'SELECT_FORM' => 'Select form',
'SELECT_USER' => 'Select User',
- 'USER_ADMIN' => 'User Administration',
+ 'USER_ADMIN' => 'User administration',
'USER_ADMIN_ACTIVATE' => 'Activate account',
- 'USER_ADMIN_ACTIVATED' => 'User activated successfully',
- 'USER_ADMIN_AVATAR_REMOVED' => 'Successfully removed avatar from user account',
+ 'USER_ADMIN_ACTIVATED' => 'User activated successfully.',
+ 'USER_ADMIN_AVATAR_REMOVED' => 'Successfully removed avatar from user account.',
'USER_ADMIN_BAN_EMAIL' => 'Ban by email',
'USER_ADMIN_BAN_EMAIL_REASON' => 'Email address banned via user management',
'USER_ADMIN_BAN_IP' => 'Ban by IP',
@@ -83,7 +92,7 @@ $lang = array_merge($lang, array(
'USER_ADMIN_BAN_NAME_REASON' => 'Username banned via user management',
'USER_ADMIN_BAN_USER' => 'Ban by username',
'USER_ADMIN_DEACTIVATE' => 'Deactivate account',
- 'USER_ADMIN_DEACTIVED' => 'User deactivated successfully',
+ 'USER_ADMIN_DEACTIVED' => 'User deactivated successfully.',
'USER_ADMIN_DEL_ATTACH' => 'Delete all attachments',
'USER_ADMIN_DEL_AVATAR' => 'Delete avatar',
'USER_ADMIN_DEL_POSTS' => 'Delete all posts',
@@ -91,24 +100,25 @@ $lang = array_merge($lang, array(
'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options. To modify the users permissions please use the user and group permissions system.',
'USER_ADMIN_FORCE' => 'Force re-activation',
'USER_ADMIN_MOVE_POSTS' => 'Move all posts',
- 'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account',
- 'USER_ATTACHMENTS_REMOVED' => 'Successfully removed all attachments made by this user',
- 'USER_AVATAR_UPDATED' => 'Successfully updated user avatars details',
+ 'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account.',
+ 'USER_ATTACHMENTS_REMOVED' => 'Successfully removed all attachments made by this user.',
+ 'USER_AVATAR_UPDATED' => 'Successfully updated user avatars details.',
'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields',
- 'USER_DELETED' => 'User deleted successfully',
+ 'USER_DELETED' => 'User deleted successfully.',
'USER_GROUP_ADD' => 'Add user to group',
'USER_GROUP_NORMAL' => 'Normal groups user is a member of',
'USER_GROUP_PENDING' => 'Groups user is in pending mode',
'USER_GROUP_SPECIAL' => 'Special groups user is a member of',
- 'USER_OVERVIEW_UPDATED' => 'User details updated',
- '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_IS_INACTIVE' => 'User is inactive',
+ 'USER_OVERVIEW_UPDATED' => 'User details updated.',
+ '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_UPDATED' => 'User profile updated',
+ 'USER_PROFILE_UPDATED' => 'User profile updated.',
'USER_RANK' => 'User Rank',
- 'USER_RANK_UPDATED' => 'User rank updated',
- 'USER_SIG_UPDATED' => 'User signature successfully updated',
+ 'USER_RANK_UPDATED' => 'User rank updated.',
+ 'USER_SIG_UPDATED' => 'User signature successfully updated.',
'USER_TOOLS' => 'Basic tools',
'WARNINGS_EXPLAIN' => 'You can directly alter the warnings this users has received.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 183f465a98..d7e4cbd50e 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
@@ -30,11 +32,11 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'TRANSLATION_INFO' => '',
- 'ENCODING' => 'iso-8859-1',
'DIRECTION' => 'ltr',
'LEFT' => 'left',
'RIGHT' => 'right',
'DATE_FORMAT' => '|d M Y|',
+ 'USER_LANG' => 'en-gb',
'1_DAY' => '1 day',
'1_MONTH' => '1 month',
@@ -52,6 +54,7 @@ $lang = array_merge($lang, array(
'ADMINISTRATOR' => 'Administrator',
'ADMINISTRATORS' => 'Administrators',
'AGE' => 'Age',
+ 'AIM' => 'AIM',
'ALLOWED' => 'Allowed',
'ALL_FILES' => 'All files',
'ALL_FORUMS' => 'All forums',
@@ -72,8 +75,8 @@ $lang = array_merge($lang, array(
'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.',
'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.',
'AVATAR_PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded',
- 'AVATAR_PHP_SIZE_NA' => 'The avatar\'s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
- 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar\'s filesize is too large, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
+ 'AVATAR_PHP_SIZE_NA' => 'The avatar’s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
+ 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
'AVATAR_URL_INVALID' => 'The URL you specified is invalid.',
'AVATAR_URL_NOT_FOUND' => 'The file specified could not be found.',
'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %1d %2s.',
@@ -81,6 +84,9 @@ $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_USER' => 'This ban has been issued on your username.',
'BBCODE_GUIDE' => 'BBCode guide',
'BCC' => 'BCC',
'BIRTHDAYS' => 'Birthdays',
@@ -96,6 +102,7 @@ $lang = array_merge($lang, array(
'CANCEL' => 'Cancel',
'CHANGE' => 'Change',
+ 'CHANGE_FONT_SIZE' => 'Change font size',
'CLICK_VIEW_PRIVMSG' => '%sGo to your inbox%s',
'CLOSE_WINDOW' => 'Close window',
'COLOUR_SWATCH' => 'Colour swatch',
@@ -107,7 +114,7 @@ $lang = array_merge($lang, array(
'CONNECTION_FAILED' => 'Connection failed',
'CONNECTION_SUCCESS' => 'Connection was successful!',
'COOKIES_DELETED' => 'All board cookies successfully deleted.',
- 'CURRENT_TIME' => 'The time is %s',
+ 'CURRENT_TIME' => 'It is currently %s',
'DAY' => 'Day',
'DAYS' => 'Days',
@@ -133,13 +140,15 @@ $lang = array_merge($lang, array(
'EDIT_POST' => 'Edit post',
'EMAIL' => 'Email',
'EMAIL_ADDRESS' => 'Email address',
- 'EMAIL_SMTP_ERROR_RESPONSE' => "Ran into problems sending Mail at <strong>Line %s</strong>. Response: %s",
+ 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending email at <strong>Line %1$s</strong>. Response: %2$s',
'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.',
'ENABLED' => 'Enabled',
'ENCLOSURE' => 'Enclosure',
'ERR_CHANGING_DIRECTORY' => 'Unable to change directory',
'ERR_CONNECTING_SERVER' => 'Error connecting to the server',
'ERR_UNABLE_TO_LOGIN' => 'Error on login. Supplied username or password wrong.',
+ 'ERR_WRONG_PATH_TO_PHPBB' => 'The phpBB path entered seems to be not valid.',
+ 'EXPAND_VIEW' => 'Expand view',
'EXTENSION' => 'Extension',
'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed',
@@ -147,6 +156,7 @@ $lang = array_merge($lang, array(
'FAQ_EXPLAIN' => 'Frequently Asked Questions',
'FILENAME' => 'Filename',
'FILESIZE' => 'Filesize',
+ 'FILEDATE' => 'Filedate',
'FILE_COMMENT' => 'File comment',
'FILE_NOT_FOUND' => 'The requested file could not be found',
'FIND_USERNAME' => 'Find a member',
@@ -208,8 +218,6 @@ $lang = array_merge($lang, array(
'G_ADMINISTRATORS' => 'Administrators',
'G_BOTS' => 'Bots',
'G_GUESTS' => 'Guests',
- 'G_INACTIVE' => 'Unapproved Users',
- 'G_INACTIVE_COPPA' => 'Unapproved COPPA Users',
'G_REGISTERED' => 'Registered Users',
'G_REGISTERED_COPPA' => 'Registered COPPA Users',
'G_GLOBAL_MODERATORS' => 'Global Moderators',
@@ -225,9 +233,12 @@ $lang = array_merge($lang, array(
'HOURS' => 'Hours',
'HOME' => 'Home',
- 'ICQ_STATUS' => 'ICQ status',
+ 'ICQ' => 'ICQ',
+ 'ICQ_STATUS' => 'ICQ status',
'IF' => 'if',
'IMAGE' => 'Image',
+ 'IMAGE_FILETYPE_INVALID' => 'Image filetype %d for mimetype %s not supported.',
+ 'IMAGE_FILETYPE_MISMATCH' => 'Image filetype mismatch: expected extension %1$s but extension %2$s given.',
'IN' => 'in',
'INDEX' => 'Index page',
'INFORMATION' => 'Information',
@@ -235,57 +246,59 @@ $lang = array_merge($lang, array(
'INVALID_DIGEST_CHALLENGE' => 'Invalid digest challenge',
'INVALID_EMAIL_LOG' => '<strong>%s</strong> possibly an invalid email address?',
'IP' => 'IP',
+ 'IP_BLACKLISTED' => 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
+ 'JABBER' => 'Jabber',
'JOINED' => 'Joined',
'JUMP_PAGE' => 'Enter the page number you wish to go to',
'JUMP_TO' => 'Jump to',
- 'JUMP_TO_PAGE' => 'Click to jump to page...',
-
- 'KB' => 'KB',
-
- 'LAST_POST' => 'Last post',
- 'LAST_UPDATED' => 'Last updated',
- 'LAST_VISIT' => 'Last visit',
- 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not availible',
- 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server',
- 'LEGEND' => 'Legend',
- 'LOCATION' => 'Location',
- 'LOCK_POST' => 'Lock Post',
- 'LOCK_POST_EXPLAIN' => 'Prevent editing',
- 'LOCK_TOPIC' => 'Lock topic',
- 'LOGIN' => 'Login',
- 'LOGIN_CHECK_PM' => 'Log in to check your private messages',
- 'LOGIN_CONFIRMATION' => 'Confirmation of login',
- 'LOGIN_CONFIRM_EXPLAIN' => 'To prevent brute forcing accounts the board administrator requires you to enter a confirmation code after a maximum amount of failed logins. 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.',
- 'LOGIN_ERROR_ATTEMPTS' => 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now have to additionally confirm the image you see below.',
+ 'JUMP_TO_PAGE' => 'Click to jump to page…',
+
+ 'KB' => 'KB',
+
+ 'LAST_POST' => 'Last post',
+ 'LAST_UPDATED' => 'Last updated',
+ 'LAST_VISIT' => 'Last visit',
+ 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not availible',
+ 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server',
+ 'LEGEND' => 'Legend',
+ 'LOCATION' => 'Location',
+ 'LOCK_POST' => 'Lock post',
+ 'LOCK_POST_EXPLAIN' => 'Prevent editing',
+ 'LOCK_TOPIC' => 'Lock topic',
+ 'LOGIN' => 'Login',
+ 'LOGIN_CHECK_PM' => 'Log in to check your private messages',
+ 'LOGIN_CONFIRMATION' => 'Confirmation of login',
+ 'LOGIN_CONFIRM_EXPLAIN' => 'To prevent brute forcing accounts the board administrator requires you to enter a confirmation code after a maximum amount of failed logins. 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.',
+ 'LOGIN_ERROR_ATTEMPTS' => 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to enter the confirm code from the image you see below.',
'LOGIN_ERROR_EXTERNAL_AUTH_APACHE' => 'You have not been authenticated by apache.',
- 'LOGIN_ERROR_PASSWORD' => 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
- 'LOGIN_ERROR_USERNAME' => 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
- 'LOGIN_FORUM' => 'To view or post in this forum you must enter its password.',
- 'LOGIN_INFO' => 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilies. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
- 'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.',
- 'LOGIN_EXPLAIN_EDIT' => 'In order to edit posts in this forum you have to be registered and logged in.',
- 'LOGOUT' => 'Logout',
- 'LOGOUT_USER' => 'Logout [ %s ]',
- 'LOG_ME_IN' => 'Log me on automatically each visit',
-
- 'MARK' => 'Mark',
- 'MARK_ALL' => 'Mark all',
- 'MARK_FORUMS_READ' => 'Mark forums read',
- 'MB' => 'MB',
- 'MCP' => 'Moderator Control Panel',
- 'MEMBERLIST' => 'Members',
+ 'LOGIN_ERROR_PASSWORD' => 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
+ 'LOGIN_ERROR_USERNAME' => 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
+ 'LOGIN_FORUM' => 'To view or post in this forum you must enter its password.',
+ 'LOGIN_INFO' => 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilities. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
+ 'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.',
+ 'LOGIN_EXPLAIN_EDIT' => 'In order to edit posts in this forum you have to be registered and logged in.',
+ 'LOGOUT' => 'Logout',
+ 'LOGOUT_USER' => 'Logout [ %s ]',
+ 'LOG_ME_IN' => 'Log me on automatically each visit',
+
+ 'MARK' => 'Mark',
+ 'MARK_ALL' => 'Mark all',
+ 'MARK_FORUMS_READ' => 'Mark forums read',
+ 'MB' => 'MB',
+ 'MCP' => 'Moderator Control Panel',
+ 'MEMBERLIST' => 'Members',
'MEMBERLIST_EXPLAIN' => 'View complete list of members',
- 'MERGE_TOPIC' => 'Merge Topic',
- 'MESSAGE' => 'Message',
- 'MESSAGES' => 'Messages',
- 'MESSAGE_BODY' => 'Message body',
- 'MINUTES' => 'Minutes',
- 'MODERATE' => 'Moderate',
- 'MODERATOR' => 'Moderator',
- 'MODERATORS' => 'Moderators',
- 'MONTH' => 'Month',
- 'MOVE' => 'Move',
+ 'MERGE_TOPIC' => 'Merge Topic',
+ 'MESSAGE' => 'Message',
+ 'MESSAGES' => 'Messages',
+ 'MESSAGE_BODY' => 'Message body',
+ 'MINUTES' => 'Minutes',
+ 'MODERATE' => 'Moderate',
+ 'MODERATOR' => 'Moderator',
+ 'MODERATORS' => 'Moderators',
+ 'MONTH' => 'Month',
+ 'MOVE' => 'Move',
'NA' => 'N/A',
'NEWEST_USER' => 'Our newest member <strong>%s%s%s</strong>',
@@ -302,35 +315,40 @@ $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.',
'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.',
+ 'NO_ACTION' => 'No action specified.',
'NO_ADMINISTRATORS' => 'No administrators assigned at this board.',
'NO_AUTH_ADMIN' => 'You do not have admin permissions and therefore not allowed to access the administration control panel.',
'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.',
- 'NO_AUTH_OPERATION' => 'You do not have the neccessary permissions to complete this operation.',
+ 'NO_AUTH_OPERATION' => 'You do not have the necessary permissions to complete this operation.',
'NO_CONNECT_TO_SMTP_HOST' => 'Could not connect to smtp host : %s : %s',
'NO_BIRTHDAYS' => 'No birthdays today',
'NO_EMAIL_MESSAGE' => 'Email message was blank',
'NO_EMAIL_RESPONSE_CODE' => 'Could not get mail server response codes',
'NO_EMAIL_SUBJECT' => 'No email subject specified',
- 'NO_FORUM' => 'The forum you selected does not exist',
+ 'NO_FORUM' => 'The forum you selected does not exist.',
'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_MEMBERS' => 'No members found for this search criteria',
'NO_MESSAGES' => 'No messages',
+ 'NO_MODE' => 'No mode specified.',
'NO_MODERATORS' => 'No moderators assigned at this board.',
'NO_NEW_MESSAGES' => 'No new messages',
'NO_NEW_PM' => '<strong>0</strong> new messages',
'NO_NEW_POSTS' => 'No new posts',
'NO_ONLINE_USERS' => 'No registered users',
'NO_POSTS' => 'No posts',
- 'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn\'t exist',
+ 'NO_POSTS_TIME_FRAME' => 'No posts exist inside this topic for the selected time frame.',
+ 'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn’t exist',
'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods',
'NO_TOPIC' => 'The requested topic does not exist.',
'NO_TOPICS' => 'There are no topics or posts in this forum.',
+ 'NO_TOPICS_TIME_FRAME' => 'No topics exist inside this forum for the selected time frame.',
'NO_UNREAD_PM' => '<strong>0</strong> unread messages',
+ 'NO_UPLOAD_FORM_FOUND' => 'Upload initiated but no valid file upload form found.',
'NO_USER' => 'The requested user does not exist.',
- 'NO_USERS' => 'The requested users do not exist',
+ 'NO_USERS' => 'The requested users do not exist.',
'NO_USER_SPECIFIED' => 'No username was specified',
'OCCUPATION' => 'Occupation',
@@ -342,36 +360,37 @@ $lang = array_merge($lang, array(
'ONLINE_USER_TOTAL' => 'In total there is <strong>%d</strong> user online :: ',
'OPTIONS' => 'Options',
- 'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
- 'PASSWORD' => 'Password',
- 'PM' => 'PM',
- 'POSTING_MESSAGE' => 'Posting message in %s',
- 'POST' => 'Post',
- 'POST_ANNOUNCEMENT' => 'Announce',
- 'POST_STICKY' => 'Sticky',
- 'POSTED' => 'Posted',
- 'POSTED_IN_FORUM' => 'in',
- 'POSTED_ON_DATE' => 'on',
- 'POSTS' => 'Posts',
- 'POSTS_UNAPPROVED' => 'At least one post in this topic has not been approved',
- 'POST_BY_AUTHOR' => 'by',
- 'POST_BY_FOE' => 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
- 'POST_DAY' => '%.2f posts per day',
- 'POST_DETAILS' => 'Post details',
- 'POST_NEW_TOPIC' => 'Post new topic',
- 'POST_PCT' => '%.2f%% of all posts',
- 'POST_PCT_ACTIVE' => '%.2f%% of your posts',
- 'POST_REPORTED' => 'Click to view report',
- 'POST_SUBJECT' => 'Post subject',
- 'POST_TIME' => 'Post time',
- 'POST_UNAPPROVED' => 'This post is waiting for approval',
- 'PREVIEW' => 'Preview',
- 'PREVIOUS' => 'Previous',
- 'PRIVACY' => 'Privacy policy',
- 'PRIVATE_MESSAGE' => 'Private Message',
- 'PRIVATE_MESSAGES' => 'Private Messages',
- 'PRIVATE_MESSAGING' => 'Private Messaging',
- 'PROFILE' => 'User Control Panel',
+ 'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
+ 'PASSWORD' => 'Password',
+ 'PLAY_QUICKTIME_FILE' => 'Play quicktime file',
+ 'PM' => 'PM',
+ 'POSTING_MESSAGE' => 'Posting message in %s',
+ 'POST' => 'Post',
+ 'POST_ANNOUNCEMENT' => 'Announce',
+ 'POST_STICKY' => 'Sticky',
+ 'POSTED' => 'Posted',
+ 'POSTED_IN_FORUM' => 'in',
+ 'POSTED_ON_DATE' => 'on',
+ 'POSTS' => 'Posts',
+ 'POSTS_UNAPPROVED' => 'At least one post in this topic has not been approved',
+ 'POST_BY_AUTHOR' => 'by',
+ 'POST_BY_FOE' => 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
+ 'POST_DAY' => '%.2f posts per day',
+ 'POST_DETAILS' => 'Post details',
+ 'POST_NEW_TOPIC' => 'Post new topic',
+ 'POST_PCT' => '%.2f%% of all posts',
+ 'POST_PCT_ACTIVE' => '%.2f%% of your posts',
+ 'POST_REPORTED' => 'Click to view report',
+ 'POST_SUBJECT' => 'Post subject',
+ 'POST_TIME' => 'Post time',
+ 'POST_UNAPPROVED' => 'This post is waiting for approval',
+ 'PREVIEW' => 'Preview',
+ 'PREVIOUS' => 'Previous',
+ 'PRIVACY' => 'Privacy policy',
+ 'PRIVATE_MESSAGE' => 'Private Message',
+ 'PRIVATE_MESSAGES' => 'Private Messages',
+ 'PRIVATE_MESSAGING' => 'Private Messaging',
+ 'PROFILE' => 'User Control Panel',
'READING_FORUM' => 'Viewing topics in %s',
'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement',
@@ -389,7 +408,7 @@ $lang = array_merge($lang, array(
'REG_USER_ONLINE' => 'There is %d registered user and ',
'REG_USER_TOTAL' => '%d registered, ',
'REMOVE' => 'Remove',
- 'REMOVE_INSTALL' => 'Please delete, move or rename the install directory.',
+ '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',
@@ -429,8 +448,11 @@ $lang = array_merge($lang, array(
'SEARCHING_FORUMS' => 'Searching forums',
'SEARCH_ACTIVE_TOPICS' => 'View active topics',
'SEARCH_FOR' => 'Search for',
+ 'SEARCH_FORUM' => 'Search this forum',
'SEARCH_NEW' => 'View new posts',
+ 'SEARCH_POSTS_BY' => 'Search posts by',
'SEARCH_SELF' => 'View your posts',
+ 'SEARCH_TOPIC' => 'Search this topic',
'SEARCH_UNANSWERED' => 'View unanswered posts',
'SECONDS' => 'Seconds',
'SELECT' => 'Select',
@@ -527,7 +549,7 @@ $lang = array_merge($lang, array(
'TOTAL_USERS_ZERO' => 'Total members <strong>0</strong>',
'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s',
- 'UNABLE_GET_IMAGE_SIZE' => 'Accessing the image was impossible or file isn\'t a valid image.',
+ 'UNABLE_GET_IMAGE_SIZE' => 'Accessing the image was impossible or file isn’t a valid image.',
'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.',
'UNKNOWN_BROWSER' => 'Unknown browser',
'UNMARK_ALL' => 'Unmark all',
@@ -542,6 +564,7 @@ $lang = array_merge($lang, array(
'USERGROUPS' => 'Groups',
'USERNAME' => 'Username',
'USERNAMES' => 'Usernames',
+ 'USER_AVATAR' => 'User avatar',
'USER_CANNOT_READ' => 'You cannot read posts in this forum',
'USER_POST' => '%d Post',
'USER_POSTS' => '%d Posts',
@@ -570,6 +593,7 @@ $lang = array_merge($lang, array(
'VIEW_TOPIC_MOVED' => 'Moved: ',
'VIEW_TOPIC_POLL' => 'Poll: ',
'VIEW_TOPIC_STICKY' => 'Sticky: ',
+ 'VISIT_WEBSITE' => 'Visit website',
'WARNINGS' => 'Warnings',
'WARN_USER' => 'Warn user',
@@ -586,6 +610,7 @@ $lang = array_merge($lang, array(
'YEAR' => 'Year',
'YES' => 'Yes',
+ 'YIM' => 'YIM',
'YOU_LAST_VISIT' => 'Last visit was: %s',
'YOU_NEW_PM' => 'A new private message is waiting for you in your Inbox',
'YOU_NEW_PMS' => 'New private messages are waiting for you in your Inbox',
@@ -593,6 +618,7 @@ $lang = array_merge($lang, array(
'datetime' => array(
'TODAY' => 'Today, ',
+ 'TOMORROW' => 'Tomorrow, ',
'YESTERDAY' => 'Yesterday, ',
'Sunday' => 'Sunday',
@@ -682,45 +708,45 @@ $lang = array_merge($lang, array(
),
'tz_zones' => array(
- '-12' => '[UTC - 12, Y] Baker Island Time',
- '-11' => '[UTC - 11, X] Niue Time, Samoa Standard Time',
- '-10' => '[UTC - 10, W] Hawaii-Aleutian Standard Time, Cook Island Time',
- '-9.5' => '[UTC - 9:30, V*] Marquesas Islands Time',
- '-9' => '[UTC - 9, V] Alaska Standard Time, Gambier Island Time',
- '-8' => '[UTC - 8, U] Pacific Standard Time',
- '-7' => '[UTC - 7, T] Mountain Standard Time',
- '-6' => '[UTC - 6, S] Central Standard Time',
- '-5' => '[UTC - 5, R] Eastern Standard Time',
- '-4' => '[UTC - 4, Q] Atlantic Standard Time',
- '-3.5' => '[UTC - 3:30, P*] Newfoundland Standard Time',
- '-3' => '[UTC - 3, P] Amazon Standard Time, Central Greenland Time',
- '-2' => '[UTC - 2, O] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
- '-1' => '[UTC - 1, N] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
- '0' => '[UTC, Z] Western European Time, Greenwich Mean Time',
- '1' => '[UTC + 1, A] Central European Time, West African Time',
- '2' => '[UTC + 2, B] Eastern European Time, Central African Time',
- '3' => '[UTC + 3, C] Moscow Standard Time, Eastern African Time',
- '3.5' => '[UTC + 3:30, C*] Iran Standard Time',
- '4' => '[UTC + 4, D] Gulf Standard Time, Samara Standard Time',
- '4.5' => '[UTC + 4:30, D*] Afghanistan Time',
- '5' => '[UTC + 5, E] Pakistan Standard Time, Yekaterinburg Standard Time',
- '5.5' => '[UTC + 5:30, E*] Indian Standard Time, Sri Lanka Time',
- '5.75' => '[UTC + 5:45, E&Dagger;] Nepal Time',
- '6' => '[UTC + 6, F] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
- '6.5' => '[UTC + 6:30, F*] Cocos Islands Time, Myanmar Time',
- '7' => '[UTC + 7, G] Indochina Time, Krasnoyarsk Standard Time',
- '8' => '[UTC + 8, H] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
- '8.75' => '[UTC + 8:45, H&Dagger;] Southeastern Western Australia Standard Time',
- '9' => '[UTC + 9, I] Japan Standard Time, Korea Standard Time, Chita Standard Time',
- '9.5' => '[UTC + 9:30, I*] Australian Central Standard Time',
- '10' => '[UTC + 10, K] Australian Eastern Standard Time, Vladivostok Standard Time',
- '10.5' => '[UTC + 10:30, K*] Lord Howe Standard Time',
- '11' => '[UTC + 11, L] Solomon Island Time, Magadan Standard Time',
- '11.5' => '[UTC + 11:30, L*] Norfolk Island Time',
- '12' => '[UTC + 12, M] New Zealand Time, Fiji Time, Kamchatka Standard Time',
- '12.75' => '[UTC + 12:45, M&Dagger;] Chatham Islands Time',
- '13' => '[UTC + 13, M*] Tonga Time, Phoenix Islands Time',
- '14' => '[UTC + 14, M&dagger;] Line Island Time',
+ '-12' => '[UTC - 12] Baker Island Time',
+ '-11' => '[UTC - 11] Niue Time, Samoa Standard Time',
+ '-10' => '[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time',
+ '-9.5' => '[UTC - 9:30] Marquesas Islands Time',
+ '-9' => '[UTC - 9] Alaska Standard Time, Gambier Island Time',
+ '-8' => '[UTC - 8] Pacific Standard Time',
+ '-7' => '[UTC - 7] Mountain Standard Time',
+ '-6' => '[UTC - 6] Central Standard Time',
+ '-5' => '[UTC - 5] Eastern Standard Time',
+ '-4' => '[UTC - 4] Atlantic Standard Time',
+ '-3.5' => '[UTC - 3:30] Newfoundland Standard Time',
+ '-3' => '[UTC - 3] Amazon Standard Time, Central Greenland Time',
+ '-2' => '[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
+ '-1' => '[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
+ '0' => '[UTC] Western European Time, Greenwich Mean Time',
+ '1' => '[UTC + 1] Central European Time, West African Time',
+ '2' => '[UTC + 2] Eastern European Time, Central African Time',
+ '3' => '[UTC + 3] Moscow Standard Time, Eastern African Time',
+ '3.5' => '[UTC + 3:30] Iran Standard Time',
+ '4' => '[UTC + 4] Gulf Standard Time, Samara Standard Time',
+ '4.5' => '[UTC + 4:30] Afghanistan Time',
+ '5' => '[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time',
+ '5.5' => '[UTC + 5:30] Indian Standard Time, Sri Lanka Time',
+ '5.75' => '[UTC + 5:45] Nepal Time',
+ '6' => '[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
+ '6.5' => '[UTC + 6:30] Cocos Islands Time, Myanmar Time',
+ '7' => '[UTC + 7] Indochina Time, Krasnoyarsk Standard Time',
+ '8' => '[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
+ '8.75' => '[UTC + 8:45] Southeastern Western Australia Standard Time',
+ '9' => '[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time',
+ '9.5' => '[UTC + 9:30] Australian Central Standard Time',
+ '10' => '[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time',
+ '10.5' => '[UTC + 10:30] Lord Howe Standard Time',
+ '11' => '[UTC + 11] Solomon Island Time, Magadan Standard Time',
+ '11.5' => '[UTC + 11:30] Norfolk Island Time',
+ '12' => '[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time',
+ '12.75' => '[UTC + 12:45] Chatham Islands Time',
+ '13' => '[UTC + 13] Tonga Time, Phoenix Islands Time',
+ '14' => '[UTC + 14] Line Island Time',
),
// The value is only an example and will get replaced by the current time on view
diff --git a/phpBB/language/en/email/admin_activate.txt b/phpBB/language/en/email/admin_activate.txt
index ea0af53880..a168ff533c 100644
--- a/phpBB/language/en/email/admin_activate.txt
+++ b/phpBB/language/en/email/admin_activate.txt
@@ -1,5 +1,4 @@
-Subject: New user account
-Charset: iso-8859-1
+Subject: Activate user account
Hello,
diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt
index 5fd5592f7c..b778496258 100644
--- a/phpBB/language/en/email/admin_send_email.txt
+++ b/phpBB/language/en/email/admin_send_email.txt
@@ -1,4 +1,3 @@
-Charset: iso-8859-1
The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt
index 3b7aa48362..0e4658b969 100644
--- a/phpBB/language/en/email/admin_welcome_activated.txt
+++ b/phpBB/language/en/email/admin_welcome_activated.txt
@@ -1,5 +1,4 @@
-Subject: Account Activated
-Charset: iso-8859-1
+Subject: Account activated
Hello {USERNAME},
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index 905e71696b..8a06683586 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -1,5 +1,4 @@
-Subject: Welcome to {SITENAME} Forums
-Charset: iso-8859-1
+Subject: Welcome to {SITENAME} ({U_BOARD})
{WELCOME_MSG}
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
index d65367e31b..b3d745ffbb 100644
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ b/phpBB/language/en/email/coppa_resend_inactive.txt
@@ -1,5 +1,4 @@
-Subject: Welcome to {SITENAME} Forums
-Charset: iso-8859-1
+Subject: Welcome to {SITENAME} ({U_BOARD})
{WELCOME_MSG}
@@ -14,7 +13,7 @@ OR mail it to:
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
-Permission to Participate at {SITENAME}
+Permission to participate at {SITENAME}
Username: {USERNAME}
Email: {EMAIL_ADDRESS}
@@ -24,7 +23,7 @@ I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD.
I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.
-Parent or Guardian
+Parent or guardian
(print your name here): _____________________
(sign here): __________________
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
index 4aac4ce5bd..3acc7e2007 100644
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ b/phpBB/language/en/email/coppa_welcome_inactive.txt
@@ -1,5 +1,4 @@
-Subject: Welcome to {SITENAME} Forums
-Charset: iso-8859-1
+Subject: Welcome to {SITENAME} ({U_BOARD})
{WELCOME_MSG}
@@ -14,7 +13,7 @@ OR mail it to:
{MAIL_INFO}
------------------------------ CUT HERE ------------------------------
-Permission to Participate at {SITENAME}
+Permission to participate at {SITENAME}
Username: {USERNAME}
Password: {PASSWORD}
@@ -25,7 +24,7 @@ I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD.
I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.
-Parent or Guardian
+Parent or guardian
(print your name here): _____________________
(sign here): __________________
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt
index 0543165627..4f65f17566 100644
--- a/phpBB/language/en/email/email_notify.txt
+++ b/phpBB/language/en/email/email_notify.txt
@@ -1,5 +1,4 @@
Subject: {SITENAME} - Email a friend
-Charset: iso-8859-1
Hello {TO_USERNAME},
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index af9e9e3bab..3252e3ae32 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -1,13 +1,12 @@
-Subject: Forum Post Notification - {FORUM_NAME}
-Charset: iso-8859-1
+Subject: Forum post notification - {FORUM_NAME}
Hello {USERNAME},
-You are receiving this email because you are watching the forum, "{FORUM_NAME}" at {SITENAME}. This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view this topic, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at {SITENAME}. This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view this topic, no more notifications will be sent until you visit the topic.
{U_NEWEST_POST}
-If you no longer wish to watch this forum you can either click the "Unsubscribe forum link" found in the forum above, or by clicking the following link:
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
{U_STOP_WATCHING_FORUM}
diff --git a/phpBB/language/en/email/group_added.txt b/phpBB/language/en/email/group_added.txt
index 4f07fdb9cd..e2a6d22ec0 100644
--- a/phpBB/language/en/email/group_added.txt
+++ b/phpBB/language/en/email/group_added.txt
@@ -1,5 +1,4 @@
Subject: You have been added to this usergroup
-Charset: iso-8859-1
Congratulations,
diff --git a/phpBB/language/en/email/group_approved.txt b/phpBB/language/en/email/group_approved.txt
index b2134f86f9..bc31d88b3e 100644
--- a/phpBB/language/en/email/group_approved.txt
+++ b/phpBB/language/en/email/group_approved.txt
@@ -1,5 +1,4 @@
Subject: Your request has been approved
-Charset: iso-8859-1
Congratulations,
diff --git a/phpBB/language/en/email/group_request.txt b/phpBB/language/en/email/group_request.txt
index 7b51823067..5b6bbcb33f 100644
--- a/phpBB/language/en/email/group_request.txt
+++ b/phpBB/language/en/email/group_request.txt
@@ -1,5 +1,4 @@
Subject: A request to join your group has been made
-Charset: iso-8859-1
Dear {USERNAME},
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
index b69e9189ae..61cd345774 100644
--- a/phpBB/language/en/email/installed.txt
+++ b/phpBB/language/en/email/installed.txt
@@ -1,5 +1,4 @@
-Subject: phpBB Installed
-Charset: iso-8859-1
+Subject: phpBB installed
Congratulations,
@@ -14,8 +13,8 @@ Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
-Useful information on your phpBB installation can be found in the docs folder of your installation and on our website - http://www.phpbb.com/support/
+Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
-We recommend that in order to stay current with software releases you subscribe to our mailing list, located at the above URL.
+In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com's mailing list, located at the above URL.
{EMAIL_SIG} \ No newline at end of file
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index 93c62fe9e2..0c64b7a40e 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -1,13 +1,12 @@
-Subject: New Topic Notification - {FORUM_NAME}
-Charset: iso-8859-1
+Subject: New topic notification - {FORUM_NAME}
Hello {USERNAME},
-You are receiving this email because you are watching the forum, "{FORUM_NAME}" at {SITENAME}. This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view forum, no more notifications will be sent until you visit the forum.
+You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at {SITENAME}. This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view forum, no more notifications will be sent until you visit the forum.
{U_FORUM}
-If you no longer wish to watch this forum you can either click the "Unsubscribe forum link" found in the forum above, or by clicking the following link:
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
{U_STOP_WATCHING_FORUM}
diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt
index 3d7c4902c5..3c8ef03a3e 100644
--- a/phpBB/language/en/email/post_approved.txt
+++ b/phpBB/language/en/email/post_approved.txt
@@ -1,11 +1,10 @@
-Subject: Post Approved - {POST_SUBJECT}
-Charset: iso-8859-1
+Subject: Post approved - {POST_SUBJECT}
Hello {USERNAME},
-You are receiving this email because your post "{POST_SUBJECT}" at {SITENAME} was approved by a moderator or admin.
+You are receiving this notification because your post "{POST_SUBJECT}" at {SITENAME} was approved by a moderator or administrator.
-If you want to view the post click the following link:
+If you want to view the post, click the following link:
{U_VIEW_POST}
If you want to view the topic, click the following link:
diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt
index c6055cb28e..f9adc3e546 100644
--- a/phpBB/language/en/email/post_disapproved.txt
+++ b/phpBB/language/en/email/post_disapproved.txt
@@ -1,9 +1,8 @@
-Subject: Post Disapproved - {POST_SUBJECT}
-Charset: iso-8859-1
+Subject: Post disapproved - {POST_SUBJECT}
Hello {USERNAME},
-You are receiving this email because your post "{POST_SUBJECT}" at {SITENAME} was disapproved by a moderator or admin.
+You are receiving this notification because your post "{POST_SUBJECT}" at {SITENAME} was disapproved by a moderator or administrator.
The following reason was given for the disapproval:
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
index 7dae75ecc9..d363df7973 100644
--- a/phpBB/language/en/email/privmsg_notify.txt
+++ b/phpBB/language/en/email/privmsg_notify.txt
@@ -1,5 +1,4 @@
-Subject: New Private Message has arrived
-Charset: iso-8859-1
+Subject: New private message has arrived
Hello {USERNAME},
diff --git a/phpBB/language/en/email/profile_send_email.txt b/phpBB/language/en/email/profile_send_email.txt
index 00dcde1e46..5dd8fd0e9c 100644
--- a/phpBB/language/en/email/profile_send_email.txt
+++ b/phpBB/language/en/email/profile_send_email.txt
@@ -1,4 +1,3 @@
-Charset: iso-8859-1
Hello {TO_USERNAME},
diff --git a/phpBB/language/en/email/profile_send_im.txt b/phpBB/language/en/email/profile_send_im.txt
index 5220bdd906..d2fea692a0 100644
--- a/phpBB/language/en/email/profile_send_im.txt
+++ b/phpBB/language/en/email/profile_send_im.txt
@@ -1,4 +1,3 @@
-Charset: iso-8859-1
Hello {TO_USERNAME},
diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt
index 7da2026fb3..f7c63527da 100644
--- a/phpBB/language/en/email/report_closed.txt
+++ b/phpBB/language/en/email/report_closed.txt
@@ -1,9 +1,8 @@
-Subject: Report Closed - {POST_SUBJECT}
-Charset: iso-8859-1
+Subject: Report closed - {POST_SUBJECT}
Hello {USERNAME},
-You are receiving this email because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was handled by a moderator or by an admin. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
+You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
{EMAIL_SIG} \ No newline at end of file
diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt
index 9fed2a590f..f8e32c88ab 100644
--- a/phpBB/language/en/email/report_deleted.txt
+++ b/phpBB/language/en/email/report_deleted.txt
@@ -1,9 +1,8 @@
-Subject: Report Closed - {POST_SUBJECT}
-Charset: iso-8859-1
+Subject: Report deleted - {POST_SUBJECT}
Hello {USERNAME},
-You are receiving this email because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was deleted by a moderator or by an admin.
+You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was deleted by a moderator or by an administrator.
{EMAIL_SIG} \ No newline at end of file
diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt
index 28927b5a29..3b9bd34b0e 100644
--- a/phpBB/language/en/email/topic_approved.txt
+++ b/phpBB/language/en/email/topic_approved.txt
@@ -1,9 +1,8 @@
-Subject: Topic Approved - {TOPIC_TITLE}
-Charset: iso-8859-1
+Subject: Topic approved - {TOPIC_TITLE}
Hello {USERNAME},
-You are receiving this email because your topic "{TOPIC_TITLE}" at {SITENAME} was approved by a moderator or admin.
+You are receiving this notification because your topic "{TOPIC_TITLE}" at {SITENAME} was approved by a moderator or administrator.
If you want to view the topic, click the following link:
{U_VIEW_TOPIC}
diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt
index 52c1578861..fe417a0a1b 100644
--- a/phpBB/language/en/email/topic_disapproved.txt
+++ b/phpBB/language/en/email/topic_disapproved.txt
@@ -1,9 +1,8 @@
-Subject: Topic Disapproved - {TOPIC_TITLE}
-Charset: iso-8859-1
+Subject: Topic disapproved - {TOPIC_TITLE}
Hello {USERNAME},
-You are receiving this email because your topic "{TOPIC_TITLE}" at {SITENAME} was disapproved by a moderator or admin.
+You are receiving this notification because your topic "{TOPIC_TITLE}" at {SITENAME} was disapproved by a moderator or administrator.
The following reason was given for the disapproval:
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index 274fe0995a..fcfb9c63af 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -1,9 +1,8 @@
-Subject: Topic Reply Notification - {TOPIC_TITLE}
-Charset: iso-8859-1
+Subject: Topic reply notification - {TOPIC_TITLE}
Hello {USERNAME},
-You are receiving this email because you are watching the topic, "{TOPIC_TITLE}" at {SITENAME}. This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at {SITENAME}. This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
If you want to view the newest post made since your last visit, click the following link:
{U_NEWEST_POST}
@@ -11,7 +10,7 @@ If you want to view the newest post made since your last visit, click the follow
If you want to view the topic, click the following link:
{U_TOPIC}
-If you no longer wish to watch this topic you can either click the "Stop watching this topic link" found at the bottom of the topic above, or by clicking the following link:
+If you no longer wish to watch this topic you can either click the "Stop watching this topic" link found at the bottom of the topic above, or by clicking the following link:
{U_STOP_WATCHING_TOPIC}
diff --git a/phpBB/language/en/email/user_activate.txt b/phpBB/language/en/email/user_activate.txt
index 0adeb5bff2..7d7960c4c5 100644
--- a/phpBB/language/en/email/user_activate.txt
+++ b/phpBB/language/en/email/user_activate.txt
@@ -1,5 +1,4 @@
Subject: Reactivate your account
-Charset: iso-8859-1
Hello {USERNAME},
diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt
index 439437940f..cbef5c780c 100644
--- a/phpBB/language/en/email/user_activate_inactive.txt
+++ b/phpBB/language/en/email/user_activate_inactive.txt
@@ -1,5 +1,4 @@
Subject: Your account has been deactivated
-Charset: iso-8859-1
Hello {USERNAME},
diff --git a/phpBB/language/en/email/user_activate_passwd.txt b/phpBB/language/en/email/user_activate_passwd.txt
index 0c2adc82ec..76a7f88930 100644
--- a/phpBB/language/en/email/user_activate_passwd.txt
+++ b/phpBB/language/en/email/user_activate_passwd.txt
@@ -1,9 +1,8 @@
Subject: New password activation
-Charset: iso-8859-1
Hello {USERNAME}
-You are receiving this email because you have (or someone pretending to be you has) requested a new password be sent for your account on {SITENAME}. If you did not request this email then please ignore it, if you keep receiving it please contact the board administrator.
+You are receiving this notification because you have (or someone pretending to be you has) requested a new password be sent for your account on {SITENAME}. If you did not request this email then please ignore it, if you keep receiving it please contact the board administrator.
To use the new password you need to activate it. To do this click the link provided below.
diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt
index be0cf3e76b..806f9f3a63 100644
--- a/phpBB/language/en/email/user_remind_inactive.txt
+++ b/phpBB/language/en/email/user_remind_inactive.txt
@@ -1,5 +1,4 @@
Subject: Inactive account reminder
-Charset: iso-8859-1
Hello {USERNAME},
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
index bc4dd02d2d..3a35c53dd4 100644
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -1,5 +1,4 @@
-Subject: Welcome to {SITENAME} Forums
-Charset: iso-8859-1
+Subject: Welcome to {SITENAME} ({U_BOARD})
{WELCOME_MSG}
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
index 42dc56df3b..6a911d90a2 100644
--- a/phpBB/language/en/email/user_welcome.txt
+++ b/phpBB/language/en/email/user_welcome.txt
@@ -1,5 +1,4 @@
-Subject: Welcome to {SITENAME} Forums
-Charset: iso-8859-1
+Subject: Welcome to {SITENAME} ({U_BOARD})
{WELCOME_MSG}
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
index 6ece2d4faf..4575c7e7bb 100644
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ b/phpBB/language/en/email/user_welcome_inactive.txt
@@ -1,5 +1,4 @@
-Subject: Welcome to {SITENAME} Forums
-Charset: iso-8859-1
+Subject: Welcome to {SITENAME} ({U_BOARD})
{WELCOME_MSG}
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index 07b566f3fe..a936058162 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -35,23 +37,23 @@ $lang = array_merge($lang, array(
'CHANGED_DEFAULT_GROUP' => 'Successfully changed default group',
'GROUP_AVATAR' => 'Group avatar',
- 'GROUP_CHANGE_DEFAULT' => 'Are you sure you want to change your default membership to the group "%s"?',
+ 'GROUP_CHANGE_DEFAULT' => 'Are you sure you want to change your default membership to the group “%s”?',
'GROUP_CLOSED' => 'Closed',
'GROUP_DESC' => 'Group description',
'GROUP_HIDDEN' => 'Hidden',
- 'GROUP_INFORMATION' => 'Usergroup Information',
+ 'GROUP_INFORMATION' => 'Usergroup information',
'GROUP_IS_CLOSED' => 'This is a closed group, new members cannot automatically join.',
'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.',
'GROUP_IS_SPECIAL' => 'This is a special group, special groups are managed by the board administrators.',
- 'GROUP_JOIN' => 'Join Group',
+ 'GROUP_JOIN' => 'Join group',
'GROUP_JOIN_CONFIRM' => 'Are you sure you want to join the selected group?',
'GROUP_JOIN_PENDING' => 'Request to join group',
'GROUP_JOIN_PENDING_CONFIRM' => 'Are you sure you want to request joining the selected group?',
'GROUP_JOINED' => 'Successfully joined selected group',
'GROUP_JOINED_PENDING' => 'Successfully requested group membership. Please wait for a group leader to approve your membership.',
- 'GROUP_LIST' => 'Manage Users',
+ 'GROUP_LIST' => 'Manage users',
'GROUP_MEMBERS' => 'Group members',
'GROUP_NAME' => 'Group name',
'GROUP_OPEN' => 'Open',
@@ -64,6 +66,7 @@ $lang = array_merge($lang, array(
'GROUP_RESIGNED_PENDING' => 'Your pending membership was successfully removed from the selected group',
'GROUP_TYPE' => 'Group type',
'GROUP_UNDISCLOSED' => 'Hidden group',
+ 'FORUM_UNDISCLOSED' => 'Moderating hidden forum(s)',
'LOGIN_EXPLAIN_GROUP' => 'You need to login to view group details',
@@ -76,7 +79,7 @@ $lang = array_merge($lang, array(
'REMOVE_SELECTED' => 'Remove selected',
- 'USER_GROUP_CHANGE' => 'From "%1$s" group to "%2$s"',
+ 'USER_GROUP_CHANGE' => 'From “%1$s” group to “%2$s”',
'USER_GROUP_DEMOTE' => 'Demote leadership',
'USER_GROUP_DEMOTE_CONFIRM' => 'Are you sure you want to demote as group leader from the selected group?',
'USER_GROUP_DEMOTED' => 'Successfully demoted your leadership.',
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index a2c1600193..ada28713e0 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -13,7 +13,9 @@
/**
*/
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -46,7 +48,7 @@ $help = array(
),
array(
0 => 'Can I combine formatting tags?',
- 1 => 'Yes, of course you can, for example to get someones attention you may write:<br /><br /><strong>[size=18][color=red][b]</strong>LOOK AT ME!<strong>[/b][/color][/size]</strong><br /><br />this would output <span style="color:red;font-size:18px;"><strong>LOOK AT ME!</strong></span><br /><br />We don\'t recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><strong>[b][u]</strong>This is wrong<strong>[/b][/u]</strong>'
+ 1 => 'Yes, of course you can, for example to get someones attention you may write:<br /><br /><strong>[size=18][color=red][b]</strong>LOOK AT ME!<strong>[/b][/color][/size]</strong><br /><br />this would output <span style="color:red;font-size:18px;"><strong>LOOK AT ME!</strong></span><br /><br />We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><strong>[b][u]</strong>This is wrong<strong>[/b][/u]</strong>'
),
array(
0 => '--',
@@ -86,7 +88,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!). There is currently no way of storing images locally with phpBB (all these issues are expected to be addressed in the next release of phpBB). 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/images/phplogo.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, eg.<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/images/phplogo.gif<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.phpbb.com/" target="_blank"><img src="http://www.phpbb.com/images/phplogo.gif" border="0" alt="" /></a><br />'
+ 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!). There is currently no way of storing images locally with phpBB (all these issues are expected to be addressed in the next release of phpBB). 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/images/phplogo.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, eg.<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/images/phplogo.gif<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.phpbb.com/" target="_blank"><img src="http://www.phpbb.com/images/phplogo.gif" alt="" /></a><br />'
),
array(
0 => '--',
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 31d9a8f5fd..a9dba1a1d6 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -13,7 +13,9 @@
/**
*/
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -29,44 +31,56 @@ $help = array(
1 => 'Login and Registration Issues'
),
array(
- 0 => 'Why can\'t I login?',
- 1 => 'Have you registered? Seriously, you must register in order to login. Have you been banned from the board (a message will be displayed if you have)? If so then you should contact the webmaster or board administrator to find out why. If you have registered and are not banned and you still cannot login then check and double check your username and password. Usually this is the problem, if not then contact the board administrator they may have incorrect configuration settings for the board.'
+ 0 => 'Why can’t I login?',
+ 1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.'
),
array(
0 => 'Why do I need to register at all?',
- 1 => 'You may not have too, it is up to the administrator of the board as to whether you need to register in order to post messages. However registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.'
+ 1 => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.'
),
array(
0 => 'Why do I get logged off automatically?',
- 1 => 'If you do not check the <i>Log me in automatically</i> box when you login the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in check the box during login, this is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university cluster, etc.'
+ 1 => 'If you do not check the <em>Log me in automatically</em> box when you login the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in check the box during login, this is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this check box, it means your administrator has disabled this feature.'
),
array(
0 => 'How do I prevent my username appearing in the online user listings?',
- 1 => 'In your profile you will find an option <i>Hide your online status</i>, if you switch this <i>on</i> you\'ll only appear to board administrators or to yourself. You will be counted as a hidden user.'
+ 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.'
),
array(
- 0 => 'I\'ve lost my password!',
- 1 => 'Don\'t panic! While your password cannot be retrieved it can be reset. To do this go to the login page and click <u>I\'ve forgotten my password</u>, follow the instructions and you should be back online in no time'
+ 0 => 'I’ve lost my password!',
+ 1 => 'Don’t panic! While your password cannot be retrieved, it can be reset. To do this go to the login page and click <em>I’ve forgotten my password</em>, follow the instructions and you should be able to log in again in no time.'
),
array(
0 => 'I registered but cannot login!',
- 1 => 'Firstly check your are entering the correct username and password. If they are okay then one of two things may have happened. If COPPA support is enabled and you clicked the <u>I am under 13 years old</u> link while registering then you will have to follow the instructions you received. If this is not the case then does your account need activating? Some boards will require all new registrations be activated, either by yourself or by the administrator before you can logon. When you registered it would have told you whether activation was required. If you were sent an email then follow the instructions, if you did not receive the email then are you sure your email address is valid? One reason activation is used is to reduce the possibility of <i>rouge</i> users abusing the board anonymously. If you are sure the email address you used is valid then try contacting the board administrator.'
+ 1 => 'Firstly check your are entering the correct username and password. If they are okay then one of two things may have happened. If COPPA support is enabled and you clicked the <em>I am under 13 years old</em> link while registering then you will have to follow the instructions you received. If this is not the case then does your account need activating? Some boards will require all new registrations be activated, either by yourself or by the administrator before you can logon. When you registered it would have told you whether activation was required. If you were sent an email then follow the instructions, if you did not receive the email then are you sure your email address is valid? One reason activation is used is to reduce the possibility of <em>rogue</em> users abusing the board anonymously. If you are sure the email address you used is valid then try contacting the board administrator.'
),
array(
0 => 'I registered in the past but cannot login any more?!',
1 => 'The most likely reasons for this are; you entered an incorrect username or password (check the email you were sent when you first registered) or the administrator has deleted your account for some reason. If it is the later case then perhaps you did not post anything? It is usual for boards to periodically remove users who have not posted anything so as to reduce the size of the database. Try registering again and get involved in discussions.'
),
array(
+ 0 => 'What is COPPA?',
+ 1 => 'COPPA, or Child Online Privacy and Protection Act of 1998 is a law in the United States that requires website that can potentially collect information from minors under the age of 13 to have written parental consent, or some other method of the legal guardians acknowledging they are allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register, or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Team cannot provide legal advice and are not the point of contact for legal concerns of any kind, except as outlined below.',
+ ),
+ array(
+ 0 => 'Why can’t I register?',
+ 1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact the board administrator for assistance.',
+ ),
+ array(
+ 0 => 'What does the “Delete all board cookies” do?',
+ 1 => 'Delete all board cookies deletes the cookies created by phpBB3 which keeps you authenticated and logged into the board, and also provides functions such as read tracking if set by the board owner.',
+ ),
+ array(
0 => '--',
1 => 'User Preferences and settings'
),
array(
0 => 'How do I change my settings?',
- 1 => 'All your settings (if you are registered) are stored in the database. To alter them click the <u>Profile</u> link (generally shown at the top of pages but this may not be the case). This will allow you to change all your settings'
+ 1 => 'All your settings (if you are registered) are stored in the database. To alter them click the <em>UCP</em> link (generally shown at the top of pages but this may not be the case). This will allow you to change all your settings and preferences.'
),
array(
0 => 'The times are not correct!',
- 1 => 'The times are almost certainly correct, however what you may be seeing are times displayed in a timezone different from the one you are in. If this is the case you should change your profile setting for the timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings can only be done by registered users. So if you are not registered this is a good time to do so, if you pardon the pun!'
+ 1 => 'Though there are rare occurrences of the website’s server having the wrong time, the times are probably correct. However; what you may be seeing are times displayed in a timezone different from the one you are in. If this is the case you should change your profile setting for the timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings can only be done by registered users. So if you are not registered this is a good time to do so, if you pardon the pun!'
),
array(
0 => 'I changed the timezone and the time is still wrong!',
@@ -74,11 +88,11 @@ $help = array(
),
array(
0 => 'My language is not in the list!',
- 1 => 'The most likely reasons for this are either the administrator did not install your language or someone has not translated this board into your language. Try asking the board administrator if they can install the language pack you need, if it does not exist then please feel free to create a new translation. More information can be found at the phpBB Group website (see link at bottom of pages)'
+ 1 => 'The most likely reasons for this are either the administrator did not install your language or someone has not translated this board into your language. Try asking the board administrator if they can install the language pack you need, if it does not exist then please feel free to create a new translation. More information can be found at the phpBB Group website (see link at bottom of pages).'
),
array(
0 => 'How do I show an image below my username?',
- 1 => 'There may be two images below a username when viewing posts. The first is an image associated with your rank, generally these take the form of stars or blocks indicating how many posts you have made or your status on the forums. Below this may be a larger image known as an avatar, this is generally unique or personal to each user. It is up to the board administrator to enable avatars and they have a choice over the way in which avatars can be made available. If you are unable to use avatars then this is the decision of the board admin, you should ask them their reasons (we\'re sure they\'ll be good!)'
+ 1 => 'There may be two images below a username when viewing posts. The first is an image associated with your rank, generally these take the form of stars or blocks indicating how many posts you have made or your status on the board. Below this may be a larger image known as an avatar, this is generally unique or personal to each user. It is up to the board administrator to enable avatars and they have a choice over the way in which avatars can be made available. If you are unable to use avatars then this is the decision of the board admin, you should ask them their reasons.'
),
array(
0 => 'How do I change my rank?',
@@ -94,33 +108,57 @@ $help = array(
),
array(
0 => 'How do I post a topic in a forum?',
- 1 => 'Easy, click the relevant button on either the forum or topic screens. You may need to register before you can post a message, the facilities available to you are listed at the bottom of the forum and topic screens (the <i>You can post new topics, You can vote in polls, etc.</i> list)'
+ 1 => 'To post a new topic in one of the forums, click the relevant button on either the forum or topic screens. You may need to register before you can post a message, the facilities available to you are listed at the bottom of the forum and topic screens (the <em>You can post new topics, You can vote in polls, etc.</em> list).'
),
array(
0 => 'How do I edit or delete a post?',
- 1 => 'Unless you are the board admin or forum moderator you can only edit or delete your own posts. You can edit a post (sometimes for only a limited time after it was made) by clicking the <i>edit</i> button for the relevant post. If someone has already replied to the post you will find a small piece of text output below the post when you return to the topic, this lists the number of times you edited it. This will only appear if no one has replied, it also will not appear if moderators or administrators edit the post (they should leave a message saying what they altered and why). Please note that normal users cannot delete a post once someone has replied.'
+ 1 => 'Unless you are the board admin or forum moderator you can only edit or delete your own posts. You can edit a post (sometimes for only a limited time after it was made) by clicking the <em>edit</em> button for the relevant post. If someone has already replied to the post you will find a small piece of text output below the post when you return to the topic, this lists the number of times you edited it. This will only appear if no one has replied, it also will not appear if moderators or administrators edit the post (they should leave a message saying what they altered and why). Please note that normal users cannot delete a post once someone has replied.'
),
array(
0 => 'How do I add a signature to my post?',
- 1 => 'To add a signature to a post you must first create one, this is done via your profile. Once created you can check the <i>Add Signature</i> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio box in your profile (you can still prevent a signature being added to individual posts by un-checking the add signature box on the posting form)'
+ 1 => 'To add a signature to a post you must first create one, this is done via your profile. Once created you can check the <em>Add Signature</em> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio box in your profile (you can still prevent a signature being added to individual posts by un-checking the add signature box on the posting form).'
),
array(
0 => 'How do I create a poll?',
- 1 => 'Creating a poll is easy, when you post a new topic (or edit the first post of a topic, if you have permission) you should see a <i>Add Poll</i> form below the main posting box (if you cannot see this then you probably do not have rights to create polls). You should enter a title for the poll and then at least two options (to set an option type in the poll question and click the <i>Add option</i> button. You can also set a time limit for the poll, 0 is an infinite poll. There will be a limit to the number of options you can list, this is set by the board administrator'
+ 1 => 'Creating a poll is easy, when you post a new topic (or edit the first post of a topic, if you have permission) you should see an <em>Add Poll</em> form below the main posting box (if you cannot see this then you probably do not have rights to create polls). You should enter a title for the poll and then at least two options (to set an option type in the poll question and click the <em>Add option</em> button. You can also set a time limit for the poll, 0 is an infinite poll. There will be a limit to the number of options you can list, this is set by the board administrator.'
),
array(
0 => 'How do I edit or delete a poll?',
1 => 'As with posts, polls can only be edited by the original poster, a moderator or board admin. To edit a poll click the first post in the topic (this always has the poll associated with it). If no one has cast a vote then users can delete the poll or edit any poll option, however if people have already placed votes only moderators or administrators can edit or delete it. This is to prevent people rigging polls by changing options mid-way through a poll'
),
array(
- 0 => 'Why can\'t I access a forum?',
- 1 => 'Some forums may be limited to certain users or groups. To view, read, post, etc. you may need special authorisation, only the forum moderator and board admin can grant this access, you should contact them.'
+ 0 => 'Why can’t I access a forum?',
+ 1 => 'Some forums may be limited to certain users or groups. To view, read, post, etc. you may need special authorization, only the forum moderator and board admin can grant this access, you should contact them.'
),
array(
- 0 => 'Why can\'t I vote in polls?',
+ 0 => 'Why can’t I vote in polls?',
1 => 'Only registered users can vote in polls (so as to prevent spoofing of results). If you have registered and still cannot vote then you probably do not have appropriate access rights.'
),
array(
+ 0 => 'Why can’t I add attachements?',
+ 1 => 'The ability to add attachments can be done on a per forum, per group, or per user basis. The board administrator may not have allowed attachments to be added for the specific forum you are posting in, or perhaps only the administrator group can post attachments. Contact the board administrator if you are unsure about why you are unable to add attachments.'
+ ),
+ array(
+ 0 => 'Why did I receieve a warning?',
+ 1 => 'Each board administrator has their own set of rules for their site. If they feel you have broken one of your rules, they may issue you a warning. Please note that this is the board administrator’s decision, and the phpBB Group does not have anything to do with the warning on the given site.'
+ ),
+ array(
+ 0 => 'How can I report posts to a moderator?',
+ 1 => 'If the board administrator has allowed it, go to the post you want to report and you should see a button that is for reporting posts. Clicking this will walk you through the steps necessary to report the post.'
+ ),
+ array(
+ 0 => 'What is the “Save” button for in topic posting?',
+ 1 => 'This allows you to save messages to be completed and submitted at a later date. To reload them, go to the User Control Panel and follow the self explanatory options there.'
+ ),
+ array(
+ 0 => 'Why does my post need to be approved?',
+ 1 => 'The board administrator may decide that the forum you are posting to needs to have posts reviewed first. It is also possible that the administrator has placed you in to a group of users whom he or she feels is a group that needs to have their posts reviewed before being submitted to the site. Please contact the board administrator for further details.'
+ ),
+ array(
+ 0 => 'How do I bump my topic?',
+ 1 => 'By clicking the “Bump topic” link when you are viewing it, you can “bump” the topic to the top of the forum on the first page. However, if you do not see this, then topic bumping is disabled. It is also possible to bump the topic simply by replying to it. However, be sure to follow the rules of the site you are visiting.'
+ ),
+ array(
0 => '--',
1 => 'Formatting and Topic Types'
),
@@ -130,39 +168,47 @@ $help = array(
),
array(
0 => 'Can I use HTML?',
- 1 => '...'
+ 1 => 'No. It is not possible to post HTML on this board and have it rendered as HTML. Most formatting which can be carried out using HTML can also be applied using BBCode instead.'
+ ),
+ array(
+ 0 => 'What are Smilies?',
+ 1 => 'Smilies, or Emoticons are small graphical images which can be used to express some feeling using a short code, e.g. :) means happy, :( means sad. The full list of emoticons can be seen via the posting form. Try not to overuse smileys though, they can quickly render a post unreadable and a moderator may decide to edit them out or remove the post altogether.'
),
array(
- 0 => 'What are Smileys?',
- 1 => 'Smileys, or Emoticons are small graphical images which can be used to express some feeling using a short code, e.g. :) means happy, :( means sad. The full list of emoticons can be seen via the posting form. Try not to overuse smileys though, they can quickly render a post unreadable and a moderator may decide to edit them out or remove the post altogether'
+ 0 => 'Can I post images?',
+ 1 => 'Yes, images can be shown in your posts. However; if the administrator has allowed attachments, you may be able to upload the image to the board. Otherwise, you must link to an image stored on a publicly accessible web server, e.g. http://www.example.com/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor images stored behind authentication mechanisms, e.g. hotmail or yahoo mailboxes, password protected sites, etc. To display the image use the BBCode [img] tag.'
),
array(
- 0 => 'Can I post Images?',
- 1 => 'Images can indeed be shown in your posts. However, there is no facility at present for uploading images directly to this board. Therefore you must link to an image stored on a publicly accessible web server, e.g. http://www.some-unknown-place.net/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor images stored behind authentication mechanisms, e.g. hotmail or yahoo mailboxes, password protected sites, etc. To display the image use either the BBCode [img] tag or appropriate HTML (if allowed).'
+ 0 => 'What are global announcements?',
+ 1 => 'Global announcements contain important information and you should read them as soon as possible. Global announcements will appear at the top of every forum and also within your User Control Panel. Whether or not you can post a gloabl announcement depends on the permissions required, these are set by the administrator.'
),
array(
- 0 => 'What are Announcements?',
- 1 => 'Announcements often contain important information and you should read them as soon as possible. Announcements appear at the top of every page in the forum to which they are posted. Whether or not you can post an announcement depends on the permissions required, these are set by the administrator.'
+ 0 => 'What are announcements?',
+ 1 => 'Announcements often contain important information for the forum you are currently reading and you should read them as soon as possible. Announcements appear at the top of every page in the forum to which they are posted. As with global announcements, whether or not you can post an announcement depends on the permissions required, these are set by the administrator.'
),
array(
- 0 => 'What are Sticky topics?',
+ 0 => 'What are sticky topics?',
1 => 'Sticky topics appear below any announcements in viewforum and only on the first page. They are often quite important so you should read them where possible. As with announcements the board administrator determines what permissions are required to post sticky topics in each forum.'
),
array(
- 0 => 'What are Locked topics?',
+ 0 => 'What are locked topics?',
1 => 'Locked topics are set this way by either the forum moderator or board administrator. You cannot reply to locked topics and any poll it contained is automatically ended. Topics may be locked for many reasons.'
),
array(
+ 0 => 'What are topic icons?',
+ 1 => 'Topic icons are images which can be assosciated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the administrator.'
+ ),
+ array(
0 => '--',
1 => 'User Levels and Groups'
),
array(
0 => 'What are Administrators?',
- 1 => 'Administrators are people assigned the highest level of control over the entire board. These people can control all facets of board operation which includes setting permissions, banning users, creating usergroups or moderators, etc. They also have full moderator capabilities in all the forums.'
+ 1 => 'Administrators are people assigned the highest level of control over the entire board. These people can control all facets of board operation which includes setting permissions, banning users, creating usergroups or moderators, etc, dependant on the board founder and what permissions he or she has given the other administrators. They can also have full moderator capabilities in all the forums, depending on what the board founder has allowed.'
),
array(
0 => 'What are Moderators?',
- 1 => 'Moderators are individuals (or groups of individuals) whose job it is to look after the running of the forums from day to day. They have the power to edit or delete posts and lock, unlock, move, delete and split topics in the forum they moderate. Generally moderators are there to prevent people going <i>off-topic</i> or posting abusive or offensive material.'
+ 1 => 'Moderators are individuals (or groups of individuals) whose job it is to look after the running of the forums from day to day. They have the power to edit or delete posts and lock, unlock, move, delete and split topics in the forum they moderate. Generally moderators are there to prevent people going <em>off-topic</em> or posting abusive or offensive material.'
),
array(
0 => 'What are Usergroups?',
@@ -170,11 +216,23 @@ $help = array(
),
array(
0 => 'How do I join a Usergroup?',
- 1 => 'To join a usergroup click the usergroup link on the page header (dependent on template design), you can then view all usergroups. Not all groups are <i>open access</i>, some are closed and some may even have hidden memberships. If the board is open then you can request to join it by clicking the appropriate button. The user group moderator will need to approve your request, they may ask why you want to join the group. Please do not pester a group moderator if they turn your request down, they will have their reasons.'
+ 1 => 'To join a Usergroup click the Usergroup link within your User Control Panel, you can then view all usergroups. Not all groups are <em>open access</em>, some may require approval to join, some are closed and some may even have hidden memberships. If the group is open then you can join it by clicking the appropriate button. If a group requires approval to join you may request to join it by clicking the appropriate button. The user group moderator will need to approve your request, they may ask why you want to join the group. Please do not pester a group moderator if they turn your request down, they will have their reasons.'
),
array(
0 => 'How do I become a Usergroup Moderator?',
- 1 => 'Usergroups are initially created by the board admin, they also assign a board moderator. If you are interested in creating a usergroup then your first point of contact should be the admin, try dropping them a private message.'
+ 1 => 'When Usergroups are initially created by the board administrator, they also assign a Usergroup moderator. If you are interested in creating a Usergroup then your first point of contact should be the administrator, try sending them a private message.'
+ ),
+ array(
+ 0 => 'Why do some Usergroups appear in a different colour?',
+ 1 => 'It is possible for the board administrator to assign a colour to the members of a usergroup to make it easy to identify the members of this group.'
+ ),
+ array(
+ 0 => 'What is a “Default Usergroup”?',
+ 1 => 'If you are a member of more than one usergroup, your default is used to determine which group colour and group rank should be shown for you by default. The board administrator may grant you permission to change your default usergroup via your User Control Panel.'
+ ),
+ array(
+ 0 => 'What is “The team” link?',
+ 1 => 'This page provides you with a list of the board staff, including board administrators and moderators which includes details of which forums they moderate.'
),
array(
0 => '--',
@@ -182,11 +240,11 @@ $help = array(
),
array(
0 => 'I cannot send private messages!',
- 1 => 'There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board or the board administrator has prevented you from sending messages. If it is the later case you should try asking the administrator why.'
+ 1 => 'There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board, or the board administrator has prevented you from sending messages. If it is the latter case you should try asking the administrator why.'
),
array(
0 => 'I keep getting unwanted private messages!',
- 1 => 'In the future we will be adding an ignore list to the private messaging system. For now though if you keep receiving unwanted private messages from someone inform the board admin, they have the power to prevent a user from sending private messages at all.'
+ 1 => 'You may block a user from sending you private messages by using message rules within your User Control Panel. If you are receiving abusive private messages from someone inform the board admin, they have the power to prevent a user from sending private messages at all.'
),
array(
0 => 'I have received a spamming or abusive email from someone on this board!',
@@ -194,14 +252,78 @@ $help = array(
),
array(
0 => '--',
- 1 => 'phpBB 2 Issues'
+ 1 => 'Friends and Foes'
+ ),
+ array(
+ 0 => 'What is my Friends and Foes list?',
+ 1 => 'You can use these lists to organise other members of the forum. Members added to your friends list will be listed within your User Control Panel for quick access to see their online status and to send them private messages. Subject to template support, posts from these users may also be highlighted. If you add a user to your foes list them any posts made by them will be hidden by default.'
+ ),
+ array(
+ 0 => 'How can I add / remove users to my friends or foes list?',
+ 1 => 'You can add users to your list in two ways. Within each user’s profile, there is a link to add them to either your friend or foe list. Alternatively from your User Control Panel, you can directly add users by entering their member name. You may also remove users from your list using the same page.'
+ ),
+ array(
+ 0 => '--',
+ 1 => 'Searching the Forums'
+ ),
+ array(
+ 0 => 'How can I search the forum?',
+ 1 => 'By entering a search term in the search box located on the index view, forum view or topic view. Advanced search can be accessed by clicking the “Search” link which is available on all pages on the forum.'
+ ),
+ array(
+ 0 => 'Why does my search return no results?',
+ 1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB3. Be more specific and use the options available within Advanced search.'
+ ),
+ array(
+ 0 => 'Why does my search return a blank page!?',
+ 1 => 'Your search returned too many results for the webserver to handle. Use Advanced search and be more specific in the terms used and forums that are to be searched.'
+ ),
+ array(
+ 0 => 'How do I search for members?',
+ 1 => 'Go to the “Members” page and click the “Find a member” link. Once there, fill out the self explanatory options.'
+ ),
+ array(
+ 0 => 'How can I find my own posts and topics?',
+ 1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts” within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropiately.'
+ ),
+ array(
+ 0 => '--',
+ 1 => 'Topic Subscriptions and Bookmarks'
+ ),
+ array(
+ 0 => 'What is the difference between bookmarking and subscribing?',
+ 1 => 'Bookmarking in phpBB3 is much like bookmarking in your web browser. You aren’t necessarily alerted when there’s an update, but you can later come back to the topic. To contrast that with subscribing, subscribing will notify you when there is an update to the topic or forum on the board via your preferred method or methods.'
+ ),
+ array(
+ 0 => 'How do I subscribe to specific forums or topics?',
+ 1 => 'To subscribe to a specific forum, once you enter the forum, you will see a “Subscribe to forum” link. This will subscribe you to the forum just like you would for a topic. To subscribe to a topic, you can either reply to the topic and check the checkbox to subscribe or you can click the link that says subscribe to topic from within the topic itself.'
+ ),
+ array(
+ 0 => 'How do I remove my subscriptions?',
+ 1 => 'To remove your subscriptions, you simply go to your User Control Panel, or UCP for short, and follow the links to your subscriptions.'
+ ),
+ array(
+ 0 => '--',
+ 1 => 'Attachments'
+ ),
+ array(
+ 0 => 'What attachments are allowed on this board?',
+ 1 => 'Each board administrator can allow or disallow certain attachment types. If you are unsure what is allowed to be uploaded, contact the board administrator for assistance.'
+ ),
+ array(
+ 0 => 'How do I find all my attachments?',
+ 1 => 'To find your list of attachments that you have uploaded, go to your User Control Panel, or UCP, and follow the links to the attachments section.'
+ ),
+ array(
+ 0 => '--',
+ 1 => 'phpBB 3 Issues'
),
array(
0 => 'Who wrote this bulletin board?',
1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="http://www.phpbb.com/" target="_blank">phpBB Group</a>. It is made available under the GNU General Public Licence and may be freely distributed, see link for more details'
),
array(
- 0 => 'Why isn\'t X feature available?',
+ 0 => 'Why isn’t X feature available?',
1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added then please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the Group uses sourceforge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.'
),
array(
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index c93ccd78f4..86a1761bfe 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
@@ -37,7 +39,7 @@ $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 />&#187; %s',
+ 'AUTHOR_NOTES' => 'Author Notes<br />» %s',
'AVAILABLE' => 'Available',
'AVAILABLE_CONVERTORS' => 'Available Convertors',
@@ -61,22 +63,22 @@ $lang = array_merge($lang, array(
'CONTINUE_LAST' => 'Continue last statements',
'CONVERT' => 'Convert',
'CONVERT_COMPLETE' => 'Conversion completed',
- 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.0. You can now login and <a href="../">access your forum </a>. Remember that help on using phpBB 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>',
+ 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.0. You can now login and <a href="../">access your forum</a>. Remember that help on using phpBB 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>',
'CONVERT_INTRO' => 'Welcome to the phpBB Unified Convertor Framework',
'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) forum systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the forum software you wish to convert from, please check our website where further conversion modules may be available for download.',
'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',
- 'COULD_NOT_COPY' => 'Could not copy file <b>%1$s</b> to <b>%2$s</b><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 />&#187; Specified source path was %s',
+ '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_ERR_INSERT' => 'Error while processing INSERT query',
- 'DB_ERR_LAST' => 'Error while processing query_last',
- 'DB_ERR_QUERY_FIRST' => 'Error while executing query_first',
- 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing query_first, %s ("%s")',
- 'DB_ERR_SELECT' => 'Error while running SELECT query',
+ '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>',
+ 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing <var>query_first</var>, %s ("%s")',
+ 'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query',
'DB_HOST' => 'Database server hostname or DSN',
'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs.',
'DB_NAME' => 'Database name',
@@ -90,21 +92,21 @@ $lang = array_merge($lang, array(
'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.',
'DIRECTORIES_AND_FILES' => 'Directory and file setup',
'DISABLE_KEYS' => 'Disabling keys',
- 'DLL_FIREBIRD' => 'Firebird 1.5+',
+ 'DLL_FIREBIRD' => 'Firebird',
'DLL_FTP' => 'Remote FTP support [ Installation ]',
+ 'DLL_GD' => 'GD graphics support [ Visual Confirmation ]',
'DLL_MBSTRING' => 'Multi-byte character support',
'DLL_MSSQL' => 'MSSQL Server 2000+',
'DLL_MSSQL_ODBC' => 'MSSQL Server 2000+ via ODBC',
- 'DLL_MYSQL' => 'MySQL 3.23.x/4.x',
- 'DLL_MYSQL4' => 'MySQL 4.x/5.x',
- 'DLL_MYSQLI' => 'MySQL 4.1.x/5.x with MySQLi Extension',
+ 'DLL_MYSQL' => 'MySQL',
+ 'DLL_MYSQLI' => 'MySQL with MySQLi Extension',
'DLL_ORACLE' => 'Oracle',
'DLL_POSTGRES' => 'PostgreSQL 7.x/8.x',
'DLL_SQLITE' => 'SQLite',
'DLL_XML' => 'XML support [ Jabber ]',
- 'DLL_ZLIB' => 'zlib Compression support [ gz, .tar.gz, .zip ]',
+ 'DLL_ZLIB' => 'zlib compression support [ gz, .tar.gz, .zip ]',
'DL_CONFIG' => 'Download config',
- 'DL_CONFIG_EXPLAIN' => 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.0 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click "Done" to move to the next stage.',
+ 'DL_CONFIG_EXPLAIN' => 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.0 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done” to move to the next stage.',
'DL_DOWNLOAD' => 'Download',
'DONE' => 'Done',
@@ -113,8 +115,8 @@ $lang = array_merge($lang, array(
'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 <b>%s</b>',
+ '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',
'FORUM_ADDRESS' => 'Forum address',
@@ -133,7 +135,7 @@ $lang = array_merge($lang, array(
'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.',
+ '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>',
'INSTALL_INTRO' => 'Welcome to Installation',
'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB onto your server.</p><p>In order to proceed, you will need the following information to hand:</p>
<ul>
@@ -141,7 +143,7 @@ $lang = array_merge($lang, array(
<li>Database name</li>
<li>Database username and password</li>
</ul>
- <p>Some more introductory text can go here...',
+ <p>Some more introductory text can go here…',
'INSTALL_INTRO_NEXT' => 'To commence the installation, please press the button below.',
'INSTALL_LOGIN' => 'Login',
'INSTALL_NEXT' => 'Next stage',
@@ -155,13 +157,17 @@ $lang = array_merge($lang, array(
'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',
'INST_ERR_DB_NO_ERROR' => 'No error message given',
- 'INST_ERR_DB_NO_MYSQL4' => 'The version of MySQL installed on this machine is incompatible with the "MySQL 4.x/5.x" option you have selected. Please try the "MySQL 3.23.x/4.x" option instead.',
- 'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is incompatible with the "MySQL 4.1.x/5.x with MySQLi Extension" option you have selected. Please try the "MySQL 4.x/5.x" or "MySQL 3.23.x/4.x" option instead.',
+ 'INST_ERR_DB_NO_MYSQL4' => 'The version of MySQL installed on this machine is incompatible with the “MySQL 4.x/5.x” option you have selected. Please try the “MySQL 3.23.x/4.x” option instead.',
+ 'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is incompatible with the “MySQL 4.1.x/5.x with MySQLi Extension” option you have selected. Please try the “MySQL 3.23.x/4.x” option instead.',
+ 'INST_ERR_DB_NO_SQLITE' => 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
+ 'INST_ERR_DB_NO_ORACLE' => 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
+ 'INST_ERR_DB_NO_FIREBIRD' => 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
+ 'INST_ERR_DB_NO_POSTGRES' => 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding',
'INST_ERR_DB_NO_NAME' => 'No database name specified',
'INST_ERR_EMAIL_INVALID' => 'The email address you entered is invalid',
'INST_ERR_EMAIL_MISMATCH' => 'The emails you entered did not match.',
'INST_ERR_FATAL' => 'Fatal installation error',
- 'INST_ERR_FATAL_DB' => 'A fatal and unrecoverable database error has occured. This may be because the specified user does not have appropriate rights to CREATE TABLES or INSERT data, etc. Further information may be given below. Please contact your hosting provider in the first instance or the support forums of phpBB for further assistance.',
+ 'INST_ERR_FATAL_DB' => 'A fatal and unrecoverable database error has occured. This may be because the specified user does not have appropriate rights to <code>CREATE TABLES</code> or <code>INSERT</code> data, etc. Further information may be given below. Please contact your hosting provider in the first instance or the support forums of phpBB for further assistance.',
'INST_ERR_FTP_PATH' => 'Could not change to the given directory, please check the path.',
'INST_ERR_FTP_LOGIN' => 'Could not login to FTP server, check your username and password',
'INST_ERR_MISSING_DATA' => 'You must fill out all fields in this block',
@@ -170,13 +176,14 @@ $lang = array_merge($lang, array(
'INST_ERR_PASSWORD_TOO_LONG' => 'The password you entered is too long. The maximum length is 30 characters.',
'INST_ERR_PASSWORD_TOO_SHORT' => 'The password you entered is too short. The minimum length is 6 characters.',
'INST_ERR_PREFIX' => 'Tables with the specified prefix already exist, please choose an alternative.',
+ 'INST_ERR_PREFIX_INVALID' => 'The table prefix you have specified is invalid for your database. Please try another, removing characters such as the hyphen',
'INST_ERR_PREFIX_TOO_LONG' => 'The table prefix you have specified is too long. The maximum length is %d characters.',
'INST_ERR_USER_TOO_LONG' => 'The username you entered is too long. The maximum length is 20 characters.',
'INST_ERR_USER_TOO_SHORT' => 'The username you entered is too short. The minimum length is 3 characters.',
'INVALID_PRIMARY_KEY' => 'Invalid primary key : %s',
- 'MAKE_FOLDER_WRITABLE' => 'Please make sure that this folder exists and is writable by the webserver then try again:<br />&#187;<b>%s</b>',
- 'MAKE_FOLDERS_WRITABLE' => 'Please make sure that these folders exist and are writable by the webserver then try again:<br />&#187;<b>%s</b>',
+ '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>',
'NAMING_CONFLICT' => 'Naming conflict: %s and %s are both aliases<br /><br />%s',
'NEXT_STEP' => 'Proceed to next step',
@@ -192,11 +199,11 @@ $lang = array_merge($lang, array(
'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 do have them they will will enable greater functionality.',
'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 "register_globals" is disabled',
+ '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_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If "safe mode" is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
+ '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',
'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',
@@ -228,23 +235,24 @@ $lang = array_merge($lang, array(
'STAGE_REQUIREMENTS' => 'Requirements',
'STAGE_SETTINGS' => 'Settings',
'STARTING_CONVERT' => 'Starting Conversion Process',
- 'STEP_PERCENT_COMPLETED' => 'Step <b>%d</b> of <b>%d</b>: %d%% completed',
+ 'STEP_PERCENT_COMPLETED' => 'Step <strong>%d</strong> of <strong>%d</strong>: %d%% completed',
'SUB_INTRO' => 'Introduction',
'SUB_LICENSE' => 'License',
'SUB_SUPPORT' => 'Support',
'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/" target="_new">subscribe to our mailing list</a>',
+ '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',
- 'TABLES_MISSING' => 'Could not find these tables<br />&#187; <b>%s</b>.',
+ 'TABLES_MISSING' => 'Could not find these tables<br />» <strong>%s</strong>.',
'TABLE_PREFIX' => 'Prefix for tables in database',
- 'TABLE_PREFIX_SAME' => 'The table prefix needs to be the one used by the software you are converting from.<br />&#187; Specified table prefix was %s',
+ 'TABLE_PREFIX_SAME' => 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s',
'TESTS_PASSED' => 'Tests passed',
'TESTS_FAILED' => 'Tests failed',
+ 'UNABLE_WRITE_LOCK' => 'Unable to write lock file',
'UNAVAILABLE' => 'Unavailable',
'UNWRITEABLE' => 'Unwriteable',
@@ -254,4 +262,171 @@ $lang = array_merge($lang, array(
'WRITEABLE' => 'Writeable',
));
+// Updater
+$lang = array_merge($lang, array(
+ 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You may want to run the database update tool now.',
+ 'ARCHIVE_FILE' => 'Source file within archive',
+
+ 'BACK' => 'Back',
+
+ 'CHECK_FILES' => 'Check files',
+ 'CHECK_FILES_AGAIN' => 'Check files again',
+ 'CHECK_FILES_EXPLAIN' => 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
+ 'CHECK_FILES_UP_TO_DATE' => 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
+ 'COLLECTED_INFORMATIONS' => 'Collected file informations',
+ 'COLLECTED_INFORMATIONS_EXPLAIN'=> 'The list below shows informations about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
+ 'COMPLETE_LOGIN_TO_BOARD' => 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Don’t forget to delete, rename or move your install directory!',
+ 'CURRENT_FILE' => 'Current original file',
+ 'CURRENT_VERSION' => 'Current version',
+
+ 'DATABASE_TYPE' => 'Database type',
+ 'DATABASE_UPDATE_INFO_OLD' => 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
+ 'DESTINATION' => 'Destination file',
+ 'DIFF_INLINE' => 'Inline',
+ 'DIFF_RAW' => 'Raw unified diff',
+ 'DIFF_SEP_EXPLAIN' => 'End of current file / Begin of new updated file',
+ 'DIFF_SIDE_BY_SIDE' => 'Side by Side',
+ 'DIFF_UNIFIED' => 'Unified diff',
+ 'DO_NOT_UPDATE' => 'Do not update this file',
+ 'DONE' => 'Done',
+ 'DOWNLOAD' => 'Download',
+ 'DOWNLOAD_AS' => 'Download as',
+ 'DOWNLOAD_UPDATE_METHOD' => 'Download modified files archive',
+ 'DOWNLOAD_UPDATE_METHOD_EXPLAIN' => 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
+
+ 'ERROR' => 'Error',
+
+ 'FILE_ALREADY_UP_TO_DATE' => 'File is already up to date',
+ 'FILE_USED' => 'Informations used from',
+ 'FILES_CONFLICT' => 'Conflict files',
+ 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified the them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.',
+ 'FILES_MODIFIED' => 'Modified files',
+ 'FILES_MODIFIED_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
+ 'FILES_NEW' => 'New files',
+ 'FILES_NEW_EXPLAIN' => 'The following files currently do not exist within your installation.',
+ 'FILES_NEW_CONFLICT' => 'New conflicting files',
+ 'FILES_NEW_CONFLICT_EXPLAIN' => 'The following files are new within the latest version but it has been determined that there is already a file with the same name within the same position. This file will be overwritten by the new file.',
+ 'FILES_NOT_MODIFIED' => 'Not modified files',
+ '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',
+
+ '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',
+
+ 'LATEST_VERSION' => 'Latest version',
+ 'LINE' => 'Line',
+ 'LINE_ADDED' => 'Added',
+ 'LINE_MODIFIED' => 'Modified',
+ 'LINE_REMOVED' => 'Removed',
+ 'LINE_UNMODIFIED' => 'Unmodified',
+ 'LOGIN_UPDATE_EXPLAIN' => 'In order to update your installation you need to login first.',
+
+ 'MAPPING_FILE_STRUCTURE' => 'To ease the upload here are the file locations which map your phpBB installation.',
+ 'MERGE_MOD_FILE_OPTION' => 'Use modified file code on final merge',
+ 'MERGE_NEW_FILE_OPTION' => 'Use new file code on final merge',
+ 'MERGE_SELECT_ERROR' => 'Conflicting file merge modes are not correctly selected.',
+
+ 'NEW_FILE' => 'New updated file',
+ 'NO_AUTH_UPDATE' => 'Not authorized to update',
+ 'NO_DATABASE_UPDATE_NEEDED' => 'All of your files seem to be up to date. Since you are already running the latest version you do not need to update your database.',
+ 'NO_ERRORS' => 'No errors',
+ 'NO_UPDATE_FILES' => 'Not updating the following files',
+ 'NO_UPDATE_FILES_EXPLAIN' => 'The following files are new or modified but the directory they normally reside in could not be found on your installation. If this list contains files to other directories than language/ or styles/ than you may have modified your directory structure and the update may be incomplete.',
+ 'NO_UPDATE_FILES_OUTDATED' => 'No valid update directory was found, please make sure you uploaded the relevant files.<br /><br />Your installation does <strong>not</strong> seem to be up to date. Updates are available for your version of phpBB %1$s, please visit <a href="http://www.phpbb.com/downloads.php" rel="external">http://www.phpbb.com/downloads.php</a> to obtain the correct package to update from Version %2$s to Version %3$s.',
+ 'NO_UPDATE_FILES_UP_TO_DATE' => 'Your version is up to date. There is no need to run the update tool. If you want to make an integrity check on your files make sure you uploaded the correct update files.',
+ 'NO_UPDATE_INFO' => 'Update file informations could not be found.',
+ 'NO_UPDATES_REQUIRED' => 'No updates required',
+ 'NO_VISIBLE_CHANGES' => 'No visible changes',
+ 'NOTICE' => 'Notice',
+ 'NUM_CONFLICTS' => 'Number of conflicts',
+
+ 'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating to phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
+
+ 'PERFORM_DATABASE_UPDATE' => 'Perform database update',
+ 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a link to the database update script. This script needs to be run seperatly because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it only seems to hang. After you clicked the link and the update finished you can close this window too.',
+ 'PREVIOUS_VERSION' => 'Previous version',
+ 'PROGRESS' => 'Progress',
+
+ 'RESULT' => 'Result',
+ 'RUN_DATABASE_SCRIPT' => 'Update my database now',
+
+ 'SELECT_DIFF_MODE' => 'Select diff mode',
+ 'SELECT_DOWNLOAD_FORMAT' => 'Select download archive format',
+ 'SELECT_FTP_SETTINGS' => 'Select FTP Settings',
+ 'SHOW_DIFF_CONFLICT' => 'Show differences/conflicts',
+ 'SHOW_DIFF_MODIFIED' => 'Show merged differences',
+ 'SHOW_DIFF_NEW' => 'Show file contents',
+ 'SHOW_DIFF_NEW_CONFLICT' => 'Show differences',
+ 'SHOW_DIFF_NOT_MODIFIED' => 'Show differences',
+ 'SOME_QUERIES_FAILED' => 'Some queries failed, the statements and errors are listing below',
+ 'SQL' => 'SQL',
+ 'SQL_FAILURE_EXPLAIN' => 'This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our support forums. See <a href="../docs/README.html">README</a> for details on how to obtain advice.',
+ 'STAGE_FILE_CHECK' => 'Check files',
+ 'STAGE_UPDATE_DB' => 'Update database',
+ 'STAGE_UPDATE_FILES' => 'Update files',
+ 'STAGE_VERSION_CHECK' => 'Version Check',
+ 'STATUS_CONFLICT' => 'Modified file producing conflicts',
+ 'STATUS_MODIFIED' => 'Modified file',
+ 'STATUS_NEW' => 'New file',
+ 'STATUS_NEW_CONFLICT' => 'Conflicting new file',
+ 'STATUS_NOT_MODIFIED' => 'Not modified file',
+ 'STATUS_UP_TO_DATE' => 'Already updated file',
+
+ 'UPDATE_COMPLETED' => 'Update completed',
+ 'UPDATE_DATABASE' => 'Update database',
+ '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_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 loose 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. If everything is correctly updated you will be forwarded to the database updater.</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. If so, you will be forwarded to the database updater.',
+ 'UPDATE_INSTRUCTIONS' => '
+
+ <h1>Release announcement</h1>
+
+ <p>Please read <a href="%1$s" title="%1$s">the release announcement for the latest version</a> before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.</p>
+
+ <br />
+
+ <h1>How to update your installation</h1>
+
+ <p>The recommended way of updating your installation only takes the following steps:</p>
+
+ <ul style="margin-left: 20px; font-size: 1.1em;">
+ <li>Go to the <a href="http://www.phpbb.com/downloads.php" title="http://www.phpbb.com/downloads.php">phpBB.com downloads page</a> and download the correct archive. If you are unsure you can <a href="%2$s" title="%2$s">download the correct archive directly</a> as a zip file.<br /><br /></li>
+ <li>Unpack the archive<br /><br /></li>
+ <li>Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).<br /><br /></li>
+ </ul>
+
+ <p>Once uploaded your board will be offline for normal users.<br /><br />
+ <strong><a href="%3$s" title="%3$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br />
+ <br />
+ You will then be guided through the update process. The update is complete after the database update script has been completed successfully - this is the last step within the udpate process.
+ </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_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',
+ 'UPDATING_DATA' => 'Updating data',
+ 'UPDATING_TO_LATEST_STABLE' => 'Updating database to latest stable release',
+ 'UPDATED_VERSION' => 'Updated version',
+ 'UPLOAD_METHOD' => 'Upload method',
+
+ '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.',
+ 'VERSION_UP_TO_DATE' => 'Your installation is up to date, no updates are available for your version of phpBB. You may want to continue anyway to perform a file validity check.',
+ 'VERSION_UP_TO_DATE_ACP' => 'Your installation is up to date, no updates are available for your version of phpBB. You do not need to update your installation.',
+ 'VIEWING_FILE_CONTENTS' => 'Viewing file contents',
+ 'VIEWING_FILE_DIFF' => 'Viewing file differences',
+
+ 'WRONG_INFO_FILE_FORMAT' => 'Wrong info file format',
+));
+
?> \ No newline at end of file
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 46c9b90418..35f537f9db 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
@@ -45,8 +47,8 @@ $lang = array_merge($lang, array(
'APPROVE_POSTS' => 'Approve posts',
'APPROVE_POSTS_CONFIRM' => 'Are you sure you want to approve the selected posts?',
- 'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it\'s already in',
- 'CANNOT_WARN_ANONYMOUS' => 'You cannot warn an guest user',
+ 'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it’s already in',
+ 'CANNOT_WARN_ANONYMOUS' => 'You cannot warn unregistered guest users',
'CANNOT_WARN_SELF' => 'You cannot warn yourself',
'CAN_LEAVE_BLANK' => 'This can be left blank.',
'CHANGE_POSTER' => 'Change poster',
@@ -55,26 +57,26 @@ $lang = array_merge($lang, array(
'CLOSE_REPORTS' => 'Close reports',
'CLOSE_REPORTS_CONFIRM' => 'Are you sure you want to close the selected reports?',
- 'DELETE_POSTS' => 'Delete posts',
- 'DELETE_POSTS_CONFIRM' => 'Are you sure you want to delete these posts?',
- 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this post?',
- 'DELETE_REPORT' => 'Delete report',
- 'DELETE_REPORT_CONFIRM' => 'Are you sure you want to delete the selected report?',
- 'DELETE_REPORTS' => 'Delete reports',
+ 'DELETE_POSTS' => 'Delete posts',
+ 'DELETE_POSTS_CONFIRM' => 'Are you sure you want to delete these posts?',
+ 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this post?',
+ 'DELETE_REPORT' => 'Delete report',
+ 'DELETE_REPORT_CONFIRM' => 'Are you sure you want to delete the selected report?',
+ 'DELETE_REPORTS' => 'Delete reports',
'DELETE_REPORTS_CONFIRM' => 'Are you sure you want to delete the selected reports?',
- 'DELETE_TOPICS' => 'Delete selected topics',
- 'DELETE_TOPICS_CONFIRM' => 'Are you sure you want to delete these topics?',
- 'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?',
- 'DISAPPROVE' => 'Disapprove',
- 'DISAPPROVE_REASON' => 'Reason for disapproval',
- 'DISAPPROVE_POST' => 'Disapprove post',
+ 'DELETE_TOPICS' => 'Delete selected topics',
+ 'DELETE_TOPICS_CONFIRM' => 'Are you sure you want to delete these topics?',
+ 'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?',
+ 'DISAPPROVE' => 'Disapprove',
+ 'DISAPPROVE_REASON' => 'Reason for disapproval',
+ 'DISAPPROVE_POST' => 'Disapprove post',
'DISAPPROVE_POST_CONFIRM' => 'Are you sure you want to disapprove this post?',
- 'DISAPPROVE_POSTS' => 'Disapprove posts',
+ 'DISAPPROVE_POSTS' => 'Disapprove posts',
'DISAPPROVE_POSTS_CONFIRM' => 'Are you sure you want to disapprove the selected posts?',
- 'DISPLAY_LOG' => 'Display entries from previous',
- 'DISPLAY_OPTIONS' => 'Display options',
+ 'DISPLAY_LOG' => 'Display entries from previous',
+ 'DISPLAY_OPTIONS' => 'Display options',
- 'EMPTY_REPORT' => 'You must enter a description when selecting this reason',
+ 'EMPTY_REPORT' => 'You must enter a description when selecting this reason',
'EMPTY_TOPICS_REMOVED_WARNING' => 'Please note that one or several topics have been removed from the database because they were or become empty',
'FEEDBACK' => 'Feedback',
@@ -192,114 +194,115 @@ $lang = array_merge($lang, array(
'MOVE_TOPICS' => 'Move selected topics',
'MOVE_TOPICS_CONFIRM' => 'Are you sure you want to move the selected topics into a new forum?',
- 'NOTIFY_POSTER_APPROVAL'=> 'Notify poster about approval?',
- 'NOTIFY_POSTER_DISAPPROVAL' => 'Notify poster about disapproval?',
- 'NOTIFY_USER_WARN' => 'Notify user about warning?',
- 'NOT_MODERATOR' => 'You are not a moderator of this forum',
- 'NO_DESTINATION_FORUM' => 'Please select a forum for destination',
+ 'NOTIFY_POSTER_APPROVAL' => 'Notify poster about approval?',
+ 'NOTIFY_POSTER_DISAPPROVAL' => 'Notify poster about disapproval?',
+ 'NOTIFY_USER_WARN' => 'Notify user about warning?',
+ 'NOT_MODERATOR' => 'You are not a moderator of this forum',
+ 'NO_DESTINATION_FORUM' => 'Please select a forum for destination',
'NO_DESTINATION_FORUM_FOUND' => 'There is no destination forum available.',
- 'NO_ENTRIES' => 'No log entries for this period',
- 'NO_FEEDBACK' => 'No feedback exists for this user',
- 'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts',
- 'NO_MATCHES_FOUND' => 'No matches found',
- 'NO_POST' => 'You have to select a post in order to warn the user for a post',
- 'NO_POST_REPORT' => 'This post was not reported.',
- 'NO_POST_SELECTED' => 'You must select at least one post to perform this action',
- 'NO_REASON_DISAPPROVAL' => 'Please give an appropiate reason for disapproval',
- 'NO_TOPIC_ICON' => 'None',
- 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action',
+ 'NO_ENTRIES' => 'No log entries for this period',
+ 'NO_FEEDBACK' => 'No feedback exists for this user',
+ 'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts',
+ 'NO_MATCHES_FOUND' => 'No matches found',
+ 'NO_POST' => 'You have to select a post in order to warn the user for a post',
+ 'NO_POST_REPORT' => 'This post was not reported.',
+ 'NO_POST_SELECTED' => 'You must select at least one post to perform this action',
+ 'NO_REASON_DISAPPROVAL' => 'Please give an appropiate reason for disapproval',
+ 'NO_TOPIC_ICON' => 'None',
+ 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action',
'OTHER_IPS' => 'Other IP addresses this user has posted from',
'ONLY_TOPIC' => 'Only topic "%s"',
'OTHER_USERS' => 'Users posting from this IP',
- 'POSTER' => 'Poster',
- 'POSTS_APPROVED_SUCCESS'=> 'The selected posts have been approved',
- 'POSTS_DELETED_SUCCESS' => 'The selected posts have been successfully removed from the database',
- 'POSTS_DISAPPROVED_SUCCESS'=> 'The selected posts have been disapproved',
- 'POSTS_LOCKED_SUCCESS' => 'The selected posts have been locked successfully',
- 'POSTS_MERGED_SUCCESS' => 'The selected posts have been merged',
- 'POSTS_UNLOCKED_SUCCESS'=> 'The selected posts have been unlocked successfully',
- 'POSTS_PER_PAGE' => 'Posts per page',
- 'POSTS_PER_PAGE_EXPLAIN'=> '(Set to 0 to view all posts)',
- 'POST_APPROVED_SUCCESS' => 'The selected post has been approved',
- 'POST_DELETED_SUCCESS' => 'The selected post has been successfully removed from the database',
+ 'POSTER' => 'Poster',
+ 'POSTS_APPROVED_SUCCESS' => 'The selected posts have been approved',
+ 'POSTS_DELETED_SUCCESS' => 'The selected posts have been successfully removed from the database',
+ 'POSTS_DISAPPROVED_SUCCESS' => 'The selected posts have been disapproved',
+ 'POSTS_LOCKED_SUCCESS' => 'The selected posts have been locked successfully',
+ 'POSTS_MERGED_SUCCESS' => 'The selected posts have been merged',
+ 'POSTS_UNLOCKED_SUCCESS' => 'The selected posts have been unlocked successfully',
+ 'POSTS_PER_PAGE' => 'Posts per page',
+ 'POSTS_PER_PAGE_EXPLAIN' => '(Set to 0 to view all posts)',
+ 'POST_APPROVED_SUCCESS' => 'The selected post has been approved',
+ 'POST_DELETED_SUCCESS' => 'The selected post has been successfully removed from the database',
'POST_DISAPPROVED_SUCCESS' => 'The selected post has been disapproved',
- 'POST_LOCKED_SUCCESS' => 'Post locked successfully',
- 'POST_NOT_EXIST' => 'The post you requested does not exist',
- 'POST_REPORTED_SUCCESS' => 'This post has been successfully reported',
- 'POST_UNLOCKED_SUCCESS' => 'Post unlocked successfully',
-
- 'READ_USERNOTES' => 'User notes',
- 'READ_WARNINGS' => 'User warnings',
- 'REPORTER' => 'Reporter',
- 'REPORTED' => 'Reported',
- 'REPORTED_BY' => 'Reported by',
- 'REPORTED_ON_DATE' => 'on',
+ 'POST_LOCKED_SUCCESS' => 'Post locked successfully',
+ 'POST_NOT_EXIST' => 'The post you requested does not exist',
+ 'POST_REPORTED_SUCCESS' => 'This post has been successfully reported',
+ 'POST_UNLOCKED_SUCCESS' => 'Post unlocked successfully',
+
+ 'READ_USERNOTES' => 'User notes',
+ 'READ_WARNINGS' => 'User warnings',
+ 'REPORTER' => 'Reporter',
+ 'REPORTED' => 'Reported',
+ 'REPORTED_BY' => 'Reported by',
+ 'REPORTED_ON_DATE' => 'on',
'REPORTS_CLOSED_SUCCESS' => 'The selected reports have been closed successfully.',
'REPORTS_DELETED_SUCCESS' => 'The selected reports have been deleted successfully.',
- 'REPORTS_TOTAL' => 'In total there are <strong>%d</strong> reports to review',
- 'REPORTS_ZERO_TOTAL' => 'There are no reports to review',
- 'REPORT_CLOSED' => 'This report has previously been closed.',
- 'REPORT_CLOSED_SUCCESS' => 'The selected report has been closed successfully.',
+ 'REPORTS_TOTAL' => 'In total there are <strong>%d</strong> reports to review',
+ 'REPORTS_ZERO_TOTAL' => 'There are no reports to review',
+ 'REPORT_CLOSED' => 'This report has previously been closed.',
+ 'REPORT_CLOSED_SUCCESS' => 'The selected report has been closed successfully.',
'REPORT_DELETED_SUCCESS' => 'The selected report has been deleted successfully.',
- 'REPORT_DETAILS' => 'Report details',
- 'REPORT_MESSAGE' => 'Report this message',
- 'REPORT_MESSAGE_EXPLAIN'=> 'Use this form to report the selected message to the board administrators. Reporting should generally be used only if the message breaks forum rules.',
- 'REPORT_NOTIFY' => 'Notify me',
- 'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with',
- 'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
- 'REPORT_REASON' => 'Report reason',
- 'REPORT_TIME' => 'Report time',
- 'REPORT_TOTAL' => 'In total there is <strong>1</strong> report to review',
- 'RESYNC' => 'Resync',
- 'RETURN_MESSAGE' => '%sReturn to the message%s',
- 'RETURN_NEW_FORUM' => '%sReturn to the new forum%s',
- 'RETURN_NEW_TOPIC' => '%sReturn to the new topic%s',
- 'RETURN_POST' => '%sReturn to the post%s',
- 'RETURN_QUEUE' => '%sReturn to the queue%s',
- 'RETURN_REPORTS' => '%sReturn to the reports%s',
-
- 'SEARCH_POSTS_BY_USER' => 'Search posts by',
- 'SELECT_ACTION' => 'Select desired action',
- 'SELECT_TOPIC' => 'Select topic',
- 'SELECT_USER' => 'Select user',
- 'SORT_ACTION' => 'Log action',
- 'SORT_DATE' => 'Date',
- 'SORT_IP' => 'IP address',
- 'SORT_WARNINGS' => 'Warnings',
- 'SPLIT_AFTER' => 'Split from selected post',
- 'SPLIT_FORUM' => 'Forum for new topic',
- 'SPLIT_POSTS' => 'Split selected posts',
- 'SPLIT_SUBJECT' => 'New topic title',
- 'SPLIT_TOPIC_ALL' => 'Split topic from selected posts',
+ 'REPORT_DETAILS' => 'Report details',
+ 'REPORT_MESSAGE' => 'Report this message',
+ 'REPORT_MESSAGE_EXPLAIN' => 'Use this form to report the selected message to the board administrators. Reporting should generally be used only if the message breaks forum rules.',
+ 'REPORT_NOTIFY' => 'Notify me',
+ 'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with',
+ 'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
+ 'REPORT_REASON' => 'Report reason',
+ 'REPORT_TIME' => 'Report time',
+ 'REPORT_TOTAL' => 'In total there is <strong>1</strong> report to review',
+ 'RESYNC' => 'Resync',
+ 'RETURN_MESSAGE' => '%sReturn to the message%s',
+ 'RETURN_NEW_FORUM' => '%sReturn to the new forum%s',
+ 'RETURN_NEW_TOPIC' => '%sReturn to the new topic%s',
+ 'RETURN_POST' => '%sReturn to the post%s',
+ 'RETURN_QUEUE' => '%sReturn to the queue%s',
+ 'RETURN_REPORTS' => '%sReturn to the reports%s',
+
+ 'SEARCH_POSTS_BY_USER' => 'Search posts by',
+ 'SELECT_ACTION' => 'Select desired action',
+ 'SELECT_TOPICS_FROM' => 'Select topics from',
+ 'SELECT_TOPIC' => 'Select topic',
+ 'SELECT_USER' => 'Select user',
+ 'SORT_ACTION' => 'Log action',
+ 'SORT_DATE' => 'Date',
+ 'SORT_IP' => 'IP address',
+ 'SORT_WARNINGS' => 'Warnings',
+ 'SPLIT_AFTER' => 'Split from selected post',
+ 'SPLIT_FORUM' => 'Forum for new topic',
+ 'SPLIT_POSTS' => 'Split selected posts',
+ 'SPLIT_SUBJECT' => 'New topic title',
+ 'SPLIT_TOPIC_ALL' => 'Split topic from selected posts',
'SPLIT_TOPIC_ALL_CONFIRM' => 'Are you sure you want to split this topic?',
- 'SPLIT_TOPIC_BEYOND' => 'Split topic at selected post',
- 'SPLIT_TOPIC_BEYOND_CONFIRM' => 'Are you sure you want to split this topic at the selected post?',
- 'SPLIT_TOPIC_EXPLAIN' => 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post',
+ 'SPLIT_TOPIC_BEYOND' => 'Split topic at selected post',
+ 'SPLIT_TOPIC_BEYOND_CONFIRM'=> 'Are you sure you want to split this topic at the selected post?',
+ 'SPLIT_TOPIC_EXPLAIN' => 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post',
- 'THIS_POST_IP' => 'IP for this post',
+ 'THIS_POST_IP' => 'IP for this post',
'TOPICS_APPROVED_SUCCESS' => 'The selected topics have been approved',
- 'TOPICS_DELETED_SUCCESS'=> 'The selected topics have been successfully removed from the database',
- 'TOPICS_DISAPPROVED_SUCCESS' => 'The selected topics have been disapproved',
- 'TOPICS_FORKED_SUCCESS' => 'The selected topics have been copied successfully',
- 'TOPICS_LOCKED_SUCCESS' => 'The selected topics have been locked',
- 'TOPICS_MOVED_SUCCESS' => 'The selected topics have been moved successfully',
- 'TOPICS_RESYNC_SUCCESS' => 'The selected topics have been resynchronised',
+ 'TOPICS_DELETED_SUCCESS' => 'The selected topics have been successfully removed from the database',
+ 'TOPICS_DISAPPROVED_SUCCESS'=> 'The selected topics have been disapproved',
+ 'TOPICS_FORKED_SUCCESS' => 'The selected topics have been copied successfully',
+ 'TOPICS_LOCKED_SUCCESS' => 'The selected topics have been locked',
+ 'TOPICS_MOVED_SUCCESS' => 'The selected topics have been moved successfully',
+ 'TOPICS_RESYNC_SUCCESS' => 'The selected topics have been resynchronised',
'TOPICS_UNLOCKED_SUCCESS' => 'The selected topics have been unlocked',
'TOPIC_APPROVED_SUCCESS' => 'The selected topic has been approved',
- 'TOPIC_DELETED_SUCCESS' => 'The selected topic has been successfully removed from the database',
+ 'TOPIC_DELETED_SUCCESS' => 'The selected topic has been successfully removed from the database',
'TOPIC_DISAPPROVED_SUCCESS' => 'The selected topic has been disapproved',
- 'TOPIC_FORKED_SUCCESS' => 'The selected topic has been copied successfully',
- 'TOPIC_LOCKED_SUCCESS' => 'The selected topic has been locked',
- 'TOPIC_MOVED_SUCCESS' => 'The selected topic has been moved successfully',
- 'TOPIC_NOT_EXIST' => 'The topic you selected does not exist',
- 'TOPIC_RESYNC_SUCCESS' => 'The selected topic has been resynchronised',
- 'TOPIC_SPLIT_SUCCESS' => 'The selected topic has been split successfully',
- 'TOPIC_TIME' => 'Topic time',
- 'TOPIC_TYPE_CHANGED' => 'Topic type changed successfully.',
- 'TOPIC_UNLOCKED_SUCCESS'=> 'The selected topic has been unlocked',
- 'TOTAL_WARNINGS' => 'Total Warnings',
+ 'TOPIC_FORKED_SUCCESS' => 'The selected topic has been copied successfully',
+ 'TOPIC_LOCKED_SUCCESS' => 'The selected topic has been locked',
+ 'TOPIC_MOVED_SUCCESS' => 'The selected topic has been moved successfully',
+ 'TOPIC_NOT_EXIST' => 'The topic you selected does not exist',
+ 'TOPIC_RESYNC_SUCCESS' => 'The selected topic has been resynchronised',
+ 'TOPIC_SPLIT_SUCCESS' => 'The selected topic has been split successfully',
+ 'TOPIC_TIME' => 'Topic time',
+ 'TOPIC_TYPE_CHANGED' => 'Topic type changed successfully.',
+ 'TOPIC_UNLOCKED_SUCCESS' => 'The selected topic has been unlocked',
+ 'TOTAL_WARNINGS' => 'Total Warnings',
'UNAPPROVED_POSTS_TOTAL' => 'In total there are <strong>%d</strong> posts waiting for approval',
'UNAPPROVED_POSTS_ZERO_TOTAL' => 'There are no posts waiting for approval',
@@ -317,8 +320,8 @@ $lang = array_merge($lang, array(
'UNLOCK_TOPICS_CONFIRM' => 'Are you sure you want to unlock all selected topics?',
'USER_CANNOT_POST' => 'You cannot post in this forum',
'USER_CANNOT_REPORT' => 'You cannot report posts in this forum',
- 'USER_FEEDBACK_ADDED' => 'User feedback added successfully',
- 'USER_WARNING_ADDED' => 'User warned successfully',
+ 'USER_FEEDBACK_ADDED' => 'User feedback added successfully.',
+ 'USER_WARNING_ADDED' => 'User warned successfully.',
'VIEW_DETAILS' => 'View details',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 37f937edda..b46fe1c621 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -34,8 +36,7 @@ $lang = array_merge($lang, array(
'ACTIVE_IN_TOPIC' => 'Most active topic',
'ADD_FOE' => 'Add foe',
'ADD_FRIEND' => 'Add friend',
- 'AFTER' => 'After',
- 'AIM' => 'AIM',
+ 'AFTER' => 'After',
'BEFORE' => 'Before',
@@ -55,14 +56,13 @@ $lang = array_merge($lang, array(
'EMPTY_SUBJECT_EMAIL' => 'You must specify a subject for the email.',
'EQUAL_TO' => 'Equal to',
- 'FIND_USERNAME_EXPLAIN' => 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format yyyy-mm-dd, e.g. 2002-01-01. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself) and click the Select Marked button to return to the previous form.',
+ 'FIND_USERNAME_EXPLAIN' => 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format <kbd>YYYY-MM-DD</kbd>, e.g. <samp>2004-02-29</samp>. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself) and click the Select Marked button to return to the previous form.',
'FLOOD_EMAIL_LIMIT' => 'You cannot send another email at this time. Please try again later.',
'GROUP_LEADER' => 'Group leader',
'HIDE_MEMBER_SEARCH' => 'Hide member search',
- 'ICQ' => 'ICQ',
'IM_ADD_CONTACT' => 'Add Contact',
'IM_AIM' => 'Please note that you need AOL Instant Messenger installed to use this.',
'IM_AIM_EXPRESS' => 'AIM Express',
@@ -72,6 +72,8 @@ $lang = array_merge($lang, array(
'IM_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s',
'IM_MESSAGE' => 'Your message',
'IM_MSNM' => 'Please note that you need Windows Messenger installed to use this.',
+ 'IM_MSNM_BROWSER' => 'Your browser does not support this.',
+ 'IM_MSNM_CONNECT' => 'MSNM is not connected.\nYou have to connect to MSNM to continue.',
'IM_NAME' => 'Your Name',
'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this server. You will need a Jabber client installed on your system to contact the recipient above.',
'IM_RECIPIENT' => 'Recipient',
@@ -80,8 +82,6 @@ $lang = array_merge($lang, array(
'IM_SENT_JABBER' => 'Your message to %1$s has been sent successfully.',
'IM_USER' => 'Send an instant message',
- 'JABBER' => 'Jabber',
-
'LAST_ACTIVE' => 'Last active',
'LESS_THAN' => 'Less than',
'LIST_USER' => '1 user',
@@ -98,14 +98,17 @@ $lang = array_merge($lang, array(
'NO_VIEW_USERS' => 'You are not authorised to view the member list or profiles.',
'ORDER' => 'Order',
+ 'OTHER' => 'Other',
'POST_IP' => 'Posted from IP/domain',
'RANK' => 'Rank',
'REAL_NAME' => 'Recipient name',
'RECIPIENT' => 'Recipient',
+ 'REMOVE_FOE' => 'Remove foe',
+ 'REMOVE_FRIEND' => 'Remove friend',
- 'SEARCH_USER_POSTS' => 'Search user\'s posts',
+ 'SEARCH_USER_POSTS' => 'Search user’s posts',
'SELECT_MARKED' => 'Select marked',
'SELECT_SORT_METHOD' => 'Select sort method',
'SEND_IM' => 'Instant messaging',
@@ -124,8 +127,6 @@ $lang = array_merge($lang, array(
'VISITED' => 'Last visited',
'WWW' => 'Website',
-
- 'YIM' => 'YIM',
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 30ed20d2f2..e0008603bc 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -29,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(
- 'ADD_ATTACHMENT' => 'Attachment uploading',
+ 'ADD_ATTACHMENT' => 'Upload attachment',
'ADD_ATTACHMENT_EXPLAIN' => 'If you wish to attach one or more files enter the details below',
'ADD_FILE' => 'Add the file',
'ADD_POLL' => 'Poll creation',
@@ -53,7 +55,7 @@ $lang = array_merge($lang, array(
'BBCODE_S_HELP' => 'Font color: [color=red]text[/color] Tip: you can also use color=#FF0000',
'BBCODE_U_HELP' => 'Underline text: [u]text[/u] (alt+u)',
'BBCODE_W_HELP' => 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url] (alt+w)',
- 'BBCODE_D_HELP' => 'Flash: [flash=height,width]http://url[/flash] (alt+d)',
+ 'BBCODE_D_HELP' => 'Flash: [flash=width,height]http://url[/flash] (alt+d)',
'BUMP_ERROR' => 'You cannot bump this topic so soon after the last post.',
'CANNOT_DELETE_REPLIED' => 'Sorry but you may only delete posts which have not been replied to.',
@@ -76,7 +78,7 @@ $lang = array_merge($lang, array(
'DISABLE_MAGIC_URL' => 'Do not automatically parse URLs',
'DISABLE_SMILIES' => 'Disable smilies',
'DISALLOWED_EXTENSION' => 'The extension %s is not allowed',
- 'DRAFT_LOADED' => 'Draft loaded into posting area, you may want to finish your post now.<br />Your Draft will be deleted after submitting this post.',
+ 'DRAFT_LOADED' => 'Draft loaded into posting area, you may want to finish your post now.<br />Your draft will be deleted after submitting this post.',
'DRAFT_SAVED' => 'Draft successfully saved.',
'DRAFT_TITLE' => 'Draft title',
@@ -127,8 +129,8 @@ $lang = array_merge($lang, array(
'NO_TOPIC_ICON' => 'None',
'PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded',
- 'PHP_SIZE_NA' => 'The attachment\'s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
- 'PHP_SIZE_OVERRUN' => 'The attachment\'s filesize is too large, the maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
+ 'PHP_SIZE_NA' => 'The attachment’s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
+ 'PHP_SIZE_OVERRUN' => 'The attachment’s filesize is too large, the maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
'PLACE_INLINE' => 'Place inline',
'POLL_DELETE' => 'Delete poll',
'POLL_FOR' => 'Run poll for',
@@ -187,13 +189,13 @@ $lang = array_merge($lang, array(
'UPDATE_COMMENT' => 'Update comment',
'URL_INVALID' => 'The URL you specified is invalid.',
'URL_NOT_FOUND' => 'The file specified could not be found.',
+ 'URL_IS_OFF' => '[url] is <em>OFF</em>',
+ 'URL_IS_ON' => '[url] is <em>ON</em>',
'USER_CANNOT_BUMP' => 'You cannot bump topics in this forum',
'USER_CANNOT_DELETE' => 'You cannot delete posts in this forum',
'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum',
'USER_CANNOT_REPLY' => 'You cannot reply in this forum',
'USER_CANNOT_FORUM_POST' => 'You are not able to do posting operations on this forum due to the forum type not supporting it.',
- 'USERNAME_DISALLOWED' => 'The username you entered has been banned.',
- 'USERNAME_TAKEN' => 'The username you entered is already in use, please select an alternative.',
'VIEW_MESSAGE' => '%sView your submitted message%s',
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 25d0000bb8..db922f340b 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
@@ -34,14 +36,14 @@ $lang = array_merge($lang, array(
'DISPLAY_RESULTS' => 'Display results as',
- 'FOUND_SEARCH_MATCH' => 'Search found %d match',
- 'FOUND_SEARCH_MATCHES' => 'Search found %d matches',
+ 'FOUND_SEARCH_MATCH' => 'Search found %d match',
+ 'FOUND_SEARCH_MATCHES' => 'Search found %d matches',
'FOUND_MORE_SEARCH_MATCHES' => 'Search found more than %d matches',
- 'GLOBAL' => 'Global topic',
+ 'GLOBAL' => 'Global announcement',
'IGNORED_TERMS' => 'ignored',
- 'IGNORED_TERMS_EXPLAIN' => 'The following words in your search query were ignored: <b>%s</b>',
+ 'IGNORED_TERMS_EXPLAIN' => 'The following words in your search query were ignored: <strong>%s</strong>',
'NO_KEYWORDS' => 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',
'NO_RECENT_SEARCHES' => 'No searches have been carried out recently',
@@ -58,30 +60,30 @@ $lang = array_merge($lang, array(
'RESULT_SORT' => 'Sort results by',
'RETURN_FIRST' => 'Return first',
- 'SEARCHED_FOR' => 'Search term used',
- 'SEARCHED_TOPIC' => 'Searched topic',
- 'SEARCH_ALL_TERMS' => 'Search for all terms or use query as entered',
- 'SEARCH_ANY_TERMS' => 'Search for any terms',
- 'SEARCH_AUTHOR' => 'Search for author',
- 'SEARCH_AUTHOR_EXPLAIN' => 'Use * as a wildcard for partial matches',
- 'SEARCH_FIRST_POST' => 'First post of topics only',
- 'SEARCH_FORUMS' => 'Search in forums',
- 'SEARCH_FORUMS_EXPLAIN' => 'Select the forum or forums you wish to search in. For speed all subforums can be searched by selecting the parent and setting enable search subforums below.',
- 'SEARCH_IN_RESULTS' => 'Search these results',
+ 'SEARCHED_FOR' => 'Search term used',
+ 'SEARCHED_TOPIC' => 'Searched topic',
+ 'SEARCH_ALL_TERMS' => 'Search for all terms or use query as entered',
+ 'SEARCH_ANY_TERMS' => 'Search for any terms',
+ 'SEARCH_AUTHOR' => 'Search for author',
+ 'SEARCH_AUTHOR_EXPLAIN' => 'Use * as a wildcard for partial matches',
+ 'SEARCH_FIRST_POST' => 'First post of topics only',
+ 'SEARCH_FORUMS' => 'Search in forums',
+ 'SEARCH_FORUMS_EXPLAIN' => 'Select the forum or forums you wish to search in. For speed all subforums can be searched by selecting the parent and setting enable search subforums below.',
+ '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_SUBFORUMS' => 'Search subforums',
- 'SEARCH_TITLE_MSG' => 'Post subjects and message text',
- 'SEARCH_TITLE_ONLY' => 'Topic titles only',
- 'SEARCH_WITHIN' => 'Search within',
- 'SORT_ASCENDING' => 'Ascending',
- 'SORT_AUTHOR' => 'Author',
- 'SORT_DESCENDING' => 'Descending',
- 'SORT_FORUM' => 'Forum',
- 'SORT_POST_SUBJECT' => 'Post subject',
- 'SORT_TIME' => 'Post time',
+ 'SEARCH_MSG_ONLY' => 'Message text only',
+ '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',
+ 'SEARCH_WITHIN' => 'Search within',
+ 'SORT_ASCENDING' => 'Ascending',
+ 'SORT_AUTHOR' => 'Author',
+ 'SORT_DESCENDING' => 'Descending',
+ 'SORT_FORUM' => 'Forum',
+ 'SORT_POST_SUBJECT' => 'Post subject',
+ 'SORT_TIME' => 'Post time',
'TOO_FEW_AUTHOR_CHARS' => 'You must specify at least %d characters of the authors name.',
));
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
index 0ef17669fa..63dfca8354 100644
--- a/phpBB/language/en/search_ignore_words.php
+++ b/phpBB/language/en/search_ignore_words.php
@@ -263,4 +263,5 @@ $words = array(
'ROTFLMAO',
'YMMV',
);
- \ No newline at end of file
+
+?> \ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 679857fabd..9d51c0d7bb 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
@@ -30,38 +32,38 @@ if (empty($lang) || !is_array($lang))
// Privacy policy and T&C
$lang = array_merge($lang, array(
- 'TERMS_OF_USE_CONTENT' => 'By accessing "%1$s" (hereinafter "we", "us", "our", "%1$s", "%2$s"), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use "%1$s". We may change these at any time and we\'ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of "%1$s" after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
+ 'TERMS_OF_USE_CONTENT' => 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
<br />
- Our forums are powered by phpBB (hereinafter "they", "them", "their", "phpBB software", "www.phpbb.com", "phpBB Group", "phpBB Teams") which is a bulletin board solution released under the "<a href="http://www.gnu.org/licenses/gpl.html">General Public License</a>" (hereinafter "GPL") and can be downloaded from <a href="http://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates Internet based discussions and the GPL strictly forbids them in what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="http://www.phpbb.com/">http://www.phpbb.com/</a>.<br />
+ Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://www.gnu.org/licenses/gpl.html">General Public License</a>” (hereinafter “GPL”) and can be downloaded from <a href="http://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates Internet based discussions and the GPL strictly forbids them in what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="http://www.phpbb.com/">http://www.phpbb.com/</a>.<br />
<br />
- You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where "%1$s" is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that "%1$s" have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither "%1$s" nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
+ You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
',
- 'PRIVACY_POLICY' => 'This policy explains in detail how "%1$s" along with its affiliated companies (hereinafter "we", "us", "our", "%1$s", "%2$s") and phpBB (hereinafter "they", "them", "their", "phpBB software", "www.phpbb.com", "phpBB Group", "phpBB Teams") use any information collected during any session of usage by you (hereinafter "your information").<br />
+ 'PRIVACY_POLICY' => 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).<br />
<br />
- Your information is collected via two ways. Firstly, by browsing "%1$s" will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer\'s web browser temporary files. The first two cookies just contain a user identifier (hereinafter "user-id") and an anonymous session identifier (hereinafter "session-id"), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within "%1$s" and is used to store which topics have been read, thereby improving your user experience.<br />
+ Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience.<br />
<br />
- We may also create cookies external to the phpBB software whilst browsing "%1$s", though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter "anonymous posts"), registering on "%1$s" (hereinafter "your account") and posts submitted by you after registration and whilst logged in (hereinafter "your posts").<br />
+ We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br />
<br />
- Your account will at a bare minimum contain a uniquely identifiable name (hereinafter "your user name"), a personal password used for logging into your account (hereinafter "your password") and a personal, valid email address (hereinafter "your email"). Your information for your account at "%1$s" is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password and your email required by "%1$s" during the registration process are at our digression what is mandatory and what is optional. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated emails from the phpBB software.<br />
+ Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid email address (hereinafter “your email”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password and your email required by “%1$s” during the registration process are at our digression what is mandatory and what is optional. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated emails from the phpBB software.<br />
<br />
- Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at "%1$s", so please guard it carefully and under no circumstance will anyone affiliated with "%1$s", phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the "I forgot my password" feature provided by the phpBB software. This process will ask you to submit your user name and your email, then the phpBB software will generate a new password to reclaim your account.<br />
+ Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your email, then the phpBB software will generate a new password to reclaim your account.<br />
',
));
$lang = array_merge($lang, array(
'CAPTCHA' =>array(
'cells' => array(
- 'Enter the code on',
- ' the right, in ',
- ' the order shown ',
- ' on the left ',
+ 'Enter the code on',
+ ' the right, in ',
+ ' the order shown ',
+ ' on the left ',
),
'shape' => array(
- 'Enter the code on',
- ' the right which ',
- 'matches the image',
- ' on the left ',
+ 'Enter the code on',
+ ' the right which ',
+ 'matches the image',
+ ' on the left ',
)
)
));
@@ -91,8 +93,8 @@ $lang = array_merge($lang, array(
'ALLOW_PM_EXPLAIN' => 'Note that admins 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_DELETED' => 'Attachments successfully deleted',
- 'ATTACHMENT_DELETED' => 'Attachment successfully deleted',
+ 'ATTACHMENTS_DELETED' => 'Attachments successfully deleted.',
+ 'ATTACHMENT_DELETED' => 'Attachment successfully deleted.',
'AVATAR_CATEGORY' => 'Category',
'AVATAR_EXPLAIN' => 'Maximum dimensions; width %1$d pixels, height %2$d pixels, filesize %3$dkB.',
'AVATAR_GALLERY' => 'Local gallery',
@@ -104,7 +106,7 @@ $lang = array_merge($lang, array(
'BIRTHDAY' => 'Birthday',
'BIRTHDAY_EXPLAIN' => 'Setting a year will list your age when it is your birthday.',
'BOARD_DATE_FORMAT' => 'My date format',
- 'BOARD_DATE_FORMAT_EXPLAIN' => 'The syntax used is identical to the PHP <a href="http://www.php.net/date" onclick="this.target=\'_blank\';" title="Opens in a new window">date()</a> function',
+ 'BOARD_DATE_FORMAT_EXPLAIN' => 'The syntax used is identical to the PHP <a href="http://www.php.net/date">date()</a> function',
'BOARD_DST' => 'Daylight Saving Time is in effect',
'BOARD_LANGUAGE' => 'My language',
'BOARD_STYLE' => 'My board style',
@@ -118,9 +120,9 @@ $lang = array_merge($lang, array(
'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages can not be moved to the folder you want to remove.',
'CANNOT_RENAME_FOLDER' => 'This folder can not be renamed.',
'CANNOT_REMOVE_FOLDER' => 'This folder can not be removed.',
+ 'CHANGE_DEFAULT_GROUP' => 'Change default group',
'CHANGE_PASSWORD' => 'Change password',
- 'CHANGE_PASSWORD_EXPLAIN' => 'Must be between %1$d and %2$d characters.',
- 'CLICK_RETURN_FOLDER' => '%1$sReturn to your "%3$s" folder%2$s',
+ 'CLICK_RETURN_FOLDER' => '%1$sReturn to your “%3$s” folder%2$s',
'CONFIRMATION' => 'Confirmation of registration',
'CONFIRM_EMAIL' => 'Confirm email address',
'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing your email address.',
@@ -130,12 +132,12 @@ $lang = array_merge($lang, array(
'COPPA_BIRTHDAY' => 'To continue with the registration procedure please tell us when you were born.',
'COPPA_COMPLIANCE' => 'COPPA compliance',
'COPPA_EXPLAIN' => 'Please note that clicking submit will create your account. However it cannot be activated until a parent or guardian approves your registration. You will be emailed a copy of the necessary form with details of where to send it.',
- 'CREATE_FOLDER' => 'Add folder...',
+ 'CREATE_FOLDER' => 'Add folder…',
'CURRENT_IMAGE' => 'Current image',
'CURRENT_PASSWORD' => 'Current password',
'CURRENT_PASSWORD_EXPLAIN' => 'You must confirm your current password if you wish to change it, alter your email address or username.',
'CUR_PASSWORD_ERROR' => 'The current password you entered is incorrect.',
- 'CUSTOM_DATEFORMAT' => 'Custom...',
+ 'CUSTOM_DATEFORMAT' => 'Custom…',
'DEFAULT_ACTION' => 'Default action',
'DEFAULT_ACTION_EXPLAIN' => 'This action will be triggered if none of the above is applicable',
@@ -162,6 +164,7 @@ $lang = array_merge($lang, array(
'DEMOTE_SELECTED' => 'Demote selected',
'DISABLE_CENSORS' => 'Enable word censoring',
'DISPLAY_GALLERY' => 'Display gallery',
+ 'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.',
'DOWNLOADS' => 'Downloads',
'DRAFTS_DELETED' => 'All selected drafts were successfully deleted.',
'DRAFTS_EXPLAIN' => 'Here you can view, edit and delete your saved drafts.',
@@ -181,15 +184,15 @@ $lang = array_merge($lang, array(
'EXPORT_AS_MSG' => 'Export as MSG',
'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.',
- 'FIELD_TOO_LONG' => 'The field "%1$s" is too long, a maximum of %2$d characters is allowed.',
- 'FIELD_TOO_SMALL' => 'The value of "%1$s" is too small, a minimum value of %2$d is required.',
- 'FIELD_TOO_LARGE' => 'The value of "%1$s" is too large, a maximum value of %2$d is allowed.',
- 'FIELD_INVALID_CHARS_NUMBERS_ONLY' => 'The field "%s" has invalid characters, only numbers are allowed.',
- 'FIELD_INVALID_CHARS_ALPHA_ONLY' => 'The field "%s" has invalid characters, only alphanumeric characters are allowed.',
- 'FIELD_INVALID_CHARS_SPACERS_ONLY' => 'The field "%s" has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
- 'FIELD_INVALID_DATE' => 'The field "%s" has an invalid date.',
+ '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.',
+ 'FIELD_TOO_LONG' => 'The field “%1$s” is too long, a maximum of %2$d characters is allowed.',
+ 'FIELD_TOO_SMALL' => 'The value of “%1$s” is too small, a minimum value of %2$d is required.',
+ 'FIELD_TOO_LARGE' => 'The value of “%1$s” is too large, a maximum value of %2$d is allowed.',
+ 'FIELD_INVALID_CHARS_NUMBERS_ONLY' => 'The field “%s” has invalid characters, only numbers are allowed.',
+ 'FIELD_INVALID_CHARS_ALPHA_ONLY' => 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
+ 'FIELD_INVALID_CHARS_SPACERS_ONLY' => 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
+ 'FIELD_INVALID_DATE' => 'The field “%s” has an invalid date.',
'FOE_MESSAGE' => 'Message from foe',
'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible and personal messages will not be permitted. Please note that you cannot ignore moderators or administrators.',
@@ -224,6 +227,8 @@ $lang = array_merge($lang, array(
'IF_FOLDER_FULL' => 'If folder is full',
'IMPORTANT_NEWS' => 'Important announcements',
+ 'INVALID_CHARS_USERNAME' => 'The username contains forbidden characters.',
+ 'INVALID_CHARS_NEW_PASSWORD'=> 'The password does not contain the required characters.',
'ITEMS_REQUIRED' => 'The items marked with * are required profile fields and need to be filled out',
'JOIN_SELECTED' => 'Join selected',
@@ -237,50 +242,49 @@ $lang = array_merge($lang, array(
'LOGIN_REDIRECT' => 'You have been successfully logged in.',
'LOGOUT_REDIRECT' => 'You have been successfully logged out.',
- 'MARK_IMPORTANT' => 'Mark as important',
- 'MARKED_MESSAGE' => 'Marked message',
- 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folder reached',
- 'MESSAGE_BY_AUTHOR' => 'by',
- 'MESSAGE_COLOURS' => 'Message colours',
- 'MESSAGE_DELETED' => 'Message successfully deleted',
- 'MESSAGE_HISTORY' => 'Message history',
- 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by it\'s author before it was delivered',
- 'MESSAGE_SENT_ON' => 'on',
- 'MESSAGE_STORED' => 'Your message has been sent successfully',
- 'MESSAGE_TO' => 'To',
- 'MESSAGES_DELETED' => 'Messages successfully deleted',
- 'MOVE_DELETED_MESSAGES_TO' => 'Move messages from removed folder to',
- '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_UP' => 'Move up',
-
- 'NEW_EMAIL_ERROR' => 'The email addresses you entered do not match.',
- 'NEW_FOLDER_NAME' => 'New folder name',
- 'NEW_PASSWORD' => 'Password',
- 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.',
- 'NEW_PASSWORD_EXPLAIN' => 'Must be between %1$d and %2$d characters.',
- 'NOTIFY_METHOD' => 'Notification method',
- 'NOTIFY_METHOD_BOTH' => 'Both',
- 'NOTIFY_METHOD_EMAIL' => 'Email only',
- 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.',
- 'NOTIFY_METHOD_IM' => 'Jabber only',
- 'NOTIFY_ON_PM' => 'Email me on new private messages',
+ 'MARK_IMPORTANT' => 'Mark as important',
+ 'MARKED_MESSAGE' => 'Marked message',
+ 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folder reached',
+ 'MESSAGE_BY_AUTHOR' => 'by',
+ 'MESSAGE_COLOURS' => 'Message colours',
+ 'MESSAGE_DELETED' => 'Message successfully deleted',
+ 'MESSAGE_HISTORY' => 'Message history',
+ 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by it’s author before it was delivered',
+ 'MESSAGE_SENT_ON' => 'on',
+ 'MESSAGE_STORED' => 'Your message has been sent successfully',
+ 'MESSAGE_TO' => 'To',
+ 'MESSAGES_DELETED' => 'Messages successfully deleted',
+ 'MOVE_DELETED_MESSAGES_TO' => 'Move messages from removed folder to',
+ '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_UP' => 'Move up',
+
+ 'NEW_EMAIL_ERROR' => 'The email addresses you entered do not match.',
+ 'NEW_FOLDER_NAME' => 'New folder name',
+ 'NEW_PASSWORD' => 'Password',
+ 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.',
+ 'NOTIFY_METHOD' => 'Notification method',
+ 'NOTIFY_METHOD_BOTH' => 'Both',
+ 'NOTIFY_METHOD_EMAIL' => 'Email only',
+ 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.',
+ 'NOTIFY_METHOD_IM' => 'Jabber only',
+ 'NOTIFY_ON_PM' => 'Notify me on new private messages',
'NOT_ADDED_FRIENDS_ANONYMOUS' => 'You cannot add the anonymous user to your friends list.',
- 'NOT_ADDED_FRIENDS_FOES' => 'You cannot add users to your friends list who are on your foes list',
- 'NOT_ADDED_FRIENDS_SELF' => 'You cannot add yourself to the friends list',
- 'NOT_ADDED_FOES_MOD_ADMIN' => 'You cannot add administrators and moderators to your foes list.',
- 'NOT_ADDED_FOES_ANONYMOUS' => 'You cannot add the anonymous user to your foes list.',
- 'NOT_ADDED_FOES_FRIENDS' => 'You cannot add users to your foes list who are on your friends list.',
- 'NOT_ADDED_FOES_SELF' => 'You cannot add yourself to the foes list.',
- 'NOT_AGREE' => 'I do not agree to these terms',
- 'NOT_ENOUGH_SPACE_FOLDER' => 'The destination folder "%s" seems to be full. The requested action has not been taken.',
- 'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.',
- 'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.',
- 'NO_ACTION_MODE' => 'No message action specified',
- 'NO_AUTHOR' => 'No author defined for this message',
- 'NO_AVATAR_CATEGORY' => 'None',
+ 'NOT_ADDED_FRIENDS_FOES' => 'You cannot add users to your friends list who are on your foes list',
+ 'NOT_ADDED_FRIENDS_SELF' => 'You cannot add yourself to the friends list',
+ 'NOT_ADDED_FOES_MOD_ADMIN' => 'You cannot add administrators and moderators to your foes list.',
+ 'NOT_ADDED_FOES_ANONYMOUS' => 'You cannot add the anonymous user to your foes list.',
+ 'NOT_ADDED_FOES_FRIENDS' => 'You cannot add users to your foes list who are on your friends list.',
+ 'NOT_ADDED_FOES_SELF' => 'You cannot add yourself to the foes list.',
+ 'NOT_AGREE' => 'I do not agree to these terms',
+ 'NOT_ENOUGH_SPACE_FOLDER' => 'The destination folder “%s” seems to be full. The requested action has not been taken.',
+ 'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.',
+ 'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.',
+ 'NO_ACTION_MODE' => 'No message action specified.',
+ 'NO_AUTHOR' => 'No author defined for this message',
+ 'NO_AVATAR_CATEGORY' => 'None',
'NO_AUTH_DELETE_MESSAGE' => 'You are not authorised to delete private messages.',
'NO_AUTH_EDIT_MESSAGE' => 'You are not authorised to edit private messages.',
@@ -312,12 +316,17 @@ $lang = array_merge($lang, array(
'NO_WATCHED_FORUMS' => 'You are not watching any forums.',
'NO_WATCHED_TOPICS' => 'You are not watching any topics.',
+ 'PASS_TYPE_ALPHA_EXPLAIN' => 'Password must be between %1$d and %2$d chars long and must contain alphanumerics',
+ 'PASS_TYPE_ANY_EXPLAIN' => 'Must be between %1$d and %2$d characters.',
+ 'PASS_TYPE_CASE_EXPLAIN' => 'Password must be between %1$d and %2$d chars long and must be mixed case',
+ 'PASS_TYPE_SYMBOL_EXPLAIN' => 'Password must be between %1$d and %2$d chars long and must contain symbols',
'PASSWORD_ACTIVATED' => 'Your new password has been activated',
'PASSWORD_UPDATED' => 'Your password has been sent successfully to your original email address.',
'PERMISSIONS_RESTORED' => 'Successfully restored original permissions.',
'PERMISSIONS_TRANSFERED' => 'Successfully transfered permissions from <strong>%s</strong>, you are now able to browse the forum with the users permissions.<br />Please note that admin permissions were not transfered. You are able to revert to your permission set at any time.',
'PM_DISABLED' => 'Private messaging has been disabled on this board',
'PM_FROM' => 'From',
+ 'PM_FROM_REMOVED_AUTHOR' => 'This message was sent by a user no longer registered.',
'PM_ICON' => 'PM icon',
'PM_INBOX' => 'Inbox',
'PM_OUTBOX' => 'Outbox',
@@ -337,28 +346,29 @@ $lang = array_merge($lang, array(
'PROFILE_INFO_NOTICE' => 'Please note that this information will be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
'PROFILE_UPDATED' => 'Your profile has been updated.',
- 'RECIPIENT' => 'Recipient',
- 'RECIPIENTS' => 'Recipients',
- 'REGISTRATION' => 'Registration',
- 'RELATIVE_DAYS' => 'Relative days',
- 'RELEASE_MESSAGES' => '%sRelease all on-hold messages%s... they will be re-sorted into the appropiate folder if enough space is made available.',
- 'REMOVE_ADDRESS' => 'Remove address',
- 'REMOVE_SELECTED_BOOKMARKS' => 'Remove selected bookmarks',
- 'REMOVE_SELECTED_BOOKMARKS_CONFIRM' => 'Are you sure you want to delete all selected bookmarks?',
- 'REMOVE_BOOKMARK_MARKED' => 'Remove marked bookmarks',
- 'REMOVE_FOLDER' => 'Remove folder',
- 'REMOVE_FOLDER_CONFIRM' => 'Are you sure you want to remove this folder?',
- 'RENAME' => 'Rename',
- 'RENAME_FOLDER' => 'Rename folder',
- 'REPLIED_MESSAGE' => 'Replied to message',
- 'RESIGN_SELECTED' => 'Resign selected',
- 'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s',
- 'RETURN_UCP' => '%sReturn to the User Control Panel%s',
- 'RULE_ADDED' => 'Rule successfully added',
- 'RULE_ALREADY_DEFINED' => 'This rule was defined previously',
- 'RULE_DELETED' => 'Rule successfully removed',
- 'RULE_NOT_DEFINED' => 'Rule not correctly specified',
-
+ 'RECIPIENT' => 'Recipient',
+ 'RECIPIENTS' => 'Recipients',
+ 'REGISTRATION' => 'Registration',
+ 'RELATIVE_DAYS' => 'Relative days',
+ 'RELEASE_MESSAGES' => '%sRelease all on-hold messages%s… they will be re-sorted into the appropiate folder if enough space is made available.',
+ 'REMOVE_ADDRESS' => 'Remove address',
+ 'REMOVE_SELECTED_BOOKMARKS' => 'Remove selected bookmarks',
+ 'REMOVE_SELECTED_BOOKMARKS_CONFIRM' => 'Are you sure you want to delete all selected bookmarks?',
+ 'REMOVE_BOOKMARK_MARKED' => 'Remove marked bookmarks',
+ 'REMOVE_FOLDER' => 'Remove folder',
+ 'REMOVE_FOLDER_CONFIRM' => 'Are you sure you want to remove this folder?',
+ 'RENAME' => 'Rename',
+ 'RENAME_FOLDER' => 'Rename folder',
+ 'REPLIED_MESSAGE' => 'Replied to message',
+ 'RESIGN_SELECTED' => 'Resign selected',
+ 'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s',
+ 'RETURN_UCP' => '%sReturn to the User Control Panel%s',
+ 'RULE_ADDED' => 'Rule successfully added',
+ 'RULE_ALREADY_DEFINED' => 'This rule was defined previously',
+ 'RULE_DELETED' => 'Rule successfully removed',
+ 'RULE_NOT_DEFINED' => 'Rule not correctly specified',
+
+ 'SAME_PASSWORD_ERROR' => 'The new password you entered is the same as your current password',
'SEARCH_YOUR_POSTS' => 'Show your posts',
'SEND_PASSWORD' => 'Send password',
'SENT_AT' => 'Sent at',
@@ -371,7 +381,7 @@ $lang = array_merge($lang, array(
'SORT_DOWNLOADS' => 'Downloads',
'SORT_EXTENSION' => 'Extension',
'SORT_FILENAME' => 'Filename',
- 'SORT_POST_TIME' => 'Post Time',
+ 'SORT_POST_TIME' => 'Post time',
'SORT_SIZE' => 'Filesize',
'TIMEZONE' => 'Timezone',
@@ -391,36 +401,37 @@ $lang = array_merge($lang, array(
'UCP_JABBER' => 'Jabber address',
'UCP_MAIN' => 'Overview',
- 'UCP_MAIN_BOOKMARKS' => 'Bookmarks',
- 'UCP_MAIN_DRAFTS' => 'Saved drafts',
+ 'UCP_MAIN_ATTACHMENTS' => 'Manage attachments',
+ 'UCP_MAIN_BOOKMARKS' => 'Manage bookmarks',
+ 'UCP_MAIN_DRAFTS' => 'Manage drafts',
'UCP_MAIN_FRONT' => 'Front page',
- 'UCP_MAIN_SUBSCRIBED' => 'Subscribed',
+ 'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions',
'UCP_MSNM' => 'MSN Messenger',
'UCP_NO_ATTACHMENTS' => 'You have posted no files',
'UCP_PREFS' => 'Forum preferences',
- 'UCP_PREFS_PERSONAL' => 'Personal settings',
- 'UCP_PREFS_POST' => 'Posting messages',
- 'UCP_PREFS_VIEW' => 'Viewing posts',
+ 'UCP_PREFS_PERSONAL' => 'Edit global settings',
+ 'UCP_PREFS_POST' => 'Edit posting defaults',
+ 'UCP_PREFS_VIEW' => 'Edit display options',
'UCP_PM' => 'Private messages',
'UCP_PM_COMPOSE' => 'Compose message',
- 'UCP_PM_DRAFTS' => 'PM drafts',
- 'UCP_PM_OPTIONS' => 'Options',
+ 'UCP_PM_DRAFTS' => 'Manage PM drafts',
+ 'UCP_PM_OPTIONS' => 'Edit options',
'UCP_PM_POPUP' => 'Private messages',
'UCP_PM_POPUP_TITLE' => 'Private message popup',
'UCP_PM_UNREAD' => 'Unread messages',
'UCP_PM_VIEW' => 'View messages',
'UCP_PROFILE' => 'Profile',
- 'UCP_PROFILE_AVATAR' => 'Your avatar',
- 'UCP_PROFILE_PROFILE_INFO' => 'Your profile',
- 'UCP_PROFILE_REG_DETAILS' => 'Registration details',
- 'UCP_PROFILE_SIGNATURE' => 'Your signature',
+ 'UCP_PROFILE_AVATAR' => 'Edit avatar',
+ 'UCP_PROFILE_PROFILE_INFO' => 'Edit profile',
+ 'UCP_PROFILE_REG_DETAILS' => 'Edit account settings',
+ 'UCP_PROFILE_SIGNATURE' => 'Edit signature',
'UCP_USERGROUPS' => 'Usergroups',
- 'UCP_USERGROUPS_MEMBER' => 'Memberships',
+ 'UCP_USERGROUPS_MEMBER' => 'Edit memberships',
'UCP_USERGROUPS_MANAGE' => 'Manage groups',
'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.',
@@ -428,9 +439,9 @@ $lang = array_merge($lang, array(
'UCP_RESEND' => 'Send activation email',
'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
'UCP_YIM' => 'Yahoo Messenger',
- 'UCP_ZEBRA' => 'Friends and Foes',
- 'UCP_ZEBRA_FOES' => 'Foes',
- 'UCP_ZEBRA_FRIENDS' => 'Friends',
+ 'UCP_ZEBRA' => 'Friends &amp; Foes',
+ 'UCP_ZEBRA_FOES' => 'Manage foes',
+ 'UCP_ZEBRA_FRIENDS' => 'Manage friends',
'UNKNOWN_FOLDER' => 'Unknown folder',
'UNWATCH_MARKED' => 'Unwatch marked',
'UPLOAD_AVATAR_FILE' => 'Upload from your machine',
@@ -507,7 +518,7 @@ $lang = array_merge($lang, array(
),
- 'GROUPS_EXPLAIN' => 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you extra rights to view content or increase your capabilities in other areas.',
+ 'GROUPS_EXPLAIN' => 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you extra rights to view content or increase your capabilities in other areas.',
'GROUP_LEADER' => 'Leaderships',
'GROUP_MEMBER' => 'Memberships',
'GROUP_PENDING' => 'Pending memberships',
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 99d2d446d6..f995aa4d78 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 0c50afb689..44276689a7 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
@@ -65,15 +67,16 @@ $lang = array_merge($lang, array(
'MISSING_INLINE_ATTACHMENT' => 'The attachment <strong>%s</strong> is no longer available',
'MOVE_TOPIC' => 'Move topic',
- 'NO_ATTACHMENT_SELECTED'=> 'You haven\'t selected an attachment to download or view.',
+ 'NO_ATTACHMENT_SELECTED'=> 'You haven’t selected an attachment to download or view.',
'NO_NEWER_TOPICS' => 'There are no newer topics in this forum',
'NO_OLDER_TOPICS' => 'There are no older topics in this forum',
'NO_UNREAD_POSTS' => 'There are no new unread posts for this topic.',
'NO_VOTE_OPTION' => 'You must specify an option when voting.',
+ 'NO_VOTES' => 'No votes',
+ 'POLL_ENDED_AT' => 'Poll ended at %s',
'POLL_RUN_TILL' => 'Poll runs till %s',
'POLL_VOTED_OPTION' => 'You voted for this option',
- 'POST_ENCODING' => 'This post by <strong>%1$s</strong> was made in a character set different to yours. %2$sView this post in its proper encoding%3$s.',
'PRINT_TOPIC' => 'Print view',
'QUICK_MOD' => 'Quick-mod tools',