| Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php |
| — | — | @@ -101,14 +101,11 @@ |
| 102 | 102 | 'centralauth-merge-method-primary-desc' => 'This is the wiki at which the account was initially merged. |
| 103 | 103 | Note that it may differ from the real home wiki of that user.', |
| 104 | 104 | 'centralauth-merge-method-empty-desc' => 'Indicates that the local account was merged because it had no edits.', |
| 105 | | - 'centralauth-merge-method-mail-desc' => 'Indicates that the local account was merged because its email address matched |
| 106 | | -the email address of the main account', |
| 107 | | - 'centralauth-merge-method-password-desc' => 'Indicates that the local account was merged because user specified a valid |
| 108 | | -password for it.', |
| 109 | | - 'centralauth-merge-method-admin-desc' => 'Indicates that the local account was merged manually by stewards. That feature |
| 110 | | -is disabled now because of security reasons.', |
| 111 | | - 'centralauth-merge-method-new-desc' => 'Indicates that the global account was created automatically when that local |
| 112 | | -account was created.', |
| | 105 | + 'centralauth-merge-method-mail-desc' => 'Indicates that the local account was merged because its email address matched the e-mail address of the main account.', |
| | 106 | + 'centralauth-merge-method-password-desc' => 'Indicates that the local account was merged because user specified a valid password for it.', |
| | 107 | + 'centralauth-merge-method-admin-desc' => 'Indicates that the local account was merged manually by stewards. |
| | 108 | +That feature is disabled now because of security reasons.', |
| | 109 | + 'centralauth-merge-method-new-desc' => 'Indicates that the global account was created automatically when that local account was created.', |
| 113 | 110 | 'centralauth-merge-method-login-desc' => 'Indicates that the local account was created automatically when user logged in.', |
| 114 | 111 | |
| 115 | 112 | // When not complete, offer to finish... |
| — | — | @@ -157,8 +154,10 @@ |
| 158 | 155 | 'centralauth-admin-list-legend-rw' => 'Unmerge local accounts', |
| 159 | 156 | 'centralauth-admin-unattached' => 'not attached', |
| 160 | 157 | 'centralauth-admin-notblocked' => '—', |
| 161 | | - 'centralauth-admin-blocked' => 'Blocked, expires $3 at $4. Reason: $2', |
| 162 | | - 'centralauth-admin-blocked-indef' => 'Blocked indefinitely. Reason: $1', |
| | 158 | + 'centralauth-admin-blocked' => 'Blocked, expires $3 at $4. |
| | 159 | +Reason: $2', |
| | 160 | + 'centralauth-admin-blocked-indef' => 'Blocked indefinitely. |
| | 161 | +Reason: $1', |
| 163 | 162 | 'centralauth-admin-blocklog' => 'block log', |
| 164 | 163 | 'centralauth-admin-list-localwiki' => 'Local wiki', |
| 165 | 164 | 'centralauth-admin-list-attached-on' => 'Attached on', |