Merge "filebackend: normalize paths used in locking"

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

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index bc254b9..49ed880 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -325,7 +325,6 @@ $wgMessageStructure = array(
                'youhavenewmessagesmulti',
                'newtalkseparator',
                'editsection',
-               'editsection-brackets',
                'editold',
                'viewsourceold',
                'editlink',
@@ -426,6 +425,8 @@ $wgMessageStructure = array(
                'customjsprotected',
                'mycustomcssprotected',
                'mycustomjsprotected',
+               'myprivateinfoprotected',
+               'mypreferencesprotected',
                'ns-specialprotected',
                'titleprotected',
                'filereadonlyerror',
@@ -443,6 +444,7 @@ $wgMessageStructure = array(
                'logouttext',
                'welcomeuser',
                'welcomecreation-msg',
+               'yourname',
                'userlogin-yourname',
                'userlogin-yourname-ph',
                'createacct-helpusername',
@@ -450,6 +452,7 @@ $wgMessageStructure = array(
                'userlogin-yourpassword',
                'userlogin-yourpassword-ph',
                'createacct-yourpassword-ph',
+               'yourpasswordagain',
                'createacct-yourpasswordagain',
                'createacct-yourpasswordagain-ph',
                'remembermypassword',
@@ -462,13 +465,20 @@ $wgMessageStructure = array(
                'login',
                'nav-login-createaccount',
                'loginprompt',
+               'userlogin',
+               'userloginnocreate',
                'logout',
                'userlogout',
                'userlogout-summary',
                'notloggedin',
                'userlogin-noaccount',
                'userlogin-joinproject',
+               'nologin',
+               'nologinlink',
                'createaccount',
+               'gotaccount',
+               'gotaccountlink',
+               'userlogin-resetlink',
                'userlogin-resetpassword-link',
                'helplogin-url',
                'userlogin-helplink',
@@ -478,6 +488,7 @@ $wgMessageStructure = array(
                'createacct-email-ph',
                'createaccountmail',
                'createacct-realname',
+               'createaccountreason',
                'createacct-reason',
                'createacct-reason-ph',
                'createacct-captcha',
@@ -770,6 +781,7 @@ $wgMessageStructure = array(
                'undo-failure',
                'undo-norev',
                'undo-summary',
+               'undo-summary-username-hidden',
        ),
        'cantcreateaccount' => array(
                'cantcreateaccounttitle',
@@ -1025,7 +1037,6 @@ $wgMessageStructure = array(
                'resetprefs',
                'restoreprefs',
                'prefs-editing',
-               'prefs-edit-boxsize',
                'rows',
                'columns',
                'searchresultshead',
@@ -1067,7 +1078,6 @@ $wgMessageStructure = array(
                'prefs-common-css-js',
                'prefs-reset-intro',
                'prefs-emailconfirm-label',
-               'prefs-textboxsize',
                'youremail',
                'username',
                'uid',
@@ -1102,6 +1112,8 @@ $wgMessageStructure = array(
                'prefs-dateformat',
                'prefs-timeoffset',
                'prefs-advancedediting',
+               'prefs-editor',
+               'prefs-preview',
                'prefs-advancedrc',
                'prefs-advancedrendering',
                'prefs-advancedsearchoptions',
@@ -1137,6 +1149,7 @@ $wgMessageStructure = array(
                'userrights-unchangeable-col',
                'userrights-irreversible-marker',
                'userrights-conflict',
+               'userrights-removed-self',
        ),
        'group' => array(
                'group',
@@ -1205,12 +1218,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',
@@ -1272,6 +1291,10 @@ $wgMessageStructure = array(
                'action-userrights-interwiki',
                'action-siteadmin',
                'action-sendemail',
+               'action-editmywatchlist',
+               'action-viewmywatchlist',
+               'action-viewmyprivateinfo',
+               'action-editmyprivateinfo',
        ),
        'recentchanges' => array(
                'nchanges',
@@ -1280,6 +1303,7 @@ $wgMessageStructure = array(
                'recentchanges-legend',
                'recentchanges-summary',
                'recentchangestext',
+               'recentchanges-noresult',
                'recentchanges-feed-description',
                'recentchanges-label-newpage',
                'recentchanges-label-minor',
@@ -1319,7 +1343,6 @@ $wgMessageStructure = array(
                'recentchangeslinked-feed',
                'recentchangeslinked-toolbox',
                'recentchangeslinked-title',
-               'recentchangeslinked-noresult',
                'recentchangeslinked-summary',
                'recentchangeslinked-page',
                'recentchangeslinked-to',
@@ -1970,7 +1993,6 @@ $wgMessageStructure = array(
                'unwatchthispage',
                'notanarticle',
                'notvisiblerev',
-               'watchnochange',
                'watchlist-details',
                'wlheader-enotif',
                'wlheader-showupdated',
@@ -3633,7 +3655,6 @@ $wgMessageStructure = array(
                'version-other',
                'version-mediahandlers',
                'version-hooks',
-               'version-extension-functions',
                'version-parser-extensiontags',
                'version-parser-function-hooks',
                'version-hook-name',
@@ -3710,6 +3731,7 @@ $wgMessageStructure = array(
                'tags-summary',
                'tag-filter',
                'tag-filter-submit',
+               'tag-list-wrapper',
                'tags-title',
                'tags-intro',
                'tags-tag',