Merge pull request #6793 from Sinble/develop

Change Menu Names

common/locales/en/character.json

@@ -1,7 +1,7 @@
 {
     "statsAch": "Stats & Achievements",
     "profile": "Profile",
-    "avatar": "Avatar",
+    "avatar": "Customize Avatar",
     "other": "Other",
     "fullName": "Full Name",
     "displayName": "Display Name",
@@ -83,7 +83,7 @@
     "allocateInt": "Points allocated to Intelligence:",
     "allocateIntPop": "Add a point to Intelligence",
     "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a>, now available for free in the Market.",
-    "stats": "Stats",
+    "stats": "Avatar Stats",
     "strength": "Strength",
     "strengthText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",
     "constitution": "Constitution",

common/locales/en/contrib.json

@@ -28,11 +28,11 @@
     "helped": "Helped Habit Grow",
     "helpedText1": "Helped Habitica grow by filling out",
     "helpedText2": "this survey.",
-    "hall": "Hall",
+    "hall": "Hall of Heroes",
     "contribTitle": "Contributor Title (eg, \"Blacksmith\")",
     "contribLevel": "Contrib Tier",
     "contribHallText": "1-7 for normal contributors, 8 for moderators, 9 for staff. This determines which items, pets, and mounts are available. Also determines name-tag coloring. Tiers 8 and 9 are automatically given admin status.",
-    "hallHeroes": "Hall of Heroes",
+    "hallContributors": "Hall of Contributors",
     "hallPatrons": "Hall of Patrons",
     "rewardUser": "Reward User",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Guilds are common-interest chat groups created by the players, for players. Browse through the list and join the Guilds that interest you!",
     "blurbChallenges": "Challenges are created by your fellow players. Joining a Challenge will add its tasks to your task dashboard, and winning a Challenge will give you an achievement and often a gem prize!",
     "blurbHallPatrons": "This is the Hall of Patrons, where we honor the noble adventurers who backed Habitica's original Kickstarter. We thank them for helping us bring Habitica to life!",
-    "blurbHallHeroes": "This is the Hall of Heroes, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
 }

common/locales/en/groups.json

@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern",
+    "tavern": "Tavern Chat",
     "innCheckOut": "Check Out of Inn",
     "innCheckIn": "Rest in the Inn",
     "innText": "You're resting in the Inn! While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day. Be warned: If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies unless they are also in the Inn! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",

website/views/options/social/hall.jade

@@ -2,13 +2,13 @@ script(type='text/ng-template', id='partials/options.social.hall.html')
   ul.options-submenu
     li(ng-class="{ active: $state.includes('options.social.hall.heroes') }")
       a(ui-sref='options.social.hall.heroes')
-        =env.t('hallHeroes')
+        =env.t('hallContributors')
     li(ng-class="{ active: $state.includes('options.social.hall.patrons') }")
       a(ui-sref='options.social.hall.patrons')
         =env.t('hallPatrons')
 
   .options-blurbmenu
-    small.muted(ng-if="$state.includes('options.social.hall.heroes')")!=env.t('blurbHallHeroes')
+    small.muted(ng-if="$state.includes('options.social.hall.heroes')")!=env.t('blurbHallContributors')
     small.muted(ng-if="$state.includes('options.social.hall.patrons')")=env.t('blurbHallPatrons')
 
   .tab-content