Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg-shared into scribblypanda-issue4468

locales/en/character.json

@@ -129,5 +129,8 @@
     "youCast": "You cast <%= spell %>.",
     "youCastTarget": "You cast <%= spell %> on <%= target %>.",
     "youCastParty": "You cast <%= spell %> for the party.",
-    "critBonus": "Critical Hit! Bonus: "
+    "critBonus": "Critical Hit! Bonus: ",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

locales/en/settings.json

@@ -45,11 +45,11 @@
     "misc": "Misc",
     "showHeader": "Show Header",
     "changePass": "Change Password",
-    "changeUsername": "Change Username",
+    "changeUsername": "Change Login Name",
     "oldPass": "Old Password",
     "newPass": "New Password",
     "confirmPass": "Confirm New Password",
-    "newUsername": "New Username",
+    "newUsername": "New Login Name",
     "dangerZone": "Danger Zone",
     "resetText1": "WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.",
     "resetText2": "You will lose all your levels, gold, and experience points. All your tasks will be deleted permanently and you will lose all of your task's historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.",
@@ -68,7 +68,16 @@
     "enterNumber": "Please enter a number between 0 and 24",
     "fillAll": "Please fill out all fields",
     "passSuccess": "Password successfully changed",
-    "usernameSuccess": "Username successfully changed",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Data",
-    "exportData": "Export Data"
+    "exportData": "Export Data",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": " including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to ",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }