Changeset 702 for trunk/forum/language/en

trunk/forum/language/en/acp/ban.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: ban.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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',
 …
         'PERMANENT'             => 'Permanent',
         'UNTIL'                                         => 'Until',
         'USER_BAN'                                      => 'Ban one or more 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.',
 ));

trunk/forum/language/en/acp/board.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: board.php 9037 2008-10-26 10:52:43Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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 switch allows for the quick reply to be disabled board-wide. When enabled, forum specific settings will be used to determine whether the quick reply is displayed in individual forums.',
+        'ALLOW_QUICK_REPLY_BUTTON'      => 'Submit and enable quick reply in all forums',
         'ALLOW_SIG'                                     => 'Allow signatures',
         'ALLOW_SIG_BBCODE'                      => 'Allow BBCode in user signatures',
 …
         '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',
 …
         '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.',
+        'BUMP_INTERVAL_EXPLAIN'                 => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic. Setting the value to 0 disables this feature.',
+        '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.',
 …
         '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',
 …
         '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',
 ));
 …
         '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',
 …
 ));
+// Feeds
+$lang = array_merge($lang, array(
+        '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_GENERAL'                                      => 'General feed settings',
+        'ACP_FEED_POST_BASED'                           => 'Post-based feed settings',
+        'ACP_FEED_TOPIC_BASED'                          => 'Topic-based feed settings',
+        'ACP_FEED_SETTINGS_OTHER'                       => 'Other feeds and settings',
+        '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'                                      => 'Enable board-wide feed',
+        'ACP_FEED_OVERALL_EXPLAIN'                      => 'Board-wide new posts.',
+        'ACP_FEED_FORUM'                                        => 'Enable per-forum feeds',
+        'ACP_FEED_FORUM_EXPLAIN'                        => 'Single forum and subforums new posts.',
+        'ACP_FEED_TOPIC'                                        => 'Enable per-topic feeds',
+        'ACP_FEED_TOPIC_EXPLAIN'                        => 'Single topics new posts.',
+        'ACP_FEED_TOPICS_NEW'                           => 'Enable new topics feed',
+        'ACP_FEED_TOPICS_NEW_EXPLAIN'           => 'Enables the “New Topics” feed, which displays the last created topics including the first post.',
+        'ACP_FEED_TOPICS_ACTIVE'                        => 'Enable active topics feed',
+        'ACP_FEED_TOPICS_ACTIVE_EXPLAIN'        => 'Enables the “Active Topics” feed, which displays the last active topics including the last post.',
+        'ACP_FEED_NEWS'                                         => 'News feed',
+        '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_OVERALL_FORUMS'                       => 'Enable forums feed',
+        'ACP_FEED_OVERALL_FORUMS_EXPLAIN'       => 'Enables the “All forums” feed, which displays a list of forums.',
+        'ACP_FEED_HTTP_AUTH'                            => 'Allow HTTP Authentication',
+        'ACP_FEED_HTTP_AUTH_EXPLAIN'            => 'Enables HTTP authentication, which allows users to receive content that is hidden to guest users by adding the <samp>auth=http</samp> parameter to the feed URL. Please note that some PHP setups require additional changes to the .htaccess file. Instructions can be found in that file.',
+        'ACP_FEED_ITEM_STATISTICS'                      => 'Item statistics',
+        'ACP_FEED_ITEM_STATISTICS_EXPLAIN'      => 'Display individual statistics underneath feed items<br />(e.g. 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 are able to define visual confirmation defaults and CAPTCHA settings.',
+        '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_Y_GRID'                                             => 'GD CAPTCHA background noise y-axis',
         'CAPTCHA_GD_Y_GRID_EXPLAIN'                             => 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable y-axis background noise.',
+        'CAPTCHA_GD_WAVE'                                               => 'GD CAPTCHA wave distortion',
+        'CAPTCHA_GD_WAVE_EXPLAIN'                               => 'This applies a wave distortion to the CAPTCHA.',
+        'CAPTCHA_GD_3D_NOISE'                                   => 'Add 3D-noise objects',
+        'CAPTCHA_GD_3D_NOISE_EXPLAIN'                   => 'This adds additional objects to the CAPTCHA, over the letters.',
+        'CAPTCHA_GD_FONTS'                                              => 'Use different fonts',
+        'CAPTCHA_GD_FONTS_EXPLAIN'                              => 'This setting controls how many different letter shapes are used. You can just use the default shapes or introduce altered letters. Adding lowercase letters is also possible.',
+        '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 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.',
+        '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.',
         '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. Some plugins might not support this option.',
 ));
 …
         'LDAP_NO_IDENTITY'                              => 'Could not find a login identity for %s.',
         'LDAP_PASSWORD'                                 => 'LDAP password',
         'LDAP_PASSWORD_EXPLAIN'                 => 'Leave blank to use anonymous binding. Else fill in the password for the above user.  Required for Active Directory Servers. <strong>WARNING:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.',
+        'LDAP_PASSWORD_EXPLAIN'                 => 'Leave blank to use anonymous binding. Else fill in the password for the above user. Required for Active Directory Servers.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>',
         'LDAP_PORT'                                             => 'LDAP server port',
         'LDAP_PORT_EXPLAIN'                             => 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.',
 …
         '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.',
 …
         '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_LOGIN'                                    => 'LOGIN',
         'SMTP_PASSWORD'                                 => 'SMTP password',
         'SMTP_PASSWORD_EXPLAIN'                 => 'Only enter a password if your SMTP server requires it.',
+        'SMTP_PASSWORD_EXPLAIN'                 => 'Only enter a password if your SMTP server requires it.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>',
         'SMTP_PLAIN'                                    => 'PLAIN',
         'SMTP_POP_BEFORE_SMTP'                  => 'POP-BEFORE-SMTP',
 …
         'JAB_PACKAGE_SIZE_EXPLAIN'      => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
         'JAB_PASSWORD'                          => 'Jabber password',
+        'JAB_PASSWORD_EXPLAIN'          => '<em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>',
         'JAB_PORT'                                      => 'Jabber port',
         'JAB_PORT_EXPLAIN'                      => 'Leave blank unless you know it is not port 5222.',

trunk/forum/language/en/acp/common.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: common.php 9049 2008-11-05 22:03:16Z toonarmy $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'ACP_FORUM_MODERATORS'                  => 'Forum moderators',
         'ACP_FORUM_PERMISSIONS'                 => 'Forum permissions',
+        'ACP_FORUM_PERMISSIONS_COPY'    => 'Copy forum permissions',
         'ACP_FORUM_ROLES'                               => 'Forum roles',
 …
         'ACP_RESTORE'                           => 'Restore',
+        'ACP_FEED'                                      => 'Feed management',
+        'ACP_FEED_SETTINGS'                     => 'Feed settings',
         'ACP_SEARCH'                            => 'Search configuration',
         'ACP_SEARCH_INDEX'                      => 'Search index',
 …
         'ACP_SECURITY_SETTINGS'         => 'Security settings',
+        'ACP_SEND_STATISTICS'           => 'Send statistical information',
         'ACP_SERVER_CONFIGURATION'      => 'Server configuration',
         'ACP_SERVER_SETTINGS'           => 'Server settings',
 …
         'ACP_STYLE_MANAGEMENT'          => 'Style management',
         'ACP_STYLES'                            => 'Styles',
+        'ACP_SUBMIT_CHANGES'            => 'Submit changes',
         'ACP_TEMPLATES'                         => 'Templates',
 …
         'ACP_USER_SECURITY'                             => 'User security',
         'ACP_USER_SIG'                                  => 'Signature',
+        'ACP_VC_SETTINGS'                                       => 'Visual confirmation settings',
+        'ACP_USER_WARNINGS'                             => 'Warnings',
+        'ACP_VC_SETTINGS'                                       => 'CAPTCHA module settings',
         'ACP_VC_CAPTCHA_DISPLAY'                        => 'CAPTCHA image preview',
         'ACP_VERSION_CHECK'                                     => 'Check for updates',
 …
         'ADMIN_PANEL'                   => 'Administration Control Panel',
         'ADM_LOGOUT'                    => 'ACP Logout',
+        'ADM_LOGOUT'                    => 'ACP&nbsp;Logout',
         'ADM_LOGGED_OUT'                => 'Successfully logged out from Administration Control Panel',
 …
         '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',
 …
         'PERMISSIONS_TRANSFERRED'                       => 'Permissions transferred',
         'PERMISSIONS_TRANSFERRED_EXPLAIN'       => 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
-        'PIXEL'                                                         => 'px',
         'PROCEED_TO_ACP'                                        => '%sProceed to the ACP%s',
 …
         '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',
 …
         'NUMBER_ORPHAN'         => 'Orphan attachments',
+        'PHP_VERSION_OLD'       => 'The version of PHP on this server will no longer be supported by future versions of phpBB. %sDetails%s',
         'POSTS_PER_DAY'         => 'Posts per day',
 …
         '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',
 …
         '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',
 …
         '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_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_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_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_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',
         'LOG_FORUM_DEL_MOVE_POSTS'                              => '<strong>Deleted forum and moved posts </strong> to %1$s<br />» %2$s',
         'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'               => '<strong>Deleted forum and its subforums, moved messages</strong> to %1$s<br />» %2$s',
+        'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'               => '<strong>Deleted forum and its subforums, moved posts</strong> to %1$s<br />» %2$s',
         'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS'  => '<strong>Deleted forum, moved posts</strong> to %1$s <strong>and subforums</strong> to %2$s<br />» %3$s',
         'LOG_FORUM_DEL_POSTS'                                   => '<strong>Deleted forum and its messages</strong><br />» %s',
         'LOG_FORUM_DEL_POSTS_FORUMS'                    => '<strong>Deleted forum, its messages and subforums</strong><br />» %s',
         'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'               => '<strong>Deleted forum and its messages, moved subforums</strong> to %1$s<br />» %2$s',
+        'LOG_FORUM_DEL_POSTS'                                   => '<strong>Deleted forum and its posts</strong><br />» %s',
+        'LOG_FORUM_DEL_POSTS_FORUMS'                    => '<strong>Deleted forum, its posts and subforums</strong><br />» %s',
+        'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'               => '<strong>Deleted forum and its posts, moved subforums</strong> to %1$s<br />» %2$s',
         'LOG_FORUM_EDIT'                                                => '<strong>Edited forum details</strong><br />» %s',
         'LOG_FORUM_MOVE_DOWN'                                   => '<strong>Moved forum</strong> %1$s <strong>below</strong> %2$s',
         'LOG_FORUM_MOVE_UP'                                             => '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
         'LOG_FORUM_SYNC'                                                => '<strong>Re-synchronised forum</strong><br />» %s',
+        'LOG_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_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_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_ADDED'               => '<strong>Added new members to 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_PURGE_CACHE'                       => '<strong>Purged cache</strong>',
+        'LOG_PURGE_SESSIONS'            => '<strong>Purged sessions</strong>',
         'LOG_RANK_ADDED'                => '<strong>Added new rank</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_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_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',

trunk/forum/language/en/acp/database.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: database.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'FILE_TYPE'                     => 'File type',
+        'FILE_WRITE_FAIL'       => 'Unable to write file to storage folder.',
         'FULL_BACKUP'           => 'Full',

trunk/forum/language/en/acp/forums.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: forums.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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',
 …
         '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'    => 'Enables the quick reply in this forum. This setting is not considered if the quick reply is disabled board wide. The quick reply will only be displayed for users who have permission to post in this forum.',
         '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.',
 …
         'FORUM_IMAGE'                                           => 'Forum image',
         'FORUM_IMAGE_EXPLAIN'                           => 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.',
+        'FORUM_IMAGE_NO_EXIST'                          => 'The specified forum image does not exist',
         'FORUM_LINK_EXPLAIN'                            => 'Full URL (including the protocol, i.e.: <samp>http://</samp>) to the destination location that clicking this forum will take the user, e.g.: <samp>http://www.phpbb.com/</samp>.',
         'FORUM_LINK_TRACK'                                      => 'Track link redirects',
 …
         'FORUM_PASSWORD_UNSET'                          => 'Remove forum password',
         'FORUM_PASSWORD_UNSET_EXPLAIN'          => 'Check here if you want to remove the forum password.',
         'FORUM_PASSWORD_OLD'                            => 'The forum password is using an old encryption and should be changed.',
+        'FORUM_PASSWORD_OLD'                            => 'The forum password is using an old hashing method and should be changed.',
         'FORUM_PASSWORD_MISMATCH'                       => 'The passwords you entered did not match.',
         'FORUM_PRUNE_SETTINGS'                          => 'Forum prune settings',

trunk/forum/language/en/acp/groups.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: groups.php 8911 2008-09-23 13:03:33Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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_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.',

trunk/forum/language/en/acp/language.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: language.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
 $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',

trunk/forum/language/en/acp/permissions.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: permissions.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
                 <h2>Permission Masks</h2>
                 <p>These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.</p>
                 <br />
 …
         'ACL_TYPE_LOCAL_M_'             => 'Forum Moderator permissions',
         'ACL_TYPE_LOCAL_F_'             => 'Forum permissions',
         'ACL_NO'                                => 'No',
         'ACL_VIEW'                              => 'Viewing permissions',
 …
         '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.',
         'ACP_ADMIN_ROLES_EXPLAIN'                                       => 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
         'ACP_FORUM_ROLES_EXPLAIN'                                       => 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
         'ACP_MOD_ROLES_EXPLAIN'                                         => 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
         'ACP_USER_ROLES_EXPLAIN'                                        => 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
+        'ACP_ADMIN_ROLES_EXPLAIN'                                       => 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+        'ACP_FORUM_ROLES_EXPLAIN'                                       => 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+        'ACP_MOD_ROLES_EXPLAIN'                                         => 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+        'ACP_USER_ROLES_EXPLAIN'                                        => 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
         'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN'           => 'Here you can assign forum permissions to users.',
         'ACP_USERS_PERMISSIONS_EXPLAIN'                         => 'Here you can assign global permissions to users - user permissions, global moderator permissions and 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. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
 …
         '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…',
 …
         '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_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_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_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.',
 …
         '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.',

trunk/forum/language/en/acp/permissions_phpbb.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: permissions_phpbb.php 8911 2008-09-23 13:03:33Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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_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'),

trunk/forum/language/en/acp/posting.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: posting.php 8743 2008-08-12 16:03:18Z Kellanved $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'ADD_BBCODE'                            => 'Add a new BBCode',
+        'BBCODE_DANGER'                         => 'The BBCode you are trying to add seems to use a {TEXT} token inside a HTML attribute. This is a possible XSS security issue. Try using the more restrictive {SIMPLETEXT} or {INTTEXT} types instead. Only proceed if you understand the risks involved and you consider the use of {TEXT} absolutely unavoidable.',
+        'BBCODE_DANGER_PROCEED'         => 'Proceed', //'I understand the risk',
         'BBCODE_ADDED'                          => 'BBCode added successfully.',
         'BBCODE_EDITED'                         => 'BBCode edited successfully.',
 …
         '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.',
         'tokens'        =>      array(
                 'TEXT'                  => 'Any text, including foreign characters, numbers, etc… You should not use this token in HTML tags. Instead try to use IDENTIFIER or SIMPLETEXT.',
+                'TEXT'                  => 'Any text, including foreign characters, numbers, etc… You should not use this token in HTML tags. Instead try to use IDENTIFIER, INTTEXT or SIMPLETEXT.',
                 'SIMPLETEXT'    => 'Characters from the latin alphabet (A-Z), numbers, spaces, commas, dots, minus, plus, hyphen and underscore',
+                'INTTEXT'               => 'Unicode letter characters, numbers, spaces, commas, dots, minus, plus, hyphen, underscore and whitespaces.',
                 '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>'
 …
         'SMILIES_WIDTH'                         => 'Smiley width',
+        'TOO_MANY_SMILIES'                      => 'Limit of %d smilies reached.',
         'WRONG_PAK_TYPE'        => 'The specified package does not contain the appropriate data.',
 ));
 …
 // Word censors
 $lang = array_merge($lang, array(
         'ACP_WORDS_EXPLAIN'             => 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.',
+        'ACP_WORDS_EXPLAIN'             => 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. People are still allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.',
         'ADD_WORD'                              => 'Add new word',
 …
         '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.',

trunk/forum/language/en/acp/profile.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: profile.php 9128 2008-11-26 20:10:29Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'DISPLAY_AT_REGISTER'                   => 'Display on registration screen',
         'DISPLAY_AT_REGISTER_EXPLAIN'   => 'If this option is enabled, the field will be displayed on registration.',
+        'DISPLAY_PROFILE_FIELD'                 => 'Display profile field',
+        '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.',

trunk/forum/language/en/acp/prune.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: prune.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
 // 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',
 …
         '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_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.',

trunk/forum/language/en/acp/search.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: search.php 9126 2008-11-26 19:17:52Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'MAX_SEARCH_CHARS'                                              => 'Max characters indexed by search',
         'MAX_SEARCH_CHARS_EXPLAIN'                              => 'Words with no more than this many characters will be indexed for searching.',
+        'MAX_NUM_SEARCH_KEYWORDS'                               => 'Maximum number of allowed keywords',
+        'MAX_NUM_SEARCH_KEYWORDS_EXPLAIN'               => 'Maximum number of words the user is able to search for. A value of 0 allows an unlimited number of words.',
         'MIN_SEARCH_CHARS'                                              => 'Min characters indexed by search',
         'MIN_SEARCH_CHARS_EXPLAIN'                              => 'Words with at least this many characters will be indexed for searching.',

trunk/forum/language/en/acp/styles.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: styles.php 9046 2008-11-02 16:19:11Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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.',

trunk/forum/language/en/acp/users.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: users.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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.',
 …
         '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_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_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',
 ));

trunk/forum/language/en/common.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: common.php 9162 2008-12-03 11:18:31Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'AVATAR_PARTIAL_UPLOAD'                 => 'The specified file was only partially uploaded.',
         'AVATAR_PHP_SIZE_NA'                    => 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
         'AVATAR_PHP_SIZE_OVERRUN'               => 'The avatar’s filesize is too large. The maximum allowed upload size is %d MB.<br />Please note this is set in php.ini and cannot be overridden.',
+        'AVATAR_PHP_SIZE_OVERRUN'               => 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
         'AVATAR_URL_INVALID'                    => 'The URL you specified is invalid.',
         'AVATAR_URL_NOT_FOUND'                  => 'The file specified could not be found.',
 …
         'EDIT_POST'                                                     => 'Edit post',
         'EMAIL'                                                         => 'E-mail',
+        'EMAIL'                                                         => 'E-mail', // Short form for EMAIL_ADDRESS
         'EMAIL_ADDRESS'                                         => 'E-mail address',
         'EMAIL_SMTP_ERROR_RESPONSE'                     => 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
 …
         'GENERAL_ERROR'                         => 'General Error',
+        'GB'                                            => 'GB',
+        'GIB'                                           => 'GiB',
         'GO'                                            => 'Go',
         'GOTO_PAGE'                                     => 'Go to page',
 …
         'G_REGISTERED_COPPA'            => 'Registered COPPA users',
         'G_GLOBAL_MODERATORS'           => 'Global moderators',
+        'G_NEWLY_REGISTERED'            => 'Newly registered users',
         'HIDDEN_USERS_ONLINE'                   => '%d hidden users online',
 …
         '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.',
 …
         'PAGE_OF'                               => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
         'PASSWORD'                              => 'Password',
+        'PIXEL'                                 => 'px',
         'PLAY_QUICKTIME_FILE'   => 'Play Quicktime file',
         'PM'                                    => 'PM',
 …
         'RETURN_TOPIC'                          => '%sReturn to the topic last visited%s',
         'RETURN_TO'                                     => 'Return to',
+        'FEED'                                          => 'Feed',
+        'FEED_NEWS'                                     => 'News',
+        'FEED_TOPICS_ACTIVE'            => 'Active Topics',
+        'FEED_TOPICS_NEW'                       => 'New Topics',
         'RULES_ATTACH_CAN'                      => 'You <strong>can</strong> post attachments in this forum',
         'RULES_ATTACH_CANNOT'           => 'You <strong>cannot</strong> post attachments in this forum',
 …
         'SEARCH_TOPIC'                          => 'Search this topic…',
         'SEARCH_UNANSWERED'                     => 'View unanswered posts',
+        'SEARCH_UNREAD'                         => 'View unread posts',
         'SECONDS'                                       => 'Seconds',
         'SELECT'                                        => 'Select',
 …
         'SELECT_DESTINATION_FORUM'      => 'Please select a destination forum',
         'SELECT_FORUM'                          => 'Select a forum',
         'SEND_EMAIL'                            => 'E-mail',
+        'SEND_EMAIL'                            => 'E-mail',                            // Used for submit buttons
         'SEND_EMAIL_USER'                       => 'E-mail',                            // Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX
         'SEND_PRIVATE_MESSAGE'          => 'Send private message',
 …
         'SORT_LOCATION'                         => 'Location',
         'SORT_RANK'                                     => 'Rank',
+        'SORT_POSTS'                            => 'Posts',
         'SORT_TOPIC_TITLE'                      => 'Topic title',
         'SORT_USERNAME'                         => 'Username',
 …
         '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.',
 …
         '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

trunk/forum/language/en/email/admin_welcome_activated.txt

-              r400
+              r702
 Hello {USERNAME},
+Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous e-mail.
+Your account on "{SITENAME}" has now been activated, you may login using the username you received in a previous e-mail.
+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.
 {EMAIL_SIG}

trunk/forum/language/en/email/admin_welcome_inactive.txt

-              r400
+              r702
 ----------------------------
 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 has 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.

trunk/forum/language/en/email/coppa_resend_inactive.txt

-              r400
+              r702
 {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}
 …
 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.

trunk/forum/language/en/email/coppa_welcome_inactive.txt

-              r400
+              r702
 {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}
 …
 Username: {USERNAME}
-Password: {PASSWORD}
 E-mail: {EMAIL_ADDRESS}
 …
 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.

trunk/forum/language/en/email/installed.txt

-              r400
+              r702
 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}

trunk/forum/language/en/email/newtopic_notify.txt

r400	r702
3	3	Hello {USERNAME},
4	4
5		You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view forum, no more notifications will be sent until you visit the forum.
	5	You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
6	6
7	7	{U_FORUM}

trunk/forum/language/en/email/user_reactivate_account.txt

r400	r702
10	10	----------------------------
11	11
12		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.
	12	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.
13	13
14	14	Please visit the following link to reactivate your account:

trunk/forum/language/en/email/user_remind_inactive.txt

r400	r702
3	3	Hello {USERNAME},
4	4
5		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.
	5	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:
6	6
7	7	{U_ACTIVATE}

trunk/forum/language/en/email/user_resend_inactive.txt

-              r400
+              r702
 ----------------------------
 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}

trunk/forum/language/en/email/user_welcome.txt

-              r400
+              r702
 ----------------------------
 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.

trunk/forum/language/en/email/user_welcome_inactive.txt

-              r400
+              r702
 ----------------------------
 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.

trunk/forum/language/en/help_bbcode.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: help_bbcode.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         array(
 => 'Creating an Ordered list',
+=> '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: arabic-numbers"><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>'
+=> '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(
+=> '--',
+=> '--'
         ),
         array(

trunk/forum/language/en/help_faq.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: help_faq.php 8896 2008-09-19 16:59:40Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         ),
         array(
 => 'How do I show an image below my username?',
 => 'There are two images that may appear below a username when viewing posts. Depending on the used style, the first may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. The second, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
+=> 'How do I show an image along with my username?',
+=> 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
         ),
         array(
 …
         array(
 => 'How do I edit or delete a post?',
 => 'Unless you are a board administrator or moderator, you can only edit or delete your own posts. You can edit a post by clicking the edit button for the relevant post, sometimes for only a limited time after the post was made. If someone has already replied to the post, you will find a small piece of text output below the post when you return to the topic which lists the number of times you edited it along with the date and time. This will only appear if someone has made a reply; it will not appear if a moderator or administrator edited the post, though they may leave a note as to why they’ve edited the post at their own digression. Please note that normal users cannot delete a post once someone has replied.'
+=> 'Unless you are a board administrator or moderator, you can only edit or delete your own posts. You can edit a post by clicking the edit button for the relevant post, sometimes for only a limited time after the post was made. If someone has already replied to the post, you will find a small piece of text output below the post when you return to the topic which lists the number of times you edited it along with the date and time. This will only appear if someone has made a reply; it will not appear if a moderator or administrator edited the post, though they may leave a note as to why they’ve edited the post at their own discretion. Please note that normal users cannot delete a post once someone has replied.'
         ),
         array(
 …
 => 'What are topic icons?',
 => '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(
+=> '--',
+=> '--'
         ),
         array(

trunk/forum/language/en/install.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: install.php 9177 2008-12-05 11:36:51Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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',
 …
         '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',
 …
         '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',
 …
                 <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>
 …
         '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.',
 …
         'MAKE_FOLDER_WRITABLE'          => 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
         'MAKE_FOLDERS_WRITABLE'         => 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
+        'MYSQL_SCHEMA_UPDATE_REQUIRED'  => 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="http://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="http://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
         'NAMING_CONFLICT'                       => 'Naming conflict: %s and %s are both aliases<br /><br />%s',
 …
 // 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',
 …
         'CONTINUE_UPDATE_NOW'                   => 'Continue the update process now',           // Shown within the database update script at the end if called from the updater
         'CONTINUE_UPDATE'                               => 'Continue update now',                                       // Shown after file upload to indicate the update process is not yet finished
         'CURRENT_FILE'                                  => 'Beginning of current original file',
+        'CURRENT_FILE'                                  => 'Begin of Conflict - Original File code before update',
         'CURRENT_VERSION'                               => 'Current version',
 …
         'DIFF_INLINE'                                           => 'Inline',
         'DIFF_RAW'                                                      => 'Raw unified diff',
         'DIFF_SEP_EXPLAIN'                                      => 'End of current original file / Beginning of new updated file',
+        'DIFF_SEP_EXPLAIN'                                      => 'Code block used within the updated/new file',
         'DIFF_SIDE_BY_SIDE'                                     => 'Side by Side',
         'DIFF_UNIFIED'                                          => 'Unified diff',
 …
         'DOWNLOAD_AS'                                           => 'Download as',
         'DOWNLOAD_UPDATE_METHOD_BUTTON'         => 'Download modified files archive (recommended)',
+        'DOWNLOAD_CONFLICTS'                            => 'Download conflicts for this file',
+        'DOWNLOAD_CONFLICTS_EXPLAIN'            => 'Search for &lt;&lt;&lt; to spot conflicts',
         'DOWNLOAD_UPDATE_METHOD'                        => 'Download modified files archive',
         'DOWNLOAD_UPDATE_METHOD_EXPLAIN'        => 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
 …
         'MERGE_NO_MERGE_NEW_OPTION'     => 'Do not merge - use new file',
         'MERGE_NO_MERGE_MOD_OPTION'     => 'Do not merge - use currently installed file',
         'MERGE_MOD_FILE_OPTION'         => 'Merge differences and use modified code within conflicting block',
         'MERGE_NEW_FILE_OPTION'         => 'Merge differences and use new file code within conflicting block',
+        'MERGE_MOD_FILE_OPTION'         => 'Merge modifications (removes new phpBB code within conflicting block)',
+        'MERGE_NEW_FILE_OPTION'         => 'Merge modifications (removes modified code within conflicting block)',
         'MERGE_SELECT_ERROR'            => 'Conflicting file merge modes are not correctly selected.',
         'MERGING_FILES'                         => 'Merging differences',
         'MERGING_FILES_EXPLAIN'         => 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
         'NEW_FILE'                                              => 'End of new updated file',
+        'NEW_FILE'                                              => 'End of Conflict',
         'NEW_USERNAME'                                  => 'New username',
         'NO_AUTH_UPDATE'                                => 'Not authorised to update',
 …
         '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.',
 …
         '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',

trunk/forum/language/en/mcp.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: mcp.php 8940 2008-09-26 11:25:04Z toonarmy $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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',
 …
         '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_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?',
 …
         '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',
 …
         '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',
 …
         '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_CLOSED_SUCCESS'     => 'The selected PM reports have been closed successfully.',
+        'PM_REPORTS_DELETED_SUCCESS'=> 'The selected PM reports have been deleted successfully.',
+        '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.',
 …
         '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.',
 …
         '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',
 …
         'SPLIT_TOPIC_EXPLAIN'                           => 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post.',
+        'THIS_PM_IP'                            => 'IP for this private message',
         'THIS_POST_IP'                          => 'IP for this post',
         'TOPICS_APPROVED_SUCCESS'       => 'The selected topics have been approved.',
 …
         'VIEW_DETAILS'                  => 'View details',
+        'VIEW_PM'                               => 'View private message',
         'VIEW_POST'                             => 'View post',
 …
                 ),
                 '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.',
+                )
         ),

trunk/forum/language/en/memberlist.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: memberlist.php 8574 2008-05-29 13:59:47Z Kellanved $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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_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',
 …
         'USER_BAN'                              => 'Banning',
         'USER_FORUM'                    => 'User statistics',
+        'USER_LAST_REMINDED'    => array(
+               => 'No reminder sent at this time',
+               => '%1$d reminder sent<br />» %2$s',
+        ),
         'USER_ONLINE'                   => 'Online',
         'USER_PRESENCE'                 => 'Board presence',

trunk/forum/language/en/posting.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: posting.php 8555 2008-05-15 14:10:11Z Kellanved $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'PARTIAL_UPLOAD'                        => 'The uploaded file was only partially uploaded.',
         'PHP_SIZE_NA'                           => 'The attachment’s file size is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
         'PHP_SIZE_OVERRUN'                      => 'The attachment’s file size is too large, the maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overridden.',
+        'PHP_SIZE_OVERRUN'                      => 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
         'PLACE_INLINE'                          => 'Place inline',
         'POLL_DELETE'                           => 'Delete poll',
 …
         '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.',
 …
         '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.',

trunk/forum/language/en/search.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: search.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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.',
         'NO_KEYWORDS'                   => 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',

trunk/forum/language/en/search_synonyms.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: search_synonyms.php 8479 2008-03-29 00:22:48Z naderman $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'anemic'                        => 'anaemic',
         'anesthesia'            => 'anaesthesia',
         'appologize'            => 'appologise',
+        'apologize'                     => 'apologise',
         'archean'                       => 'archaean',
         'archeology'            => 'archaeology',

trunk/forum/language/en/ucp.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: ucp.php 9162 2008-12-03 11:18:31Z acydburn $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         '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',
 …
         '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',
 …
         'CONFIRM_EMAIL_EXPLAIN'         => 'You only need to specify this if you are changing your e-mail address.',
         'CONFIRM_EXPLAIN'                       => 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
+        'VC_REFRESH'                            => 'Refresh confirmation code',
+        'VC_REFRESH_EXPLAIN'            => 'If you cannot read the code you can request a new one by clicking the button.',
         'CONFIRM_PASSWORD'                      => 'Confirm password',
         'CONFIRM_PASSWORD_EXPLAIN'      => 'You only need to confirm your password if you changed it above.',
 …
         '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',
 …
         '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.',
 …
         'PASSWORD'                                      => 'Password',
         'PASSWORD_ACTIVATED'            => 'Your new password has been activated.',
         'PASSWORD_UPDATED'                      => 'Your password has been sent successfully to your original e-mail address.',
+        'PASSWORD_UPDATED'                      => 'A new password was sent to your registered e-mail address.',
         'PERMISSIONS_RESTORED'          => 'Successfully restored original permissions.',
         'PERMISSIONS_TRANSFERRED'       => 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
 …
         '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',
 …
         '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',
 …
         'UCP_MAIN_SUBSCRIBED'           => 'Manage subscriptions',
         'UCP_MSNM'                                      => 'MSN Messenger',
+        'UCP_MSNM'                                      => 'WL/MSN Messenger',
         'UCP_NO_ATTACHMENTS'            => 'You have posted no files.',
 …
         'UCP_ZEBRA_FOES'                                => 'Manage foes',
         'UCP_ZEBRA_FRIENDS'                             => 'Manage friends',
+        'UNDISCLOSED_RECIPIENT'                 => 'Undisclosed Recipient',
         'UNKNOWN_FOLDER'                                => 'Unknown folder',
         'UNWATCH_MARKED'                                => 'Unwatch marked',

trunk/forum/language/en/viewtopic.php

-              r400
+              r702
+*
 * @package language
 * @version $Id: viewtopic.php 8775 2008-08-21 15:41:12Z Kellanved $
+* @version $Id$
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 …
         'CODE'                                  => 'Code',
+        'COLLAPSE_QR'                   => 'Hide Quick Reply',
         'DELETE_TOPIC'                  => 'Delete topic',
 …
         '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.',
 …
         'QUICK_MOD'                             => 'Quick-mod tools',
+        'QUICKREPLY'                    => 'Quick Reply',
         'QUOTE'                                 => 'Quote',
 …
         'RETURN_POST'                   => '%sReturn to the post%s',
+        'SHOW_QR'                               => 'Quick Reply',
         'SUBMIT_VOTE'                   => 'Submit vote',

Context Navigation

Legend:

Download in other formats: