Merge "Change login/createaccount forms to new appearance"

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/specials/SpecialUserlogin.php
Simple merge

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc languages/messages/MessagesQqq.php
index c21bb29,ca42ab3..cea3a0a
--- 1/languages/messages/MessagesQqq.php
--- 2/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@@ -1089,12 -1102,28 +1102,29 @@@ It is also used on the top of the page 
  'gotaccountlink' => 'Text of the link to the log in form. Before that link, the message {{msg-mw|Gotaccount}} appears.
  {{Identical|Log in}}',
  'userlogin-resetlink' => 'Used on the login page.',
+ 'helplogin-url' => 'Description: The URL the provides information on logging in to the wiki.',
+ 'userlogin-helplink' => 'Wiki text linking to login help',
+ 'createacct-join' => 'Subheading of create account form encouraging user to join the wiki.',
+ 'createacct-emailrequired'  => 'Label in Agora create account form for email field when it is required.',
+ 'createacct-emailoptional' => 'Label in Agora create account form for email field when it is optional.',
+ 'createacct-email-ph'  => 'Placeholder in Agora create account form for email field.',
  'createaccountmail' => 'Button text for creating a new account and sending the new password to the specified e-mail address directly, as used on [[Special:UserLogin/signup]] if creating accounts by e-mail is allowed.',
  'createaccountreason' => '{{Identical|Reason}}',
+ 'createacct-reason' => 'In Agora create account form, label for field to enter reason to create an account when already logged-in.',
+ 'createacct-benefit-heading' => 'In Agora create account form, the heading for the section describing the benefits of creating an account.',
+ 'createacct-benefit-icon1' => 'In Agora create account form, the CSS style for the div next to the first benefit. If you replace this you will need probably need to adjust CSS.',
+ 'createacct-benefit-head1' => 'In Agora create account form, the text in the heading for the first benefit. Do not edit the magic word; if you replace it you will probably need to adjust CSS.',
+ 'createacct-benefit-body1' => 'In Agora create account form, the text for the first benefit.',
+ 'createacct-benefit-icon2' => 'In Agora create account form, the CSS style for the div next to the second benefit. If you replace this you will need probably need to adjust CSS.',
+ 'createacct-benefit-head2' => 'In Agora create account form, the text in the heading for the second benefit. Do not edit the magic word; if you replace it you will probably need to adjust CSS.',
+ 'createacct-benefit-body2' => 'In Agora create account form, the text for the second benefit.',
+ 'createacct-benefit-icon3' => 'In Agora create account form, the CSS style for the div next to the third benefit. If you replace this you will need probably need to adjust CSS.',
+ 'createacct-benefit-head3' => 'In Agora create account form, the text in the heading for the third benefit. Do not edit the magic word; if you replace it you will probably need to adjust CSS.',
+ 'createacct-benefit-body3' => 'In Agora create account form, the text for the third benefit.',
  'badretype' => 'Used as error message when the new password and its retype do not match.',
  'userexists' => 'Used as error message in creating a user account.',
 -'loginerror' => 'Used as title of error message.',
 +'loginerror' => 'Used as title of error message.
 +{{Identical|Login error}}',
  'createaccounterror' => 'Parameters:
  * $1 is an error message',
  'nocookiesnew' => "This message is displayed when a new account was successfully created, but the browser doesn't accept cookies.",

diff --cc resources/Resources.php
Simple merge