Index: branches/rsr.v5.1.dev/web/punbb/lang/English/profile.php
===================================================================
--- branches/rsr.v5.1.dev/web/punbb/lang/English/profile.php	(revision 1)
+++ branches/rsr.v5.1.dev/web/punbb/lang/English/profile.php	(revision 3)
@@ -5,140 +5,137 @@
 
 // Navigation and sections
-'Profile menu'				=>	'Profile menu',
-'Section essentials'		=>	'Essentials',
-'Section personal'			=>	'Personal',
-'Section messaging'			=>	'Messaging',
-'Section personality'		=>	'Personality',
-'Section display'			=>	'Display',
-'Section privacy'			=>	'Privacy',
-'Section admin'				=>	'Administration',
+'Profile menu'					=>	'Profile menu',
+'Section essentials'			=>	'Essentials',
+'Section personal'				=>	'Personal',
+'Section messaging'				=>	'Messaging',
+'Section personality'			=>	'Personality',
+'Section display'				=>	'Display',
+'Section privacy'				=>	'Privacy',
+'Section admin'					=>	'Administration',
 
 // Miscellaneous
-'Username and pass legend'	=>	'Enter your username and password',
-'Personal details legend'	=>	'Enter your personal details',
-'Contact details legend'	=>	'Enter your messaging details',
-'Options display'			=>	'Set your display options',
-'Options post'				=>	'Set your post viewing options',
-'User activity'				=>	'User activity',
-'Paginate info'				=>	'Enter the number of topics and posts you wish to view on each page.',
+'Username and pass legend'		=>	'Enter your username and password',
+'Personal details legend'		=>	'Enter your personal details',
+'Contact details legend'		=>	'Enter your messaging details',
+'User activity'					=>	'User activity',
+'Paginate info'					=>	'Enter the number of topics and posts you wish to view on each page.',
 
 // Password stuff
-'Pass key bad'				=>	'The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at',
-'Pass updated'				=>	'Your password has been updated. You can now login with your new password.',
-'Pass updated redirect'		=>	'Password updated. Redirection ...',
-'Wrong pass'				=>	'Wrong old password.',
-'Change pass'				=>	'Change password',
-'Change pass legend'		=>	'Enter and confirm your new password',
-'Old pass'					=>	'Old password',
-'New pass'					=>	'New password',
-'Confirm new pass'			=>	'Confirm new password',
+'Pass key bad'					=>	'The specified password activation key was incorrect or has expired. Please re-request a new password. If that fails, contact the forum administrator at',
+'Pass updated'					=>	'Your password has been updated. You can now login with your new password.',
+'Pass updated redirect'			=>	'Password updated. Redirecting âŠ',
+'Wrong pass'					=>	'Wrong old password.',
+'Change pass'					=>	'Change password',
+'Change pass legend'			=>	'Enter and confirm your new password',
+'Old pass'						=>	'Old password',
+'New pass'						=>	'New password',
+'Confirm new pass'				=>	'Confirm new password',
+'Pass info'						=>	'Passwords must be at least 4 characters long. Passwords are case sensitive.',
 
-// E-mail stuff
-'E-mail key bad'			=>	'The specified e-mail activation key was incorrect or has expired. Please re-request change of e-mail address. If that fails, contact the forum administrator at',
-'E-mail updated'			=>	'Your e-mail address has been updated.',
-'Activate e-mail sent'		=>	'An email has been sent to the specified address with instructions on how to activate the new e-mail address. If it doesn\'t arrive you can contact the forum administrator at',
-'E-mail legend'				=>	'Enter your new e-mail address',
-'E-mail instructions'		=>	'An e-mail will be sent to your new address with an activation link. You must click the link in the e-mail you receive to activate the new address.',
-'Change e-mail'				=>	'Change e-mail address',
-'New e-mail'				=>	'New e-mail',
+// Email stuff
+'Email key bad'					=>	'The specified email activation key was incorrect or has expired. Please re-request change of email address. If that fails, contact the forum administrator at',
+'Email updated'					=>	'Your email address has been updated.',
+'Activate email sent'			=>	'An email has been sent to the specified address with instructions on how to activate the new email address. If it doesn\'t arrive you can contact the forum administrator at',
+'Email legend'					=>	'Enter your new email address',
+'Email instructions'			=>	'An email will be sent to your new address with an activation link. You must click the link in the email you receive to activate the new address.',
+'Change email'					=>	'Change email address',
+'New email'						=>	'New email',
 
 // Avatar upload stuff
-'Avatars disabled'			=>	'The administrator has disabled avatar support.',
-'Too large ini'				=>	'The selected file was too large to upload. The server didn\'t allow the upload.',
-'Partial upload'			=>	'The selected file was only partially uploaded. Please try again.',
-'No tmp directory'			=>	'PHP was unable to save the uploaded file to a temporary location.',
-'No file'					=>	'You did not select a file for upload.',
-'Bad type'					=>	'The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png.',
-'Too wide or high'			=>	'The file you tried to upload is wider and/or higher than the maximum allowed',
-'Too large'					=>	'The file you tried to upload is larger than the maximum allowed',
-'pixels'					=>	'pixels',
-'bytes'						=>	'bytes',
-'Move failed'				=>	'The server was unable to save the uploaded file. Please contact the forum administrator at',
-'Unknown failure'			=>	'An unknown error occurred. Please try again.',
-'Avatar upload redirect'	=>	'Avatar uploaded. Redirection ...',
-'Avatar deleted redirect'	=>	'Avatar deleted. Redirection ...',
-'Avatar desc'				=>	'An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than',
-'Upload avatar'				=>	'Upload avatar',
-'Upload avatar legend'		=>	'Enter an avatar file to upload',
-'Delete avatar'				=>	'Delete avatar',	// only for admins
-'File'						=>	'File',
-'Upload'					=>	'Upload',	// submit button
+'Avatars disabled'				=>	'The administrator has disabled avatar support.',
+'Too large ini'					=>	'The selected file was too large to upload. The server didn\'t allow the upload.',
+'Partial upload'				=>	'The selected file was only partially uploaded. Please try again.',
+'No tmp directory'				=>	'PHP was unable to save the uploaded file to a temporary location.',
+'No file'						=>	'You did not select a file for upload.',
+'Bad type'						=>	'The file you tried to upload is not of an allowed type. Allowed types are gif, jpeg and png.',
+'Too wide or high'				=>	'The file you tried to upload is wider and/or higher than the maximum allowed',
+'Too large'						=>	'The file you tried to upload is larger than the maximum allowed',
+'pixels'						=>	'pixels',
+'bytes'							=>	'bytes',
+'Move failed'					=>	'The server was unable to save the uploaded file. Please contact the forum administrator at',
+'Unknown failure'				=>	'An unknown error occurred. Please try again.',
+'Avatar upload redirect'		=>	'Avatar uploaded. Redirecting âŠ',
+'Avatar deleted redirect'		=>	'Avatar deleted. Redirecting âŠ',
+'Avatar desc'					=>	'An avatar is a small image that will be displayed under your username in your posts. It must not be any bigger than',
+'Upload avatar'					=>	'Upload avatar',
+'Upload avatar legend'			=>	'Enter an avatar file to upload',
+'Delete avatar'					=>	'Delete avatar', // only for admins
+'File'							=>	'File',
+'Upload'						=>	'Upload', // submit button
 
 // Form validation stuff
-'Dupe username'				=>	'Someone else has already registered with that username. Please go back and try a different username.',
-'Forbidden title'			=>	'The title you entered contains a forbidden word. You must choose a different title.',
-'Profile redirect'			=>	'Profile updated. Redirection ...',
+'Forbidden title'				=>	'The title you entered contains a forbidden word. You must choose a different title.',
+'Profile redirect'				=>	'Profile updated. Redirecting âŠ',
 
 // Profile display stuff
-'Not activated'				=>	'This user hasn\'t activated his/her account yet. The account is activated when he/she logs in the first time.',
-'Unknown'					=>	'(Unknown)',	// This is displayed when a user hasn't filled out profile field (e.g. Location)
-'Private'					=>	'(Private)',	// This is displayed when a user does not want to receive e-mails
-'No avatar'					=>	'(No avatar)',
-'Show posts'				=>	'Show all posts',
-'Realname'					=>	'Real name',
-'Location'					=>	'Location',
-'Website'					=>	'Website',
-'Jabber'					=>	'Jabber',
-'ICQ'						=>	'ICQ',
-'MSN'						=>	'MSN Messenger',
-'AOL IM'					=>	'AOL IM',
-'Yahoo'						=>	'Yahoo! Messenger',
-'Avatar'					=>	'Avatar',
-'Signature'					=>	'Signature',
-'Sig max length'			=>	'Max length',
-'Sig max lines'				=>	'Max lines',
-'Avatar legend'				=>	'Set your avatar display options',
-'Avatar info'				=>	'An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below. The checkbox \'Use avatar\' below must be checked in order for the avatar to be visible in your posts.',
-'Change avatar'				=>	'Change avatar',
-'Use avatar'				=>	'Use avatar.',
-'Signature legend'			=>	'Compose your signature',
-'Signature info'			=>	'A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It\'s up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature.',
-'Sig preview'				=>	'Current signature preview:',
-'No sig'					=>	'No signature currently stored in profile.',
-'Topics per page'			=>	'Topics',
-'Topics per page info'		=>	'This setting controls how many topics are displayed per page when you view a forum. If you are uncertain about what to use, you can just leave it blank and the forum default will be used.',
-'Posts per page'			=>	'Posts',
-'Posts per page info'		=>	'This setting controls how many posts are displayed per page when you view a topic. If you are uncertain about what to use, you can just leave it blank and the forum default will be used.',
-'Leave blank'				=>	'Leave blank to use forum default.',
-'Notify full'				=>	'Include post in subscription e-mails.',
-'Notify full info'			=>	'With this enabled, a plain text version of the new post will be included in subscription notification e-mails.',
-'Show smilies'				=>	'Show smilies as graphic icons',
-'Show smilies info'			=>	'If you enable this option, small images will be displayed instead of text smilies.',
-'Show images'				=>	'Show images in posts.',
-'Show images info'			=>	'Disable this if you don\'t want to see images in posts (i.e. images displayed with the [img]-tag).',
-'Show images sigs'			=>	'Show images in user signatures.',
-'Show images sigs info'		=>	'Disable this if you don\'t want to see images in signatures (i.e. images displayed with the [img]-tag).',
-'Show avatars'				=>	'Show user avatars in posts.',
-'Show avatars info'			=>	'This option toggles whether user avatar images will be displayed in posts or not.',
-'Show sigs'					=>	'Show user signatures.',
-'Show sigs info'			=>	'Enable if you would like to see user signatures.',
-'Style legend'				=>	'Select your preferred style',
-'Style info'				=>	'If you like you can use a different visual style for this forum.',
-'Admin note'				=>	'Admin note',
-'Pagination legend'			=>	'Enter your pagination options',
-'Post display legend'		=>	'Set your options for viewing posts',
-'Post display info'			=>	'If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster.',
-'Instructions'				=>	'When you update your profile, you will be redirected back to this page.',
+'Users profile'					=>	'%s\'s profile',
+'Username info'					=>	'Username: %s',
+'Email info'					=>	'Email: %s',
+'Posts info'					=>	'Posts: %s',
+'Registered info'				=>	'Registered: %s',
+'Last post info'				=>	'Last post: %s',
+'Last visit info'				=>	'Last visit: %s',
+'Show posts'					=>	'Show all posts',
+'Show topics'					=>	'Show all topics',
+'Show subscriptions'			=>	'Show all subscriptions',
+'Realname'						=>	'Real name',
+'Location'						=>	'Location',
+'Website'						=>	'Website',
+'Invalid website URL'					=>	'The website URL you entered is invalid.',
+'Jabber'						=>	'Jabber',
+'ICQ'							=>	'ICQ',
+'MSN'							=>	'MSN Messenger',
+'AOL IM'						=>	'AOL IM',
+'Yahoo'							=>	'Yahoo! Messenger',
+'Avatar'						=>	'Avatar',
+'Signature'						=>	'Signature',
+'Sig max size'					=>	'Max length: %s characters / Max lines: %s',
+'Avatar legend'					=>	'Set your avatar display options',
+'Avatar info'					=>	'An avatar is a small image that will be displayed with all your posts. You can upload an avatar by clicking the link below.',
+'Change avatar'					=>	'Change avatar',
+'Signature legend'				=>	'Compose your signature',
+'Signature info'				=>	'A signature is a small piece of text that is attached to your posts. In it, you can enter just about anything you like. Perhaps you would like to enter your favourite quote or your star sign. It\'s up to you! In your signature you can use BBCode if it is allowed in this particular forum. You can see the features that are allowed/enabled listed below whenever you edit your signature.',
+'Sig preview'					=>	'Current signature preview:',
+'No sig'						=>	'No signature currently stored in profile.',
+'Signature quote/code/list/h'	=>	'The quote, code, list, and heading BBCodes are not allowed in signatures.',
+'Topics per page'				=>	'Topics',
+'Posts per page'				=>	'Posts',
+'Leave blank'					=>	'Leave blank to use forum default.',
+'Subscription legend'			=>	'Set your subscription options',
+'Notify full'					=>	'Include a plain text version of new posts in subscription notification emails.',
+'Auto notify full'				=>	'Automatically subscribe to every topic you post in.',
+'Show smilies'					=>	'Show smilies as graphic icons.',
+'Show images'					=>	'Show images in posts.',
+'Show images sigs'				=>	'Show images in user signatures.',
+'Show avatars'					=>	'Show user avatars in posts.',
+'Show sigs'						=>	'Show user signatures.',
+'Style legend'					=>	'Select your preferred style',
+'Styles'						=>	'Styles',
+'Admin note'					=>	'Admin note',
+'Pagination legend'				=>	'Enter your pagination options',
+'Post display legend'			=>	'Set your options for viewing posts',
+'Post display info'				=>	'If you are on a slow connection, disabling these options, particularly showing images in posts and signatures, will make pages load faster.',
+'Instructions'					=>	'When you update your profile, you will be redirected back to this page.',
 
 // Administration stuff
-'Group membership legend'	=>	'Choose user group',
-'Save'						=>	'Save',
-'Set mods legend'			=>	'Set moderator access',
-'Moderator in'				=>	'Moderator in',
-'Moderator in info'			=>	'Choose what forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums.',
-'Update forums'				=>	'Update forums',
-'Delete ban legend'			=>	'Delete (administrators only) or ban user',
-'Delete user'				=>	'Delete user',
-'Ban user'					=>	'Ban user',
-'Confirm delete legend'		=>	'Important: read before deleting user',
-'Confirm delete user'		=>	'Confirm delete user',
-'Confirmation info'			=>	'Please confirm that you want to delete the user',	// the username will be appended to this string
-'Delete warning'			=>	'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time.',
-'Delete posts'				=>	'Delete any posts and topics this user has made.',
-'Delete'					=>	'Delete',		// submit button (confirm user delete)
-'User delete redirect'		=>	'User deleted. Redirection ...',
-'Group membership redirect'	=>	'Group membership saved. Redirection ...',
-'Update forums redirect'	=>	'Forum moderator rights updated. Redirection ...',
-'Ban redirect'				=>	'Redirection ...'
+'Group membership legend'		=>	'Choose user group',
+'Save'							=>	'Save',
+'Set mods legend'				=>	'Set moderator access',
+'Moderator in info'				=>	'Choose which forums this user should be allowed to moderate. Note: This only applies to moderators. Administrators always have full permissions in all forums.',
+'Update forums'					=>	'Update forums',
+'Delete ban legend'				=>	'Delete (administrators only) or ban user',
+'Delete user'					=>	'Delete user',
+'Ban user'						=>	'Ban user',
+'Confirm delete legend'			=>	'Important: read before deleting user',
+'Confirm delete user'			=>	'Confirm delete user',
+'Confirmation info'				=>	'Please confirm that you want to delete the user', // the username will be appended to this string
+'Delete warning'				=>	'Warning! Deleted users and/or posts cannot be restored. If you choose not to delete the posts made by this user, the posts can only be deleted manually at a later time.',
+'Delete posts'					=>	'Delete any posts and topics this user has made.',
+'Delete'						=>	'Delete', // submit button (confirm user delete)
+'User delete redirect'			=>	'User deleted. Redirecting âŠ',
+'Group membership redirect'		=>	'Group membership saved. Redirecting âŠ',
+'Update forums redirect'		=>	'Forum moderator rights updated. Redirecting âŠ',
+'Ban redirect'					=>	'Redirecting âŠ',
+'No delete admin message'		=>	'Administrators cannot be deleted. In order to delete this user, you must first move him/her to a different user group.',
 
 );
