3 files changed, 36 insertions, 12 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php
index bf2bdb4092..1af0520fc7 100644
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -2036,15 +2036,29 @@ $lang += array(
 	'SECOND_OPTION'				=> 'Second Option',
 	'EMPTY_FIELD_NAME'			=> 'Empty field name',
 	'EMPTY_USER_FIELD_NAME'		=> 'Empty Field Name presented to the user',
-	'FIELD_IDENT_ALREADY_EXIST'	=> 'Field identifier %s already exist, please choose another Field Name.',
-	'NEXT_PAGE'					=> 'Next Page',
-	'PREVIOUS_PAGE'				=> 'Previous Page',
-	'STEP_1_TITLE'				=> 'Add Profile Field',
-	'STEP_1_EXPLAIN'			=> 'Here you can enter the first basic parameters of your new profile field. These informations are needed for the second step where you are able to set remaining options and where you are able to preview and tweak your profile field further.',
-	'STEP_2_TITLE'				=> 'Profile type specific options',
-	'STEP_2_EXPLAIN'			=> 'Here you are able to define some common options. Further you are able to preview the field you generated, as the user will see it. Play around with it until you are satisfied as how the field behaves.',
-	'STEP_3_TITLE'				=> 'Remaining Language Definitions',
-	'STEP_3_EXPLAIN'			=> 'Since you have more than one board language installed, you have to fill out the remaining language items too. The profile field will work with the default language enabled, you are able to fill out the remaining language items later too.',
+
+	'PROFILE_BASIC_OPTIONS'		=> 'Basic Options',
+	'PROFILE_TYPE_OPTIONS'		=> 'Profile type specific options',
+	'PROFILE_LANG_OPTIONS'		=> 'Language specific options',
+	
+	'STEP_1_TITLE_CREATE'		=> 'Add Profile Field',
+	'STEP_1_TITLE_EDIT'			=> 'Edit Profile Field',
+
+	'STEP_1_EXPLAIN_CREATE'		=> 'Here you can enter the first basic parameters of your new profile field. These informations are needed for the second step where you are able to set remaining options and where you are able to preview and tweak your profile field further.',
+	'STEP_1_EXPLAIN_EDIT'		=> 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step, where you are able to preview and test the changed settings.',
+
+	'STEP_2_TITLE_CREATE'		=> 'Profile type specific options',
+	'STEP_2_TITLE_EDIT'			=> 'Profile type specific options',
+
+	'STEP_2_EXPLAIN_CREATE'		=> 'Here you are able to define some common options. Further you are able to preview the field you generated, as the user will see it. Play around with it until you are satisfied as how the field behaves.',
+	'STEP_2_EXPLAIN_EDIT'		=> 'Here you are able to change some common options. Further you are able to preview the changed field, as the user will see it. Play around with it until you are satisfied as how the field behaves.<br /><b>Please note that changes to profile fields will not affect existing profile fields entered by your users.</b>',
+	
+	'STEP_3_TITLE_CREATE'		=> 'Remaining Language Definitions',
+	'STEP_3_TITLE_EDIT'			=> 'Language Definitions',
+
+	'STEP_3_EXPLAIN_CREATE'		=> 'Since you have more than one board language installed, you have to fill out the remaining language items too. The profile field will work with the default language enabled, you are able to fill out the remaining language items later too.',
+	'STEP_3_EXPLAIN_EDIT'		=> 'Since you have more than one board language installed, you now can change or add the remaining language items too. The profile field will work with the default language enabled.',
+
 	'ROWS'						=> 'Rows',
 	'COLUMNS'					=> 'Columns',
 	'UPDATE_PREVIEW'			=> 'Update Preview',
@@ -2077,7 +2091,7 @@ $lang += array(
 	'FIELD_TYPE'			=> 'Field Type',
 	'FIELD_TYPE_EXPLAIN'	=> 'You are not able to change the field type later.',
 	'FIELD_NAME'			=> 'Field Name',
-	'FIELD_NAME_EXPLAIN'	=> 'The Field Name is a name for you to identify the profile field, it is not displayed to the user. You are able to use this name as template variable later.',
+	'FIELD_NAME_EXPLAIN'	=> 'The Field Name is a name for you to identify the profile field, it is not displayed to the user.',
 	'LANG_SPECIFIC_OPTIONS'	=> 'Language specific options [<b>%s</b>]',
 	'USER_FIELD_NAME'		=> 'Field Name presented to the user',
 	'FIELD_DESCRIPTION'		=> 'Field Description',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 83f0d2f30f..80620d238b 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -504,7 +504,7 @@ $lang += array(
 	),
 );
 
-// Pool of unused or currently not assignable language variables
+/* Pool of unused or currently not assignable language variables
 $unused = array(
 	'ALREADY_VOTED' => 'You have already voted in this poll and may not change your selection.',
 	'AM' => 'AM',
@@ -614,6 +614,6 @@ $unused = array(
 	'VIEWING_MESSAGES' => 'Viewing Private Messages',
 	'View_Information' => 'View Information'
 );
-
+*/
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 6a4ad557ac..164f862e43 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -127,6 +127,16 @@ $lang += array(
 	'EXPORT_AS_TXT'				=> 'Export as TXT',
 	'EXPORT_AS_MSG'				=> 'Export as MSG',
 
+	'FIELD_REQUIRED'			=> 'The field "%s" must be completed.',
+	'FIELD_TOO_SHORT'			=> 'The field "%1$s" is too short, a minimum of %2$d characters is required.',
+	'FIELD_TOO_LONG'			=> 'The field "%1$s" is too long, a maximum of %2$d characters is allowed.',
+	'FIELD_TOO_SMALL'			=> 'The value of "%1$s" is too small, a minimum value of %2$d is required.',
+	'FIELD_TOO_LARGE'			=> 'The value of "%1$s" is too large, a maximum value of %2$d is allowed.',
+	'FIELD_INVALID_CHARS_NUMBERS_ONLY'	=> 'The field "%s" has invalid characters, only numbers are allowed.',
+	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field "%s" has invalid characters, only alphanumeric characters are allowed.',
+	'FIELD_INVALID_CHARS_SPACERS_ONLY'	=> 'The field "%s" has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
+	'FIELD_INVALID_DATE'		=> 'The field "%s" has an invalid date.',
+
 	'FOE_MESSAGE'				=> 'Message from foe',
 	'FOES_EXPLAIN'				=> 'Foes are users which will be ignored by default. Posts by these users will not be fully visible and personal messages will not be permitted. Please note that you cannot ignore moderators or administrators.',
 	'FOES_UPDATED'				=> 'Your foes list has been updated successfully',