Release Mergeback 2017/05/03 (#8716)

* Content 2017/05 (#8714)

* feat(content): May 2017
Add Armoire, add BGs, end Spring Fling

* chore(sprites): compile

* chore(i18n): update locales

* 3.89.0

migrations/takeThis.js

@@ -1,4 +1,4 @@
-var migrationName = '20170404_takeThis.js'; // Update per month
+var migrationName = '20170502_takeThis.js'; // Update per month
 var authorName = 'Sabe'; // in case script author needs to know when their ...
 var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
 
@@ -14,7 +14,7 @@ function processUsers(lastId) {
   // specify a query to limit the affected users (empty for all users):
   var query = {
     'migration':{$ne:migrationName},
-    'challenges':{$in:['630018a7-49ab-4e95-ac26-12417b746e1c']} // Update per month
+    'challenges':{$in:['69999331-d4ea-45a0-8c3f-f725d22b56c8']} // Update per month
   };
 
   if (lastId) {

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "3.88.1",
+  "version": "3.89.0",
   "dependencies": {
     "@gulp-sourcemaps/map-sources": {
       "version": "1.0.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "3.88.1",
+  "version": "3.89.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

website/assets/sprites/css/index.css

@@ -1,9 +1,9 @@
 /* Comment out for holiday events */
-/* .npc_ian {
+.npc_ian {
   background: url("/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-} */
+}
 
 .quest_burnout {
   background: url("/quest_burnout.gif") no-repeat;

website/assets/sprites/dist/spritesmith-largeSprites-0.css

@@ -6,25 +6,25 @@
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px 0px;
+  background-position: -1573px -295px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -849px -600px;
+  background-position: -1573px 0px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px 0px;
+  background-position: -1150px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -423px -1042px;
+  background-position: -1291px -442px;
   width: 140px;
   height: 441px;
 }
@@ -42,37 +42,37 @@
 }
 .promo_backgrounds_armoire_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -568px -600px;
+  background-position: -710px -600px;
   width: 140px;
   height: 439px;
 }
 .promo_backgrounds_armoire_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -709px -600px;
+  background-position: -851px -600px;
   width: 139px;
   height: 438px;
 }
 .promo_backgrounds_armoire_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px 0px;
+  background-position: -1432px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -141px -1042px;
+  background-position: 0px -1042px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201612 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px 0px;
+  background-position: -141px -1042px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201701 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px -442px;
+  background-position: -282px -1042px;
   width: 140px;
   height: 441px;
 }
@@ -84,11 +84,17 @@
 }
 .promo_backgrounds_armoire_201703 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -142px -600px;
+  background-position: -840px -148px;
   width: 141px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201704 {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -426px -600px;
+  width: 141px;
+  height: 441px;
+}
+.promo_backgrounds_armoire_201705 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: 0px -600px;
   width: 141px;
@@ -96,7 +102,7 @@
 }
 .promo_bees {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -982px -148px;
+  background-position: -142px -600px;
   width: 141px;
   height: 441px;
 }
@@ -132,7 +138,7 @@
 }
 .promo_classes_fall_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -295px;
+  background-position: -1573px -590px;
   width: 103px;
   height: 348px;
 }
@@ -144,49 +150,49 @@
 }
 .promo_contrib_spotlight_Keith {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -980px;
+  background-position: -1715px -1536px;
   width: 87px;
   height: 111px;
 }
 .promo_contrib_spotlight_beffymaroo {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -922px;
+  background-position: -1715px -626px;
   width: 114px;
   height: 147px;
 }
 .promo_contrib_spotlight_blade {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -868px;
+  background-position: -1715px -1424px;
   width: 89px;
   height: 111px;
 }
 .promo_contrib_spotlight_cantras {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1201px;
+  background-position: -1803px -1536px;
   width: 87px;
   height: 109px;
 }
 .promo_contrib_spotlight_dewines {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1092px;
+  background-position: -1573px -939px;
   width: 89px;
   height: 108px;
 }
 .promo_contrib_spotlight_megan {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -644px;
+  background-position: -1715px -1200px;
   width: 90px;
   height: 111px;
 }
 .promo_contrib_spotlight_shanaqui {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -756px;
+  background-position: -1715px -1312px;
   width: 90px;
   height: 111px;
 }
 .promo_cow {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px -442px;
+  background-position: -1432px -442px;
   width: 140px;
   height: 441px;
 }
@@ -198,7 +204,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -182px -1755px;
+  background-position: -1474px -1664px;
   width: 90px;
   height: 90px;
 }
@@ -216,37 +222,37 @@
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1664px;
+  background-position: -1341px -1042px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -218px -1664px;
+  background-position: -468px -1664px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1415px -1664px;
+  background-position: -928px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1428px;
+  background-position: -1715px -1018px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -273px -1755px;
+  background-position: -364px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_fairy_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -840px -148px;
+  background-position: -982px -148px;
   width: 141px;
   height: 441px;
 }
@@ -258,7 +264,7 @@
 }
 .promo_ghost_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1042px;
+  background-position: -1291px 0px;
   width: 140px;
   height: 441px;
 }
@@ -276,25 +282,25 @@
 }
 .promo_habitoween_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -282px -1042px;
+  background-position: -1150px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_haunted_hair {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1070px;
+  background-position: -1715px -774px;
   width: 100px;
   height: 137px;
 }
 .promo_holly_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -426px -600px;
+  background-position: -568px -600px;
   width: 141px;
   height: 440px;
 }
 .promo_item_notif {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -849px -895px;
+  background-position: 0px -1664px;
   width: 249px;
   height: 102px;
 }
@@ -312,13 +318,13 @@
 }
 .promo_mystery_201405 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1779px -1664px;
+  background-position: 0px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1755px;
+  background-position: -1432px -884px;
   width: 90px;
   height: 96px;
 }
@@ -330,169 +336,169 @@
 }
 .promo_mystery_201408 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1829px -1208px;
+  background-position: -1821px -912px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1688px -1664px;
+  background-position: -182px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1417px;
+  background-position: -1806px -1200px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -91px -1755px;
+  background-position: -837px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1836px -1519px;
+  background-position: -1836px -1109px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1830px -1004px;
+  background-position: -1830px -708px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -960px -1664px;
+  background-position: -91px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1233px -1664px;
+  background-position: -1656px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1821px -1322px;
+  background-position: -1806px -1312px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1597px -1664px;
+  background-position: -1110px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1838px -1428px;
+  background-position: -1838px -1018px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px -884px;
+  background-position: -1573px -1260px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -775px -1664px;
+  background-position: -1291px -884px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -455px -1755px;
+  background-position: -273px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -399px -1664px;
+  background-position: -1150px -884px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -364px -1755px;
+  background-position: -1019px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1830px -922px;
+  background-position: -1830px -626px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1519px;
+  background-position: -1715px -1109px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1051px -1664px;
+  background-position: -1292px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1142px -1664px;
+  background-position: -1383px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -493px -1664px;
+  background-position: -991px -895px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1324px -1664px;
+  background-position: -1565px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201606 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1311px;
+  background-position: -1573px -1048px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201607 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1506px -1664px;
+  background-position: -1747px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -587px -1664px;
+  background-position: -649px -1664px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -681px -1664px;
+  background-position: -743px -1664px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1816px -1070px;
+  background-position: -1816px -774px;
   width: 63px;
   height: 84px;
 }
 .promo_mystery_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px -884px;
+  background-position: -1573px -1366px;
   width: 90px;
   height: 99px;
 }
@@ -504,7 +510,7 @@
 }
 .promo_mystery_201701 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px -884px;
+  background-position: -1573px -1154px;
   width: 90px;
   height: 105px;
 }
@@ -522,31 +528,31 @@
 }
 .promo_mystery_201704 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -869px -1664px;
+  background-position: -1201px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_3014 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1341px -1042px;
+  background-position: -250px -1664px;
   width: 217px;
   height: 90px;
 }
 .promo_new_hair_fall2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px -442px;
+  background-position: -423px -1042px;
   width: 140px;
   height: 441px;
 }
 .promo_orca {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1322px;
+  background-position: -1715px -912px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1610px;
+  background-position: -1432px -981px;
   width: 115px;
   height: 47px;
 }
@@ -574,27 +580,3 @@
   width: 60px;
   height: 60px;
 }
-.promo_peppermint_flame {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -626px;
-  width: 140px;
-  height: 147px;
-}
-.promo_pet_skins {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -774px;
-  width: 140px;
-  height: 147px;
-}
-.customize-option.promo_pet_skins {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1740px -789px;
-  width: 60px;
-  height: 60px;
-}
-.promo_pyromancer {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1208px;
-  width: 113px;
-  height: 113px;
-}

website/assets/sprites/dist/spritesmith-largeSprites-1.css

@@ -1,6 +1,30 @@
+.promo_peppermint_flame {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1629px -934px;
+  width: 140px;
+  height: 147px;
+}
+.promo_pet_skins {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1488px -934px;
+  width: 140px;
+  height: 147px;
+}
+.customize-option.promo_pet_skins {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1513px -949px;
+  width: 60px;
+  height: 60px;
+}
+.promo_pyromancer {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1639px -632px;
+  width: 113px;
+  height: 113px;
+}
 .promo_rainbow_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1341px;
+  background-position: -1358px -556px;
   width: 92px;
   height: 103px;
 }
@@ -30,13 +54,13 @@
 }
 .promo_splashyskins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1082px;
+  background-position: -1488px -1230px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1513px -1097px;
+  background-position: -1513px -1245px;
   width: 60px;
   height: 60px;
 }
@@ -54,7 +78,7 @@
 }
 .promo_spring_classes_2017 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -589px -916px;
+  background-position: -899px -916px;
   width: 309px;
   height: 147px;
 }
@@ -120,7 +144,7 @@
 }
 .promo_takethis_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -632px;
+  background-position: -1358px -377px;
   width: 114px;
   height: 87px;
 }
@@ -132,19 +156,19 @@
 }
 .promo_turkey_day_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -765px;
+  background-position: -1076px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_unconventional_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -720px;
+  background-position: -1639px -871px;
   width: 60px;
   height: 60px;
 }
 .promo_unconventional_armor2 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1687px -1082px;
+  background-position: -1687px -1230px;
   width: 70px;
   height: 74px;
 }
@@ -156,7 +180,7 @@
 }
 .promo_veteran_pets {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1627px -934px;
+  background-position: -1627px -1082px;
   width: 146px;
   height: 75px;
 }
@@ -174,7 +198,7 @@
 }
 .promo_winter_fireworks {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -934px;
+  background-position: -1488px -1082px;
   width: 138px;
   height: 147px;
 }
@@ -186,19 +210,19 @@
 }
 .promo_wintery_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1076px 0px;
+  background-position: 0px -765px;
   width: 140px;
   height: 441px;
 }
 .customize-option.promo_wintery_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1101px -15px;
+  background-position: -25px -780px;
   width: 60px;
   height: 60px;
 }
 .promo_winteryhair {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1174px;
+  background-position: -1488px -1322px;
   width: 152px;
   height: 75px;
 }
@@ -210,7 +234,7 @@
 }
 .npc_viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1250px;
+  background-position: -1358px -465px;
   width: 108px;
   height: 90px;
 }
@@ -222,7 +246,7 @@
 }
 .promo_backtoschool {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -481px;
+  background-position: -1488px -632px;
   width: 150px;
   height: 150px;
 }
@@ -234,13 +258,13 @@
 }
 .promo_startingover {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -632px;
+  background-position: -1488px -783px;
   width: 150px;
   height: 150px;
 }
 .promo_valentines {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -899px -916px;
+  background-position: -589px -916px;
   width: 309px;
   height: 147px;
 }
@@ -252,7 +276,7 @@
 }
 .scene_coding {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -330px;
+  background-position: -1488px -481px;
   width: 150px;
   height: 150px;
 }
@@ -276,7 +300,7 @@
 }
 .scene_phone_peek {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -783px;
+  background-position: -1488px -330px;
   width: 150px;
   height: 150px;
 }

website/client/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -6,25 +6,25 @@
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px 0px;
+  background-position: -1573px -295px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -849px -600px;
+  background-position: -1573px 0px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px 0px;
+  background-position: -1150px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -423px -1042px;
+  background-position: -1291px -442px;
   width: 140px;
   height: 441px;
 }
@@ -42,37 +42,37 @@
 }
 .promo_backgrounds_armoire_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -568px -600px;
+  background-position: -710px -600px;
   width: 140px;
   height: 439px;
 }
 .promo_backgrounds_armoire_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -709px -600px;
+  background-position: -851px -600px;
   width: 139px;
   height: 438px;
 }
 .promo_backgrounds_armoire_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px 0px;
+  background-position: -1432px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -141px -1042px;
+  background-position: 0px -1042px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201612 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px 0px;
+  background-position: -141px -1042px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201701 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px -442px;
+  background-position: -282px -1042px;
   width: 140px;
   height: 441px;
 }
@@ -84,11 +84,17 @@
 }
 .promo_backgrounds_armoire_201703 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -142px -600px;
+  background-position: -840px -148px;
   width: 141px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201704 {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -426px -600px;
+  width: 141px;
+  height: 441px;
+}
+.promo_backgrounds_armoire_201705 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
   background-position: 0px -600px;
   width: 141px;
@@ -96,7 +102,7 @@
 }
 .promo_bees {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -982px -148px;
+  background-position: -142px -600px;
   width: 141px;
   height: 441px;
 }
@@ -132,7 +138,7 @@
 }
 .promo_classes_fall_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -295px;
+  background-position: -1573px -590px;
   width: 103px;
   height: 348px;
 }
@@ -144,49 +150,49 @@
 }
 .promo_contrib_spotlight_Keith {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -980px;
+  background-position: -1715px -1536px;
   width: 87px;
   height: 111px;
 }
 .promo_contrib_spotlight_beffymaroo {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -922px;
+  background-position: -1715px -626px;
   width: 114px;
   height: 147px;
 }
 .promo_contrib_spotlight_blade {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -868px;
+  background-position: -1715px -1424px;
   width: 89px;
   height: 111px;
 }
 .promo_contrib_spotlight_cantras {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1201px;
+  background-position: -1803px -1536px;
   width: 87px;
   height: 109px;
 }
 .promo_contrib_spotlight_dewines {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1092px;
+  background-position: -1573px -939px;
   width: 89px;
   height: 108px;
 }
 .promo_contrib_spotlight_megan {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -644px;
+  background-position: -1715px -1200px;
   width: 90px;
   height: 111px;
 }
 .promo_contrib_spotlight_shanaqui {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -756px;
+  background-position: -1715px -1312px;
   width: 90px;
   height: 111px;
 }
 .promo_cow {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px -442px;
+  background-position: -1432px -442px;
   width: 140px;
   height: 441px;
 }
@@ -198,7 +204,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -182px -1755px;
+  background-position: -1474px -1664px;
   width: 90px;
   height: 90px;
 }
@@ -216,37 +222,37 @@
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1664px;
+  background-position: -1341px -1042px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -218px -1664px;
+  background-position: -468px -1664px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1415px -1664px;
+  background-position: -928px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1428px;
+  background-position: -1715px -1018px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -273px -1755px;
+  background-position: -364px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_fairy_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -840px -148px;
+  background-position: -982px -148px;
   width: 141px;
   height: 441px;
 }
@@ -258,7 +264,7 @@
 }
 .promo_ghost_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1042px;
+  background-position: -1291px 0px;
   width: 140px;
   height: 441px;
 }
@@ -276,25 +282,25 @@
 }
 .promo_habitoween_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -282px -1042px;
+  background-position: -1150px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_haunted_hair {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1070px;
+  background-position: -1715px -774px;
   width: 100px;
   height: 137px;
 }
 .promo_holly_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -426px -600px;
+  background-position: -568px -600px;
   width: 141px;
   height: 440px;
 }
 .promo_item_notif {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -849px -895px;
+  background-position: 0px -1664px;
   width: 249px;
   height: 102px;
 }
@@ -312,13 +318,13 @@
 }
 .promo_mystery_201405 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1779px -1664px;
+  background-position: 0px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1755px;
+  background-position: -1432px -884px;
   width: 90px;
   height: 96px;
 }
@@ -330,169 +336,169 @@
 }
 .promo_mystery_201408 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1829px -1208px;
+  background-position: -1821px -912px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1688px -1664px;
+  background-position: -182px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1417px;
+  background-position: -1806px -1200px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -91px -1755px;
+  background-position: -837px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1836px -1519px;
+  background-position: -1836px -1109px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1830px -1004px;
+  background-position: -1830px -708px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -960px -1664px;
+  background-position: -91px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1233px -1664px;
+  background-position: -1656px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1821px -1322px;
+  background-position: -1806px -1312px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1597px -1664px;
+  background-position: -1110px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1838px -1428px;
+  background-position: -1838px -1018px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px -884px;
+  background-position: -1573px -1260px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -775px -1664px;
+  background-position: -1291px -884px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -455px -1755px;
+  background-position: -273px -1767px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -399px -1664px;
+  background-position: -1150px -884px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -364px -1755px;
+  background-position: -1019px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1830px -922px;
+  background-position: -1830px -626px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1519px;
+  background-position: -1715px -1109px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1051px -1664px;
+  background-position: -1292px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1142px -1664px;
+  background-position: -1383px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -493px -1664px;
+  background-position: -991px -895px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1324px -1664px;
+  background-position: -1565px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201606 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1311px;
+  background-position: -1573px -1048px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201607 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1506px -1664px;
+  background-position: -1747px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -587px -1664px;
+  background-position: -649px -1664px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -681px -1664px;
+  background-position: -743px -1664px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1816px -1070px;
+  background-position: -1816px -774px;
   width: 63px;
   height: 84px;
 }
 .promo_mystery_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px -884px;
+  background-position: -1573px -1366px;
   width: 90px;
   height: 99px;
 }
@@ -504,7 +510,7 @@
 }
 .promo_mystery_201701 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px -884px;
+  background-position: -1573px -1154px;
   width: 90px;
   height: 105px;
 }
@@ -522,31 +528,31 @@
 }
 .promo_mystery_201704 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -869px -1664px;
+  background-position: -1201px -1664px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_3014 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1341px -1042px;
+  background-position: -250px -1664px;
   width: 217px;
   height: 90px;
 }
 .promo_new_hair_fall2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px -442px;
+  background-position: -423px -1042px;
   width: 140px;
   height: 441px;
 }
 .promo_orca {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1322px;
+  background-position: -1715px -912px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1610px;
+  background-position: -1432px -981px;
   width: 115px;
   height: 47px;
 }
@@ -574,27 +580,3 @@
   width: 60px;
   height: 60px;
 }
-.promo_peppermint_flame {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -626px;
-  width: 140px;
-  height: 147px;
-}
-.promo_pet_skins {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -774px;
-  width: 140px;
-  height: 147px;
-}
-.customize-option.promo_pet_skins {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1740px -789px;
-  width: 60px;
-  height: 60px;
-}
-.promo_pyromancer {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1208px;
-  width: 113px;
-  height: 113px;
-}

website/client/assets/css/sprites/spritesmith-largeSprites-1.css

@@ -1,6 +1,30 @@
+.promo_peppermint_flame {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1629px -934px;
+  width: 140px;
+  height: 147px;
+}
+.promo_pet_skins {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1488px -934px;
+  width: 140px;
+  height: 147px;
+}
+.customize-option.promo_pet_skins {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1513px -949px;
+  width: 60px;
+  height: 60px;
+}
+.promo_pyromancer {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1639px -632px;
+  width: 113px;
+  height: 113px;
+}
 .promo_rainbow_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1341px;
+  background-position: -1358px -556px;
   width: 92px;
   height: 103px;
 }
@@ -30,13 +54,13 @@
 }
 .promo_splashyskins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1082px;
+  background-position: -1488px -1230px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1513px -1097px;
+  background-position: -1513px -1245px;
   width: 60px;
   height: 60px;
 }
@@ -54,7 +78,7 @@
 }
 .promo_spring_classes_2017 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -589px -916px;
+  background-position: -899px -916px;
   width: 309px;
   height: 147px;
 }
@@ -120,7 +144,7 @@
 }
 .promo_takethis_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -632px;
+  background-position: -1358px -377px;
   width: 114px;
   height: 87px;
 }
@@ -132,19 +156,19 @@
 }
 .promo_turkey_day_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -765px;
+  background-position: -1076px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_unconventional_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -720px;
+  background-position: -1639px -871px;
   width: 60px;
   height: 60px;
 }
 .promo_unconventional_armor2 {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1687px -1082px;
+  background-position: -1687px -1230px;
   width: 70px;
   height: 74px;
 }
@@ -156,7 +180,7 @@
 }
 .promo_veteran_pets {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1627px -934px;
+  background-position: -1627px -1082px;
   width: 146px;
   height: 75px;
 }
@@ -174,7 +198,7 @@
 }
 .promo_winter_fireworks {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -934px;
+  background-position: -1488px -1082px;
   width: 138px;
   height: 147px;
 }
@@ -186,19 +210,19 @@
 }
 .promo_wintery_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1076px 0px;
+  background-position: 0px -765px;
   width: 140px;
   height: 441px;
 }
 .customize-option.promo_wintery_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1101px -15px;
+  background-position: -25px -780px;
   width: 60px;
   height: 60px;
 }
 .promo_winteryhair {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1174px;
+  background-position: -1488px -1322px;
   width: 152px;
   height: 75px;
 }
@@ -210,7 +234,7 @@
 }
 .npc_viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1250px;
+  background-position: -1358px -465px;
   width: 108px;
   height: 90px;
 }
@@ -222,7 +246,7 @@
 }
 .promo_backtoschool {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -481px;
+  background-position: -1488px -632px;
   width: 150px;
   height: 150px;
 }
@@ -234,13 +258,13 @@
 }
 .promo_startingover {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -632px;
+  background-position: -1488px -783px;
   width: 150px;
   height: 150px;
 }
 .promo_valentines {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -899px -916px;
+  background-position: -589px -916px;
   width: 309px;
   height: 147px;
 }
@@ -252,7 +276,7 @@
 }
 .scene_coding {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -330px;
+  background-position: -1488px -481px;
   width: 150px;
   height: 150px;
 }
@@ -276,7 +300,7 @@
 }
 .scene_phone_peek {
   background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -783px;
+  background-position: -1488px -330px;
   width: 150px;
   height: 150px;
 }

website/common/locales/bg/backgrounds.json

@@ -261,5 +261,12 @@
     "backgroundGiantBirdhouseText": "Огромна къщичка за птици",
     "backgroundGiantBirdhouseNotes": "Посетете огромна къщичка за птици.",
     "backgroundMistShroudedMountainText": "Планина в мъгла",
-    "backgroundMistShroudedMountainNotes": "Качете се на планина, обвита в мъгла."
+    "backgroundMistShroudedMountainNotes": "Качете се на планина, обвита в мъгла.",
+    "backgrounds052017": "SET 36: Released May 2017",
+    "backgroundGuardianStatuesText": "Guardian Statues",
+    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+    "backgroundHabitCityStreetsText": "Habit City Streets",
+    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+    "backgroundOnATreeBranchText": "On a Tree Branch",
+    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
 }

website/common/locales/bg/gear.json

@@ -90,12 +90,12 @@
     "weaponSpecialPageBannerNotes": "Развейте знамето си високо, за да вдъхнете увереност! Увеличава силата с <%= str %>.",
     "weaponSpecialRoguishRainbowMessageText": "Закачливо съобщение с цветовете на дъгата",
     "weaponSpecialRoguishRainbowMessageNotes": "Този лъскав плик съдържа насърчителни послания от хабитиканците, както и малко вълшебство, за да ускори доставките Ви! Увеличава усета с <%= per %>.",
-    "weaponSpecialSkeletonKeyText": "Skeleton Key",
+    "weaponSpecialSkeletonKeyText": "Костен ключ",
     "weaponSpecialSkeletonKeyNotes": "Добрите крадци винаги носят със себе си ключ, който може да отвори всяка ключалка! Увеличава якостта с <%= con %>.",
     "weaponSpecialNomadsScimitarText": "Номадски ятаган",
     "weaponSpecialNomadsScimitarNotes": "Извитото острие на ятагана е идеално за нападане на задачите от гърба на превоз! Увеличава интелигентността с <%= int %>.",
-    "weaponSpecialFencingFoilText": "Fencing Foil",
-    "weaponSpecialFencingFoilNotes": "Should anyone dare to impugn your honor, you'll be ready with this fine foil! Increases Strength by <%= str %>.",
+    "weaponSpecialFencingFoilText": "Рапира",
+    "weaponSpecialFencingFoilNotes": "Ако някой нарани честта Ви, ще можете да отвърнете с тази изящна рапира!! Увеличава силата с <%= str %>.",
     "weaponSpecialTachiText": "Тачи",
     "weaponSpecialTachiNotes": "Този лек, извит меч ще насече задачите Ви на малки парченца! Увеличава силата с <%= str %>.",
     "weaponSpecialYetiText": "Копие на укротител на йетита",
@@ -262,12 +262,14 @@
     "weaponArmoireOgreClubNotes": "Тази тояга е отмъкната от пещера на истински човекоядец. Увеличава силата с <%= str %>. Омагьосан гардероб: комплект „Човекоядец“ (предмет 2 от 3).",
     "weaponArmoireWoodElfStaffText": "Скиптър на дървесен елф",
     "weaponArmoireWoodElfStaffNotes": "Този скиптър, създаден от паднал клон на древно дърво, ще Ви помогне да разговаряте с всички горски обитатели, били те малки или големи. Увеличава интелигентността с <%= int %>. Омагьосан гардероб: комплект „Дървесен елф“ (предмет 3 от 3).",
-    "weaponArmoireWandOfHeartsText": "Магическа пръчка със сърце",
+    "weaponArmoireWandOfHeartsText": "Вълшебна пръчка със сърце",
     "weaponArmoireWandOfHeartsNotes": "Тази магическа пръчка излъчва топла червена светлина. А и ще Ви дари с мъдрост. Увеличава интелигентността с <%= int %>. Омагьосан гардероб: комплект „Дама купа“ (предмет 3 от 3).",
     "weaponArmoireForestFungusStaffText": "Горски гъбен скиптър",
     "weaponArmoireForestFungusStaffNotes": "Използвайте този чепат скиптър, за да изпълнявате гъбени вълшебства. Увеличава интелигентността с <%= int %> и усета с <%= per %>. Омагьосан гардероб: Независим предмет.",
-    "weaponArmoireFestivalFirecrackerText": "Празничен бенгалски огън",
+    "weaponArmoireFestivalFirecrackerText": "Бенгалски огън",
     "weaponArmoireFestivalFirecrackerNotes": "Радвайте се на искрите, но и внимавайте да не подпалите нещо. Увеличава усета с <%= per %>. Омагьосан гардероб: комплект „Празнична премяна“ (предмет 3 от 3).",
+    "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
+    "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
     "armor": "броня",
     "armorCapitalized": "Броня",
     "armorBase0Text": "Обикновени дрехи",
@@ -329,19 +331,19 @@
     "armorSpecialLunarWarriorArmorText": "Броня на лунен воин",
     "armorSpecialLunarWarriorArmorNotes": "Тази броня е изкована от лунен камък и вълшебна стомана. Увеличава силата и якостта с по <%= attrs %>.",
     "armorSpecialMammothRiderArmorText": "Броня на мамутоездач",
-    "armorSpecialMammothRiderArmorNotes": "Този костюм от кожа и козина включва шикозно наметало, осеяно с камъни от розов кварц. Това е превъзходна защита срещу пронизващите ветрове, когато Ви се налага да пътувате из места с по-студен климат. Увеличава якостта с <%= con %>.",
+    "armorSpecialMammothRiderArmorNotes": "Този костюм от кожа и козина включва шикозно наметало, осеяно с камъни от розов кварц. Това е превъзходна защита срещу пронизващите ветрове, докато приключенствате в най-студените места. Увеличава якостта с <%= con %>.",
     "armorSpecialPageArmorText": "Броня на паж",
     "armorSpecialPageArmorNotes": "С това можете да носите със себе си всичко, от което имате нужда! Увеличава якостта с <%= con %>.",
     "armorSpecialRoguishRainbowMessengerRobesText": "Мантия на закачливия куриер с цветовете на дъгата",
     "armorSpecialRoguishRainbowMessengerRobesNotes": "С тази мантия на цветни ивици ще можете да летите из бурните ветрове леко и безопасно. Увеличава силата с <%= str %>.",
-    "armorSpecialSneakthiefRobesText": "Sneakthief Robes",
+    "armorSpecialSneakthiefRobesText": "Одежди на крадец",
     "armorSpecialSneakthiefRobesNotes": "Тези одежди ще Ви скрият в нощта, но и ще Ви позволят да се движите свободно, докато се промъквате безшумно! Увеличава интелигентността с <%= int %>.",
-    "armorSpecialSnowSovereignRobesText": "Snow Sovereign Robes",
+    "armorSpecialSnowSovereignRobesText": "Одежди на снежен владетел",
     "armorSpecialSnowSovereignRobesNotes": "Тези одежди са достатъчно елегантни за царския двор, но и достатъчно топли за студените зимни дни. Увеличава усета с <%= per %>.",
     "armorSpecialNomadsCuirassText": "Номадска броня",
     "armorSpecialNomadsCuirassNotes": "Тази броня има подсилен нагръдник, който да защитава сърцето Ви! Увеличава якостта с <%= con %>.",
-    "armorSpecialDandySuitText": "Dandy Suit",
-    "armorSpecialDandySuitNotes": "С това определено ще изглеждате като успешен човек! Увеличава усета с <%= per %>.",
+    "armorSpecialDandySuitText": "Изискан костюм",
+    "armorSpecialDandySuitNotes": "С това определено ще изглеждате като някой от висшата класа! Увеличава усета с <%= per %>.",
     "armorSpecialSamuraiArmorText": "Самурайска броня",
     "armorSpecialSamuraiArmorNotes": "Частите на тази здрава броня са свързани с изящни копринени нишки. Увеличава усета с <%= per %>.",
     "armorSpecialYetiText": "Мантия на укротител на йетита",
@@ -459,11 +461,11 @@
     "armorSpecialWinter2017HealerText": "Венчелистчена броня",
     "armorSpecialWinter2017HealerNotes": "Въпреки че е мека, тази броня от венчелистчета е много здрава. Увеличава якостта с <%= con %>. Ограничена серия: Зимна екипировка 2016-2017 г.",
     "armorSpecialSpring2017RogueText": "Костюм на промъкващ се заек",
-    "armorSpecialSpring2017RogueNotes": "Мек, но удобен — с този костюм можете да се промъквате в градините още по-незабелязано. Увеличава усета с <%= per %>.  Ограничена серия: Пролетна екипировка 2017 г.",
+    "armorSpecialSpring2017RogueNotes": "Мек на допир, но здрав — с този костюм можете да се промъквате в градините още по-незабелязано. Увеличава усета с <%= per %>.  Ограничена серия: Пролетна екипировка 2017 г.",
     "armorSpecialSpring2017WarriorText": "Пухкава броня",
     "armorSpecialSpring2017WarriorNotes": "Тази броня е лъскава като най-спретното Ви сако, но и може да Ви защити от удари. Увеличава якостта с <%= con %>. Ограничена серия: Пролетна екипировка 2017 г.",
     "armorSpecialSpring2017MageText": "Одежди на кучешки вълшебник",
-    "armorSpecialSpring2017MageNotes": "Проектирани за магия, пухкави — просто така. Увеличава интелигентността с  <%= int %>. Ограничена серия: Пролетна екипировка 2017 г.",
+    "armorSpecialSpring2017MageNotes": "Вълшебен дизайн с добавена пухкавост. Увеличава интелигентността с  <%= int %>. Ограничена серия: Пролетна екипировка 2017 г.",
     "armorSpecialSpring2017HealerText": "Одежди за отдих",
     "armorSpecialSpring2017HealerNotes": "Мекотата на тези одежди Ви успокоява, също както и всекиго, който се нуждае от лечителната Ви сила! Увеличава якостта с <%= con %>. Ограничена серия: Пролетна екипировка 2017 г.",
     "armorMystery201402Text": "Одежди на вестоносец",
@@ -580,6 +582,8 @@
     "armorArmoireMushroomDruidArmorNotes": "Тази дървесно кафява броня, украсена с малки гъбки, ще Ви помогне да чуете шепота на горския живот. Увеличава якостта с <%= con %> и усета с <%= per %>. Омагьосан гардероб: комплект „Гъбен друид“ (предмет 2 от 3).",
     "armorArmoireGreenFestivalYukataText": "Зелена празнична юката",
     "armorArmoireGreenFestivalYukataNotes": "С тази лека юката ще Ви бъде прохладно, докато се наслаждавате на празника. Увеличава якостта и усета с по <%= attrs %>. Омагьосан гардероб: комплект „Празнична премяна“ (предмет 1 от 3).",
+    "armorArmoireMerchantTunicText": "Merchant Tunic",
+    "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
     "headgear": "защита за главата",
     "headgearCapitalized": "Защита за главата",
     "headBase0Text": "Няма шлем",
@@ -646,13 +650,13 @@
     "headSpecialPageHelmNotes": "Ризница: за изисканите И практични хора. Увеличава усета с <%= per %>.",
     "headSpecialRoguishRainbowMessengerHoodText": "Качулка на закачливия куриер с цветовете на дъгата",
     "headSpecialRoguishRainbowMessengerHoodNotes": "Тази ярка качулка излъчва цветен ореол, който ще Ви предпази от неприятното време! Увеличава якостта с <%= con %>.",
-    "headSpecialClandestineCowlText": "Clandestine Cowl",
+    "headSpecialClandestineCowlText": "Тайнствена качулка",
     "headSpecialClandestineCowlNotes": "Уверете се, че лицето Ви е скрито, когато ограбвате златото и плячката от задачите си. Увеличава усета с <%= per %>.",
-    "headSpecialSnowSovereignCrownText": "Snow Sovereign Crown",
+    "headSpecialSnowSovereignCrownText": "Корона на снежен владетел",
     "headSpecialSnowSovereignCrownNotes": "Скъпоценните камъни на тази корона блестят като току-що паднали снежинки. Увеличава якостта с <%= con %>.",
-    "headSpecialSpikedHelmText": "Spiked Helm",
+    "headSpecialSpikedHelmText": "Шлем с шип",
     "headSpecialSpikedHelmNotes": "С този функционална (и красив) шлем ще имате добра защита срещу изостаналите ежедневни задачи и лошите навици. Увеличава силата с <%= str %>.",
-    "headSpecialDandyHatText": "Dandy Hat",
+    "headSpecialDandyHatText": "Изискана шапка",
     "headSpecialDandyHatNotes": "Колко веселяшко шапо! Ще изглеждате доста добре, когато се разхождате с него. Увеличава якостта с <%= con %>.",
     "headSpecialKabutoText": "Кабуто",
     "headSpecialKabutoNotes": "Този шлем е функционален и красив! Враговете Ви ще се разсеят, тъй като ще са заети да му се възхищават. Увеличава интелигентността с <%= int %>.",
@@ -906,6 +910,8 @@
     "headArmoireCrownOfHeartsNotes": "Тази червена като роза корона не е проста зашеметяваща! Та ще даде сила на сърцето Ви срещу упоритите задачи. Увеличава силата с <%= str %>. Омагьосан гардероб: комплект „Дама купа“ (предмет 1 от 3).",
     "headArmoireMushroomDruidCapText": "Шапка на гъбен друид",
     "headArmoireMushroomDruidCapNotes": "Отгледана някъде в дълбоката мъглива гора, тази шапка дава на собственика си знания относно лечебните билки. Увеличава интелигентността с <%= int %> и силата с <%= str %>. Омагьосан гардероб: комплект „Гъбен друид“ (предмет 1 от 3).",
+    "headArmoireMerchantChaperonText": "Merchant Chaperon",
+    "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
     "offhand": "предмет за защитната ръка",
     "offhandCapitalized": "Предмет за защитната ръка",
     "shieldBase0Text": "Няма предмет в защитната ръка",
@@ -948,7 +954,7 @@
     "shieldSpecialRoguishRainbowMessageNotes": "Този лъскав плик съдържа насърчителни послания от хабитиканците, както и малко вълшебство, за да ускори доставките Ви! Увеличава интелигентността с <%= int %>.",
     "shieldSpecialLootBagText": "Торба за плячка",
     "shieldSpecialLootBagNotes": "Тази торба е идеална за събиране на всички хубави неща, които тихомълком сте отмъкнали от нищо неподозиращите задачи! Увеличава силата с <%= str %>.",
-    "shieldSpecialWintryMirrorText": "Wintry Mirror",
+    "shieldSpecialWintryMirrorText": "Заскрежено огледало",
     "shieldSpecialWintryMirrorNotes": "Как иначе да се любувате на зимния си вид? Увеличава интелигентността с <%= int %>.",
     "shieldSpecialWakizashiText": "Уакизаши",
     "shieldSpecialWakizashiNotes": "Този къс меч е идеален за близък бой с ежедневните Ви задачи! Увеличава якостта с <%= con %>.",
@@ -1095,7 +1101,7 @@
     "backSpecialWonderconBlackNotes": "Изтъкано от сенки и шепоти. Не променя показателите. Специално издание: Конгресен предмет.",
     "backSpecialTakeThisText": "Крила от „Вземи това“",
     "backSpecialTakeThisNotes": "Тези крила бяха спечелени като награда за участие в предизвикателство, създадено и спонсорирано от „Вземи това“ („Take This“). Поздравления! Увеличава всички атрибути с <%= attrs %>.",
-    "backSpecialSnowdriftVeilText": "Snowdrift Veil",
+    "backSpecialSnowdriftVeilText": "Снежно наметало",
     "backSpecialSnowdriftVeilNotes": "С този прозрачен воал ще изглеждате така, сякаш Ви обгръща изящен снежен облак! Не променя показателите.",
     "body": "Аксесоар за тяло",
     "bodyBase0Text": "Няма аксесоар за тяло",

website/common/locales/cs/backgrounds.json

@@ -261,5 +261,12 @@
     "backgroundGiantBirdhouseText": "Giant Birdhouse",
     "backgroundGiantBirdhouseNotes": "Perch in a Giant Birdhouse.",
     "backgroundMistShroudedMountainText": "Mist-Shrouded Mountain",
-    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain."
+    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain.",
+    "backgrounds052017": "SET 36: Released May 2017",
+    "backgroundGuardianStatuesText": "Guardian Statues",
+    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+    "backgroundHabitCityStreetsText": "Habit City Streets",
+    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+    "backgroundOnATreeBranchText": "On a Tree Branch",
+    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
 }

website/common/locales/cs/gear.json

@@ -268,6 +268,8 @@
     "weaponArmoireForestFungusStaffNotes": "Use this gnarled staff to work mycological magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.",
     "weaponArmoireFestivalFirecrackerText": "Festival Firecracker",
     "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).",
+    "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
+    "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
     "armor": "zbroj",
     "armorCapitalized": "Zbroj",
     "armorBase0Text": "Obyčejné oblečení",
@@ -580,6 +582,8 @@
     "armorArmoireMushroomDruidArmorNotes": "This woody brown armor, capped with tiny mushrooms, will help you hear the whispers of forest life. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Mushroom Druid Set (Item 2 of 3).",
     "armorArmoireGreenFestivalYukataText": "Green Festival Yukata",
     "armorArmoireGreenFestivalYukataNotes": "This fine lightweight yukata will keep you cool while you enjoy any festive occasion. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Festival Attire Set (Item 1 of 3).",
+    "armorArmoireMerchantTunicText": "Merchant Tunic",
+    "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
     "headgear": "Pokrývka hlavy",
     "headgearCapitalized": "Headgear",
     "headBase0Text": "Žádná přilba",
@@ -906,6 +910,8 @@
     "headArmoireCrownOfHeartsNotes": "This rosy red crown isn't just eye-catching! It will also strengthen your heart against tough tasks. Increases Strength by <%= str %>. Enchanted Armoire: Queen of Hearts Set (Item 1 of 3).",
     "headArmoireMushroomDruidCapText": "Mushroom Druid Cap",
     "headArmoireMushroomDruidCapNotes": "Harvested deep in a misty forest, this cap grants the wearer knowledge of medicinal plants. Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Mushroom Druid Set (Item 1 of 3).",
+    "headArmoireMerchantChaperonText": "Merchant Chaperon",
+    "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
     "offhand": "štít v ruce",
     "offhandCapitalized": "Shield-Hand Item",
     "shieldBase0Text": "Bez štítu v ruce",

website/common/locales/da/backgrounds.json

@@ -261,5 +261,12 @@
     "backgroundGiantBirdhouseText": "Kæmpe Fuglehus",
     "backgroundGiantBirdhouseNotes": "Sid i et Kæmpe Fuglehus.",
     "backgroundMistShroudedMountainText": "Tåge-Indhyllet Bjerg",
-    "backgroundMistShroudedMountainNotes": "Bestig et Tåge-Indhyllet Bjerg."
+    "backgroundMistShroudedMountainNotes": "Bestig et Tåge-Indhyllet Bjerg.",
+    "backgrounds052017": "SET 36: Released May 2017",
+    "backgroundGuardianStatuesText": "Guardian Statues",
+    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+    "backgroundHabitCityStreetsText": "Habit City Streets",
+    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+    "backgroundOnATreeBranchText": "On a Tree Branch",
+    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
 }

website/common/locales/da/gear.json

@@ -90,10 +90,10 @@
     "weaponSpecialPageBannerNotes": "Hold din fane højt for at indgyde selvtillid! øger Styrke med <%= str %>.",
     "weaponSpecialRoguishRainbowMessageText": "Slyndelagtig Regnbuebesked",
     "weaponSpecialRoguishRainbowMessageNotes": "Denne glitrende kuvert indeholder opmuntrende beskeder fra habitikanere og ensmule magi for at hjælpe dine uddelinger på vej! øger Opfattelse med <%= per %>.",
-    "weaponSpecialSkeletonKeyText": "Skeleton Key",
-    "weaponSpecialSkeletonKeyNotes": "All the best Sneakthieves carry a key that can open any lock! Increases Constitution by <%= con %>.",
-    "weaponSpecialNomadsScimitarText": "Nomad's Scimitar",
-    "weaponSpecialNomadsScimitarNotes": "The curved blade of this Scimitar is perfect for attacking Tasks from the back of a mount! Increases Intelligence by <%= int %>.",
+    "weaponSpecialSkeletonKeyText": "Skelet Nøgle",
+    "weaponSpecialSkeletonKeyNotes": "Alle de bedste Listetyve bærer en nøgle, der kan åbne enhver lås! Øger Konstitution med <%= con %>.",
+    "weaponSpecialNomadsScimitarText": "Nomades Krumsabel",
+    "weaponSpecialNomadsScimitarNotes": "Den buede klinge af denne Krumsabel er perfekt til at angribe Opgaver fra ryggen af et Ridedyr! Øger Intelligens med <%= int %>.",
     "weaponSpecialFencingFoilText": "Fencing Foil",
     "weaponSpecialFencingFoilNotes": "Should anyone dare to impugn your honor, you'll be ready with this fine foil! Increases Strength by <%= str %>.",
     "weaponSpecialTachiText": "Tachi",
@@ -268,6 +268,8 @@
     "weaponArmoireForestFungusStaffNotes": "Use this gnarled staff to work mycological magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.",
     "weaponArmoireFestivalFirecrackerText": "Festival Firecracker",
     "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).",
+    "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
+    "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
     "armor": "rustning",
     "armorCapitalized": "Armor",
     "armorBase0Text": "Almindeligt tøj",
@@ -580,6 +582,8 @@
     "armorArmoireMushroomDruidArmorNotes": "This woody brown armor, capped with tiny mushrooms, will help you hear the whispers of forest life. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Mushroom Druid Set (Item 2 of 3).",
     "armorArmoireGreenFestivalYukataText": "Green Festival Yukata",
     "armorArmoireGreenFestivalYukataNotes": "This fine lightweight yukata will keep you cool while you enjoy any festive occasion. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Festival Attire Set (Item 1 of 3).",
+    "armorArmoireMerchantTunicText": "Merchant Tunic",
+    "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
     "headgear": "hovedbeklædning",
     "headgearCapitalized": "Headgear",
     "headBase0Text": "Ingen Hjelm",
@@ -906,6 +910,8 @@
     "headArmoireCrownOfHeartsNotes": "This rosy red crown isn't just eye-catching! It will also strengthen your heart against tough tasks. Increases Strength by <%= str %>. Enchanted Armoire: Queen of Hearts Set (Item 1 of 3).",
     "headArmoireMushroomDruidCapText": "Mushroom Druid Cap",
     "headArmoireMushroomDruidCapNotes": "Harvested deep in a misty forest, this cap grants the wearer knowledge of medicinal plants. Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Mushroom Druid Set (Item 1 of 3).",
+    "headArmoireMerchantChaperonText": "Merchant Chaperon",
+    "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
     "offhand": "skjoldhånds-udstyr",
     "offhandCapitalized": "Skjoldhånds-udstyr",
     "shieldBase0Text": "Intet Skjoldhånds-udstyr",
@@ -1083,11 +1089,11 @@
     "backMystery201510Notes": "Prehensile and powerful! Confers no benefit. October 2015 Subscriber Item.",
     "backMystery201602Text": "Hjerteknuserkappe",
     "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
-    "backMystery201608Text": "Cape of Thunder",
+    "backMystery201608Text": "Tordenskappe",
     "backMystery201608Notes": "Fly through the stormy skies with this billowing cape! Confers no benefit. August 2016 Subscriber Item.",
-    "backMystery201702Text": "Heartstealer Cape",
+    "backMystery201702Text": "Hjertetyvskappe",
     "backMystery201702Notes": "A swoosh of this cape, and all near you will be swept off their feet by your charm! Confers no benefit. February 2017 Subscriber Item.",
-    "backMystery201704Text": "Fairytale Wings",
+    "backMystery201704Text": "Eventyr Vinger",
     "backMystery201704Notes": "These shimmering wings will carry you anywhere, even the hidden realms ruled by magical creatures. Confers no benefit. April 2017 Subscriber Item.",
     "backSpecialWonderconRedText": "Mægtig Kappe",
     "backSpecialWonderconRedNotes": "Rasler af styrke og skønhed. Giver ingen bonusser. Specielt Messeudstyr.",
@@ -1106,7 +1112,7 @@
     "bodySpecialWonderconGoldNotes": "En attraktiv gylden krave! Giver ingen bonusser. Specielt Messeudstyr.",
     "bodySpecialWonderconBlackText": "Ibenholtskrave",
     "bodySpecialWonderconBlackNotes": "En attraktiv krave af ibenholt! Giver ingen bonusser. Specielt Messeudstyr.",
-    "bodySpecialTakeThisText": "Take This Pauldrons",
+    "bodySpecialTakeThisText": "Tage Dette Skulderstykker",
     "bodySpecialTakeThisNotes": "These pauldrons were earned by participating in a sponsored Challenge made by Take This. Congratulations! Increases all attributes by <%= attrs %>.",
     "bodySpecialSummerMageText": "Skinnende Lille Kappe",
     "bodySpecialSummerMageNotes": "Hverken saltvand eller ferskvand kan plette denne metalliske lille kappe. Giver ingen bonusser. Specielt 2014 Sommerudstyr.",
@@ -1150,13 +1156,13 @@
     "headAccessorySpecialSpring2016MageNotes": "These sharp ears can detect the minute hum of ambient Mana, or the muted footfalls of a Rogue. Confers no benefit. Limited Edition 2016 Spring Gear.",
     "headAccessorySpecialSpring2016HealerText": "Lilla Kaninører",
     "headAccessorySpecialSpring2016HealerNotes": "They stand like flags above the fray, letting others know where to run for help. Confers no benefit. Limited Edition 2016 Spring Gear.",
-    "headAccessorySpecialSpring2017RogueText": "Red Bunny Ears",
+    "headAccessorySpecialSpring2017RogueText": "Røde Kaninører",
     "headAccessorySpecialSpring2017RogueNotes": "No sounds will escape you thanks to these ears. Confers no benefit. Limited Edition 2017 Spring Gear.",
-    "headAccessorySpecialSpring2017WarriorText": "Blue Kitty Ears",
+    "headAccessorySpecialSpring2017WarriorText": "Blå Katteører",
     "headAccessorySpecialSpring2017WarriorNotes": "These ears can hear a bag of kitty treats open even in the din of battle! Confers no benefit. Limited Edition 2017 Spring Gear.",
-    "headAccessorySpecialSpring2017MageText": "Teal Dog Ears",
+    "headAccessorySpecialSpring2017MageText": "Blågrønne Hundeører",
     "headAccessorySpecialSpring2017MageNotes": "You can hear the magic in the air! Confers no benefit. Limited Edition 2017 Spring Gear.",
-    "headAccessorySpecialSpring2017HealerText": "Purple Mouse Ears",
+    "headAccessorySpecialSpring2017HealerText": "Lilla Museører",
     "headAccessorySpecialSpring2017HealerNotes": "These ears will help you hear healing secrets. Confers no benefit. Limited Edition 2017 Spring Gear.",
     "headAccessoryBearEarsText": "Bjørneører",
     "headAccessoryBearEarsNotes": "These ears make you look like a brave bear! Confers no benefit.",
@@ -1225,8 +1231,8 @@
     "eyewearMystery301404Notes": "Ingen øjenbeklædning er smartere end goggles - måske bortset fra en monokel. Giver ingen bonusser. April 3015 Abonnentting.",
     "eyewearMystery301405Text": "Monokel",
     "eyewearMystery301405Notes": "Ingen øjenbeklædning er smartere end en monokel - måske bortset fra goggles. Giver ingen bonusser. Juli 3015 Abonnentting.",
-    "eyewearMystery301703Text": "Peacock Masquerade Mask",
-    "eyewearMystery301703Notes": "Perfect for a fancy masquerade or for stealthily moving through a particularly well-dressed crowd. Confers no benefit. March 3017 Subscriber Item.",
+    "eyewearMystery301703Text": "Påfugl Maskerade Maske",
+    "eyewearMystery301703Notes": "Perfekt til en smart maskerade eller til at listende bevæge sig gennem en særlig velklædt menneskemængde. Giver ingen bonusser. Marts 3017 Abonnentting.",
     "eyewearArmoirePlagueDoctorMaskText": "Pestlægemaske",
     "eyewearArmoirePlagueDoctorMaskNotes": "En autentisk maske båret af de læger, der bekæmper udsættelsespesten. Giver ingen bonusser. Fortryllet Klædeskab: Pestlægesæt (Genstand 2 af 3)."
 }

website/common/locales/de/backgrounds.json

@@ -261,5 +261,12 @@
     "backgroundGiantBirdhouseText": "Riesiges Vogelhaus",
     "backgroundGiantBirdhouseNotes": "Lass Dich in einem riesigen Vogelhaus nieder.",
     "backgroundMistShroudedMountainText": "Vernebeltes Gebirge",
-    "backgroundMistShroudedMountainNotes": "Erklimme ein vernebeltes Gebirge."
+    "backgroundMistShroudedMountainNotes": "Erklimme ein vernebeltes Gebirge.",
+    "backgrounds052017": "SET 36: Released May 2017",
+    "backgroundGuardianStatuesText": "Guardian Statues",
+    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+    "backgroundHabitCityStreetsText": "Habit City Streets",
+    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+    "backgroundOnATreeBranchText": "On a Tree Branch",
+    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
 }

website/common/locales/de/gear.json

@@ -97,7 +97,7 @@
     "weaponSpecialFencingFoilText": "Fencing Foil",
     "weaponSpecialFencingFoilNotes": "Should anyone dare to impugn your honor, you'll be ready with this fine foil! Increases Strength by <%= str %>.",
     "weaponSpecialTachiText": "Tachi",
-    "weaponSpecialTachiNotes": "This light and curved sword will shred your tasks to ribbons! Increases Strength by <%= str %>.",
+    "weaponSpecialTachiNotes": "Dieses leichte und gebogene Schwert wird Deine Aufgaben in Streifen zerteilen! Erhöht Stärke um <%= str %>.",
     "weaponSpecialYetiText": "Speer des Yeti-Zähmers",
     "weaponSpecialYetiNotes": "Dieser Speer erlaubt dem Träger, jeden Yeti zu bändigen. Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2013-2014, Winterausrüstung.",
     "weaponSpecialSkiText": "Stock des Sk(i)-attentäters",
@@ -268,6 +268,8 @@
     "weaponArmoireForestFungusStaffNotes": "Benutze diesen knorrigen Stab um mykologische Magie zu wirken! Erhöht Intelligenz um <%= int %> und Wahrnehmung um <%= per %>. Verzauberter Schrank: Unabhängiger Gegenstand. ",
     "weaponArmoireFestivalFirecrackerText": "Festival-Feuerwerk",
     "weaponArmoireFestivalFirecrackerNotes": "Vergnüge Dich verantwortungsvoll mit dieser entzückenden Wunderkerze. Erhöht Wahrnehmung um <%= per %>. Verzauberter Schrank: Festival-Tracht Set (Gegenstand 3 von 3).",
+    "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
+    "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
     "armor": "Rüstung",
     "armorCapitalized": "Rüstung",
     "armorBase0Text": "Schlichte Kleidung",
@@ -340,8 +342,8 @@
     "armorSpecialSnowSovereignRobesNotes": "Diese Robe ist elegant genug, um bei Hofe getragen zu werden, und dennoch warm genug für die kältesten Wintertage. Erhöht Wahrnehmung um <%= per %>.",
     "armorSpecialNomadsCuirassText": "Nomad's Cuirass",
     "armorSpecialNomadsCuirassNotes": "This armor features a strong chest-plate to protect your heart! Increases Constitution by <%= con %>.",
-    "armorSpecialDandySuitText": "Dandy Suit",
-    "armorSpecialDandySuitNotes": "You're undeniably dressed for success! Increases Perception by <%= per %>.",
+    "armorSpecialDandySuitText": "Fabelhafter Anzug",
+    "armorSpecialDandySuitNotes": "Du bist unbestreitbar erfolgreich angezogen! Erhöht Wahrnehmung um <%= per %>.",
     "armorSpecialSamuraiArmorText": "Samurai Armor",
     "armorSpecialSamuraiArmorNotes": "This strong, scaled armor is held together by elegant silk cords. Increases Perception by <%= per %>.",
     "armorSpecialYetiText": "Robe des Yeti-Zähmers",
@@ -358,7 +360,7 @@
     "armorSpecialBirthday2015Notes": "Alles Gute zum Geburtstag, Habitica! Trage diese albernen Partyroben um diesen wundervollen Tag zu feiern. Gewährt keinen Attributbonus.",
     "armorSpecialBirthday2016Text": "Lächerliches Festgewand",
     "armorSpecialBirthday2016Notes": "Alles Gute zum Geburtstag, Habitica! Trage dieses lächerliche Festgewand, um diesen wundervollen Tag zu feiern. Gewährt keinen Attributbonus.",
-    "armorSpecialBirthday2017Text": "Wunderliche Partygewänder",
+    "armorSpecialBirthday2017Text": "Wunderliches Partygewand",
     "armorSpecialBirthday2017Notes": "Alles Gute zum Geburtstag, Habitica! Trage diese wunderlichen Partyroben um diesen wundervollen Tag zu feiern. Gewährt keinen Attributbonus.",
     "armorSpecialGaymerxText": "Regenbogenkriegerrüstung",
     "armorSpecialGaymerxNotes": "Zur Feier der GaymerX-Konferenz, ist diese besondere Rüstung mit einem strahlenden, bunten Regenbogen verziert! GaymerX ist eine Spiele-Konvention, die LGBTQ und das Spielen an sich feiert und die offen für alle ist. Sie findet statt im InterContinental in der Stadtmitte von SanFrancisco vom 11. bis 13. Juli.",
@@ -580,6 +582,8 @@
     "armorArmoireMushroomDruidArmorNotes": "Diese hölzern-braune, von winzigen Pilzen bedeckte Rüstung hilft Dir, das Wispern des Waldlebens zu hören. Erhöht Ausdauer um <%= con %> und Wahrnehmung um <%= per %>. Verzauberter Schrank: Pilzdruiden-Set (Gegenstand 2 von 3). ",
     "armorArmoireGreenFestivalYukataText": "Grüne Festival-Yukata",
     "armorArmoireGreenFestivalYukataNotes": "Diese vorzügliche, leichte Yukata hält Dich kühl während Du ein Fest geniesst. Erhöht Ausdauer und Wahrnehmung um je <%= attrs %>. Verzauberter Schrank: Festival-Tracht Set (Gegenstand 1 von 3).",
+    "armorArmoireMerchantTunicText": "Merchant Tunic",
+    "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
     "headgear": "Kopfschutz",
     "headgearCapitalized": "Kopfschutz",
     "headBase0Text": "Kein Helm.",
@@ -650,12 +654,12 @@
     "headSpecialClandestineCowlNotes": "Take care to conceal your face as you rob your Tasks of gold and loot! Increases Perception by <%= per %>.",
     "headSpecialSnowSovereignCrownText": "Snow Sovereign Crown",
     "headSpecialSnowSovereignCrownNotes": "The jewels in this crown sparkle like new-fallen snowflakes. Increases Constitution by <%= con %>.",
-    "headSpecialSpikedHelmText": "Spiked Helm",
-    "headSpecialSpikedHelmNotes": "You'll be well protected from stray Dailies and bad Habits with this functional (and neat-looking!) helm. Increases Strength by <%= str %>.",
+    "headSpecialSpikedHelmText": "Stachelhelm",
+    "headSpecialSpikedHelmNotes": "Du wirst gut vor vereinzelten täglichen Aufgaben und schlechten Gewohnheiten mit diesem funktionalen (und gut aussehenden) Helm beschützt sein. Erhöht Stärke um <%= str %>",
     "headSpecialDandyHatText": "Dandy Hat",
     "headSpecialDandyHatNotes": "What a merry chapeau! You'll look quite fine enjoying a stroll in it. Increases Constitution by <%= con %>.",
-    "headSpecialKabutoText": "Kabuto",
-    "headSpecialKabutoNotes": "This helm is functional and beautiful! Your enemies will become distracted admiring it. Increases Intelligence by <%= int %>.",
+    "headSpecialKabutoText": "Kabuto-Helm",
+    "headSpecialKabutoNotes": "Dieser Helm ist funktional und schön zugleich! Deine Feinde werden abgelenkt sein, weil sie ihn bewundern werden. Erhöht Intelligenz um <%= int %>.",
     "headSpecialNyeText": "Ulkiger Partyhut",
     "headSpecialNyeNotes": "Du hast einen ulkigen Partyhut erhalten! Trage ihn mit Stolz bei Deinem Rutsch ins neue Jahr! Gewährt keinen Attributbonus.",
     "headSpecialYetiText": "Helm des Yeti-Zähmers",
@@ -906,6 +910,8 @@
     "headArmoireCrownOfHeartsNotes": "Diese rosenrote Krone ist nicht nur ein Blickfang! Sie wird auch Dein Herz für schwierige Aufgaben stärken. Erhöht Stärke um <%= str %>. Verzauberter Schrank: Herzkönigin Set (Gegenstand 1 von 3).",
     "headArmoireMushroomDruidCapText": "Pilzdruiden-Kappe",
     "headArmoireMushroomDruidCapNotes": "In den Tiefen eines nebligen Waldes geerntet, gewährt die Kappe dem Träger Wissen über Heilpflanzen. Erhöht Intelligenz um <%= int %> und Stärke um <%= str %>. Verzauberter Schrank: Pilzdruiden-Set (Gegenstand 1 von 3).",
+    "headArmoireMerchantChaperonText": "Merchant Chaperon",
+    "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
     "offhand": "Schildhand-Gegenstand",
     "offhandCapitalized": "Schildhand-Gegenstand",
     "shieldBase0Text": "Keine Schildhand-Ausrüstung",

website/common/locales/de/subscriber.json

@@ -125,7 +125,7 @@
     "mysterySet201701": "Zeitanhalterset",
     "mysterySet201702": "Herzensstehler-Set",
     "mysterySet201703": "Schimmer-Set",
-    "mysterySet201704": "Fairytale Set",
+    "mysterySet201704": "Feen-Set",
     "mysterySet301404": "Steampunk-Standard-Set",
     "mysterySet301405": "Steampunk-Zubehör-Set",
     "mysterySet301703": "Pfauen-Steampunk-Set",

website/common/locales/en/backgrounds.json

@@ -297,5 +297,13 @@
   "backgroundGiantBirdhouseText": "Giant Birdhouse",
   "backgroundGiantBirdhouseNotes": "Perch in a Giant Birdhouse.",
   "backgroundMistShroudedMountainText": "Mist-Shrouded Mountain",
-  "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain."
+  "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain.",
+
+  "backgrounds052017": "SET 36: Released May 2017",
+  "backgroundGuardianStatuesText": "Guardian Statues",
+  "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+  "backgroundHabitCityStreetsText": "Habit City Streets",
+  "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+  "backgroundOnATreeBranchText": "On a Tree Branch",
+  "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
 }

website/common/locales/en/gear.json

@@ -291,6 +291,8 @@
   "weaponArmoireForestFungusStaffNotes": "Use this gnarled staff to work mycological magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.",
   "weaponArmoireFestivalFirecrackerText": "Festival Firecracker",
   "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).",
+  "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
+  "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -627,6 +629,8 @@
   "armorArmoireMushroomDruidArmorNotes": "This woody brown armor, capped with tiny mushrooms, will help you hear the whispers of forest life. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Mushroom Druid Set (Item 2 of 3).",
   "armorArmoireGreenFestivalYukataText": "Green Festival Yukata",
   "armorArmoireGreenFestivalYukataNotes": "This fine lightweight yukata will keep you cool while you enjoy any festive occasion. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Festival Attire Set (Item 1 of 3).",
+  "armorArmoireMerchantTunicText": "Merchant Tunic",
+  "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
 
   "headgear": "headgear",
   "headgearCapitalized": "Headgear",
@@ -977,6 +981,8 @@
   "headArmoireCrownOfHeartsNotes": "This rosy red crown isn't just eye-catching! It will also strengthen your heart against tough tasks. Increases Strength by <%= str %>. Enchanted Armoire: Queen of Hearts Set (Item 1 of 3).",
   "headArmoireMushroomDruidCapText": "Mushroom Druid Cap",
   "headArmoireMushroomDruidCapNotes": "Harvested deep in a misty forest, this cap grants the wearer knowledge of medicinal plants. Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Mushroom Druid Set (Item 1 of 3).",
+  "headArmoireMerchantChaperonText": "Merchant Chaperon",
+  "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
 
   "offhand": "shield-hand item",
   "offhandCapitalized": "Shield-Hand Item",

website/common/locales/en@pirate/backgrounds.json

@@ -261,5 +261,12 @@
     "backgroundGiantBirdhouseText": "Giant Birdhouse",
     "backgroundGiantBirdhouseNotes": "Perch in a Giant Birdhouse.",
     "backgroundMistShroudedMountainText": "Mist-Shrouded Mountain",
-    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain."
+    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain.",
+    "backgrounds052017": "SET 36: Released May 2017",
+    "backgroundGuardianStatuesText": "Guardian Statues",
+    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+    "backgroundHabitCityStreetsText": "Habit City Streets",
+    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+    "backgroundOnATreeBranchText": "On a Tree Branch",
+    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
 }

website/common/locales/en@pirate/gear.json

@@ -268,6 +268,8 @@
     "weaponArmoireForestFungusStaffNotes": "Use this gnarled staff to work mycological magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.",
     "weaponArmoireFestivalFirecrackerText": "Festival Firecracker",
     "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).",
+    "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
+    "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
     "armor": "armor",
     "armorCapitalized": "Armor",
     "armorBase0Text": "Plain Slops",
@@ -580,6 +582,8 @@
     "armorArmoireMushroomDruidArmorNotes": "This woody brown armor, capped with tiny mushrooms, will help you hear the whispers of forest life. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Mushroom Druid Set (Item 2 of 3).",
     "armorArmoireGreenFestivalYukataText": "Green Festival Yukata",
     "armorArmoireGreenFestivalYukataNotes": "This fine lightweight yukata will keep you cool while you enjoy any festive occasion. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Festival Attire Set (Item 1 of 3).",
+    "armorArmoireMerchantTunicText": "Merchant Tunic",
+    "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
     "headgear": "headgear",
     "headgearCapitalized": "Headgear",
     "headBase0Text": "No Helm",
@@ -906,6 +910,8 @@
     "headArmoireCrownOfHeartsNotes": "This rosy red crown isn't just eye-catching! It will also strengthen your heart against tough tasks. Increases Strength by <%= str %>. Enchanted Armoire: Queen of Hearts Set (Item 1 of 3).",
     "headArmoireMushroomDruidCapText": "Mushroom Druid Cap",
     "headArmoireMushroomDruidCapNotes": "Harvested deep in a misty forest, this cap grants the wearer knowledge of medicinal plants. Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Mushroom Druid Set (Item 1 of 3).",
+    "headArmoireMerchantChaperonText": "Merchant Chaperon",
+    "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
     "offhand": "shield-hand item",
     "offhandCapitalized": "Shield-Hand Item",
     "shieldBase0Text": "No Shield-Hand Equipment",

website/common/locales/en_GB/backgrounds.json

@@ -261,5 +261,12 @@
     "backgroundGiantBirdhouseText": "Giant Birdhouse",
     "backgroundGiantBirdhouseNotes": "Perch in a Giant Birdhouse.",
     "backgroundMistShroudedMountainText": "Mist-Shrouded Mountain",
-    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain."
+    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain.",
+    "backgrounds052017": "SET 36: Released May 2017",
+    "backgroundGuardianStatuesText": "Guardian Statues",
+    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+    "backgroundHabitCityStreetsText": "Habit City Streets",
+    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+    "backgroundOnATreeBranchText": "On a Tree Branch",
+    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
 }

website/common/locales/en_GB/gear.json

@@ -268,6 +268,8 @@
     "weaponArmoireForestFungusStaffNotes": "Use this gnarled staff to work mycological magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.",
     "weaponArmoireFestivalFirecrackerText": "Festival Firecracker",
     "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).",
+    "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
+    "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
     "armor": "armour",
     "armorCapitalized": "Armour",
     "armorBase0Text": "Plain Clothing",
@@ -339,11 +341,11 @@
     "armorSpecialSnowSovereignRobesText": "Snow Sovereign Robes",
     "armorSpecialSnowSovereignRobesNotes": "These robes are elegant enough for court, yet warm enough for the coldest winter day. Increases Perception by <%= per %>.",
     "armorSpecialNomadsCuirassText": "Nomad's Cuirass",
-    "armorSpecialNomadsCuirassNotes": "This armor features a strong chest-plate to protect your heart! Increases Constitution by <%= con %>.",
+    "armorSpecialNomadsCuirassNotes": "This armour features a strong chest-plate to protect your heart! Increases Constitution by <%= con %>.",
     "armorSpecialDandySuitText": "Dandy Suit",
     "armorSpecialDandySuitNotes": "You're undeniably dressed for success! Increases Perception by <%= per %>.",
-    "armorSpecialSamuraiArmorText": "Samurai Armor",
-    "armorSpecialSamuraiArmorNotes": "This strong, scaled armor is held together by elegant silk cords. Increases Perception by <%= per %>.",
+    "armorSpecialSamuraiArmorText": "Samurai Armour",
+    "armorSpecialSamuraiArmorNotes": "This strong, scaled armour is held together by elegant silk cords. Increases Perception by <%= per %>.",
     "armorSpecialYetiText": "Yeti-Tamer Robe",
     "armorSpecialYetiNotes": "Fuzzy and fierce. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
     "armorSpecialSkiText": "Ski-sassin Parka",
@@ -518,8 +520,8 @@
     "armorMystery201612Notes": "Crack nuts in style in this spectacular holiday ensemble. Be careful not to pinch your fingers! Confers no benefit. December 2016 Subscriber Item.",
     "armorMystery201703Text": "Shimmer Armour",
     "armorMystery201703Notes": "Though its colours are reminiscent of spring petals, this armour is stronger than steel! Confers no benefit. March 2017 Subscriber Item.",
-    "armorMystery201704Text": "Fairytale Armor",
-    "armorMystery201704Notes": "Fairy folk crafted this armor from morning dew to capture the colors of the sunrise. Confers no benefit. April 2017 Subscriber Item.",
+    "armorMystery201704Text": "Fairytale Armour",
+    "armorMystery201704Notes": "Fairy folk crafted this armour from morning dew to capture the colours of the sunrise. Confers no benefit. April 2017 Subscriber Item.",
     "armorMystery301404Text": "Steampunk Suit",
     "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
     "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -580,6 +582,8 @@
     "armorArmoireMushroomDruidArmorNotes": "This woody brown armour, capped with tiny mushrooms, will help you hear the whispers of forest life. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Mushroom Druid Set (Item 2 of 3).",
     "armorArmoireGreenFestivalYukataText": "Green Festival Yukata",
     "armorArmoireGreenFestivalYukataNotes": "This fine lightweight yukata will keep you cool while you enjoy any festive occasion. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Festival Attire Set (Item 1 of 3).",
+    "armorArmoireMerchantTunicText": "Merchant Tunic",
+    "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
     "headgear": "headgear",
     "headgearCapitalized": "Headgear",
     "headBase0Text": "No Helm",
@@ -645,7 +649,7 @@
     "headSpecialPageHelmText": "Page Helm",
     "headSpecialPageHelmNotes": "Chainmail: for the stylish AND the practical. Increases Perception by <%= per %>.",
     "headSpecialRoguishRainbowMessengerHoodText": "Roguish Rainbow Messenger Hood",
-    "headSpecialRoguishRainbowMessengerHoodNotes": "This bright hood emits a colorful glow that will protect you from unpleasant weather! Increases Constitution by <%= con %>.",
+    "headSpecialRoguishRainbowMessengerHoodNotes": "This bright hood emits a colourful glow that will protect you from unpleasant weather! Increases Constitution by <%= con %>.",
     "headSpecialClandestineCowlText": "Clandestine Cowl",
     "headSpecialClandestineCowlNotes": "Take care to conceal your face as you rob your Tasks of gold and loot! Increases Perception by <%= per %>.",
     "headSpecialSnowSovereignCrownText": "Snow Sovereign Crown",
@@ -906,6 +910,8 @@
     "headArmoireCrownOfHeartsNotes": "This rosy red crown isn't just eye-catching! It will also strengthen your heart against tough tasks. Increases Strength by <%= str %>. Enchanted Armoire: Queen of Hearts Set (Item 1 of 3).",
     "headArmoireMushroomDruidCapText": "Mushroom Druid Cap",
     "headArmoireMushroomDruidCapNotes": "Harvested deep in a misty forest, this cap grants the wearer knowledge of medicinal plants. Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Mushroom Druid Set (Item 1 of 3).",
+    "headArmoireMerchantChaperonText": "Merchant Chaperon",
+    "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
     "offhand": "shield-hand item",
     "offhandCapitalized": "Shield-Hand Item",
     "shieldBase0Text": "No Shield-Hand Equipment",

website/common/locales/en_GB/questscontent.json

@@ -463,7 +463,7 @@
     "questMayhemMistiflying1RageEffect": "`Air Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls come whirling out of the clouds!",
     "questMayhemMistiflying1DropSkeletonPotion": "Skeleton Hatching Potion",
     "questMayhemMistiflying1DropWhitePotion": "White Hatching Potion",
-    "questMayhemMistiflying1DropArmor": "Roguish Rainbow Messenger Robes (Armor)",
+    "questMayhemMistiflying1DropArmor": "Roguish Rainbow Messenger Robes (Armour)",
     "questMayhemMistiflying2Text": "Mayhem in Mistiflying, Part 2: In Which the Wind Worsens",
     "questMayhemMistiflying2Notes": "Mistiflying dips and rocks as the magical bees keeping it afloat are buffeted by the gale. After a desperate search for the April Fool, you find him inside a cottage, blithely playing cards with an angry, trussed-up skull.<br><br>@Katy133 raises their voice over the whistling wind. “What’s causing this? We defeated the skulls, but it’s getting worse!”<br><br>“That is a pickle,” the April Fool agrees. “Please be a dear and don’t mention it to Lady Glaciate. She’s always threatening to call off our courtship on the grounds that I am ‘catastrophically irresponsible,’ and I fear that she might misread this situation.” He shuffles the deck. “Perhaps you might follow the Mistiflies? They’re immaterial, so the wind can’t blow them away, and they tend to swarm around threats.” He nods out the window, where several of the city’s patron creatures are fluttering towards the east. “Now let me concentrate — my opponent has quite the poker face.”",
     "questMayhemMistiflying2Completion": "You follow the Mistiflies to the site of a tornado, too stormy for you to enter.<br><br>“This should help,” says a voice directly in your ear, and you nearly fall off of your mount. The April Fool is somehow sitting directly behind you in the saddle. “I hear these messenger hoods emit an aura that guards against inclement weather — very useful to avoid losing missives as you fly around. Perhaps give it a try?”",

website/common/locales/es/backgrounds.json

@@ -261,5 +261,12 @@
     "backgroundGiantBirdhouseText": "Giant Birdhouse",
     "backgroundGiantBirdhouseNotes": "Perch in a Giant Birdhouse.",
     "backgroundMistShroudedMountainText": "Mist-Shrouded Mountain",
-    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain."
+    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain.",
+    "backgrounds052017": "SET 36: Released May 2017",
+    "backgroundGuardianStatuesText": "Guardian Statues",
+    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+    "backgroundHabitCityStreetsText": "Habit City Streets",
+    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+    "backgroundOnATreeBranchText": "On a Tree Branch",
+    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
 }

website/common/locales/es/gear.json

@@ -268,6 +268,8 @@
     "weaponArmoireForestFungusStaffNotes": "¡Usa este bastón retorcido para hacer mágica mycológica! Aumenta Inteligencia por <%= int %> y Percepción por <%= per %>. Armario Encantado: Artículo Independiente.",
     "weaponArmoireFestivalFirecrackerText": "Festival Firecracker",
     "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).",
+    "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
+    "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
     "armor": "armadura",
     "armorCapitalized": "Armadura",
     "armorBase0Text": "Ropa normal",
@@ -580,6 +582,8 @@
     "armorArmoireMushroomDruidArmorNotes": "Esta leñosa armadura marrón, cubierta con pequeños champiñones, te ayudará a oír los susurros de la vida del bosque. Aumenta Constitución por <%= con %> y Percepción por <%= per %>. Armario Encantado: Juego de Druida de Champiñón (Artículo 2 de 3).",
     "armorArmoireGreenFestivalYukataText": "Green Festival Yukata",
     "armorArmoireGreenFestivalYukataNotes": "This fine lightweight yukata will keep you cool while you enjoy any festive occasion. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Festival Attire Set (Item 1 of 3).",
+    "armorArmoireMerchantTunicText": "Merchant Tunic",
+    "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
     "headgear": "cubrecabeza",
     "headgearCapitalized": "Equipo de cabeza",
     "headBase0Text": "Sin casco",
@@ -906,6 +910,8 @@
     "headArmoireCrownOfHeartsNotes": "¡Esta corona rosada no sólo es llamativa! . También fortalecerá tu corazón contra las tareas más duras. Aumenta la Fuerza en <%= str %>. Armario Encantado: Conjunto de Reina de Corazones (Artículo 1 de 3)",
     "headArmoireMushroomDruidCapText": "Caperuza de Druida de Champiñón",
     "headArmoireMushroomDruidCapNotes": "Cosechada en las profundidades de un bosque neblinoso, esta caperuza concede al que la lleve el conocimiento de plantas medicinales. Aumenta Inteligencia por <%= int %>  y Fuerza por  <%= str %>. Armario Encantado: Juego de Druida de Champiñón (Artículo 1 de 3).",
+    "headArmoireMerchantChaperonText": "Merchant Chaperon",
+    "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
     "offhand": "objeto para la mano del escudo",
     "offhandCapitalized": "Objeto para la mano del escudo",
     "shieldBase0Text": "Sin equipamiento en la mano del escudo",