Merge "Add Special:Login and Special:Logout as aliases."

[lhc/web/wiklou.git] / languages / messages / MessagesEn.php

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index b29c204..dcd6b1f 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -469,8 +469,8 @@ $specialPageAliases = array(
        'Unwatchedpages'            => array( 'UnwatchedPages' ),
        'Upload'                    => array( 'Upload' ),
        'UploadStash'               => array( 'UploadStash' ),
-       'Userlogin'                 => array( 'UserLogin' ),
-       'Userlogout'                => array( 'UserLogout' ),
+       'Userlogin'                 => array( 'UserLogin', 'Login' ),
+       'Userlogout'                => array( 'UserLogout', 'Logout' ),
        'Userrights'                => array( 'UserRights', 'MakeSysop', 'MakeBot' ),
        'Version'                   => array( 'Version' ),
        'Wantedcategories'          => array( 'WantedCategories' ),
@@ -541,7 +541,6 @@ $preloadedMessages = array(
        'disclaimers',
        'edit',
        'editsection',
-       'editsection-brackets',
        'editsectionhint',
        'help',
        'helppage',
@@ -941,7 +940,6 @@ See [[Special:Version|version page]].',
 'youhavenewmessagesmulti'      => 'You have new messages on $1',
 'newtalkseparator'             => ', ', # do not translate or duplicate this message to other languages
 'editsection'                  => 'edit',
-'editsection-brackets'         => '[$1]', # only translate this message to other languages if you have to change it
 'editold'                      => 'edit',
 'viewsourceold'                => 'view source',
 'editlink'                     => 'edit',
@@ -1072,6 +1070,8 @@ $2',
 'customjsprotected'             => "You do not have permission to edit this JavaScript page because it contains another user's personal settings.",
 'mycustomcssprotected'          => 'You do not have permission to edit this CSS page.',
 'mycustomjsprotected'           => 'You do not have permission to edit this JavaScript page.',
+'myprivateinfoprotected'        => 'You do not have permission to edit your private information.',
+'mypreferencesprotected'        => 'You do not have permission to edit your preferences.',
 'ns-specialprotected'           => 'Special pages cannot be edited.',
 'titleprotected'                => 'This title has been protected from creation by [[User:$1|$1]].
 The reason given is "\'\'$2\'\'".',
@@ -2089,7 +2089,8 @@ Your email address is not revealed when other users contact you.',
 'right-proxyunbannable'       => 'Bypass automatic blocks of proxies',
 'right-unblockself'           => 'Unblock themselves',
 'right-protect'               => 'Change protection levels and edit protected pages',
-'right-editprotected'         => 'Edit protected pages (without cascading protection)',
+'right-editprotected'         => 'Edit pages protected as "{{int:protect-level-sysop}}"',
+'right-editsemiprotected'     => 'Edit pages protected as "{{int:protect-level-autoconfirmed}}"',
 'right-editinterface'         => 'Edit the user interface',
 'right-editusercssjs'         => "Edit other users' CSS and JavaScript files",
 'right-editusercss'           => "Edit other users' CSS files",
@@ -2098,6 +2099,9 @@ Your email address is not revealed when other users contact you.',
 'right-editmyuserjs'          => 'Edit your own user JavaScript files',
 'right-viewmywatchlist'       => 'View your own watchlist',
 'right-editmywatchlist'       => 'Edit your own watchlist. Note some actions will still add pages even without this right.',
+'right-viewmyprivateinfo'     => 'View your own private data (e.g. email address, real name)',
+'right-editmyprivateinfo'     => 'Edit your own private data (e.g. email address, real name)',
+'right-editmyoptions'         => 'Edit your own preferences',
 'right-rollback'              => 'Quickly rollback the edits of the last user who edited a particular page',
 'right-markbotedits'          => 'Mark rolled-back edits as bot edits',
 'right-noratelimit'           => 'Not be affected by rate limits',
@@ -2161,6 +2165,8 @@ Your email address is not revealed when other users contact you.',
 'action-sendemail'            => 'send emails',
 'action-viewmywatchlist'      => 'view your watchlist',
 'action-editmywatchlist'      => 'edit your watchlist',
+'action-viewmyprivateinfo'    => 'view your private information',
+'action-editmyprivateinfo'    => 'edit your private information',
 
 # Recent changes
 'nchanges'                          => '$1 {{PLURAL:$1|change|changes}}',
@@ -4599,7 +4605,7 @@ Please confirm that you really want to recreate this page.",
 'semicolon-separator' => '; ', # only translate this message to other languages if you have to change it
 'comma-separator'     => ', ', # only translate this message to other languages if you have to change it
 'colon-separator'     => ': ', # only translate this message to other languages if you have to change it
-'autocomment-prefix'  => '', # only translate this message to other languages if you have to change it
+'autocomment-prefix'  => '', # do not translate or duplicate this message to other languages
 'pipe-separator'      => ' | ', # only translate this message to other languages if you have to change it
 'word-separator'      => ' ', # only translate this message to other languages if you have to change it
 'ellipsis'            => '...', # only translate this message to other languages if you have to change it