Vaious new strings

git-svn-id: file:///svn/phpbb/trunk@4797 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/en/lang_admin.php

@@ -78,6 +78,7 @@ $lang += array(
 	'PRUNE_USERS'	=> 'Prune users', 
 	'BOTS'			=> 'Manage Bots', 
 	'GROUP_MANAGE'	=> 'Manage groups', 
+	'CUSTOM_PROFILE_FIELDS'	=> 'Profile fields', 
 
 	'ADMINISTRATORS'	=> 'Administrators',
 	'USERNAMES_EXPLAIN'	=> 'Place each username on a seperate line', 
@@ -553,24 +554,6 @@ $lang += array(
 	'JAB_RESOURCE'			=> 'Jabber resource', 
 	'JAB_RESOURCE_EXPLAIN'	=> 'The resource locates this particular connection, e.g. board, home, etc.', 
 
-	'JAB_TRANSPORTS'		=> 'Jabber Transports', 
-	'JAB_AIM_ENABLE'		=> 'Enable AIM transport', 
-	'AIM_USERNAME'			=> 'AIM Username', 
-	'AIM_USERNAME_EXPLAIN'	=> 'A valid username on %sAIM%s', 
-	'AIM_PASSWORD'			=> 'AIM Password', 
-	'JAB_ICQ_ENABLE'		=> 'Enable ICQ transport', 
-	'ICQ_USERNAME'			=> 'ICQ UID', 
-	'ICQ_USERNAME_EXPLAIN'	=> 'A valid user id on %sICQ%s', 
-	'ICQ_PASSWORD'			=> 'ICQ Password', 
-	'JAB_MSN_ENABLE'		=> 'Enable MSN transport', 
-	'MSN_USERNAME'			=> 'MSN Username', 
-	'MSN_USERNAME_EXPLAIN'	=> 'A valid username on %sMSN%s', 
-	'MSN_PASSWORD'			=> 'MSN Password', 
-	'JAB_YIM_ENABLE'		=> 'Enable YIM transport', 
-	'YIM_USERNAME'			=> 'YIM Username', 
-	'YIM_USERNAME_EXPLAIN'	=> 'A valid username on %sYIM%s', 
-	'YIM_PASSWORD'			=> 'YIM Password', 
-
 	'JAB_PASS_CHANGED'		=> 'Jabber password changed successfully', 
 	'JAB_REGISTERED'		=> 'New account registered successfully', 
 	'JAB_CHANGED'			=> 'Jabber account changed successfully', 
@@ -723,6 +706,33 @@ $lang += array(
 	'VISUAL_CONFIRM_EXPLAIN'	=> 'Requires new users enter a random code matching an image to help prevent mass registrations.',
 	'REG_LIMIT'					=> 'Registration attempts', 
 	'REG_LIMIT_EXPLAIN'			=> 'Number of attempts users can make at the confirmation code before being locked out that session.', 
+	'FORCE_PASS_CHANGE'			=> 'Force password change', 
+	'FORCE_PASS_CHANGE_EXPLAIN'	=> 'Require user to change their password after a set number of days or zero to disable.', 
+	'CHAR_LIMIT'				=> 'Max characters per post',
+	'CHAR_LIMIT_EXPLAIN'		=> 'Set to 0 for unlimited characters.',
+	'SMILIES_LIMIT'				=> 'Max smilies per post',
+	'SMILIES_LIMIT_EXPLAIN'		=> 'Set to 0 for unlimited smilies.',
+	'QUOTE_DEPTH_LIMIT'			=> 'Max nested quotes per post',
+	'QUOTE_DEPTH_LIMIT_EXPLAIN'	=> 'Set to 0 for unlimited depth.',
+	'USERNAME_LENGTH'			=> 'Username length', 
+	'USERNAME_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in usernames.', 
+	'USERNAME_CHARS'			=> 'Limit username chars', 
+	'USERNAME_CHARS_EXPLAIN'	=> 'Restrict type of characters that may be used in usernames, spacers are; space, -, +, _, [ and ]', 
+	'PASSWORD_LENGTH'			=> 'Password length', 
+	'PASSWORD_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in passwords.', 
+	'PASSWORD_TYPE'				=> 'Password complexity',
+	'PASSWORD_TYPE_EXPLAIN'		=> 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.', 
+	'PASS_TYPE_ANY'				=> 'No requirements', 
+	'PASS_TYPE_CASE'			=> 'Must be mixed case', 
+	'PASS_TYPE_ALPHA'			=> 'Must contain alphanumerics', 
+	'PASS_TYPE_SYMBOL'			=> 'Must contain symbols', 
+	'MIN_CHARS'					=> 'Min', 
+	'MAX_CHARS'					=> 'Max', 
+	'ALLOW_EMAIL_REUSE'			=> 'Allow Email address re-use',
+	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same email address.',
+	'USERNAME_CHARS_ANY'		=> 'Any character', 
+	'USERNAME_ALPHA_ONLY'		=> 'Alphanumeric only', 
+	'USERNAME_ALPHA_SPACERS'	=> 'Alphanumeric and spacers', 
 	'ENABLE_COPPA'				=> 'Enable COPPA',
 	'ENABLE_COPPA_EXPLAIN'		=> 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA act.',
 	'COPPA_FAX'					=> 'COPPA Fax Number',
@@ -730,10 +740,6 @@ $lang += array(
 	'COPPA_MAIL_EXPLAIN'		=> 'This is the mailing address where parents will send COPPA registration forms',
 	'BOARD_PM'					=> 'Private Messaging', 
 	'BOARD_PM_EXPLAIN'			=> 'Enable or disable private messaging for all users.', 
-	'BOXES_MAX'					=> 'Max number of message boxes',
-	'BOXES_MAX_EXPLAIN'			=> 'Users can create this many private messaging boxes.',
-	'BOXES_LIMIT'				=> 'Max messages per box',
-	'BOXES_LIMIT_EXPLAIN'		=> 'Users are limited to no more than this many messages in each of their private message boxes. Enter 0 for unlimited messages.',
 	'EDIT_TIME'					=> 'Limit editing time',
 	'EDIT_TIME_EXPLAIN'			=> 'Limits the time available to edit a new post, zero equals infinity',
 	'DISPLAY_LAST_EDITED'		=> 'Display last edited time information',
@@ -777,33 +783,16 @@ $lang += array(
 	'DEFAULT_DATE_FORMAT_EXPLAIN'=> 'The date format is the same as the PHP date function.',
 	'SYSTEM_TIMEZONE'			=> 'System Timezone',
 	'SYSTEM_DST'				=> 'Enable Daylight Savings Time',
-	'CHAR_LIMIT'				=> 'Max characters per post',
+	'BOXES_MAX'					=> 'Max private message folders',
-	'CHAR_LIMIT_EXPLAIN'		=> 'Set to 0 for unlimited characters.',
+	'BOXES_MAX_EXPLAIN'			=> 'By default users may create this many personal folders for private messages..',
-	'SMILIES_LIMIT'				=> 'Max smilies per post',
+	'BOXES_LIMIT'				=> 'Max private messages per box',
-	'SMILIES_LIMIT_EXPLAIN'		=> 'Set to 0 for unlimited smilies.',
+	'BOXES_LIMIT_EXPLAIN'		=> 'Users may receive no more than this many messages in each of their private message boxes or zero for unlimited messages.',
-	'QUOTE_DEPTH_LIMIT'			=> 'Max nested quotes per post',
-	'QUOTE_DEPTH_LIMIT_EXPLAIN'	=> 'Set to 0 for unlimited depth.',
 	'ALLOW_TOPIC_NOTIFY'		=> 'Allow Topic Watching',
 	'ALLOW_FORUM_NOTIFY'		=> 'Allow Forum Watching',
 	'ALLOW_NAME_CHANGE'			=> 'Allow Username changes',
-	'USERNAME_LENGTH'			=> 'Username length', 
+
-	'USERNAME_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in usernames.', 
-	'USERNAME_CHARS'			=> 'Limit username chars', 
-	'USERNAME_CHARS_EXPLAIN'	=> 'Restrict type of characters that may be used in usernames, spacers are; space, -, +, _, [ and ]', 
-	'PASSWORD_LENGTH'			=> 'Password length', 
-	'PASSWORD_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in passwords.', 
-	'PASSWORD_TYPE'				=> 'Password complexity',
-	'PASSWORD_TYPE_EXPLAIN'		=> 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.', 
-	'PASS_TYPE_ANY'				=> 'No requirements', 
-	'PASS_TYPE_CASE'			=> 'Must be mixed case', 
-	'PASS_TYPE_ALPHA'			=> 'Must contain alphanumerics', 
-	'PASS_TYPE_SYMBOL'			=> 'Must contain symbols', 
-	'MIN_CHARS'					=> 'Min', 
-	'MAX_CHARS'					=> 'Max', 
 	'MIN_RATINGS'				=> 'Ratings count before karma',
 	'MIN_RATINGS_EXPLAIN'		=> 'Number of distinct ratings before users karma is calculated.',
-	'ALLOW_EMAIL_REUSE'			=> 'Allow Email address re-use',
-	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same email address.',
 	'ALLOW_ATTACHMENTS'			=> 'Allow Attachments',
 	'ALLOW_PM_ATTACHMENTS'		=> 'Allow Attachments in Private Messages',
 	'ALLOW_HTML'				=> 'Allow HTML',
@@ -816,9 +805,6 @@ $lang += array(
 	'MAX_SIG_LENGTH_EXPLAIN'	=> 'Maximum number of characters in user signatures.',
 	'ALLOW_NO_CENSORS'			=> 'Allow Disable of Censors',
 	'ALLOW_NO_CENSORS_EXPLAINS'	=> 'User can disable word censoring.',
-	'USERNAME_CHARS_ANY'		=> 'Any character', 
-	'USERNAME_ALPHA_ONLY'		=> 'Alphanumeric only', 
-	'USERNAME_ALPHA_SPACERS'	=> 'Alphanumeric and spacers', 
 );
 
 // Karma settings
@@ -885,8 +871,10 @@ $lang += array(
 	'UNLOCKED'			=> 'Unlocked', 
 	'ENABLE_NEWS'		=> 'Set as news forum', 
 	'ENABLE_NEWS_EXPLAIN' => 'If set to yes posts in this forum will be displayed as news items.',
-	'ENABLE_RECENT'		=> 'Enable recent posts', 
+	'ENABLE_RECENT'		=> 'Display active topics', 
-	'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the recent posts list.', 
+	'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.', 
+	'DISPLAY_ACTIVE_TOPICS'			=> 'Enable active topics', 
+	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'	=> 'If set to yes active topics in selected subforums will be displayed under this category.', 
 	'ENABLE_INDEXING'	=> 'Enable search indexing', 
 	'ENABLE_INDEXING_EXPLAIN'	=> 'If set to yes posts made to this forum will be indexed for searching.', 
 	'ENABLE_TOPIC_ICONS'=> 'Enable Topic Icons', 
@@ -908,6 +896,8 @@ $lang += array(
 	'PRUNE_STICKY'				=> 'Prune Stickies',
 	'FORUM_TOPICS_PAGE'			=> 'Topics Per Page', 
 	'FORUM_TOPICS_PAGE_EXPLAIN'	=> 'If non-zero this value will override the default topics per page setting.', 
+	'ACTIVE_TOPICS_PAGE'			=> 'Number of active topics', 
+	'ACTIVE_TOPICS_PAGE_EXPLAIN'	=> 'If non-zero this value will override the default topics per page setting.', 
 	'FORUM_PASSWORD'			=> 'Forum Password', 
 	'FORUM_PASSWORD_EXPLAIN'	=> 'Defines a password for this forum, use the permission system in preference.', 
 	'FORUM_PASSWORD_CONFIRM'	=> 'Confirm Forum Password', 

phpBB/language/en/lang_main.php

@@ -759,6 +759,9 @@ $lang += array(
 	'CURRENT_PASSWORD_EXPLAIN'		=> 'You must confirm your current password if you wish to change it, alter your email address or username.',
 	'CONFIRM_PASSWORD_EXPLAIN'		=> 'You only need to confirm your password if you changed it above',
 	'CONFIRM_EMAIL_EXPLAIN'			=> 'You only need to specify this if you are changing your email address.', 
+	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
+	'CUR_PASSWORD_ERROR'			=> 'The current password you entered is incorrect.', 
+	'NEW_EMAIL_ERROR'				=> 'The email addresses you entered do not match.', 
 
 	'UCP_PROFILE_INFO'	=> 'Your Profile', 
 	'PROFILE_INFO_NOTICE'	=> 'Please note that this information will be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
@@ -842,6 +845,10 @@ $lang += array(
 	'PASSWORD_MISMATCH'			=> 'The passwords you entered did not match',
 	'CONFIRM_CODE_WRONG'		=> 'The confirmation code you entered was incorrect.', 
 	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.', 
+	'TOO_SHORT_PASSWORD_CONFIRM'=> 'The password confirmation you entered is too short.', 
+	'TOO_SHORT_NEW_PASSWORD'	=> 'The password you entered is too short.', 
+	'USERNAME_TAKEN_USERNAME'	=> 'The username you entered is already in use, please select an alternative.', 
+	'EMAIL_TAKEN_EMAIL'			=> 'The email address you specified is already in use, please select an alternative.', 
 
 	'ACCOUNT_ADDED'			=> 'Thank you for registering, your account has been created. You may now login with your username and password',
 	'ACCOUNT_INACTIVE'		=> 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information',