1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 21:54:00 +02:00

Merge PR #785 branch 'Senky/ticket/10835' into develop-olympus

* Senky/ticket/10835:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP
This commit is contained in:
Oleg Pudeyev
2012-05-11 02:32:58 -04:00
3 changed files with 5 additions and 4 deletions

View File

@@ -42,7 +42,7 @@
<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="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall"><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></td>
<td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td>
</tr>
<tr>