chore(i18n): update locales

2025-12-14 05:07:22 +01:00 · 2015-06-23 10:43:29 +02:00
parent e03bf6a711
commit 782ae4f81c
299 changed files with 3721 additions and 777 deletions
--- a/common/locales/cs/defaulttasks.json
+++ b/common/locales/cs/defaulttasks.json
@@ -1,9 +1,9 @@
 {
-    "defaultHabit1Text": "Dobrý zvyk",
-    "defaultHabit1Notes": "Příklad Dobrého zvyku: + Sníst zeleninu +15 minut produktivní práce",
-    "defaultHabit2Text": "Zlozvyk",
+    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
+    "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work",
+    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
    "defaultHabit2Notes": "Příklad zlozvyku: - Kouření - Flákání se",
-    "defaultHabit3Text": "Dobrý zvyk nebo zlozvyk",
+    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
    "defaultHabit3Notes": "Příklad Dobrého zvyku nebo zlozvyku: +/- Schody/Výtah; +/- Voda/Limonáda",
    "defaultDaily1Text": "1 hodina práce na osobním projektu",
    "defaultDaily1Notes": "Po vytvoření jsou všechny úkoly žluté. Takže jejich nesplnění způsobí jen mírnou újmu, naopak splnění ti vynese přiměřenou odměnu.",
@@ -31,7 +31,7 @@
    "defaultTodo4Checklist2": "nastav obtížnost v sekci Pokročilé nastavení",
    "defaultTodo4Checklist3": "volitelné: nastavte Datum splnění",
    "defaultTodo5Text": "Založ si Družinu (soukromá skupina) s přáteli (Komunita > Družina)",
-    "defaultReward1Text": "1 epizoda Hry o trůny",
+    "defaultReward1Text": "15 minute break",
    "defaultReward1Notes": "Vlastní odměny mohou mít mnoho podob. Někteří lidé se zdrží sledování své oblíbené šou, pokud nemají dost zlata na její zaplacení.",
    "defaultReward2Text": "Dort",
    "defaultReward2Notes": "Jiní lidé ocení pěkný kousek dortu. Zkus vytvářet odměny, které tě budou nejvíc motivovat.",
--- a/common/locales/cs/gear.json
+++ b/common/locales/cs/gear.json
@@ -116,6 +116,14 @@
    "weaponSpecialSpring2015MageNotes": "Vykouzli si mrkev s touhle super hůlkou. Zvyšuje Inteligenci o <%= int %> a Vnímání o <%= per %>. Limitovaná edice Jarní výbavy 2015.",
    "weaponSpecialSpring2015HealerText": "Kočičí chrastítko",
    "weaponSpecialSpring2015HealerNotes": "Když s ním zamáváš, vydává fascinující chřestivý zvuk, který zabaví KOHOKOLIV na hodiny. Zvyšuje Inteligenci o <%= int %>. Limitovaná edice Jarní výbavy 2015.",
+    "weaponSpecialSummer2015RogueText": "Firing Coral",
+    "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+    "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+    "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+    "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "weaponMystery201411Text": "Vidle hodů",
    "weaponMystery201411Notes": "Píchni své nepřátele nebo se pusť do svého oblíbeného jídla - tyhle všestranné vidle zvládnou všechno! Nepřináší žádný benefit.",
    "weaponMystery201502Text": "Třpytivá okřídlená hůl lásky a také pravdy",
@@ -124,6 +132,10 @@
    "weaponMystery201505Notes": "Toto zelené a stříbrné kopí sundalo již mnoho jezdců z jejich zvířat. Nepřináší žádný benefit. Předmět pro předplatitele květen 2015.",
    "weaponMystery301404Text": "Steampunková hůl",
    "weaponMystery301404Notes": "Výborná na procházku po městě. Předmět pro předplatitele březen 2015. Nepřináší žádný benefit.",
+    "weaponArmoireBasicCrossbowText": "Basic Crossbow",
+    "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre",
+    "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).",
    "armor": "zbroj",
    "armorBase0Text": "Obyčejné oblečení",
    "armorBase0Notes": "Běžné oblečení. Nenabízí žádný bonus.",
@@ -227,6 +239,14 @@
    "armorSpecialSpring2015MageNotes": "Všechno k sobě ladí! Zvyšuje Inteligenci o <%= int %>. Limitovaná edice Jarní výbavy 2015.",
    "armorSpecialSpring2015HealerText": "Uklidňující overal",
    "armorSpecialSpring2015HealerNotes": "Tenhle měkký overal je pohodlný a uklidňující jako mátový čaj. Zvyšuje Obranu o <%= con %>. Limitovaná edice Jarní výbavy 2015.",
+    "armorSpecialSummer2015RogueText": "Ruby Tail",
+    "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015WarriorText": "Golden Tail",
+    "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015MageText": "Soothsayer Robes",
+    "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015HealerText": "Sailor's Armor",
+    "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "armorMystery201402Text": "Oděv poslíčka",
    "armorMystery201402Notes": "Třpytivý a silný, tento oděv má spoustu kapes na dopisy. Nepřináší žádný benefit. Výbava pro předplatitele únor 2014",
    "armorMystery201403Text": "Zbroj lesáka",
@@ -253,6 +273,10 @@
    "armorMystery201504Notes": "V tomto okouzlujícím oděvu budeš produktivní jako pilná včelka! Nepřináší žádný benefit. Předmět pro předplatitele Duben 2015.",
    "armorMystery301404Text": "Steampunk oblek",
    "armorMystery301404Notes": "Elegantní a fešácký, joj!  Nepřináší žádný benefit. Předmět pro předplatitele únor 3015.",
+    "armorArmoireLunarArmorText": "Soothing Lunar Armor",
+    "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).",
+    "armorArmoireGladiatorArmorText": "Gladiator Armor",
+    "armorArmoireGladiatorArmorNotes": "To be a gladiator you must be not only cunning... but strong. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 2 of 3).",
    "headgear": "Pokrývka hlavy",
    "headBase0Text": "Žádná přilba",
    "headBase0Notes": "Žádná pokrývka hlavy",
@@ -354,6 +378,14 @@
    "headSpecialSpring2015MageNotes": "Co bylo první? Králík nebo klobouk? Zvyšuje Vnímání o <%= per %>. Limitovaná edice Jarní výbavy 2015.",
    "headSpecialSpring2015HealerText": "Uklidňující koruna",
    "headSpecialSpring2015HealerNotes": "Perla ve středu korunu uklidňuje ty kolem sebe. Zvyšuje Inteligenci o <%= int %>. Limitovaná edice Jarní výbavy 2015.",
+    "headSpecialSummer2015RogueText": "Renegade Hat",
+    "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+    "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015MageText": "Soothsayer Scarf",
+    "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015HealerText": "Sailor's Cap",
+    "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "headSpecialGaymerxText": "Helma duhového bojovníka",
    "headSpecialGaymerxNotes": "Ku příležitosti oslav sezóny Gay Pride a GaymerX je tato speciální helma zdobená zářivým barevným duhovým vzorem! GaymerX je herní veletrh oslavující LGBTQ a hry a je otevřený všem. Koná se v InterContinentalu v centru San Francisca 11.-13. července! Nepřináší žádné výhody.",
    "headMystery201402Text": "Okřídlená přilba",
@@ -378,6 +410,16 @@
    "headMystery301404Notes": "Fešný cylindr pro ty největší džentlmeny.  Předmět pro předplatitele leden 2015. Nepřináší žádný benefit.",
    "headMystery301405Text": "Obyčejný cylindr",
    "headMystery301405Notes": "Obyčejný cylindr, který si přímo žádá o doplnění nějakým fešáckým ohozem. Nepřináší žádný benefit.  Předmět pro předplatitele květen 3015.",
+    "headArmoireLunarCrownText": "Soothing Lunar Crown",
+    "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).",
+    "headArmoireRedHairbowText": "Red Hairbow",
+    "headArmoireRedHairbowNotes": "Become strong, tough and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
+    "headArmoireVioletFloppyHatText": "Violet Floppy Hat",
+    "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "headArmoireGladiatorHelmText": "Gladiator Helm",
+    "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).",
+    "headArmoireRancherHatText": "Rancher Hat",
+    "headArmoireRancherHatNotes": "Round up your pets and wrangle your mounts while wearing this magical Rancher Hat! Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
    "offhand": "štít v ruce",
    "shieldBase0Text": "Bez štítu v ruce",
    "shieldBase0Notes": "Bez štítu nebo druhé zbraně.",
@@ -441,8 +483,17 @@
    "shieldSpecialSpring2015WarriorNotes": "Hoď ho po nepřátelích... nebo ho drž, protože se naplní dobrůtkami na večeři. Zvyšuje Obranu o <%= con %>. Limitovaná edice Jarní výbavy 2015.",
    "shieldSpecialSpring2015HealerText": "Vzorovaný polštář",
    "shieldSpecialSpring2015HealerNotes": "Na tomhle měkkém polštáři si můžeš odpočinout nebo s ním můžeš zápasit. Grrr! Zvyšuje Obranu o <%= con %>. Limitovaná edice Jarní výbavy 2015.",
+    "shieldSpecialSummer2015RogueText": "Firing Coral",
+    "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+    "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015HealerText": "Strapping Shield",
+    "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "shieldMystery301405Text": "Štít z hodin",
    "shieldMystery301405Notes": "Čas je na tvé straně s tímhle štítem z hodin! Nepřináší žádný benefit.  Předmět pro předplatitele červen 3015.",
+    "shieldArmoireGladiatorShieldText": "Gladiator Shield",
+    "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
+    "back": "Back Accessory",
    "backBase0Text": "Bez příslušenství na zádech",
    "backBase0Notes": "Bez příslušenství na zádech.",
    "backMystery201402Text": "Zlatá křídla",
@@ -457,6 +508,7 @@
    "backSpecialWonderconRedNotes": "Skví se silou a krásou. Speciální edice běžné zbroje. Nepřináší žádný benefit.",
    "backSpecialWonderconBlackText": "Záludná kápě",
    "backSpecialWonderconBlackNotes": "Utkána ze stínů a šepotu. Speciální edice běžné zbroje. Nepřináší žádný benefit.",
+    "body": "Body Accessory",
    "bodyBase0Text": "Žádné doplňky",
    "bodyBase0Notes": "Žádné doplňky",
    "bodySpecialWonderconRedText": "Rubínový límec",
@@ -469,6 +521,14 @@
    "bodySpecialSummerMageNotes": "Slaná ani sladká voda neponičí tuto kovovou karkulku. Nepřidává žádný bonus. Limitovaná edice 2014 Letní Výbava.",
    "bodySpecialSummerHealerText": "Korálový límec",
    "bodySpecialSummerHealerNotes": "Stylový límec ze živého korálů! Nepřidává žádný bonus. Limitovaná edice 2014 Letní Výbava.",
+    "bodySpecialSummer2015RogueText": "Renegade Sash",
+    "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+    "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015MageText": "Golden Buckle",
+    "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
    "headAccessory": "doplňky na hlavu",
    "accessories": "Doplňky",
    "animalEars": "Zvířecí uši",
@@ -516,6 +576,7 @@
    "headAccessoryMystery201502Notes": "Nech svou představivost létat! Nepřináší žádný benefit. Předmět pro předplatitele únor 2015.",
    "headAccessoryMystery301405Text": "Brýle na čele",
    "headAccessoryMystery301405Notes": "\"Brýle jsou na oči,\"  říkali. \"Nikdo nechce nosit brýle na čele,\" říkali. Ha! Teď jsi jim to natřel! Nepřináší žádný benefit.  Předmět pro předplatitele srpen 3015.",
+    "eyewear": "Eyewear",
    "eyewearBase0Text": "Žádné vybavení pro oči",
    "eyewearBase0Notes": "Žádné vybavení pro oči.",
    "eyewearSpecialSummerRogueText": "Ničemné brýle",
--- a/common/locales/cs/generic.json
+++ b/common/locales/cs/generic.json
@@ -54,7 +54,7 @@
    "gems": "Drahokamy",
    "gemButton": "Máš <%= number %> Drahokamy/Drahokamů",
    "moreInfo": "Více informací",
-    "gemsWhatFor": "Zakoupeno za reálné peníze. Používají se k nakupování speciálních předmětů a služeb (vejce, líhnoucí lektvary, posílení, atd.). Nejprve však musíš mít tyto funkce odemknuté, abys mohl drahokamy použít.",
+    "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.",
    "veteran": "Veterán",
    "veteranText": "Vystavil Zvyk Šedý (naši stránku před použitím Angular) vlivu přírody a získal mnoho jizev z boje s jejími chybami. ",
    "originalUser": "Původní uživatel!",
@@ -70,7 +70,6 @@
    "lastLoggedIn": "- Naposledy přihlášen",
    "notPorted": "Tato funkce zatím nebyla převedena z původní stránky.",
    "buyThis": "Koupit <%= text %> za <%= price %> z tvých <%= gems %>  drahokamů?",
-    "untilNoFace": "Dokud nepřidáme Facebook, použij k přihlášení UUID a API token ( nalezneš je na https://habitrpg.com > Možnosti > Nastavení).",
    "noReachServer": "Server je momentálně nedostupný, zkus to později.",
    "errorUpCase": "CHYBA:",
    "newPassSent": "Nové heslo odesláno.",
@@ -86,6 +85,7 @@
    "audioTheme_off": "Vypnuto",
    "audioTheme_danielTheBard": "Bard Daniel",
    "audioTheme_wattsTheme": "Watts' téma",
+    "audioTheme_gokulTheme": "Gokul Theme",
    "askQuestion": "Položit otázku",
    "reportBug": "Nahlásit chybu",
    "contributeToHRPG": "Přispět HabitRPG",
--- a/common/locales/cs/groups.json
+++ b/common/locales/cs/groups.json
@@ -39,6 +39,8 @@
    "editGroup": "Upravit družinu",
    "newGroupName": "<%= groupType %> jméno",
    "groupName": "Jméno družiny",
+    "groupLeader": "Group Leader",
+    "groupID": "Group ID",
    "groupDescr": "Popisek zobrazovaný ve veřejném seznamu cechů (formátování povoleno)",
    "logoUrl": "Adresa loga",
    "assignLeader": "Zvolit vůdce družiny",
@@ -116,5 +118,7 @@
    "sendGiftFromBalance": "Z bilance",
    "sendGiftPurchase": "Koupit",
    "sendGiftMessagePlaceholder": "Osobní zpráva (volitelné)",
-    "sendGiftSubscription": "<%= months %> měsíc(e/ů): $<%= price %>"
+    "sendGiftSubscription": "<%= months %> měsíc(e/ů): $<%= price %>",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
--- a/common/locales/cs/limited.json
+++ b/common/locales/cs/limited.json
@@ -25,6 +25,7 @@
    "seasonalShopTitle": "<%= linkStart %>Sezónní mudrci<%= linkEnd %>",
    "seasonalShopClosedText": "Sezónní obchod je momentálně zavřený!! Nevím, kde se momentálně Sezonní Kouzelnice nachází, ale vsadím se, že bude zpět na další <%= linkStart %>Velkolepé Gala<%= linkEnd %>!",
    "seasonalShopText": "Vítej v Sezonním obchodě! Zrovna tu máme jarní <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Sezonní edici</a> zboží. Všechno zde je možné zakoupit v průběhu Jarního flámu každý rok, ale máme otevřeno pouze do 30. dubna, tak si nakup teď nebo budeš muset čekat další rok!",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
    "seasonalShopRebirth": "Pokud jsi použil Kouli znovuzrození, můžeš si znovu zakoupit toto vybavení ve sloupci s odměnami, jakmile odemkneš Obchod. Ze začátku si budeš moci koupit pouze vybavení pro tvou momentální třídu (výchozí je Válečník), ale neboj, další vybavení pro další třídy bude přístupné jakmile si budeš moci svou třídu vybrat.",
    "candycaneSet": "Cukrátková hůl (mág)",
    "skiSet": "Lyžovrah (zloděj)",
@@ -44,5 +45,9 @@
    "mightyBunnySet": "Mocný Králík (válečník)",
    "magicMouseSet": "Kouzelná Myš (mág)",
    "lovingPupSet": "Milující Štěně (léčitel)",
-    "stealthyKittySet": "Nenápadná Kočka (lupič)"
+    "stealthyKittySet": "Nenápadná Kočka (lupič)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }
--- a/common/locales/cs/messages.json
+++ b/common/locales/cs/messages.json
@@ -1,6 +1,7 @@
 {
    "messageLostItem": "Něco se rozbilo. Asi <%= itemText %>.",
    "messageTaskNotFound": "Úkol nenalezen.",
+    "messageDuplicateTaskID": "A task with that ID already exists.",
    "messageTagNotFound": "Štítek nenalezen.",
    "messagePetNotFound": ":pet nebyl nalezen v user.items.pets",
    "messageFoodNotFound": ":food nebylo nalezeno v user.items.food",
@@ -20,5 +21,8 @@
    "messageDropFood": "Copak to je? A hele, <%= dropArticle %><%= dropText %>! <%= dropNotes %>",
    "messageDropEgg": "Našel jsi vejce, ze kterého se vylíhne <%= dropText %> ! <%= dropNotes %>",
    "messageDropPotion": "Našel jsi <%= dropText %> líhnoucí lektvar! <%= dropNotes %>",
-    "messageFoundQuest": "Našel jsi výpravu \"<%= questText %>\"!"
+    "messageFoundQuest": "Našel jsi výpravu \"<%= questText %>\"!",
+    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
--- a/common/locales/cs/npc.json
+++ b/common/locales/cs/npc.json
@@ -10,6 +10,8 @@
    "alexander": "Obchodník Alexander",
    "welcomeMarket": "Vítej na trhu! Kup si vzácná vejce a lektvary! Prodej, co máš navíc! Objednej si užitečné služby! Přijď se podívat, co všechno nabízíme.",
    "sellForGold": "Prodej <%= item %> za <%= gold %> zlaťáků",
+    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
+    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
    "buyGems": "Kup drahokamy",
    "justin": "Justin",
    "USD": "dolar/ů",
@@ -18,7 +20,7 @@
    "dismissAlert": "Zavřít toto oznámení",
    "donateText1": "Přidá 20 drahokamů na tvůj účet. Drahokamy se používají pro nákup speciálních herních předmětů, jako například košil a vlasů.",
    "donateText2": "Pomož podpořit HabitRPG",
-    "donateText3": "Jako open source projekt, využijeme každou pomoc, které se nám dostane!",
+    "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
    "donationDesc": "20 drahokamů, Příspěvek vývojářům",
    "payWithCard": "Zaplatit kartou",
    "payNote": "Poznámka: Zpracování platby přes PayPal někdy trvá delší dobu. Doporučujeme platit kartou.",
@@ -41,13 +43,36 @@
    "tourHabits": "Tenhle sloupeček je pro dobré zvyky a zlozvyky, které děláš několikrát denně! Abys mohl pokračovat, klikni na tužku abys mohl upravit názvy, potom klikni na fajfku, aby se ti změny uložily.",
    "tourStats": "Dobré zvyky přidávají Zkušenost a Zlaťáky! Zlozvyky ti ubírají zdraví.",
    "tourGP": "Abys mohl pokračovat, kup si Meč na trénink za zlato, které jsi právě získal!",
-    "tourAvatar": "Nyní má tvůj avatar meč na trénink. Abys mohl pokračovat, klikni na svého avatara, abys ho mohl upravit!",
+    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
    "tourScrollDown": "Nezapomeň sjet dolů na stránce, abys viděl všechny možnosti! Klikni na svého avatara, aby ses vrátil zpět na stránku s úkoly.",
    "tourMuchMore": "Když skončíš s úkoly, můžeš s přáteli vytvořit Družinu, popovídat si v zájmových ceších, přidat se k Výzvám a více!",
    "tourStatsPage": "Tohle je stránka s tvými statistikami! Získej ocenění za splnění vyjmenovaných úkolů.",
-    "tourTavernPage": "Vítej v Krčme, chatu pro všechny věkové kategorie! Můžeš si tu zmrazit Denní úkoly, aby ti neublížily, když budeš třeba nemocný nebo když budeš pryč. Stačí kliknout na \"Odpočívat v hostinci\". Pojď pozdravit!",
+    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
    "tourPartyPage": "Tvá družina ti pomůže dodržovat cíle. Pozvi své přátele a odemkni Svitek výpravy!",
-    "tourGuildsPage": "Cechy jsou sociální skupiny s podobnými zájmy. Můžeš si vyhledat témata, která tě zajímají! Doporučujeme Newbies Guild neboli Cech pro nováčky.",
-    "tourChallengesPage": "Výzvy jsou seznamy tématických úkolů vytvořené uživateli! Přidání se k výzvě ti přidá úkoly do tvých listů. Soutěž proti ostatním uživatelům a vyhraj cenné drahokamy!",
-    "tourMarketPage": "Když dosáhneš úrovně 4, začneš po splnění úkolů náhodně nacházet vejce a lektvary. Budou se objevovat tady - použij je k vylíhnutí mazlíčků! Můžeš si je také koupi na Trhu."
+    "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!",
+    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourMarketPage": "Když dosáhneš úrovně 4, začneš po splnění úkolů náhodně nacházet vejce a lektvary. Budou se objevovat tady - použij je k vylíhnutí mazlíčků! Můžeš si je také koupi na Trhu.",
+    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!",
+    "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
+    "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
+    "tourOkay": "Okay!",
+    "tourAwesome": "Awesome!",
+    "tourSplendid": "Splendid!",
+    "tourNifty": "Nifty!",
+    "tourAvatarProceed": "Show me my tasks!",
+    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
+    "tourDailiesProceed": "I'll be careful!",
+    "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
+    "tourHabitsProceed": "Makes sense!",
+    "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
+    "tourRewardsProceed": "That's all!",
+    "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+    "welcome1": "Create and customize an in-game avatar to represent you.",
+    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+    "welcome5": "Now you'll customize your avatar and set up your tasks...",
+    "imReady": "I'm Ready!"
 }
--- a/common/locales/cs/quests.json
+++ b/common/locales/cs/quests.json
@@ -1,9 +1,11 @@
 {
    "quests": "Výpravy",
    "quest": "výprava",
+    "questDetails": "Quest Details",
+    "invitations": "Invitations",
    "completed": "Dokončeno!",
    "youReceived": "Získal jsi",
-    "questSend": "Kliknutí na \"Pozvat\" pošle pozvání členům tvé 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.",
+    "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": "Pozvat družinu",
    "questInvitation": "Pozvánka na výpravu:",
    "questInvitationTitle": "Pozvánka na Výpravu",
--- a/common/locales/cs/questscontent.json
+++ b/common/locales/cs/questscontent.json
@@ -202,5 +202,11 @@
    "questSheepBoss": "Hromový beran",
    "questSheepCompletion": "Všechna zloba opouští Hromového berana ohromeného vaší vytrvalostí. Hodí vám k nohám tři velké kroupy a poté za hlasitého zvuku hromu zmizí. Při bližší zkoumání zjistíte, že ty kroupy jsou vlastně tři nadýchaná vejce. Posbíráte je a vydáte se domů pod modrým nebem.",
    "questSheepDropSheepEgg": "Beran (vejce)",
-    "questSheepUnlockText": "Odemyká vejce berana na Trhu"
+    "questSheepUnlockText": "Odemyká vejce berana na Trhu",
+    "questKrakenText": "The Kraken of Inkomplete",
+    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
+    "questKrakenBoss": "The Kraken of Inkomplete",
+    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
+    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
+    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"
 }
--- a/common/locales/cs/rebirth.json
+++ b/common/locales/cs/rebirth.json
@@ -21,11 +21,5 @@
    "rebirthOrb": "Použil Kouli znovuzrození, aby začal odznovu po dosažení úrovně",
    "rebirthPop": "Začni s novou postavou na úrovni 1 a přitom si zachovej ocenění, sběratelské předměty a úkoly s historií.",
    "rebirthName": "Koule znovuzrození",
-    "reborn": "Znovuzrozen, maximální úroveň <%= reLevel %>",
-    "welcome100": "Vítejte na úrovni 100!",
-    "intro100": "Teď, když jsi dosáhl úrovně 100, máš možnost kdykoli zdarma používat Kouli znovuzrození.",
-    "followup100": "Můžeš dál zvyšovat svoji úroveň, ale nebude to už zvedat tvoje statistiky a nic nového se ti neodemkne. Zavedli jsme to tak, aby Habitika zůstala zajímavá pro všechny bez ohledu na styl hraní.",
-    "rebirth100Info": "Jsi-li připraven začít nové dobrodružství, můžeš použít Znovuzrození... anebo vyzkoušet, jak daleko se dokážeš dostat.",
-    "rebirthWait": "Počkám...",
-    "rebirthNow": "Zroď se znovu teď!"
+    "reborn": "Znovuzrozen, maximální úroveň <%= reLevel %>"
 }
--- a/common/locales/cs/settings.json
+++ b/common/locales/cs/settings.json
@@ -113,10 +113,11 @@
    "benefits": "Benefity",
    "coupon": "Kupón",
    "couponPlaceholder": "Zadej kód z kupónu",
-    "couponText": "Někdy pořádáme události a rozdáváme promo kódy na speciální výbavu. (např. těm, kdo se zastaví u našeho stánku na Wonderconu)",
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
    "apply": "Zadat",
    "resubscribe": "Znovu se přihlásit k odběru",
    "promoCode": "Promo kód",
    "promoCodeApplied": "Promo kód zadán! Koukni do Inventáře",
-    "promoPlaceholder": "Vlož promo kód"
+    "promoPlaceholder": "Vlož promo kód",
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
 }
--- a/common/locales/cs/subscriber.json
+++ b/common/locales/cs/subscriber.json
@@ -3,17 +3,17 @@
    "subscriptions": "Předplatné",
    "subDescription": "Bez reklam, nakupování drahokamů za zlaťáky, každý měsíc záhadný předmět, uchovaná historie, dvojnásobné množství předmětů každý den, podporuje vývojáře. Klikni pro více informací.",
    "disableAds": "Zablokuj reklamy",
-    "disableAdsText": "Reklamy zůstanou vypnuté, dokud je předplatné aktivní. (pro uživatele kteří si reklamy odstranili v dřívější akci to neplatí)",
+    "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).",
    "buyGemsGold": "Kup drahokamy za zlato",
-    "buyGemsGoldText": "(1 drahokam stojí <%= gemCost %> zlaťáků) Řeší obavu o \"zaplacení výhry\", jelikož vše lze nyní získat tvrdou prací. Existuje měsíční limit převodu <%= gemLimit %> drahokamů, kvůli omezení farmingu.",
+    "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
    "retainHistory": "Ponech si veškeré položky historie",
    "retainHistoryText": "Tvá plná historie bude k dispozici v grafu a pro export. Ostatním uživatelům se historie kvůli optimalizaci databáze slučuje.",
    "doubleDrops": "Denně získáš dvakrát více předmětů",
    "doubleDropsText": "Najdi všechny mazlíčky rychleji!",
    "mysteryItem": "Jedinečné předměty při měsíčním předplatném",
-    "mysteryItemText": "Každý měsíc všichni předplatitelé získají opravdu unikátní předmět pro svou postavu!",
+    "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
    "supportDevs": "Podporuje vývojáře",
-    "supportDevsText": "Tento open source projekt potřebuje každou pomoc, které se mu dostane. Pomož nám udržet Habit naživu!",
+    "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
    "monthUSD": "Amerických dolarů měsíčně",
    "organization": "Organizace",
    "groupPlans": "Firemní plány",
--- a/common/locales/cs/tasks.json
+++ b/common/locales/cs/tasks.json
@@ -16,7 +16,7 @@
    "checklist": "Seznam",
    "checklistText": "Rozděl si úkoly na menší části! Seznamy úkolů zvyšují Zkušenost a zlaťáky, které za splnění úkolu získáš, a zmírňují újmu, kterou bys dostal, za zmeškání Denního úkolu.",
    "expandCollapse": "Rozbalit/Sbalit",
-    "text": "Text",
+    "text": "Title",
    "extraNotes": "Další poznámky",
    "direction/Actions": "Pokyny/Činnosti",
    "advancedOptions": "Pokročilé možnosti",
@@ -36,6 +36,11 @@
    "newDailyBulk": "Nové Denní úkoly (jeden na řádek)",
    "streakCounter": "Počítadlo šňůr úspěšnosti",
    "repeat": "Opakovat",
+    "repeatEvery": "Repeat Every",
+    "repeatDays": "Every X Days",
+    "repeatWeek": "On Certain Days of the Week",
+    "day": "Day",
+    "days": "Days",
    "restoreStreak": "Obnov šňůru",
    "todos": "Úkolníček",
    "newTodo": "Nový Úkol",
@@ -60,6 +65,9 @@
    "clearTags": "Vyčistit",
    "hideTags": "Schovat",
    "showTags": "Ukázat",
+    "startDate": "Start Date",
+    "startDateHelpTitle": "When should this task start?",
+    "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.",
    "streakName": "Ocenění za šňůry úspěšnosti",
    "streakText": "Má na kontě <%= streaks %> 21-denních šňůr úspěšnosti v Denních úkolech",
    "streakSingular": "Šňůrař",
@@ -78,5 +86,23 @@
    "pushTaskToTop": "Přesunout úkol na vrchol",
    "pushTaskToBottom": "Posunout úkol na spodek",
    "emptyTask": "Nejdřív zadej název úkolu.",
-    "dailiesRestingInInn": "Odpočíváš v Hostinci! Tvé Denní úkoly ti dnes NEUBLÍŽÍ, ale BUDOU se resetovat každý den. Pokud jsi na Výpravě, neuštědříš žádný úder/nebudeš sbírat předměty dokud se z Hostince neodhlásíš, ale stále ti může ublížit Boss, pokud tví přátelé v Družině nebudou plnit své Denní úkoly."
+    "dailiesRestingInInn": "Odpočíváš v Hostinci! Tvé Denní úkoly ti dnes NEUBLÍŽÍ, ale BUDOU se resetovat každý den. Pokud jsi na Výpravě, neuštědříš žádný úder/nebudeš sbírat předměty dokud se z Hostince neodhlásíš, ale stále ti může ublížit Boss, pokud tví přátelé v Družině nebudou plnit své Denní úkoly.",
+    "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.",
+    "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.",
+    "habitHelp3": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Habits' target='_blank'>sample Habits</a>!",
+    "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!",
+    "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.",
+    "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.",
+    "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
+    "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+    "dailyHelp5": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Dailies' target='_blank'>sample Dailies</a>!",
+    "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
+    "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
+    "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+    "toDoHelp4": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+    "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
+    "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
+    "rewardHelp3": "Special equipment will appear here during World Events.",
+    "rewardHelp4": "Don't be afraid to set custom Rewards! Check out <a href='http://habitrpg.wikia.com/wiki/Sample_Custom_Rewards' target='_blank'>some samples here</a>.",
+    "clickForHelp": "Click for help"
 }
--- a/common/locales/da/defaulttasks.json
+++ b/common/locales/da/defaulttasks.json
@@ -1,9 +1,9 @@
 {
-    "defaultHabit1Text": "God Vane",
-    "defaultHabit1Notes": "Eksempler på Gode Vaner: +Spist en grønsag +15 minutters produktivt arbejde",
-    "defaultHabit2Text": "Dårlig Vane",
+    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
+    "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work",
+    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
    "defaultHabit2Notes": "Eksempler på Dårlige Vaner: -Ryge -Overspringshandling",
-    "defaultHabit3Text": "God eller Dårlig Vane",
+    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
    "defaultHabit3Notes": "Eksempel på God eller Dårlig Vane: +/- Tog Trapperne/Elevatoren; +/- Drak Vand/Sodavand",
    "defaultDaily1Text": "1 times Personligt Projekt",
    "defaultDaily1Notes": "Alle opgaver har gul som udgangspunkt når de er skabt. Det betyder, at du kun tager moderat skade når de bliver sprunget over, og at du får kun en moderat belønning når de er gennemført. ",
@@ -31,7 +31,7 @@
    "defaultTodo4Checklist2": "sæt sværhedsgrad under Avancerede Indstillinger",
    "defaultTodo4Checklist3": "valgfrit: sæt en deadline",
    "defaultTodo5Text": "Start en Gruppe (privat) med dine venner (Social > Gruppe)",
-    "defaultReward1Text": "1 Episode af Game of Thrones",
+    "defaultReward1Text": "15 minute break",
    "defaultReward1Notes": "Tilpassede belønninger kommer i mange former. Nogle mennesker vil undlade at se deres favoritserie, hvis de ikke har guld til at betale for det. ",
    "defaultReward2Text": "Kage",
    "defaultReward2Notes": "Andre synes bare om et dejligt stykke kage. Prøv at lave de belønninger, der motiverer dig mest. ",
--- a/common/locales/da/gear.json
+++ b/common/locales/da/gear.json
@@ -116,6 +116,14 @@
    "weaponSpecialSpring2015MageNotes": "Conjure yourself up a carrot with this fancy wand. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
    "weaponSpecialSpring2015HealerText": "Katterangle",
    "weaponSpecialSpring2015HealerNotes": "When you wave it, it makes a fascinating clickety noise that would keep ANYONE entertained for hours. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
+    "weaponSpecialSummer2015RogueText": "Firing Coral",
+    "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+    "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+    "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+    "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "weaponMystery201411Text": "Høstfests-Høtyv",
    "weaponMystery201411Notes": "Stik dine fjender eller grib for dig af dine yndlingsretter - denne høtyv kan det hele! Giver ingen bonusser. November 2014 Abonnentvare.",
    "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -124,6 +132,10 @@
    "weaponMystery201505Notes": "Denne lanse i grøn og sølv har væltet mange modstandere af hesten. Giver ingen fordel. Maj 2015 - kun for abonnenter.",
    "weaponMystery301404Text": "Steampunk Stok",
    "weaponMystery301404Notes": "Perfekt at svinge rundt i hele byen. Marts 3015 Abonnentvare. Giver ingen bonusser.",
+    "weaponArmoireBasicCrossbowText": "Basic Crossbow",
+    "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre",
+    "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).",
    "armor": "rustning",
    "armorBase0Text": "Almindeligt tøj",
    "armorBase0Notes": "Helt normalt tøj. Giver ingen bonusser.",
@@ -227,6 +239,14 @@
    "armorSpecialSpring2015MageNotes": "Your coattails match your cottontail! Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
    "armorSpecialSpring2015HealerText": "Comforting Catsuit",
    "armorSpecialSpring2015HealerNotes": "This soft catsuit is comfortable, and as comforting as mint tea. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+    "armorSpecialSummer2015RogueText": "Ruby Tail",
+    "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015WarriorText": "Golden Tail",
+    "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015MageText": "Soothsayer Robes",
+    "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015HealerText": "Sailor's Armor",
+    "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "armorMystery201402Text": "Sendebudsdragt",
    "armorMystery201402Notes": "En skinnende og stærk dragt med masser af lommer til at bære breve i. Giver ingen bonusser. Februar 2014 Abonnentting.",
    "armorMystery201403Text": "Skovvandrer-rustning",
@@ -253,6 +273,10 @@
    "armorMystery201504Notes": "You'll be productive as a busy bee in this fetching robe! Confers no benefit. April 2015 Subscriber Item.",
    "armorMystery301404Text": "Steampunk-dragt",
    "armorMystery301404Notes": "Nydelig og elegant, selvfølgelig! Giver ingen bonusser. Februar 3015 Abonnentting.",
+    "armorArmoireLunarArmorText": "Soothing Lunar Armor",
+    "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).",
+    "armorArmoireGladiatorArmorText": "Gladiator Armor",
+    "armorArmoireGladiatorArmorNotes": "To be a gladiator you must be not only cunning... but strong. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 2 of 3).",
    "headgear": "hovedbeklædning",
    "headBase0Text": "Ingen Hjelm",
    "headBase0Notes": "Ingen hovedpåklædning",
@@ -354,6 +378,14 @@
    "headSpecialSpring2015MageNotes": "Which came first, the bunny or the hat? Increases Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
    "headSpecialSpring2015HealerText": "Comforting Crown",
    "headSpecialSpring2015HealerNotes": "The pearl at the center of this crown calms and comforts those around it. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
+    "headSpecialSummer2015RogueText": "Renegade Hat",
+    "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+    "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015MageText": "Soothsayer Scarf",
+    "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015HealerText": "Sailor's Cap",
+    "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "headSpecialGaymerxText": "Regnbuekrigerhjelm",
    "headSpecialGaymerxNotes": "For at fejre Pride-sæsonen og GaymerX er denne specielle hjelm dekoreret med en lysende og farverig regnbue! GaymerX er en spil-messe, der fejrer LGBTQ og gaming, og den er åben for alle. Den foregår på InterContinental i San Fransisco 11-13 juli! Giver ingen bonusser.",
    "headMystery201402Text": "Bevinget Hjelm",
@@ -378,6 +410,16 @@
    "headMystery301404Notes": "En smart tophat for de fineste folk! Giver ingen bonusser. Januar 3015 Abonnentting.",
    "headMystery301405Text": "Simpel Tophat",
    "headMystery301405Notes": "En simpel tophat, der bare beder om at blive sat sammen med smart hovedtilbehør. Giver ingen bonusser. Maj 3015 Abonnentting.",
+    "headArmoireLunarCrownText": "Soothing Lunar Crown",
+    "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).",
+    "headArmoireRedHairbowText": "Red Hairbow",
+    "headArmoireRedHairbowNotes": "Become strong, tough and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
+    "headArmoireVioletFloppyHatText": "Violet Floppy Hat",
+    "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "headArmoireGladiatorHelmText": "Gladiator Helm",
+    "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).",
+    "headArmoireRancherHatText": "Rancher Hat",
+    "headArmoireRancherHatNotes": "Round up your pets and wrangle your mounts while wearing this magical Rancher Hat! Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
    "offhand": "skjoldhånds-udstyr",
    "shieldBase0Text": "Intet Skjoldhånds-udstyr",
    "shieldBase0Notes": "Intet skjold eller andet våben.",
@@ -441,8 +483,17 @@
    "shieldSpecialSpring2015WarriorNotes": "Hurl it at your enemies.... or just hold it, because it will fill up with yummy kibble at dinnertime. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
    "shieldSpecialSpring2015HealerText": "Patterned Pillow",
    "shieldSpecialSpring2015HealerNotes": "You can rest your head on this soft pillow, or you can wrestle it with your fearsome claws. Rawr! Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+    "shieldSpecialSummer2015RogueText": "Firing Coral",
+    "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+    "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015HealerText": "Strapping Shield",
+    "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "shieldMystery301405Text": "Urskjold",
    "shieldMystery301405Notes": "Tiden er på din side med dette tårnhøje urskjold. Giver ingen bonusser. Juni 3015 Abonnentting.",
+    "shieldArmoireGladiatorShieldText": "Gladiator Shield",
+    "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
+    "back": "Back Accessory",
    "backBase0Text": "Intet Ryg-udstyr",
    "backBase0Notes": "Intet Ryg-udstyr.",
    "backMystery201402Text": "Gyldne Vinger",
@@ -457,6 +508,7 @@
    "backSpecialWonderconRedNotes": "Rasler af styrke og skønhed. Giver ingen bonusser. Specielt Messeudstyr.",
    "backSpecialWonderconBlackText": "Lusket Kappe",
    "backSpecialWonderconBlackNotes": "Spundet af skygger og hvisken. Giver ingen bonusser. Specielt Messeudstyr.",
+    "body": "Body Accessory",
    "bodyBase0Text": "Intet Krops-udstyr",
    "bodyBase0Notes": "Intet Krops-udstyr.",
    "bodySpecialWonderconRedText": "Rubinkrave",
@@ -469,6 +521,14 @@
    "bodySpecialSummerMageNotes": "Hverken saltvand eller ferskvand kan plette denne metalliske lille kappe. Giver ingen bonusser. Specielt 2014 Sommerudstyr.",
    "bodySpecialSummerHealerText": "Koralkrave",
    "bodySpecialSummerHealerNotes": "En tjekket krave af levende koral! Giver ingen bonusser. Specielt 2014 Sommerudstyr.",
+    "bodySpecialSummer2015RogueText": "Renegade Sash",
+    "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+    "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015MageText": "Golden Buckle",
+    "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
    "headAccessory": "hovedudstyr",
    "accessories": "Tilbehør",
    "animalEars": "Dyreører",
@@ -516,6 +576,7 @@
    "headAccessoryMystery201502Notes": "Let your imagination take flight! Confers no benefit. February 2015 Subscriber Item.",
    "headAccessoryMystery301405Text": "Hoved-goggles",
    "headAccessoryMystery301405Notes": "\"Briller er til øjnene,\" sagde de. \"Ingen vil have briller, som du kun kan have på hovedet,\" sagde de. Ha! Dér viste du dem! Giver ingen bonusser. August 3015 Abonnentting.",
+    "eyewear": "Eyewear",
    "eyewearBase0Text": "Ingen Øjenbeklædning",
    "eyewearBase0Notes": "Ingen Øjenbeklædning.",
    "eyewearSpecialSummerRogueText": "Skurkeagtig Øjeklap",
--- a/common/locales/da/generic.json
+++ b/common/locales/da/generic.json
@@ -54,7 +54,7 @@
    "gems": "Ædelsten",
    "gemButton": "Du har <%= number %> Ædelsten.",
    "moreInfo": "Mere Information",
-    "gemsWhatFor": "Købt for rigtige penge. Bruges til at købe specielle varer og funktioner (æg, udrugnings-eliksir, Forstærkning o.s.v.). Du skal låse op for disse funktioner for at kunne bruge Ædelsten.",
+    "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.",
    "veteran": "Veteran",
    "veteranText": "Har klaret Den Grå Habit (vores hjemmeside før Angular), og har fået mange krigs-ar på grund af fejlene dengang.",
    "originalUser": "Original Bruger!",
@@ -70,7 +70,6 @@
    "lastLoggedIn": "- Sidst logget ind",
    "notPorted": "Denne funktion er ikke blevet konvertet fra den originale side endnu.",
    "buyThis": "Køb denne <%= text %> med <%= price %> af dine <%= gems %> Ædelsten?",
-    "untilNoFace": "Indtil vi tilføjer Facebook skal du bruge dit Unikke Bruger-ID og API Nøgle til at logge ind (kan findes på https://habitrpg.com > Valgmuligheder > Indstillinger).",
    "noReachServer": "Serveren er p.t. ikke tilgængelig, prøv igen senere",
    "errorUpCase": "FEJL:",
    "newPassSent": "Nyt kodeord tilsendt.",
@@ -86,6 +85,7 @@
    "audioTheme_off": "Sluk",
    "audioTheme_danielTheBard": "Skjalden Daniel",
    "audioTheme_wattsTheme": "Watts' Tema",
+    "audioTheme_gokulTheme": "Gokul Theme",
    "askQuestion": "Stil et Spørgsmål",
    "reportBug": "Rapporter en Fejl",
    "contributeToHRPG": "Bidrag til HabitRPG",
--- a/common/locales/da/groups.json
+++ b/common/locales/da/groups.json
@@ -39,6 +39,8 @@
    "editGroup": "Ret Gruppe",
    "newGroupName": "<%= groupType %> Navn",
    "groupName": "Gruppenavn",
+    "groupLeader": "Group Leader",
+    "groupID": "Group ID",
    "groupDescr": "Beskrivelse, der bliver vist offentligt i Klanlisten (Markdown er tilladt)",
    "logoUrl": "Logo-URL",
    "assignLeader": "Udpeg Gruppeleder",
@@ -116,5 +118,7 @@
    "sendGiftFromBalance": "Fra Saldo",
    "sendGiftPurchase": "Køb",
    "sendGiftMessagePlaceholder": "Personlig besked (valgfri)",
-    "sendGiftSubscription": "<%= months %> Måned(er): $<%= price %>"
+    "sendGiftSubscription": "<%= months %> Måned(er): $<%= price %>",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
--- a/common/locales/da/limited.json
+++ b/common/locales/da/limited.json
@@ -25,6 +25,7 @@
    "seasonalShopTitle": "<%= linkStart %>Sæson-heksen<%= linkEnd %>",
    "seasonalShopClosedText": "Sæson-markedet er lukket! Jeg ved ikke hvor Sæson-heksen er lige nu, men hun kommer sikkert tilbage til den næste <%= linkStart %>Store Fest<%= linkEnd %>!",
    "seasonalShopText": "Velkommen til Sæson-markedet! Vi har forårs-<a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>sæson</a> godter lige nu. Alting her kan købes under Forårsflirt-eventet hvert år, men vi holder kun åbent indtil 30. april, så husk at købe ind nu, ellers må du vente et helt år for igen at kunne købe disse ting!",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
    "seasonalShopRebirth": "Hvis du har brugt Genfødselskuglen kan du genkøbe dette udstyr i Belønningskolonnen efter du har fået adgang til Udstyrsbutikken. I starten vil du kun kunne købe tingene, der passer til din nuværende klasse (Kriger som standard), men frygt ej, de andre klasse-specifikke varer bliver tilgængelige hvis du skifter til den klasse.",
    "candycaneSet": "Slikstok (Magiker)",
    "skiSet": "Ski-morder (Slyngel)",
@@ -44,5 +45,9 @@
    "mightyBunnySet": "Kraftfuld Kanin (Kriger)",
    "magicMouseSet": "Magisk Mus (Magiker)",
    "lovingPupSet": "Kærlig Hvalp (Helbreder)",
-    "stealthyKittySet": "Snigende Kat (Slyngel)"
+    "stealthyKittySet": "Snigende Kat (Slyngel)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }
--- a/common/locales/da/messages.json
+++ b/common/locales/da/messages.json
@@ -1,6 +1,7 @@
 {
    "messageLostItem": "<%= itemText %> gik i stykker.",
    "messageTaskNotFound": "Opgave ikke fundet.",
+    "messageDuplicateTaskID": "A task with that ID already exists.",
    "messageTagNotFound": "Tag ikke fundet",
    "messagePetNotFound": ":pet ikke fundet i user.items.pets",
    "messageFoodNotFound": ":food ikke fundet i user.items.food",
@@ -20,5 +21,8 @@
    "messageDropFood": "Du fandt <%= dropArticle %><%= dropText %>! <%= dropNotes %>",
    "messageDropEgg": "Du fandt et <%= dropText %> Æg! <%= dropNotes %>",
    "messageDropPotion": "Du fandt en <%= dropText %> Udrugningseliksir! <%= dropNotes %>",
-    "messageFoundQuest": "Du fandt questen \"<%= questText %>\"!"
+    "messageFoundQuest": "Du fandt questen \"<%= questText %>\"!",
+    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
--- a/common/locales/da/npc.json
+++ b/common/locales/da/npc.json
@@ -10,6 +10,8 @@
    "alexander": "Købmanden Alexander",
    "welcomeMarket": "Velkommen til Markedet! Her kan du købe æg og eliksirer, der er svære at finde, eller sælge dine overskydende! Bestil nyttige tjenester! Kom og se hvad vi har at tilbyde.",
    "sellForGold": "Sælg <%= item %> for <%= gold %> Guld",
+    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
+    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
    "buyGems": "Køb Ædelsten",
    "justin": "Justin",
    "USD": "US$",
@@ -18,7 +20,7 @@
    "dismissAlert": "Fjern Denne Besked ",
    "donateText1": "Tilføjer 20 Ædelsten til din konto. Ædelsten bruges til at købe specielle spil-ting, såsom bluser og frisurer.",
    "donateText2": "Støt HabitRPG",
-    "donateText3": "Da vi er et open source-projekt, kan vi bruge al den hjælp, vi kan få!",
+    "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
    "donationDesc": "20 Ædelsten, donation til HabitRPG",
    "payWithCard": "Betal med kort",
    "payNote": "Bemærk: PayPal tager nogen gange lang tid om at udføre betalinger. Vi anbefaler, at du betaler med kort.",
@@ -41,13 +43,36 @@
    "tourHabits": "This column is for good and bad Habits that you do many times a day! To proceed, click the pencil to edit the names, then click the checkmark to save.",
    "tourStats": "Gode Vaner giver Erfaring og Guld! Dårlige vaner giver skade.",
    "tourGP": "For at fortsætte skal du købe Træningssværdet med det guld, du lige har tjent!",
-    "tourAvatar": "Nu har din avatar Træningssværdet. For at fortsætte skal du klikke på din avatar for at personliggøre den!",
+    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
    "tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
    "tourMuchMore": "Når du er færdig med dine opgaver, kan du oprette en Gruppe med dine venner, snakke med ligesindede i Klaner, deltage i Udfordringer, og meget mere!",
    "tourStatsPage": "Dette er din Statistik side! Opnå Præstationer ved at gennemføre de opgaver der er nævnt.",
    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
    "tourPartyPage": "Din Gruppe kan hjælpe dig, ved at holde dig ansvarlig. Inviter venner for at åbne for en quest-skriftrulle.",
-    "tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
-    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
-    "tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
+    "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!",
+    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market.",
+    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!",
+    "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
+    "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
+    "tourOkay": "Okay!",
+    "tourAwesome": "Awesome!",
+    "tourSplendid": "Splendid!",
+    "tourNifty": "Nifty!",
+    "tourAvatarProceed": "Show me my tasks!",
+    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
+    "tourDailiesProceed": "I'll be careful!",
+    "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
+    "tourHabitsProceed": "Makes sense!",
+    "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
+    "tourRewardsProceed": "That's all!",
+    "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+    "welcome1": "Create and customize an in-game avatar to represent you.",
+    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+    "welcome5": "Now you'll customize your avatar and set up your tasks...",
+    "imReady": "I'm Ready!"
 }
--- a/common/locales/da/quests.json
+++ b/common/locales/da/quests.json
@@ -1,9 +1,11 @@
 {
    "quests": "Quests",
    "quest": "quest",
+    "questDetails": "Quest Details",
+    "invitations": "Invitations",
    "completed": "Færdig!",
    "youReceived": "Du har modtaget",
-    "questSend": "Send invitation til dine gruppemedlemmer ved at klikke \"Invitér\". Når alle medlemmer har accepteret eller afvist vil questen begynde. Se status under Valgmuligheder > Social > Gruppe.",
+    "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ér Gruppe",
    "questInvitation": "Quest-invitation:",
    "questInvitationTitle": "Quest-invitation",
--- a/common/locales/da/questscontent.json
+++ b/common/locales/da/questscontent.json
@@ -202,5 +202,11 @@
    "questSheepBoss": "Tordenvædder",
    "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
    "questSheepDropSheepEgg": "Får (Æg)",
-    "questSheepUnlockText": "Åbner for køb at fåreæg på Markedet"
+    "questSheepUnlockText": "Åbner for køb at fåreæg på Markedet",
+    "questKrakenText": "The Kraken of Inkomplete",
+    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
+    "questKrakenBoss": "The Kraken of Inkomplete",
+    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
+    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
+    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"
 }
--- a/common/locales/da/rebirth.json
+++ b/common/locales/da/rebirth.json
@@ -21,11 +21,5 @@
    "rebirthOrb": "Brugte en Genfødselskugle til at starte forfra efter at have opnået Niveau",
    "rebirthPop": "Begynd en ny karakter på Niveau 1 mens du beholder præstationer, samlerobjekter, og opgaver med historik. ",
    "rebirthName": "Genfødselskugle",
-    "reborn": "Genfødt, højeste Niveau <%= reLevel %>",
-    "welcome100": "Velkommen til Niveau 100!",
-    "intro100": "Nu, hvor du har nået Niveau 100, har du mulighed for at bruge en Genfødselskugle gratis på et hvilket som helst tidspunkt. ",
-    "followup100": "Du kan fortsætte med at øge dit niveau, men det vil ikke længere øge dine statistikker, og der vil ikke blive mere tilgængeligt indhold. Dette er for at holde HabitRPG sjovt for folk med alle spillestile.",
-    "rebirth100Info": "Hvis du er klar til at starte et nyt eventyr kan du Genfødes nu... eller se hvor meget længere du kan drive dig selv frem. ",
-    "rebirthWait": "Jeg vil vente...",
-    "rebirthNow": "Genfødsel nu!"
+    "reborn": "Genfødt, højeste Niveau <%= reLevel %>"
 }
--- a/common/locales/da/settings.json
+++ b/common/locales/da/settings.json
@@ -113,10 +113,11 @@
    "benefits": "Fordele",
    "coupon": "Kupon",
    "couponPlaceholder": "Indtast Kuponkode",
-    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
    "apply": "Udfør",
    "resubscribe": "Genabonnér",
    "promoCode": "Promo-kode",
    "promoCodeApplied": "Promo Code Applied! Check your inventory",
-    "promoPlaceholder": "Indtast Promo-kode"
+    "promoPlaceholder": "Indtast Promo-kode",
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
 }
--- a/common/locales/da/subscriber.json
+++ b/common/locales/da/subscriber.json
@@ -3,17 +3,17 @@
    "subscriptions": "Abonnementer",
    "subDescription": "Fjern reklamer, køb ædelsten med guld, få en mystisk vare hver måned, gem fremskridtshistorik, din daglige drop-grænse bliver fordoblet OG du støtter udviklerne! Klik for mere info.",
    "disableAds": "Deaktivér reklamer",
-    "disableAdsText": "Reklamer vil være væk så længe du har et aktivt abonnement (originale brugere er fritaget for reklamer).",
+    "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).",
    "buyGemsGold": "Køb Ædelsten med Guld",
-    "buyGemsGoldText": "(1 ædelsten koster <%= gemCost %> Guld) Modvirker \"betal for at vinde\"-bekymringen, da alt nu kan opnås gennem hårdt arbejde. Der er et månedligt vekslemaksimum på  <%= gemLimit %>Ædelsten for at forhindre udbytning/misbrug.",
+    "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
    "retainHistory": "Behold fuld historik",
    "retainHistoryText": "Gør din fulde historik tilgængelig i grafer og eksport. Ikke-abonnent-historik bliver sammenlagt til databaseoptimering.",
    "doubleDrops": "Daglig drop-grænse fordoblet",
    "doubleDropsText": "Fyld din stald hurtigere!",
    "mysteryItem": "Unikke Månedlige Abonnent-varer",
-    "mysteryItemText": "Hver måned får alle abonnenter en totalt unik kosmetisk vare til deres avatarer!",
+    "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
    "supportDevs": "Støt udviklerne",
-    "supportDevsText": "Dette open source projekt kan bruge al den hjælp det kan få. Hjælp os med at holde HabitRPG i live!",
+    "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
    "monthUSD": "US$ / Måned",
    "organization": "Organisation",
    "groupPlans": "Forretningsplaner",
--- a/common/locales/da/tasks.json
+++ b/common/locales/da/tasks.json
@@ -16,7 +16,7 @@
    "checklist": "Tjekliste",
    "checklistText": "Del en opgave op i mindre bidder. Tjeklister øger hvor meget Erfaring og Guld du får fra en To-Do, og reducerer skaden fra Daglige.",
    "expandCollapse": "Åbn/Luk",
-    "text": "Tekst",
+    "text": "Title",
    "extraNotes": "Ekstra Noter",
    "direction/Actions": "Retning/Virkninger",
    "advancedOptions": "Avancerede Indstillinger",
@@ -36,6 +36,11 @@
    "newDailyBulk": "Nye Daglige (én per linje)",
    "streakCounter": "Stribe-tæller",
    "repeat": "Gentag",
+    "repeatEvery": "Repeat Every",
+    "repeatDays": "Every X Days",
+    "repeatWeek": "On Certain Days of the Week",
+    "day": "Day",
+    "days": "Days",
    "restoreStreak": "Genskab Stribe",
    "todos": "To-Do",
    "newTodo": "Ny To-Do",
@@ -60,6 +65,9 @@
    "clearTags": "Ryd",
    "hideTags": "Skjul",
    "showTags": "Vis",
+    "startDate": "Start Date",
+    "startDateHelpTitle": "When should this task start?",
+    "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.",
    "streakName": "Stribe-præstationer",
    "streakText": "Har udført <%= streaks %> 21-dags striber på Daglige",
    "streakSingular": "Striber",
@@ -78,5 +86,23 @@
    "pushTaskToTop": "Flyt opgave til toppen",
    "pushTaskToBottom": "Flyt opgave til bunden",
    "emptyTask": "Indtast først opgavens titel.",
-    "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies."
+    "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies.",
+    "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.",
+    "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.",
+    "habitHelp3": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Habits' target='_blank'>sample Habits</a>!",
+    "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!",
+    "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.",
+    "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.",
+    "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
+    "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+    "dailyHelp5": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Dailies' target='_blank'>sample Dailies</a>!",
+    "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
+    "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
+    "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+    "toDoHelp4": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+    "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
+    "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
+    "rewardHelp3": "Special equipment will appear here during World Events.",
+    "rewardHelp4": "Don't be afraid to set custom Rewards! Check out <a href='http://habitrpg.wikia.com/wiki/Sample_Custom_Rewards' target='_blank'>some samples here</a>.",
+    "clickForHelp": "Click for help"
 }
--- a/common/locales/de/defaulttasks.json
+++ b/common/locales/de/defaulttasks.json
@@ -1,9 +1,9 @@
 {
-    "defaultHabit1Text": "Gute Gewohnheit",
-    "defaultHabit1Notes": "Beispiel für gute Gewohnheiten: + Iss Gemüse +15 Minuten produktive Arbeit ",
-    "defaultHabit2Text": "Schlechte Gewohnheit",
+    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
+    "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work",
+    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
    "defaultHabit2Notes": "Beispiel für schlechte Gewohnheiten: - Rauchen - Dinge aufschieben",
-    "defaultHabit3Text": "Gute oder schlechte Gewohnheit",
+    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
    "defaultHabit3Notes": "Beispiel für gute oder schlechte Gewohnheiten: +/- Treppen/Aufzug benutzt ; +/- Wasser/Limonade getrunken",
    "defaultDaily1Text": "1 Stunde persönliches Projekt",
    "defaultDaily1Notes": "Standardmäßig haben alle neuen Aufgaben eine gelbe Farbe.  Verpasst Du sie zu Erledigen, nimmst Du nur mäßigen Schaden, wirst beim Erledigen aber auch nur durchschnittlich belohnt.",
@@ -31,7 +31,7 @@
    "defaultTodo4Checklist2": "Stelle die Schwierigkeit unter 'Fortgeschrittene Optionen' ein",
    "defaultTodo4Checklist3": "optional: bestimme ein Fälligkeitsdatum",
    "defaultTodo5Text": "Starte eine (private) Gruppe mit deinen Freunden (Soziales > Gruppe)",
-    "defaultReward1Text": "1 Episode Game of Thrones",
+    "defaultReward1Text": "15 minute break",
    "defaultReward1Notes": "Individuelle Belohnungen können viele Formen annehmen. Manche Leute verzichten auf ihre Lieblingsserien bis sie genügend Gold gesammelt haben um sie sich leisten zu können.",
    "defaultReward2Text": "Kuchen",
    "defaultReward2Notes": "Andere geben sich mit einem Stück Kuchen zufrieden. Probiere die Belohnungen zu setzen, die Dich am besten anspornen.",
--- a/common/locales/de/gear.json
+++ b/common/locales/de/gear.json
@@ -116,6 +116,14 @@
    "weaponSpecialSpring2015MageNotes": "Beschwöre Dir eine Karotte mit diesem schönen Zauberstab herauf. Erhöht Intelligenz um <%= int %> und Wahrnehmung um <%= per %>. Limited Edition 2015 Frühlingsausrüstung.",
    "weaponSpecialSpring2015HealerText": "Katzenrassel",
    "weaponSpecialSpring2015HealerNotes": "Wenn Du es schüttelst macht es ein faszinierendes Klimpergeräusch, was JEDEN über Stunden hinweg unterhalten würde. Erhöht Intelligenz um <%= int %>. Limited Edition 2015 Frühlingsausrüstung.",
+    "weaponSpecialSummer2015RogueText": "Firing Coral",
+    "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+    "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+    "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+    "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "weaponMystery201411Text": "Forke des Feierns",
    "weaponMystery201411Notes": "Ersteche deine Feinde oder verschling dein Lieblingsessen - diese flexible Forke ist universell einsetzbar! Gewährt keinen Bonus. November 2014 Abonnenten-Gegenstand.",
    "weaponMystery201502Text": "Schimmernder Flügelstab der Liebe und auch der Wahrheit",
@@ -124,6 +132,10 @@
    "weaponMystery201505Notes": "Diese grün-silberne Lanze hat viele Gegner aus ihren Sätteln gehoben. Gewährt keinen Attributbonus. Mai 2015 Abonnentengegenstand.",
    "weaponMystery301404Text": "Steampunk Spazierstock",
    "weaponMystery301404Notes": "Perfekt, um gemütlich durch die Stadt zu spazieren. März 3015 Abonnenten-Gegenstand. Gewährt keinen Bonus.",
+    "weaponArmoireBasicCrossbowText": "Basic Crossbow",
+    "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre",
+    "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).",
    "armor": "Rüstung",
    "armorBase0Text": "Schlichte Kleidung",
    "armorBase0Notes": "Gewöhnliches Kleidungsstück. Gewährt keinen Bonus zu Attributen.",
@@ -227,6 +239,14 @@
    "armorSpecialSpring2015MageNotes": "Dein Baumwollmantel passt zu deinem Baumwollschwanz! Erhöht Intelligenz um <%= int %>. Limited Edition 2015 Frühlingsausrüstung.",
    "armorSpecialSpring2015HealerText": "Trostspendender Katzenanzug",
    "armorSpecialSpring2015HealerNotes": "Dieser weiche Katzenanzug ist bequem und so beruhigend wie Pfefferminztee. Erhöht die Ausdauer um <%= con %>. Limited Edition 2015 Frühlingsausrüstung.",
+    "armorSpecialSummer2015RogueText": "Ruby Tail",
+    "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015WarriorText": "Golden Tail",
+    "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015MageText": "Soothsayer Robes",
+    "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015HealerText": "Sailor's Armor",
+    "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "armorMystery201402Text": "Robe des Nachrichtenbringers",
    "armorMystery201402Notes": "Schimmernd, stabil und mit vielen Taschen für Briefe. Gewährt keinen Bonus zu Attributen. Februar 2014 Abonnenten-Gegenstand.",
    "armorMystery201403Text": "Waldwanderer Rüstung",
@@ -253,6 +273,10 @@
    "armorMystery201504Notes": "In dieser Robe wirst Du fleißig sein wie eine Biene! Verleiht keine Attributboni. April 2015 Abonnentengegenstand.",
    "armorMystery301404Text": "Steampunkanzug",
    "armorMystery301404Notes": "Adrett und schneidig, hoho! Februar 3015 Abonennten-Gegenstand. Kein Attributbonus.",
+    "armorArmoireLunarArmorText": "Soothing Lunar Armor",
+    "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).",
+    "armorArmoireGladiatorArmorText": "Gladiator Armor",
+    "armorArmoireGladiatorArmorNotes": "To be a gladiator you must be not only cunning... but strong. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 2 of 3).",
    "headgear": "Kopfschutz",
    "headBase0Text": "Kein Helm.",
    "headBase0Notes": "Keine Kopfbedeckung.",
@@ -354,6 +378,14 @@
    "headSpecialSpring2015MageNotes": "Was kam zuerst, das Häschen oder der Hut? Erhöht Wahrnehmung um <%= per %>.  Limitierte Auflage 2015 Frühlingsausrüstung.",
    "headSpecialSpring2015HealerText": "Trostspendende Krone",
    "headSpecialSpring2015HealerNotes": "Die Perle im Zentrum dieser Krone beruhigt und tröstet jene, die sich in ihrer Nähe befinden. Erhöht Intelligenz um <%= int %>. Limited Edition 2015 Frühlingsausrüstung.",
+    "headSpecialSummer2015RogueText": "Renegade Hat",
+    "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+    "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015MageText": "Soothsayer Scarf",
+    "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015HealerText": "Sailor's Cap",
+    "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "headSpecialGaymerxText": "Regenbogenkriegerhelm",
    "headSpecialGaymerxNotes": "Dieser besondere Helm ist zur Feier der Pride-Zeit und GaymerX mit einem strahlenden, bunten Regenbogen verziert! GaymerX ist eine Game Convention, die LGBTQ und Gaming feiert und an der jeder teilnehmen kann. Sie findet im InterContinental in der Stadtmitte von SanFrancisco vom 11.-13. Juli statt. Kein Attributbonus.",
    "headMystery201402Text": "Geflügelter Helm",
@@ -378,6 +410,16 @@
    "headMystery301404Notes": "Ein schicker Zylinder für die feinsten Gentlemänner und -frauen! Januar 3015 Abonennten-Gegenstand. Kein Attributbonus. ",
    "headMystery301405Text": "Einfacher Zylinder",
    "headMystery301405Notes": "Ein einfacher Zylinder, der wie gemacht für ein paar schicke Kopf-Accessoires ist. Mai 3015 Abonnenten-Gegenstand. Kein Attributbonus.",
+    "headArmoireLunarCrownText": "Soothing Lunar Crown",
+    "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).",
+    "headArmoireRedHairbowText": "Red Hairbow",
+    "headArmoireRedHairbowNotes": "Become strong, tough and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
+    "headArmoireVioletFloppyHatText": "Violet Floppy Hat",
+    "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "headArmoireGladiatorHelmText": "Gladiator Helm",
+    "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).",
+    "headArmoireRancherHatText": "Rancher Hat",
+    "headArmoireRancherHatNotes": "Round up your pets and wrangle your mounts while wearing this magical Rancher Hat! Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
    "offhand": "Schildhand-Gegenstand",
    "shieldBase0Text": "Keine Schildhand-Ausrüstung",
    "shieldBase0Notes": "Kein Schild oder keine zweite Waffe.",
@@ -441,8 +483,17 @@
    "shieldSpecialSpring2015WarriorNotes": "Schleudere es auf deine Feine.... oder halte es nur in der Hand, denn es wird sich zur Essenszeit mit leckerem Trockenfutter füllen. Erhöht Ausdauer um <%= con %>. Limited Edition 2015 Frühlingsausrüstung.",
    "shieldSpecialSpring2015HealerText": "Gemusterter Kissen",
    "shieldSpecialSpring2015HealerNotes": "Du kannst dich auf diesem weichen Kissen ausruhen oder du kannst es mit deinen furchterregenden Klauen zerreißen. Fauch! Erhöht Ausdauer um <%= con %>. Limited Edition 2015 Frühlingsausrüstung.",
+    "shieldSpecialSummer2015RogueText": "Firing Coral",
+    "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+    "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015HealerText": "Strapping Shield",
+    "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "shieldMystery301405Text": "Uhrenschild",
    "shieldMystery301405Notes": "Die Zeit ist auf deiner Seite mit diesem gewaltigen Uhrenschild! Juni 3015 Abonennten-Gegenstand. Kein Attributbonus.",
+    "shieldArmoireGladiatorShieldText": "Gladiator Shield",
+    "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
+    "back": "Back Accessory",
    "backBase0Text": "Kein Rückenschmuck",
    "backBase0Notes": "Kein Rückenschmuck.",
    "backMystery201402Text": "Güldene Flügel.",
@@ -457,6 +508,7 @@
    "backSpecialWonderconRedNotes": "Strotzt vor Stärke und Schönheit. Kein Attributbonus. Special Edition Convention-Gegenstand.",
    "backSpecialWonderconBlackText": "Tückischer Umhang",
    "backSpecialWonderconBlackNotes": "Gewebt aus Schatten und Geflüster. Kein Attributbonus. Special Edition Convention Rüstung.",
+    "body": "Body Accessory",
    "bodyBase0Text": "Kein Kleidungsschmuck",
    "bodyBase0Notes": "Kein Kleidungsschmuck.",
    "bodySpecialWonderconRedText": "Rubinkragen",
@@ -469,6 +521,14 @@
    "bodySpecialSummerMageNotes": "Weder Salzwasser noch frisches Wasser kann diesen metallischen Kurzumhang beflecken. Kein Attributbonus. Limited Edition 2014 Sommer-Ausrüstung. ",
    "bodySpecialSummerHealerText": "Korallenkragen",
    "bodySpecialSummerHealerNotes": "Limited Edition 2014 Sommer-Set. Ein stylischer Kragen aus lebendigen Korallen! Gewährt keinen Bonus zu Attributen.",
+    "bodySpecialSummer2015RogueText": "Renegade Sash",
+    "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+    "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015MageText": "Golden Buckle",
+    "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
    "headAccessory": "Kopfschmuck",
    "accessories": "Accessoires ",
    "animalEars": "Tierohren",
@@ -516,6 +576,7 @@
    "headAccessoryMystery201502Notes": "Verleihe deiner Vorstellung Flügel! Gewährt keinen Attributbonus. Februar 2015 Abonnentengegenstand.",
    "headAccessoryMystery301405Text": "Kopf-Brille",
    "headAccessoryMystery301405Notes": "\"Brillen sind für die Augen,\" haben sie gesagt. \"Niemand will Brillen, die man nur auf dem Kopf tragen kann,\" haben sie gesagt. Ha! Da hast du es ihnen aber ordentlich gezeigt! August 3015 Abonnenten-Gegenstand. Kein Attributbonus.",
+    "eyewear": "Eyewear",
    "eyewearBase0Text": "Keine Brille",
    "eyewearBase0Notes": "Keine Brille.",
    "eyewearSpecialSummerRogueText": "Schurkische Augenklappe",
--- a/common/locales/de/generic.json
+++ b/common/locales/de/generic.json
@@ -39,7 +39,7 @@
    "close": "Schließen",
    "saveAndClose": "Speichern & Schließen",
    "cancel": "Abbrechen",
-    "ok": "Okay",
+    "ok": "OK",
    "add": "Hinzufügen",
    "undo": "Rückgängig",
    "continue": "Weiter",
@@ -54,7 +54,7 @@
    "gems": "Edelsteine",
    "gemButton": "Du hast <%= number %> Edelsteine.",
    "moreInfo": "Mehr Informationen",
-    "gemsWhatFor": "Kann mit echtem Geld gekauft werden. Wird benötigt, um besondere Gegenstände und Dienste zu kaufen (Eier, Schlüpftränke, Stärkungstränke, usw.). Du musst diese Features erst freischalten, bevor du Edelsteine dafür verwenden kannst. ",
+    "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.",
    "veteran": "Veteran",
    "veteranText": "Hat Habit den Grauen (unsere pre-Angular Webseite) überlebt und hat viele Kriegsnarben von den Bugs davongetragen.",
    "originalUser": "Erstbenutzer!",
@@ -70,7 +70,6 @@
    "lastLoggedIn": "- Zuletzt eingeloggt",
    "notPorted": "Dieses Feature wurde noch nicht von der ursprünglichen Seite geportet.",
    "buyThis": "Kaufe <%= text %> mit <%= price %> Deiner <%= gems %> Edelsteinen?",
-    "untilNoFace": "Bis wir Facebook eingegliedert haben, benutze unsere UUID and API Tokens um Dich einzuloggen (zu finden unter https://habitrpg.com > Optionen > Einstellungen).",
    "noReachServer": "Der Server ist momentan nicht erreichbar, versuche es später noch einmal",
    "errorUpCase": "FEHLER:",
    "newPassSent": "Neues Passwort wurde gesendet.",
@@ -86,6 +85,7 @@
    "audioTheme_off": "Aus",
    "audioTheme_danielTheBard": "Daniel der Barde",
    "audioTheme_wattsTheme": "Watts' Thema",
+    "audioTheme_gokulTheme": "Gokul Theme",
    "askQuestion": "Stelle eine Frage",
    "reportBug": "Melde einen Fehler",
    "contributeToHRPG": "Wirke bei HabitRPG mit",
--- a/common/locales/de/groups.json
+++ b/common/locales/de/groups.json
@@ -39,6 +39,8 @@
    "editGroup": "Gruppe bearbeiten",
    "newGroupName": "<%= groupType %> Name",
    "groupName": "Gruppenname",
+    "groupLeader": "Group Leader",
+    "groupID": "Group ID",
    "groupDescr": "Beschreibung auf der öffentlichen Gildenliste (Markdown Okay)",
    "logoUrl": "Logo URL",
    "assignLeader": "Gruppenleiter bestimmen",
@@ -116,5 +118,7 @@
    "sendGiftFromBalance": "Vom Saldo",
    "sendGiftPurchase": "Kauf",
    "sendGiftMessagePlaceholder": "Persönliche Nachricht (optional)",
-    "sendGiftSubscription": "<%= months %> Monat(e): $<%= price %>"
+    "sendGiftSubscription": "<%= months %> Monat(e): $<%= price %>",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
--- a/common/locales/de/limited.json
+++ b/common/locales/de/limited.json
@@ -25,6 +25,7 @@
    "seasonalShopTitle": "<%= linkStart %>Saisonzauberin<%= linkEnd %>",
    "seasonalShopClosedText": "Der saisonale Shop ist zurzeit geschlossen!!! Ich weiß nicht wo zurzeit die saisonale Zauberin ist, aber ich wette sie kommt zur nächsten <%= linkStart %>Grand Gala<%= linkEnd %> wieder!",
    "seasonalShopText": "Willkommen zum Jahreszeitenmarkt!! Momentan haben wir <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Frühlingsgegenstände</a> auf Lager. Alles hier wird während des Frühlingsevents, das jedes Jahr stattfindet, verfügbar sein. Allerdings nur bis zum 30. April, also stocke jetzt auf, ansonsten musst du bis nächstes Jahr warten.",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
    "seasonalShopRebirth": "Wenn Du eine Sphäre der Wiedergeburt benutzt hast, kannst Du diese Ausrüstung wieder in der Belohnungs Spalte finden und kaufen, nachdem Du den Item Shop freigeschaltet hast. Zunächst wirst Du nur die Items für deine aktuelle Klasse kaufen können (zu Beginn Krieger), aber keine Sorge, die anderen Klassen spezifischen Items werden Dir zur Verfügung stehen, wenn Du zu der entsprechenden Klasse wechselst.",
    "candycaneSet": "Zuckerstange (Magier)",
    "skiSet": "Ski-Attentäter (Schurke)",
@@ -44,5 +45,9 @@
    "mightyBunnySet": "Mächtiges Häschen (Krieger)",
    "magicMouseSet": "Magische Maus (Magier)",
    "lovingPupSet": "Liebevoller Welpe (Heiler)",
-    "stealthyKittySet": "Verstohlenes Kätzchen (Schurke)"
+    "stealthyKittySet": "Verstohlenes Kätzchen (Schurke)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }
--- a/common/locales/de/messages.json
+++ b/common/locales/de/messages.json
@@ -1,6 +1,7 @@
 {
    "messageLostItem": "Dein <%= itemText %> ist kaputt gegangen.",
    "messageTaskNotFound": "Aufgabe nicht gefunden.",
+    "messageDuplicateTaskID": "A task with that ID already exists.",
    "messageTagNotFound": "Tag nicht gefunden.",
    "messagePetNotFound": ":pet in user.items.pets nicht gefunden",
    "messageFoodNotFound": ":food in user.items.food nicht gefunden",
@@ -20,5 +21,8 @@
    "messageDropFood": "<%= dropArticle %><%= dropText %> gefunden! <%= dropNotes %>",
    "messageDropEgg": "Du hast ein <%= dropText %> Ei gefunden! <%= dropNotes %>",
    "messageDropPotion": "Du hast einen <%= dropText %>  Schlüpftrank gefunden! <%= dropNotes %>",
-    "messageFoundQuest": "Du hast das Quest \"<%= questText %>\" gefunden!"
+    "messageFoundQuest": "Du hast das Quest \"<%= questText %>\" gefunden!",
+    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
--- a/common/locales/de/npc.json
+++ b/common/locales/de/npc.json
@@ -10,6 +10,8 @@
    "alexander": "Alexander der Händler",
    "welcomeMarket": "Willkommen auf dem Marktplatz! Kaufe schwer zu findende Eier und Tränke! Verkaufe Überflüssiges! Gib' wichtige Dienste in Auftrag! Komm' und schau', was wir anzubieten haben.",
    "sellForGold": "Verkaufe <%= item %> für <%= gold %> Gold",
+    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
+    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
    "buyGems": "Kaufe Edelsteine",
    "justin": "Justin",
    "USD": "USD ($)",
@@ -18,7 +20,7 @@
    "dismissAlert": "Als gelesen markieren",
    "donateText1": "Fügt Deinem Konto 20 Edelsteine hinzu. Edelsteine werden benutzt um Spielgegenstände wie Shirts und Frisuren zu kaufen.",
    "donateText2": "Hilf dabei, HabitRPG zu unterstützen",
-    "donateText3": "Als \"open source Projekt\" können wir jede Hilfe brauchen die wir bekommen können.",
+    "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
    "donationDesc": "20 Edelsteine, Spende an die Entwickler",
    "payWithCard": "Mit Kreditkarte bezahlen",
    "payNote": "Achtung: PayPal braucht manchmal viel Zeit. Wir empfehlen, eine Kreditkarte zu benutzen",
@@ -41,13 +43,36 @@
    "tourHabits": "Diese Spalte ist für gute und für schlechte Gewohnheiten, denen Du mehrmals am Tag nachgehst! Um weiterzumachen, klicke auf das Stift-Icon einer Gewohnheit. So kannst Du die Gewohnheit bearbeiten. Ändere die Namen und klicke anschließend auf das Häkchen, um die Änderung zu speichern.",
    "tourStats": "Gute Gewohnheiten bringen Erfahrung und Gold! Schlechte Gewohnheiten verringern Deine Lebenspunkte. ",
    "tourGP": "Um weiterzumachen, kaufe das Übungschwert mit dem Gold, das Du gerade verdient hast!",
-    "tourAvatar": "Nun besitzt Dein Avatar das Übungsschwert. Um weiterzumachen, klicke auf Deinen Avatar! So kannst Du ihn verändern und Deinen Wünschen anpassen.",
+    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
    "tourScrollDown": "Gehe sicher, dass Du auch ganz nach unten scrollst um alle Optionen zu sehen! Klicke erneut auf Deinen Avatar um zur Aufgabenseite zurückzukehren. ",
    "tourMuchMore": "Wenn Du Aufgaben erledigt hast, kannst Du mit Freunden eine Gruppe gründen, Dich in den Gilden nach Gespräche über verschiedene Themen umsehen, Wettbewerben beitreten und vieles mehr!",
    "tourStatsPage": "Auf dieser Seite kannst Du Deine Statuswerte im Auge behalten. Erreiche neue Erfolge indem Du die aufgelisteten Aufgaben erledigst.",
-    "tourTavernPage": "Willkommen in der Taverne, ein Chatroom für Habitianer aller Altersgruppen! Falls du krank oder im Urlaub bist, kannst du hier verhindern, dass dir deine täglichen Aufgaben Schaden zufügen, indem du auf \"Im Gasthaus erholen\" klickst. Komm rein und sag Hallo! ",
+    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
    "tourPartyPage": "Deine Gruppe wird Dir dabei helfen weiterhin verantwortungsbewusst Deine Aufgaben zu erledigen. Lade Freunde ein um neue Quest Rollen freizuschalten!",
-    "tourGuildsPage": "Gilden sind Gruppen mit gemeinsamen Interessen. Suche nach Begriffen, die Dich interessieren! Wir empfehlen die \"Gilde für Neuankömmlinge\" (Newbies Guild).",
-    "tourChallengesPage": "Wettbewerbe sind Aufgabenlisten mit bestimmten Themen, die von Benutzern erstellt wurden. Wenn du einem Wettbewerb beitrittst, werden seine Aufgaben deinem Aufgabenmenü hinzugefügt. Messe dich mit anderen Spielern und gewinne Edelsteine! ",
-    "tourMarketPage": "Sobald Du Level 4 erreichst, erhältst Du manchmal als zufällige Belohnung für erledigte Aufgaben Eier und Schlüpftränke. Diese erscheinen hier - nutze sie um Haustiere auszubrüten. Du kannst außerdem Gegenstände vom Marktplatz kaufen."
+    "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!",
+    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourMarketPage": "Sobald Du Level 4 erreichst, erhältst Du manchmal als zufällige Belohnung für erledigte Aufgaben Eier und Schlüpftränke. Diese erscheinen hier - nutze sie um Haustiere auszubrüten. Du kannst außerdem Gegenstände vom Marktplatz kaufen.",
+    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!",
+    "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
+    "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
+    "tourOkay": "Okay!",
+    "tourAwesome": "Awesome!",
+    "tourSplendid": "Splendid!",
+    "tourNifty": "Nifty!",
+    "tourAvatarProceed": "Show me my tasks!",
+    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
+    "tourDailiesProceed": "I'll be careful!",
+    "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
+    "tourHabitsProceed": "Makes sense!",
+    "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
+    "tourRewardsProceed": "That's all!",
+    "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+    "welcome1": "Create and customize an in-game avatar to represent you.",
+    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+    "welcome5": "Now you'll customize your avatar and set up your tasks...",
+    "imReady": "I'm Ready!"
 }
--- a/common/locales/de/quests.json
+++ b/common/locales/de/quests.json
@@ -1,9 +1,11 @@
 {
    "quests": "Quests",
    "quest": "Quest",
+    "questDetails": "Quest Details",
+    "invitations": "Invitations",
    "completed": "Erfüllt!",
    "youReceived": "Du hast folgendes erhalten:",
-    "questSend": "Indem Du auf \"Einladen\" klickst, sendest Du eine Einladung an Deine Gruppenmitglieder. Wenn alle Mitglieder angenommen oder abgelehnt haben beginnt das Quest. Statusabfrage unter Optionen > Soziales > Gruppe.",
+    "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": "Gruppe einladen",
    "questInvitation": "Quest Einladung:",
    "questInvitationTitle": "Quest-Einladung",
--- a/common/locales/de/questscontent.json
+++ b/common/locales/de/questscontent.json
@@ -202,5 +202,11 @@
    "questSheepBoss": "Donnerbock",
    "questSheepCompletion": "Beeindruckt von deinem Fleiß, lässt die Wut des Donnerbocks nach. Er schießt drei riesige Hagelkörner in deine Richtung und verschwindet dann mit leisem Grollen. Bei näherer Betrachtung entdeckst du, dass die Hagelkörner eigentlich drei flauschige Eier sind. Du hebst sie auf und schlenderst unter blauem Himmel nach Hause.",
    "questSheepDropSheepEgg": "Schaf (Ei)",
-    "questSheepUnlockText": "Ermöglicht den Kauf von Schafseiern auf dem Marktplatz"
+    "questSheepUnlockText": "Ermöglicht den Kauf von Schafseiern auf dem Marktplatz",
+    "questKrakenText": "The Kraken of Inkomplete",
+    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
+    "questKrakenBoss": "The Kraken of Inkomplete",
+    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
+    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
+    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"
 }
--- a/common/locales/de/rebirth.json
+++ b/common/locales/de/rebirth.json
@@ -21,11 +21,5 @@
    "rebirthOrb": "Hat eine Sphäre der Wiedergeburt verwendet nachdem er folgendes Level erreicht hatte:",
    "rebirthPop": "Starte einen neuen Charakter mit Level 1, aber behalte Erfolge, Sammlungen und Aufgaben mit Verlauf bei.",
    "rebirthName": "Sphäre der Wiedergeburt",
-    "reborn": "Wiedergeboren, max. Level <%= reLevel %>",
-    "welcome100": "Willkommen auf Level 100!",
-    "intro100": "Jetzt, da du Level 100 erreicht hast, hast du die Möglichkeit jederzeit eine Sphäre der Wiedergeburt zu verwenden.",
-    "followup100": "Du wirst weiterhin Erfahrung und Level hinzuverdienen können, aber deine Statuswerte werden nicht weiter ansteigen und es wird kein neuer Inhalt freigeschaltet, damit HabitRPG weiterhin für jeden Spielertyp attraktiv und unterhaltsam bleibt.",
-    "rebirth100Info": "Wenn Du ein neues Abenteuer beginnen willst, dann kannst du jetzt wiedergeboren werden...oder Du kannst austesten wie weit Du noch kommst.",
-    "rebirthWait": "Ich werde hier warten...",
-    "rebirthNow": "Werde jetzt wiedergeboren!"
+    "reborn": "Wiedergeboren, max. Level <%= reLevel %>"
 }
--- a/common/locales/de/settings.json
+++ b/common/locales/de/settings.json
@@ -113,10 +113,11 @@
    "benefits": "Vorteile",
    "coupon": "Gutschein",
    "couponPlaceholder": "Gib Deinen Gutschein Code ein",
-    "couponText": "Wir halten manchmal Events und geben Promo Codes für besondere Ausrüstungsgegenstände heraus. (z.B. wenn du bei unserem Wondercon Stand vorbeigeschaut hast)",
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
    "apply": "Anwenden",
    "resubscribe": "Wieder abonnieren",
    "promoCode": "Promo Code",
    "promoCodeApplied": "Promo Code aktiviert! Überprüfe dein Inventar",
-    "promoPlaceholder": "Promo Code eingeben"
+    "promoPlaceholder": "Promo Code eingeben",
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
 }
--- a/common/locales/de/subscriber.json
+++ b/common/locales/de/subscriber.json
@@ -3,17 +3,17 @@
    "subscriptions": "Abonnements",
    "subDescription": "Werbung ausschalten, Edelsteine mit Gold erwerben, ein monatlicher Überraschungsgegenstand, den Fortschrittsverlauf erhalten, doppeltes Beutelimit pro Tag, Unterstützung der Entwickler. Klicke um mehr zu erfahren.",
    "disableAds": "Werbung entfernen",
-    "disableAdsText": "Werbung wird entfernt bleiben, solange Du ein aktives Abo hast (ursprüngliche Benutzer mit entfernter Werbung sind von Neuregelungen ausgenommen).",
+    "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).",
    "buyGemsGold": "Kaufe Edelsteine mit Gold",
-    "buyGemsGoldText": "(1 Edelstein kostet <%= gemCost %> Gold) Das zielt auf die \"Geld gewinnt das Spiel\" Bedenken, weil dadurch alles mit harter Arbeit verdient werden kann. Es gibt ein <%= gemLimit %> Edelstein Limit pro Monat, um unfaire Vorteile zu verhindern.",
+    "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
    "retainHistory": "Behalte alle Verlaufeinträge",
    "retainHistoryText": "Dein gesamter Verlauf steht Dir für Graphen und Exporte zur Verfügung. Der Verlauf von Nicht-Abonnementen wird zusammengelegt um die Datenbanken zu optimieren.",
    "doubleDrops": "Du kannst doppelt so viele Gegenstände pro Tag finden",
    "doubleDropsText": "Fülle Deine Ställe schneller!",
    "mysteryItem": "Einzigartige Abonnement Gegenstände",
-    "mysteryItemText": "Jeden Monat erhalten alle Abonnementen einen einzigartigen kosmetischen Gegenstand für ihre Avatare.",
+    "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
    "supportDevs": "Unterstütze die Entwickler",
-    "supportDevsText": "Dieses 'open source Projekt' kann jede Hilfe gebrauchen die es bekommen kann. Hilf uns HabitRPG am Leben zu erhalten!",
+    "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
    "monthUSD": "USD($) / Monat",
    "organization": "Organisation",
    "groupPlans": "Gemeinschaftliche Pläne",
--- a/common/locales/de/tasks.json
+++ b/common/locales/de/tasks.json
@@ -16,7 +16,7 @@
    "checklist": "Checkliste",
    "checklistText": "Zerlege eine Aufgabe in kleinere Teile! Checklisten erhöhen die Erfahrung und das Gold, das du für eine Aufgabe bekommst, und verringern den Schaden, den eine tägliche Aufgabe verursacht. ",
    "expandCollapse": "Auf-/Zuklappen",
-    "text": "Text",
+    "text": "Title",
    "extraNotes": "Extra Notizen",
    "direction/Actions": "Leitung/Aktionen",
    "advancedOptions": "Erweiterte Optionen",
@@ -36,6 +36,11 @@
    "newDailyBulk": "Neue tägliche Aufgaben (eine pro Zeile)",
    "streakCounter": "Strähnenzähler",
    "repeat": "Wiederholen",
+    "repeatEvery": "Repeat Every",
+    "repeatDays": "Every X Days",
+    "repeatWeek": "On Certain Days of the Week",
+    "day": "Day",
+    "days": "Days",
    "restoreStreak": "Strähne wiederherstellen",
    "todos": "To-Dos",
    "newTodo": "Neuer To-Do Eintrag",
@@ -60,6 +65,9 @@
    "clearTags": "Aufräumen",
    "hideTags": "Verbergen",
    "showTags": "Anzeigen",
+    "startDate": "Start Date",
+    "startDateHelpTitle": "When should this task start?",
+    "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.",
    "streakName": "Strähnen Erfolg(e)",
    "streakText": "Hat <%= streaks %> 21-tägige Strähnen von täglichen Aufgaben erreicht",
    "streakSingular": "Perfektionist",
@@ -78,5 +86,23 @@
    "pushTaskToTop": "Aufgabe nach oben verschieben",
    "pushTaskToBottom": "Aufgabe nach unten verschieben",
    "emptyTask": "Gib der Aufgabe zunächst einen Titel.",
-    "dailiesRestingInInn": "Du ruhst dich im Gasthaus aus! Deine täglichen Aufgaben werden dir heute Nacht keinen Schaden zufügen, sie werden sich aber dennoch täglich aktualisieren. Falls du dich in einer Quest befindest, wirst du keinen Schaden austeilen/Gegenstände finden bis du das Gasthaus wieder verlässt, allerdings kannst du durch einen Boss verletzt werden, wenn deine Gruppe tägliche Aufgaben nicht erledigt."
+    "dailiesRestingInInn": "Du ruhst dich im Gasthaus aus! Deine täglichen Aufgaben werden dir heute Nacht keinen Schaden zufügen, sie werden sich aber dennoch täglich aktualisieren. Falls du dich in einer Quest befindest, wirst du keinen Schaden austeilen/Gegenstände finden bis du das Gasthaus wieder verlässt, allerdings kannst du durch einen Boss verletzt werden, wenn deine Gruppe tägliche Aufgaben nicht erledigt.",
+    "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.",
+    "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.",
+    "habitHelp3": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Habits' target='_blank'>sample Habits</a>!",
+    "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!",
+    "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.",
+    "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.",
+    "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
+    "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+    "dailyHelp5": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Dailies' target='_blank'>sample Dailies</a>!",
+    "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
+    "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
+    "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+    "toDoHelp4": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+    "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
+    "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
+    "rewardHelp3": "Special equipment will appear here during World Events.",
+    "rewardHelp4": "Don't be afraid to set custom Rewards! Check out <a href='http://habitrpg.wikia.com/wiki/Sample_Custom_Rewards' target='_blank'>some samples here</a>.",
+    "clickForHelp": "Click for help"
 }
--- a/common/locales/en@pirate/defaulttasks.json
+++ b/common/locales/en@pirate/defaulttasks.json
@@ -1,9 +1,9 @@
 {
-    "defaultHabit1Text": "Good Habit",
+    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
    "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work",
-    "defaultHabit2Text": "Bad Habit",
+    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
    "defaultHabit2Notes": "Sample Bad Habits: - Smoke - Procrastinate",
-    "defaultHabit3Text": "Good or Bad Habit",
+    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
    "defaultHabit3Notes": "Sample Good or Bad Habits: +/- Took Stairs/Elevator ; +/- Drank Water/Soda",
    "defaultDaily1Text": "1h Personal Project",
    "defaultDaily1Notes": "All tasks default to yellow when they be created. 'tis means ye gunna take only moderate damage when they be missed 'n gunna gain only a moderate reward when they be completed.",
@@ -31,7 +31,7 @@
    "defaultTodo4Checklist2": "set difficulty under Advanced Options",
    "defaultTodo4Checklist3": "optional: set a Due Date",
    "defaultTodo5Text": "Start a Party (private group) with your friends (Social > Party)",
-    "defaultReward1Text": "1 Screening o' \"Pirates o' th' Caribbean\" ",
+    "defaultReward1Text": "15 minute break",
    "defaultReward1Notes": "Custom rewards can come in many forms. Some people gunna hold off watchin' their favorite show unless they have th' doubloons to pay fer it.",
    "defaultReward2Text": "Rum",
    "defaultReward2Notes": "Other people just want to heartly enjoy a nice bit o' rum. give a go' to create rewards that gunna motivate ye best.",
--- a/common/locales/en@pirate/gear.json
+++ b/common/locales/en@pirate/gear.json
@@ -116,6 +116,14 @@
    "weaponSpecialSpring2015MageNotes": "Conjure yourself up a carrot with this fancy wand. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
    "weaponSpecialSpring2015HealerText": "Cat Rattle",
    "weaponSpecialSpring2015HealerNotes": "When you wave it, it makes a fascinating clickety noise that would keep ANYONE entertained for hours. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
+    "weaponSpecialSummer2015RogueText": "Firing Coral",
+    "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+    "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+    "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+    "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "weaponMystery201411Text": "Pitchfork of Feasting",
    "weaponMystery201411Notes": "Stab yer enemies or dig in to yer favorite vittles - this here versatile pitchfork does it all! It don't benefit ye.\nNovember 2014 Subscriberrr Item",
    "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -124,6 +132,10 @@
    "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
    "weaponMystery301404Text": "Steampunk Cane",
    "weaponMystery301404Notes": "Excellent fer struttin' about town. March 3015 Subscriberrr Item. Don't benefit ye.",
+    "weaponArmoireBasicCrossbowText": "Basic Crossbow",
+    "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre",
+    "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).",
    "armor": "armor",
    "armorBase0Text": "Plain Slops",
    "armorBase0Notes": "Ordinary slops. Don't benefit ye.",
@@ -227,6 +239,14 @@
    "armorSpecialSpring2015MageNotes": "Your coattails match your cottontail! Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
    "armorSpecialSpring2015HealerText": "Comforting Catsuit",
    "armorSpecialSpring2015HealerNotes": "This soft catsuit is comfortable, and as comforting as mint tea. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+    "armorSpecialSummer2015RogueText": "Ruby Tail",
+    "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015WarriorText": "Golden Tail",
+    "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015MageText": "Soothsayer Robes",
+    "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015HealerText": "Sailor's Armor",
+    "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "armorMystery201402Text": "Messenger Robes",
    "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
    "armorMystery201403Text": "Forest Walker Armor",
@@ -253,6 +273,10 @@
    "armorMystery201504Notes": "You'll be productive as a busy bee in this fetching robe! Confers no benefit. April 2015 Subscriber Item.",
    "armorMystery301404Text": "Steampunk Suit",
    "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
+    "armorArmoireLunarArmorText": "Soothing Lunar Armor",
+    "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).",
+    "armorArmoireGladiatorArmorText": "Gladiator Armor",
+    "armorArmoireGladiatorArmorNotes": "To be a gladiator you must be not only cunning... but strong. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 2 of 3).",
    "headgear": "headgear",
    "headBase0Text": "No Helm",
    "headBase0Notes": "No headgear.",
@@ -354,6 +378,14 @@
    "headSpecialSpring2015MageNotes": "Which came first, the bunny or the hat? Increases Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
    "headSpecialSpring2015HealerText": "Comforting Crown",
    "headSpecialSpring2015HealerNotes": "The pearl at the center of this crown calms and comforts those around it. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
+    "headSpecialSummer2015RogueText": "Renegade Hat",
+    "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+    "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015MageText": "Soothsayer Scarf",
+    "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015HealerText": "Sailor's Cap",
+    "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "headSpecialGaymerxText": "Rainbow Warrior Helm",
    "headSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGBTQ and gaming and is open to everyone. It takes place at the InterContinental in downtown San Francisco on July 11-13! Confers no benefit.",
    "headMystery201402Text": "Winged Helm",
@@ -378,6 +410,16 @@
    "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
    "headMystery301405Text": "Basic Top Hat",
    "headMystery301405Notes": "A basic top hat, just begging to be paired with some fancy head accessories. Confers no benefit. May 3015 Subscriber Item.",
+    "headArmoireLunarCrownText": "Soothing Lunar Crown",
+    "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).",
+    "headArmoireRedHairbowText": "Red Hairbow",
+    "headArmoireRedHairbowNotes": "Become strong, tough and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
+    "headArmoireVioletFloppyHatText": "Violet Floppy Hat",
+    "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "headArmoireGladiatorHelmText": "Gladiator Helm",
+    "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).",
+    "headArmoireRancherHatText": "Rancher Hat",
+    "headArmoireRancherHatNotes": "Round up your pets and wrangle your mounts while wearing this magical Rancher Hat! Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
    "offhand": "shield-hand item",
    "shieldBase0Text": "No Shield-Hand Equipment",
    "shieldBase0Notes": "No shield or second weapon.",
@@ -441,8 +483,17 @@
    "shieldSpecialSpring2015WarriorNotes": "Hurl it at your enemies.... or just hold it, because it will fill up with yummy kibble at dinnertime. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
    "shieldSpecialSpring2015HealerText": "Patterned Pillow",
    "shieldSpecialSpring2015HealerNotes": "You can rest your head on this soft pillow, or you can wrestle it with your fearsome claws. Rawr! Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+    "shieldSpecialSummer2015RogueText": "Firing Coral",
+    "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+    "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015HealerText": "Strapping Shield",
+    "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "shieldMystery301405Text": "Clock Shield",
    "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
+    "shieldArmoireGladiatorShieldText": "Gladiator Shield",
+    "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
+    "back": "Back Accessory",
    "backBase0Text": "No Back Accessory",
    "backBase0Notes": "No Back Accessory.",
    "backMystery201402Text": "Golden Wings",
@@ -457,6 +508,7 @@
    "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
    "backSpecialWonderconBlackText": "Sneaky Cape",
    "backSpecialWonderconBlackNotes": "Spun of shadows and whispers. Confers no benefit. Special Edition Convention Item.",
+    "body": "Body Accessory",
    "bodyBase0Text": "No Body Accessory",
    "bodyBase0Notes": "No Body Accessory.",
    "bodySpecialWonderconRedText": "Ruby Collar",
@@ -469,6 +521,14 @@
    "bodySpecialSummerMageNotes": "Neither salt water nor fresh water can tarnish this metallic capelet. Confers no benefit. Limited Edition 2014 Summer Gear.",
    "bodySpecialSummerHealerText": "Coral Collar",
    "bodySpecialSummerHealerNotes": "A stylish collar 'o live coral! Confers no benefit. Limited Edition 2014 Summer Gear.",
+    "bodySpecialSummer2015RogueText": "Renegade Sash",
+    "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+    "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015MageText": "Golden Buckle",
+    "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
    "headAccessory": "head accessory",
    "accessories": "Accessories",
    "animalEars": "Animal Ears",
@@ -516,6 +576,7 @@
    "headAccessoryMystery201502Notes": "Let your imagination take flight! Confers no benefit. February 2015 Subscriber Item.",
    "headAccessoryMystery301405Text": "Headwear Goggles",
    "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
+    "eyewear": "Eyewear",
    "eyewearBase0Text": "No Eyewear",
    "eyewearBase0Notes": "No Eyewear.",
    "eyewearSpecialSummerRogueText": "Roguish Eyepatch",
--- a/common/locales/en@pirate/generic.json
+++ b/common/locales/en@pirate/generic.json
@@ -39,7 +39,7 @@
    "close": "Close",
    "saveAndClose": "Save & Close",
    "cancel": "Nay",
-    "ok": "Aye",
+    "ok": "OK",
    "add": "Add",
    "undo": "Undo",
    "continue": "Sail On",
@@ -54,7 +54,7 @@
    "gems": "Gems",
    "gemButton": "Ye be havin' <%= number %> Gems.",
    "moreInfo": "More Info",
-    "gemsWhatFor": "Purchased usin' real doubloons. Used fer buyin' special items 'n services (eggs, hatchin' potions, Fortify, etc.). ye'll need to unlock them weapons before bein' able to use Gems.",
+    "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.",
    "veteran": "Veteran",
    "veteranText": "Has weathered Habit th' Grey (our pre Angular ship), 'n has gained many battle-scars from its bugs.",
    "originalUser": "Original User!",
@@ -70,7 +70,6 @@
    "lastLoggedIn": "- Last sailed on",
    "notPorted": "This feature is not yet ported from th' original site.",
    "buyThis": "Buy this <%= text %> with <%= price %> o' yer <%= gems %> Gems?",
-    "untilNoFace": "'til we add Facebook, use ye UUID 'n API Token to log in (found at https://habitrpg.com > Options > Settin's).",
    "noReachServer": "Server not currently reachable, try again later",
    "errorUpCase": "ERROR:",
    "newPassSent": "New passcode sent.",
@@ -86,6 +85,7 @@
    "audioTheme_off": "Off",
    "audioTheme_danielTheBard": "Daniel The Bard",
    "audioTheme_wattsTheme": "Watts' Theme",
+    "audioTheme_gokulTheme": "Gokul Theme",
    "askQuestion": "Ask a Question",
    "reportBug": "Report a Bug",
    "contributeToHRPG": "Contribute to HabitRPG",
--- a/common/locales/en@pirate/groups.json
+++ b/common/locales/en@pirate/groups.json
@@ -39,6 +39,8 @@
    "editGroup": "Edit Group",
    "newGroupName": "<%= groupType %> Name",
    "groupName": "Group Name",
+    "groupLeader": "Group Leader",
+    "groupID": "Group ID",
    "groupDescr": "Description shown in public Alliances list (Markdown OK)",
    "logoUrl": "Logo URL",
    "assignLeader": "Assign Group Captain",
@@ -116,5 +118,7 @@
    "sendGiftFromBalance": "From Balance",
    "sendGiftPurchase": "Purchase",
    "sendGiftMessagePlaceholder": "Personal message (optional)",
-    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
+    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
--- a/common/locales/en@pirate/limited.json
+++ b/common/locales/en@pirate/limited.json
@@ -25,6 +25,7 @@
    "seasonalShopTitle": "<%= linkStart %>Seasonal Sorceress<%= linkEnd %>",
    "seasonalShopClosedText": "The Seasonal Shop is currently closed!! I don't know where the Seasonal Sorceress is now, but I bet she'll be back during the next <%= linkStart %>Grand Gala<%= linkEnd %>!",
    "seasonalShopText": "Welcome to the Seasonal Shop!! We're stocking springtime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Spring Fling event each year, but we're only open until April 30th, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
    "seasonalShopRebirth": "If ye've used the Orb o' Rebirth, ye can buy this gear in the Loot Column after ye've unlocked the Item Shop. At first, ye'll only be able to buy the items fer yer current class (Mercenary by default), but remain stout o' heart, ye can have the other classes' stuff if ye switch to that class.",
    "candycaneSet": "Candy Cane (Mage)",
    "skiSet": "Ski-sassin (Scallywag)",
@@ -44,5 +45,9 @@
    "mightyBunnySet": "Mighty Bunny (Warrior)",
    "magicMouseSet": "Magic Mouse (Mage)",
    "lovingPupSet": "Loving Pup (Healer)",
-    "stealthyKittySet": "Stealthy Kitty (Scallywag)"
+    "stealthyKittySet": "Stealthy Kitty (Scallywag)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }
--- a/common/locales/en@pirate/messages.json
+++ b/common/locales/en@pirate/messages.json
@@ -1,6 +1,7 @@
 {
    "messageLostItem": "Yer <%= itemText %> broke.",
    "messageTaskNotFound": "Task not found.",
+    "messageDuplicateTaskID": "A task with that ID already exists.",
    "messageTagNotFound": "Tag not found.",
    "messagePetNotFound": ":pet not found in user.items.pets",
    "messageFoodNotFound": ":vittles not found in user.items.vittles",
@@ -20,5 +21,8 @@
    "messageDropFood": "Ye 'ave found <%= dropArticle %><%= dropText %>! <%= dropNotes %>",
    "messageDropEgg": "Ye 'ave found a <%= dropText %> Egg! <%= dropNotes %>",
    "messageDropPotion": "Ye 'ave found a <%= dropText %> Hatchin' Potion! <%= dropNotes %>",
-    "messageFoundQuest": "Ye 'ave found th' adventure \"<%= questText %>\"!"
+    "messageFoundQuest": "Ye 'ave found th' adventure \"<%= questText %>\"!",
+    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
--- a/common/locales/en@pirate/npc.json
+++ b/common/locales/en@pirate/npc.json
@@ -10,6 +10,8 @@
    "alexander": "Alexander th' Sutler",
    "welcomeMarket": "Welcome to the Market! Buy harrrd-to-find eggs 'n potions! Sell yer extras! Commission useful services! Come 'n see what we have to offer ye.",
    "sellForGold": "Sell <%= item %> fer <%= gold %> Doubloons",
+    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
+    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
    "buyGems": "Buy Gems",
    "justin": "Justin",
    "USD": "USD",
@@ -18,7 +20,7 @@
    "dismissAlert": "Dismiss This Here Pesky Alert",
    "donateText1": "Adds 20 Gems to yer account. Gems be used to buy special in-game items, such as shirts 'n hairstyles.",
    "donateText2": "Help support HabitRPG",
-    "donateText3": "As an open source project, it can use all the help we can get!",
+    "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
    "donationDesc": "20 Gems, Donation to HabitRPG",
    "payWithCard": "Pay with Card",
    "payNote": "Ahoy! PayPal sometimes be takin' a long time to clear.  Payin' with yer card be better.",
@@ -41,13 +43,36 @@
    "tourHabits": "This column is for good and bad Habits that you do many times a day! To proceed, click the pencil to edit the names, then click the checkmark to save.",
    "tourStats": "Good Habits add Experience and Gold! Bad Habits remove health.",
    "tourGP": "To proceed, buy the Training Sword with the gold you just earned!",
-    "tourAvatar": "Now your avatar has the Training Sword. To proceed, click on your avatar to customize it!",
+    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
    "tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
    "tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
    "tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
    "tourPartyPage": "Yer crew will hold ye accountable. Invite mates aboard to uncover a Quest Scroll!",
-    "tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
-    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
-    "tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
+    "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!",
+    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market.",
+    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!",
+    "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
+    "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
+    "tourOkay": "Okay!",
+    "tourAwesome": "Awesome!",
+    "tourSplendid": "Splendid!",
+    "tourNifty": "Nifty!",
+    "tourAvatarProceed": "Show me my tasks!",
+    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
+    "tourDailiesProceed": "I'll be careful!",
+    "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
+    "tourHabitsProceed": "Makes sense!",
+    "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
+    "tourRewardsProceed": "That's all!",
+    "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+    "welcome1": "Create and customize an in-game avatar to represent you.",
+    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+    "welcome5": "Now you'll customize your avatar and set up your tasks...",
+    "imReady": "I'm Ready!"
 }
--- a/common/locales/en@pirate/quests.json
+++ b/common/locales/en@pirate/quests.json
@@ -1,9 +1,11 @@
 {
    "quests": "Adventures",
    "quest": "quest",
+    "questDetails": "Quest Details",
+    "invitations": "Invitations",
    "completed": "Completed!",
    "youReceived": "Ye 'ave Receiv'd",
-    "questSend": "Clickin' \"Invite\" gunna send an invitation to ye crew members. When all members have accepted or denied, th' quest begins. See status under Options > Social > Crew",
+    "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 Crew",
    "questInvitation": "Quest Invitation:",
    "questInvitationTitle": "Adventure Invitation",
--- a/common/locales/en@pirate/questscontent.json
+++ b/common/locales/en@pirate/questscontent.json
@@ -202,5 +202,11 @@
    "questSheepBoss": "Thunder Ram",
    "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
    "questSheepDropSheepEgg": "Sheep (Egg)",
-    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market",
+    "questKrakenText": "The Kraken of Inkomplete",
+    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
+    "questKrakenBoss": "The Kraken of Inkomplete",
+    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
+    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
+    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"
 }
--- a/common/locales/en@pirate/rebirth.json
+++ b/common/locales/en@pirate/rebirth.json
@@ -21,11 +21,5 @@
    "rebirthOrb": "Used an Orb o' Rebirth to start ov'r after attainin' Level",
    "rebirthPop": "Begin a new character at Level 1 whilst retaining achievements, collectibles, and tasks with history.",
    "rebirthName": "Orb o' Rebirth",
-    "reborn": "Reborn, max level <%= reLevel %>",
-    "welcome100": "Welcome t' Level 100!",
-    "intro100": "Now that ye 'ave hit level 100, ye 'ave th' option t' use th' Orb o' Rebirth fer free at any time.",
-    "followup100": "Though ye can still level up, it won't boost yer stats any more 'n no more content'll unlock, keepin' HabitRPG fun fer folks of all play styles.",
-    "rebirth100Info": "If ye're ready to start a new adventure, ye can Rebirth now... or spy wit' ye eye how much further ye can push yourself.",
-    "rebirthWait": "I'll wait...",
-    "rebirthNow": "Rebirth Now!"
+    "reborn": "Reborn, max level <%= reLevel %>"
 }
--- a/common/locales/en@pirate/settings.json
+++ b/common/locales/en@pirate/settings.json
@@ -113,10 +113,11 @@
    "benefits": "Benefits",
    "coupon": "Coupon",
    "couponPlaceholder": "Enter Coupon Code",
-    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
    "apply": "Apply",
    "resubscribe": "Resubscribe",
    "promoCode": "Promo Code",
    "promoCodeApplied": "Promo Code Applied! Check your inventory",
-    "promoPlaceholder": "Enter Promotion Code"
+    "promoPlaceholder": "Enter Promotion Code",
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
 }
--- a/common/locales/en@pirate/subscriber.json
+++ b/common/locales/en@pirate/subscriber.json
@@ -3,17 +3,17 @@
    "subscriptions": "Subscriptions",
    "subDescription": "Disable ads, buy gems with doubloons, monthly mestery item, retain progress history, double daily loot-caps, supports th' devs. Click for more info.",
    "disableAds": "Disable ads",
-    "disableAdsText": "Ads will stay disabled whilst ye 'ave an active subscription (original users with disabled ads arrr grandfathered).",
+    "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).",
    "buyGemsGold": "Buy Gems with Doubloons",
-    "buyGemsGoldText": "(1 Gem costs <%= gemCost %> Gold) Addresses the \"pay to win\" concern, as everything is now achievable through hard work. There's a <%= gemLimit %> Gem monthly conversion cap to prevent farming.",
+    "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
    "retainHistory": "Retain full log entries",
    "retainHistoryText": "Makes yer full history available in graphs an' export. Non-subscriber histories get consolidated fer database optimization.",
    "doubleDrops": "Daily loot-caps doubled",
    "doubleDropsText": "Complete yer stable faster!",
    "mysteryItem": "Unique Monthly Subscription Items",
-    "mysteryItemText": "Each month, all subscribers will git a totally unique cosmetic item for their avatarrs!",
+    "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
    "supportDevs": "Supports th' developers",
-    "supportDevsText": "This open source project can use all th' help it can get. Help us keep Habit alive!",
+    "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
    "monthUSD": "USD / Month",
    "organization": "Organization",
    "groupPlans": "Corporate Plans",
--- a/common/locales/en@pirate/tasks.json
+++ b/common/locales/en@pirate/tasks.json
@@ -16,7 +16,7 @@
    "checklist": "Checklist",
    "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
    "expandCollapse": "Expand/Collapse",
-    "text": "Text",
+    "text": "Title",
    "extraNotes": "Extra Notes",
    "direction/Actions": "Direction/Actions",
    "advancedOptions": "Advanced Options",
@@ -36,6 +36,11 @@
    "newDailyBulk": "New Dailies (one per line)",
    "streakCounter": "Streak Counter",
    "repeat": "Repeat",
+    "repeatEvery": "Repeat Every",
+    "repeatDays": "Every X Days",
+    "repeatWeek": "On Certain Days of the Week",
+    "day": "Day",
+    "days": "Days",
    "restoreStreak": "Restore Streak",
    "todos": "To-Dos",
    "newTodo": "New To-Do",
@@ -60,6 +65,9 @@
    "clearTags": "Clear",
    "hideTags": "Hide",
    "showTags": "Show",
+    "startDate": "Start Date",
+    "startDateHelpTitle": "When should this task start?",
+    "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.",
    "streakName": "Streak Achievements",
    "streakText": "Has performed <%= streaks %> 21-day streaks on Dailies",
    "streakSingular": "Streaker",
@@ -78,5 +86,23 @@
    "pushTaskToTop": "Push task to top",
    "pushTaskToBottom": "Push task to bottom",
    "emptyTask": "Enter t' task's title first.",
-    "dailiesRestingInInn": "Yo'rg Restin' in t' Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If yo'rge in a quest, you won't deal damage/collect items until you check out o' t' Inn, but you can still be injured by a Boss if your Party lads skip their own Dailies."
+    "dailiesRestingInInn": "Yo'rg Restin' in t' Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If yo'rge in a quest, you won't deal damage/collect items until you check out o' t' Inn, but you can still be injured by a Boss if your Party lads skip their own Dailies.",
+    "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.",
+    "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.",
+    "habitHelp3": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Habits' target='_blank'>sample Habits</a>!",
+    "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!",
+    "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.",
+    "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.",
+    "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
+    "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+    "dailyHelp5": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Dailies' target='_blank'>sample Dailies</a>!",
+    "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
+    "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
+    "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+    "toDoHelp4": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+    "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
+    "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
+    "rewardHelp3": "Special equipment will appear here during World Events.",
+    "rewardHelp4": "Don't be afraid to set custom Rewards! Check out <a href='http://habitrpg.wikia.com/wiki/Sample_Custom_Rewards' target='_blank'>some samples here</a>.",
+    "clickForHelp": "Click for help"
 }
--- a/common/locales/en_GB/defaulttasks.json
+++ b/common/locales/en_GB/defaulttasks.json
@@ -1,9 +1,9 @@
 {
-    "defaultHabit1Text": "Good Habit",
+    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
    "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work",
-    "defaultHabit2Text": "Bad Habit",
+    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
    "defaultHabit2Notes": "Sample Bad Habits: - Smoke - Procrastinate",
-    "defaultHabit3Text": "Good or Bad Habit",
+    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
    "defaultHabit3Notes": "Sample Good or Bad Habits: +/- Took Stairs/Lift ; +/- Drank Water/Soda",
    "defaultDaily1Text": "1h Personal Project",
    "defaultDaily1Notes": "All tasks default to yellow when they are created. This means you will take only moderate damage when they are missed and will gain only a moderate reward when they are completed.",
@@ -31,7 +31,7 @@
    "defaultTodo4Checklist2": "set difficulty under Advanced Options",
    "defaultTodo4Checklist3": "optional: set a Due Date",
    "defaultTodo5Text": "Start a Party (private group) with your friends (Social > Party)",
-    "defaultReward1Text": "1 Episode of Game of Thrones",
+    "defaultReward1Text": "15 minute break",
    "defaultReward1Notes": "Custom rewards can come in many forms. Some people will hold off watching their favourite show unless they have the gold to pay for it.",
    "defaultReward2Text": "Cake",
    "defaultReward2Notes": "Other people just want to enjoy a nice piece of cake. Try to create rewards that will motivate you best.",
--- a/common/locales/en_GB/gear.json
+++ b/common/locales/en_GB/gear.json
@@ -116,6 +116,14 @@
    "weaponSpecialSpring2015MageNotes": "Conjure yourself up a carrot with this fancy wand. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
    "weaponSpecialSpring2015HealerText": "Cat Rattle",
    "weaponSpecialSpring2015HealerNotes": "When you wave it, it makes a fascinating clickety noise that would keep ANYONE entertained for hours. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
+    "weaponSpecialSummer2015RogueText": "Firing Coral",
+    "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+    "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+    "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+    "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "weaponMystery201411Text": "Pitchfork of Feasting",
    "weaponMystery201411Notes": "Stab your enemies or dig in to your favourite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
    "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -124,6 +132,10 @@
    "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
    "weaponMystery301404Text": "Steampunk Cane",
    "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
+    "weaponArmoireBasicCrossbowText": "Basic Crossbow",
+    "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre",
+    "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).",
    "armor": "armour",
    "armorBase0Text": "Plain Clothing",
    "armorBase0Notes": "Ordinary clothing. Confers no benefit.",
@@ -227,6 +239,14 @@
    "armorSpecialSpring2015MageNotes": "Your coattails match your cottontail! Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
    "armorSpecialSpring2015HealerText": "Comforting Catsuit",
    "armorSpecialSpring2015HealerNotes": "This soft catsuit is comfortable, and as comforting as mint tea. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+    "armorSpecialSummer2015RogueText": "Ruby Tail",
+    "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015WarriorText": "Golden Tail",
+    "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015MageText": "Soothsayer Robes",
+    "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015HealerText": "Sailor's Armor",
+    "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "armorMystery201402Text": "Messenger Robes",
    "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
    "armorMystery201403Text": "Forest Walker Armour",
@@ -253,6 +273,10 @@
    "armorMystery201504Notes": "You'll be productive as a busy bee in this fetching robe! Confers no benefit. April 2015 Subscriber Item.",
    "armorMystery301404Text": "Steampunk Suit",
    "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
+    "armorArmoireLunarArmorText": "Soothing Lunar Armor",
+    "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).",
+    "armorArmoireGladiatorArmorText": "Gladiator Armor",
+    "armorArmoireGladiatorArmorNotes": "To be a gladiator you must be not only cunning... but strong. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 2 of 3).",
    "headgear": "headgear",
    "headBase0Text": "No Helm",
    "headBase0Notes": "No headgear.",
@@ -354,6 +378,14 @@
    "headSpecialSpring2015MageNotes": "Which came first, the bunny or the hat? Increases Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
    "headSpecialSpring2015HealerText": "Comforting Crown",
    "headSpecialSpring2015HealerNotes": "The pearl at the center of this crown calms and comforts those around it. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
+    "headSpecialSummer2015RogueText": "Renegade Hat",
+    "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+    "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015MageText": "Soothsayer Scarf",
+    "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015HealerText": "Sailor's Cap",
+    "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "headSpecialGaymerxText": "Rainbow Warrior Helm",
    "headSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special helmet is decorated with a radiant, colourful rainbow pattern! GaymerX is a game convention celebrating LGBTQ and gaming and is open to everyone. It takes place at the InterContinental in downtown San Francisco on July 11-13! Confers no benefit.",
    "headMystery201402Text": "Winged Helm",
@@ -378,6 +410,16 @@
    "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
    "headMystery301405Text": "Basic Top Hat",
    "headMystery301405Notes": "A basic top hat, just begging to be paired with some fancy head accessories. Confers no benefit. May 3015 Subscriber Item.",
+    "headArmoireLunarCrownText": "Soothing Lunar Crown",
+    "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).",
+    "headArmoireRedHairbowText": "Red Hairbow",
+    "headArmoireRedHairbowNotes": "Become strong, tough and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
+    "headArmoireVioletFloppyHatText": "Violet Floppy Hat",
+    "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "headArmoireGladiatorHelmText": "Gladiator Helm",
+    "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).",
+    "headArmoireRancherHatText": "Rancher Hat",
+    "headArmoireRancherHatNotes": "Round up your pets and wrangle your mounts while wearing this magical Rancher Hat! Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
    "offhand": "shield-hand item",
    "shieldBase0Text": "No Shield-Hand Equipment",
    "shieldBase0Notes": "No shield or second weapon.",
@@ -441,8 +483,17 @@
    "shieldSpecialSpring2015WarriorNotes": "Hurl it at your enemies.... or just hold it, because it will fill up with tasty grub at dinnertime. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
    "shieldSpecialSpring2015HealerText": "Patterned Pillow",
    "shieldSpecialSpring2015HealerNotes": "You can rest your head on this soft pillow, or you can wrestle it with your fearsome claws. Rawr! Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+    "shieldSpecialSummer2015RogueText": "Firing Coral",
+    "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+    "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015HealerText": "Strapping Shield",
+    "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "shieldMystery301405Text": "Clock Shield",
    "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
+    "shieldArmoireGladiatorShieldText": "Gladiator Shield",
+    "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
+    "back": "Back Accessory",
    "backBase0Text": "No Back Accessory",
    "backBase0Notes": "No Back Accessory.",
    "backMystery201402Text": "Golden Wings",
@@ -457,6 +508,7 @@
    "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
    "backSpecialWonderconBlackText": "Sneaky Cape",
    "backSpecialWonderconBlackNotes": "Spun of shadows and whispers. Confers no benefit. Special Edition Convention Item.",
+    "body": "Body Accessory",
    "bodyBase0Text": "No Body Accessory",
    "bodyBase0Notes": "No Body Accessory.",
    "bodySpecialWonderconRedText": "Ruby Collar",
@@ -469,6 +521,14 @@
    "bodySpecialSummerMageNotes": "Neither salt water nor fresh water can tarnish this metallic capelet. Confers no benefit. Limited Edition 2014 Summer Gear.",
    "bodySpecialSummerHealerText": "Coral Collar",
    "bodySpecialSummerHealerNotes": "A stylish collar of live coral! Confers no benefit. Limited Edition 2014 Summer Gear.",
+    "bodySpecialSummer2015RogueText": "Renegade Sash",
+    "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+    "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015MageText": "Golden Buckle",
+    "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
    "headAccessory": "head accessory",
    "accessories": "Accessories",
    "animalEars": "Animal Ears",
@@ -516,6 +576,7 @@
    "headAccessoryMystery201502Notes": "Let your imagination take flight! Confers no benefit. February 2015 Subscriber Item.",
    "headAccessoryMystery301405Text": "Headwear Goggles",
    "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
+    "eyewear": "Eyewear",
    "eyewearBase0Text": "No Eyewear",
    "eyewearBase0Notes": "No Eyewear.",
    "eyewearSpecialSummerRogueText": "Roguish Eyepatch",
--- a/common/locales/en_GB/generic.json
+++ b/common/locales/en_GB/generic.json
@@ -39,7 +39,7 @@
    "close": "Close",
    "saveAndClose": "Save & Close",
    "cancel": "Cancel",
-    "ok": "Ok",
+    "ok": "OK",
    "add": "Add",
    "undo": "Undo",
    "continue": "Continue",
@@ -54,7 +54,7 @@
    "gems": "Gems",
    "gemButton": "You have <%= number %> Gems.",
    "moreInfo": "More Info",
-    "gemsWhatFor": "Purchased using real money. Used for buying special items and services (eggs, hatching potions, Fortify, etc.). You'll need to unlock those features before being able to use Gems.",
+    "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.",
    "veteran": "Veteran",
    "veteranText": "Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs.",
    "originalUser": "Original User!",
@@ -70,7 +70,6 @@
    "lastLoggedIn": "- Last logged in",
    "notPorted": "This feature is not yet ported from the original site.",
    "buyThis": "Buy this <%= text %> with <%= price %> of your <%= gems %> Gems?",
-    "untilNoFace": "Until we add Facebook, use your UUID and API Token to log in (found at https://habitrpg.com > Options > Settings).",
    "noReachServer": "Server not currently reachable, try again later",
    "errorUpCase": "ERROR:",
    "newPassSent": "New password sent.",
@@ -86,6 +85,7 @@
    "audioTheme_off": "Off",
    "audioTheme_danielTheBard": "Daniel The Bard",
    "audioTheme_wattsTheme": "Watts' Theme",
+    "audioTheme_gokulTheme": "Gokul Theme",
    "askQuestion": "Ask a Question",
    "reportBug": "Report a Bug",
    "contributeToHRPG": "Contribute to HabitRPG",
--- a/common/locales/en_GB/groups.json
+++ b/common/locales/en_GB/groups.json
@@ -39,6 +39,8 @@
    "editGroup": "Edit Group",
    "newGroupName": "<%= groupType %> Name",
    "groupName": "Group Name",
+    "groupLeader": "Group Leader",
+    "groupID": "Group ID",
    "groupDescr": "Description shown in public Guilds list (Markdown OK)",
    "logoUrl": "Logo URL",
    "assignLeader": "Assign Group Leader",
@@ -116,5 +118,7 @@
    "sendGiftFromBalance": "From Balance",
    "sendGiftPurchase": "Purchase",
    "sendGiftMessagePlaceholder": "Personal message (optional)",
-    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
+    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
--- a/common/locales/en_GB/limited.json
+++ b/common/locales/en_GB/limited.json
@@ -25,6 +25,7 @@
    "seasonalShopTitle": "<%= linkStart %>Seasonal Sorceress<%= linkEnd %>",
    "seasonalShopClosedText": "The Seasonal Shop is currently closed!! I don't know where the Seasonal Sorceress is now, but I bet she'll be back during the next <%= linkStart %>Grand Gala<%= linkEnd %>!",
    "seasonalShopText": "Welcome to the Seasonal Shop!! We're stocking springtime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Spring Fling event each year, but we're only open until 30 April, so be sure to stock up now or you'll have to wait a year to buy these items again!",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
    "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column after you unlock the Item Shop. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",
    "candycaneSet": "Candy Cane (Mage)",
    "skiSet": "Ski-sassin (Rogue)",
@@ -44,5 +45,9 @@
    "mightyBunnySet": "Mighty Bunny (Warrior)",
    "magicMouseSet": "Magic Mouse (Mage)",
    "lovingPupSet": "Loving Pup (Healer)",
-    "stealthyKittySet": "Stealthy Kitty (Rogue)"
+    "stealthyKittySet": "Stealthy Kitty (Rogue)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }
--- a/common/locales/en_GB/messages.json
+++ b/common/locales/en_GB/messages.json
@@ -1,6 +1,7 @@
 {
    "messageLostItem": "Your <%= itemText %> broke.",
    "messageTaskNotFound": "Task not found.",
+    "messageDuplicateTaskID": "A task with that ID already exists.",
    "messageTagNotFound": "Tag not found.",
    "messagePetNotFound": ":pet not found in user.items.pets",
    "messageFoodNotFound": ":food not found in user.items.food",
@@ -20,5 +21,8 @@
    "messageDropFood": "You've found <%= dropArticle %><%= dropText %>! <%= dropNotes %>",
    "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>",
    "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>",
-    "messageFoundQuest": "You've found the quest \"<%= questText %>\"!"
+    "messageFoundQuest": "You've found the quest \"<%= questText %>\"!",
+    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
--- a/common/locales/en_GB/npc.json
+++ b/common/locales/en_GB/npc.json
@@ -10,6 +10,8 @@
    "alexander": "Alexander the Merchant",
    "welcomeMarket": "Welcome to the Market! Buy hard-to-find eggs and potions! Sell your extras! Commission useful services! Come see what we have to offer.",
    "sellForGold": "Sell <%= item %> for <%= gold %> Gold",
+    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
+    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
    "buyGems": "Buy Gems",
    "justin": "Justin",
    "USD": "USD",
@@ -18,7 +20,7 @@
    "dismissAlert": "Dismiss This Alert",
    "donateText1": "Adds 20 Gems to your account. Gems are used to buy special in-game items, such as shirts and hairstyles.",
    "donateText2": "Help support HabitRPG",
-    "donateText3": "As an open source project, it can use all the help we can get!",
+    "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
    "donationDesc": "20 Gems, Donation to HabitRPG",
    "payWithCard": "Pay with Card",
    "payNote": "Note: PayPal sometimes takes a long time to clear. We recommend paying with card.",
@@ -41,13 +43,36 @@
    "tourHabits": "This column is for good and bad Habits that you do many times a day! To proceed, click the pencil to edit the names, then click the check mark to save.",
    "tourStats": "Good Habits add Experience and Gold! Bad Habits remove health.",
    "tourGP": "To proceed, buy the Training Sword with the gold you just earned!",
-    "tourAvatar": "Now your avatar has the Training Sword. To proceed, click on your avatar to customise it!",
+    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
    "tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
    "tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
    "tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
    "tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
-    "tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
-    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
-    "tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here—use them to hatch pets! You can also buy items from the Market."
+    "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!",
+    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here—use them to hatch pets! You can also buy items from the Market.",
+    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!",
+    "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
+    "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
+    "tourOkay": "Okay!",
+    "tourAwesome": "Awesome!",
+    "tourSplendid": "Splendid!",
+    "tourNifty": "Nifty!",
+    "tourAvatarProceed": "Show me my tasks!",
+    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
+    "tourDailiesProceed": "I'll be careful!",
+    "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
+    "tourHabitsProceed": "Makes sense!",
+    "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
+    "tourRewardsProceed": "That's all!",
+    "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+    "welcome1": "Create and customize an in-game avatar to represent you.",
+    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+    "welcome5": "Now you'll customize your avatar and set up your tasks...",
+    "imReady": "I'm Ready!"
 }
--- a/common/locales/en_GB/quests.json
+++ b/common/locales/en_GB/quests.json
@@ -1,9 +1,11 @@
 {
    "quests": "Quests",
    "quest": "quest",
+    "questDetails": "Quest Details",
+    "invitations": "Invitations",
    "completed": "Completed!",
    "youReceived": "You've Received",
-    "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Options > Social > Party.",
+    "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",
    "questInvitation": "Quest Invitation:",
    "questInvitationTitle": "Quest Invitation",
--- a/common/locales/en_GB/questscontent.json
+++ b/common/locales/en_GB/questscontent.json
@@ -202,5 +202,11 @@
    "questSheepBoss": "Thunder Ram",
    "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
    "questSheepDropSheepEgg": "Sheep (Egg)",
-    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market",
+    "questKrakenText": "The Kraken of Inkomplete",
+    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
+    "questKrakenBoss": "The Kraken of Inkomplete",
+    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
+    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
+    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"
 }
--- a/common/locales/en_GB/rebirth.json
+++ b/common/locales/en_GB/rebirth.json
@@ -21,11 +21,5 @@
    "rebirthOrb": "Used an Orb of Rebirth to start over after attaining Level",
    "rebirthPop": "Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.",
    "rebirthName": "Orb of Rebirth",
-    "reborn": "Reborn, max level <%= reLevel %>",
-    "welcome100": "Welcome to Level 100!",
-    "intro100": "Now that you've hit level 100, you have the option to use the Orb of Rebirth for free at any time.",
-    "followup100": "While you can continue to level up, it will no longer boost your stats and no more content will unlock, to keep Habit fun for people of all play styles.",
-    "rebirth100Info": "If you're ready to start a new adventure, you can Rebirth now... or see how much further you can push yourself.",
-    "rebirthWait": "I'll wait...",
-    "rebirthNow": "Rebirth Now!"
+    "reborn": "Reborn, max level <%= reLevel %>"
 }
--- a/common/locales/en_GB/settings.json
+++ b/common/locales/en_GB/settings.json
@@ -113,10 +113,11 @@
    "benefits": "Benefits",
    "coupon": "Coupon",
    "couponPlaceholder": "Enter Coupon Code",
-    "couponText": "We sometimes have events and give out promo codes for special gear. (e.g., those who stop by our Wondercon booth)",
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
    "apply": "Apply",
    "resubscribe": "Resubscribe",
    "promoCode": "Promo Code",
    "promoCodeApplied": "Promo Code Applied! Check your inventory",
-    "promoPlaceholder": "Enter Promotion Code"
+    "promoPlaceholder": "Enter Promotion Code",
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
 }
--- a/common/locales/en_GB/subscriber.json
+++ b/common/locales/en_GB/subscriber.json
@@ -3,17 +3,17 @@
    "subscriptions": "Subscriptions",
    "subDescription": "Disable ads, buy gems with gold, monthly mystery item, retain progress history, double daily drop-caps, supports the devs. Click for more info.",
    "disableAds": "Disable ads",
-    "disableAdsText": "Ads will stay disabled while you have an active subscription (original users with disabled ads are grandfathered).",
+    "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).",
    "buyGemsGold": "Buy Gems with Gold",
-    "buyGemsGoldText": "(1 Gem costs <%= gemCost %> Gold) Addresses the \"pay to win\" concern, as everything is now achievable through hard work. There's a <%= gemLimit %> Gem monthly conversion cap to prevent farming.",
+    "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
    "retainHistory": "Retain full history entries",
    "retainHistoryText": "Makes your full history available in graphs and export. Non-subscriber histories get consolidated for database optimisation.",
    "doubleDrops": "Daily drop-caps doubled",
    "doubleDropsText": "Complete your stable faster!",
    "mysteryItem": "Unique Monthly Subscription Items",
-    "mysteryItemText": "Each month, all subscribers will get a totally unique cosmetic item for their avatars!",
+    "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
    "supportDevs": "Supports the developers",
-    "supportDevsText": "This open-source project can use all the help it can get. Help us keep Habit alive!",
+    "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
    "monthUSD": "USD / Month",
    "organization": "Organisation",
    "groupPlans": "Corporate Plans",
--- a/common/locales/en_GB/tasks.json
+++ b/common/locales/en_GB/tasks.json
@@ -16,7 +16,7 @@
    "checklist": "Checklist",
    "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
    "expandCollapse": "Expand/Collapse",
-    "text": "Text",
+    "text": "Title",
    "extraNotes": "Extra Notes",
    "direction/Actions": "Direction/Actions",
    "advancedOptions": "Advanced Options",
@@ -36,6 +36,11 @@
    "newDailyBulk": "New Dailies (one per line)",
    "streakCounter": "Streak Counter",
    "repeat": "Repeat",
+    "repeatEvery": "Repeat Every",
+    "repeatDays": "Every X Days",
+    "repeatWeek": "On Certain Days of the Week",
+    "day": "Day",
+    "days": "Days",
    "restoreStreak": "Restore Streak",
    "todos": "To-Dos",
    "newTodo": "New To-Do",
@@ -60,6 +65,9 @@
    "clearTags": "Clear",
    "hideTags": "Hide",
    "showTags": "Show",
+    "startDate": "Start Date",
+    "startDateHelpTitle": "When should this task start?",
+    "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.",
    "streakName": "Streak Achievements",
    "streakText": "Has performed <%= streaks %> 21-day streaks on Dailies",
    "streakSingular": "Streaker",
@@ -78,5 +86,23 @@
    "pushTaskToTop": "Push task to top",
    "pushTaskToBottom": "Push task to bottom",
    "emptyTask": "Enter the task's title first.",
-    "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies."
+    "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies.",
+    "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.",
+    "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.",
+    "habitHelp3": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Habits' target='_blank'>sample Habits</a>!",
+    "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!",
+    "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.",
+    "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.",
+    "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
+    "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+    "dailyHelp5": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Dailies' target='_blank'>sample Dailies</a>!",
+    "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
+    "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
+    "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+    "toDoHelp4": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+    "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
+    "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
+    "rewardHelp3": "Special equipment will appear here during World Events.",
+    "rewardHelp4": "Don't be afraid to set custom Rewards! Check out <a href='http://habitrpg.wikia.com/wiki/Sample_Custom_Rewards' target='_blank'>some samples here</a>.",
+    "clickForHelp": "Click for help"
 }
--- a/common/locales/es/defaulttasks.json
+++ b/common/locales/es/defaulttasks.json
@@ -1,9 +1,9 @@
 {
-    "defaultHabit1Text": "Buen Hábito",
-    "defaultHabit1Notes": "Ejemplo de Buenos Hábitos: + Comer verduras +15 minutos de Trabajo Productivo",
-    "defaultHabit2Text": "Mal Hábito",
+    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
+    "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work",
+    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
    "defaultHabit2Notes": "Ejemplo de Malos Hábitos: - Fumar - Procastinar",
-    "defaultHabit3Text": "Buenos o Malos Hábitos",
+    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
    "defaultHabit3Notes": "Ejemplo de Buenos o Malos Hábitos: +/- Ir por las Escaleras/Ascensor ; +/- Beber agua/Bebida con Gas",
    "defaultDaily1Text": "1h proyecto personal",
    "defaultDaily1Notes": "Todas las tareas creadas por defecto están de color amarillo Esto significa que te harán un daño moderado cuando no las haces y ganarás una recompensa moderada cuando las realizas.",
@@ -31,7 +31,7 @@
    "defaultTodo4Checklist2": "configura la dificultad en Opciones Avanzadas",
    "defaultTodo4Checklist3": "opcional: Fija una fecha límite",
    "defaultTodo5Text": "Haz un grupo privado con tus amigos (Social > Grupo)",
-    "defaultReward1Text": "1 episodio de Juego de Tronos",
+    "defaultReward1Text": "15 minute break",
    "defaultReward1Notes": "Recompensas personalizadas pueden tener muchas formas. Algunos eligen no ver su programa favorita hasta que tengan el oro para pagar.",
    "defaultReward2Text": "Pastel",
    "defaultReward2Notes": "Otras personas sólo quieren disfrutar de un buen pedazo de pastel. Intenta crear recompensas que mejor te motiven.",
--- a/common/locales/es/gear.json
+++ b/common/locales/es/gear.json
@@ -116,6 +116,14 @@
    "weaponSpecialSpring2015MageNotes": "Conjúrate una zanahoria con esta elegante varita. Aumenta la Inteligencia en <%= int %> y la Percepción en  <%= per %>. Equipamiento de Primavera 2015, Edición Limitada.",
    "weaponSpecialSpring2015HealerText": "Cascabel de Gato",
    "weaponSpecialSpring2015HealerNotes": "Cuando lo ondeas, hace un click tan fascinante que mantendría a CUALQUIERA entretenido por horas. Aumenta la Inteligencia en <%= int %>. Equipamiento de Primavera 2015, Edición Limitada",
+    "weaponSpecialSummer2015RogueText": "Firing Coral",
+    "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+    "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+    "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+    "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "weaponMystery201411Text": "Horca de Banquete",
    "weaponMystery201411Notes": "Clávasela a tus enemigos o ataca tus comidas favoritas - ¡esta horca versátil vale para todo! No confiere ningún beneficio. Artículo de suscriptor de noviembre 2014.",
    "weaponMystery201502Text": "Báculo Reluciente Alado del Amor y También de la Verdad",
@@ -124,6 +132,10 @@
    "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
    "weaponMystery301404Text": "Bastón Steampunk",
    "weaponMystery301404Notes": "Excelente para darse una vuelta por la ciudad. Artículo del suscriptor de marzo 3015. No da beneficios.",
+    "weaponArmoireBasicCrossbowText": "Basic Crossbow",
+    "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre",
+    "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).",
    "armor": "armadura",
    "armorBase0Text": "Ropa normal",
    "armorBase0Notes": "Ropa normal. No otorga ningún beneficio.",
@@ -227,6 +239,14 @@
    "armorSpecialSpring2015MageNotes": "¡Tu falda combina con tu rabo blanco! Aumenta Inteligencia en <%= int %>. Equipo de Primavera Edición Limitada 2015. ",
    "armorSpecialSpring2015HealerText": "Traje de Gato Reconfortante",
    "armorSpecialSpring2015HealerNotes": "Este suave traje de gato es cómodo, y tan reconfortante como un té de menta. Aumenta Constitución en <%= con %>. Equipo de Primavera Edición Limitada 2015. ",
+    "armorSpecialSummer2015RogueText": "Ruby Tail",
+    "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015WarriorText": "Golden Tail",
+    "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015MageText": "Soothsayer Robes",
+    "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015HealerText": "Sailor's Armor",
+    "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "armorMystery201402Text": "Túnica de Mensajero",
    "armorMystery201402Notes": "Reluciente y fuerte, esta túnica tiene muchos bolsillos para llevar cartas. No proporciona ningún beneficio. Artículo de suscriptor de febrero 2014.",
    "armorMystery201403Text": "Armadura del Caminante del Bosque",
@@ -253,6 +273,10 @@
    "armorMystery201504Notes": "Serás tan productivo como una abeja obrera con ésta Túnica! No otorga beneficios. Item de suscriptores de Abril 2015.",
    "armorMystery301404Text": "Traje Steampunk",
    "armorMystery301404Notes": "¡Sofisticado y elegante! No otorga ningún beneficio. Artículo de suscriptor de febrero 3015.",
+    "armorArmoireLunarArmorText": "Soothing Lunar Armor",
+    "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).",
+    "armorArmoireGladiatorArmorText": "Gladiator Armor",
+    "armorArmoireGladiatorArmorNotes": "To be a gladiator you must be not only cunning... but strong. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 2 of 3).",
    "headgear": "cubrecabeza",
    "headBase0Text": "Sin casco",
    "headBase0Notes": "Sin equipo de cabeza.",
@@ -354,6 +378,14 @@
    "headSpecialSpring2015MageNotes": "¿Qué fue antes, el conejo o el sombrero? Aumenta Percepción en <%= per %>. Equipo de Primavera Edición Limitada 2015. ",
    "headSpecialSpring2015HealerText": "Corona Reconfortante",
    "headSpecialSpring2015HealerNotes": "La perla en el centro de la corona calma y reconforta a quienes están a su alrededor. Aumenta Inteligencia en <%= int %>. Equipo de Primavera Edición Limitada 2015. ",
+    "headSpecialSummer2015RogueText": "Renegade Hat",
+    "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+    "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015MageText": "Soothsayer Scarf",
+    "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015HealerText": "Sailor's Cap",
+    "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "headSpecialGaymerxText": "Casco de Guerrero de Arco Iris",
    "headSpecialGaymerxNotes": "¡Con motivo de la temporada del orgullo y de GaymerX, este armadura especial está decorada con un radiante y colorido arco iris! GaymerX es una convención dedicada a los videojuegos y al colectivo LGBTQ, está abierta a todo el mundo y tiene lugar en el InterContinental, en el centro de San Francisco, el 11-13 de julio. Esta armadura no proporciona ningún beneficio.",
    "headMystery201402Text": "Casco alado",
@@ -378,6 +410,16 @@
    "headMystery301404Notes": "¡Un sofisticado sombrero de copa solo para los más refinados caballeros! No otorga ningún beneficio. Artículo de Suscriptor de Enero del 3015",
    "headMystery301405Text": "Sombrero de copa básico",
    "headMystery301405Notes": "Un sombrero de copa común que está deseando ser emparejado con algún decorativo y sofisticado accesorio para la cabeza. No otorga ningún beneficio. Artículo de Suscriptor Mayo del 3015",
+    "headArmoireLunarCrownText": "Soothing Lunar Crown",
+    "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).",
+    "headArmoireRedHairbowText": "Red Hairbow",
+    "headArmoireRedHairbowNotes": "Become strong, tough and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
+    "headArmoireVioletFloppyHatText": "Violet Floppy Hat",
+    "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "headArmoireGladiatorHelmText": "Gladiator Helm",
+    "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).",
+    "headArmoireRancherHatText": "Rancher Hat",
+    "headArmoireRancherHatNotes": "Round up your pets and wrangle your mounts while wearing this magical Rancher Hat! Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
    "offhand": "objeto para la mano del escudo",
    "shieldBase0Text": "Sin equipamiento en la mano del escudo",
    "shieldBase0Notes": "Sin escudo o arma secundaria.",
@@ -441,8 +483,17 @@
    "shieldSpecialSpring2015WarriorNotes": "Lánzaselo a tus enemigos... o sostenlo en las manos, porque se llenará de rico pienso a la hora de cenar. Aumenta la constitución en <%= con %>. Equipo de Primavera 2015 Edición Limitada.",
    "shieldSpecialSpring2015HealerText": "Almohada Decorada",
    "shieldSpecialSpring2015HealerNotes": "Puedes descansar la cabeza en esta almohada suave, o puedes luchar contra ella con tus temibles garras. ¡Rawr! Aumenta la Constitución en <% = con%>. Equipo de Primavera 2015 Edición Limitada.",
+    "shieldSpecialSummer2015RogueText": "Firing Coral",
+    "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+    "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015HealerText": "Strapping Shield",
+    "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "shieldMystery301405Text": "Escudo Reloj",
    "shieldMystery301405Notes": "¡El tiempo está de tu parte con este imponente escudo reloj! No confiere ningún beneficio. Equipo de suscriptor Junio 3015.",
+    "shieldArmoireGladiatorShieldText": "Gladiator Shield",
+    "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
+    "back": "Back Accessory",
    "backBase0Text": "Sin Accesorio en la Espalda",
    "backBase0Notes": "Sin Accesorio en la Espalda",
    "backMystery201402Text": "Alas doradas",
@@ -457,6 +508,7 @@
    "backSpecialWonderconRedNotes": "Castañea con fuerza y belleza. No confiere beneficio. Artículo Edición Especial Convención.",
    "backSpecialWonderconBlackText": "Capa Sigilosa",
    "backSpecialWonderconBlackNotes": "Hilada de sombras y suspiros. No otorga ningún beneficio. Artículo de Convención Edición especial",
+    "body": "Body Accessory",
    "bodyBase0Text": "Sin accesorio en el cuerpo",
    "bodyBase0Notes": "Sin accesorio en el cuerpo",
    "bodySpecialWonderconRedText": "Collar de rubí",
@@ -469,6 +521,14 @@
    "bodySpecialSummerMageNotes": "Ni el agua salada ni el agua fresca pueden deslustrar este metálico poncho. No confiere ningún beneficio. Equipamiento de Primavera 2014, Edición Limitada.",
    "bodySpecialSummerHealerText": "Collar de coral",
    "bodySpecialSummerHealerNotes": "¡Un elegante collar de Coral vivo! No otorga ningún beneficio. Equipo de Verano, Edición Limitada del 2014.",
+    "bodySpecialSummer2015RogueText": "Renegade Sash",
+    "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+    "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015MageText": "Golden Buckle",
+    "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
    "headAccessory": "Accesorio de Cabeza",
    "accessories": "Accessories",
    "animalEars": "Animal Ears",
@@ -516,6 +576,7 @@
    "headAccessoryMystery201502Notes": "¡Deja volar tu imaginación! No otorga ningún beneficio. Artículo de suscriptor de febrero 2015.",
    "headAccessoryMystery301405Text": "Gafas para la Cabeza",
    "headAccessoryMystery301405Notes": "\"Las gafas son para los ojos\" dijeron, \"Nadie quiere gafas que solo se puedan llevar en la cabeza\" dijeron. ¡Ja! ¡Demuéstrales que eso no es así! No confiere ningún beneficio. Artículo de suscriptor de agosto de 3015.",
+    "eyewear": "Eyewear",
    "eyewearBase0Text": "Sin Gafas.",
    "eyewearBase0Notes": "Sin Gafas.",
    "eyewearSpecialSummerRogueText": "Parche Picaresco",
--- a/common/locales/es/generic.json
+++ b/common/locales/es/generic.json
@@ -39,7 +39,7 @@
    "close": "Cerrar",
    "saveAndClose": "Guardar y Cerrar",
    "cancel": "Cancelar",
-    "ok": "Ok",
+    "ok": "OK",
    "add": "Añadir",
    "undo": "Deshacer",
    "continue": "Continuar",
@@ -54,7 +54,7 @@
    "gems": "Gemas",
    "gemButton": "Tienes <%= number %> Gemas.",
    "moreInfo": "Más información",
-    "gemsWhatFor": "Se adquiere mediante dinero real. Usado para compras objectos especiales y servicios (huevos, pociónes incubadoras, Fortificar, etcétera). Necesitarás desbloquear estas funciones antes de poder usar Gemas.",
+    "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.",
    "veteran": "Veterano",
    "veteranText": "Ha sobrevivido a Habit The Grey (nuestro sito web pre-Angular) y se ha ganado muchas cicatrices por sus fallos.",
    "originalUser": "¡Usuario original!",
@@ -70,7 +70,6 @@
    "lastLoggedIn": "- Última conexión",
    "notPorted": "Esta función no se ha traido del sitio original",
    "buyThis": "Comprarás este <%=text%> con <%=price %> de tus <% gems%> Gemas?",
-    "untilNoFace": "Hasta que soportemos Facebook, usa tu UUID y tu API Token para conectarte (lo puedes encontrar en https://habitrpg.com > Opciones > Ajustes).",
    "noReachServer": "Error en la conexión al servidor, intentalo más tarde.",
    "errorUpCase": "ERROR:",
    "newPassSent": "Nueva contraseña enviada.",
@@ -86,6 +85,7 @@
    "audioTheme_off": "Apagar",
    "audioTheme_danielTheBard": "Daniel el Bardo",
    "audioTheme_wattsTheme": "Tema Watts",
+    "audioTheme_gokulTheme": "Gokul Theme",
    "askQuestion": "Hacer una Pregunta",
    "reportBug": "Notificar un error",
    "contributeToHRPG": "Contribuir con HabitRPG",
--- a/common/locales/es/groups.json
+++ b/common/locales/es/groups.json
@@ -39,6 +39,8 @@
    "editGroup": "Editar grupo",
    "newGroupName": "<%= groupType %> Nombre",
    "groupName": "Nombre del grupo",
+    "groupLeader": "Group Leader",
+    "groupID": "Group ID",
    "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",
@@ -116,5 +118,7 @@
    "sendGiftFromBalance": "From Balance",
    "sendGiftPurchase": "Purchase",
    "sendGiftMessagePlaceholder": "Personal message (optional)",
-    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
+    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
--- a/common/locales/es/limited.json
+++ b/common/locales/es/limited.json
@@ -25,6 +25,7 @@
    "seasonalShopTitle": "<%= linkStart %>Hechicera Estacional<%= linkEnd %>",
    "seasonalShopClosedText": "¡¡La Tienda Estacional se encuantra actualmente cerrada!! ¡Desconocemos la ubicación actual de la Hechicera Estacional pero estará de vuelta para la próxima <%= linkStart %>Grand Gala<%= linkEnd %>!",
    "seasonalShopText": "¡¡ Bienvenido a la tienda de temporada !! Estamos almacenando bienes para la Temporada de Primavera <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>  Edición Estacional </a> en este momento. Todo lo que hay  aquí estará disponible para comprar durante el evento Spring Fling cada año, pero no abrimos hasta el 30 de Abril, así que asegúrate de abastecerte ahora, ¡o tendrás que esperar un año para poder comprar estos artículos de nuevo!",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
    "seasonalShopRebirth": "Si has utilizado el Orbe de Renacimiento, puedes volver a comprar este equipo en la Columna de Recompensas después de desbloquear la Tienda de Artículos. Inicialmente, solo podrás comprar los artículos para tu clase actual (Guerrero por defecto), pero no temas, los otros elementos específicos de cada clase estarán disponible si cambias a esa clase.",
    "candycaneSet": "Bastón de Caramelo (Mago)",
    "skiSet": "Ski-asesino (Ladrón)",
@@ -44,5 +45,9 @@
    "mightyBunnySet": "Conejo Poderoso (Guerrero)",
    "magicMouseSet": "Ratón Mágico (Mago)",
    "lovingPupSet": "Cachorro Adorable (Sanador)",
-    "stealthyKittySet": "Gatito Sigiloso (Pícaro)"
+    "stealthyKittySet": "Gatito Sigiloso (Pícaro)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }
--- a/common/locales/es/messages.json
+++ b/common/locales/es/messages.json
@@ -1,6 +1,7 @@
 {
    "messageLostItem": "Tu <%= itemText %> se rompió.",
    "messageTaskNotFound": "Tarea no encontrada.",
+    "messageDuplicateTaskID": "A task with that ID already exists.",
    "messageTagNotFound": "Etiqueta no encontrada.",
    "messagePetNotFound": ":pet no encontrada en user.items.pets",
    "messageFoodNotFound": ":food no encontrada en user.items.food",
@@ -20,5 +21,8 @@
    "messageDropFood": "¡Has encontrado <%= dropArticle %><%= dropText %>! <%= dropNotes %>",
    "messageDropEgg": "¡Has encontrado un huevo de <%= dropText %>! <%= dropNotes %>",
    "messageDropPotion": "¡Has encontrado una pocion de eclosión de <%= dropText %>! <%= dropNotes %>",
-    "messageFoundQuest": "¡Has encontrado la misión \"<%= questText %>\"!"
+    "messageFoundQuest": "¡Has encontrado la misión \"<%= questText %>\"!",
+    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
--- a/common/locales/es/npc.json
+++ b/common/locales/es/npc.json
@@ -10,6 +10,8 @@
    "alexander": "Alexander el Mercader",
    "welcomeMarket": "¡Bienvenido al Mercado! ¡Compra huevos dificiles de encontrar y pociones! ¡Vende los que te sobren! ¡Encarga servicios utiles! Ven a ver lo que tenemos que ofrecer.",
    "sellForGold": "Vender <%= item %> por <%= gold %> Oro",
+    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
+    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
    "buyGems": "Comprar Gemas",
    "justin": "Justin",
    "USD": "USD",
@@ -18,7 +20,7 @@
    "dismissAlert": "Ignora Esta Alerta",
    "donateText1": "Añade 20 Gemas a tu cuenta. Las Gemas se usan para comprar objetos especiales en el juego, como camisetas y peinados.",
    "donateText2": "Ayuda a HabitRPG",
-    "donateText3": "¡Como proyecto de código abierto, le vendría bien cualquier ayuda que podamos conseguir!",
+    "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
    "donationDesc": "20 Gemas, Donación a HabitRPG",
    "payWithCard": "Pagar con una tarjeta de crédito",
    "payNote": "Nota: Paypal a veces toma mucho tiempo autorizando. Recomendamos pagar con tarjeta de crédito.",
@@ -41,13 +43,36 @@
    "tourHabits": "¡Esta columna es para los buenos y malos hábitos que haces varias veces al día! Para continuar haz click al lápiz para editar los nombres, después haz click en el tick para guardarlo.",
    "tourStats": "¡Los Buenos Hábitos dan Experiencia y Oro! Los Malos Hábitos quitan vida.",
    "tourGP": "Para poder continuar, ¡compra la Espada de Entrenamiento con el oro que acabas de ganar!",
-    "tourAvatar": "Ahora tu personaje tiene la Espada de Entrenamiento. Para continuar, da click en tu personaje para personalizarla.",
+    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
    "tourScrollDown": "¡Estate seguro de que te has desplazado hasta abajo del todo para ver todas las opciones! Da click en tu personaje otra vez para volver a la página de Tareas.",
    "tourMuchMore": "¡Cuando hayas acabado con tus tareas, puedes formar un grupo con tus amigos, chatear en los Gremios de tu interés, unirte a los Desafíos, y mucho más!",
    "tourStatsPage": "¡Está es tu página de Estadísticas! Consigue logros completando las tareas de las listas.",
    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
    "tourPartyPage": "Tu Grupo te ayudará a mantenerte responsable. Invita a amigos para desbloquear un Pergamino de Misión.",
-    "tourGuildsPage": "Los Gremios son grupos sociales con temas en común. ¡Busca los temas que te interesan! Te recomendamos el Gremio de los Principiantes. ",
-    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
-    "tourMarketPage": "Desde el nivel 4, los huevos y pociones eclosionadoras caen de manera aleatoria cuando completas tareas. Aparecen aquí - ¡úsalas para eclosionar mascotas! También puedes comprar objetos del Mercado."
+    "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!",
+    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourMarketPage": "Desde el nivel 4, los huevos y pociones eclosionadoras caen de manera aleatoria cuando completas tareas. Aparecen aquí - ¡úsalas para eclosionar mascotas! También puedes comprar objetos del Mercado.",
+    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!",
+    "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
+    "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
+    "tourOkay": "Okay!",
+    "tourAwesome": "Awesome!",
+    "tourSplendid": "Splendid!",
+    "tourNifty": "Nifty!",
+    "tourAvatarProceed": "Show me my tasks!",
+    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
+    "tourDailiesProceed": "I'll be careful!",
+    "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
+    "tourHabitsProceed": "Makes sense!",
+    "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
+    "tourRewardsProceed": "That's all!",
+    "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+    "welcome1": "Create and customize an in-game avatar to represent you.",
+    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+    "welcome5": "Now you'll customize your avatar and set up your tasks...",
+    "imReady": "I'm Ready!"
 }
--- a/common/locales/es/quests.json
+++ b/common/locales/es/quests.json
@@ -1,9 +1,11 @@
 {
    "quests": "Misiones",
    "quest": "misión",
+    "questDetails": "Quest Details",
+    "invitations": "Invitations",
    "completed": "¡Completado!",
    "youReceived": "Has recibido",
-    "questSend": "Haciendo clic en ”Invitar” mandarás una invitación a los miembros de tu grupo. Cuando todos los miembros hayan decidido, se dará comienzo a la misión. El estado se puede ver en Opciones > Social > Grupo.",
+    "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",
    "questInvitation": "Invitación a Misión:",
    "questInvitationTitle": "Invitación a Misión",
--- a/common/locales/es/questscontent.json
+++ b/common/locales/es/questscontent.json
@@ -202,5 +202,11 @@
    "questSheepBoss": "Thunder Ram",
    "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
    "questSheepDropSheepEgg": "Sheep (Egg)",
-    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market",
+    "questKrakenText": "The Kraken of Inkomplete",
+    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
+    "questKrakenBoss": "The Kraken of Inkomplete",
+    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
+    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
+    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"
 }
--- a/common/locales/es/rebirth.json
+++ b/common/locales/es/rebirth.json
@@ -21,11 +21,5 @@
    "rebirthOrb": "Usó una Esfera de Renacimiento para comenzar de nuevo después de llegar al Nivel",
    "rebirthPop": "Comienza con un personaje en Nivel 1, manteniendo logros, coleccionables, y tareas con historial.",
    "rebirthName": "Esfera de Renacimiento",
-    "reborn": "Renacido, nivel máximo <%= reLevel %>",
-    "welcome100": "¡Bienvenido al Nivel 100!",
-    "intro100": "Ahora que has llegado al nivel 100, tienes la opción de usar la Esfera de Renacimiento gratis en cualquier momento.",
-    "followup100": "Aunque puedes contribuir para aumentar de nivel, esto no impulsará tus estadísitcas y no te desbloqueará más contenido, para mantener así Habit divertido para gente de todos los estilos de juego.",
-    "rebirth100Info": "Si estás listo para empezar una nueva aventura, puedes Renacer ahora... O ver cuánto más lejos puedes empujarte a tí mismo.",
-    "rebirthWait": "Esperaré...",
-    "rebirthNow": "¡Quiero renacer!"
+    "reborn": "Renacido, nivel máximo <%= reLevel %>"
 }
--- a/common/locales/es/settings.json
+++ b/common/locales/es/settings.json
@@ -113,10 +113,11 @@
    "benefits": "Beneficios",
    "coupon": "Cupón",
    "couponPlaceholder": "Introduce Código de Cupón",
-    "couponText": "A veces organizamos eventos y regalamos códigos promocionales para equipo especial (p.ej., los que se pasan por nuestro stand en Wondercon)",
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
    "apply": "Aplicar",
    "resubscribe": "Resuscribirse",
    "promoCode": "Código Promocional",
    "promoCodeApplied": "¡Código Promocional Aplicado! Mira tu inventario",
-    "promoPlaceholder": "Introducir Código Promocional"
+    "promoPlaceholder": "Introducir Código Promocional",
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
 }
--- a/common/locales/es/subscriber.json
+++ b/common/locales/es/subscriber.json
@@ -3,17 +3,17 @@
    "subscriptions": "Suscripciones ",
    "subDescription": "Desactivar anuncios, comprar gemas con oro, conseguir el artículo misterioso del mes, retener historial del progreso, duplicar el número máximo diario de premios posibles, y apoyar los desarrolladores. Haz clic para más información. ",
    "disableAds": "Desactivar anuncios",
-    "disableAdsText": "Los anuncios se desactivarán mientras tengas una suscripción activa  (usuarios originales con anuncios desactivados también entran dentro de este grupo).",
+    "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).",
    "buyGemsGold": "Comprar Gemas con oro",
-    "buyGemsGoldText": "(1 Gema cuesta <%= gemCost %> monedas de Oro) Esto resuelve el problema de \"pagar para ganar,\" debido a que ahora todo es alcanzable a través del trabajo duro. Hay una restricción de <%= gemLimit %> Gemas máximo al mes para evitar la sobre-explotación.",
+    "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
    "retainHistory": "Conservación completa de historial de entradas",
    "retainHistoryText": "Hace que tu historial completo esté disponible en forma de gráficos y exportaciones. Los historiales de personas que no son suscriptores se consolidan para la optimización de la base de datos.",
    "doubleDrops": "Duplica la cantidad de botines diarios",
    "doubleDropsText": "¡Completa tu establo más rápido!",
    "mysteryItem": "Artículos Exclusivos de Suscripción Mensual",
-    "mysteryItemText": "Cada mes, todos los suscriptores recibirán un artículo cosmético completamente único para sus avatares.",
+    "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
    "supportDevs": "Apoya a los desarrolladores",
-    "supportDevsText": "Este proyecto de código abierto usará toda la ayuda que reciba. ¡Ayúdanos a mantener Habit vivo!",
+    "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
    "monthUSD": "USD / mes",
    "organization": "Organización",
    "groupPlans": "Planes cooperativos",
--- a/common/locales/es/tasks.json
+++ b/common/locales/es/tasks.json
@@ -16,7 +16,7 @@
    "checklist": "Lista",
    "checklistText": "¡Divide una tarea en pedazos más pequeños! Las listas aumentan la Experiencia y el Oro conseguidos por una Tarea Pendiente y reducen el daño causado por una Diaria.",
    "expandCollapse": "Expandir/Colapsar",
-    "text": "Texto",
+    "text": "Title",
    "extraNotes": "Notas Extra",
    "direction/Actions": "Dirección/Acciones",
    "advancedOptions": "Opciones Avanzadas",
@@ -36,6 +36,11 @@
    "newDailyBulk": "Nuevas Tareas Diarias (uno por línea)",
    "streakCounter": "Contador de Rachas",
    "repeat": "Repetir",
+    "repeatEvery": "Repeat Every",
+    "repeatDays": "Every X Days",
+    "repeatWeek": "On Certain Days of the Week",
+    "day": "Day",
+    "days": "Days",
    "restoreStreak": "Restaurar Racha",
    "todos": "tareas Pendientes",
    "newTodo": "Nueva tarea Pendiente",
@@ -60,6 +65,9 @@
    "clearTags": "Limpiar",
    "hideTags": "Ocultar",
    "showTags": "Mostrar",
+    "startDate": "Start Date",
+    "startDateHelpTitle": "When should this task start?",
+    "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.",
    "streakName": "Logro(s) de Rachas",
    "streakText": "Ha realizado <%= streaks %> racha(s)  de 21 días de tareas Diarias",
    "streakSingular": "En racha",
@@ -78,5 +86,23 @@
    "pushTaskToTop": "Desplazar tarea al inicio",
    "pushTaskToBottom": "Desplazar tarea hacia abajo",
    "emptyTask": "Introduzca primero el título de la Tarea",
-    "dailiesRestingInInn": "¡Estás descansando en la Posada! Tus tareas Diarias NO te harán daño esta noche, pero se refrescarán cada día. Si estás en una misión, no sufrirás daño ni conseguirás objetos hasta que salgas de la Posada, pero sí puedes ser herido por un Jefe si tus compañeros de Grupo se saltan sus tareas Diarias."
+    "dailiesRestingInInn": "¡Estás descansando en la Posada! Tus tareas Diarias NO te harán daño esta noche, pero se refrescarán cada día. Si estás en una misión, no sufrirás daño ni conseguirás objetos hasta que salgas de la Posada, pero sí puedes ser herido por un Jefe si tus compañeros de Grupo se saltan sus tareas Diarias.",
+    "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.",
+    "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.",
+    "habitHelp3": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Habits' target='_blank'>sample Habits</a>!",
+    "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!",
+    "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.",
+    "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.",
+    "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
+    "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+    "dailyHelp5": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Dailies' target='_blank'>sample Dailies</a>!",
+    "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
+    "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
+    "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+    "toDoHelp4": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+    "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
+    "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
+    "rewardHelp3": "Special equipment will appear here during World Events.",
+    "rewardHelp4": "Don't be afraid to set custom Rewards! Check out <a href='http://habitrpg.wikia.com/wiki/Sample_Custom_Rewards' target='_blank'>some samples here</a>.",
+    "clickForHelp": "Click for help"
 }
--- a/common/locales/es_419/defaulttasks.json
+++ b/common/locales/es_419/defaulttasks.json
@@ -1,9 +1,9 @@
 {
-    "defaultHabit1Text": "Buen hábito",
-    "defaultHabit1Notes": "Ejemplos de buenos hábitos: + Comer un vegetal +15 minutos de trabajo productivo",
-    "defaultHabit2Text": "Mal hábito",
+    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
+    "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work",
+    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
    "defaultHabit2Notes": "Ejemplos de malos hábitos: - Fumar - Procastrinar",
-    "defaultHabit3Text": "Buen o mal hábito",
+    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
    "defaultHabit3Notes": "Ejemplos de buenos o malos hábitos: +/- Usar Escaleras/Elevador; +/- Tomé agua/Soda",
    "defaultDaily1Text": "1hr proyecto personal",
    "defaultDaily1Notes": "Todas las tareas son de color amarillo cuando son creadas. Esto significa que te harán un daño moderado cuando no las hagas y ganarás una recompensa moderada cuando las completes.",
@@ -31,7 +31,7 @@
    "defaultTodo4Checklist2": "configura la dificultad dentro de Opciones avanzadas",
    "defaultTodo4Checklist3": "opcional: seleccionar días para completar las Diarias",
    "defaultTodo5Text": "Empieza un equipo (grupo privado) con tus amigos (Social > Equipo)",
-    "defaultReward1Text": "1 episodio de Juego de tronos",
+    "defaultReward1Text": "15 minute break",
    "defaultReward1Notes": "Las recompensas personalizadas pueden tener muchas formas. Algunos eligen no ver su programa favorito a menos que tengan el oro para pagar por ello.",
    "defaultReward2Text": "Pastel",
    "defaultReward2Notes": "Otras personas sólo quieren disfrutar de un buen pedazo de pastel. Intenta crear recompensas que mejor te motiven.",
--- a/common/locales/es_419/gear.json
+++ b/common/locales/es_419/gear.json
@@ -116,6 +116,14 @@
    "weaponSpecialSpring2015MageNotes": "Conjúrate una zanahoria con esta sofisticada varita. Incrementa la Inteligencia por <%= int %> y la Percepción por  <%= per %>. Equipamiento de edición limitada de primavera 2015.",
    "weaponSpecialSpring2015HealerText": "Sonaja de gato",
    "weaponSpecialSpring2015HealerNotes": "Cuando lo agitas, hace un chasquido fascinante que mantendría a  CUALQUIERA entretenido durante horas. Aumenta la Inteligencia por <%= int %>. Equipamiento de edición limitada de primavera 2015.",
+    "weaponSpecialSummer2015RogueText": "Firing Coral",
+    "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+    "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+    "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+    "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "weaponMystery201411Text": "Horca de banquete",
    "weaponMystery201411Notes": "Apuñalar a tus enemigos o tu comida favorita -  ¡esta horca versátil lo hace todo! No otorga ningún beneficio. Articulo de suscriptor de noviembre 2014.",
    "weaponMystery201502Text": "Reluciente báculo alado del Amor y también de la Verdad.",
@@ -124,6 +132,10 @@
    "weaponMystery201505Notes": "Esta lanza de verde y plata ha quitado muchos adversarios de sus caballos. Artículo de Suscriptor de Mayo de 2015. No confiere ningún beneficio. ",
    "weaponMystery301404Text": "Bastón steampunk",
    "weaponMystery301404Notes": "Excelente para dar una vuelta por el pueblo. Artículo de suscriptor de marzo 3015. No otorga ningún beneficio.",
+    "weaponArmoireBasicCrossbowText": "Basic Crossbow",
+    "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre",
+    "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).",
    "armor": "armadura",
    "armorBase0Text": "Ropa simple",
    "armorBase0Notes": "Ropa simple. No otorga ningún beneficio.",
@@ -227,6 +239,14 @@
    "armorSpecialSpring2015MageNotes": "¡Tu faldón combina con tu rabito de algodón! Aumenta la Inteligencia por <%= int %>. Equipamiento de edición limitada de primavera 2015.",
    "armorSpecialSpring2015HealerText": "Traje de gato reconfortante.",
    "armorSpecialSpring2015HealerNotes": "Este suave traje de gato es cómodo, y tan reconfortante como el té de menta. Aumenta la Constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
+    "armorSpecialSummer2015RogueText": "Ruby Tail",
+    "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015WarriorText": "Golden Tail",
+    "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015MageText": "Soothsayer Robes",
+    "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015HealerText": "Sailor's Armor",
+    "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "armorMystery201402Text": "Túnica de mensajero",
    "armorMystery201402Notes": "Reluciente y fuerte, esta túnica tiene muchos bolsillos para llevar cartas. No otorga ningún beneficio. Artículo de suscriptor de febrero 2014.",
    "armorMystery201403Text": "Armadura del paseante del bosque",
@@ -253,6 +273,10 @@
    "armorMystery201504Notes": "¡Vas a ser tan productivo como una abeja trabajadora con esta atractiva túnica! No otorga ningún beneficio. Artículo de suscriptor de Abril 2015.",
    "armorMystery301404Text": "Traje steampunk",
    "armorMystery301404Notes": "¡Sofisticado y elegante, oh no! No otorga ningún beneficio. Artículo de suscriptor de febrero 3015.",
+    "armorArmoireLunarArmorText": "Soothing Lunar Armor",
+    "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).",
+    "armorArmoireGladiatorArmorText": "Gladiator Armor",
+    "armorArmoireGladiatorArmorNotes": "To be a gladiator you must be not only cunning... but strong. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 2 of 3).",
    "headgear": "protector de cabeza",
    "headBase0Text": "Sin yelmo",
    "headBase0Notes": "Sin protector de cabeza.",
@@ -354,6 +378,14 @@
    "headSpecialSpring2015MageNotes": "¿Qué fue primero? ¿El conejito o el sombrero? Aumenta la Percepción por <%= per %>. Equipamiento de edición limitada de primavera 2015.",
    "headSpecialSpring2015HealerText": "Corona reconfortante",
    "headSpecialSpring2015HealerNotes": "La perla en el centro de esta corona calma y reconforta a aquellos que la rodean. Aumenta la Inteligencia por <%= int %>. Equipamiento de edición limitada de primavera 2015.",
+    "headSpecialSummer2015RogueText": "Renegade Hat",
+    "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+    "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015MageText": "Soothsayer Scarf",
+    "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015HealerText": "Sailor's Cap",
+    "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "headSpecialGaymerxText": "Yelmo de guerrero arco iris",
    "headSpecialGaymerxNotes": "Con motivo de la celebración de la temporada del orgullo y GaymerX, este casco especial está decorado con un radiante y colorido estampado de arco iris. GaymerX es una convención de juegos que celebra LGBTQ y los video juegos y está abierta para todos. ¡Tiene lugar en el InterContinental en el centro de San Francisco del 11-13 de julio! No otorga ningún beneficio.",
    "headMystery201402Text": "Yelmo alado",
@@ -378,6 +410,16 @@
    "headMystery301404Notes": "¡Una galera elegante para los señores más sofisticados! Artículo de Suscriptor de Enero de 3015. No confiere ningún beneficio.",
    "headMystery301405Text": "Galera básica",
    "headMystery301405Notes": "Una galera básica que implora ser emparejada con algunos accesorios elegantes. No otorga ningún beneficio. Artículo de suscriptor de mayo 3015.",
+    "headArmoireLunarCrownText": "Soothing Lunar Crown",
+    "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).",
+    "headArmoireRedHairbowText": "Red Hairbow",
+    "headArmoireRedHairbowNotes": "Become strong, tough and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
+    "headArmoireVioletFloppyHatText": "Violet Floppy Hat",
+    "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "headArmoireGladiatorHelmText": "Gladiator Helm",
+    "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).",
+    "headArmoireRancherHatText": "Rancher Hat",
+    "headArmoireRancherHatNotes": "Round up your pets and wrangle your mounts while wearing this magical Rancher Hat! Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
    "offhand": "artículo adicional",
    "shieldBase0Text": "Sin equipamiento addicional",
    "shieldBase0Notes": "Sin escudo o arma secundaria.",
@@ -441,8 +483,17 @@
    "shieldSpecialSpring2015WarriorNotes": "Arrójalo a tus enemigos... o simplemente sostenlo, porque se llenará de deliciosas croquetas a la hora de comer. Aumenta la Constitución por <%= con %>.  Equipamiento de edición limitada de primavera 2015.",
    "shieldSpecialSpring2015HealerText": "Almohada decorada",
    "shieldSpecialSpring2015HealerNotes": "Puedes descansar tu cabeza en esta suavealmohada, o puedes luchar con sus temibles garras. ¡Raaawr! Aumenta la Constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
+    "shieldSpecialSummer2015RogueText": "Firing Coral",
+    "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+    "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015HealerText": "Strapping Shield",
+    "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "shieldMystery301405Text": "Escudo reloj",
    "shieldMystery301405Notes": "¡El tiempo está de tu lado con este imponente escudo reloj! No otorga ningún beneficio. Artículo de suscriptor de junio 3015.",
+    "shieldArmoireGladiatorShieldText": "Gladiator Shield",
+    "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
+    "back": "Back Accessory",
    "backBase0Text": "Sin accesorio de la espalda",
    "backBase0Notes": "Sin accesorio de la espalda",
    "backMystery201402Text": "Alas doradas",
@@ -457,6 +508,7 @@
    "backSpecialWonderconRedNotes": "Da chasquidos con fuerza y belleza. No otorga ningún beneficio. Artículo de edición especial de convención .",
    "backSpecialWonderconBlackText": "Capa furtiva",
    "backSpecialWonderconBlackNotes": "Tejida de sombras y susurros. No otorga ningún beneficio. Artículo de edición especial de convención.",
+    "body": "Body Accessory",
    "bodyBase0Text": "Sin accesorio del cuerpo ",
    "bodyBase0Notes": "Sin accesorio del cuerpo ",
    "bodySpecialWonderconRedText": "Collar de rubíes",
@@ -469,6 +521,14 @@
    "bodySpecialSummerMageNotes": "Ni el agua salada ni el agua dulce pueden deslustrar esta corta capa metálica. No otorga ningún beneficio. Equipamiento de edición limitada de verano 2014.",
    "bodySpecialSummerHealerText": "Collar de coral",
    "bodySpecialSummerHealerNotes": "¡Un collar elegante de coral vivo! No otorga ningún beneficio. Equipamiento de edición limitada de verano 2014.",
+    "bodySpecialSummer2015RogueText": "Renegade Sash",
+    "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+    "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015MageText": "Golden Buckle",
+    "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
    "headAccessory": "Accesorio para cabeza",
    "accessories": "accesorios",
    "animalEars": "Orejas de animal",
@@ -516,6 +576,7 @@
    "headAccessoryMystery201502Notes": "¡Deja volar tu imaginación! No otorga ningún beneficio. Objeto de subscriptor de Febrero 2015.",
    "headAccessoryMystery301405Text": "Gafas de tocado",
    "headAccessoryMystery301405Notes": "\"Las gafas son para tus ojos\", dijeron. \"Nadie quiere gafas que sólo se puedan usar sobre la cabeza\", dijeron. ¡Ja! ¡Claramente les demostraste que estaban equivocados! No otorgan ningún beneficio. Artículo de suscriptor de agosto 3015.",
+    "eyewear": "Eyewear",
    "eyewearBase0Text": "Sin gafas",
    "eyewearBase0Notes": "Sin gafas",
    "eyewearSpecialSummerRogueText": "Parche pícaro",
--- a/common/locales/es_419/generic.json
+++ b/common/locales/es_419/generic.json
@@ -39,7 +39,7 @@
    "close": "Cerrar",
    "saveAndClose": "Guardar y Cerrar",
    "cancel": "Cancelar",
-    "ok": "Ok",
+    "ok": "OK",
    "add": "Añadir",
    "undo": "Deshacer",
    "continue": "Continuar",
@@ -54,7 +54,7 @@
    "gems": "Gemas",
    "gemButton": "Tienes <%= number %> gemas.",
    "moreInfo": "Más información",
-    "gemsWhatFor": "Comprado con dinero real. Se usan para comprar objetos especiales y servicios (huevos, pociones de eclosión, Fortalecer, etc). Necesitarás desbloquear estas funciones antes de poder usar las Gemas.",
+    "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.",
    "veteran": "Veterano",
    "veteranText": "Ha sobrevivido a Habit The Grey (nuestro sito web pre-Angular) y se ha ganado muchas cicatrices de lucha por los errores de éste.",
    "originalUser": "¡Usuario original!",
@@ -70,7 +70,6 @@
    "lastLoggedIn": "- Última conexión",
    "notPorted": "Esta función aún no se ha traído del sitio original.",
    "buyThis": "¿Comprarás este <%=text%> con <%=price %> de tus <% gems%> Gemas?",
-    "untilNoFace": "Hasta que soportemos Facebook, usa tu UUID y tu API Token para conectarte (lo puedes encontrar en https://habitrpg.com > Opciones > Ajustes).",
    "noReachServer": "Error en la conexión al servidor, inténtalo más tarde.",
    "errorUpCase": "ERROR:",
    "newPassSent": "Nueva contraseña enviada.",
@@ -86,6 +85,7 @@
    "audioTheme_off": "Apagar",
    "audioTheme_danielTheBard": "Daniel el Bardo",
    "audioTheme_wattsTheme": "Tema de Watts",
+    "audioTheme_gokulTheme": "Gokul Theme",
    "askQuestion": "Preguntar",
    "reportBug": "Reportar un error",
    "contributeToHRPG": "Contribuir a HabitRPG",
--- a/common/locales/es_419/groups.json
+++ b/common/locales/es_419/groups.json
@@ -39,6 +39,8 @@
    "editGroup": "Editar grupo",
    "newGroupName": "Nombre del <%= groupType %> ",
    "groupName": "Nombre del grupo",
+    "groupLeader": "Group Leader",
+    "groupID": "Group ID",
    "groupDescr": "Descripción mostrada en la lista pública de Gremios (puedes usar Markdown)",
    "logoUrl": "URL del Logotipo",
    "assignLeader": "Asignar líder del grupo",
@@ -116,5 +118,7 @@
    "sendGiftFromBalance": "From Balance",
    "sendGiftPurchase": "Purchase",
    "sendGiftMessagePlaceholder": "Personal message (optional)",
-    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
+    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
--- a/common/locales/es_419/limited.json
+++ b/common/locales/es_419/limited.json
@@ -25,6 +25,7 @@
    "seasonalShopTitle": "Hechicera estacional",
    "seasonalShopClosedText": "¡¡La Tienda estacional está actualmente cerrada!! No sé dónde está la Hechicera estacional, pero apuesto a que volverá durante la próxima <%= linkStart %>Gran gala<%= linkEnd %>!",
    "seasonalShopText": "¡¡Bienvenido a la tienda de estacional!! Nos estamos abasteciendo de objetos valiosos de <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Edición estacional</a> de primavera. Todo aquí estará disponible para comprar durante el evento Fiesta de primavera cada año, pero estamos abierto sólo hasta el 30 de abril, así que asegúrate de abastecerte ahora, ¡o tendrás que esperar un año para comprar estos artículos de nuevo!",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
    "seasonalShopRebirth": "Si has usado la Esfera de renacimiento, puedes comprar este equipamiento de nuevo en la Columna de recompensas luego de que desbloquees la tienda de artículos. Inicialmente solo podrás comprar artículos para tu clase actual (Guerrero por defecto), pero no temas, los otros artículos específicos de clase van a estar disponibles cuando cambies a esa clase.",
    "candycaneSet": "Bastón de caramelo (Mago)",
    "skiSet": "Esquia-sesino (Granuja)",
@@ -44,5 +45,9 @@
    "mightyBunnySet": "Conejito poderoso (Guerrero)",
    "magicMouseSet": "Raton magico (Mago)",
    "lovingPupSet": "Cachorro cariñoso (Curador)",
-    "stealthyKittySet": "Gatito sigiloso (Granuja)"
+    "stealthyKittySet": "Gatito sigiloso (Granuja)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }
--- a/common/locales/es_419/messages.json
+++ b/common/locales/es_419/messages.json
@@ -1,6 +1,7 @@
 {
    "messageLostItem": "Tu <%= itemText %> se rompió.",
    "messageTaskNotFound": "Tarea no encontrada.",
+    "messageDuplicateTaskID": "A task with that ID already exists.",
    "messageTagNotFound": "Etiqueta no encontrada.",
    "messagePetNotFound": ":pet no encontrado en user.items.pets",
    "messageFoodNotFound": ":food no encontrado en user.items.food",
@@ -20,5 +21,8 @@
    "messageDropFood": "¡Has encontrado <%= dropText %>! <%= dropNotes %>",
    "messageDropEgg": "¡Has encontrado un Huevo de <%= dropText %>! <%= dropNotes %>",
    "messageDropPotion": "¡Has encontrado una Poción de eclosión <%= dropText %> ! <%= dropNotes %>",
-    "messageFoundQuest": "¡Has encontrado la misión \"<%= questText %>\"!"
+    "messageFoundQuest": "¡Has encontrado la misión \"<%= questText %>\"!",
+    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
--- a/common/locales/es_419/npc.json
+++ b/common/locales/es_419/npc.json
@@ -10,6 +10,8 @@
    "alexander": "Alexander el Comerciante",
    "welcomeMarket": "¡Bienvenidos al Mercado! ¡Compra huevos difíciles de encontrar y pociones! ¡Vende tus extras! ¡Encarga servicios útiles! Ven a ver lo que tenemos para ofrecer.",
    "sellForGold": "Vender <%= item %> por <%= gold %> Oro",
+    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
+    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
    "buyGems": "Comprar Gemas",
    "justin": "Justin",
    "USD": "USD",
@@ -18,7 +20,7 @@
    "dismissAlert": "Despedir esta alerta",
    "donateText1": "Añade 20 Gemas a tu cuenta. Las gemas se usan para comprar objetos especiales en el juego, como camisas y peinados.",
    "donateText2": "Ayuda a financiar HabitRPG",
-    "donateText3": "¡Como un proyecto de código abierto, toda la asistencia posible nos ayuda!",
+    "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
    "donationDesc": "20 Gemas, donación a HabitRPG",
    "payWithCard": "Pagar con una tarjeta de crédito",
    "payNote": "Nota: Paypal a veces toma mucho tiempo para autorizar el pago. Recomendamos que pagues con tarjeta de crédito.",
@@ -41,13 +43,36 @@
    "tourHabits": "¡Esta columna es para hábitos buenos y malos que haces muchas veces por día! Para continuar, haga clic en el lápiz para editar los nombres, y haga clic en la marca de verificación para guardar.",
    "tourStats": "¡Los Hábitos buenos añaden Experiencia y Oro! Los Hábitos malos quitan salud.",
    "tourGP": "Para continuar, ¡compra la Espada de Entrenamiento con el oro que acabas de conseguir!",
-    "tourAvatar": "Ahora tu avatar tiene la Espada de Entrenamiento. ¡Haz clic en tu avatar para personalizarlo!",
+    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
    "tourScrollDown": "¡Asegúrate de desplazarse hacia abajo para ver todas las opciones!  Haga clic en el avatar otra vez para regresar a la página de tareas.",
    "tourMuchMore": "¡Cuando hayas terminado con tus tareas, podrás hacer un Equipo con tus amigos, chatear en los Gremios que te interesen, unirte a Desafíos, y más!",
    "tourStatsPage": "¡Esta es la página de Estadísticas! Gana logros completando las tareas listadas.",
    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
    "tourPartyPage": "Tu equipo te ayudará a que te mantengas responsable. ¡Invita a tus amigo para desbloquear un Pergamino de misión!",
-    "tourGuildsPage": "Los Gremios son grupos sociales con temas comunes. ¡Busca los temas que te interesen! Te recomendamos el Gremio de los novatos.",
-    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
-    "tourMarketPage": "Cuando comienzas el Nivel 4, huevos y pociones de eclosión empezarán a caer al azar cuando completes tareas. Aparecen aquí - ¡úsalos para eclosionar a las mascotas! También puedes comprar artículos del Mercado."
+    "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!",
+    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourMarketPage": "Cuando comienzas el Nivel 4, huevos y pociones de eclosión empezarán a caer al azar cuando completes tareas. Aparecen aquí - ¡úsalos para eclosionar a las mascotas! También puedes comprar artículos del Mercado.",
+    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!",
+    "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
+    "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
+    "tourOkay": "Okay!",
+    "tourAwesome": "Awesome!",
+    "tourSplendid": "Splendid!",
+    "tourNifty": "Nifty!",
+    "tourAvatarProceed": "Show me my tasks!",
+    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
+    "tourDailiesProceed": "I'll be careful!",
+    "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
+    "tourHabitsProceed": "Makes sense!",
+    "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
+    "tourRewardsProceed": "That's all!",
+    "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+    "welcome1": "Create and customize an in-game avatar to represent you.",
+    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+    "welcome5": "Now you'll customize your avatar and set up your tasks...",
+    "imReady": "I'm Ready!"
 }
--- a/common/locales/es_419/quests.json
+++ b/common/locales/es_419/quests.json
@@ -1,9 +1,11 @@
 {
    "quests": "Misiones",
    "quest": "misión",
+    "questDetails": "Quest Details",
+    "invitations": "Invitations",
    "completed": "¡Completado!",
    "youReceived": "Has recibido",
-    "questSend": "Haciendo clic en ”Invite” mandará una invitación a los miembros de tu grupo. Cuando todos los miembros lo hayan aceptado o rechazado, comienza la misión. El estatus se puede ver en Opciones > Social > Equipo.",
+    "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 equipo",
    "questInvitation": "Invitación a una misión:",
    "questInvitationTitle": "Quest Invitation",
--- a/common/locales/es_419/questscontent.json
+++ b/common/locales/es_419/questscontent.json
@@ -202,5 +202,11 @@
    "questSheepBoss": "Carnero del trueno",
    "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
    "questSheepDropSheepEgg": "Sheep (Egg)",
-    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market",
+    "questKrakenText": "The Kraken of Inkomplete",
+    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
+    "questKrakenBoss": "The Kraken of Inkomplete",
+    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
+    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
+    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"
 }
--- a/common/locales/es_419/rebirth.json
+++ b/common/locales/es_419/rebirth.json
@@ -21,11 +21,5 @@
    "rebirthOrb": "Uso una Esfera derenacimiento para comenzar de nuevo después de conseguir Nivel",
    "rebirthPop": "Comenzar con un personaje nuevo a Nivel 1, mientras manteniendo logros, lo coleccionable, y tareas con historial.",
    "rebirthName": "Esfera de renacimiento",
-    "reborn": "Renacido, nivel máximo <%= reLevel %>",
-    "welcome100": "¡Bienvenido a Nivel 100!",
-    "intro100": "Ahora que has llegado al nivel 100, tienes la opción de usar la Esfera de renacimiento gratis en cualquier momento.",
-    "followup100": "Aunque puedes continuar a nivelar, ya no sera posible aumentar tus estadísticas y no sera desbloqueado mas contenido, así Habit seguirá siendo divertido para todos los estilos de juego.",
-    "rebirth100Info": "Si estas listo para comenzar una nueva aventura, puedes Renacer ahora... o ver qué tan lejos puedes llegar.",
-    "rebirthWait": "Yo esperaré...",
-    "rebirthNow": "¡Renacimiento ahora!"
+    "reborn": "Renacido, nivel máximo <%= reLevel %>"
 }
--- a/common/locales/es_419/settings.json
+++ b/common/locales/es_419/settings.json
@@ -113,10 +113,11 @@
    "benefits": "Beneficios",
    "coupon": "Cupón",
    "couponPlaceholder": "Introduzca el código de cupón",
-    "couponText": "A veces tenemos eventos y damos cupones con códigos para equipamiento especial. (p ej, a aquellos que nos visitan a nuestro stand de Wondercon)",
+    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
    "apply": "Aplicar",
    "resubscribe": "Reanudar suscripción",
    "promoCode": "Código promocional",
    "promoCodeApplied": "¡Tu código promocional fue aceptado! Revisa tu inventario.",
-    "promoPlaceholder": "Ingresa tu código promocional"
+    "promoPlaceholder": "Ingresa tu código promocional",
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
 }
--- a/common/locales/es_419/subscriber.json
+++ b/common/locales/es_419/subscriber.json
@@ -3,17 +3,17 @@
    "subscriptions": "Suscripciones ",
    "subDescription": "Desactivar anuncios, comprar gemas con oro, conseguir el objeto misterio del mes, retener historia del progreso, doblar el número máximo diario de botín posible, y apoyar los progs. Haz clic para más información. ",
    "disableAds": "Desactivar anuncios",
-    "disableAdsText": "Los anuncios serán desactivados mientras tienes una suscripción activa (los usuarios originales con anuncios desactivados serán integrados).",
+    "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).",
    "buyGemsGold": "Comprar Gemas con oro",
-    "buyGemsGoldText": "(1 Gema cuesta <%= gemCost %> Oro) Resuelve el problema de \"pagar para ganar,\" debido a que ahora todo es alcanzable a través del trabajo arduo. Hay una restricción de <%= gemLimit %> Gemas máximo al mes para evitar la sobre-explotación.",
+    "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
    "retainHistory": "Conservación completa de historia de entradas",
    "retainHistoryText": "Hace que tu historial completo esté disponible en forma de gráficos y exportaciones. Historiales de personas que no son suscriptores se consolidan para la optimización de la base de datos.",
    "doubleDrops": "Límites diarios de botines doblado",
    "doubleDropsText": "¡Completa tu establo más rápido!",
    "mysteryItem": "Artículos exclusivos de suscripción mensual",
-    "mysteryItemText": "Cada mes, todos los suscriptores recibirán un artículo cosmético completamente único para sus avatares.",
+    "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
    "supportDevs": "Apoya a los desarrolladores",
-    "supportDevsText": "Este proyecto de código abierto puede usar toda la ayuda que reciba. ¡Ayúdanos a mantener a Habit vivo!",
+    "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
    "monthUSD": "USD / mes",
    "organization": "Organización",
    "groupPlans": "Planes corporativos",
--- a/common/locales/es_419/tasks.json
+++ b/common/locales/es_419/tasks.json
@@ -16,7 +16,7 @@
    "checklist": "Lista de control",
    "checklistText": "¡Distribuye una tarea en partes! Las listas de control incrementan la Experiencia y el Oro ganados por completar Pendientes, y reducen el daño causado por una Diaria.",
    "expandCollapse": "Expandir/Contraer",
-    "text": "Texto",
+    "text": "Title",
    "extraNotes": "Notas adicionales",
    "direction/Actions": "Dirección/Acciones",
    "advancedOptions": "Opciones avanzadas",
@@ -36,6 +36,11 @@
    "newDailyBulk": "Nuevas Diarias (una por línea)",
    "streakCounter": "Contador de rachas",
    "repeat": "Repetir",
+    "repeatEvery": "Repeat Every",
+    "repeatDays": "Every X Days",
+    "repeatWeek": "On Certain Days of the Week",
+    "day": "Day",
+    "days": "Days",
    "restoreStreak": "Restaurar racha",
    "todos": "Pendientes",
    "newTodo": "Nueva Pendiente",
@@ -60,6 +65,9 @@
    "clearTags": "Limpiar",
    "hideTags": "Esconder",
    "showTags": "Mostrar",
+    "startDate": "Start Date",
+    "startDateHelpTitle": "When should this task start?",
+    "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.",
    "streakName": "Logros de rachas",
    "streakText": "Ha realizado <%= streaks %> racha(s)  de 21 días de tareas Diarias",
    "streakSingular": "Buena racha",
@@ -78,5 +86,23 @@
    "pushTaskToTop": "Enviar tarea al tope",
    "pushTaskToBottom": "Enviar tarea al fondo",
    "emptyTask": "Primero escribe el título de la tarea.",
-    "dailiesRestingInInn": "¡Estás descansando en la Posada! Tus Diarias no te harán daño esta noche, pero continuarán reiniciándose cada día. Si te encuentras una misión, no harás daño/coleccionarás objetos hasta que hayas salido de la Posada, pero sí recibirás daño de un Jefe si tus compañeros no completan sus Diarias."
+    "dailiesRestingInInn": "¡Estás descansando en la Posada! Tus Diarias no te harán daño esta noche, pero continuarán reiniciándose cada día. Si te encuentras una misión, no harás daño/coleccionarás objetos hasta que hayas salido de la Posada, pero sí recibirás daño de un Jefe si tus compañeros no completan sus Diarias.",
+    "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.",
+    "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.",
+    "habitHelp3": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Habits' target='_blank'>sample Habits</a>!",
+    "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!",
+    "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.",
+    "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.",
+    "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
+    "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+    "dailyHelp5": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_Dailies' target='_blank'>sample Dailies</a>!",
+    "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
+    "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
+    "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+    "toDoHelp4": "For inspiration, check out these <a href='http://habitrpg.wikia.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+    "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
+    "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
+    "rewardHelp3": "Special equipment will appear here during World Events.",
+    "rewardHelp4": "Don't be afraid to set custom Rewards! Check out <a href='http://habitrpg.wikia.com/wiki/Sample_Custom_Rewards' target='_blank'>some samples here</a>.",
+    "clickForHelp": "Click for help"
 }
--- a/common/locales/fr/defaulttasks.json
+++ b/common/locales/fr/defaulttasks.json
@@ -1,9 +1,9 @@
 {
-    "defaultHabit1Text": "Bonne Habitude",
-    "defaultHabit1Notes": "Exemples de bonnes habitudes : + Manger des légumes + 15 minutes de travail productif",
-    "defaultHabit2Text": "Mauvaise Habitude",
+    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
+    "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work",
+    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
    "defaultHabit2Notes": "Exemples de mauvaises habitudes : - Fumer une cigarette - Procrastiner",
-    "defaultHabit3Text": "Bonne ou Mauvaise Habitude",
+    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
    "defaultHabit3Notes": "Exemples de bonnes ou mauvaises habitudes : +/- Prendre les escaliers/l'ascenseur ; +/- Boire de l'eau/du soda",
    "defaultDaily1Text": "1h sur mon projet personnel",
    "defaultDaily1Notes": "Par défaut, toutes les tâches sont jaunes au moment de leur création. Cela signifie que vous ne subirez que des dommages modérés en les manquant, et ne gagnerez que des récompenses modérées en les complétant.",
@@ -31,7 +31,7 @@
    "defaultTodo4Checklist2": "reglez la difficulté dans les Options Avancées",
    "defaultTodo4Checklist3": "facultatif : définissez une Date d'Expiration",
    "defaultTodo5Text": "Créez une Équipe (groupe privé) avec vos amis (Social > Équipe)",
-    "defaultReward1Text": "1 épisode de Games of Thrones",
+    "defaultReward1Text": "15 minute break",
    "defaultReward1Notes": "Les récompenses personnalisées peuvent prendre de nombreuses formes. Certaines personnes se retiendront de regarder leur série préférée jusqu'à ce qu'elles aient assez d'or pour la payer.",
    "defaultReward2Text": "Gâteau",
    "defaultReward2Notes": "D'autres personnes veulent juste profiter d'un bon morceau de gâteau. Essayez de créer les récompenses qui vous motiveront le plus.",
--- a/common/locales/fr/gear.json
+++ b/common/locales/fr/gear.json
@@ -116,6 +116,14 @@
    "weaponSpecialSpring2015MageNotes": "Invoquez une carotte avec cette élégante baguette magique. Augmente l'Intelligence de <%= int %> points et la Perception de <%= per %>. Équipement en Édition Limitée du Printemps 2015.",
    "weaponSpecialSpring2015HealerText": "Hochet de Chat",
    "weaponSpecialSpring2015HealerNotes": "Lorsque vous l'agitez, il fait un drôle de cliquetis qui amuserait N'IMPORTE QUI pendant des heures. Augmente l'Intelligence de <%= int %> points. Équipement en Édition Limitée du Printemps 2015.",
+    "weaponSpecialSummer2015RogueText": "Firing Coral",
+    "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+    "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+    "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+    "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "weaponMystery201411Text": "Fourche Festive",
    "weaponMystery201411Notes": "Embrochez vos ennemis ou plantez-la dans votre nourriture préférée : cette fourche multi-fonctions peut tout faire ! N'apporte aucun bonus. Équipement d'Abonné de Novembre 2014.",
    "weaponMystery201502Text": "Bâton Chatoyant Ailé d'Amour et Aussi de Vérité",
@@ -124,6 +132,10 @@
    "weaponMystery201505Notes": "Cette lance verte et argent a désarçonné de nombreux adversaires! N'apporte aucun bonus. Équipement d'Abonné de Mai 2015.",
    "weaponMystery301404Text": "Canne Steampunk",
    "weaponMystery301404Notes": "Parfaite pour faire un tour en ville. N'apporte aucun bonus. Équipement d'Abonné de Mars 3015.",
+    "weaponArmoireBasicCrossbowText": "Basic Crossbow",
+    "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre",
+    "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).",
    "armor": "armure",
    "armorBase0Text": "Habit simple",
    "armorBase0Notes": "Un vêtement ordinaire. N'apporte aucun avantage.",
@@ -227,6 +239,14 @@
    "armorSpecialSpring2015MageNotes": "Plus besoin de patte de lapin, vous en portez deux ! Augmente l'Intelligence de <%= int %> points. Équipement en Édition Limitée du Printemps 2015.",
    "armorSpecialSpring2015HealerText": "Combinaison réconfortante",
    "armorSpecialSpring2015HealerNotes": "Cette douce combinaison est confortable, et aussi réconfortante qu'un thé à la menthe. Augmente la Constitution de <%= con %> points. Équipement en Édition Limitée du Printemps 2015.",
+    "armorSpecialSummer2015RogueText": "Ruby Tail",
+    "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015WarriorText": "Golden Tail",
+    "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015MageText": "Soothsayer Robes",
+    "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+    "armorSpecialSummer2015HealerText": "Sailor's Armor",
+    "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "armorMystery201402Text": "Robe du Messager",
    "armorMystery201402Notes": "Chatoyante et solide, cette robe possède de nombreuses poches dans lesquelles transporter des lettres. N'apporte aucun bonus. Équipement d'Abonné de Février 2014.",
    "armorMystery201403Text": "Armure du Marcheur Sylvain",
@@ -253,6 +273,10 @@
    "armorMystery201504Notes": "Vous serez aussi productif qu'une abeille dans cette robe attirante ! N'apporte aucun bonus. Équipement d'Abonné d'Avril 2015",
    "armorMystery301404Text": "Tenue Steampunk",
    "armorMystery301404Notes": "Pimpant et fringuant ! N'apporte aucun bonus. Équipement d'Abonné de Février 3015.",
+    "armorArmoireLunarArmorText": "Soothing Lunar Armor",
+    "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).",
+    "armorArmoireGladiatorArmorText": "Gladiator Armor",
+    "armorArmoireGladiatorArmorNotes": "To be a gladiator you must be not only cunning... but strong. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 2 of 3).",
    "headgear": "coiffe",
    "headBase0Text": "Pas de casque",
    "headBase0Notes": "Pas de couvre-chef.",
@@ -354,6 +378,14 @@
    "headSpecialSpring2015MageNotes": "Qu'est-ce qui est venu d'abord, le lapin ou le chapeau? Augmente la Perception de <%= per %> points. Équipement en Édition Limitée du Printemps 2015 ! ",
    "headSpecialSpring2015HealerText": "Couronne réconfortante",
    "headSpecialSpring2015HealerNotes": "La perle au centre de cette couronne calme et conforte les personnes qui l'entourent. Augmente l'Intelligence de <%=int %> points. Équipement en Édition Limitée du Printemps 2015.",
+    "headSpecialSummer2015RogueText": "Renegade Hat",
+    "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+    "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015MageText": "Soothsayer Scarf",
+    "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+    "headSpecialSummer2015HealerText": "Sailor's Cap",
+    "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
    "headSpecialGaymerxText": "Heaume de Guerrier Arc-en-Ciel",
    "headSpecialGaymerxNotes": "En l'honneur de la \"Pride season\" et de GaymerX, ce casque spécial est décoré avec un motif arc-en-ciel aussi radieux que coloré ! GaymerX est une convention célébrant les LGBTQ et les jeux, et est ouverte à tous. Elle se déroule à l'InterContinental dans le centre de San Francisco, du 11 au 13 Juillet ! N'apporte aucun bonus.",
    "headMystery201402Text": "Heaume Ailé",
@@ -378,6 +410,16 @@
    "headMystery301404Notes": "Un couvre-chef fantaisiste pour les gens de bonne famille les plus élégants ! N'apporte aucun bonus. Équipement d'Abonné de Janvier 3015.",
    "headMystery301405Text": "Haut-de-forme Classique",
    "headMystery301405Notes": "Un haut-de-forme classique ne demandant qu'à être assorti avec des accessoires fantaisistes. N'apporte aucun bonus. Équipement d'Abonné de Mai 3015.",
+    "headArmoireLunarCrownText": "Soothing Lunar Crown",
+    "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).",
+    "headArmoireRedHairbowText": "Red Hairbow",
+    "headArmoireRedHairbowNotes": "Become strong, tough and smart while wearing this beautiful Red Hairbow! Increases Strength by <%= str %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
+    "headArmoireVioletFloppyHatText": "Violet Floppy Hat",
+    "headArmoireVioletFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a pleasing purple color. Increases Perception by <%= per %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
+    "headArmoireGladiatorHelmText": "Gladiator Helm",
+    "headArmoireGladiatorHelmNotes": "To be a gladiator you must be not only strong.... but cunning. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Gladiator Set (Item 1 of 3).",
+    "headArmoireRancherHatText": "Rancher Hat",
+    "headArmoireRancherHatNotes": "Round up your pets and wrangle your mounts while wearing this magical Rancher Hat! Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
    "offhand": "objet de main de bouclier",
    "shieldBase0Text": "Pas d'Équipement de Main de Bouclier",
    "shieldBase0Notes": "Pas de bouclier ni de deuxième arme.",
@@ -441,8 +483,17 @@
    "shieldSpecialSpring2015WarriorNotes": "Lancez-le vers vos ennemis... ou ne faites que le tenir, parce qu'il va se remplir de délicieuse nourriture pour chien à l'heure du repas. Augmente la Constitution de <%= con %> points. Équipement en Édition Limitée du Printemps 2015.",
    "shieldSpecialSpring2015HealerText": "Coussin décoré",
    "shieldSpecialSpring2015HealerNotes": "Vous pouvez reposer votre tête sur cet oreiller, ou vous pouvez lutter contre lui avec vos imposantes griffes. Raah! Augmente la Constitution de <%= con %> points. Équipement en Édition Limitée du Printemps 2015.",
+    "shieldSpecialSummer2015RogueText": "Firing Coral",
+    "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+    "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+    "shieldSpecialSummer2015HealerText": "Strapping Shield",
+    "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
    "shieldMystery301405Text": "Bouclier Horloge",
    "shieldMystery301405Notes": "Le temps est de vote côté avec cet imposant bouclier horloge ! N'apporte aucun bonus. Équipement d'Abonné de Juin 3015.",
+    "shieldArmoireGladiatorShieldText": "Gladiator Shield",
+    "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
+    "back": "Back Accessory",
    "backBase0Text": "Pas d’accessoire dorsal",
    "backBase0Notes": "Pas d’accessoire dorsal.",
    "backMystery201402Text": "Ailes d'Or",
@@ -457,6 +508,7 @@
    "backSpecialWonderconRedNotes": "Bruisse avec force et élégance. N'apporte aucun bonus. Équipement de Convention en Édition Spéciale.",
    "backSpecialWonderconBlackText": "Cape de Dissimulation",
    "backSpecialWonderconBlackNotes": "Tissage d'ombres et de murmures. N'apporte aucun bonus. Équipement de Convention en Édition Spéciale.",
+    "body": "Body Accessory",
    "bodyBase0Text": "Pas d'armure.",
    "bodyBase0Notes": "Pas d'armure.",
    "bodySpecialWonderconRedText": "Collier de Rubis",
@@ -469,6 +521,14 @@
    "bodySpecialSummerMageNotes": "Ni l'eau de mer ni l'eau douce ne peuvent ternir cette pèlerine métallisée. N'apporte aucun bonus. Équipement en Édition Limitée de l’Été 2014.",
    "bodySpecialSummerHealerText": "Collier de Corail",
    "bodySpecialSummerHealerNotes": "Un élégant collier de corail vivant ! N'apporte aucun bonus. Équipement en Édition Limitée de l’Été 2014.",
+    "bodySpecialSummer2015RogueText": "Renegade Sash",
+    "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+    "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015MageText": "Golden Buckle",
+    "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
    "headAccessory": "accessoire de tête",
    "accessories": "Accessoires",
    "animalEars": "Oreilles d'Animaux",
@@ -516,6 +576,7 @@
    "headAccessoryMystery201502Notes": "Laissez votre imagination s'envoler ! N'apporte aucun bonus. Équipement d'Abonné de Février 2015.",
    "headAccessoryMystery301405Text": "Lunettes Frontales",
    "headAccessoryMystery301405Notes": "\"Les lunettes c'est pour les yeux,\" disaient-ils. \"Personne ne voudrait de lunettes qu'on ne peut porter que sur la tête\" disaient-ils. Ha ! Vous leur avez bien montré ! N'apporte aucun bonus. Équipement d'Abonné d'Août 3015.",
+    "eyewear": "Eyewear",
    "eyewearBase0Text": "Pas de Lunettes",
    "eyewearBase0Notes": "Pas de Lunettes.",
    "eyewearSpecialSummerRogueText": "Cache-œil Espiègle",
--- a/common/locales/fr/generic.json
+++ b/common/locales/fr/generic.json
@@ -39,7 +39,7 @@
    "close": "Fermer",
    "saveAndClose": "Enregistrer & Fermer",
    "cancel": "Annuler",
-    "ok": "Ok",
+    "ok": "OK",
    "add": "Ajouter",
    "undo": "Annuler",
    "continue": "Continuer",
@@ -54,7 +54,7 @@
    "gems": "Gemmes",
    "gemButton": "Vous avez <%= number %> gemmes.",
    "moreInfo": "Plus d'infomations",
-    "gemsWhatFor": "Obtenues à l'aide d'argent réel. Servent à acheter des objets spéciaux et des services (œufs, potions d'éclosion, Fortification, etc.). Vous aurez besoin de débloquer ces fonctionnalités avant de pouvoir utiliser les Gemmes.",
+    "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.",
    "veteran": "Vétéran",
    "veteranText": "A résisté à Habit le Gris (notre site pré-Angular) et a gagné de nombreuses cicatrices de guerre à cause de ses bugs.",
    "originalUser": "Utilisateur d'origine !",
@@ -70,7 +70,6 @@
    "lastLoggedIn": "- Dernière connexion",
    "notPorted": "Cette fonction n'a pas encore été importée depuis le site original.",
    "buyThis": "Acheter ce <%= text %> avec <%= price %> de vos <%= gems %> Gemmes ?",
-    "untilNoFace": "Jusqu'à ce que nous ayons ajouté Facebook, utilisez votre UUID et votre jeton API pour vous identifier (disponible sur https://habitrpg.com > Options > Paramètres).",
    "noReachServer": "Serveur inaccessible, réessayez plus tard",
    "errorUpCase": "ERREUR :",
    "newPassSent": "Nouveau mot de passe envoyé.",
@@ -86,6 +85,7 @@
    "audioTheme_off": "Arrêt",
    "audioTheme_danielTheBard": "Daniel le Barde",
    "audioTheme_wattsTheme": "Watts",
+    "audioTheme_gokulTheme": "Gokul Theme",
    "askQuestion": "Poser une Question",
    "reportBug": "Signaler un Bug",
    "contributeToHRPG": "Contribuer à HabitRPG",
--- a/common/locales/fr/groups.json
+++ b/common/locales/fr/groups.json
@@ -39,6 +39,8 @@
    "editGroup": "Modifier le Groupe",
    "newGroupName": "<%= groupType %> Nom",
    "groupName": "Nom du Groupe",
+    "groupLeader": "Group Leader",
+    "groupID": "Group ID",
    "groupDescr": "Description affichée dans la liste des Guildes publiques (Markdown OK)",
    "logoUrl": "URL du logo",
    "assignLeader": "Désigner un Chef de Groupe",
@@ -116,5 +118,7 @@
    "sendGiftFromBalance": "Offrir vos propres Gemmes",
    "sendGiftPurchase": "Acheter les Gemmes",
    "sendGiftMessagePlaceholder": "Message personnel (facultatif)",
-    "sendGiftSubscription": "<%= months %> mois: <%= price %>$ (USD)"
+    "sendGiftSubscription": "<%= months %> mois: <%= price %>$ (USD)",
+    "startAParty": "Start a Party",
+    "addToParty": "Add someone to your party"
 }
--- a/common/locales/fr/limited.json
+++ b/common/locales/fr/limited.json
@@ -25,6 +25,7 @@
    "seasonalShopTitle": "<%= linkStart %>Sorcière Saisonnière<%= linkEnd %>",
    "seasonalShopClosedText": "La Boutique Saisonnière est actuellement fermée !! Je ne sais pas où est passé la Sorcière Saisonnière, mais je parie qu'elle sera de retour lors du prochain <%= linkStart %>Grand Gala<%= linkEnd %> !",
    "seasonalShopText": "Bienvenue à la Boutique Saisonnière !! Nous avons actuellement reçu les nouveautés <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> du Printemps. Tout l'équipement est disponible à l'achat pendant la Fête du Printemps chaque année, mais nous ne sommes ouverts que jusqu'au 30 Avril, alors faites un stock dès maintenant, ou vous devrez attendre un an pour acheter à nouveau cet équipement.",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
    "seasonalShopRebirth": "Si vous avez utilisé l'Orbe de Renaissance, vous pouvez acheter ces équipements à nouveau dès lors que vous débloquez la Boutique. Dans un premier temps, vous ne pourrez acheter que les objets de votre classe actuelle (Guerrier, par défaut), mais ne craignez rien, les autres objets de classes seront disponibles si vous changez de classe.",
    "candycaneSet": "Sucre d'Orge (Mage)",
    "skiSet": "Ski-sassin (Voleur)",
@@ -44,5 +45,9 @@
    "mightyBunnySet": "Puissant Lapin (Guerrier)",
    "magicMouseSet": "Souris Magique (Mage)",
    "lovingPupSet": "Chiot Affectueux (Guérisseur)",
-    "stealthyKittySet": "Chaton Furtif (Voleur)"
+    "stealthyKittySet": "Chaton Furtif (Voleur)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }
--- a/common/locales/fr/messages.json
+++ b/common/locales/fr/messages.json
@@ -1,6 +1,7 @@
 {
    "messageLostItem": "Votre <%= itemText %> s'est cassé·e.",
    "messageTaskNotFound": "Tâche non trouvée.",
+    "messageDuplicateTaskID": "A task with that ID already exists.",
    "messageTagNotFound": "Étiquette non trouvée.",
    "messagePetNotFound": ":pet non trouvé dans user.items.pets",
    "messageFoodNotFound": ":food non trouvé dans user.items.food",
@@ -20,5 +21,8 @@
    "messageDropFood": "Vous avez trouvé <%= dropArticle %><%= dropText %> ! <%= dropNotes %>",
    "messageDropEgg": "Vous avez trouvé un Œuf de <%= dropText %> ! <%= dropNotes %>",
    "messageDropPotion": "Vous avez trouvé une Potion d’Éclosion <%= dropText %> ! <%= dropNotes %>",
-    "messageFoundQuest": "Vous avez trouvé la quête \"<%= questText %>\" !"
+    "messageFoundQuest": "Vous avez trouvé la quête \"<%= questText %>\" !",
+    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
+    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
+    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!"
 }
--- a/common/locales/fr/npc.json
+++ b/common/locales/fr/npc.json
@@ -10,6 +10,8 @@
    "alexander": "Alexander le Marchand",
    "welcomeMarket": "Bienvenue au Marché ! Achetez des œufs rares et des potions ! Vendez vos surplus ! Commandez des services utiles ! Venez voir ce que nous avons à proposer. ",
    "sellForGold": "Vendre <%= item %> pour <%= gold %> Or",
+    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
+    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
    "buyGems": "Acheter des Gemmes",
    "justin": "Justin",
    "USD": "USD",
@@ -18,7 +20,7 @@
    "dismissAlert": "Renvoyer la Messagère",
    "donateText1": "Ajoute 20 Gemmes à votre compte. Les gemmes sont utilisées pour acheter des objets spéciaux en jeu tel que les maillots ou les coiffures.",
    "donateText2": "Contribuez à soutenir HabitRPG",
-    "donateText3": "En tant que projet open-source, nous utiliserons toute l'aide que nous pouvons recevoir !",
+    "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
    "donationDesc": "20 Gemmes, Don à HabitRPG",
    "payWithCard": "Payer par Carte Bancaire",
    "payNote": "Note : Paypal met parfois longtemps à transmettre. Nous vous recommandons de payer par carte.",
@@ -41,13 +43,36 @@
    "tourHabits": "Cette colonne est pour les bonnes et mauvaises Habitudes que vous réalisez fréquemment ! Pour continuer, cliquez sur le crayon pour changer les noms, puis cliquez sur la coche pour enregistrer.",
    "tourStats": "Les bonnes habitudes vous donneront de l'expérience et de l'or. Les mauvaises habitudes vous feront perdre de la vie.",
    "tourGP": "Pour continuer, achetez l’Épée d'Entrainement avec l'or que vous venez de recevoir !",
-    "tourAvatar": "Votre avatar a désormais l’Épée d'Entrainement. Pour continuer, cliquez sur votre avatar pour le personnaliser !",
+    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
    "tourScrollDown": "Faites attention à bien aller tout en bas de la page pour voir toutes les options ! Cliquez sur votre avatar à nouveau pour retourner à la page des tâches.",
    "tourMuchMore": "Quand vous aurez fini avec vos tâches, vous pourrez former une équipe avec vos amis, discuter dans les guildes liées à vos centres d'intérêts, participer à des défis, et bien plus !",
    "tourStatsPage": "Ceci est votre page de statistiques ! Remportez des succès en complétant les tâches listées.",
-    "tourTavernPage": "Bienvenue à la Taverne, un lieu de discussion pour tous! Vous pouvez vous protéger des dégâts causés par vos Quotidiennes en cas de maladie ou de voyage en cliquant sur \"Se reposer à l'Auberge\". Venez dire bonjour!",
+    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
    "tourPartyPage": "Votre équipe vous aidera à rester responsable. Invitez des amis pour déverrouiller un parchemin de quête !",
-    "tourGuildsPage": "Les Guildes sont des groupes de personnes avec des centres d'intérêts communs. Recherchez les sujets qui vous plaisent ! Nous vous recommandons la guilde des nouveaux arrivants.",
-    "tourChallengesPage": "Les Défis sont des listes de tâches créées par des membres! Rejoindre un défi ajoutera ses tâches à votre compte. Rivalisez avec d'autres membres pour gagner des gemmes!",
-    "tourMarketPage": "A partir du niveau 4, des œufs et des potions d'éclosion apparaitront au hasard comme butin lorsque vous réaliserez vos tâches. Ils apparaissent ici - utilisez-les pour faire éclore des Familiers ! Vous pouvez aussi acheter des objets au Marché."
+    "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!",
+    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourMarketPage": "A partir du niveau 4, des œufs et des potions d'éclosion apparaitront au hasard comme butin lorsque vous réaliserez vos tâches. Ils apparaissent ici - utilisez-les pour faire éclore des Familiers ! Vous pouvez aussi acheter des objets au Marché.",
+    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!",
+    "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
+    "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
+    "tourOkay": "Okay!",
+    "tourAwesome": "Awesome!",
+    "tourSplendid": "Splendid!",
+    "tourNifty": "Nifty!",
+    "tourAvatarProceed": "Show me my tasks!",
+    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
+    "tourDailiesProceed": "I'll be careful!",
+    "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
+    "tourHabitsProceed": "Makes sense!",
+    "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
+    "tourRewardsProceed": "That's all!",
+    "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+    "welcome1": "Create and customize an in-game avatar to represent you.",
+    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+    "welcome5": "Now you'll customize your avatar and set up your tasks...",
+    "imReady": "I'm Ready!"
 }
--- a/common/locales/fr/quests.json
+++ b/common/locales/fr/quests.json
@@ -1,9 +1,11 @@
 {
    "quests": "Quêtes",
    "quest": "quête",
+    "questDetails": "Quest Details",
+    "invitations": "Invitations",
    "completed": "Complétée !",
    "youReceived": "Vous remportez",
-    "questSend": "Cliquer sur \"Inviter\" enverra une invitation aux membres de votre équipe. Quand tous les membres auront accepté ou refusé, la quête commencera. Voir l'avancement dans Options > Social > Équipe.",
+    "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": "Inviter l'équipe",
    "questInvitation": "Invitation à une Quête :",
    "questInvitationTitle": "Invitation à une Quête",
--- a/common/locales/fr/questscontent.json
+++ b/common/locales/fr/questscontent.json
@@ -202,5 +202,11 @@
    "questSheepBoss": "Bélier du Tonnerre",
    "questSheepCompletion": "Impressionné par votre assiduité, le Bélier du Tonnerre voit sa fureur se calmer peu à peu. Il lance trois énormes grêlons dans votre direction et disparaît dans un grondement sourd. En allant voir les grêlons de plus près, vous vous apercevez que ce sont en fait trois œufs doux et floconneux. Vous les ramassez et rentrez chez vous en flânant sous un ciel sans tache.",
    "questSheepDropSheepEgg": "Mouton (Œuf)",
-    "questSheepUnlockText": "Déverrouille l'achat d’œufs de mouton au Marché"
+    "questSheepUnlockText": "Déverrouille l'achat d’œufs de mouton au Marché",
+    "questKrakenText": "The Kraken of Inkomplete",
+    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
+    "questKrakenBoss": "The Kraken of Inkomplete",
+    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
+    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
+    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market"
 }
--- a/Show More
+++ b/Show More