Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_bans.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_bans.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_bans.php	(revision 3)
@@ -0,0 +1,67 @@
+<?php
+
+// Language definitions used in admin_bans.php
+$lang_admin_bans = array(
+
+'No user message'			=>	'No user by that username registered. If you want to add a ban not tied to a specific username just leave the username blank.',
+'No user ID message'		=>	'No user by that ID registered.',
+'User is admin message'		=>	'The user %s is an administrator and can\'t be banned. If you want to ban an administrator, you must first demote him/her.',
+'User is mod message'		=>	'The user %s is a moderator and can\'t be banned. If you want to ban a moderator, you must first demote him/her.',
+'Must enter message'		=>	'You must enter either a username, an IP address or an email address (at least).',
+'Cannot ban guest message'	=>	'The guest user cannot be banned.',
+'Invalid IP message'		=>	'You entered an invalid IP/IP-range.',
+'Invalid e-mail message'	=>	'The email address (e.g. user@domain.com) or partial email address domain (e.g. domain.com) you entered is invalid.',
+'Invalid date message'		=>	'You entered an invalid expire date.',
+'Invalid date reasons'		=>	'The format should be YYYY-MM-DD and the date must be at least one day in the future.',
+'Ban added redirect'		=>	'Ban added. Redirecting âŠ' ,
+'Ban edited redirect'		=>	'Ban edited. Redirecting âŠ',
+'Ban removed redirect'		=>	'Ban removed. Redirecting âŠ',
+
+'New ban head'				=>	'New ban',
+'Add ban subhead'			=>	'Add ban',
+'Username label'			=>	'Username',
+'Username help'				=>	'The username to ban (case-insensitive).',
+'Username advanced help'	=>	'The username to ban (case-insensitive). The next page will let you enter a custom IP and email. If you just want to ban a specific IP/IP-range or email just leave it blank.',
+
+'Ban search head'			=>	'Ban search',
+'Ban search subhead'		=>	'Enter search criteria',
+'Ban search info'			=>	'Search for bans in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted. To show all bans leave all fields empty.',
+'Date help'					=>	'(yyyy-mm-dd)',
+'Message label'				=>	'Message',
+'Expire after label'		=>	'Expire after',
+'Expire before label'		=>	'Expire before',
+'Order by label'			=>	'Order by',
+'Order by username'			=>	'Username',
+'Order by ip'				=>	'IP',
+'Order by e-mail'			=>	'Email',
+'Order by expire'			=>	'Expire date',
+'Ascending'					=>	'Ascending',
+'Descending'				=>	'Descending',
+'Submit search'				=>	'Submit search',
+
+'E-mail label'				=>	'Email',
+'E-mail help'				=>	'The email or email domain you wish to ban (e.g. someone@somewhere.com or somewhere.com). See "Allow banned email addresses" in Permissions for more info.',
+'IP label'					=>	'IP address/IP-ranges',
+'IP help'					=>	'The IP address or IP-ranges you wish to ban (e.g. 150.11.110.1 or 150.11.110). Separate addresses with spaces. If an IP is entered already it is the last known IP of this user in the database.',
+'IP help link'				=>	'Click %s to see IP statistics for this user.',
+'Ban advanced head'			=>	'Ban advanced settings',
+'Ban advanced subhead'		=>	'Supplement ban with IP and email',
+'Ban message label'			=>	'Ban message',
+'Ban message help'			=>	'A message that will be displayed to the banned user when he/she visits the board.',
+'Message expiry subhead'	=>	'Ban message and expiry',
+'Ban IP range info'			=>	'You should be very careful when banning an IP-range because of the possibility of multiple users matching the same partial IP.',
+'Expire date label'			=>	'Expire date',
+'Expire date help'			=>	'The date when this ban should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually.',
+
+'Results head'				=>	'Search Results',
+'Results username head'		=>	'Username',
+'Results e-mail head'		=>	'Email',
+'Results IP address head'	=>	'IP/IP-ranges',
+'Results expire head'		=>	'Expires',
+'Results message head'		=>	'Message',
+'Results banned by head'	=>	'Banned by',
+'Results actions head'		=>	'Actions',
+'No match'					=>	'No match',
+'Unknown'					=>	'Unknown',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_categories.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_categories.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_categories.php	(revision 3)
@@ -0,0 +1,29 @@
+<?php
+
+// Language definitions used in admin-categories.php
+$lang_admin_categories = array(
+
+'Must enter name message'		=>	'You must enter a name for the category',
+'Category added redirect'		=>	'Category added. Redirecting âŠ',
+'Category deleted redirect'		=>	'Category deleted. Redirecting âŠ',
+'Delete category head'			=>	'Delete category (together with all forums and posts it contains)',
+'Confirm delete subhead'		=>	'Confirm delete category',
+'Confirm delete info'			=>	'Are you sure that you want to delete the category <strong>%s</strong>?',
+'Delete category warn'			=>	'<strong>WARNING!</strong> Deleting a category will delete all forums and posts (if any) in this category!',
+'Must enter integer message'	=>	'Position must be a positive integer value.',
+'Categories updated redirect'	=>	'Categories updated. Redirecting âŠ',
+'Add categories head'			=>	'Add categories',
+'Add categories subhead'		=>	'Add categories',
+'Add category label'			=>	'Add a new category',
+'Add new submit'				=>	'Add new',
+'Add category help'				=>	'The name of the new category you want to add. You can edit the name of the category later (see below). Go to %s to add forums to your new category.',
+'Delete categories head'		=>	'Delete categories',
+'Delete categories subhead'		=>	'Delete categories',
+'Delete category label'			=>	'Delete a category',
+'Delete category help'			=>	'Select the name of the category you want to delete. You will be asked to confirm your choice of category for deletion before it is deleted.',
+'Edit categories head'			=>	'Edit categories',
+'Edit categories subhead'		=>	'Edit categories',
+'Category position label'		=>	'Position',
+'Category name label'			=>	'Name',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_censoring.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_censoring.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_censoring.php	(revision 3)
@@ -0,0 +1,21 @@
+<?php
+
+// Language definitions used in admin_censoring.php
+$lang_admin_censoring = array(
+
+'Must enter word message'	=>	'You must enter a word to censor.',
+'Word updated redirect'		=>	'Censor word updated. Redirecting âŠ',
+'Word added redirect'		=>	'Censor word added. Redirecting âŠ',
+'Word removed redirect'		=>	'Censor word removed. Redirecting âŠ',
+'Censoring head'			=>	'Censoring',
+'Add word subhead'			=>	'Add word',
+'Add word info'				=>	'Enter a word that you want to censor and the replacement text for this word. Wildcards are accepted (i.e. *some* would match somewhere and lonesome). Censor words also affect usernames. New users will not be able to register with usernames containing any censored words. The search is case insensitive.',
+'Censoring enabled'			=>	'<strong>Censoring is enabled in %s.</strong>',
+'Censoring disabled'		=>	'<strong>Censoring is disabled in %s.</strong>',
+'Censored word label'		=>	'Censored word',
+'Replacement label'			=>	'Replacement word(s)',
+'Action label'				=>	'Action',
+'Edit remove subhead'		=>	'Edit or remove words',
+'No words in list'			=>	'No censor words in list.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_common.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_common.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_common.php	(revision 3)
@@ -0,0 +1,44 @@
+<?php
+
+// Language definitions used in admin_common
+$lang_admin_common = array(
+
+// The menu
+'Admin menu'			=>	'Admin menu',
+'Plugins menu'			=>	'Plugins menu',
+'Moderator menu'		=>	'Moderator menu',
+'Index'					=>	'Index',
+'Categories'			=>	'Categories',
+'Forums'				=>	'Forums',
+'Users'					=>	'Users',
+'User groups'			=>	'User groups',
+'Options'				=>	'Options',
+'Permissions'			=>	'Permissions',
+'Censoring'				=>	'Censoring',
+'Ranks'					=>	'Ranks',
+'Bans'					=>	'Bans',
+'Prune'					=>	'Prune',
+'Maintenance'			=>	'Maintenance',
+'Reports'				=>	'Reports',
+
+'Admin'					=>	'Admin',
+'Go back'				=>	'Go back',
+'Delete'				=>	'Delete',
+'Update'				=>	'Update',
+'Add'					=>	'Add',
+'Edit'					=>	'Edit',
+'Remove'				=>	'Remove',
+'Yes'					=>	'Yes',
+'No'					=>	'No',
+'Save changes'			=>	'Save changes',
+'Save'					=>	'Save',
+'here'					=>	'here',
+'Action'				=>	'Action',
+'None'					=>	'None',
+'Maintenance mode'		=>	'maintenance mode', // Used for link text in more than one file
+
+// Admin loader
+'No plugin message'		=>	'There is no plugin called %s in the plugin directory.',
+'Plugin failed message'	=>	'Loading of the plugin - <strong>%s</strong> - failed.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_forums.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_forums.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_forums.php	(revision 3)
@@ -0,0 +1,53 @@
+<?php
+
+// Language definitions used in admin-forums.php
+$lang_admin_forums = array(
+
+'Forum added redirect'		=>	'Forum added. Redirecting âŠ',
+'Forum deleted redirect'	=>	'Forum deleted. Redirecting âŠ',
+'Forums updated redirect'	=>	'Forums updated. Redirecting âŠ',
+'Forum updated redirect'	=>	'Forum updated. Redirecting âŠ',
+'Perms reverted redirect'	=>	'Permissions reverted to defaults. Redirecting âŠ',
+'Must enter name message'	=>	'You must enter a forum name.',
+'Must be integer message'	=>	'Position must be a positive integer value.',
+'New forum'					=>	'New forum',
+
+// Entry page
+'Add forum head'			=>	'Add forum',
+'Create new subhead'		=>	'Create a new forum',
+'Add forum label'			=>	'Add forum to category',
+'Add forum help'			=>	'Select the category to which you wish to add a new forum.',
+'Add forum'					=>	'Add forum',
+'No categories exist'		=>	'No categories exist',
+'Edit forums head'			=>	'Edit forums',
+'Category subhead'			=>	'Category:',
+'Forum label'				=>	'Forum',
+'Edit link'					=>	'Edit',
+'Delete link'				=>	'Delete',
+'Position label'			=>	'Position',
+'Update positions'			=>	'Update positions',
+'Confirm delete head'		=>	'Confirm delete forum',
+'Confirm delete subhead'	=>	'Important! Read before deleting',
+'Confirm delete info'		=>	'Are you sure that you want to delete the forum <strong>%s</strong>?',
+'Confirm delete warn'		=>	'WARNING! Deleting a forum will delete all posts (if any) in that forum!',
+
+// Detailed edit page
+'Edit forum head'			=>	'Edit forum',
+'Edit details subhead'		=>	'Edit forum details',
+'Forum name label'			=>	'Forum name',
+'Forum description label'	=>	'Description (HTML)',
+'Category label'			=>	'Category',
+'Sort by label'				=>	'Sort topics by',
+'Last post'					=>	'Last post',
+'Topic start'				=>	'Topic start',
+'Subject'					=>	'Subject',
+'Redirect label'			=>	'Redirect URL',
+'Redirect help'				=>	'Only available in empty forums',
+'Group permissions subhead'	=>	'Edit group permissions for this forum',
+'Group permissions info'	=>	'In this form, you can set the forum specific permissions for the different user groups. If you haven\'t made any changes to this forum\'s group permissions, what you see below is the default based on settings in %s. Administrators always have full permissions and are thus excluded. Permission settings that differ from the default permissions for the user group are marked red. The "Read forum" permission checkbox will be disabled if the group in question lacks the "Read board" permission. For redirect forums, only the "Read forum" permission is editable.',
+'Read forum label'			=>	'Read forum',
+'Post replies label'		=>	'Post replies',
+'Post topics label'			=>	'Post topics',
+'Revert to default'			=>	'Revert to default',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_groups.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_groups.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_groups.php	(revision 3)
@@ -0,0 +1,84 @@
+<?php
+
+// Language definitions used in admin-groups.php
+$lang_admin_groups = array(
+
+'Must enter title message'		=>	'You must enter a group title.',
+'Title already exists message'	=>	'There is already a group with the title <strong>%s</strong>.',
+'Default group redirect'		=>	'Default group set. Redirecting âŠ',
+'Cannot remove default message'	=>	'The default group cannot be removed. In order to delete this group, you must first setup a different group as the default.',
+'Group removed redirect'		=>	'Group removed. Redirecting âŠ',
+'Group added redirect'			=>	'Group added. Redirecting âŠ',
+'Group edited redirect'			=>	'Group edited. Redirecting âŠ',
+
+'Add groups head'				=>	'Add/setup groups',
+'Add group subhead'				=>	'Add new group',
+'New group label'				=>	'Base new group on',
+'New group help'				=>	'Select a user group from which the new group will inherit its permission settings. The next page will let you fine-tune its settings.',
+'Default group subhead'			=>	'Set default group',
+'Default group label'			=>	'Default group',
+'Default group help'			=>	'This is the default user group, e.g. the group users are placed in when they register. For security reasons, users can\'t be placed in either the moderator or administrator user groups by default.',
+'Existing groups head'			=>	'Existing groups',
+'Edit groups subhead'			=>	'Edit/delete groups',
+'Edit groups info'				=>	'The pre-defined groups Guests, Administrators, Moderators and Members cannot be removed. However, they can be edited. Please note that in some groups, some options are unavailable (e.g. the <em>edit posts</em> permission for guests). Administrators always have full permissions.',
+'Edit link'						=>	'Edit',
+'Delete link'					=>	'Delete',
+'Group delete head'				=>	'Group delete',
+'Confirm delete subhead'		=>	'Confirm delete group',
+'Confirm delete info'			=>	'Are you sure that you want to delete the group <strong>%s</strong>?',
+'Confirm delete warn'			=>	'WARNING! After you deleted a group you cannot restore it.',
+'Delete group head'				=>	'Delete group',
+'Move users subhead'			=>	'Move users currently in group',
+'Move users info'				=>	'The group <strong>%s</strong> currently has <strong>%s</strong> members. Please select a group to which these members will be assigned upon deletion.',
+'Move users label'				=>	'Move users to',
+'Delete group'					=>	'Delete group',
+
+'Group settings head'			=>	'Group settings',
+'Group settings subhead'		=>	'Setup group options and permissions',
+'Group settings info'			=>	'Below options and permissions are the default permissions for the user group. These options apply if no forum specific permissions are in effect.',
+'Group title label'				=>	'Group title',
+'User title label'				=>	'User title',
+'User title help'				=>	'This title will override any rank users in this group have attained. Leave blank to use default title or rank.',
+'Mod privileges label'			=>	'Allow users moderator privileges',
+'Mod privileges help'			=>	'In order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user\'s profile.',
+'Edit profile label'			=>	'Allow moderators to edit user profiles',
+'Edit profile help'				=>	'If moderator privileges are enabled, allow users in this group to edit user profiles.',
+'Rename users label'			=>	'Allow moderators to rename users',
+'Rename users help'				=>	'If moderator privileges are enabled, allow users in this group to rename users.',
+'Change passwords label'		=>	'Allow moderators to change passwords',
+'Change passwords help'			=>	'If moderator privileges are enabled, allow users in this group to change user passwords.',
+'Ban users label'				=>	'Allow moderators to ban users',
+'Ban users help'				=>	'If moderator privileges are enabled, allow users in this group to ban users.',
+'Read board label'				=>	'Read board',
+'Read board help'				=>	'Allow users in this group to view the board. This setting applies to every aspect of the board and can therefore not be overridden by forum specific settings. If this is set to "No", users in this group will only be able to login/logout and register.',
+'View user info label'			=>	'View user information',
+'View user info help'			=>	'Allow users to view the user list and user profiles.',
+'Post replies label'			=>	'Post replies',
+'Post replies help'				=>	'Allow users in this group to post replies in topics.',
+'Post topics label'				=>	'Post topics',
+'Post topics help'				=>	'Allow users in this group to post new topics.',
+'Edit posts label'				=>	'Edit posts',
+'Edit posts help'				=>	'Allow users in this group to edit their own posts.',
+'Delete posts label'			=>	'Delete posts',
+'Delete posts help'				=>	'Allow users in this group to delete their own posts.',
+'Delete topics label'			=>	'Delete topics',
+'Delete topics help'			=>	'Allow users in this group to delete their own topics (including any replies).',
+'Set own title label'			=>	'Set own user title',
+'Set own title help'			=>	'Allow users in this group to set their own user title.',
+'User search label'				=>	'Use search',
+'User search help'				=>	'Allow users in this group to use the search feature.',
+'User list search label'		=>	'Search user list',
+'User list search help'			=>	'Allow users in this group to freetext search for users in the user list.',
+'Send e-mails label'			=>	'Send e-mails',
+'Send e-mails help'				=>	'Allow users in this group to send e-mails to other users.',
+'Post flood label'				=>	'Post flood interval',
+'Post flood help'				=>	'Number of seconds that users in this group have to wait between posts. Set to 0 to disable.',
+'Search flood label'			=>	'Search flood interval',
+'Search flood help'				=>	'Number of seconds that users in this group have to wait between searches. Set to 0 to disable.',
+'E-mail flood label'			=>	'Email flood interval',
+'E-mail flood help'				=>	'Number of seconds that users in this group have to wait between emails. Set to 0 to disable.',
+'Report flood label'			=>	'Report flood interval',
+'Report flood help'				=>	'Number of seconds that users in this group have to wait between reports. Set to 0 to disable.',
+'Moderator info'				=>	'Please note that in order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user\'s profile.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_index.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_index.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_index.php	(revision 3)
@@ -0,0 +1,51 @@
+<?php
+
+// Language definitions used in admin_index.php
+$lang_admin_index = array(
+
+'fopen disabled message'			=>	'Unable to check for upgrade since \'allow_url_fopen\' is disabled on this system.',
+'Upgrade check failed message'		=>	'Check for upgrade failed for unknown reasons.',
+'Running latest version message'	=>	'You are running the latest version of FluxBB.',
+'New version available message'		=>	'A new version of FluxBB has been released. You can download the latest version at %s.',
+'PHPinfo disabled message'			=>	'The PHP function phpinfo() has been disabled on this server.',
+'Not available'						=>	'Not available',
+'Forum admin head'					=>	'Forum administration',
+'NA'								=>	'N/A',
+'Welcome to admin'					=>	'Welcome to the FluxBB administration control panel. From here you can control vital aspects of the board. Depending on whether you are an administrator or a moderator you can:',
+'Welcome 1'							=>	'Organize categories and forums.',
+'Welcome 2'							=>	'Set forum-wide options and preferences.',
+'Welcome 3'							=>	'Control permissions for users and guests.',
+'Welcome 4'							=>	'View IP statistics for users.',
+'Welcome 5'							=>	'Ban users.',
+'Welcome 6'							=>	'Censor words.',
+'Welcome 7'							=>	'Set up user ranks.',
+'Welcome 8'							=>	'Prune old posts.',
+'Welcome 9'							=>	'Handle post reports.',
+'Statistics head'					=>	'Statistics',
+'FluxBB version label'				=>	'FluxBB version',
+'Check for upgrade'					=>	'Check for upgrade',
+'FluxBB version data'				=>	'v%s - %s',
+'Server load label'					=>	'Server load',
+'Server load data'					=>	'%s - %s user(s) online',
+'Environment label'					=>	'Environment',
+'Environment data OS'				=>	'Operating system: %s',
+'Show info'							=>	'Show info',
+'Environment data version'			=>	'PHP: %s - %s',
+'Environment data acc'				=>	'Accelerator: %s',
+'Turck MMCache'						=>	'Turck MMCache',
+'Turck MMCache link'				=>	'turck-mmcache.sourceforge.net/',
+'ionCube PHP Accelerator'			=>	'ionCube PHP Accelerator',
+'ionCube PHP Accelerator link'		=>	'www.php-accelerator.co.uk/',
+'Alternative PHP Cache (APC)'		=>	'Alternative PHP Cache (APC)',
+'Alternative PHP Cache (APC) link'	=>	'www.php.net/apc/',
+'Zend Optimizer'					=>	'Zend Optimizer',
+'Zend Optimizer link'				=>	'www.zend.com/products/guard/zend-optimizer/',
+'eAccelerator'						=>	'eAccelerator',
+'eAccelerator link'					=>	'www.eaccelerator.net/',
+'XCache'							=>	'XCache',
+'XCache link'						=>	'xcache.lighttpd.net/',
+'Database label'					=>	'Database',
+'Database data rows'				=>	'Rows: %s',
+'Database data size'				=>	'Size: %s',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_maintenance.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_maintenance.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_maintenance.php	(revision 3)
@@ -0,0 +1,40 @@
+<?php
+
+// Language definitions used in admin_maintenance.php
+$lang_admin_maintenance = array(
+
+'Maintenance head'				=>	'Forum maintenance',
+'Rebuild index subhead'			=>	'Rebuild search index',
+'Rebuild index info'			=>	'If you\'ve added, edited or removed posts manually in the database or if you\'re having problems searching, you should rebuild the search index. For best performance, you should put the forum in %s during rebuilding. <strong>Rebuilding the search index can take a long time and will increase server load during the rebuild process!</strong>',
+'Posts per cycle label'			=>	'Posts per cycle',
+'Posts per cycle help'			=>	'The number of posts to process per pageview. E.g. if you were to enter 300, three hundred posts would be processed and then the page would refresh. This is to prevent the script from timing out during the rebuild process.',
+'Starting post label'			=>	'Starting post ID',
+'Starting post help'			=>	'The post ID to start rebuilding at. The default value is the first available ID in the database. Normally you wouldn\'t want to change this.',
+'Empty index label'				=>	'Empty index',
+'Empty index help'				=>	'Select this if you want the search index to be emptied before rebuilding (see below).',
+'Rebuild completed info'		=>	'Once the process has completed, you will be redirected back to this page. It is highly recommended that you have JavaScript enabled in your browser during rebuilding (for automatic redirect when a cycle has completed). If you are forced to abort the rebuild process, make a note of the last processed post ID and enter that ID+1 in "Starting post ID" when/if you want to continue ("Empty index" must not be selected).',
+'Rebuild index'					=>	'Rebuild index',
+'Rebuilding search index'		=>	'Rebuilding search index',
+'Rebuilding index info'			=>	'Rebuilding index. This might be a good time to put on some coffee :-)',
+'Processing post'				=>	'Processing post <strong>%s</strong> âŠ',
+'Click here'					=>	'Click here',
+'Javascript redirect failed'	=>	'JavaScript redirect unsuccessful. %s to continue âŠ',
+'Posts must be integer message'	=>	'Posts per cycle must be a positive integer value.',
+'Days must be integer message'	=>	'Days to prune must be a positive integer value.',
+'No old topics message'			=>	'There are no topics that are %s days old. Please decrease the value of "Days old" and try again.',
+'Posts pruned redirect'			=>	'Posts pruned. Redirecting âŠ',
+'Prune head'					=>	'Prune',
+'Prune subhead'					=>	'Prune old posts',
+'Days old label'				=>	'Days old',
+'Days old help'					=>	'The number of days "old" a topic must be to be pruned. E.g. if you were to enter 30, every topic that didn\'t contain a post dated less than 30 days old would be deleted.',
+'Prune sticky label'			=>	'Prune sticky topics',
+'Prune sticky help'				=>	'When enabled, sticky topics will also be pruned.',
+'Prune from label'				=>	'Prune from forum',
+'All forums'					=>	'All forums',
+'Prune from help'				=>	'The forum from which you want to prune posts.',
+'Prune info'					=>	'Use this feature with caution. <strong>Pruned posts can never be recovered.</strong> For best performance, you should put the forum in %s during pruning.',
+'Confirm prune subhead'			=>	'Confirm prune posts',
+'Confirm prune info'			=>	'Are you sure that you want to prune all topics older than %s days from %s (%s topics).',
+'Confirm prune warn'			=>	'WARNING! Pruning posts deletes them permanently.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_options.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_options.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_options.php	(revision 3)
@@ -0,0 +1,228 @@
+<?php
+
+// Language definitions used in admin-options.php
+$lang_admin_options = array(
+
+'Bad HTTP Referer message'			=>	'Bad HTTP_REFERER. If you have moved these forums from one location to another or switched domains, you need to update the Base URL manually in the database (look for o_base_url in the config table) and then clear the cache by deleting all .php files in the /cache directory.',
+'Must enter title message'			=>	'You must enter a board title.',
+'Invalid e-mail message'			=>	'The admin email address you entered is invalid.',
+'Invalid webmaster e-mail message'	=>	'The webmaster email address you entered is invalid.',
+'SMTP passwords did not match'		=>	'You need to enter the SMTP password twice exactly the same to change it.',
+'Enter announcement here'			=>	'Enter your announcement here.',
+'Enter rules here'					=>	'Enter your rules here.',
+'Default maintenance message'		=>	'The forums are temporarily down for maintenance. Please try again in a few minutes.',
+'Timeout error message'				=>	'The value of "Timeout online" must be smaller than the value of "Timeout visit".',
+'Options updated redirect'			=>	'Options updated. Redirecting âŠ',
+'Options head'						=>	'Options',
+
+// Essentials section
+'Essentials subhead'				=>	'Essentials',
+'Board title label'					=>	'Board title',
+'Board title help'					=>	'The title of this bulletin board (shown at the top of every page). This field may <strong>not</strong> contain HTML.',
+'Board desc label'					=>	'Board description',
+'Board desc help'					=>	'A short description of this bulletin board (shown at the top of every page). This field may contain HTML.',
+'Base URL label'					=>	'Base URL',
+'Base URL help'						=>	'The complete URL of the board without trailing slash (i.e. http://www.mydomain.com/forums). This <strong>must</strong> be correct in order for all admin and moderator features to work. If you get "Bad referer" errors, it\'s probably incorrect.',
+'Timezone label'					=>	'Default time zone',
+'Timezone help'						=>	'The default time zone for guests and users attempting to register for the board.',
+'DST label'							=>	'Adjust for DST',
+'DST help'							=>	'Check if daylight savings is in effect (advances times by 1 hour).',
+'Language label'					=>	'Default language',
+'Language help'						=>	'The default language for guests and users who haven\'t changed from the default in their profile. If you remove a language pack, this must be updated.',
+'Default style label'				=>	'Default style',
+'Default style help'				=>	'The default style for guests and users who haven\'t changed from the default in their profile.',
+
+// Essentials section timezone options
+'UTC-12:00'							=>	'(UTC-12:00) International Date Line West',
+'UTC-11:00'							=>	'(UTC-11:00) Niue, Samoa',
+'UTC-10:00'							=>	'(UTC-10:00) Hawaii-Aleutian, Cook Island',
+'UTC-09:30'							=>	'(UTC-09:30) Marquesas Islands',
+'UTC-09:00'							=>	'(UTC-09:00) Alaska, Gambier Island',
+'UTC-08:30'							=>	'(UTC-08:30) Pitcairn Islands',
+'UTC-08:00'							=>	'(UTC-08:00) Pacific',
+'UTC-07:00'							=>	'(UTC-07:00) Mountain',
+'UTC-06:00'							=>	'(UTC-06:00) Central',
+'UTC-05:00'							=>	'(UTC-05:00) Eastern',
+'UTC-04:00'							=>	'(UTC-04:00) Atlantic',
+'UTC-03:30'							=>	'(UTC-03:30) Newfoundland',
+'UTC-03:00'							=>	'(UTC-03:00) Amazon, Central Greenland',
+'UTC-02:00'							=>	'(UTC-02:00) Mid-Atlantic',
+'UTC-01:00'							=>	'(UTC-01:00) Azores, Cape Verde, Eastern Greenland',
+'UTC'								=>	'(UTC) Western European, Greenwich',
+'UTC+01:00'							=>	'(UTC+01:00) Central European, West African',
+'UTC+02:00'							=>	'(UTC+02:00) Eastern European, Central African',
+'UTC+03:00'							=>	'(UTC+03:00) Moscow, Eastern African',
+'UTC+03:30'							=>	'(UTC+03:30) Iran',
+'UTC+04:00'							=>	'(UTC+04:00) Gulf, Samara',
+'UTC+04:30'							=>	'(UTC+04:30) Afghanistan',
+'UTC+05:00'							=>	'(UTC+05:00) Pakistan, Yekaterinburg',
+'UTC+05:30'							=>	'(UTC+05:30) India, Sri Lanka',
+'UTC+05:45'							=>	'(UTC+05:45) Nepal',
+'UTC+06:00'							=>	'(UTC+06:00) Bangladesh, Bhutan, Novosibirsk',
+'UTC+06:30'							=>	'(UTC+06:30) Cocos Islands, Myanmar',
+'UTC+07:00'							=>	'(UTC+07:00) Indochina, Krasnoyarsk',
+'UTC+08:00'							=>	'(UTC+08:00) Greater China, Australian Western, Irkutsk',
+'UTC+08:45'							=>	'(UTC+08:45) Southeastern Western Australia',
+'UTC+09:00'							=>	'(UTC+09:00) Japan, Korea, Chita',
+'UTC+09:30'							=>	'(UTC+09:30) Australian Central',
+'UTC+10:00'							=>	'(UTC+10:00) Australian Eastern, Vladivostok',
+'UTC+10:30'							=>	'(UTC+10:30) Lord Howe',
+'UTC+11:00'							=>	'(UTC+11:00) Solomon Island, Magadan',
+'UTC+11:30'							=>	'(UTC+11:30) Norfolk Island',
+'UTC+12:00'							=>	'(UTC+12:00) New Zealand, Fiji, Kamchatka',
+'UTC+12:45'							=>	'(UTC+12:45) Chatham Islands',
+'UTC+13:00'							=>	'(UTC+13:00) Tonga, Phoenix Islands',
+'UTC+14:00'							=>	'(UTC+14:00) Line Islands',
+
+// Timeout Section
+'Timeouts subhead'					=>	'Time and timeouts',
+'Time format label'					=>	'Time format',
+'PHP manual'						=>	'PHP manual',
+'Time format help'					=>	'[Current format: %s]. See %s for formatting options.',
+'Date format label'					=>	'Date format',
+'Date format help'					=>	'[Current format: %s]. See %s for formatting options.',
+'Visit timeout label'				=>	'Visit timeout',
+'Visit timeout help'				=>	'Number of seconds a user must be idle before his/hers last visit data is updated (primarily affects new message indicators).',
+'Online timeout label'				=>	'Online timeout',
+'Online timeout help'				=>	'Number of seconds a user must be idle before being removed from the online users list.',
+'Redirect time label'				=>	'Redirect time',
+'Redirect time help'				=>	'Number of seconds to wait when redirecting. If set to 0, no redirect page will be displayed (not recommended).',
+
+// Display Section
+'Display subhead'					=>	'Display',
+'Version number label'				=>	'Version number',
+'Version number help'				=>	'Show FluxBB version number in footer.',
+'Info in posts label'				=>	'User info in posts',
+'Info in posts help'				=>	'Show information about the poster under the username in topic view. The information affected is location, register date, post count and the contact links (email and URL).',
+'Post count label'					=>	'User post count',
+'Post count help'					=>	'Show the number of posts a user has made (affects topic view, profile and user list).',
+'Smilies label'						=>	'Smilies in posts',
+'Smilies help'						=>	'Convert smilies to small graphic icons.',
+'Smilies sigs label'				=>	'Smilies in signatures',
+'Smilies sigs help'					=>	'Convert smilies to small graphic icons in user signatures.',
+'Clickable links label'				=>	'Make clickable links',
+'Clickable links help'				=>	'When enabled, FluxBB will automatically detect any URLs in posts and make them clickable hyperlinks.',
+'Topic review label'				=>	'Topic review',
+'Topic review help'					=>	'Maximum number of posts to display when posting (newest first). Set to 0 to disable.',
+'Topics per page label'				=>	'Topics per page',
+'Topics per page help'				=>	'The default number of topics to display per page in a forum. Users can personalize this setting.',
+'Posts per page label'				=>	'Posts per page',
+'Posts per page help'				=>	'The default number of posts to display per page in a topic. Users can personalize this setting.',
+'Indent label'						=>	'Indent size',
+'Indent help'						=>	'If set to 8, a regular tab will be used when displaying text within the [code][/code] tag. Otherwise this many spaces will be used to indent the text.',
+'Quote depth label'					=>	'Maximum [quote] depth',
+'Quote depth help'					=>	'The maximum times a [quote] tag can go inside other [quote] tags, any tags deeper than this will be discarded.',
+
+// Features section
+'Features subhead'					=>	'Features',
+'Quick post label'					=>	'Quick post',
+'Quick post help'					=>	'When enabled, FluxBB will add a quick post form at the bottom of topics. This way users can post directly from the topic view.',
+'Users online label'				=>	'Users online',
+'Users online help'					=>	'Display info on the index page about guests and registered users currently browsing the board.',
+'Censor words label'				=>	'Censor words',
+'Censor words help'					=>	'Enable this to censor specific words in the board. See %s for more info.',
+'Signatures label'					=>	'Signatures',
+'Signatures help'					=>	'Allow users to attach a signature to their posts.',
+'User ranks label'					=>	'User ranks',
+'User ranks help'					=>	'Enable this to use user ranks. See %s for more info.',
+'User has posted label'				=>	'User has posted earlier',
+'User has posted help'				=>	'This feature displays a dot in front of topics in viewforum.php in case the currently logged in user has posted in that topic earlier. Disable if you are experiencing high server load.',
+'Topic views label'					=>	'Topic views',
+'Topic views help'					=>	'Keep track of the number of views a topic has. Disable if you are experiencing high server load in a busy forum.',
+'Quick jump label'					=>	'Quick jump',
+'Quick jump help'					=>	'Enable the quick jump (jump to forum) drop list.',
+'GZip label'						=>	'GZip output',
+'GZip help'							=>	'If enabled, FluxBB will gzip the output sent to browsers. This will reduce bandwidth usage, but use a little more CPU. This feature requires that PHP is configured with zlib (--with-zlib). Note: If you already have one of the Apache modules mod_gzip or mod_deflate set up to compress PHP scripts, you should disable this feature.',
+'Search all label'					=>	'Search all forums',
+'Search all help'					=>	'When disabled, searches will only be allowed in one forum at a time. Disable if server load is high due to excessive searching.',
+'Menu items label'					=>	'Additional menu items',
+'Menu items help'					=>	'By entering HTML hyperlinks into this textbox, any number of items can be added to the navigation menu at the top of all pages. The format for adding new links is X = &lt;a href="URL"&gt;LINK&lt;/a&gt; where X is the position at which the link should be inserted (e.g. 0 to insert at the beginning and 2 to insert after "User list"). Separate entries with a linebreak.',
+
+// Feeds section
+'Feed subhead'						=>	'Syndication',
+'Default feed label'				=>	'Default feed type',
+'Default feed help'					=>	'Select the type of syndication feed to display. Note: Choosing none will not disable feeds, only hide them by default.',
+'None'								=>	'None',
+'RSS'								=>	'RSS',
+'Atom'								=>	'Atom',
+'Feed TTL label'					=>	'Duration to cache feeds',
+'Feed TTL help'						=>	'Feeds can be cached to lower the resource usage of feeds.',
+'No cache'							=>	'Don\'t cache',
+'Minutes'							=>	'%d minutes',
+
+// Reports section
+'Reports subhead'					=>	'Reports',
+'Reporting method label'			=>	'Reporting method',
+'Internal'							=>	'Internal',
+'By e-mail'							=>	'Email',
+'Both'								=>	'Both',
+'Reporting method help'				=>	'Select the method for handling topic/post reports. You can choose whether topic/post reports should be handled by the internal report system, emailed to the addresses on the mailing list (see below) or both.',
+'Mailing list label'				=>	'Mailing list',
+'Mailing list help'					=>	'A comma separated list of subscribers. The people on this list are the recipients of reports.',
+
+// Avatars section
+'Avatars subhead'					=>	'Avatars',
+'Use avatars label'					=>	'Use avatars',
+'Use avatars help'					=>	'When enabled, users will be able to upload an avatar which will be displayed under their title/rank.',
+'Upload directory label'			=>	'Upload directory',
+'Upload directory help'				=>	'The upload directory for avatars (relative to the FluxBB root directory). PHP must have write permissions to this directory.',
+'Max width label'					=>	'Max width',
+'Max width help'					=>	'The maximum allowed width of avatars in pixels (60 is recommended).',
+'Max height label'					=>	'Max height',
+'Max height help'					=>	'The maximum allowed height of avatars in pixels (60 is recommended).',
+'Max size label'					=>	'Max size',
+'Max size help'						=>	'The maximum allowed size of avatars in bytes (10240 is recommended).',
+
+// E-mail section
+'E-mail subhead'					=>	'Email',
+'Admin e-mail label'				=>	'Admin email',
+'Admin e-mail help'					=>	'The email address of the board administrator.',
+'Webmaster e-mail label'			=>	'Webmaster email',
+'Webmaster e-mail help'				=>	'This is the address that all emails sent by the board will be addressed from.',
+'Forum subscriptions label'			=>	'Forum subscriptions',
+'Forum subscriptions help'			=>	'Enable users to subscribe to forums (receive email when someone creates a new topic).',
+'Topic subscriptions label'			=>	'Topic subscriptions',
+'Topic subscriptions help'			=>	'Enable users to subscribe to topics (receive email when someone replies).',
+'SMTP address label'				=>	'SMTP server address',
+'SMTP address help'					=>	'The address of an external SMTP server to send emails with. You can specify a custom port number if the SMTP server doesn\'t run on the default port 25 (example: mail.myhost.com:3580). Leave blank to use the local mail program.',
+'SMTP username label'				=>	'SMTP username',
+'SMTP username help'				=>	'Username for SMTP server. Only enter a username if it is required by the SMTP server (most servers <strong>do not</strong> require authentication).',
+'SMTP password label'				=>	'SMTP password',
+'SMTP change password help'			=>	'Check this if you want to change or delete the currently stored password.',
+'SMTP password help'				=>	'Password for SMTP server. Only enter a password if it is required by the SMTP server (most servers <strong>do not</strong> require authentication). Please enter your password twice to confirm.',
+'SMTP SSL label'					=>	'Encrypt SMTP using SSL',
+'SMTP SSL help'						=>	'Encrypts the connection to the SMTP server using SSL. Should only be used if your SMTP server requires it and your version of PHP supports SSL.',
+
+// Registration Section
+'Registration subhead'				=>	'Registration',
+'Allow new label'					=>	'Allow new registrations',
+'Allow new help'					=>	'Controls whether this board accepts new registrations. Disable only under special circumstances.',
+'Verify label'						=>	'Verify registrations',
+'Verify help'						=>	'When enabled, users are emailed a random password when they register. They can then log in and change the password in their profile if they see fit. This feature also requires users to verify new email addresses if they choose to change from the one they registered with. This is an effective way of avoiding registration abuse and making sure that all users have "correct" email addresses in their profiles.',
+'Report new label'					=>	'Report new registrations',
+'Report new help'					=>	'If enabled, FluxBB will notify users on the mailing list (see above) when a new user registers in the forums.',
+'Use rules label'					=>	'User forum rules',
+'Use rules help'					=>	'When enabled, users must agree to a set of rules when registering (enter text below). The rules will always be available through a link in the navigation table at the top of every page.',
+'Rules label'						=>	'Enter your rules here',
+'Rules help'						=>	'Here you can enter any rules or other information that the user must review and accept when registering. If you enabled rules above you have to enter something here, otherwise it will be disabled. This text will not be parsed like regular posts and thus may contain HTML.',
+'E-mail default label'				=>	'Default email setting',
+'E-mail default help'				=>	'Choose the default privacy setting for new user registrations.',
+'Display e-mail label'				=>	'Display email address to other users.',
+'Hide allow form label'				=>	'Hide email address but allow form e-mail.',
+'Hide both label'					=>	'Hide email address and disallow form email.',
+
+// Announcement Section
+'Announcement subhead'				=>	'Announcements',
+'Display announcement label'		=>	'Display announcement',
+'Display announcement help'			=>	'Enable this to display the below message in the board.',
+'Announcement message label'		=>	'Announcement message',
+'Announcement message help'			=>	'This text will not be parsed like regular posts and thus may contain HTML.',
+
+// Maintenance Section
+'Maintenance subhead'				=>	'Maintenance',
+'Maintenance mode label'			=>	'Maintenance mode',
+'Maintenance mode help'				=>	'When enabled, the board will only be available to administrators. This should be used if the board needs to be taken down temporarily for maintenance. <strong>WARNING! Do not log out when the board is in maintenance mode.</strong> You will not be able to login again.',
+'Maintenance message label'			=>	'Maintenance message',
+'Maintenance message help'			=>	'The message that will be displayed to users when the board is in maintenance mode. If left blank, a default message will be used. This text will not be parsed like regular posts and thus may contain HTML.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_permissions.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_permissions.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_permissions.php	(revision 3)
@@ -0,0 +1,36 @@
+<?php
+
+// Language definitions used in admin-permissions.php
+$lang_admin_permissions = array(
+
+'Perms updated redirect'	=>	'Permissions updated. Redirecting âŠ',
+'Permissions head'			=>	'Permissions',
+'Posting subhead'			=>	'Posting',
+'BBCode label'				=>	'BBCode',
+'BBCode help'				=>	'Allow BBCode in posts (recommended).',
+'Image tag label'			=>	'Image tag',
+'Image tag help'			=>	'Allow the BBCode [img][/img] tag in posts.',
+'All caps message label'	=>	'All caps message',
+'All caps message help'		=>	'Allow a message to contain only capital letters.',
+'All caps subject label'	=>	'All caps subject',
+'All caps subject help'		=>	'Allow a subject to contain only capital letters.',
+'Require e-mail label'		=>	'Require guest email',
+'Require e-mail help'		=>	'Require guests to supply an email address when posting.',
+'Signatures subhead'		=>	'Signatures',
+'BBCode sigs label'			=>	'BBCodes in signatures',
+'BBCode sigs help'			=>	'Allow BBCodes in user signatures.',
+'Image tag sigs label'		=>	'Image tag in signatures',
+'Image tag sigs help'		=>	'Allow the BBCode [img][/img] tag in user signatures (not recommended).',
+'All caps sigs label'		=>	'All caps signature',
+'All caps sigs help'		=>	'Allow a signature to contain only capital letters.',
+'Max sig length label'		=>	'Maximum signature length',
+'Max sig length help'		=>	'The maximum number of characters a user signature may contain.',
+'Max sig lines label'		=>	'Maximum signature lines',
+'Max sig lines help'		=>	'The maximum number of lines a user signature may contain.',
+'Registration subhead'		=>	'Registration',
+'Banned e-mail label'		=>	'Allow banned email addresses',
+'Banned e-mail help'		=>	'Allow users to register with or change to a banned email address/domain. If left at its default setting (yes), this action will be allowed, but an alert email will be sent to the mailing list (an effective way of detecting multiple registrations).',
+'Duplicate e-mail label'	=>	'Allow duplicate email addresses',
+'Duplicate e-mail help'		=>	'Controls whether users should be allowed to register with an email address that another user already has. If allowed, an alert email will be sent to the mailing list if a duplicate is detected.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_ranks.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_ranks.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_ranks.php	(revision 3)
@@ -0,0 +1,23 @@
+<?php
+
+// Language definitions used in admin_ranks.php
+$lang_admin_ranks = array(
+
+'Must be integer message'	=>	'Minimum posts must be a positive integer value.',
+'Dupe min posts message'	=>	'There is already a rank with a minimun posts value of %s.',
+'Must enter title message'	=>	'You must enter a rank title.',
+'Rank added redirect'		=>	'Rank added. Redirecting âŠ',
+'Rank updated redirect'		=>	'Rank updated. Redirecting âŠ',
+'Rank removed redirect'		=>	'Rank removed. Redirecting âŠ',
+'Ranks head'				=>	'Ranks',
+'Add rank subhead'			=>	'Add rank',
+'Add rank info'				=>	'Enter a rank and the minimum number of posts a user must have made to attain the rank. Different ranks cannot have the same value for minimum posts. If a title is set for a user, the title will be displayed instead of any rank.',
+'Ranks enabled'				=>	'<strong>User ranks is enabled in %s.</strong>',
+'Ranks disabled'			=>	'<strong>User ranks is disabled in %s.</strong>',
+'Rank title label'			=>	'Rank title',
+'Minimum posts label'		=>	'Minimum posts',
+'Actions label'				=>	'Actions',
+'Edit remove subhead'		=>	'Edit/remove ranks',
+'No ranks in list'			=>	'No ranks in list',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_reports.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_reports.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_reports.php	(revision 3)
@@ -0,0 +1,21 @@
+<?php
+
+// Language definitions used in admin_reports.php
+$lang_admin_reports = array(
+
+'Report zapped redirect'	=>	'Report marked as read. Redirecting âŠ',
+'New reports head'			=>	'New reports',
+'Deleted user'				=>	'Deleted user',
+'Deleted'					=>	'Deleted',
+'Post ID'					=>	'Post #%s',
+'Report subhead'			=>	'Reported %s',
+'Reported by'				=>	'Reported by %s',
+'Reason'					=>	'Reason',
+'Zap'						=>	'Mark as read',
+'No new reports'			=>	'There are no new reports.',
+'Last 10 head'				=>	'10 last read reports',
+'NA'						=>	'N/A',
+'Zapped subhead'			=>	'Marked as read %s by %s',
+'No zapped reports'			=>	'There are no read reports.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/admin_users.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/admin_users.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/admin_users.php	(revision 3)
@@ -0,0 +1,110 @@
+<?php
+
+// Language definitions used in admin-users.php
+$lang_admin_users = array(
+
+'Non numeric message'		=>	'You entered a non-numeric value into a numeric only column.',
+'Invalid date time message'	=>	'You entered an invalid date/time.',
+'Not verified'				=>	'Not verified',
+
+// Actions: mass delete/ban etc.
+'No users selected'			=>	'No users selected.',
+'No move admins message'	=>	'For security reasons, you are not allowed to move multiple administrators to another group. If you want to move these administrators, you can do so on their respective user profiles.',
+'No delete admins message'	=>	'Administrators cannot be deleted. In order to delete administrators, you must first move them to a different user group.',
+'No ban admins message'		=>	'Administrators cannot be banned. In order to ban administrators, you must first move them to a different user group.',
+'No ban mods message'		=>	'Moderators cannot be banned. In order to ban moderators, you must first move them to a different user group.',
+'Move users'				=>	'Change user group',
+'Move users subhead'		=>	'Select new user group',
+'New group label'			=>	'New group',
+'New group help'			=>	'Select the group to which the selected users will be moved. For security reasons, it is not possible to move multiple users to the administrator group.',
+'Invalid group message'		=>	'Invalid group ID.',
+'Users move redirect'		=>	'User group changed. Redirecting âŠ',
+'Delete users'				=>	'Delete users',
+'Confirm delete legend'		=>	'Important: read before deleting users',
+'Confirm delete info'		=>	'Please confirm that you want to delete these users.',
+'Delete posts'				=>	'Delete any posts and topics these users have made.',
+'Delete warning'			=>	'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by these users, the posts can only be deleted manually at a later time.',
+'Users delete redirect'		=>	'Users deleted. Redirecting âŠ',
+'Ban users'					=>	'Ban users',
+'Message expiry subhead'	=>	'Ban message and expiry',
+'Ban message label'			=>	'Ban message',
+'Ban message help'			=>	'A message that will be displayed to the banned users when they visit the board.',
+'Expire date label'			=>	'Expire date',
+'Expire date help'			=>	'The date when these bans should be automatically removed (format: yyyy-mm-dd). Leave blank to remove manually.',
+'Ban IP label'				=>	'Ban IP addresses',
+'Ban IP help'				=>	'Also ban the IP addresses of the banned users to make registering a new account more difficult for them.',
+'Invalid date message'		=>	'You entered an invalid expire date.',
+'Invalid date reasons'		=>	'The format should be YYYY-MM-DD and the date must be at least one day in the future.',
+'Users banned redirect'		=>	'Users banned. Redirecting âŠ',
+
+'User search head'			=>	'User search',
+'User search subhead'		=>	'Enter search criteria',
+'User search info'			=>	'Search for users in the database. You can enter one or more terms to search for. Wildcards in the form of asterisks (*) are accepted.',
+'Username label'			=>	'Username',
+'E-mail address label'		=>	'Email address',
+'Title label'				=>	'Title',
+'Real name label'			=>	'Real name',
+'Website label'				=>	'Website',
+'Jabber label'				=>	'Jabber',
+'ICQ label'					=>	'ICQ',
+'MSN label'					=>	'MSN Messenger',
+'AOL label'					=>	'AOL IM',
+'Yahoo label'				=>	'Yahoo Messenger',
+'Location label'			=>	'Location',
+'Signature label'			=>	'Signature',
+'Admin note label'			=>	'Admin note',
+'Posts more than label'		=>	'Number of posts greater than',
+'Posts less than label'		=>	'Number of posts less than',
+'Last post after label'		=>	'Last post is after',
+'Date help'					=>	'(yyyy-mm-dd hh:mm:ss)',
+'Last post before label'	=>	'Last post is before',
+'Last visit after label'	=>	'Last visit is after',
+'Last visit before label'	=>	'Last visit is before',
+'Registered after label'	=>	'Registered after',
+'Registered before label'	=>	'Registered before',
+'Order by label'			=>	'Order by',
+'Order by username'			=>	'Username',
+'Order by e-mail'			=>	'Email',
+'Order by posts'			=>	'Number of posts',
+'Order by last post'		=>	'Last post',
+'Order by last visit'		=>	'Last visit',
+'Order by registered'		=>	'Registered',
+'Ascending'					=>	'Ascending',
+'Descending'				=>	'Descending',
+'User group label'			=>	'User group',
+'All groups'				=>	'All groups',
+'Unverified users'			=>	'Unverified users',
+'Submit search'				=>	'Submit search',
+'IP search head'			=>	'IP search',
+'IP search subhead'			=>	'Enter IP to search for',
+'IP address label'			=>	'IP address',
+'IP address help'			=>	'The IP address to search for in the post database.',
+'Find IP address'			=>	'Find IP address',
+
+'Results head'				=>	'Search Results',
+'Results username head'		=>	'Username',
+'Results e-mail head'		=>	'Email',
+'Results title head'		=>	'Title/Status',
+'Results posts head'		=>	'Posts',
+'Results admin note head'	=>	'Admin note',
+'Results actions head'		=>	'Actions',
+'Results IP address head'	=>	'IP address',
+'Results last used head'	=>	'Last used',
+'Results times found head'	=>	'Times found',
+'Results action head'		=>	'Action',
+'Results find more link'	=>	'Find more users for this ip',
+'Results no posts found'	=>	'There are currently no posts by that user in the forum.',
+'Select'					=>	'Select',
+'Select all'				=>	'Select all',
+'Unselect all'				=>	'Unselect all',
+'Ban'						=>	'Ban',
+'Delete'					=>	'Delete',
+'Change group'				=>	'Change group',
+'Bad IP message'			=>	'The supplied IP address is not correctly formatted.',
+'Results view IP link'		=>	'View IP stats',
+'Results show posts link'	=>	'Show posts',
+'Results guest'				=>	'Guest',
+'Results no IP found'		=>	'The supplied IP address could not be found in the database.',
+'No match'					=>	'No match'
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/common.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/common.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/common.php	(revision 3)
@@ -1,154 +1,163 @@
 <?php
 
-/*
-// Determine what locale to use
-switch (PHP_OS)
-{
-	case 'WINNT':
-	case 'WIN32':
-		$locale = 'english';
-		break;
-
-	case 'FreeBSD':
-	case 'NetBSD':
-	case 'OpenBSD':
-		$locale = 'en_US.US-ASCII';
-		break;
-
-	default:
-		$locale = 'en_US';
-		break;
-}
-
-// Attempt to set the locale
-setlocale(LC_CTYPE, $locale);
-*/
-
 // Language definitions for frequently used strings
-
 $lang_common = array(
 
 // Text orientation and encoding
-'lang_direction'		=>	'ltr',	// ltr (Left-To-Right) or rtl (Right-To-Left)
-'lang_encoding'			=>	'iso-8859-1',
-'lang_multibyte'		=>	false,
+'lang_direction'					=>	'ltr', // ltr (Left-To-Right) or rtl (Right-To-Left)
+'lang_identifier'					=>	'en',
+
+// Number formatting
+'lang_decimal_point'				=>	'.',
+'lang_thousands_sep'				=>	',',
 
 // Notices
-'Bad request'			=>	'Bad request. The link you followed is incorrect or outdated.',
-'No view'				=>	'You do not have permission to view these forums.',
-'No permission'			=>	'You do not have permission to access this page.',
-'Bad referrer'			=>	'Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that \'Base URL\' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the PunBB documentation.',
-
-// Topic/forum indicators
-'New icon'				=>	'There are new posts',
-'Normal icon'			=>	'<!-- -->',
-'Closed icon'			=>	'This topic is closed',
-'Redirect icon'			=>	'Redirected forum',
+'Bad request'						=>	'Bad request. The link you followed is incorrect or outdated.',
+'No view'							=>	'You do not have permission to view these forums.',
+'No permission'						=>	'You do not have permission to access this page.',
+'Bad referrer'						=>	'Bad HTTP_REFERER. You were referred to this page from an unauthorized source. If the problem persists please make sure that \'Base URL\' is correctly set in Admin/Options and that you are visiting the forum by navigating to that URL. More information regarding the referrer check can be found in the FluxBB documentation.',
+'No cookie'							=>	'You appear to have logged in successfully, however a cookie has not been set. Please check your settings and if applicable, enable cookies for this website.',
+'Pun include error'					=>	'Unable to process user include %s from template %s. There is no such file in neither the template directory nor in the user include directory.',
 
 // Miscellaneous
-'Announcement'			=>	'Announcement',
-'Options'				=>	'Options',
-'Actions'				=>	'Actions',
-'Submit'				=>	'Submit',	// "name" of submit buttons
-'Ban message'			=>	'You are banned from this forum.',
-'Ban message 2'			=>	'The ban expires at the end of',
-'Ban message 3'			=>	'The administrator or moderator that banned you left the following message:',
-'Ban message 4'			=>	'Please direct any inquiries to the forum administrator at',
-'Never'					=>	'Never',
-'Today'					=>	'Today',
-'Yesterday'				=>	'Yesterday',
-'Info'					=>	'Info',		// a common table header
-'Go back'				=>	'Go back',
-'Maintenance'			=>	'Maintenance',
-'Redirecting'			=>	'Redirecting',
-'Click redirect'		=>	'Click here if you do not want to wait any longer (or if your browser does not automatically forward you)',
-'on'					=>	'on',		// as in "BBCode is on"
-'off'					=>	'off',
-'Invalid e-mail'		=>	'The e-mail address you entered is invalid.',
-'required field'		=>	'is a required field in this form.',	// for javascript form validation
-'Last post'				=>	'Last post',
-'by'					=>	'by',	// as in last post by someuser
-'New posts'				=>	'New&#160;posts',	// the link that leads to the first new post (use &#160; for spaces)
-'New posts info'		=>	'Go to the first new post in this topic.',	// the popup text for new posts links
-'Username'				=>	'Username',
-'Password'				=>	'Password',
-'E-mail'				=>	'E-mail',
-'Send e-mail'			=>	'Send e-mail',
-'Moderated by'			=>	'Moderated by',
-'Registered'			=>	'Registered',
-'Subject'				=>	'Subject',
-'Message'				=>	'Message',
-'Topic'					=>	'Topic',
-'Forum'					=>	'Forum',
-'Posts'					=>	'Posts',
-'Replies'				=>	'Replies',
-'Author'				=>	'Author',
-'Pages'					=>	'Pages',
-'BBCode'				=>	'BBCode',	// You probably shouldn't change this
-'img tag'				=>	'[img] tag',
-'Smilies'				=>	'Smilies',
-'and'					=>	'and',
-'Image link'			=>	'image',	// This is displayed (i.e. <image>) instead of images when "Show images" is disabled in the profile
-'wrote'					=>	'wrote',	// For [quote]'s
-'Code'					=>	'Code',		// For [code]'s
-'Mailer'				=>	'Mailer',	// As in "MyForums Mailer" in the signature of outgoing e-mails
-'Important information'	=>	'Important information',
-'Write message legend'	=>	'Write your message and submit',
+'Announcement'						=>	'Announcement',
+'Options'							=>	'Options',
+'Submit'							=>	'Submit', // "Name" of submit buttons
+'Ban message'						=>	'You are banned from this forum.',
+'Ban message 2'						=>	'The ban expires at the end of',
+'Ban message 3'						=>	'The administrator or moderator that banned you left the following message:',
+'Ban message 4'						=>	'Please direct any inquiries to the forum administrator at',
+'Never'								=>	'Never',
+'Today'								=>	'Today',
+'Yesterday'							=>	'Yesterday',
+'Info'								=>	'Info', // A common table header
+'Go back'							=>	'Go back',
+'Maintenance'						=>	'Maintenance',
+'Redirecting'						=>	'Redirecting',
+'Click redirect'					=>	'Click here if you do not want to wait any longer (or if your browser does not automatically forward you)',
+'on'								=>	'on', // As in "BBCode is on"
+'off'								=>	'off',
+'Invalid email'						=>	'The email address you entered is invalid.',
+'Required'							=>	'(Required)',
+'required field'					=>	'is a required field in this form.', // For javascript form validation
+'Last post'							=>	'Last post',
+'by'								=>	'by', // As in last post by someuser
+'New posts'							=>	'New posts', // The link that leads to the first new post
+'New posts info'					=>	'Go to the first new post in this topic.', // The popup text for new posts links
+'Username'							=>	'Username',
+'Password'							=>	'Password',
+'Email'								=>	'Email',
+'Send email'						=>	'Send email',
+'Moderated by'						=>	'Moderated by',
+'Registered'						=>	'Registered',
+'Subject'							=>	'Subject',
+'Message'							=>	'Message',
+'Topic'								=>	'Topic',
+'Forum'								=>	'Forum',
+'Posts'								=>	'Posts',
+'Replies'							=>	'Replies',
+'Pages'								=>	'Pages:',
+'Page'								=>	'Page %s',
+'BBCode'							=>	'BBCode:', // You probably shouldn't change this
+'img tag'							=>	'[img] tag:',
+'Smilies'							=>	'Smilies:',
+'and'								=>	'and',
+'Image link'						=>	'image', // This is displayed (i.e. <image>) instead of images when "Show images" is disabled in the profile
+'wrote'								=>	'wrote:', // For [quote]'s
+'Mailer'							=>	'%s Mailer', // As in "MyForums Mailer" in the signature of outgoing emails
+'Important information'				=>	'Important information',
+'Write message legend'				=>	'Write your message and submit',
+'Previous'							=>	'Previous',
+'Next'								=>	'Next',
+'Spacer'							=>	'âŠ', // Ellipsis for paginate
 
 // Title
-'Title'					=>	'Title',
-'Member'				=>	'Member',	// Default title
-'Moderator'				=>	'Moderator',
-'Administrator'			=>	'Administrator',
-'Banned'				=>	'Banned',
-'Guest'					=>	'Guest',
+'Title'								=>	'Title',
+'Member'							=>	'Member', // Default title
+'Moderator'							=>	'Moderator',
+'Administrator'						=>	'Administrator',
+'Banned'							=>	'Banned',
+'Guest'								=>	'Guest',
 
 // Stuff for include/parser.php
-'BBCode error'			=>	'The BBCode syntax in the message is incorrect.',
-'BBCode error 1'		=>	'Missing start tag for [/quote].',
-'BBCode error 2'		=>	'Missing end tag for [code].',
-'BBCode error 3'		=>	'Missing start tag for [/code].',
-'BBCode error 4'		=>	'Missing one or more end tags for [quote].',
-'BBCode error 5'		=>	'Missing one or more start tags for [/quote].',
+'BBCode error no opening tag'		=>	'[/%1$s] was found without a matching [%1$s]',
+'BBCode error invalid nesting'		=>	'[%1$s] was opened within [%2$s], this is not allowed',
+'BBCode error invalid self-nesting'	=>	'[%s] was opened within itself, this is not allowed',
+'BBCode error no closing tag'		=>	'[%1$s] was found without a matching [/%1$s]',
+'BBCode error empty attribute'		=>	'[%s] tag had an empty attribute section',
+'BBCode code problem'				=>	'There is a problem with your [code] tags',
+'BBCode list size error'			=>	'Your list was too long to parse, please make it smaller!',
 
 // Stuff for the navigator (top of every page)
-'Index'					=>	'Index',
-'User list'				=>	'User list',
-'Rules'					=>  'Rules',
-'Search'				=>  'Search',
-'Register'				=>  'Register',
-'Login'					=>  'Login',
-'Not logged in'			=>  'You are not logged in.',
-'Profile'				=>	'Profile',
-'Logout'				=>	'Logout',
-'Logged in as'			=>	'Logged in as',
-'Admin'					=>	'Administration',
-'Last visit'			=>	'Last visit',
-'Show new posts'		=>	'Show new posts since last visit',
-'Mark all as read'		=>	'Mark all topics as read',
-'Link separator'		=>	'',	// The text that separates links in the navigator
+'Index'								=>	'Index',
+'User list'							=>	'User list',
+'Rules'								=>	'Rules',
+'Search'							=>	'Search',
+'Register'							=>	'Register',
+'Login'								=>	'Login',
+'Not logged in'						=>	'You are not logged in.',
+'Profile'							=>	'Profile',
+'Logout'							=>	'Logout',
+'Logged in as'						=>	'Logged in as',
+'Admin'								=>	'Administration',
+'Last visit'						=>	'Last visit: %s',
+'Topic searches'					=>	'Topics:',
+'New posts header'					=>	'New',
+'Active topics'						=>	'Active',
+'Unanswered topics'					=>	'Unanswered',
+'Posted topics'						=>	'Posted',
+'Show new posts'					=>	'Find topics with new posts since your last visit.',
+'Show active topics'				=>	'Find topics with recent posts.',
+'Show unanswered topics'			=>	'Find topics with no replies.',
+'Show posted topics'				=>	'Find topics you have posted to.',
+'Mark all as read'					=>	'Mark all topics as read',
+'Mark forum read'					=>	'Mark this forum as read',
+'Title separator'					=>	' / ',
 
 // Stuff for the page footer
-'Board footer'			=>	'Board footer',
-'Search links'			=>	'Search links',
-'Show recent posts'		=>	'Show recent posts',
-'Show unanswered posts'	=>	'Show unanswered posts',
-'Show your posts'		=>	'Show your posts',
-'Show subscriptions'	=>	'Show your subscribed topics',
-'Jump to'				=>	'Jump to',
-'Go'					=>	' Go ',		// submit button in forum jump
-'Move topic'			=>  'Move topic',
-'Open topic'			=>  'Open topic',
-'Close topic'			=>  'Close topic',
-'Unstick topic'			=>  'Unstick topic',
-'Stick topic'			=>  'Stick topic',
-'Moderate forum'		=>	'Moderate forum',
-'Delete posts'			=>	'Delete multiple posts',
-'Debug table'			=>	'Debug information',
+'Board footer'						=>	'Board footer',
+'Jump to'							=>	'Jump to',
+'Go'								=>	' Go ', // Submit button in forum jump
+'Moderate topic'					=>	'Moderate topic',
+'Move topic'						=>	'Move topic',
+'Open topic'						=>	'Open topic',
+'Close topic'						=>	'Close topic',
+'Unstick topic'						=>	'Unstick topic',
+'Stick topic'						=>	'Stick topic',
+'Moderate forum'					=>	'Moderate forum',
+'Powered by'						=>	'Powered by %s',
+
+// Debug information
+'Debug table'						=>	'Debug information',
+'Querytime'							=>	'Generated in %1$s seconds, %2$s queries executed',
+'Memory usage'						=>	'Memory usage: %1$s',
+'Peak usage'						=>	'(Peak: %1$s)',
+'Query times'						=>	'Time (s)',
+'Query'								=>	'Query',
+'Total query time'					=>	'Total query time: %s',
 
 // For extern.php RSS feed
-'RSS Desc Active'		=>	'The most recently active topics at',	// board_title will be appended to this string
-'RSS Desc New'			=>	'The newest topics at',					// board_title will be appended to this string
-'Posted'				=>	'Posted'	// The date/time a topic was started
+'RSS description'					=>	'The most recent topics at %s.',
+'RSS description topic'				=>	'The most recent posts in %s.',
+'RSS reply'							=>	'Re: ', // The topic subject will be appended to this string (to signify a reply)
+'RSS active topics feed'			=>	'RSS active topics feed',
+'Atom active topics feed'			=>	'Atom active topics feed',
+'RSS forum feed'					=>	'RSS forum feed',
+'Atom forum feed'					=>	'Atom forum feed',
+'RSS topic feed'					=>	'RSS topic feed',
+'Atom topic feed'					=>	'Atom topic feed',
+
+// Admin related stuff in the header
+'New reports'						=>	'There are new reports',
+'Maintenance mode enabled'			=>	'Maintenance mode is enabled!',
+
+// Units for file sizes
+'Size unit B'						=>	'%s B',
+'Size unit KiB'						=>	'%s KiB',
+'Size unit MiB'						=>	'%s MiB',
+'Size unit GiB'						=>	'%s GiB',
+'Size unit TiB'						=>	'%s TiB',
+'Size unit PiB'						=>	'%s PiB',
+'Size unit EiB'						=>	'%s EiB',
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/delete.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/delete.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/delete.php	(revision 3)
@@ -5,8 +5,12 @@
 
 'Delete post'			=>	'Delete post',
-'Warning'				=>	'Warning! If this is the first post in the topic, the whole topic will be deleted.',
-'Delete'				=>	'Delete',	// The submit button
-'Post del redirect'		=>	'Post deleted. Redirection ...',
-'Topic del redirect'	=>	'Topic deleted. Redirection ...'
+'Warning'				=>	'You are about to permanently delete this post.',
+'Topic warning'			=>	'Warning! This is the first post in the topic, the whole topic will be permanently deleted.',
+'Delete info'			=>	'The post you have chosen to delete is set out below for you to review before proceeding.',
+'Reply by'				=>	'Reply by %s - %s',
+'Topic by'				=>	'Topic started by %s - %s',
+'Delete'				=>	'Delete', // The submit button
+'Post del redirect'		=>	'Post deleted. Redirecting âŠ',
+'Topic del redirect'	=>	'Topic deleted. Redirecting âŠ'
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/forum.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/forum.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/forum.php	(revision 3)
@@ -6,7 +6,12 @@
 'Post topic'	=>	'Post new topic',
 'Views'			=>	'Views',
-'Moved'			=>	'Moved',
-'Sticky'		=>	'Sticky',
-'Empty forum'	=>	'Forum is empty.'
+'Moved'			=>	'Moved:',
+'Sticky'		=>	'Sticky:',
+'Closed'		=>	'Closed:',
+'Empty forum'	=>	'Forum is empty.',
+'Mod controls'	=>	'Moderator controls',
+'Is subscribed'	=>	'You are currently subscribed to this forum',
+'Unsubscribe'	=>	'Unsubscribe',
+'Subscribe'		=>	'Subscribe to this forum'
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/help.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/help.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/help.php	(revision 3)
@@ -7,4 +7,5 @@
 'produces'				=>	'produces',
 
+'BBCode'				=>	'BBCode',
 'BBCode info 1'			=>	'BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them.',
 'BBCode info 2'			=>	'Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature.',
@@ -15,11 +16,23 @@
 'Underlined text'		=>	'Underlined text',
 'Italic text'			=>	'Italic text',
+'Strike-through text'	=>	'Strike-through text',
 'Red text'				=>	'Red text',
 'Blue text'				=>	'Blue text',
+'Heading text'			=>	'Heading text',
+'Deleted text'			=>	'Deleted text',
+'Inserted text'			=>	'Inserted text',
+'Emphasised text'		=>	'Emphasised text',
 
 'Links and images'		=>	'Links and images',
-'Links info'			=>	'You can create links to other documents or to e-mail addresses using the following tags:',
-'My e-mail address'		=>	'My e-mail address',
-'Images info'			=>	'If you want to display an image you can use the img tag.',
+'Links info'			=>	'You can create links to other documents or to email addresses using the following tags:',
+'This help page'		=>	'This help page',
+'My email address'		=>	'My email address',
+'Images info'			=>	'If you want to display an image you can use the img tag. The text appearing after the "=" sign in the opening tag is used for the alt attribute and should be included whenever possible.',
+'FluxBB bbcode test'	=>	'FluxBB bbcode test',
+
+'Test topic'			=>	'Test topic',
+'Test post'				=>	'Test post',
+'Test forum'			=>	'Test forum',
+'Test user'				=>	'Test user',
 
 'Quotes'				=>	'Quotes',
@@ -28,4 +41,5 @@
 'Quote text'			=>	'This is the text i want to quote.',
 'produces quote box'	=>	'produces a quote box like this:',
+'quote note'			=>	'Note: If a username contains the characters [ or ] you can enclose it in quote marks.',
 
 'Code'					=>	'Code',
@@ -38,4 +52,14 @@
 'Bold, underlined text'	=>	'Bold, underlined text',
 
+'Lists'					=>	'Lists',
+'List info'				=>	'To create a list you can use the list tag. You can create 3 types of lists using the list tag.',
+'List text 1'			=>	'Example list item 1.',
+'List text 2'			=>	'Example list item 2.',
+'List text 3'			=>	'Example list item 3.',
+'produces list'			=>	'produces a bulleted list.',
+'produces decimal list'	=>	'produces a numbered list.',
+'produces alpha list'	=>	'produces an alphabetically labelled list.',
+
+'Smilies'				=>	'Smilies',
 'Smilies info'			=>	'If you like (and if it is enabled), the forum can convert a series of smilies to images representations of that smiley. This forum recognizes the following smilies and replaces them with images:'
 
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/index.html
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/index.html	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/index.html	(revision 3)
@@ -1,8 +1,1 @@
-<html>
-<head>
-<title>.</title>
-</head>
-<body>
-.
-</body>
-</html>
+<html><head><title>.</title></head><body>.</body></html>
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/index.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/index.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/index.php	(revision 3)
@@ -4,18 +4,17 @@
 $lang_index = array(
 
-'Topics'				=>  'Topics',
-'Moderators'			=>  'Moderators',
-'Link to'				=>	'Link to',	// As in "Link to http://www.punbb.org/"
-'Empty board'			=>	'Board is empty.',
-'Newest user'			=>	'Newest registered user',
-'Users online'			=>	'Registered users online',
-'Guests online'			=>	'Guests online',
-'No of users'			=>	'Total number of registered users',
-'No of topics'			=>	'Total number of topics',
-'No of posts'			=>	'Total number of posts',
-'Online'				=>	'Online',	// As in "Online: User A, User B etc."
-'Board info'			=>	'Board information',
-'Board stats'			=>	'Board statistics',
-'User info'				=>	'User information'
+'Topics'		=>	'Topics',
+'Link to'		=>	'Link to:', // As in "Link to: http://fluxbb.org/"
+'Empty board'	=>	'Board is empty.',
+'Newest user'	=>	'Newest registered user: %s',
+'Users online'	=>	'Registered users online: %s',
+'Guests online'	=>	'Guests online: %s',
+'No of users'	=>	'Total number of registered users: %s',
+'No of topics'	=>	'Total number of topics: %s',
+'No of posts'	=>	'Total number of posts: %s',
+'Online'		=>	'Online:', // As in "Online: User A, User B etc."
+'Board info'	=>	'Board information',
+'Board stats'	=>	'Board statistics',
+'User info'		=>	'User information'
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/install.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/install.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/install.php	(revision 3)
@@ -0,0 +1,120 @@
+<?php
+
+// Language definitions used in install.php, localized by adaur
+
+$lang_install = array(
+
+'Install message'				=>	'The file \'config.php\' doesn\'t exist or is corrupt. This implies that FluxBB has not yet been installed.',
+'Choose install language'		=>	'Choose the install script language',
+'Choose install language info'	=>	'The language used for this install script. The default language used for the board itself can be set below.',
+'Install language'				=>	'Install language',
+'Change language'				=>	'Change language',
+'Next'							=>	'Next',
+'Already installed'				=>	'It seems like FluxBB is already installed. You should go <a href="index.php">here</a> instead.',
+'You are running error'			=>	'You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue.',
+'My FluxBB Forum'				=>	'My FluxBB Forum',
+'Description'					=>	'Unfortunately no one can be told what FluxBB is - you have to see it for yourself.',
+'Username 1'					=>	'Usernames must be at least 2 characters long.',
+'Username 2'					=>	'Usernames must not be more than 25 characters long.',
+'Username 3'					=>	'The username guest is reserved.',
+'Username 4'					=>	'Usernames may not be in the form of an IP address.',
+'Username 5'					=>	'Usernames may not contain all the characters \', " and [ or ] at once.',
+'Username 6'					=>	'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses.',
+'Short password'				=>	'Passwords must be at least 4 characters long.',
+'Passwords not match'			=>	'Passwords do not match.',
+'Wrong email'					=>	'The administrator email address you entered is invalid.',
+'No board title'				=>	'You must enter a board title.',
+'Error default language'		=>	'The default language chosen doesn\'t seem to exist.',
+'Error default style'			=>	'The default style chosen doesn\'t seem to exist.',
+'No DB extensions'				=>	'This PHP environment does not have support for any of the databases that FluxBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for FluxBB to be installed.',
+'Administrator username'		=>	'Administrator\'s username',
+'Administrator password 1'		=>	'Administrator password 1',
+'Administrator password 2'		=>	'Administrator password 2',
+'Administrator email'			=>	'Administrator\'s email',
+'Board title'					=>	'Board title',
+'Base URL'						=>	'Base URL',
+'Required field'				=>	'is a required field in this form.',
+'FluxBB Installation'			=>	'FluxBB Installation',
+'Welcome'						=>	'You are about to install FluxBB. In order to install FluxBB, you must complete the form set out below. If you encounter any difficulties with the installation, please refer to the documentation.',
+'Install'						=>	'Install FluxBB 1.4',
+'Errors'						=>	'The following errors need to be corrected:',
+'Database setup'				=>	'Database setup',
+'Info 1'						=>	'Please enter the requested information in order to setup your database for FluxBB. You must know all the information asked for before proceeding with the installation.',
+'Select database'				=>	'Select your database type',
+'Info 2'						=>	'FluxBB currently supports MySQL, PostgreSQL and SQLite. If your database of choice is missing from the drop-down menu below, it means this PHP environment does not have support for that particular database. More information regarding support for particular versions of each database can be found in the FAQ.',
+'Dual MySQL'					=>	'FluxBB has detected that your PHP environment supports two different ways of communicating with MySQL. The two options are called standard and improved. If you are uncertain which one to use, start by trying improved and if that fails, try standard.',
+'InnoDB'						=>	'FluxBB has detected that your MySQL server might support <a href="http://dev.mysql.com/doc/refman/5.0/en/innodb.html">InnoDB</a>. This would be a good choice if you are planning to run a large forum. If you are uncertain, it is recommended that you do not use InnoDB.',
+'Database type'					=>	'Database type',
+'Required'						=>	'(Required)',
+'Database hostname'				=>	'Enter your database server hostname',
+'Info 3'						=>	'The address of the database server (example: localhost, db.myhost.com or 192.168.0.15). You can specify a custom port number if your database doesn\'t run on the default port (example: localhost:3580). For SQLite support, just enter anything or leave it at \'localhost\'.',
+'Database server hostname'		=>'Database server hostname',
+'Database enter name'			=>	'Enter the name of your database',
+'Info 4'						=>	'The name of the database that FluxBB will be installed into. The database must exist. For SQLite, this is the relative path to the database file. For security reasons, it is highly recommended to place the SQLite database in a private (not web accessible) directory whenever possible. If the SQLite database file does not exist, FluxBB will attempt to create it.',
+'Database name'					=>	'Database name',
+'Database enter informations'	=>	'Enter your database username and password',
+'Database username'				=>	'Database username',
+'Info 5'						=>	'Enter the username and password with which you connect to the database. Ignore for SQLite.',
+'Database password'				=>	'Database password',
+'Database enter prefix'			=>	'Enter database table prefix',
+'Info 6'						=>	'If you like, you can specify a table prefix. This way you can run multiple copies of FluxBB in the same database (example: foo_).',
+'Table prefix'					=>	'Table prefix',
+'Administration setup'			=>	'Administration setup',
+'Info 7'						=>	'Please enter the requested information in order to setup an administrator for your FluxBB installation.',
+'Admin enter username'			=>	'Enter Administrator\'s username',
+'Info 8'						=>	'The username of the forum administrator. You can later create more administrators and moderators. Usernames can be between 2 and 25 characters long.',
+'Admin enter password'			=>	'Enter and confirm Administrator\'s password',
+'Info 9'						=>	'Passwords must be at least 4 characters long. Passwords are case sensitive.',
+'Password'						=>	'Password',
+'Confirm password'				=>	'Confirm password',
+'Admin enter email'				=>	'Enter Administrator\'s email',
+'Info 10'						=>	'The email address of the forum administrator.',
+'Board setup'					=>	'Board setup',
+'Info 11'						=>	'Please enter the requested information in order to setup your FluxBB board.',
+'Enter board title'				=>	'Enter your board\'s title',
+'Info 12'						=>	'The title of this bulletin board (shown at the top of every page).',
+'Enter board description'		=>	'Enter your board\'s description',
+'Info 13'						=>	'A short description of this bulletin board (shown at the top of every page). This field may contain HTML.',
+'Board description'				=>	'Board description',
+'Enter base URL'				=>	'Enter the Base URL of your FluxBB installation',
+'Info 14'						=>	'The URL (without trailing slash) of your FluxBB forum (example: http://forum.myhost.com or http://myhost.com/~myuser). This <strong>must</strong> be correct, otherwise, administrators and moderators will not be able to submit any forms. Please note that the preset value below is just an educated guess by FluxBB.',
+'Choose the default language'	=>	'Choose the default language',
+'Info 15'						=>	'The default language used for guests and users who haven\'t changed from the default in their profile.',
+'Default language'				=>	'Default language',
+'Choose the default style'		=>	'Choose the default style',
+'Info 16'						=>	'The default style used for guests and users who haven\'t changed from the default in their profile.',
+'Default style'					=>	'Default style',
+'Start install'					=>	'Start install',
+'DB type not valid'				=>	'\'%s\' is not a valid database type',
+'Table prefix error'			=>	'The table prefix \'%s\' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix',
+'Prefix reserved'				=>	'The table prefix \'sqlite_\' is reserved for use by the SQLite engine. Please choose a different prefix',
+'Existing table error'			=>	'A table called \'%susers\' is already present in the database \'%s\'. This could mean that FluxBB is already installed or that another piece of software is installed and is occupying one or more of the table names FluxBB requires. If you want to install multiple copies of FluxBB in the same database, you must choose a different table prefix',
+'InnoDB off'					=>	'InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server',
+'Administrators'				=>	'Administrators',
+'Administrator'					=>	'Administrator',
+'Moderators'					=>	'Moderators',
+'Moderator'						=>	'Moderator',
+'Guests'						=>	'Guests',
+'Guest'							=>	'Guest',
+'New member'					=>	'New member',
+'Members'						=>	'Members',
+'Member'						=>	'Member',
+'Announcement'					=>	'Enter your announcement here.',
+'Rules'							=>	'Enter your rules here',
+'Maintenance message'			=>	'The forums are temporarily down for maintenance. Please try again in a few minutes.',
+'Test post'						=>	'Test post',
+'Message'						=>	'If you are looking at this (which I guess you are), the install of FluxBB appears to have worked! Now log in and head over to the administration control panel to configure your forum.',
+'Test category'					=>	'Test category',
+'Test forum'					=>	'Test forum',
+'This is just a test forum'		=>	'This is just a test forum',
+'Alert cache'					=>	'<strong>The cache directory is currently not writable!</strong> In order for FluxBB to function properly, the directory <em>%s</em> must be writable by PHP. Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777.',
+'Alert avatar'					=>	'<strong>The avatar directory is currently not writable!</strong> If you want users to be able to upload their own avatar images you must see to it that the directory <em>%s</em> is writable by PHP. You can later choose to save avatar images in a different directory (see Admin/Options). Use chmod to set the appropriate directory permissions. If in doubt, chmod to 0777.',
+'Alert upload'					=>	'<strong>File uploads appear to be disallowed on this server!</strong> If you want users to be able to upload their own avatar images you must enable the file_uploads configuration setting in PHP. Once file uploads have been enabled, avatar uploads can be enabled in Administration/Options/Features.',
+'FluxBB has been installed'		=>	'FluxBB has been installed. To finalize the installation please follow the instructions below.',
+'Final instructions'			=>	'Final instructions',
+'Info 17'						=>	'To finalize the installation, you need to click on the button below to download a file called config.php. You then need to upload this file to the root directory of your FluxBB installation.',
+'Info 18'						=>	'Once you have uploaded config.php, FluxBB will be fully installed! At that point, you may <a href="index.php">go to the forum index</a>.',
+'Download config.php file'		=>	'Download config.php file',
+'FluxBB fully installed'		=>	'FluxBB has been fully installed! You may now <a href="index.php">go to the forum index</a>.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/login.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/login.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/login.php	(revision 3)
@@ -1,22 +1,26 @@
 <?php
 
-// Language definitions used in delete.php
+// Language definitions used in login.php
 $lang_login = array(
 
 // Miscellaneous
-'Wrong user/pass'		=>	'Wrong username and/or password.',
-'Forgotten pass'		=>	'Forgotten your password?',
-'Login redirect'		=>	'Logged in successfully. Redirection ...',
-'Logout redirect'		=>	'Logged out. Redirection ...',
-'No e-mail match'		=>	'There is no user registered with the e-mail address',
-'Request pass'			=>	'Request password',
-'Request pass legend'	=>	'Enter the e-mail address with which you registered',
-'Request pass info'		=>	'A new password together with a link to activate the new password will be sent to that address.',
-'Not registered'		=>	'Not registered yet?',
-'Login legend'			=>	'Enter your username and password below',
-'Login info'			=>	'If you have not registered or have forgotten your password click on the appropriate link below.',
+'Wrong user/pass'			=>	'Wrong username and/or password.',
+'Forgotten pass'			=>	'Forgotten your password?',
+'Login redirect'			=>	'Logged in successfully. Redirecting âŠ',
+'Logout redirect'			=>	'Logged out. Redirecting âŠ',
+'No email match'			=>	'There is no user registered with the email address',
+'Request pass'				=>	'Request password',
+'Request pass legend'		=>	'Enter the email address with which you registered',
+'Request pass info'			=>	'A new password together with a link to activate the new password will be sent to that address.',
+'Not registered'			=>	'Not registered yet?',
+'Login legend'				=>	'Enter your username and password below',
+'Remember me'				=>	'Log me in automatically each time I visit.',
+'Login info'				=>	'If you have not registered or have forgotten your password click on the appropriate link below.',
+'New password errors'		=>	'Password request error',
+'New passworderrors info'	=>	'The following error needs to be corrected before a new password can be sent:',
 
 // Forget password mail stuff
-'Forget mail'			=>	'An e-mail has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at'
+'Forget mail'				=>	'An email has been sent to the specified address with instructions on how to change your password. If it does not arrive you can contact the forum administrator at',
+'Email flood'				=>	'This account has already requested a password reset in the past hour. Please wait a while before requesting a new password again.'
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/activate_email.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/activate_email.tpl	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/activate_email.tpl	(revision 3)
@@ -1,12 +1,12 @@
-Subject: Change e-mail address requested
+Subject: Change email address requested
 
 Hello <username>,
 
-You have requested to have a new e-mail address assigned to your account in the discussion forum at <base_url>. If you didn't request this or if you don't want to change your e-mail address you should just ignore this message. Only if you visit the activation page below will your e-mail address be changed. In order for the activation page to work, you must be logged in to the forum.
+You have requested to have a new email address assigned to your account in the discussion forum at <base_url>. If you didn't request this or if you don't want to change your email address you should just ignore this message. Only if you visit the activation page below will your email address be changed. In order for the activation page to work, you must be logged in to the forum.
 
-To change your e-mail address, please visit the following page:
+To change your email address, please visit the following page:
 <activation_url>
 
--- 
-<board_mailer>
+--
+<board_mailer> Mailer
 (Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/activate_password.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/activate_password.tpl	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/activate_password.tpl	(revision 3)
@@ -10,5 +10,5 @@
 <activation_url>
 
--- 
-<board_mailer>
+--
+<board_mailer> Mailer
 (Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_change.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_change.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_change.tpl	(revision 3)
@@ -0,0 +1,9 @@
+Subject: Alert - Banned email detected
+
+User '<username>' changed to banned email address: <email>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_post.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_post.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_post.tpl	(revision 3)
@@ -0,0 +1,9 @@
+Subject: Alert - Banned email detected
+
+User '<username>' posted with banned email address: <email>
+
+Post URL: <post_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_register.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_register.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/banned_email_register.tpl	(revision 3)
@@ -0,0 +1,9 @@
+Subject: Alert - Banned email detected
+
+User '<username>' registered with banned email address: <email>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/dupe_email_change.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/dupe_email_change.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/dupe_email_change.tpl	(revision 3)
@@ -0,0 +1,9 @@
+Subject: Alert - Duplicate email detected
+
+User '<username>' changed to an email address that also belongs to: <dupe_list>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/dupe_email_register.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/dupe_email_register.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/dupe_email_register.tpl	(revision 3)
@@ -0,0 +1,9 @@
+Subject: Alert - Duplicate email detected
+
+User '<username>' registered with an email address that also belongs to: <dupe_list>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/form_email.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/form_email.tpl	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/form_email.tpl	(revision 3)
@@ -1,5 +1,5 @@
 Subject: <mail_subject>
 
-<sender> from <board_title> has sent you a message. You can reply to <sender> by replying to this e-mail.
+<sender> from <board_title> has sent you a message. You can reply to <sender> by replying to this email.
 
 The message reads as follows:
@@ -10,4 +10,4 @@
 -----------------------------------------------------------------------
 
--- 
-<board_mailer>
+--
+<board_mailer> Mailer
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/index.html
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/index.html	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/index.html	(revision 3)
@@ -1,8 +1,1 @@
-<html>
-<head>
-<title>.</title>
-</head>
-<body>
-.
-</body>
-</html>
+<html><head><title>.</title></head><body>.</body></html>
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_reply.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_reply.tpl	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_reply.tpl	(revision 3)
@@ -1,5 +1,5 @@
-Subject: Reply to topic: <topic_subject>
+Subject: Reply to topic: '<topic_subject>'
 
-<replier> has replied to the topic <topic_subject> to which you are subscribed. There may be more new replies, but this is the only notification you will receive until you visit the board again.
+<replier> has replied to the topic '<topic_subject>' to which you are subscribed. There may be more new replies, but this is the only notification you will receive until you visit the board again.
 
 The post is located at <post_url>
@@ -7,5 +7,5 @@
 You can unsubscribe by going to <unsubscribe_url>
 
--- 
-<board_mailer>
+--
+<board_mailer> Mailer
 (Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_reply_full.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_reply_full.tpl	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_reply_full.tpl	(revision 3)
@@ -1,5 +1,5 @@
-Subject: Reply to topic: <topic_subject>
+Subject: Reply to topic: '<topic_subject>'
 
-<replier> has replied to the topic <topic_subject> to which you are subscribed. There may be more new replies, but this is the only notification you will receive until you visit the board again.
+<replier> has replied to the topic '<topic_subject>' to which you are subscribed. There may be more new replies, but this is the only notification you will receive until you visit the board again.
 
 The message reads as follows:
@@ -14,5 +14,5 @@
 You can unsubscribe by going to <unsubscribe_url>
 
--- 
-<board_mailer>
+--
+<board_mailer> Mailer
 (Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_report.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_report.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_report.tpl	(revision 3)
@@ -0,0 +1,9 @@
+Subject: Report(<forum_id>) - '<topic_subject>'
+
+User '<username>' has reported the following message: <post_url>
+
+Reason: <reason>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_topic.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_topic.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_topic.tpl	(revision 3)
@@ -0,0 +1,11 @@
+Subject: New topic in forum: '<forum_name>'
+
+<poster> has posted a new topic '<topic_subject>' in the forum '<forum_name>', to which you are subscribed.
+
+The topic is located at <topic_url>
+
+You can unsubscribe by going to <unsubscribe_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_topic_full.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_topic_full.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_topic_full.tpl	(revision 3)
@@ -0,0 +1,18 @@
+Subject: New topic in forum: '<forum_name>'
+
+<poster> has posted a new topic '<topic_subject>' in the forum '<forum_name>', to which you are subscribed.
+
+The message reads as follows:
+-----------------------------------------------------------------------
+
+<message>
+
+-----------------------------------------------------------------------
+
+The topic is located at <topic_url>
+
+You can unsubscribe by going to <unsubscribe_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_user.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_user.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/new_user.tpl	(revision 3)
@@ -0,0 +1,9 @@
+Subject: Alert - New registration
+
+User '<username>' registered in the forums at <base_url>
+
+User profile: <profile_url>
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/rename.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/rename.tpl	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/rename.tpl	(revision 3)
@@ -0,0 +1,12 @@
+Subject: User account renamed
+
+During an upgrade to the forums at <base_url> it was determined your username is too similar to an existing user. Your username has been changed accordingly.
+
+Old username: <old_username>
+New username: <new_username>
+
+We apologise for any inconvenience caused.
+
+--
+<board_mailer> Mailer
+(Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/welcome.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/welcome.tpl	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/mail_templates/welcome.tpl	(revision 3)
@@ -9,4 +9,4 @@
 
 --
-<board_mailer>
+<board_mailer> Mailer
 (Do not reply to this message)
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/misc.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/misc.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/misc.php	(revision 3)
@@ -4,64 +4,90 @@
 $lang_misc = array(
 
-'Mark read redirect'		=>	'All topics and forums have been marked as read. Redirection ...',
+'Mark read redirect'			=>	'All topics and forums have been marked as read. Redirecting âŠ',
+'Mark forum read redirect'		=>	'All topics in the specified forum have been marked as read. Redirecting âŠ',
 
-// Send e-mail
-'Form e-mail disabled'		=>	'The user you are trying to send an e-mail to has disabled form e-mail.',
-'No e-mail subject'			=>	'You must enter a subject.',
-'No e-mail message'			=>	'You must enter a message.',
-'Too long e-mail message'	=>	'Messages cannot be longer than 65535 characters (64 KB).',
-'E-mail sent redirect'		=>	'E-mail sent. Redirection ...',
-'Send e-mail to'			=>	'Send e-mail to',
-'E-mail subject'			=>	'Subject',
-'E-mail message'			=>	'Message',
-'E-mail disclosure note'	=>	'Please note that by using this form, your e-mail address will be disclosed to the recipient.',
-'Write e-mail'				=>	'Write and submit your e-mail message',
+// Send email
+'Form email disabled'			=>	'The user you are trying to send an email to has disabled form email.',
+'No email subject'				=>	'You must enter a subject.',
+'No email message'				=>	'You must enter a message.',
+'Too long email message'		=>	'Messages cannot be longer than 65535 characters (64 KB).',
+'Email flood'					=>	'At least %s seconds have to pass between sent emails. Please wait a while and try sending again.',
+'Email sent redirect'			=>	'Email sent. Redirecting âŠ',
+'Send email to'					=>	'Send email to',
+'Email subject'					=>	'Subject',
+'Email message'					=>	'Message',
+'Email disclosure note'			=>	'Please note that by using this form, your email address will be disclosed to the recipient.',
+'Write email'					=>	'Write and submit your email message',
 
 // Report
-'No reason'					=>	'You must enter a reason.',
-'Report redirect'			=>	'Post reported. Redirection ...',
-'Report post'				=>	'Report post',
-'Reason'					=>	'Reason',
-'Reason desc'				=>	'Please enter a short reason why you are reporting this post',
+'No reason'						=>	'You must enter a reason.',
+'Reason too long'				=>	'Your message must be under 65535 bytes (~64kb).',
+'Report flood'					=>	'At least %s seconds have to pass between reports. Please wait a while and try sending again.',
+'Report redirect'				=>	'Post reported. Redirecting âŠ',
+'Report post'					=>	'Report post',
+'Reason'						=>	'Reason',
+'Reason desc'					=>	'Please enter a short reason why you are reporting this post',
 
 // Subscriptions
-'Already subscribed'		=>	'You are already subscribed to this topic.',
-'Subscribe redirect'		=>	'Your subscription has been added. Redirection ...',
-'Not subscribed'			=>	'You are not subscribed to this topic.',
-'Unsubscribe redirect'		=>	'Your subscription has been removed. Redirection ...',
+'Already subscribed topic'		=>	'You are already subscribed to this topic.',
+'Already subscribed forum'		=>	'You are already subscribed to this forum.',
+'Subscribe redirect'			=>	'Your subscription has been added. Redirecting âŠ',
+'Not subscribed topic'			=>	'You are not subscribed to this topic.',
+'Not subscribed forum'			=>	'You are not subscribed to this forum.',
+'Unsubscribe redirect'			=>	'Your subscription has been removed. Redirecting âŠ',
 
 // General forum and topic moderation
-'Moderate'					=>	'Moderate',
-'Select'					=>	'Select',	// the header of a column of checkboxes
-'Move'						=>	'Move',
-'Delete'					=>	'Delete',
+'Moderate'						=>	'Moderate',
+'Select'						=>	'Select', // the header of a column of checkboxes
+'Move'							=>	'Move',
+'Split'							=>	'Split',
+'Delete'						=>	'Delete',
+'Merge'							=>	'Merge',
 
 // Moderate forum
-'Open'						=>	'Open',
-'Close'						=>	'Close',
-'Move topic'				=>	'Move topic',
-'Move topics'				=>	'Move topics',
-'Move legend'				=>	'Select destination of move',
-'Move to'					=>	'Move to',
-'Leave redirect'			=>	'Leave redirect topic(s)',
-'Move topic redirect'		=>	'Topic moved. Redirection ...',
-'Move topics redirect'		=>	'Topics moved. Redirection ...',
-'Confirm delete legend'		=>	'Please confirm deletion',
-'Delete topics'				=>	'Delete topics',
-'Delete topics comply'		=>	'Are you sure you want to delete the selected topics?',
-'Delete topics redirect'	=>	'Topics deleted. Redirection ...',
-'Open topic redirect'		=>	'Topic opened. Redirection ...',
-'Open topics redirect'		=>	'Topics opened. Redirection ...',
-'Close topic redirect'		=>	'Topic closed. Redirection ...',
-'Close topics redirect'		=>	'Topics closed. Redirection ...',
-'No topics selected'		=>	'You must select at least one topic for move/delete/open/close.',
-'Stick topic redirect'		=>	'Topic sticked. Redirection ...',
-'Unstick topic redirect'	=>	'Topic unsticked. Redirection ...',
+'Open'							=>	'Open',
+'Close'							=>	'Close',
+'Move topic'					=>	'Move topic',
+'Move topics'					=>	'Move topics',
+'Move legend'					=>	'Select destination of move',
+'Move to'						=>	'Move to',
+'Nowhere to move'				=>	'There are no forums into which you can move topics.',
+'Leave redirect'				=>	'Leave redirect topic(s)',
+'Move topic redirect'			=>	'Topic moved. Redirecting âŠ',
+'Move topics redirect'			=>	'Topics moved. Redirecting âŠ',
+'Confirm delete legend'			=>	'Please confirm deletion',
+'Delete topics'					=>	'Delete topics',
+'Delete topics comply'			=>	'Are you sure you want to delete the selected topics?',
+'Delete topics redirect'		=>	'Topics deleted. Redirecting âŠ',
+'Open topic redirect'			=>	'Topic opened. Redirecting âŠ',
+'Open topics redirect'			=>	'Topics opened. Redirecting âŠ',
+'Close topic redirect'			=>	'Topic closed. Redirecting âŠ',
+'Close topics redirect'			=>	'Topics closed. Redirecting âŠ',
+'No topics selected'			=>	'You must select at least one topic for move/delete/open/close.',
+'Not enough topics selected'	=>	'You must select at least two topics for merge.',
+'Stick topic redirect'			=>	'Topic sticked. Redirecting âŠ',
+'Unstick topic redirect'		=>	'Topic unsticked. Redirecting âŠ',
+'Merge topics'					=>	'Merge topics',
+'Merge topics redirect'			=>	'Topics merged. Redirecting âŠ',
+'Confirm merge legend'			=>	'Please confirm merge',
+'New subject'					=>	'New subject',
+
+// Split multiple posts in topic
+'Confirm split legend'			=>	'Please confirm split of selected posts and select destination of move.',
+'Split posts'					=>	'Split posts',
+'Split posts comply'			=>	'Are you sure you want to split the selected posts?',
+'Split posts redirect'			=>	'Posts have been split. Redirecting âŠ',
 
 // Delete multiple posts in topic
-'Delete posts'				=>	'Delete posts',
-'Delete posts comply'		=>	'Are you sure you want to delete the selected posts?',
-'Delete posts redirect'		=>	'Posts deleted. Redirection ...',
-'No posts selected'			=>	'You must select at least one post to be deleted.'
+'Delete posts'					=>	'Delete posts',
+'Cannot select first'			=>	'First post cannot be selected for split/delete.',
+'Delete posts comply'			=>	'Are you sure you want to delete the selected posts?',
+'Delete posts redirect'			=>	'Posts deleted. Redirecting âŠ',
+'No posts selected'				=>	'You must select at least one post for split/delete.',
+
+// Get host
+'Host info 1'					=>	'The IP address is: %s',
+'Host info 2'					=>	'The host name is: %s',
+'Show more users'				=>	'Show more users for this IP',
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/post.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/post.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/post.php	(revision 3)
@@ -5,29 +5,35 @@
 
 // Post validation stuff (many are similiar to those in edit.php)
-'No subject'			=>	'Topics must contain a subject.',
-'Too long subject'		=>	'Subjects cannot be longer than 70 characters.',
-'No message'			=>	'You must enter a message.',
-'Too long message'		=>	'Posts cannot be longer that 65535 characters (64 KB).',
+'No subject'		=>	'Topics must contain a subject.',
+'No subject after censoring'	=>	'Topics must contain a subject. After applying censoring filters, your subject was empty.',
+'Too long subject'	=>	'Subjects cannot be longer than 70 characters.',
+'No message'		=>	'You must enter a message.',
+'No message after censoring'	=>	'You must enter a message. After applying censoring filters, your message was empty.',
+'Too long message'	=>	'Posts cannot be longer that %s bytes.',
+'All caps subject'	=>	'Subjects cannot contain only capital letters.',
+'All caps message'	=>	'Posts cannot contain only capital letters.',
+'Empty after strip'	=>	'It seems your post consisted of empty BBCodes only. It is possible that this happened because e.g. the innermost quote was discarded because of the maximum quote depth level.',
 
 // Posting
-'Post errors'			=>	'Post errors',
-'Post errors info'		=>	'The following errors need to be corrected before the message can be posted:',
-'Post preview'			=>	'Post preview',
-'Guest name'			=>	'Name',	// For guests (instead of Username)
-'Post redirect'			=>	'Post entered. Redirection ...',
-'Post a reply'			=>	'Post a reply',
-'Post new topic'		=>	'Post new topic',
-'Hide smilies'			=>	'Never show smilies as icons for this post',
-'Subscribe'				=>	'Subscribe to this topic',
-'Topic review'			=>	'Topic review (newest first)',
-'Flood start'			=>	'At least',
-'flood end'				=>	'seconds have to pass between posts. Please wait a little while and try posting again.',
-'Preview'				=>	'Preview',	// submit button to preview message
+'Post errors'		=>	'Post errors',
+'Post errors info'	=>	'The following errors need to be corrected before the message can be posted:',
+'Post preview'		=>	'Post preview',
+'Guest name'		=>	'Name', // For guests (instead of Username)
+'Post redirect'		=>	'Post entered. Redirecting âŠ',
+'Post a reply'		=>	'Post a reply',
+'Post new topic'	=>	'Post new topic',
+'Hide smilies'		=>	'Never show smilies as icons for this post',
+'Subscribe'			=>	'Subscribe to this topic',
+'Stay subscribed'	=>	'Stay subscribed to this topic',
+'Topic review'		=>	'Topic review (newest first)',
+'Flood start'		=>	'At least',
+'flood end'			=>	'seconds have to pass between posts. Please wait a little while and try posting again.',
+'Preview'			=>	'Preview', // submit button to preview message
 
 // Edit post
-'Edit post legend'		=>	'Edit the post and submit changes',
-'Silent edit'			=>	'Silent edit (don\'t display "Edited by ..." in topic view)',
-'Edit post'				=>	'Edit post',
-'Edit redirect'			=>	'Post updated. Redirection ...'
+'Edit post legend'	=>	'Edit the post and submit changes',
+'Silent edit'		=>	'Silent edit (don\'t display "Edited by ..." in topic view)',
+'Edit post'			=>	'Edit post',
+'Edit redirect'		=>	'Post updated. Redirecting âŠ'
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/prof_reg.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/prof_reg.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/prof_reg.php	(revision 3)
@@ -4,36 +4,76 @@
 $lang_prof_reg = array(
 
-'E-mail legend'				=>	'Enter a valid e-mail address',
-'E-mail legend 2'			=>	'Enter and confirm a valid e-mail address',
+'Email legend'				=>	'Enter a valid email address',
+'Email legend 2'			=>	'Enter and confirm a valid email address',
 'Localisation legend'		=>	'Set your localisation options',
-'Timezone'					=>	'Timezone',
-'Timezone info'				=>	'For the forum to display times correctly you must select your local timezone.',
+'Time zone'					=>	'Time zone',
+'Time zone info'			=>	'For the forum to display times correctly you must select your local time zone. If Daylight Savings Time is in effect you should also check the option provided which will advance times by 1 hour.',
+'DST'						=>	'Daylight Savings Time is in effect (advance time by 1 hour).',
+'Time format'				=>	'Time format',
+'Date format'				=>	'Date format',
+'Default'					=>	'Default',
 'Language'					=>	'Language',
-'Language info'				=>	'You can choose which language you wish to use to view the forum.',
-'E-mail setting info'		=>	'Select whether you want your e-mail address to be viewable to other users or not and if you want other users to be able to send you e-mail via the forum (form e-mail) or not.',
-'E-mail setting 1'			=>	'Display your e-mail address.',
-'E-mail setting 2'			=>	'Hide your e-mail address but allow form e-mail.',
-'E-mail setting 3'			=>	'Hide your e-mail address and disallow form e-mail.',
+'Email setting info'		=>	'Select whether you want your email address to be viewable to other users or not and if you want other users to be able to send you email via the forum (form email) or not.',
+'Email setting 1'			=>	'Display your email address.',
+'Email setting 2'			=>	'Hide your email address but allow form email.',
+'Email setting 3'			=>	'Hide your email address and disallow form email.',
 'Privacy options legend'	=>	'Set your privacy options',
-'Save user/pass'			=>	'Save username and password between visits.',
-'Save user/pass info'		=>	'This option sets whether the forum should "remember" you between visits. If enabled, you will not have to login every time you visit the forum. You will be logged in automatically. Recommended.',
 'Confirm pass'				=>	'Confirm password',
 
 'Username too short'		=>	'Usernames must be at least 2 characters long. Please choose another (longer) username.',
+'Username too long'			=>	'Usernames must not be more than 25 characters long. Please choose another (shorter) username.',
 'Username guest'			=>	'The username guest is reserved. Please choose another username.',
 'Username IP'				=>	'Usernames may not be in the form of an IP address. Please choose another username.',
 'Username reserved chars'	=>	'Usernames may not contain all the characters \', " and [ or ] at once. Please choose another username.',
 'Username BBCode'			=>	'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
-'Dupe username'				=>	'Someone else has already registered with that username. Please choose another username.',
+'Banned username'			=>	'The username you entered is banned in this forum. Please choose another username.',
 'Pass too short'			=>	'Passwords must be at least 4 characters long. Please choose another (longer) password.',
-'Pass not match'			=>	'Passwords do not match. Please go back and correct.',
-'Banned e-mail'				=>	'The e-mail address you entered is banned in this forum. Please choose another e-mail address.',
-'Dupe e-mail'				=>	'Someone else is already registered with that e-mail address. Please choose another e-mail address.',
-'Sig too long'				=>	'Signatures cannot be longer than',
-'characters'				=>	'characters',
-'Sig too many lines'		=>	'Signatures cannot have more than',
-'lines'						=>	'lines',
-'Signature quote/code'		=>	'The quote and code BBCodes are not allowed in signatures. Please go back and correct.',
-'Bad ICQ'					=>	'You entered an invalid ICQ UIN. Please go back and correct.'
+'Pass not match'			=>	'Passwords do not match.',
+'Banned email'				=>	'The email address you entered is banned in this forum. Please choose another email address.',
+'Dupe email'				=>	'Someone else is already registered with that email address. Please choose another email address.',
+'Sig too long'				=>	'Signatures cannot be longer than %1$s characters. Please reduce your signature by %2$s characters.',
+'Sig too many lines'		=>	'Signatures cannot have more than %s lines.',
+'Bad ICQ'					=>	'You entered an invalid ICQ UIN. Please go back and correct.',
+
+'UTC-12:00'					=>	'(UTC-12:00) International Date Line West',
+'UTC-11:00'					=>	'(UTC-11:00) Niue, Samoa',
+'UTC-10:00'					=>	'(UTC-10:00) Hawaii-Aleutian, Cook Island',
+'UTC-09:30'					=>	'(UTC-09:30) Marquesas Islands',
+'UTC-09:00'					=>	'(UTC-09:00) Alaska, Gambier Island',
+'UTC-08:30'					=>	'(UTC-08:30) Pitcairn Islands',
+'UTC-08:00'					=>	'(UTC-08:00) Pacific',
+'UTC-07:00'					=>	'(UTC-07:00) Mountain',
+'UTC-06:00'					=>	'(UTC-06:00) Central',
+'UTC-05:00'					=>	'(UTC-05:00) Eastern',
+'UTC-04:00'					=>	'(UTC-04:00) Atlantic',
+'UTC-03:30'					=>	'(UTC-03:30) Newfoundland',
+'UTC-03:00'					=>	'(UTC-03:00) Amazon, Central Greenland',
+'UTC-02:00'					=>	'(UTC-02:00) Mid-Atlantic',
+'UTC-01:00'					=>	'(UTC-01:00) Azores, Cape Verde, Eastern Greenland',
+'UTC'						=>	'(UTC) Western European, Greenwich',
+'UTC+01:00'					=>	'(UTC+01:00) Central European, West African',
+'UTC+02:00'					=>	'(UTC+02:00) Eastern European, Central African',
+'UTC+03:00'					=>	'(UTC+03:00) Moscow, Eastern African',
+'UTC+03:30'					=>	'(UTC+03:30) Iran',
+'UTC+04:00'					=>	'(UTC+04:00) Gulf, Samara',
+'UTC+04:30'					=>	'(UTC+04:30) Afghanistan',
+'UTC+05:00'					=>	'(UTC+05:00) Pakistan, Yekaterinburg',
+'UTC+05:30'					=>	'(UTC+05:30) India, Sri Lanka',
+'UTC+05:45'					=>	'(UTC+05:45) Nepal',
+'UTC+06:00'					=>	'(UTC+06:00) Bangladesh, Bhutan, Novosibirsk',
+'UTC+06:30'					=>	'(UTC+06:30) Cocos Islands, Myanmar',
+'UTC+07:00'					=>	'(UTC+07:00) Indochina, Krasnoyarsk',
+'UTC+08:00'					=>	'(UTC+08:00) Greater China, Australian Western, Irkutsk',
+'UTC+08:45'					=>	'(UTC+08:45) Southeastern Western Australia',
+'UTC+09:00'					=>	'(UTC+09:00) Japan, Korea, Chita',
+'UTC+09:30'					=>	'(UTC+09:30) Australian Central',
+'UTC+10:00'					=>	'(UTC+10:00) Australian Eastern, Vladivostok',
+'UTC+10:30'					=>	'(UTC+10:30) Lord Howe',
+'UTC+11:00'					=>	'(UTC+11:00) Solomon Island, Magadan',
+'UTC+11:30'					=>	'(UTC+11:30) Norfolk Island',
+'UTC+12:00'					=>	'(UTC+12:00) New Zealand, Fiji, Kamchatka',
+'UTC+12:45'					=>	'(UTC+12:45) Chatham Islands',
+'UTC+13:00'					=>	'(UTC+13:00) Tonga, Phoenix Islands',
+'UTC+14:00'					=>	'(UTC+14:00) Line Islands'
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/profile.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/profile.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/profile.php	(revision 3)
@@ -5,140 +5,137 @@
 
 // Navigation and sections
-'Profile menu'				=>	'Profile menu',
-'Section essentials'		=>	'Essentials',
-'Section personal'			=>	'Personal',
-'Section messaging'			=>	'Messaging',
-'Section personality'		=>	'Personality',
-'Section display'			=>	'Display',
-'Section privacy'			=>	'Privacy',
-'Section admin'				=>	'Administration',
+'Profile menu'					=>	'Profile menu',
+'Section essentials'			=>	'Essentials',
+'Section personal'				=>	'Personal',
+'Section messaging'				=>	'Messaging',
+'Section personality'			=>	'Personality',
+'Section display'				=>	'Display',
+'Section privacy'				=>	'Privacy',
+'Section admin'					=>	'Administration',
 
 // Miscellaneous
-'Username and pass legend'	=>	'Enter your username and password',
-'Personal details legend'	=>	'Enter your personal details',
-'Contact details legend'	=>	'Enter your messaging details',
-'Options display'			=>	'Set your display options',
-'Options post'				=>	'Set your post viewing options',
-'User activity'				=>	'User activity',
-'Paginate info'				=>	'Enter the number of topics and posts you wish to view on each page.',
+'Username and pass legend'		=>	'Enter your username and password',
+'Personal details legend'		=>	'Enter your personal details',
+'Contact details legend'		=>	'Enter your messaging details',
+'User activity'					=>	'User activity',
+'Paginate info'					=>	'Enter the number of topics and posts you wish to view on each page.',
 
 // Password stuff
-'Pass key bad'				=>	'The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at',
-'Pass updated'				=>	'Your password has been updated. You can now login with your new password.',
-'Pass updated redirect'		=>	'Password updated. Redirection ...',
-'Wrong pass'				=>	'Wrong old password.',
-'Change pass'				=>	'Change password',
-'Change pass legend'		=>	'Enter and confirm your new password',
-'Old pass'					=>	'Old password',
-'New pass'					=>	'New password',
-'Confirm new pass'			=>	'Confirm new password',
+'Pass key bad'					=>	'The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at',
+'Pass updated'					=>	'Your password has been updated. You can now login with your new password.',
+'Pass updated redirect'			=>	'Password updated. Redirecting âŠ',
+'Wrong pass'					=>	'Wrong old password.',
+'Change pass'					=>	'Change password',
+'Change pass legend'			=>	'Enter and confirm your new password',
+'Old pass'						=>	'Old password',
+'New pass'						=>	'New password',
+'Confirm new pass'				=>	'Confirm new password',
+'Pass info'						=>	'Passwords must be at least 4 characters long. Passwords are case sensitive.',
 
-// E-mail stuff
-'E-mail key bad'			=>	'The specified e-mail activation key was incorrect or has expired. Please re-request change of e-mail address. If that fails, contact the forum administrator at',
-'E-mail updated'			=>	'Your e-mail address has been updated.',
-'Activate e-mail sent'		=>	'An email has been sent to the specified address with instructions on how to activate the new e-mail address. If it doesn\'t arrive you can contact the forum administrator at',
-'E-mail legend'				=>	'Enter your new e-mail address',
-'E-mail instructions'		=>	'An e-mail will be sent to your new address with an activation link. You must click the link in the e-mail you receive to activate the new address.',
-'Change e-mail'				=>	'Change e-mail address',
-'New e-mail'				=>	'New e-mail',
+// Email stuff
+'Email key bad'					=>	'The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at',
+'Email updated'					=>	'Your email address has been updated.',
+'Activate email sent'			=>	'An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn\'t arrive you can contact the forum administrator at',
+'Email legend'					=>	'Enter your new email address',
+'Email instructions'			=>	'An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address.',
+'Change email'					=>	'Change email address',
+'New email'						=>	'New email',
 
 // Avatar upload stuff
-'Avatars disabled'			=>	'The administrator has disabled avatar support.',
-'Too large ini'				=>	'The selected file was too large to upload. The server didn\'t allow the upload.',
-'Partial upload'			=>	'The selected file was only partially uploaded. Please try again.',
-'No tmp directory'			=>	'PHP was unable to save the uploaded file to a temporary location.',
-'No file'					=>	'You did not select a file for upload.',
-'Bad type'					=>	'The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png.',
-'Too wide or high'			=>	'The file you tried to upload is wider and/or higher than the maximum allowed',
-'Too large'					=>	'The file you tried to upload is larger than the maximum allowed',
-'pixels'					=>	'pixels',
-'bytes'						=>	'bytes',
-'Move failed'				=>	'The server was unable to save the uploaded file. Please contact the forum administrator at',
-'Unknown failure'			=>	'An unknown error occurred. Please try again.',
-'Avatar upload redirect'	=>	'Avatar uploaded. Redirection ...',
-'Avatar deleted redirect'	=>	'Avatar deleted. Redirection ...',
-'Avatar desc'				=>	'An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than',
-'Upload avatar'				=>	'Upload avatar',
-'Upload avatar legend'		=>	'Enter an avatar file to upload',
-'Delete avatar'				=>	'Delete avatar',	// only for admins
-'File'						=>	'File',
-'Upload'					=>	'Upload',	// submit button
+'Avatars disabled'				=>	'The administrator has disabled avatar support.',
+'Too large ini'					=>	'The selected file was too large to upload. The server didn\'t allow the upload.',
+'Partial upload'				=>	'The selected file was only partially uploaded. Please try again.',
+'No tmp directory'				=>	'PHP was unable to save the uploaded file to a temporary location.',
+'No file'						=>	'You did not select a file for upload.',
+'Bad type'						=>	'The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png.',
+'Too wide or high'				=>	'The file you tried to upload is wider and/or higher than the maximum allowed',
+'Too large'						=>	'The file you tried to upload is larger than the maximum allowed',
+'pixels'						=>	'pixels',
+'bytes'							=>	'bytes',
+'Move failed'					=>	'The server was unable to save the uploaded file. Please contact the forum administrator at',
+'Unknown failure'				=>	'An unknown error occurred. Please try again.',
+'Avatar upload redirect'		=>	'Avatar uploaded. Redirecting âŠ',
+'Avatar deleted redirect'		=>	'Avatar deleted. Redirecting âŠ',
+'Avatar desc'					=>	'An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than',
+'Upload avatar'					=>	'Upload avatar',
+'Upload avatar legend'			=>	'Enter an avatar file to upload',
+'Delete avatar'					=>	'Delete avatar', // only for admins
+'File'							=>	'File',
+'Upload'						=>	'Upload', // submit button
 
 // Form validation stuff
-'Dupe username'				=>	'Someone else has already registered with that username. Please go back and try a different username.',
-'Forbidden title'			=>	'The title you entered contains a forbidden word. You must choose a different title.',
-'Profile redirect'			=>	'Profile updated. Redirection ...',
+'Forbidden title'				=>	'The title you entered contains a forbidden word. You must choose a different title.',
+'Profile redirect'				=>	'Profile updated. Redirecting âŠ',
 
 // Profile display stuff
-'Not activated'				=>	'This user hasn\'t activated his/her account yet. The account is activated when he/she logs in the first time.',
-'Unknown'					=>	'(Unknown)',	// This is displayed when a user hasn't filled out profile field (e.g. Location)
-'Private'					=>	'(Private)',	// This is displayed when a user does not want to receive e-mails
-'No avatar'					=>	'(No avatar)',
-'Show posts'				=>	'Show all posts',
-'Realname'					=>	'Real name',
-'Location'					=>	'Location',
-'Website'					=>	'Website',
-'Jabber'					=>	'Jabber',
-'ICQ'						=>	'ICQ',
-'MSN'						=>	'MSN Messenger',
-'AOL IM'					=>	'AOL IM',
-'Yahoo'						=>	'Yahoo! Messenger',
-'Avatar'					=>	'Avatar',
-'Signature'					=>	'Signature',
-'Sig max length'			=>	'Max length',
-'Sig max lines'				=>	'Max lines',
-'Avatar legend'				=>	'Set your avatar display options',
-'Avatar info'				=>	'An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below. The checkbox \'Use avatar\' below must be checked in order for the avatar to be visible in your posts.',
-'Change avatar'				=>	'Change avatar',
-'Use avatar'				=>	'Use avatar.',
-'Signature legend'			=>	'Compose your signature',
-'Signature info'			=>	'A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It\'s up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature.',
-'Sig preview'				=>	'Current signature preview:',
-'No sig'					=>	'No signature currently stored in profile.',
-'Topics per page'			=>	'Topics',
-'Topics per page info'		=>	'This setting controls how many topics are displayed per page when you view a forum. If you are uncertain about what to use, you can just leave it blank and the forum default will be used.',
-'Posts per page'			=>	'Posts',
-'Posts per page info'		=>	'This setting controls how many posts are displayed per page when you view a topic. If you are uncertain about what to use, you can just leave it blank and the forum default will be used.',
-'Leave blank'				=>	'Leave blank to use forum default.',
-'Notify full'				=>	'Include post in subscription e-mails.',
-'Notify full info'			=>	'With this enabled, a plain text version of the new post will be included in subscription notification e-mails.',
-'Show smilies'				=>	'Show smilies as graphic icons',
-'Show smilies info'			=>	'If you enable this option, small images will be displayed instead of text smilies.',
-'Show images'				=>	'Show images in posts.',
-'Show images info'			=>	'Disable this if you don\'t want to see images in posts (i.e. images displayed with the [img]-tag).',
-'Show images sigs'			=>	'Show images in user signatures.',
-'Show images sigs info'		=>	'Disable this if you don\'t want to see images in signatures (i.e. images displayed with the [img]-tag).',
-'Show avatars'				=>	'Show user avatars in posts.',
-'Show avatars info'			=>	'This option toggles whether user avatar images will be displayed in posts or not.',
-'Show sigs'					=>	'Show user signatures.',
-'Show sigs info'			=>	'Enable if you would like to see user signatures.',
-'Style legend'				=>	'Select your preferred style',
-'Style info'				=>	'If you like you can use a different visual style for this forum.',
-'Admin note'				=>	'Admin note',
-'Pagination legend'			=>	'Enter your pagination options',
-'Post display legend'		=>	'Set your options for viewing posts',
-'Post display info'			=>	'If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster.',
-'Instructions'				=>	'When you update your profile, you will be redirected back to this page.',
+'Users profile'					=>	'%s\'s profile',
+'Username info'					=>	'Username: %s',
+'Email info'					=>	'Email: %s',
+'Posts info'					=>	'Posts: %s',
+'Registered info'				=>	'Registered: %s',
+'Last post info'				=>	'Last post: %s',
+'Last visit info'				=>	'Last visit: %s',
+'Show posts'					=>	'Show all posts',
+'Show topics'					=>	'Show all topics',
+'Show subscriptions'			=>	'Show all subscriptions',
+'Realname'						=>	'Real name',
+'Location'						=>	'Location',
+'Website'						=>	'Website',
+'Invalid website URL'					=>	'The website URL you entered is invalid.',
+'Jabber'						=>	'Jabber',
+'ICQ'							=>	'ICQ',
+'MSN'							=>	'MSN Messenger',
+'AOL IM'						=>	'AOL IM',
+'Yahoo'							=>	'Yahoo! Messenger',
+'Avatar'						=>	'Avatar',
+'Signature'						=>	'Signature',
+'Sig max size'					=>	'Max length: %s characters / Max lines: %s',
+'Avatar legend'					=>	'Set your avatar display options',
+'Avatar info'					=>	'An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below.',
+'Change avatar'					=>	'Change avatar',
+'Signature legend'				=>	'Compose your signature',
+'Signature info'				=>	'A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It\'s up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature.',
+'Sig preview'					=>	'Current signature preview:',
+'No sig'						=>	'No signature currently stored in profile.',
+'Signature quote/code/list/h'	=>	'The quote, code, list, and heading BBCodes are not allowed in signatures.',
+'Topics per page'				=>	'Topics',
+'Posts per page'				=>	'Posts',
+'Leave blank'					=>	'Leave blank to use forum default.',
+'Subscription legend'			=>	'Set your subscription options',
+'Notify full'					=>	'Include a plain text version of new posts in subscription notification emails.',
+'Auto notify full'				=>	'Automatically subscribe to every topic you post in.',
+'Show smilies'					=>	'Show smilies as graphic icons.',
+'Show images'					=>	'Show images in posts.',
+'Show images sigs'				=>	'Show images in user signatures.',
+'Show avatars'					=>	'Show user avatars in posts.',
+'Show sigs'						=>	'Show user signatures.',
+'Style legend'					=>	'Select your preferred style',
+'Styles'						=>	'Styles',
+'Admin note'					=>	'Admin note',
+'Pagination legend'				=>	'Enter your pagination options',
+'Post display legend'			=>	'Set your options for viewing posts',
+'Post display info'				=>	'If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster.',
+'Instructions'					=>	'When you update your profile, you will be redirected back to this page.',
 
 // Administration stuff
-'Group membership legend'	=>	'Choose user group',
-'Save'						=>	'Save',
-'Set mods legend'			=>	'Set moderator access',
-'Moderator in'				=>	'Moderator in',
-'Moderator in info'			=>	'Choose what forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums.',
-'Update forums'				=>	'Update forums',
-'Delete ban legend'			=>	'Delete (administrators only) or ban user',
-'Delete user'				=>	'Delete user',
-'Ban user'					=>	'Ban user',
-'Confirm delete legend'		=>	'Important: read before deleting user',
-'Confirm delete user'		=>	'Confirm delete user',
-'Confirmation info'			=>	'Please confirm that you want to delete the user',	// the username will be appended to this string
-'Delete warning'			=>	'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time.',
-'Delete posts'				=>	'Delete any posts and topics this user has made.',
-'Delete'					=>	'Delete',		// submit button (confirm user delete)
-'User delete redirect'		=>	'User deleted. Redirection ...',
-'Group membership redirect'	=>	'Group membership saved. Redirection ...',
-'Update forums redirect'	=>	'Forum moderator rights updated. Redirection ...',
-'Ban redirect'				=>	'Redirection ...'
+'Group membership legend'		=>	'Choose user group',
+'Save'							=>	'Save',
+'Set mods legend'				=>	'Set moderator access',
+'Moderator in info'				=>	'Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums.',
+'Update forums'					=>	'Update forums',
+'Delete ban legend'				=>	'Delete (administrators only) or ban user',
+'Delete user'					=>	'Delete user',
+'Ban user'						=>	'Ban user',
+'Confirm delete legend'			=>	'Important: read before deleting user',
+'Confirm delete user'			=>	'Confirm delete user',
+'Confirmation info'				=>	'Please confirm that you want to delete the user', // the username will be appended to this string
+'Delete warning'				=>	'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time.',
+'Delete posts'					=>	'Delete any posts and topics this user has made.',
+'Delete'						=>	'Delete', // submit button (confirm user delete)
+'User delete redirect'			=>	'User deleted. Redirecting âŠ',
+'Group membership redirect'		=>	'Group membership saved. Redirecting âŠ',
+'Update forums redirect'		=>	'Forum moderator rights updated. Redirecting âŠ',
+'Ban redirect'					=>	'Redirecting âŠ',
+'No delete admin message'		=>	'Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group.',
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/register.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/register.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/register.php	(revision 3)
@@ -6,7 +6,8 @@
 // Miscellaneous
 'No new regs'				=>	'This forum is not accepting new registrations.',
-'Reg cancel redirect'		=>	'Registration cancelled. Redirection ...',
+'Reg cancel redirect'		=>	'Registration cancelled. Redirecting âŠ',
 'Forum rules'				=>	'Forum rules',
 'Rules legend'				=>	'You must agree to the following in order to register',
+'Registration flood'		=>	'A new user was registered with the same IP address as you within the last hour. To prevent registration flooding, at least an hour has to pass between registrations from the same IP. Sorry for the inconvenience.',
 'Agree'						=>	'Agree',
 'Cancel'					=>	'Cancel',
@@ -14,12 +15,14 @@
 
 // Form validation stuff (some of these are also used in post.php)
+'Registration errors'		=>	'Registration errors',
+'Registration errors info'	=>	'The following errors need to be corrected before you can register:',
 'Username censor'			=>	'The username you entered contains one or more censored words. Please choose a different username.',
 'Username dupe 1'			=>	'Someone is already registered with the username',
 'Username dupe 2'			=>	'The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
-'E-mail not match'			=>	'E-mail addresses do not match. Please go back and correct.',
+'Email not match'			=>	'Email addresses do not match.',
 
-// Registration e-mail stuff
-'Reg e-mail'				=>	'Thank you for registering. Your password has been sent to the specified address. If it doesn\'t arrive you can contact the forum administrator at',
-'Reg complete'				=>	'Registration complete. Logging in and Redirection ...',
+// Registration email stuff
+'Reg email'					=>	'Thank you for registering. Your password has been sent to the specified address. If it doesn\'t arrive you can contact the forum administrator at',
+'Reg complete'				=>	'Registration complete. Logging in and redirecting âŠ',
 
 // Register info
@@ -27,9 +30,8 @@
 'Desc 2'					=>	'Below is a form you must fill out in order to register. Once you are registered you should visit your profile and review the different settings you can change. The fields below only make up a small part of all the settings you can alter in your profile.',
 'Username legend'			=>	'Please enter a username between 2 and 25 characters long',
-'Pass legend 1'				=>	'Please enter and confirm your chosen password',
-'Pass legend 2'				=>	'Please read the instructions below',
-'Pass info'					=>	'Passwords can be between 4 and 16 characters long. Passwords are case sensitive.',
-'E-mail info'				=>	'You must enter a valid e-mail address as your randomly generated password will be sent to that address.',
-'Confirm e-mail'			=>	'Confirm e-mail address',
+'Pass legend'				=>	'Please enter and confirm your chosen password',
+'Pass info'					=>	'Passwords must be at least 4 characters long. Passwords are case sensitive.',
+'Email info'				=>	'You must enter a valid email address as your randomly generated password will be sent to that address.',
+'Confirm email'				=>	'Confirm email address',
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/search.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/search.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/search.php	(revision 3)
@@ -5,43 +5,61 @@
 
 // The search form
-'User search'				=>	'User search',
-'No search permission'		=>	'You do not have permission to use the search feature.',
-'Search'					=>	'Search',
-'Search criteria legend'	=>	'Enter your search criteria',
-'Search info'				=>	'To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches.',
-'Keyword search'			=>	'Keyword search',
-'Author search'				=>	'Author search',
-'Search in legend'			=>	'Select where to search',
-'Search in info'			=>	'Choose in which forum you would like to search and if you want to search in topic subjects, message text or both.',
-'Forum search'				=>	'Forum',
-'All forums'				=>	'All forums',
-'Search in'					=>	'Search in',
-'Message and subject'		=>	'Message text and topic subject',
-'Message only'				=>	'Message text only',
-'Topic only'				=>	'Topic subject only',
-'Sort by'					=>	'Sort by',
-'Sort order'				=>	'Sort order',
-'Search results legend'		=>	'Select how to view search results',
-'Search results info'		=>	'You can choose how you wish to sort and show your results.',
-'Sort by post time'			=>	'Post time',
-'Sort by author'			=>	'Author',
-'Sort by subject'			=>	'Subject',
-'Sort by forum'				=>	'Forum',
-'Ascending'					=>	'Ascending',
-'Descending'				=>	'Descending',
-'Show as'					=>	'Show results as',
-'Show as topics'			=>	'Topics',
-'Show as posts'				=>	'Posts',
+'User search'						=>	'User search',
+'No search permission'				=>	'You do not have permission to use the search feature.',
+'Search flood'						=>	'At least %s seconds have to pass between searches. Please wait a while and try searching again.',
+'Search'							=>	'Search',
+'Search criteria legend'			=>	'Enter your search criteria',
+'Search info'						=>	'To search by keyword, enter a term or terms to search for. Separate terms with spaces. Use AND, OR and NOT to refine your search. To search by author enter the username of the author whose posts you wish to search for. Use wildcard character * for partial matches.',
+'Keyword search'					=>	'Keyword search',
+'Author search'						=>	'Author search',
+'Search in legend'					=>	'Select where to search',
+'Search in info'					=>	'Choose in which forum you would like to search and if you want to search in topic subjects, message text or both.',
+'Search multiple forums info'		=>	'If no forums are selected, all forums will be searched.',
+'Forum search'						=>	'Forum',
+'All forums'						=>	'All forums',
+'Search in'							=>	'Search in',
+'Message and subject'				=>	'Message text and topic subject',
+'Message only'						=>	'Message text only',
+'Topic only'						=>	'Topic subject only',
+'Sort by'							=>	'Sort by',
+'Sort order'						=>	'Sort order',
+'Search results legend'				=>	'Select how to view search results',
+'Search results info'				=>	'You can choose how you wish to sort and show your results.',
+'Sort by post time'					=>	'Post time',
+'Sort by author'					=>	'Author',
+'Sort by subject'					=>	'Subject',
+'Sort by forum'						=>	'Forum',
+'Ascending'							=>	'Ascending',
+'Descending'						=>	'Descending',
+'Show as'							=>	'Show results as',
+'Show as topics'					=>	'Topics',
+'Show as posts'						=>	'Posts',
 
 // Results
-'Search results'			=>	'Search results',
-'No terms'					=>	'You have to enter at least one keyword and/or an author to search for.',
-'No hits'					=>	'Your search returned no hits.',
-'No user posts'				=>	'There are no posts by this user in this forum.',
-'No subscriptions'			=>	'You are currently not subscribed to any topics.',
-'No new posts'				=>	'There are no topics with new posts since your last visit.',
-'No recent posts'			=>	'No new posts have been made within the last 24 hours.',
-'No unanswered'				=>	'There are no unanswered posts in this forum.',
-'Go to post'				=>	'Go to post'
+'Search'							=>	'Search',
+'Search results'					=>	'Search results',
+'Quick search show_new'				=>	'New',
+'Quick search show_recent'			=>	'Active',
+'Quick search show_unanswered'		=>	'Unanswered',
+'Quick search show_replies'			=>	'Posted',
+'Quick search show_user_topics'		=>	'Topics by %s',
+'Quick search show_user_posts'		=>	'Posts by %s',
+'Quick search show_subscriptions'	=>	'Subscribed by %s',
+'By keywords show as topics'		=>	'Topics with posts containing \'%s\'',
+'By keywords show as posts'			=>	'Posts containing \'%s\'',
+'By user show as topics'			=>	'Topics with posts by %s',
+'By user show as posts'				=>	'Posts by %s',
+'By both show as topics'			=>	'Topics with posts containing \'%s\', by %s',
+'By both show as posts'				=>	'Posts containing \'%s\', by %s',
+'No terms'							=>	'You have to enter at least one keyword and/or an author to search for.',
+'No hits'							=>	'Your search returned no hits.',
+'No user posts'						=>	'There are no posts by this user in this forum.',
+'No user topics'					=>	'There are no topics by this user in this forum.',
+'No subscriptions'					=>	'This user is currently not subscribed to any topics.',
+'No new posts'						=>	'There are no topics with new posts since your last visit.',
+'No recent posts'					=>	'No new posts have been made within the last 24 hours.',
+'No unanswered'						=>	'There are no unanswered posts in this forum.',
+'Go to post'						=>	'Go to post',
+'Go to topic'						=>	'Go to topic'
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/stopwords.txt
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/stopwords.txt	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/stopwords.txt	(revision 3)
@@ -11,4 +11,5 @@
 are
 arent
+aren't
 around
 ask
@@ -21,12 +22,17 @@
 can
 cant
+can't
 come
 could
 couldnt
+couldn't
 did
 didnt
+didn't
 does
 doesnt
+doesn't
 dont
+don't
 each
 either
@@ -47,4 +53,5 @@
 have
 havent
+haven't
 having
 her
@@ -55,8 +62,15 @@
 how
 ill
+i'll
+i'm
 into
 isnt
+isn't
+itll
+it'll
 its
+it's
 ive
+i've
 just
 know
@@ -83,4 +97,5 @@
 our
 ours
+our's
 out
 over
@@ -103,4 +118,5 @@
 that
 thats
+that's
 the
 their
@@ -148,3 +164,12 @@
 you
 your
+youre
+you're
 yours
+http
+https
+ftp
+www
+com
+net
+org
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/topic.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/topic.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/topic.php	(revision 3)
@@ -6,6 +6,10 @@
 'Post reply'		=>	'Post reply',
 'Topic closed'		=>	'Topic closed',
-'From'				=>	'From',				// User location
-'Note'				=>	'Note',				// Admin note
+'From'				=>	'From:', // User location
+'IP address logged'	=>	'IP address logged',
+'Note'				=>	'Note:', // Admin note
+'Posts'				=>	'Posts:',
+'Registered'		=>	'Registered:',
+'Replies'			=>	'Replies:',
 'Website'			=>	'Website',
 'Guest'				=>	'Guest',
@@ -21,7 +25,8 @@
 'Subscribe'			=>	'Subscribe to this topic',
 'Quick post'		=>	'Quick post',
-
-'Link separator'	=>	' | ',	// The text that separates links in posts (website, e-mail, report, edit etc.)
-'Mod controls'		=>	'Moderator controls'
+'Mod controls'		=>	'Moderator controls',
+'New icon'			=>	'New post',
+'Re'				=>	'Re:',
+'Preview'			=>	'Preview'
 
 );
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/update.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/update.php	(revision 3)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/update.php	(revision 3)
@@ -0,0 +1,76 @@
+<?php
+
+// Language definitions used in db_update.php
+
+$lang_update = array(
+
+'Update'						=>	'Update FluxBB',
+'Update message'				=>	'Your FluxBB database is out-of-date and must be upgraded in order to continue. If you are the board administrator, please follow the instructions below to complete the upgrade.',
+'Note'							=>	'Note:',
+'Members message'				=>	'This process is for board administators only. If you are a member there is nothing to worry about - the forums will be back shortly!',
+'Administrator only'			=>	'This step is for the board administrator only!',
+'Database password info'		=>	'To perform the database update please enter the database password with which FluxBB was installed. If you cannot remember, this is stored in your \'config.php\' file.',
+'Database password note'		=>	'If you are running SQLite (and hence have no database password) please use the database file name instead. This must exactly match the database file name given in your configuration file.',
+'Database password'				=>	'Database password',
+'Maintenance'					=>	'Maintenance',
+'Maintenance message info'		=>	'The message that will be displayed to users during the updating process. This text will not be parsed like regular posts and thus may contain HTML.',
+'Maintenance message'		    =>	'Maintenance message',
+'Next'							=>	'Next',
+
+'You are running error'			=>	'You are running %1$s version %2$s. FluxBB %3$s requires at least %1$s %4$s to run properly. You must upgrade your %1$s installation before you can continue.',
+'Version mismatch error'		=>	'Version mismatch. The database \'%s\' doesn\'t seem to be running a FluxBB database schema supported by this update script.',
+'Invalid file error'			=>	'Invalid database file name. When using SQLite the database file name must be entered exactly as it appears in your \'%s\'',
+'Invalid password error'		=>	'Invalid database password. To upgrade FluxBB you must enter your database password exactly as it appears in your \'%s\'',
+'No password error'				=>	'No database password provided',
+'Script runs error'				=>	'It appears the update script is already being ran by someone else. If this is not the case, please manually delete the file \'%s\' and try again',
+'No update error'				=>	'Your forum is already as up-to-date as this script can make it',
+
+'Intro 1'						=>	'This script will update your forum database. The update procedure might take anything from a second to hours depending on the speed of the server and the size of the forum database. Don\'t forget to make a backup of the database before continuing.',
+'Intro 2'						=>	'Did you read the update instructions in the documentation? If not, start there.',
+'No charset conversion'			=>	'<strong>IMPORTANT!</strong> FluxBB has detected that this PHP environment does not have support for the encoding mechanisms required to do UTF-8 conversion from character sets other than ISO-8859-1. What this means is that if the current character set is not ISO-8859-1, FluxBB won\'t be able to convert your forum database to UTF-8 and you will have to do it manually. Instructions for doing manual charset conversion can be found in the update instructions.',
+'Enable conversion'				=>	'<strong>Enable conversion:</strong> When enabled this update script will, after it has made the required structural changes to the database, convert all text in the database from the current character set to UTF-8. This conversion is required if you\'re upgrading from version 1.2.',
+'Current character set'			=>	'<strong>Current character set:</strong> If the primary language in your forum is English, you can leave this at the default value. However, if your forum is non-English, you should enter the character set of the primary language pack used in the forum. <em>Getting this wrong can corrupt your database so don\'t just guess!</em> Note: This is required even if the old database is UTF-8.',
+'Charset conversion'			=>	'Charset conversion',
+'Enable conversion label'		=>	'<strong>Enable conversion</strong> (perform database charset conversion).',
+'Current character set label'	=>	'Current character set',
+'Current character set info'	=>	'Accept default for English forums otherwise the character set of the primary language pack.',
+'Start update'					=>	'Start update',
+'Error converting users'		=>	'Error converting users',
+'Error info 1'					=>	'There was an error converting some users. This can occur when converting from FluxBB v1.2 if multiple users have registered with very similar usernames, for example "bob" and "bÃ¶b".',
+'Error info 2'					=>	'Below is a list of users who failed to convert. Please choose a new username for each user. Users who are renamed will automatically be sent an email alerting them of the change.',
+'New username'					=>	'New username',
+'Required'						=>	'(Required)',
+'Correct errors'				=>	'The following errors need to be corrected:',
+'Rename users'					=>	'Rename users',
+'Successfully updated'			=>	'Your forum database was successfully updated. You may now %s.',
+'go to index'					=>	'go to the forum index',
+
+'Unable to lock error'			=>	'Unable to write update lock. Please make sure PHP has write access to the directory \'%s\' and no-one else is currently running the update script.',
+
+'Converting'					=>	'Converting %s âŠ',
+'Converting item'				=>	'Converting %1$s %2$s âŠ',
+'Preparsing item'				=>	'Preparsing %1$s %2$s âŠ',
+'Rebuilding index item'			=>	'Rebuilding index for %1$s %2$s',
+
+'ban'							=>	'ban',
+'categories'					=>	'categories',
+'censor words'					=>	'censor words',
+'configuration'					=>	'configuration',
+'forums'						=>	'forums',
+'groups'						=>	'groups',
+'post'							=>	'post',
+'ranks'							=>	'ranks',
+'report'						=>	'report',
+'topic'							=>	'topic',
+'user'							=>	'user',
+'signature'						=>	'signature',
+
+'Username too short error'		=>	'Usernames must be at least 2 characters long. Please choose another (longer) username.',
+'Username too long error'		=>	'Usernames must not be more than 25 characters long. Please choose another (shorter) username.',
+'Username Guest reserved error'	=>	'The username guest is reserved. Please choose another username.',
+'Username IP format error'		=>	'Usernames may not be in the form of an IP address. Please choose another username.',
+'Username bad characters error'	=>	'Usernames may not contain all the characters \', " and [ or ] at once. Please choose another username.',
+'Username BBCode error'			=>	'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
+'Username duplicate error'		=>	'Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
+
+);
Index: branches/rsr.v5.1.dev/web/punbb/lang/English/userlist.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/userlist.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/userlist.php	(revision 3)
@@ -4,9 +4,10 @@
 $lang_ul = array(
 
-'User find legend'		=>	'Find and sort users',
-'User search info'		=>	'Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches. Sort users by name, date registered or number of posts and in ascending/descending order.',
-'User group'			=>	'User group',
-'No of posts'			=>	'No. of posts',
-'All users'				=>	'All'
+'User find legend'	=>	'Find and sort users',
+'User search info'	=>	'Enter a username to search for and/or a user group to filter by. The username field can be left blank. Use the wildcard character * for partial matches.',
+'User sort info'	=>	'Sort users by name, date registered or number of posts and in ascending/descending order.',
+'User group'		=>	'User group',
+'No of posts'		=>	'Number of posts',
+'All users'			=>	'All'
 
 );
