Merge "Make thumb_handler.php use MediaHandler::parseParamString"

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

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index b9b8544..991fc1b 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -377,8 +377,11 @@ $wgMessageStructure = array(
        'errors' => array(
                'error',
                'databaseerror',
-               'dberrortext',
-               'dberrortextcl',
+               'databaseerror-text',
+               'databaseerror-textcl',
+               'databaseerror-query',
+               'databaseerror-function',
+               'databaseerror-error',
                'laggedslavemode',
                'readonly',
                'enterlockreason',
@@ -419,7 +422,6 @@ $wgMessageStructure = array(
                'viewyourtext',
                'protectedinterface',
                'editinginterface',
-               'sqlhidden',
                'cascadeprotected',
                'namespaceprotected',
                'customcssprotected',
@@ -1141,6 +1143,7 @@ $wgMessageStructure = array(
                'prefs-displaywatchlist',
                'prefs-tokenwatchlist',
                'prefs-diffs',
+               'prefs-help-prefershttps',
        ),
        'preferences-email' => array(
                'email-address-validity-valid',
@@ -1385,6 +1388,7 @@ $wgMessageStructure = array(
                'upload-preferred',
                'upload-prohibited',
                'uploadfooter',
+               'upload-default-description',
                'uploadlog',
                'uploadlogpage',
                'uploadlogpagetext',
@@ -1592,6 +1596,10 @@ $wgMessageStructure = array(
                'listfiles_size',
                'listfiles_description',
                'listfiles_count',
+               'listfiles-show-all',
+               'listfiles-latestversion',
+               'listfiles-latestversion-yes',
+               'listfiles-latestversion-no',
        ),
        'filedescription' => array(
                'file-anchor-link',
@@ -1719,12 +1727,6 @@ $wgMessageStructure = array(
                'statistics-mostpopular',
                'statistics-footer',
        ),
-       'disambiguations' => array(
-               'disambiguations',
-               'disambiguations-summary',
-               'disambiguationspage',
-               'disambiguations-text',
-       ),
        'pageswithprop' => array(
                'pageswithprop',
                'pageswithprop-summary',
@@ -1839,6 +1841,7 @@ $wgMessageStructure = array(
                'listusers-summary',
                'listusers-editsonly',
                'listusers-creationsort',
+               'listusers-desc',
                'usereditcount',
                'usercreated',
                'newpages',
@@ -3791,6 +3794,7 @@ $wgMessageStructure = array(
                'dberr-problems',
                'dberr-again',
                'dberr-info',
+               'dberr-info-hidden',
                'dberr-usegoogle',
                'dberr-outofdate',
                'dberr-cachederror',
@@ -3996,7 +4000,7 @@ future releases. Also note that since each list value is wrapped in a unique
        'cologneblue'         => 'Cologne Blue skin',
        'vector'              => 'Vector skin',
        'miscellaneous2'      => '',
-       'links'               => 'All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).',
+       'links'               => 'All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage).',
        'badaccess'           => '',
        'versionrequired'     => '',
        'miscellaneous3'      => '',
@@ -4060,7 +4064,6 @@ future releases. Also note that since each list value is wrapped in a unique
        'randomincategory'    => 'Random page in category',
        'randomredirect'      => 'Random redirect',
        'statistics'          => 'Statistics',
-       'disambiguations'     => '',
        'pageswithprop'       => '',
        'doubleredirects'     => '',
        'brokenredirects'     => '',