diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:58:44 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:58:44 -0600 |
| commit | 68363e362d4b6d3fe717a8ffae95ab13eb374e9f (patch) | |
| tree | eea655f80184a3cee5a95abec5da1437c6e9aa5a /phpBB/styles/subsilver2/template/ucp_remind.html | |
| parent | 6c8c54d4d2575cd40fe873cd2108b031ae5830a6 (diff) | |
| parent | f5ed04f8ff0c65e1bfe6a4953b974315dd2790d7 (diff) | |
| download | forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.gz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.bz2 forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.tar.xz forums-68363e362d4b6d3fe717a8ffae95ab13eb374e9f.zip | |
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
phpBB/install/schemas/mssql_schema.sql
phpBB/report.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/styles/subsilver2/template/ucp_remind.html')
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_remind.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/subsilver2/template/ucp_remind.html b/phpBB/styles/subsilver2/template/ucp_remind.html index bf3ded394c..5151ccfad3 100644 --- a/phpBB/styles/subsilver2/template/ucp_remind.html +++ b/phpBB/styles/subsilver2/template/ucp_remind.html @@ -9,11 +9,11 @@ <th colspan="2">{L_SEND_PASSWORD}</th> </tr> <tr> - <td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b></td> + <td class="row1" width="38%"><b class="genmed">{L_USERNAME}{L_COLON} </b></td> <td class="row2"><input type="text" class="post" name="username" size="25" value="{USERNAME}" /></td> </tr> <tr> - <td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td> + <td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}{L_COLON} </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td> <td class="row2"><input type="text" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td> </tr> <tr> |