aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/ban.php6
-rw-r--r--phpBB/language/en/acp/board.php86
-rw-r--r--phpBB/language/en/acp/common.php74
-rw-r--r--phpBB/language/en/acp/database.php1
-rw-r--r--phpBB/language/en/acp/forums.php5
-rw-r--r--phpBB/language/en/acp/groups.php5
-rw-r--r--phpBB/language/en/acp/language.php2
-rw-r--r--phpBB/language/en/acp/permissions.php14
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php16
-rw-r--r--phpBB/language/en/acp/posting.php7
-rw-r--r--phpBB/language/en/acp/profile.php2
-rw-r--r--phpBB/language/en/acp/prune.php8
-rw-r--r--phpBB/language/en/acp/styles.php1
-rw-r--r--phpBB/language/en/acp/users.php9
-rw-r--r--phpBB/language/en/captcha_qa.php63
-rw-r--r--phpBB/language/en/captcha_recaptcha.php52
-rw-r--r--phpBB/language/en/common.php10
-rw-r--r--phpBB/language/en/email/admin_welcome_inactive.txt5
-rw-r--r--phpBB/language/en/email/coppa_resend_inactive.txt8
-rw-r--r--phpBB/language/en/email/coppa_welcome_inactive.txt9
-rw-r--r--phpBB/language/en/email/installed.txt7
-rw-r--r--phpBB/language/en/email/pm_report_closed.txt8
-rw-r--r--phpBB/language/en/email/pm_report_deleted.txt8
-rw-r--r--phpBB/language/en/email/user_reactivate_account.txt2
-rw-r--r--phpBB/language/en/email/user_remind_inactive.txt2
-rw-r--r--phpBB/language/en/email/user_resend_inactive.txt4
-rw-r--r--phpBB/language/en/email/user_welcome.txt3
-rw-r--r--phpBB/language/en/email/user_welcome_inactive.txt5
-rw-r--r--phpBB/language/en/help_bbcode.php5
-rw-r--r--phpBB/language/en/help_faq.php5
-rw-r--r--phpBB/language/en/install.php35
-rw-r--r--phpBB/language/en/mcp.php38
-rw-r--r--phpBB/language/en/memberlist.php8
-rw-r--r--phpBB/language/en/posting.php5
-rw-r--r--phpBB/language/en/search.php1
-rw-r--r--phpBB/language/en/ucp.php12
-rw-r--r--phpBB/language/en/viewtopic.php6
37 files changed, 437 insertions, 100 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 5fcbb1fa69..099834d1e4 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -48,6 +48,8 @@ $lang = array_merge($lang, array(
'BAN_REASON' => 'Reason for ban',
'BAN_GIVE_REASON' => 'Reason shown to the banned',
'BAN_UPDATE_SUCCESSFUL' => 'The banlist has been updated successfully.',
+ 'BANNED_UNTIL_DATE' => 'until %s', // Example: "until Mon 13.Jul.2009, 14:44"
+ 'BANNED_UNTIL_DURATION' => '%1$s (until %2$s)', // Example: "7 days (until Tue 14.Jul.2009, 14:44)"
'EMAIL_BAN' => 'Ban one or more e-mail addresses',
'EMAIL_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered e-mail address from all current bans.',
@@ -67,7 +69,7 @@ $lang = array_merge($lang, array(
'LENGTH_BAN_INVALID' => 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.',
'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.',
@@ -75,8 +77,6 @@ $lang = array_merge($lang, array(
'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 are emphasised.',
-
-
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 7c2f3a24bb..8797a1210a 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -70,6 +70,10 @@ $lang = array_merge($lang, array(
'ALLOW_NO_CENSORS' => 'Allow disabling of word censoring',
'ALLOW_NO_CENSORS_EXPLAIN' => 'Users can choose to disable the automatic word censoring of posts and private messages.',
'ALLOW_PM_ATTACHMENTS' => 'Allow attachments in private messages',
+ 'ALLOW_PM_REPORT' => 'Allow users to report private messages',
+ 'ALLOW_PM_REPORT_EXPLAIN' => 'If this setting is enabled, users have the option of reporting a private message they have received or sent to the board’s moderators. These private messages will then be visible in the Moderator Control Panel.',
+ 'ALLOW_QUICK_REPLY' => 'Allow quick reply',
+ 'ALLOW_QUICK_REPLY_EXPLAIN' => 'This setting defines if quick reply is enabled or not. If this setting is enabled, forums need to have their quick reply option enabled too.',
'ALLOW_SIG' => 'Allow signatures',
'ALLOW_SIG_BBCODE' => 'Allow BBCode in user signatures',
'ALLOW_SIG_FLASH' => 'Allow use of <code>[FLASH]</code> BBCode tag in user signatures',
@@ -87,9 +91,13 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
+ 'ALLOW_AVATARS' => 'Enable avatars',
+ 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.',
'ALLOW_LOCAL' => 'Enable gallery avatars',
'ALLOW_REMOTE' => 'Enable remote avatars',
'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.',
+ 'ALLOW_REMOTE_UPLOAD' => 'Enable remote avatar uploading',
+ 'ALLOW_REMOTE_UPLOAD_EXPLAIN' => 'Allow uploading of avatars from another website.',
'ALLOW_UPLOAD' => 'Enable avatar uploading',
'AVATAR_GALLERY_PATH' => 'Avatar gallery path',
'AVATAR_GALLERY_PATH_EXPLAIN' => 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.',
@@ -140,15 +148,12 @@ $lang = array_merge($lang, array(
'ALLOW_POST_FLASH' => 'Allow use of <code>[FLASH]</code> BBCode tag in posts',
'ALLOW_POST_FLASH_EXPLAIN' => 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
- 'ENABLE_QUEUE_TRIGGER' => 'Enable queued posts',
- 'ENABLE_QUEUE_TRIGGER_EXPLAIN' => 'Ability to put registered users posts to post approval if their post count is lower than the specified value below. This setting has no effect on the permission setting for post/topic approval.',
- 'QUEUE_TRIGGER_POSTS' => 'Maximum post count for queued posts',
- 'QUEUE_TRIGGER_POSTS_EXPLAIN' => 'If queued posts is enabled, this is the post count the user need to reach in order to post without post approval. If the users post count is below this number, the post is stored in the queue automatically.',
-
'BUMP_INTERVAL' => 'Bump interval',
'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
- 'CHAR_LIMIT' => 'Maximum characters per post',
- 'CHAR_LIMIT_EXPLAIN' => 'The number of characters allowed within a post. Set to 0 for unlimited characters.',
+ 'CHAR_LIMIT' => 'Maximum characters per post/message',
+ 'CHAR_LIMIT_EXPLAIN' => 'The number of characters allowed within a post/private message. Set to 0 for unlimited characters.',
+ 'DELETE_TIME' => 'Limit deleting time',
+ 'DELETE_TIME_EXPLAIN' => 'Limits the time available to delete a new post. Setting the value to 0 disables this behaviour.',
'DISPLAY_LAST_EDITED' => 'Display last edited time information',
'DISPLAY_LAST_EDITED_EXPLAIN' => 'Choose if the last edited by information to be displayed on posts.',
'EDIT_TIME' => 'Limit editing time',
@@ -166,12 +171,15 @@ $lang = array_merge($lang, array(
'MAX_POST_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image/flash file in postings. Set to 0 for unlimited size.',
'MAX_POST_URLS' => 'Maximum links per post',
'MAX_POST_URLS_EXPLAIN' => 'Maximum number of URLs in a post. Set to 0 for unlimited links.',
+ 'MIN_CHAR_LIMIT' => 'Minimum characters per post/message',
+ 'MIN_CHAR_LIMIT_EXPLAIN' => 'The minimum number of characters the user need to enter within a post/private message.',
'POSTING' => 'Posting',
'POSTS_PER_PAGE' => 'Posts per page',
'QUOTE_DEPTH_LIMIT' => 'Maximum nested quotes per post',
'QUOTE_DEPTH_LIMIT_EXPLAIN' => 'Maximum number of nested quotes in a post. Set to 0 for unlimited depth.',
'SMILIES_LIMIT' => 'Maximum smilies per post',
'SMILIES_LIMIT_EXPLAIN' => 'Maximum number of smilies in a post. Set to 0 for unlimited smilies.',
+ 'SMILIES_PER_PAGE' => 'Smilies per page',
'TOPICS_PER_PAGE' => 'Topics per page',
));
@@ -197,8 +205,13 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'ACP_REGISTER_SETTINGS_EXPLAIN' => 'Here you are able to define registration and profile related settings.',
- 'ACC_ACTIVATION' => 'Account activation',
- 'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
+ 'ACC_ACTIVATION' => 'Account activation',
+ 'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
+ 'NEW_MEMBER_POST_LIMIT' => 'New member post limit',
+ 'NEW_MEMBER_POST_LIMIT_EXPLAIN' => 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>',
+ 'NEW_MEMBER_GROUP_DEFAULT' => 'Set Newly Registered Users group to default',
+ 'NEW_MEMBER_GROUP_DEFAULT_EXPLAIN' => 'If set to yes and a new member post limit is specified newly registered users will be not only put into the <em>Newly Registered Users</em> group, but this group also being their default one. This may come in handy if you want to assign a group default rank and/or avatar the user then inherits.',
+
'ACC_ADMIN' => 'By Admin',
'ACC_DISABLE' => 'Disable',
'ACC_NONE' => 'None',
@@ -231,11 +244,45 @@ $lang = array_merge($lang, array(
'USERNAME_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in usernames.',
));
-// Visual Confirmation Settings
+// Feeds
$lang = array_merge($lang, array(
- 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and CAPTCHA settings.',
+ 'ACP_FEED_MANAGEMENT' => 'General Syndication Feeds settings',
+ 'ACP_FEED_MANAGEMENT_EXPLAIN' => 'This Module makes available various ATOM Feeds, parsing any BBCode in posts to make them readable in external feeds.',
+
+ 'ACP_FEED_ENABLE' => 'Enable Feeds',
+ 'ACP_FEED_ENABLE_EXPLAIN' => 'Turns on or off ATOM Feeds for the entire board.<br />Disabling this switches off all Feeds, no matter how the options below are set.',
+ 'ACP_FEED_LIMIT' => 'Number of items',
+ 'ACP_FEED_LIMIT_EXPLAIN' => 'The maximum number of feed items to display.',
+
+ 'ACP_FEED_OVERALL_FORUMS' => 'Enable overall forums feed',
+ 'ACP_FEED_OVERALL_FORUMS_EXPLAIN' => 'This feed displays the latest posts from all forums topics.',
+ 'ACP_FEED_OVERALL_FORUMS_LIMIT' => 'Number of items per page to display in the forums feed',
+
+ 'ACP_FEED_OVERALL_TOPIC' => 'Enable overall topics feed',
+ 'ACP_FEED_OVERALL_TOPIC_EXPLAIN' => 'Enables the “All Topics” feed',
+ 'ACP_FEED_OVERALL_TOPIC_LIMIT' => 'Number of items per page to display in the topics feed',
+ 'ACP_FEED_FORUM' => 'Enable Per-Forum Feeds',
+ 'ACP_FEED_FORUM_EXPLAIN' => 'Single forum new posts.',
+ 'ACP_FEED_TOPIC' => 'Enable Per-Topic Feeds',
+ 'ACP_FEED_TOPIC_EXPLAIN' => 'Single topics new posts.',
+ 'ACP_FEED_NEWS' => 'News Feeds',
+ 'ACP_FEED_NEWS_EXPLAIN' => 'Pull the first post from these forums. Select no forums to disable news feed.<br />Select multiple forums by holding <samp>CTRL</samp> and clicking.',
+
+ 'ACP_FEED_GENERAL' => 'General Feed Settings',
+
+ 'ACP_FEED_ITEM_STATISTICS' => 'Item statistics',
+ 'ACP_FEED_ITEM_STATISTICS_EXPLAIN' => 'Display individual statistics underneath feed items<br />(Posted by, date and time, Replies, Views)',
+ 'ACP_FEED_EXCLUDE_ID' => 'Exclude these forums',
+ 'ACP_FEED_EXCLUDE_ID_EXPLAIN' => 'Content from these will be <strong>not included in feeds</strong>. Select no forum to pull data from all forums.<br />Select/Deselect multiple forums by holding <samp>CTRL</samp> and clicking.',
+));
+// Visual Confirmation Settings
+$lang = array_merge($lang, array(
+ 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure CAPTCHA plugins, which implement various ways to reject registration attempts from so-called spambots.',
+ 'AVAILABLE_CAPTCHAS' => 'Available plugins',
+ 'CAPTCHA_UNAVAILABLE' => 'The CAPTCHA cannot be selected as its requirements are not met.',
'CAPTCHA_GD' => 'GD CAPTCHA',
+ 'CAPTCHA_GD_3D' => 'GD 3D Captcha',
'CAPTCHA_GD_FOREGROUND_NOISE' => 'GD CAPTCHA foreground noise',
'CAPTCHA_GD_EXPLAIN' => 'Use GD to make a more advanced CAPTCHA.',
'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN' => 'Use foreground noise to make the GD based CAPTCHA harder.',
@@ -252,16 +299,23 @@ $lang = array_merge($lang, array(
'CAPTCHA_FONT_DEFAULT' => 'Default',
'CAPTCHA_FONT_NEW' => 'New Shapes',
'CAPTCHA_FONT_LOWER' => 'Also use lowercase',
+ 'CAPTCHA_NO_GD' => 'CAPTCHA without GD',
+ 'CAPTCHA_PREVIEW_MSG' => 'Your changes to the visual confirmation setting were not saved. This is just a preview.',
+ 'CAPTCHA_PREVIEW_EXPLAIN' => 'The CAPTCHA as it would look like using the current selection.',
+ 'CAPTCHA_SELECT' => 'Installed CAPTCHA plugins',
+ 'CAPTCHA_SELECT_EXPLAIN' => 'The dropdown holds the CAPTCHA plugins recognized by the board. Gray entries are not available right now and might need configuration prior to use.',
+ 'CAPTCHA_CONFIGURE' => 'Configure CAPTCHAs',
+ 'CAPTCHA_CONFIGURE_EXPLAIN' => 'Change the settings for the selected CAPTCHA.',
+ 'CONFIGURE' => 'Configure',
+ 'CAPTCHA_NO_OPTIONS' => 'This CAPTCHA has no configuration options.',
- 'CAPTCHA_PREVIEW_MSG' => 'Your changes to the visual confirmation setting were not saved. This is just a preview.',
- 'CAPTCHA_PREVIEW_EXPLAIN' => 'The CAPTCHA as it will look like using the current settings. Use the preview button to refresh. Note that captchas are randomized and will differ from one view to the next.',
'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',
'VISUAL_CONFIRM_REG_EXPLAIN' => 'Requires new users to enter a random code matching an image to help prevent mass registrations.',
'VISUAL_CONFIRM_REFRESH' => 'Enable users to refresh the confirmation image',
- 'VISUAL_CONFIRM_REFRESH_EXPLAIN' => 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration.',
+ 'VISUAL_CONFIRM_REFRESH_EXPLAIN' => 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration. Some plugins might not support this option.',
));
// Cookie Settings
@@ -347,7 +401,7 @@ $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 e-mails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
'ENABLE_GZIP' => 'Enable GZip compression',
- 'ENABLE_GZIP_EXPLAIN' => 'Generated content will be compressed prior to sending it to the user. This can reduce network traffic but will also increase CPU usage on both server and client side.',
+ 'ENABLE_GZIP_EXPLAIN' => 'Generated content will be compressed prior to sending it to the user. This can reduce network traffic but will also increase CPU usage on both server and client side. Requires zlib PHP extension to be loaded.',
'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',
@@ -434,7 +488,7 @@ $lang = array_merge($lang, array(
'EMAIL_SIG' => 'E-mail signature',
'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all e-mails the board sends.',
'ENABLE_EMAIL' => 'Enable board-wide e-mails',
- 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no e-mails will be sent by the board at all.',
+ 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will require no activation of new accounts.</em>',
'SMTP_AUTH_METHOD' => 'Authentication method for SMTP',
'SMTP_AUTH_METHOD_EXPLAIN' => 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
'SMTP_CRAM_MD5' => 'CRAM-MD5',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6cfcc44d21..94188f4b1b 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -88,6 +88,7 @@ $lang = array_merge($lang, array(
'ACP_FORUM_MANAGEMENT' => 'Forum management',
'ACP_FORUM_MODERATORS' => 'Forum moderators',
'ACP_FORUM_PERMISSIONS' => 'Forum permissions',
+ 'ACP_FORUM_PERMISSIONS_COPY' => 'Copy forum permissions',
'ACP_FORUM_ROLES' => 'Forum roles',
'ACP_GENERAL_CONFIGURATION' => 'General configuration',
@@ -148,11 +149,15 @@ $lang = array_merge($lang, array(
'ACP_RESTORE' => 'Restore',
+ 'ACP_FEED' => 'Feed management',
+ 'ACP_FEED_SETTINGS' => 'Feed settings',
+
'ACP_SEARCH' => 'Search configuration',
'ACP_SEARCH_INDEX' => 'Search index',
'ACP_SEARCH_SETTINGS' => 'Search settings',
'ACP_SECURITY_SETTINGS' => 'Security settings',
+ 'ACP_SEND_STATISTICS' => 'Send statistical information',
'ACP_SERVER_CONFIGURATION' => 'Server configuration',
'ACP_SERVER_SETTINGS' => 'Server settings',
'ACP_SIGNATURE_SETTINGS' => 'Signature settings',
@@ -161,6 +166,8 @@ $lang = array_merge($lang, array(
'ACP_STYLE_MANAGEMENT' => 'Style management',
'ACP_STYLES' => 'Styles',
+ 'ACP_SUBMIT_CHANGES' => 'Submit changes',
+
'ACP_TEMPLATES' => 'Templates',
'ACP_THEMES' => 'Themes',
@@ -181,8 +188,9 @@ $lang = array_merge($lang, array(
'ACP_USER_ROLES' => 'User roles',
'ACP_USER_SECURITY' => 'User security',
'ACP_USER_SIG' => 'Signature',
+ 'ACP_USER_WARNINGS' => 'Warnings',
- 'ACP_VC_SETTINGS' => 'Visual confirmation settings',
+ 'ACP_VC_SETTINGS' => 'CAPTCHA module settings',
'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA image preview',
'ACP_VERSION_CHECK' => 'Check for updates',
'ACP_VIEW_ADMIN_PERMISSIONS' => 'View administrative permissions',
@@ -241,6 +249,8 @@ $lang = array_merge($lang, array(
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
+ 'MORE' => 'More', // Not used at the moment
+ 'MORE_INFORMATION' => 'More information »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
@@ -267,10 +277,12 @@ $lang = array_merge($lang, array(
'SELECT_ANONYMOUS' => 'Select anonymous user',
'SELECT_OPTION' => 'Select option',
- 'SETTING_TOO_LOW' => 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.',
- 'SETTING_TOO_BIG' => 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.',
- 'SETTING_TOO_LONG' => 'The entered value for the setting “%1$s” is too long. The maximal allowed length is %2$d.',
- 'SETTING_TOO_SHORT' => 'The entered value for the setting “%1$s” is not long enough. The minimal allowed length is %2$d.',
+ 'SETTING_TOO_LOW' => 'The provided value for the setting “%1$s” is too low. The minimum acceptable value is %2$d.',
+ 'SETTING_TOO_BIG' => 'The provided value for the setting “%1$s” is too high. The maximum acceptable value is %2$d.',
+ 'SETTING_TOO_LONG' => 'The provided value for the setting “%1$s” is too long. The maximum acceptable length is %2$d.',
+ 'SETTING_TOO_SHORT' => 'The provided value for the setting “%1$s” is too short. The minimum acceptable length is %2$d.',
+
+ 'SHOW_ALL_OPERATIONS' => 'Show all operations',
'UCP' => 'User Control Panel',
'USERNAMES_EXPLAIN' => 'Place each username on a separate line.',
@@ -334,6 +346,10 @@ $lang = array_merge($lang, array(
'PURGE_CACHE_CONFIRM' => 'Are you sure you wish to purge the cache?',
'PURGE_CACHE_EXPLAIN' => 'Purge all cache related items, this includes any cached template files or queries.',
+ 'PURGE_SESSIONS' => 'Purge all sessions',
+ 'PURGE_SESSIONS_CONFIRM' => 'Are you sure you wish to purge all sessions? This will log out all users.',
+ 'PURGE_SESSIONS_EXPLAIN' => 'Purge all sessions. This will log out all users by truncating the session table.',
+
'RESET_DATE' => 'Reset board’s start date',
'RESET_DATE_CONFIRM' => 'Are you sure you wish to reset the board’s start date?',
'RESET_ONLINE' => 'Reset most users ever online',
@@ -357,9 +373,11 @@ $lang = array_merge($lang, array(
'UPLOAD_DIR_SIZE' => 'Size of posted attachments',
'USERS_PER_DAY' => 'Users per day',
- 'VALUE' => 'Value',
- 'VIEW_ADMIN_LOG' => 'View administrator log',
- 'VIEW_INACTIVE_USERS' => 'View inactive users',
+ 'VALUE' => 'Value',
+ 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version information.',
+ 'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version',
+ 'VIEW_ADMIN_LOG' => 'View administrator log',
+ 'VIEW_INACTIVE_USERS' => 'View inactive users',
'WELCOME_PHPBB' => 'Welcome to phpBB',
'WRITABLE_CONFIG' => 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
@@ -384,10 +402,24 @@ $lang = array_merge($lang, array(
'SORT_LAST_VISIT' => 'Last visit',
'SORT_REASON' => 'Reason',
'SORT_REG_DATE' => 'Registration date',
+ 'SORT_LAST_REMINDER'=> 'Last reminded',
+ 'SORT_REMINDER' => 'Reminder sent',
'USER_IS_INACTIVE' => 'User is inactive',
));
+// Send statistics page
+$lang = array_merge($lang, array(
+ 'EXPLAIN_SEND_STATISTICS' => 'Please send information about your server and board configurations to phpBB for statistical analysis. All information that could identify you or your website has been removed - the data is entirely <strong>anonymous</strong>. We base decisions about future phpBB versions on this information. The statistics are made available publically. We also share this data with the PHP project, the programming language phpBB is made with.',
+ 'EXPLAIN_SHOW_STATISTICS' => 'Using the button below you can preview all variables that will be transmitted.',
+ 'DONT_SEND_STATISTICS' => 'Return to the ACP if you do not wish to send statistical information to phpBB.',
+ 'GO_ACP_MAIN' => 'Go to the ACP start page',
+ 'HIDE_STATISTICS' => 'Hide details',
+ 'SEND_STATISTICS' => 'Send statistical information',
+ 'SHOW_STATISTICS' => 'Show details',
+ 'THANKS_SEND_STATISTICS' => 'Thank you for submitting your information.',
+));
+
// Log Entries
$lang = array_merge($lang, array(
'LOG_ACL_ADD_USER_GLOBAL_U_' => '<strong>Added or edited users’ user permissions</strong><br />» %s',
@@ -464,23 +496,26 @@ $lang = array_merge($lang, array(
'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_FEED' => '<strong>Altered syndication feeds 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_CONFIG_VISUAL' => '<strong>Altered antibot 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_POST' => '<strong>Deleted post “%1$s” written by</strong><br />» %2$s',
'LOG_DELETE_SHADOW_TOPIC' => '<strong>Deleted shadow topic</strong><br />» %s',
- 'LOG_DELETE_TOPIC' => '<strong>Deleted topic</strong><br />» %s',
+ 'LOG_DELETE_TOPIC' => '<strong>Deleted topic “%1$s” written by</strong><br />» %2$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 %1$s to %2$s',
+ 'LOG_PM_REPORT_CLOSED' => '<strong>Closed PM report</strong><br />» %s',
+ 'LOG_PM_REPORT_DELETED' => '<strong>Deleted PM report</strong><br />» %s',
'LOG_POST_APPROVED' => '<strong>Approved post</strong><br />» %s',
'LOG_POST_DISAPPROVED' => '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
'LOG_POST_EDITED' => '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
@@ -511,6 +546,7 @@ $lang = array_merge($lang, array(
'LOG_ERROR_EMAIL' => '<strong>E-mail error</strong><br />» %s',
'LOG_FORUM_ADD' => '<strong>Created new forum</strong><br />» %s',
+ 'LOG_FORUM_COPIED_PERMISSIONS' => '<strong>Copied forum permissions</strong> from %1$s<br />» %2$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',
@@ -525,6 +561,8 @@ $lang = array_merge($lang, array(
'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_GENERAL_ERROR' => '<strong>A general error occured</strong>: %1$s <br />» %2$s',
+
'LOG_GROUP_CREATED' => '<strong>New usergroup created</strong><br />» %s',
'LOG_GROUP_DEFAULTS' => '<strong>Group “%1$s” made default for members</strong><br />» %2$s',
'LOG_GROUP_DELETE' => '<strong>Usergroup deleted</strong><br />» %s',
@@ -533,8 +571,11 @@ $lang = array_merge($lang, array(
'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_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
+ 'LOG_USERS_PENDING' => '<strong>Users requested to join group “%1$s” and need to be approved</strong><br />» %2$s',
+
+ 'LOG_IMAGE_GENERATION_ERROR' => '<strong>Error while creating image</strong><br />» Error in %1$s on line %2$s: %3$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',
@@ -603,6 +644,8 @@ $lang = array_merge($lang, array(
'LOG_PRUNE_USER_DEL_ANON' => '<strong>Users pruned and posts retained</strong><br />» %s',
'LOG_PURGE_CACHE' => '<strong>Purged cache</strong>',
+ 'LOG_PURGE_SESSIONS' => '<strong>Purged sessions</strong>',
+
'LOG_RANK_ADDED' => '<strong>Added new rank</strong><br />» %s',
'LOG_RANK_REMOVED' => '<strong>Removed rank</strong><br />» %s',
@@ -654,12 +697,15 @@ $lang = array_merge($lang, array(
'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_OUTBOX' => '<strong>Emptied user outbox</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 reactivation</strong><br />» %s',
+ 'LOG_USER_REMOVED_NR' => '<strong>Removed newly registered flag from user</strong><br />» %s',
+
'LOG_USER_UPDATE_EMAIL' => '<strong>User “%1$s” changed e-mail</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',
@@ -683,6 +729,10 @@ $lang = array_merge($lang, array(
'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_WARNING_DELETED' => '<strong>Deleted user warning</strong><br />» %s',
+ 'LOG_WARNINGS_DELETED' => '<strong>Deleted %2$s user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
+ 'LOG_WARNINGS_DELETED_ALL' => '<strong>Deleted all user warnings</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',
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index 7100fcb1e3..ae8f76d6b7 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -54,6 +54,7 @@ $lang = array_merge($lang, array(
'DOWNLOAD_BACKUP' => 'Download backup',
'FILE_TYPE' => 'File type',
+ 'FILE_WRITE_FAIL' => 'Unable to write file to storage folder.',
'FULL_BACKUP' => 'Full',
'RESTORE_FAILURE' => 'The backup file may be corrupt.',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 52919f4f40..371a184fb7 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -44,9 +44,12 @@ $lang = array_merge($lang, array(
'AUTO_PRUNE_VIEWED' => 'Auto-prune post viewed age',
'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.',
+ 'CONTINUE' => 'Continue',
'COPY_PERMISSIONS' => 'Copy permissions from',
+ 'COPY_PERMISSIONS_EXPLAIN' => 'To ease up the permission setup for your new forum, you can copy the permissions of an existing forum.',
'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
+ 'COPY_TO_ACL' => 'Alternatively, you are also able to %sset up new permissions%s for this forum.',
'CREATE_FORUM' => 'Create new forum',
'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum',
@@ -62,6 +65,8 @@ $lang = array_merge($lang, array(
'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.',
'ENABLE_POST_REVIEW' => 'Enable post review',
'ENABLE_POST_REVIEW_EXPLAIN' => 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.',
+ 'ENABLE_QUICK_REPLY' => 'Enable quick reply',
+ 'ENABLE_QUICK_REPLY_EXPLAIN' => 'If set to yes users get a quick reply box for this forum. If the global option for quick reply is disabled or the forum not postable to the quick reply box will not be displayed, even if set to yes here.',
'ENABLE_RECENT' => 'Display active topics',
'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.',
'ENABLE_TOPIC_ICONS' => 'Enable topic icons',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index db6f334540..e8c1a3c494 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -88,16 +88,19 @@ $lang = array_merge($lang, array(
'GROUP_PENDING' => 'Pending members',
'GROUP_MAX_RECIPIENTS' => 'Maximum number of allowed recipients per private message',
'GROUP_MAX_RECIPIENTS_EXPLAIN' => 'The maximum number of allowed recipients in a private message. If 0 is entered, the board-wide setting is used.',
+ 'GROUP_OPTIONS_SAVE' => 'Group wide options',
'GROUP_PROMOTE' => 'Promote to group leader',
'GROUP_RANK' => 'Group rank',
'GROUP_RECEIVE_PM' => 'Group able to receive private messages',
'GROUP_RECEIVE_PM_EXPLAIN' => 'Please note that hidden groups are not able to be messaged, regardless of this setting.',
'GROUP_REQUEST' => 'Request',
'GROUP_SETTINGS_SAVE' => 'Group wide settings',
+ 'GROUP_SKIP_AUTH' => 'Exempt group leader from permissions',
+ 'GROUP_SKIP_AUTH_EXPLAIN' => 'If enabled group leader no longer inherit permissions from the group.',
'GROUP_TYPE' => 'Group type',
'GROUP_TYPE_EXPLAIN' => 'This determines which users can join or view this group.',
'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.',
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index a10148942b..4d11309ebb 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -37,7 +37,7 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACP_FILES' => 'Admin language files',
- 'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs.',
+ 'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs. The default language pack is marked with an asterisk (*).',
'EMAIL_FILES' => 'E-mail templates',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 920643d927..cf248cffdb 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -80,6 +80,7 @@ $lang = array_merge($lang, array(
'ACP_ADMINISTRATORS_EXPLAIN' => 'Here you can assign administrator permissions to users or groups. All users with administrator permissions can view the administration control panel.',
'ACP_FORUM_MODERATORS_EXPLAIN' => 'Here you can assign users and groups as forum moderators. To assign users access to forums, to define global moderative permissions or administrators please use the appropriate page.',
'ACP_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page.',
+ 'ACP_FORUM_PERMISSIONS_COPY_EXPLAIN' => 'Here you can copy forum permissions from one forum to one or more other forums.',
'ACP_GLOBAL_MODERATORS_EXPLAIN' => 'Here you can assign global moderator permissions 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 administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
@@ -109,6 +110,12 @@ $lang = array_merge($lang, array(
'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.',
+ 'COPY_PERMISSIONS_CONFIRM' => 'Are you sure you wish to carry out this operation? Please be aware that this will overwrite any existing permissions on the selected targets.',
+ 'COPY_PERMISSIONS_FORUM_FROM_EXPLAIN' => 'The source forum you want to copy permissions from.',
+ 'COPY_PERMISSIONS_FORUM_TO_EXPLAIN' => 'The destination forums you want the copied permissions applied to.',
+ 'COPY_PERMISSIONS_FROM' => 'Copy permissions from',
+ 'COPY_PERMISSIONS_TO' => 'Apply permissions to',
+
'CREATE_ROLE' => 'Create role',
'CREATE_ROLE_FROM' => 'Use settings from…',
'CUSTOM' => 'Custom…',
@@ -164,6 +171,7 @@ $lang = array_merge($lang, array(
'ROLE_FORUM_POLLS' => 'Standard Access + Polls',
'ROLE_FORUM_READONLY' => 'Read Only Access',
'ROLE_FORUM_STANDARD' => 'Standard Access',
+ 'ROLE_FORUM_NEW_MEMBER' => 'Newly registered User',
'ROLE_MOD_FULL' => 'Full Moderator',
'ROLE_MOD_QUEUE' => 'Queue Moderator',
'ROLE_MOD_SIMPLE' => 'Simple Moderator',
@@ -173,6 +181,8 @@ $lang = array_merge($lang, array(
'ROLE_USER_NOAVATAR' => 'No Avatar',
'ROLE_USER_NOPM' => 'No Private Messages',
'ROLE_USER_STANDARD' => 'Standard Features',
+ 'ROLE_USER_NEW_MEMBER' => 'Newly registered User',
+
'ROLE_DESCRIPTION_ADMIN_FORUM' => 'Can access the forum management and forum permission settings.',
'ROLE_DESCRIPTION_ADMIN_FULL' => 'Has access to all administrative functions of this board.<br />Not recommended.',
@@ -187,6 +197,7 @@ $lang = array_merge($lang, array(
'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 and deleting own topics, but cannot lock own topics, and cannot create polls.',
+ 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER' => 'A role for members of the special newly registered users group; contains <samp>NEVER</samp> permissions to lock features for new users.',
'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.',
@@ -196,6 +207,7 @@ $lang = array_merge($lang, array(
'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_USER_NEW_MEMBER' => 'A role for members of the special newly registered users group; contains <samp>NEVER</samp> permissions to lock features for new users.',
'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_DESCRIPTION_LONG' => 'The role description is too long, please limit it to 4000 characters.',
@@ -241,7 +253,7 @@ $lang = array_merge($lang, array(
'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_FOUNDER' => 'The user is a founder, therefore admin permissions are always set to <samp>YES</samp>.',
'TRACE_USER_KEPT' => 'The user’s permission is <samp>NO</samp> so the old total value is kept.',
'TRACE_USER_KEPT_LOCAL' => 'The user’s permission for this forum is <samp>NO</samp> so the old total value is kept.',
'TRACE_USER_NEVER_TOTAL_NEVER' => 'The user’s permission is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index c8ccc0e56a..945a675861 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -121,10 +121,10 @@ $lang = array_merge($lang, array(
'acl_u_pm_printpm' => array('lang' => 'Can print private messages', 'cat' => 'pm'),
'acl_u_pm_attach' => array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
'acl_u_pm_download' => array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
- 'acl_u_pm_bbcode' => array('lang' => 'Can post BBCode in private messages', 'cat' => 'pm'),
- 'acl_u_pm_smilies' => array('lang' => 'Can post smilies in private messages', 'cat' => 'pm'),
- 'acl_u_pm_img' => array('lang' => 'Can post images in private messages', 'cat' => 'pm'),
- 'acl_u_pm_flash' => array('lang' => 'Can post Flash in private messages', 'cat' => 'pm'),
+ 'acl_u_pm_bbcode' => array('lang' => 'Can use BBCode in private messages', 'cat' => 'pm'),
+ 'acl_u_pm_smilies' => array('lang' => 'Can use smilies in private messages', 'cat' => 'pm'),
+ 'acl_u_pm_img' => array('lang' => 'Can use [img] BBCode tag in private messages', 'cat' => 'pm'),
+ 'acl_u_pm_flash' => array('lang' => 'Can use [flash] BBCode tag in private messages', 'cat' => 'pm'),
'acl_u_sendemail' => array('lang' => 'Can send e-mails', 'cat' => 'misc'),
'acl_u_sendim' => array('lang' => 'Can send instant messages', 'cat' => 'misc'),
@@ -151,10 +151,10 @@ $lang = array_merge($lang, array(
'acl_f_attach' => array('lang' => 'Can attach files', 'cat' => 'content'),
'acl_f_download' => array('lang' => 'Can download files', 'cat' => 'content'),
'acl_f_sigs' => array('lang' => 'Can use signatures', 'cat' => 'content'),
- 'acl_f_bbcode' => array('lang' => 'Can post BBCode', 'cat' => 'content'),
- 'acl_f_smilies' => array('lang' => 'Can post smilies', 'cat' => 'content'),
- 'acl_f_img' => array('lang' => 'Can post images', 'cat' => 'content'),
- 'acl_f_flash' => array('lang' => 'Can post Flash', 'cat' => 'content'),
+ 'acl_f_bbcode' => array('lang' => 'Can use BBCode', 'cat' => 'content'),
+ 'acl_f_smilies' => array('lang' => 'Can use smilies', 'cat' => 'content'),
+ 'acl_f_img' => array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'),
+ 'acl_f_flash' => array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
'acl_f_edit' => array('lang' => 'Can edit own posts', 'cat' => 'actions'),
'acl_f_delete' => array('lang' => 'Can delete own posts', 'cat' => 'actions'),
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 01453b85ef..531e07f7ef 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -68,7 +68,7 @@ $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. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language 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 &quot;wrote&quot; or its translation according to user’s locale.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
+ '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. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language 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.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
'TOKEN_DEFINITION' => 'What can it be?',
'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
@@ -78,7 +78,7 @@ $lang = array_merge($lang, array(
'IDENTIFIER' => 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore',
'NUMBER' => 'Any series of digits',
'EMAIL' => 'A valid e-mail address',
- 'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, &quot;http://&quot; is prefixed 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 prefixed 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 colour, 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>'
)
@@ -180,6 +180,8 @@ $lang = array_merge($lang, array(
'SMILIES_URL' => 'Smiley image file',
'SMILIES_WIDTH' => 'Smiley width',
+ 'TOO_MANY_SMILIES' => 'Limit of %d smilies reached.',
+
'WRONG_PAK_TYPE' => 'The specified package does not contain the appropriate data.',
));
@@ -217,6 +219,7 @@ $lang = array_merge($lang, array(
'RANK_ADDED' => 'The rank was successfully added.',
'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_IMAGE_IN_USE' => '(In use)',
'RANK_MINIMUM' => 'Minimum posts',
'RANK_REMOVED' => 'The rank was successfully deleted.',
'RANK_SPECIAL' => 'Set as special rank',
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index ef291585bc..a25dcd174b 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -66,6 +66,8 @@ $lang = array_merge($lang, array(
'DISPLAY_AT_PROFILE_EXPLAIN' => 'The user is able to change this profile field within the user control panel.',
'DISPLAY_AT_REGISTER' => 'Display on registration screen',
'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration.',
+ 'DISPLAY_ON_VT' => 'Display on viewtopic screen',
+ 'DISPLAY_ON_VT_EXPLAIN' => 'If this option is enabled, the field will be displayed in the mini-profile on the topic screen.',
'DISPLAY_PROFILE_FIELD' => 'Publicly display profile field',
'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown in all locations allowed within the load settings. Setting this to “no” will hide the field from topic pages, profiles and the memberlist.',
'DROPDOWN_ENTRIES_EXPLAIN' => 'Enter your options now, every option in one line.',
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 31e14d62a1..8a06225102 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -37,23 +37,23 @@ if (empty($lang) || !is_array($lang))
// User pruning
$lang = array_merge($lang, array(
- 'ACP_PRUNE_USERS_EXPLAIN' => 'Here you can delete (or deactivate) users from your board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.',
+ 'ACP_PRUNE_USERS_EXPLAIN' => 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
'DEACTIVATE_DELETE' => 'Deactivate or delete',
- 'DEACTIVATE_DELETE_EXPLAIN' => 'Choose whether to deactivate users or delete them entirely, note there is no undo!',
+ 'DEACTIVATE_DELETE_EXPLAIN' => 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!',
'DELETE_USERS' => 'Delete',
'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 <kbd>YYYY-MM-DD</kbd> format.',
- 'LAST_ACTIVE_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
+ 'LAST_ACTIVE_EXPLAIN' => 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. Enter <kbd>0000-00-00</kbd> to prune users who never logged in, <em>Before</em> and <em>After</em> conditions will be ignored.',
'PRUNE_USERS_LIST' => 'Users to be pruned',
'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed.',
'PRUNE_USERS_LIST_DEACTIVATE' => 'With the selected critera for pruning users the following accounts will be deactivated.',
- 'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here, they will be used in preference to the criteria above.',
+ 'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here, they will be used in preference to the criteria above. Founders cannot be pruned.',
'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully.',
'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully.',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index eb742fd140..247d8a4140 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -392,6 +392,7 @@ $lang = array_merge($lang, array(
'TEMPLATE_LOCATION' => 'Store templates in',
'TEMPLATE_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.',
'TEMPLATE_NAME' => 'Template name',
+ 'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.',
'TEMPLATE_REFRESHED' => 'Template refreshed successfully.',
'THEME_ADDED' => 'New theme added on filesystem.',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index dc28032483..8d9bf0d486 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -77,6 +77,7 @@ $lang = array_merge($lang, array(
'MOVE_POSTS_EXPLAIN' => 'Please select the forum to which you wish to move all the posts this user has made.',
'NO_SPECIAL_RANK' => 'No special rank assigned',
+ 'NO_WARNINGS' => 'No warnings.',
'NOT_MANAGE_FOUNDER' => 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.',
'QUICK_TOOLS' => 'Quick tools',
@@ -102,21 +103,28 @@ $lang = array_merge($lang, array(
'USER_ADMIN_DEACTIVED' => 'User deactivated successfully.',
'USER_ADMIN_DEL_ATTACH' => 'Delete all attachments',
'USER_ADMIN_DEL_AVATAR' => 'Delete avatar',
+ 'USER_ADMIN_DEL_OUTBOX' => 'Empty PM outbox',
'USER_ADMIN_DEL_POSTS' => 'Delete all posts',
'USER_ADMIN_DEL_SIG' => 'Delete signature',
'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options.',
'USER_ADMIN_FORCE' => 'Force reactivation',
+ 'USER_ADMIN_LEAVE_NR' => 'Remove from Newly Registered',
'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_NOT_ALLOWED' => 'The avatar cannot be displayed because avatars have been disallowed.',
'USER_AVATAR_UPDATED' => 'Successfully updated user avatars details.',
+ 'USER_AVATAR_TYPE_NOT_ALLOWED' => 'The current avatar cannot be displayed because its type has been disallowed.',
'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields',
'USER_DELETED' => 'User deleted successfully.',
'USER_GROUP_ADD' => 'Add user to group',
'USER_GROUP_NORMAL' => 'User defined groups user is a member of',
'USER_GROUP_PENDING' => 'Groups user is in pending mode',
'USER_GROUP_SPECIAL' => 'Pre-defined groups user is a member of',
+ 'USER_LIFTED_NR' => 'Successfully removed the user’s newly registered status.',
'USER_NO_ATTACHMENTS' => 'There are no attached files to display.',
+ 'USER_OUTBOX_EMPTIED' => 'Successfully emptied user’s private message outbox.',
+ 'USER_OUTBOX_EMPTY' => 'The user’s private message outbox was already empty.',
'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.',
@@ -126,6 +134,7 @@ $lang = array_merge($lang, array(
'USER_RANK' => 'User rank',
'USER_RANK_UPDATED' => 'User rank updated.',
'USER_SIG_UPDATED' => 'User signature successfully updated.',
+ 'USER_WARNING_LOG_DELETED' => 'No information available. Possibly the log entry has been deleted.',
'USER_TOOLS' => 'Basic tools',
));
diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
new file mode 100644
index 0000000000..1d443e995a
--- /dev/null
+++ b/phpBB/language/en/captcha_qa.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* captcha_qa [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+ $lang = array();
+}
+
+// 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
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// 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
+
+$lang = array_merge($lang, array(
+ 'CAPTCHA_QA' => 'Q&amp;A CAPTCHA',
+ 'CONFIRM_QUESTION_EXPLAIN' => 'This question is a means of identifying and preventing automated submissions.',
+ 'CONFIRM_QUESTION_WRONG' => 'You have provided an invalid answer to the confirmation question.',
+
+ 'QUESTION_ANSWERS' => 'Answers',
+ 'ANSWERS_EXPLAIN' => 'Please enter valid answers to the question, one per line.',
+ 'CONFIRM_QUESTION' => 'Question',
+
+ 'ANSWER' => 'Answer',
+ 'EDIT_QUESTION' => 'Edit Question',
+ 'QUESTIONS' => 'Questions',
+ 'QUESTIONS_EXPLAIN' => 'During registration, users will be asked one of the questions specified here. To use this plugin, at least one question must be set in the default language. These questions should be easy for your target audience to answer, but beyond the ability of a bot capable of running a Google™ search. Using a large and regulary changed set of questions will yield the best results. Enable the strict setting if your question relies on punctuation or capitalisation.',
+ 'QUESTION_DELETED' => 'Question deleted',
+ 'QUESTION_LANG' => 'Language',
+ 'QUESTION_LANG_EXPLAIN' => 'The language that this question and its answers are written in.',
+ 'QUESTION_STRICT' => 'Strict check',
+ 'QUESTION_STRICT_EXPLAIN' => 'If enabled, capitalisation and whitespace will also be enforced.',
+
+ 'QUESTION_TEXT' => 'Question',
+ 'QUESTION_TEXT_EXPLAIN' => 'The question that will be asked on registration.',
+
+ 'QA_ERROR_MSG' => 'Please fill in all fields and enter at least one answer.',
+));
+
+?> \ No newline at end of file
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
new file mode 100644
index 0000000000..897e8a4979
--- /dev/null
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* recaptcha [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+ $lang = array();
+}
+
+// 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
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// 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
+
+$lang = array_merge($lang, array(
+ 'RECAPTCHA_LANG' => 'en',
+ 'RECAPTCHA_NOT_AVAILABLE' => 'In order to use reCaptcha, you must create an account on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+ 'CAPTCHA_RECAPTCHA' => 'reCaptcha',
+ 'RECAPTCHA_INCORRECT' => 'The visual confirmation code you submitted was incorrect',
+
+ 'RECAPTCHA_PUBLIC' => 'Public reCaptcha key',
+ 'RECAPTCHA_PUBLIC_EXPLAIN' => 'Your public reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+ 'RECAPTCHA_PRIVATE' => 'Private reCaptcha key',
+ 'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+
+ 'RECAPTCHA_EXPLAIN' => 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed below into the text field underneath.',
+));
+
+?> \ No newline at end of file
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 12510d5d5e..b97445f186 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -250,6 +250,7 @@ $lang = array_merge($lang, array(
'G_REGISTERED' => 'Registered users',
'G_REGISTERED_COPPA' => 'Registered COPPA users',
'G_GLOBAL_MODERATORS' => 'Global moderators',
+ 'G_NEWLY_REGISTERED' => 'Newly registered users',
'HIDDEN_USERS_ONLINE' => '%d hidden users online',
'HIDDEN_USERS_TOTAL' => '%d hidden',
@@ -383,6 +384,8 @@ $lang = array_merge($lang, array(
'NO_ONLINE_USERS' => 'No registered users',
'NO_POSTS' => 'No posts',
'NO_POSTS_TIME_FRAME' => 'No posts exist inside this topic for the selected time frame.',
+ 'NO_FEED_ENABLED' => 'Feeds are not available on this board.',
+ 'NO_FEED' => 'The requested feed is not available.',
'NO_SUBJECT' => 'No subject specified', // Used for posts having no subject defined but displayed within management pages.
'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn’t exist.',
'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods.',
@@ -486,6 +489,8 @@ $lang = array_merge($lang, array(
'RETURN_PAGE' => '%sReturn to the previous page%s',
'RETURN_TOPIC' => '%sReturn to the topic last visited%s',
'RETURN_TO' => 'Return to',
+ 'FEED' => 'Feed',
+ 'FEED_NEWS' => 'News',
'RULES_ATTACH_CAN' => 'You <strong>can</strong> post attachments in this forum',
'RULES_ATTACH_CANNOT' => 'You <strong>cannot</strong> post attachments in this forum',
'RULES_DELETE_CAN' => 'You <strong>can</strong> delete your posts in this forum',
@@ -517,6 +522,7 @@ $lang = array_merge($lang, array(
'SEARCH_SELF' => 'View your posts',
'SEARCH_TOPIC' => 'Search this topic…',
'SEARCH_UNANSWERED' => 'View unanswered posts',
+ 'SEARCH_UNREAD' => 'View unread posts',
'SECONDS' => 'Seconds',
'SELECT' => 'Select',
'SELECT_ALL_CODE' => 'Select all',
@@ -535,6 +541,7 @@ $lang = array_merge($lang, array(
'SORT_JOINED' => 'Joined date',
'SORT_LOCATION' => 'Location',
'SORT_RANK' => 'Rank',
+ 'SORT_POSTS' => 'Posts',
'SORT_TOPIC_TITLE' => 'Topic title',
'SORT_USERNAME' => 'Username',
'SPLIT_TOPIC' => 'Split topic',
@@ -598,6 +605,7 @@ $lang = array_merge($lang, array(
'TOPIC' => 'Topic',
'TOPICS' => 'Topics',
+ 'TOPICS_UNAPPROVED' => 'At least one topic in this forum has not been approved.',
'TOPIC_ICON' => 'Topic icon',
'TOPIC_LOCKED' => 'This topic is locked, you cannot edit posts or make further replies.',
'TOPIC_LOCKED_SHORT'=> 'Topic locked',
@@ -644,6 +652,8 @@ $lang = array_merge($lang, array(
'USERS' => 'Users',
'USE_PERMISSIONS' => 'Test out user’s permissions',
+ 'USER_NEW_PERMISSION_DISALLOWED' => 'We are sorry, but you are not authorised to use this feature. You may have just registered here and may need to participate more to be able to use this feature.',
+
'VARIANT_DATE_SEPARATOR' => ' / ', // Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date
'VIEWED' => 'Viewed',
'VIEWING_FAQ' => 'Viewing FAQ',
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index 746d13da7a..af3ac9ca87 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -6,14 +6,13 @@ Please keep this e-mail for your records. Your account information is as follows
----------------------------
Username: {USERNAME}
-Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
-Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.
+Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this had occured.
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
index 9d43ca4f85..c3e4af576d 100644
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ b/phpBB/language/en/email/coppa_resend_inactive.txt
@@ -2,9 +2,9 @@ Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
-In compliance with the COPPA your account is currently inactive.
+In compliance with the COPPA, your account is currently inactive.
-Please print this message out and have your parent or guardian sign and date it. Then fax it to:
+Please print this message and have your parent or guardian sign and date it. Then fax it to:
{FAX_INFO}
@@ -33,9 +33,9 @@ Date: _______________
------------------------------ CUT HERE ------------------------------
-Once the administrator has received the above form via fax or regular mail your account will be activated.
+Once the administrator has received the above form via fax or regular mail, your account will be activated.
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
index f079ddb838..c3e4af576d 100644
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ b/phpBB/language/en/email/coppa_welcome_inactive.txt
@@ -2,9 +2,9 @@ Subject: Welcome to "{SITENAME}"
{WELCOME_MSG}
-In compliance with the COPPA your account is currently inactive.
+In compliance with the COPPA, your account is currently inactive.
-Please print this message out and have your parent or guardian sign and date it. Then fax it to:
+Please print this message and have your parent or guardian sign and date it. Then fax it to:
{FAX_INFO}
@@ -16,7 +16,6 @@ OR mail it to:
Permission to participate at "{SITENAME}" - {U_BOARD}
Username: {USERNAME}
-Password: {PASSWORD}
E-mail: {EMAIL_ADDRESS}
I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION.
@@ -34,9 +33,9 @@ Date: _______________
------------------------------ CUT HERE ------------------------------
-Once the administrator has received the above form via fax or regular mail your account will be activated.
+Once the administrator has received the above form via fax or regular mail, your account will be activated.
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
index 4d9286bd65..2aa03a7f33 100644
--- a/phpBB/language/en/email/installed.txt
+++ b/phpBB/language/en/email/installed.txt
@@ -4,17 +4,16 @@ Congratulations,
You have successfully installed phpBB on your server.
-This e-mail contains important information on your installation that you should keep safe. The password has been encrypted in the database and cannot be recovered, although you can request a new password should you lose this one.
+This e-mail contains important information regarding your installation and should be kept for reference. Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
----------------------------
Username: {USERNAME}
-Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
-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/
+Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
-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.
+In order to keep your board safe and secure, we highly recommended keeping current with software releases. For your convenience, a mailing list is available at the page referenced above.
{EMAIL_SIG} \ No newline at end of file
diff --git a/phpBB/language/en/email/pm_report_closed.txt b/phpBB/language/en/email/pm_report_closed.txt
new file mode 100644
index 0000000000..1b9f4a6658
--- /dev/null
+++ b/phpBB/language/en/email/pm_report_closed.txt
@@ -0,0 +1,8 @@
+Subject: Report closed - "{PM_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. If you have further questions, please contact {CLOSER_NAME} by private message.
+
+
+{EMAIL_SIG} \ No newline at end of file
diff --git a/phpBB/language/en/email/pm_report_deleted.txt b/phpBB/language/en/email/pm_report_deleted.txt
new file mode 100644
index 0000000000..8cb7fdd6fa
--- /dev/null
+++ b/phpBB/language/en/email/pm_report_deleted.txt
@@ -0,0 +1,8 @@
+Subject: Report deleted - "{PM_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the report you filed regarding the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator.
+
+
+{EMAIL_SIG} \ No newline at end of file
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
index b5639d0b7a..4ef7dd899a 100644
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -9,7 +9,7 @@ Please keep this e-mail for your records. Your account information is as follows
Username: {USERNAME}
----------------------------
-Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Please visit the following link to reactivate your account:
diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt
index 49dea02044..1ba28329f6 100644
--- a/phpBB/language/en/email/user_remind_inactive.txt
+++ b/phpBB/language/en/email/user_remind_inactive.txt
@@ -2,7 +2,7 @@ Subject: Inactive account reminder
Hello {USERNAME},
-On {REGISTER_DATE} you registered a new account at "{SITENAME}". To date you have not activated this account which is a prerequisite for board login. For your convenience the activation link is repeated below.
+This notification is a reminder that your account at "{SITENAME}", created on {REGISTER_DATE}, remains inactive. If you would like to activate this account, please visit the following link:
{U_ACTIVATE}
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
index 5635801b80..4638d6df63 100644
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -8,9 +8,9 @@ Please keep this e-mail for your records. Your account information is as follows
Username: {USERNAME}
----------------------------
-Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
-Your account is currently inactive. You cannot use it until you visit the following link:
+Please visit the following link in order to activate your account:
{U_ACTIVATE}
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
index 6c3cee0b50..2648769dfd 100644
--- a/phpBB/language/en/email/user_welcome.txt
+++ b/phpBB/language/en/email/user_welcome.txt
@@ -6,12 +6,11 @@ Please keep this e-mail for your records. Your account information is as follows
----------------------------
Username: {USERNAME}
-Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
index 4b6d96ddd8..1b72b1c5a8 100644
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ b/phpBB/language/en/email/user_welcome_inactive.txt
@@ -6,16 +6,15 @@ Please keep this e-mail for your records. Your account information is as follows
----------------------------
Username: {USERNAME}
-Password: {PASSWORD}
Board URL: {U_BOARD}
----------------------------
-Your account is currently inactive. You cannot use it until you visit the following link:
+Please visit the following link in order to activate your account:
{U_ACTIVATE}
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
Thank you for registering.
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index ed6fea96d3..df5f950e3e 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -78,6 +78,11 @@ $help = array(
0 => 'Creating an Ordered list',
1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
),
+ // This block will switch the FAQ-Questions to the second template column
+ array(
+ 0 => '--',
+ 1 => '--'
+ ),
array(
0 => '--',
1 => 'Creating Links'
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 89ac845021..88b2cc273d 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -202,6 +202,11 @@ $help = array(
0 => 'What are topic icons?',
1 => 'Topic icons are author chosen images associated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the board administrator.'
),
+ // This block will switch the FAQ-Questions to the second template column
+ array(
+ 0 => '--',
+ 1 => '--'
+ ),
array(
0 => '--',
1 => 'User Levels and Groups'
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index d3fd8d5e26..b653d54318 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -133,6 +133,7 @@ $lang = array_merge($lang, array(
'DB_PASSWORD' => 'Database password',
'DB_PORT' => 'Database server port',
'DB_PORT_EXPLAIN' => 'Leave this blank unless you know the server operates on a non-standard port.',
+ 'DB_UPDATE_NOT_SUPPORTED' => 'We are sorry, but this script does not support updating from versions of phpBB prior to “%1$s”. The version you currently have installed is “%2$s”. Please update to a previous version before running this script. Assistance with this is available in the Support Forum on phpBB.com.',
'DB_USERNAME' => 'Database username',
'DB_TEST' => 'Test connection',
'DEFAULT_LANG' => 'Default board language',
@@ -166,6 +167,9 @@ $lang = array_merge($lang, array(
'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 “Unwritable” 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',
+
+ 'FIREBIRD_DBMS_UPDATE_REQUIRED' => 'phpBB no longer supports Firebird/Interbase prior to Version 2.1. Please update your Firebird installation to at least 2.1.0 before proceeding with the update.',
+
'FINAL_STEP' => 'Process final step',
'FORUM_ADDRESS' => 'Board address',
'FORUM_ADDRESS_EXPLAIN' => 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
@@ -184,11 +188,11 @@ $lang = array_merge($lang, array(
'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' => '
- <p>You have now successfully installed phpBB %1$s. From here, you have two options as to what to do with your newly installed phpBB3:</p>
+ You have successfully installed phpBB %1$s. Please proceed by choosing one of the following options:</p>
<h2>Convert an existing board to phpBB3</h2>
- <p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed on to the convertor</a>.</p>
+ <p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
<h2>Go live with your phpBB3!</h2>
- <p>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/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>, see the <a href="%3$s">README</a> for further information.</p><p><strong>Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.</strong></p>',
+ <p>Clicking the button below will take you to a form for submitting statistical data to phpBB in your Administration Control Panel (ACP). We would appreciate it if you could help us by sending that information. Afterwards you should 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/">Documentation</a>, <a href="%3$s">README</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, 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 phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
@@ -208,7 +212,7 @@ $lang = array_merge($lang, array(
<li>MySQL 3.23 or above (MySQLi supported)</li>
<li>PostgreSQL 7.3+</li>
<li>SQLite 2.8.2+</li>
- <li>Firebird 2.0+</li>
+ <li>Firebird 2.1+</li>
<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
<li>Oracle</li>
</ul>
@@ -230,7 +234,7 @@ $lang = array_merge($lang, array(
'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” 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_FIREBIRD' => 'The version of Firebird installed on this machine is older than 2.1, please upgrade to a newer version.',
'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
'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.',
@@ -364,7 +368,7 @@ $lang = array_merge($lang, array(
// Updater
$lang = array_merge($lang, array(
- 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
+ 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
'ARCHIVE_FILE' => 'Source file within archive',
'BACK' => 'Back',
@@ -466,7 +470,7 @@ $lang = array_merge($lang, array(
'NO_VISIBLE_CHANGES' => 'No visible changes',
'NOTICE' => 'Notice',
'NUM_CONFLICTS' => 'Number of conflicts',
- 'NUMBER_OF_FILES_COLLECTED' => 'Currently differences of %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
+ 'NUMBER_OF_FILES_COLLECTED' => 'Currently differences from %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
@@ -559,14 +563,15 @@ $lang = array_merge($lang, array(
'USER_ACTIVE' => 'Active user',
'USER_INACTIVE' => 'Inactive user',
- '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',
+ 'VERSION_CHECK' => 'Version check',
+ 'VERSION_CHECK_EXPLAIN' => 'Checks to see if your phpBB installation is up to date.',
+ 'VERSION_NOT_UP_TO_DATE' => 'Your phpBB installation is not up to date. Please continue the update process.',
+ 'VERSION_NOT_UP_TO_DATE_ACP' => 'Your phpBB installation is not up to date.<br />Below is a link to the release announcement, which contains more information as well as instructions on updating.',
+ 'VERSION_NOT_UP_TO_DATE_TITLE' => 'Your phpBB installation is not up to date.',
+ 'VERSION_UP_TO_DATE' => 'Your phpBB installation is up to date. Although there are no updates available at this time, you may continue in order to perform a file validity check.',
+ 'VERSION_UP_TO_DATE_ACP' => 'Your phpBB installation is up to date. There are no updates available at this time.',
+ 'VIEWING_FILE_CONTENTS' => 'Viewing file contents',
+ 'VIEWING_FILE_DIFF' => 'Viewing file differences',
'WRONG_INFO_FILE_FORMAT' => 'Wrong info file format',
));
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 93b694be77..ab03cdb0be 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -46,6 +46,7 @@ $lang = array_merge($lang, array(
'ALL_NOTES_DELETED' => 'Successfully removed all user notes.',
'ALL_REPORTS' => 'All reports',
'ALREADY_REPORTED' => 'This post has already been reported.',
+ 'ALREADY_REPORTED_PM' => 'This private message has already been reported.',
'ALREADY_WARNED' => 'A warning has already been issued for this post.',
'APPROVE' => 'Approve',
'APPROVE_POST' => 'Approve post',
@@ -58,11 +59,19 @@ $lang = array_merge($lang, array(
'CANNOT_WARN_SELF' => 'You cannot warn yourself.',
'CAN_LEAVE_BLANK' => 'This can be left blank.',
'CHANGE_POSTER' => 'Change poster',
+ 'CLOSE_PM_REPORT' => 'Close PM report',
+ 'CLOSE_PM_REPORT_CONFIRM' => 'Are you sure you want to close the selected PM report?',
+ 'CLOSE_PM_REPORTS' => 'Close PM reports',
+ 'CLOSE_PM_REPORTS_CONFIRM' => 'Are you sure you want to close the selected PM reports?',
'CLOSE_REPORT' => 'Close report',
'CLOSE_REPORT_CONFIRM' => 'Are you sure you want to close the selected report?',
'CLOSE_REPORTS' => 'Close reports',
'CLOSE_REPORTS_CONFIRM' => 'Are you sure you want to close the selected reports?',
+ 'DELETE_PM_REPORT' => 'Delete PM report',
+ 'DELETE_PM_REPORT_CONFIRM' => 'Are you sure you want to delete the selected PM report?',
+ 'DELETE_PM_REPORTS' => 'Delete PM reports',
+ 'DELETE_PM_REPORTS_CONFIRM' => 'Are you sure you want to delete the selected PM 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?',
@@ -106,6 +115,7 @@ $lang = array_merge($lang, array(
'LATEST_LOGS' => 'Latest 5 logged actions',
'LATEST_REPORTED' => 'Latest 5 reports',
+ 'LATEST_REPORTED_PMS' => 'Latest 5 PM reports',
'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting approval',
'LATEST_WARNING_TIME' => 'Latest warning issued',
'LATEST_WARNINGS' => 'Latest 5 warnings',
@@ -170,7 +180,14 @@ $lang = array_merge($lang, array(
'MCP_POST_REPORTS' => 'Reports issued on this post',
- 'MCP_REPORTS' => 'Reported posts',
+ 'MCP_PM_REPORTS' => 'Reported PMs',
+ 'MCP_PM_REPORT_DETAILS' => 'PM Report details',
+ 'MCP_PM_REPORTS_CLOSED' => 'Closed PM reports',
+ 'MCP_PM_REPORTS_CLOSED_EXPLAIN' => 'This is a list of all reports about private messages which have previously been resolved.',
+ 'MCP_PM_REPORTS_OPEN' => 'Open PM reports',
+ 'MCP_PM_REPORTS_OPEN_EXPLAIN' => 'This is a list of all reported private messages which are still to be handled.',
+
+ 'MCP_REPORTS' => 'Reported messages',
'MCP_REPORT_DETAILS' => 'Report details',
'MCP_REPORTS_CLOSED' => 'Closed reports',
'MCP_REPORTS_CLOSED_EXPLAIN' => 'This is a list of all reports about posts which have previously been resolved.',
@@ -232,6 +249,13 @@ $lang = array_merge($lang, array(
'ONLY_TOPIC' => 'Only topic “%s”',
'OTHER_USERS' => 'Other users posting from this IP',
+ 'PM_REPORT_CLOSED_SUCCESS' => 'The selected PM report has been closed successfully.',
+ 'PM_REPORT_DELETED_SUCCESS' => 'The selected PM report has been deleted successfully.',
+ 'PM_REPORTED_SUCCESS' => 'This private message has been successfully reported.',
+ 'PM_REPORT_TOTAL' => 'In total there is <strong>1</strong> PM report to review.',
+ 'PM_REPORTS_TOTAL' => 'In total there are <strong>%d</strong> PM reports to review.',
+ 'PM_REPORTS_ZERO_TOTAL' => 'There are no PM reports to review.',
+ 'PM_REPORT_DETAILS' => 'Private message report details',
'POSTER' => 'Poster',
'POSTS_APPROVED_SUCCESS' => 'The selected posts have been approved.',
'POSTS_DELETED_SUCCESS' => 'The selected posts have been successfully removed from the database.',
@@ -264,7 +288,7 @@ $lang = array_merge($lang, array(
'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. Reporting should generally be used only if the message breaks forum rules.',
+ 'REPORT_MESSAGE_EXPLAIN' => 'Use this form to report the selected private message. Reporting should generally be used only if the message breaks forum rules. <strong>Reporting a private message will make its contents visible to all moderators.</strong>',
'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.',
@@ -275,6 +299,7 @@ $lang = array_merge($lang, array(
'RETURN_MESSAGE' => '%sReturn to the message%s',
'RETURN_NEW_FORUM' => '%sGo to the new forum%s',
'RETURN_NEW_TOPIC' => '%sGo to the new topic%s',
+ 'RETURN_PM' => '%sReturn to the private message%s',
'RETURN_POST' => '%sReturn to the post%s',
'RETURN_QUEUE' => '%sReturn to the queue%s',
'RETURN_REPORTS' => '%sReturn to the reports%s',
@@ -346,6 +371,7 @@ $lang = array_merge($lang, array(
'USER_WARNING_ADDED' => 'User warned successfully.',
'VIEW_DETAILS' => 'View details',
+ 'VIEW_PM' => 'View private message',
'VIEW_POST' => 'View post',
'WARNED_USERS' => 'Warned users',
@@ -365,10 +391,10 @@ $lang = array_merge($lang, array(
'OTHER' => 'Other',
),
'DESCRIPTION' => array(
- 'WAREZ' => 'The post contains links to illegal or pirated software.',
- 'SPAM' => 'The reported post has the only purpose to advertise for a website or another product.',
- 'OFF_TOPIC' => 'The reported post is off topic.',
- 'OTHER' => 'The reported post does not fit into any other category, please use the further information field.',
+ 'WAREZ' => 'The message contains links to illegal or pirated software.',
+ 'SPAM' => 'The reported message has the only purpose to advertise for a website or another product.',
+ 'OFF_TOPIC' => 'The reported message is off topic.',
+ 'OTHER' => 'The reported message does not fit into any other category, please use the further information field.',
)
),
));
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index b5b8434776..e7a9c6b88d 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -81,7 +81,7 @@ $lang = array_merge($lang, array(
'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_MSNM_CONNECT' => 'MSNM is not connected.\nYou have to connect to MSNM to continue.',
'IM_NAME' => 'Your Name',
'IM_NO_DATA' => 'There is no suitable contact information for this user.',
'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
@@ -90,7 +90,7 @@ $lang = array_merge($lang, array(
'IM_SEND_MESSAGE' => 'Send message',
'IM_SENT_JABBER' => 'Your message to %1$s has been sent successfully.',
'IM_USER' => 'Send an instant message',
-
+
'LAST_ACTIVE' => 'Last active',
'LESS_THAN' => 'Less than',
'LIST_USER' => '1 user',
@@ -134,6 +134,10 @@ $lang = array_merge($lang, array(
'USER_ADMIN' => 'Administrate user',
'USER_BAN' => 'Banning',
'USER_FORUM' => 'User statistics',
+ 'USER_LAST_REMINDED' => array(
+ 0 => 'No reminder sent at this time',
+ 1 => '%1$d reminder sent<br />» %2$s',
+ ),
'USER_ONLINE' => 'Online',
'USER_PRESENCE' => 'Board presence',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index b3acb7f290..8016a233fd 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -167,6 +167,8 @@ $lang = array_merge($lang, array(
'POST_ICON' => 'Post icon',
'POST_NORMAL' => 'Normal',
'POST_REVIEW' => 'Post review',
+ 'POST_REVIEW_EDIT' => 'Post review',
+ 'POST_REVIEW_EDIT_EXPLAIN' => 'This post has been altered by another user while you were editing it. You may wish to review the current version of this post and adjust your edits.',
'POST_REVIEW_EXPLAIN' => 'At least one new post has been made to this topic. You may wish to review your post in light of this.',
'POST_STORED' => 'This message has been posted successfully.',
'POST_STORED_MOD' => 'This message has been submitted successfully, but it will need to be approved by a moderator before it is publicly viewable.',
@@ -184,10 +186,11 @@ $lang = array_merge($lang, array(
'SMILIES_ARE_ON' => 'Smilies are <em>ON</em>',
'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit',
'STICK_TOPIC_FOR' => 'Stick topic for',
- 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 or leave blank for a never ending Sticky/Announcement.',
+ 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 or leave blank for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.',
'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text.',
'TOO_FEW_CHARS' => 'Your message contains too few characters.',
+ 'TOO_FEW_CHARS_LIMIT' => 'Your message contains %1$d characters. The minimum number of characters you need to enter is %2$d.',
'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.',
'TOO_MANY_ATTACHMENTS' => 'Cannot add another attachment, %d is the maximum.',
'TOO_MANY_CHARS' => 'Your message contains too many characters.',
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 4618a585b3..be92391a4e 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -53,6 +53,7 @@ $lang = array_merge($lang, array(
'JUMP_TO_POST' => 'Jump to post',
'LOGIN_EXPLAIN_EGOSEARCH' => 'The board requires you to be registered and logged in to view your own posts.',
+ 'LOGIN_EXPLAIN_UNREADSEARCH'=> 'The board requires you to be registered and logged in to view your unread posts.',
'MAX_NUM_SEARCH_KEYWORDS_REFINE' => 'You specified too many words to search for. Please do not enter more than %1$d words.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 594a1dbe4f..4b79a4b6ca 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -79,6 +79,7 @@ $lang = array_merge($lang, array(
'ADD_NEW_RULE' => 'Add new rule',
'ADD_RULE' => 'Add rule',
'ADD_TO' => 'Add [To]',
+ 'ADD_USERS_UCP_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Please enter each username on a separate line.',
'ADMIN_EMAIL' => 'Administrators can e-mail me information',
'AGREE' => 'I agree to these terms',
'ALLOW_PM' => 'Allow users to send you private messages',
@@ -92,7 +93,9 @@ $lang = array_merge($lang, array(
'AVATAR_FEATURES_DISABLED' => 'The avatar functionality is currently disabled.',
'AVATAR_GALLERY' => 'Local gallery',
'AVATAR_GENERAL_UPLOAD_ERROR' => 'Could not upload avatar to %s.',
+ 'AVATAR_NOT_ALLOWED' => 'Your avatar cannot be displayed because avatars have been disallowed.',
'AVATAR_PAGE' => 'Page',
+ 'AVATAR_TYPE_NOT_ALLOWED' => 'Your current avatar cannot be displayed because its type has been disallowed.',
'BACK_TO_DRAFTS' => 'Back to saved drafts',
'BACK_TO_LOGIN' => 'Back to login screen',
@@ -197,6 +200,7 @@ $lang = array_merge($lang, array(
'FOES_UPDATED' => 'Your foes list has been updated successfully.',
'FOLDER_ADDED' => 'Folder successfully added.',
'FOLDER_MESSAGE_STATUS' => '%1$d from %2$d messages stored',
+ 'FOLDER_NAME_EMPTY' => 'You must enter a name for this folder.',
'FOLDER_NAME_EXIST' => 'Folder <strong>%s</strong> already exists.',
'FOLDER_OPTIONS' => 'Folder options',
'FOLDER_RENAMED' => 'Folder successfully renamed.',
@@ -273,10 +277,12 @@ $lang = array_merge($lang, array(
'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_BOTS' => 'You cannot add bots 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_BOTS' => 'You cannot add bots 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',
@@ -346,7 +352,7 @@ $lang = array_merge($lang, array(
'POST_EDIT_PM' => 'Edit message',
'POST_FORWARD_PM' => 'Forward message',
'POST_NEW_PM' => 'Compose message',
- 'POST_PM_LOCKED' => 'Private messaging is locked',
+ 'POST_PM_LOCKED' => 'Private messaging is locked.',
'POST_PM_POST' => 'Quote post',
'POST_QUOTE_PM' => 'Quote message',
'POST_REPLY_PM' => 'Reply to message',
@@ -368,6 +374,8 @@ $lang = array_merge($lang, array(
'RENAME' => 'Rename',
'RENAME_FOLDER' => 'Rename folder',
'REPLIED_MESSAGE' => 'Replied to message',
+ 'REPLY_TO_ALL' => 'Reply to sender and all recipients.',
+ 'REPORT_PM' => 'Report private message',
'RESIGN_SELECTED' => 'Resign selected',
'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s',
'RETURN_UCP' => '%sReturn to the User Control Panel%s',
@@ -417,7 +425,7 @@ $lang = array_merge($lang, array(
'UCP_MAIN_FRONT' => 'Front page',
'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions',
- 'UCP_MSNM' => 'MSN Messenger',
+ 'UCP_MSNM' => 'WL/MSN Messenger',
'UCP_NO_ATTACHMENTS' => 'You have posted no files.',
'UCP_PREFS' => 'Board preferences',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 4252fa7542..3e1874f1ab 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -48,6 +48,7 @@ $lang = array_merge($lang, array(
'BUMP_TOPIC' => 'Bump topic',
'CODE' => 'Code',
+ 'COLLAPSE_QR' => 'Hide Quick Reply',
'DELETE_TOPIC' => 'Delete topic',
'DOWNLOAD_NOTICE' => 'You do not have the required permissions to view the files attached to this post.',
@@ -59,7 +60,8 @@ $lang = array_merge($lang, array(
'FILE_NOT_FOUND_404' => 'The file <strong>%s</strong> does not exist.',
'FORK_TOPIC' => 'Copy topic',
-
+ 'FULL_EDITOR' => 'Full Editor',
+
'LINKAGE_FORBIDDEN' => 'You are not authorised to view, download or link from/to this site.',
'LOGIN_NOTIFY_TOPIC' => 'You have been notified about this topic, please login to view it.',
'LOGIN_VIEWTOPIC' => 'The board requires you to be registered and logged in to view this topic.',
@@ -86,11 +88,13 @@ $lang = array_merge($lang, array(
'PRINT_TOPIC' => 'Print view',
'QUICK_MOD' => 'Quick-mod tools',
+ 'QUICKREPLY' => 'Quick Reply',
'QUOTE' => 'Quote',
'REPLY_TO_TOPIC' => 'Reply to topic',
'RETURN_POST' => '%sReturn to the post%s',
+ 'SHOW_QR' => 'Quick Reply',
'SUBMIT_VOTE' => 'Submit vote',
'TOTAL_VOTES' => 'Total votes',