Merge "Add new parserTests for table cell attributes coming from templates."
[lhc/web/wiklou.git] / maintenance / language / messages.inc
index 4e9d864..388904a 100644 (file)
@@ -237,6 +237,7 @@ $wgMessageStructure = array(
                'create-this-page',
                'delete',
                'deletethispage',
+               'undeletethispage',
                'undelete_short',
                'viewdeleted_short',
                'protect',
@@ -324,7 +325,6 @@ $wgMessageStructure = array(
                'youhavenewmessagesmulti',
                'newtalkseparator',
                'editsection',
-               'editsection-brackets',
                'editold',
                'viewsourceold',
                'editlink',
@@ -403,6 +403,7 @@ $wgMessageStructure = array(
                'cannotdelete',
                'cannotdelete-title',
                'delete-hook-aborted',
+               'no-null-revision',
                'badtitle',
                'badtitletext',
                'perfcached',
@@ -423,6 +424,10 @@ $wgMessageStructure = array(
                'namespaceprotected',
                'customcssprotected',
                'customjsprotected',
+               'mycustomcssprotected',
+               'mycustomjsprotected',
+               'myprivateinfoprotected',
+               'mypreferencesprotected',
                'ns-specialprotected',
                'titleprotected',
                'filereadonlyerror',
@@ -443,6 +448,7 @@ $wgMessageStructure = array(
                'yourname',
                'userlogin-yourname',
                'userlogin-yourname-ph',
+               'createacct-another-username-ph',
                'createacct-helpusername',
                'yourpassword',
                'userlogin-yourpassword',
@@ -479,9 +485,11 @@ $wgMessageStructure = array(
                'helplogin-url',
                'userlogin-helplink',
                'createacct-join',
+               'createacct-another-join',
                'createacct-emailrequired',
                'createacct-emailoptional',
                'createacct-email-ph',
+               'createacct-another-email-ph',
                'createaccountmail',
                'createacct-realname',
                'createaccountreason',
@@ -491,6 +499,7 @@ $wgMessageStructure = array(
                'createacct-imgcaptcha-help',
                'createacct-imgcaptcha-ph',
                'createacct-submit',
+               'createacct-another-submit',
                'createacct-benefit-heading',
                'createacct-benefit-icon1',
                'createacct-benefit-head1',
@@ -584,11 +593,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',
@@ -615,6 +624,18 @@ $wgMessageStructure = array(
                'changeemail-submit',
                'changeemail-cancel',
        ),
+       'resettokens' => array(
+               'resettokens',
+               'resettokens-summary',
+               'resettokens-text',
+               'resettokens-no-tokens',
+               'resettokens-legend',
+               'resettokens-tokens',
+               'resettokens-token-label',
+               'resettokens-watchlist-token',
+               'resettokens-done',
+               'resettokens-resetbutton',
+       ),
        'toolbar' => array(
                'bold_sample',
                'bold_tip',
@@ -738,6 +759,7 @@ $wgMessageStructure = array(
                'edit-gone-missing',
                'edit-conflict',
                'edit-no-change',
+               'postedit-confirmation',
                'edit-already-exists',
                'addsection-preload',
                'addsection-editintro',
@@ -776,6 +798,7 @@ $wgMessageStructure = array(
                'undo-failure',
                'undo-norev',
                'undo-summary',
+               'undo-summary-username-hidden',
        ),
        'cantcreateaccount' => array(
                'cantcreateaccounttitle',
@@ -924,6 +947,7 @@ $wgMessageStructure = array(
                'compareselectedversions',
                'showhideselectedversions',
                'editundo',
+               'diff-empty',
                'diff-multi',
                'diff-multi-manyusers',
                'difference-missing-revision',
@@ -950,9 +974,7 @@ $wgMessageStructure = array(
                'searchmenu-exists',
                'searchmenu-new',
                'searchmenu-new-nocreate',
-               'searchhelp-url',
                'searchmenu-prefix',
-               'searchmenu-help',
                'searchprofile-articles',
                'searchprofile-project',
                'searchprofile-images',
@@ -1033,7 +1055,6 @@ $wgMessageStructure = array(
                'resetprefs',
                'restoreprefs',
                'prefs-editing',
-               'prefs-edit-boxsize',
                'rows',
                'columns',
                'searchresultshead',
@@ -1044,7 +1065,7 @@ $wgMessageStructure = array(
                'recentchangesdays-max',
                'recentchangescount',
                'prefs-help-recentchangescount',
-               'prefs-help-watchlist-token',
+               'prefs-help-watchlist-token2',
                'savedprefs',
                'timezonelegend',
                'localtime',
@@ -1075,7 +1096,6 @@ $wgMessageStructure = array(
                'prefs-common-css-js',
                'prefs-reset-intro',
                'prefs-emailconfirm-label',
-               'prefs-textboxsize',
                'youremail',
                'username',
                'uid',
@@ -1110,6 +1130,8 @@ $wgMessageStructure = array(
                'prefs-dateformat',
                'prefs-timeoffset',
                'prefs-advancedediting',
+               'prefs-editor',
+               'prefs-preview',
                'prefs-advancedrc',
                'prefs-advancedrendering',
                'prefs-advancedsearchoptions',
@@ -1117,6 +1139,7 @@ $wgMessageStructure = array(
                'prefs-displayrc',
                'prefs-displaysearchoptions',
                'prefs-displaywatchlist',
+               'prefs-tokenwatchlist',
                'prefs-diffs',
        ),
        'preferences-email' => array(
@@ -1145,6 +1168,7 @@ $wgMessageStructure = array(
                'userrights-unchangeable-col',
                'userrights-irreversible-marker',
                'userrights-conflict',
+               'userrights-removed-self',
        ),
        'group' => array(
                'group',
@@ -1213,10 +1237,18 @@ $wgMessageStructure = array(
                'right-unblockself',
                'right-protect',
                'right-editprotected',
+               'right-editsemiprotected',
                'right-editinterface',
                'right-editusercssjs',
                'right-editusercss',
                'right-edituserjs',
+               'right-editmyusercss',
+               'right-editmyuserjs',
+               'right-viewmywatchlist',
+               'right-editmywatchlist',
+               'right-viewmyprivateinfo',
+               'right-editmyprivateinfo',
+               'right-editmyoptions',
                'right-rollback',
                'right-markbotedits',
                'right-noratelimit',
@@ -1278,6 +1310,10 @@ $wgMessageStructure = array(
                'action-userrights-interwiki',
                'action-siteadmin',
                'action-sendemail',
+               'action-editmywatchlist',
+               'action-viewmywatchlist',
+               'action-viewmyprivateinfo',
+               'action-editmyprivateinfo',
        ),
        'recentchanges' => array(
                'nchanges',
@@ -1687,6 +1723,8 @@ $wgMessageStructure = array(
                'pageswithprop-text',
                'pageswithprop-prop',
                'pageswithprop-submit',
+               'pageswithprop-prophidden-long',
+               'pageswithprop-prophidden-binary',
        ),
        'doubleredirects' => array(
                'doubleredirects',
@@ -1770,6 +1808,7 @@ $wgMessageStructure = array(
                'prefixindex',
                'prefixindex-namespace',
                'prefixindex-summary',
+               'prefixindex-strip',
                'shortpages',
                'shortpages-summary',
                'longpages',
@@ -3638,7 +3677,6 @@ $wgMessageStructure = array(
                'version-other',
                'version-mediahandlers',
                'version-hooks',
-               'version-extension-functions',
                'version-parser-extensiontags',
                'version-parser-function-hooks',
                'version-hook-name',
@@ -3715,6 +3753,7 @@ $wgMessageStructure = array(
                'tags-summary',
                'tag-filter',
                'tag-filter-submit',
+               'tag-list-wrapper',
                'tags-title',
                'tags-intro',
                'tags-tag',
@@ -3916,8 +3955,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',
@@ -3942,6 +3981,7 @@ XHTML id names.",
        'resetpass'           => 'Change password dialog',
        'passwordreset'       => 'Special:PasswordReset',
        'changeemail'         => 'Special:ChangeEmail',
+       'resettokens'         => 'Special:ResetTokens',
        'toolbar'             => 'Edit page toolbar',
        'edit'                => 'Edit pages',
        'parserwarnings'      => 'Parser/template warnings',