Merge remote-tracking branch 'Alys/patch-5' into develop

Conflicts:
	locales/en/npc.json
This commit is contained in:
Tyler Renelle 2014-05-13 16:25:20 -06:00
commit 810b2eaeb0

View file

@ -30,7 +30,7 @@
"yourAvatar": "Your Avatar",
"yourAvatarText": "This is your avatar. It represents you in the world of Habitica. As you accomplish goals, your avatar will gain levels, earn gold, and equip itself for further challenges ahead.",
"avatarCustom": "Avatar Customization",
"avatarCustomText": "You can customize your avatar by clicking anywhere in this box. Change your body type, hair color, skin color, and more from this menu. You can also find a number of HabitRPG's exciting social features from the Social menu.",
"avatarCustomText": "You can customize your avatar by clicking anywhere in this box. Change your body type, hair color, skin color, and more from this menu. Make sure you scroll all the way down - we have hairstyle and head accessories available as well! You can also find a number of HabitRPG's exciting social features from the Social menu.",
"hitPoints": "Hit Points",
"hitPointsText": "The red bar tracks your avatar's health points. Whenever you fail to meet a goal, you take damage and lose health. If your health bar reaches zero, you die. Dying results in the loss of one level, all your gold, and a piece of equipment.",
"expPoints": "Experience Points",