Merge "Fix undo edit summary when the user who made the old revision is hidden"

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

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 1c3dcba..7b82276 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -135,6 +135,18 @@ $wgMessageStructure = array(
                'oct',
                'nov',
                'dec',
+               'january-date',
+               'february-date',
+               'march-date',
+               'april-date',
+               'may-date',
+               'june-date',
+               'july-date',
+               'august-date',
+               'september-date',
+               'october-date',
+               'november-date',
+               'december-date',
        ),
        'categorypages' => array(
                'pagecategories',
@@ -225,6 +237,7 @@ $wgMessageStructure = array(
                'create-this-page',
                'delete',
                'deletethispage',
+               'undeletethispage',
                'undelete_short',
                'viewdeleted_short',
                'protect',
@@ -411,6 +424,8 @@ $wgMessageStructure = array(
                'namespaceprotected',
                'customcssprotected',
                'customjsprotected',
+               'mycustomcssprotected',
+               'mycustomjsprotected',
                'ns-specialprotected',
                'titleprotected',
                'filereadonlyerror',
@@ -431,8 +446,7 @@ $wgMessageStructure = array(
                'yourname',
                'userlogin-yourname',
                'userlogin-yourname-ph',
-               'createacct-helpusername-url',
-               'createacct-helpusername-link',
+               'createacct-helpusername',
                'yourpassword',
                'userlogin-yourpassword',
                'userlogin-yourpassword-ph',
@@ -477,7 +491,6 @@ $wgMessageStructure = array(
                'createacct-reason',
                'createacct-reason-ph',
                'createacct-captcha',
-               'createacct-captcha-help-url',
                'createacct-imgcaptcha-help',
                'createacct-imgcaptcha-ph',
                'createacct-submit',
@@ -574,11 +587,11 @@ $wgMessageStructure = array(
        ),
        'passwordreset' => array(
                'passwordreset',
-               'passwordreset-text',
+               'passwordreset-text-one',
+               'passwordreset-text-many',
                'passwordreset-legend',
                'passwordreset-disabled',
                'passwordreset-emaildisabled',
-               'passwordreset-pretext',
                'passwordreset-username',
                'passwordreset-domain',
                'passwordreset-capture',
@@ -728,6 +741,7 @@ $wgMessageStructure = array(
                'edit-gone-missing',
                'edit-conflict',
                'edit-no-change',
+               'postedit-confirmation',
                'edit-already-exists',
                'addsection-preload',
                'addsection-editintro',
@@ -941,9 +955,7 @@ $wgMessageStructure = array(
                'searchmenu-exists',
                'searchmenu-new',
                'searchmenu-new-nocreate',
-               'searchhelp-url',
                'searchmenu-prefix',
-               'searchmenu-help',
                'searchprofile-articles',
                'searchprofile-project',
                'searchprofile-images',
@@ -1136,6 +1148,7 @@ $wgMessageStructure = array(
                'userrights-unchangeable-col',
                'userrights-irreversible-marker',
                'userrights-conflict',
+               'userrights-removed-self',
        ),
        'group' => array(
                'group',
@@ -1208,6 +1221,10 @@ $wgMessageStructure = array(
                'right-editusercssjs',
                'right-editusercss',
                'right-edituserjs',
+               'right-editmyusercss',
+               'right-editmyuserjs',
+               'right-viewmywatchlist',
+               'right-editmywatchlist',
                'right-rollback',
                'right-markbotedits',
                'right-noratelimit',
@@ -1269,6 +1286,8 @@ $wgMessageStructure = array(
                'action-userrights-interwiki',
                'action-siteadmin',
                'action-sendemail',
+               'action-editmywatchlist',
+               'action-viewmywatchlist',
        ),
        'recentchanges' => array(
                'nchanges',
@@ -2450,6 +2469,7 @@ $wgMessageStructure = array(
                'thumbnail-more',
                'filemissing',
                'thumbnail_error',
+               'thumbnail_error_remote',
                'djvu_page_error',
                'djvu_no_xml',
                'thumbnail-temp-create',
@@ -2675,7 +2695,6 @@ $wgMessageStructure = array(
                'modern.css',
                'vector.css',
                'print.css',
-               'handheld.css',
                'noscript.css',
                'group-autoconfirmed.css',
                'group-bot.css',
@@ -3908,8 +3927,8 @@ $wgBlockComments = array(
 begin with * or ** are discarded, furthermore lines that do begin with ** and
 do not contain | are also discarded, but do not depend on this behavior for
 future releases. Also note that since each list value is wrapped in a unique
-XHTML id it should only appear once and include characters that are legal
-XHTML id names.",
+(X)HTML id it should only appear once and include characters that are legal
+(X)HTML id names.",
        'toggles'             => 'User preference toggles',
        'underline'           => '',
        'editfont'            => 'Font style option in Special:Preferences',