aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/language/en/ucp.php5
-rw-r--r--phpBB/styles/subSilver/template/ucp_profile_reg_details.html17
2 files changed, 13 insertions, 9 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 9d51c0d7bb..8d92655259 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -124,10 +124,11 @@ $lang = array_merge($lang, array(
'CHANGE_PASSWORD' => 'Change password',
'CLICK_RETURN_FOLDER' => '%1$sReturn to your ā€œ%3$sā€ folder%2$s',
'CONFIRMATION' => 'Confirmation of registration',
+ 'CONFIRM_CHANGES' => 'Confirm changes',
'CONFIRM_EMAIL' => 'Confirm email address',
'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing your email address.',
'CONFIRM_EXPLAIN' => 'To prevent automated registrations the board administrator requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
- 'CONFIRM_PASSWORD' => 'Confirm password',
+ 'CONFIRM_PASSWORD' => 'Confirm new password',
'CONFIRM_PASSWORD_EXPLAIN' => 'You only need to confirm your password if you changed it above',
'COPPA_BIRTHDAY' => 'To continue with the registration procedure please tell us when you were born.',
'COPPA_COMPLIANCE' => 'COPPA compliance',
@@ -263,7 +264,7 @@ $lang = array_merge($lang, array(
'NEW_EMAIL_ERROR' => 'The email addresses you entered do not match.',
'NEW_FOLDER_NAME' => 'New folder name',
- 'NEW_PASSWORD' => 'Password',
+ 'NEW_PASSWORD' => 'New password',
'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.',
'NOTIFY_METHOD' => 'Notification method',
'NOTIFY_METHOD_BOTH' => 'Both',
diff --git a/phpBB/styles/subSilver/template/ucp_profile_reg_details.html b/phpBB/styles/subSilver/template/ucp_profile_reg_details.html
index ba70350308..6ade4c8cba 100644
--- a/phpBB/styles/subSilver/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/subSilver/template/ucp_profile_reg_details.html
@@ -14,31 +14,34 @@
<td class="row3" colspan="2" align="center"><span class="gensmall" style="color:red">{ERROR}</span></td>
</tr>
<!-- ENDIF -->
-<tr>
+<tr>
<td class="row1" width="35%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>
<td class="row2"><!-- IF S_CHANGE_USERNAME --><input type="text" class="post" name="username" size="30" maxlength="30" value="{USERNAME}" /><!-- ELSE --><b class="gen">{USERNAME}</b><!-- ENDIF --></td>
</tr>
-<tr>
+<tr>
<td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
<td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="60" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td>
</tr>
<!-- IF S_CHANGE_EMAIL -->
- <tr>
+ <tr>
<td class="row1" width="35%"><b class="genmed">{L_CONFIRM_EMAIL}: </b><br /><span class="gensmall">{L_CONFIRM_EMAIL_EXPLAIN}</span></td>
<td class="row2"><input type="text" class="post" name="email_confirm" size="30" maxlength="60" value="{CONFIRM_EMAIL}" /></td>
</tr>
<!-- ENDIF -->
<!-- IF S_CHANGE_PASSWORD -->
- <tr>
- <td class="row1" width="35%"><b class="genmed">{L_CHANGE_PASSWORD}: </b><br /><span class="gensmall">{L_CHANGE_PASSWORD_EXPLAIN}</span></td>
+ <tr>
+ <td class="row1" width="35%"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_CHANGE_PASSWORD_EXPLAIN}</span></td>
<td class="row2"><input type="password" class="post" name="new_password" size="30" maxlength="255" value="{NEW_PASSWORD}" /></td>
</tr>
- <tr>
+ <tr>
<td class="row1" width="35%"><b class="genmed">{L_CONFIRM_PASSWORD}: </b><br /><span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td>
<td class="row2"><input type="password" class="post" name="password_confirm" size="30" maxlength="255" value="{PASSWORD_CONFIRM}" /></td>
</tr>
<!-- ENDIF -->
-<tr>
+<tr>
+ <th colspan="2">{L_CONFIRM_CHANGES}</th>
+</tr>
+<tr>
<td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall">{L_CURRENT_PASSWORD_EXPLAIN}</span></td>
<td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td>
</tr>