Merge "Changing the welcome message after signing up"

diff --combined languages/messages/MessagesEn.php
index 644dded,f4a8b68..85474ff
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -1085,8 -1085,7 +1085,8 @@@ The administrator who locked it offere
  'invalidtitle-knownnamespace'   => 'Invalid title with namespace "$2" and text "$3"',
  'invalidtitle-unknownnamespace' => 'Invalid title with unknown namespace number $1 and text "$2"',
  'exception-nologin'             => 'Not logged in',
 -'exception-nologin-text'        => 'This page or action requires you to be logged in on this wiki.',
 +'exception-nologin-text'        => 'Please [[Special:Userlogin|log in]] to be able to access this page or action.',
 +'exception-nologin-text-manual' => 'Please $1 to be able to access this page or action.',
  
  # Virus scanner
  'virus-badscanner'     => "Bad configuration: Unknown virus scanner: ''$1''",
@@@ -1099,7 -1098,7 +1099,7 @@@
  Note that some pages may continue to be displayed as if you were still logged in, until you clear your browser cache.",
  'welcomeuser'                     => 'Welcome, $1!',
  'welcomecreation-msg'             => 'Your account has been created.
- Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
+ You can change your {{SITENAME}} [[Special:Preferences|preferences]] if you wish.',
  'yourname'                        => 'Username:',
  'userlogin-yourname'              => 'Username',
  'userlogin-yourname-ph'           => 'Enter your username',
@@@ -1900,7 -1899,7 +1900,7 @@@ Note that their indexes of {{SITENAME}
  'mypreferences'                 => 'Preferences',
  'prefs-edits'                   => 'Number of edits:',
  'prefsnologin'                  => 'Not logged in',
 -'prefsnologintext'              => 'You must be <span class="plainlinks">[{{fullurl:{{#Special:UserLogin}}|returnto=$1}} logged in]</span> to set user preferences.',
 +'prefsnologintext2'             => 'Please $1 to set user preferences.',
  'changepassword'                => 'Change password',
  'changepassword-summary'        => '', # do not translate or duplicate this message to other languages
  'prefs-skin'                    => 'Skin',
@@@ -3018,9 -3017,9 +3018,9 @@@ Contact the editor
  mail: $PAGEEDITOR_EMAIL
  wiki: $PAGEEDITOR_WIKI
  
 -There will be no other notifications in case of further activity unless you visit this page. You could also reset the notification flags for all your watched pages on your watchlist.
 +There will be no other notifications in case of further activity unless you visit this page while logged in. You could also reset the notification flags for all your watched pages on your watchlist.
  
 -                       Your friendly {{SITENAME}} notification system
 +Your friendly {{SITENAME}} notification system
  
  --
  To change your email notification settings, visit
@@@ -4900,8 -4899,8 +4900,8 @@@ You should have received [{{SERVER}}{{S
  # Special:SpecialPages
  'specialpages'                   => 'Special pages',
  'specialpages-summary'           => '', # do not translate or duplicate this message to other languages
 -'specialpages-note'              => '----
 -* Normal special pages.
 +'specialpages-note-top'          => 'Legend',
 +'specialpages-note'              => '* Normal special pages.
  * <span class="mw-specialpagerestricted">Restricted special pages.</span>',
  'specialpages-group-maintenance' => 'Maintenance reports',
  'specialpages-group-other'       => 'Other special pages',