| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1180,17 +1180,16 @@ |
| 1181 | 1181 | |
| 1182 | 1182 | # Special:PasswordReset |
| 1183 | 1183 | 'passwordreset' => 'Reset password', |
| 1184 | | -'passwordreset-text' => 'Complete this form to receive an email reminder of your account details.', |
| | 1184 | +'passwordreset-text' => 'Complete this form to receive an e-mail reminder of your account details.', |
| 1185 | 1185 | 'passwordreset-legend' => 'Reset password', |
| 1186 | 1186 | 'passwordreset-disabled' => 'Password resets have been disabled on this wiki.', |
| 1187 | 1187 | 'passwordreset-pretext' => '{{PLURAL:$1||Enter one of the pieces of data below}}', |
| 1188 | 1188 | 'passwordreset-username' => 'Username:', |
| 1189 | | -'passwordreset-email' => 'Email:', |
| | 1189 | +'passwordreset-email' => 'E-mail address:', |
| 1190 | 1190 | 'passwordreset-emailtitle' => 'Account details on {{SITENAME}}', |
| 1191 | | -'passwordreset-emailtext-ip' => ' |
| 1192 | | -Someone (probably you, from IP address $1) requested a reminder of your |
| | 1191 | +'passwordreset-emailtext-ip' => 'Someone (probably you, from IP address $1) requested a reminder of your |
| 1193 | 1192 | account details for {{SITENAME}} ($4). The following user {{PLURAL:$3|account is|accounts are}} |
| 1194 | | -associated with this email address: |
| | 1193 | +associated with this e-mail address: |
| 1195 | 1194 | |
| 1196 | 1195 | $2 |
| 1197 | 1196 | |
| — | — | @@ -1199,9 +1198,8 @@ |
| 1200 | 1199 | request, or if you have remembered your original password, and you no longer |
| 1201 | 1200 | wish to change it, you may ignore this message and continue using your old |
| 1202 | 1201 | password.', |
| 1203 | | -'passwordreset-emailtext-user' => ' |
| 1204 | | -User $1 on {{SITENAME}} requested a reminder of your account details for {{SITENAME}} |
| 1205 | | -($4). The following user {{PLURAL:$3|account is|accounts are}} associated with this email address: |
| | 1202 | +'passwordreset-emailtext-user' => 'User $1 on {{SITENAME}} requested a reminder of your account details for {{SITENAME}} |
| | 1203 | +($4). The following user {{PLURAL:$3|account is|accounts are}} associated with this e-mail address: |
| 1206 | 1204 | |
| 1207 | 1205 | $2 |
| 1208 | 1206 | |
| — | — | @@ -1210,8 +1208,9 @@ |
| 1211 | 1209 | request, or if you have remembered your original password, and you no longer |
| 1212 | 1210 | wish to change it, you may ignore this message and continue using your old |
| 1213 | 1211 | password.', |
| 1214 | | -'passwordreset-emailelement' => "\tUsername: $1\n\tTemporary password: $2", |
| 1215 | | -'passwordreset-emailsent' => 'A reminder email has been sent.', |
| | 1212 | +'passwordreset-emailelement' => "Username: $1 |
| | 1213 | +Temporary password: $2", |
| | 1214 | +'passwordreset-emailsent' => 'A reminder e-mail has been sent.', |
| 1216 | 1215 | |
| 1217 | 1216 | # Edit page toolbar |
| 1218 | 1217 | 'bold_sample' => 'Bold text', |