Merge "Add new parserTests for table cell attributes coming from templates."

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

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 43d05d0..388904a 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -403,6 +403,7 @@ $wgMessageStructure = array(
                'cannotdelete',
                'cannotdelete-title',
                'delete-hook-aborted',
+               'no-null-revision',
                'badtitle',
                'badtitletext',
                'perfcached',
@@ -623,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',
@@ -1052,7 +1065,7 @@ $wgMessageStructure = array(
                'recentchangesdays-max',
                'recentchangescount',
                'prefs-help-recentchangescount',
-               'prefs-help-watchlist-token',
+               'prefs-help-watchlist-token2',
                'savedprefs',
                'timezonelegend',
                'localtime',
@@ -1126,6 +1139,7 @@ $wgMessageStructure = array(
                'prefs-displayrc',
                'prefs-displaysearchoptions',
                'prefs-displaywatchlist',
+               'prefs-tokenwatchlist',
                'prefs-diffs',
        ),
        'preferences-email' => array(
@@ -1794,6 +1808,7 @@ $wgMessageStructure = array(
                'prefixindex',
                'prefixindex-namespace',
                'prefixindex-summary',
+               'prefixindex-strip',
                'shortpages',
                'shortpages-summary',
                'longpages',
@@ -3966,6 +3981,7 @@ future releases. Also note that since each list value is wrapped in a unique
        'resetpass'           => 'Change password dialog',
        'passwordreset'       => 'Special:PasswordReset',
        'changeemail'         => 'Special:ChangeEmail',
+       'resettokens'         => 'Special:ResetTokens',
        'toolbar'             => 'Edit page toolbar',
        'edit'                => 'Edit pages',
        'parserwarnings'      => 'Parser/template warnings',