merging latest master

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

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 000517f..79c6ec7 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -67,7 +67,6 @@ $wgMessageStructure = array(
                'tog-watchlisthideliu',
                'tog-watchlisthideanons',
                'tog-watchlisthidepatrolled',
-               'tog-nolangconversion',
                'tog-ccmeonemails',
                'tog-diffonly',
                'tog-showhiddencats',
@@ -306,6 +305,10 @@ $wgMessageStructure = array(
                'youhavenewmessages',
                'newmessageslink',
                'newmessagesdifflink',
+               'youhavenewmessagesfromusers',
+               'youhavenewmessagesmanyusers',
+               'newmessageslinkplural',
+               'newmessagesdifflinkplural',
                'youhavenewmessagesmulti',
                'newtalkseparator',
                'editsection',
@@ -368,9 +371,9 @@ $wgMessageStructure = array(
                'readonly',
                'enterlockreason',
                'readonlytext',
-               'missing-article',
-               'missingarticle-rev',
-               'missingarticle-diff',
+               'missing-article', // not used anymore in core, but kept for extensions
+               'missingarticle-rev', // not used anymore in core, but kept for extensions
+               'missingarticle-diff', // not used anymore in core, but kept for extensions
                'readonly_lag',
                'internalerror',
                'internalerror_info',
@@ -430,6 +433,7 @@ $wgMessageStructure = array(
                'remembermypassword',
                'securelogin-stick-https',
                'yourdomainname',
+               'password-change-forbidden',
                'externaldberror',
                'login',
                'nav-login-createaccount',
@@ -615,6 +619,7 @@ $wgMessageStructure = array(
                'noarticletext',
                'noarticletext-nopermission',
                'noarticletextanon',
+               'missing-revision',
                'userpage-userdoesnotexist',
                'userpage-userdoesnotexist-view',
                'blocked-notice-logextract',
@@ -700,6 +705,7 @@ $wgMessageStructure = array(
                'expansion-depth-exceeded-warning',
                'parser-unstrip-loop-warning',
                'parser-unstrip-recursion-limit',
+               'converter-manual-rule-error',
        ),
        'undo' => array(
                'undo-success',
@@ -856,6 +862,7 @@ $wgMessageStructure = array(
                'editundo',
                'diff-multi',
                'diff-multi-manyusers',
+               'difference-missing-revision',
        ),
        'search' => array(
                'search-summary',
@@ -1643,6 +1650,7 @@ $wgMessageStructure = array(
        'specialpages' => array(
                'nbytes',
                'ncategories',
+               'ninterwikis',
                'nlinks',
                'nmembers',
                'nrevisions',
@@ -1689,6 +1697,8 @@ $wgMessageStructure = array(
                'mostcategories-summary',
                'mostimages',
                'mostimages-summary',
+               'mostinterwikis',
+               'mostinterwikis-summary',
                'mostrevisions',
                'mostrevisions-summary',
                'prefixindex',
@@ -1851,6 +1861,8 @@ $wgMessageStructure = array(
                'mailnologin',
                'mailnologintext',
                'emailuser',
+               'emailuser-title-target',
+               'emailuser-title-notarget',
                'emailuser-summary',
                'emailpage',
                'emailpagetext',
@@ -2253,6 +2265,7 @@ $wgMessageStructure = array(
                'cant-see-hidden-user',
                'ipbblocked',
                'ipbnounblockself',
+               'ipb-default-expiry',
        ),
        'developertools' => array(
                'lockdb',
@@ -2391,6 +2404,7 @@ $wgMessageStructure = array(
                'import-interwiki-templates',
                'import-interwiki-submit',
                'import-interwiki-namespace',
+               'import-interwiki-rootpage',
                'import-upload-filename',
                'import-comment',
                'importtext',
@@ -2422,6 +2436,9 @@ $wgMessageStructure = array(
                'import-error-interwiki',
                'import-error-special',
                'import-error-invalid',
+               'import-options-wrong',
+               'import-rootpage-invalid',
+               'import-rootpage-nosubpage',
        ),
        'importlog' => array(
                'importlogpage',
@@ -2646,16 +2663,33 @@ $wgMessageStructure = array(
        ),
        'info' => array(
                'pageinfo-title',
+               'pageinfo-header-basic',
                'pageinfo-header-edits',
-               'pageinfo-header-watchlist',
-               'pageinfo-header-views',
-               'pageinfo-subjectpage',
-               'pageinfo-talkpage',
+               'pageinfo-header-restrictions',
+               'pageinfo-header-properties',
+               'pageinfo-display-title',
+               'pageinfo-default-sort',
+               'pageinfo-length',
+               'pageinfo-article-id',
+               'pageinfo-robot-policy',
+               'pageinfo-views',
                'pageinfo-watchers',
+               'pageinfo-redirects-name',
+               'pageinfo-redirects-value',
+               'pageinfo-subpages-name',
+               'pageinfo-subpages-value',
+               'pageinfo-firstuser',
+               'pageinfo-firsttime',
+               'pageinfo-lastuser',
+               'pageinfo-lasttime',
                'pageinfo-edits',
                'pageinfo-authors',
-               'pageinfo-views',
-               'pageinfo-viewsperedit',
+               'pageinfo-recent-edits',
+               'pageinfo-recent-authors',
+               'pageinfo-restriction',
+               'pageinfo-magic-words',
+               'pageinfo-hidden-categories',
+               'pageinfo-templates',
        ),
        'skin' => array(
                'skinname-standard',
@@ -3711,6 +3745,7 @@ $wgMessageStructure = array(
                'api-error-file-too-large',
                'api-error-filename-tooshort',
                'api-error-filetype-banned',
+               'api-error-filetype-banned-type',
                'api-error-filetype-missing',
                'api-error-hookaborted',
                'api-error-http',