* Converted UserMailer stuff to return a Status object instead of true-or-WikiError

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

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index f9e2195..874b8a2 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -31,6 +31,7 @@ $wgMessageStructure = array(
                'tog-watchdefault',
                'tog-watchmoves',
                'tog-watchdeletion',
+               'tog-minordefault',
                'tog-previewontop',
                'tog-previewonfirst',
                'tog-nocache',
@@ -396,6 +397,7 @@ $wgMessageStructure = array(
                'yourpassword',
                'yourpasswordagain',
                'remembermypassword',
+               'securelogin-stick-https',
                'yourdomainname',
                'externaldberror',
                'login',
@@ -430,6 +432,7 @@ $wgMessageStructure = array(
                'wrongpasswordempty',
                'passwordtooshort',
                'password-name-match',
+               'password-too-weak',
                'mailmypassword',
                'passwordremindertitle',
                'passwordremindertext',
@@ -459,7 +462,11 @@ $wgMessageStructure = array(
                'loginlanguagelabel',
                'loginlanguagelinks',
                'suspicious-userlogout',
-               'ratelimit-excluded-ips',
+       ),
+       'mail' => array(
+               'pear-mail-error',
+               'php-mail-error',
+               'php-mail-error-unknown',
        ),
        'passwordstrength' => array(
                'password-strength',
@@ -579,7 +586,7 @@ $wgMessageStructure = array(
                'copyrightwarning',
                'copyrightwarning2',
                'editpage-tos-summary',
-               'longpagewarning',
+               'longpage-hint',
                'longpageerror',
                'readonlywarning',
                'protectedpagewarning',
@@ -632,7 +639,6 @@ $wgMessageStructure = array(
        'cantcreateaccount' => array(
                'cantcreateaccounttitle',
                'cantcreateaccount-text',
-               'cantcreateaccount-nonblock-text',
        ),
        'history' => array(
                'viewpagelogs',
@@ -1111,6 +1117,7 @@ $wgMessageStructure = array(
                'right-override-export-depth',
                'right-sendemail',
                'right-revisionmove',
+               'right-disableaccount',
        ),
        'rightslog' => array(
                'rightslog',
@@ -1354,6 +1361,7 @@ $wgMessageStructure = array(
                'listfiles_search_for',
                'imgfile',
                'listfiles',
+               'listfiles_thumb',
                'listfiles_date',
                'listfiles_name',
                'listfiles_user',
@@ -1470,6 +1478,7 @@ $wgMessageStructure = array(
                'statistics-edits',
                'statistics-edits-average',
                'statistics-views-total',
+               'statistics-views-total-desc',
                'statistics-views-peredit',
                'statistics-users',
                'statistics-users-active',
@@ -1515,6 +1524,8 @@ $wgMessageStructure = array(
                'nrevisions',
                'nviews',
                'nchanges',
+               'nimagelinks',
+               'ntransclusions',
                'specialpage-empty',
                'lonelypages',
                'lonelypages-summary',
@@ -1942,6 +1953,7 @@ $wgMessageStructure = array(
                'sp-contributions-newbies-title',
                'sp-contributions-blocklog',
                'sp-contributions-deleted',
+               'sp-contributions-uploads',
                'sp-contributions-logs',
                'sp-contributions-talk',
                'sp-contributions-userrights',
@@ -2006,7 +2018,6 @@ $wgMessageStructure = array(
                'ipb-edit-dropdown',
                'ipb-unblock-addr',
                'ipb-unblock',
-               'ipb-blocklist-addr',
                'ipb-blocklist',
                'ipb-blocklist-contribs',
                'unblockip',
@@ -2099,6 +2110,7 @@ $wgMessageStructure = array(
                'move-page-backlink',
                'move-page-legend',
                'movepagetext',
+               'movepagetext-noredirectfixer',
                'movepagetalktext',
                'movearticle',
                'moveuserpage-warning',
@@ -3221,6 +3233,17 @@ $wgMessageStructure = array(
                'sqlite-has-fts',
                'sqlite-no-fts',
        ),
+       'disableaccount' => array(
+               'disableaccount',
+               'disableaccount-user',
+               'disableaccount-reason',
+               'disableaccount-confirm',
+               'disableaccount-mustconfirm',
+               'disableaccount-confirm',
+               'disableaccount-nosuchuser',
+               'disableaccount-success',
+               'disableaccount-logentry',
+       ),
 );
 
 /** Comments for each block */
@@ -3250,6 +3273,7 @@ XHTML id names.",
        'errors'              => 'General errors',
        'virus'               => 'Virus scanner',
        'login'               => 'Login and logout pages',
+       'mail'                => 'E-mail sending',
        'passwordstrength'    => 'JavaScript password checks',
        'resetpass'           => 'Password reset dialog',
        'toolbar'             => 'Edit page toolbar',
@@ -3433,4 +3457,5 @@ Variants for Chinese language",
        'db-error-messages'     => 'Database error messages',
        'html-forms'            => 'HTML forms',
        'sqlite'                => 'SQLite database support',
+       'disableaccount'        => 'Special:DisableAccount',
 );