Merge "Link to existing login help page by default from helplogin-url"

[lhc/web/wiklou.git] / languages / messages / MessagesEn.php

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index df17d8f..435f7cc 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -460,6 +460,7 @@ $specialPageAliases = array(
        'Redirect'                  => array( 'Redirect' ),
        'ResetTokens'               => array( 'ResetTokens' ),
        'Revisiondelete'            => array( 'RevisionDelete' ),
+       'RunJobs'                   => array( 'RunJobs' ),
        'Search'                    => array( 'Search' ),
        'Shortpages'                => array( 'ShortPages' ),
        'Specialpages'              => array( 'SpecialPages' ),
@@ -1126,8 +1127,8 @@ You can change your {{SITENAME}} [[Special:Preferences|preferences]] if you wish
 'gotaccountlink'                  => 'Log in',
 'userlogin-resetlink'             => 'Forgotten your login details?',
 'userlogin-resetpassword-link'    => 'Forgot your password?',
-'helplogin-url'                   => 'Help:Logging in',
-'userlogin-helplink'              => '[[{{MediaWiki:helplogin-url}}|Help with logging in]]',
+'helplogin-url'                   => 'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Logging_in',
+'userlogin-helplink2'              => 'Help with logging in',
 'userlogin-loggedin'              => 'You are already logged in as {{GENDER:$1|$1}}.
 Use the form below to log in as another user.',
 'userlogin-createanother'         => 'Create another account',
@@ -1289,6 +1290,9 @@ To finish logging in, you must set a new password here:',
 'resetpass-abort-generic'   => 'Password change has been aborted by an extension.',
 'resetpass-expired'         => 'Your password has expired. Please set a new password to log in.',
 'resetpass-expired-soft'    => 'Your password has expired and needs to be reset. Please choose a new password now, or click "{{int:resetpass-submit-cancel}}" to reset it later.',
+'resetpass-validity-soft'     => 'Your password is not valid: $1
+
+Please choose a new password now, or click "{{int:resetpass-submit-cancel}}" to reset it later.',
 
 # Special:PasswordReset
 'passwordreset'                    => 'Reset password',
@@ -2782,7 +2786,7 @@ It now redirects to [[$2]].',
 'deadendpagestext'                 => 'The following pages do not link to other pages in {{SITENAME}}.',
 'protectedpages'                   => 'Protected pages',
 'protectedpages-indef'             => 'Indefinite protections only',
-'protectedpages-summary'           => 'This page lists existing pages that are currently protected. For a list of titles that are protected from creation, see [[{{#special:ProtectedTitles}}]].',
+'protectedpages-summary'           => 'This page lists existing pages that are currently protected. For a list of titles that are protected from creation, see [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]].',
 'protectedpages-cascade'           => 'Cascading protections only',
 'protectedpages-noredirect'        => 'Hide redirects',
 'protectedpagesempty'              => 'No pages are currently protected with these parameters.',
@@ -2796,7 +2800,7 @@ It now redirects to [[$2]].',
 'protectedpages-unknown-performer' => 'Unknown user',
 'protectedpages-unknown-reason'    => '—', # do not translate or duplicate this message to other languages
 'protectedtitles'                  => 'Protected titles',
-'protectedtitles-summary'          => 'This page lists titles that are currently protected from creation. For a list of existing pages that are protected, see [[{{#special:ProtectedPages}}]].',
+'protectedtitles-summary'          => 'This page lists titles that are currently protected from creation. For a list of existing pages that are protected, see [[{{#special:ProtectedPages}}|{{int:protectedpages}}]].',
 'protectedtitlesempty'             => 'No titles are currently protected with these parameters.',
 'listusers'                        => 'User list',
 'listusers-summary'                => '', # do not translate or duplicate this message to other languages