Merge "Slight improvements to FormSpecialPage behavior."

[lhc/web/wiklou.git] / maintenance / language / messages.inc

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 96a6c13..876b03d 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -431,8 +431,7 @@ $wgMessageStructure = array(
                'yourname',
                'userlogin-yourname',
                'userlogin-yourname-ph',
-               'createacct-helpusername-url',
-               'createacct-helpusername-link',
+               'createacct-helpusername',
                'yourpassword',
                'userlogin-yourpassword',
                'userlogin-yourpassword-ph',
@@ -464,6 +463,7 @@ $wgMessageStructure = array(
                'gotaccount',
                'gotaccountlink',
                'userlogin-resetlink',
+               'userlogin-resetpassword-link',
                'helplogin-url',
                'userlogin-helplink',
                'createacct-join',
@@ -474,10 +474,11 @@ $wgMessageStructure = array(
                'createacct-realname',
                'createaccountreason',
                'createacct-reason',
+               'createacct-reason-ph',
                'createacct-captcha',
-               'createacct-captcha-help-url',
                'createacct-imgcaptcha-help',
                'createacct-imgcaptcha-ph',
+               'createacct-submit',
                'createacct-benefit-heading',
                'createacct-benefit-icon1',
                'createacct-benefit-head1',
@@ -567,6 +568,7 @@ $wgMessageStructure = array(
                'resetpass-submit-cancel',
                'resetpass-wrong-oldpass',
                'resetpass-temp-password',
+               'resetpass-abort-generic',
        ),
        'passwordreset' => array(
                'passwordreset',
@@ -1130,6 +1132,7 @@ $wgMessageStructure = array(
                'userrights-changeable-col',
                'userrights-unchangeable-col',
                'userrights-irreversible-marker',
+               'userrights-conflict',
        ),
        'group' => array(
                'group',
@@ -1873,6 +1876,17 @@ $wgMessageStructure = array(
                'listusers-noresult',
                'listusers-blocked',
        ),
+       'activeusers' => array(
+               'activeusers',
+               'activeusers-summary',
+               'activeusers-intro',
+               'activeusers-count',
+               'activeusers-from',
+               'activeusers-hidebots',
+               'activeusers-hidesysops',
+               'activeusers-submit',
+               'activeusers-noresult',
+       ),
        'listgrouprights' => array(
                'listgrouprights',
                'listgrouprights-summary',
@@ -3637,11 +3651,18 @@ $wgMessageStructure = array(
                'version-entrypoints-api-php',
                'version-entrypoints-load-php',
        ),
-       'filepath' => array(
-               'filepath',
-               'filepath-page',
-               'filepath-submit',
-               'filepath-summary',
+       'redirect' => array(
+               'redirect',
+               'redirect-legend',
+               'redirect-text',
+               'redirect-summary',
+               'redirect-submit',
+               'redirect-lookup',
+               'redirect-value',
+               'redirect-user',
+               'redirect-revision',
+               'redirect-file',
+               'redirect-not-exists',
        ),
        'fileduplicatesearch' => array(
                'fileduplicatesearch',
@@ -3727,6 +3748,7 @@ $wgMessageStructure = array(
                'htmlform-selectorother-other',
                'htmlform-no',
                'htmlform-yes',
+               'htmlform-chosen-placeholder',
        ),
        'sqlite' => array(
                'sqlite-has-fts',
@@ -3972,6 +3994,7 @@ XHTML id names.",
        'deletedcontribs'     => 'Special:DeletedContributions',
        'linksearch'          => 'Special:LinkSearch',
        'listusers'           => 'Special:ListUsers',
+       'activeusers'         => 'Special:ActiveUsers',
        'newuserlog'          => 'Special:Log/newusers',
        'listgrouprights'     => 'Special:ListGroupRights',
        'emailuser'           => 'Email user',
@@ -4027,9 +4050,9 @@ Variants for Chinese language",
        'variantname-shi'     => 'Variants for Tachelhit language',
        'media-info'          => 'Media information',
        'metadata'            => 'Metadata',
-       'exif'                           => 'EXIF tags',
+       'exif'                           => 'Exif tags',
        'exif-values'                    => 'Make & model, can be wikified in order to link to the camera and model name',
-       'exif-compression'               => 'EXIF attributes',
+       'exif-compression'               => 'Exif attributes',
        'exif-copyrighted'               => '',
        'exif-unknowndate'               => '',
        'exif-photometricinterpretation' => '',
@@ -4098,7 +4121,7 @@ Variants for Chinese language",
        'signatures'            => 'Signatures',
        'CoreParserFunctions'   => 'Core parser functions',
        'version'               => 'Special:Version',
-       'filepath'              => 'Special:FilePath',
+       'redirect'              => 'Special:Redirect',
        'fileduplicatesearch'   => 'Special:FileDuplicateSearch',
        'special-specialpages'  => 'Special:SpecialPages',
        'special-blank'         => 'Special:BlankPage',