Index: branches/rsr.v5.1.1/web/punbb/lang/English/admin_bans.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_bans.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_bans.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_categories.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_categories.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_categories.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_censoring.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_censoring.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_censoring.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_common.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_common.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_common.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_forums.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_forums.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_forums.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_groups.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_groups.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_groups.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_index.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_index.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_index.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_maintenance.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_maintenance.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_maintenance.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_options.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_options.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_options.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_permissions.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_permissions.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_permissions.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_ranks.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_ranks.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_ranks.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_reports.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_reports.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_reports.php	(revision 4)
@@ -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.1/web/punbb/lang/English/admin_users.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/admin_users.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/admin_users.php	(revision 4)
@@ -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.1/web/punbb/lang/English/common.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/common.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/common.php	(revision 4)
@@ -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.1/web/punbb/lang/English/delete.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/delete.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/delete.php	(revision 4)
@@ -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.1/web/punbb/lang/English/forum.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/forum.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/forum.php	(revision 4)
@@ -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.1/web/punbb/lang/English/help.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/help.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/help.php	(revision 4)
@@ -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.1/web/punbb/lang/English/index.html
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/index.html	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/index.html	(revision 4)
@@ -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.1/web/punbb/lang/English/index.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/index.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/index.php	(revision 4)
@@ -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.1/web/punbb/lang/English/install.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/install.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/install.php	(revision 4)
@@ -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.1/web/punbb/lang/English/login.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/login.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/login.php	(revision 4)
@@ -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.1/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.1/web/punbb/lang/English/mail_templates/activate_email.tpl	(revision 4)
@@ -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.1/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.1/web/punbb/lang/English/mail_templates/activate_password.tpl	(revision 4)
@@ -10,5 +10,5 @@
 <activation_url>
 
--- 
-<board_mailer>
+--
+<board_mailer> Mailer
 (Do not reply to this message)
Index: branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/banned_email_change.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/banned_email_change.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/banned_email_change.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/banned_email_post.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/banned_email_post.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/banned_email_post.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/banned_email_register.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/banned_email_register.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/banned_email_register.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/dupe_email_change.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/dupe_email_change.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/dupe_email_change.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/dupe_email_register.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/dupe_email_register.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/dupe_email_register.tpl	(revision 4)
@@ -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.1/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.1/web/punbb/lang/English/mail_templates/form_email.tpl	(revision 4)
@@ -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.1/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.1/web/punbb/lang/English/mail_templates/index.html	(revision 4)
@@ -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.1/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.1/web/punbb/lang/English/mail_templates/new_reply.tpl	(revision 4)
@@ -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.1/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.1/web/punbb/lang/English/mail_templates/new_reply_full.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/new_report.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/new_report.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/new_report.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/new_topic.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/new_topic.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/new_topic.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/new_topic_full.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/new_topic_full.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/new_topic_full.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/new_user.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/new_user.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/new_user.tpl	(revision 4)
@@ -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.1/web/punbb/lang/English/mail_templates/rename.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/rename.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/mail_templates/rename.tpl	(revision 4)
@@ -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.1/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.1/web/punbb/lang/English/mail_templates/welcome.tpl	(revision 4)
@@ -9,4 +9,4 @@
 
 --
-<board_mailer>
+<board_mailer> Mailer
 (Do not reply to this message)
Index: branches/rsr.v5.1.1/web/punbb/lang/English/misc.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/misc.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/misc.php	(revision 4)
@@ -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.1/web/punbb/lang/English/post.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/post.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/post.php	(revision 4)
@@ -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.1/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.1/web/punbb/lang/English/prof_reg.php	(revision 4)
@@ -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.1/web/punbb/lang/English/profile.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/profile.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/profile.php	(revision 4)
@@ -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.1/web/punbb/lang/English/register.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/register.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/register.php	(revision 4)
@@ -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.1/web/punbb/lang/English/search.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/search.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/search.php	(revision 4)
@@ -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.1/web/punbb/lang/English/stopwords.txt
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/stopwords.txt	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/stopwords.txt	(revision 4)
@@ -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.1/web/punbb/lang/English/topic.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/topic.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/topic.php	(revision 4)
@@ -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.1/web/punbb/lang/English/update.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/English/update.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/update.php	(revision 4)
@@ -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.1/web/punbb/lang/English/userlist.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/userlist.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/English/userlist.php	(revision 4)
@@ -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'
 
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_bans.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_bans.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_bans.php	(revision 4)
@@ -0,0 +1,67 @@
+<?php
+
+// Language definitions used in admin_bans.php
+$lang_admin_bans = array(
+
+'No user message'			=>	'Aucun utilisateur enregistrÃ© sous ce nom d\'utilisateur. Si vous souhaitez ajouter un bannissement n\'Ã©tant pas associÃ© Ã  un nom d\'utilisateur veuillez laisser le champ du nom d\'utilisateur vide.',
+'No user ID message'			=>	'Aucun utilisateur inscrit avec cet ID.',
+'User is admin message'			=>	'L\'utilisateur %s est un administrateur et ne peut Ãªtre banni. Si vous souhaitez bannir un administrateur, vous devez d\'abord le destituer de ce rang.',
+'User is mod message'                   =>      'L\'utilisateur %s est un modÃ©rateur et ne peut Ãªtre banni. Si vous souhaitez bannir un modÃ©rateur, vous devez d\'abord le destituer de ce rang.',
+'Must enter message'			=>	'Vous devez indiquer, au minimum, soit un nom d\'utilisateur, soit une adresse IP, soit une adresse Ã©lectronique.',
+'Cannot ban guest message'		=>	'Un visiteur ne peut Ãªtre banni.',
+'Invalid IP message'			=>	'Vous avez indiquÃ© une IP/plage d\'IP invalide.',
+'Invalid e-mail message'		=>	'L\'adresse Ã©lectronique (ex. : utilisateur@domaine.com) ou le nom de domaine d\'adresse Ã©lectronique (ex. : domaine.com) que vous avez indiquÃ© est invalide.',
+'Invalid date message'			=>	'Vous avez indiquÃ© une date d\'expiration invalide.',
+'Invalid date reasons'			=>	'Le format devrait Ãªtre du type YYYY-MM-DD et la date doit Ãªtre ultÃ©rieure Ã  la date d\'aujourd\'hui.',
+'Ban added redirect'			=>	'Bannissement ajoutÃ©. Redirection&#160;âŠ' ,
+'Ban edited redirect'			=>	'Bannissement modifiÃ©. Redirection&#160;âŠ',
+'Ban removed redirect'			=>	'Bannissement supprimÃ©. Redirection&#160;âŠ',
+
+'New ban head'				=>	'Nouveau bannissement',
+'Add ban subhead'			=>	'Ajouter le bannissement',
+'Username label'			=>	'Nom d\'utilisateur',
+'Username help'				=>	'Le nom d\'utilisateur Ã  bannir (insensible Ã  la casse).',
+'Username advanced help'		=>	'Le nom d\'utilisateur Ã  bannir (insensible Ã  la casse). La page suivante vous permettra d\'indiquer une IP et un e-mail personnalisÃ©s. Si vous ne souhaitez bannir qu\'une IP/plage d\'IP ou un e-mail, veuillez laisser ce champ vide.',
+
+'Ban search head'			=>	'Recherche de bannissements',
+'Ban search subhead'			=>	'Indiquer les critÃšres de recherche',
+'Ban search info'			=>	'Recherche de bannissements dans la base de donnÃ©es. Vous pouvez indiquer un ou plusieurs termes Ã  retrouver. Les jokers sous formes d\'astÃ©risques (*) sont acceptÃ©s. Pour afficher tous les bannissements, laisser tous les champs vides.',
+'Date help'				=>	'(yyyy-mm-dd)',
+'Message label'				=>	'Message',
+'Expire after label'			=>	'Expire aprÃšs',
+'Expire before label'			=>	'Expire avant',
+'Order by label'			=>	'Trier par',
+'Order by username'			=>	'Nom d\'utilisateur',
+'Order by ip'			        =>	'IP',
+'Order by e-mail'			=>	'E-mail',
+'Order by expire'			=>	'Date d\'expiration',
+'Ascending'				=>	'Ascendant',
+'Descending'				=>	'Descendant',
+'Submit search'				=>	'Lancer la recherche',
+
+'E-mail label'				=>	'E-mail',
+'E-mail help'				=>	'L\'e-mail ou le domaine d\'e-mail que vous souhaitez bannir (ex. : utilisateur@domaine.com ou domaine.com). Rendez-vous Ã  Â«&#160;Autoriser les adresses Ã©lectroniques bannies&#160;Â» dans la rubrique Permissions pour davantage d\'informations.',
+'IP label'				=>	'Adresse IP/plages d\'adresses IP',
+'IP help'				=>	'L\'adresse IP ou la plage d\'adresses IP que vous souhaitez bannir (ex. : 150.11.110.1 ou 150.11.110). SÃ©parez les adresses par des espaces. Si une IP est dÃ©jÃ  indiquÃ©e, il s\'agit de la derniÃšre adresse IP connue de cet utilisateur enregistrÃ©e dans la base de donnÃ©es.',
+'IP help link'				=>	'Cliquez sur %s pour afficher les statistiques IP de cet utilisateur.',
+'Ban advanced head'			=>	'ParamÃštres de bannissement avancÃ©s',
+'Ban advanced subhead'			=>	'Ajouter IP et e-mail pour complÃ©ter le bannissement',
+'Ban message label'			=>	'Message de bannissement',
+'Ban message help'			=>	'Un message qui s\'affichera lors de la prochaine visite de l\'utilisateur banni.',
+'Message expiry subhead'		=>	'Message de bannissement et expiration',
+'Ban IP range info'			=>	'Vous devrez Ãªtre trÃšs prudent lors du bannissement d\'une plage d\'IP puisqu\'il est possible que plusieurs utilisateurs utilisent la mÃªme partie d\'adresse IP.',
+'Expire date label'			=>	'Date d\'expiration',
+'Expire date help'			=>	'La date Ã  laquelle ce bannissement devrait prendre automatiquement fin (format : YYYY-MM-DD). Laissez vide pour une suppression manuelle.',
+
+'Results head'				=>	'RÃ©sultats de la recherche',
+'Results username head'			=>	'Nom d\'utilisateur',
+'Results e-mail head'			=>	'E-mail',
+'Results IP address head'		=>	'IP/plage d\'IP',
+'Results expire head'	      		=>	'Expire',
+'Results message head'	        	=>	'Message',
+'Results banned by head'       		=>	'Banni par',
+'Results actions head'			=>	'Actions',
+'No match'				=>	'Pas de correspondance',
+'Unknown'				=>	'Inconnu',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_categories.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_categories.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_categories.php	(revision 4)
@@ -0,0 +1,29 @@
+<?php
+
+// Language definitions used in admin_categories.php
+$lang_admin_categories = array(
+
+'Must enter name message'		=>	'Vous devez indiquer un nom pour la catÃ©gorie',
+'Category added redirect'		=>	'CatÃ©gorie ajoutÃ©e. Redirection&#160;âŠ',
+'Category deleted redirect'		=>	'CatÃ©gorie supprimÃ©e. Redirection&#160;âŠ',
+'Delete category head'			=>	'Supprimer la catÃ©gorie (ainsi que les forums et les sujets qu\'elle contient)',
+'Confirm delete subhead'		=>	'Confirmer la suppression de la catÃ©gorie',
+'Confirm delete info'			=>	'Souhaitez-vous vraiment supprimer la catÃ©gorie Â«&#160;%s&#160;Â» ?',
+'Delete category warn'			=>	'<strong>ATTENTION&#160;!</strong> Supprimer une catÃ©gorie entraÃ®ne la suppression des forums et sujets Ã©ventuels qu\'elle contient !',
+'Must enter integer message'		=>	'La position doit Ãªtre indiquÃ©e sous la forme d\'un nombre entier positif',
+'Categories updated redirect'		=>	'CatÃ©gories mises Ã  jour. Redirection&#160;âŠ',
+'Add categories head'			=>	'Ajouter des catÃ©gories',
+'Add categories subhead'		=>	'Ajouter les catÃ©gories',
+'Add category label'			=>	'Ajouter une nouvelle catÃ©gorie',
+'Add new submit'			=>	'Ajouter',
+'Add category help'			=>	'Le nom de la nouvelle catÃ©gorie que vous souhaitez ajouter. Vous pouvez modifier ce nom plus tard (voir ci-dessous). Allez Ã  la rubrique %s pour ajouter des forums dans votre nouvelle catÃ©gorie.',
+'Delete categories head'		=>	'Supprimer des catÃ©gories',
+'Delete categories subhead'		=>	'Supprimer les catÃ©gories',
+'Delete category label'			=>	'Supprimer une catÃ©gorie',
+'Delete category help'			=>	'SÃ©lectionnez le nom de la catÃ©gorie que vous souhaitez supprimer. Une confirmation vous sera demandÃ©e avant que cette catÃ©gorie ne soit supprimÃ©e.',
+'Edit categories head'			=>	'Modifier des catÃ©gories',
+'Edit categories subhead'		=>	'Modifier les catÃ©gories',
+'Category position label'		=>	'Position',
+'Category name label'			=>	'Nom',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_censoring.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_censoring.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_censoring.php	(revision 4)
@@ -0,0 +1,21 @@
+<?php
+
+// Language definitions used in admin_censoring.php
+$lang_admin_censoring = array(
+
+'Must enter word message'		=>	'Vous devez indiquer un mot Ã  censurer.',
+'Word updated redirect'			=>	'Mot censurÃ© mis Ã  jour. Redirection&#160;âŠ',
+'Word added redirect'			=>	'Mot censurÃ© ajoutÃ©. Redirection&#160;âŠ',
+'Word removed redirect'			=>	'Mot censurÃ© supprimÃ©. Redirection&#160;âŠ',
+'Censoring head'			=>	'Censure',
+'Add word subhead'			=>	'Ajouter le mot',
+'Add word info'				=>	'Indiquer un mot que vous souhaitez censurer et le texte de remplacement pour ce mot. Les jokers sont acceptÃ©s (ex. : *certain* correspond Ã  Â«&#160;incertain&#160;Â» et Ã  Â«&#160;certainement&#160;Â»). Les noms d\'utilisateurs sont Ã©galement concernÃ©s par la censure. Les nouveaux utilisateurs ne pourront pas s\'inscrire en utilisant des noms d\'utilisateurs contenant un mot censurÃ©. La recherche est insensible Ã  la casse.',
+'Censoring enabled'			=>	'<strong>La censure est activÃ©e dans %s.</strong>',
+'Censoring disabled'			=>	'<strong>La censure est dÃ©sactivÃ©e dans %s.</strong>',
+'Censored word label'			=>	'Mot censurÃ©',
+'Replacement label'			=>	'Mot(s) de remplacement',
+'Action label'				=>	'Action',
+'Edit remove subhead'			=>	'Modifier ou supprimer des mots',
+'No words in list'			=>	'Aucun mot censurÃ© pour le moment.',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_common.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_common.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_common.php	(revision 4)
@@ -0,0 +1,44 @@
+<?php
+
+// Language definitions used in admin_common
+$lang_admin_common = array(
+
+// The menu
+'Admin menu'					=>	'Menu d\'administration',
+'Plugins menu'					=>	'Menu des plugins',
+'Moderator menu'				=>	'Menu de modÃ©ration',
+'Index'						=>	'Accueil',
+'Categories'					=>	'CatÃ©gories',
+'Forums'					=>	'Forums',
+'Users'						=>	'Utilisateurs',
+'User groups'					=>	'Groupes d\'utilisateurs',
+'Options'					=>	'Options',
+'Permissions'					=>	'Permissions',
+'Censoring'					=>	'Censure',
+'Ranks'						=>	'Rangs',
+'Bans'						=>	'Bannissements',
+'Prune'						=>	'Ãlagage',
+'Maintenance'					=>	'Maintenance',
+'Reports'					=>	'Signalements',
+
+'Admin'						=>	'Admin',
+'Go back'					=>	'Retour',
+'Delete'					=>	'Supprimer',
+'Update'					=>	'Mettre Ã  jour',
+'Add'						=>	'Ajouter',
+'Edit'						=>	'Modifier',
+'Remove'					=>	'Supprimer',
+'Yes'						=>	'Oui',
+'No'						=>	'Non',
+'Save changes'					=>	'Enregistrer les modifications',
+'Save'						=>	'Enregistrer',
+'here'						=>	'ici',
+'Action'					=>	'Action',
+'None'						=>	'Aucune',
+'Maintenance mode'				=>	'Mode maintenance', // Used for link text in more than one file
+
+// Admin loader
+'No plugin message'				=>	'Il n\'y a aucun plugin nommÃ© %s dans le rÃ©pertoire plugin.',
+'Plugin failed message'				=>	'Ãchec du chargement du plugin <strong>%s</strong>',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_forums.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_forums.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_forums.php	(revision 4)
@@ -0,0 +1,53 @@
+<?php
+
+// Language definitions used in admin_forums.php
+$lang_admin_forums = array(
+
+'Forum added redirect'		=>	'Forum ajoutÃ©. Redirection&#160;âŠ',
+'Forum deleted redirect'	=>	'Forum supprimÃ©. Redirection&#160;âŠ',
+'Forums updated redirect'	=>	'Forums mis Ã  jour. Redirection&#160;âŠ',
+'Forum updated redirect'	=>	'Forum mis Ã  jour. Redirection&#160;âŠ',
+'Perms reverted redirect'	=>	'RÃ©tablissement des permissions par dÃ©faut. Redirection&#160;âŠ',
+'Must enter name message'	=>	'Vous devez indiquer un nom de forum.',
+'Must be integer message'	=>	'La position doit Ãªtre indiquÃ©e sous forme de nombre entier positif.',
+'New forum'			=>	'Nouveau forum',
+
+// Entry page
+'Add forum head'		=>	'Ajouter un forum',
+'Create new subhead'		=>	'CrÃ©er un nouveau forum',
+'Add forum label'		=>	'Ajouter le forum Ã  une catÃ©gorie',
+'Add forum help'		=>	'Choisissez la catÃ©gorie Ã  laquelle vous souhaitez ajouter un nouveau forum.',
+'Add forum'			=>	'Ajouter le forum',
+'No categories exist'		=>	'Il n\'existe aucune catÃ©gorie pour le moment',
+'Edit forums head'		=>	'Modifier des forums',
+'Category subhead'		=>	'CatÃ©gorie&#160;:',
+'Forum label'			=>	'Forum',
+'Edit link'			=>	'Modifier',
+'Delete link'			=>	'Supprimer',
+'Position label'		=>	'Position',
+'Update positions'		=>	'Mettre Ã  jour les positions',
+'Confirm delete head'		=>	'Confirmation de suppression de forum',
+'Confirm delete subhead'	=>	'Important ! Lisez ceci avant de supprimer.',
+'Confirm delete info'		=>	'Souhaitez-vous vraiment supprimer le forum <strong>%s</strong>&#160;?',
+'Confirm delete warn'		=>	'ATTENTION ! La suppression d\'un forum entraÃ®nera la suppression des Ã©ventuels messages contenus dans ce forum&#160;!',
+
+// Detailed edit page
+'Edit forum head'		=>	'Modifier un forum',
+'Edit details subhead'		=>	'Modifier les informations sur le forum',
+'Forum name label'		=>	'Nom du forum',
+'Forum description label'	=>	'Description (HTML)',
+'Category label'		=>	'CatÃ©gorie',
+'Sort by label'			=>	'Trier les discussions par',
+'Last post'			=>	'Dernier message',
+'Topic start'			=>	'DÃ©but du sujet',
+'Subject'					=>	'Sujet',
+'Redirect label'		=>	'URL de redirection',
+'Redirect help'			=>	'Uniquement disponible pour les forums vides',
+'Group permissions subhead'	=>	'Modifier les permissions des groupes pour ce forum',
+'Group permissions info'	=>	'Dans ce forum, vous pouvez dÃ©finir les permissions spÃ©cifiques Ã  diffÃ©rents groupes d\'utilisateurs. Si vous n\'avez fait aucune modification aux permissions de groupe de ce forum, ce que vous voyez ci-dessous sont les paramÃštres par dÃ©faut basÃ©s sur ceux proposÃ©s dans %s. Les administrateurs ont toujours toutes les permissions et sont donc exclus de ce paramÃ©trage. Les paramÃštres de permission qui diffÃšrent des permissions par dÃ©faut pour le groupe d\'utilisateurs sont mis en Ã©vidence en rouge. La case Ã  cocher indiquant la permission de Â«&#160;lire le forum&#160;Â» sera dÃ©sactivÃ©e si le groupe en question ne possÃšde pas cette permission. Pour les forums redirigÃ©s, seule la permission de lecture de forum est modifiable.',
+'Read forum label'		=>	'Lire le forum',
+'Post replies label'		=>	'RÃ©pondre aux messages',
+'Post topics label'		=>	'CrÃ©er des discussions',
+'Revert to default'		=>	'RÃ©tablir les paramÃštres par dÃ©faut',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_groups.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_groups.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_groups.php	(revision 4)
@@ -0,0 +1,84 @@
+<?php
+
+// Language definitions used in admin_groups.php
+$lang_admin_groups = array(
+
+'Must enter title message'		=>	'Vous devez indiquer un nom au groupe.',
+'Title already exists message'		=>	'Il existe dÃ©jÃ  un groupe nommÃ© <strong>%s</strong>.',
+'Default group redirect'		=>	'Groupe par dÃ©faut dÃ©fini. Redirection&#160;âŠ',
+'Cannot remove default message'		=>	'Le groupe par dÃ©faut ne peut Ãªtre supprimÃ©. Pour pouvoir supprimer ce groupe, vous devez d\'abord configurer un autre groupe.',
+'Group removed redirect'		=>	'Groupe supprimÃ©. Redirection&#160;âŠ',
+'Group added redirect'			=>	'Groupe ajoutÃ©. Redirection&#160;âŠ',
+'Group edited redirect'			=>	'Groupe modifiÃ©. Redirection&#160;âŠ',
+
+'Add groups head'			=>	'Ajouter/configurer des groupes',
+'Add group subhead'			=>	'Ajouter un nouveau groupe',
+'New group label'			=>	'Baser le nouveau groupe sur',
+'New group help'			=>	'SÃ©lectionner un groupe d\'utilisateurs duquel le nouveau groupe va hÃ©riter les permissions. La page suivante vous permettra de rÃ©gler plus prÃ©cisÃ©ment les paramÃštres.',
+'Default group subhead'			=>	'DÃ©finir le groupe par dÃ©faut',
+'Default group label'			=>	'Groupe par dÃ©faut',
+'Default group help'			=>	'Ceci est le groupe par dÃ©faut, c\'est-Ã -dire le groupe dans lequel sont placÃ©s les utilisateurs lorsqu\'ils s\'inscrivent. Pour des raisons de sÃ©curitÃ©, les utilisateurs ne peuvent Ãªtre placÃ©s ni dans le groupe des modÃ©rateurs, ni dans le groupe des administrateurs par dÃ©faut.',
+'Existing groups head'			=>	'Groupes existants',
+'Edit groups subhead'			=>	'Modifier/supprimer des groupes',
+'Edit groups info'			=>	'Les groupes prÃ©dÃ©finis des invitÃ©s, administrateurs, modÃ©rateurs et membres ne peuvent Ãªtre supprimÃ©s. Cependant, ils peuvent Ãªtre modifiÃ©s. Veuillez prendre note que, dans certains groupes, certaines options ne sont pas disponibles (ex. : la permission de <em>modifier les messages</em> pour les invitÃ©s). Les administrateurs ont toujours toutes les permissions.',
+'Edit link'				=>	'Modifier',
+'Delete link'				=>	'Supprimer',
+'Group delete head'			=>	'Suppression de groupe',
+'Confirm delete subhead'		=>	'Confirmez la suppression du groupe',
+'Confirm delete info'			=>	'Souhaitez-vous vraiment supprimer le groupe <strong>%s</strong> ?',
+'Confirm delete warn'			=>	'ATTENTION&#160;! AprÃšs avoir supprimÃ© un groupe il n\'est plus possible de le rÃ©tablir.',
+'Delete group head'			=>	'Supprimer le groupe',
+'Move users subhead'			=>	'DÃ©placer les utilisateurs actuellement dans le groupe',
+'Move users info'			=>	'Le groupe <strong>%s</strong> comporte actuellement <strong>%s</strong> membres. Veuillez choisir un groupe auquel ses membres seront assignÃ©s aprÃšs la suppression.',
+'Move users label'			=>	'DÃ©placer les utilisateurs vers',
+'Delete group'				=>	'Supprimer le groupe',
+
+'Group settings head'			=>	'ParamÃštres du groupe',
+'Group settings subhead'		=>	'Configurer les options et les permissions du groupe',
+'Group settings info'			=>	'Les options et permissions ci-dessous sont les permissions par dÃ©faut de ce groupe d\'utilisateurs. Ces options sont appliquÃ©es si aucune permission spÃ©cifique au forum n\'est effective.',
+'Group title label'			=>	'Nom du groupe',
+'User title label'			=>	'Titre d\'utilisateur',
+'User title help'			=>	'Ce titre remplacera tout rang que les utilisateurs auront obtenus dans ce groupe. Laissez vide pour utiliser titre ou rang par dÃ©faut.',
+'Mod privileges label'			=>	'Appliquer des privilÃšges de modÃ©rateur aux utilisateurs',
+'Mod privileges help'			=>	'Pour qu\'un utilisateur de ce groupe puisse obtenir des privilÃšges de modÃ©rateur, il doit Ãªtre assignÃ© Ã  modÃ©rer un ou plusieurs forums. Ceci se fait via la page d\'administration d\'utilisateur du profil de l\'utilisateur.',
+'Edit profile label'			=>	'Autoriser les modÃ©rateurs Ã  Ã©diter les profils des utilisateurs',
+'Edit profile help'			=>	'Si les privilÃšges de modÃ©rateurs sont activÃ©s, autoriser les utilisateurs de ce groupe Ã  Ã©diter les profils des utilisateurs.',
+'Rename users label'			=>	'Autoriser les modÃ©rateurs Ã  renommer les utilisateurs',
+'Rename users help'			=>	'Si les privilÃšges de modÃ©rateurs sont activÃ©s, autoriser les utilisateurs de ce groupe Ã  renommer les utilisateurs.',
+'Change passwords label'		=>	'Autoriser les modÃ©rateurs Ã  modifier les mots de passe',
+'Change passwords help'			=>	'Si les privilÃšges de modÃ©rateurs sont activÃ©s, autoriser les utilisateurs de ce groupe Ã  modifier le mot de passe des utilisateurs.',
+'Ban users label'			=>	'Autoriser les modÃ©rateurs Ã  bannir les utilisateurs',
+'Ban users help'			=>	'Si les privilÃšges de modÃ©rateurs sont activÃ©s, autoriser les utilisateurs de ce groupe Ã  bannir les utilisateurs.',
+'Read board label'			=>	'Lire le forum',
+'Read board help'			=>	'Autoriser les utilisateurs de ce groupe Ã  afficher le forum. Ce paramÃštre s\'applique Ã  tous les aspects du forum et ne peut donc pas Ãªtre remplacÃ© par les paramÃštres spÃ©cifiques au forum. Si votre choix porte sur le Â«&#160;Non&#160;Â», les utilisateurs dans ce groupe ne pourront que se connecter/dÃ©connecter et s\'inscrire.',
+'View user info label'			=>	'Afficher les informations sur l\'utilisateur',
+'View user info help'			=>	'Autoriser les utilisateurs Ã  afficher la liste des utilisateurs et les profils.',
+'Post replies label'			=>	'RÃ©pondre aux messages',
+'Post replies help'			=>	'Autoriser les utilisateurs de ce groupe Ã  rÃ©pondre dans les discussions.',
+'Post topics label'			=>	'CrÃ©er des discussions',
+'Post topics help'			=>	'Autoriser les utilisateurs de ce groupe Ã  crÃ©er des discussions.',
+'Edit posts label'			=>	'Modifier les messages',
+'Edit posts help'			=>	'Autoriser les utilisateurs de ce groupe Ã  modifier leurs propres messages.',
+'Delete posts label'			=>	'Supprimer les messages',
+'Delete posts help'			=>	'Autoriser les utilisateurs de ce groupe Ã  supprimer leurs propres messages.',
+'Delete topics label'			=>	'Supprimer les discussions',
+'Delete topics help'			=>	'Autoriser les utilisateurs de ce groupe Ã  supprimer leurs propres discussions (ainsi que les Ã©ventuelles rÃ©ponses).',
+'Set own title label'			=>	'DÃ©finir leur propre titre d\'utilisateur',
+'Set own title help'			=>	'Autoriser les utilisateurs de ce groupe Ã  dÃ©finir leur propre titre d\'utilisateur.',
+'User search label'			=>	'Utiliser la recherche',
+'User search help'			=>	'Autoriser les utilisateurs de ce groupe Ã  utiliser la fonction de recherche.',
+'User list search label'		=>	'Rechercher dans la liste des utilisateurs',
+'User list search help'			=>	'Autoriser les utilisateurs de ce groupe Ã  rechercher Ã  partir d\'un texte libre des utilisateurs dans la liste d\'utilisateurs.',
+'Send e-mails label'			=>	'Envoyer des e-mails',
+'Send e-mails help'			=>	'Autoriser les utilisateurs de ce groupe Ã  envoyer des e-mails Ã  d\'autres utilisateurs.',
+'Post flood label'			=>	'Intervalle entre messages consÃ©cutifs',
+'Post flood help'			=>	'DÃ©lai en secondes Ã  respecter par les utilisateurs de ce groupe entre deux messages envoyÃ©s. DÃ©finir Ã  0 pour dÃ©sactiver.',
+'Search flood label'			=>	'Intervalle entre recherches consÃ©cutives',
+'Search flood help'			=>	'DÃ©lai en secondes Ã  respecter par les utilisateurs de ce groupe entre deux recherches. DÃ©finir Ã  0 pour dÃ©sactiver.',
+'E-mail flood label'			=>	'Intervalle entre e-mails consÃ©cutifs',
+'E-mail flood help'			=>	'DÃ©lai en secondes Ã  respecter par les utilisateurs de ce groupe entre deux e-mails envoyÃ©s. DÃ©finir Ã  0 pour dÃ©sactiver.',
+'Report flood label'      =>  'Intervalle entre signalements consÃ©cutifs',
+'Report flood help'        =>  'DÃ©lai en secondes Ã  respecter par les utilisateurs de ce groupe entre deux signalements envoyÃ©s. DÃ©finir Ã  0 pour dÃ©sactiver.',
+'Moderator info'			=>	'Veuillez prendre note que pour qu\'un utilisateur de ce groupe puisse obtenir des privilÃšges de modÃ©rateur, il doit Ãªtre assignÃ© Ã  modÃ©rer un ou plusieurs forums. Ceci se fait via la page d\'administration d\'utilisateur du profil de l\'utilisateur.',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_index.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_index.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_index.php	(revision 4)
@@ -0,0 +1,51 @@
+<?php
+
+// Language definitions used in admin_index.php
+$lang_admin_index = array(
+
+'fopen disabled message'		=>	'Impossible de vÃ©rifier la prÃ©sence de nouvelles mises Ã  jour puisque l\'option Â«&#160;allow_url_fopen&#160;Â» est dÃ©sactivÃ©e sur ce systÃšme.',
+'Upgrade check failed message'		=>	'La vÃ©rification de nouvelles mises Ã  jour a Ã©chouÃ© pour des raisons inconnues.',
+'Running latest version message'	=>	'Vous utilisez la version la plus rÃ©cente de FluxBB.',
+'New version available message'		=>	'Une nouvelle version de FluxBB est disponible. Vous pouvez tÃ©lÃ©charger cette version ici&#160;: %s.',
+'PHPinfo disabled message'		=>	'La fonction PHP phpinfo() a Ã©tÃ© dÃ©sactivÃ©e sur ce serveur.',
+'Not available'				=>	'Non disponible',
+'Forum admin head'			=>	'Administration du forum',
+'NA'					=>	'N/A',
+'Welcome to admin'			=>	'Bienvenue dans le panneau d\'administration de FluxBB. Ã partir d\'ici vous pouvez gÃ©rer les aspects vitaux du forum. Selon que vous Ãªtes administrateur ou modÃ©rateur, vous pouvez',
+'Welcome 1'				=>	'Organiser les catÃ©gories et forums.',
+'Welcome 2'				=>	'DÃ©finir les options et prÃ©fÃ©rences pour chaque forum.',
+'Welcome 3'				=>	'GÃ©rer les permissions pour les utilisateurs et les invitÃ©s.',
+'Welcome 4'				=>	'Afficher les statistiques IP des utilisateurs.',
+'Welcome 5'				=>	'Bannir des utilisateurs.',
+'Welcome 6'				=>	'Censurer des mots.',
+'Welcome 7'				=>	'ParamÃ©trer les rangs d\'utilisateurs.',
+'Welcome 8'				=>	'Supprimer d\'anciens messages.',
+'Welcome 9'				=>	'Traiter les signalements de messages.',
+'Statistics head'			=>	'Statistiques',
+'FluxBB version label'			=>	'Version de FluxBB',
+'Check for upgrade'			=>	'VÃ©rification pour mise Ã  niveau',
+'FluxBB version data'			=>	'v%s - %s',
+'Server load label'			=>	'Charge du serveur',
+'Server load data'			=>	'%s - %s utilisateur(s) en ligne',
+'Environment label'			=>	'Environnement',
+'Environment data OS'			=>	'SystÃšme d\'exploitation&#160;: %s',
+'Show info'				=>	'Afficher les infos',
+'Environment data version'		=>	'PHP : %s - %s',
+'Environment data acc'			=>	'AccÃ©lÃ©rateur&#160;: %s',
+'Turck MMCache'				=>	'Turck MMCache',
+'Turck MMCache link'			=>	'turck-mmcache.sourceforge.net/',
+'ionCube PHP Accelerator'		=>	'AccÃ©lÃ©rateur PHP ionCube PHP',
+'ionCube PHP Accelerator link'		=>	'www.php-accelerator.co.uk/',
+'Alternative PHP Cache (APC)'		=>	'Cache alternatif PHP (APC)',
+'Alternative PHP Cache (APC) link'	=>	'www.php.net/apc/',
+'Zend Optimizer'			=>	'Optimiseur Zend',
+'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'			=>	'Base de donnÃ©es',
+'Database data rows'			=>	'Lignes&#160;: %s',
+'Database data size'			=>	'Taille&#160;: %s',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_maintenance.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_maintenance.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_maintenance.php	(revision 4)
@@ -0,0 +1,39 @@
+<?php
+
+// Language definitions used in admin_maintenance.php
+$lang_admin_maintenance = array(
+
+'Maintenance head'			=>	'Maintenance du forum',
+'Rebuild index subhead'			=>	'Reconstruire l\'index de recherche',
+'Rebuild index info'			=>	'Si vous avez ajoutÃ©, modifiÃ© ou supprimÃ© des messages manuellement dans la base de donnÃ©es ou si vous rencontrez des problÃšmes lors des recherches, vous devriez reconstruire l\'index de recherche. Pour une performance optimale vous devriez placer le forum en %s lors de la reconstruction. <strong>La reconstruction de l\'index de recherche peut prendre du temps et provoquer une montÃ©e en charge du serveur durant le processus&#160;!</strong>',
+'Posts per cycle label'			=>	'Messages par cycle',
+'Posts per cycle help'			=>	'Le nombre de messages Ã  afficher pour chaque page. Ex. : si vous indiquez 300, trois cents messages seront traitÃ©s, ensuite la page sera rÃ©actualisÃ©e. Ceci Ã©vite que le script ne s\'interrompe durant le processus de reconstruction.',
+'Starting post label'			=>	'ID du message de dÃ©part',
+'Starting post help'			=>	'L\'ID du message de dÃ©part pour la reconstruction. La valeur pas dÃ©faut est le premier ID disponible dans la base de donnÃ©es. En principe, vous ne devriez pas avoir Ã  changer cela.',
+'Empty index label'			=>	'Effacer l\'index',
+'Empty index help'			=>	'Choisissez cela si vous souhaitez que l\'index soit vidÃ© avant de dÃ©buter la reconstruction (voir ci-dessous).',
+'Rebuild completed info'		=>	'Une fois que le processus s\'est achevÃ© vous serez redirigÃ© vers cette page. L\'activation de Javascript dans votre navigateur est fortement recommandÃ©e durant la reconstruction (pour redirection automatique au terme d\'un cycle). Si vous Ãªtes contraint(e) d\'interrompre le processus de reconstruction, notez l\'ID du message traitÃ© en dernier et indiquez la valeur ID+1 dans Â«&#160;ID du message de dÃ©part&#160;Â» lorsque/si vous souhaitez continuer (Â«&#160;Effacer l\'index&#160;Â» ne doit pas Ãªtre sÃ©lectionnÃ©).',
+'Rebuild index'				=>	'Reconstruire l\'index',
+'Rebuilding search index'		=>	'Reconstruction de l\'index de recherche',
+'Rebuilding index info'			=>	'Reconstruction de l\'index. Il serait bon de se servir un cafÃ© en attendant :-)',
+'Processing post'			=>	'Traitement du message <strong>%s</strong>&#160;âŠ',
+'Click here'				=>	'Cliquez ici',
+'Javascript redirect failed'		=>	'Ãchec de la redirection JavaScript. %s pour continuer&#160;âŠ',
+'Posts must be integer message'		=>	'Le nombre de messages par cycle doit Ãªtre une valeur entiÃšre positive.',
+'Days must be integer message'          =>      'Le nombre de jours Ã  prendre en compte pour Ã©laguer doit Ãªtre indiquÃ© sous forme de nombre entier positif.',
+'No old topics message'		        =>	'Aucune discussion ne date de plus de %s jours. Veuillez rÃ©duire la valeur de Â«&#160;AnciennetÃ© en jours&#160;Â» et essayer Ã  nouveau.',
+'Posts pruned redirect'		        =>	'Messages Ã©laguÃ©s. Redirection&#160;âŠ',
+'Prune head'			        =>	'Ãlaguer',
+'Prune subhead'			        =>	'Supprimer d\'anciens messages',
+'Days old label'		        =>	'AnciennetÃ© en jours',
+'Days old help'			        =>	'L\'anciennetÃ© d\'une discussion pour qu\'elle puisse Ãªtre supprimÃ©e. Ex.&#160;: si vous indiquez le nombre 30, toute discussion qui ne contient pas de message datant de moins de 30 jours sera supprimÃ©e.',
+'Prune sticky label'		        =>	'Supprimer les discussions Ã©pinglÃ©es',
+'Prune sticky help'		        =>	'Si activÃ©, les discussions Ã©pinglÃ©es seront Ã©galement prises en compte lors de l\'Ã©lagage.',
+'Prune from label'		        =>	'Ãlaguer dans le forum',
+'All forums'			        =>	'Tous les forums',
+'Prune from help'		        =>	'Le forum dans lequel vous souhaitez Ã©laguer les messages.',
+'Prune info'			        =>	'Utilisez cette fonctionnalitÃ© avec prudence. <strong>Les messages supprimÃ©s ne peuvent plus Ãªtre rÃ©cupÃ©rÃ©s.</strong> Pour une performance optimale, vous devriez passer le forum en %s.',
+'Confirm prune subhead'		        =>	'Confirmer l\'Ã©lagage des messages',
+'Confirm prune info'		        =>	'Souhaitez-vous vraiment supprimer toutes les discussions datant de plus de %s jours de %s (%s discussions).',
+'Confirm prune warn'		        =>	'ATTENTION&#160;! La suppression des messages est irrÃ©versible lors de l\'Ã©lagage.',
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_options.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_options.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_options.php	(revision 4)
@@ -0,0 +1,228 @@
+<?php
+
+// Language definitions used in admin-options.php
+$lang_admin_options = array(
+
+'Bad HTTP Referer message'			=>	'Mauvais HTTP_REFERER. Si vous avez dÃ©placÃ© ces forums d\'un endroit Ã  un autre ou si vous avez changÃ© de domaine, vous devez mettre Ã  jour l\'URL de base manuellement dans la base de donnÃ©es (recherchez o_base_url dans la table config) et nettoyer le cache en supprimant tous les fichiers *.php dans le rÃ©pertoire /cache.',
+'Must enter title message'			=>	'Vous devez spÃ©cifier un nom pour le forum.',
+'Invalid e-mail message'			=>	'L\'adresse Ã©lectronique d\'administrateur que vous avez indiquÃ©e est invalide.',
+'Invalid webmaster e-mail message'		=>	'L\'adresse Ã©lectronique de Webmestre que vous avez indiquÃ©e est invalide.',
+'SMTP passwords did not match'		        =>	'Vous devez indiquer le mot de passe SMTP deux fois exactement de la mÃªme maniÃšre pour le modifier.',
+'Enter announcement here'			=>	'Veuillez saisir votre annonce ici.',
+'Enter rules here'				=>	'Veuillez saisir vos rÃšgles ici.',
+'Default maintenance message'			=>	'Les forums sont temporairement fermÃ©s pour maintenance. Veuillez essayer Ã  nouveau dans quelques minutes.',
+'Timeout error message'				=>	'La valeur pour Â«&#160;DÃ©lai avant dÃ©connexion&#160;Â» doit Ãªtre infÃ©rieure Ã  celle du champ Â«&#160;DÃ©lai de fin de visite&#160;Â».',
+'Options updated redirect'			=>	'Options mises Ã  jour. Redirection&#160;âŠ',
+'Options head'					=>	'Options',
+
+// Essentials section
+'Essentials subhead'				=>	'Principal',
+'Board title label'				=>	'Titre du forum',
+'Board title help'				=>	'Le titre de ce forum (affichÃ© en haut de chaque page). Ce champ <strong>ne</strong> doit <strong>pas</strong> contenir de code HTML.',
+'Board desc label'				=>	'Description du forum',
+'Board desc help'				=>	'Une courte description de ce forum (affichÃ©e en haut de chaque page). Ce champ peut contenir du code HTML.',
+'Base URL label'				=>	'URL de base',
+'Base URL help'					=>	'L\'URL complÃšte du forum sans barre oblique finale (ex. : http://www.mondomaine.com/forums). Ceci <strong>doit</strong> Ãªtre correct pour que les fonctionnalitÃ©s dÃ©diÃ©es aux administrateurs et aux modÃ©rateurs puissent Ãªtre conservÃ©es. Si vous obtenez des erreurs Â«&#160;Bad referer&#160;Â», elle est sÃ»rement incorrecte.',
+'Timezone label'				=>	'Fuseau horaire par dÃ©faut',
+'Timezone help'					=>	'Le fuseau horaire par dÃ©faut pour les invitÃ©s et les utilisateurs qui s\'inscrivent sur le forum.',
+'DST label'					=>	'Ajustement pour l\'heure d\'Ã©tÃ©',
+'DST help'					=>	'Pour activer l\'heure d\'Ã©tÃ© (avance d\'une heure).',
+'Language label'				=>	'Langue par dÃ©faut',
+'Language help'					=>	'Ceci est la langue par dÃ©faut utilisÃ©e si le visiteur est un invitÃ© ou si un utilisateur n\'a pas modifiÃ© ce paramÃštre dans son pofil. Si vous supprimez un paquetage de langue, ceci devra Ãªtre mis Ã  jour.',
+'Default style label'				=>	'Style par dÃ©faut',
+'Default style help'				=>	'Ceci est le style par dÃ©faut utilisÃ© si le visiteur est un invitÃ© ou si un utilisateur n\'a pas modifiÃ© ce paramÃštre dans son profil.',
+
+// Essentials section timezone options
+'UTC-12:00'					=>	'(UTC-12:00) Ligne de changement de date OUEST',
+'UTC-11:00'					=>	'(UTC-11:00) Niue, Samoa',
+'UTC-10:00'					=>	'(UTC-10:00) Hawaii et des Ã®les AlÃ©outiennes, Ãles Cook',
+'UTC-09:30'					=>	'(UTC-09:30) Ãles Marquises',
+'UTC-09:00'					=>	'(UTC-09:00) Alaska, Ãles Gambier',
+'UTC-08:30'					=>	'(UTC-08:30) Ãles Pitcairn',
+'UTC-08:00'					=>	'(UTC-08:00) Pacifique',
+'UTC-07:00'					=>	'(UTC-07:00) Montagnes, les Rocheuses',
+'UTC-06:00'					=>	'(UTC-06:00) Centre',
+'UTC-05:00'					=>	'(UTC-05:00) Est',
+'UTC-04:00'					=>	'(UTC-04:00) Atlantique',
+'UTC-03:30'					=>	'(UTC-03:30) Terre-Neuve',
+'UTC-03:00'					=>	'(UTC-03:00) Amazone, Centre du Groenland',
+'UTC-02:00'					=>	'(UTC-02:00) Milieu de l\'Atlantique',
+'UTC-01:00'					=>	'(UTC-01:00) AÃ§ores, Cap Vert, Groenland de l\'Est',
+'UTC'						=>	'(UTC) Europe Occidentale, Greenwich',
+'UTC+01:00'					=>	'(UTC+01:00) Europe Centrale, Afrique Occidentale',
+'UTC+02:00'					=>	'(UTC+02:00) Europe de l\'Est, Afrique Centrale',
+'UTC+03:00'					=>	'(UTC+03:00) Moscou, Afrique Orientale',
+'UTC+03:30'					=>	'(UTC+03:30) Iran',
+'UTC+04:00'					=>	'(UTC+04:00) Golf, Samara',
+'UTC+04:30'					=>	'(UTC+04:30) Afghanistan',
+'UTC+05:00'					=>	'(UTC+05:00) Pakistan, Iekaterinbourg',
+'UTC+05:30'					=>	'(UTC+05:30) Inde, Sri Lanka',
+'UTC+05:45'					=>	'(UTC+05:45) NÃ©pal',
+'UTC+06:00'					=>	'(UTC+06:00) Bangladesh, Bhutan, Novosibirsk',
+'UTC+06:30'					=>	'(UTC+06:30) Ãles Cocos, Myanmar',
+'UTC+07:00'					=>	'(UTC+07:00) Indochine, Krasnoyarsk',
+'UTC+08:00'					=>	'(UTC+08:00) Grande Chin, Australie occidentale, Irkutsk',
+'UTC+08:45'					=>	'(UTC+08:45) Australie occidentale',
+'UTC+09:00'					=>	'(UTC+09:00) Japon, CorÃ©e, Chine',
+'UTC+09:30'					=>	'(UTC+09:30) Australie MÃ©ridionale',
+'UTC+10:00'					=>	'(UTC+10:00) Australie Orientale, Vladivostok',
+'UTC+10:30'					=>	'(UTC+10:30) Ãle Lord Howe',
+'UTC+11:00'					=>	'(UTC+11:00) Ãle Salomon, Magadan',
+'UTC+11:30'					=>	'(UTC+11:30) Ãle Norfolk',
+'UTC+12:00'					=>	'(UTC+12:00) Nouvelle ZÃ©lande, Fiji, Kamchatka',
+'UTC+12:45'					=>	'(UTC+12:45) Ãles Chatham',
+'UTC+13:00'					=>	'(UTC+13:00) Tonga, Ãles Phoenix',
+'UTC+14:00'					=>	'(UTC+14:00) Ãles de la Ligne',
+
+// Timeout Section
+'Timeouts subhead'				=>	'Horaire et dÃ©lais avant interruption',
+'Time format label'				=>	'Format de l\'horaire',
+'PHP manual'					=>	'manuel PHP',
+'Time format help'				=>	'[Format actuel&#160;: %s]. Rendez-vous au %s pour des options de formatage.',
+'Date format label'				=>	'Format de la date',
+'Date format help'				=>	'[Format actuel&#160;: %s]. Rendez-vous au %s pour des options de formatage.',
+'Visit timeout label'				=>	'DÃ©lai d\'interruption de visite',
+'Visit timeout help'				=>	'DÃ©lai en secondes d\'inactivitÃ© d\'un utilisateur avant de mettre Ã  jour ses donnÃ©es de derniÃšre visite (touche principalement les indicateurs de nouveau message).',
+'Online timeout label'				=>	'DÃ©lai de dÃ©connexion',
+'Online timeout help'				=>	'DÃ©lai en secondes d\'inactivitÃ© d\'un utilisateur avant d\'Ãªtre retirÃ© de la liste des utilisateurs en ligne.',
+'Redirect time label'				=>	'DÃ©lai de redirection',
+'Redirect time help'				=>	'DÃ©lai en secondes avant redirection. Si dÃ©fini Ã  0, la page de redirection ne sera pas affichÃ©e (non recommandÃ©).',
+
+// Display Section
+'Display subhead'				=>	'Affichage',
+'Version number label'				=>	'NumÃ©ro de version',
+'Version number help'				=>	'Afficher la version de FluxBB dans le pied de page.',
+'Info in posts label'				=>	'Infos sur l\'utilisateur dans les messages',
+'Info in posts help'				=>	'Afficher les informations Ã  propos de l\'utilisateur ayant crÃ©Ã© le  message sous son nom d\'utilisateur dans la discussion. Les informations donnÃ©es sont&#160;: le lieu, la date d\'inscription, le nombre de messages publiÃ©s et les liens de contact (e-mail et URL).',
+'Post count label'				=>	'Nombre de messages',
+'Post count help'				=>	'Affiche le nombre de messages publiÃ©s par un utilisateur (indiquÃ© dans les discussions, le profil et la liste d\'utilisateurs).',
+'Smilies label'					=>	'ÃmoticÃŽnes dans les messages',
+'Smilies help'					=>	'Convertit les Ã©moticÃŽnes en petites icÃŽnes graphiques.',
+'Smilies sigs label'				=>	'ÃmoticÃŽnes dans les signatures',
+'Smilies sigs help'				=>	'Convertit les Ã©moticÃŽnes en petites icÃŽnes graphiques dans les signatures d\'utilisateurs.',
+'Clickable links label'				=>	'Rendre les liens cliquables',
+'Clickable links help'				=>	'Si activÃ©e, FluxBB dÃ©tectera automatiquement les URL dans les messages et les convertira en hyperliens cliquables.',
+'Topic review label'				=>	'RÃ©sumÃ© de discussion',
+'Topic review help'				=>	'Nombre maximal de sujets Ã  afficher lors de la composition de message (le plus rÃ©cent en premier). 0 pour dÃ©sactiver.',
+'Topics per page label'				=>	'Discussions par page',
+'Topics per page help'				=>	'Le nombre de discussions Ã  afficher par dÃ©faut par page dans un forum. Les utilisateurs peuvent personnaliser ce paramÃštre.',
+'Posts per page label'				=>	'Messages par page',
+'Posts per page help'				=>	'Le nombre de messages Ã  afficher par dÃ©faut par page dans une discussion. Les utilisateurs peuvent personnaliser ce paramÃštre.',
+'Indent label'					=>	'Tabulation',
+'Indent help'					=>	'Si dÃ©finie Ã  8, une indentation normale sera utilisÃ©e lors de l\'affichage du texte contenu dans une balise [code][/code]. Sinon, le nombre d\'espaces indiquÃ© sera utilisÃ© pour l\'indentation du texte.',
+'Quote depth label'				=>	'Niveau maximum de citations imbriquÃ©es',
+'Quote depth help'				=>	'Le nombre de fois qu\'une balise [quote] peut apparaÃ®re Ã  l\'intÃ©rieure d\'une autre balise [quote], toute balise de niveau supÃ©rieur sera ignorÃ©e.',
+
+// Features section
+'Features subhead'				=>	'FonctionnalitÃ©s',
+'Quick post label'				=>	'RÃ©ponse rapide',
+'Quick post help'				=>	'Si activÃ©e, FluxBB ajoutera un formulaire de rÃ©ponse rapide au bas des sujets. Ainsi, les utilisateurs pourront rÃ©pondre directement Ã  partir du sujet.',
+'Users online label'				=>	'Utilisateurs en ligne',
+'Users online help'				=>	'Affiche des informations sur la page d\'accueil indiquant le nombre d\'invitÃ©s et d\'inscrits visitant actuellement les forums.',
+'Censor words label'				=>	'Mots censurÃ©s',
+'Censor words help'				=>	'Activez ceci pour censurer des mots spÃ©cifiques dans le forum. Rendez-vous Ã  la rubrique %s pour davantage d\'informations.',
+'Signatures label'				=>	'Signatures',
+'Signatures help'				=>	'Autoriser les utilisateurs Ã  ajouter une signature en bas de message.',
+'User ranks label'				=>	'Rangs des utilisateurs',
+'User ranks help'				=>	'Activer cela pour utiliser les rangs d\'utilisateurs. Rendez-vous Ã  la rubrique %s pour davantage d\'informations.',
+'User has posted label'				=>	'Indication de message antÃ©rieur',
+'User has posted help'				=>	'Cette fonctionnalitÃ© affiche un point devant les sujets dans viewforum.php si l\'utilisateur actuellement connectÃ© a dÃ©jÃ  Ã©crit un message dans le sujet. DÃ©sactivez cette fonction si vous constatez des problÃšmes de surcharge du serveur.',
+'Topic views label'				=>	'Affichages de sujet',
+'Topic views help'				=>	'Conserver le nombre de fois qu\'un sujet a Ã©tÃ© visionnÃ©. DÃ©sactivez cette option si vous constatez une surcharge du serveur dans un forum trÃšs frÃ©quentÃ©.',
+'Quick jump label'				=>	'Basculement rapide',
+'Quick jump help'				=>	'Activer la liste dÃ©roulante de basculement rapide (basculer vers un forum).',
+'GZip label'					=>	'Compression GZip',
+'GZip help'					=>	'Si activÃ©e, FluxBB compressera au format gzip ce qui sera envoyÃ© au navigateur. Cela rÃ©duira l\'utilisation de la bande passante mais utilisera davantage les ressources du processeur. Cette fonctionnalitÃ© demande une configuration de PHP avec zlib (--with-zlib). Remarque : si vous avez d\'ores et dÃ©jÃ  configurÃ© un des modules Apache mod_gzip ou mod_deflate pour compresser les scripts PHP, vous devriez dÃ©sactiver cette fonctionnalitÃ©.',
+'Search all label'				=>	'Rechercher dans tous les forums',
+'Search all help'				=>	'Si dÃ©sactivÃ©e, les recherches ne pourront Ãªtre effectuÃ©es que dans un forum Ã  la fois. DÃ©sactivez ceci si la charge du serveur est trop Ã©levÃ©e Ã  cause d\'un nombre de recherches trop important.',
+'Menu items label'				=>	'ÃlÃ©ments de menu supplÃ©mentaires',
+'Menu items help'				=>	'En ajoutant des hyperliens HTML dans cette boÃ®te, un nombre illimitÃ© d\'Ã©lÃ©ments peuvent Ãªtre ajoutÃ©s au menu de navigation situÃ© en haut de chaque page. Le format pour ajouter de nouveaux liens est le suivant&#160;: X = &lt;a href="URL"&gt;INTITULE DU LIEN&lt;/a&gt; oÃ¹ X est la position Ã  laquelle le lien devra Ãªtre insÃ©rÃ© (ex. : 0 pour insÃ©rer au dÃ©but et 2 pour insÃ©rer aprÃšs l\'Ã©lÃ©ment Â«&#160;Liste d\'utilisateurs&#160;Â»). Chaque Ã©lÃ©ment devra se trouver dans une nouvelle ligne.',
+
+// Feeds section
+'Feed subhead'                                  =>      'Syndication',
+'Default feed label'				=>	'Type de flux par dÃ©faut',
+'Default feed help'				=>	'Type d\'abonnement de flux devant Ãªtre affichÃ©. Remarque&#160;: le choix Â«&#160;Aucun&#160;Â» ne dÃ©sactive pas le flux mais le masque simplement par dÃ©faut.',
+'None'						=>	'Aucun',
+'RSS'						=>	'RSS',
+'Atom'						=>	'Atom',
+'Feed TTL label'                                =>      'Temps de mise en cache des flux',
+'Feed TTL help'                                 =>      'Les flux peuvent Ãªtre placÃ©s dans le cache afin de rÃ©duire l\'utilisation des ressources.',
+'No cache'                                      =>      'Ne pas placer dans le cache',
+'Minutes'                                       =>      '%d minutes',
+
+// Reports section
+'Reports subhead'				=>	'Signalements',
+'Reporting method label'			=>	'MÃ©thode de signalement',
+'Internal'					=>	'Interne',
+'By e-mail'					=>	'E-mail',
+'Both'						=>	'Les deux',
+'Reporting method help'				=>	'Choisissez la mÃ©thode pour traiter les signalements de discussion/message. Vous pouvez opter pour le systÃšme de signalement interne, l\'envoi d\'un e-mail Ã  la liste de diffusion (voir ci-dessous) ou effectuer les deux opÃ©rations.',
+'Mailing list label'				=>	'Liste de diffusion',
+'Mailing list help'				=>	'Une liste d\'abonnÃ©s sÃ©parÃ©s par une virgule. Les personnes dans cette liste sont les destinataires des signalements.',
+
+// Avatars section
+'Avatars subhead'				=>	'Avatars',
+'Use avatars label'				=>	'Utiliser des avatars',
+'Use avatars help'				=>	'Si activÃ©e, les utilisateurs pourront envoyer vers le serveur un avatar qui sera affichÃ© sous leur titre/rang.',
+'Upload directory label'			=>	'RÃ©pertoire d\'envoi',
+'Upload directory help'				=>	'Le rÃ©pertoire vers lequel les avatars seront envoyÃ©s (relatif au rÃ©pertoire racine de FluxBB). PHP doit avoir les permissions d\'Ã©criture dans ce rÃ©pertoire.',
+'Max width label'				=>	'Largeur max',
+'Max width help'				=>	'La largeur maximale autorisÃ©e pour les avatars en pixels (60 recommandÃ©s).',
+'Max height label'				=>	'Hauteur max',
+'Max height help'				=>	'La hauteur maximale autorisÃ©e pour les avatars en pixels (60 recommandÃ©s).',
+'Max size label'				=>	'Taille max',
+'Max size help'					=>	'La taille maximale autorisÃ©e pour les avatars en octets (10240 recommandÃ©s).',
+
+// E-mail section
+'E-mail subhead'				=>	'E-mail',
+'Admin e-mail label'				=>	'E-mail de l\'administrateur',
+'Admin e-mail help'				=>	'L\'adresse Ã©lectronique de l\'administrateur du forum.',
+'Webmaster e-mail label'			=>	'E-mail du webmaster',
+'Webmaster e-mail help'				=>	'Ceci est l\'adresse indiquÃ©e comme adresse de provenance dans les e-mails envoyÃ©s par le forum.',
+'Forum subscriptions label'			=>	'Suivi de forum',
+'Forum subscriptions help'			=>	'Autorise les utilisateurs Ã  suivre des forums (reÃ§oivent un e-mail lorsque quelqu\'un crÃ©Ã© une nouvelle discussion).',
+'Topic subscriptions label'			=>	'Suivi de discussion',
+'Topic subscriptions help'			=>	'Autorise les utilisateurs Ã  suivre des discussions (reÃ§oivent un e-mail lorsque quelqu\'un rÃ©pond).',
+'SMTP address label'				=>	'Adresse du serveur SMTP',
+'SMTP address help'				=>	'L\'adresse d\'un serveur SMTP externe Ã  utiliser pour envoyer les e-mails. Vous pouvez spÃ©cifier un numÃ©ro de port personnalisÃ© si le serveur SMTP n\'utilise pas le port par dÃ©faut 25 (exemple : mail.monhÃŽte.com:3580). Laisser vide pour utiliser le programme d\'envoi d\'e-mail local.',
+'SMTP username label'				=>	'Nom d\'utilisateur SMTP',
+'SMTP username help'				=>	'Nom d\'utilisateur pour serveur SMTP. Indiquez un nom d\'utilisateur uniquement si cela est demandÃ© par le serveur SMTP (la plupart des serveurs <strong>ne</strong> nÃ©cessitent <strong>pas</strong> d\'authentification).',
+'SMTP password label'				=>	'Mot de passe SMTP',
+'SMTP change password help'			=>	'Cocher ceci si vous souhaitez modifier ou supprimer le mot de passe stockÃ© actuellement.',
+'SMTP password help'				=>	'Mot de passe pour serveur SMTP. Indiquez un mot de passe uniquement si cela est demandÃ© par le serveur SMTP (la plupart des serveurs <strong>ne</strong> nÃ©cessitent <strong>pas</strong> d\'authentification). Veuillez indiquer deux fois votre mot de passe pour confirmation.',
+'SMTP SSL label'				=>	'Chiffrage du SMTP par SSL',
+'SMTP SSL help'					=>	'Chiffre la connexion vers le serveur SMTP en utilisant SSL. Ne devrait Ãªtre utilisÃ© que si votre serveur SMTP le demande et que votre version de PHP prend en charge SSL.',
+
+// Registration Section
+'Registration subhead'				=>	'Inscription',
+'Allow new label'				=>	'Autoriser de nouvelles inscriptions',
+'Allow new help'				=>	'Indique si ce forum accepte de nouvelles inscriptions. Ne dÃ©sactiver que sous certaines conditions.',
+'Verify label'					=>	'VÃ©rifier les inscriptions',
+'Verify help'					=>	'Si activÃ©e, les utilisateurs obtiendront par e-mail un mot de passe alÃ©atoire lors de leur inscription. Ils pourront alors se connecter et modifier leur mot de passe dans leur profil s\'ils le souhaitent. Cette fonctionnalitÃ© demande Ã©galement une vÃ©rification de leur adresse Ã©lectronique s\'ils choisissent d\'en changer. Ceci est un moyen efficace d\'Ã©viter l\'inscription abusive et de vÃ©rifier que les utilisateurs ont une adresse Ã©lectronique correcte associÃ©e Ã  leur profil.',
+'Report new label'				=>	'Signaler les nouvelles inscriptions',
+'Report new help'				=>	'Si activÃ©e, FluxBB notifiera les utilisateurs dans la liste de diffusion (voir ci-dessus) lorsqu\'un nouvel utilisateur s\'inscrit sur les forums.',
+'Use rules label'				=>	'RÃšgles du forum pour les utilisateurs',
+'Use rules help'				=>	'Si activÃ©e, les utilisateurs devront accepter les rÃšgles lorsqu\'ils s\'inscriront (indiquez le texte ci-dessous). Ces rÃšgles seront toujours disponibles sous forme de lien dans le menu de navigation en haut de chaque page.',
+'Rules label'					=>	'Indiquez vos rÃšgles d\'utilisation ici',
+'Rules help'					=>	'Ici vous pouvez indiquer toute rÃšgle ou autre information que l\'utilisateur doit considÃ©rer et accepter avant de s\'inscrire. Si vous avez activÃ© les rÃšgles ci-dessus vous devez saisir quelque chose ici, sinon, elles seront dÃ©sactivÃ©es. Ce texte ne sera pas traitÃ© comme les messages ordinaires et peut contenir du code HTML.',
+'E-mail default label'				=>	'ParamÃštre e-mail par dÃ©faut',
+'E-mail default help'				=>	'Choisissez le paramÃštre de vie privÃ©e pour les nouvelles inscriptions d\'utilisateurs.',
+'Display e-mail label'				=>	'Divulguer l\'adresse Ã©lectronique aux autres utilisateurs.',
+'Hide allow form label'				=>	'Masquer l\'adresse Ã©lectronique mais autoriser l\'utilisation du formulaire d\'envoi d\'e-mail.',
+'Hide both label'				=>	'Masquer l\'adresse Ã©lectronique et ne pas autoriser l\'utilisation du formulaire d\'envoi d\'e-mail.',
+
+// Announcement Section
+'Announcement subhead'				=>	'Annonces',
+'Display announcement label'			=>	'Afficher l\'annonce',
+'Display announcement help'			=>	'Activez ceci pour afficher le message ci-dessous sur chaque page des forums.',
+'Announcement message label'			=>	'Message d\'annonce',
+'Announcement message help'			=>	'Ce texte ne sera pas traitÃ© comme les messages ordinaires et peut contenir du code HTML.',
+
+// Maintenance Section
+'Maintenance subhead'				=>	'Maintenance',
+'Maintenance mode label'			=>	'Mode maintenance',
+'Maintenance mode help'				=>	'Si activÃ©, le forum ne sera disponible qu\'aux administrateurs. Ceci devra Ãªtre utilisÃ© si le forum doit Ãªtre indisponible temporairement pour maintenance. ATTENTION&#160;! Ne vous dÃ©connectez pas lorsque le forum est en mode maintenance. Vous ne seriez plus en mesure de vous connecter.',
+'Maintenance message label'			=>	'Message de maintenance',
+'Maintenance message help'			=>	'Le message qui s\'affichera pour les utilisateurs lorsque le forum sera en mode maintenance. Si laissÃ© vide, un message par dÃ©faut sera utilisÃ©. Ce texte ne sera pas traitÃ© comme les messages ordinaires et peut contenir du code HTML.',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_permissions.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_permissions.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_permissions.php	(revision 4)
@@ -0,0 +1,36 @@
+<?php
+
+// Language definitions used in admin-permissions.php
+$lang_admin_permissions = array(
+
+'Perms updated redirect'	=>	'Permissions mises Ã  jour. Redirection&#160;âŠ',
+'Permissions head'		=>	'Permissions',
+'Posting subhead'		=>	'Messages',
+'BBCode label'			=>	'BBCode',
+'BBCode help'			=>	'Autoriser les balises BBCode dans les messages (recommandÃ©).',
+'Image tag label'		=>	'Balise image',
+'Image tag help'		=>	'Autoriser la balise BBCode [img][/img] dans les messages.',
+'All caps message label'	=>	'Message uniquement en capitales',
+'All caps message help'		=>	'Accepter qu\'un message soit complÃštement Ã©crit en lettres capitales.',
+'All caps subject label'	=>	'Sujet uniquement en capitales',
+'All caps subject help'		=>	'Accepter qu\'un sujet soit complÃštement Ã©crit en lettres capitales.',
+'Require e-mail label'		=>	'E-mail de l\'invitÃ© obligatoire',
+'Require e-mail help'		=>	'Demander Ã  l\'invitÃ© d\'indiquer son adresse Ã©lectronique pour publier un message.',
+'Signatures subhead'		=>	'Signatures',
+'BBCode sigs label'		=>	'BBCodes dans les signatures',
+'BBCode sigs help'		=>	'Autoriser les balises BBCode dans les signatures des utilisateurs.',
+'Image tag sigs label'		=>	'Balise image dans les signatures',
+'Image tag sigs help'		=>	'Autoriser la balise BBCode [img][/img] dans les signatures d\'utilisateurs (non recommandÃ©).',
+'All caps sigs label'		=>	'Signature uniquement en capitales',
+'All caps sigs help'		=>	'Accepter qu\'une signature soit complÃštement Ã©crite en lettres capitales.',
+'Max sig length label'		=>	'Longueur maximale de la signature',
+'Max sig length help'		=>	'Nombre maximal de caractÃšres contenus dans une signature d\'utilisateur.',
+'Max sig lines label'		=>	'Lignes maximales de la signature',
+'Max sig lines help'		=>	'Nombre maximal de lignes acceptÃ© dans une signature d\'utilisateur.',
+'Registration subhead'		=>	'Inscription',
+'Banned e-mail label'		=>	'Autoriser les adresses Ã©lectroniques bannies',
+'Banned e-mail help'		=>	'Autoriser l\'utilisation d\'adresse Ã©lectroniques ou de domaines d\'adresse Ã©lectronique bannis lors de l\'inscription ou la modification d\'e-mail d\'utilisateurs. Si laissÃ© au paramÃštre par dÃ©faut (oui), cette action sera autorisÃ©e, mais un avertissement par e-mail sera envoyÃ© Ã  la liste de diffusion (moyen efficace pour dÃ©tecter les inscriptions multiples).',
+'Duplicate e-mail label'	=>	'Autoriser des adresses Ã©lectroniques en double',
+'Duplicate e-mail help'		=>	'Indique si les utilisateurs sont autorisÃ©s Ã  s\'inscrire avec une adresse Ã©lectronique dÃ©jÃ  utilisÃ©e par un autre utilisateur enregistrÃ©. Si autorisÃ©, un e-mail d\'avertissement sera envoyÃ© Ã  la liste de diffusion si un doublon est dÃ©tectÃ©.',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_ranks.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_ranks.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_ranks.php	(revision 4)
@@ -0,0 +1,23 @@
+<?php
+
+// Language definitions used in admin_ranks.php
+$lang_admin_ranks = array(
+
+'Must be integer message'	=>	'Le nombre minimum de messages doit Ãªtre indiquÃ© sous forme de nombre entier positif.',
+'Dupe min posts message'	=>	'Il existe dÃ©jÃ  un rang avec un nombre minimum de messages fixÃ© Ã  %s.',
+'Must enter title message'	=>	'Vous devez indiquer un intitulÃ© pour le rang.',
+'Rank added redirect'		=>	'Rang ajoutÃ©. Redirection&#160;âŠ',
+'Rank updated redirect'		=>	'Rang mis Ã  jour. Redirection&#160;âŠ',
+'Rank removed redirect'		=>	'Rang supprimÃ©. Redirection&#160;âŠ',
+'Ranks head'			=>	'Rangs',
+'Add rank subhead'		=>	'Ajouter le rang',
+'Add rank info'			=>	'Indiquez un rang et le nombre minimum de messages publiÃ©s pour qu\'un utilisateur puisse obtenir ce rang. DiffÃ©rents rangs ne peuvent dÃ©pendre du mÃªme nombre minimum de messages. Si une identitÃ© est dÃ©finie pour un utilisateur, cette identitÃ© sera affichÃ©e Ã  la place du rang.',
+'Ranks enabled'			=>	'<strong>Les rangs d\'utilisateur sont activÃ©s dans %s.</strong>',
+'Ranks disabled'		=>	'<strong>Les rangs d\'utilisateur sont dÃ©sactivÃ©s dans %s.</strong>',
+'Rank title label'		=>	'IntitulÃ© de rang',
+'Minimum posts label'		=>	'Nombre de messages minimum',
+'Actions label'			=>	'Actions',
+'Edit remove subhead'		=>	'Modifier/supprimer des rangs',
+'No ranks in list'		=>	'Pas de rangs dÃ©finis pour le moment.',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_reports.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_reports.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_reports.php	(revision 4)
@@ -0,0 +1,21 @@
+<?php
+
+// Language definitions used in admin_reports.php
+$lang_admin_reports = array(
+
+'Report zapped redirect'		=>	'Signalement traitÃ©. Redirection&#160;âŠ',
+'New reports head'			=>	'Nouveaux signalements',
+'Deleted user'				=>	'Utilisateur supprimÃ©',
+'Deleted'				=>	'SupprimÃ©',
+'Post ID'                               =>      'Message nÂ°%s',
+'Report subhead'			=>	'SignalÃ©&#160;: %s',
+'Reported by'				=>	'SignalÃ© par %s',
+'Reason'				=>	'Motif',
+'Zap'					=>	'Marquer comme traitÃ©',
+'No new reports'			=>	'Aucun nouveau signalement pour l\'instant.',
+'Last 10 head'				=>	'10 derniers signalements traitÃ©s',
+'NA'					=>	'N/A',
+'Zapped subhead'			=>	'TraitÃ© le %s par %s',
+'No zapped reports'			=>	'Aucun signalement traitÃ© pour le moment.',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/admin_users.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/admin_users.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/admin_users.php	(revision 4)
@@ -0,0 +1,110 @@
+<?php
+
+// Language definitions used in admin-users.php
+$lang_admin_users = array(
+
+'Non numeric message'			=>	'Vous avez indiquÃ© une valeur non numÃ©rique dans une colonne n\'acceptant que des valeurs numÃ©riques.',
+'Invalid date time message'		=>	'Vous avez indiquÃ© une date, un horaire invalide.',
+'Not verified'				=>	'Non vÃ©rifiÃ©',
+
+// Actions: mass delete/ban etc.
+'No users selected'                     =>      'Aucun utilisateur sÃ©lectionnÃ©.',
+'No move admins message'                =>      'Pour des raisons de sÃ©curitÃ©, vous n\'Ãªtes pas autorisÃ©(e) Ã  dÃ©placer plusieurs administrateurs vers un autre groupe. Si vous souhaitez dÃ©placer ces administrateurs, vous pouvez le faire dans leurs profils respectifs.',
+'No delete admins message'              =>      'Les administrateurs ne peuvent Ãªtre supprimÃ©s. Pour supprimer des administrateurs, vous devez d\'abord les dÃ©placer vers un autre groupe d\'utilisateurs.',
+'No ban admins message'                 =>      'Les administrateurs ne peuvent Ãªtre bannis. Pour bannir des administrateurs, vous devez d\'abord les dÃ©placer vers un autre groupe d\'utilisateurs.',
+'No ban mods message'                   =>      'Les modÃ©rateurs ne peuvent Ãªtre bannis. Pour bannir des modÃ©rateurs, vous devez d\'abord les dÃ©placer vers un autre groupe d\'utilisateurs.',
+'Move users'                            =>      'Changer le groupe d\'utilisateurs',
+'Move users subhead'                    =>      'Choisir un nouveau groupe d\'utilisateurs',
+'New group label'                       =>      'Nouveau groupe',
+'New group help'                        =>      'Choisissez le groupe vers lequel l\'(les) utilisateur(s) sÃ©lectionnÃ©(s) sera(seront) dÃ©placÃ©(s). Pour des raisons de sÃ©curitÃ©, il n\'est pas possible de dÃ©placer plusieurs utilisateurs vers le groupe des administrateurs.',
+'Invalid group message'                 =>      'ID de groupe invalide.',
+'Users move redirect'                   =>      'Groupe d\'utilisateur modifiÃ©. Redirection&#160;âŠ',
+'Delete users'                          =>      'Supprimer des utilisateurs',
+'Confirm delete legend'                 =>      'Important : lisez avant de supprimer des utilisateurs',
+'Confirm delete info'                   =>      'Veuillez confirmer que vous souhaitez supprimer ces utilisateurs.',
+'Delete posts'                          =>      'Supprimer tous les messages et discussions que ces utilisateurs ont publiÃ©s.',
+'Delete warning'                        =>      'Avertissement ! Des utilisateurs et/ou messages supprimÃ©s ne peuvent Ãªtre rÃ©cupÃ©rÃ©s. Si vous choisissez de ne pas supprimer les messages crÃ©Ã©s par ces utilisateurs, ils ne pourront Ãªtre supprimÃ©s plus tard que manuellement.',      
+'Users delete redirect'                 =>      'Utilisateurs supprimÃ©s. Redirection&#160;âŠ',
+'Ban users'                             =>      'Bannir des utilisateurs',
+'Message expiry subhead'                =>      'Message de bannissement et expiration',
+'Ban message label'                     =>      'Message de bannissement',
+'Ban message help'                      =>      'Un message qui s\'affichera pour les utilisateurs bannis lorsqu\'ils consulteront les forums.',
+'Expire date label'                     =>      'Date d\'expiration',
+'Expire date help'                      =>      'La date Ã  laquelle ces bannissements devront Ãªtre automatiquement supprimÃ©s (format : yyyy-mm-dd). Laisser vide pour une suppression manuelle.',
+'Ban IP label'                          =>      'Bannissement d\'adresse IP',
+'Ban IP help'                           =>      'Bannir Ã©galement les adresses IP des utilisateurs bannis pour leur rendre une nouvelle crÃ©ation de compte plus difficile.',
+'Invalid date message'                  =>      'Vous avez indiquÃ© une date d\'expiration invalide.',
+'Invalid date reasons'                  =>      'Le format devrait correspondre Ã  YYYY-MM-DD et la date doit Ãªtre dÃ©finie Ã  au moins un jour plus tard.',
+'Users banned redirect'                 =>      'Utilisateurs bannis. Redirection&#160;âŠ',
+
+'User search head'			=>	'Recherche d\'utilisateur',
+'User search subhead'			=>	'Indiquer les critÃšres de recherche',
+'User search info'			=>	'Rechercher des utilisateurs dans la base de donnÃ©es. Vous pouvez indiquer un ou plusieurs termes Ã  rechercher. Les jokers sous forme d\'astÃ©risques (*) sont acceptÃ©s.',
+'Username label'			=>	'Nom d\'utilisateur',
+'E-mail address label'			=>	'Adresse Ã©lectronique',
+'Title label'				=>	'Titre',
+'Real name label'			=>	'Nom rÃ©el',
+'Website label'				=>	'Site Web',
+'Jabber label'				=>	'Jabber',
+'ICQ label'				=>	'ICQ',
+'MSN label'				=>	'MSN Messenger',
+'AOL label'				=>	'AOL IM',
+'Yahoo label'				=>	'Yahoo Messenger',
+'Location label'			=>	'Lieu',
+'Signature label'			=>	'Signature',
+'Admin note label'			=>	'Note d\'administrateur',
+'Posts more than label'			=>	'Nombre de messages supÃ©rieur Ã ',
+'Posts less than label'			=>	'Nombre de messages infÃ©rieur Ã ',
+'Last post after label'			=>	'Dernier message publiÃ© aprÃšs',
+'Date help'				=>	'(dd-mm-yyyy hh:mm:ss)',
+'Last post before label'		=>	'Dernier message publiÃ© avant',
+'Last visit after label'  =>  'DerniÃšre visite aprÃšs',
+'Last visit before label'  =>  'DerniÃšre visite avant',
+'Registered after label'		=>	'Inscrit aprÃšs',
+'Registered before label'		=>	'Inscrit avant',
+'Order by label'			=>	'CritÃšre de tri&160;:',
+'Order by username'			=>	'nom d\'utilisateur',
+'Order by e-mail'			=>	'e-mail',
+'Order by posts'			=>	'nombre de messages',
+'Order by last post'			=>	'dernier message',
+'Order by last visit'    =>  'derniÃšre visite',
+'Order by registered'			=>	'inscrit',
+'Ascending'				=>	'ascendant',
+'Descending'				=>	'descendant',
+'User group label'			=>	'Groupe d\'utilisateurs',
+'All groups'				=>	'Tous les groupes',
+'Unverified users'			=>	'Utilisateurs non vÃ©rifiÃ©s',
+'Submit search'				=>	'Lancer la recherche',
+'IP search head'			=>	'Recherche d\'IP',
+'IP search subhead'			=>	'Indiquer l\'IP Ã  rechercher',
+'IP address label'			=>	'Adresse IP',
+'IP address help'			=>	'L\'adresse IP Ã  rechercher dans la base de donnÃ©es des messages.',
+'Find IP address'			=>	'Rechercher l\'adresse IP',
+
+'Results head'				=>	'Utilisateurs',
+'Results username head'			=>	'Nom d\'utilisateur',
+'Results e-mail head'			=>	'E-mail',
+'Results title head'			=>	'IdentitÃ©/Ã©tat',
+'Results posts head'			=>	'Messages',
+'Results admin note head'		=>	'Note d\'administrateur',
+'Results actions head'			=>	'Actions',
+'Results IP address head'		=>	'Adresse IP',
+'Results last used head'		=>	'RÃ©cemment utilisÃ©e',
+'Results times found head'		=>	'Nombre de fois trouvÃ©',
+'Results action head'			=>	'Action',
+'Results find more link'		=>	'Trouver davantage d\'utilisateurs pour cette IP',
+'Results no posts found'		=>	'Aucun message n\'a Ã©tÃ© publiÃ© par cet utilisateur dans ce forum pour le moment.',
+'Select'                                =>      'SÃ©lectionner',
+'Select all'                            =>      'Tout sÃ©lectionner',
+'Unselect all'                          =>      'Tout dÃ©sÃ©lectionner',
+'Ban'                                   =>      'Bannir',
+'Delete'                                =>      'Supprimer',
+'Change group'                          =>      'Changer de groupe',
+'Bad IP message'			=>	'L\'adresse IP indiquÃ©e n\'est pas correctement formatÃ©e.',
+'Results view IP link'			=>	'Afficher les stats IP',
+'Results show posts link'		=>	'Afficher les messages',
+'Results guest'				=>	'InvitÃ©',
+'Results no IP found'			=>	'L\'adresse IP indiquÃ©e est introuvable dans la base de donnÃ©es.',
+'No match'				=>	'Aucune correspondance'
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/common.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/common.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/common.php	(revision 4)
@@ -1,154 +1,163 @@
 <?php
 
-/*
-// Determine what locale to use
-switch (PHP_OS)
-{
-	case 'WINNT':
-	case 'WIN32':
-		$locale = 'french';
-		break;
+// Language definitions for frequently used strings
+$lang_common = array(
 
-	case 'FreeBSD':
-	case 'NetBSD':
-	case 'OpenBSD':
-		$locale = 'fr_FR.ISO8859-1';
-		break;
-
-	default:
-		$locale = 'fr_FR';
-		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'			=>	'utf-8',
-'lang_multibyte'		=>	false,
- 
+'lang_identifier'		=>	'fr', //iso code 639-1 value (see http://www.loc.gov/standards/iso639-2/php/code_list.php)
+
+// Number formatting
+'lang_decimal_point'            =>        ',',
+'lang_thousands_sep'            =>        ' ',
+
 // Notices
 'Bad request'			=>	'Erreur. Le lien que vous avez suivi est incorrect ou pÃ©rimÃ©.',
-'No view'				=>	'Vous n\'Ãªtes pas autorisÃ© Ã  visiter ces forums.',
-'No permission'			=>	'Vous n\'Ãªtes pas autorisÃ© Ã  afficher cette page.',
-'Bad referrer'			=>	'Mauvais HTTP_REFERER. Vous avez Ã©tÃ© renvoyÃ© sur cette page par une source inconnue ou interdite. Si le problÃšme persiste, assurez-vous que le champ \'URL de base\' de la page Admin/Options est correctement renseignÃ© et que vous visitez ces forums en utilisant cette URL. Plus d\'informations pourront-Ãªtres trouvÃ©es dans la documentation de PunBB.',
- 
-// Topic/forum indicators
-'New icon'				=>	'Il y a des nouveaux messages',
-'Normal icon'			=>	'<!-- -->',
-'Closed icon'			=>	'Cette discussion est fermÃ©e',
-'Redirect icon'			=>	'Forum de redirection',
- 
+'No view'			=>	'Vous n\'Ãªtes pas autorisÃ©(e) Ã  visiter ces forums.',
+'No permission'			=>	'Vous n\'Ãªtes pas autorisÃ©(e) Ã  afficher cette page.',
+'Bad referrer'			=>	'Mauvais HTTP_REFERER. Vous avez Ã©tÃ© renvoyÃ©(e) vers cette page par une source inconnue ou interdite. Si le problÃšme persiste, assurez-vous que le champ Â«&#160;URL de base&#160;Â» de la page Administration&#160;Â» Options est correctement renseignÃ© et que vous vous rendez sur ces forums en utilisant cette URL. Vous pourrez trouver davantage d\'informations dans la documentation de FluxBB.',
+'No cookie'			=>	'Vous semblez avoir Ã©tÃ© identifiÃ©(e), cependant aucun cookie n\'a Ã©tÃ© envoyÃ©. Veuillez vÃ©rifier vos paramÃštres et, si possible, activer les cookies pour ce site.',
+'Pun include error'		=>	'Impossible de procÃ©der Ã  l\'inclusion utilisateur %s Ã  partir du gabarit %s. Ce fichier ne se trouve ni dans le dossier des gabarits, ni dans le dossier d\'inclusion d\'utilisateur.',
+
 // Miscellaneous
 'Announcement'			=>	'Annonce',
-'Options'				=>	'Options',
-'Actions'				=>	'Actions',
-'Submit'				=>	'Envoyer',	// "name" of submit buttons
-'Ban message'			=>	'Vous Ãªtes exclu de ce forum.',
-'Ban message 2'			=>	'Votre exclusion expire le',
-'Ban message 3'			=>	'L\'administrateur ou le modÃ©rateur qui vous a exclu envoit le message suivant&#160;:',
+'Options'			=>	'Options',
+'Submit'			=>	'Valider',	// "name" of submit buttons
+'Ban message'			=>	'Vous Ãªtes banni(e) de ce forum.',
+'Ban message 2'			=>	'Votre bannissement expire le',
+'Ban message 3'			=>	'L\'administrateur ou le modÃ©rateur qui vous a banni envoie le message suivant :',
 'Ban message 4'			=>	'Pour toute question, contactez l\'administrateur',
-'Never'					=>	'Jamais',
-'Today'					=>	'Aujourd\'hui',
-'Yesterday'				=>	'Hier',
-'Info'					=>	'Info',		// a common table header
-'Go back'				=>	'Retour',
+'Never'				=>	'Jamais',
+'Today'				=>	'Aujourd\'hui',
+'Yesterday'			=>	'Hier',
+'Info'				=>	'Info',		// a common table header
+'Go back'			=>	'Retour',
 'Maintenance'			=>	'Maintenance',
 'Redirecting'			=>	'Redirection',
-'Click redirect'		=>	'Cliquez ici si vous ne voulez pas attendre (ou si votre navigateur ne vous redirige pas).',
-'on'					=>	'actif',		// as in "BBCode is on"
-'off'					=>	'inactif',
-'Invalid e-mail'		=>	'L\'adresse e-mail que vous avez saisie est invalide.',
-'required field'		=>	'est un champ requis pour ce formulaire.',	// for javascript form validation
-'Last post'				=>	'Dernier message',
-'by'					=>	'par',	// as in last post by someuser
-'New posts'				=>	'Nouveaux&#160;messages',	// the link that leads to the first new post (use &#160; for spaces)
-'New posts info'		=>	'Allez au premier nouveau message de cette discussion.',	// the popup text for new posts links
-'Username'				=>	'Nom d\'utilisateur',
-'Password'				=>	'Mot de passe',
-'E-mail'				=>	'e-mail',
-'Send e-mail'			=>	'Envoyer un e-mail',
+'Click redirect'		=>	'Cliquez ici si vous ne voulez pas attendre (ou si votre navigateur ne vous redirige pas automatiquement).',
+'on'				=>	'activÃ©',		// as in "BBCode is on"
+'off'				=>	'dÃ©sactivÃ©',
+'Invalid email'			=>	'L\'adresse Ã©lectronique que vous avez saisie est invalide.',
+'Required'			=>	'(obligatoire)',
+'required field'		=>	'est un champ obligatoire pour ce formulaire.',	// for javascript form validation
+'Last post'			=>	'Dernier message',
+'by'				=>	'par',	// as in last post by someuser
+'New posts'			=>	'Nouveaux messages',
+'New posts info'		=>	'Atteindre le premier nouveau message de cette discussion.',	// the popup text for new posts links
+'Username'			=>	'Nom d\'utilisateur',
+'Password'			=>	'Mot de passe',
+'Email'				=>	'E-mail',
+'Send email'			=>	'Envoyer un e-mail',
 'Moderated by'			=>	'ModÃ©rÃ© par',
 'Registered'			=>	'Date d\'inscription',
-'Subject'				=>	'Sujet',
-'Message'				=>	'Message',
-'Topic'					=>	'Discussion',
-'Forum'					=>	'Forum',
-'Posts'					=>	'Messages',
-'Replies'				=>	'RÃ©ponses',
-'Author'				=>	'Auteur',
-'Pages'					=>	'Pages',
-'BBCode'				=>	'BBCode',	// You probably shouldn't change this
-'img tag'				=>	'Balise [img]',
-'Smilies'				=>	'ÃmoticÃŽnes',
-'and'					=>	'et',
+'Subject'			=>	'Sujet',
+'Message'			=>	'Message',
+'Topic'				=>	'Discussion',
+'Forum'				=>	'Forum',
+'Posts'				=>	'Messages',
+'Replies'			=>	'RÃ©ponses',
+'Pages'				=>	'Pages&#160;:',
+'Page'				=>	'Page %s',
+'BBCode'			=>	'BBCode&#160;:',	// You probably shouldn't change this
+'img tag'			=>	'Balise [img]&#160;:',
+'Smilies'			=>	'ÃmoticÃŽnes&#160;:',
+'and'				=>	'et',
 'Image link'			=>	'image',	// This is displayed (i.e. <image>) instead of images when "Show images" is disabled in the profile
-'wrote'					=>	'a Ã©crit',	// For [quote]'s
-'Code'					=>	'Code',		// For [code]'s
-'Mailer'				=>	'E-mail automatique',	// As in "MyForums Mailer" in the signature of outgoing e-mails
-'Important information'	=>	'Information importante',
-'Write message legend'	=>	'Veuillez Ã©crire votre message et l\'envoyer',
- 
+'wrote'				=>	'a Ã©crit&#160;:',	// For [quote]'s
+'Mailer'			=>	'E-mail automatique',	// As in "MyForums Mailer" in the signature of outgoing e-mails
+'Important information'		=>	'Information importante',
+'Write message legend'		=>	'Veuillez composer votre message et l\'envoyer',
+'Previous'                      =>      'PrÃ©cÃ©dent',
+'Next'                          =>      'Suivant',
+'Spacer'                        =>      'âŠ', // Ellipsis for paginate
+
 // Title
-'Title'					=>	'Titre',
-'Member'				=>	'Membre',	// Default title
-'Moderator'				=>	'ModÃ©rateur',
+'Title'				=>	'Titre de l\'utilisateur',
+'Member'			=>	'Membre',	// Default title
+'Moderator'			=>	'ModÃ©rateur',
 'Administrator'			=>	'Administrateur',
-'Banned'				=>	'Banni',
-'Guest'					=>	'InvitÃ©',
+'Banned'			=>	'Banni(e)',
+'Guest'				=>	'InvitÃ©',
  
 // Stuff for include/parser.php
-'BBCode error'			=>	'La syntaxe BBCode est incorrecte.',
-'BBCode error 1'		=>	'Il manque la balise d\'ouverture pour [/quote].',
-'BBCode error 2'		=>	'Il manque la balise de fermeture pour [code].',
-'BBCode error 3'		=>	'Il manque la balise d\'ouverture pour [/code].',
-'BBCode error 4'		=>	'Il manque une ou plusieurs balises de fermeture pour [quote].',
-'BBCode error 5'		=>	'Il manque une ou plusieurs balises d\'ouverture manquantes pour [/quote].',
- 
+'BBCode error no opening tag'		=>	'La balise [/%1$s] a Ã©tÃ© trouvÃ©e sans balise [%1$s] correspondante',
+'BBCode error invalid nesting'		=>	'La balise [%1$s] a Ã©tÃ© ouverte dans la balise [%2$s], ceci n\'est pas autorisÃ©',
+'BBCode error invalid self-nesting'	=>	'La balise [%s] a Ã©tÃ© ouverte dans cette mÃªme balise, ceci n\'est pas autorisÃ©',
+'BBCode error no closing tag'		=>	'La balise [%1$s] a Ã©tÃ© trouvÃ©e sans balise [/%1$s] correspondante',
+'BBCode error empty attribute'		=>	'La balise [%s] comporte un attribut non dÃ©fini',
+'BBCode code problem'			=>	'Il y a un problÃšme avec vos balises [code]',
+'BBCode list size error'		=>	'Votre liste Ã©tant trop longue pour Ãªtre analysÃ©e, veuillez la rÃ©duire s\'il vous plaÃ®t&#160;!',
+
 // Stuff for the navigator (top of every page)
-'Index'					=>	'Index',
-'User list'				=>	'Liste des membres',
-'Rules'					=>  'RÃšgles',
-'Search'				=>  'Recherche',
-'Register'				=>  'Inscription',
-'Login'					=>  'S\'identifier',
-'Not logged in'			=>  'Vous n\'Ãªtes pas identifiÃ©.',
-'Profile'				=>	'Profil',
-'Logout'				=>	'DÃ©connexion',
-'Logged in as'			=>	'ConnectÃ© en tant que',
-'Admin'					=>	'Administration',
-'Last visit'			=>	'DerniÃšre visite',
-'Show new posts'		=>	'Afficher les nouveaux messages depuis la derniÃšre visite',
+'Index'				=>	'Accueil',
+'User list'			=>	'Liste des membres',
+'Rules'				=>  	'RÃšgles',
+'Search'			=>  	'Recherche',
+'Register'			=>  	'Inscription',
+'Login'				=>  	'Identification',
+'Not logged in'			=>  	'Vous n\'Ãªtes pas identifiÃ©(e).',
+'Profile'			=>	'Profil',
+'Logout'			=>	'DÃ©connexion',
+'Logged in as'			=>	'ConnectÃ©(e) sous l\'identitÃ©&#160;',
+'Admin'				=>	'Administration',
+'Last visit'			=>	'DerniÃšre visite&#160;: %s',
+'Topic searches'		=>	'Contributions&#160;:',
+'New posts header'		=>	'Nouvelles',
+'Active topics'			=>	'RÃ©centes',
+'Unanswered topics'		=>      'Sans rÃ©ponse',
+'Posted topics'			=>	'Personnelles',
+'Show new posts'		=>	'Trouver les discussions avec de nouveaux messages depuis votre derniÃšre visite.',
+'Show active topics'		=>	'Trouver les discussions comportant des messages rÃ©cents.',
+'Show unanswered topics'	=>	'Trouver les discussions sans rÃ©ponse.',
+'Show posted topics'		=>	'Trouver les discussions auxquelles vous avez participÃ©.',
 'Mark all as read'		=>	'Marquer toutes les discussions comme lues',
-'Link separator'		=>	'',	// The text that separates links in the navigator
- 
+'Mark forum read'               =>      'Marquer ce forum comme lu',
+'Title separator'		=>	' / ',
+
 // Stuff for the page footer
 'Board footer'			=>	'Pied de page des forums',
-'Search links'			=>	'Liens de recherche',
-'Show recent posts'		=>	'Afficher les messages rÃ©cents',
-'Show unanswered posts'	=>	'Afficher les messages sans rÃ©ponse',
-'Show your posts'		=>	'Afficher vos messages',
-'Show subscriptions'	=>	'Afficher les discussions auxquelles vous Ãªtes abonnÃ©s',
-'Jump to'				=>	'Aller Ã ',
-'Go'					=>	' Aller ',		// submit button in forum jump
-'Move topic'			=>  'DÃ©placer la discussion',
-'Open topic'			=>  'Ouvrir la discussion',
-'Close topic'			=>  'Fermer la discussion',
-'Unstick topic'			=>  'DÃ©tacher la discussion',
-'Stick topic'			=>  'Ãpingler la discussion',
+'Jump to'			=>	'Atteindre',
+'Go'				=>	'Aller',		// submit button in forum jump
+'Moderate topic'                =>      'ModÃ©rer la discussion',
+'Move topic'			=>  	'DÃ©placer la discussion',
+'Open topic'			=>  	'Ouvrir la discussion',
+'Close topic'			=>  	'Fermer la discussion',
+'Unstick topic'			=>  	'DÃ©tacher la discussion',
+'Stick topic'			=>  	'Ãpingler la discussion',
 'Moderate forum'		=>	'ModÃ©rer le forum',
-'Delete posts'			=>	'Supprimer plusieurs messages',
-'Debug table'			=>	'Informations de dÃ©bogue',
+'Powered by'                    =>      'PropulsÃ© par %s',
  
+// Debug information
+'Debug table'                   =>        'Informations de dÃ©bogage',
+'Querytime'                     =>        'GÃ©nÃ©rÃ©es en %1$s secondes, %2$s requÃªtes exÃ©cutÃ©es',
+'Memory usage'			=>	  'Utilisation de la mÃ©moire : %1$s',
+'Peak usage'			=>	  '(pic d\'utilisation : %1$s)',
+'Query times'                   =>        'Temps (s)',
+'Query'                         =>        'RequÃªte',
+'Total query time'              =>        'Temps total d\'exÃ©cution de la requÃªte&#160;: %s',
+
 // For extern.php RSS feed
-'RSS Desc Active'		=>	'Les discussions rÃ©cemment actives de',	// board_title will be appended to this string
-'RSS Desc New'			=>	'Les derniÃšres discussions de',					// board_title will be appended to this string
-'Posted'				=>	'Ãcrit le'	// The date/time a topic was started
-);
- 
+'RSS description'                                 =>        'Les sujets les plus rÃ©cents sur %s.',
+'RSS description topic'                           =>        'Les sujets les plus rÃ©cents dans %s.',
+'RSS reply'                                       =>        'RÃ©ponse Ã &#160;:  ', // The topic subject will be appended to this string (to signify a reply)
+'RSS active topics feed'			  =>	    'Flux RSS des discussions actives',
+'Atom active topics feed'			  =>	    'Flux Atom des discussions actives',
+'RSS forum feed'				  =>	    'Flux RSS du forum',
+'Atom forum feed'				  =>	    'Flux Atom du forum',
+'RSS topic feed'				  =>	    'Flux RSS de la discussion',
+'Atom topic feed'				  =>	    'Flux Atom de la discussion',
+
+// Admin related stuff in the header
+'New reports'					  =>	    'De nouveaux signalements ont Ã©tÃ© envoyÃ©s&#160;!',
+'Maintenance mode enabled'			  =>	    'Le mode maintenance est activÃ©&#160;!',
+
+// Units for file sizes
+'Size unit B'            =>  '%s O',
+'Size unit KiB'            =>  '%s Kio',
+'Size unit MiB'            =>  '%s Mio',
+'Size unit GiB'            =>  '%s Gio',
+'Size unit TiB'            =>  '%s Tio',
+'Size unit PiB'            =>  '%s Pio',
+'Size unit EiB'            =>  '%s Eio',
+
+); 
Index: branches/rsr.v5.1.1/web/punbb/lang/French/delete.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/delete.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/delete.php	(revision 4)
@@ -5,8 +5,12 @@
  
 'Delete post'			=>	'Supprimer le message',
-'Warning'				=>	'Attention&#160;: S\'il s\'agit du premier message de la discussion, celle-ci sera entiÃšrement supprimÃ©e&#160;!',
-'Delete'				=>	'Supprimer',	// The submit button
-'Post del redirect'		=>	'Message supprimÃ©. Redirection ...',
-'Topic del redirect'	=>	'Discussion supprimÃ©e. Redirection ...'
+'Warning'			=>	'Vous Ãªtes sur le point de supprimer dÃ©finitivement ce message&#160;!',
+'Topic warning'			=>	'Attention&#160;! Ceci est le premier message de cette discussion, toute la discussion sera dÃ©finitivement supprimÃ©e.',
+'Delete info'			=>	'Le message que vous souhaitez supprimer vous est prÃ©sentÃ© ci-dessous afin que vous puissiez le revoir avant de continuer.',
+'Reply by'			=>	'RÃ©ponse de %s - %s',
+'Topic by'			=>	'Discussion dÃ©marrÃ©e par %s - %s',
+'Delete'			=>	'Supprimer',	// The submit button
+'Post del redirect'		=>	'Message supprimÃ©. Redirection&#160;âŠ',
+'Topic del redirect'		=>	'Discussion supprimÃ©e. Redirection&#160;âŠ'
  
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/forum.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/forum.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/forum.php	(revision 4)
@@ -3,10 +3,14 @@
 // Language definitions used in viewforum.php
 $lang_forum = array(
- 
+
 'Post topic'	=>	'Nouvelle discussion',
-'Views'			=>	'Vues',
-'Moved'			=>	'DÃ©placÃ©',
-'Sticky'		=>	'ÃpinglÃ©',
-'Empty forum'	=>	'Le forum est vide.'
- 
+'Views'		=>	'Vues',
+'Moved'		=>	'DÃ©placÃ©e&#160;:',
+'Sticky'	=>	'ÃpinglÃ©e&#160;:',
+'Closed'	=>	'FermÃ©e&#160;:',
+'Empty forum'	=>	'Le forum ne contient aucune discussion.',
+'Mod controls'	=>	'Interventions pour modÃ©rateurs',
+'Is subscribed'	=>	'Vous suivez ce forum',
+'Unsubscribe'	=>	'Ne plus suivre',
+'Subscribe'	=>	'Suivre ce forum'
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/help.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/help.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/help.php	(revision 4)
@@ -4,39 +4,63 @@
 $lang_help = array(
  
-'Help'					=>	'Aide',
-'produces'				=>	'produit',
- 
-'BBCode info 1'			=>	'Le BBCode est une collection de balises de formatage utilisÃ©es pour modifier l\'apparence du texte sur ces forums. BBCode est basÃ© sur le mÃªme principe -&#160;et y ressemble beaucoup&#160;- que le HTML. Ci-dessous la liste de tous les BBCodes disponibles et les instructions d\'utilisation.',
-'BBCode info 2'			=>	'Les administrateurs ont la possibilitÃ© d\'activer ou de dÃ©sactiver le systÃšme de BBCode. Vous pouvez vÃ©rifier si le BBCode est activÃ© ou non lorsque vous Ã©crivez un message ou lorsque vous modifiez votre signature.',
+'Help'				=>	'Aide',
+'produces'			=>	'gÃ©nÃšre',
+
+'BBCode'			=>	'BBCode',
+'BBCode info 1'			=>	'Le BBCode est une collection de balises de formatage utilisÃ©es pour modifier l\'apparence du texte ou ajouter des Ã©lÃ©ments graphiques sur ces forums. BBCode est basÃ© sur le mÃªme principe que le HTML, et y ressemble donc beaucoup. Il suffit d\'encadrer les parties que l\'on souhaite modifier/ajouter par des balises ([nom_de_balise]partie Ã  modifier[/nom_de_balise]). Ci-dessous la liste de toutes les balises BBCodes disponibles et les instructions d\'utilisation.',
+'BBCode info 2'			=>	'Les administrateurs ont la possibilitÃ© d\'activer ou de dÃ©sactiver le systÃšme BBCode. Vous pouvez vÃ©rifier si le BBCode est activÃ© lors de la composition d\'un message ou la modification de votre signature.',
  
 'Text style'			=>	'Style du texte',
 'Text style info'		=>	'Les balises suivantes changent l\'apparence du texte&#160;:',
-'Bold text'				=>	'Texte en gras',
+'Bold text'			=>	'Texte en gras',
 'Underlined text'		=>	'Texte soulignÃ©',
 'Italic text'			=>	'Texte en italique',
-'Red text'				=>	'Texte rouge',
-'Blue text'				=>	'Texte bleu',
+'Strike-through text'		=>	'Texte barrÃ©',
+'Red text'			=>	'Texte rouge',
+'Blue text'			=>	'Texte bleu',
+'Heading text'			=>	'Titre',
+'Deleted text'			=>	'Texte supprimÃ©',
+'Inserted text'			=>	'Texte insÃ©rÃ©',
+'Emphasised text'		=>	'Texte en emphase',
+
+'Links and images'		=>	'Liens et images',
+'This help page'    =>  'Cette page d\'aide',
+'Links info'			=>	'Vous pouvez crÃ©er des liens vers d\'autres documents ou vers des adresses Ã©lectroniques en utilisant les balises suivantes&#160;:',
+'My email address'		=>	'Mon adresse Ã©lectronique',
+'Images info'			=>	'Si vous souhaitez afficher une image, vous pouvez utiliser la balise Â«&#160;<strong>img</strong>&#160;Â». Le texte aprÃšs le signe Â«&#160;=&#160;Â» dans la balise ouvrante est utilisÃ© pour l\'attribut alt (texte alternatif en cas de non affichage de l\'image) et devrait Ãªtre ajoutÃ© Ã  chaque fois que cela est possible',
+'FluxBB bbcode test'	        =>	'Test du bbcode FluxBB',
+
+'Test topic'      =>  'Discussion de test',
+'Test post'        =>  'Message de test',
+'Test forum'      =>  'Forum de test',
+'Test user'        =>  'Utilisateur de test',
+
+'Quotes'			=>	'Citations',
+'Quotes info'			=>	'Si vous souhaitez inclure une citation de quelqu\'un, vous devriez utiliser la balise Â«&#160;<strong>quote</strong>&#160;Â».',
+'Quotes info 2'			=>	'Si vous ne souhaitez pas citer quelqu\'un en particulier, vous pouvez utiliser la balise Â«&#160;<strong>quote</strong>&#160;Â» sans spÃ©cifier de nom.',
+'Quote text'			=>	'Voici le texte que je veux citer.',
+'produces quote box'		=>	'gÃ©nÃšre une boÃ®te de citation comme ceci&#160;:',
+'quote note'			=>	'Remarque&#160;: si un nom d\'utilisateur contient les caractÃšres [ ou ] vous pouvez les dÃ©limiter par des guillemets.',
  
-'Links and images'		=>	'Liens et images',
-'Links info'			=>	'Vous pouvez crÃ©er des liens vers d\'autres documents ou vers des adresses e-mail en utilisant les balises suivantes&#160;:',
-'My e-mail address'		=>	'Mon adresse e-mail',
-'Images info'			=>	'Si vous souhaitez afficher une image, vous pouvez utiliser la balise <em>img</em> comme ceci&#160;:',
- 
-'Quotes'				=>	'Citations',
-'Quotes info'			=>	'Si vous souhaitez rÃ©aliser une citation de quelqu\'un, vous devriez utiliser la balise <em>quote</em>.',
-'Quotes info 2'			=>	'Si vous ne souhaitez pas citer quelqu\'un en particulier, vous pouvez utiliser la balise <em>quote</em> sans spÃ©cifier de nom.',
-'Quote text'			=>	'Voici le texte que je veux citer.',
-'produces quote box'	=>	'produit une boite de citation comme ceci&#160;:',
- 
-'Code'					=>	'Code',
-'Code info'				=>	'Lorsque vous affichez du code source vous devriez vous assurer que vous utilisez la balise <em>code</em>. Le texte affichÃ© entre les balises <em>code</em> utilise une police de caractÃšre Ã  chasse fixe et n\'est pas affectÃ© par les autres balises.',
-'Code text'				=>	'Voici un peu de code.',
-'produces code box'		=>	'produit une boite de code comme ceci&#160;:',
+'Code'				=>	'Code',
+'Code info'			=>	'Lorsque vous affichez du code source vous devriez vous assurer que vous utilisez la balise Â«&#160;<strong>code</strong>&#160;Â». Le texte affichÃ© entre les balises <em>code</em> utilise une police de caractÃšres Ã  chasse fixe et n\'est pas affectÃ© par les autres balises.',
+'Code text'			=>	'Voici un peu de code.',
+'produces code box'		=>	'gÃ©nÃšre une boÃ®te de code comme ceci&#160;:',
  
 'Nested tags'			=>	'Balises imbriquÃ©es',
 'Nested tags info'		=>	'Les balises BBCode peuvent s\'imbriquer afin de rÃ©aliser un formatage avancÃ©. Par exemple&#160;:',
-'Bold, underlined text'	=>	'Texte gras et soulignÃ©',
+'Bold, underlined text'		=>	'Texte gras et soulignÃ©',
  
-'Smilies info'			=>	'Si vous le souhaitez (et si c\'est activÃ©), les forums peuvent convertir une sÃ©rie d\'Ã©moticÃŽnes en reprÃ©sentation graphique de ceux-ci. Les forums reconnaissent et remplacent les Ã©moticÃŽnes par des images comme ci-dessous&#160;:'
+'Lists'                    	=>    	'Listes',
+'List info'               	=>    	'Pour crÃ©er une liste vous pouvez utiliser la balise Â«&#160;<strong>list</strong>&#160;Â». Trois types de listes sont Ã  votre disposition.',
+'List text 1'             	=>    	'Exemple de premier Ã©lÃ©ment de liste.',
+'List text 2'             	=>    	'Exemple de deuxiÃšme Ã©lÃ©ment de liste.',
+'List text 3'             	=>    	'Exemple de troisiÃšme Ã©lÃ©ment de liste.',
+'produces list'           	=>    	'gÃ©nÃšre une liste Ã  puces.',
+'produces decimal list'   	=>    	'gÃ©nÃšre une liste numÃ©rotÃ©e.',
+'produces alpha list'     	=>    	'gÃ©nÃšre une liste alphabÃ©tique.',
+
+'Smilies'			=>	'ÃmoticÃŽnes',
+'Smilies info'			=>	'Si vous le souhaitez (et si cette fonctionnalitÃ© est activÃ©e), les forums peuvent convertir une sÃ©rie d\'Ã©moticÃŽnes en images correspondantes. Ces forums reconnaissent les Ã©moticÃŽnes suivantes et les remplacent par des images&#160;:'
  
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/index.html
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/index.html	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/index.html	(revision 4)
@@ -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.1/web/punbb/lang/French/index.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/index.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/index.php	(revision 4)
@@ -4,18 +4,17 @@
 $lang_index = array(
  
-'Topics'				=>  'Discussions',
-'Moderators'			=>  'ModÃ©rateurs',
-'Link to'				=>	'Lien vers',	// As in "Link to http://www.punbb.org/"
-'Empty board'			=>	'Les forums sont vides.',
-'Newest user'			=>	'Dernier utilisateur inscrit',
-'Users online'			=>	'Membres en ligne',
-'Guests online'			=>	'InvitÃ©s en ligne',
-'No of users'			=>	'Nombre total de membres',
-'No of topics'			=>	'Nombre total de discussions',
-'No of posts'			=>	'Nombre total de messages',
-'Online'				=>	'Actuellement en ligne',	// As in "Online: User A, User B etc."
-'Board info'			=>	'Informations Forums',
-'Board stats'			=>	'Statistiques Forums',
-'User info'				=>	'Informations utilisateurs'
+'Topics'			=>  	'Discussions',
+'Link to'			=>	'Lien vers&#160;:',	// As in "Link to: http://www.punbb.org/"
+'Empty board'			=>	'Les forums ne contiennent rien pour le moment.',
+'Newest user'			=>	'Dernier utilisateur inscrit&#160;: %s',
+'Users online'			=>	'Membres en ligne&#160;: %s',
+'Guests online'			=>	'InvitÃ©s en ligne&#160;: %s',
+'No of users'			=>	'Nombre total de membres&#160;: %s',
+'No of topics'			=>	'Nombre total de discussions&#160;: %s',
+'No of posts'			=>	'Nombre total de messages&#160;: %s',
+'Online'			=>	'Actuellement en ligne&#160;: ',	// As in "Online: User A, User B etc."
+'Board info'			=>	'Informations sur les forums',
+'Board stats'			=>	'Statistiques des forums',
+'User info'			=>	'Informations sur l\'utilisateur'
  
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/install.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/install.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/install.php	(revision 4)
@@ -0,0 +1,120 @@
+<?php
+
+// Language definitions used in install.php, localized by adaur
+
+$lang_install = array(
+
+'Install message'			=>	'Le fichier \'config.php\' n\'existe pas ou est corrompu. Cela veut dire que FluxBB n\'a pas encore Ã©tÃ© installÃ©. Pour l\'installer, veuillez suivre les instructions ci-dessous.',
+'Choose install language'		=>	'Choisir la langue du script d\'installation',
+'Choose install language info'	        =>	'La langue utilisÃ©e pour ce script d\'installation. La langue par dÃ©faut utilisÃ©e pour les forums peut Ãªtre dÃ©finie ci-dessous.',
+'Install language'			=>	'Installer la langue',
+'Change language'                       =>      'Changer de langue',
+'Next'					=>	'Suivante',
+'Already installed'			=>	'Il semble que FluxBB soit dÃ©jÃ  installÃ©. Veuillez vous rendre <a href="index.php">ici</a> plutÃŽt.',
+'You are running error'			=>	'Vous utilisez la version %2$s de %1$s. FluxBB %3$s nÃ©cessite au moins %1$s %4$s pour fonctionner correctement. Vous devez mettre Ã  niveau votre installation %1$s avant de poursuivre.',
+'My FluxBB Forum'			=>	'Mon Forum FluxBB',
+'Description'				=>	'Malheureusement, on ne peut pas vous expliquer ce qu\'est FluxBB - vous devrez vous en rendre compte par vous-mÃªme.',
+'Username 1'				=>	'Les noms d\'utilisateurs doivent comporter au moins 2 caractÃšres.',
+'Username 2'				=>	'Les noms d\'utilisateurs ne doivent pas comporter plus de 25 caractÃšres.',
+'Username 3'				=>	'Le nom d\'utilisateur Â« guest Â» est rÃ©servÃ©.',
+'Username 4'				=>	'Les noms d\'utilisateurs ne doivent pas ressembler Ã  une adresse IP.',
+'Username 5'				=>	'Les noms d\'utilisateurs ne doivent pas comporter tous les caractÃšres \', " et [ ou ] en mÃªme temps.',
+'Username 6'				=>	'Les noms d\'utilisateurs ne doivent pas comporter de balises de formatage de texte (BBCode) utilisÃ©s par les forums.',
+'Short password'			=>	'Les mots de passe doivent comporter au moins 4 caractÃšres.',
+'Passwords not match'			=>	'Les mots de passe ne coÃ¯ncident pas.',
+'Wrong email'				=>	'L\'e-mail d\'administrateur que vous avez indiquÃ© est invalide.',
+'No board title'			=>	'Vous devez indiquer un titre pour les forums.',
+'Error default language'		=>	'La langue par dÃ©faut choisie semble ne pas exister.',
+'Error default style'			=>	'Le style par dÃ©faut choisi semble ne pas exister.',
+'No DB extensions'			=>	'Cet environnement PHP n\'est compatible avec aucune des bases de donnÃ©es prises en charge par FluxBB. PHP doit prendre en charge MySQL, PostgreSQL ou SQLite pour pouvoir installer FluxBB.',
+'Administrator username'		=>	'Nom d\'utilisateur de l\'administrateur',
+'Administrator password 1'		=>	'Mot de passe de l\'administarteur',
+'Administrator password 2'		=>	'Confirmation du mot de passe de l\'administrateur',
+'Administrator email'			=>	'E-mail de l\'administrateur',
+'Board title'				=>	'Titre des forums',
+'Base URL'				=>	'URL de base',
+'Required field'			=>	'est un champ obligatoire dans ce formulaire.',
+'FluxBB Installation'			=>	'Installation de FluxBB',
+'Welcome'				=>	'Vous allez installer FluxBB. Pour ce faire, vous devez remplir le formulaire ci-dessous. Si vous rencontrez des difficultÃ©s concernant cette installation, veuillez vous rÃ©fÃ©rer Ã  la documentation.',
+'Install'				=>	'Installer FluxBB 1.4',
+'Errors'				=>	'Les erreurs suivantes doivent Ãªtre corrigÃ©es :',
+'Database setup'			=>	'ParamÃ©trage de la base de donnÃ©es',
+'Info 1'				=>	'Veuillez renseigner les informations demandÃ©es pour paramÃ©trer votre base de donnÃ©es FluxBB. Vous devez connaÃ®tre toutes les informations demandÃ©es avant de procÃ©der Ã  l\'installation.',
+'Select database'			=>	'Choisir votre type de base de donnÃ©es',
+'Info 2'				=>	'FluxBB prend actuellement en charge MySQL, PostgreSQL et SQLite. Si la base de donnÃ©es que vous avez choisie ne figure pas dans le menu dÃ©roulant ci-dessous, cela signifie que votre environnement PHP n\'est pas compatible avec cette base de donnÃ©es-ci. Vous pourrez trouver davantage d\'informations concernant la prise en charge de base de donnÃ©es particuliÃšres dans la FAQ.',
+'Dual MySQL'				=>	'FluxBB a dÃ©tectÃ© que votre environnement PHP prend en charge 2 moyens diffÃ©rents de communication avec MySQL. Les deux options sont nommÃ©es Â« standard Â» et Â« improved Â». Si vous ne savez pas trop lequel utiliser, commencez par essayer avec Â« improved Â» et si cela ne fonctionne pas, essayez Â« standard Â».',
+'InnoDB'				=>	'FluxBB a dÃ©tectÃ© que votre serveur devrait prendre en charge <a href="http://dev.mysql.com/doc/refman/5.0/en/innodb.html">InnoDB</a>. Cela serait un bon choix si vous avez l\'intention de mettre Ã  disposition une grande plate-forme de discussion. Si vous n\'Ãªtes pas sÃ»r de vous, il est recommandÃ© de ne pas utiliser InnoDB.',
+'Database type'				=>	'Type de base de donnÃ©es',
+'Required'				=>	'(Obligatoire)',
+'Database hostname'			=>	'Indiquer le nom d\'hÃŽte de votre serveur de base de donnÃ©es',
+'Info 3'				=>	'L\'adresse du serveur de base de donnÃ©es (exemple : localhost, db.monhote.com ou 192.168.0.15). Vous pouvez spÃ©cifier un numÃ©ro de port si votre base de donnÃ©es n\'utilise pas le port par dÃ©faut (exemple : localhost:3580). Pour la prise en charge de SQLite, indiquer n\'importe quoi ou laisser \'localhost\'.',
+'Database server hostname'		=>      'Nom d\'hÃŽte du serveur de base de donnÃ©es',
+'Database enter name'			=>	'Indiquer le nom de votre base de donnÃ©es',
+'Info 4'				=>	'Le nom de la base de donnÃ©es dans laquelle FluxBB sera installÃ©. La base de donnÃ©e doit exister. Pour SQLite, indiquer le chemin relatif vers le fichier de base de donnÃ©es. Pour des raisons de sÃ©curitÃ©, il est fortement recommandÃ© de placer la base de donnÃ©es SQLite dans un dossier privÃ© (non accessible par le Web) tant que possible. Si le fichier de base de donnÃ©es SQLite n\'existe pas, FluxBB tentera de le crÃ©er.',
+'Database name'				=>	'Nom de la base de donnÃ©es',
+'Database enter informations'	        =>	'Indiquer le nom d\'utilisateur et le mot de passe de votre base de donnÃ©es',
+'Database username'			=>	'Nom d\'utilisateur de base de donnÃ©es',
+'Info 5'				=>	'Indiquer le nom d\'utilisateur et le mot de passe avec lesquels vous vous connectez Ã  la base de donnÃ©es. Ã ignorer pour SQLite.',
+'Database password'			=>	'Mot de passe de base de donnÃ©es',
+'Database enter prefix'			=>	'Indiquer le prÃ©fixe de table de la base de donnÃ©es',
+'Info 6'				=>	'Si vous le souhaitez, vous pouvez spÃ©cifier un prÃ©fixe de table. Ainsi vous pourrez faire fonctionner plusieurs copies de FluxBB dans la mÃªme base de donnÃ©es (exemple : foo_).',
+'Table prefix'				=>	'PrÃ©fixe de table',
+'Administration setup'			=>	'ParamÃ©trage de l\'administration',
+'Info 7'				=>	'Veuillez renseigner les informations demandÃ©es afin de paramÃ©trer un administrateur pour votre installation FluxBB.',
+'Admin enter username'			=>	'Indiquer le nom d\'utilisateur de l\'administrateur',
+'Info 8'				=>	'Le nom d\'utilisateur de l\'administrateur des forums. Vous pourrez crÃ©er davantage d\'administrateurs et de modÃ©rateurs plus tard. Les noms d\'utilisateur peuvent comporter de 2 Ã  25 caractÃšres.',
+'Admin enter password'			=>	'Indiquer et confirmer le mot de passe administrateur',
+'Info 9'				=>	'Les mots de passe doivent comporter au moins 4 caractÃšres. Ils sont sensibles Ã  la casse.',
+'Password'				=>	'Mot de passe',
+'Confirm password'			=>	'Confirmation du mot de passe',
+'Admin enter email'			=>	'Indiquer l\'e-mail de l\'administrateur',
+'Info 10'				=>	'L\'e-mail de l\'administrateur des forums.',
+'Board setup'				=>	'ParamÃ©trage des forums',
+'Info 11'				=>	'Veuillez renseigner les informations demandÃ©es afin de paramÃ©trer vos forums FluxBB.',
+'Enter board title'			=>	'Indiquer le titre des forums',
+'Info 12'				=>	'Le titre de cette plate-forme de discussion (AffichÃ© en haut de chaque page).',
+'Enter board description'		=>	'Indiquer la description des forums',
+'Info 13'				=>	'Une brÃšve description de cette plate-forme de discussion (AffichÃ© en haut de chaque page). Ce champ peut contenir des balises HTML.',
+'Board description'			=>	'Description des forums',
+'Enter base URL'			=>	'Indiquer l\'URL de base de votre installation FluxBB',
+'Info 14'				=>	'L\'URL (sans barre oblique Ã  la fin) de vos forums FluxBB (exemple : http://forum.mondomaine.com ou http://mondomaine.com/~monutilisateur). Ceci <strong>doit</strong> Ãªtre juste, sinon, les administrateurs et les modÃ©rateurs ne pourront pas soumettre de formulaires. Veuillez prendre note que la valeur prÃ©dÃ©finie ci-dessous n\'est qu\'une suggestion de FluxBB.',
+'Choose the default language'	        =>	'Choisir la langue par dÃ©faut',
+'Info 15'				=>	'La langue par dÃ©faut utilisÃ©e pour les invitÃ©s et les utilisateurs qui n\'ont pas optÃ© pour une autre langue dans leur profil.',
+'Default language'			=>	'Langue par dÃ©faut',
+'Choose the default style'		=>	'Choisir le style par dÃ©faut',
+'Info 16'				=>	'Le style par dÃ©faut utilisÃ© pour les invitÃ©s et les utilisateurs qui n\'ont pas optÃ© pour un autre style dans leur profil.',
+'Default style'				=>	'Style par dÃ©faut',
+'Start install'				=>	'DÃ©marrage de l\'installation',
+'DB type not valid'			=>	'Â«&#160;%s&#160;Â» n\'est pas un type de base de donnÃ©es valide',
+'Table prefix error'			=>	'Le prÃ©fixe de table Â«&#160;%s&#160;Â» comporte des cacactÃšres interdits ou est trop long. Le prÃ©fixe peut contenir les lettres de a Ã  z, tout nombre et le caractÃšre de soulignement (underscore). Mais il ne doit pas commencer par un nombre. La taille maximale est de 40 caractÃšres. Veuillez choisir un autre prÃ©fixe.',
+'Prefix reserved'			=>	'Le prÃ©fixe de table Â«&#160;sqlite_&#160;Â» est rÃ©servÃ© pour Ãªtre utilisÃ© par le moteur SQLite. Veuillez choisir un autre prÃ©fixe.',
+'Existing table error'			=>	'Une table nommÃ©e Â«&#160;%susers&#160;Â» est dÃ©jÃ  prÃ©sente dans la base de donnÃ©es Â«&#160;%s&#160;Â». Cela pourrait signifier que FluxBB est dÃ©jÃ  installÃ© ou qu\'une autre application utilise le nom d\'une ou plusieures tables nÃ©cessaires Ã  FluxBB. Si vous souhaitez installer plusieurs copies de FluxBB dans la mÃªme base de donnÃ©es, vous devez choisir un prÃ©fixe de table diffÃ©rent.',
+'InnoDB off'				=>	'InnoDB semble ne pas Ãªtre activÃ©. Veuillez choisir une base de donnÃ©es qui ne prend pas en charge InnoDB ou activez InnoDB sur votre serveur MySQL.',
+'Administrators'			=>	'Administrateurs',
+'Administrator'				=>	'Administrateur',
+'Moderators'				=>	'ModÃ©rateurs',
+'Moderator'				=>	'ModÃ©rateur',
+'Guests'                                =>      'InvitÃ©s',
+'Guest'					=>	'InvitÃ©',
+'New member'				=>	'Nouveau membre',
+'Members'                               =>      'Membres',
+'Member'				=>	'Membre',
+'Announcement'				=>	'Indiquer votre annonce ici.',
+'Rules'					=>	'Indiquer vos rÃšgles ici',
+'Maintenance message'			=>	'Les forums sont temporairement inaccessibles pour maintenance. Veuillez essayer Ã  nouveau dans quelques minutes.',
+'Test post'				=>	'Message de test',
+'Message'				=>	'Si vous lisez ceci (ce que vous faites probablement), l\'installation de FluxBB semble avoir fonctionnÃ© ! A prÃ©sent, identifiez-vous et rendez-vous au panneau d\'administration pour paramÃ©trer vos forums.',
+'Test category'				=>	'CatÃ©gorie de test',
+'Test forum'				=>	'Forum de test',
+'This is just a test forum'		=>	'Ceci n\'est qu\'un forum de test.',
+'Alert cache'				=>	'<strong>Le rÃ©pertoire cache n\'est pas modifiable actuellement !</strong> Pour que FluxBB fonctionne correctement, le rÃ©pertoire nommÃ© <em>%s</em> doit Ãªtre modifiable par PHP. Utilisez chmod pour spÃ©cifier les permissions appropriÃ©es au rÃ©pertoire. Si vous avez un doute, passez le chmod Ã  0777.',
+'Alert avatar'				=>	'<strong>Le rÃ©pertoire avatar n\'est pas modifiable actuellement !</strong> Si vous souhaitez que les utilisateurs puissent envoyer vers le serveur leur propre image avatar, vous devez vÃ©rifier que le rÃ©pertoire nommÃ© <em>%s</em> soit modifiable par PHP. Vous pourrez plus tard choisir d\'enregistrer les images avatar dans un autre rÃ©pertoire (rendez-vous Ã  Admin/Options). Utilisez chmod pour spÃ©cifier les permissions appropriÃ©es au rÃ©pertoire. Si vous avez un doute, passez le chmod Ã  0777.',
+'Alert upload'				=>	'<strong>L\'envoi de fichier semble Ãªtre interdit sur ce serveur !</strong> Si vous souhaitez que les utilisateurs puissent envoyer leur propre image avatar vous devez activer le paramÃštre de configuration file_uploads dans PHP. Une fois que l\'envoi (upload) de fichiers a Ã©tÃ© activÃ©, l\'envoi d\'avatars peut Ãªtre activÃ© dans Administration/Options/FonctionnalitÃ©s.',
+'FluxBB has been installed'		=>	'FluxBB a Ã©tÃ© installÃ©. Pour finaliser l\'installation veuillez suivre les instructions ci-dessous.',
+'Final instructions'			=>	'Instructions finales',
+'Info 17'				=>	'Pour finaliser l\'installation, vous devez cliquer sur le bouton ci-dessous afin de tÃ©lÃ©charger un fichier nommÃ© config.php. Vous devrez ensuite envoyer ce fichier vers le rÃ©pertoire racine de votre installation FluxBB.',
+'Info 18'				=>	'Une fois que vous aurez envoyÃ© config.php vers le serveur, FluxBB sera complÃštement installÃ© ! A ce moment-lÃ  vous pourrez <a href="index.php">vous rendre Ã  la page d\'accueil des forums</a>.',
+'Download config.php file'		=>	'TÃ©lÃ©charger le fichier config.php',
+'FluxBB fully installed'		=>	'FluxBB a Ã©tÃ© complÃštement installÃ© ! Vous pouvez Ã  prÃ©sent <a href="index.php">vous rendre Ã  la page d\'accueil des forums</a>.',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/login.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/login.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/login.php	(revision 4)
@@ -5,18 +5,22 @@
  
 // Miscellaneous
-'Wrong user/pass'		=>	'Identifiant et/ou mot de passe incorrect.',
+'Wrong user/pass'		=>	'Nom d\'utilisateur et/ou mot de passe incorrect.',
 'Forgotten pass'		=>	'Mot de passe oubliÃ©&#160;?',
-'Login redirect'		=>	'Vous Ãªtes maintenant identifiÃ©. Redirection ...',
-'Logout redirect'		=>	'Vous Ãªtes maintenant dÃ©connectÃ©. Redirection ...',
-'No e-mail match'		=>	'Il n`y a pas d\'utilisateur inscrit avec l\'adresse e-mail',
+'Login redirect'		=>	'Vous Ãªtes Ã  prÃ©sent identifiÃ©(e). Redirection&#160;âŠ',
+'Logout redirect'		=>	'Vous Ãªtes Ã  prÃ©sent dÃ©connectÃ©(e). Redirection&#160;âŠ',
+'No email match'		=>	'Aucun utilisateur inscrit n\'utilise cette adresse Ã©lectronique',
 'Request pass'			=>	'Demande de mot de passe',
-'Request pass legend'	=>	'Saisissez l\'adresse e-mail avec laquelle vous vous Ãªtes inscrits',
-'Request pass info'		=>	'Un nouveau mot de passe ainsi que le lien pour activer ce nouveau mot de passe vont Ãªtre envoyÃ©s Ã  cette adresse e-mail.',
-'Not registered'		=>	'Toujours pas inscrit&#160;?',
-'Login legend'			=>	'Saisissez ci-dessous votre nom d\'utilisateur et votre mot de passe',
-'Login info'			=>	'Si vous ne vous Ãªtes jamais inscrits  ou si vous avez oubliÃ© votre mot de passe, veuillez cliquer ci-dessous sur le lien appropriÃ©.',
- 
+'Request pass legend'		=>	'Indiquez l\'adresse Ã©lectronique utilisÃ©e lors de l\'inscription',
+'Request pass info'		=>	'Un nouveau mot de passe ainsi que le lien pour activer ce nouveau mot de passe vont Ãªtre envoyÃ©s Ã  cette adresse.',
+'Not registered'		=>	'Pas encore inscrit&#160;?',
+'Login legend'			=>	'Indiquez ci-dessous votre nom d\'utilisateur et votre mot de passe',
+'Remember me'			=>	'Me connecter automatiquement lors de mes prochaines visites.',
+'Login info'			=>	'Si vous n\'Ãªtes pas encore inscrit(e) ou si vous avez oubliÃ© votre mot de passe, veuillez cliquer sur le lien appropriÃ© ci-dessous.',
+'New password errors'		=>	'Erreur pour demande de mot de passe',
+'New passworderrors info'	=>	'Les erreurs suivantes doivent Ãªtre corrigÃ©es avant qu\'un nouveau mot de passe puisse Ãªtre envoyÃ©&#160;:',
+
 // Forget password mail stuff
-'Forget mail'			=>	'Un e-mail avec les instructions pour changer de mot de passe vient d\'Ãªtre envoyÃ© Ã  l\'adresse indiquÃ©e. Si vous ne le recevez pas, vous pouvez contacter l\'administrateur des forums Ã '
- 
+'Forget mail'			=>	'Un e-mail contenant des instructions pour modifier votre mot de passe vient d\'Ãªtre envoyÃ© Ã  l\'adresse indiquÃ©e. Si vous ne le recevez pas, vous pouvez contacter l\'administrateur des forums&#160;: ',
+'Email flood'			=>	'Une rÃ©initialisation du mot de passe de ce compte a Ã©tÃ© effectuÃ©e il y a moins d\'une heure. Veuillez patienter un moment avant de rÃ©clamer un nouveau mot de passe.'
+
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/activate_email.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/mail_templates/activate_email.tpl	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/activate_email.tpl	(revision 4)
@@ -1,12 +1,12 @@
-Subject: Demande de changement d'adresse e-mail
+Subject: Demande de changement d'adresse Ã©lectronique
 
 Bonjour <username>,
 
-Vous avez fait la demande d'avoir une nouvelle adresse e-mail assignÃ©e Ã  votre compte sur le forum de <base_url>. Si vous n'en avez pas fait la demande ou ne voulez pas en changer, veuillez ignorer ce message. Votre e-mail ne sera changÃ© que si vous visitez la page d'activation ci-dessous. Pour que la page d'activation fonctionne, vous devez Ãªtre identifiÃ© sur le forum.
+Vous avez demandÃ© un changement d'adresse Ã©lectronique associÃ©e Ã  votre compte sur les forums de <base_url>. Si vous n'en avez pas fait la demande ou ne souhaitez finalement pas la modifier, veuillez ignorer ce message. Elle ne sera changÃ© que si vous vous rendez Ã  la page d'activation ci-dessous. Pour que cette activation soit effective, vous devez Ãªtre identifiÃ© sur les forums.
 
-Pour changer votre adresse e-mail, merci de visiter la page suivante:
+Afin de changer votre adresse Ã©lectronique, merci de vous rendre Ã  la page suivante :
 <activation_url>
 
 -- 
 <board_mailer>
-(Ne pas rÃ©pondre a ce message)
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/activate_password.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/mail_templates/activate_password.tpl	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/activate_password.tpl	(revision 4)
@@ -3,12 +3,13 @@
 Bonjour <username>,
 
-Vous avez fait la demande d'avoir un nouveau mot de passe assignÃ© Ã  votre compte sur le forum de <base_url>. Si vous n'en avez pas fait la demande ou ne voulez pas en changer, veuillez ignorer ce message. Votre mot de passe ne sera changÃ© qui si vous visitez la page d'activation ci-dessous. 
+Vous avez demandÃ© un nouveau mot de passe associÃ© Ã  votre compte sur les forums de <base_url>. Si vous n'en avez pas fait la demande ou ne souhaitez finalement pas le modifier, veuillez ignorer ce message. Il ne sera changÃ© que si vous vous rendez Ã  la page d'activation ci-dessous. 
+=======================================================================
+Votre nouveau mot de passe est : <new_password>
+=======================================================================
 
-Votre nouveau mot de passe est : <new_password>
-
-Pour changer votre mot de passe, merci de visiter la page suivante:
+Afin de modifier votre mot de passe, merci de vous rendre Ã  la page suivante :
 <activation_url>
 
 -- 
 <board_mailer>
-(Ne pas rÃ©pondre a ce message)
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_change.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_change.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_change.tpl	(revision 4)
@@ -0,0 +1,9 @@
+Subject: Avertissement - e-mail bannie dÃ©tectÃ©e
+
+L'utilisateur Â« <username> Â» a modifiÃ© son e-mail pour l'adresse e-mail bannie suivante : <email>
+
+Profil utilisateur : <profile_url>
+
+-- 
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_post.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_post.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_post.tpl	(revision 4)
@@ -0,0 +1,9 @@
+Subject: Avertissement - e-mail bannie dÃ©tectÃ©e
+
+L'utilisateur Â« <username> Â» a publiÃ© un messsage en utilisant l'adresse e-mail bannie suivante : <email>
+
+URL du message : <post_url>
+
+-- 
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_register.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_register.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/banned_email_register.tpl	(revision 4)
@@ -0,0 +1,9 @@
+Subject: Avertissement - e-mail bannie dÃ©tectÃ©e
+
+L'utilisateur Â« <username> Â» s'est inscrit avec l'adresse e-mail bannie suivante : <email>
+
+Profil utilisateur : <profile_url>
+
+-- 
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/dupe_email_change.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/dupe_email_change.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/dupe_email_change.tpl	(revision 4)
@@ -0,0 +1,9 @@
+Subject: Avertissement - e-mail en doublon dÃ©tectÃ©e
+
+L'utilisateur Â« <username> Â» a modifiÃ© son e-mail pour l'adresse e-mail appartenant Ã©galement Ã  : <dupe_list>
+
+Profil utilisateur : <profile_url>
+
+-- 
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/dupe_email_register.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/dupe_email_register.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/dupe_email_register.tpl	(revision 4)
@@ -0,0 +1,9 @@
+Subject: Avertissement - e-mail en doublon dÃ©tectÃ©e
+
+L'utilisateur Â« <username> Â» s'est inscrit avec l'adresse e-mail appartenant Ã©galement Ã  : <dupe_list>
+
+Profil utilisateur : <profile_url>
+
+-- 
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/form_email.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/mail_templates/form_email.tpl	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/form_email.tpl	(revision 4)
@@ -1,12 +1,12 @@
 Subject: <mail_subject>
 
-<sender> de <board_title> vous a envoyÃ© un message. Vous pouvez rÃ©pondre Ã  <sender> en rÃ©pondant Ã  cet e-mail.
+<sender> vous a envoyÃ© un message Ã  partir de <board_title>. Vous pouvez rÃ©pondre Ã  <sender> en rÃ©pondant Ã  cet e-mail.
 
-Contenu du message:
------------------------------------------------------------------------
+Contenu du message :
+=======================================================================
 
 <mail_message>
 
------------------------------------------------------------------------
+=======================================================================
 
 -- 
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/index.html
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/mail_templates/index.html	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/index.html	(revision 4)
@@ -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.1/web/punbb/lang/French/mail_templates/new_reply.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/mail_templates/new_reply.tpl	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_reply.tpl	(revision 4)
@@ -1,11 +1,11 @@
-Subject: RÃ©ponse Ã  la discussion : <topic_subject>
+Subject: RÃ©ponse Ã  la discussion Â« <topic_subject> Â»
 
-<replier> a rÃ©pondu Ã  la discussion <topic_subject> Ã  laquelle vous avez souscrit. Il se peut qu'il y ait plus de nouvelles rÃ©ponses, mais ce sera la seule notification d'ici Ã  ce que vous vous reconnectiez sur le forum.
+<replier> a rÃ©pondu Ã  la discussion Â« <topic_subject> Â» que vous suivez. Il se peut qu'il y ait davantage de nouvelles rÃ©ponses, mais ce sera la seule notification tant que vous ne vous serez pas rendu(e) Ã  nouveau aux forums.
 
-Le message est situÃ© <post_url>
+Le message est situÃ© ici : <post_url>
 
-Vous pouvez vous dÃ©sabonner ici <unsubscribe_url>
+Vous pouvez interrompre le suivi de cette discussion en cliquant ici : <unsubscribe_url>
 
 -- 
 <board_mailer>
-(Ne pas rÃ©pondre a ce message)
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_reply_full.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/mail_templates/new_reply_full.tpl	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_reply_full.tpl	(revision 4)
@@ -1,18 +1,18 @@
-Subject: RÃ©ponse Ã  la discussion: <topic_subject>
+Subject: RÃ©ponse Ã  la discussion Â« <topic_subject> Â»
 
-<replier> a rÃ©pondu Ã  la discussion <topic_subject> Ã  laquelle vous avez souscrit. Il se peut qu'il y ait plus de nouvelles rÃ©ponses, mais ce sera la seule notification d'ici Ã  ce que vous vous reconnectiez sur le forum.
+<replier> a rÃ©pondu Ã  la discussion Â« <topic_subject> Â» que vous suivez. Il se peut qu'il y ait davantage de nouvelles rÃ©ponses, mais ce sera la seule notification tant que vous ne vous serez pas rendu(e) Ã  nouveau aux forums.
 
-Contenu du message:
------------------------------------------------------------------------
+Contenu du message :
+=======================================================================
 
 <message>
 
------------------------------------------------------------------------
+=======================================================================
 
-Le message est situÃ© <post_url>
+Le message est situÃ© ici : <post_url>
 
-Vous pouvez vous dÃ©sabonner ici <unsubscribe_url>
+Vous pouvez interrompre le suivi de cette discussion en cliquant ici : <unsubscribe_url>
 
 -- 
 <board_mailer>
-(Ne pas rÃ©pondre a ce message)
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_report.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_report.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_report.tpl	(revision 4)
@@ -0,0 +1,9 @@
+Subject: Signalement(<forum_id>) - Â« <topic_subject> Â»
+
+L'utilisateur Â« <username> Â» a signalÃ© le message suivant : <post_url>
+
+Motif : <reason>
+
+--
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_topic.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_topic.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_topic.tpl	(revision 4)
@@ -0,0 +1,11 @@
+Subject: Nouvelle discussion dans le forum Â« <forum_name> Â»
+
+<poster> a lancÃ© une nouvelle discussion intitulÃ©e Â« <topic_subject> Â» dans le forum Â« <forum_name> Â» que vous suivez.
+
+La discussion se trouve ici : <topic_url>
+
+Vous pouvez interrompre le suivi en cliquant ici : <unsubscribe_url>
+
+--
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_topic_full.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_topic_full.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_topic_full.tpl	(revision 4)
@@ -0,0 +1,18 @@
+Subject: Nouvelle discussion dans le forum Â« <forum_name> Â»
+
+<poster> a lancÃ© une nouvelle discussion intitulÃ©e Â« <topic_subject> Â» dans le forum Â« <forum_name> Â» que vous suivez.
+
+Contenu du message :
+=======================================================================
+
+<message>
+
+=======================================================================
+
+La discussion se trouve ici : <topic_url>
+
+Vous pouvez interrompre le suivi en cliquant ici : <unsubscribe_url>
+
+--
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_user.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_user.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/new_user.tpl	(revision 4)
@@ -0,0 +1,9 @@
+Subject: Avertissement - nouvelle inscription
+
+L'utilisateur Â« <username> Â» s'est inscrit dans les forums de <base_url>
+
+Profil utilisateur : <profile_url>
+
+--
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/rename.tpl
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/rename.tpl	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/rename.tpl	(revision 4)
@@ -0,0 +1,12 @@
+Subject: Compte utilisateur renommÃ©
+
+Lors d'une mise Ã  jour des forums sur <base_url> il a Ã©tÃ© dÃ©terminÃ© que votre nom d'utilisateur est trop proche d'un autre existant dÃ©jÃ . Il a donc Ã©tÃ© modifiÃ© de la maniÃšre suivante.
+
+Ancien nom d'utilisateur : <old_username>
+Nouveau nom d'utilisateur : <new_username>
+
+Nous vous prions de nous excuser pour les dÃ©sagrÃ©ments causÃ©s.
+
+--
+<board_mailer>
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/welcome.tpl
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/mail_templates/welcome.tpl	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/mail_templates/welcome.tpl	(revision 4)
@@ -1,12 +1,13 @@
 Subject: Bienvenue sur <board_title> !
 
-Merci de vous Ãªtre inscrit sur les forums <base_url>. Les dÃ©tails de votre compte sont :
-
+Merci de vous Ãªtre inscrit(e) sur <base_url>. Voici les informations concernant votre compte :
+=======================================================================
 Nom d'utilisateur : <username>
 Mot de passe      : <password>
+=======================================================================
 
-Allez Ã  <login_url> pour activer votre compte.
+Veuillez vous rendre Ã  <login_url> pour activer votre compte.
 
 -- 
 <board_mailer>
-(Ne pas rÃ©pondre a ce message)
+(Veuillez ne pas rÃ©pondre Ã  ce message. Merci !)
Index: branches/rsr.v5.1.1/web/punbb/lang/French/misc.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/misc.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/misc.php	(revision 4)
@@ -4,64 +4,90 @@
 $lang_misc = array(
  
-'Mark read redirect'    	=>	'Tous les messages et forums ont Ã©tÃ© marquÃ©s comme lus. Redirection ...',
- 
+'Mark read redirect'    	=>	'Toutes les discussions et forums ont Ã©tÃ© marquÃ©s comme lus. Redirection&#160;âŠ',
+'Mark forum read redirect'	=>	'Toutes les discussions du forum spÃ©cifiÃ© ont Ã©tÃ© marquÃ©es comme lues. Redirection&#160;âŠ',
+
 // Send e-mail
-'Form e-mail disabled'		=>	'L\'utilisateur Ã  qui vous essayez d\'envoyer un e-mail a dÃ©sactivÃ© le formulaire e-mail.',
-'No e-mail subject'			=>	'Vous devez saisir un sujet.',
-'No e-mail message'			=>	'Vous devez saisir un message.',
-'Too long e-mail message'	=>	'Les messages ne peuvent excÃ©der 65535 caractÃšres de long (64 ko).',
-'E-mail sent redirect'		=>	'E-mail envoyÃ©. Redirection ...',
-'Send e-mail to'			=>	'Envoyer un e-mail Ã ',
-'E-mail subject'			=>	'Sujet',
-'E-mail message'			=>	'Message',
-'E-mail disclosure note'	=>	'Veuillez noter qu\'en utilisant ce formulaire, votre adresse e-mail sera rÃ©vÃ©lÃ©e au destinataire.',
-'Write e-mail'				=>	'Ãcrivez et envoyez votre e-mail',
+'Form email disabled'		=>	'L\'utilisateur Ã  qui vous essayez d\'envoyer un e-mail a dÃ©sactivÃ© le formulaire e-mail.',
+'No email subject'		=>	'Vous devez indiquer un sujet.',
+'No email message'		=>	'Vous devez saisir un message.',
+'Too long email message'	=>	'Les messages ne peuvent contenir plus de 65535 caractÃšres (64 Kio).',
+'Email flood'			=>	'L\'intervalle d\'envoi consÃ©cutif d\'e-mails est de %s secondes. Veuillez patienter un moment avant de tenter d\'envoyer Ã  nouveau.',
+'Email sent redirect'		=>	'E-mail envoyÃ©. Redirection&#160;âŠ',
+'Send email to'			=>	'Envoyer un e-mail Ã ',
+'Email subject'			=>	'Sujet',
+'Email message'			=>	'Message',
+'Email disclosure note'		=>	'Veuillez prendre note qu\'en utilisant ce formulaire, vous divulguerez votre adresse Ã©lectronique au destinataire.',
+'Write email'			=>	'Composez et envoyez votre e-mail',
  
 // Report
-'No reason'					=>	'Vous devez saisir un motif.',
-'Report redirect'			=>	'Signalement envoyÃ©. Redirection ...',
-'Report post'				=>	'Signaler un message',
-'Reason'					=>	'Motif',
-'Reason desc'				=>	'Saisissez le motif du signalement de ce message.',
+'No reason'			=>	'Vous devez indiquer un motif.',
+'Reason too long'		=>	'Votre message ne doit pas dÃ©passer 65535 octets (~64 Kio).',
+'Report flood'			=>	'L\'intervalle d\'envoi consÃ©cutif de signalements est de %s secondes. Veuillez patienter un moment avant de tenter d\'envoyer Ã  nouveau.',
+'Report redirect'		=>	'Message signalÃ©. RedirectionâŠ',
+'Report post'			=>	'Signaler un message',
+'Reason'			=>	'Motif',
+'Reason desc'			=>	'Indiquez la raison pour laquelle vous signalez ce message.',
  
 // Subscriptions
-'Already subscribed'		=>	'Vous Ãªtes dÃ©jÃ  abonnÃ© Ã  cette discussion.',
-'Subscribe redirect'		=>	'Votre abonnement a Ã©tÃ© pris en compte. Redirection ...',
-'Not subscribed'			=>	'Vous n\'Ãªtes pas abonnÃ© Ã  cette discussion.',
-'Unsubscribe redirect'		=>	'Votre abonnement a Ã©tÃ© annulÃ©. Redirection ...',
+'Already subscribed topic'      =>      'Vous suivez dÃ©jÃ  cette discussion.',
+'Already subscribed forum'      =>      'Vous suivez dÃ©jÃ  ce forum.',
+'Subscribe redirect'		=>	'Votre demande de suivi a Ã©tÃ© prise en compte. Redirection&#160;âŠ',
+'Not subscribed topic'		=>	'Vous ne suivez pas cette discussion.',
+'Not subscribed forum'		=>	'Vous ne suivez pas ce forum.',
+'Unsubscribe redirect'		=>	'Vous ne suivez plus cette discussion. Redirection&#160;âŠ',
  
 // General forum and topic moderation
-'Moderate'					=>	'ModÃ©rer',
-'Select'					=>	'SÃ©lectionner',  // the header of a column of checkboxes
-'Move'						=>	'DÃ©placer',
-'Delete'					=>	'Supprimer',
- 
+'Moderate'			=>	'ModÃ©rer',
+'Select'			=>	'SÃ©lectionner',  // the header of a column of checkboxes
+'Move'				=>	'DÃ©placer',
+'Split'				=>	'Scinder',
+'Delete'			=>	'Supprimer',
+'Merge'				=>	'Fusionner',
+
 // Moderate forum
-'Open'						=>	'Ouvrir',
-'Close'						=>	'Fermer',
-'Move topic'				=>	'DÃ©placer la discussion',
-'Move topics'				=>	'DÃ©placer les discussions',
-'Move legend'				=>	'Choisissez une destination',
-'Move to'					=>	'DÃ©placer vers',
-'Leave redirect'			=>	'Laisser un lien de redirection',
-'Move topic redirect'		=>	'Discussion dÃ©placÃ©e. Redirection ...',
-'Move topics redirect'		=>	'Discussions dÃ©placÃ©es. Redirection ...',
+'Open'				=>	'Ouvrir',
+'Close'				=>	'Fermer',
+'Move topic'			=>	'DÃ©placer la discussion',
+'Move topics'			=>	'DÃ©placer les discussions',
+'Move legend'			=>	'Choisissez une destination',
+'Move to'			=>	'DÃ©placer vers',
+'Nowhere to move'		=>	'Aucun forum n\'est disponible pour y dÃ©placer des discussions.',
+'Leave redirect'		=>	'Laisser un lien de redirection',
+'Move topic redirect'		=>	'Discussion dÃ©placÃ©e. Redirection&#160;âŠ',
+'Move topics redirect'		=>	'Discussions dÃ©placÃ©es. Redirection&#160;âŠ',
 'Confirm delete legend'		=>	'Veuillez confirmer la suppression',
-'Delete topics'				=>	'Supprimer des discussions',
-'Delete topics comply'		=>	'Ãtes-vous sÃ»r de vouloir supprimer les discussions sÃ©lectionnÃ©es&#160;?',
-'Delete topics redirect'	=>	'Discussions supprimÃ©es. Redirection ...',
-'Open topic redirect'       =>  'Discussion ouverte. Redirection ...',
-'Open topics redirect'      =>  'Discussions ouvertes. Redirection ...',
-'Close topic redirect'		=>	'Discussion fermÃ©e. Redirection ...',
-'Close topics redirect'		=>	'Discussions fermÃ©es. Redirection ...',
-'No topics selected'		=>	'Vous devez choisir au moins une discussion Ã  DÃ©placer/Supprimer/Ouvrir/Fermer.',
-'Stick topic redirect'		=>	'Discussion Ã©pinglÃ©e. Redirection ...',
-'Unstick topic redirect'	=>	'Discussion dÃ©tachÃ©e. Redirection ...',
- 
+'Delete topics'			=>	'Supprimer des discussions',
+'Delete topics comply'		=>	'Souhaitez-vous vraiment supprimer les discussions sÃ©lectionnÃ©es&#160;?',
+'Delete topics redirect'	=>	'Discussions supprimÃ©es. Redirection&#160;âŠ',
+'Open topic redirect'       	=>  	'Discussion ouverte. Redirection&#160;âŠ',
+'Open topics redirect'     	=>  	'Discussions ouvertes. Redirection&#160;âŠ',
+'Close topic redirect'		=>	'Discussion fermÃ©e. Redirection&#160;âŠ',
+'Close topics redirect'		=>	'Discussions fermÃ©es. Redirection&#160;âŠ',
+'No topics selected'		=>	'Vous devez choisir au moins une discussion Ã  dÃ©placer/supprimer/ouvrir/fermer.',
+'Not enough topics selected'	=>	'Vous devez sÃ©lectionner au moins 2 discussions pour une fusion.',
+'Stick topic redirect'		=>	'Discussion Ã©pinglÃ©e. Redirection&#160;âŠ',
+'Unstick topic redirect'	=>	'Discussion dÃ©tachÃ©e. Redirection&#160;âŠ',
+'Merge topics'			=>	'Fusionner les discussions',
+'Merge topics redirect'		=>	'Discussions fusionnÃ©es. Redirection&#160;âŠ',
+'Confirm merge legend'		=>	'Veuillez confirmer la fusion',
+'New subject'			=>	'Nouveau sujet',
+
+// Split multiple posts in topic
+'Confirm split legend'		=>	'Veuillez confirmer la scission des messages sÃ©lectionnÃ©s et choisir leur destination pour dÃ©placement.',
+'Split posts'			=>	'Scinder les messages',
+'Split posts comply'		=>	'Souhaitez-vous vraiment scinder les messages sÃ©lectionnÃ©s&#160;?',
+'Split posts redirect'		=>	'Les messages ont Ã©tÃ© scindÃ©s. Redirection&#160;âŠ',
+
 // Delete multiple posts in topic
-'Delete posts'				=>	'Supprimer les messages',
-'Delete posts comply'		=>	'Ãtes vous sÃ»r de vouloir supprimer les messages sÃ©lectionnÃ©s&#160;?',
-'Delete posts redirect'		=>	'Messages supprimÃ©s. Redirection ...',
-'No posts selected'			=>	'Vous devez choisir au moins un message Ã  supprimer.'
+'Delete posts'			=>	'Supprimer les messages',
+'Cannot select first'		=>	'Le premier message ne peut pas Ãªtre sÃ©lectionnÃ© pour Ãªtre scindÃ©/supprimÃ©.',
+'Delete posts comply'		=>	'Souhaitez-vous vraiment supprimer les messages sÃ©lectionnÃ©s&#160;?',
+'Delete posts redirect'		=>	'Messages supprimÃ©s. Redirection&#160;âŠ',
+'No posts selected'		=>	'Vous devez choisir au moins un message Ã  scinder/supprimer.',
+
+// Get host
+'Host info 1'			=>	'L\'adresse IP est&#160;: %s',
+'Host info 2'			=>	'Le nom d\'hÃŽte est&#160;: %s',
+'Show more users'		=>	'Afficher davantage d\'utilisateurs pour cette IP',
  
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/post.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/post.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/post.php	(revision 4)
@@ -5,29 +5,35 @@
  
 // Post validation stuff (many are similiar to those in edit.php)
-'No subject'			=>	'Vous devez saisir un sujet.',
+'No subject'			=>	'Vous devez indiquer un sujet.',
+'No subject after censoring'    =>      'Les discussions doivent comporter un sujet. AprÃšs application des filtres de censure, le sujet n\'est pas indiquÃ©.',
 'Too long subject'		=>	'Le sujet ne peut contenir plus de 70 caractÃšres.',
 'No message'			=>	'Vous devez saisir un message.',
-'Too long message'		=>	'Les messages ne peuvent excÃ©der 65535 caractÃšres de long (64 ko).',
- 
+'No message after censoring'    =>      'Vous devez saisir un message. AprÃšs application des filtres de censure, votre message est vide.',
+'Too long message'		=>	'Les messages ne peuvent contenir plus de %s octets.',
+'All caps subject'  		=>  	'Il n\'est pas autorisÃ© d\'Ã©crire un sujet entiÃšrement en lettres capitales.',
+'All caps message'  		=>  	'Il n\'est pas autorisÃ© d\'Ã©crire un message entiÃšrement en lettres capitales.',
+'Empty after strip'	        =>	'Il semblerait que votre message ne comporte que des balises BBCode vides. Il est possible que cela se soit passÃ© par exemple parce que la citation imbriquÃ©e la plus ancienne a Ã©tÃ© supprimÃ© pour cause de niveau d\'imbrication de citations supÃ©rieur Ã  celui autorisÃ©.',
+
 // Posting
-'Post errors'			=>	'Erreurs',
+'Post errors'			=>	'Erreurs dans le message',
 'Post errors info'		=>	'Les erreurs suivantes doivent Ãªtre corrigÃ©es pour que le message puisse Ãªtre envoyÃ©&#160;:',
 'Post preview'			=>	'PrÃ©visualisation du message',
 'Guest name'			=>	'Nom',	// For guests (instead of Username)
-'Post redirect'			=>	'Message envoyÃ©. Redirection ...',
-'Post a reply'			=>	'Ãcrire une rÃ©ponse',
-'Post new topic'		=>	'Lancer une nouvelle discussion',
-'Hide smilies'			=>	'Ne pas convertir les Ã©moticÃŽnes sur ce message',
-'Subscribe'				=>	'S\'abonner Ã  cette discussion',
+'Post redirect'			=>	'Message envoyÃ©. Redirection&#160;âŠ',
+'Post a reply'			=>	'RÃ©pondre',
+'Post new topic'		=>	'Nouvelle discussion',
+'Hide smilies'			=>	'Ne pas convertir les Ã©moticÃŽnes dans ce message',
+'Subscribe'			=>	'Suivre cette discussion',
+'Stay subscribed'   		=>  	'Continuer Ã  suivre cette discussion',
 'Topic review'			=>	'RÃ©sumÃ© de la discussion (messages les plus rÃ©cents en premier)',
 'Flood start'			=>	'Au moins',
-'flood end'				=>	'secondes doivent s\'Ã©couler entre deux messages. Merci de patienter quelques instants et essayer Ã  nouveau.',
-'Preview'				=>	'PrÃ©visualisation',	// submit button to preview message
+'flood end'			=>	'secondes doivent s\'Ã©couler entre deux messages. Veuillez patienter quelques instants avant d\'essayer Ã  nouveau.',
+'Preview'			=>	'PrÃ©visualisation',	// submit button to preview message
  
 // Edit post
-'Edit post legend'		=>	'Modifier le message et valider les changements',
-'Silent edit'			=>	'Modification invisible (la mention "DerniÃšre modification par ..." ne s\'affichera pas)',
-'Edit post'				=>	'Modifier le message',
-'Edit redirect'			=>	'Message mis Ã  jour. Redirection ...'
+'Edit post legend'		=>	'Modifier le message et valider les modifications',
+'Silent edit'			=>	'Modification anonyme (la mention Â«&#160;DerniÃšre modification parâŠ&#160;Â» ne s\'affichera pas)',
+'Edit post'			=>	'Modifier le message',
+'Edit redirect'			=>	'Message mis Ã  jour. Redirection&#160;âŠ'
  
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/prof_reg.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/prof_reg.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/prof_reg.php	(revision 4)
@@ -4,36 +4,76 @@
 $lang_prof_reg = array(
  
-'E-mail legend'				=>	'Saisissez une adresse e-mail valide',
-'E-mail legend 2'			=>	'Saisissez et confirmez une adresse e-mail valide',
-'Localisation legend'		=>	'RÃ©glez vos options gÃ©ographiques',
-'Timezone'					=>	'Fuseau horaire&#160;',
-'Timezone info'				=>	'Afin que le forum affiche correctement l\'heure, vous devez sÃ©lectionner votre fuseau horaire.',
-'Language'					=>	'Langue&#160;',
-'Language info'				=>	'Vous pouvez choisir la langue dans laquelle vous souhaitez lire les forums.',
-'E-mail setting info'		=>	'Choisissez si vous voulez que votre adresse e-mail soit visible par les autres utilisateurs ou non et si vous voulez que les autres utilisateurs puissent vous envoyer des e-mails via ces forums (formulaire e-mail) ou non.',
-'E-mail setting 1'			=>	'Afficher votre adresse e-mail.',
-'E-mail setting 2'			=>	'Cacher votre adresse e-mail mais autoriser le formulaire e-mail.',
-'E-mail setting 3'			=>	'Cacher votre adresse e-mail et interdisez le formulaire e-mail.',
-'Privacy options legend'	=>	'RÃ©glez vos options de vie privÃ©e',
-'Save user/pass'			=>	'MÃ©moriser le nom d\'utilisateur et le mot de passe entre les visites.',
-'Save user/pass info'		=>	'Cette option dÃ©finit si le forum doit vous "mÃ©moriser" entre deux visites. Si vous l\'activez, vous n\'aurez pas Ã  vous identifier Ã  chaque fois que vous visitez les forums. Vous serez automatiquement connectÃ©s. RecommandÃ©.',
-'Confirm pass'				=>	'Confirmez votre mot de passe',
+'Email legend'			=>	'Indiquez une adresse Ã©lectronique valide',
+'Email legend 2'		=>	'Saisissez et confirmez une adresse Ã©lectronique valide',
+'Localisation legend'		=>	'DÃ©finissez vos options gÃ©ographiques',
+'Time zone'			=>	'Fuseau horaire&#160;',
+'Time zone info'		=>	'Afin que le forum affiche correctement l\'heure, vous devez sÃ©lectionner votre fuseau horaire.',
+'DST'				=>	'Ajustement pour l\'heure d\'Ã©tÃ©&#160;: cochez cette case si nÃ©cessaire pour que les forums affichent correctement l\'heure.',
+'Time format'			=>	'Format de l\'heure',
+'Date format'			=>	'Format de la date',
+'Default'			=>	'Par dÃ©faut',
+'Language'			=>	'Langue&#160;',
+'Email setting info'		=>	'Indiquez si vous souhaitez que votre adresse Ã©lectronique soit visible par les autres utilisateurs ou non et si vous voulez que les autres utilisateurs puissent vous envoyer des e-mails via ces forums (formulaire d\'envoi d\'e-mail) ou non.',
+'Email setting 1'		=>	'Divulguer votre adresse Ã©lectronique.',
+'Email setting 2'		=>	'Masquer votre adresse Ã©lectronique mais autoriser l\'envoi via le formulaire d\'envoi d\'e-mail.',
+'Email setting 3'		=>	'Masquer votre adresse Ã©lectronique et interdire l\'utilisation du formulaire d\'envoi d\'e-mail.',
+'Privacy options legend'	=>	'DÃ©finissez vos options de vie privÃ©e',
+'Confirm pass'			=>	'Confirmez votre mot de passe',
  
-'Username too short'		=>	'Les noms d\'utilisateur doivent Ãªtres constituÃ©s d\'au moins 2 caractÃšres. Veuillez choisir un autre nom d\'utilisateur.',
-'Username guest'			=>	'Le nom d\'utilisateur \'invitÃ©\' est rÃ©servÃ©. Veuillez choisir un autre nom d\'utilisateur.',
-'Username IP'				=>	'Les noms d\'utilisateur ne peuvent pas Ãªtres au format d\'une adresse IP. Veuillez choisir un autre nom d\'utilisateur.',
+'Username too short'		=>	'Les noms d\'utilisateur doivent comporter au moins 2 caractÃšres. Veuillez choisir un autre nom d\'utilisateur.',
+'Username too long'		=>	'Les noms d\'utilisateur ne doivent pas comporter plus de 25 caractÃšres. Veuillez choisir un autre nom d\'utilisateur.',
+'Username guest'		=>	'Le nom d\'utilisateur Â«&#160;invitÃ©&#160;Â» est rÃ©servÃ©. Veuillez choisir un autre nom d\'utilisateur.',
+'Username IP'			=>	'Les noms d\'utilisateur ne peuvent pas Ãªtre au format d\'une adresse IP. Veuillez choisir un autre nom d\'utilisateur.',
 'Username reserved chars'	=>	'Les noms d\'utilisateurs ne peuvent pas contenir les caractÃšres \', " et [ ou ]. Veuillez choisir un autre nom d\'utilisateur.',
-'Username BBCode'			=>	'Les noms d\'utilisateur ne peuvent pas contenir de balises (BBCode). Veuillez choisir un autre nom d\'utilisateur.',
-'Dupe username'				=>	'Ce nom d\'utilisateur est dÃ©jÃ  utilisÃ©. Veuillez choisir un autre nom d\'utilisateur.',
-'Pass too short'			=>	'Les mots de passe doivent Ãªtres constituÃ©s d\'au moins 4 caractÃšres. Veuillez choisir un autre mot de passe.',
-'Pass not match'			=>	'Les mots de passe ne correspondent pas. Veuillez recommencer.',
-'Banned e-mail'				=>	'L\'adresse e-mail saisie est bannie de ces forums. Veuillez en choisir une autre.',
-'Dupe e-mail'				=>	'Cette adresse e-mail est dÃ©jÃ  utilisÃ©e. Veuillez en choisir une autre.',
-'Sig too long'				=>	'Les signatures ne peuvent pas contenir plus de',
-'characters'				=>	'caractÃšres',
-'Sig too many lines'		=>	'Les signatures ne peuvent pas faire plus de',
-'lines'						=>	'lignes',
-'Signature quote/code'		=>	'Les balises BBCode \'QUOTE\' et \'CODE\' ne sont pas autorisÃ©es dans les signatures. Veuillez corriger.',
-'Bad ICQ'					=>	'Vous avez saisi un UIN ICQ invalide. Merci de corriger.'
- 
+'Username BBCode'		=>	'Les noms d\'utilisateur ne peuvent pas contenir de balises (BBCode). Veuillez choisir un autre nom d\'utilisateur.',
+'Banned username'		=>	'Le nom d\'utilisateur que vous avez indiquÃ© est banni. Veuillez choisir un autre nom d\'utilisateur.',
+'Pass too short'		=>	'Les mots de passe doivent comporter au moins 4 caractÃšres. Veuillez choisir un autre mot de passe.',
+'Pass not match'		=>	'Les mots de passe ne coÃ¯ncident pas. Veuillez recommencer.',
+'Banned email'			=>	'L\'adresse Ã©lectronique saisie est bannie de ces forums. Veuillez en choisir une autre.',
+'Dupe email'			=>	'Cette adresse Ã©lectronique est dÃ©jÃ  utilisÃ©e. Veuillez en choisir une autre.',
+'Sig too long'			=>	'Les signatures ne peuvent pas contenir plus de %1$s caractÃšres. Veuillez raccourcir votre signature de %2$s caractÃšres.',
+'Sig too many lines'		=>	'Les signatures ne peuvent pas comporter plus de %s lignes.',
+'Bad ICQ'			=>	'Vous avez saisi un UIN ICQ invalide. Merci de corriger.',
+
+'UTC-12:00'			=>	'(UTC-12:00) Ligne de changement de date OUEST',
+'UTC-11:00'			=>	'(UTC-11:00) Niue, Samoa',
+'UTC-10:00'			=>	'(UTC-10:00) Hawaii et des Ã®les AlÃ©outiennes, Ãles Cook',
+'UTC-09:30'			=>	'(UTC-09:30) Ãles Marquises',
+'UTC-09:00'			=>	'(UTC-09:00) Alaska, Ãles Gambier',
+'UTC-08:30'			=>	'(UTC-08:30) Ãles Pitcairn',
+'UTC-08:00'			=>	'(UTC-08:00) Pacifique',
+'UTC-07:00'			=>	'(UTC-07:00) Montagnes, les Rocheuses',
+'UTC-06:00'			=>	'(UTC-06:00) Centre',
+'UTC-05:00'			=>	'(UTC-05:00) Est',
+'UTC-04:00'			=>	'(UTC-04:00) Atlantique',
+'UTC-03:30'			=>	'(UTC-03:30) Terre-Neuve',
+'UTC-03:00'			=>	'(UTC-03:00) Amazone, Centre du Groenland',
+'UTC-02:00'			=>	'(UTC-02:00) Milieu de l\'Atlantique',
+'UTC-01:00'			=>	'(UTC-01:00) AÃ§ores, Cap Vert, Groenland de l\'Est',
+'UTC'				=>	'(UTC) Europe Occidentale, Greenwich',
+'UTC+01:00'			=>	'(UTC+01:00) Europe Centrale, Afrique Occidentale',
+'UTC+02:00'			=>	'(UTC+02:00) Europe de l\'Est, Afrique Centrale',
+'UTC+03:00'			=>	'(UTC+03:00) Moscou, Afrique Orientale',
+'UTC+03:30'			=>	'(UTC+03:30) Iran',
+'UTC+04:00'			=>	'(UTC+04:00) Golf, Samara',
+'UTC+04:30'			=>	'(UTC+04:30) Afghanistan',
+'UTC+05:00'			=>	'(UTC+05:00) Pakistan, Iekaterinbourg',
+'UTC+05:30'			=>	'(UTC+05:30) Inde, Sri Lanka',
+'UTC+05:45'			=>	'(UTC+05:45) NÃ©pal',
+'UTC+06:00'			=>	'(UTC+06:00) Bangladesh, Bhutan, Novosibirsk',
+'UTC+06:30'			=>	'(UTC+06:30) Ãles Cocos, Myanmar',
+'UTC+07:00'			=>	'(UTC+07:00) Indochine, Krasnoyarsk',
+'UTC+08:00'			=>	'(UTC+08:00) Grande Chin, Australie occidentale, Irkutsk',
+'UTC+08:45'			=>	'(UTC+08:45) Australie occidentale',
+'UTC+09:00'			=>	'(UTC+09:00) Japon, CorÃ©e, Chine',
+'UTC+09:30'			=>	'(UTC+09:30) Australie MÃ©ridionale',
+'UTC+10:00'			=>	'(UTC+10:00) Australie Orientale, Vladivostok',
+'UTC+10:30'			=>	'(UTC+10:30) Ãle Lord Howe',
+'UTC+11:00'			=>	'(UTC+11:00) Ãle Salomon, Magadan',
+'UTC+11:30'			=>	'(UTC+11:30) Ãle Norfolk',
+'UTC+12:00'			=>	'(UTC+12:00) Nouvelle ZÃ©lande, Fiji, Kamchatka',
+'UTC+12:45'			=>	'(UTC+12:45) Ãles Chatham',
+'UTC+13:00'			=>	'(UTC+13:00) Tonga, Ãles Phoenix',
+'UTC+14:00'			=>	'(UTC+14:00) Ãles de la Ligne',
+
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/profile.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/profile.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/profile.php	(revision 4)
@@ -5,140 +5,137 @@
  
 // Navigation and sections
-'Profile menu'				=>	'Menu profil',
-'Section essentials'		=>	'GÃ©nÃ©ral',
-'Section personal'			=>	'Personnel',
-'Section messaging'			=>	'Messagerie',
-'Section personality'		=>	'Personnalisation',
-'Section display'			=>	'Affichage',
-'Section privacy'			=>	'Vie privÃ©e',
-'Section admin'				=>	'Administration',
+'Profile menu'			=>	'Menu profil',
+'Section essentials'		=>	'Principal',
+'Section personal'		=>	'Personnel',
+'Section messaging'		=>	'Messagerie',
+'Section personality'		=>	'PersonnalitÃ©',
+'Section display'		=>	'Affichage',
+'Section privacy'		=>	'Vie privÃ©e',
+'Section admin'			=>	'Administration',
  
 // Miscellaneous
 'Username and pass legend'	=>	'Nom d\'utilisateur et mot de passe',
 'Personal details legend'	=>	'Informations personnelles',
-'Contact details legend'	=>	'Informations de messageries instantanÃ©es',
-'Options display'			=>	'Options d\'affichage',
-'Options post'				=>	'Options de visualisation des messages',
-'User activity'				=>	'ActivitÃ© de l\'utilisateur',
-'Paginate info'				=>	'Nombres de discussions et de messages a afficher par page.',
+'Contact details legend'	=>	'Informations sur les messageries instantanÃ©es',
+'User activity'			=>	'ActivitÃ© de l\'utilisateur',
+'Paginate info'			=>	'Nombres de discussions et de messages Ã  afficher par page.',
  
 // Password stuff
-'Pass key bad'				=>	'La clef d\'activation du mot de passe est incorrecte ou a expirÃ©. Veuillez demander Ã  nouveau un mot de passe. Si cela Ã©choue, contactez l\'administrateur',
-'Pass updated'				=>	'Votre mot de passe a Ã©tÃ© mis Ã  jour. Vous pouvez vous identifier avec votre nouveau mot de passe.',
-'Pass updated redirect'		=>	'Mot de passe mis Ã  jour. Redirection ...',
-'Wrong pass'				=>	'Ancien mot de passe incorrect.',
-'Change pass'				=>	'Changer de mot de passe',
+'Pass key bad'			=>	'La clef d\'activation du mot de passe est incorrecte ou a expirÃ©. Veuillez demander un nouveau mot de passe. Si cela ne marche pas, contactez l\'administrateur.',
+'Pass updated'			=>	'Votre mot de passe a Ã©tÃ© mis Ã  jour. Vous pouvez Ã  prÃ©sent vous identifier avec votre nouveau mot de passe.',
+'Pass updated redirect'		=>	'Mot de passe mis Ã  jour. Redirection&#160;âŠ',
+'Wrong pass'			=>	'Ancien mot de passe incorrect.',
+'Change pass'			=>	'Changer de mot de passe',
 'Change pass legend'		=>	'Saisissez et confirmez votre mot de passe',
-'Old pass'					=>	'Ancien mot de passe',
-'New pass'					=>	'Nouveau mot de passe',
-'Confirm new pass'			=>	'Confirmez le nouveau mot de passe',
+'Old pass'			=>	'Ancien mot de passe',
+'New pass'			=>	'Nouveau mot de passe',
+'Confirm new pass'		=>	'Confirmez le nouveau mot de passe',
+'Pass info'			=>	'Les mots de passe doivent comporter au moins 4 caractÃšres. Ils sont sensibles Ã  la casse.',
  
 // E-mail stuff
-'E-mail key bad'			=>	'La clef d\'activation d\'adresse e-mail est incorrecte ou a expir&eacute. Veuillez demander Ã  nouveau un changement d\'adresse e-mail. Si cela Ã©choue, contactez l\'administrateur',
-'E-mail updated'			=>	'Votre adresse e-mail a Ã©tÃ© mise Ã  jour.',
-'Activate e-mail sent'		=>	'Un e-mail a Ã©tÃ© envoyÃ© avec les instructions pour activer la nouvelle adresse e-mail. S\'il n\'arrive pas, contactez l\'administrateur Ã ',
-'E-mail legend'				=>	'Saisissez la nouvelle adresse e-mail',
-'E-mail instructions'		=>	'Entrez la nouvelle adresse e-mail. Un e-mail y sera envoyÃ© avec un lien d\'activation. Vous devrez cliquer sur ce lien pour activer l\'adresse.',
-'Change e-mail'				=>	'Changer l\'adresse e-mail',
-'New e-mail'				=>	'Nouvelle adresse e-mail',
+'Email key bad'			=>	'La clef d\'activation d\'adresse Ã©lectronique est incorrecte ou a expirÃ©. Veuillez demander Ã  nouveau un changement d\'adresse Ã©lectronique. Si cela Ã©choue, contactez l\'administrateur',
+'Email updated'			=>	'Votre adresse Ã©lectronique a Ã©tÃ© mise Ã  jour.',
+'Activate email sent'		=>	'Un e-mail comportant les instructions pour activer la nouvelle adresse Ã©lectronique a Ã©tÃ© envoyÃ©. S\'il n\'arrive pas, contactez l\'administrateur&#160;: ',
+'Email legend'			=>	'Saisissez la nouvelle adresse Ã©lectronique',
+'Email instructions'		=>	'Indiquez la nouvelle adresse Ã©lectronique. Un e-mail comportant un lien d\'activation y sera envoyÃ©. Vous devrez cliquer sur ce lien pour activer l\'adresse.',
+'Change email'			=>	'Changer l\'adresse Ã©lectronique',
+'New email'			=>	'Nouvelle adresse Ã©lectronique',
  
 // Avatar upload stuff
-'Avatars disabled'			=>	'Le support des avatars est dÃ©sactivÃ©.',
-'Too large ini'				=>	'Fichier trop gros. Le serveur refuse son tÃ©lÃ©chargement.',
-'Partial upload'			=>	'Fichier partiellement tÃ©lÃ©charg&eacute. Merci de reacute;essayer.',
-'No tmp directory'			=>	'Le serveur n\'a pas pu enregistrer le fichier envoyÃ© dans un rÃ©pertoire temporaire.',
-'No file'					=>	'Vous n\'avez pas sÃ©lectionnÃ© de fichier Ã  tÃ©lÃ©charger.',
-'Bad type'					=>	'Le type du fichier n\'est pas autorisÃ©. Les types autorisÃ©s sont le GIF, le JPG et le PNG.',
-'Too wide or high'			=>	'L\'image est plus large et/ou plus haute que le maximum autorisÃ©',
-'Too large'					=>	'La taille du fichier dÃ©passe le maximum autorisÃ©',
-'pixels'					=>	'pixels',
-'bytes'						=>	'octets',
-'Move failed'				=>	'Le serveur n\'a pas pu enregistrer le fichier tÃ©lÃ©charg&acute;. Contactez l\'administrateur',
-'Unknown failure'			=>	'Erreur inconnue. Merci de rÃ©essayer.',
-'Avatar upload redirect'	=>	'Avatar tÃ©lÃ©chargÃ©. Redirection ...',
-'Avatar deleted redirect'	=>	'Avatar effacÃ©. Redirection ...',
-'Avatar desc'				=>	'Un avatar est une petite image qui sera affichÃ©e sous votre nom d\'utilisateur dans vos messages. Il ne doit pas faire plus de',
-'Upload avatar'				=>	'TÃ©lÃ©charger un avatar',
-'Upload avatar legend'		=>	'SÃ©lectionnez un fichier avatar Ã  tÃ©lÃ©charger',
-'Delete avatar'				=>	'Effacer l\'avatar',	// only for admins
-'File'						=>	'Fichier',
-'Upload'					=>	'TÃ©lÃ©charger',	// submit button
+'Avatars disabled'		=>	'La prise en charge des avatars est dÃ©sactivÃ©e.',
+'Too large ini'			=>	'Fichier trop volumineux. Le serveur refuse son envoi.',
+'Partial upload'		=>	'Fichier partiellement envoyÃ©. Merci de rÃ©essayer.',
+'No tmp directory'		=>	'Le serveur n\'a pas pu enregistrer temporairement le fichier envoyÃ©.',
+'No file'			=>	'Vous n\'avez pas sÃ©lectionnÃ© de fichier Ã  envoyer.',
+'Bad type'			=>	'Ce type de fichier n\'est pas autorisÃ©. Voici les formats pris en charge&#160;:  *.gif, *.jpeg et *.png.',
+'Too wide or high'		=>	'L\'image est plus large et/ou plus haute que le maximum autorisÃ©',
+'Too large'			=>	'La taille du fichier dÃ©passe le maximum autorisÃ©',
+'pixels'			=>	'pixels',
+'bytes'				=>	'octets',
+'Move failed'			=>	'Le serveur n\'a pas pu enregistrer le fichier envoyÃ©. Contactez l\'administrateur',
+'Unknown failure'		=>	'Erreur inconnue. Merci de rÃ©essayer.',
+'Avatar upload redirect'	=>	'Avatar envoyÃ©. Redirection&#160;âŠ',
+'Avatar deleted redirect'	=>	'Avatar effacÃ©. Redirection&#160;âŠ',
+'Avatar desc'			=>	'Un avatar est une petite image qui sera affichÃ©e sous votre nom d\'utilisateur dans vos messages. Il ne doit pas faire plus de',
+'Upload avatar'			=>	'Envoyer un avatar',
+'Upload avatar legend'		=>	'SÃ©lectionnez un fichier avatar Ã  envoyer',
+'Delete avatar'			=>	'Effacer l\'avatar',	// only for admins
+'File'				=>	'Fichier',
+'Upload'			=>	'Envoyer',	// submit button
  
 // Form validation stuff
-'Dupe username'				=>	'Ce nom d\'utilisateur est dÃ©jÃ  utilisÃ©. Essayez un autre nom d\'utilisateur.',
-'Forbidden title'			=>	'Votre titre contient un mot interdit. Choisissez un autre titre.',
-'Profile redirect'			=>	'Profil mis Ã  jour. Redirection ...',
+'Forbidden title'		=>	'Votre titre contient un mot interdit. Choisissez un autre titre.',
+'Profile redirect'		=>	'Profil mis Ã  jour. Redirection&#160;âŠ',
  
 // Profile display stuff
-'Not activated'				=>	'Cet utilisateur n\'a pas activÃ© son compte. Le compte est activÃ© lors de la premiÃšre identification de l\'utilisateur.',
-'Unknown'					=>	'(Information inconnue)',	// This is displayed when a user hasn't filled out profile field (e.g. Location)
-'Private'					=>	'(Information privÃ©e)',	// This is displayed when a user does not want to receive e-mails
-'No avatar'					=>	'(Aucun avatar)',
-'Show posts'				=>	'Voir les messages de cet utilisateur',
-'Realname'					=>	'Nom',
-'Location'					=>	'Lieu',
-'Website'					=>	'Site web',
-'Jabber'					=>	'Jabber',
-'ICQ'						=>	'ICQ',
-'MSN'						=>	'MSN Messenger',
-'AOL IM'					=>	'AOL IM',
-'Yahoo'						=>	'Yahoo! Messenger',
-'Avatar'					=>	'Avatar',
-'Signature'					=>	'Signature',
-'Sig max length'			=>	'Longueur maximale',
-'Sig max lines'				=>	'Maximum de lignes',
-'Avatar legend'				=>	'DÃ©finissez vos options d\'affichage d\'avatar',
-'Avatar info'				=>	'Un avatar est une petite image qui sera affichÃ©e avec chacun de vos messages. Vous pouvez tÃ©lÃ©charger un avatar en cliquant sur le lien ci-dessous. La case \'Utiliser l\'avatar\' doit Ãªtre cochÃ©e pour que l\'avatar soit visible dans vos messages.',
-'Change avatar'				=>	'Modifier avatar',
-'Use avatar'				=>	'Utiliser l\'avatar.',
-'Signature legend'			=>	'RÃ©digez votre signature',
-'Signature info'			=>	'Une signature est un petit texte ajoutÃ© Ã  la suite de vos messages. Vous pouvez y mettre ce que vous voulez. Vous pouvez y utiliser des balises BBCode, selon la configuration du forum. Les fonctionnalitÃ©s actives apparaissent dans la marge lors de l\'Ã©dition de votre signature.',
-'Sig preview'				=>	'Apercu de la signature actuelle:',
-'No sig'					=>	'Pas de signature dans le profil.',
-'Topics per page'			=>	'Discussions par page',
-'Topics per page info'		=>	'ContrÃŽle le nombre de discussions affichÃ©es par page dans chaque forum. Vous pouvez laisser blanc et la valeur par dÃ©faut sera employÃ©e.',
-'Posts per page'			=>	'Messages par page',
-'Posts per page info'		=>	'ContrÃŽle le nombre de messages affichÃ©s par page dans chaque forum. Vous pouvez laisser blanc et la valeur par dÃ©faut sera employÃ©e.',
-'Leave blank'				=>	'Laisser blanc pour utiliser la valeur par dÃ©faut du forum.',
-'Notify full'				=>	'Inclure le message dans les e-mails d\'abonnement.',
-'Notify full info'			=>	'En activant cette option, une version en texte brut du nouveau message sera incluse dans l\'avis d\'abonnement par e-mail.',
-'Show smilies'				=>	'Afficher les smileys sous forme d\'icÃŽnes',
-'Show smilies info'			=>	'En activant cette option, de petites images seront affichÃ©es Ã  la place du texte.',
-'Show images'				=>	'Afficher les images.',
-'Show images info'			=>	'En dÃ©sactivant cette option, vous ne verez pas les images dans les message (c\'est-Ã -dire les images affichÃ©es avec la balise [img]).',
-'Show images sigs'			=>	'Afficher les images dans les signatures des utilisateurs.',
-'Show images sigs info'		=>	'DÃ©sactivez ceci si vous ne voulez pas voir les images dans les signatures (c\'est-Ã -dire les images affichÃ©es avec la balise [img]).',
-'Show avatars'				=>	'Afficher les avatars des utilisateurs.',
-'Show avatars info'			=>	'Cette option vous permet de dÃ©cider si les images des avatars des utilisateurs doivent Ãªtre affichÃ©es dans les messages ou non.',
-'Show sigs'					=>	'Afficher les signatures.',
-'Show sigs info'			=>	'Activez ceci si vous voulez voir les signatures ou non.',
-'Style legend'				=>	'SÃ©lectionnez votre style favori',
-'Style info'				=>	'Vous pouvez utiliser un style diffÃ©rent pour ce forum.',
-'Admin note'				=>	'Note de l\'administrateur',
-'Pagination legend'			=>	'DÃ©finissez vos options de pagination',
+'Users profile'			=>	'Profil de %s',
+'Username info'			=>	'Nom d\'utilisateur&#160;: %s',
+'Email info'			=>	'E-mail&#160;: %s',
+'Posts info'			=>	'Messages&#160;: %s',
+'Registered info'		=>	'Inscription&#160;: %s',
+'Last post info'		=>	'Dernier message&#160;: %s',
+'Last visit info'               =>      'DerniÃšre visite&#160;: %s',
+'Show posts'			=>	'Voir les messages de cet utilisateur',
+'Show topics'			=>	'Afficher toutes les discussions',
+'Show subscriptions'		=>	'Afficher toutes les discussions suivies',
+'Realname'			=>	'Nom',
+'Location'			=>	'Lieu',
+'Website'			=>	'Site Web',
+'Invalid website URL'          =>  'L\'URL de site Web saisie est invalide.',
+'Jabber'			=>	'Jabber',
+'ICQ'				=>	'ICQ',
+'MSN'				=>	'MSN Messenger',
+'AOL IM'			=>	'AOL IM',
+'Yahoo'				=>	'Yahoo! Messenger',
+'Avatar'			=>	'Avatar',
+'Signature'			=>	'Signature',
+'Sig max size'			=>	'%s caractÃšres et %s lignes autorisÃ©s',
+'Avatar legend'			=>	'DÃ©finissez vos options d\'affichage d\'avatar',
+'Avatar info'			=>	'Un avatar est une petite image qui sera affichÃ©e avec chacun de vos messages. Vous pouvez envoyer un avatar en cliquant sur le lien ci-dessous.',
+'Change avatar'			=>	'Changer d\'avatar',
+'Signature legend'		=>	'RÃ©digez votre signature',
+'Signature info'		=>	'Une signature est un petit texte ajoutÃ© Ã  la suite de vos messages. Vous pouvez y inclure ce que vous voulez et y utiliser des balises BBCode, selon la configuration du forum. Les fonctionnalitÃ©s actives apparaissent dans la marge lors de l\'Ã©dition de votre signature.',
+'Sig preview'			=>	'AperÃ§u de la signature actuelle&#160;:',
+'No sig'			=>	'Pas de signature dans le profil.',
+'Signature quote/code/list/h'	=>	'L\'utilisation des balises BBCode [quote], [code], [list] et [h] n\'est pas autorisÃ©e dans les signatures.',
+'Topics per page'		=>	'Discussions par page',
+'Posts per page'		=>	'Messages par page',
+'Leave blank'			=>	'Laisser vide pour utiliser la valeur par dÃ©faut du forum.',
+'Subscription legend'	        =>	'DÃ©finit vos options de suivi de discussion',
+'Notify full'			=>	'Inclure le message dans les e-mails de notification de rÃ©ponse.',
+'Auto notify full'		=>	'Suivre automatiquement les sujets auxquels on a rÃ©pondu.',
+'Show smilies'			=>	'Afficher les Ã©moticÃŽnes sous forme d\'icÃŽnes',
+'Show images'			=>	'Afficher les images.',
+'Show images sigs'		=>	'Afficher les images dans les signatures des utilisateurs.',
+'Show avatars'			=>	'Afficher les avatars des utilisateurs.',
+'Show sigs'			=>	'Afficher les signatures.',
+'Style legend'			=>	'Choisissez votre style favori',
+'Styles'			=>	'Styles',
+'Admin note'			=>	'Note de l\'administrateur',
+'Pagination legend'		=>	'DÃ©finissez vos options de pagination',
 'Post display legend'		=>	'DÃ©finissez vos options de visualisation des messages',
-'Post display info'			=>	'En dÃ©sactivant toutes les options d\'affichage des images dans les messages et les signatures vous augmenterez le temps de chargement des pages.',
-'Instructions'				=>	'AprÃšs avoir mis Ã  jour le profil vous serez redirigÃ©s sur cette page.',
+'Post display info'		=>	'En dÃ©sactivant toutes les options d\'affichage des images et des signatures dans les messages, vous augmenterez la vitesse de chargement des pages.',
+'Instructions'			=>	'AprÃšs avoir mis Ã  jour le profil vous serez redirigÃ©(e) vers cette page.',
  
 // Administration stuff
 'Group membership legend'	=>	'Choisissez un groupe d\'utilisateurs',
-'Save'						=>	'Enregistrer',
-'Set mods legend'			=>	'DÃ©finir l\'accÃšs modÃ©rateur',
-'Moderator in'				=>	'ModÃšre',
-'Moderator in info'			=>	'Veuillez choisir quels forums cet utilisateur peut modÃ©rer. Note: Ceci s\'applique seulement aux modÃ©rateurs. Les administrateurs ont toujours toutes les permissions pour tous les forums.',
-'Update forums'				=>	'Mettre Ã  jour',
-'Delete ban legend'			=>	'Supprimer (administrateurs seulement) ou exclure un utilisateur',
-'Delete user'				=>	'Supprimer l\'utilisateur',
-'Ban user'					=>	'Exclure l\'utilisateur',
+'Save'				=>	'Enregistrer',
+'Set mods legend'		=>	'DÃ©finir l\'accÃšs modÃ©rateur',
+'Moderator in info'		=>	'Veuillez choisir les forums que cet utilisateur peut modÃ©rer. Remarque&#160;:  Ceci s\'applique seulement aux modÃ©rateurs. Les administrateurs ont toujours toutes les permissions pour tous les forums.',
+'Update forums'			=>	'Mettre Ã  jour',
+'Delete ban legend'		=>	'Supprimer (administrateurs seulement) ou bannir un utilisateur',
+'Delete user'			=>	'Supprimer l\'utilisateur',
+'Ban user'			=>	'Bannir l\'utilisateur',
 'Confirm delete legend'		=>	'Important&#160;: lisez avant de supprimer un utilisateur',
 'Confirm delete user'		=>	'Confirmer la suppression de l\'utilisateur',
-'Confirmation info'			=>	'Veuillez confirmer la suppression de l\'utilisateur',	// the username will be appended to this string
-'Delete warning'			=>	'Attention&#160;! Les utilisateurs et/ou messages supprimÃ©s ne peuvent Ãªtre restaurÃ©s. Si vous choisissez de ne pas supprimer les messages d\'un utilisateur, les messages ne pourront Ãªtre uniquement supprimÃ©s manuellement plus tard.',
-'Delete posts'				=>	'Supprimer tous les messages ou discussions de cet utilisateur.',
-'Delete'					=>	'Supprimer',		// submit button (confirm user delete)
-'User delete redirect'		=>	'Utilisateur supprimÃ©. Redirection ...',
-'Group membership redirect'	=>	'Appartenance Ã  un groupe enregistrÃ©e. Redirection ...',
-'Update forums redirect'	=>	'Droits du modÃ©rateur mis Ã  jour. Redirection ...',
-'Ban redirect'				=>	'Redirection ...'
+'Confirmation info'		=>	'Veuillez confirmer la suppression de l\'utilisateur',	// the username will be appended to this string
+'Delete warning'		=>	'Attention&#160;! Les utilisateurs et/ou messages supprimÃ©s ne peuvent Ãªtre rÃ©cupÃ©rÃ©s. Si vous choisissez de ne pas supprimer les messages d\'un utilisateur, les messages pourront uniquement Ãªtre supprimÃ©s manuellement plus tard.',
+'Delete posts'			=>	'Supprimer tous les messages ou discussions de cet utilisateur.',
+'Delete'			=>	'Supprimer',		// submit button (confirm user delete)
+'User delete redirect'		=>	'Utilisateur supprimÃ©. Redirection&#160;âŠ',
+'Group membership redirect'	=>	'Appartenance Ã  un groupe enregistrÃ©e. Redirection&#160;âŠ',
+'Update forums redirect'	=>	'Droits du modÃ©rateur mis Ã  jour. Redirection&#160;âŠ',
+'Ban redirect'			=>	'Redirection&#160;âŠ',
+'No delete admin message'	=>	'Les administrateurs ne peuvent Ãªtre supprimÃ©s. Pour supprimer cet utilisateur, vous devez d\'abord le/la dÃ©placer vers un groupe d\'utilisateurs diffÃ©rent.',
  
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/register.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/register.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/register.php	(revision 4)
@@ -5,31 +5,33 @@
  
 // Miscellaneous
-'No new regs'				=>	'Ce forum n\'accepte pas de nouveaux utilisateurs.',
-'Reg cancel redirect'		=>	'Inscription annulÃ©e. Redirection ...',
-'Forum rules'				=>	'Conditions d\'utilisation du forum',
-'Rules legend'				=>	'Vous devez accepter les conditions d\'utilisation suivantes pour vous inscrire sur ce forum.',
-'Agree'						=>	'J\'accepte',
-'Cancel'					=>	'Je refuse',
-'Register'					=>	'S\'inscrire',
+'No new regs'			=>	'Ces forums n\'acceptent pas de nouveaux utilisateurs.',
+'Reg cancel redirect'		=>	'Inscription annulÃ©e. Redirection&#160;âŠ',
+'Forum rules'			=>	'Conditions d\'utilisation des forums',
+'Rules legend'			=>	'Vous devez accepter les conditions d\'utilisation suivantes pour vous inscrire sur ces forums.',
+'Registration flood'		=>	'Un nouvel utilisateur ayant la mÃªme adresse IP que vous a Ã©tÃ© inscrit dans la derniÃšre heure. Pour Ã©viter les inscriptions multiples, il n\'est pas possible de s\'inscrire Ã  partir de la mÃªme IP dans un intervalle infÃ©rieur Ã  1 heure. DÃ©solÃ© pour la gÃªne occasionnÃ©e.',
+'Agree'				=>	'J\'accepte',
+'Cancel'			=>	'Je refuse',
+'Register'			=>	'S\'inscrire',
  
 // Form validation stuff (some of these are also used in post.php)
-'Username censor'			=>	'Le nom d\'utilisateur que vous avez saisi contient des mots interdits. Veuillez choisir un autre nom d\'utilisateur.',
-'Username dupe 1'			=>	'Quelqu\'un est dÃ©jÃ  inscrit avec ce nom d\'utilisateur',
-'Username dupe 2'			=>	'Ce nom d\'utilisateur est trop ressemblant. Il doit diffÃ©rer par au moins un caractÃšre alpha-numÃ©rique (a-z ou 0-9). Veuillez essayer un autre nom d\'utilisateur.',
-'E-mail not match'			=>	'Les adresses e-mail ne correspondent pas. Veuiller retourner en arriÃšre et corriger cela.',
+'Registration errors'		=>	'Erreurs d\'inscription',
+'Registration errors info'	=>	'Les erreurs suivantes doivent Ãªtre corrigÃ©es avant que vous puissiez vous inscrire&#160;:',
+'Username censor'		=>	'Le nom d\'utilisateur que vous avez saisi contient des mots interdits. Veuillez choisir un autre nom d\'utilisateur.',
+'Username dupe 1'		=>	'Il existe dÃ©jÃ  une personne inscrite avec ce nom d\'utilisateur.',
+'Username dupe 2'		=>	'Ce nom d\'utilisateur est trop ressemblant. Il doit diffÃ©rer par au moins un caractÃšre alpha-numÃ©rique (a-z ou 0-9). Veuillez essayer un autre nom d\'utilisateur.',
+'Email not match'		=>	'Les adresses Ã©lectroniques ne coÃ¯ncident pas. Veuillez revenir en arriÃšre et corriger cela.',
  
 // Registration e-mail stuff
-'Reg e-mail'				=>	'Merci de vous Ãªtre inscrits. Votre mot de passe a Ã©tÃ© envoyÃ© Ã  l\'adresse indiquÃ©e. S\'il n\'arrive pas, merci de contacter l\'administrateur Ã ',
-'Reg complete'				=>	'Inscription acceptÃ©e. Identification et redirection ...',
+'Reg email'			=>	'Merci de vous Ãªtre inscrit(e). Votre mot de passe a Ã©tÃ© envoyÃ© Ã  l\'adresse indiquÃ©e. Si vous ne l\'obtenez pas, merci de contacter l\'administrateur&#160;:',
+'Reg complete'			=>	'Inscription acceptÃ©e. Identification et redirection&#160;âŠ',
  
 // Register info
-'Desc 1'					=>	'L\'inscription vous accordera l\'accÃšs Ã  un certain nombre de fonctionnalitÃ©s et de possibilitÃ©s autrement indisponibles. Cela inclue la possibilitÃ© de modifier et d\'effacer des messages, de crÃ©er vos propres signatures, et autres encore. Pour toute question, contactez l\'administrateur.',
-'Desc 2'					=>	'Ci-dessous le formulaire Ã  remplir afin de vous inscrire. AprÃšs vous Ãªtres inscrits, vous pourrez regarder votre profil et vos prÃ©fÃ©rences. Les champs ci-dessous ne sont qu\'une toute petite partie de tous ce que vous pouvez changer dans votre profil.',
-'Username legend'			=>	'Veuillez saisir un nom d\'utilisateur entre 2 et 25 caractÃšres de long.',
-'Pass legend 1'				=>	'Veuillez saisir et confirmer le mot de passe que vous avez choisi',
-'Pass legend 2'				=>	'Veuillez lire les instructions ci-dessous',
-'Pass info'					=>	'Le mots de passe doit faire entre 4 et 16 caractÃšres de long (sensible Ã  la casse).',
-'E-mail info'				=>	'Vous devez saisir une adresse e-mail valide,. Vous pouvez choisir de ne pas rÃ©veler votre adresse aux autres utilisateurs (voir ci-dessous).',
-'Confirm e-mail'			=>	'Confirmez votre adresse e-mail',
+'Desc 1'			=>	'L\'inscription vous permettra d\'accÃ©der Ã  un certain nombre de fonctionnalitÃ©s autrement indisponibles. Cela inclut la possibilitÃ© de modifier et d\'effacer des messages, de crÃ©er vos propres signatures et bien davantage. Pour toute question, contactez l\'administrateur.',
+'Desc 2'			=>	'Ci-dessous le formulaire Ã  remplir afin de vous inscrire. AprÃšs vous Ãªtre inscrit(e), vous pourrez consulter votre profil et modifier vos prÃ©fÃ©rences. Les champs ci-dessous ne sont qu\'une toute petite partie de tout ce que vous pouvez changer dans votre profil.',
+'Username legend'		=>	'Veuillez saisir un nom d\'utilisateur comportant entre 2 et 25 caractÃšres.',
+'Pass legend'			=>	'Veuillez saisir et confirmer le mot de passe que vous avez choisi.',
+'Pass info'			=>	'Le mot de passe doit comporter au minimum 4 caractÃšres (sensible Ã  la casse).',
+'Email info'			=>	'Vous devez saisir une adresse Ã©lectronique valide. Vous pouvez choisir de ne pas divulguer votre adresse aux autres utilisateurs (voir ci-dessous).',
+'Confirm email'			=>	'Confirmez votre adresse Ã©lectronique',
  
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/search.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/search.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/search.php	(revision 4)
@@ -5,43 +5,61 @@
  
 // The search form
-'User search'				=>	'Rechercher un utilisateur',
-'No search permission'		=>	'Vous n\'avez pas accÃšs Ã  la fonctionnalitÃ© de recherche',
-'Search'					=>	'Rechercher',
-'Search criteria legend'	=>	'SÃ©lectionnez vos critÃšres de recherche',
-'Search info'				=>	'Pour effectuer une recherche par mots-clef, saisissez le ou les termes Ã  rechercher. SÃ©parez chaque terme avec des espaces. Utilisez AND, OR, NOT pour affiner votre recherche. Pour rechercher par auteur, saisissez le nom d\'utilisateur auquel les messages appartiennent. Utilisez le joker * pour des recherches sur des mots incomplets.',
-'Keyword search'			=>	'Mots-clef',
-'Author search'				=>	'Rechercher un auteur',
-'Search in legend'			=>	'SÃ©lectionnez oÃ¹ vous souhaitez chercher',
-'Search in info'			=>	'Choisissez dans quel forum vous souhaitez lancer votre recherche et si vous souhaitez rechercher dans les sujets des discussions ou les textes des messages ou bien les deux Ã  la fois.',
-'Forum search'				=>	'Forum',
-'All forums'				=>	'Tous les forums',
-'Search in'					=>	'Rechercher dans',
-'Message and subject'		=>	'Texte du message et du sujet',
-'Message only'				=>	'Texte du message seulement',
-'Topic only'				=>	'Texte du sujet seulement',
-'Sort by'					=>	'Trier par',
-'Sort order'				=>	'Ordre',
-'Search results legend'		=>	'Selectionnez le mode d\'affichage des rÃ©sultats',
-'Search results info'		=>	'Vous pouvez choisir comment vous voulez classer et afficher les rÃ©sultats.',
-'Sort by post time'			=>	'Date du message',
-'Sort by author'			=>	'Auteur',
-'Sort by subject'			=>	'Sujet',
-'Sort by forum'				=>	'Forum',
-'Ascending'					=>	'Croissant',
-'Descending'				=>	'DÃ©croissant',
-'Show as'					=>	'Voir les rÃ©sultats',
-'Show as topics'			=>	'Discussions',
-'Show as posts'				=>	'Messages',
+'User search'			=>	'Rechercher un utilisateur',
+'No search permission'		=>	'Vous ne pouvez pas effectuer de recherche, vous n\'avez pas les permissions requises',
+'Search flood'			=>	'Vous devez patienter au minimum %s secondes avant d\'effectuer une nouvelle recherche. Veuillez patienter un moment et essayer Ã  nouveau.',
+'Search'			=>	'Rechercher',
+'Search criteria legend'	=>	'Choisissez vos critÃšres de recherche',
+'Search info'			=>	'Pour effectuer une recherche par mots-clÃ©s, indiquez le ou les termes Ã  rechercher en les sÃ©parant par des espaces. Utilisez AND, OR, NOT pour affiner votre recherche. Pour rechercher par auteur, saisissez le nom d\'utilisateur auquel les messages appartiennent. Utilisez le joker * pour des recherches sur des fragments de mot.',
+'Keyword search'		=>	'Mots-clÃ©s',
+'Author search'			=>	'Rechercher un auteur',
+'Search in legend'		=>	'Indiquez oÃ¹ la recherche doit s\'effectuer',
+'Search in info'		=>	'Choisissez le forum dans lequel vous souhaitez lancer votre recherche et indiquez si vous souhaitez rechercher dans les sujets des discussions uniquement ou dans les textes des messages ou bien dans les deux Ã  la fois.',
+'Search multiple forums info'    =>  'Si aucun forum n\'est sÃ©lectionnÃ©, la recherche s\'effectuera dans tous les forums.',
+'Forum search'			=>	'Forum',
+'All forums'			=>	'Tous les forums',
+'Search in'			=>	'Rechercher dans&#160;âŠ',
+'Message and subject'		=>	'Le texte du message et du sujet',
+'Message only'			=>	'Le texte du message seulement',
+'Topic only'			=>	'Le texte du sujet seulement',
+'Sort by'			=>	'Trier par&#160;âŠ',
+'Sort order'			=>	'Ordre&#160;âŠ',
+'Search results legend'		=>	'SÃ©lectionnez le mode d\'affichage des rÃ©sultats',
+'Search results info'		=>	'Vous pouvez choisir le mode de classement et d\'affichage des rÃ©sultats.',
+'Sort by post time'		=>	'Date du message',
+'Sort by author'		=>	'Auteur',
+'Sort by subject'		=>	'Sujet',
+'Sort by forum'			=>	'Forum',
+'Ascending'			=>	'Croissant',
+'Descending'			=>	'DÃ©croissant',
+'Show as'			=>	'Afficher les&#160;âŠ',
+'Show as topics'		=>	'Discussions',
+'Show as posts'			=>	'Messages',
  
 // Results
-'Search results'			=>	'RÃ©sultats de la recherche',
-'No terms'					=>	'Vous devez entrer au moins un mot-clef et/ou un auteur Ã  rechercher.',
-'No hits'					=>	'Votre recherche n\'a renvoyÃ© aucun rÃ©sultat.',
-'No user posts'				=>	'Il n\'y a pas de message de cet utilisateur dans ce forum.',
-'No subscriptions'			=>	'Vous n\'Ãªtes abonnÃ© Ã  aucune discussion.',
-'No new posts'				=>	'Il n\'y a pas de discussion avec de nouveaux messages depuis votre derniÃšre visite.',
-'No recent posts'			=>	'Il n\'y a pas de discussion avec de nouveaux messages depuis les derniÃšres 24 heures.',
-'No unanswered'				=>	'Il n\'y a pas de message sans rÃ©ponse dans ce forum.',
-'Go to post'				=>	'Aller au message'
- 
+'Search'              =>  'Recherche',
+'Search results'		=>	'RÃ©sultats de la recherche',
+'Quick search show_new'		=>	'Nouveaux',
+'Quick search show_recent'	=>	'RÃ©centes',
+'Quick search show_unanswered'	=>	'Sans rÃ©ponse',
+'Quick search show_replies'	=>	'PubliÃ©s',
+'Quick search show_user_topics'	=>	'Discussions de %s',
+'Quick search show_user_posts'	=>	'Messages de %s',
+'Quick search show_subscriptions'       =>	'Suivies par %s',
+'By keywords show as topics'    =>      'Discussions avec messages contenant Â«&#160;%s&#160;Â»',
+'By keywords show as posts'     =>      'Messages contenant Â«&#160;%s&#160;Â»',
+'By user show as topics'        =>      'Discussions contenant des messages de %s',
+'By user show as posts'         =>      'Messages de %s',
+'By both show as topics'        =>      'Discussions avec messages de %s contenant Â«&#160;%s&#160;Â»',
+'By both show as posts'         =>      'Messages de %s contenant Â«&#160;%s&#160;Â»',
+'No terms'			=>	'Vous devez saisir au moins un mot-clÃ© et/ou un auteur Ã  rechercher.',
+'No hits'			=>	'DÃ©solÃ©, aucun rÃ©sultat n\'a Ã©tÃ© trouvÃ© pour votre recherche.',
+'No user posts'			=>	'Il n\'y a pas de message de cet utilisateur dans ce forum.',
+'No user topics'		=>	'Il n\'y a pas de discussion de cet utilisateur dans ce forum.',
+'No subscriptions'		=>	'Cet utilisateur ne suit actuellement aucune discussion.',
+'No new posts'			=>	'Il n\'y a pas de discussion avec de nouveaux messages depuis votre derniÃšre visite.',
+'No recent posts'		=>	'Il n\'y a pas de discussion avec de nouveaux messages depuis les 24 derniÃšres heures.',
+'No unanswered'			=>	'Il n\'y a pas de message sans rÃ©ponse dans ce forum.',
+'Go to post'			=>	'Aller au message',
+'Go to topic'			=>	'Aller Ã  la discussion'
+
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/topic.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/topic.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/topic.php	(revision 4)
@@ -3,24 +3,30 @@
 // Language definitions used in viewtopic.php
 $lang_topic = array(
- 
-'Post reply'		=>	'Ãcrire une rÃ©ponse',
+
+'Post reply'		=>	'RÃ©pondre',
 'Topic closed'		=>	'Discussion fermÃ©e',
-'From'				=>	'Lieu',				// User location
-'Note'				=>	'Note',				// Admin note
-'Website'			=>	'Site web',
-'Guest'				=>	'InvitÃ©',
-'Online'			=>	'En ligne',
-'Offline'			=>	'Hors ligne',
-'Last edit'			=>	'DerniÃšre modification par',
-'Report'			=>	'Signaler',
-'Delete'			=>	'Supprimer',
-'Edit'				=>	'Modifier',
-'Quote'				=>	'Citer',
-'Is subscribed'		=>	'Vous Ãªtes abonnÃ© Ã  cette discussion',
-'Unsubscribe'		=>	'DÃ©sabonner',
-'Subscribe'			=>	'S\'abonner Ã  cette discussion',
+'From'			=>	'Lieu&#160;:',	// User location
+'IP address logged'	=>	'IP de connexion',
+'Note'			=>	'Note&#160;:',	// Admin note
+'Posts'			=>	'Messages&#160;:',
+'Replies'		=>	'RÃ©ponses&#160;:',
+'Registered'		=>	'Inscription&#160;:',
+'Website'		=>	'Site Web',
+'Guest'			=>	'InvitÃ©',
+'Online'		=>	'En ligne',
+'Offline'		=>	'Hors ligne',
+'Last edit'		=>	'DerniÃšre modification par',
+'Report'		=>	'Signaler',
+'Delete'		=>	'Supprimer',
+'Edit'			=>	'Modifier',
+'Quote'			=>	'Citer',
+'Is subscribed'		=>	'Vous suivez cette discussion',
+'Unsubscribe'		=>	'Ne plus suivre',
+'Subscribe'		=>	'Suivre cette discussion',
 'Quick post'		=>	'RÃ©ponse rapide',
-'Link separator'	=>	' | ',	// The text that separates links in posts (website, e-mail, report, edit etc.)
-'Mod controls'		=>	'ModÃ©ration'
- 
+'Mod controls'		=>	'ModÃ©ration',
+'New icon'		=>	'Nouveau message',
+'Re'			=>	'Re&#160;:',
+'Preview'		=>	'PrÃ©visualisation'
+
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/French/update.php
===================================================================
--- branches/rsr.v5.1.1/web/punbb/lang/French/update.php	(revision 4)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/update.php	(revision 4)
@@ -0,0 +1,76 @@
+<?php
+
+// Language definitions used in db_update.php
+
+$lang_update = array(
+
+'Update'			     =>	'Mise Ã  jour de FluxBB',
+'Update message'		     =>	'Votre base de donnÃ©es FluxBB est dÃ©passÃ©e et doit Ãªtre mise Ã  niveau afin de poursuivre. Si vous Ãªtes l\'administrateur de ces forums, veuillez suivre les instructions ci-desssous afin d\'achever la mise Ã  niveau.',
+'Note'				     =>	'Remarque :',
+'Members message'		     =>	'Cette procÃ©dure n\'est destinÃ©e qu\'aux administrateurs des forums. Si vous Ãªtes un membre ce n\'est pas la peine de vous prÃ©occuper de cela - les forums seront trÃšs rapidement fonctionnels !',
+'Administrator only'		     =>	'Cette Ã©tape ne concerne que l\'administrateur des forums !',
+'Database password info'	     =>	'Pour lancer la mise Ã  jour de la base de donnÃ©es veuillez indiquer le mot de passe de base de donnÃ©es avec lequel FluxBB a Ã©tÃ© installÃ©. Si vous ne vous en souvenez plus, il est stockÃ© dans le fichier \'config.php\'.',
+'Database password note'	     =>	'Si vous utilisez SQLite (et donc n\'avez dÃ©fini aucun mot de passe), veuillez utiliser le nom du fichier de base de donnÃ©es Ã  la place. Cela doit correspondre exactement au nom de base de donnÃ©es indiquÃ© dans votre fichier de configuration.',
+'Database password'		     =>	'Mot de passe de base de donnÃ©es',
+'Maintenance'          =>  'Maintenance',
+'Maintenance message info'    =>  'Le message qui s\'affichera pour les utilisateurs lors de l\'opÃ©ration de mise Ã  jour. Ce texte ne sera pas analysÃ© comme les messages habituels et peut donc contenir du code HTML.',
+'Maintenance message'        =>  'Message de maintenance',
+'Next'				     =>	'Suivante',
+
+'You are running error'		     =>	'Vous utilez la version %2$s de %1$s. FluxBB %3$s nÃ©cessite au moins %1$s %4$s pour fonctionner correctement. Vous devez mettre Ã  niveau votre installation avant de poursuivre.',
+'Version mismatch error'	     =>	'Version non correspondante. La base de donnÃ©es \'%s\' ne semble pas utiliser un schÃ©ma de base de donnÃ©es FluxBB pris en charge par ce script de mise Ã  jour.',
+'Invalid file error'		     =>	'Nom de base de donnÃ©es invalide. Lorsque vous utilisez SQLite le nom de la base de donnÃ©es indiquÃ© doit Ãªtre exactement identique Ã  celui de votre \'%s\'',
+'Invalid password error'	     =>	'Mot de passe de base de donnÃ©es invalide. Pour mettre Ã  niveau FluxBB vous devez indiquer votre mot de passe de base de donnÃ©es, il doit Ãªtre exactement identique Ã  celui de votre \'%s\'',
+'No password error'		     =>	'Aucun mot de passe de base de donnÃ©es fourni',
+'Script runs error'		     =>	'Il semblerait que le script de mise Ã  jour ait dÃ©jÃ  Ã©tÃ© lancÃ© par une autre personne. Si cela ne s\'averrait pas Ãªtre vrai, veuillez supprimer manuellement le fichier \'%s\' et essayer Ã  nouveau',
+'No update error'		     =>	'Votre forum a dÃ©jÃ  atteint le niveau de mis Ã  jour le plus Ã©levÃ© pour ce script',
+
+'Intro 1'			     =>	'Ce script va se charger de mettre votre base de donnÃ©es Ã  jour. La procÃ©dure de mise Ã  jour pourra prendre quelques secondes Ã  plusieures heures, cette durÃ©e dÃ©pendant de la vitesse du serveur et de la taille de la base de donnÃ©es. N\'oubliez pas de faire une sauvegarde de la base de donnÃ©es avant de poursuivre.',
+'Intro 2'			     =>	'Avez-vous lu les instructions de mise Ã  jour dans la documentation ? Si non, allez voir.',
+'No charset conversion'		     =>	'<strong>IMPORTANT !</strong> FluxBB a dÃ©tectÃ© que cet environnement PHP ne prend pas en charge les mÃ©canismes d\'encodage nÃ©cessaires pour effectuer une conversion UTF-8 Ã  partir de jeux de caractÃšres autres que ISO-8859-1. Cela signifie que si le jeu de caractÃšres actuel n\'est pas ISO-8859-1, FluxBB ne pourra pas convertir votre base de donnÃ©es du forum en UTF-8 et vous devrez le faire manuellement. Des informations concernant la conversion manuelle peuvent Ãªtre trouvÃ©es dans les instructions de mise Ã  jour.',
+'Enable conversion'		     =>	'<strong>Activer la conversion :</strong> si activÃ©, ce script de mise Ã  jour procÃšdera, aprÃšs avoir fait les modifications structurelles nÃ©cessaires Ã  la base de donnÃ©es, Ã  la conversion de tout le texte dans la base de donnÃ©es de l\'actuel jeu de caractÃšres vers UTF-8. Cette conversion est nÃ©cessaire si vous mettez Ã  niveau une version 1.2.',
+'Current character set'		     =>	'<strong>Jeu de caractÃšre actuel :</strong> Si la langue principale de votre forum est l\'anglais, vous pouvez laisser cela Ã  la valeur par dÃ©faut. En revanche, si votre forum utilise une autre langue, vous devrez indiquer le jeu de caractÃšres du paquetage de la langue principale utilisÃ© par le forum. <em>Si cette donnÃ©e est fausse, cela pourra corrompre votre base de donnÃ©es, donc n\'essayez pas de deviner !</em> Remarque : ceci est nÃ©cessaire mÃªme si votre ancienne base de donnÃ©es est en UTF-8.',
+'Charset conversion'		     =>	'Conversion de jeu de caractÃšres',
+'Enable conversion label'	     =>	'<strong>Activer la conversion</strong> (effectuer la conversion du jeu de caractÃšres de la base de donnÃ©es).',
+'Current character set label'	     =>	'Jeu de caractÃšres actuel',
+'Current character set info'	     =>	'Accepter la valeur par dÃ©faut pour des forums en anglais sinon, le jeu de caractÃšres du paquetage de la langue principale.',
+'Start update'			     =>	'DÃ©marrer la mise Ã  jour',
+'Error converting users'	     =>	'Erreur lors de la conversion de noms d\'utilisateurs',
+'Error info 1'			     =>	'Une erreur est survenue lors de la conversion de certains noms d\'utilisateurs. Cela peut arriver lors d\'une conversion Ã  partir de FluxBB v1.2 si plusieurs utilisateurs se sont inscrits en indiquant des noms trÃšs similaires, par exemple Â« bob Â» et Â« bÃ¶b Â».',
+'Error info 2'			     =>	'Ci-dessous une liste d\'utilisateurs dont la conversion du nom a Ã©chouÃ©. Veuillez choisir un nouveau nom pour chaque utilisateur. Les utilisateurs dont le nom aura Ã©tÃ© modifiÃ© seront automatiquement avertis par l\'envoi d\'un e-mail.',
+'New username'			     =>	'Nouvel utilisateur',
+'Required'			     =>	'(Obligatoire)',
+'Correct errors'		     =>	'Les erreurs suivantes doivent Ãªtre corrigÃ©es :',
+'Rename users'			     =>	'Renommer les utilisateurs',
+'Successfully updated'		     =>	'Votre base de donnÃ©es a Ã©tÃ© mise Ã  jour avec succÃšs. Vous devrez Ã  prÃ©sent %s.',
+'go to index'			     =>	'vous rendre Ã  la page d\'accueil des forums',
+
+'Unable to lock error'		     =>	'Impossible de dÃ©verrouiller pour mise Ã  jour. Veuillez vÃ©rifier que PHP puisse modifier le rÃ©pertoire \'%s\' et qu\'actuellement personne d\'autre n\'a lancÃ© le script de mise Ã  jour.',
+
+'Converting'			     =>	'Conversion de %s âŠ',
+'Converting item'		     =>	'Conversion de %1$s %2$s âŠ',
+'Preparsing item'		     =>	'Analyse prÃ©liminaire de %1$s %2$s âŠ',
+'Rebuilding index item'		     =>	'Reconstruction de l\'index pour %1$s %2$s',
+
+'ban'				     =>	'bannissement',
+'categories'			     =>	'catÃ©gories',
+'censor words'			     =>	'mots censurÃ©s',
+'configuration'			     =>	'configuration',
+'forums'			     =>	'forums',
+'groups'			     =>	'groupes',
+'post'				     =>	'message',
+'ranks'				     =>	'rangs',
+'report'			     =>	'signalement',
+'topic'				     =>	'discussion',
+'user'				     =>	'utilisateur',
+'signature'			     =>	'signature',
+
+'Username too short error'	     =>	'Les noms d\'utilisateurs doivent comporter au moins 2 caractÃšres. Veuillez choisir un autre nom d\'utilisateur (plus long).',
+'Username too long error'	     =>	'Les noms d\'utilisateurs ne doivent pas comporter plus de 25 caractÃšres. Veuillez choisir un autre nom d\'utilisateur (plus court).',
+'Username Guest reserved error'	     =>	'Le nom d\'utilisateur Â« guest Â» est rÃ©servÃ©. Veuillez choisir un autre nom.',
+'Username IP format error'	     =>	'Les noms d\'utilisateurs ne doivent pas ressembler Ã  une adresse IP. Veuillez choisir un autre nom d\'utilisateur.',
+'Username bad characters error'	     =>	'Les noms d\'utilisateurs ne doivent pas comporter tous les caractÃšres \', " et [ ou ] en mÃªme temps. Veuillez choisir un autre nom d\'utilisateur.',
+'Username BBCode error'		     =>	'Les noms d\'utilisateurs ne doivent pas comporter de balises de formatage de texte (BBCode) utilisÃ©s par le forum. Veuillez choisir un autre nom d\'utilisateur.',
+'Username duplicate error'	     =>	'Quelqu\'un a dÃ©jÃ  utilisÃ© le nom d\'utilisateur Â« %s Â». Le nom d\'utilisateur que vous avez indiquÃ© est trop semblable. Le nom doit comporter au moins un caractÃšre alphanumÃ©rique (a-z ou 0-9) diffÃ©rent. Veuillez choisir un autre nom d\'utilisateur.',
+
+);
Index: branches/rsr.v5.1.1/web/punbb/lang/French/userlist.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/French/userlist.php	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/French/userlist.php	(revision 4)
@@ -5,8 +5,9 @@
  
 'User find legend'		=>	'Chercher et trier les utilisateurs',
-'User search info'		=>	'Saisissez un nom d\'utilisateur pour rechercher un utilisateur et le trier par groupe d\'utilisateurs. Le champ nom d\'utilisateur peut rester vide. Utilisez le joker * pour des recherches partielles. Triez les utilisateurs par nom, date d\'inscription ou nombre de messages et en ordre croissant ou dÃ©croissant.',
+'User search info'		=>	'Saisissez un nom d\'utilisateur pour le rechercher et/ou un groupe d\'utilisateurs pour filtrer les rÃ©sultats. Le champ Â«&#160;Nom d\'utilisateur&#160;Â» peut rester vide. Utilisez le joker * pour des recherches sur une partie du nom.',
+'User sort info'		=>	'Triez les utilisateurs par nom, date d\'inscription ou nombre de messages et dans l\'ordre croissant ou dÃ©croissant.',
 'User group'			=>	'Groupe d\'utilisateurs',
 'No of posts'			=>	'Nombre de messages',
-'All users'				=>	'Tous les utilisateurs'
+'All users'			=>	'Tous les utilisateurs'
  
 );
Index: branches/rsr.v5.1.1/web/punbb/lang/index.html
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/index.html	(revision 1)
+++ branches/rsr.v5.1.1/web/punbb/lang/index.html	(revision 4)
@@ -1,8 +1,1 @@
-<html>
-<head>
-<title>.</title>
-</head>
-<body>
-.
-</body>
-</html>
+<html><head><title>.</title></head><body>.</body></html>
