merge into develop

common/dist/sprites/spritesmith2.css

@@ -3012,157 +3012,157 @@
 }
 .shop_armor_armoire_gladiatorArmor {
   background-image: url(spritesmith2.png);
-  background-position: 0px -1729px;
+  background-position: -123px -1729px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_armoire_goldenToga {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1681px;
+  background-position: -82px -1729px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_armoire_hornedIronArmor {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1558px;
+  background-position: -41px -1729px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_armoire_lunarArmor {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1517px;
+  background-position: -1729px -1640px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_armoire_plagueDoctorOvercoat {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1476px;
+  background-position: -1729px -1599px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_armoire_rancherRobes {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1312px;
+  background-position: -1729px -1558px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_armoire_plagueDoctorMask {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1271px;
+  background-position: -1729px -1394px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_blueHairbow {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1230px;
+  background-position: -1729px -1353px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_gladiatorHelm {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1189px;
+  background-position: -1729px -1312px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_goldenLaurels {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1066px;
+  background-position: -1729px -1271px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_hornedIronHelm {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1025px;
+  background-position: -1729px -1148px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_lunarCrown {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -984px;
+  background-position: -1729px -1107px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_plagueDoctorHat {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -943px;
+  background-position: -1729px -1066px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_rancherHat {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -902px;
+  background-position: -1729px -1025px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_redFloppyHat {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -861px;
+  background-position: -1729px -984px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_redHairbow {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -820px;
+  background-position: -1729px -943px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_royalCrown {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -779px;
+  background-position: -1729px -902px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_violetFloppyHat {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -738px;
+  background-position: -1729px -861px;
   width: 40px;
   height: 40px;
 }
 .shop_head_armoire_yellowHairbow {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -697px;
+  background-position: -1729px -820px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_armoire_gladiatorShield {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -41px;
+  background-position: -1729px -779px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_armoire_basicCrossbow {
   background-image: url(spritesmith2.png);
-  background-position: -1744px 0px;
+  background-position: -1729px -123px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_armoire_goldWingStaff {
   background-image: url(spritesmith2.png);
-  background-position: -1696px -1679px;
+  background-position: -1729px -82px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_armoire_ironCrook {
   background-image: url(spritesmith2.png);
-  background-position: -1655px -1679px;
+  background-position: -1729px -41px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_armoire_lunarSceptre {
   background-image: url(spritesmith2.png);
-  background-position: -1614px -1679px;
+  background-position: -1729px 0px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_armoire_mythmakerSword {
   background-image: url(spritesmith2.png);
-  background-position: -1573px -1679px;
+  background-position: -1670px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_armoire_rancherLasso {
   background-image: url(spritesmith2.png);
-  background-position: -1532px -1679px;
+  background-position: -1629px -1679px;
   width: 40px;
   height: 40px;
 }
@@ -3372,205 +3372,205 @@
 }
 .shop_armor_healer_1 {
   background-image: url(spritesmith2.png);
-  background-position: -1491px -1679px;
+  background-position: -1588px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_healer_2 {
   background-image: url(spritesmith2.png);
-  background-position: -1450px -1679px;
+  background-position: -1547px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_healer_3 {
   background-image: url(spritesmith2.png);
-  background-position: -1409px -1679px;
+  background-position: -1506px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_healer_4 {
   background-image: url(spritesmith2.png);
-  background-position: -1368px -1679px;
+  background-position: -1465px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_healer_5 {
   background-image: url(spritesmith2.png);
-  background-position: -1327px -1679px;
+  background-position: -1424px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_rogue_1 {
   background-image: url(spritesmith2.png);
-  background-position: -1286px -1679px;
+  background-position: -1383px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_rogue_2 {
   background-image: url(spritesmith2.png);
-  background-position: -1163px -1679px;
+  background-position: -1342px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_rogue_3 {
   background-image: url(spritesmith2.png);
-  background-position: -1122px -1679px;
+  background-position: -1219px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_rogue_4 {
   background-image: url(spritesmith2.png);
-  background-position: -1696px -1638px;
+  background-position: -1178px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_rogue_5 {
   background-image: url(spritesmith2.png);
-  background-position: -1655px -1638px;
+  background-position: -1137px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_0 {
   background-image: url(spritesmith2.png);
-  background-position: -1614px -1638px;
+  background-position: -1670px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_1 {
   background-image: url(spritesmith2.png);
-  background-position: -1573px -1638px;
+  background-position: -1629px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_2 {
   background-image: url(spritesmith2.png);
-  background-position: -1532px -1638px;
+  background-position: -1588px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_finnedOceanicArmor {
   background-image: url(spritesmith2.png);
-  background-position: -1491px -1638px;
+  background-position: -1547px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_warrior_1 {
   background-image: url(spritesmith2.png);
-  background-position: -1450px -1638px;
+  background-position: -1506px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_warrior_2 {
   background-image: url(spritesmith2.png);
-  background-position: -1409px -1638px;
+  background-position: -1465px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_warrior_3 {
   background-image: url(spritesmith2.png);
-  background-position: -1368px -1638px;
+  background-position: -1424px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_warrior_4 {
   background-image: url(spritesmith2.png);
-  background-position: -1327px -1638px;
+  background-position: -1383px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_warrior_5 {
   background-image: url(spritesmith2.png);
-  background-position: -1286px -1638px;
+  background-position: -1342px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_wizard_1 {
   background-image: url(spritesmith2.png);
-  background-position: -1245px -1638px;
+  background-position: -1301px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_wizard_2 {
   background-image: url(spritesmith2.png);
-  background-position: -1204px -1638px;
+  background-position: -1260px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_wizard_3 {
   background-image: url(spritesmith2.png);
-  background-position: -1163px -1638px;
+  background-position: -1219px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_wizard_4 {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -246px;
+  background-position: -1729px -369px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_wizard_5 {
   background-image: url(spritesmith2.png);
-  background-position: -1122px -1638px;
+  background-position: -1178px -1638px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_healer_1 {
   background-image: url(spritesmith2.png);
-  background-position: -485px -1638px;
+  background-position: -500px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_healer_2 {
   background-image: url(spritesmith2.png);
-  background-position: -576px -1638px;
+  background-position: -591px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_healer_3 {
   background-image: url(spritesmith2.png);
-  background-position: -667px -1638px;
+  background-position: -682px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_healer_4 {
   background-image: url(spritesmith2.png);
-  background-position: -758px -1638px;
+  background-position: -773px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_healer_5 {
   background-image: url(spritesmith2.png);
-  background-position: -849px -1638px;
+  background-position: -864px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_rogue_1 {
   background-image: url(spritesmith2.png);
-  background-position: -940px -1638px;
+  background-position: -955px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_rogue_2 {
   background-image: url(spritesmith2.png);
-  background-position: -394px -1638px;
+  background-position: -1046px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_rogue_3 {
   background-image: url(spritesmith2.png);
-  background-position: -303px -1638px;
+  background-position: -409px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_rogue_4 {
   background-image: url(spritesmith2.png);
-  background-position: -212px -1638px;
+  background-position: -318px -1638px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_rogue_5 {
   background-image: url(spritesmith2.png);
-  background-position: -121px -1638px;
+  background-position: -227px -1638px;
   width: 90px;
   height: 90px;
 }
@@ -3660,13 +3660,13 @@
 }
 .shop_armor_special_birthday {
   background-image: url(spritesmith2.png);
-  background-position: -1204px -1679px;
+  background-position: -1260px -1679px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_birthday2015 {
   background-image: url(spritesmith2.png);
-  background-position: -1245px -1679px;
+  background-position: -1301px -1679px;
   width: 40px;
   height: 40px;
 }
@@ -3690,313 +3690,319 @@
 }
 .broad_armor_special_fallMage {
   background-image: url(spritesmith2.png);
-  background-position: 0px -1638px;
+  background-position: -106px -1638px;
   width: 120px;
   height: 90px;
 }
 .broad_armor_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -1638px 0px;
+  background-position: 0px -1638px;
   width: 105px;
   height: 90px;
 }
 .broad_armor_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: -1547px -1547px;
+  background-position: -1638px 0px;
   width: 90px;
   height: 90px;
 }
 .head_special_fallHealer {
   background-image: url(spritesmith2.png);
-  background-position: -1424px -1456px;
+  background-position: -1547px -1547px;
   width: 90px;
   height: 90px;
 }
 .head_special_fallMage {
   background-image: url(spritesmith2.png);
-  background-position: -1303px -1456px;
+  background-position: -1394px -1456px;
   width: 120px;
   height: 90px;
 }
 .head_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -1197px -1456px;
+  background-position: -1288px -1456px;
   width: 105px;
   height: 90px;
 }
 .head_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: -1106px -1456px;
+  background-position: -1197px -1456px;
   width: 90px;
   height: 90px;
 }
 .shield_special_fallHealer {
   background-image: url(spritesmith2.png);
-  background-position: -1015px -1456px;
+  background-position: -1106px -1456px;
   width: 90px;
   height: 90px;
 }
 .shield_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -909px -1456px;
+  background-position: -1000px -1456px;
   width: 105px;
   height: 90px;
 }
 .shield_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: -818px -1456px;
+  background-position: -909px -1456px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_special_fallHealer {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -82px;
+  background-position: -1729px -164px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fallMage {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -123px;
+  background-position: -1729px -205px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -164px;
+  background-position: -1729px -246px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -205px;
+  background-position: -1729px -287px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fallHealer {
   background-image: url(spritesmith2.png);
-  background-position: -41px -1729px;
+  background-position: -1729px -328px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fallMage {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -287px;
+  background-position: -1137px -1638px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -328px;
+  background-position: -1729px -410px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -369px;
+  background-position: -1729px -451px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fallHealer {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -410px;
+  background-position: -1729px -492px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -451px;
+  background-position: -1729px -533px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -492px;
+  background-position: -1729px -574px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fallHealer {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -533px;
+  background-position: -1729px -615px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fallMage {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -574px;
+  background-position: -1729px -656px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -615px;
+  background-position: -1729px -697px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -656px;
+  background-position: -1729px -738px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_special_fallHealer {
   background-image: url(spritesmith2.png);
-  background-position: -727px -1456px;
+  background-position: -818px -1456px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_fallMage {
   background-image: url(spritesmith2.png);
-  background-position: -606px -1456px;
+  background-position: -697px -1456px;
   width: 120px;
   height: 90px;
 }
 .slim_armor_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -500px -1456px;
+  background-position: -591px -1456px;
   width: 105px;
   height: 90px;
 }
 .slim_armor_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: -409px -1456px;
+  background-position: -500px -1456px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_fallHealer {
   background-image: url(spritesmith2.png);
-  background-position: -318px -1456px;
+  background-position: -409px -1456px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_fallMage {
   background-image: url(spritesmith2.png);
-  background-position: -197px -1456px;
+  background-position: -288px -1456px;
   width: 120px;
   height: 90px;
 }
 .weapon_special_fallRogue {
   background-image: url(spritesmith2.png);
-  background-position: -91px -1456px;
+  background-position: -182px -1456px;
   width: 105px;
   height: 90px;
 }
 .weapon_special_fallWarrior {
   background-image: url(spritesmith2.png);
-  background-position: 0px -1456px;
+  background-position: -91px -1456px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_gaymerx {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -1365px;
+  background-position: 0px -1456px;
   width: 90px;
   height: 90px;
 }
 .head_special_gaymerx {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -1274px;
+  background-position: -1456px -1365px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_special_gaymerx {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1107px;
+  background-position: -1729px -1189px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_gaymerx {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1148px;
+  background-position: -1729px -1230px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_special_gaymerx {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -1183px;
+  background-position: -1456px -1274px;
   width: 90px;
   height: 90px;
 }
 .back_mystery_201402 {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -1092px;
+  background-position: -1456px -1183px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201402 {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -1001px;
+  background-position: -1456px -1092px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201402 {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -910px;
+  background-position: -1456px -1001px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201402 {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1353px;
+  background-position: -1729px -1435px;
   width: 40px;
   height: 40px;
 }
 .shop_back_mystery_201402 {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1394px;
+  background-position: -1729px -1476px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201402 {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1435px;
+  background-position: -1729px -1517px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201402 {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -819px;
+  background-position: -1456px -910px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201403 {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -728px;
+  background-position: -1456px -819px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_mystery_201403 {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -637px;
+  background-position: -1456px -728px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201403 {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1599px;
+  background-position: -1729px -1681px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_mystery_201403 {
   background-image: url(spritesmith2.png);
-  background-position: -1744px -1640px;
+  background-position: 0px -1729px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201403 {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -546px;
+  background-position: -1456px -637px;
   width: 90px;
   height: 90px;
 }
 .back_mystery_201404 {
   background-image: url(spritesmith2.png);
-  background-position: -1456px -455px;
+  background-position: -1456px -546px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_mystery_201404 {
   background-image: url(spritesmith2.png);
-  background-position: -1031px -1638px;
+  background-position: -1456px -455px;
   width: 90px;
   height: 90px;
 }
+.shop_back_mystery_201404 {
+  background-image: url(spritesmith2.png);
+  background-position: -164px -1729px;
+  width: 40px;
+  height: 40px;
+}

common/locales/cs/groups.json

@@ -14,7 +14,7 @@
     "resources": "Zdroje",
     "tavernTalk": "Rozhovory v krčmě",
     "tavernAlert1": "Poznámka: Pokud chceš nahlásit chybu, nedělej to tady, vývojáři to neuvidí. Prosím",
-    "tavernAlert2": "použij raději Github",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Moderátoři krčmy a cechu jsou:",
     "communityGuidelines": "zásady komunity",
     "communityGuidelinesRead1": "Prosíme, přečti si naše",
@@ -24,11 +24,17 @@
     "updatedParty": "Nastavení družiny aktualizováno.",
     "noPartyText": "Nejsi členem družiny nebo načítání tvé družiny trvá déle než obvykle. Můžeš družinu založit a pozvat do ní přátele, nebo se stát členem už existující družiny, v tom případě je nech zadat následující Uživatelské ID a poté se sem vrať přijmout pozvánku:",
     "LFG": "K prezentování tvé družiny, nebo abys našel novou, ke které se přidáš, navštiv cech <%= linkStart %>Hledaná družina (Hledáme skupinu)<%= linkEnd %>.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Vytvořit",
     "userId": "Uživatelské ID",
     "invite": "Pozvat",
     "leave": "Odejít",
     "invitedTo": "Pozván do <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nová zpráva v  \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Poslat zprávu",
@@ -44,8 +50,8 @@
     "groupDescr": "Popisek zobrazovaný ve veřejném seznamu cechů (formátování povoleno)",
     "logoUrl": "Adresa loga",
     "assignLeader": "Zvolit vůdce družiny",
-    "members": "Člen(ové)",
+    "members": "Members",
-    "partyList": "Pořadí členů družiny ve hlavičce (obnov prohlížeč po změně)",
+    "partyList": "Order for party members in header",
     "banTip": "Vykopnout člena",
     "moreMembers": "více členů",
     "invited": "Pozván",
@@ -70,7 +76,7 @@
     "sortJoined": "Seřadit podle data připojení ke družině",
     "sortName": "Seřadit podle jména avatara",
     "sortBackgrounds": "Seřadit podle pozadí",
-    "sortHabitrpgJoined": "Seřaď podle data, kdy se přidal k Habitice",
+    "sortHabitrpgJoined": "Seřaď podle data, kdy se vydal na cestu zemí Habitica",
     "sortHabitrpgLastLoggedIn": "Seřaď podle toho, kdy se naposledy přihlásil",
     "ascendingSort": "Seřaď vzestupně",
     "descendingSort": "Seřaď sestupně",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Pouze velitel družiny může vytvářet Výzvy",
     "sendGift": "Poslat dárek",
     "inviteFriends": "Pozvat přátele",
-    "inviteAlertInfo": "Pozvi přátele pomocí <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>Uživatelského ID</a>.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Pozvat existujícího uživatele",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Pozvi přátele pomocí emailu. Pokud se přidají z tvého emailu, budou automaticky pozváni do této skupiny.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Od:",
-    "inviteNewUsers": "Pozvat nové uživatele",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Nebo sdílej tento link (kopírovat/vložit):",
     "sendGiftHeading": "Poslat dárek <%= name %>",
     "sendGiftGemsBalance": "Z <%= number %> Drahokamů",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Osobní zpráva (volitelné)",
     "sendGiftSubscription": "<%= months %> měsíc(e/ů): $<%= price %>",
     "battleWithFriends": "Bojuj s přáteli proti příšerám",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Založ družinu",
     "addToParty": "Přidej někoho do své družiny",
-    "likePost": "Klikni sem, pokud se ti tenhle příspěvek líbí!"
+    "likePost": "Klikni sem, pokud se ti tenhle příspěvek líbí!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/cs/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Získal jsi",
     "dropQuestCongrats": "Blahopřejeme ti k tomuto svitku s Výpravou! Můžeš pozvat svou družinu a začít s ní hned, nebo se k ní můžeš kdykoliv vrátit v Inventář > Výpravy.",
     "questSend": "Kliknutí na \"Pozvat\" odešle pozvánku členům Družiny. Poté, co všichni členové přijali nebo odmítli, může výprava začít. Stav si můžeš zobrazit v Možnosti > Komunita > Družina.",
-    "inviteParty": "Pozvat družinu",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Pozvánka na výpravu:",
     "questInvitationTitle": "Pozvánka na Výpravu",
     "questInvitationInfo": "Pozvánka na Výpravu <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Síla bosse",
     "collect": "Sbírat",
     "collected": "Získáno",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Každý splnění Denní úkol, úkol z Úkolníčku a každý pozitivní zvyk zraní Bosse. Zraň ho víc červenějšími úkoly nebo Brutální ranou nebo Vzplanutím ohňů. Boss zraní každého účastníka výpravy za každý nesplněný Denní úkol (újma je násobena jeho Silou) navíc k normálnímu zranění, takže udržuj skupinu zdravou plněním úkolů. <strong>Veškerá zranění bossovi i vám se přičítají na kronu (na konci dne).</strong>",
     "bossDmg2": "Jen ti, kteří přijmou pozvání, budou bojovat proti bossovi a rozdělí si odměnu za výpravu.",
     "tavernBossInfo": "Abys zranil světového bosse, musíš splnit všechny své Denní úkoly a úkoly v Úkolníčku. Čím více bodů za úkoly získáš, tím větší zranění bossovi způsobíš (splnění červených úkolů, Mágova kouzla, útoky Válečníka, atd.) Za každý Denní úkol, který nesplníš (znásobený bossovou Sílou), se zvýší bossova Zuřivost. Jakmile jeho Zuřivost dosáhne maxima, stane se něco špatného - takže plň své Denní úkoly! <strong>Všechna újma způsobená bossovi nebo tobě se přičítá na kronu (na konci dne).</strong>",
     "bossColl1": "Pro získání předmětů plň své pozitivní úkoly. Předměty z výpravy budeš nacházet stejně jako normální předměty, uvidíš je však až další den, kdy se vše, co jste našli, shromáždí a přidá na hromadu.",
     "bossColl2": "Jen ti, kteří přijmou pozvání, mohou sbírat předměty a rozdělit si odměnu za výpravu.",
     "abort": "Ukončit",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Majitel výpravy",
     "questOwnerNotInPendingQuest": "Majitel výpravy výpravu opustil a nemůže ji již začít. Doporučujeme ji zrušit. Majitel výpravy získá zpět svitek.",
     "questOwnerNotInRunningQuest": "Majitel výpravy výpravu opustil. Můžete výpravu ukončit, pokud chcete. Můžete však pokračovat dále a všichni zbývající účastnici si po jejím skončení rozdělí kořist.",
@@ -43,7 +47,7 @@
     "questParticipants": "Účastníci",
     "scrolls": "Svitky s Výpravou",
     "noScrolls": "Nemáš žádné svitky s Výpravou.",
-    "scrollsText1": "Pro účast na výpravě musíš být členem družiny. Pokud chceš na výpravu na vlastní pěst, ",
+    "scrollsText1": "Pro účast na výpravě musíš být členem družiny. Pokud chceš na výpravu na vlastní pěst,",
     "scrollsText2": "vytvoř si prázdnou družinu",
     "scrollsPre": "Tuto Výpravu jsi ještě neodemkl!",
     "alreadyEarnedQuestLevel": "Tuto Výpravu jsi si již vysloužil dosažením Úrovně <%= level %>.",
@@ -51,7 +55,7 @@
     "completedQuests": "Dokončil následující výpravy",
     "mustComplete": "Nejdříve musíš dokončit <%= quest %>.",
     "mustLevel": "Musíš být na Úrovni <%= level %>, abys mohl začít tuto Výpravu.",
-    "mustLvlQuest": "Aby sis mohl koupit tuto výpravu, musíš být na úrovni <%= level %> ! ",
+    "mustLvlQuest": "Aby sis mohl koupit tuto výpravu, musíš být na úrovni <%= level %> !",
     "mustInviteFriend": "Aby sis zasloužil tuto Výpravu, musíš pozvat někoho do své Družiny. Pozveš někoho hned?",
     "unlockByQuesting": "Aby sis vysloužil tuto Výpravu, musíš nejdřív splnit Výpravu <%= title %>.",
     "sureCancel": "Jsi si jistý, že chceš skončit výpravu? Všechny pozvánky budou ztraceny. Svitek bude navrácen svému majiteli.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Jsi si určitě jistý? Ujisti se, že tě pak ostatní nebudou do smrti nenávidět!",
     "questWarning": "Pokud se před začátkem výpravy do družiny připojí noví hráči, dostanou také pozvánku. Jakmile však výprava začne, žádní noví členové družiny se nemohou k výpravě připojit.",
     "bossRageTitle": "Zuřivost",
-    "bossRageDescription": "Když se tato lišta naplní, boss předvede speciální útok!"
+    "bossRageDescription": "Když se tato lišta naplní, boss předvede speciální útok!",
-}
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
+}

common/locales/cs/settings.json

@@ -2,7 +2,7 @@
     "settings": "Nastavení",
     "language": "Jazyk",
     "americanEnglishGovern": "V případě rozdílu v anglických překladech používáme verzi americké angličtiny.",
-    "helpWithTranslation": "Chceš nám pomoci Habitiku přeložit? Super! Tak se koukni na <a href=\"https://trello.com/c/SvTsLdRF/12-translations\" target=\"_blank\">tuhle</a> Trello kartu.",
+    "helpWithTranslation": "Chceš nám pomoci program Habitica přeložit? Super! Tak se koukni na <a href=\"https://trello.com/c/SvTsLdRF/12-translations\" target=\"_blank\">tuhle</a> Trello kartu.",
     "showHeaderPop": "Zobrazuje tvou postavu, tabulky zdraví/zkušeností a družinu.",
     "stickyHeader": "Pevný horní info panel",
     "stickyHeaderPop": "Zafixuje horní panel nahoře na obrazovce. Pokud je nezaškrtnuto, panel se posouvá se stránkou.",
@@ -15,19 +15,18 @@
     "startAdvCollapsed": "Pokročilé možnosti se v úkolu zobrazí zabalené.",
     "startAdvCollapsedPop": "Pokud je tato volba nastavena, pokročilé možnosti budou skryté, když poprvé otevřeš úkol pro úpravu.",
     "showTour": "Zobrazit průvodce",
-    "restartTour": "Restartovat instruktážního průvodce od bodu, kdy jsi se do Habitiky zapojil.",
+    "restartTour": "Restartovat instruktážního průvodce od bodu, kdy jsi se do země Habitica vydal.",
     "showBailey": "Zobraz Baileyho",
     "showBaileyPop": "Vytáhni Baileyho, městského vyvolávače, z úkrytu, aby sis mohl přečíst starší novinky.",
     "fixVal": "Opravit hodnoty postavy",
     "fixValPop": "Ručně upravit hodnoty jako zdraví, úroveň a zlaťáky.",
     "enableClass": "Povolit systém povolání",
     "enableClassPop": "Dříve jsi se odhlásil ze sytému povolání. Chceš se nyní zapojit?",
-    "showClass": "Zobrazit průvodce pro povolání",
     "classTourPop": "Zobrazí průvodce pro použití systému povolání.",
     "resetAccount": "Resetovat účet",
     "resetAccPop": "Začít znova. Odstraň všechny úrovně, zlaťáky, vybavení, historii a úkoly.",
     "deleteAccount": "Smazat účet",
-    "deleteAccPop": "Zruš svůj účet a odstraň ho z Habitiky..",
+    "deleteAccPop": "Zruš svůj účet a odstraň ho ze země Habitica..",
     "qrCode": "QR kód",
     "dataExport": "Export dat",
     "saveData": "Zde je několik možností pro uložení tvých dat.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Vlastní začátek dne",
-    "24HrClock": "24hod mód",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitika implicitně kontroluje a resetuje tvé denní úkoly vždy o půlnoci tvé časové zóny. Měl by sis přečíst následující informace, než to změníš:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Dokonči všechny své denní úkoly před změnou vlastního začátku dne</strong> nebo ten den <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Odpočívej v hostinci</a>. Změna vlastního začátku dne může způsobit okamžité spuštění <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>kronu</a>, ale po prvním dnu bude vše fungovat tak, jak má.<br><br><strong>Změna může trvat až dvě hodiny.</strong> Například pokud je nyní nastaven na 0 (půlnoc), změň ho před 10. hodinou večerní; pokud ho chceš nastavit na 9. hodinu, změň ho před 7. hodinou.<br><br>Zadej hodinu od 0 do 23 (používá se 24-hodinový formát). Psaní je efektivnější než použití šipek. Jakmile máš nastaveno, obnov stránku pro kontrolu, že se již objevuje nová hodnota.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Ostatní",
     "showHeader": "Zobrazit horní info panel",
     "changePass": "Změnit heslo",
@@ -85,7 +85,7 @@
     "usernameOrEmail": "Přihlašovací jméno nebo email",
     "email": "Email",
     "registeredWithFb": "Registrovaný přes Facebook",
-    "loginNameDescription1": "Tohle použiješ k přihlášení do Habitiky. Jdi na",
+    "loginNameDescription1": "Tohle použiješ k přihlášení do země Habitica. Jdi na",
     "loginNameDescription2": "Uživatel -> Profil",
     "loginNameDescription3": "aby sis změnil jméno, které se objevuje u tvého avataru a zpráv v chatu.",
     "emailNotifications": "Emailová upozornění",
@@ -101,12 +101,12 @@
     "questStarted": "Tvá výprava započla",
     "invitedQuest": "Pozván na Výpravu",
     "kickedGroup": "Vykopnut z družiny",
-    "remindersToLogin": "Upomínky k přihlášení do Habitiky",
+    "remindersToLogin": "Upomínky k přihlášení do země Habitica",
     "unsubscribedSuccessfully": "Úspěšně odepsán",
-    "unsubscribedTextUsers": "Úspěšně ses odepsal ze všech emailu z Habitiky. Můžeš povolit pouze ty emaily, které chceš dostávat v <a href=\"/#/options/settings/notifications\">nastavení</a> (musíš být přihlášen).",
+    "unsubscribedTextUsers": "Úspěšně ses odepsal ze všech emailu ze země Habitica. Můžeš povolit pouze ty emaily, které chceš dostávat v <a href=\"/#/options/settings/notifications\">Nastavení</a> (musíš být přihlášen).",
-    "unsubscribedTextOthers": "Již nedostanež od Habitiky žádný další email.",
+    "unsubscribedTextOthers": "Již nedostaneš ze země Habitica žádný další email.",
     "unsubscribeAllEmails": "Zaškrtni, aby ses odhlásil z emailů",
-    "unsubscribeAllEmailsText": "Zaškrtnutím toho políčka potvrzuji, že rozumím tomu, že kvůli odhlášení se z emailů mě nebude Habitika moci nikdy kontaktovat emailem o důležitých změnách na stránce nebo v mém účtu.",
+    "unsubscribeAllEmailsText": "Zaškrtnutím toho políčka potvrzuji, že rozumím tomu, že kvůli odhlášení se z emailů mě nebude moci nikdy nikdo kontaktovat emailem o důležitých změnách na stránce nebo v mém účtu ze země Habitica.",
     "correctlyUnsubscribedEmailType": "Úspěšně ses odhlásil z \"<%= emailType %>\" emailů.",
     "subscriptionRateText": "Opakovaně $<%= price %> každé <%= months %> měsíce",
     "benefits": "Benefity",

common/locales/da/groups.json

@@ -14,7 +14,7 @@
     "resources": "Ressourcer",
     "tavernTalk": "Værtshuschat",
     "tavernAlert1": "Obs: hvis du rapporterer en fejl vil udviklerne ikke se det. Brug venligst",
-    "tavernAlert2": "Github i stedet",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Værtshus- og Klanmoderatorer er:",
     "communityGuidelines": "Retningslinjer for Fællesskabet",
     "communityGuidelinesRead1": "Læs venligst vores",
@@ -24,11 +24,17 @@
     "updatedParty": "Gruppeindstillinger opdateret.",
     "noPartyText": "Du er enten ikke i en gruppe eller din gruppe tager lang tid at loade. Du kan enten oprette en og invitere venner, eller hvis du vil slutte dig til en eksisterende gruppe få dem til at indtaste dit unikke Bruger ID herunder, og komme tilbage senere for at se invitationen:",
     "LFG": "For at gøre reklame for din nye gruppe eller finde en, du kan joine, gå til <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Klanen.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Opret",
     "userId": "Bruger ID",
     "invite": "Invitér",
     "leave": "Forlad",
     "invitedTo": "Inviteret til <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Ny besked i \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Send Besked",
@@ -44,8 +50,8 @@
     "groupDescr": "Beskrivelse, der bliver vist offentligt i Klanlisten (Markdown er tilladt)",
     "logoUrl": "Logo-URL",
     "assignLeader": "Udpeg Gruppeleder",
-    "members": "Medlem(mer)",
+    "members": "Members",
-    "partyList": "Rækkefølgen af medlemmer i sidehovedet (opdatér siden efter at have ændret rækkefølgen)",
+    "partyList": "Order for party members in header",
     "banTip": "Fjern Medlem",
     "moreMembers": "flere medlemmer",
     "invited": "Inviteret",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Kun gruppelederen kan oprette Udfordringer",
     "sendGift": "Send Gave",
     "inviteFriends": "Invitér Venner",
-    "inviteAlertInfo": "Invitér venner med <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>Bruger ID</a> her.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invitér Eksisterende Bruger",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invitér venner gennem e-mail. Hvis de opretter sig via din e-mail, bliver de automatisk inviteret til denne gruppe.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Af:",
-    "inviteNewUsers": "Invitér Ny(e) Bruger(e)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Eller del dette link (kopier/indsæt):",
     "sendGiftHeading": "Send Gave til <%= name %>",
     "sendGiftGemsBalance": "Fra <%= number %> Ædelsten",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personlig besked (valgfri)",
     "sendGiftSubscription": "<%= months %> Måned(er): $<%= price %>",
     "battleWithFriends": "Bekæmp Monstre med dine Venner",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Start en Gruppe",
     "addToParty": "Tilføj nogen til din gruppe",
-    "likePost": "Klik hvis du synes on denne besked!"
+    "likePost": "Klik hvis du synes on denne besked!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/da/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Du har modtaget",
     "dropQuestCongrats": "Tillykke med denne quest-skriftrulle! Du kan invitere venner for at starte questen nu, eller vende tilbage til den når som helst i Inventar > Quests.",
     "questSend": "Ved at klikke \"Invitér\" sender du en invitation til alle gruppemedlemmer. Når alle medlemmer har accepteret eller afvist vil questen begynde. Se status under Social > Gruppe.",
-    "inviteParty": "Invitér Gruppe",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Quest-invitation:",
     "questInvitationTitle": "Quest-invitation",
     "questInvitationInfo": "Invitation til Questen <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Boss-styrke",
     "collect": "Saml",
     "collected": "Indsamlet",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "For at skade en boss skal du færdiggøre dine Daglige og Gøremål. Jo mere skade du gør på opgaver, des mere skade tager Bossen (færdiggørelse af røde opgaver, Magikeres fortryllelser, Krigeres angreb osv.). Bossen vil give skade til alle quest-deltagere for hver Daglig du springer over (ganget med bossens Styrke) oveni din sædvanlige skade, så hold din gruppe i live ved at færdiggøre dine Daglige! <strong>Al skade på og fra bossen bliver opgjort ved cron (når din dag skifter).</strong>",
     "bossDmg2": "Kun deltagere vil kæmpe mod bossen og få del i quest-byttet.",
     "tavernBossInfo": "For at skade en verdens-boss skal du færdiggøre dine Daglige og Gøremål. Jo mere skade du gør på opgaver, des mere skade tager Bossen (færdiggørelse af røde opgaver, Magikeres fortryllelser, Krigeres angreb osv.). Bossens Vrede stiger for hver Daglig du springer over (ganget med bossens Styrke). Når hans Vrede når maksimum vil der ske slemme ting - så færdiggør dine Daglige! <strong>Al skade på og fra bossen bliver opgjort ved cron (når din dag skifter).</strong>",
     "bossColl1": "Udfør dine positive opgaver for at samle ting. Quest-ting dropper som normale ting, men du vil ikke se drops før næste dag, hvor alt hvad du har fundet vil blive opgjort og lagt i bunken.",
     "bossColl2": "Kun deltagere kan samle ting og få del i quest-byttet.",
     "abort": "Afbryd",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Quest-leder",
     "questOwnerNotInPendingQuest": "Quest-lederen har forladt questen og kan ikke længere starte den. Det anbefales at du afbryder den nu. Quest-lederen beholder quest-skriftrullen.",
     "questOwnerNotInRunningQuest": "Quest-lederen har forladt questen. Du kan afbryde questen hvis du har brug for det, men du kan også lade den fortsætte, og dermed lade alle tilbageværende deltagere modtage quest-præmierne når questen er overstået.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Er du helt sikker? Tjek lige at de ikke vil hade dig for evigt!",
     "questWarning": "Hvis nye spillere melder sig ind i gruppen før questen begynder vil de også modtage en invitation. Dog kan nye medlemmer ikke deltage i questen hvis den allerede er startet.",
     "bossRageTitle": "Vrede",
-    "bossRageDescription": "Når denne bar bliver fyldt vil bossen udføre et specielt angreb!"
+    "bossRageDescription": "Når denne bar bliver fyldt vil bossen udføre et specielt angreb!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/da/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Manuelt ret værdier såsom Helbred, Niveau og Guld.",
     "enableClass": "Aktivér Klassesystem",
     "enableClassPop": "Du fravalgte oprindeligt klassesystemet. Vil du gerne aktivere det nu?",
-    "showClass": "Vis Klasse-rundvisning",
     "classTourPop": "Starter rundvisningen i brugen af klassesystemet.",
     "resetAccount": "Nulstil Konto",
     "resetAccPop": "Fjern alle niveauer og opgaver og alt guld, udstyr og historik og start helt forfra.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Brugerdefineret Dagstart",
-    "24HrClock": "24-timers tid",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Som udgangspunkt vil Habitica tjekke og nulstille dine Daglige ved midnat hver dag. Vi anbefaler, at du læser følgende information inden du ændrer det:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Gennemfør alle dine Daglige inden du ændrer Brugerdefineret Dagstart</strong> eller <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Slap af på Kroen</a> den dag. Når du ændrer Brugerdefineret Dagstart kan det ske, at <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> udføres med det samme, men efter den første dag virker det som forventet.<br><br><strong>Det tager cirka to timer før ændringen træder i kraft.</strong> Eksempel: Hvis den er sat til 0 (midnat), så skal du ændre det inden klokken 22; hvis du vil ændre det til klokken 21, skal du gøre det inden klokken 19.<br><br>Indtast et timetal mellem 0 og 23 (det er et 24-timers ur). Det er mere effektivt at skrive tallet end at bruge pilene. Når du har ændret tidspunktet, kan du genindlæse siden for at se om din ændring er blevet gemt.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Diverse",
     "showHeader": "Vis Sidehoved",
     "changePass": "Skift Kodeord",

common/locales/de/groups.json

@@ -14,7 +14,7 @@
     "resources": "Ressourcen",
     "tavernTalk": "Gasthausgespräche",
     "tavernAlert1": "Achtung: Wenn Du einen Bug meldest, sehen die Entwickler es hier nicht. Bitte",
-    "tavernAlert2": "verwende anstatt dessen GitHub",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Die Moderatoren des Gasthauses und der Gruppe sind;",
     "communityGuidelines": "Community-Richtlinien",
     "communityGuidelinesRead1": "Bitte lese unsere",
@@ -24,11 +24,17 @@
     "updatedParty": "Gruppeneinstellungen wurden aktualisiert.",
     "noPartyText": "Entweder bist Du noch in keiner Gruppe oder Deine Gruppe dauert etwas länger, um zu laden. Du kannst eine neue Gruppe erstellen und Freunde einladen. Wenn Du stattdessen einer bestehenden Gruppe beitreten willst, sag ihnen, dass sie Deine persönliche User ID eingeben sollen und komm dann zurück hierher um nach der Einladung zu suchen:",
     "LFG": "Um deine Gruppe bekannt zu machen oder um eine zu finden, der du beitreten kannst, gehe zur <%= linkStart %>Gruppe gesucht<%= linkEnd %>-Gilde.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Erstellen",
     "userId": "Benutzer ID",
     "invite": "Einladen",
     "leave": "Verlassen",
     "invitedTo": "Du wurdest zu <%= name %> eingeladen.",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Neue Nachricht unter \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Nachricht senden",
@@ -44,8 +50,8 @@
     "groupDescr": "Beschreibung auf der öffentlichen Gildenliste (Markdown Okay)",
     "logoUrl": "Logo URL",
     "assignLeader": "Gruppenleiter bestimmen",
-    "members": "Mitglied(er)",
+    "members": "Members",
-    "partyList": "Reihenfolge der Gruppenmitglieder im Header (aktualisiere Deinen Browser, wenn du die Reihenfolge geändert hast)",
+    "partyList": "Order for party members in header",
     "banTip": "Mitglied ausschließen",
     "moreMembers": "weitere(s) Mitglied(er)",
     "invited": "Eingeladen",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Nur der Gruppenleiter kann Wettbewerbe erstellen",
     "sendGift": "Geschenk schicken",
     "inviteFriends": "Lade Freunde ein",
-    "inviteAlertInfo": "Lade hier Freunde mit <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>Benutzer ID</a> ein.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Lade existierenden Nutzer ein",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Lade Freunde per Email ein. Falls sie über deine Email beitreten, werden sie automatisch dieser Gruppe hinzugefügt.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Von:",
-    "inviteNewUsers": "Lade neue(n) Benutzer ein.",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Oder teile diesen Link (kopieren/einfügen):",
     "sendGiftHeading": "Sende Geschenk an <%= name %>",
     "sendGiftGemsBalance": "Von <%= number %> Edelsteinen",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Persönliche Nachricht (optional)",
     "sendGiftSubscription": "<%= months %> Monat(e): $<%= price %>",
     "battleWithFriends": "Besiege mit Freunden Monster!",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Erstelle eine Gruppe",
     "addToParty": "Füge jemanden deiner Gruppe hinzu",
-    "likePost": "Klicke wenn du dir dieser Beitrag gefällt!"
+    "likePost": "Klicke wenn du dir dieser Beitrag gefällt!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/de/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Du hast folgendes erhalten:",
     "dropQuestCongrats": "Gratulation zum Erwerb dieser Questschriftrolle! Du kannst nun deine Gruppe dazu einladen die Quest zu starten oder du kommst irgendwann darauf zurück unter Inventar > Quests.",
     "questSend": "Ein Klick auf \"Einladen\" sendet eine Einladung an Deine Gruppenmitglieder. Sobald alle Mitglieder diese angenommen oder abgelehnt haben, beginnt die Quest. Der Status ist unter Optionen > Soziales > Gruppe einsehbar.",
-    "inviteParty": "Gruppe einladen",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Quest Einladung:",
     "questInvitationTitle": "Quest-Einladung",
     "questInvitationInfo": "Einladung zu der Quest <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Boss Stärke",
     "collect": "Sammle ein",
     "collected": "Gesammelt",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Jede erledigte tägliche Aufgabe und Aufgabe und jede positive Gewohnheit fügt dem Boss Schaden zu. Mit röteren Aufgaben, Gewaltschlag oder Flammenstoß kannst du ihm noch stärkeren Schaden zufügen. Für jede tägliche Aufgabe, die du nicht erledigt hast, wird der Boss jedem Teilnehmer der Quest Schaden zufügen (multipliziert mit der Stärke des Bosses), der zu deinem normalen Schaden noch dazukommt. Deshalb sorge dafür, dass deine Gruppe gesund bleibt, indem du deine täglichen Aufgaben erledigst! <strong>Jeder Schaden, der dem Boss zugefügt wird und den er zufügt, wird zu Cron berechnet (dein individueller Tagesbeginn).</strong>",
     "bossDmg2": "Nur Teilnehmer kämpfen gegen den Boss und bekommen ihren Anteil an der Beute.",
     "tavernBossInfo": "Um einem Weltbossmonster Schaden zuzufügen, musst Du Deine täglichen und einmaligen Aufgaben abhaken. Ein höherer Aufgaben Schaden führt zu höherem Bossschaden (rote Aufgaben abhaken, Zaubersprüche, Spezialattacken, usw.). Für jede tägliche Aufgabe, die Du nicht erledigst (multipliziert mit der Stärke des Bossmonsters) wird die Wut des Bossmonsters ansteigen. Hat sie das Maximum erreicht, wird etwas schlimmes passieren - also erledige Deine täglichen Aufgaben! <strong>Der Schaden den Du dem Bossmonster zufügst und die Wutpunkte, die Du an das Bossmonster verlierst, werden in der Chronik festgehalten (dort kannst Du den täglichen Fortschritt überprüfen).</strong>",
     "bossColl1": "Um Gegenstände zu sammeln musst Du Deine Aufgaben erfüllen. Quest Gegenstände sind genauso wie normale Gegenstände zu finden, aber Du kannst das Ergebnis erst zum Tageswechsel sehen. Dann wird alles, was jeder Teilnehmer gefunden hat zusammengerechnet und dem Quest zugerechnet.",
     "bossColl2": "Nur Teilnehmer können Gegenstände sammeln und erhalten ihren Anteil an der Beute.",
     "abort": "Abbrechen",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Quest-Besitzer",
     "questOwnerNotInPendingQuest": "Der Quest-Besitzer hat die Gruppe verlassen und kann die Quest nicht mehr starten. Es wird empfohlen, dass du sie jetzt abbrichst. Der Quest-Besitzer wird die Questrolle zurück bekommen.",
     "questOwnerNotInRunningQuest": "Der Quest-Besitzer hat die Quest verlassen. Wenn du willst, kannst du die Quest abbrechen. Du kannst sie auch weiterlaufen lassen und alle übrigen Teilnehmer werden die Questbelohnungen erhalten wenn sie die Quest geschafft haben.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Bist Du wirklich wirklich sicher? Sei' ganz sicher, dass sie Dich nicht für immer hassen werden!",
     "questWarning": "Wenn neue Mitglieder der Gruppe beitreten, bevor das Quest anfängt, werden auch sie eine Einladung bekommen. Aber sobald das Quest angefangen hat, können neue Gruppenmitglieder dem Quest nicht mehr beitreten.",
     "bossRageTitle": "Zorn",
-    "bossRageDescription": "Wenn sich dieser Balken füllt, wird der Boss eine Spezialattacke ausführen"
+    "bossRageDescription": "Wenn sich dieser Balken füllt, wird der Boss eine Spezialattacke ausführen",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/de/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Verändere Werte wie Lebenspunkte, Level, Gold manuell.",
     "enableClass": "Klassensystem aktivieren",
     "enableClassPop": "Du hast Dich vorher entschlossen auf das Klassensystem zu verzichten. Möchtest Du es jetzt aktivieren?",
-    "showClass": "Klassen Anleitung anzeigen",
     "classTourPop": "Zeigt die Anleitung für das Klassensystem an.",
     "resetAccount": "Konto zurücksetzen",
     "resetAccPop": "Starte neu, dabei werden alle Level, Gold, Ausrüstung, Verlauf und Aufgaben entfernt.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Tageswechsel einstellen",
-    "24HrClock": "24h Uhr",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica ist so eingestellt, dass Deine täglichen Aufgaben um Mitternacht in deiner eigenen Zeitzone überprüft und zurückgesetzt werden. Wir empfehlen den folgenden Text zu lesen, bevor Du diese Einstellungen veränderst:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Beende alle deine täglichen Aufgaben bevor du deinen persönlichen Tagesstart änderst</strong> oder checke für diesen Tag im <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Gasthaus</a> ein. Das Ändern deines Tagesstarts kann bewirken, dass dein <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> sofort ausgeführt wird, aber nach dem ersten Tag funktioniert alles wie erwartet.<br><br><strong>Plane ein Zeitfenster von zwei Stunden ein, um die Änderungen wirksam werden zu lassen.</strong> Wenn die Zeit bisher beispielsweise auf 0 (Mitternacht) gesetzt ist, ändere sie vor 22 Uhr; Wenn du sie auf 21 setzen willst, ändere sie vor 19 Uhr.<br><br>Gib eine Zahl zwischen 0 und 23 an. Tippen ist effektiver als das Benutzen der Pfeiltasten. Wenn du die Zeit gesetzt hast, lade die Seite neu, um sicherzustellen, dass der neue Wert angezeigt wird.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Verschiedenes",
     "showHeader": "Header anzeigen",
     "changePass": "Passwort ändern",
@@ -75,7 +75,7 @@
     "emailSuccess": "Die E-Mail-Adresse wurde erfolgreich geändert",
     "detachFacebook": "Facebook Registrierung löschen",
     "detachedFacebook": "Facebook erfolgreich von deinem Konto entfernt",
-    "addedLocalAuth": "Successfully added local authentication",
+    "addedLocalAuth": "Lokale Authentifizierung erfolgreich hinzugefügt",
     "data": "Daten",
     "exportData": "Daten exportieren",
     "emailChange1": "Um Deine Email-Adresse zu ändern, schicke bitte eine Email an",

common/locales/en/groups.json

@@ -14,7 +14,7 @@
     "resources": "Resources",
     "tavernTalk": "Tavern Talk",
     "tavernAlert1": "Note: if you're reporting a bug, the developers won't see it here. Please",
-    "tavernAlert2": "use Github instead",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Tavern and guild moderators are: ",
     "communityGuidelines": "Community Guidelines",
     "communityGuidelinesRead1": "Please read our",
@@ -24,11 +24,17 @@
     "updatedParty": "Party settings updated.",
     "noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:",
     "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Create",
     "userId": "User ID",
     "invite": "Invite",
     "leave": "Leave",
     "invitedTo": "Invited to <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "New message in \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Send Chat",
@@ -44,8 +50,8 @@
     "groupDescr": "Description shown in public Guilds list (Markdown OK)",
     "logoUrl": "Logo URL",
     "assignLeader": "Assign Group Leader",
-    "members": "Member(s)",
+    "members": "Members",
-    "partyList": "Order for party members in header (reload browser after changing order)",
+    "partyList": "Order for party members in header",
     "banTip": "Boot Member",
     "moreMembers": "more members",
     "invited": "Invited",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only group leader can create challenges",
     "sendGift": "Send Gift",
     "inviteFriends": "Invite Friends",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invite Existing User",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "By:",
-    "inviteNewUsers": "Invite New User(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Send Gift to <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Gems",
@@ -120,7 +131,19 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Start a Party",
     "addToParty": "Add someone to your party",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }
+

common/locales/en/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "You've Received",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Invite Party",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Quest Invitation: ",
     "questInvitationTitle": "Quest Invitation",
     "questInvitationInfo": "Invitation for the Quest <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Boss Strength",
     "collect": "Collect",
     "collected": "Collected",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "Only participants will fight the boss and share in the quest loot.",
     "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossColl1": "To collect items, do your positive tasks. Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile.",
     "bossColl2": "Only participants can collect items and share in the quest loot.",
     "abort": "Abort",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Quest Owner",
     "questOwnerNotInPendingQuest": "The quest owner has left the quest and can no longer begin it. It is recommended that you cancel it now. The quest owner will retain possession of the quest scroll.",
     "questOwnerNotInRunningQuest": "The quest owner has left the quest. You can abort the quest if you need to. You can also allow it to keep running and all remaining participants will receive the quest rewards when the quest finishes.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Are you double sure? Make sure they won't hate you forever!",
     "questWarning": "If new players join the party before the quest starts, they will also receive an invitation. However once the quest has started, no new party members can join the quest.",
     "bossRageTitle": "Rage",
-    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!"
+    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/en/settings.json

@@ -39,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Custom Day Start",
-    "24HrClock": "24Hr Clock",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it: ",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Misc",
     "showHeader": "Show Header",
     "changePass": "Change Password",

common/locales/en@pirate/groups.json

@@ -14,7 +14,7 @@
     "resources": "Resources",
     "tavernTalk": "Pub Chatter",
     "tavernAlert1": "Ahoy! If ye arrr reporting a bug, th' developers won't see it 'ere. Please",
-    "tavernAlert2": "use Github instead",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Pub an' alliance seadogs be:",
     "communityGuidelines": "Rules o' th' Sea",
     "communityGuidelinesRead1": "Please read our",
@@ -24,11 +24,17 @@
     "updatedParty": "Crew settings updated.",
     "noPartyText": "Ye be either not in a crew or ye crew be takin' a while t' load. Ye can either create one 'n invite buckos, or if ye want t' join an existin' crew, have them enter ye Unique User ID below 'n then come back here t' look fer th' invitation:",
     "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Create",
     "userId": "User ID",
     "invite": "Invite",
     "leave": "Leave",
     "invitedTo": "Invited t' <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "New message in \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Send a Message-In-A-Bottle",
@@ -44,8 +50,8 @@
     "groupDescr": "Description shown in public Alliances list (Markdown OK)",
     "logoUrl": "Logo URL",
     "assignLeader": "Assign Group Captain",
-    "members": "Mate(s)",
+    "members": "Members",
-    "partyList": "Order fer crew members in header (reload browser after changin' order)",
+    "partyList": "Order for party members in header",
     "banTip": "Make a Mate Walk the Plank",
     "moreMembers": "more mates",
     "invited": "Invited",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only group captain can create challenges",
     "sendGift": "Send Gift",
     "inviteFriends": "Invite Friends",
-    "inviteAlertInfo": "Invite mates by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invite Existing User",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite mates by email. If they join via yer email, they'll automatically be invited t' this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "By:",
-    "inviteNewUsers": "Invite New User(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Send Gift t' <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Sapphires",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Beasts Wit' Mates",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Form a Crew",
     "addToParty": "Add someone t' yer crew",
-    "likePost": "Click if ye like this post!"
+    "likePost": "Click if ye like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/en@pirate/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Ye 'ave Receiv'd",
     "dropQuestCongrats": "Congratulations on earnin' this quest scroll! Ye can invite yer crew t' begin th' quest now, or come back to it any time in yer Inventory > Quests.",
     "questSend": "Clickin' \"Invite\" will send an invitation t' yer crew members. When all members have accepted or denied, th' quest begins. See status under Social > Crew.",
-    "inviteParty": "Invite Crew",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Quest Invitation:",
     "questInvitationTitle": "Adventure Invitation",
     "questInvitationInfo": "Ye 'ave found th' adventure \"<%= quest %>\"!",
@@ -29,12 +29,16 @@
     "bossStrength": "Strength",
     "collect": "Plunder",
     "collected": "Collected",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "T' hurt a world boss, complete ye Dailies 'n To-Dos. Higher task damage means higher boss damage. T h' boss gunna deal damage t' every quest participant fer every Daily ye've missed (multiplied by th' boss's Strength) in addition t' yer regular damage, so keep yer crew healthy by completin' ye dailies! <strong>All damage to 'n from a boss be tallied on cron (ye day roll-over).</strong>",
     "bossDmg2": "Only participants will fight th' boss an' share in the adventure's loot.",
     "tavernBossInfo": "T' hurt a boss, complete ye Dailies 'n To-Dos. Higher task damage means higher boss damage (completin' reds, Magician spells, Warrior attacks, etc). Th' boss gunna deal damage to every quest participant fer every Daily ye've missed (multiplied by th' boss's Strength) in addition to ye regular damage, so keep ye crew healthy by completin' ye dailies! <strong>All damage to 'n from a boss be tallied on cron (ye day roll-over).</strong>",
     "bossColl1": "T'  collect items, do ye positive tasks. Quest items drop just like normal items; however, ye won't spy wit' ye eye th' loot 'til th' next day, then everythin' ye've found gunna be tallied up 'n contributed to th' pile.",
     "bossColl2": "Only participants can collect items an' share in th' adventure's loot.",
     "abort": "Abandon Ship",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Quest Owner",
     "questOwnerNotInPendingQuest": "Th' quest owner has left th' quest 'n can no longer begin it. It be recommended that ye cancel it now. th' quest owner gunna retain possession 'o th' quest scroll.",
     "questOwnerNotInRunningQuest": "Th' quest owner has left th' quest. ye can abort th' quest if ye need to. ye can also allow it to keep runnin' 'n all remainin' participants gunna receive th' quest rewards when th' quest finishes.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Arrr ye double sure? Make sure they won't hate ye forever!",
     "questWarning": "If new players join th' crew before th' quest starts, they gunna also receive an invitation. However once th' quest has started, no new crew members can join th' quest.",
     "bossRageTitle": "Rage",
-    "bossRageDescription": "When 'tis bar fills, the boss will unleash a special attack!"
+    "bossRageDescription": "When 'tis bar fills, the boss will unleash a special attack!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/en@pirate/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Manually change values like Health, Level, an' Doubloons.",
     "enableClass": "Enable Class System",
     "enableClassPop": "Ye opted out 'o th' class system initially. Would ye like now t' opt-in?",
-    "showClass": "Show Classes Tour",
     "classTourPop": "Show th' tour fer usin' th' class system.",
     "resetAccount": "Reset Account",
     "resetAccPop": "Start over, removin' all levels, doubloons, gear, history, 'n tasks.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Custom Day Start",
-    "24HrClock": "24Hr Clock",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica defaults t' check an' reset yer Dailies at midnight in yer own time zone each day. It be recommended that ye read th' following information before changin' it:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all yer Dailies before changin' th' Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in th ' Inn</a> that day. Changing yer Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> t' run immediately, but after th' first day it works as expected.<br><br><strong>Allow a window o' two hours fer th' change t' take effect.</strong> For example, if it currently be set t' 0 (midnight), change it before 10pm; if ye want t' set it t' 9pm, change it before 7pm.<br><br>Enter an hour from 0 t' 23 (it uses a 24 hour clock). Typing be more effective than arrow keys. Once set, reload th' page t' confirm that th' new value be displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Misc",
     "showHeader": "Show Header",
     "changePass": "Change Password",

common/locales/en_GB/groups.json

@@ -14,7 +14,7 @@
     "resources": "Resources",
     "tavernTalk": "Tavern Talk",
     "tavernAlert1": "Note: if you're reporting a bug, the developers won't see it here. Please",
-    "tavernAlert2": "use Github instead",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Tavern and guild moderators are:",
     "communityGuidelines": "Community Guidelines",
     "communityGuidelinesRead1": "Please read our",
@@ -24,11 +24,17 @@
     "updatedParty": "Party settings updated.",
     "noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:",
     "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Create",
     "userId": "User ID",
     "invite": "Invite",
     "leave": "Leave",
     "invitedTo": "Invited to <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "New message in \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Send Chat",
@@ -44,8 +50,8 @@
     "groupDescr": "Description shown in public Guilds list (Markdown OK)",
     "logoUrl": "Logo URL",
     "assignLeader": "Assign Group Leader",
-    "members": "Member(s)",
+    "members": "Members",
-    "partyList": "Order for party members in header (reload browser after changing order)",
+    "partyList": "Order for party members in header",
     "banTip": "Boot Member",
     "moreMembers": "more members",
     "invited": "Invited",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only the group leader can create challenges",
     "sendGift": "Send Gift",
     "inviteFriends": "Invite Friends",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invite Existing User",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "By:",
-    "inviteNewUsers": "Invite New User(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Send Gift to <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Gems",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Start a Party",
     "addToParty": "Add someone to your party",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
-}
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
+}

common/locales/en_GB/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "You've Received",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Invite Party",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Quest Invitation:",
     "questInvitationTitle": "Quest Invitation",
     "questInvitationInfo": "Invitation for the Quest <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Boss Strength",
     "collect": "Collect",
     "collected": "Collected",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "Only participants will fight the boss and share in the quest loot.",
     "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossColl1": "To collect items, do your positive tasks. Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile.",
     "bossColl2": "Only participants can collect items and share in the quest loot.",
     "abort": "Abort",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Quest Owner",
     "questOwnerNotInPendingQuest": "The quest owner has left the quest and can no longer begin it. It is recommended that you cancel it now. The quest owner will retain possession of the quest scroll.",
     "questOwnerNotInRunningQuest": "The quest owner has left the quest. You can abort the quest if you need to. You can also allow it to keep running and all remaining participants will receive the quest rewards when the quest finishes.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Are you double sure? Make sure they won't hate you forever!",
     "questWarning": "If new players join the party before the quest starts, they will also receive an invitation. However once the quest has started, no new party members can join the quest.",
     "bossRageTitle": "Rage",
-    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!"
+    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!",
-}
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
+}

common/locales/en_GB/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Manually change values like Health, Level, and Gold.",
     "enableClass": "Enable Class System",
     "enableClassPop": "You opted out of the class system initially. Would you like now to opt-in?",
-    "showClass": "Show Classes Tour",
     "classTourPop": "Show the tour for using the class system.",
     "resetAccount": "Reset Account",
     "resetAccPop": "Start over, removing all levels, gold, gear, history, and tasks.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Custom Day Start",
-    "24HrClock": "24Hr Clock",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Misc",
     "showHeader": "Show Header",
     "changePass": "Change Password",

common/locales/es/groups.json

@@ -14,7 +14,7 @@
     "resources": "Recursos",
     "tavernTalk": "Conversaciones de Taberna",
     "tavernAlert1": "Nota: Si estás informando sobre un error, los desarrolladores no van a verlo aquí. Por favor,",
-    "tavernAlert2": "utiliza Github en vez de hacerlo aquí.",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Los moderadores de la taberna y gremiales son:",
     "communityGuidelines": "Normas de la Comunidad",
     "communityGuidelinesRead1": "Por favor lee nuestro",
@@ -24,11 +24,17 @@
     "updatedParty": "Preferencias del Grupo actualizadas.",
     "noPartyText": "O no tienes un equipo o tu equipo está tardando en cargar. Puedes crear uno e invitar algunos amigos, o si quieres unirte a un equipo existente, haz que introduzcan tu ID de usuario único abajo y después vuelves aquí para buscar la invitación:",
     "LFG": "Para promocionar tu nuevo grupo o encontrar uno al que unirte, dirígete al Gremio <%= linkStart %>Búsqueda de Grupo (Se busca Grupo)<%= linkEnd %>.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Crear",
     "userId": "Número de Usuario",
     "invite": "Invitar",
     "leave": "Salir",
     "invitedTo": "Invitado a <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Mensaje nuevo en \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Enviar Chat",
@@ -44,8 +50,8 @@
     "groupDescr": "Descripción mostrada en la lista pública de Gremios (permite usar formato Markdown)",
     "logoUrl": "URL del Logotipo",
     "assignLeader": "Asignar Líder del Grupo",
-    "members": "Miembro(s)",
+    "members": "Members",
-    "partyList": "Orden de la lista de miembros en la cabecera (recarga el navegador después de cambiar la orden)",
+    "partyList": "Order for party members in header",
     "banTip": "Expulsar Miembro",
     "moreMembers": "más miembros",
     "invited": "Invitado",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Sólo el Líder del Grupo puede crear desafíos",
     "sendGift": "Envia Regalo",
     "inviteFriends": "Invita a tus Amigos",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invita Usario Existente",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invitar amigo por e-mail. Si ellos se unen por tu e-mail, invitan automáticamente ellos a este grupo.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Por:",
-    "inviteNewUsers": "Invita Usario(s) Nuevo(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "O compra este enlace (copia/pega):",
     "sendGiftHeading": "Send Gift to <%= name %>",
     "sendGiftGemsBalance": "De <%= number %> Gemas",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Lucha Monstruos Con Amigos",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Introduce un Grupo",
     "addToParty": "Añade alguien a tu grupo",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/es/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Has recibido",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Invitar Grupo",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Invitación a Misión:",
     "questInvitationTitle": "Invitación a Misión",
     "questInvitationInfo": "Invitación a la Misión <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Fuerza del Jefe",
     "collect": "Recoger",
     "collected": "Recogido",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Cada tarea Diaria y Pendiente y cada Hábito positivo que completes hacen daño al jefe. Hazle más daño con tareas más rojas o con Paliza Brutal y Llamarada. El jefe herirá a cada participante en la misión por cada tarea Diaria que te saltes (multiplicada por la Fuerza del jefe) además del daño habitual, así que ¡protege la salud de tu grupo completando tus tareas Diarias! <strong>Todos los daños sufridos y causados por un jefe son aplicados por cron (tu cambio de  día).</strong>",
     "bossDmg2": "Solo los participantes pelearan contra el jefe y compartiran el botín de la misión.",
     "tavernBossInfo": "Para dañar a un jefe de mundo, completa tus tareas Diarias y tareas Pendientes. Un mayor daño en una tarea significa un mayor daño al jefe (completar tareas rojas, hechizos de Mago, ataques de Guerrero, etc.) Por cada tarea Diaria que no hayas completado (multiplicado por la Fuerza del jefe), la Ira del jefe aumentará. Una vez su Ira alcance el máximo, algo malo va a pasar - ¡así que completa tus tareas Diarias! <strong>Todo el daño de y para el jefe se anota a un cronómetro (cuando reinicie tu día).</strong>",
     "bossColl1": "Para conseguir objetos de misión, haz tus tareas. Los objetos de misión aparecen como los demás; sin embargo, no los verás hasta el día siguiente, en ese momento todo lo que hayais encontrado se pondrá en común.",
     "bossColl2": "Solo los participantes pueden coger objetos y su parte del botín de la misión.",
     "abort": "Abandonar",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Dueño de la Misión",
     "questOwnerNotInPendingQuest": "El dueño de la misión ha abandonado y por consiguiente no puedes empezarla de nuevo. Te recomendamos que canceles la misión. El dueño de la misión se quedará con el pergamino usado.",
     "questOwnerNotInRunningQuest": "El dueño de la misión ha abandonado. Puedes abandonar tú también si es necesario. También puedes permitir que siga activa y todos los demás participantes recibirán los premios de la misión cuando ésta sea completada.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "¿Estás totalmente seguro? ¡Asegurate de que no te vayan a odiar para siempre!",
     "questWarning": "Si nuevos miembros se unen al equipo antes de que comience la misión, también recibirán una invitación. Sin embargo, una vez que la misión ha comenzado, nuevos miembros no se pueden unir a la misión.",
     "bossRageTitle": "Ira",
-    "bossRageDescription": "¡Cuando esta barra se llene, el jefe desatará un ataque especial!"
+    "bossRageDescription": "¡Cuando esta barra se llene, el jefe desatará un ataque especial!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/es/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Permite cambiar manualmente valores como tu Salud, Nivel y el Oro",
     "enableClass": "Activar Sistema de Clases",
     "enableClassPop": "Inicialmente decidiste no utilizar el sistema de clases. ¿Quieres usarlo ahora?",
-    "showClass": "Mostrar el Tour sobre las Clases",
     "classTourPop": "Iniciar el Tour para usar el sistema de clases.",
     "resetAccount": "Reiniciar su cuenta",
     "resetAccPop": "Empezar de nuevo, eliminando todo el oro, niveles, equipo, historial, y tareas.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Comienzo de Día Personalizado",
-    "24HrClock": "Sistema 24h",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica verifica y reinicia tus tareas a medianoche en tu propia zona horaria. Es recomendable que leas lo siguiente antes de cambiarlo:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Varios",
     "showHeader": "Mostrar encabezamiento",
     "changePass": "Cambiar contraseña",

common/locales/es_419/groups.json

@@ -14,7 +14,7 @@
     "resources": "Recursos",
     "tavernTalk": "Conversaciones de taberna",
     "tavernAlert1": "Nota: Si estás reportando sobre un error, los programadores no lo verán aquí. Por favor,",
-    "tavernAlert2": "utiliza Github.",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Los moderadores de la taberna y del gremio son:",
     "communityGuidelines": "Orientaciones comunitarias",
     "communityGuidelinesRead1": "Por favor lee nuestras",
@@ -24,11 +24,17 @@
     "updatedParty": "Ajustes de Equipo actualizados",
     "noPartyText": "O no tienes un equipo o tu equipo está tardando en cargar. Puedes crear uno e invitar algunos amigos, o si quieres unirte a un equipo existente, haz que introduzcan tu ID de usuario único abajo y después vuelves aquí para buscar la invitación:",
     "LFG": "Para promocionar tu nuevo equipo o encontrar uno para unirte, ve al Gremio <%= linkStart %>Se busca equipo (Buscando un grupo)<%= linkEnd %>.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Crear",
     "userId": "ID de Usuario",
     "invite": "Invitar",
     "leave": "Salir",
     "invitedTo": "Invitado a <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Mensaje nuevo en \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Enviar Chat",
@@ -44,8 +50,8 @@
     "groupDescr": "Descripción mostrada en la lista pública de Gremios (puedes usar Markdown)",
     "logoUrl": "URL del Logotipo",
     "assignLeader": "Asignar líder del grupo",
-    "members": "Miembro(s)",
+    "members": "Members",
-    "partyList": "Orden de la lista de miembros en la cabecera (recarga el navegador después de cambiar la orden)",
+    "partyList": "Order for party members in header",
     "banTip": "Echar miembro",
     "moreMembers": "más miembros",
     "invited": "Invitado",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Sólo el líder del grupo puede crear Retos",
     "sendGift": "Enviar regalo",
     "inviteFriends": "Invitar amigos",
-    "inviteAlertInfo": "Invita amigos mediante su <a href='http://es.habitica.wikia.com/wiki/API_Options' target='_blank'>ID de usuario</a> aquí.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invitar usuario existente",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invitar amigos vía correo electrónico. Si ellos se unen vía tu correo electrónico serán automáticamente invitados a este grupo.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Por:",
-    "inviteNewUsers": "Invitar nuevo(s) usuario(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "O comparte este link (copia/pega):",
     "sendGiftHeading": "Enviar regalo a <%= name %>",
     "sendGiftGemsBalance": "De <%= number %> gemas",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Mensaje personal (opcional)",
     "sendGiftSubscription": "<%= months %> Mes(es): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Crear un grupo",
     "addToParty": "Añadir a alguien a tu grupo",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/es_419/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Has recibido",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Cliqueando en \"Invitar\" enviara una invitación a los miembros de tu grupo. Cuando todos los miembros hayan aceptado o negado, la misión comenzara. Mira el progreso en Social > Grupo",
-    "inviteParty": "Invitar equipo",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Invitación a una misión:",
     "questInvitationTitle": "Invitación a una misión",
     "questInvitationInfo": "Invitación para la misión  <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Fuerza del Jefe",
     "collect": "Recolectar",
     "collected": "Recogido",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Cada tarea diaria o tarea pendiente completada y cada hábito positivo lastima al Jefe. Dañalo aun mas con las tareas mas rojas o aplástalos brutalmente y hazlos estallar en llamas. El Jefe hará daño a cada participante de la misión por cada tarea diaria que dejes pasar (multiplicado por la fuerza del jefe) en adición al daño regular, ¡así que mantén a tu grupo saludable completando tus tareas diarias! <strong> Todo daño hacia y desde el jefe se anota en tu cron (el día de cambio) </strong>",
     "bossDmg2": "Only participants will fight the boss and share in the quest loot.",
     "tavernBossInfo": "Para hacerle daño a un jefe mundial, completa tus Diarias y Pendientes. Mientras más alto sea el nivel de la tarea, más daño le harás al jefe (completando las rojas, hechizos de los Magos, ataques de los Guerreros, etc). Por cada Diaria que no completes (multiplicado por la Fuerza del jefe) aumentará la ira del jefe. Una vez que su ira llegue al máximo, algo malo pasará - ¡así que completa tus diarias! <strong>Todo el daño que ocasionen tu y el jefe es calculado durante el cron (al reinicio de tu día).</strong>",
     "bossColl1": "Para coleccionar artículos, haga tus tareas positivas. Objetos de misiones se ganan como objetos normales; sin embargo, no verá estos artículos hasta el próximo día cuando todo que encontró estará sumado y contribuido al total.",
     "bossColl2": "Solo los participantes pueden coleccionar artículos y compartir del botín de la misión.",
     "abort": "Abortar",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Organizador de la misión",
     "questOwnerNotInPendingQuest": "El organizador de la misión ha abandonado la misión y no puede iniciarla. Se recomienda cancelar también. El organizador se quedará con el pergamino de misión.",
     "questOwnerNotInRunningQuest": "El organizador de la misión ha abandonado la misión. Si necesitas abortar la misión, puedes hacerlo. También puedes dejarla activa y los participantes restantes recibirán las recompensas al concluir la misión.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "¿Verdaderamente estas seguro? ¡Asegúrate que no te oidarán eternamente!",
     "questWarning": "Si nuevos miembros se unen al equipo antes de que comience la misión, también recibirán una invitación. Sin embargo, una vez que la misión ha comenzado, nuevos miembros no se pueden unir a la misión.",
     "bossRageTitle": "Ira",
-    "bossRageDescription": "Cuando esta barra se llene, el jefe desencadenará un ataque especial!"
+    "bossRageDescription": "Cuando esta barra se llene, el jefe desencadenará un ataque especial!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/es_419/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Permite cambiar manualmente valores como tu Salud, Nivel y Oro",
     "enableClass": "Activar el sistema de clases",
     "enableClassPop": "Inicialmente decidiste no utilizar el sistema de clases. ¿Quieres usarlo ahora?",
-    "showClass": "Mostrar el tour sobre las Clases",
     "classTourPop": "Iniciar el tour para usar el sistema de clases.",
     "resetAccount": "Reiniciar su cuenta",
     "resetAccPop": "Empezar de nuevo, eliminando todo los niveles, el oro, el equipamiento, el historial, y las tareas.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Comienzo de día personalizado",
-    "24HrClock": "Sistema 24h",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica por defecto revisa y resetea tus Diarias a la medianoche en tu propia zona horaria cada día. Es recomendable que leas la siguiente información antes de cambiar la configuración por defecto.",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Varios",
     "showHeader": "Mostrar cabecera",
     "changePass": "Cambiar contraseña",

common/locales/fr/groups.json

@@ -14,7 +14,7 @@
     "resources": "Ressources",
     "tavernTalk": "Discussion de comptoir",
     "tavernAlert1": "Note : si vous signalez un problème ici, les développeurs ne le verront pas. Veuillez",
-    "tavernAlert2": "utiliser Github à la place",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Les modérateurs des guildes et de la Taverne sont :",
     "communityGuidelines": "Règles de Vie en Communauté",
     "communityGuidelinesRead1": "Merci de lire nos",
@@ -24,11 +24,17 @@
     "updatedParty": "Paramètres d'équipe mis à jour.",
     "noPartyText": "Vous n'êtes pas dans une équipe, ou votre équipe prend du temps à charger. Vous pouvez soit en créer une nouvelle et y inviter des amis soit, si vous voulez rejoindre une équipe existante, leur demander d'entrer votre ID d'utilisateur ci-dessous et revenir ici pour recevoir leur invitation :",
     "LFG": "Pour annoncer votre nouvelle équipe, ou pour en trouve une à rejoindre, rendez-vous dans la guilde <%= linkStart %>Demandes d'équipes (Recherche un groupe)<%= linkEnd %>.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Créer",
     "userId": "ID d'utilisateur",
     "invite": "Inviter",
     "leave": "Quitter",
     "invitedTo": "Invité·e à rejoindre <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nouveau message dans \"<%= name %>\"",
     "chat": "Discussion",
     "sendChat": "Envoyer un Message",
@@ -44,8 +50,8 @@
     "groupDescr": "Description affichée dans la liste des Guildes publiques (Markdown OK)",
     "logoUrl": "URL du logo",
     "assignLeader": "Désigner un Chef de Groupe",
-    "members": "Membre(s)",
+    "members": "Members",
-    "partyList": "Changez l'ordre des membres de l'équipe dans la bannière (actualisez ensuite votre navigateur)",
+    "partyList": "Order for party members in header",
     "banTip": "Virer ce Membre",
     "moreMembers": "membres supplémentaires",
     "invited": "Invité",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Seul le responsable du groupe peut créer des défis",
     "sendGift": "Envoyer un cadeau",
     "inviteFriends": "Inviter des amis",
-    "inviteAlertInfo": "Inviter des amis ici avec leur <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>ID d'Utilisateur</a>.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Inviter un utilisateur existant",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Inviter des amis par courriel. S'ils s'inscrivent en réponse à votre courriel, ils seront automatiquement invités à ce groupe.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Invité par:",
-    "inviteNewUsers": "Inviter un/plusieurs nouveau(x) utilisateur(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Ou partagez ce lien (copier/coller):",
     "sendGiftHeading": "Envoyer un cadeau à <%= name %>",
     "sendGiftGemsBalance": "De vos <%= number %> Gemmes",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Message personnel (facultatif)",
     "sendGiftSubscription": "<%= months %> mois: <%= price %>$ (USD)",
     "battleWithFriends": "Combattez des Monstres aux côtés d'Amis",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Former une Equipe",
     "addToParty": "Ajouter un membre à votre équipe",
-    "likePost": "Cliquez si vous aimez cette publication!"
+    "likePost": "Cliquez si vous aimez cette publication!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/fr/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Vous remportez",
     "dropQuestCongrats": "Félicitations d'avoir gagné ce parchemin de quête! Vous pouvez inviter votre équipe à commencer la quête maintenant, ou y revenir à n'importe quel moment dans votre Inventaire > Quêtes.",
     "questSend": "En cliquant sur \"Inviter\", vous enverrez une invitation aux membres de votre équipe. Lorsque tous les membres auront accepté ou refusé, la quête commencera. Vous pouvez suivre le statut de l'invitation sous Social > Équipe.",
-    "inviteParty": "Inviter l'équipe",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Invitation à une Quête :",
     "questInvitationTitle": "Invitation à une Quête",
     "questInvitationInfo": "Invitation à la Quête <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Force du Boss",
     "collect": "Collecter",
     "collected": "Récolté",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Chaque tâche Quotidienne ou À Faire et chaque Habitude  positive inflige des dommages au boss. Frappez plus fort avec des tâches plus rouges ou avec les sorts Frappe Brutale et Eplosion de Flammes. Le boss infligera des dommages à chacun des participants de la quête pour chaque Quotidienne que vous aurez manquée (multipliés par la Force du boss) en plus des dommages normaux. Alors protégez votre équipe en effectuant vos Quotidiennes! <strong>Tout dommage causé par vous et par le boss est pris en compte au cron (la réinitialisation de votre journée).</strong>",
     "bossDmg2": "Seuls les participants pourront combattre le boss et partager le butin de la quête.",
     "tavernBossInfo": "Pour blesser un boss mondial, complétez vos tâches Quotidiennes et À faire. Plus vous infligez de dommages à une tâche, plus vous en infligerez au boss en conséquence (tâches rouges, sorts de Mage, attaques de Guerrier, etc). Pour chaque Quotidienne que vous avez manqué (multiplié par la Force du boss), la barre de Rage du boss augmentera. Lorsque sa Rage atteindra son maximum, quelque chose de terrible arrivera, donc complétez vos Quotidiennes ! <strong>Tous les dommages infligés au boss et par lui seront pris en compte au cron (le passage d'une journée à l'autre).</strong>",
     "bossColl1": "Pour obtenir des objets, accomplissez vos tâches positives. Vous trouvez les objets de quêtes de la même façon que vous trouvez les objets normaux mais vous ne les verrez que le jour suivant. À ce moment, tous les objets de quêtes que vous aurez trouvés seront comptabilisés et s'ajouteront à la pile.",
     "bossColl2": "Seuls les participants peuvent collecter des objets et partager le butin de la quête.",
     "abort": "Abandonner",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Lanceur de Quête",
     "questOwnerNotInPendingQuest": "Le lanceur de quête a quitté la quête et ne peut plus la débuter. Il vous est recommandé d'abandonner celle-ci. Le lanceur de quête reprendra possession du parchemin de quête.",
     "questOwnerNotInRunningQuest": "Le lanceur de quête a quitté la quête. Vous pouvez abandonner la quête si vous le désirez, mais vous pouvez aussi décider de la poursuivre, et tous les participants recevront les récompenses de quête lorsque celle-ci sera terminée.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Êtes-vous sûr(e) et certain(e) ? Assurez-vous qu'ils ne vont pas vous détester pour le reste de votre vie !",
     "questWarning": "Si de nouveaux joueurs rejoignent le groupe avant que la quête ne soit lancée, il recevront également une invitation. Cependant, une fois la quête débutée aucun nouveau membre du groupe ne pourra rejoindre celle-ci.",
     "bossRageTitle": "Rage",
-    "bossRageDescription": "Quand cette jauge sera remplie, le boss réalisera une attaque spéciale !"
+    "bossRageDescription": "Quand cette jauge sera remplie, le boss réalisera une attaque spéciale !",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/fr/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Changer manuellement les valeurs telles que la Vie, le Niveau et l'Or.",
     "enableClass": "Activer le Système de Classe",
     "enableClassPop": "Vous avez désactivé le système de classe. Vous-vous à présent l'activer ?",
-    "showClass": "Montrer la visite guidée des Classes",
     "classTourPop": "Montre la visite guidée à propos l'utilisation du système de classe.",
     "resetAccount": "Réinitialiser le compte",
     "resetAccPop": "Recommencez à zéro. Cela supprimera votre niveau, votre or, votre équipement, votre historique et vos tâches.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Heure personnalisée de début de journée",
-    "24HrClock": "Horloge de 24 heures",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Par défaut, Habitica vérifie et réinitialise vos quotidiennes à minuit dans votre propre fuseau horaire tout les jours. Il est recommandé que vous lisiez les informations suivantes avant de les changer :",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Terminez toutes vos tâches quotidiennes avant de personnaliser l'heure de démarrage de la journée</strong> ou <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>reposez-vous à l'auberge</a> pendant cette journée. Modifier l'heure de démarrage de la journée peut amener <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> à s'exécuter immédiatement, mais après le premier jour, il fonctionnera de la façon souhaitée.<br><br><strong>Attendez en moyenne deux heures pour que les changements prennent effet.</strong> Par exemple, s'il est actuellement règlé à 0 (minuit), changez le avant 22h; si vous voulez le régler sur 21h, modifiez le avant 19h.<br><br>Indiquez une heure de 0 à 23 (c'est le système horaire sur 24 heures qui est utilisé). Écrire est plus efficace que d'utiliser les flèches. Une fois le paramètre modifié, actualisez la page pour vérifier que la nouvelle valeur s'affiche correctement.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Divers",
     "showHeader": "Montrer le Bandeau",
     "changePass": "Changer le mot de passe",

common/locales/he/groups.json

@@ -14,7 +14,7 @@
     "resources": "משאבים",
     "tavernTalk": "שיחת פונדק",
     "tavernAlert1": "הערה: אם את/ה מדווח/ת על באג, המפתחים לא יראו זאת כאן. אנא",
-    "tavernAlert2": "השתמש בGithub במקום זאת",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "עורכי הפונדק והגילדות הם:",
     "communityGuidelines": "החוקים הקהילתיים",
     "communityGuidelinesRead1": "אנא קרא את",
@@ -24,11 +24,17 @@
     "updatedParty": "Party settings updated.",
     "noPartyText": "או שאינך חלק מחבורה, או שלחבורה שלך לוקח זמן מה להיטען. תוכל/י או ליצור חבורה חדשה ולהזמין את חברייך, או אם ברצונך להצטרף לחבורה קיימת, אמור/אמרי להם להשתמש במספר המשתמש הייחודי שלך למטה, ואז חזור/חזרי כדי לראות את הזמנתם:",
     "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "היכנס",
     "userId": "מספר משתמש",
     "invite": "הזמן",
     "leave": "עזוב",
     "invitedTo": "הזמן ל <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "הודעה חדשה ב\"<%= name %>\"",
     "chat": "דיבורים",
     "sendChat": "שלח הודעה",
@@ -44,8 +50,8 @@
     "groupDescr": "תיאור ציבורי שייראה ברשימת הגילדות",
     "logoUrl": "קישור לסמל",
     "assignLeader": "בחר מנהיג לקבוצה",
-    "members": "חבר/ה(ים/ות)",
+    "members": "Members",
-    "partyList": "מיון אנשי חבורה בראש העמוד (טענ/י מחדש את העמוד לאחר שינוי הסדר)",
+    "partyList": "Order for party members in header",
     "banTip": "סלק חבר",
     "moreMembers": "חברים נוספים",
     "invited": "הוזמן",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only group leader can create challenges",
     "sendGift": "Send Gift",
     "inviteFriends": "Invite Friends",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invite Existing User",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "By:",
-    "inviteNewUsers": "Invite New User(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Send Gift to <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Gems",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Start a Party",
     "addToParty": "Add someone to your party",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/he/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "קיבלת",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "הזמן חבורה",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "הזמנה למשימה:",
     "questInvitationTitle": "Quest Invitation",
     "questInvitationInfo": "Invitation for the Quest <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "עוצמת האויב",
     "collect": "לאסוף",
     "collected": "נאסף",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "רק משתתפים שנלחמים בבוס חולקים בביזת המשימה.",
     "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossColl1": "כדי לאסוף חפצים, בצע/י מטלות חיוביות. חפצי קווסט נופלים ממש כמו חפצים רגילים, אם כי, את/ה לא תראה/י אותם עד היום הבא, בו כל מה שמצאה החבורה ייאסף לערימת המשימה.",
     "bossColl2": "רק משתתפים במשימה יכולים לאסוף חפצים ולהתחלק בשלל המשימה.",
     "abort": "בטל",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "בעל/ת המשימה",
     "questOwnerNotInPendingQuest": "בעל/ת המשימה עזב/ה את המשימה וכבר לא יכולה להתחיל אותה. מומלץ שגם את/ה תבטל/י אותה כעת. בעל/ת המשימה ת/ישמור על בעלות המגילה.",
     "questOwnerNotInRunningQuest": "בעל/ת המשימה עזבה את המשימה. את/ה יכול/ה לבטל אותה אם זהו רצונך, או להמשיך אותה ולקבל את הפרסים בסופה, יחד עם כל שאר המשתתפים.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "האם את/ה באמת באמת בטוח/ה? כל החבורה שלך עלולה לשנוא אותך לנצח!",
     "questWarning": "אם שחקנים חדשים מצטרפים לחבורה לפני תחילת המשימה, גם הם יקבלו הזמנה. לעומת זאת, ברגע שהמשימה תתחיל, אף אחד מהחבורה לא יוכל להצטרף אליה.",
     "bossRageTitle": "זעם",
-    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!"
+    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/he/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "שנה באופן ידני ערכים כגון בריאות, רמה וזהב.",
     "enableClass": "אפשר מערכת מקצועות",
     "enableClassPop": "החלטת לא לבחור מקצוע בתור התחלה. האם היית רוצה לבחור אחד עכשיו?",
-    "showClass": "הצג סיור מקצועות",
     "classTourPop": "הראה את סיור ההיכרות עבור מערכת המקצועות.",
     "resetAccount": "אפס חשבון",
     "resetAccPop": "התחלה מחדש, תוך הסרת כל הזהב, הרמות, הציוד, ההיסטוריה והמשימות.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "התחלת יום מותאמת אישית",
-    "24HrClock": "שעות 24 שעות",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "ברירת המחדל של הביטיה היא לבדוק ולאפס את המטלות היומיות בחצות באזור הזמן שלך מידי יום. מומלץ לקרוא את המידע הבא שמשנים:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "שונות",
     "showHeader": "הראה כותרת",
     "changePass": "שנה סיסמה",

common/locales/hu/groups.json

@@ -14,7 +14,7 @@
     "resources": "Erőforrások",
     "tavernTalk": "Kocsmai Csevej",
     "tavernAlert1": "Megj.: Ha egy hibát akarsz bejelenteni, akkor a fejlesztők nem fogják itt látni. Kérjük",
-    "tavernAlert2": "használj Githubot helyette",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "A Kocsma és a céh moderátorai:",
     "communityGuidelines": "a közösségi irányelveinket",
     "communityGuidelinesRead1": "Kérlek olvasd el",
@@ -24,11 +24,17 @@
     "updatedParty": "Csoport beállítások megváltoztatva.",
     "noPartyText": "Vagy nem vagy csapatban, vagy a csapat elég lassan töltődik be. Létrehozhatsz egy újat és meghívhatod a barátaidat, vagy csatlakozhatsz egy már létező csapathoz. Ez esetben kérd meg őket, hogy az egyedi Felhasználói Azonosítódat írják be ide, majd gyere vissza és várd meg, hogy megérkezzen a meghívó.",
     "LFG": "Menj a <%= linkStart %>Csoport kerestetik (Csoportot keresek)<%= linkEnd %> céhbe, ha a csoportod szeretnéd hirdetni, vagy ha azt keresel.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Létrehozás",
     "userId": "Felhasználói azonosító",
     "invite": "Meghívás",
     "leave": "Kilép",
     "invitedTo": "Meghívtak a <%= name %> csapatba.",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Új üzenet \"<%= name %>\"",
     "chat": "Csevegő",
     "sendChat": "Üzenet küldése",
@@ -44,8 +50,8 @@
     "groupDescr": "Leírás, amit a nyilvános Céh listában láthatsz (Használhatsz Markdown-t)",
     "logoUrl": "Logo URL",
     "assignLeader": "Jelölj ki Csoportvezetőt",
-    "members": "Tag(ok)",
+    "members": "Members",
-    "partyList": "A csapattagok sorrendje a fejlécben (frissítsd a böngészőt a sorrend megváltoztatása után)",
+    "partyList": "Order for party members in header",
     "banTip": "Tag kirúgása",
     "moreMembers": "továbi tagok",
     "invited": "meghívva",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only group leader can create challenges",
     "sendGift": "Send Gift",
     "inviteFriends": "Invite Friends",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invite Existing User",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "By:",
-    "inviteNewUsers": "Invite New User(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Send Gift to <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Gems",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Start a Party",
     "addToParty": "Add someone to your party",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/hu/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Amit kaptál",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Csapat meghívása",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Küldetés meghívás:",
     "questInvitationTitle": "Quest Invitation",
     "questInvitationInfo": "Invitation for the Quest <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Főellenség ereje",
     "collect": "Gyűjts be",
     "collected": "Begyűjtve",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "Csak a résztvevők harcolnak a főellenséggel és ők osztják meg a küldetés zsákmányát is.",
     "tavernBossInfo": "Hogy sebezd a világi főellenséget, teljesítsd a Napi feladataidat és a Teendőidet. A nagyobb feladat sebzés nagyobb főellenség sebzést is jelent (piros feladatok elvégzése, Mágus varázslatok, Harcos támadások, stb.). Minden elmulasztott Napi feladatod (szorozva a szörny erejével) tovább haragítja a főszörnyet. Ha eléri a maximális őrjöngést, akkor valami nagyon rossz fog történni - szóval végezd el a Napi feladataidat! <strong>Minden sebzés a nap végén számolódik (a napfordulódon)</strong>",
     "bossColl1": "Tárgygyűjtéshez végezd el a pozitív feladataidat. Küldetés tárgyak ugyanúgy esnek, mint normál tárgyak; bár ezeket nem látod a következő napig, amikor minden, amit találtál össze lesz vonva és hozzátéve a halomhoz.",
     "bossColl2": "Csak résztvevők kapják meg a tárgyat és részesülnek a kihívás zsákmányából.",
     "abort": "Megszakít",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Küldetés tulajdonos",
     "questOwnerNotInPendingQuest": "A küldetés tulajdonosa kilépett a küldetésből és már nem tudja elindítani. Ajánlott, hogy lépj vissza te is. A küldetés tulajdonosánál marad a küldetés tekercse.",
     "questOwnerNotInRunningQuest": "A küldetés tulajdonosa kilépett a küldetésből. Megszakíthatod a küldetést, ha kell. Egyébként hagyhatod, hogy menjen tovább és a maradék résztvevők megkapják a küldetés jutalmát amikor a küldetés véget ér.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Tuti biztos vagy benne? Győződj meg róla, hogy nem fognak a többiek utálni!",
     "questWarning": "Ha új játékosok csatlakoznak a csapathoz a küldetés indulása előtt, akkor ők is kapnak meghívót. Egyébként, ha a küldetés indulása után csatlakozik valaki, az nem tud részt venni benne.",
     "bossRageTitle": "Örjöngés",
-    "bossRageDescription": "Ha ez a sáv megtelik, akkor a Főellenség egy speciális támadást szabadít ránk."
+    "bossRageDescription": "Ha ez a sáv megtelik, akkor a Főellenség egy speciális támadást szabadít ránk.",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/hu/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Manuálisan beállíthatod az értékeket, úgy mint életerő, szint és arany.",
     "enableClass": "Kaszt rendszer engedélyezése",
     "enableClassPop": "Kikapcsoltad a kasztrendszert korábban. Szeretnéd bekapcsolni?",
-    "showClass": "Mutasd a kaszt ismertetőt",
     "classTourPop": "Megmutatja a kasztrendszer ismertetőjét.",
     "resetAccount": "Fiók újraindítása",
     "resetAccPop": "Újraindítás, elveszted az összes szinted, aranyad, felszerelésed, történeted és feladataid.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Egyedi nap indítás",
-    "24HrClock": "24 órás óra",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "A Habitica alapértelmezetten a Napi feladataidat éjfélkor vizsgálja meg és állítja vissza, a saját időzónádban minden egyes nap. Azt ajánljuk, hogy olvasd el a következő információt mielőtt átállítod:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Egyéb",
     "showHeader": "Mutasd a fejlécet",
     "changePass": "Jelszó megváltoztatása",

common/locales/it/groups.json

@@ -14,7 +14,7 @@
     "resources": "Risorse",
     "tavernTalk": "Chiacchiere in Taverna",
     "tavernAlert1": "Nota: se stai segnalando un bug, gli sviluppatori non potranno aiutarti qui. In quel caso, per favore",
-    "tavernAlert2": "usa Github",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "I moderatori della Taverna e delle Gilde sono:",
     "communityGuidelines": "Linee guida della community",
     "communityGuidelinesRead1": "Per favore leggi le",
@@ -24,11 +24,17 @@
     "updatedParty": "Impostazioni squadra aggiornate.",
     "noPartyText": "Non sei in una squadra, oppure la tua squadra sta impiegando troppo tempo a caricarsi. Puoi crearne una ed invitare i tuoi amici; se invece vuoi unirti ad una squadra esistente, chiedi di inserire il tuo ID Utente e torna qui per visualizzare l'invito:",
     "LFG": "Per pubblicizzare la tua nuova squadra o trovarne una a cui unirti, vai alla Gilda <%= linkStart %>Party Wanted<%= linkEnd %> (in inglese).",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Crea",
     "userId": "ID Utente",
     "invite": "Invita",
     "leave": "Abbandona",
     "invitedTo": "Invitato in <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nuovo messaggio in \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Invia messaggio",
@@ -44,8 +50,8 @@
     "groupDescr": "Descrizione mostrata nella lista delle Gilde pubbliche (Markdown OK)",
     "logoUrl": "URL Logo",
     "assignLeader": "Assegna un leader al gruppo",
-    "members": "Membri",
+    "members": "Members",
-    "partyList": "Ordina membri della squadra nell'header (richiede il ricaricamento del browser)",
+    "partyList": "Order for party members in header",
     "banTip": "Creatore del gruppo",
     "moreMembers": "altri membri",
     "invited": "Invitato",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Solo il leader del gruppo può creare le sfide",
     "sendGift": "Invia regalo",
     "inviteFriends": "Invita amici",
-    "inviteAlertInfo": "Invita amici tramite <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>ID Utente</a> da qui.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invita Utente Esistente",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invita i tuoi amici tramite email. Se si iscrivono tramite la tua email, verranno automaticamente invitati in questo gruppo.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Da:",
-    "inviteNewUsers": "Invita nuovi utenti",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Oppure condividi questo link (copia/incolla):",
     "sendGiftHeading": "Invia regalo a <%= name %>",
     "sendGiftGemsBalance": "Da <%= number %> Gemme",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Messaggio personale (facoltativo)",
     "sendGiftSubscription": "<%= months %> Mese(/i): <%= price %>$",
     "battleWithFriends": "Combatti i mostri con gli amici",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Crea una Squadra",
     "addToParty": "Aggiungi qualcuno alla tua squadra",
-    "likePost": "Fai click se ti piace questo post!"
+    "likePost": "Fai click se ti piace questo post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/it/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Hai ricevuto",
     "dropQuestCongrats": "Congratulazioni per aver ottenuto questa Pergamena! Puoi invitare la tua squadra a cominciare questa missione ora, oppure puoi farlo in un secondo momento andando in Inventario > Missioni.",
     "questSend": "Cliccando \"Invita\" manderai un invito ai membri della tua squadra. Quando tutti i membri avranno accettato o rifiutato, la missione inizierà. Vedi lo stato in Social > Squadra.",
-    "inviteParty": "Invita squadra",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Invito alla missione:",
     "questInvitationTitle": "Invito alla missione",
     "questInvitationInfo": "Invito alla missione <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Forza del Boss",
     "collect": "Raccogli",
     "collected": "Collezionati",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Ogni Daily e To-Do completata e ogni Habit positiva danneggiano il boss. Puoi infliggere danni maggiori con le attività più rosse, con Attacco Brutale e con Fiammata. I boss danneggeranno ogni partecipante per le Daily mancate (moltiplicate per la Forza del boss) oltre al loro normale danno, quindi tieni in forze la tua squadra completando le tue Daily! <strong>I danni inflitti e ricevuti dal boss sono calcolati al cambio di giorno (all'ora da te impostata).</strong>",
     "bossDmg2": "Solo i partecipanti potranno combattere il boss e condividere il bottino della missione.",
     "tavernBossInfo": "Per ferire un boss mondiale, completa le tue Daily e i tuoi To-Do. Maggiore è il valore dell'attività, maggiore sarà il danno inflitto al boss (attività di colore rosso, gli incantesimi dei Maghi, gli attacchi dei Guerrieri, ecc.). La Furia del boss aumenterà per ogni Daily incompleta (moltiplicate per la Forza del boss). Quando la Furia raggiunge il massimo, accadrà qualcosa di davvero brutto - quindi completa le tue Daily! <strong>Tutto il danno inflitto e ricevuto da un boss viene calcolato al cambio di giorno (che avviene all'ora da te scelta nelle impostazioni).</strong>",
     "bossColl1": "Per ottenere gli oggetti, completa delle attività positive. Gli oggetti delle missioni compaiono come quelli normali; non li vedrai però fino al giorno dopo, quando tutto quello che hai trovato verrà raccolto e aggiunto agli oggetti già trovati.",
     "bossColl2": "Solo i partecipanti potranno collezionare gli oggetti e condividere il bottino della missione.",
     "abort": "Annulla",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Capomissione",
     "questOwnerNotInPendingQuest": "Il Capomissione ha abbandonato la missione e non può più cominciarla. Suggeriamo anche a te di abbandonarla ora. Il Capomissione rimarrà in possesso della Pergamena.",
     "questOwnerNotInRunningQuest": "Il Capomissione ha abbandonato la missione. Se necessario puoi annullare la missione. Puoi anche lasciare che continui e tutti i restanti partecipanti riceveranno le ricompense della missione una volta completata.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Sei veramente sicuro? Assicurati che non ti odieranno per sempre!",
     "questWarning": "Se altri giocatori si uniscono alla squadra prima che la missione abbia inizio, anche loro riceveranno un invito. Tuttavia, una volta che la missione sarà iniziata, nessun altro membro della squadra potrà unirsi ai partecipanti.",
     "bossRageTitle": "Furia",
-    "bossRageDescription": "Quando questa barra sarà completamente piena, il boss eseguirà un attacco speciale!"
+    "bossRageDescription": "Quando questa barra sarà completamente piena, il boss eseguirà un attacco speciale!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/it/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Modifica manualmente valori come Salute, livello e quantità di Oro.",
     "enableClass": "Attiva il sistema delle classi",
     "enableClassPop": "Avevi scelto di non utilizzare il sistema delle classi, inizialmente. Vorresti cominciare?",
-    "showClass": "Mostra l'introduzione al sistema delle classi",
     "classTourPop": "Mostra il tour introduttivo su come utilizzzare il sistema delle classi.",
     "resetAccount": "Resetta account",
     "resetAccPop": "Ricomincia da zero rimuovendo tutti i livelli, l'oro, gli oggetti, la cronologia e tutte le attività.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Data di inizio giorno personalizzata",
-    "24HrClock": "orologio 24h",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica è impostato automaticamente per resettare le tue Daily a mezzanotte nel tuo fuso orario ogni giorno. Ti consigliamo di leggere le seguenti informazioni prima di apportare modifiche:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Completa tutte le tue Daily prima di modificare il tuo Inizio del Giorno Personalizzato</strong> o <a href='http://habiticahabitrpg.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Riposa alla Locanda</a> per quel giorno. Cambiare il tuo Inizio del Giorno Personalizzato può causare l'avvento immediato del <a href='http://habitrpg.wikia.com/wiki/Cron' target='_blank'>Cron</a>, ma dopo il primo giorno funziona come previsto.<br><br><strong>Ci possono volere circa due ore perchè il cambiamento diventi effettivo.</strong> Ad esempio, se è impostato a 0 (mezzanotte) al momento, cambialo prima delle 22; se vuoi impostarlo alle 21, cambialo prima delle 19.<br><br>Inserisci un orario da 0 a 23 (viene utilizzato l'orologio a 24 ore). Digitare è più efficace di premere le frecce. Una volta impostato, ricarica la pagina per assicurarti che il nuovo valore venga visualizzato.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Altro",
     "showHeader": "Mostra header",
     "changePass": "Cambia password",

common/locales/ja/groups.json

@@ -14,7 +14,7 @@
     "resources": "リソース",
     "tavernTalk": "居酒屋トーク",
     "tavernAlert1": "注意: バグを報告する場合、開発者はここを見ません。どうか、",
-    "tavernAlert2": "かわりにGithubを使ってください",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "酒場やギルドモデレーターは、次のとおりです:",
     "communityGuidelines": "コミュニティーガイドライン",
     "communityGuidelinesRead1": "チャットする前に",
@@ -24,11 +24,17 @@
     "updatedParty": "パーティの設定が更新されました。",
     "noPartyText": "あなたがパーティにいないか、パーティのロードに時間がかかっているかのどちらかです。あなたはパーティを作成して友人を招待するか、または既存のパーティーに参加したい場合は、下に固有のユーザーIDを入力して、その後でここに戻って来て招待状を待つかの、いずれかができます:",
     "LFG": "新しいパーティーの宣伝かパーティーに参加するなら、 <%= linkStart %> パーティ求む (グループを探す)<%= linkEnd %>ギルドへ行きましょう。",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "作る",
     "userId": "ユーザーＩＤ",
     "invite": "招待する",
     "leave": "やめる",
     "invitedTo": "<%= name %>に招待されました",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "\"<%= name %>\"で新しいメッセージがあります",
     "chat": "チャット",
     "sendChat": "チャット送信",
@@ -44,8 +50,8 @@
     "groupDescr": "公共ギルドリストに表示される説明 (マークダウン OK)",
     "logoUrl": "ロゴＵＲＬ",
     "assignLeader": "グループリーダー指定",
-    "members": "メンバー",
+    "members": "Members",
-    "partyList": "ヘッダーのパーティメンバーの順序 (順序変更後にブラウザを再ロードしてください)",
+    "partyList": "Order for party members in header",
     "banTip": "メンバーを解雇",
     "moreMembers": "メンバー一覧",
     "invited": "招待された方",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "グループリーダーだけがチャレンジを作成できます",
     "sendGift": "贈り物を送る",
     "inviteFriends": "友達を招待する",
-    "inviteAlertInfo": "<a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>ユーザーID</a> で友人をここに招待する",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "既存のユーザーを招待する",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "メールで友人を招待する。もし彼らがあなたのメール経由で参加したら、自動的にこのグループに招待されます。",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "で",
-    "inviteNewUsers": "新しいユーザー(達)を招待する",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "もしくはこのリンクを共有する(コピー/ペースト):",
     "sendGiftHeading": "<%= name %>に贈り物を送る",
     "sendGiftGemsBalance": "<%= number %>個のジェムから",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "個人メッセージ(任意)",
     "sendGiftSubscription": "<%= months %>ヶ月: $<%= price %>",
     "battleWithFriends": "フレンドと一緒にモンスターと戦う",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "チームを作る",
     "addToParty": "チームに誰かを入れる",
-    "likePost": "「いいね！」とすればクリックします。"
+    "likePost": "「いいね！」とすればクリックします。",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/ja/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "受け取りました",
     "dropQuestCongrats": "おめでとうございます！クエストの巻物を取得しました。クエストにパーティメンバーを招待してクエストを開始できます。所持品>クエストから好きな時に開始できます。",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "パーティ招待",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "クエストへの招待状：",
     "questInvitationTitle": "クエストへの招待",
     "questInvitationInfo": "クエスト <%= quest %> への招待",
@@ -29,12 +29,16 @@
     "bossStrength": "ボスの力",
     "collect": "獲得",
     "collected": "獲得済み",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "参加者だけがボスと戦い、クエストの勝利品を共有することができる",
     "tavernBossInfo": "ワールドボスを傷つけるには、日課とToDoを完了させてください。高いタスクダメージ(赤の完了や魔道士の呪文や戦士の攻撃など)はボスへのダメージが高いことを意味します。あなたが実行しなかった全ての日課においてボスの強さに倍されて、ボスの怒りが増加するでしょう。いったんボスの怒りが最大に達すると、何か悪い事が起こるでしょう、ですから日課を完了させてください！<strong>全てのボスからのダメージとボスへのダメージはcron(あなたの一日の切り替え)で集計されます。</strong>",
     "bossColl1": "アイテムを収集するには、良いタスクを実行します。クエストアイテムは通常のアイテムのようにドロップします。ただし、翌日までドロップは表示されません。その後あなたが見つけたものはすべて集計されて、山に寄与します。",
     "bossColl2": "参加者だけがアイテムを探索し、クエストの勝利品を共有することができる",
     "abort": "中止",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "クエストオーナー",
     "questOwnerNotInPendingQuest": "クエストオーナーはクエストを残していますが、もはやそれを始めることはできません。それを今キャンセルすることをお勧めします。クエストオーナーはクエストスクロールの所有を保持します。",
     "questOwnerNotInRunningQuest": "クエストオーナーはクエストを残しています。必要であれば、クエストを中止することができます。また、実行の継続を許可することもでき、残りのすべての参加者はクエストが終了した時に、クエストの報酬を受け取ります。",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "本当に二つ同時に行うのですか？途中で嫌にならないか、きちんと考えてくださいね。",
     "questWarning": "クエストが始まる前に新しいプレイヤーがパーティに参加した場合、彼らもまた、招待状を受け取ります。ただし、クエストが開始した後は、新しいパーティメンバーはクエストに参加できません。",
     "bossRageTitle": "怒り",
-    "bossRageDescription": "もしこのバーが満タンになると、ボスは特殊攻撃を放ちます！"
+    "bossRageDescription": "もしこのバーが満タンになると、ボスは特殊攻撃を放ちます！",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/ja/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "手動で健康、レベル、ゴールドのような値を変更します。",
     "enableClass": "クラスシステムを有効にする",
     "enableClassPop": "初期設定では、クラスシステムは無効に設定されています。有効にしますか?",
-    "showClass": "クラス・ツアーを表示する",
     "classTourPop": "クラス・システムのツアーを表示する",
     "resetAccount": "アカウントをリセットする",
     "resetAccPop": "全部のレベル、キン、ギア、履歴、業務が削除して始まりなおす",
@@ -40,9 +39,10 @@
     "xml": "（ＸＭＬ）",
     "json": "（ＪＳＯＮ）",
     "customDayStart": "カスタムの日の更新",
-    "24HrClock": "２４時間時計",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "デフォルト設定だと、Habiticaで設定された日課はユーザーのタイムゾーンでの0時にチェック・リセットされます。設定を変更するまえに、以下の情報を確認することが推奨されています:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "その他",
     "showHeader": "ヘッダーを表示する",
     "changePass": "パスワードを変更する",

common/locales/nl/groups.json

@@ -14,7 +14,7 @@
     "resources": "Hulpbronnen",
     "tavernTalk": "Herbergchat",
     "tavernAlert1": "Let op: ontwikkelaars zien het niet als je hier een bug meldt. Gebruik daar liever",
-    "tavernAlert2": "Github voor",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Herberg- en gildebeheerders zijn:",
     "communityGuidelines": "Gemeenschapsrichtlijnen",
     "communityGuidelinesRead1": "Lees alsjeblieft onze",
@@ -24,11 +24,17 @@
     "updatedParty": "Groepsinstellingen bijgewerkt.",
     "noPartyText": "Of je zit niet in een groep, of het duurt een tijdje om je groep in te laden. Je kunt eventueel een nieuwe groep aanmaken en vrienden uitnodigen; als je je bij een bestaande groep aan wil sluiten, laat ze dan onderstaand unieke gebruikers-ID invoeren en kom dan hier terug voor de uitnodiging:",
     "LFG": "Ga om je nieuwe groep te promoten of om een groep te vinden naar het gilde voor <%= linkStart %>berichten: groep gezocht<%= linkEnd %>.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Creëren",
     "userId": "Gebruikers-ID",
     "invite": "Uitnodigen",
     "leave": "Verlaten",
     "invitedTo": "Uitgenodigd voor <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nieuw bericht in \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Chat verzenden",
@@ -44,8 +50,8 @@
     "groupDescr": "Beschrijving voor de openbare gildelijst (Markdown mogelijk)",
     "logoUrl": "URL logo",
     "assignLeader": "Groepsleider aanwijzen",
-    "members": "Leden",
+    "members": "Members",
-    "partyList": "Volgorde van groepsleden in bovenbalk (laad website opnieuw in na veranderen volgorde)",
+    "partyList": "Order for party members in header",
     "banTip": "Lid verwijderen",
     "moreMembers": "overige leden",
     "invited": "Uitgenodigd",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Alleen de groepsleider kan uitdagingen aanmaken",
     "sendGift": "Geschenk versturen",
     "inviteFriends": "Vrienden Uitnodigen",
-    "inviteAlertInfo": "Nodig hier vrienden uit met hun <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'> Gebruikers-ID </a>.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Bestaande gebruiker uitnodigen",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Nodig vrienden uit via e-mail. Als ze lid worden via jouw e-mail, zullen ze automatisch uitgenodigd worden voor deze groep.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Door:",
-    "inviteNewUsers": "Nieuwe gebruiker(s) uitnodigen",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Of deel deze link (knip en plak):",
     "sendGiftHeading": "Geschenk verzenden naar <%= name %>",
     "sendGiftGemsBalance": "Van <%= number %> edelstenen",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Persoonlijk bericht (optioneel)",
     "sendGiftSubscription": "<%= months %> maand(en): $<%= price %>",
     "battleWithFriends": "Strijd met je vrienden tegen monsters",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Een groep beginnen",
     "addToParty": "Iemand aan je groep toevoegen",
-    "likePost": "Klik hier als je dit bericht leuk vindt!"
+    "likePost": "Klik hier als je dit bericht leuk vindt!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/nl/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Je hebt ontvangen",
     "dropQuestCongrats": "Gefeliciteerd, je hebt een queeste-perkamentrol gevonden! Je kunt je groep uitnodigen om er direct mee te beginnen, of er later alsnog mee starten via Boedel > Queesten.",
     "questSend": "Op \"Uitnodigen\" klikken stuurt een uitnodiging naar de groepsleden. Wanneer alle leden hebben geaccepteerd of geweigerd, begint de queeste. Zie de status onder Sociaal > Groep.",
-    "inviteParty": "Groep uitnodigen",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Uitnodiging voor queeste:",
     "questInvitationTitle": "Uitnodiging voor queeste",
     "questInvitationInfo": "Uitnodiging voor de queeste <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Kracht eindbaas",
     "collect": "Verzamel",
     "collected": "Verzameld",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Elke voltooide Dagelijkse Taak en To-do en elke positieve Gewoonte brengt schade toe aan de eindbaas. Breng meer schade toe met rodere taken of Wrede Slag en Uiteenspatting van Vlammen. De eindbaas brengt iedereen die meedoet aan de queeste schade toe voor iedere Dagelijkse Taak die je gemist hebt (vermenigvuldigd met de Kracht van de eindbaas), bovenop je normale schade, dus houd je groep gezond door je dagelijkse taken te doen! <strong>Alle schade van en aan een eindbaas wordt verrekend tijdens cron (je dagelijkse nieuwe start).</strong>",
     "bossDmg2": "Alleen deelnemers bevechten de eindbaas en delen de buit.",
     "tavernBossInfo": "Om een wereldbaas schade toe te brengen, moet je je Dagelijkse Taken en To-do's afvinken. Meer schade aan een taak betekent meer schade aan de eindbaas (rode taken voltooien, spreuken van de Magiër, aanvallen van de Krijger, enz). Voor elke Dagelijkse Taak die je mist (vermenigvuldigd met de Kracht van de eindbaas) neemt de Woede van de eindbaas toe. Als die Woede zijn maximum bereikt, gebeurt er iets naars - dus zorg ervoor dat je die dagelijkse taken doet! <strong>Alle schade aan en van een eindbaas wordt verrekend tijdens cron (je dagelijkse nieuwe start).</strong>",
     "bossColl1": "Om vondsten te verzamelen moet je positieve taken doen. De vondsten van de queeste werken hetzelfde als normale vondsten; je zult de vondsten echter niet zien tot de volgende dag, wanneer alles wat je hebt gevonden wordt opgeteld en aan de buit wordt toegevoegd.",
     "bossColl2": "Alleen deelnemers kunnen vondsten verzamelen en de buit delen.",
     "abort": "Afbreken",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Eigenaar van de queeste",
     "questOwnerNotInPendingQuest": "De eigenaar van de queeste heeft de queeste verlaten en kan deze niet meer handmatig starten. Advies is om de queeste te annuleren. De eigenaar van de queeste houdt de queeste-perkamentrol.",
     "questOwnerNotInRunningQuest": "De eigenaar van de queeste heeft de queeste verlaten. Als het nodig is, kun je de queeste afbreken. Het is ook mogelijk om de queeste door te laten gaan; alle resterende deelnemers krijgen hun beloning als de queeste afgelopen is.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Weet je het echt heel zeker? Zorg ervoor dat ze niet voor altijd een hekel aan je krijgen!",
     "questWarning": "Als nieuwe spelers bij de groep komen voordat de queeste begint, krijgen ze ook een uitnodiging. Als de queeste eenmaal begonnen is, kunnen nieuwe groepsleden zich echter niet bij de queeste aansluiten.",
     "bossRageTitle": "Woede",
-    "bossRageDescription": "Als deze balk vol is, zal de eindbaas een speciale aanval ontketenen."
+    "bossRageDescription": "Als deze balk vol is, zal de eindbaas een speciale aanval ontketenen.",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/nl/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Handmatig veranderen van waarden zoals gezondheidspunten, niveau en goud.",
     "enableClass": "Klassensysteem aanzetten",
     "enableClassPop": "Aanvankelijk had je geen klasse gekozen. Wil je er nu een kiezen?",
-    "showClass": "Rondleiding door klassen laten zien",
     "classTourPop": "Laat de rondleiding zien over hoe je het klassensysteem kunt gebruiken.",
     "resetAccount": "Account resetten",
     "resetAccPop": "Opnieuw starten, en alle niveaus, goud, uitrusting, geschiedenis en taken verliezen.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Begin van de dag aanpassen",
-    "24HrClock": "24-uursklok",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Standaard controleert en reset Habitica je Dagelijkse Taken elke nacht om middernacht in jouw tijdszone. Als je dat wilt veranderen, raden we je aan de volgende instructies te lezen:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Zorg ervoor dat je al je Dagelijkse Taken voltooid hebt voordat je het begin van de dag aanpast</strong> of <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>rust die dag uit in de herberg</a>. Het aanpassen van het begin van de dag kan ervoor zorgen dat <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> meteen optreedt, maar na die eerste dag zou het goed moeten werken.<br><br><strong>Geef het effect twee uur de tijf om in te treden.</strong> Als de dagstart nu bijvoorbeeld op 0 staat (middernacht), pas hem dan aan voor 10 uur 's avonds. Als je hem naar 9 uur 's avonds wil veranderen, doe dat dan voor 7 uur 's avonds.<br><br>Vul een uur in van 0 tot 23 (op een 24-uursklok). Typen werkt beter dan de pijltjestoetsen gebruiken. Herlaad het scherm nadat je de dagstart hebt aangepast om te controleren of de nieuwe waarde weergegeven wordt.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Diversen",
     "showHeader": "Bovenbalk laten zien",
     "changePass": "Wachtwoord veranderen",

common/locales/pl/groups.json

@@ -14,7 +14,7 @@
     "resources": "Zasoby",
     "tavernTalk": "Pogaduszki w Karczmie",
     "tavernAlert1": "Uwaga: nie zgłaszaj tu błędów w grze, bo Twórcy nie zauważą Twojego wpisu. Zgłoś błędy",
-    "tavernAlert2": "na portalu Github",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Moderatorami Karczmy i gildii są:",
     "communityGuidelines": "Regulamin Społeczności",
     "communityGuidelinesRead1": "Prosimy, przeczytaj nasz",
@@ -24,11 +24,17 @@
     "updatedParty": "Zaktualizowano stawienia drużyny.",
     "noPartyText": "Nie jesteś w drużynie albo twoja drużyna jeszcze się nie wczytała. Możesz albo stworzyć własną i zaprosić przyjaciół, albo - jeśli wolisz dołączyć do już istniejącej - poproś Przywódcę tej Drużyny aby wpisał twój unikalny ID użytkownika poniżej, a wtedy znajdziesz tutaj zaproszenie.",
     "LFG": "Aby zareklamować swoją nową drużynę lub znaleźć jakąś do przyłączenia się, idź do Gildii <%= linkStart %>Drużyna poszukiwana (szukam grupy)<%= linkEnd %>",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Stwórz",
     "userId": "ID Użytkownika",
     "invite": "Zaproś",
     "leave": "Opuść",
     "invitedTo": "Zaproszono do <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nowa wiadomość w \"<%= name %>\"",
     "chat": "Czat",
     "sendChat": "Wyślij",
@@ -44,8 +50,8 @@
     "groupDescr": "Opis pokazywany na liście publicznych Gildii (kodowanie Markdown dostępne)",
     "logoUrl": "Link do logo",
     "assignLeader": "Przydziel przywódcę grupy",
-    "members": "Członkowie",
+    "members": "Members",
-    "partyList": "Porządek listy członków drużyny w nagłówku (przeładuj przeglądarkę po zmianie porządku)",
+    "partyList": "Order for party members in header",
     "banTip": "Wywal gracza z Drużyny",
     "moreMembers": "więcej członków",
     "invited": "Zaproszenie",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Tylko przywódca grupy może tworzyć wyzwania",
     "sendGift": "Wyślij prezent",
     "inviteFriends": "Zaproś znajomych",
-    "inviteAlertInfo": "Zaproś tutaj znajomych za pomocą <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>ID użytkownika</a>.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Zaproś istniejącego użytkownika",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Zaproś znajomych przez e-maila. Jeśli dołączą się przez twojego e-maila, to zostaną automatycznie zaproszeni do tej grupy.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Przez:",
-    "inviteNewUsers": "Zaproś nowych użytkowników",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Lub podziel się tym odnośnikiem (kopiuj/wklej):",
     "sendGiftHeading": "Wyślij prezent dla <%= name %>",
     "sendGiftGemsBalance": "Posiadanych Klejnotów: <%= number %>",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Osobista wiadomość (opcjonalnie)",
     "sendGiftSubscription": "<%= months %> miesięcy: <%= price %> $",
     "battleWithFriends": "Zwalczaj potwory z przyjaciółmi",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Utwórz drużynę",
     "addToParty": "Dodaj kogoś do swojej drużyny",
-    "likePost": "Kliknij jeśli lubisz ten post!"
+    "likePost": "Kliknij jeśli lubisz ten post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/pl/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Otrzymałeś",
     "dropQuestCongrats": "Gratulacje za zdobycie tego zwoju misji! Teraz możesz zaprosić swoją drużynę i od razu rozpocząć misję, albo powrócić do niej w dowolnym momencie z poziomu Ekwipunek > Misje.",
     "questSend": "Naciśnięcie \"Zaproś\" wyśle zaproszenie do członków twojej drużyny. Gdy już wszyscy członkowie zaakceptują lub odrzucą zaproszenie, misja zostanie rozpoczęta. Możesz zobaczyć jej status pod Społeczność > Drużyna.",
-    "inviteParty": "Zaproś drużynę",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Zaproszenie do misji:",
     "questInvitationTitle": "Zaproszenie do misji",
     "questInvitationInfo": "Zaproszenie do misji <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Siła bossa",
     "collect": "Zebrano",
     "collected": "Zebrano",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Każde zakończone Codzienne i Do-Zrobienia oraz każdy pozytywny Nawyk rani bossa. Zrań go bardziej czerwieńszymi zadaniami lub Brutalnym uderzeniem i Eksplozją płomieni. Boss zada obrażenia każdemu uczestnikowi misji za każde pominięte Codzienne (pomnożone przez siłę bossa) jako dodatek do standardowych obrażeń, więc utrzymuj swoją drużynę w zdrowiu przez wypełnianie swoich Codziennych! <strong>Wszystkie obrażenia zadane bossowi i przez niego będą podsumowane przez crona (twoje przejście do następnego dnia).</strong>",
     "bossDmg2": "Tylko uczestnicy będą mogli walczyć z bossem i brać udział w podziale łupów.",
     "tavernBossInfo": "Aby zranić światowego bossa, wykonuj swoje Codzienne oraz Do-Zrobienia. Wyższe obrażenia od zadań oznaczają wyższe obrażenia zadane bossowi (wypełnianie czerwonych zadań, zaklęcia Czarodzieja, ataki Wojownika, itd). Za każdy Codzienny obowiązek, który pominiesz (pomnożony przez Siłę bossa), jego Furia wzrośnie. Kiedy Furia osiągnie maksimum, stanie się coś złego ­– więc wypełniaj swoje Codzienne! <strong>Wszystkie obrażenia zadane bossowi i przez niego, będą podsumowane przy cronie (podczas zmiany twojego dnia).</strong>",
     "bossColl1": "Aby zbierać przedmioty, wykonuj pozytywne zadania. Przedmioty misyjne znajdujesz tak samo jak zwykłe, jednakże nie zobaczysz łupów aż do końca dnia – wtedy to wszystkie przedmioty zostaną wyszczególnione i dodane do sterty.",
     "bossColl2": "Tylko uczestnicy mogą zbierać przedmioty i brać udział w podziale łupów.",
     "abort": "Przerwij",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Właściciel misji",
     "questOwnerNotInPendingQuest": "Właściciel misji opuścił misję i nie może jej już rozpocząć. Zaleca się anulowanie jej na tym etapie. Właściciel misji zatrzyma zwój misji.",
     "questOwnerNotInRunningQuest": "Właściciel misji opuścił misję. Możesz ją porzucić, jeśli chcesz. Możesz ją także kontynować, a wszyscy uczestnicy, którzy zostaną, otrzymają nagrody misji po jej ukończeniu.",
@@ -55,9 +59,13 @@
     "mustInviteFriend": "By zdobyć tą misję, zaproś przyjaciela do swojej drużyny. Zaprosić kogoś teraz?",
     "unlockByQuesting": "By zdobyć tą misję, najpierw ukończ <%= title %>.",
     "sureCancel": "Czy na pewno chcesz zakończyć tę misję? Wszystkie zaakceptowane zaproszenia zostaną stracone. Właściciel misji zachowa zwój misji.",
-    "sureAbort": "Czy na pewno chcesz porzucić tę misję? Zostanie przerwana dla każdego członka twojej drużyny i cały postęp zostanie stracony. Zwój misji zostanie zwrócony właścicielowi. ",
+    "sureAbort": "Czy na pewno chcesz porzucić tę misję? Zostanie przerwana dla każdego członka twojej drużyny i cały postęp zostanie stracony. Zwój misji zostanie zwrócony właścicielowi.",
     "doubleSureAbort": "Czy jesteś pewien? Drużyna się na Ciebie nie obrazi?",
     "questWarning": "Jeśli nowi gracze dołączą do drużyny zanim rozpocznie się misja, również dostaną zaproszenie do niej. Jednakże kiedy już misja się zacznie, żadni nowi członkowie drużyny nie będą mogli  dołączyć do misji.",
     "bossRageTitle": "Furia",
-    "bossRageDescription": "Gdy pasek się zapełni, boss wykona atak specjalny!"
+    "bossRageDescription": "Gdy pasek się zapełni, boss wykona atak specjalny!",
-}
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
+}

common/locales/pl/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Manualnie zmienia wartości takie jak Zdrowie, Poziom i Złoto.",
     "enableClass": "Odblokuj system klas",
     "enableClassPop": "Wyłączyłeś wcześniej system klas. Czy chcesz włączyć go teraz ponownie?",
-    "showClass": "Pokaż przewodnik po klasach",
     "classTourPop": "Pokazuje przewodnik objaśniający działanie systemu klas.",
     "resetAccount": "Zresetuj konto",
     "resetAccPop": "Zacznij od początku. Usuwa wszystkie poziomy, złoto, wyposażenie, historię, oraz zadania.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Własny początek dnia",
-    "24HrClock": "zegar 24-godzinny",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica domyślnie sprawdza i resetuje twoje Codzienne o północy każdego dnia w twojej strefie czasowej. Zaleca się przeczytanie poniższych informacji przed jego zmianą.",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Wykonaj wszystkie swoje Codzienne przed zmianą Własnego początku dnia</strong> lub <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Odpoczywaj w Gospodzie</a> tego dnia. Zmiana Własnego początku dnia może spowodować natychmiastowe uruchomienie <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Crona</a>, jednak po pierwszym dniu działa on zgodnie z założeniami.<br><br><strong>Pozwól na dwugodzinne okno przerwy w celu wprowadzenia zmian.</strong> Dla przykładu, jeśli aktualnie jest ustawione na 0:00 (północ), zmień go przed 22:00; jeśli chcesz go ustawić na 21:00, zmień go przed 19:00.<br><br>Wprowadź godzinę od 0 do 23 (używa 24-godzinnego zegara). Wpisywanie jest skuteczniejsze niż klawisze strzałek. Po ustawieniu przeładuj stronę w celu potwierdzenia, że wyświetlane są nowe wartości.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Pozostałe",
     "showHeader": "Pokaż nagłówek",
     "changePass": "Zmień hasło",

common/locales/pt/groups.json

@@ -14,7 +14,7 @@
     "resources": "Recursos",
     "tavernTalk": "Conversas da Taverna",
     "tavernAlert1": "Nota: se estiver reportando um bug, os desenvolvedores não o verão aqui. Por favor,",
-    "tavernAlert2": "use o GitHub",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Os moderadores da taverna e guilda são:",
     "communityGuidelines": "Diretrizes de Comunidade",
     "communityGuidelinesRead1": "Por favor, leia nossas",
@@ -24,11 +24,17 @@
     "updatedParty": "Configurações de equipe atualizadas.",
     "noPartyText": "Você ou não faz parte de uma equipe ou sua equipe está demorando para carregar. Você pode criar uma e convidar amigos ou, se quiser entrar em uma equipe já existente, colocar o seu ID de Usuário abaixo e então voltar aqui para procurar por um convite:",
     "LFG": "Para anunciar sua nova equipe ou achar uma à que se juntar, vá para a guilda <%= linkStart %>Mensagens de Procura de Grupo (Equipe Desejada)<%= linkEnd %>.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Criar",
     "userId": "ID do Usuário",
     "invite": "Convidar",
     "leave": "Sair",
     "invitedTo": "Convidado para <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nova mensagem em \"<%= name %>\"",
     "chat": "Conversas",
     "sendChat": "Enviar Mensagem",
@@ -44,8 +50,8 @@
     "groupDescr": "Descrição mostrada na lista pública de Guildas (Markdown OK)",
     "logoUrl": "URL do Logo",
     "assignLeader": "Nomear Líder do Grupo",
-    "members": "Membro(s)",
+    "members": "Members",
-    "partyList": "Ordem para os membros da equipe no cabeçalho (atualize o navegador após alterar a ordem)",
+    "partyList": "Order for party members in header",
     "banTip": "Expulsar Membro",
     "moreMembers": "mais membros",
     "invited": "Convidado",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Somente o líder do grupo pode criar desafios",
     "sendGift": "Enviar Presente",
     "inviteFriends": "Convidar Amigos",
-    "inviteAlertInfo": "Convidar amigos por <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a>  aqui.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Convidar Utilizador Existente",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Convidar amigos por email. Se eles se juntarem através do seu email, então serão automaticamente convidados para este grupo.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Por:",
-    "inviteNewUsers": "Convidar Novo(s) Utilizador(es)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Ou partilhe este link (copiar/colar):",
     "sendGiftHeading": "Enviar Presente para <%= name %>",
     "sendGiftGemsBalance": "De <%= number %> Gemas",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Mensagem Pessoal (opcional)",
     "sendGiftSubscription": "<%= months %> Mês(es): $<%= price %>",
     "battleWithFriends": "Enfrente monstros com os amigos",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Começar uma Equipe",
     "addToParty": "Adicione alguém em sua equipe",
-    "likePost": "Clique se você gostou desta publicação!"
+    "likePost": "Clique se você gostou desta publicação!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/pt/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Você Recebeu",
     "dropQuestCongrats": "Parabéns, você ganhou um pergaminho de missão! Você pode convidar seu grupo para começar a missão agora mesmo, ou voltar a qualquer momento em Inventário > Missões.",
     "questSend": "Clicar em \"Convidar\" enviará um convite para os membros da sua equipe. Quando todos membros aceitarem ou rejeitarem, a missão começará. Veja o estado da missão em Social > Equipe.",
-    "inviteParty": "Convidar Equipe",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Convite de Missão:",
     "questInvitationTitle": "Convite para Missão",
     "questInvitationInfo": "Convite para a Missão <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Força do Chefão",
     "collect": "Coletar",
     "collected": "Coletado",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Todos os Afazeres e Tarefas Diárias completadas e cada Hábito positivo causa dando no Chefão. Cause mais dano com tarefas mais vermelhas, com Destruição Brutal ou com Explosão de Chamas. O Chefão causará dano em todos os participantes da missão por cada Tarefa Diária perdida (multiplicada pela Força do Chefão) em adição ao seu dano normal, então mantenha a saúde da sua equipe completando suas Tarefas Diárias. <strong>Todo o dano recebido ou inflingido ao Chefão é computado no seu Cron (virada do dia).</strong>",
     "bossDmg2": "Apenas participantes lutarão contra o chefão e dividirão as recompensas da missão.",
     "tavernBossInfo": "Para ferir um chefão de mundo, complete suas Tarefas Diárias e Afazeres. Dano alto de tarefa significa maior dano ao chefão (completar tarefas vermelhas, feitiços de Magos, ataques de Guerreiros, etc). Para cada Tarefa Diária que você perder (multiplicada pela Força do chefão), a Ira do chefão irá aumentar. Uma vez que sua Ira chegar ao máximo, alguma coisa ruim irá acontecer - então, complete suas Tarefas Diárias! <strong>Todo dano causado para e pelo chefão é registrado no cron (na sua virada do dia).</strong>",
     "bossColl1": "Para coletar itens, complete suas tarefas positivas. Itens de missão aparecem assim como itens normais; entretanto, você não verá a coleta até o dia seguinte, então tudo que você encontrou será registrado e contribuído à pilha.",
     "bossColl2": "Apenas participantes podem coletar itens e dividir as recompensas da missão.",
     "abort": "Abortar",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Dono da Missão",
     "questOwnerNotInPendingQuest": "O dono da missão deixou a missão e não pode mais iniciá-la. Recomenda-se que você a cancele agora. O dono da missão manterá a posse do pergaminho de missão.",
     "questOwnerNotInRunningQuest": "O dono da missão deixou a missão. Você pode abortar a missão se precisar. Você também pode permitir que a missão continue e todos os participantes remanescentes receberão as recompensas quando a missão terminar.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Tem certeza mesmo? Certifique-se de que eles não o detestarão para sempre!",
     "questWarning": "Se novos jogadores se juntarem à equipe antes do início da missão, eles também receberão um convite. Contudo, uma vez que a missão comece, nenhum membro novo da equipe poderá entrar nela.",
     "bossRageTitle": "Ira",
-    "bossRageDescription": "Quando essa barra encher, o chefão irá soltar um ataque especial!"
+    "bossRageDescription": "Quando essa barra encher, o chefão irá soltar um ataque especial!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/pt/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Alterar manualmente os valores como Vida, Nível, e Ouro.",
     "enableClass": "Habilitar Sistema de Classe",
     "enableClassPop": "Você optou por não usar o sistema de classe inicialmente? Deseja habilitar agora?",
-    "showClass": "Mostrar Tour das Classes",
     "classTourPop": "Mostra o tour de como usar o sistema de classes.",
     "resetAccount": "Reiniciar Conta",
     "resetAccPop": "Comece de novo, removendo todos níveis, ouro, equipamentos, histórico, e tarefas.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Início do Dia Personalizado",
-    "24HrClock": "Relógio 24hrs",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Por padrão, Habitica verifica e redefine suas tarefas diárias todos os dias à meia-noite no seu próprio fuso horário. É recomendado que você leia as seguintes informações antes de alterar isso:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete todas as suas Tarefas Diárias antes de alterar o seu Horário de Início do Dia</strong> ou <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Descanse na Pousada</a> neste dia. Alterar o seu Horário de Início do Dia pode levar o <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> a começar imediatamente, mas depois do primeiro dia irá funcionar como esperado.<br><br><strong>Espere até duas horas para as mudanças tenham efeito.</strong> Por exemplo: se estiver atualmente definido como 0 (meia-noite), altere antes das 10 da noite; se quiser alterar para às 9 PM, faça a mudança antes das 7 PM.<br><br>Preencha um horário de 0 à 23 (o sistema usa um relógio de 24 horas). Digitar é mais efetivo do que usar as setas. Uma vez definido, atualize a página para confirmar se o novo valor está sendo mostrado corretamente.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Variados",
     "showHeader": "Mostrar Cabeçalho",
     "changePass": "Alterar Senha",

common/locales/ro/groups.json

@@ -14,7 +14,7 @@
     "resources": "Resurse",
     "tavernTalk": "Bârfe de cârciumă",
     "tavernAlert1": "Notă: dacă vrei să semnalezi o eroare, dezvoltatorii n-o vor vedea aici. Te rugăm",
-    "tavernAlert2": "folosește Github",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Cârciuma şi moderatorii ghildelor sunt:",
     "communityGuidelines": "Community Guidelines",
     "communityGuidelinesRead1": "Please read our",
@@ -24,11 +24,17 @@
     "updatedParty": "Party settings updated.",
     "noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:",
     "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Creează",
     "userId": "ID Utilizator",
     "invite": "Invită",
     "leave": "Părăseşte",
     "invitedTo": "Invitat la  <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Mesaj nou în „<%= name %>”",
     "chat": "Chat",
     "sendChat": "Trimite Chat",
@@ -44,8 +50,8 @@
     "groupDescr": "Descrierea vizibilă în lista publică a Ghildelor (poți folosi Markdown)",
     "logoUrl": "URL logo",
     "assignLeader": "Stabilește liderul grupului",
-    "members": "Membri",
+    "members": "Members",
-    "partyList": "Order for party members in header (reload browser after changing order)",
+    "partyList": "Order for party members in header",
     "banTip": "Exclude membru",
     "moreMembers": "mai mulți membri",
     "invited": "Invitați",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only group leader can create challenges",
     "sendGift": "Send Gift",
     "inviteFriends": "Invite Friends",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invite Existing User",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "By:",
-    "inviteNewUsers": "Invite New User(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Send Gift to <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Gems",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Start a Party",
     "addToParty": "Add someone to your party",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/ro/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Ai primit",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Invită Echipa",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Invitație la Aventuri:",
     "questInvitationTitle": "Quest Invitation",
     "questInvitationInfo": "Invitation for the Quest <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Boss Strength",
     "collect": "Collect",
     "collected": "Adunate",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "Doar participanții se vor lupta cu monstrul și vor împărți prada aventurii.",
     "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossColl1": "Pentru a aduna obiecte, îndeplinește țeluri pozitive. Obiectele specifice aventurii apar la fel ca obiectele obișnuite; totuși, nu le vei vedea decât a doua zi, atunci tot ce vei fi adunat va fi socotit și adăugat grămezii.",
     "bossColl2": "Doar participanții pot aduna obiecte și împărți prada aventurii.",
     "abort": "Abandon",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Proprietarul aventurii",
     "questOwnerNotInPendingQuest": "Proprietarul aventurii a abandonat aventure și nu o mai poate începe. Se recomandă să o anulezi acum. Proprietarul aventurii va păstra răvașul aventurii.",
     "questOwnerNotInRunningQuest": "The quest owner has left the quest. You can abort the quest if you need to. You can also allow it to keep running and all remaining participants will receive the quest rewards when the quest finishes.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Eşti sigur sigur ? Asigură-te că nu te vor urî pentru totdeauna!",
     "questWarning": "Dacă jucători noi se înscriu în echipă înainte ca aventura să pornească, aceştia vor primi şi ei o invitaţie. Dacă totuşi aventura a început deja, niciun nou jucător nu se poate alătura acesteia.",
     "bossRageTitle": "Furie",
-    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!"
+    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/ro/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Schimbă manual valori ca Sănătate, Nivel și Aur.",
     "enableClass": "Activează Sistemul de Clase.",
     "enableClassPop": "Inițial, ai dezactivat sistemul de clase. Vrei să îl reactivezi acum?",
-    "showClass": "Arată Turul de prezentare a Claselor",
     "classTourPop": "Arată turul de prezentare a utilizării sistemului de clase.",
     "resetAccount": "Resetează contul",
     "resetAccPop": "Ia-o de la început, eliminiând toate nivelele, aurul, echipamentul, istoricul și țelurile.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Când începe ziua",
-    "24HrClock": "Ceas cu 24H",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Altele",
     "showHeader": "Arată antet",
     "changePass": "Schimbă parola",

common/locales/ru/groups.json

@@ -14,7 +14,7 @@
     "resources": "Ресурсы",
     "tavernTalk": "Разговор в Таверне",
     "tavernAlert1": "Примечание: если вы хотите сообщить об ошибке, разработчики не прочтут ваше сообщение здесь. Пожалуйста,",
-    "tavernAlert2": "сделайте это на Github",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Модераторы Таверны и гильдий:",
     "communityGuidelines": "Правила сообщества",
     "communityGuidelinesRead1": "Пожалуйста, прочтите",
@@ -24,11 +24,17 @@
     "updatedParty": "Настройки команды обновлены.",
     "noPartyText": "Вы не в команде, либо ее загрузка занимает время. Вы можете создать новую команду и пригласить друзей или, если хотите присоединиться к существующей, попросите ее участников ввести ваш персональный ID:",
     "LFG": "Объявить о создании новой команды или найти подходящую и присоединиться к ней можно в гильдии <%= linkStart %>Требуется команда (поиск команды)<%= linkEnd %>.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Создать",
     "userId": "ID пользователя",
     "invite": "Пригласить",
     "leave": "Выйти",
     "invitedTo": "Получено приглашение в <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Новое сообщение в «<%= name %>»",
     "chat": "Чат",
     "sendChat": "Написать в чат",
@@ -44,8 +50,8 @@
     "groupDescr": "Описание, которое отображается в списке открытых гильдий (можно использовать Markdown)",
     "logoUrl": "Ссылка на логотип",
     "assignLeader": "Назначить лидера группы",
-    "members": "Член(ы)",
+    "members": "Members",
-    "partyList": "Упорядочить по участникам в списке (перезапустить браузер после изменения порядка)",
+    "partyList": "Order for party members in header",
     "banTip": "Выгнать",
     "moreMembers": "других членов",
     "invited": "Приглашение отправлено",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Только лидер группы может создавать испытания",
     "sendGift": "Отправить подарок",
     "inviteFriends": "Пригласить друзей",
-    "inviteAlertInfo": "Здесь можно пригласить друзей по <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>ID пользователя</a>.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Пригласить существующего пользователя",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Пригласить друзей по почте. Если они присоединятся по ссылке из вашего письма, они будут автоматически приглашены в эту группу.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "От:",
-    "inviteNewUsers": "Пригласить Новых Пользователей",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Или поделитесь этой ссылкой (Скопировать/Вставить)",
     "sendGiftHeading": "Отправить подарок <%= name %>",
     "sendGiftGemsBalance": "Из <%= number %> самоцветов",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Личное сообщение (необязательно)",
     "sendGiftSubscription": "<%= months %> месяц(а/ев): $<%= price %>",
     "battleWithFriends": "Побеждайте монстров с друзьями",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Создать команду",
     "addToParty": "Пригласите участника в команду",
-    "likePost": "Кликните, если нравится пост!"
+    "likePost": "Кликните, если нравится пост!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/ru/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Вы получили",
     "dropQuestCongrats": "Поздравляем с получением этого свитка квеста! Вы можете пригласить команду для начала квеста прямо сейчас или вернуться к нему позже в любое время через раздел Инвентарь > Квесты.",
     "questSend": "Нажатие кнопки «Пригласить» отправит приглашения всем членам команды. Когда все члены команды ответят на него (согласием или отказом), квест начнется. Текущий статус можно посмотреть во вкладке Общение > Команда",
-    "inviteParty": "Пригласить команду",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Приглашение на участие в квесте",
     "questInvitationTitle": "Приглашение на квест",
     "questInvitationInfo": "Приглашение на квест \"<%= quest %>\"",
@@ -29,12 +29,16 @@
     "bossStrength": "Сила босса",
     "collect": "Собрать",
     "collected": "Собрано",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Босс получает урон от каждого завершенного ежедневного задания, каждой задачи и каждой полезной привычки. Вы можете нанести больше урона, выполняя красные задания и используя Мощный удар или Всплеск пламени. Босс нанесет урон каждому участнику квеста за каждое пропущенное ежедневное задание (ущерб от задания, умноженный на силу босса) в дополнение к обычному урону. Старайтесь поддерживать здоровье команды, выполняя ежедневные задания! <strong>Весь урон, нанесенный команде и боссу, засчитывается в момент смены суток (по окончании вашего дня).</strong>",
     "bossDmg2": "Только участники будут сражаться с боссом и разделят квестовые трофеи.",
     "tavernBossInfo": "Чтобы нанести урон боссу, выполняйте свои задачи и ежедневные задания. Чем сложнее задание, тем больший урон вы нанесете боссу выполняя его (красные задания, заклинания магов, атаки воинов и так далее). Ярость босса будет увеличиваться за каждое невыполненное ежедневное задание (урон от него умножается на силу босса). Когда его ярость достигнет максимума произойдёт что-то плохое, поэтому выполняйте свои ежедневные задания! <strong>Весь урон боссу и от босса подсчитывается по расписанию (в ваш момент смены суток).</strong>",
     "bossColl1": "Чтобы собирать предметы, выполняйте положительные задания. Квестовые предметы падают точно так же, как обычные; однако, вы не увидите, что упало, до начала следующего дня — тогда всё, что вы нашли, будет посчитано и сложено в общую стопку.",
     "bossColl2": "Только участники могут собрать предметы и разделять квестовые трофеи.",
     "abort": "Прервать",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Создатель квеста",
     "questOwnerNotInPendingQuest": "Владелец квеста забросил его, и он не может быть выполнен. Вам рекомендуется отменить квест. Владелец квеста сохранит владение свитком",
     "questOwnerNotInRunningQuest": "Владелец квеста бросил его. . Вы можете отменить квест, если нужно, но можно и оставить, тогда все оставшиеся члены группы получат награду, когда квест завершится.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Вы точно-точно уверены? Подумайте, не будут ли они ненавидеть вас всю жизнь после этого?",
     "questWarning": "Получайте приглашение на участие в квесте до его начала, т.к. после старта ни один новый член команды не сможет к нему присоединиться.",
     "bossRageTitle": "Ярость",
-    "bossRageDescription": "Когда полоска заполнится, босс произведет особую атаку!"
+    "bossRageDescription": "Когда полоска заполнится, босс произведет особую атаку!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/ru/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Вручную изменить данные: здоровье, уровень и золото.",
     "enableClass": "Включить систему классов",
     "enableClassPop": "Ранее вы отказались от системы классов. Хотите включить ее сейчас?",
-    "showClass": "Показать тур по классам",
     "classTourPop": "Показать ознакомительный тур по использованию системы классов.",
     "resetAccount": "Сброс учетной записи",
     "resetAccPop": "Начать заново, потеряв все уровни, золото, экипировку, историю и задачи.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Персональное начало суток",
-    "24HrClock": "24-часовой формат",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica по умолчанию проверяет и сбрасывает ваши ежедневные задачи каждый день в полночь по вашему часовому поясу. Рекомендуем прочитать следующую информацию, прежде чем изменять настройки:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Разное",
     "showHeader": "Показывать область персонажа",
     "changePass": "Изменение пароля",

common/locales/sk/groups.json

@@ -14,7 +14,7 @@
     "resources": "Zdroje",
     "tavernTalk": "Pokec v hostinci",
     "tavernAlert1": "Poznámka: ak nahlasuješ bug, tu si ho vývojári nevšimnú. Prosím",
-    "tavernAlert2": "radšej použi Github",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Moderátori hostinca a cechu sú:",
     "communityGuidelines": "Community Guidelines",
     "communityGuidelinesRead1": "Please read our",
@@ -24,11 +24,17 @@
     "updatedParty": "Party settings updated.",
     "noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:",
     "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Vytvoriť",
     "userId": "ID používateľa",
     "invite": "Pozvať",
     "leave": "Opustiť",
     "invitedTo": "Pozvaný do <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nová správa v \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Odoslať",
@@ -44,8 +50,8 @@
     "groupDescr": "Popis zobrazujúci sa vo verejnom zozname cechov (Markdown je OK)",
     "logoUrl": "URL loga",
     "assignLeader": "Vodca družiny",
-    "members": "Člen(ovia)",
+    "members": "Members",
-    "partyList": "Order for party members in header (reload browser after changing order)",
+    "partyList": "Order for party members in header",
     "banTip": "Vykopnúť člena",
     "moreMembers": "viac členov",
     "invited": "Pozvaný",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only group leader can create challenges",
     "sendGift": "Poslať darček",
     "inviteFriends": "Pozvať priateľov",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Pozvať existujúceho používateľa",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "By:",
-    "inviteNewUsers": "Pozvať nového používateľa(ov)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Poslať darček pre <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Gems",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Založiť družinu",
     "addToParty": "Add someone to your party",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/sk/quests.json

@@ -13,10 +13,10 @@
     "youReceived": "Získal si",
     "dropQuestCongrats": "Gratulujeme ti k získaniu zvitku výpravy! Teraz môžeš pozvať svoju družinu na výpravu alebo sa môžeš kedykoľvek vrátiť cez Inventár -> Výpravy.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Pozvať družinu",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Pozvánka na výpravu:",
-    "questInvitationTitle": "Quest Invitation",
+    "questInvitationTitle": "Pozvánka na výpravu",
-    "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+    "questInvitationInfo": "Pozvánka na výpravu <%= quest %>",
     "askLater": "Spýtať sa neškôr",
     "questLater": "Quest Later",
     "buyQuest": "Kúpiť výpravu",
@@ -29,18 +29,22 @@
     "bossStrength": "Boss Strength",
     "collect": "Collect",
     "collected": "Nazbieraných",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "Len tí, čo sú na výprave môžu bojovať s bossom a podeliť sa o korisť.",
     "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossColl1": "Pre získanie predmetov musíš plniť svoje dobré návyky. Predmety za ukončenie výpravy padajú ako normálne predmety, ale uvidíš ich až nasledujúci deň. Vtedy sa všetko sčíta a pridá na hromadu.",
     "bossColl2": "Len tí, čo sú na výprave môžu zbierať predmety a podeliť sa o korisť.",
     "abort": "Ukončiť",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Vlastník výpravy",
     "questOwnerNotInPendingQuest": "Vlastník výpravy opustil výpravu a teda ju už nemôže začať. Odporúčame aby si ju teraz ukončil. Vlastník výpravy získa zvitok naspäť.",
     "questOwnerNotInRunningQuest": "Vlastník výpavy ju opustil. Môžes ju opustiť aj ty, ak potrebuješ. Ale môžeš aj ďalej pokračovať a všetci účastníci na konci dostanú odmeny za danú výpravu.",
     "questOwnerNotInPendingQuestParty": "Vlastník výpravy opustil družinu a teda ju už nemôže začať výpravu. Odporúčame aby si ju teraz ukončil. Vlastník výpravy získa zvitok naspäť.",
     "questOwnerNotInRunningQuestParty": "Vlastník výpavy opustil družinu. Môžeš odísť z výpravy, ak potrebuješ. Ale môžeš aj ďalej pokračovať a všetci účastníci na konci dostanú odmeny za danú výpravu.",
-    "questParticipants": "Participants",
+    "questParticipants": "Účastníci",
     "scrolls": "Zvitky s mapami výprav",
     "noScrolls": "Nemáš žiadne zvitky s mapami výprav.",
     "scrollsText1": "Ak chceš ísť na výpravu, potrebuješ družinu. Ak chceš ísť sólo,",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Si si naozaj istý? Uisti sa, že ťa potom nebudú naveky neznášať!",
     "questWarning": "Ak sa nový hráči pridajú do družiny pred začiatkom výpravy, dostanú pozvánku aj oni. Ale ak sa už výprava začala, noví hráči sa nebudú môcť na ňu pridať.",
     "bossRageTitle": "Zúrivosť",
-    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!"
+    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/sk/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Manuálne nastav hodnoty ako zdravie, level, a zlato.",
     "enableClass": "Povoliť povolania",
     "enableClassPop": "Pôvodne si povolania odmietol. Chceš ich začať používať?",
-    "showClass": "Zobraziť prehliadku povolaní",
     "classTourPop": "Zobraziť prehliadku s informáciami o používaní povolaní.",
     "resetAccount": "Resetovať konto",
     "resetAccPop": "Začať odznovu, zrušiť všetky levely, zlato, výzbroj, históriu a úlohy.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Vlastný začiatok dňa",
-    "24HrClock": "24-hodinový formát hodí",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Rôzne",
     "showHeader": "Zobraziť záhlavie",
     "changePass": "Zmeniť heslo",
@@ -72,8 +72,8 @@
     "fillAll": "Prosím, vyplň všetky polia",
     "passwordSuccess": "Heslo úspešne zmenené",
     "usernameSuccess": "Prihlasovacie meno úspešne zmenené",
-    "emailSuccess": "Email successfully changed",
+    "emailSuccess": "Email bol úspešne zmenený",
-    "detachFacebook": "De-register Facebook",
+    "detachFacebook": "Odregistrovať Facebook",
     "detachedFacebook": "Successfully removed Facebook from your account",
     "addedLocalAuth": "Successfully added local authentication",
     "data": "Data",
@@ -89,7 +89,7 @@
     "loginNameDescription2": "Používateľ->Profil",
     "loginNameDescription3": "to change the name that appears in your avatar and chat messages.",
     "emailNotifications": "Email notifikácie",
-    "wonChallenge": "You Won a Challenge",
+    "wonChallenge": "Vyhral si výzvu",
     "newPM": "Received Private Message",
     "giftedGems": "Gifted Gems",
     "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",

common/locales/sr/groups.json

@@ -14,7 +14,7 @@
     "resources": "Resursi",
     "tavernTalk": "Razgovori u Krčmi",
     "tavernAlert1": "Napomena: Ako ovde prijavite problem, programeri to neće videti. Molimo Vas da to",
-    "tavernAlert2": "učinite na GitHub-u.",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Moderatori za Krčmu i udruženja su:",
     "communityGuidelines": "Pravila ponašanja",
     "communityGuidelinesRead1": "Molimo Vas da pročitate",
@@ -24,11 +24,17 @@
     "updatedParty": "Postavke družine su izmenjene.",
     "noPartyText": "Niste član družine, ili se Vaša družina sporo učitava. Možete da organizujete novu družinu i pozovete prijatelje, ili, ako hoćete da se priključite postojećoj družini, da im date svoj UUID, pomoću kog će Vas pozvati, a pozivnica će Vam stići ovde:",
     "LFG": "Članove za svoju družinu, ili družinu kojoj biste se priključili, možete tražiti na stranici udruženja <%= linkStart %>Tražim družinu<%= linkEnd %>.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Organizovati",
     "userId": "Korisnički ID (UUID)",
     "invite": "Pozvati",
     "leave": "Napustiti družinu/udruženje",
     "invitedTo": "Pozvani ste u <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nova poruka u „<%= name %>”",
     "chat": "Čet",
     "sendChat": "Poslati",
@@ -44,8 +50,8 @@
     "groupDescr": "Opis koji se pojavljuje u spisku udruženja (podržava Markdown)",
     "logoUrl": "Logo URL",
     "assignLeader": "Vođa grupe",
-    "members": "članova",
+    "members": "Members",
-    "partyList": "Uputstva za članove družine (osvežite stranicu kad promenite uputstva)",
+    "partyList": "Order for party members in header",
     "banTip": "Izbaciti člana",
     "moreMembers": "još članova",
     "invited": "Poziv poslat",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Samo vođa grupe može da napravi izazov",
     "sendGift": "Poslati poklon",
     "inviteFriends": "Pozvati prijatelje",
-    "inviteAlertInfo": "Ovde možete pozvati prijatelje ako znate njihov <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>UID</a>",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Pozvati registrovanog korisnika",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Pozovite prijatelje imejlom. Ako se registruju preko linka iz poruke, automatski će biti pozvani u ovu grupu.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "Od:",
-    "inviteNewUsers": "Pozvati nove korisnike",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Ili pošaljilte ovaj link (copy/paste):",
     "sendGiftHeading": "Send Gift to <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Gems",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Start a Party",
     "addToParty": "Add someone to your party",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/sr/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Dobili ste",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Pozvati družinu",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Poziv u misiju:",
     "questInvitationTitle": "Poziv u misiju",
     "questInvitationInfo": "Poziv u misiju <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Snaga Bosa",
     "collect": "Sakupiti",
     "collected": "Sakupljeno",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Završavajte svoje Svakodnevne i Jednokratne zadatke da biste naneli štetu bosu. Crveni zadaci, Vatra, i Divlji udarac načiniće još veću štetu. Za svaki propušten Svakodnevni zadatak bos nanosi štetu svakom učesniku misije (šteta od zadatka pomnožena sa snagom bosa) povrh normalne štete od zadatka. Završavajte Svakodnevne zadatke kako bi vaša družina bila zdrava. <strong>Sva šteta koju bos primi i nanese obračunava se na kraju dana.(odnosno u trenutku smene između dva dana).</strong>",
     "bossDmg2": "Samo učesnici će se boriti protiv bosa i dobiti deo plena.",
     "tavernBossInfo": "Završavajte svoje Svakodnevne i Jednokrate zadatke da biste naneli štetu bosu. Zadaci sa većom štetom više će povrediti bosa (crveni zadaci, magije Čarobnjaka, napadi Ratnika, itd). Bos dobija Bes za svaki propušten Svakodnevni zadatak (pomnoženo sa snagom bosa). Kad Bes dostigne maksimalnu vrednost, desiće se nešto loše. Zato završavajte Svakodnevne zadatke. <strong>Sva šteta koju bos primi i nanese obračunava se na kraju dana.(odnosno u trenutku smene između dva dana).</strong>",
     "bossColl1": "Da biste dobili predmete, radite pozitivne zadatke.Na misiji predmeti padaju na isti način kao i inače, ali nećete moći da ih vidite do sledećeg dana, kad će svi nađeni predmeti biti sakupljeni na gomilu.",
     "bossColl2": "Samo učesnici mogu da preuzmu predmete i dobiju deo plena.",
     "abort": "Prekinuti",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Vlasnik misije.",
     "questOwnerNotInPendingQuest": "Vlasnik misije je napustio misiju i više ne može da je pokrene. Preporučujemo Vam da odustanete od misije. Svitak sa misijom vraćen je vlasniku.",
     "questOwnerNotInRunningQuest": "Vlasnik misije je napustio misiju. Možete da prekinete misiju ako želite. Možete i da nastavite, a preostali učesnici dobiće nagrade kad završe misiju.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Jeste li sigurni da ste sigurni? Ne radite nešto zbog čega ćete se kajati.",
     "questWarning": "Ako novi igrači pristupe družini pre nego što misija počne, i oni će dobiti pozivnice. Kad misija počne, novi članovi družine ne mogu da se priključe.",
     "bossRageTitle": "Bes",
-    "bossRageDescription": "Kada se ova skala popuni, bos će upotrebiti specijalni napad."
+    "bossRageDescription": "Kada se ova skala popuni, bos će upotrebiti specijalni napad.",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/sr/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Ručno podešavanje vrednosti poput Zdravlja, Zlata, i nivoa.",
     "enableClass": "Uključiti sistem klasa",
     "enableClassPop": "Sistem klasa je isključen. Želite li da ga uključite?",
-    "showClass": "Prikazati objašnjenje klasa",
     "classTourPop": "Prikazati objašnjenje za upotrebu sistema klasa.",
     "resetAccount": "Vratiti nalog na početno stanje",
     "resetAccPop": "Nulirajte novi, zlato, opremu, istoriju, i zadatke, i počnite iz početka.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Vreme početka dana",
-    "24HrClock": "24-časovni format",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica je automatski podešen da u ponoć proveri stanje svakodnevnih zadataka i spremi ih za sledeći dan. Savetujemo Vam da pročitate sledeće informacije pre nego što to promenite:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Ostalo",
     "showHeader": "Prikazati zaglavlje",
     "changePass": "Promeniti lozinku",

common/locales/sv/groups.json

@@ -14,7 +14,7 @@
     "resources": "Resurser",
     "tavernTalk": "Krogsnack",
     "tavernAlert1": "Notera: om du rapporterar en bugg här kommer inte utvecklarna se det. Var god",
-    "tavernAlert2": "använd Github istället.",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Tavern and guild moderators are:",
     "communityGuidelines": "Gemenskapens riktlinjer",
     "communityGuidelinesRead1": "Vänligen läs vår",
@@ -24,11 +24,17 @@
     "updatedParty": "Gruppinställningar uppdaterade.",
     "noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:",
     "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Skapa",
     "userId": "Användar-ID",
     "invite": "Bjud in",
     "leave": "Lämna",
     "invitedTo": "Inbjuden till <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Nytt meddelande i \"<%= name %>\"",
     "chat": "Chatt",
     "sendChat": "Skicka Chatt",
@@ -44,8 +50,8 @@
     "groupDescr": "Beskrivning som visas i offentliga listor över Gillen (Markdown-formatering är okej)",
     "logoUrl": "URL till logga",
     "assignLeader": "Tilldela Gruppledare",
-    "members": "Medlemmar",
+    "members": "Members",
-    "partyList": "Order for party members in header (reload browser after changing order)",
+    "partyList": "Order for party members in header",
     "banTip": "Sparka Medlem",
     "moreMembers": "fler medlemmar",
     "invited": "Inbjuden",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only group leader can create challenges",
     "sendGift": "Skicka Gåva",
     "inviteFriends": "Bjud in Vänner",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invite Existing User",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "AV:",
-    "inviteNewUsers": "Bjud in Nya Användare(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Skicka Gåva till <%= name %>",
     "sendGiftGemsBalance": "Från <%= number %> Juveler",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Starta ett Sällskap",
     "addToParty": "Lägg Till Någon i Ditt Sällskap",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/sv/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Du har erhållit",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Bjud in Sällskap",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Uppdragsinbjudan:",
     "questInvitationTitle": "Uppdragsinbjudnader",
     "questInvitationInfo": "Invitation for the Quest <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Bossstyrka",
     "collect": "Samla",
     "collected": "Samlade",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "Bara deltagare kommer strida mot bossen och dela på uppdragsbytet.",
     "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossColl1": "För att samla föremål, fullborda dina positiva uppgifter. Uppdragsföremål droppar precis som vanliga föremål, men du kommer inte se dem innan nästa dag. Då kommer allt du hittat att räknas ihop och läggas på högen.",
     "bossColl2": "Endast deltagare kan samla föremål och dela uppdragets byte.",
     "abort": "Avbryt",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Uppdragsägare",
     "questOwnerNotInPendingQuest": "The quest owner has left the quest and can no longer begin it. It is recommended that you cancel it now. The quest owner will retain possession of the quest scroll.",
     "questOwnerNotInRunningQuest": "Uppdragsägaren har lämnat uppdraget. Du kan avbryta uppdraget om du behöver, men du kan även fortsätta och alla kvarvarande deltagare kommer belönas när uppdraget är slutfört.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Är du helt säker? Se till att de inte kommer hata dig för alltid!",
     "questWarning": "Nya spelare som går med i sällskapet innan uppdraget påbörjas får också en inbjudan. Däremot kan inga nya sällskapsmedlemmar ansluta sig till uppdraget när det väl har påbörjats.",
     "bossRageTitle": "Vrede",
-    "bossRageDescription": "När denna mätare fylls kommer bossen släppa lös en specialattack."
+    "bossRageDescription": "När denna mätare fylls kommer bossen släppa lös en specialattack.",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/sv/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Ändra värden som Hälsa, Level och Guld manuellt.",
     "enableClass": "Aktivera Klass-system",
     "enableClassPop": "Du har tidigare valt bort klass-systemet. Vill du ändra ditt beslut?",
-    "showClass": "Visa Klass-rundtur",
     "classTourPop": "Visa rundturen för användning av klass-systemet.",
     "resetAccount": "Återställ Konto",
     "resetAccPop": "Börja om, ta bort alla levlar, guld, utrustning, historik och uppgifter.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Anpassad Dagsstart",
-    "24HrClock": "24h-Klocka",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Blandat",
     "showHeader": "Visa sidhuvud",
     "changePass": "Ändra lösenord",

common/locales/uk/groups.json

@@ -14,7 +14,7 @@
     "resources": "Джерела",
     "tavernTalk": "Посиденьки у таверні",
     "tavernAlert1": "Примітка: Розробники не побачать тут Вашого повідомлення про помилку. Будь ласка,",
-    "tavernAlert2": "скористайтеся Github.",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "Модератори Таверни та гільдій:",
     "communityGuidelines": "Правила спiльноти",
     "communityGuidelinesRead1": "Будь ласка, прочитайте",
@@ -24,11 +24,17 @@
     "updatedParty": "Party settings updated.",
     "noPartyText": "Ви ще не в гурті, або ваш гурт завантажується. Ви можете створити гурт і запросити своїх друзів, або, якщо бажаєте, приєднатися до вже існуючого, виславши свій унікальний ID-користувача і повернувшись сюда, щоб дочекатись запрошення:",
     "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "Створити",
     "userId": "ID гравця",
     "invite": "Запросити",
     "leave": "Полишити",
     "invitedTo": "Запрошено до <%= name %>",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "Нове повідомлення у „<%= name %>“",
     "chat": "Гутірка",
     "sendChat": "Надіслати",
@@ -44,8 +50,8 @@
     "groupDescr": "Опис, показаний у переліку ґільдій (з урахув. Markdown)",
     "logoUrl": "URL логотипу",
     "assignLeader": "Призначити лідера групи",
-    "members": "Учасник(-ів)",
+    "members": "Members",
-    "partyList": "Порядок членів гурту в заголовку (перезавантажте браузер після зміни порядку)",
+    "partyList": "Order for party members in header",
     "banTip": "Показати учасника",
     "moreMembers": "інші учасники",
     "invited": "Запрошено",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "Only group leader can create challenges",
     "sendGift": "Send Gift",
     "inviteFriends": "Invite Friends",
-    "inviteAlertInfo": "Invite friends by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "Invite Existing User",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "By:",
-    "inviteNewUsers": "Invite New User(s)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "Or share this link (copy/paste):",
     "sendGiftHeading": "Send Gift to <%= name %>",
     "sendGiftGemsBalance": "From <%= number %> Gems",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "Personal message (optional)",
     "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
     "battleWithFriends": "Battle Monsters With Friends",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "Start a Party",
     "addToParty": "Add someone to your party",
-    "likePost": "Click if you like this post!"
+    "likePost": "Click if you like this post!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/uk/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "Ви отримали",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "Зібрати гурт",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "Запрошення до квесту:",
     "questInvitationTitle": "Запрошення до квесту",
     "questInvitationInfo": "Запрошення до Квесту: <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Сила Боса",
     "collect": "Collect",
     "collected": "Зібрано",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "Тільки учасники битимуться з босом та розділять квестові трофеї.",
     "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossColl1": "Аби зібрати всі предмети, виконуйте позитивні завдання. Квестові предмети випадають так само часто, як і звичайні, але Ви не побачите, що випало, до початку наступного дня, лише після цього все, що було знайдено, буде підраховано та складено до загальної купи.",
     "bossColl2": "Лише учасники можуть збирати предмети та розподіляти квестові трофеї.",
     "abort": "Перервати",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "Власник квесту",
     "questOwnerNotInPendingQuest": "Власник квесту покинув його і більше не може почати його. Рекомендується скасувати його зараз. Власник квесту зберігає собі квестовий сувій.",
     "questOwnerNotInRunningQuest": "Власник квесту покинув його. Ви можете скасувати квест, якщо бажаєте. Також ви можете продовжити його, щоб разом з іншими отримати нагороду, коли квест скінчиться.",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "Ви точно-точно впевнені? Подумайте, чи не зненавидять вони Вас назавжди!",
     "questWarning": "Якщо нові учасники вступають до гурту до початку квесту, вони також отримують запрошення. Коли квест розпочався, нові учасники не можуть приєднатися до нього.",
     "bossRageTitle": "Лють",
-    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!"
+    "bossRageDescription": "When this bar fills, the boss will unleash a special attack!",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/uk/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "Самотужки змінити дані: здоров'я, рівень і золото.",
     "enableClass": "Увімкнути систему Класів",
     "enableClassPop": "Раніше Ви відмовилися від системи класів. Бажаєте її ввімкнути?",
-    "showClass": "Показати тур по класах",
     "classTourPop": "Показати тур по використанню системи класів.",
     "resetAccount": "Скинути акаунт",
     "resetAccPop": "Почати заново, залишивши всі рівні, золото, спорядження, історію та завдання.",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Обрати початок доби",
-    "24HrClock": "24-годинний формат",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it:",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "Усяке",
     "showHeader": "Показати заголовок",
     "changePass": "Змінити пароль",

common/locales/zh/groups.json

@@ -14,7 +14,7 @@
     "resources": "资源",
     "tavernTalk": "酒馆聊天",
     "tavernAlert1": "注意：开发者不会来这里阅读反馈。如果你想报告bug，请",
-    "tavernAlert2": "用Github",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "酒馆和公会版主是：",
     "communityGuidelines": "社区准则",
     "communityGuidelinesRead1": "请阅读我们的",
@@ -24,11 +24,17 @@
     "updatedParty": "队伍设置已更新。",
     "noPartyText": "要么你不在一个队伍中，要么你的队伍需要一段时间来加载。你可以创建一个队伍并邀请朋友。或者，如果你想加入一个队伍，你可以把下方的你的唯一用户 ID 给他们，然后来这里查看邀请信息。",
     "LFG": "宣传你的队伍或招募队友，请到<%= linkStart %>集结队伍（寻找小组）<%= linkEnd %> 公会。",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "建立",
     "userId": "用户ID",
     "invite": "邀请",
     "leave": "离开",
     "invitedTo": "已给<%= name %>发送邀请",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "新消息在 “<%= name %>”",
     "chat": "聊天",
     "sendChat": "发送",
@@ -44,8 +50,8 @@
     "groupDescr": "公会公开列表中显示的描述 (支持标记语言)",
     "logoUrl": "图标链接",
     "assignLeader": "任命队长",
-    "members": "成员(们)",
+    "members": "Members",
-    "partyList": "给队伍成员的置顶讯息(更改讯息后请重新载入浏览器)",
+    "partyList": "Order for party members in header",
     "banTip": "引导成员",
     "moreMembers": "更多成员",
     "invited": "已邀请",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "只有会长能创建挑战",
     "sendGift": "赠送礼物",
     "inviteFriends": "邀请朋友",
-    "inviteAlertInfo": "通过<a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>用户ID</a>邀请朋友。",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "邀请已存在用户",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "通过电子邮件邀请朋友。如果他们通过你的电子邮件加入，他们将自动被邀请加入这个公会。",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "来自：",
-    "inviteNewUsers": "邀请新用户(们)",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "或者分享这个链接(复制/粘贴)",
     "sendGiftHeading": "给 <%= name %>赠送礼物",
     "sendGiftGemsBalance": "来自 <%= number %> 宝石",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "私信(可选)",
     "sendGiftSubscription": "<%= months %>月(或多个月)： $<%= price %>",
     "battleWithFriends": "与朋友一起同怪兽战斗",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "创建一个队伍",
     "addToParty": "加入队伍成员",
-    "likePost": "如果你喜欢这个公告请点击！"
+    "likePost": "如果你喜欢这个公告请点击！",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/zh/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "你收到了",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
-    "inviteParty": "邀请团队",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "任务邀请：",
     "questInvitationTitle": "任务邀请",
     "questInvitationInfo": "Invitation for the Quest <%= quest %>",
@@ -29,12 +29,16 @@
     "bossStrength": "Boss的力量",
     "collect": "收集",
     "collected": "已收集",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "只有参与者会跟boss战斗并共享任务掉落。",
     "tavernBossInfo": "为了对世界boss造成伤害，请完成你的日常任务和待办事项。更高的任务伤害意味着更高的boss伤害( 完成红色任务，法师技能，战士攻击等等)。你的每个未完成日常个数 (乘以boss的力量)，boss的怒气都会增加。一旦他的怒气达到上限，后果不堪设想——所以请完成你的日常任务。<strong>所有对boss和来自boss的伤害会在重置时间进行结算 (你的日常重置时间)</strong>",
     "bossColl1": "为了收集物品，做那些正的任务。任务物品会像正常物品一样掉落；但是你直到第二天才能看得见这些掉落，然后找到的所有物品会被结算然后堆叠到一起。",
     "bossColl2": "只有参与者才能收集物品并共享任务掉落。",
     "abort": "舍弃",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "任务业主",
     "questOwnerNotInPendingQuest": "任务拥有者已经离开这个队伍，无法再启动这个任务。我们建议您现在取消它。任务拥有者将保留持有的任务卷轴。",
     "questOwnerNotInRunningQuest": "任务拥有者已经离开这个任务。如果你必须退出，你可以退出这个任务。你也可以繼續執行這個任务，其余所有参与者将会在完成任务时获得任务奖励。",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "你真的真的要这样做吗？要确保他们不会讨厌你一辈子哟！",
     "questWarning": "如果一个新的小队成员在任务开始前加入，他们会收到一个邀请。但是一旦任务开始了，新成员就无法再加入这个任务了。",
     "bossRageTitle": "愤怒值",
-    "bossRageDescription": "当这个条满的时候，boss会释放一个特殊攻击！"
+    "bossRageDescription": "当这个条满的时候，boss会释放一个特殊攻击！",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/zh/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "手动修改诸如生命值，等级和金币等数值。",
     "enableClass": "开启职业系统",
     "enableClassPop": "你当初放弃了任务系统，希望现在开启吗？",
-    "showClass": "显示职业说明",
     "classTourPop": "显示如何使用职业系统的教程。",
     "resetAccount": "重置帐号",
     "resetAccPop": "从头再来，移除所有等级，金币，装备，历史和任务。",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "自定义起始日期",
-    "24HrClock": "24小时表",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica默认在午夜时分（当然是在你所在地区的时区内）检查并且重置你的日常事项。我们推荐你在改变它之前先读读下面这些信息：",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.<br><br>Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "其他",
     "showHeader": "显示顶部",
     "changePass": "修改密码",

common/locales/zh_TW/groups.json

@@ -14,7 +14,7 @@
     "resources": "資源",
     "tavernTalk": "酒館聊天",
     "tavernAlert1": "注意：如果您想回報一個bug，開發者在這裡不會看到。請",
-    "tavernAlert2": "用Github",
+    "tavernAlert2": "use GitHub instead",
     "moderatorIntro1": "酒館和公會的版主是：",
     "communityGuidelines": "社群規範",
     "communityGuidelinesRead1": "請讀我",
@@ -24,11 +24,17 @@
     "updatedParty": "隊與設置更新。",
     "noPartyText": "你不在一個個隊伍中，或是你的隊伍需要一點時間來載入。你可以建立一個隊伍並邀請朋友，或是加入一個既存的隊伍中，讓他們輸入你的UUID，再回來看邀請訊息：",
     "LFG": "為了宣傳新的隊伍並找到一個人加入，請到<%= linkStart %>Party Wanted(尋找隊伍)<%= linkEnd %>公會。",
+    "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "joinExistingParty": "Join Someone Else's Party",
     "create": "建立",
     "userId": "UUID",
     "invite": "邀請",
     "leave": "離開",
     "invitedTo": "已給<%= name %>發送邀請",
+    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "joinNewParty": "Join New Party",
+    "declineInvitation": "Decline Invitation",
+    "loadingNewParty": "Your new party is loading. Please wait...",
     "newMsg": "新消息在\"<%= name %>\"",
     "chat": "聊天",
     "sendChat": "發送",
@@ -44,8 +50,8 @@
     "groupDescr": "公會公開列表中顯示的描述(支持標記語言)",
     "logoUrl": "標識的網址",
     "assignLeader": "指定隊長",
-    "members": "成員",
+    "members": "Members",
-    "partyList": "給隊伍成員的置頂訊息(更改訊息後請重新載入瀏覽器)",
+    "partyList": "Order for party members in header",
     "banTip": "引導成員",
     "moreMembers": "更多成員",
     "invited": "已邀請",
@@ -106,11 +112,16 @@
     "leaderOnlyChallenges": "只有群組發起者可以建立挑戰",
     "sendGift": "送禮物",
     "inviteFriends": "邀請朋友",
-    "inviteAlertInfo": "按這裡通過<a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>UUID</a>邀請朋友加入",
+    "inviteByEmail": "Invite by Email",
-    "inviteExistUser": "邀請已存在的玩家",
+    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteByEmail": "通過電子郵件邀請朋友。如果他們通過你發的電子郵件加入， 他們自然而然被邀請加入這個群組",
+    "inviteFriendsNow": "Invite Friends Now",
+    "inviteFriendsLater": "Invite Friends Later",
+    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
+    "inviteExistUser": "Invite Existing Users",
     "byColon": "作者：",
-    "inviteNewUsers": "邀請新手加入",
+    "inviteNewUsers": "Invite New Users",
+    "sendInvitations": "Send Invitations",
+    "invitationsSent": "Invitations sent!",
     "inviteAlertInfo2": "或者分享這個連接(複製／粘貼):",
     "sendGiftHeading": "送<%= name %>禮物",
     "sendGiftGemsBalance": "從 <%= number %> 個寶石",
@@ -120,7 +131,18 @@
     "sendGiftMessagePlaceholder": "私信 (可選)",
     "sendGiftSubscription": "<%= months %> 個月的價格為 ($)<%= price %>",
     "battleWithFriends": "與朋友一起打怪",
+    "startPartyWithFriends": "Start a Party with your friends!",
     "startAParty": "開團",
     "addToParty": "加某人到你的隊伍",
-    "likePost": "如果喜歡這個貼文請按+1!"
+    "likePost": "如果喜歡這個貼文請按+1!",
+    "partyExplanation1": "Play Habitica with friends to stay accountable!",
+    "partyExplanation2": "Battle monsters and create Challenges!",
+    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "wantToStartParty": "Do you want to start a party?",
+    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
+    "nameYourParty": "Name your new party!",
+    "partyEmpty": "You're the only one in your party. Invite your friends!",
+    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
+    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "possessiveParty": "<%= name %>'s Party"
 }

common/locales/zh_TW/quests.json

@@ -13,7 +13,7 @@
     "youReceived": "你收到了",
     "dropQuestCongrats": "恭喜妳拿到任務卷軸! 你可以邀請你的隊伍開始任務，或隨時透過 背包->任務 回來查看。",
     "questSend": "點擊「邀請」會向你的隊友發送邀請。當所有成員接受或拒絕後任務開始。在選項> 社交> 組隊裡查看任務狀態。",
-    "inviteParty": "邀請隊伍",
+    "inviteParty": "Invite Party to Quest",
     "questInvitation": "任務邀請：",
     "questInvitationTitle": "任務邀請",
     "questInvitationInfo": "<%= quest %> 的邀請",
@@ -29,12 +29,16 @@
     "bossStrength": "Boss的力量",
     "collect": "收集",
     "collected": "已收集",
+    "collectionItems": "<%= number %> <%= items %>",
+    "itemsToCollect": "Items to Collect",
     "bossDmg1": "想要攻擊魔王，你必須完成你的每日任務和待辦事項。任務傷害越高，你對魔王的傷害也越大，達成紅色事項、法師的法術、戰士的攻擊等等。如果你未能完成每日任務，除了本來就會遭受的傷害，魔王會針對你遺漏的事項(乘上魔王的力量)額外再傷害你和你的隊友。所以想要保持隊伍健康，就去完成你的每日任務！<strong> 所有從魔王和你攻擊的傷害將在跨日(一天結束)時結算。 </strong>",
     "bossDmg2": "只有參與者會跟魔王戰鬥，並共享任務獎勵。",
     "tavernBossInfo": "想要攻擊世界Boss，你必須完成你的每日任務和待辦事項。任務傷害越高，你對魔王的傷害也越大(達成紅色事項、法師的法術、戰士的攻擊等等)。如果你未能完成每日任務，除了本來就會遭受的傷害，魔王會針對你遺漏的事項(乘上魔王的力量)累積憤怒值。一旦憤怒值達到上限，將會發生相當糟糕的事情─所以好好完成你的每日任務！<strong> 所有從魔王和你攻擊的傷害將在跨日(一天結束)時結算。 </strong>",
     "bossColl1": "要撿到物品，你必須完成你的「正向」任務。任務獎勵品會像普通物品一樣掉落；但要在隔天才看到。你撿到的物品會被計算並累積到戰利品堆當中。",
     "bossColl2": "只有參與者會跟魔王戰鬥，並共享任務獎勵。",
     "abort": "放棄",
+    "leaveQuest": "Leave Quest",
+    "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
     "questOwner": "任務擁有者",
     "questOwnerNotInPendingQuest": "任務擁有者已經離開這個隊伍，無法再啟動這個任務。我們建議您現在取消它。任務擁有者將保留原本持有的任務捲軸。",
     "questOwnerNotInRunningQuest": "任務擁有者已經離開這個隊伍。如果你想，你可以退出這個任務，但你也可以繼續執行任務，其餘所有參與者，將會在完成任務時獲得任務獎勵。",
@@ -59,5 +63,9 @@
     "doubleSureAbort": "你真的真的要這樣做嗎？要確保他們不會一輩子討厭你喲！",
     "questWarning": "如果新的隊友在開始前加入了隊伍，他們也會收到邀請。但是一旦任務已經開始，新的隊友就無法再加入這個任務了。",
     "bossRageTitle": "憤怒值",
-    "bossRageDescription": "當此欄全滿時，Boss就會發動特殊攻擊！"
+    "bossRageDescription": "當此欄全滿時，Boss就會發動特殊攻擊！",
+    "startAQuest": "START A QUEST",
+    "startQuest": "Start Quest",
+    "whichQuestStart": "Which quest do you want to start?",
+    "getMoreQuests": "Get more quests"
 }

common/locales/zh_TW/settings.json

@@ -22,7 +22,6 @@
     "fixValPop": "手動修改諸如生命值、等級和金幣等數值。",
     "enableClass": "開啟職業系統",
     "enableClassPop": "你當初放棄了職業系統，現在確認開啟嗎？",
-    "showClass": "顯示職業說明",
     "classTourPop": "顯示使用職業系統的教學。",
     "resetAccount": "重置帳號",
     "resetAccPop": "從頭開始，移除所有等級、金幣、裝備、歷史和任務。",
@@ -40,9 +39,10 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "設定開始日期",
-    "24HrClock": "24 小時制",
+    "changeCustomDayStart": "Change Custom Day Start?",
-    "customDayStartInfo1": "Habitica預設在你自己的時區的午夜檢查並重設你的每日任務。我們建議您在改變之前閱讀以下信息：",
+    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
-    "customDayStartInfo4": "<strong>在設定自訂每日起始時間前請先完成你的所有每日任務</strong>或在該日先<a href='http://habitica.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>在旅館休息</a>以凍結所有任務的時間。自訂每日起始時間會立刻啟動<a href='http://habitica.wikia.com/wiki/Cron' target='_blank'>系統排程</a> ，但是接下來的日子就會正常。<br><br><strong>修改完後的2個小時期間後將會生效。</strong> 假設要設定午夜0點為每日起始時間，那就在晚上10點前設定完畢; 如果要設定晚上9點為每日起始時間，那就在晚上7點前設定完畢。<br><br>輸入0-23的數字(24小時制)。直接輸入比用上下鍵選擇方便。當設定完成請重新載入此頁面以看到新的每日起始時間。",
+    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
+    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "其他",
     "showHeader": "顯示頂部",
     "changePass": "修改密碼",

common/script/content.coffee

@@ -1203,6 +1203,12 @@ api.food =
 _.each api.food, (food,key) ->
   _.defaults food, {value: 1, key, notes: t('foodNotes')}
 
+api.userCanOwnQuestCategories = [
+  'unlockable'
+  'gold'
+  'pet'
+]
+
 api.quests =
 
   dilatory:

common/script/count.js

@@ -27,7 +27,6 @@ function dropPetsCurrentlyOwned(pets) {
   return count;
 }
 
-
 function mountMasterProgress(mounts) {
   var count = 0;
   _(DROP_ANIMALS).each(function(animal) {
@@ -51,9 +50,23 @@ function remainingGearInSet(userGear, set) {
   return count;
 }
 
+function questsOfCategory(userQuests, category) {
+  var quests = _.filter(content.quests, function(quest) {
+    var categoryMatches = quest.category === category;
+    var hasQuest = userQuests[quest.key];
+
+    return categoryMatches && hasQuest;
+  });
+
+  var count = _.size(quests);
+
+  return count;
+}
+
 module.exports = {
   beastMasterProgress: beastMasterProgress,
   dropPetsCurrentlyOwned: dropPetsCurrentlyOwned,
   mountMasterProgress: mountMasterProgress,
-  remainingGearInSet: remainingGearInSet
+  remainingGearInSet: remainingGearInSet,
+  questsOfCategory: questsOfCategory
 };

karma.conf.js

@@ -38,7 +38,6 @@ module.exports = function(config) {
       'test/spec/mocks/**/*.js',
 
       "website/public/js/env.js",
-
       "website/public/js/app.js",
       "common/script/public/config.js",
       "common/script/public/userServices.js",

test/api/party.coffee

@@ -129,7 +129,7 @@ describe "Party", ->
     group = undefined
     participating = []
     notParticipating = []
-    before (done) ->
+    beforeEach (done) ->
       # Tavern boss, side-by-side
       Group.update(
         _id: "habitrpg"
@@ -310,6 +310,20 @@ describe "Party", ->
         expect(_.size(res.body.quest.members)).to.equal 3
         done()
 
+    it "allows quest participants to leave quest", (done) ->
+      leavingMember = party[1]
+      expect(group.quest.members[leavingMember._id]).to.eql(true)
+
+      request.post(baseURL + "/groups/" + group._id + "/questLeave")
+        .set("X-API-User", leavingMember._id)
+        .set("X-API-Key", leavingMember.apiToken)
+        .end (err, res) ->
+          expectCode res, 204
+          request.get(baseURL + '/groups/party')
+            .end (err, res) ->
+              expect(res.body.quest.members[leavingMember._id]).to.not.be.ok
+              done()
+
     xit "Hurts the boss", (done) ->
       request.post(baseURL + "/user/batch-update").end (res) ->
         user = res.body

test/common/count.js

@@ -154,4 +154,23 @@ describe('count', function() {
       expect(dropPets).to.eql(2);
     });
   });
+
+  describe('questsOfCategory', function() {
+
+    it('counts user quest scrolls of a particular category', function() {
+      var quests = {
+        "atom1": 2,
+        "whale": 4,
+        "kraken": 2,
+        "sheep": 1,
+        "goldenknight2": 1
+      };
+      var petQuestCount = count.questsOfCategory(quests, 'pet');
+      var unlockableQuestCount = count.questsOfCategory(quests, 'unlockable');
+      var goldQuestCount = count.questsOfCategory(quests, 'gold');
+      expect(petQuestCount).to.eql(3);
+      expect(unlockableQuestCount).to.eql(2);
+      expect(goldQuestCount).to.eql(0);
+    });
+  });
 });

test/server_side/controllers/groups.test.js

@@ -0,0 +1,382 @@
+var sinon = require('sinon');
+var chai = require("chai");
+chai.use(require("sinon-chai"));
+var expect = chai.expect;
+
+var Q = require('q');
+var Group = require('../../../website/src/models/group').model;
+var groupsController = require('../../../website/src/controllers/groups');
+
+describe('Groups Controller', function() {
+  var utils = require('../../../website/src/utils');
+
+  describe('#invite', function() {
+    var res, req, user, group;
+
+    beforeEach(function() {
+      group = {
+        _id: 'group-id',
+        name: 'group-name',
+        type: 'party',
+        members: [
+          'user-id',
+          'another-user'
+        ],
+        save: sinon.stub().yields(),
+        markModified: sinon.spy()
+      };
+
+      user = {
+        _id: 'user-id',
+        name: 'inviter',
+        email: 'inviter@example.com',
+        save: sinon.stub().yields(),
+        markModified: sinon.spy()
+      };
+
+      res = {
+        locals: {
+          group: group,
+          user: user
+        },
+        json: sinon.stub(),
+        send: sinon.stub()
+      };
+
+      req = {
+        body: {}
+      };
+    });
+
+    context('uuids', function() {
+      beforeEach(function() {
+        req.body.uuids = ['invited-user'];
+      });
+
+      it('returns 400 if user not found');
+
+      it('returns a 400 if user is already in the group');
+
+      it('retuns 400 if user was already invited to that group');
+
+      it('returns 400 if user is already pending an invitation');
+
+      it('returns 400 is user is already in another party');
+
+      it('emails invited user');
+
+      it('does not email invited user if email preference is set to false');
+    });
+
+    context('emails', function() {
+      var EmailUnsubscription = require('../../../website/src/models/emailUnsubscription').model;
+      var execStub, selectStub;
+
+      beforeEach(function() {
+        sinon.stub(utils, 'encrypt').returns('http://link.com');
+        sinon.stub(utils, 'getUserInfo').returns({
+          name: user.name,
+          email: user.email
+        });
+        execStub = sinon.stub();
+        selectStub = sinon.stub().returns({
+          exec: execStub
+        });
+        sinon.stub(User, 'findOne').returns({
+          select: selectStub
+        });
+        sinon.stub(EmailUnsubscription, 'findOne');
+        sinon.stub(utils, 'txnEmail');
+
+        req.body.emails = [{email: 'user@example.com', name: 'user'}];
+      });
+
+      afterEach(function() {
+        User.findOne.restore();
+        EmailUnsubscription.findOne.restore();
+        utils.encrypt.restore();
+        utils.getUserInfo.restore();
+        utils.txnEmail.restore();
+      });
+
+      it('emails user with invite', function() {
+        execStub.yields(null, null);
+        EmailUnsubscription.findOne.yields(null, null);
+
+        groupsController.invite(req, res);
+
+        expect(utils.txnEmail).to.be.calledOnce;
+        expect(utils.txnEmail).to.be.calledWith(
+          { email: 'user@example.com', name: 'user' },
+          'invite-friend',
+          [
+            { name: 'LINK', content: '?partyInvite=http://link.com' },
+            { name: 'INVITER', content: 'inviter' },
+            { name: 'REPLY_TO_ADDRESS', content: 'inviter@example.com' }
+          ]
+        );
+      });
+
+      it('does not email user if user is on unsubscribe list', function() {
+        EmailUnsubscription.findOne.yields(null, {_id: 'on-list'});
+
+        expect(utils.txnEmail).to.not.be.called;
+      });
+
+      it('checks if a user with provided email already exists');
+    });
+
+    context('others', function() {
+      it ('returns a 400 error', function() {
+        groupsController.invite(req, res);
+
+        expect(res.json).to.be.calledOnce;
+        expect(res.json).to.be.calledWith(
+          400,
+          { err: 'Can invite only by email or uuid' }
+        );
+      });
+    });
+  });
+
+  describe('#leave', function() {
+    var res, req, user, group;
+
+    beforeEach(function() {
+      group = {
+        _id: 'group-id',
+        type: 'party',
+        members: [
+          'user-id',
+          'another-user'
+        ],
+        save: sinon.stub().yields(),
+        markModified: sinon.spy()
+      };
+
+      user = {
+        _id: 'user-id',
+        save: sinon.stub().yields(),
+        markModified: sinon.spy()
+      };
+
+      res = {
+        locals: {
+          group: group,
+          user: user
+        },
+        json: sinon.stub(),
+        send: sinon.stub()
+      };
+
+      req = {
+        query: { keep: 'keep' }
+      };
+    });
+
+    context('party', function() {
+      beforeEach(function() {
+        group.type = 'party';
+        group.quest = {
+          leader : 'another-user',
+          active: true,
+          members: {
+            'user-id': true,
+            'another-user': true
+          },
+          key : 'vice1',
+          progress : {
+              hp : 364,
+              collect : {}
+          }
+        };
+
+        sinon.spy(Group, 'update');
+      });
+
+      afterEach(function() {
+        Group.update.restore();
+      });
+
+      it('prevents user from leaving party if quest is active', function() {
+        user.party = {
+          quest : {
+              key : 'vice1',
+              progress : {
+                  up : 50,
+                  down : 0,
+                  collect : {}
+              },
+              completed : null,
+              RSVPNeeded : false
+          }
+        }
+
+        groupsController.leave(req, res);
+
+        expect(Group.update).to.not.be.called;
+        expect(res.json).to.be.calledOnce;
+        expect(res.json).to.be.calledWith(403, 'You cannot leave party during an active quest. Please leave the quest first');
+      });
+
+      it('leaves party if quest is not active', function() {
+        user.party = { quest: { key: null } };
+
+        groupsController.leave(req, res);
+
+        expect(Group.update).to.be.calledOnce;
+        expect(res.json).to.not.be.called;
+      });
+    });
+  });
+
+  describe('#questLeave', function() {
+    var res, req, group, user, saveSpy;
+
+    beforeEach(function() {
+      sinon.stub(Q, 'all').returns({
+        done: sinon.stub().yields()
+      });
+      group = {
+        _id: 'group-id',
+        type: 'party',
+        quest: {
+          leader : 'another-user',
+          active: true,
+          members: {
+            'user-id': true,
+            'another-user': true
+          },
+          key : 'vice1',
+          progress : {
+              hp : 364,
+              collect : {}
+          }
+        },
+        save: sinon.stub().yields(),
+        markModified: sinon.spy()
+      };
+
+      user = {
+        _id: 'user-id',
+        party : {
+          quest : {
+              key : 'vice1',
+              progress : {
+                  up : 50,
+                  down : 0,
+                  collect : {}
+              },
+              completed : null,
+              RSVPNeeded : false
+          }
+        },
+        save: sinon.stub().yields(),
+        markModified: sinon.spy()
+      };
+
+      res = {
+        locals: {
+          group: group,
+          user: user
+        },
+        json: sinon.stub(),
+        send: sinon.stub()
+      };
+
+      req = { };
+    });
+
+    afterEach(function() {
+      Q.all.restore();
+    });
+
+    context('error conditions', function() {
+      it('errors if quest is not active', function() {
+        group.quest.active = false;
+
+        groupsController.questLeave(req, res);
+
+        expect(res.json).to.be.calledOnce;
+        expect(res.json).to.be.calledWith(
+          404,
+          { err: 'No active quest to leave' }
+        );
+      });
+
+      it('errors if user is not part of quest', function() {
+        delete group.quest.members[user._id];
+
+        groupsController.questLeave(req, res);
+
+        expect(res.json).to.be.calledOnce;
+        expect(res.json).to.be.calledWith(
+          403,
+          { err: 'You are not part of the quest' }
+        );
+      });
+
+      it('does not allow quest leader to leave quest', function() {
+        group.quest.leader = 'user-id';
+
+        groupsController.questLeave(req, res);
+
+        expect(res.json).to.be.calledOnce;
+        expect(res.json).to.be.calledWith(
+          403,
+          { err: 'Quest leader cannot leave quest' }
+        );
+      });
+
+      it('sends 500 if group cannot save', function() {
+        Q.all.returns({
+          done: sinon.stub().callsArgWith(1, {err: 'save error'})
+        });
+        var nextSpy = sinon.spy();
+
+        groupsController.questLeave(req, res, nextSpy);
+
+        expect(res.json).to.not.be.called;
+        expect(nextSpy).to.be.calledOnce;
+        expect(nextSpy).to.be.calledWith({err: 'save error'});
+      });
+    });
+
+    context('success', function() {
+      it('removes user from quest', function() {
+        expect(group.quest.members[user._id]).to.exist;
+
+        groupsController.questLeave(req, res);
+
+        expect(group.quest.members[user._id]).to.not.exist;
+      });
+
+      it('scrubs quest data from user', function() {
+        user.party.quest.progress = {
+          up: 100,
+          down: 32,
+          collect: {
+            foo: 12,
+            bar: 4
+          }
+        };
+
+        groupsController.questLeave(req, res);
+
+        expect(user.party.quest.key).to.not.exist;
+        expect(user.party.quest.progress).to.eql({
+          up: 0,
+          down: 0,
+          collect: {}
+        });
+      });
+
+      it('sends back 204 on success', function() {
+        groupsController.questLeave(req, res);
+
+        expect(res.send).to.be.calledOnce;
+        expect(res.send).to.be.calledWith(204);
+      });
+    });
+  });
+});

test/spec/controllers/inviteToGroupCtrlSpec.js

@@ -0,0 +1,194 @@
+'use strict';
+
+describe('Invite to Group Controller', function() {
+  var scope, ctrl, groups, user, guild, $rootScope;
+
+  beforeEach(function() {
+    user = specHelper.newUser({
+      profile: { name: 'Mario' }
+    });
+
+    module(function($provide) {
+      $provide.value('User', {});
+      $provide.value('injectedGroup', { user: user });
+    });
+
+    inject(function($rootScope, $controller, Groups){
+      scope = $rootScope.$new();
+
+      // Load RootCtrl to ensure shared behaviors are loaded
+      $controller('RootCtrl',  {$scope: scope, User: {user: user}});
+
+      ctrl = $controller('InviteToGroupCtrl', {$scope: scope, User: {user: user}});
+
+      groups = Groups;
+    });
+  });
+
+  describe('addEmail', function() {
+    it('adds blank email to email list', function() {
+      scope.emails = [{name: 'Mario', email: 'mario@mushroomkingdom.com'}];
+      scope.addEmail();
+
+      expect(scope.emails).to.eql([{name: 'Mario', email: 'mario@mushroomkingdom.com'}, {name: '', email: ''}]);
+    });
+  });
+
+  describe('addUuid', function() {
+    it('adds blank uuid to invitees list', function() {
+      scope.invitees = [{uuid: 'user1'}];
+      scope.addUuid();
+
+      expect(scope.invitees).to.eql([{uuid: 'user1'}, {uuid: ''}]);
+    });
+  });
+
+  describe('inviteNewUsers', function() {
+    beforeEach(function() {
+      scope.group = specHelper.newGroup({
+        type: 'party',
+        $save: sinon.stub().returns({
+          then: function(cb) { cb(); }
+        })
+      });
+
+      sandbox.stub(groups.Group, 'invite');
+    });
+
+    context('if the party does not already exist', function() {
+      beforeEach(function() {
+        delete scope.group._id;
+      });
+
+      it('saves the group if a new group is being created', function() {
+        scope.inviteNewUsers('uuid');
+        expect(scope.group.$save).to.be.calledOnce;
+      });
+
+      it('uses provided name', function() {
+        scope.group.name = 'test party';
+        scope.inviteNewUsers('uuid');
+        expect(group.name).to.eql('test party');
+      });
+
+      it('names the group if no name is provided', function() {
+        scope.group.name = '';
+        scope.inviteNewUsers('uuid');
+        expect(group.name).to.eql(env.t('possessiveParty', {name: user.profile.name}));
+      });
+    });
+
+    context('email', function() {
+      it('invites user with emails', function() {
+        scope.emails = [
+          {name: 'Luigi', email: 'mario_bro@themushroomkingdom.com'},
+          {name: 'Mario', email: 'mario@tmk.com'}
+        ];
+
+        scope.inviteNewUsers('email');
+        expect(groups.Group.invite).to.be.calledOnce;
+        expect(groups.Group.invite).to.be.calledWith({
+          gid: scope.group._id,
+        }, {
+          inviter: user.profile.name,
+          emails: [
+            {name: 'Luigi', email: 'mario_bro@themushroomkingdom.com'},
+            {name: 'Mario', email: 'mario@tmk.com'}
+          ]
+
+        });
+      });
+
+      it('resets email list after sending', function() {
+        groups.Group.invite.yields();
+        scope.emails[0].name = 'Luigi';
+        scope.emails[0].email = 'mario_bro@themushroomkingdom.com';
+
+        scope.inviteNewUsers('email');
+
+        expect(scope.emails).to.eql([{name:'', email: ''},{name:'', email: ''}]);
+      });
+
+      it('filters out blank email inputs', function() {
+        scope.emails = [
+          {name: 'Luigi', email: 'mario_bro@themushroomkingdom.com'},
+          {name: 'Toad', email: ''},
+          {name: 'Mario', email: 'mario@tmk.com'}
+        ];
+
+        scope.inviteNewUsers('email');
+        expect(groups.Group.invite).to.be.calledOnce;
+        expect(groups.Group.invite).to.be.calledWith({
+          gid: scope.group._id,
+        }, {
+          inviter: user.profile.name,
+          emails: [
+            {name: 'Luigi', email: 'mario_bro@themushroomkingdom.com'},
+            {name: 'Mario', email: 'mario@tmk.com'}
+          ]
+        });
+      });
+    });
+
+    context('uuid', function() {
+      it('invites user with uuid', function() {
+        scope.invitees = [{uuid: '1234'}];
+
+        scope.inviteNewUsers('uuid');
+        expect(groups.Group.invite).to.be.calledOnce;
+        expect(groups.Group.invite).to.be.calledWith({
+          gid: scope.group._id,
+        }, {
+          uuids: ['1234']
+        });
+      });
+
+      it('invites users with uuids', function() {
+        scope.invitees = [{uuid: 'user1'}, {uuid: 'user2'}, {uuid: 'user3'}];
+
+        scope.inviteNewUsers('uuid');
+        expect(groups.Group.invite).to.be.calledOnce;
+        expect(groups.Group.invite).to.be.calledWith({
+          gid: scope.group._id,
+        }, {
+          uuids: ['user1', 'user2', 'user3']
+        });
+      });
+
+      it('resets invitee list after sending', function() {
+        groups.Group.invite.yields();
+        scope.invitees = [{uuid: 'user1'}, {uuid: 'user2'}, {uuid: 'user3'}];
+
+        scope.inviteNewUsers('uuid');
+
+        expect(scope.invitees).to.eql([{uuid: ''}]);
+      });
+
+      it('removes blank fields from being sent', function() {
+        groups.Group.invite.yields();
+        scope.invitees = [{uuid: 'user1'}, {uuid: ''}, {uuid: 'user3'}];
+
+        scope.inviteNewUsers('uuid');
+
+        expect(groups.Group.invite).to.be.calledOnce;
+        expect(groups.Group.invite).to.be.calledWith({
+          gid: scope.group._id,
+        }, {
+          uuids: ['user1', 'user3']
+        });
+      });
+    });
+
+    context('invalid invite method', function() {
+      it('logs error', function() {
+        sandbox.stub(console, 'log');
+
+        scope.inviteNewUsers();
+        expect(groups.Group.invite).to.not.be.called;
+        expect(console.log).to.be.calledOnce;
+        expect(console.log).to.be.calledWith('Invalid invite method.');
+      });
+    });
+
+  });
+});

test/spec/controllers/partyCtrlSpec.js

@@ -1,14 +1,14 @@
 'use strict';
 
 describe("Party Controller", function() {
-  var scope, ctrl, user, User, groups, $rootScope, $controller;
+  var scope, ctrl, user, User, groups, rootScope, $controller;
 
   beforeEach(function() {
     user = specHelper.newUser(),
     user._id = "unique-user-id";
     User = {
       user: user,
-      sync: sinon.spy
+      sync: sandbox.spy
     }
 
     module(function($provide) {
@@ -17,7 +17,7 @@ describe("Party Controller", function() {
 
     inject(function(_$rootScope_, _$controller_, Groups){
 
-      $rootScope = _$rootScope_;
+      rootScope = _$rootScope_;
 
       scope = _$rootScope_.$new();
 
@@ -35,7 +35,7 @@ describe("Party Controller", function() {
   describe('questAccept', function() {
     it('calls Groups.questAccept', function() {
       var party = {};
-      var groupSpy = sinon.stub(groups, "questAccept", function(){return true;});
+      var groupSpy = sandbox.stub(groups, "questAccept", function(){return true;});
       scope.questAccept(party);
       groupSpy.should.have.been.calledOnce;
     });
@@ -44,7 +44,7 @@ describe("Party Controller", function() {
   describe('questReject', function() {
     it('calls Groups.questReject', function() {
       var party = {};
-      var groupSpy = sinon.stub(groups, "questReject", function(){return true;});
+      var groupSpy = sandbox.stub(groups, "questReject", function(){return true;});
       scope.questReject(party);
       groupSpy.should.have.been.calledOnce;
     });
@@ -54,7 +54,7 @@ describe("Party Controller", function() {
     var party, cancelSpy, windowSpy;
     beforeEach(function() {
       party = {};
-      cancelSpy = sinon.stub(groups, "questCancel", function(){return true;});
+      cancelSpy = sandbox.stub(groups, "questCancel", function(){return true;});
     });
 
     afterEach(function() {
@@ -63,7 +63,7 @@ describe("Party Controller", function() {
     });
 
     it('calls Groups.questCancel when alert box is confirmed', function() {
-      windowSpy = sinon.stub(window, "confirm", function(){return true});
+      windowSpy = sandbox.stub(window, "confirm", function(){return true});
 
       scope.questCancel(party);
       windowSpy.should.have.been.calledOnce;
@@ -71,8 +71,8 @@ describe("Party Controller", function() {
       cancelSpy.should.have.been.calledOnce;
     });
 
-    it('does not call Groups.questCancel when alert box is confirmed', function() {
+    it('does not call Groups.questCancel when alert box is not confirmed', function() {
-      windowSpy = sinon.stub(window, "confirm", function(){return false});
+      windowSpy = sandbox.stub(window, "confirm", function(){return false});
 
       scope.questCancel(party);
       windowSpy.should.have.been.calledOnce;
@@ -84,7 +84,7 @@ describe("Party Controller", function() {
     var party, abortSpy, windowSpy;
     beforeEach(function() {
       party = {};
-      abortSpy = sinon.stub(groups, "questAbort", function(){return true;});
+      abortSpy = sandbox.stub(groups, "questAbort", function(){return true;});
     });
 
     afterEach(function() {
@@ -93,7 +93,7 @@ describe("Party Controller", function() {
     });
 
     it('calls Groups.questAbort when two alert boxes are confirmed', function() {
-      windowSpy = sinon.stub(window, "confirm", function(){return true});
+      windowSpy = sandbox.stub(window, "confirm", function(){return true});
 
       scope.questAbort(party);
       windowSpy.should.have.been.calledTwice;
@@ -103,7 +103,7 @@ describe("Party Controller", function() {
     });
 
     it('does not call Groups.questAbort when first alert box is not confirmed', function() {
-      windowSpy = sinon.stub(window, "confirm", function(){return false});
+      windowSpy = sandbox.stub(window, "confirm", function(){return false});
 
       scope.questAbort(party);
       windowSpy.should.have.been.calledOnce;
@@ -115,7 +115,7 @@ describe("Party Controller", function() {
     it('does not call Groups.questAbort when first alert box is confirmed but second one is not', function() {
       // Hack to confirm first window, but not second
       var shouldReturn = false;
-      windowSpy = sinon.stub(window, "confirm", function(){
+      windowSpy = sandbox.stub(window, "confirm", function(){
         shouldReturn = !shouldReturn;
         return shouldReturn;
       });
@@ -127,4 +127,118 @@ describe("Party Controller", function() {
       abortSpy.should.not.have.been.calledOnce;
     });
   });
+
+  describe('#questLeave', function() {
+    var party, leaveSpy, windowSpy;
+
+    beforeEach(function() {
+      party = {};
+      scope.group = {
+        quest: { members: { 'user-id': true } }
+      };
+      leaveSpy = sandbox.stub(groups, 'questLeave').returns({
+        then: sandbox.stub().yields()
+      });
+    });
+
+    it('calls Groups.questLeave when alert box is confirmed', function() {
+      windowSpy = sandbox.stub(window, "confirm").returns(true);
+
+      scope.questLeave(party);
+      windowSpy.should.have.been.calledOnce;
+      windowSpy.should.have.been.calledWith(window.env.t('sureLeave'));
+      leaveSpy.should.have.been.calledOnce;
+    });
+
+    it('does not call Groups.questLeave when alert box is not confirmed', function() {
+      windowSpy = sandbox.stub(window, "confirm").returns(false);
+
+      scope.questLeave(party);
+      windowSpy.should.have.been.calledOnce;
+      leaveSpy.should.not.have.been.calledOnce;
+    });
+  });
+
+  describe('clickStartQuest', function() {
+    beforeEach(function() {
+      sandbox.stub(rootScope, 'openModal');
+      sandbox.stub(rootScope.$state, 'go');
+    });
+
+    it('opens quest modal if user has a quest', function() {
+      user.items.quests = {
+        whale: 1
+      };
+
+      scope.clickStartQuest();
+
+      expect(rootScope.$state.go).to.not.be.called;
+      expect(rootScope.openModal).to.be.calledOnce;
+      expect(rootScope.openModal).to.be.calledWith(
+        'ownedQuests',
+        { controller: 'InventoryCtrl' }
+      );
+    });
+
+    it('does not open modal if user has no quests', function() {
+      user.items.quests = { };
+
+      scope.clickStartQuest();
+
+      expect(rootScope.openModal).to.not.be.called;
+      expect(rootScope.$state.go).to.be.calledOnce;
+      expect(rootScope.$state.go).to.be.calledWith('options.inventory.quests');
+    });
+
+    it('does not open modal if user had quests previously, but does not now', function() {
+      user.items.quests = {
+        whale: 0,
+        atom1: 0
+      };
+
+      scope.clickStartQuest();
+
+      expect(rootScope.openModal).to.not.be.called;
+      expect(rootScope.$state.go).to.be.calledOnce;
+      expect(rootScope.$state.go).to.be.calledWith('options.inventory.quests');
+    });
+  });
+
+  describe('#leaveOldPartyAndJoinNewParty', function() {
+    beforeEach(function() {
+      sandbox.stub(scope, 'join');
+      sandbox.stub(groups.Group, 'leave').yields();
+      sandbox.stub(groups, 'party').returns({
+        _id: 'old-party'
+      });
+      sandbox.stub(window, 'confirm').returns(true);
+    });
+
+    it('does nothing if user declines confirmation', function() {
+      window.confirm.returns(false);
+      scope.leaveOldPartyAndJoinNewParty('some-id', 'some-name');
+
+      expect(groups.Group.leave).to.not.be.called;
+    })
+
+    it('leaves user\'s current party', function() {
+      scope.leaveOldPartyAndJoinNewParty('some-id', 'some-name');
+
+      expect(groups.Group.leave).to.be.calledOnce;
+      expect(groups.Group.leave).to.be.calledWith({
+        gid: 'old-party',
+        keep: false
+      });
+    });
+
+    it('joins the new party', function() {
+      scope.leaveOldPartyAndJoinNewParty('some-id', 'some-name');
+
+      expect(scope.join).to.be.calledOnce;
+      expect(scope.join).to.be.calledWith({
+        id: 'some-id',
+        name: 'some-name'
+      });
+    });
+  });
 });

test/spec/controllers/settingsCtrlSpec.js

@@ -0,0 +1,86 @@
+'use strict';
+
+describe('Settings Controller', function() {
+  var rootScope, scope, user, User, ctrl;
+
+  beforeEach(function() {
+    module(function($provide) {
+      user = specHelper.newUser();
+      User = {
+        set: sandbox.stub(),
+        user: user
+      };
+      $provide.value('User', User);
+      $provide.value('Guide', sandbox.stub());
+    });
+
+    inject(function(_$rootScope_, _$controller_) {
+      scope = _$rootScope_.$new();
+      rootScope = _$rootScope_;
+
+      // Load RootCtrl to ensure shared behaviors are loaded
+      _$controller_('RootCtrl',  {$scope: scope, User: User});
+
+      ctrl = _$controller_('SettingsCtrl', {$scope: scope, User: User});
+    });
+  });
+
+  describe('#openDayStartModal', function() {
+    beforeEach(function() {
+      sandbox.stub(rootScope, 'openModal');
+      sandbox.stub(window, 'alert');
+    });
+
+    it('opens the day start modal', function() {
+      scope.openDayStartModal(5);
+
+      expect(rootScope.openModal).to.be.calledOnce;
+      expect(rootScope.openModal).to.be.calledWith('change-day-start', {scope: scope});
+    });
+
+    it('sets nextCron variable', function() {
+      expect(scope.nextCron).to.not.exist;
+
+      scope.openDayStartModal(5);
+
+      expect(scope.nextCron).to.exist;
+    });
+
+    it('calculates the next time cron will run', function() {
+      var fakeCurrentTime = new Date(2013, 3, 1, 3, 12).getTime();
+      var expectedTime = new Date(2013, 3, 1, 5, 0, 0).getTime();
+      sandbox.useFakeTimers(fakeCurrentTime);
+
+      scope.openDayStartModal(5);
+
+      expect(scope.nextCron).to.eq(expectedTime);
+    });
+
+    it('calculates the next time cron will run and adds a day if cron would have already passed', function() {
+      var fakeCurrentTime = new Date(2013, 3, 1, 8, 12).getTime();
+      var expectedTime = new Date(2013, 3, 2, 5, 0, 0).getTime();
+      sandbox.useFakeTimers(fakeCurrentTime);
+
+      scope.openDayStartModal(5);
+
+      expect(scope.nextCron).to.eq(expectedTime);
+    });
+  });
+
+  describe('#saveDayStart', function() {
+
+    it('updates user\'s custom day start and last cron', function() {
+      var fakeCurrentTime = new Date(2013, 3, 1, 8, 12).getTime();
+      var expectedTime = fakeCurrentTime;
+      sandbox.useFakeTimers(fakeCurrentTime);
+      scope.dayStart = 5;
+      scope.saveDayStart();
+
+      expect(User.set).to.be.calledOnce;
+      expect(User.set).to.be.calledWith({
+        'preferences.dayStart': 5,
+        'lastCron': expectedTime
+      });
+    });
+  });
+});

test/spec/services/groupServicesSpec.js

@@ -41,99 +41,65 @@ describe('groupServices', function() {
   });
 
   context('quest function wrappers', function() {
-    var successPromise = function() {
+    var successPromise, failPromise;
-      return {
-        then: function(success, failure) {
-          success();
-        }
-      }
-    }
-
-    var successParty = {
-      $questAccept: successPromise,
-      $questReject: successPromise,
-      $questCancel: successPromise,
-      $questAbort:  successPromise
-    }
-
-    var failPromise = function() {
-      return {
-        then: function(success, failure) {
-          failure('fail');
-        }
-      }
-    }
-
-    var failParty = {
-      $questAccept: failPromise,
-      $questReject: failPromise,
-      $questCancel: failPromise,
-      $questAbort:  failPromise
-    }
 
     beforeEach(function() {
-      sinon.spy(user, 'sync');
+      sandbox.spy(user, 'sync');
-      sinon.stub(console, 'log', function(arg) { return true; });
+      sandbox.stub(console, 'log');
-    });
 
-    afterEach(function() {
+      successPromise = sandbox.stub().returns({
-      user.sync.restore();
+        then: function(success, failure) {
-      console.log.restore();
+          return success();
-    });
+        }
-
-    describe('questAccept', function() {
-      it('syncs user if $questAccept succeeds', function() {
-        groups.questAccept(successParty);
-        user.sync.should.have.been.calledOnce;
       });
 
-      it('does not sync user if $questAccept fails', function() {
+      failPromise = sandbox.stub().returns({
-        groups.questAccept(failParty);
+        then: function(success, failure) {
-        user.sync.should.not.have.been.calledOnce;
+          return failure('fail');
-        console.log.should.have.been.calledWith('fail');
+        }
       });
     });
 
-    describe('questReject', function() {
+    var questFunctions = [
-      it('syncs user if $questReject succeeds', function() {
+      'questAccept',
-        groups.questReject(successParty);
+      'questReject',
-        user.sync.should.have.been.calledOnce;
+      'questCancel',
-        console.log.should.not.have.been.called;
+      'questAbort',
-      });
+      'questLeave'
+    ];
 
-      it('does not sync user if $questReject fails', function() {
+    for (var i in questFunctions) {
-        groups.questReject(failParty);
+      var questFunc = questFunctions[i];
-        user.sync.should.not.have.been.calledOnce;
-        console.log.should.have.been.calledWith('fail');
-      });
-    });
 
-    describe('questCancel', function() {
+      describe('#' + questFunc, function() {
-      it('syncs user if $questCancel succeeds', function() {
+        it('calls party.$' + questFunc, function() {
-        groups.questCancel(successParty);
+          var party = { };
-        user.sync.should.have.been.calledOnce;
+          party['$' + questFunc] = successPromise;
-        console.log.should.not.have.been.called;
-      });
 
-      it('does not sync user if $questCancel fails', function() {
+          groups[questFunc](party);
-        groups.questCancel(failParty);
-        user.sync.should.not.have.been.calledOnce;
-        console.log.should.have.been.calledWith('fail');
-      });
-    });
 
-    describe('questAbort', function() {
+          expect(party['$' + questFunc]).to.be.calledOnce;
-      it('syncs user if $questAbort succeeds', function() {
+        });
-        groups.questAbort(successParty);
-        user.sync.should.have.been.calledOnce;
-        console.log.should.not.have.been.called;
-      });
 
-      it('does not sync user if $questAbort fails', function() {
+        it('syncs user if $' + questFunc + ' succeeds', function() {
-        groups.questAbort(failParty);
+          var successParty = { };
-        user.sync.should.not.have.been.calledOnce;
+          successParty['$' + questFunc] = successPromise;
-        console.log.should.have.been.calledWith('fail');
+
+          groups[questFunc](successParty);
+
+          user.sync.should.have.been.calledOnce;
+        });
+
+        it('does not sync user if $' + questFunc + ' fails', function() {
+          var failParty = { };
+          failParty['$' + questFunc] = failPromise;
+
+          groups[questFunc](failParty);
+
+          user.sync.should.not.have.been.calledOnce;
+          console.log.should.have.been.calledWith('fail');
+        });
       });
-    });
+    }
   });
 });

website/public/css/shared.styl

@@ -67,3 +67,6 @@ li.spaced
 .flex-column
   display: flex
   flex-direction: column
+
+.row-margin
+  margin: auto auto 1em auto

website/public/js/controllers/autoCompleteCtrl.js

@@ -0,0 +1,73 @@
+'use strict';
+
+habitrpg.controller('AutocompleteCtrl', ['$scope', '$timeout', 'Groups', 'User', 'InputCaret', function ($scope,$timeout,Groups,User,InputCaret) {
+    $scope.clearUserlist = function() {
+      $scope.response = [];
+      $scope.usernames = [];
+    }
+
+    $scope.filterUser = function(msg) {
+      if (!$scope.query || !msg.user) {
+        return false;
+      }
+
+      // Ignore casing when checking for username
+      var user = msg.user.toLowerCase();
+      var text = $scope.query.text.toLowerCase();
+
+      return user.indexOf(text) == 0;
+    }
+
+    $scope.performCompletion = function(msg) {
+      $scope.autoComplete(msg);
+      $scope.query = null;
+    }
+
+    $scope.addNewUser = function(user) {
+      if($.inArray(user.user,$scope.usernames) == -1) {
+        user.username = user.user;
+        $scope.usernames.push(user.user);
+        $scope.response.push(user);
+      }
+    }
+
+    $scope.clearUserlist();
+
+    $scope.chatChanged = function(newvalue,oldvalue){
+      if($scope.group && $scope.group.chat && $scope.group.chat.length > 0){
+        for(var i = 0; i < $scope.group.chat.length; i++) {
+          $scope.addNewUser($scope.group.chat[i]);
+        }
+      }
+    }
+
+    $scope.$watch('group.chat',$scope.chatChanged);
+
+    $scope.caretChanged = function(newCaretPos) {
+      var relativeelement = $('.chat-form div:first');
+      var textarea = $('.chat-form textarea');
+      var userlist = $('.list-at-user');
+      var offset = {
+        x: textarea.offset().left - relativeelement.offset().left,
+        y: textarea.offset().top - relativeelement.offset().top,
+      };
+      if(relativeelement) {
+        var caretOffset = InputCaret.getPosition(textarea);
+        userlist.css({
+                  left: caretOffset.left + offset.x,
+                  top: caretOffset.top + offset.y + 16
+                });
+      }
+    }
+
+    $scope.updateTimer = false;
+
+    $scope.$watch(function () { return $scope.caretPos; },function(newCaretPos) {
+      if($scope.updateTimer){
+        $timeout.cancel($scope.updateTimer)
+      }
+      $scope.updateTimer = $timeout(function(){
+        $scope.caretChanged(newCaretPos);
+      },$scope.watchDelay)
+    });
+  }]);

website/public/js/controllers/chatCtrl.js

@@ -0,0 +1,139 @@
+'use strict';
+
+habitrpg.controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'ApiUrl', 'Notification', 'Members', '$rootScope', 'Analytics',
+    function($scope, Groups, Chat, User, $http, ApiUrl, Notification, Members, $rootScope, Analytics){
+    $scope.message = {content:''};
+    $scope._sending = false;
+
+    $scope.isUserMentioned = function(user, message) {
+      if(message.hasOwnProperty("highlight"))
+        return message.highlight;
+      message.highlight = false;
+      var messagetext = message.text.toLowerCase();
+      var username = user.profile.name;
+      var mentioned = messagetext.indexOf(username.toLowerCase());
+      var pattern = username+"([^\w]|$){1}";
+      if(mentioned > -1) {
+        var preceedingchar = messagetext.substring(mentioned-1,mentioned);
+        if(mentioned == 0 || preceedingchar.trim() == '' || preceedingchar == '@'){
+          var regex = new RegExp(pattern,'i');
+          message.highlight = regex.test(messagetext);
+        }
+      }
+      return message.highlight;
+    }
+
+    $scope.postChat = function(group, message){
+      if (_.isEmpty(message) || $scope._sending) return;
+      $scope._sending = true;
+      var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false;
+      Chat.utils.postChat({gid: group._id, message:message, previousMsg: previousMsg}, undefined, function(data){
+        if(data.chat){
+          group.chat = data.chat;
+        }else if(data.message){
+          group.chat.unshift(data.message);
+        }
+        $scope.message.content = '';
+        $scope._sending = false;
+        if (group.type == 'party') {
+          Analytics.updateUser({'partyID':group.id,'partySize':group.memberCount});
+        }
+        if (group.privacy == 'public'){
+          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy,'groupName':group.name,'message':message});
+        } else {
+          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy});
+        }
+      }, function(err){
+        $scope._sending = false;
+      });
+    }
+
+    $scope.deleteChatMessage = function(group, message){
+      if(message.uuid === User.user.id || (User.user.backer && User.user.contributor.admin)){
+        var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false;
+        if(confirm('Are you sure you want to delete this message?')){
+          Chat.utils.deleteChatMessage({gid:group._id, messageId:message.id, previousMsg:previousMsg}, undefined, function(data){
+            if(data.chat) group.chat = data.chat;
+
+            var i = _.findIndex(group.chat, {id: message.id});
+            if(i !== -1) group.chat.splice(i, 1);
+          });
+        }
+      }
+    }
+
+    $scope.likeChatMessage = function(group,message) {
+      if (message.uuid == User.user._id)
+        return Notification.text(window.env.t('foreverAlone'));
+      if (!message.likes) message.likes = {};
+      if (message.likes[User.user._id]) {
+        delete message.likes[User.user._id];
+      } else {
+        message.likes[User.user._id] = true;
+      }
+      Chat.utils.like({ gid:group._id, messageId:message.id }, undefined);
+    }
+
+    $scope.flagChatMessage = function(groupId,message) {
+      if(!message.flags) message.flags = {};
+      if(message.flags[User.user._id])
+        Notification.text(window.env.t('abuseAlreadyReported'));
+      else {
+        $scope.abuseObject = message;
+        $scope.groupId = groupId;
+        Members.selectMember(message.uuid, function(){
+          $rootScope.openModal('abuse-flag',{
+            controller:'MemberModalCtrl',
+            scope: $scope
+          });
+        });
+      }
+    };
+
+    $scope.copyToDo = function(message) {
+      var taskNotes = env.t("messageWroteIn",  {
+        user: message.uuid == 'system'
+            ? 'system'
+            : '[' + message.user + '](' + env.BASE_URL + '/static/front/#?memberId=' + message.uuid + ')',
+        group: '[' + $scope.group.name + '](' + window.location.href + ')'
+      });
+
+      var newScope = $scope.$new();
+      newScope.text = message.text;
+      newScope.notes = taskNotes;
+
+      $rootScope.openModal('copyChatToDo',{
+        controller:'CopyMessageModalCtrl',
+        scope: newScope
+      });
+    };
+
+    $scope.sync = function(group){
+      if(group.type == 'party') {
+        group.$syncParty(); // Syncs the whole party, not just 15 members
+      } else {
+        group.$get();
+      }
+      // When the user clicks fetch recent messages we need to update
+      // that the user has seen the new messages
+      Chat.seenMessage(group._id);
+    }
+
+    // List of Ordering options for the party members list
+    $scope.partyOrderChoices = {
+      'level': window.env.t('sortLevel'),
+      'random': window.env.t('sortRandom'),
+      'pets': window.env.t('sortPets'),
+      'habitrpg_date_joined' : window.env.t('sortHabitrpgJoined'),
+      'party_date_joined': window.env.t('sortJoined'),
+      'habitrpg_last_logged_in': window.env.t('sortHabitrpgLastLoggedIn'),
+      'name': window.env.t('sortName'),
+      'backgrounds': window.env.t('sortBackgrounds'),
+    };
+
+    $scope.partyOrderAscendingChoices = {
+      'ascending': window.env.t('ascendingSort'),
+      'descending': window.env.t('descendingSort')
+    }
+
+  }]);

website/public/js/controllers/copyMessageModalCtrl.js

@@ -0,0 +1,17 @@
+'use strict';
+
+habitrpg.controller("CopyMessageModalCtrl", ['$scope', 'User', 'Notification',
+    function($scope, User, Notification){
+      $scope.saveTodo = function() {
+        var newTask = {
+          text: $scope.text,
+          type: 'todo',
+          notes: $scope.notes
+        };
+
+        User.user.ops.addTask({body:newTask});
+        Notification.text(window.env.t('messageAddedAsToDo'));
+
+        $scope.$close();
+      }
+  }]);

website/public/js/controllers/groupsCtrl.js

@@ -7,13 +7,13 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
       if (!group.quest || !group.quest.members) return false;
       if (group.quest.active) return false; // quest is started, not pending
       return userid in group.quest.members && group.quest.members[userid] != false;
-    }
+    };
 
     $scope.isMemberOfRunningQuest = function(userid, group) {
       if (!group.quest || !group.quest.members) return false;
       if (!group.quest.active) return false; // quest is pending, not started
       return group.quest.members[userid];
-    }
+    };
 
     $scope.isMemberOfGroup = function(userid, group){
 
@@ -32,11 +32,11 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
       if (!group.members) return false;
       var memberIds = _.map(group.members, function(x){return x._id});
       return ~(memberIds.indexOf(userid));
-    }
+    };
 
     $scope.isMember = function(user, group){
       return ~(group.members.indexOf(user._id));
-    }
+    };
 
     $scope.Members = Members;
     $scope._editing = {group:false};
@@ -45,13 +45,13 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
       if(group._newLeader && group._newLeader._id) group.leader = group._newLeader._id;
       group.$save();
       group._editing = false;
-    }
+    };
 
     $scope.deleteAllMessages = function() {
       if (confirm(window.env.t('confirmDeleteAllMessages'))) {
         User.user.ops.clearPMs({});
       }
-    }
+    };
 
     // ------ Modals ------
 
@@ -69,7 +69,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
           $rootScope.openModal('member', {controller:'MemberModalCtrl', windowClass:'profile-modal', size:'lg'});
         });
       }
-    }
+    };
 
 
     $scope.removeMember = function(group, member, isMember){
@@ -80,7 +80,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
         isMember: isMember
       };
       $rootScope.openModal('remove-member', {scope: $scope});
-    }
+    };
 
     $scope.confirmRemoveMember = function(confirm){
       if(confirm){
@@ -100,31 +100,21 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
       }else{
         $scope.removeMemberData = undefined;
       }
-    }
-
-    $scope.openInviteModal = function(group){
-      $rootScope.openModal('invite-friends', {controller:'InviteToGroupCtrl', resolve:
-        {injectedGroup: function(){
-          return group;
-        }}});
     };
 
-    //var serializeQs = function(obj, prefix){
+    $scope.openInviteModal = function(group){
-    //  var str = [];
+      if (group.type !== 'party' && group.type !== 'guild') {
-    //  for(var p in obj) {
+        return console.log('Invalid group type.')
-    //    if (obj.hasOwnProperty(p)) {
+      }
-    //      var k = prefix ? prefix + "[" + p + "]" : p, v = obj[p];
+      $rootScope.openModal('invite-' + group.type, {
-    //      str.push(typeof v == "object" ?
+        controller:'InviteToGroupCtrl',
-    //        serializeQs(v, k) :
+        resolve: {
-    //        encodeURIComponent(k) + "=" + encodeURIComponent(v));
+          injectedGroup: function(){
-    //    }
+            return group;
-    //  }
+          }
-    //  return str.join("&");
+        }
-    //}
+      });
-    //
+    };
-    //$scope.inviteLink = function(obj){
-    //  return window.env.BASE_URL + '?' + serializeQs({partyInvite: obj});
-    //}
 
     $scope.quickReply = function(uid) {
       Members.selectMember(uid, function(){
@@ -132,457 +122,4 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
       });
     }
 
-  }])
+  }]);
-
-  .controller('InviteToGroupCtrl', ['$scope', 'User', 'Groups', 'injectedGroup', '$http', 'Notification', function($scope, User, Groups, injectedGroup, $http, Notification){
-    $scope.group = injectedGroup;
-
-    $scope.inviter = User.user.profile.name;
-    $scope.emails = [{name:"",email:""},{name:"",email:""}];
-
-    $scope.inviteEmails = function(){
-      Groups.Group.invite({gid: $scope.group._id}, {inviter: $scope.inviter, emails: $scope.emails}, function(){
-        Notification.text("Invitation(s) sent!");
-        $scope.emails = [{name:'',email:''},{name:'',email:''}];
-      }, function(){
-        $scope.emails = [{name:'',email:''},{name:'',email:''}];
-      });
-    };
-
-    $scope.invite = function(){
-      Groups.Group.invite({gid: $scope.group._id}, {uuids: [$scope.invitee]}, function(){
-        Notification.text("Invitation(s) sent!");
-        $scope.invitee = '';
-      }, function(){
-        $scope.invitee = '';
-      });
-    };
-  }])
-
-  .controller('AutocompleteCtrl', ['$scope', '$timeout', 'Groups', 'User', 'InputCaret', function ($scope,$timeout,Groups,User,InputCaret) {
-    $scope.clearUserlist = function() {
-      $scope.response = [];
-      $scope.usernames = [];
-    }
-
-    $scope.filterUser = function(msg) {
-      if (!$scope.query || !msg.user) {
-        return false;
-      }
-
-      // Ignore casing when checking for username
-      var user = msg.user.toLowerCase();
-      var text = $scope.query.text.toLowerCase();
-
-      return user.indexOf(text) == 0;
-    }
-
-    $scope.performCompletion = function(msg) {
-      $scope.autoComplete(msg);
-      $scope.query = null;
-    }
-
-    $scope.addNewUser = function(user) {
-      if($.inArray(user.user,$scope.usernames) == -1) {
-        user.username = user.user;
-        $scope.usernames.push(user.user);
-        $scope.response.push(user);
-      }
-    }
-
-    $scope.clearUserlist();
-
-    $scope.chatChanged = function(newvalue,oldvalue){
-      if($scope.group && $scope.group.chat && $scope.group.chat.length > 0){
-        for(var i = 0; i < $scope.group.chat.length; i++) {
-          $scope.addNewUser($scope.group.chat[i]);
-        }
-      }
-    }
-
-    $scope.$watch('group.chat',$scope.chatChanged);
-
-    $scope.caretChanged = function(newCaretPos) {
-      var relativeelement = $('.chat-form div:first');
-      var textarea = $('.chat-form textarea');
-      var userlist = $('.list-at-user');
-      var offset = {
-        x: textarea.offset().left - relativeelement.offset().left,
-        y: textarea.offset().top - relativeelement.offset().top,
-      };
-      if(relativeelement) {
-        var caretOffset = InputCaret.getPosition(textarea);
-        userlist.css({
-                  left: caretOffset.left + offset.x,
-                  top: caretOffset.top + offset.y + 16
-                });
-      }
-    }
-
-    $scope.updateTimer = false;
-
-    $scope.$watch(function () { return $scope.caretPos; },function(newCaretPos) {
-      if($scope.updateTimer){
-        $timeout.cancel($scope.updateTimer)
-      }
-      $scope.updateTimer = $timeout(function(){
-        $scope.caretChanged(newCaretPos);
-      },$scope.watchDelay)
-    });
-  }])
-
-  .controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'ApiUrl', 'Notification', 'Members', '$rootScope', 'Analytics',
-    function($scope, Groups, Chat, User, $http, ApiUrl, Notification, Members, $rootScope, Analytics){
-    $scope.message = {content:''};
-    $scope._sending = false;
-
-    $scope.isUserMentioned = function(user, message) {
-      if(message.hasOwnProperty("highlight"))
-        return message.highlight;
-      message.highlight = false;
-      var messagetext = message.text.toLowerCase();
-      var username = user.profile.name;
-      var mentioned = messagetext.indexOf(username.toLowerCase());
-      var pattern = username+"([^\w]|$){1}";
-      if(mentioned > -1) {
-        var preceedingchar = messagetext.substring(mentioned-1,mentioned);
-        if(mentioned == 0 || preceedingchar.trim() == '' || preceedingchar == '@'){
-          var regex = new RegExp(pattern,'i');
-          message.highlight = regex.test(messagetext);
-        }
-      }
-      return message.highlight;
-    }
-
-    $scope.postChat = function(group, message){
-      if (_.isEmpty(message) || $scope._sending) return;
-      $scope._sending = true;
-      var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false;
-      Chat.utils.postChat({gid: group._id, message:message, previousMsg: previousMsg}, undefined, function(data){
-        if(data.chat){
-          group.chat = data.chat;
-        }else if(data.message){
-          group.chat.unshift(data.message);
-        }
-        $scope.message.content = '';
-        $scope._sending = false;
-        if (group.type == 'party') {
-          Analytics.updateUser({'partyID':group.id,'partySize':group.memberCount});
-        }
-        if (group.privacy == 'public'){
-          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy,'groupName':group.name,'message':message});
-        } else {
-          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy});
-        }
-      }, function(err){
-        $scope._sending = false;
-      });
-    }
-
-    $scope.deleteChatMessage = function(group, message){
-      if(message.uuid === User.user.id || (User.user.backer && User.user.contributor.admin)){
-        var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false;
-        if(confirm('Are you sure you want to delete this message?')){
-          Chat.utils.deleteChatMessage({gid:group._id, messageId:message.id, previousMsg:previousMsg}, undefined, function(data){
-            if(data.chat) group.chat = data.chat;
-
-            var i = _.findIndex(group.chat, {id: message.id});
-            if(i !== -1) group.chat.splice(i, 1);
-          });
-        }
-      }
-    }
-
-    $scope.likeChatMessage = function(group,message) {
-      if (message.uuid == User.user._id)
-        return Notification.text(window.env.t('foreverAlone'));
-      if (!message.likes) message.likes = {};
-      if (message.likes[User.user._id]) {
-        delete message.likes[User.user._id];
-      } else {
-        message.likes[User.user._id] = true;
-      }
-      Chat.utils.like({ gid:group._id, messageId:message.id }, undefined);
-    }
-
-    $scope.flagChatMessage = function(groupId,message) {
-      if(!message.flags) message.flags = {};
-      if(message.flags[User.user._id])
-        Notification.text(window.env.t('abuseAlreadyReported'));
-      else {
-        $scope.abuseObject = message;
-        $scope.groupId = groupId;
-        Members.selectMember(message.uuid, function(){
-          $rootScope.openModal('abuse-flag',{
-            controller:'MemberModalCtrl',
-            scope: $scope
-          });
-        });
-      }
-    };
-
-    $scope.copyToDo = function(message) {
-      var taskNotes = env.t("messageWroteIn",  {
-        user: message.uuid == 'system'
-            ? 'system'
-            : '[' + message.user + '](' + env.BASE_URL + '/static/front/#?memberId=' + message.uuid + ')',
-        group: '[' + $scope.group.name + '](' + window.location.href + ')'
-      });
-
-      var newScope = $scope.$new();
-      newScope.text = message.text;
-      newScope.notes = taskNotes;
-
-      $rootScope.openModal('copyChatToDo',{
-        controller:'CopyMessageModalCtrl',
-        scope: newScope
-      });
-    };
-
-    $scope.sync = function(group){
-      if(group.type == 'party') {
-        group.$syncParty(); // Syncs the whole party, not just 15 members
-      } else {
-        group.$get();
-      }
-      // When the user clicks fetch recent messages we need to update
-      // that the user has seen the new messages
-      Chat.seenMessage(group._id);
-    }
-
-    // List of Ordering options for the party members list
-    $scope.partyOrderChoices = {
-      'level': window.env.t('sortLevel'),
-      'random': window.env.t('sortRandom'),
-      'pets': window.env.t('sortPets'),
-      'habitrpg_date_joined' : window.env.t('sortHabitrpgJoined'),
-      'party_date_joined': window.env.t('sortJoined'),
-      'habitrpg_last_logged_in': window.env.t('sortHabitrpgLastLoggedIn'),
-      'name': window.env.t('sortName'),
-      'backgrounds': window.env.t('sortBackgrounds'),
-    };
-
-    $scope.partyOrderAscendingChoices = {
-      'ascending': window.env.t('ascendingSort'),
-      'descending': window.env.t('descendingSort')
-    }
-
-  }])
-
-  .controller("GuildsCtrl", ['$scope', 'Groups', 'User', 'Challenges', '$rootScope', '$state', '$location', '$compile', 'Analytics',
-    function($scope, Groups, User, Challenges, $rootScope, $state, $location, $compile, Analytics) {
-      $scope.groups = {
-        guilds: Groups.myGuilds(),
-        "public": Groups.publicGuilds()
-      }
-
-      $scope.type = 'guild';
-      $scope.text = window.env.t('guild');
-      var newGroup = function(){
-        return new Groups.Group({type:'guild', privacy:'private'});
-      }
-      $scope.newGroup = newGroup()
-      $scope.create = function(group){
-        if (User.user.balance < 1)
-          return $rootScope.openModal('buyGems', {track:"Gems > Create Group"});
-
-        if (confirm(window.env.t('confirmGuild'))) {
-          group.$save(function(saved){
-            if (saved.privacy == 'public') {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'guild','privacy':saved.privacy,'groupName':saved.name})}
-            else {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'guild','privacy':saved.privacy})}
-            $rootScope.hardRedirect('/#/options/groups/guilds/' + saved._id);
-          });
-        }
-      }
-
-      $scope.join = function(group){
-        // If we're accepting an invitation, we don't have the actual group object, but a faux group object (for performance
-        // purposes) {id, name}. Let's trick ngResource into thinking we have a group, so we can call the same $join
-        // function (server calls .attachGroup(), which finds group by _id and handles this properly)
-        if (group.id && !group._id) {
-          group = new Groups.Group({_id:group.id});
-        }
-
-        group.$join(function(joined){
-          if (joined.privacy == 'public') {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'guild','privacy':joined.privacy,'groupName':joined.name})}
-          else {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'guild','privacy':joined.privacy})}
-          $rootScope.hardRedirect('/#/options/groups/guilds/' + joined._id);
-        })
-      }
-
-      $scope.leave = function(keep) {
-         if (keep == 'cancel') {
-           $scope.selectedGroup = undefined;
-           $scope.popoverEl.popover('destroy');
-         } else {
-           Groups.Group.leave({gid: $scope.selectedGroup._id, keep:keep}, undefined, function(){
-             $rootScope.hardRedirect('/#/options/groups/guilds');
-           });
-         }
-      }
-
-      $scope.clickLeave = function(group, $event){
-          $scope.selectedGroup = group;
-          $scope.popoverEl = $($event.target);
-          var html, title;
-          Challenges.Challenge.query(function(challenges) {
-              challenges = _.pluck(_.filter(challenges, function(c) {
-                  return c.group._id == group._id;
-              }), '_id');
-              if (_.intersection(challenges, User.user.challenges).length > 0) {
-                  html = $compile(
-              '<a ng-controller="GroupsCtrl" ng-click="leave(\'remove-all\')">' + window.env.t('removeTasks') + '</a><br/>\n<a ng-click="leave(\'keep-all\')">' + window.env.t('keepTasks') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
-          )($scope);
-                  title = window.env.t('leaveGroupCha');
-              } else {
-                  html = $compile(
-                      '<a ng-controller="GroupsCtrl" ng-click="leave(\'keep-all\')">' + window.env.t('confirm') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
-                  )($scope);
-                  title = window.env.t('leaveGroup')
-              }
-          $scope.popoverEl.popover('destroy').popover({
-              html: true,
-              placement: 'top',
-              trigger: 'manual',
-                  title: title,
-              content: html
-          }).popover('show');
-          });
-      }
-
-      $scope.reject = function(guild){
-        var i = _.findIndex(User.user.invitations.guilds, {id:guild.id});
-        if (~i){
-          User.user.invitations.guilds.splice(i, 1);
-          User.set({'invitations.guilds':User.user.invitations.guilds});
-        }
-      }
-    }
-  ])
-
-  .controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','Challenges','$state','$compile','Analytics','Quests',
-    function($rootScope,$scope,Groups,Chat,User,Challenges,$state,$compile,Analytics,Quests) {
-      $scope.type = 'party';
-      $scope.text = window.env.t('party');
-      $scope.group = $rootScope.party = Groups.party();
-      $scope.newGroup = new Groups.Group({type:'party'});
-      $scope.inviteOrStartParty = Groups.inviteOrStartParty;
-      $scope.questInit = Quests.questInit;
-
-      if ($state.is('options.social.party')) {
-        $scope.group.$syncParty(); // Sync party automatically when navigating to party page
-      }
-
-      Chat.seenMessage($scope.group._id);
-
-      $scope.create = function(group){
-        group.$save(function(){
-          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'party','privacy':'private'});
-          Analytics.updateUser({'partyID':group.id,'partySize':1});
-          $rootScope.hardRedirect('/#/options/groups/party');
-        });
-      };
-
-      $scope.join = function(party){
-        var group = new Groups.Group({_id: party.id, name: party.name});
-        group.$join(function(){
-          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'party','privacy':'private'});
-          Analytics.updateUser({'partyID':party.id});
-          $rootScope.hardRedirect('/#/options/groups/party');
-        });
-      };
-
-      // TODO: refactor guild and party leave into one function
-      $scope.leave = function(keep) {
-        if (keep == 'cancel') {
-          $scope.selectedGroup = undefined;
-          $scope.popoverEl.popover('destroy');
-        } else {
-          Groups.Group.leave({gid: $scope.selectedGroup._id, keep:keep}, undefined, function(){
-            Analytics.updateUser({'partySize':null,'partyID':null});
-            $rootScope.hardRedirect('/#/options/groups/party');
-          });
-        }
-      };
-
-      // TODO: refactor guild and party clickLeave into one function
-      $scope.clickLeave = function(group, $event){
-          $scope.selectedGroup = group;
-          $scope.popoverEl = $($event.target);
-          var html, title;
-          Challenges.Challenge.query(function(challenges) {
-              challenges = _.pluck(_.filter(challenges, function(c) {
-                  return c.group._id == group._id;
-              }), '_id');
-              if (_.intersection(challenges, User.user.challenges).length > 0) {
-                  html = $compile(
-              '<a ng-controller="GroupsCtrl" ng-click="leave(\'remove-all\')">' + window.env.t('removeTasks') + '</a><br/>\n<a ng-click="leave(\'keep-all\')">' + window.env.t('keepTasks') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
-          )($scope);
-                  title = window.env.t('leavePartyCha');
-              } else {
-                  html = $compile(
-                      '<a ng-controller="GroupsCtrl" ng-click="leave(\'keep-all\')">' + window.env.t('confirm') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
-                  )($scope);
-                  title = window.env.t('leaveParty');
-              }
-          $scope.popoverEl.popover('destroy').popover({
-              html: true,
-              placement: 'top',
-              trigger: 'manual',
-                  title: title,
-              content: html
-          }).popover('show');
-          });
-      }
-
-      $scope.reject = function(){
-        //User.user.invitations.party = undefined;
-        User.set({'invitations.party':{}});
-      }
-
-      $scope.questCancel = function(party){
-        if (!confirm(window.env.t('sureCancel'))) return;
-        Groups.questCancel(party);
-      }
-
-      $scope.questAbort = function(party){
-        if (!confirm(window.env.t('sureAbort'))) return;
-        if (!confirm(window.env.t('doubleSureAbort'))) return;
-        Groups.questAbort(party);
-      }
-
-      $scope.questAccept = function(party){
-        Groups.questAccept(party);
-      };
-
-      $scope.questReject = function(party){
-        Groups.questReject(party);
-      }
-    }
-  ])
-
-  .controller("TavernCtrl", ['$scope', 'Groups', 'User',
-    function($scope, Groups, User) {
-      $scope.group = Groups.tavern();
-      $scope.toggleUserTier = function($event) {
-        $($event.target).next().toggle();
-      }
-    }
-  ])
-
-  .controller("CopyMessageModalCtrl", ['$scope', 'User', 'Notification',
-    function($scope, User, Notification){
-      $scope.saveTodo = function() {
-        var newTask = {
-          text: $scope.text,
-          type: 'todo',
-          notes: $scope.notes
-        };
-
-        User.user.ops.addTask({body:newTask});
-        Notification.text(window.env.t('messageAddedAsToDo'));
-
-        $scope.$close();
-      }
-    }
-  ]);

website/public/js/controllers/guildsCtrl.js

@@ -0,0 +1,92 @@
+'use strict';
+
+habitrpg.controller("GuildsCtrl", ['$scope', 'Groups', 'User', 'Challenges', '$rootScope', '$state', '$location', '$compile', 'Analytics',
+    function($scope, Groups, User, Challenges, $rootScope, $state, $location, $compile, Analytics) {
+      $scope.groups = {
+        guilds: Groups.myGuilds(),
+        "public": Groups.publicGuilds()
+      }
+
+      $scope.type = 'guild';
+      $scope.text = window.env.t('guild');
+      var newGroup = function(){
+        return new Groups.Group({type:'guild', privacy:'private'});
+      }
+      $scope.newGroup = newGroup()
+      $scope.create = function(group){
+        if (User.user.balance < 1)
+          return $rootScope.openModal('buyGems', {track:"Gems > Create Group"});
+
+        if (confirm(window.env.t('confirmGuild'))) {
+          group.$save(function(saved){
+            if (saved.privacy == 'public') {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'guild','privacy':saved.privacy,'groupName':saved.name})}
+            else {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'guild','privacy':saved.privacy})}
+            $rootScope.hardRedirect('/#/options/groups/guilds/' + saved._id);
+          });
+        }
+      }
+
+      $scope.join = function(group){
+        // If we're accepting an invitation, we don't have the actual group object, but a faux group object (for performance
+        // purposes) {id, name}. Let's trick ngResource into thinking we have a group, so we can call the same $join
+        // function (server calls .attachGroup(), which finds group by _id and handles this properly)
+        if (group.id && !group._id) {
+          group = new Groups.Group({_id:group.id});
+        }
+
+        group.$join(function(joined){
+          if (joined.privacy == 'public') {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'guild','privacy':joined.privacy,'groupName':joined.name})}
+          else {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'guild','privacy':joined.privacy})}
+          $rootScope.hardRedirect('/#/options/groups/guilds/' + joined._id);
+        })
+      }
+
+      $scope.leave = function(keep) {
+         if (keep == 'cancel') {
+           $scope.selectedGroup = undefined;
+           $scope.popoverEl.popover('destroy');
+         } else {
+           Groups.Group.leave({gid: $scope.selectedGroup._id, keep:keep}, undefined, function(){
+             $rootScope.hardRedirect('/#/options/groups/guilds');
+           });
+         }
+      }
+
+      $scope.clickLeave = function(group, $event){
+          $scope.selectedGroup = group;
+          $scope.popoverEl = $($event.target);
+          var html, title;
+          Challenges.Challenge.query(function(challenges) {
+              challenges = _.pluck(_.filter(challenges, function(c) {
+                  return c.group._id == group._id;
+              }), '_id');
+              if (_.intersection(challenges, User.user.challenges).length > 0) {
+                  html = $compile(
+              '<a ng-controller="GroupsCtrl" ng-click="leave(\'remove-all\')">' + window.env.t('removeTasks') + '</a><br/>\n<a ng-click="leave(\'keep-all\')">' + window.env.t('keepTasks') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
+          )($scope);
+                  title = window.env.t('leaveGroupCha');
+              } else {
+                  html = $compile(
+                      '<a ng-controller="GroupsCtrl" ng-click="leave(\'keep-all\')">' + window.env.t('confirm') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
+                  )($scope);
+                  title = window.env.t('leaveGroup')
+              }
+          $scope.popoverEl.popover('destroy').popover({
+              html: true,
+              placement: 'top',
+              trigger: 'manual',
+                  title: title,
+              content: html
+          }).popover('show');
+          });
+      }
+
+      $scope.reject = function(guild){
+        var i = _.findIndex(User.user.invitations.guilds, {id:guild.id});
+        if (~i){
+          User.user.invitations.guilds.splice(i, 1);
+          User.set({'invitations.guilds':User.user.invitations.guilds});
+        }
+      }
+    }
+  ]);

website/public/js/controllers/inviteToGroupCtrl.js

@@ -0,0 +1,72 @@
+'use strict';
+
+habitrpg.controller('InviteToGroupCtrl', ['$scope', 'User', 'Groups', 'injectedGroup', '$http', 'Notification', function($scope, User, Groups, injectedGroup, $http, Notification) {
+    $scope.group = injectedGroup;
+
+    $scope.inviter = User.user.profile.name;
+    _resetInvitees();
+
+    $scope.addUuid = function() {
+      $scope.invitees.push({uuid: ''});
+    };
+
+    $scope.addEmail = function() {
+      $scope.emails.push({name: '', email: ''});
+    };
+
+    $scope.inviteNewUsers = function(inviteMethod) {
+      if (!$scope.group._id) {
+        $scope.group.name = $scope.group.name || env.t('possessiveParty', {name: User.user.profile.name});
+        return $scope.group.$save()
+          .then(function(res) {
+            _inviteByMethod(inviteMethod);
+          });
+      }
+
+      _inviteByMethod(inviteMethod);
+    };
+
+    function _inviteByMethod(inviteMethod) {
+      var invitationDetails;
+
+      if (inviteMethod === 'email') {
+        var emails = _getEmails();
+        invitationDetails = {inviter: $scope.inviter, emails: emails};
+      } else if (inviteMethod === 'uuid') {
+        var uuids = _getOnlyUuids();
+        invitationDetails = {uuids: uuids};
+      } else {
+        return console.log('Invalid invite method.')
+      }
+
+      Groups.Group.invite({gid: $scope.group._id}, invitationDetails, function(){
+        Notification.text(window.env.t('invitationsSent'));
+        _resetInvitees();
+      }, function(){
+        _resetInvitees();
+      });
+    }
+
+    function _getOnlyUuids() {
+      var uuids = _.pluck($scope.invitees, 'uuid');
+      var filteredUuids = _.filter(uuids, function(id) {
+        return id != '';
+      });
+      return filteredUuids;
+    }
+
+    function _getEmails() {
+      var emails = _.filter($scope.emails, function(obj) {
+          return obj.email != '';
+      });
+      return emails;
+    }
+
+    function _resetInvitees() {
+      var emptyEmails = [{name:"",email:""},{name:"",email:""}];
+      var emptyInvitees = [{uuid: ''}];
+
+      $scope.emails = emptyEmails;
+      $scope.invitees = emptyInvitees;
+    }
+  }]);

website/public/js/controllers/partyCtrl.js

@@ -0,0 +1,132 @@
+'use strict';
+
+habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','Challenges','$state','$compile','Analytics','Quests',
+    function($rootScope,$scope,Groups,Chat,User,Challenges,$state,$compile,Analytics,Quests) {
+      $scope.type = 'party';
+      $scope.text = window.env.t('party');
+      $scope.group = $rootScope.party = Groups.party();
+      $scope.newGroup = new Groups.Group({type:'party'});
+      $scope.inviteOrStartParty = Groups.inviteOrStartParty;
+      $scope.questInit = Quests.questInit;
+
+      if ($state.is('options.social.party')) {
+        $scope.group.$syncParty(); // Sync party automatically when navigating to party page
+      }
+
+      Chat.seenMessage($scope.group._id);
+
+      $scope.create = function(group){
+        if (!group.name) group.name = env.t('possessiveParty', {name: User.user.profile.name});
+        group.$save(function(){
+          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'party','privacy':'private'});
+          Analytics.updateUser({'partyID':group.id,'partySize':1});
+          $rootScope.hardRedirect('/#/options/groups/party');
+        });
+      };
+
+      $scope.join = function(party){
+        var group = new Groups.Group({_id: party.id, name: party.name});
+        group.$join(function(){
+          Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'party','privacy':'private'});
+          Analytics.updateUser({'partyID':party.id});
+          $rootScope.hardRedirect('/#/options/groups/party');
+        });
+      };
+
+      // TODO: refactor guild and party leave into one function
+      $scope.leave = function(keep) {
+        if (keep == 'cancel') {
+          $scope.selectedGroup = undefined;
+          $scope.popoverEl.popover('destroy');
+        } else {
+          Groups.Group.leave({gid: $scope.selectedGroup._id, keep:keep}, undefined, function(){
+            Analytics.updateUser({'partySize':null,'partyID':null});
+            $rootScope.hardRedirect('/#/options/groups/party');
+          });
+        }
+      };
+
+      // TODO: refactor guild and party clickLeave into one function
+      $scope.clickLeave = function(group, $event){
+          $scope.selectedGroup = group;
+          $scope.popoverEl = $($event.target);
+          var html, title;
+          Challenges.Challenge.query(function(challenges) {
+              challenges = _.pluck(_.filter(challenges, function(c) {
+                  return c.group._id == group._id;
+              }), '_id');
+              if (_.intersection(challenges, User.user.challenges).length > 0) {
+                  html = $compile(
+              '<a ng-controller="GroupsCtrl" ng-click="leave(\'remove-all\')">' + window.env.t('removeTasks') + '</a><br/>\n<a ng-click="leave(\'keep-all\')">' + window.env.t('keepTasks') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
+          )($scope);
+                  title = window.env.t('leavePartyCha');
+              } else {
+                  html = $compile(
+                      '<a ng-controller="GroupsCtrl" ng-click="leave(\'keep-all\')">' + window.env.t('confirm') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
+                  )($scope);
+                  title = window.env.t('leaveParty');
+              }
+          $scope.popoverEl.popover('destroy').popover({
+              html: true,
+              placement: 'top',
+              trigger: 'manual',
+                  title: title,
+              content: html
+          }).popover('show');
+          });
+      };
+
+      $scope.clickStartQuest = function(){
+        var hasQuests = _.find(User.user.items.quests, function(quest) {
+          return quest > 0;
+        });
+
+        if (hasQuests){
+          $rootScope.openModal("ownedQuests", { controller:"InventoryCtrl" });
+        } else {
+          $rootScope.$state.go('options.inventory.quests');
+        }
+      };
+
+      $scope.leaveOldPartyAndJoinNewParty = function(newPartyId, newPartyName) {
+        if (confirm('Are you sure you want to delete your party and join ' + newPartyName + '?')) {
+          Groups.Group.leave({gid: Groups.party()._id, keep:false}, undefined, function() {
+            $scope.group = {
+              loadingNewParty: true
+            };
+            $scope.join({ id: newPartyId, name: newPartyName });
+          });
+        }
+      }
+
+      $scope.reject = function(){
+        User.set({'invitations.party':{}});
+      }
+
+      $scope.questCancel = function(party){
+        if (!confirm(window.env.t('sureCancel'))) return;
+        Groups.questCancel(party);
+      }
+
+      $scope.questAbort = function(party){
+        if (!confirm(window.env.t('sureAbort'))) return;
+        if (!confirm(window.env.t('doubleSureAbort'))) return;
+        Groups.questAbort(party);
+      }
+
+      $scope.questLeave = function(party){
+        if (!confirm(window.env.t('sureLeave'))) return;
+
+        delete $scope.group.quest.members[User.user._id];
+        Groups.questLeave(party);
+      }
+
+      $scope.questAccept = function(party){
+        Groups.questAccept(party);
+      };
+
+      $scope.questReject = function(party){
+        Groups.questReject(party);
+      }
+    }
+  ]);

website/public/js/controllers/settingsCtrl.js

@@ -62,14 +62,21 @@ habitrpg.controller('SettingsCtrl',
       User.set({'flags.newStuff':true});
     }
 
-    $scope.saveDayStart = function(){
+    $scope.dayStart = User.user.preferences.dayStart;
-      var dayStart = +User.user.preferences.dayStart;
+
-      if (_.isNaN(dayStart) || dayStart < 0 || dayStart > 24) {
+    $scope.openDayStartModal = function(dayStart) {
-        dayStart = 0;
+      $scope.dayStart = +dayStart;
-        return alert(window.env.t('enterNumber'));
+      $scope.nextCron = _calculateNextCron();
-      }
+
-      User.set({'preferences.dayStart': dayStart});
+      $rootScope.openModal('change-day-start', { scope: $scope });
-    }
+    };
+
+    $scope.saveDayStart = function() {
+      User.set({
+        'preferences.dayStart': Math.floor($scope.dayStart),
+        'lastCron': +new Date
+      });
+    };
 
     $scope.language = window.env.language;
     $scope.avalaibleLanguages = window.env.avalaibleLanguages;
@@ -192,5 +199,18 @@ habitrpg.controller('SettingsCtrl',
         subs["google_6mo"].discount = false;
       });
     }
+
+    function _calculateNextCron() {
+      $scope.dayStart;
+
+      var nextCron = moment().hours($scope.dayStart).minutes(0).seconds(0).milliseconds(0);
+
+      var currentHour = moment().format('H');
+      if (currentHour >= $scope.dayStart) {
+        nextCron = nextCron.add(1, 'day');;
+      }
+
+      return +nextCron.format('x');
+    }
   }
 ]);

website/public/js/controllers/tavernCtrl.js

@@ -0,0 +1,10 @@
+'use strict';
+
+habitrpg.controller("TavernCtrl", ['$scope', 'Groups', 'User',
+    function($scope, Groups, User) {
+      $scope.group = Groups.tavern();
+      $scope.toggleUserTier = function($event) {
+        $($event.target).next().toggle();
+      }
+    }
+  ]);