Cleaned up layout of the Shib and Account Information pgs and updated…

… help/info/validation messages. [ref #2950 #2915]

src/main/java/Bundle.properties

@@ -71,6 +71,7 @@ header.logOut=Log Out
 header.accountInfo=Account Information
 header.user.selectTab.dataRelated=My Data
 header.user.selectTab.notifications=Notifications
+header.user.selectTab.accountInfo=Account Information
 header.user.selectTab.groupsAndRoles=Groups + Roles
 
 # dataverse_template.xhtml
@@ -179,20 +180,20 @@ authenticationProvidersAvailable.tip={0}There are no active authentication provi
 login.System=Login System
 login.forgot.text=Forgot your password?
 login.institution=Institution Log In
-login.institution.blurb=Use Dataverse with your institutional log in instead of creating an account.
+login.institution.blurb=Use Dataverse with your institutional log in instead of creating an account. Leaving your institution? Please contact <a href="#" onclick="event.preventDefault();PF('contactForm').show();">Dataverse Support</a> for assistance.
 login.invaliduserpassword=The username and/or password you entered is invalid. Need assistance accessing your account?
 login.error=Error validating the username and/or password. Please try again. If the problem persists, contact an administrator.
 
 #shib.xhtml
-shib.btn.acceptAndConvert=Accept Terms and Convert Account
-shib.btn.acceptAndCreate=Accept Terms and Create Account
+shib.btn.convertAccount=Convert Account
+shib.btn.createAccount=Create Account
 shib.welcome=Welcome,
-shib.welcomeExistingUserMessage=The email provided by {0} authentication matches an existing Dataverse account. If you would like to associate your existing Dataverse account with {0} authentication, please enter the password of your existing Dataverse account, review the General Terms of Use, and then click the Accept Terms and Convert Account button.
+shib.welcomeExistingUserMessage=Your institutional log in for {0} matches an email address already being used for a Dataverse account. By entering your current Dataverse password below, your existing Dataverse account can be converted to use your institutional log in.
 shib.dataverseUsername=Dataverse Username
 shib.currentDataversePassword=Current Dataverse Password
 shib.accountInformation=Account Information
-shib.offerToCreateNewAccount=Please agree to the Dataverse Terms of Use to create your account.
-shib.passwordRejected=Your account can only be converted if you provide the correct password for your existing account.
+shib.offerToCreateNewAccount=This information is provided by your institution and will be used to create your Dataverse account.
+shib.passwordRejected=<strong>Validation Error</strong> - Your account can only be converted if you provide the correct password for your existing account.
 
 #apitoken.xhtml
 apitoken.title=API Token