Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

common/locales/cs/character.json

@@ -129,5 +129,8 @@
     "youCast": "Seslal jsi <%= spell %>.",
     "youCastTarget": "Seslal jsi <%= spell %> na <%= target %>.",
     "youCastParty": "Seslal jsi na družinu <%= spell %>.",
-    "critBonus": "Kritický zásah! Bonus:"
+    "critBonus": "Kritický zásah! Bonus:",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/cs/content.json

@@ -47,8 +47,8 @@
     "questEggOwlAdjective": "moudrý",
     "questEggPenguinText": "Tučňák",
     "questEggPenguinAdjective": "bystrý",
-    "questEggTRexText": "Tyrannosaur",
-    "questEggTRexAdjective": "tiny-armed",
+    "questEggTRexText": "Tyranosaur",
+    "questEggTRexAdjective": "s malými ručičkami",
     "eggNotes": "Najdi líhnoucí lektvar, nalij ho na vejce a z něj se vylíhne  <%= eggAdjective() %> <%= eggText() %>.",
     "hatchingPotionBase": "Základní",
     "hatchingPotionWhite": "Bílý",

common/locales/cs/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "Když je tvůj <strong>pátý</strong> set zlepšováků zaveden, budeš mít možnost koupit si <strong>Křišťálový štít</strong> v obchodě s Odměnami. Jako kořist za svou práci také obdržíš <strong>4 drahokamy</strong>.",
     "championSixth": "Když je tvůj <strong>šestý</strong> set zlepšováků zaveden, obdržíš <strong>Hydru</strong>. Také obdržíš <strong>4 drahokamy</strong>.",
     "legendary": "Legenda",
-    "legSeventh": "Když je tvůj <strong>sedmý</strong> set zlepšováků zaveden, obdržíš <strong>4 drahokamy</strong> a staneš se ctěným členem Cechu Přispěvatelů a budeš zasvěcen do detailů za oponou HabitRPG! Další příspěvky ti nebudou zvyšovat úroveň, ale mohou ti dále vydělávat Drahokamy a tituly.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Moderátor",
     "guardian": "Ochránce",
-    "guardianText": "Moderátoři byly pečlivě vybráni z řad přispěvatelů na vysokých úrovních, tak jim, prosím, ukazujte respekt a naslouchejte jejich radám.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Hůl",
     "heroic": "Hrdina",
-    "heroicText": "Mezi hrdiny patří personál HabitRPG a přispěvatelé na úrovni personálu. Pokud máš tento titul, byl ti udělen (nebo jsme tě najali!).",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "NPC podpořily hru nejvyšší částkou na Kickstarteru. Můžeš je najít, jak stráží funkce stránky!",
     "modalContribAchievement": "Ocenění pomocníka",
-    "contribModal": "<%= name %>, ty úžasná osobo! Nyní jsi za pomoc Habit RPG na úrovni přispěvatele <%= name %> . Podívej se ",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "jaké ceny jsi za svou pomoc získal!",
     "contribName": "Přispěvatel",
     "contribText": "Pomohl si HabitRPG (programování, design, pixel art, právní pomoc, dokumentace, atd.). Chceš toto ocenění?",
@@ -42,7 +42,7 @@
     "moreDetails2": "více detailů (8-9)",
     "contributions": "Příspěvky",
     "admin": "Admin",
-    "notGems": "je v USD, <em>ne</em> v drahokamech. Neboli, pokud je tam číslo 1, znamená to 4 drahokamy. Použij tuto možnost pouze pokud ručně uděluješ drahokamy hráčům, nepoužívej jí při přidělování úrovní přispěvatelů. Úrovně přispěvatelů přidají automaticky 2Drah/úroveň.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Schovat reklamy",
     "gamemaster": "Herní mistr (personál/moderátor)",
     "backerTier": "Stupeň podporovatele",

common/locales/cs/generic.json

@@ -86,6 +86,6 @@
     "November": "Listopad",
     "December": "Prosinec",
     "dateFormat": "Formát data",
-    "achievementStressbeast": "Savior of Stoïkalm",
-    "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2015 Winter Wonderland Event!"
+    "achievementStressbeast": "Zachránce Stoïkalmu",
+    "achievementStressbeastText": "Pomož přemoci Zavrženíhodnou Strespříšeru při příležitosti Zimní říše divů 2015!"
 }

common/locales/cs/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Seřadit podle data připojení ke družině",
     "sortName": "Seřadit podle jména avatara",
     "sortBackgrounds": "Seřadit podle pozadí",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "Vytvořit cech za 4 drahokamy?",
     "leaveGroupCha": "Opustit výzvy cechu a...",
     "confirm": "Potvrdit",

common/locales/cs/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "<%= name %>, cítíš se na projížďku? Klikni na zvíře, které si chceš osedlat. ",
     "mattBochText1": "Vítej u mazlíčků! Jsem Matt, pán šelem. Zvol si mazlíčka, který tě bude doprovázet po tvém boku. Krm je a oni vyrostou v silná zvířata.",
-    "mattBochText2": "Pojďme se podívat",
-    "mattBochText3": "na všechny mazlíčky, které můžeš posbírat.",
     "daniel": "Daniel",
     "danielText": "Vítej v krčmě! Chvilku se zdrž a poznej místní. Pokud si potřebuješ odpočinout (jedeš na dovolenou? náhlá nemoc?), nabízím ti pokoj v hostinci. Zatímco tu budeš ubytovaný, tvé denní úkoly budou zmrazeny tak, jak jsou (zaškrtnuté/nezaškrtnuté), dokud se nevrátíš. Na konci dne ti nijak neublíží.",
     "danielText2": "Dej pozor: Pokud se účastníš boje s bossem, ublíží ti i za nesplněné denní úkoly ostatních členů tvé družiny!",
@@ -27,7 +25,7 @@
     "card": "Kartou",
     "paymentMethods": "Platební metody:",
     "welcomeHabit": "Vítej v HabitRPG",
-    "welcomeHabitT1": "Welcome to HabitRPG, a habit tracker that treats your tasks like a Role Playing Game. I'm",
+    "welcomeHabitT1": "Vítej v HabitRPG, aplikaci, kde se budování zvyků stává hrou. Já jsem",
     "welcomeHabitT2": ", tvůj průvodce!",
     "yourAvatar": "Tvá postava",
     "yourAvatarText": "Tohle je tvá postava. Reprezentuje Tě ve světě Habitika. Za plnění úkolů bude postupovat do vyšších úrovní, získávat zlaťáky a vybavení potřebné v dalších dobrodružstvích, které leží před tebou.",

common/locales/cs/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "nalezených mazlíčků ",
     "rarePets": "Vzácní mazlíčci",
     "questPets": "Mazlíčci z výprav",
-    "beastmasterProgress": "Pokrok k titulu Pána šelem",
     "mounts": "Stáj",
     "mountsTamed": "zkrocených zvířat",
     "questMounts": "Z výprav",
@@ -13,7 +12,7 @@
     "cerberusPup": "Štěně Kerbera",
     "hydra": "Hydra",
     "mantisShrimp": "Strašek paví",
-    "mammoth": "Woolly Mammoth",
+    "mammoth": "Huňatý mamut",
     "rarePetPop1": "Klikni na zlatou packu pro více informací o tom, jak získat toto vzácné zvíře za přispívání HabitRPG!",
     "rarePetPop2": "Jak získat toto zvíře!",
     "potion": "<%= potionType %> lektvar",
@@ -27,10 +26,21 @@
     "inventoryText": "Po kliknutí na vejce se zeleně zvýrazní použitelné lektvary. Poté klikni na jeden z nich pro vylíhnutí mazlíčka. Pokud nejsou žádné lektvary zvýrazněny, klikni na vejce znovu pro zrušení jeho výběru a místo toho klikni nejprve na lektvar, aby se označila použitelná vejce. Také můžeš nechtěné nalezené předměty prodat obchodníku Alexanderovi.",
     "food": "Jídlo a sedla",
     "noFood": "Nemáš žádné jídlo ani žádná sedla.",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "Získal jsi ocenění \"Pán šelem\" za získání všech mazlíčků!",
-    "beastMastName": "Pán šelem",
-    "beastMastText": "Nalezl všech 90 zvířátek ( šíleně obtížné, zaslouží si uznání!)",
-    "beastMastText2": "a vypustil <%= count %>krát své mazlíčky",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Nalézání přemětů povoleno",
     "itemDrop": "Nalezen předmět",
     "firstDrop": "Odemknuto nalézání předmětů! Od teď máš malou šanci nalézt předmět při dokončení úkolů. Právě nalezeno <strong> vejce zvířátka <%= eggText %></strong>! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= potion %> <%= egg %>",
     "mountName": "<%= potion %> <%= mount %>",
     "petKeyName": "Klíč ke kotcům",
-    "petKeyPop": "Nech své mazlíčky pobíhat na svobodě, vypusť je aby mohli začít své vlastní dobrodružství a zažij znovu vzrušení a staň se znovu pánem šelem!",
-    "petKeyBegin": "Klíč ke kotcům: Zažij znovu vzrušení a staň se Pánem šelem!",
-    "petKeyInfo": "Miluješ své mazlíčky? Propusť je na svobodu! Nalezená vejce a lektvary znovu získají smysl.",
-    "petKeyInfo2": "Klíč ke kotcům resetuje všechny tvé nalezené mazlíčky (ne ty z výprav) jako kdybys je nikdy nenašel. Jakmile klíč použiješ, můžeš znovu získat ocenění Pána Šelem a pochlubit se, kolikrát jsi byl ten nejlepší.",
-    "petKeyInfo3": "Existují dvě sady klíčů: můžeš buďto vypustit na svobodu mazlíčky za čtyři drahokamy, nebo mazlíčky i zvířata ze stáje za osm drahokamů. Pokud stále pracuješ na sbírání zvířat ve stáji, jistě je nechceš vypustit předčasně!",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Vypusťte mé mazlíčky",
-    "petKeyMounts": "Vypusťte všechny, prosím",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Ještě ne",
     "gemsEach": "drahokamů každý"
 }

common/locales/cs/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Polámané větvičky",
     "questEvilSanta2DropBearCubPolarPet": "Lední medvěd (mazlíček)",
     "questGryphonText": "Ohnivý Gryf",
-    "questGryphonNotes": "Velký pán šelem, <strong>baconsaur</strong>, přišel do tvé družiny hledat pomoc. \"Prosím, dobrodruzi, musíte mi pomoct! Můj drahocenný gryf utekl a terorizuje Habit City! Pokud ji zastavíte, mohu vás odměnit jejími vejci!\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Poražené zvíře se zahanbeně courá zpět ke svému pánovi. \"Páni! Výborná práce dobrodruzi!\" <strong>baconsaur</strong> zvolá, \"Prosím, vezměte si nějaká gryfova vejce. Jsem si jist, že ty mladé dobře vychováte!\"",
     "questGryphonBoss": "Ohnivý Gryf",
     "questGryphonDropGryphonEgg": "Gryf (vejce)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "Řetěz měsíčních kamenů, část 3.: Recidiva transformována (svitek)",
     "questMoonstone3Text": "Recidiva transformována",
     "questMoonstone3Notes": "<p>Recidiva padá k zemi a vy ji zasáhnete řetězem z měsíčních kamenů. K vašemu nemilému překvapení vám Recidiva kameny vezme a v očích ji žhne triumf.</p><br/><p>\"Blázni z masa a kostí!\" křičí. \"Tyto měsíční kameny mne učiní smrtelnou, to ano, ale ne tak, jak doufáte. Stejně jako úplněk přibývá z temnoty i má moc roste a ze stínů přivolávám stvoření jehož se nejvíce obáváte!\" </p><br/><p> Hnusná zelená mlha se zvedá z bažiny a tělo Recidivy se zmítá a mění se ve tvar, který ve vás vzbuzuje hrůzu - nemrtvé tělo Zlořáda.</p>",
-    "questMoonstone3Completion": "<p> Dech vám ztěžkne a čůrky potu vám zakalí zrak, když se mrtvý drak kácí k zemi. Pozůstatky recidivy se odpaří do šedé mlhy, která se rychle rozplyne v závanu čerstvého vzduchu, a v dáli slyšíte řev Habiťany v boji s jejich zlozvyky. </p><br/><p>@Baconsaur, Pán šelem, se k vám snese na gryfu. \"Viděl jsem konec vaší bitvy ze vzduchu a velmi mě to dojalo. Prosím, přijměte tuto kouzelnou tuniku - vaše hrdinství vypovídá o vašich chrabrých srdcích a věřím, že byste ji měli mít.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Nekro-Zlořád",
     "questMoonstone3DropRottenMeat": "Zkažené maso (jídlo)",
     "questMoonstone3DropZombiePotion": "Zombie líhnoucí lektvar",
@@ -142,7 +142,7 @@
     "questPenguinCompletion": "Když tučňáka porazíš, led roztaje. Tučňák se usadí na sluníčku a srká z kyblík plného ryb, který jste našli. Foukajíc před sebe jemný třpytivý led odbruslí přes jezero. Jaký to divní pták! \"Zdá se, že tu za sebou nechal pár vajec,\" říká @Painter de Cluster. <br><br>@Rattify se směje \"Možná budou tihle tučňáčci trochu... chladnější?\"",
     "questPenguinBoss": "Mrazivý tučňák",
     "questPenguinDropPenguinEgg": "Tučňák (vejce)",
-    "questStressbeastText": "The Abominable Stressbeast of the Stoïkalm Steppes",
+    "questStressbeastText": "Zavrženíhodná Strespříšera ze Stoïkalmských stepí",
     "questStressbeastNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.<br><br>~*~<br><br>The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.<br><br>We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.<br><br>\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"<br><br>\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.<br><br>\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"<br><br>There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...",
     "questStressbeastBoss": "The Abominable Stressbeast",
     "questStressbeastBossRageTitle": "Stress Strike",
@@ -152,6 +152,7 @@
     "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
     "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
     "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questTRexText": "King of the Dinosaurs",

common/locales/cs/settings.json

@@ -45,11 +45,11 @@
     "misc": "Ostatní",
     "showHeader": "Zobrazit horní info panel",
     "changePass": "Změnit heslo",
-    "changeUsername": "Změnit uživatelské jméno",
+    "changeUsername": "Change Login Name",
     "oldPass": "Staré heslo",
     "newPass": "Nové heslo",
     "confirmPass": "Potvrď nové heslo",
-    "newUsername": "Nové uživatelské jméno",
+    "newUsername": "New Login Name",
     "dangerZone": "Nebezpečná zóna",
     "resetText1": "POZOR! Tímto resetujete mnoho částí svého účtu. Silně nedoporučujeme tuto možnost používat, ale vyhovuje to některým uživatelům, kteří si se stránkou na začátku trochu hrají.",
     "resetText2": "Přijdeš o všechny své úrovně, zlato a zkušenosti. Všechny tvé úkoly se permanentně smažou a ztratíš všechna historická data svých úkolů. Přijdeš o veškeré své vybavení, ale budeš si ho moci všechno znovu koupit, a to včetně předmětů z limitovaných edic nebo předplatitelské záhadné předměty které již vlastníš (pro znovuzakoupení některého vybavení musí mít tvoje postava odpovídající povolání). Ponecháš si aktuální povolání, mazlíčky a zvířata k osedlání. Možná bude lepší místo toho použít Kouli znovuzrození, která je bezpečnější a zachová tvoje úkoly. ",
@@ -68,7 +68,16 @@
     "enterNumber": "Prosím, zadej číslo mezi 0 a 24",
     "fillAll": "Prosím, vyplň všechna pole",
     "passSuccess": "Heslo bylo úspěšně změněno",
-    "usernameSuccess": "Uživatelské jméno úspěšně změněno",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Data",
-    "exportData": "Export dat"
+    "exportData": "Export dat",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/cs/subscriber.json

@@ -8,7 +8,7 @@
     "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í)",
     "buyGemsGold": "Kup drahokamy za zlato",
-    "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": "(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.",
     "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ů",

common/locales/cs/tasks.json

@@ -36,8 +36,10 @@
     "todos": "Úkolníček",
     "newTodo": "Nový Úkol",
     "dueDate": "Termín splnění",
-    "remaining": "Zbývající",
-    "complete": "Dokončené",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Zbývající",
     "grey": "Dokončené",
     "rewards": "Odměny",

common/locales/da/character.json

@@ -129,5 +129,8 @@
     "youCast": "Du kaster <%= spell %>.",
     "youCastTarget": "Du kaster <%= spell %> på <%= target %>.",
     "youCastParty": "Du kaster <%= spell %> for hele selskabet.",
-    "critBonus": "Fuldtræffer! Bonus: "
+    "critBonus": "Fuldtræffer! Bonus: ",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/da/content.json

@@ -47,8 +47,8 @@
     "questEggOwlAdjective": "klog",
     "questEggPenguinText": "Pingvin",
     "questEggPenguinAdjective": "Skarpsindig",
-    "questEggTRexText": "Tyrannosaur",
-    "questEggTRexAdjective": "tiny-armed",
+    "questEggTRexText": "Tyrannosaurus",
+    "questEggTRexAdjective": "kortarmet",
     "eggNotes": "Find en udrugningseliksir til at hælde på dit æg, og det vil udklække en <%= eggAdjective() %> <%= eggText() %>.",
     "hatchingPotionBase": "Almindelig",
     "hatchingPotionWhite": "Hvid",

common/locales/da/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "Når din <strong>femte</strong> indsendelse er taget i brug, vil <strong>Krystalskjoldet</strong> være mulig at købe i Belønningsbutikken. Som en belønning for dit fortsatte arbejde vil du også modtage <strong>4 Ædelsten</strong>.",
     "championSixth": "Når din <strong>sjette</strong> indsendelse er taget i brug, vil du modtage et <strong>Hydrakæledyr</strong>. Som en belønning for dit fortsatte arbejde vil du også modtage <strong>4 Ædelsten</strong>.",
     "legendary": "Legendarisk",
-    "legSeventh": "Når din <strong>syvende</strong> indsendelse er taget i brug, vil du modtage <strong>4 Ædelsten</strong> og blive medlem af den ærefulde Bidragsyderklan, samt have adgang til detaljer om hvad der sker bag kulisserne i HabitRPG! Flere bidrag øger ikke dit niveau, men du kan fortsat tjene Ædelstensbelønninger og titler.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Moderator",
     "guardian": "Beskytter",
-    "guardianText": "Moderatorer blev omhyggeligt valgt fra bidragsydere på højt niveau, så vis dem venligst respekt og lyt til deres forslag.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Ansat",
     "heroic": "Heltemodig",
-    "heroicText": "Det Heltemodige niveau indeholder HabitRPG-ansatte og bidragydere på ansat-niveau. Hvis du har denne titel, så blev du udnævnt til den (eller ansat!).",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "NPCs støttede HabitRPG-Kickstarteren på det højeste trin. Du kan se deres avatarer overvåge side-features!",
     "modalContribAchievement": "Bidragsyderspræstation!",
-    "contribModal": "<%= name %>, din fantastiske person! Du er nu en niveau <%= level %> bidragsyder som tak for at hjælpe HabitRPG. Se",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "hvilke præmier du har fået for dit bidrag!",
     "contribName": "Bidragsyder",
     "contribText": "Har bidraget til HabitRPG (kode, design, pixel art, juridisk rådgivning, dokumenter, m.m). Vil du have dette emblem?",
@@ -42,7 +42,7 @@
     "moreDetails2": "flere detaljer (8-9)",
     "contributions": "Bidrag",
     "admin": "Admin",
-    "notGems": "er i US$, <em>ikke</em> i Ædelsten. Altså, hvis tallet er 1, betyder det 4 Ædelstene. Brug kun denne mulighed, hvis du giver ædelsten til spillere manuelt, ikke til at skænke bidragsyderniveauer. Bidragsyderniveau vil automatiskt tilføje 2 Ædelsten per niveau.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Skjul reklamer",
     "gamemaster": "Spilmester (ansat/moderator)",
     "backerTier": "Støttetrin",

common/locales/da/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Sortér efter gruppeindmeldelsesdato",
     "sortName": "Sortér efter avatar-navn",
     "sortBackgrounds": "Sortér efter baggrund",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "Opret Klan for 4 Ædelsten?",
     "leaveGroupCha": "Forlad Klanudfordringer og...",
     "confirm": "Bekræft",

common/locales/da/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "Skal jeg hente dit ridedyr, <%= name %>? Klik på et ridedyr for at bestige det.",
     "mattBochText1": "Velkommen til Stalden! Jeg er Matt, bæstmesteren. Vælg det kæledyr, du vil have til at følge dig, her. Fodr dem, og de vil vokse til kraftfulde ridedyr.",
-    "mattBochText2": "Kast et kig",
-    "mattBochText3": "på alle de kæledyr, du kan samle.",
     "daniel": "Daniel",
     "danielText": "Velkommen til Værtshuset! Hæng ud og mød de lokale. Hvis du har brug for at slappe af (ferie? sygdom?), så er der plads på Kroen. Når du er tjekket ing på Kroen vil dine Daglige blive frosset i den tilstand, de er i (markerede/umarkerede) indtil dagen efter du tjekker ud. Du vil ikke ved dagens afslutning lide under at have sprunget dem over.",
     "danielText2": "Advarsel: Hvis du deltager i en Boss-quest vil bossen stadig skade dig for de andre gruppemedlemmers oversprungne Daglige!",

common/locales/da/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "Fundne kæledyr",
     "rarePets": "Sjældne kæledyr",
     "questPets": "Quest-kæledyr",
-    "beastmasterProgress": "Bæstmesterfremskridt",
     "mounts": "Ridedyr",
     "mountsTamed": "Ridedyr tæmmet",
     "questMounts": "Quest-ridedyr",
@@ -27,10 +26,21 @@
     "inventoryText": "Klik på et æg for at se brugbare eliksirer fremhævet med grønt, og klik derefter på en af de fremhævede eliksirer for at udruge dit kæledyr. Hvis ingen eliksirer er fremhævede, så klik på ægget igen for at fravælge det, og i stedet klikke en eliksir først for at få de brugbare æg fremhævet. Du kan også sælge uønskede drops til Købmanden Alexander.",
     "food": "Mad og sadler",
     "noFood": "Du har hverken mad eller sadler.",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "Du har opnået \"Bæstmester\"-præstationen ved at samle alle kæledyr!",
-    "beastMastName": "Bæstmester",
-    "beastMastText": "Har fundet alle 90 kæledyr (sindsoprivende vanskeligt, lykønsk denne bruger!)",
-    "beastMastText2": "og har sluppet deres kæledyr fri <%= count %> gange",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Drops aktiveret!",
     "itemDrop": "En ting er droppet!",
     "firstDrop": "Du har nu adgang til dropsystemet! Når du nu fuldender opgaver, har du en lille chance for at finde en ting. Du har lige fundet et <strong><%= eggText %>-æg</strong>! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= potion %> <%= egg %>",
     "mountName": "<%= potion %> <%= mount %>",
     "petKeyName": "Nøglen til Kennelen",
-    "petKeyPop": "Slip dine kæledyr fri og lad dem starte deres eget eventyr, så kan du igen opleve glæden ved at være Bæstmester!",
-    "petKeyBegin": "Nøglen til Kennelen: Bliv Bæstmester Igen!",
-    "petKeyInfo": "Vis dine kæledyr kærlighed ved at slippe dem fri, og få drops til at føles meningsfulde igen.",
-    "petKeyInfo2": "Nøglen til kennelen nulstiller alle kæledyr du ikke har fået fra quests, som om du aldrig har fundet dem. Når du har brugt den kan du gentage Bæstmester-præstationen, og prale med hvor mange gange du kan overvinde vores tilfældige drop-generator.",
-    "petKeyInfo3": "Der er to sæt nøgler: du kan enten vælge kun at slippe dine Kæledyr fri for fire Ædelsten, eller alle dine Kæledyr og Ridedyr for otte Ædelsten. Hvis du stadig arbejder hen imod at få alle Ridedyr, kan det tænkes, at du ikke vil slippe dem fri endnu!",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Slip mine kæledyr fri",
-    "petKeyMounts": "Slip begge fri, tak",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Ikke endnu",
     "gemsEach": "ædelsten hver"
 }

common/locales/da/quests.json

@@ -19,7 +19,7 @@
     "bossDmg2": "Kun deltagere vil kæmpe mod bossen og få del i quest-byttet.",
     "tavernBossInfo": "For at skade en verdens-boss skal du færdiggøre dine Daglige og Gøremål. Jo mere skade du gør på opgaver, des mere skade tager Bossen (færdiggørelse af røde opgaver, Magikeres fortryllelser, Krigeres angreb osv.). Bossens Vrede stiger for hver Daglige du springer over (ganget med bossens Styrke). Når hans Vrede når maksimum vil der ske slemme ting - så færdiggør dine Daglige! <strong>Al skade på og fra bossen bliver opgjort ved cron (når din dag skifter).</strong>",
     "bossColl1": "Udfør dine positive opgaver for at samle ting. Quest-ting dropper som normale ting, men du vil ikke se drops før næste dag, hvor alt hvad du har fundet vil blive opgjort og lagt i bunken.",
-    "bossColl2": "Kun deltagere kan samle ting og fp del i quest-byttet.",
+    "bossColl2": "Kun deltagere kan samle ting og få del i quest-byttet.",
     "abort": "Afbryd",
     "questOwner": "Quest-leder",
     "questOwnerNotInPendingQuest": "Quest-lederen har forladt questen og kan ikke længere starte den. Det anbefales at du afbryder den nu. Quest-lederen beholder quest-skriftrullen.",

common/locales/da/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Brækkede Grene",
     "questEvilSanta2DropBearCubPolarPet": "Isbjørn (Kæledyr)",
     "questGryphonText": "Den Flammende Grif",
-    "questGryphonNotes": "Storbæstmesteren <strong>baconsaur</strong> har kontaktet din gruppe og bedt om hjælp. \"Eventyrere, hjælp mig! Min prisvindende grif er sluppet fri og terroriserer Habitby! Hvis I kan stoppe hende kan jeg tilbyde nogle af hendes æg som tak!\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Overvundet vender det mægtige bæst tilbage til sin ejer. \"Åh! Godt klaret, eventyrere!\" udbryder <strong>baconsaur</strong>, \"Her, tag nogle af griffens æg! Jeg er sikker på, at I vil opfostre ungerne godt!\"",
     "questGryphonBoss": "Flammende Grif",
     "questGryphonDropGryphonEgg": "Grif (Æg)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "Månestenskæden, del 3: Tilbagefald Transformeret (Skriftrulle)",
     "questMoonstone3Text": "Tilbagefald Transformeret",
     "questMoonstone3Notes": "<p>Tilbagefald falder om, og du slår hende med månestenskæden. Men til din store skræk tager Tilbagefald kæden fra dig, og hendes øjne lyser af triumf.</p><br/><p>\"Fjollede kød-skabninger!\" råber hun. \"Disse månesten vil give mig min fysiske form tilbage, ja, men ikke som du regnede med. Som månen går fra ny til fuld, på samme måde vender min magt tilbage, og jeg kan nu fremmane din værste fjende fra skyggerne!\"</p><br/><p>En sygeligt grøn tåge rejser sig fra mosen, og Tilbagefalds krop vrider og drejer sig til en form, der fylder dig med ren frygt - den uddøde krop af Last, genfødt på forfærdelig vis.</p>",
-    "questMoonstone3Completion": "<p>Dit åndedræt kommer i stød, og sveden stikker i dine øjne da den uddøde Drage kollapser. Resterne af Tilbagefald fordamper til en tynd grå tåge, der hurtigt forsvinder da en forfriskende brise pludselig blæser ind, og i det fjerne kan du høre kampråbene fra Habitboer, der besejrer deres Dårlige Vaner én gang for alle.</p><br/><p>Bæstmesteren @Baconsaur kommer flyvende på en grif. \"Jeg så slutningen af kampen fra luften, og jeg blev helt rørt. Tag denne fortryllede tunika - dit mod viser, at du har et nobelt hjerte, og jeg tror, at det er meningen, at du skal have den.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Nekro-Last",
     "questMoonstone3DropRottenMeat": "Råddent Kød (Mad)",
     "questMoonstone3DropZombiePotion": "Zombie Udrugningseliksir",
@@ -152,18 +152,19 @@
     "questStressbeastBossRageStables": "`Det Afskyelige Stressbæst bruger STRESSANGREB!`\n\nMængden af stress heler Det Afskyelige Stressbæst!\n\nÅh nej! På trods af forsøget på at gøre vores bedste, er nogle Daglige sluppet fra os, og deres mørkerøde farve har ophidset Det Afskyelige Stressbæst og det har genvundet noget Helbred! Det forfærdelige bæst slår ud efter Stalden, men Bæstmesteren Matt beskytter heltemodigt alle kæledyr og ridedyr. Stressbæstet har fanget Matt i sin store klo, men i det mindste er det distraheret nu. Skynd dig! Lad os holde vores Daglige nede så vi kan overvinde dette monster før det angriber igen!",
     "questStressbeastBossRageBailey": "`Det Afskyelige Stressbæst bruger STRESSANGREB!`\n\nMængden af stress heler Det Afskyelige Stressbæst!\n\nÅååååh! Vores ufærdige Daglige har gjort Det Afskyelige Stressbæst vredere end nogen sinde før, og det har genvundet noget Helbred! Byudråberen Bailey stod og råbte til nogle indbyggere, at de skulle komme i sikkerhed, og nu har den fanget hende i sin anden klo! Se på hende, hun råber stadig nyheder mens Stressbæstet svinger hende rundt... Lad os ære hendes heltemod ved at være så produktive som muligt, så vi kan redde vores NPCer!",
     "questStressbeastBossRageGuide": "`Det Afskyelige Stressbæst bruger STRESSANGREB!`\n\nMængden af stress heler Det Afskyelige Stressbæst!\n\nPas på! Guiden Justin prøver at distrahere Stressbæstet ved at løbe rundt om dets ankler og give det produktivitetstips! Det Afskyelige Stressbæst stamper vredt, men det ser ud til, at vi er ved at overvinde bæstet. Jeg tvivler på, at det har kræfter til endnu et angreb. Giv ikke op... vi er så tæt på at få det ned med nakken!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>Det Afskyelige Stressbæst er BESEJRET!</strong><br><br>Vi har gjort det! Med et sidste brøl opløses Det Afskyelige Stressbæst i en sky af sne. Snefnuggene glimter på deres vej ned, og glade Habitboer krammer deres kæledyr og ridedyr. Vores dyr og NPCer er igen i sikkerhed!<br><br><strong>Stoiskro er Reddet!</strong><br><br>SabreCat taler blidt til en lille sabeltandstiger. \"Hjælp os med at finde Stoiskros Steppers indbyggere og led dem hen til os,\" siger han. Flere timer senere vender sabeltandstigeren tilbage med en gruppe mammut-ryttere ridende langsomt efter sig. Du genkender deres leder som Madam Gletscha, lederen af Stoiskro.<br><br>\"Ærede Habitboer,\" siger hun, \"Mine landsmænd og jeg skylder jer en stor tak, og en stor undskyldning. I et forsøg på at beskytte vores stepper mod uro, begyndte vi i al hemmelighed at sende al vores stress til frostbjergene. Vi havde ikke forestillet os, at det ville ende med at vokse sig til det Stressbæst, I så! Da de slap løs fangede det os alle i bjergene i stedet for det selv, og gik til angreb på vores elskede dyr.\" Hendes triste blik følger den faldende sne. \"Vi bragte alle i fare med vores ubetænksomhed. Jeg forsikrer jer om, at i fremtiden vil vi komme til jer med vores problemer, før vores problemer kommer til jer.\"<br><br>Hun vender sig mod @Baconsaur, der nusser nogle baby-mamutter. \"Vi har taget mad med til jeres dyr som undskyldning for at skræmme dem, og som et symbol på vores tiltro til jer vil vi efterlade nogle af vores kæledyr og ridedyr hos jer. Vi ved, at I alle vil tage jer godt af dem.\"",
     "questStressbeastCompletionChat": "`Det Afskyelige Stressbæst er BESEJRET!`\n\nVi har gjort det! Med et sidste brøl opløses Det Afskyelige Stressbæst i en sky af sne. Snefnuggene glimter på deres vej ned, og glade Habitboer krammer deres kæledyr og ridedyr. Vores dyr og NPCer er igen i sikkerhed!\n\n`Stoiskro er Reddet!`\n\nSabreCat taler blidt til en lille sabeltandstiger. \"Hjælp os med at finde Stoiskros Steppers indbyggere og led dem hen til os,\" siger han. Flere timer senere vender sabeltandstigeren tilbage med en gruppe mammut-ryttere ridende langsomt efter sig. Du genkender deres leder som Madam Gletscha, lederen af Stoiskro.\n\n\"Ærede Habitboer,\" siger hun, \"Mine landsmænd og jeg skylder jer en stor tak, og en stor undskyldning. I et forsøg på at beskytte vores stepper mod uro, begyndte vi i al hemmelighed at sende al vores stress til frostbjergene. Vi havde ikke forestillet os, at det ville ende med at vokse sig til det Stressbæst, I så! Da de slap løs fangede det os alle i bjergene i stedet for det selv, og gik til angreb på vores elskede dyr.\" Hendes triste blik følger den faldende sne. \"Vi bragte alle i fare med vores ubetænksomhed. Jeg forsikrer jer om, at i fremtiden vil vi komme til jer med vores problemer, før vores problemer kommer til jer.\"\n\nHun vender sig mod @Baconsaur, der nusser nogle baby-mamutter. \"Vi har taget mad med til jeres dyr som undskyldning for at skræmme dem, og som et symbol på vores tiltro til jer vil vi efterlade nogle af vores kæledyr og ridedyr hos jer. Vi ved, at I alle vil tage jer godt af dem.\"",
-    "questTRexText": "King of the Dinosaurs",
-    "questTRexNotes": "Now that ancient creatures from the Stoïkalm Steppes are roaming throughout all of Habitica, @Urse has decided to adopt a full-grown Tyrannosaur. What could go wrong?<br><br>Everything.",
-    "questTRexCompletion": "The wild dinosaur finally stops its rampage and settles down to make friends with the giant roosters. @Urse beams down at it. \"They're not such terrible pets, after all! They just need a little discipline. Here, take some Tyrannosaur eggs for yourself.\"",
-    "questTRexBoss": "Flesh Tyrannosaur",
-    "questTRexUndeadText": "The Dinosaur Unearthed",
-    "questTRexUndeadNotes": "As the ancient dinosaurs from the Stoïkalm Steppes roam through Habit City, a cry of terror emanates from the Grand Museum. @Baconsaur shouts, \"The Tyrannosaur skeleton in the museum is stirring! It must have sensed its kin!\" The bony beast bares its teeth and clatters towards you. How can you defeat a creature that is already dead? You'll have to strike fast before it heals itself!",
-    "questTRexUndeadCompletion": "The Tyrannosaur's glowing eyes grow dark, and it settles back onto its familiar pedestal. Everyone sighs with relief. \"Look!\" @Baconsaur says. \"Some of the fossilized eggs are shiny and new! Maybe they'll hatch for you.\"",
-    "questTRexUndeadBoss": "Skeletal Tyrannosaur",
-    "questTRexUndeadRageTitle": "Skeleton Healing",
-    "questTRexUndeadRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Skeletal Tyrannosaur will heal 30% of its remaining health!",
-    "questTRexUndeadRageEffect": "`Skeletal Tyrannosaur uses SKELETON HEALING!`\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!",
-    "questTRexDropTRexEgg": "Tyrannosaur (Egg)"
+    "questTRexText": "Dinosaurernes Konge",
+    "questTRexNotes": "Nu da forhistorieske væsner fra Stoiskros Stepper findes overalt i Habitica, har @Urse besluttet at adoptere en fuldvoksen Tyrannosaurus. Hvad er der galt med det?<br><br>Alting.",
+    "questTRexCompletion": "Den vilde dinosaurus stopper endelig sin hærgen og går i stedet i gang med at blive venner med kæmpehanerne. @Urse kigger hengivent på den. \"Når alt kommer til alt er de faktisk ikke forfærdelige kæledyr! De skal bare opdrages lidt. Her, tag nogle Tyrannosaurus-æg til dig selv.\"",
+    "questTRexBoss": "Kød-Tyrannosaurus",
+    "questTRexUndeadText": "Dinosaur-skelettet",
+    "questTRexUndeadNotes": "Imens de forhistoriske dinosaurer fra Stoiskros Stepper vandrer rundt i Habitby høres pludselig et højlydt frygteligt skrig fra Nationalmuseet. @Baconsaur råber, \"Tyrannosaur-skelettet i museet bevæger sig! Det må have fornemmet sine artsfæller!\" Det benede bæst viser tænder og rasler imod dig. Hvordan kan man bekæmpe noget, der allerede er dødt? Du må slå til hurtigt før den heler sig selv!",
+    "questTRexUndeadCompletion": "Tyrannosaurens lysende øjne bliver mørke, og den falder igen til ro på sin sædvanlige sokkel. Alle ånder lettet op. \"Se!\" siger @Baconsaur. \"Nogle af de forstenede æg er helt nye og fine! Måske kan du udruge dem.\"",
+    "questTRexUndeadBoss": "Skelet-tyrannosaur",
+    "questTRexUndeadRageTitle": "Skelet-heling",
+    "questTRexUndeadRageDescription": "Denne måler fyldes når du ikke færdiggører dine Daglige. Når den er fyldt vil Skelet-tyrannosauren blive helet for 30% af sit resterende Helbred!",
+    "questTRexUndeadRageEffect": "`Skelet-tyrannosaurusen bruger SKELET-HELING!`\n\nMonstret giver et unaturligt brøl, og nogle af dens beskadigede knogler heler op!",
+    "questTRexDropTRexEgg": "Tyrannosaurus (Æg)"
 }

common/locales/da/settings.json

@@ -45,11 +45,11 @@
     "misc": "Diverse",
     "showHeader": "Vis Sidehoved",
     "changePass": "Skift Kodeord",
-    "changeUsername": "Skift Brugernavn",
+    "changeUsername": "Change Login Name",
     "oldPass": "Gammelt Kodeord",
     "newPass": "Nyt Kodeord",
     "confirmPass": "Bekræft Nyt Kodeord",
-    "newUsername": "Nyt Brugernavn",
+    "newUsername": "New Login Name",
     "dangerZone": "Farezone",
     "resetText1": "ADVARSEL! Dette nulstiller mange dele af din konto. Vi fraråder på det kraftigste dette, men nogen finder det brugbart i begyndelsen, efter at have spillet i kort tid.",
     "resetText2": "Du vil miste alle dine niveauer, dit guld og dine erfaringspoint. Alle dine opgaver vil blive slettet permanent og du vil miste alle dine opgavers historiske data. Du vil miste alt dit udstyr, men du kan købe det hele igen, inklusive alle specielle udgaver og abonnenters mystiske varer som du allerede ejer (du skal dog være den korrekte klasse for at købe klassespecifikt udstyr). Du vil beholde din nuværende klasse og dine kæledyr og ridedyr. Du vil måske foretrække at bruge en Genfødselskugle i stedet, hvilket er et meget sikrere valg og vil lade dig beholde dine opgaver.",
@@ -68,7 +68,16 @@
     "enterNumber": "Indtast venligst et tal mellem 0 og 24",
     "fillAll": "Udfyld venligst alle felter",
     "passSuccess": "Dit kodeord er nu ændret",
-    "usernameSuccess": "Dit brugernavn er nu ændret",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Data",
-    "exportData": "Eksportér Data"
+    "exportData": "Eksportér Data",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/da/tasks.json

@@ -36,8 +36,10 @@
     "todos": "Gøremål",
     "newTodo": "Nyt Gøremål",
     "dueDate": "Forfaldsdato",
-    "remaining": "Resterende",
-    "complete": "Færdiggjorte",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Forfalden",
     "grey": "Grå",
     "rewards": "Belønninger",

common/locales/de/character.json

@@ -129,5 +129,8 @@
     "youCast": "Du verwendest <%= spell %>.",
     "youCastTarget": "Du wendest <%= spell %> auf <%= target %> an.",
     "youCastParty": "Du wendest <%= spell %> für Deine Gruppe.",
-    "critBonus": "Kritischer Treffer! Bonus:"
+    "critBonus": "Kritischer Treffer! Bonus:",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/de/content.json

@@ -47,8 +47,8 @@
     "questEggOwlAdjective": "weise",
     "questEggPenguinText": "Pinguin",
     "questEggPenguinAdjective": "scharfsinning",
-    "questEggTRexText": "Tyrannosaur",
-    "questEggTRexAdjective": "tiny-armed",
+    "questEggTRexText": "Tyrannosaurus",
+    "questEggTRexAdjective": "kleinarmig",
     "eggNotes": "Übergieße dieses Ei mit einem Schlüpftrank und ein  <%= eggAdjective() %> <%= eggText() %> wird schlüpfen.",
     "hatchingPotionBase": "Normaler",
     "hatchingPotionWhite": "Weißer",

common/locales/de/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "Wenn das <strong>fünfte</strong> Bündel deiner Beiträge angenommen wurde, kannst du den <strong>Kristallschild</strong> im Belohnungs-Shop kaufen. Als Belohnung deiner fortwährenden Arbeit erhälst du außerdem <strong>4 Edelsteine</strong>.",
     "championSixth": "Wenn das <strong>sechste</strong> Bündel deiner Beiträge angenommen wurde, erhälst du ein <strong>Hydra Haustier</strong>. Außerdem erhälst du <strong>4 Edelsteine</strong>.",
     "legendary": "Legendär",
-    "legSeventh": "Wenn das <strong>siebte</strong> Bündel deiner Beiträge angenommen wurde, erhälst du ein <strong>4 Edelsteine</strong> und wirst Mitglied der ehrwürdigen Mitwirkende(r) Gilde und bekommst einen Blick hinter die Kulissen von HabitRPG! Weitere Mitwirkungen erhöhen zwar deine Stufe nicht, aber du kannst zusätzliche Edelsteine und Titel erhalten.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Moderator",
     "guardian": "Wächter",
-    "guardianText": "Moderatoren wurden sorgfältig aus besonders fleißigen Mitwirkenden ausgewählt. Respektiere sie und höre dir ihre Vorschläge an. ",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Mitarbeiter",
     "heroic": "Heroisch",
-    "heroicText": "Das heroische Level ist HabitRPG Mitarbeitern und Mitwirkenden auf dem selben Niveau vorbehalten. Wenn Du diesen Titel hast, wurdest Du dazu ernannt (oder angestellt!).",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "NPCs haben HabitRPG über Kickstarter mitfinanziert. Du kannst ihre Avatare sehen, wie sie über die Features des Spiels wachen.",
     "modalContribAchievement": "Erfolg als Mitwirkender!",
-    "contribModal": "<%= name %>, Du bist großartig! Du bist jetzt ein Level <%= level %> Mitwirkender für Deinen Beitrag auf HabitRPG. Folgende",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "Preise hast Du für Deinen Beitrag verdient!",
     "contribName": "Mitwirkender",
     "contribText": "Hat zu HabitRPG beigetragen (Code, Design, Pixel Art, Rechtsrat, Dokumentationen, etc.). Willst Du dieses Abzeichen auch haben?",
@@ -42,7 +42,7 @@
     "moreDetails2": "mehr Details (8-9)",
     "contributions": "Beiträge",
     "admin": "Admin",
-    "notGems": "bedeutet USD($), <em>nicht</em> Edelsteine. Ergo, wenn diese Nummer 1 ist, bedeutet das 4 Edelsteine. Verwende diese Option nur dann, wenn Du Spielern Edelsteine verleihen möchtest, verwende sie nicht, wenn Du Mitwirkender-Levels verteilst. Mitwirkende-Level verleihen automatisch 2 Edelsteine/Level.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Werbung abschalten",
     "gamemaster": "Spielleiter (Mitarbeiter/Moderator)",
     "backerTier": "Träger Stufe",

common/locales/de/generic.json

@@ -86,6 +86,6 @@
     "November": "November",
     "December": "Dezember",
     "dateFormat": "Datumsformat",
-    "achievementStressbeast": "Savior of Stoïkalm",
-    "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2015 Winter Wonderland Event!"
+    "achievementStressbeast": "Retter von Stoïkalm",
+    "achievementStressbeastText": "Hat beim 2015 Winter Wunderland Event dabei geholfen, das Schreckliche Stressbiest zu besiegen!"
 }

common/locales/de/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Nach Beitrittsdatum sortieren",
     "sortName": "Nach Avatarname sortieren",
     "sortBackgrounds": "Nach Hintergrund sortieren",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "Gilde für 4 Edelsteine gründen?",
     "leaveGroupCha": "Gildenwettbewerbe verlassen und...",
     "confirm": "Bestätigen",

common/locales/de/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "Soll ich Dir Dein Ross bringen, <%= name %>? Klicke auf ein Reittier um aufzusteigen.",
     "mattBochText1": "Wilkommen in den Ställen! Ich bin Matt, der Meister aller Bestien. Wähle hier ein Haustier aus damit es Dir treu zur Seite steht. Füttere sie und sie werden zu mächtigen Rössern heranwachsen.",
-    "mattBochText2": "Schau doch nur",
-    "mattBochText3": "wie viele Haustiere Du sammeln kannst.",
     "daniel": "Daniel",
     "danielText": "Wilkommen im Gasthaus! Bleib ein bisschen und lerne die Einheimischen kennen. Wenn Du Dich ausruhen musst (Urlaub? Krankheit?), werde ich Dir ein Zimmer suchen. Während Du eingecheckt bist, bleiben deine täglichen Aufgaben so eingefrogen wie sie sind (abgehakt/nicht abgehakt) bis einen Tag nachdem du das Gasthaus wieder verlassen hast. Diese Aufgaben fügen Dir keinen Schaden zu, wenn du sie am Ende des Tages nicht abhakst.",
     "danielText2": "Vorsicht: Wenn Du an einer Boss-Quest teilnimmst, wird der Boss Dir weiterhin Schaden für die verpassten täglichen Aufgaben Deiner Gruppenmitglieder zufügen! ",
@@ -17,17 +15,17 @@
     "USD": "USD ($)",
     "newStuff": "Neuigkeiten",
     "cool": "Erzähl es mir später",
-    "dismissAlert": "Diese Nachricht ausblenden",
+    "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.",
     "donationDesc": "20 Edelsteine, Spende an die Entwickler",
-    "payWithCard": "Mit Kreditkarte zahlen",
+    "payWithCard": "Mit Kreditkarte bezahlen",
     "payNote": "Achtung: PayPal braucht manchmal viel Zeit. Wir empfehlen, eine Kreditkarte zu benutzen",
     "card": "Kreditkarte",
     "paymentMethods": "Zahlungsarten:",
     "welcomeHabit": "Wilkommen zu HabitRPG",
-    "welcomeHabitT1": "Welcome to HabitRPG, a habit tracker that treats your tasks like a Role Playing Game. I'm",
+    "welcomeHabitT1": "Willkommen zu HabitRPG, einem Gewohnheits-Tracker, der Deine Ziele und Aufgaben wie ein Rollenspiel behandelt. Ich bin",
     "welcomeHabitT2": "Dein Fremdenführer!",
     "yourAvatar": "Dein Avatar",
     "yourAvatarText": "Das ist Dein Avatar. Er repräsentiert Dich in der Welt von Habitica. Wenn Du Ziele erreichst, erhält Dein Avatar Level, verdient Gold und rüstet sich für zukünftige Herausforderungen aus.",

common/locales/de/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "Haustiere gefunden",
     "rarePets": "Seltene Haustiere",
     "questPets": "Quest Haustiere",
-    "beastmasterProgress": "\"Meister aller Bestien\" Fortschritt",
     "mounts": "Reittiere",
     "mountsTamed": "Reittiere gezähmt",
     "questMounts": "Quest Reittiere",
@@ -13,7 +12,7 @@
     "cerberusPup": "Zerberuswelpe",
     "hydra": "Hydra",
     "mantisShrimp": "Fangschreckenkrebs",
-    "mammoth": "Wollmammut",
+    "mammoth": "Wollhaarmammut",
     "rarePetPop1": "Klicke auf den goldenen Pfotenabdruch um zu sehen, wie Du diese seltenen Haustiere erhalten kannst indem Du bei HabitRPG mitwirkst!",
     "rarePetPop2": "Wie erhält man dieses Haustier?",
     "potion": "<%= potionType %> Trank",
@@ -27,10 +26,21 @@
     "inventoryText": "Klicke ein Ei um die anwendbaren Tränke grün hervorgehoben zu sehen und klicke auf einen hervorgehobenen Trank um Dein Haustier auszubrüten. Falls kein Trank hervorgehoben wird, klicke auf das Ei um es abzuwählen und klicke diesmal zuerst auf den Trank um die Eier hervorzuheben. Du kannst überflüssige Gegenstände auch an Alexander den Kaufmann verkaufen.",
     "food": "Futter und magische Sättel",
     "noFood": "Du hast im Moment weder Futter noch magische Sättel.",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "Du hast den \"Meister aller Bestien\" Erfolg dafür erhalten, dass Du alle Haustiere gesammelt hast!",
-    "beastMastName": "Meister aller Bestien",
-    "beastMastText": "Hat alle 90 Haustiere gesammelt (unglaublich schwer, dieser Spieler verdient Respekt!)",
-    "beastMastText2": "und hat seine Haustiere <%= count %> mal freigelassen.",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Beutesystem Aktiviert!",
     "itemDrop": "Du hast einen Gegenstand gefunden!",
     "firstDrop": "Du hast das Beute-System freigeschaltet! Wenn Du von jetzt an Aufgaben erfüllst, hast Du eine kleine Chance einen Gegenstand zu finden. Du hast gerade ein <strong><%= eggText %> Ei</strong>! <%= eggNotes %> gefunden",
@@ -41,13 +51,14 @@
     "petName": "<%= potion %> <%= egg %>",
     "mountName": "<%= potion %> <%= mount %>",
     "petKeyName": "Schlüssel zu den Zwingern.",
-    "petKeyPop": "Lässt alle Deine Haustiere frei, um ihr eigenes Abenteuer zu starten und erlaubt Dir den Titel \"Meister aller Bestien\" noch einmal von Anfang an zu verdienen.",
-    "petKeyBegin": "Der Schlüssel zu den Zwingern: Arbeite Dich erneut zum Meister aller Bestien vor.",
-    "petKeyInfo": "Liebe Deine Haustiere genug, um sie ziehen zu lassen und zukünftige Beute wieder wertvoll zu machen.",
-    "petKeyInfo2": "Der Schlüssel zu den Zwingern setzt alle nicht-Quest Haustiere zurück, als ob Du sie nie gefunden hättest. Wenn Du das tust, kannst du den \"Meister aller Bestien\" Erfolg stapeln und damit angeben wie oft Du den Zufall schon besiegt hast.",
-    "petKeyInfo3": "Es gibt zwei Schlüssel: Du kannst entweder alle Haustiere für 4 Edelsteine oder Deine Haus- und Reittiere für 8 Edelsteine befreien. Wenn Du noch nicht alle Reittiere freigeschaltet hast, dann wirst Du mit letzterem wohl noch etwas warten wollen.",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Lass' meine Haustiere frei",
-    "petKeyMounts": "Lass' meine Haus- und Reittiere frei",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Noch nicht.",
     "gemsEach": "Edelsteine jeweils"
 }

common/locales/de/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Zerbrochene Zweige",
     "questEvilSanta2DropBearCubPolarPet": "Eisbär (Haustier)",
     "questGryphonText": "Der Feurige Greif",
-    "questGryphonNotes": "Der große Bestienmeister, <strong>banconsaur</strong>, kommt zu Deiner Gruppe mit einem Ersuchen: \"Bitte, Abenteurer, Ihr müsst mir helfen! Mein preisgekrönter Greif ist ausgebrochen und terrorisiert Habit City! Wenn Ihr sie einfangen könnt, dann werde ich Euch mit einigen Ihrer Eier belohnen!\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Das mächtige Tier schleigt besiegt zu seinem Meister zurück. \"Ich bin beeindruckt! Gut gemacht, Abenteurer!\" ruft <strong>baconsaur</strong>, \"Bitte nehmt ein paar Greifeneier als Dank an. Ich bin sicher, Ihr werdet Euch gut um sie kümmern!\"",
     "questGryphonBoss": "Feuriger Greif",
     "questGryphonDropGryphonEgg": "Greif (Ei)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "Die Mondsteinkette Teil 3: Recidivate Transformiert (Rolle)",
     "questMoonstone3Text": "Recidivate Transformiert",
     "questMoonstone3Notes": "<p>Recidivate fällt zu Boden und Du schlägst mit der Mondsteinkette nach ihr. Zu deinem Entsetzen reißt Recidivate die Steine an sich und ihre Augen leuchten vor Triumph. </p><br/><p>\"Törichte Kreatur des Fleisches!\", schreit sie. \"Es ist wahr, die Mondsteine werden mich wieder in eine körperliche Form zurückversetzen, aber anders, als Du dir vorgestellt hast. Wenn der volle Mond zunimmt, wächst auch meine Macht, und aus den Schatten rufe ich deinen gefürchtetsten Feind hervor!\" </p><br/><p>Ein übler grüner Nebel steigt aus dem Sumpf auf und Recidivate's Körper windet und dreht sich und verzerrt sich in eine Form, die dich mit Schrecken erfüllt - der untote Körper von Vice, wiederauferstanden.</p>",
-    "questMoonstone3Completion": "<p>Du atmest schwer und Schweiß brennt in deinen Augen als der untote Wyrm zusammenbricht. Die Überreste von Recidivate lösen sich in einen dünnen grauen Nebel auf, der sich bald unter dem Angriff einer frischen Brise zerstreut, und in der Ferne hörst du die Angriffsschreie von Habiticanern, die ihre schlechten Gewohnheiten für ein und allemal besiegen.</p><br/><p>@Baconsaur, der Meister aller Bestien, fliegt auf einem Greif herab. \"Ich habe das Ende Deines Kampfes vom Himmel aus beobachtet und es hat mich sehr berührt. Bitte, nimm diese verzauberte Tunika - Deine Tapferkeit zeigt ein edles Herz, und ich glaube, dass Du dazu bestimmt bist, sie zu bekommen.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Nekro-Laster",
     "questMoonstone3DropRottenMeat": "Verrottetes Fleisch (Futter)",
     "questMoonstone3DropZombiePotion": "Zombifizierter Schlüpftrank",
@@ -142,28 +142,29 @@
     "questPenguinCompletion": "Mit der Niederlage des Pinguins beginnt das Eis zu schmelzen. Der riesige Pinguin setzt sich im Sonnenschein auf den Boden und schlürft einen Eimer Fische herunter. Er gleitet über den See und lässt dabei mit einem leichten Pusten nach unten glattes, glitzerndes Eis entstehen. Was für ein komischer Vogel! \"Es scheint so, als hätte er einige Eier hinterlassen,\" sagt  @Painter de Cluster. <br><br>@Rattify lacht. \"Vielleicht werden diese Pinguine ein bisschen... gechillter sein?\"",
     "questPenguinBoss": "Frostpinguin",
     "questPenguinDropPenguinEgg": "Pinguin (Ei)",
-    "questStressbeastText": "Das Schreckliche Stressbiest aus den Stoistillen Steppen",
-    "questStressbeastNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.<br><br>~*~<br><br>The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.<br><br>We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.<br><br>\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"<br><br>\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.<br><br>\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"<br><br>There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...",
+    "questStressbeastText": "Das Schreckliche Stressbiest aus den Stoïstillen Steppen",
+    "questStressbeastNotes": "Erfülle tägliche, sowie einmalige Aufgaben um dem Welt-Bossmonster Schaden zuzufügen! Unerfüllte tägliche Aufgaben füllen die Stressschlag Leiste. Ist die Leiste voll, wird das Welt-Bissmonster einen NPC angreifen. Ein Welt-Bossmonster fügt einzelnen Spielern oder Accounts auf keine Weise Schaden zufügen. Nur die nicht erfüllten täglichen Aufgaben von aktiven Spielern, die sich nicht im Gasthaus ausruhen zählen.<br><br>~*~<br><br>Das erste was wir vernehmen sind die Schritte, langsam und donnernd. Einer nach dem anderen öffnen die Haitianer ihre Haustüren und blicken dem entgegen und die Worte bleiben uns im Halse stecken.<br><br>Wir alle kennen das Stressbiest, natürlich - winzige, fiese Kreaturen, die uns im ungünstigsten Augenblick angreifen. Aber das? Das hier ragt in den Himmel hinauf, höher als die Gebäude, mit Pranken, die ohne Probleme einen Drachen zerschmettern könnten. Frostsplitter regnen aus dem stinkenden Fell herab und sein Gebrüll entfesselt einen eisigen Sturm, der die Dächer von unseren Häusern hebt. Von so einem gewaltigen Monster sprechen nur unsere ältesten Legenden.<br><br>\"Gebt acht, Haitianer!\", ruft SabreCat, \"Barrikadiert euch in euren Häusern - dies ist das schreckliche Stressbiest!\"<br><br>\"Dieses Ding muss Jahrhunderte von Stress in sich tragen!\", sagt Kiwibot, während er die Türen des Gasthauses verrammelt und die Fenster zuschlägt.<br><br>\"Die Stoïstillen Steppen\", meint Lemnos mit grimmigem Gesicht, \"Die ganze Zeit dachten wir sie wären ein friedlicher Ort, aber sie müssen ihren Stress irgendwo versteckt haben. Über Generationen hinweg ist das hier aus ihm geworden, und nun hat es sich befreit und griff sie an - und uns!\"<br><br>Es gibt nur eine Möglichkeit das Stressbiest zu vertreiben, schrecklich oder nicht, und die ist es, es mit erfüllten täglichen und einmaligen Aufgaben anzugreifen! Wir müssen zusammen stehen um gegen diesen furchteinflößenden Feind zu bestehen - geht sicher, dass ihr eure Aufgaben nicht unerfüllt lasst, das könnte das Stressbiest so sehr reizen, dass es vielleicht anfängt um sich zu schlagen...",
     "questStressbeastBoss": "Das schreckliche Stressbiest",
     "questStressbeastBossRageTitle": "Stressschlag",
-    "questStressbeastBossRageDescription": "Wenn sich die Anzeige füllt, entfesselt das Schreckliche Stressbiest seinen Stressschlag auf Habitica!",
+    "questStressbeastBossRageDescription": "Wenn sich diese Anzeige füllt, entfesselt das Schreckliche Stressbiest seinen Stressschlag auf Habitica!",
     "questStressbeastDropMammothPet": "Mammut (Haustier)",
     "questStressbeastDropMammothMount": "Mammut (Reittier)",
-    "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
-    "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
-    "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
-    "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
-    "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
-    "questTRexText": "King of the Dinosaurs",
-    "questTRexNotes": "Now that ancient creatures from the Stoïkalm Steppes are roaming throughout all of Habitica, @Urse has decided to adopt a full-grown Tyrannosaur. What could go wrong?<br><br>Everything.",
-    "questTRexCompletion": "The wild dinosaur finally stops its rampage and settles down to make friends with the giant roosters. @Urse beams down at it. \"They're not such terrible pets, after all! They just need a little discipline. Here, take some Tyrannosaur eggs for yourself.\"",
-    "questTRexBoss": "Flesh Tyrannosaur",
-    "questTRexUndeadText": "The Dinosaur Unearthed",
-    "questTRexUndeadNotes": "As the ancient dinosaurs from the Stoïkalm Steppes roam through Habit City, a cry of terror emanates from the Grand Museum. @Baconsaur shouts, \"The Tyrannosaur skeleton in the museum is stirring! It must have sensed its kin!\" The bony beast bares its teeth and clatters towards you. How can you defeat a creature that is already dead? You'll have to strike fast before it heals itself!",
-    "questTRexUndeadCompletion": "The Tyrannosaur's glowing eyes grow dark, and it settles back onto its familiar pedestal. Everyone sighs with relief. \"Look!\" @Baconsaur says. \"Some of the fossilized eggs are shiny and new! Maybe they'll hatch for you.\"",
-    "questTRexUndeadBoss": "Skeletal Tyrannosaur",
-    "questTRexUndeadRageTitle": "Skeleton Healing",
-    "questTRexUndeadRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Skeletal Tyrannosaur will heal 30% of its remaining health!",
-    "questTRexUndeadRageEffect": "`Skeletal Tyrannosaur uses SKELETON HEALING!`\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!",
-    "questTRexDropTRexEgg": "Tyrannosaur (Egg)"
+    "questStressbeastBossRageStables": "Das Schreckliche Stressbiest benutzt STRESS-SCHLAG!\n\nDas Aufwallen des Stresses heilt das Schreckliche Stressbiest!\n\nOh nein! Trotz unserer größten Anstrengungen sind uns einige tägliche Aufgaben entwischt! Ihre dunkelrote Farbe hat das Schreckliche Stressbiest zornig gemacht und dafür gesorgt, dass es einen Teil seiner Lebenspunkte zurückerhält! Die furchtbare Kreatur will sich auf die Ställe stürzen, aber Matt der Herr aller Bestien wirft sich heldenhaft in den Kampf, um die Haustiere und Reittiere zu schützen. Das Stressbiest schnappt sich Matt und hält ihn in seinen schrecklichen Klauen, aber dadurch ist es zumindest für einen Moment abgelenkt. Schnell! Erledigen wir unsere Täglichen Aufgaben und besiegen wir es, bevor es erneut zuschlägt!",
+    "questStressbeastBossRageBailey": "Das Schreckliche Stressbiest benutzt STRESS-SCHLAG!\n\nDas Aufwallen des Stresses heilt das Schreckliche Stressbiest!\n\nAhh!!! Unsere unerfüllten Täglichen Aufgaben haben dafür gesorgt, dass das Schreckliche Stressbiest wütender denn je ist und einige seiner Lebenspunkten zurückerhalten hat! Bailey die Marktschreierin hatte die Einwohner aufgerufen sich in Sicherheit zu bringen, und nun hält das Biest sie in seiner anderen Hand! Seht nur wie sie tapfer die Neuigkeiten berichtet, während das Stressbiest sie heftig hin und her schleudert... Erweisen wir uns ihrer Tapferkeit als würdig, seien wir so produktiv wie nur möglich und retten wir unsere NPCs!",
+    "questStressbeastBossRageGuide": "Das Schreckliche Stressbiest benutzt STRESS-SCHLAG!\n\nDas Aufwallen des Stresses heilt das Schreckliche Stressbiest!\n\nSchaut! Justin der Stadtführer versucht das Stressbiest abzulenken, indem er um dessen Knöchel herumrennt und dabei hilfreiche Tips für eine bessere Produktivität gibt! Das Schreckliche Stressbiest stampft wütend herum, aber es scheint als würden wir es wirklich niederringen. Ich bezweifele dass es noch einmal genug Energie für einen neuen Schlag hat. Gebt nicht auf... wir sind so nah daran, es zu besiegen!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
+    "questStressbeastCompletion": "<strong>Das schreckliche Stressbiest ist BESIEGT!!</strong><br><br>Wir haben es geschafft! Mit einem letzten Aufheulen löst sich das Schreckliche Stressbiest in eine Wolke aus Schnee auf. Die Flocken schweben sachte zu Boden, während jubelnde Habitianer ihre Haustiere und Reittiere umarmen. Unsere Tiere und unsere NPCs sind gerettet!!<br><br><strong>Stoïstill ist gerettet!</strong><br><br>SabreCat spricht sanft mit einem kleinen Säbelzahntiger. \"Bitte finde die Einwohner der Stoïstillen Steppe und führe sie zu uns\", sagt er. Einige Stunden später kehrt der Säbelzahntiger zurück. Ihm folgt gemächlich eine Herde von Mammutreitern. Du erkennst den Anführer der Reiter. Es ist Lady Glaciate, die Anführerin von Stoïstill.<br><br>\"Tapfere Habitianer\", spricht sie, \"Meine Einwohner und ich sind Euch zu tiefsten Dank verpflichtet und wir müssen uns entschuldigen. Bei dem Versuch unsere Steppen vor Unruhe zu schützen, haben wir heimlich all unseren Stress in die Frostberge verbannt. Wir hatten ja keine Ahnung, dass sich der Stress dort über Generationen sammeln und schließlich zu dem Stressbiest werden würde, dem Ihr begegnet seid! Als es ausbrach, waren wir alle unter den Trümmern seines Gefängnisses in den Bergen gefangen und es begann unsere geliebten Tiere zu jagen.\" Ihr trauriger Blick folgt dem herabrieselndem Schnee. \"Wir haben durch unsere Dummheit alle in Gefahr gebracht. Seid versichert, dass wir in Zukunft mit unseren Problemen zu Euch kommen werden - bevor die Probleme zu Euch kommen.\"<br><br> Sie dreht sich zu @Baconsaur, der mit einigen der Babymammuts kuschelt. \"Wir haben Euren Tieren etwas Leckeres zu essen mitgebracht, um uns für den Schrecken, den wir verursachten, zu entschuldigen und als ein Symbol des Vertrauens werden wir einige unserer Haus- und Reittiere bei Euch lassen. Wir wissen, dass Ihr Euch gut um sie kümmern werdet.\"",
+    "questStressbeastCompletionChat": "'Das schreckliche Stressbiest ist BESIEGT!'\n\nWir haben es geschafft! Mit einem letzten Aufheulen löst sich das Schreckliche Stressbiest in eine Wolke aus Schnee auf. Die Flocken schweben sachte zu Boden, während jubelnde Habitianer ihre Haustiere und Reittiere umarmen. Unsere Tiere und unsere NPCs sind gerettet!!\n\nStoïstill ist gerettet!\n\nSabreCat spricht sanft mit einem kleinen Säbelzahntiger. \"Bitte finde die Einwohner der Stoïstillen Steppe und führe sie zu uns\", sagt er. Einige Stunden später kehrt der Säbelzahntiger zurück. Ihm folgt gemächlich eine Herde von Mammutreitern. Du erkennst den Anführer der Reiter. Es ist Lady Glaciate, die Anführerin von Stoïstill.\n\nTapfere Habitianer\", spricht sie, \"Meine Einwohner und ich sind Euch zu tiefsten Dank verpflichtet und wir müssen uns entschuldigen. Bei dem Versuch unsere Steppen vor Unruhe zu schützen, haben wir heimlich all unseren Stress in die Frostberge verbannt. Wir hatten ja keine Ahnung, dass sich der Stress dort über Generationen sammeln und schließlich zu dem Stressbiest werden würde, dem Ihr begegnet seid! Als es ausbrach, waren wir alle unter den Trümmern seines Gefängnisses in den Bergen gefangen und es begann unsere geliebten Tiere zu jagen.\" Ihr trauriger Blick folgt dem herabrieselndem Schnee. \"Wir haben durch unsere Dummheit alle in Gefahr gebracht. Seid versichert, dass wir in Zukunft mit unseren Problemen zu Euch kommen werden - bevor die Probleme zu Euch kommen.\"\n\nSie dreht sich zu @Baconsaur, der mit einigen der Babymammuts kuschelt. \"Wir haben Euren Tieren etwas Leckeres zu essen mitgebracht, um uns für den Schrecken, den wir verursachten, zu entschuldigen und als ein Symbol des Vertrauens werden wir einige unserer Haus- und Reittiere bei Euch lassen. Wir wissen, dass Ihr Euch gut um sie kümmern werdet.\"",
+    "questTRexText": "König der Dinosaurier",
+    "questTRexNotes": "Jetzt, wo uralte Kreaturen der Stoïkalm Steppen überall in Habitica umherstreifen, hat @Urse beschlossen, einen ausgewachsenen Tyrannosaurus zu adoptieren. Was kann dabei schon schiefgehen? <br><br>Alles.",
+    "questTRexCompletion": "Der wilde Dinosaurier hört endlich zu toben und zu randalieren auf, setzt sich ruhig hin und fängt an sich mit den riesigen Hähnen anzufreunden. @Urse strahlt ihn an. \"Sie sind doch gar keine so schlimmen Haustiere! Sie brauchen einfach nur ein bisschen Disziplin. Hier, nimm dir ein paar Tyrannosaurus-Eier mit!\" ",
+    "questTRexBoss": "Fleischerner Tyrannosaurus",
+    "questTRexUndeadText": "Der Dinosaurier aus den Tiefen der Erde",
+    "questTRexUndeadNotes": "Während die uralten Dinosaurier der Stoïstillen Steppen durch HabitCity wandern, hört man auf ein mal einen angstvollen Schrei aus Richtung des Grand Museums. @Baconsaur ruft: \"Das Tyrannosaurus Skelett im Museum fängt an sich zu bewegen! Es muss die Anwesenheit seiner Artgenossen gewittert haben!\" Das knöcherne Biest bleckt seine monströsen Zähne und klappert auf Dich zu. Wie wirst Du in der Lage sein eine Kreatur zu besiegen, die bereits tot ist? Du wirst schnell zuschlagen müssen, bevor sie sich selbst heilt!",
+    "questTRexUndeadCompletion": "Die glühenden Augen des Tyrannosaurus werden dunkel und trüb und er begibt sich zurück zu seinem Sockel. Alle atmen vor Erleichterung auf. \"Seht nur!\", sagt @Baconsaur, \"einige der Fossilisieneier sind plötzlich wie neu! Vielleicht werden sie ja für dich ausschlüpfen.\"",
+    "questTRexUndeadBoss": "Skelettierter Tyrannosaurus",
+    "questTRexUndeadRageTitle": "Knöcherne Heilung",
+    "questTRexUndeadRageDescription": "Diese Leiste füllt sich, wenn Du deine täglichen Aufgaben nicht erfüllst. Wenn sie voll ist, heilt sich der skelettierte Tyrannosaurus um 30% seiner übrigen Lebenspunkte.",
+    "questTRexUndeadRageEffect": "'Der Skelettierte Tyrannosaurus benutzt KNÖCHERNE HEILUNG!'\n\nDas Monster lässt ein furchtbares Brüllen ertönen und einige seiner gesplitterten Knochen setzen sich wieder zusammen!",
+    "questTRexDropTRexEgg": "Tyrannosaurus (Ei)"
 }

common/locales/de/rebirth.json

@@ -2,7 +2,7 @@
     "rebirthNew": "Wiedergeburt: Ein neues Abenteuer erwartet Dich!",
     "rebirthUnlock": "Du hast die Wiedergeburt freigeschaltet! Dieser besondere Dienst gestattet es Dir ein neues Spiel mit Level 1 zu beginnen, jedoch Deine Aufgaben, Erfolge, Haustiere und mehr zu behalten. Verwende den Gegenstand, um neues Leben in HabitRPG zu bringen wenn Du glaubst Alles erreicht zu haben, oder um neue Feature auf dem Blickwinkel eines neuen Spielers zu erleben!",
     "rebirthBegin": "Wiedergeburt: Beginne ein neues Abenteuer",
-    "rebirthStartOver": "Die Wiedergeburt setzt Deinen Charakter auf Level 1 zurück als ob Du ein neues Konto erstellt hättest.",
+    "rebirthStartOver": "Die Wiedergeburt setzt Deinen Charakter auf Level 1 zurück, als ob Du ein neues Konto erstellt hättest.",
     "rebirthAdvList1": "Du erhältst volle Lebenspunkte.",
     "rebirthAdvList2": "Du hast keine Erfahrung, Gold oder Ausrüstung.",
     "rebirthAdvList3": "Deine Gewohnheiten, täglichen Aufgaben und Aufgaben werden auf Gelb gesetzt und Strähnen starten von vorn.",
@@ -10,8 +10,8 @@
     "rebirthInherit": "Dein neuer Charakter erbt ein paar Dinge von seinem Vorgänger:",
     "rebirthInList1": "Aufgaben, Verlauf und Einstellungen bleiben bestehen.",
     "rebirthInList2": "Wettbewerb-, Gilden- und Gruppenmitgliedschaften bleiben bestehen.",
-    "rebirthInList3": "Edelsteine, Träger-Haustiere, Mitwirkender-Level bleiben bestehen.",
-    "rebirthInList4": "Gegenstände die mit Edelsteinen oder zufällig gefunden wurden bleiben bestehen (Haus- und Reittiere), allerdings kannst Du sie erst anwählen, wenn das Feature wieder freigeschaltet ist.",
+    "rebirthInList3": "Edelsteine, Träger-Stufen, Mitwirkender-Level bleiben bestehen.",
+    "rebirthInList4": "Gegenstände die mit Edelsteinen oder zufällig gefunden wurden bleiben bestehen (wie z.B. Haus- und Reittiere), allerdings kannst Du sie erst anwählen, wenn das Feature wieder freigeschaltet ist.",
     "rebirthInList5": "Limited edition Ausrüstung die Du schon einmal erworben hast, kann wieder erworben werden, auch wenn die Erwerbsfrist abgelaufen ist.",
     "rebirthEarnAchievement": "Du erhältst den Erfolg für das Beginnen eines neuen Abenteuers!",
     "beReborn": "Werde wiedergeboren",
@@ -25,7 +25,7 @@
     "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 kannst zwar weiterhin aufsteigen, aber Du erhältst keine Attributboni mehr und es gibt nichts mehr freizuschalten. So bleibt HabitRPG für alle Spielstile unterhaltsam.",
-    "rebirth100Info": "Wenn Du ein neues Abenteuer beginnen willst, dann kannst du wiedergeboren werden...oder Du kannst austesten wie weit Du noch kommst.",
+    "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 wiedergeboren!"
+    "rebirthNow": "Werde jetzt wiedergeboren!"
 }

common/locales/de/settings.json

@@ -45,11 +45,11 @@
     "misc": "Verschiedenes",
     "showHeader": "Header anzeigen",
     "changePass": "Passwort ändern",
-    "changeUsername": "Benutzername ändern",
+    "changeUsername": "Change Login Name",
     "oldPass": "Altes Passwort",
     "newPass": "Neues Passwort",
     "confirmPass": "Neues Passwort bestätigen",
-    "newUsername": "Neuer Benutzername",
+    "newUsername": "New Login Name",
     "dangerZone": "Gefahrenzone",
     "resetText1": "WARNUNG! Es werden große Teile Deines Accounts zurückgesetzt. Wir raten dringend davon ab. Jedoch finden einige Spieler diese Funktion sinnvoll, um nach einem anfänglichen Testen der Seite neu beginnen zu können.",
     "resetText2": "Du verlierst alle Level, Dein Gold und Erfahrungspunkte. Darüber hinaus werden alle aktuellen und vergangenen Aufgaben gelöscht. Außerdem verlierst Du deine Ausrüstung, die Du Dir jedoch zurück kaufen kannst. Darunter fallen Sonderausrüstungsgegenstände oder Mystery-Gegenstände von Abonnenten (Du musst in der gleichen Klasse sein, um klassenabhängige Gegenstände zurück kaufen zu können). Du behältst deine aktuelle Klasse, deine Haus- und Reittiere. Statt dieser Option empfehlen wir die Kugel der Wiedergeburt zu verwenden, da dadurch alle Deine Aufgaben erhalten bleiben.",
@@ -68,7 +68,16 @@
     "enterNumber": "Bitte gib' eine Zahl zwischen 0 und 24 ein",
     "fillAll": "Bitte fülle alle Felder aus",
     "passSuccess": "Passwort erfolgreich geändert",
-    "usernameSuccess": "Benutzername erfolgreich geändert",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Daten",
-    "exportData": "Daten exportieren"
+    "exportData": "Daten exportieren",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/de/spells.json

@@ -15,7 +15,7 @@
     "spellWarriorValorousPresenceNotes": "Deine Gegenwart ermutigt Deine Gruppe. Dieser Mut lässt euch neue Kraft schöpfen. Alle Gruppenmitglieder erhalten einen Stärkebonus.",
     "spellWarriorIntimidateText": "Einschüchternder Blick",
     "spellWarriorIntimidateNotes": "Dein Blick lässt eure Gegner vor Furcht erstarren. Deine Gruppe erhält einen Verteidigungsbonus.",
-    "spellRoguePickPocketText": "Stehlen",
+    "spellRoguePickPocketText": "Taschendiebstahl",
     "spellRoguePickPocketNotes": "Deine geschickten Finger arbeiten sich durch die Taschen deiner Aufgabe und fördern ein paar Schätze zu Tage. Du erhältst einen sofortigen Goldbonus für die Aufgabe. Je fetter (blauer) deine Aufgabe ist, desto mehr Gold bekommst du.",
     "spellRogueBackStabText": "Überraschungsangriff",
     "spellRogueBackStabNotes": "Lautlos schleichst Du Dich hinter eine Aufgabe und fällst ihr in den Rücken. Du fügst mehr Schaden zu und hast eine hohe Chance auf einen kritischen Treffer.",
@@ -35,8 +35,8 @@
     "spellSpecialSnowballAuraNotes": "Wirf einen Schneeball auf ein Gruppenmitglied! Was kann dabei schon schief gehen? Dauert bis zum Tageswechsel des Gruppenmitglieds an.",
     "spellSpecialSaltText": "Salz",
     "spellSpecialSaltNotes": "Jemand hat Dich mit Schnee eingeseift. Haha, sehr lustig. Jetzt ist aber Schluss!",
-    "spellSpecialSpookDustText": "Spukglitter",
+    "spellSpecialSpookDustText": "Spukglitzer",
     "spellSpecialSpookDustNotes": "Verwandle Deine Freunde in schwebende Bettlaken mit Augen!",
-    "spellSpecialOpaquePotionText": "Trank der Entgeisterung.",
+    "spellSpecialOpaquePotionText": "Trank der Entgeisterung",
     "spellSpecialOpaquePotionNotes": "Beendet den Effekt von Spukglitter"
 }

common/locales/de/subscriber.json

@@ -8,7 +8,7 @@
     "disableAds": "Werbung entfernen",
     "disableAdsText": "Werbung wird entfernt bleiben, solange Du ein aktives Abo hast (ursprüngliche Benutzer mit entfernter Werbung sind von Neuregelungen ausgenommen).",
     "buyGemsGold": "Kaufe Edelsteine mit 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": "(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.",
     "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",

common/locales/de/tasks.json

@@ -36,8 +36,10 @@
     "todos": "Aufgaben",
     "newTodo": "Neue Aufgabe",
     "dueDate": "Frist",
-    "remaining": "Verbleibend",
-    "complete": "Erfüllt",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Fällig",
     "grey": "Grau",
     "rewards": "Belohnungen",

common/locales/en/generic.json

@@ -69,6 +69,7 @@
     "audioTheme": "Audio Theme",
     "audioTheme_off": "Off",
     "audioTheme_danielTheBard": "Daniel The Bard",
+    "audioTheme_wattsTheme": "Watts' Theme",
     "askQuestion": "Ask a Question",
     "reportBug": "Report a Bug",
     "contributeToHRPG": "Contribute to HabitRPG",

common/locales/en@pirate/backgrounds.json

@@ -39,7 +39,7 @@
     "backgroundHarvestFeastText": "Harvest Feast",
     "backgroundHarvestFeastNotes": "Enjoy a Harvest Feast.",
     "backgroundStarrySkiesText": "Starry Skies",
-    "backgroundStarrySkiesNotes": "Gaze at the Starry Skies.",
+    "backgroundStarrySkiesNotes": "Gaze at the Starrrry Skies.",
     "backgroundSunsetMeadowText": "Sunset Meadow",
     "backgroundSunsetMeadowNotes": "Admire a Sunset Meadow.",
     "backgrounds122014": "SET 7: Released December 2014",

common/locales/en@pirate/challenge.json

@@ -4,11 +4,11 @@
     "brokenTask": "Broken Challenge Link: 'tis task was part 'o a challenge, but has be removed from it. What would ye like to do?",
     "keepIt": "Keep It",
     "removeIt": "Remove It",
-    "brokenChallenge": "Broken Challenge Link: 'tis task was part 'o a challenge, but th' challenge (or group) has be deleted. What to do wit' th' orphan tasks?",
+    "brokenChallenge": "Broken Challenge Link: Ye task was part 'o a challenge, but th' challenge (or group) has be deleted. What to do wit' th' orphan tasks?",
     "keepThem": "Keep Them",
     "removeThem": "Remove Them",
-    "challengeCompleted": "'tis challenge has be completed, 'n th' winner was <span class=\"badge\"><%= user %></span>! What to do wit' th' orphan tasks?",
-    "unsubChallenge": "Broken Challenge Link: 'tis task was part 'o a challenge, but ye have unsubscribed from t' challenge. What to do wit' t' orphan tasks?",
+    "challengeCompleted": "Ye challenge has be completed, 'n th' winner was <span class=\"badge\"><%= user %></span>! What to do wit' th' orphan tasks?",
+    "unsubChallenge": "Broken Challenge Link: Ye task was part 'o a challenge, but ye have unsubscribed from t' challenge. What to do wit' t' orphan tasks?",
     "challengeWinner": "Was t' victor in t' followin' challenges",
     "challenges": "Challenges",
     "noChallenges": "No challenges yet, visit",
@@ -16,7 +16,7 @@
     "selectWinner": "Select a winner an' close th' challenge:",
     "deleteOrSelect": "Delete or select winner",
     "endChallenge": "End Challenge",
-    "challengeDiscription": "These be t' challenge's tasks. As users participate, they gunna change color 'n gain graphs to show ye t' overall progress 'o t' group.",
+    "challengeDiscription": "These be t' challenge's tasks. As users participate, they gunna change color 'n gain graphs t' show ye t' overall progress 'o t' group.",
     "hows": "How's Everyone Doing?",
     "filter": "Filter",
     "groups": "Groups",

common/locales/en@pirate/character.json

@@ -23,7 +23,7 @@
     "specialShirts": "Special Shirts",
     "bodyHead": "Hairstyles 'n Hair Colors",
     "bodySkin": "Skin",
-    "color": "Colour",
+    "color": "Color",
     "bodyHair": "Locks",
     "hairBangs": "Bangs",
     "hairBase": "Base",
@@ -36,7 +36,7 @@
     "rainbowSkins": "Rainbow Skins",
     "spookySkins": "Skins o' Hauntin'",
     "supernaturalSkins": "Supernatural Skins",
-    "rainbowColors": "Rainbow Colours",
+    "rainbowColors": "Rainbow Colors",
     "hauntedColors": "Haunted Colors",
     "winteryColors": "Wintery Colors",
     "equipment": "Slops",
@@ -129,5 +129,8 @@
     "youCast": "Ye cast <%= spell %>.",
     "youCastTarget": "Ye cast <%= spell %> on <%= target %>.",
     "youCastParty": "You cast <%= spell %> for the crew.",
-    "critBonus": "Critical Hit! Bonus:"
+    "critBonus": "Critical Hit! Bonus:",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/en@pirate/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "When your <strong>fifth</strong> set of submissions is deployed, the <strong>Crystal Shield</strong> will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive <strong>4 Gems</strong>.",
     "championSixth": "When your <strong>sixth</strong> set of submissions is deployed, you will receive a <strong>Hydra Pet</strong>. You will also receive <strong>4 Gems</strong>.",
     "legendary": "Captain",
-    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your level, but you may continue to earn Gem bounties and titles.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Seadog",
     "guardian": "Flibustier",
-    "guardianText": "Moderators were selected carefully from high level contributors, so please give them your respect and listen to their suggestions.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Privateer",
     "heroic": "Fleet Captain",
-    "heroicText": "Th' Captain level contains HabitRPG privateers 'n privateer-level contributors. If ye have 'tis title, ye were appointed to it (or hired!).",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "NPCs backed HabitRPG's Kickstarter at th' highest rank. ye can find their avatarrs watchin' over site features!",
     "modalContribAchievement": "Contributor Achievement!",
-    "contribModal": "<%= name %> ye person full o' awe! ye're now a level <%= level %> contributor fer helpin' HabitRPG. spy wit' ye eye",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "what treasure ya earned fer yer contribution!",
     "contribName": "Contributor",
     "contribText": "Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want 'tis medal?",
@@ -42,9 +42,9 @@
     "moreDetails2": "more details (8-9)",
     "contributions": "Contributions",
     "admin": "Admin",
-    "notGems": "be in USD, <em>not</em> in Gems. Aka, if 'tis number be 1, it means 4 gems. Only use 'tis option when manually grantin' gems to players, don't use it when grantin' contributor levels. Contrib levels gunna automatically add 2G/lvl.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Hide Ads",
-    "gamemaster": "Game Master (staff/moderator)",
+    "gamemaster": "Quarter Master (staff/seadog)",
     "backerTier": "Backer Rank",
     "balance": "Balance",
     "tierPop": "Click rank labels fer details.",

common/locales/en@pirate/front.json

@@ -45,7 +45,7 @@
     "passMan": "In case ye be usin' a passcode manager (like 1Password) 'n have problems loggin' in, give a go' typin' piratename 'n passcode manually.",
     "forgotPass": "Lost me Passcode",
     "emailNewPass": "Email New Passcode",
-    "invalidEmail": "A valid email address is required in order to perform a password reset.",
+    "invalidEmail": "Arr, we need yer email before we can resent yer password, matey!",
     "email": "Email",
     "passConfirm": "Confirm Passcode",
     "accept1Terms": "By clicking th' button below, I agree to th'",

common/locales/en@pirate/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Sort by date joined th' crew",
     "sortName": "Sort by avatarr name",
     "sortBackgrounds": "Sort by background",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "Create Crew fer 4 Pieces of Booty?",
     "leaveGroupCha": "Leave Alliance challenges 'n...",
     "confirm": "Confirm",

common/locales/en@pirate/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "Shall I bring ye yer steed, <%= name %>? Click a mount t' saddle up.",
     "mattBochText1": "Welcome to th' Stable! I be Matt, th' beast master. Choose a pet here to venture at ye side. Feed them 'n they'll grow into powerful steeds.",
-    "mattBochText2": "Have a look-see",
-    "mattBochText3": "at all th' pets ye can collect.",
     "daniel": "Daniel",
     "danielText": "Welcome to th' Pub! Stay a while 'n meet th' locals. If ye need to rest (vacation? illness?), I'll set ye up in the Quarters. While checked-in, ye Dailies be frozen as-be (checked/unchecked) 'til th' day after check-out. ye gunna not suffer fer missin' them at th' day's end.",
     "danielText2": "Ahoy! If ye be participatin' in a boss quest, th' boss gunna still damage ye fer ye crew mates' missed Dailies!",

common/locales/en@pirate/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "Pets Found",
     "rarePets": "Rare Pets",
     "questPets": "Quest Pets",
-    "beastmasterProgress": "Beastmaster Progress",
     "mounts": "Mounts",
     "mountsTamed": "Mounts Tamed",
     "questMounts": "Quest Mounts",
@@ -27,10 +26,21 @@
     "inventoryText": "Click an egg to spy wit' ye eye usable potions highlighted in green 'n then click one 'o th' highlighted potions to hatch ye pet. If no potions be highlighted, click that egg again to deselect it, 'n instead click a potion first to have th' usable eggs highlighted. ye can also sell unwanted loot to Alexander th' Sutler.",
     "food": "Food and Saddles",
     "noFood": "Ye don't 'ave any food er saddles.",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "Ye 'ave earned th' \"Beast Master\" Achievement fer collectin' all the pets!",
-    "beastMastName": "Beast Master",
-    "beastMastText": "Has found all 90 pets (insanely difficult, congratulate 'tis user!)",
-    "beastMastText2": "'n has released their pets a total 'o <%= count %> times",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Loot Enabled!",
     "itemDrop": "An item 'as been looted!",
     "firstDrop": "Ye've unlocked th' Loot System! Now when ye complete tasks, ye have a small chance 'o findin' an item. ye just found a <strong><%= eggText %> Egg</strong>! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= potion %> <%= egg %>",
     "mountName": "<%= potion %> <%= mount %>",
     "petKeyName": "Key to th' Kennels",
-    "petKeyPop": "Let ye pets roam free, release them to start their own adventure, 'n gift yourself th' thrill 'o Beastmaster once more!",
-    "petKeyBegin": "Key to th' Kennels: Experience Beastmaster Once More!",
-    "petKeyInfo": "Love ye pets that be all I can take to let them be off, 'n have loot feel meanin'ful again.",
-    "petKeyInfo2": "Th' Key to th' Kennels resets all 'o ye non-quest pets back to as if ye'd never found them. Once ye've used it, ye'll be able to stack th' Beastmaster achievement, showin' off how many times ye've be able to best th' RNG.",
-    "petKeyInfo3": "Thar be a pair 'o Keys: ye can either just release ye pets fer four gems or ye pets 'n mounts fer eight gems. If ye're still workin' towards gettin' all 'o th' mounts, ye may not want to give them their freedom yet!",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Release Me Pets",
-    "petKeyMounts": "Release Both",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Not Yet",
     "gemsEach": "gems each"
 }

common/locales/en@pirate/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Broken Twigs",
     "questEvilSanta2DropBearCubPolarPet": "Polar Bear (Pet)",
     "questGryphonText": "Th' Fiery Gryphon",
-    "questGryphonNotes": "Th' grand beastmaster, <strong>baconsaur</strong>, has come to ye crew seekin' help. \"Please, adventurers, ye must help me! me prized gryphon has broken free 'n be terrorizin' Habit City! If ye can stop her, I could reward ye wit' some 'o her eggs!\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Defeated, the mighty beast ashamedly slinks back to its master. \"My word! Well done, adventurers!\" <strong>baconsaur</strong> exclaims, \"Please, have some of the gryphon's eggs. I am sure you will raise these young ones well!\"",
     "questGryphonBoss": "Fiery Gryphon",
     "questGryphonDropGryphonEgg": "Gryphon (Egg)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "Th' Moonstone Chain Part 3: Recidivate Transformed (Scroll)",
     "questMoonstone3Text": "Recidivate Transformed",
     "questMoonstone3Notes": "<p>Recidivate crumples to th' ground, 'n ye strike at her wit' th' moonstone chain. To ye horror, Recidivate seizes th' gems, eyes burnin' wit' triumph.</p><br/><p>\"Foolish creature 'o flesh!\" she shouts. \"These moonstones gunna restore me to a physical form, true, but not as ye imagined. As th' full moon waxes from th' dark, so too does me power flourish, 'n from th' shadows I summon th' specter 'o ye most feared foe!\"</p><br/><p>A sickly green fog rises from th' swamp, 'n Recidivate's body writhes 'n contorts into a shape that fills ye wit' dread – th' undead body 'o Vice, horribly reborn.</p>",
-    "questMoonstone3Completion": "<p>ye breath comes harrrd 'n sweat stin's ye eyes as th' undead Wyrm collapses. th' remains 'o Recidivate dissipate into a thin grey mist that clears quickly under th' onslaught 'o a refreshin' breeze, 'n ye hear th' distant, rallyin' cries 'o Habiticans defeatin' their Bad Habits fer once 'n fer all.</p><br/><p>@Baconsaur th' beastmaster swoops below on a gryphon. \"I saw th' end 'o ye battle from th' sky, 'n I was greatly moved. Please, take 'tis enchanted tunic – ye bravery speaks 'o a noble heart, 'n I believe ye were meant to have it.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Necro-Vice",
     "questMoonstone3DropRottenMeat": "Rotten Meat (Food)",
     "questMoonstone3DropZombiePotion": "Zombie Hatchin' Potion",
@@ -152,6 +152,7 @@
     "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
     "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
     "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questTRexText": "King of the Dinosaurs",

common/locales/en@pirate/settings.json

@@ -45,11 +45,11 @@
     "misc": "Misc",
     "showHeader": "Show Header",
     "changePass": "Change Passcode",
-    "changeUsername": "Change Moniker",
+    "changeUsername": "Change Login Name",
     "oldPass": "Old Passcode",
     "newPass": "New Passcode",
     "confirmPass": "Confirm yer New Passcode",
-    "newUsername": "New Moniker",
+    "newUsername": "New Login Name",
     "dangerZone": "Danger Zone",
     "resetText1": "AHOY! 'tis resets many parts 'o ye account. 'tis be highly discouraged, but some people find it useful in th' beginnin' after playin' wit' th' site fer a short time.",
     "resetText2": "Ye gunna lose all ye levels, doubloons, 'n experience points. All ye tasks gunna be deleted permanently 'n ye gunna lose all 'o ye task's historical data. ye gunna lose all ye equipment but ye gunna be able to buy it all back, includin' all limited edition equipment or subscriber Mystery items that ye already own (ye gunna need to be in th' correct class to re-buy class-specific gear). ye gunna keep ye current class 'n ye pets 'n mounts. ye might prefer to use an Orb 'o Rebirth instead, which be a much safer option 'n which will preserve ye tasks.",
@@ -68,7 +68,16 @@
     "enterNumber": "Please enter a number 'tween 0 an' 24",
     "fillAll": "Please fill out all fields",
     "passSuccess": "Passcode successfully changed",
-    "usernameSuccess": "Moniker successfully changed",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Data",
-    "exportData": "Export Data"
+    "exportData": "Export Data",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/en@pirate/tasks.json

@@ -36,8 +36,10 @@
     "todos": "To-Dos",
     "newTodo": "New To-Do",
     "dueDate": "Due Date",
-    "remaining": "Remaining",
-    "complete": "Complete",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Due",
     "grey": "Grey",
     "rewards": "Loot",

common/locales/en_GB/character.json

@@ -129,5 +129,8 @@
     "youCast": "You cast <%= spell %>.",
     "youCastTarget": "You cast <%= spell %> on <%= target %>.",
     "youCastParty": "You cast <%= spell %> for the party.",
-    "critBonus": "Critical Hit! Bonus:"
+    "critBonus": "Critical Hit! Bonus:",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/en_GB/communityguidelines.json

@@ -24,7 +24,7 @@
     "commGuidePara011b": "on GitHub/Wikia",
     "commGuidePara011c": "on Wikia",
     "commGuidePara012": "If you have an issue or concern about a particular Mod, please send an email to Lemoness (<a href=\"mailto:leslie@habitrpg.com\">leslie@habitrpg.com</a>).",
-    "commGuidePara013": "In a community as big as Habitica, users come and go, and sometimes a moderator needs to lay down their noble mantle and relax. The following are Moderators Emeritus. They no longer act with the power of a Moderator, but we would still like to honor their work!",
+    "commGuidePara013": "In a community as big as Habitica, users come and go, and sometimes a moderator needs to lay down their noble mantle and relax. The following are Moderators Emeritus. They no longer act with the power of a Moderator, but we would still like to honour their work!",
     "commGuidePara014": "Moderators Emeritus:",
     "commGuideHeadingPublicSpaces": "Public Spaces In Habitica",
     "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds and party chat.",
@@ -104,7 +104,7 @@
     "commGuidePara056": "Minor Infractions, while discouraged, still have minor consequences. If they continue to occur, they can lead to more severe consequences over time.",
     "commGuidePara057": "The following are some examples of Minor Infractions. This is not a comprehensive list.",
     "commGuideList07A": "First-time violation of Public Space Guidelines",
-    "commGuideList07B": "Any statements or actions that trigger a \"Please Don't\". When a Mod has to say \"Please Don't do this\" to a user, it can count as a very minor infraction for that user. An example might be \"Mod Talk: Please Don't keep arguing in favor of this feature idea after we've told you several times that it isn't feasible.\" In many cases, the Please Don't will be the minor consequence as well, but if Mods have to say \"Please Don't\" to the same user enough times, the triggering Minor Infractions will start to count as Moderate Infractions.",
+    "commGuideList07B": "Any statements or actions that trigger a \"Please Don't\". When a Mod has to say \"Please Don't do this\" to a user, it can count as a very minor infraction for that user. An example might be \"Mod Talk: Please Don't keep arguing in favour of this feature idea after we've told you several times that it isn't feasible.\" In many cases, the Please Don't will be the minor consequence as well, but if Mods have to say \"Please Don't\" to the same user enough times, the triggering Minor Infractions will start to count as Moderate Infractions.",
     "commGuideHeadingConsequences": "Consequences",
     "commGuidePara058": "In Habitica -- as in real life -- every action has a consequence, whether it is getting fit because you've been running, getting cavities because you've been eating too much sugar, or passing a class because you've been studying.",
     "commGuidePara059": "<strong>Similarly, all infractions have direct consequences.</strong> Some sample consequences are outlined below.",

common/locales/en_GB/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "When your <strong>fifth</strong> set of submissions is deployed, the <strong>Crystal Shield</strong> will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive <strong>4 Gems</strong>.",
     "championSixth": "When your <strong>sixth</strong> set of submissions is deployed, you will receive a <strong>Hydra Pet</strong>. You will also receive <strong>4 Gems</strong>.",
     "legendary": "Legendary",
-    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honoured Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your level, but you may continue to earn Gem bounties and titles.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Moderator",
     "guardian": "Guardian",
-    "guardianText": "Moderators were selected carefully from high level contributors, so please give them your respect and listen to their suggestions.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Staff",
     "heroic": "Heroic",
-    "heroicText": "The Heroic level contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "NPCs backed HabitRPG's Kickstarter at the highest tier. You can find their avatars watching over site features!",
     "modalContribAchievement": "Contributor Achievement!",
-    "contribModal": "<%= name %>, you awesome person! You're now a level <%= level %> contributor for helping HabitRPG. See",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "what prizes you've earned for your contribution!",
     "contribName": "Contributor",
     "contribText": "Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge?",
@@ -42,7 +42,7 @@
     "moreDetails2": "more details (8-9)",
     "contributions": "Contributions",
     "admin": "Admin",
-    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor levels. Contrib levels will automatically add 2G/lvl.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Hide Ads",
     "gamemaster": "Game Master (staff/moderator)",
     "backerTier": "Backer Tier",

common/locales/en_GB/gear.json

@@ -109,10 +109,10 @@
     "weaponSpecialWinter2015HealerText": "Soothing Scepter",
     "weaponSpecialWinter2015HealerNotes": "This scepter warms sore muscles and soothes away stress. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.",
     "weaponMystery201411Text": "Pitchfork of Feasting",
-    "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
+    "weaponMystery201411Notes": "Stab your enemies or dig in to your favourite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
     "weaponMystery301404Text": "Steampunk Cane",
     "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
-    "armor": "armor",
+    "armor": "armour",
     "armorBase0Text": "Plain Clothing",
     "armorBase0Notes": "Ordinary clothing. Confers no benefit.",
     "armorWarrior1Text": "Leather Armour",
@@ -170,9 +170,9 @@
     "armorSpecialSnowflakeText": "Snowflake Robe",
     "armorSpecialSnowflakeNotes": "A robe to keep you warm, even in a blizzard. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
     "armorSpecialBirthdayText": "Absurd Party Robes",
-    "armorSpecialBirthdayNotes": "As part of the festivities, Absurd Party Robes are available free of charge in the Item Store! Swath yourself in those silly garbs and don your matching hats to celebrate this momentous day. Confers no benefit.",
+    "armorSpecialBirthdayNotes": "As part of the festivities, Absurd Party Robes are available free of charge in the Item Shop! Swath yourself in those silly garbs and don your matching hats to celebrate this momentous day. Confers no benefit.",
     "armorSpecialGaymerxText": "Rainbow Warrior Armour",
-    "armorSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special armor 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.",
+    "armorSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special armour 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.",
     "armorSpecialSpringRogueText": "Sleek Cat Suit",
     "armorSpecialSpringRogueNotes": "Impeccably groomed. Increases Perception by <%= per %>. Limited Edition 2014 Spring Gear.",
     "armorSpecialSpringWarriorText": "Clover-steel Armour",
@@ -197,9 +197,9 @@
     "armorSpecialFallMageNotes": "This robe has plenty of pockets to hold extra helpings of eye of newt and tongue of frog. Increases Intelligence by <%= int %>. Limited Edition 2014 Autumn Gear.",
     "armorSpecialFallHealerText": "Gauzy Gear",
     "armorSpecialFallHealerNotes": "Charge into battle pre-bandaged! Increases Constitution by <%= con %>. Limited Edition 2014 Autumn Gear.",
-    "armorSpecialWinter2015RogueText": "Icicle Drake Armor",
-    "armorSpecialWinter2015RogueNotes": "This armor is freezing cold, but it will definitely be worth it when you uncover the untold riches at the center of the Icicle Drake hives. Not that you are looking for any such untold riches, because you are truly, definitely, absolutely a genuine Icicle Drake, okay?! Stop asking questions! Increases Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.",
-    "armorSpecialWinter2015WarriorText": "Gingerbread Armor",
+    "armorSpecialWinter2015RogueText": "Icicle Drake Armour",
+    "armorSpecialWinter2015RogueNotes": "This armour is freezing cold, but it will definitely be worth it when you uncover the untold riches at the center of the Icicle Drake hives. Not that you are looking for any such untold riches, because you are truly, definitely, absolutely a genuine Icicle Drake, okay?! Stop asking questions! Increases Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.",
+    "armorSpecialWinter2015WarriorText": "Gingerbread Armour",
     "armorSpecialWinter2015WarriorNotes": "Cozy and warm, straight from the oven! Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
     "armorSpecialWinter2015MageText": "Boreal Robe",
     "armorSpecialWinter2015MageNotes": "You can see the glimmering lights of the north in this robe. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.",
@@ -208,7 +208,7 @@
     "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",
-    "armorMystery201403Notes": "This mossy armor of woven wood bends with the movement of the wearer. Confers no benefit. March 2014 Subscriber Item.",
+    "armorMystery201403Notes": "This mossy armour of woven wood bends with the movement of the wearer. Confers no benefit. March 2014 Subscriber Item.",
     "armorMystery201405Text": "Flame of Heart",
     "armorMystery201405Notes": "Nothing can hurt you when you are swathed in flames! Confers no benefit. May 2014 Subscriber Item.",
     "armorMystery201406Text": "Octopus Robe",
@@ -319,7 +319,7 @@
     "headSpecialWinter2015HealerText": "Snuggly Earmuffs",
     "headSpecialWinter2015HealerNotes": "These warm earmuffs keep out chills and distracting noises. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter 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.",
+    "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",
     "headMystery201402Notes": "This winged circlet imbues the wearer with the speed of the wind! Confers no benefit. February 2014 Subscriber Item.",
     "headMystery201405Text": "Flame of Mind",
@@ -436,7 +436,7 @@
     "headAccessoryMystery201404Text": "Twilight Butterfly Antennae",
     "headAccessoryMystery201404Notes": "These antennae help the wearer sense dangerous distractions! Confers no benefit. April 2014 Subscriber Item.",
     "headAccessoryMystery201409Text": "Autumn Antlers",
-    "headAccessoryMystery201409Notes": "These powerful antlers change colors with the leaves. Confers no benefit. September 2014 Subscriber Item.",
+    "headAccessoryMystery201409Notes": "These powerful antlers change colours with the leaves. Confers no benefit. September 2014 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.",
     "eyewearBase0Text": "No Eyewear",

common/locales/en_GB/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Sort by date joined the party",
     "sortName": "Sort by avatar name",
     "sortBackgrounds": "Sort by background",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "Create Guild for 4 Gems?",
     "leaveGroupCha": "Leave Guild challenges and...",
     "confirm": "Confirm",

common/locales/en_GB/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "Shall I bring you your steed, <%= name %>? Click a mount to saddle up.",
     "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. Feed them and they'll grow into powerful steeds.",
-    "mattBochText2": "Have a look-see",
-    "mattBochText3": "at all the pets you can collect.",
     "daniel": "Daniel",
     "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the inn. While checked-in, your dailies are frozen as-is (checked/unchecked) until the day after check-out. You will not suffer for missing them at the day's end.",
     "danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed dailies!",
@@ -57,7 +55,7 @@
     "partySysText": "Be social, join a party and play Habit with your friends! You'll be better at your habits with accountability partners. Click User -> Options -> Party, and follow the instructions. LFG anyone?",
     "classGear": "Class Gear",
     "classGearText": "First: don't panic! Your old gear is in your inventory, and you're now wearing your apprentice <strong><%= klass %></strong> equipment. Wearing your class's gear grants you a 50% bonus to stats. However, feel free to switch back to your old gear.",
-    "classStats": "These are your class's stats; they affect the game-play. Each time you level up, you get one point to allocate to particular stat. Hover over each stat for more information.",
+    "classStats": "These are your class's stats; they affect the game-play. Each time you level up, you get one point to allocate to a particular stat. Hover over each stat for more information.",
     "autoAllocate": "Auto Allocate",
     "autoAllocateText": "If 'automatic allocation' is ticked, your avatar gains stats automatically based on your tasks' attributes, which you can find in <strong>TASK > Edit > Advanced > Attributes</strong>. Eg, if you hit the gym often, and your 'Gym' Daily is set to 'Physical', you'll gain Strength automatically.",
     "spells": "Spells",

common/locales/en_GB/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "Pets Found",
     "rarePets": "Rare Pets",
     "questPets": "Quest Pets",
-    "beastmasterProgress": "Beastmaster Progress",
     "mounts": "Mounts",
     "mountsTamed": "Mounts Tamed",
     "questMounts": "Quest Mounts",
@@ -27,10 +26,21 @@
     "inventoryText": "Click an egg to see usable potions highlighted in green and then click one of the highlighted potions to hatch your pet. If no potions are highlighted, click that egg again to deselect it, and instead click a potion first to have the usable eggs highlighted. You can also sell unwanted drops to Alexander the Merchant.",
     "food": "Food and Saddles",
     "noFood": "You don't have any food or saddles.",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "You have earned the \"Beast Master\" Achievement for collecting all the pets!",
-    "beastMastName": "Beast Master",
-    "beastMastText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
-    "beastMastText2": "and has released their pets a total of <%= count %> times",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Drops Enabled!",
     "itemDrop": "An item has dropped!",
     "firstDrop": "You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item. You just found a <strong><%= eggText %> Egg</strong>! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= potion %> <%= egg %>",
     "mountName": "<%= potion %> <%= mount %>",
     "petKeyName": "Key to the Kennels",
-    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beastmaster once more!",
-    "petKeyBegin": "Key to the Kennels: Experience Beastmaster Once More!",
-    "petKeyInfo": "Love your pets enough to let them go, and have drops feel meaningful again.",
-    "petKeyInfo2": "The Key to the Kennels resets all of your non-quest pets back to as if you'd never found them. Once you've used it, you'll be able to stack the Beastmaster achievement, showing off how many times you've been able to best the RNG.",
-    "petKeyInfo3": "There are two sets of Keys: you can either just release your pets for four gems or your pets and mounts for eight gems. If you're still working towards getting all of the mounts, you may not want to give them their freedom yet!",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Release My Pets",
-    "petKeyMounts": "Release Both Please",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Not Yet",
     "gemsEach": "gems each"
 }

common/locales/en_GB/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Broken Twigs",
     "questEvilSanta2DropBearCubPolarPet": "Polar Bear (Pet)",
     "questGryphonText": "The Fiery Gryphon",
-    "questGryphonNotes": "The grand beastmaster, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorising Habit City! If you can stop her, I could reward you with some of her eggs!\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Defeated, the mighty beast ashamedly slinks back to its master. \"My word! Well done, adventurers!\" <strong>baconsaur</strong> exclaims, \"Please, have some of the gryphon's eggs. I am sure you will raise these young ones well!\"",
     "questGryphonBoss": "Fiery Gryphon",
     "questGryphonDropGryphonEgg": "Gryphon (Egg)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "The Moonstone Chain Part 3: Recidivate Transformed (Scroll)",
     "questMoonstone3Text": "Recidivate Transformed",
     "questMoonstone3Notes": "<p>Recidivate crumples to the ground, and you strike at her with the moonstone chain. To your horror, Recidivate seizes the gems, eyes burning with triumph.</p><br/><p>\"Foolish creature of flesh!\" she shouts. \"These moonstones will restore me to a physical form, true, but not as you imagined. As the full moon waxes from the dark, so too does my power flourish, and from the shadows I summon the specter of your most feared foe!\"</p><br/><p>A sickly green fog rises from the swamp, and Recidivate’s body writhes and contorts into a shape that fills you with dread – the undead body of Vice, horribly reborn.</p>",
-    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beastmaster swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Necro-Vice",
     "questMoonstone3DropRottenMeat": "Rotten Meat (Food)",
     "questMoonstone3DropZombiePotion": "Zombie Hatching Potion",
@@ -88,7 +88,7 @@
     "questGoldenknight2Boss": "Gold Knight",
     "questGoldenknight2DropGoldenknight3Quest": "The Golden Knight Chain Part 3: The Iron Knight (Scroll)",
     "questGoldenknight3Text": "The Iron Knight",
-    "questGoldenknight3Notes": "<p>@Jon Arinbjorn cries out to you to get your attention. In the aftermath of your battle, a new figure has appeared. A knight coated in stained-black iron slowly approaches you with sword in hand. The Golden Knight shouts to the figure, \"Father, no!\" but knight shows no signs of stopping. She turns to you and says, \"I am sorry. I have been a fool, with a head too big to see how cruel I have been. But my father is crueler than I could ever be. If he isn't stopped he'll destroy us all. Here, use my morningstar and halt the Iron Knight!\"</p>",
+    "questGoldenknight3Notes": "<p>@Jon Arinbjorn cries out to you to get your attention. In the aftermath of your battle, a new figure has appeared. A knight coated in stained-black iron slowly approaches you with sword in hand. The Golden Knight shouts to the figure, \"Father, no!\" but The Iron Knight shows no signs of stopping. She turns to you and says, \"I am sorry. I have been a fool, with a head too big to see how cruel I have been. But my father is crueler than I could ever be. If he isn't stopped he'll destroy us all. Here, use my morningstar and halt the Iron Knight!\"</p>",
     "questGoldenknight3Completion": "<p>With a satisfying clang, the Iron Knight falls to his knees and slumps over. \"You are quite strong,\" he pants. \"I have been humbled, today.\" The Golden Knight approaches you and says, \"Thank you. I believe we have gained some humility from our encounter with you. I will speak with my father and explain the complaints against us. Perhaps, we should begin apologizing to the other Habiticans.\" She mulls over in thought before turning back to you. \"Here: as our gift to you, I want you to keep my morningstar. It is yours now.\"</p>",
     "questGoldenknight3Boss": "The Iron Knight",
     "questGoldenknight3DropHoney": "Honey (Food)",
@@ -152,6 +152,7 @@
     "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
     "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
     "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questTRexText": "King of the Dinosaurs",

common/locales/en_GB/settings.json

@@ -45,11 +45,11 @@
     "misc": "Misc",
     "showHeader": "Show Header",
     "changePass": "Change Password",
-    "changeUsername": "Change Username",
+    "changeUsername": "Change Login Name",
     "oldPass": "Old Password",
     "newPass": "New Password",
     "confirmPass": "Confirm New Password",
-    "newUsername": "New Username",
+    "newUsername": "New Login Name",
     "dangerZone": "Danger Zone",
     "resetText1": "WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.",
     "resetText2": "You will lose all your levels, gold, and experience points. All your tasks will be deleted permanently and you will lose all of your task's historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.",
@@ -68,7 +68,16 @@
     "enterNumber": "Please enter a number between 0 and 24",
     "fillAll": "Please fill out all fields",
     "passSuccess": "Password successfully changed",
-    "usernameSuccess": "Username successfully changed",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Data",
-    "exportData": "Export Data"
+    "exportData": "Export Data",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/en_GB/tasks.json

@@ -36,8 +36,10 @@
     "todos": "To-Dos",
     "newTodo": "New To-Do",
     "dueDate": "Due Date",
-    "remaining": "Remaining",
-    "complete": "Complete",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Due",
     "grey": "Grey",
     "rewards": "Rewards",

common/locales/es/character.json

@@ -129,5 +129,8 @@
     "youCast": "Lanzas <%= spell %>.",
     "youCastTarget": "Lanzas <%= spell %> a <%= target %>.",
     "youCastParty": "Lanzas <%= spell %> para el grupo.",
-    "critBonus": "¡Golpe Crítico! Bonificación :"
+    "critBonus": "¡Golpe Crítico! Bonificación :",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/es/communityguidelines.json

@@ -55,7 +55,7 @@
     "commGuidePara038": "<strong>A veces una conversación se alargará, salir del tema, o volver muy delicada para seguir en un Espacio Publico sin hacer incomodos los otros usuarios.  En ese caso, la conversación será dirigida al gremio Rincón Trasero. Que se note que ser dirijido al Rincón Trasero no es un castigo!</strong> De hecho, a muchos Habiticanos les gusta pasar tiempo ahi y participar en conversaciones largas.",
     "commGuidePara039": "El Rincón Trasero Gremio es un espacio público libre de hablar de material sensible o una sola conversación durante mucho tiempo, y se modera con cuidado.<strong> Las Normas de Espacios Públicos siguen aplicando, al igual que todos los Términos y Condiciones.</strong> El hecho de que estamos usando largas capas y la agrupación en una esquina, no significa que todo se vale! Ahora me paso que arde la vela, ¿quieres?",
     "commGuideHeadingTrello": "Paneles de Trello",
-    "commGuidePara040": "<strong>Trello serves as an open forum for suggestions and discussion of site features.</strong> Habitica is ruled by the people in the form of valiant contributors -- we all build the site together. Trello is the system that lends method to our madness. Out of consideration for this, <strong>try your best to contain all your thoughts into one comment, instead of commenting many times in a row on the same card. If you think of something new, feel free to edit your original comments.</strong> Please, take pity on those of us who receive a notification for every new comment. Our inboxes can only withstand so much.",
+    "commGuidePara040": "<strong> Trello es un forum abierto para sugerencias y discusiones sobre las características de la página web.</strong> Habitica esta moderada por la comunidad en forma de colaboradores-- todos construimos la página juntos. Trello es el metodo por que conseguimos seguir adelante. Considerando esto, <strong>  intentar poner todas tus preguntass y sugerencias en un solo comentario en vez de comentar varias veces con el mismo contenido. Si crees que se trata de algo nuevo, puedes editar tu comentario original.</strong> Por favor, tener en mente que recibimos un correo por cada comentario nuevo y nuestros  buzones de entrada  tienen capacidad limitada.",
     "commGuidePara041": "HabitRPG usa cinco paneles diferentes de Trello.",
     "commGuideList03A": "El <strong>Main Board</strong>  es un lugar para solicitar y votar sobre características de sitio.",
     "commGuideList03B": "El <strong>Tablero Móvil (Mobile Board)</strong> es un lugar para pedir y votar por características de aplicaciones móviles.",
@@ -68,7 +68,7 @@
     "commGuidePara044": "Los siguiente usuarios son miembros de la repositorio de HabitRPG:",
     "commGuideHeadingWiki": "Wiki",
     "commGuidePara045": "<strong>La wiki HabitRPG recolecta información acerca del sitio web.</strong> También contiene algunos foros semejantes a los gremios en HabitRPG.  Por lo tanto, se aplican todas las reglas del Espacio Publico.",
-    "commGuidePara046": "The HabitRPG wiki can be considered to be a database of all things HabitRPG. It provides information about site features, guides to play the game, tips on how you can contribute to HabitRPG and also provides a place for you to advertise your guild or party and vote on topics.",
+    "commGuidePara046": "La wiki de HabitRPG puede ser considerada una base de datos de todo sobre HabitRPG. Tiene información sobre las carecterísticas de la página, guias sobre como jugar al juego, consejos sobre como contirbuir a HabitRPG y también es un sitio para que puedas anunciar tu grupo o gremio y  para votar sobre varios temas.",
     "commGuidePara047": "Como la wiki está alojada por Wikia, los términos y condicones de Wikia se aplican ademas de las reglas establecidas por HabitRPG y el sitio wiki de HabitRPG. ",
     "commGuidePara048": "Este wiki es únicamente una colaboración entre todos sus editores entonces unas normas adiconales uncluyen:",
     "commGuideList04A": "Pedir páginas nuevas o grandes cambios por el tablero Wiki en Trello",
@@ -86,15 +86,15 @@
     "commGuidePara050": "Overwhelmingly, Habiticans assist each other, are respectful, and work to make the whole community fun and friendly. However, once in a blue moon, something that a Habitican does may violate one of the above guidelines. When this happens, the Mods will take whatever actions they deem necessary to keep Habitica safe and comfortable for everyone.",
     "commGuidePara051": "<strong>There are a variety of infractions, and they are dealt with depending on their severity.</strong> These are not conclusive lists, and Mods have a certain amount of discretion. The Mods will take context into account when evaluating infractions.",
     "commGuideHeadingSevereInfractions": "Infracciones graves",
-    "commGuidePara052": "Severe infractions greatly harm the safety of Habitica's community and users, and therefore have severe consequences as a result.",
+    "commGuidePara052": "Infracciones graves dañan enormemente la seguridad de la comunidad y usuarios de Habitica, y por lo tanto llevan consecuencias graves como resultado.",
     "commGuidePara053": "Los siguientes son algunos ejemplos de infracciones graves. Esta no es una lista completa.",
     "commGuideList05A": "Violación de los Términos y Condiciones",
     "commGuideList05B": "Hate Speech/Images, Harassment/Stalking, Cyber-Bullying, Flaming, and Trolling",
     "commGuideList05C": "Violación de Libertad Condicional",
-    "commGuideList05D": "Impersonating Staff or Moderators",
+    "commGuideList05D": "Personificar el Personal o Moderadores",
     "commGuideList05E": "Infracciones moderadas repetidas",
     "commGuideHeadingModerateInfractions": "Infracciones moderadas",
-    "commGuidePara054": "Moderate infractions do not make our community unsafe, but they do make it unpleasant. These infractions will have moderate consequences. When in conjunction with multiple infractions, the consequences may grow more severe.",
+    "commGuidePara054": "Infracciones moderadas no hacen a nuestra comunidad insegura, pero la hacen desagradable. Estas infracciones tendrán consecuencias moderadas. En relación con infracciones múltiples, las consecuencias pueden ser más graves.",
     "commGuidePara055": "Los siguientes son algunos ejemplos de infracciones moderadas. Esto no es una lista completa.",
     "commGuideList06A": "Ignoring or Disrespecting a Mod. This includes publicly complaining about moderators or other users/publicly glorifying or defending banned users. If you are concerned about one of the rules or Mods, please contact Lemoness via email (<a href=\"mailto:leslie@habitrpg.com\">leslie@habitrpg.com</a>).",
     "commGuideList06B": "Backseat Modding. To quickly clarify a relevant point: A friendly mention of the rules is fine. Backseat modding consists of telling, demanding, and/or strongly implying that someone must take an action that you describe to correct a mistake. You can alert someone to the fact that they have committed a transgression, but please do not demand an action-for example, saying, \"Just so you know, profanity is discouraged in the Tavern, so you may want to delete that,\" would be better than saying, \"I'm going to have to ask you to delete that post.\"",
@@ -102,7 +102,7 @@
     "commGuideList06D": "Infracciones Menores Repetidas",
     "commGuideHeadingMinorInfractions": "Infracciones menores",
     "commGuidePara056": "Las Infracciones menores, si bien son desaconsejadas, tienen consecuencias menores. Si continúan ocurriendo, con el tiempo pueden conducir a consecuencias más severas. ",
-    "commGuidePara057": "The following are some examples of Minor Infractions. This is not a comprehensive list.",
+    "commGuidePara057": "Los siguientes son algunos ejemplos de infracciones menores. Esta no es una lista completa.",
     "commGuideList07A": "Primera Violación de las Normas de Espacios Públicos",
     "commGuideList07B": "Any statements or actions that trigger a \"Please Don't\". When a Mod has to say \"Please Don't do this\" to a user, it can count as a very minor infraction for that user. An example might be \"Mod Talk: Please Don't keep arguing in favor of this feature idea after we've told you several times that it isn't feasible.\" In many cases, the Please Don't will be the minor consequence as well, but if Mods have to say \"Please Don't\" to the same user enough times, the triggering Minor Infractions will start to count as Moderate Infractions.",
     "commGuideHeadingConsequences": "Consecuencias",
@@ -113,15 +113,15 @@
     "commGuideList08B": "cuál es su consecuencia",
     "commGuideList08C": "qué hacer para corregir la situación y restablecer tu status, si es posible.",
     "commGuideHeadingSevereConsequences": "Ejemplos de Consecuencias Severas",
-    "commGuideList09A": "Account bans",
-    "commGuideList09B": "Account deletions",
+    "commGuideList09A": "Suspenciones de cuentas",
+    "commGuideList09B": "Eliminaciones de cuentas",
     "commGuideList09C": "Permanently disabling (\"freezing\") progression through Contributor Tiers",
     "commGuideHeadingModerateConsequences": "Ejemplos de Consecuencias Moderadas",
-    "commGuideList10A": "Restricted public chat privileges",
-    "commGuideList10B": "Restricted private chat privileges",
+    "commGuideList10A": "Privilegios restringidos de chat público",
+    "commGuideList10B": "Privilegios restringidos de chat privado",
     "commGuideList10C": "Restricted guild/challenge creation privileges",
     "commGuideList10D": "Temporarily disabling (\"freezing\") progression through Contributor Tiers",
-    "commGuideList10E": "Demotion of Contributor Tiers",
+    "commGuideList10E": "Descenso de Nivel de Contribuyente",
     "commGuideList10F": "Putting users on \"Probation\"",
     "commGuideHeadingMinorConsequences": "Ejemplos de Consecuencias Menores",
     "commGuideList11A": "Recordatorios de las Normas de Espacios Públicos",
@@ -150,23 +150,23 @@
     "commGuideList13D": "<strong>Users on probation cannot be promoted to the next tier.</strong> Mods have the right to freeze user advancement due to infractions. If this happens, the user will always be informed of the decision, and how to correct it. Tiers may also be removed as a result of infractions or probation.",
     "commGuideHeadingFinal": "La Sección Final",
     "commGuidePara067": "So there you have it, brave Habitican -- the Community Guidelines! Wipe that sweat off of your brow and give yourself some XP for reading it all. If you have any questions or concerns about these Community Guidelines, please email Lemoness (<a href=\"mailto:leslie@habitrpg.com\">leslie@habitrpg.com</a>) and she will be happy to help clarify things.",
-    "commGuidePara068": "Now go forth, brave adventurer, and slay some dailies!",
+    "commGuidePara068": "¡Ahora salid, aventurero valiente, y matad algunas tareas diarias!",
     "commGuideHeadingLinks": "Enlaces Útiles",
-    "commGuidePara069": "The following talented artists contributed to these illustrations:",
+    "commGuidePara069": "Los siguientes artistas talentosos contribuyeron a estas ilustraciones:",
     "commGuideLink01": "El Gremio de los Novatos",
     "commGuideLink01description": "¡Un gremio para que los nuevos usuarios hagan preguntas!",
-    "commGuideLink02": "The Back Corner Guild",
-    "commGuideLink02description": "a guild for the discussion of long or sensitive topics.",
+    "commGuideLink02": "Gremio Del Rincón Trasero",
+    "commGuideLink02description": "un gremio para conversaciones de temas largos o delicados.",
     "commGuideLink03": "La Wiki",
     "commGuideLink03description": "la coleción más grande de información sobre HabitRPG.",
     "commGuideLink04": "GitHub",
     "commGuideLink04description": "¡para informar de errores o ayudar con la programación de el código!",
-    "commGuideLink05": "The Main Trello",
+    "commGuideLink05": "Trello Principal",
     "commGuideLink05description": "para solicitar características de página.",
-    "commGuideLink06": "The Mobile Trello",
+    "commGuideLink06": "Trello Móvil",
     "commGuideLink06description": "para solicitar características  de movil.",
-    "commGuideLink07": "The Art Trello",
+    "commGuideLink07": "Trello de Artes",
     "commGuideLink07description": "para entregar  arte de pixeles.",
-    "commGuideLink08": "The Quest Trello",
+    "commGuideLink08": "Trello de Misiónes",
     "commGuideLink08description": "para entregar escritura de misiones."
 }

common/locales/es/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "Cuando se implemente tu <strong>quinta</strong> contribución, el <strong>Escudo de cristal</strong> estará disponible en la tienda de Recompensas. Como premio por tu trabajo también recibirás <strong>4 Gemas</strong>.",
     "championSixth": "Cuando se implemente tu <strong>sexta</strong> contribución, recibirás una <strong>Mascota hidra</strong>. Como premio por tu trabajo también recibirás <strong>4 Gemas</strong>.",
     "legendary": "Legendario",
-    "legSeventh": "Cuando tu <strong>séptimo</strong> conjunto de contribuciones es desplegado, recibirás <strong>4 gemas</strong> y ¡pasarás a formar parte del honorable Gremio de Colaboradores y estar enterado de los detalles \"entre bastidores\" de HabitRPG! Contribuiciones más allá de esto no incrementarán tu nivel, pero podrás seguir ganando premios de gemas y títulos.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Moderador",
     "guardian": "Guardián",
-    "guardianText": "Los moderadores fueron seleccionados cuidadosamente de los contribuidores de alto nivel, por lo que rogamos que los tratéis con el máximo respeto y que escuchéis sus sugerencias.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Equipo",
     "heroic": "Heroico",
-    "heroicText": "El nivel Heroico es para el personal de HabitRPG y colaboradores a nivel de personal. Si tienes este título, fuiste designado (¡o contratado!) para él.",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "Los NPCs contribuyeron al Kickstarter de HabitRPG en su nivel más alto. ¡Puedes encontrar sus avatares velando sobre las características del sitio!",
     "modalContribAchievement": "¡Hazaña de Colaborador!",
-    "contribModal": "¡<%= name %>, qué persona increíble! Ahora eres un colaborador de nivel <%= level %> por ayudar HabitRPG. ¡Revisa",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "los premios que has ganado por tu colaboración!",
     "contribName": "Colaborador",
     "contribText": "Ha contribuido a HabitRPG (código, diseño, arte, asesoramiento legal, documentos, etc). ¿Quieres esta insignia?",
@@ -42,7 +42,7 @@
     "moreDetails2": "Más detalles (8-9)",
     "contributions": "Contribuciones",
     "admin": "Administración",
-    "notGems": "es en dólares, <em>no</em> en Gemas. Es decir, si este número es 1 significa 4 gemas. Utilice esta opción sólo cuando otorga gemas a los jugadores de forma manual, no lo use al otorgar niveles de colaborador. Los niveles de colaborador agregarán automáticamente 2G por nivel.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Esconder Anuncios",
     "gamemaster": "Maestro del Juego (Staff/moderador)",
     "backerTier": "Nivel de Sponsor",

common/locales/es/gear.json

@@ -162,63 +162,63 @@
     "armorSpecial2Text": "Túnica noble de Jean Chalard",
     "armorSpecial2Notes": "¡Te hace extra blandito! Aumenta tu constitución e inteligencia en  <%= attrs %> cada una.",
     "armorSpecialYetiText": "Túnica de domador de Yetis",
-    "armorSpecialYetiNotes": "Fuzzy and fierce. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
+    "armorSpecialYetiNotes": "Peluda y de aspecto salvaje. Aumenta tu constitución en <%= con %>. Equipo de invierno de edición limitada 2013-2014.",
     "armorSpecialSkiText": "Parka del Ski-asesino",
-    "armorSpecialSkiNotes": "Full of secret daggers and ski trail maps. Increases Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.",
+    "armorSpecialSkiNotes": "Llena de dagas secretas y mapas de pistas de esquí. Aumenta la percepción en <%= per %>. Equipo de invierno de edición limitada 2013-2014.",
     "armorSpecialCandycaneText": "Túnica de bastón de caramelo",
-    "armorSpecialCandycaneNotes": "Spun from sugar and silk. Increases Intelligence by <%= int %>. Limited Edition 2013-2014 Winter Gear.",
+    "armorSpecialCandycaneNotes": "Tejida con azúcar y seda. Aumenta la inteligencia en <%= int %>. Equipo de invierno de edición limitada 2013-2014.",
     "armorSpecialSnowflakeText": "Túnica de copo de nieve",
-    "armorSpecialSnowflakeNotes": "A robe to keep you warm, even in a blizzard. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
+    "armorSpecialSnowflakeNotes": "Una túnica que te mantiene caliente, incluso en una ventisca. Aumenta la constitución en <%= con %>. Equipo Invierno Edición Limitada 2013-2014.",
     "armorSpecialBirthdayText": "Ropa Absurda de Fiesta",
-    "armorSpecialBirthdayNotes": "As part of the festivities, Absurd Party Robes are available free of charge in the Item Store! Swath yourself in those silly garbs and don your matching hats to celebrate this momentous day. Confers no benefit.",
-    "armorSpecialGaymerxText": "Armadura de Guerrero de Arco Iris",
-    "armorSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special armor 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.",
+    "armorSpecialBirthdayNotes": "¡Como parte de las fiestas, la Ropa Absurda de Fiesta está disponible de manera gratuita en la Tienda de Objetos! Envuélvete en estas estúpidas prendas y ponte un sombrero a juego para celebrar este día tan importante. No proporciona ningún beneficio.",
+    "armorSpecialGaymerxText": "Armadura de Guerrero del Arco Iris",
+    "armorSpecialGaymerxNotes": "¡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, del 11 al 13 de julio. Esta armadura no proporciona ningún beneficio.",
     "armorSpecialSpringRogueText": "Traje Pulcro de Gato",
-    "armorSpecialSpringRogueNotes": "Impeccably groomed. Increases Perception by <%= per %>. Limited Edition 2014 Spring Gear.",
+    "armorSpecialSpringRogueNotes": "Impecablemente cuidado. Aumenta la percepción en <%= per %>. Equipo de Primavera Edición Limitada 2014. ",
     "armorSpecialSpringWarriorText": "Armadura de Acero de Trébol.",
-    "armorSpecialSpringWarriorNotes": "Soft as clover, strong as steel! Increases Constitution by <%= con %>. Limited Edition 2014 Spring Gear.",
+    "armorSpecialSpringWarriorNotes": "¡Suave como el trébol, resistente como el acero! Aumenta la constitución en <%= con %>. Equipo de Primavera Edición Limitada 2014. ",
     "armorSpecialSpringMageText": "Túnica de Rodentia",
     "armorSpecialSpringMageNotes": "¡Los ratones son geniales! Añade <%= int %> puntos a INT. Equipo de Primavera Edición Limitada 2014. ",
     "armorSpecialSpringHealerText": "Túnica de Cachorro Felpudo",
-    "armorSpecialSpringHealerNotes": "Warm and snuggly, but protects its owner from harm. Increases Constitution by <%= con %>. Limited Edition 2014 Spring Gear.",
+    "armorSpecialSpringHealerNotes": "Cálida y cómoda, pero además protege del daño a su portador. Aumenta la constitución en <%= con %>. Equipo de Primavera Edición Limitada 2014.",
     "armorSpecialSummerRogueText": "Manto de Pirata",
     "armorSpecialSummerRogueNotes": "These robes be very cozy, yarrrr! Increases Perception by <%= per %>. Limited Edition 2014 Summer Gear.",
     "armorSpecialSummerWarriorText": "Ropajes de espadachín",
     "armorSpecialSummerWarriorNotes": "Complete with buckle, as well as swash. Increases Constitution by <%= con %>. Limited Edition 2014 Summer Gear.",
-    "armorSpecialSummerMageText": "Aleta de Esmeralda",
-    "armorSpecialSummerMageNotes": "This garment of shimmering scales transforms its wearer into a real Mermage! Increases Intelligence by <%= int %>. Limited Edition 2014 Summer Gear.",
+    "armorSpecialSummerMageText": "Cola de Esmeralda",
+    "armorSpecialSummerMageNotes": "¡Esta prenda de escamas deslumbrantes transforma a su portador en un mago marino! Aumenta la inteligencia en <%= int %>. Equipo de Verano Edición Limitada 2014.",
     "armorSpecialSummerHealerText": "Aleta de Pezanador",
-    "armorSpecialSummerHealerNotes": "This garment of shimmering scales transforms its wearer into a real Seahealer! Increases Constitution by <%= con %>. Limited Edition 2014 Summer Gear.",
-    "armorSpecialFallRogueText": "Túnicas rojas sangre",
-    "armorSpecialFallRogueNotes": "Vivid. Velvet. Vampiric. Increases Perception by <%= per %>. Limited Edition 2014 Autumn Gear.",
+    "armorSpecialSummerHealerNotes": "¡Esta prenda de escamas deslumbrantes transforma a su portador en un verdadero sanador del mar! Aumenta tu constitución en <%= con %>. Equipo de Verano Edición Limitada 2014.",
+    "armorSpecialFallRogueText": "Túnicas rojo sangre",
+    "armorSpecialFallRogueNotes": "Vívidas. Aterciopeladas. Vampíricas. Aumentan la percepción en <%= per %>. Equipo de Otoño Edición Limitada 2014.",
     "armorSpecialFallWarriorText": "La bata de la ciencia",
-    "armorSpecialFallWarriorNotes": "Protects you from mysterious potion spills. Increases Constitution by <%= con %>. Limited Edition 2014 Autumn Gear.",
+    "armorSpecialFallWarriorNotes": "Te protege contra derrames de pociones misteriosas. Aumenta la constitución en <%= con %>. Equipo de Otoño Edición Limitada 2014. ",
     "armorSpecialFallMageText": "Túnica Mágica de Hechicero",
-    "armorSpecialFallMageNotes": "This robe has plenty of pockets to hold extra helpings of eye of newt and tongue of frog. Increases Intelligence by <%= int %>. Limited Edition 2014 Autumn Gear.",
-    "armorSpecialFallHealerText": "Equipo Diáfano",
-    "armorSpecialFallHealerNotes": "Charge into battle pre-bandaged! Increases Constitution by <%= con %>. Limited Edition 2014 Autumn Gear.",
-    "armorSpecialWinter2015RogueText": "Icicle Drake Armor",
-    "armorSpecialWinter2015RogueNotes": "This armor is freezing cold, but it will definitely be worth it when you uncover the untold riches at the center of the Icicle Drake hives. Not that you are looking for any such untold riches, because you are truly, definitely, absolutely a genuine Icicle Drake, okay?! Stop asking questions! Increases Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.",
+    "armorSpecialFallMageNotes": "Esta túnica tiene un montón de bolsillos para guardar raciones adicionales de ojo de tritón y lengua de rana. Añade <%= int %> a Inteligencia. Equipo de Otoño Edición Limitada 2014.",
+    "armorSpecialFallHealerText": "Equipo Diáfano de Gasa",
+    "armorSpecialFallHealerNotes": "¡Irrumpe en la batalla previamente vendado! Incrementa tu constitución en <%= con %>. Equipo de Otoño Edición Limitada 2014. ",
+    "armorSpecialWinter2015RogueText": "Armadura de Dragón del Hielo",
+    "armorSpecialWinter2015RogueNotes": "Esta armadura es gélida, pero desde luego valdrá la pena cuando descubras las riquezas incalculables que hay en el centro de las guaridas de los Dragones del Hielo. Que no es que tú estés buscando tales riquezas, porque definitivamente, de verdad de la buena, que eres un Dragón del Hielo auténtico, ¡¿vale?! ¡No hagas más preguntas! Aumenta la percepción en <%= per %>. Equipo de Invierno Edición Limitada 2014-2015.",
     "armorSpecialWinter2015WarriorText": "Armadura de pan de jengibre",
-    "armorSpecialWinter2015WarriorNotes": "Cozy and warm, straight from the oven! Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
+    "armorSpecialWinter2015WarriorNotes": "¡Cómoda y calentita, recién salida del horno! Aumenta la constitución en <%= con %>. Equipo de Invierno Edición Limitada 2014-2015.",
     "armorSpecialWinter2015MageText": "Túnica Boreal",
-    "armorSpecialWinter2015MageNotes": "You can see the glimmering lights of the north in this robe. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.",
-    "armorSpecialWinter2015HealerText": "Skating Outfit",
-    "armorSpecialWinter2015HealerNotes": "Ice-skating is very relaxing, but you shouldn't try it without this protective gear in case you get attacked by the icicle drakes. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
+    "armorSpecialWinter2015MageNotes": "En esta túnica puedes ver los destellos del norte. Aumenta la inteligencia en <%= int %>. Equipo de Invierno Edición Limitada 2014-2015.",
+    "armorSpecialWinter2015HealerText": "Atuendo de Patinaje",
+    "armorSpecialWinter2015HealerNotes": "Patinar sobre hielo es muy relajante, pero no deberías intentarlo sin este equipo de protección, por si acaso te atacan los dragones del hielo. Aumenta la constitución en <%= con %>. Equipo de Invierno Edición Limitada 2014-2015.",
     "armorMystery201402Text": "Túnica de Mensajero",
-    "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
+    "armorMystery201402Notes": "Reluciente y fuerte, esta túnica tiene muchos bolsillos para llevar cartas. No proporciona ningún beneficio. Artículo de suscriptor Febrero 2014.",
     "armorMystery201403Text": "Armadura del Caminante del Bosque",
-    "armorMystery201403Notes": "This mossy armor of woven wood bends with the movement of the wearer. Confers no benefit. March 2014 Subscriber Item.",
+    "armorMystery201403Notes": "Esta musgosa armadura de madera trenzada se dobla con el movimiento de su portador. No otorga beneficios. Artículo de suscriptor para Marzo 2014.",
     "armorMystery201405Text": "Llama de Corazón",
-    "armorMystery201405Notes": "Nothing can hurt you when you are swathed in flames! Confers no benefit. May 2014 Subscriber Item.",
+    "armorMystery201405Notes": "¡Nada puede hacerte daño cuando estás envuelto en fuego! No proporciona beneficios. Artículo de suscriptor Mayo 2014.",
     "armorMystery201406Text": "Túnica de Pulpo",
-    "armorMystery201406Notes": "This flexible robe makes it possible for its wearer to slip through even the tiniest cracks. Confers no benefit. June 2014 Subscriber Item.",
-    "armorMystery201407Text": "Traje acuático",
+    "armorMystery201406Notes": "Esta túnica flexible permite al portador colarse incluso por las grietas más pequeñas. No proporciona ningún beneficio. Artículo de suscriptor de Junio 2014.",
+    "armorMystery201407Text": "Traje de explorador submarino",
     "armorMystery201407Notes": "Described alternatively as \"splooshy\", \"overly thick\" and \"frankly, kind of cumbersome\", this suit is the best friend of any intrepid undersea explorer. Confers no benefit. July 2014 Subscriber Item.",
     "armorMystery201408Text": "Túnicas del Sol",
     "armorMystery201408Notes": "These robes are woven with sunlight and gold. Confers no benefit. August 2014 Subscriber Item.",
     "armorMystery201409Text": "Chaleco de Andares",
-    "armorMystery201409Notes": "A leaf-covered vest that camouflages the wearer. Confers no benefit. September 2014 Subscriber Item.",
+    "armorMystery201409Notes": "Un chaleco cubierto con hojas que camufla al que lo lleva. No confiere ningún beneficio. Artículo de suscriptor para Septiembre 2014. ",
     "armorMystery201410Text": "Equipo de Duende",
     "armorMystery201410Notes": "Scaly, slimy, and strong! Confers no benefit. October 2014 Subscriber Item.",
     "armorMystery201412Text": "Traje de Pingüino",
@@ -231,7 +231,7 @@
     "headWarrior1Text": "Yelmo de Cuero.",
     "headWarrior1Notes": "Cap of sturdy boiled hide. Increases Strength by <%= str %>.",
     "headWarrior2Text": "Capucha de Malla",
-    "headWarrior2Notes": "Hood of interlocked metal rings. Increases Strength by <%= str %>.",
+    "headWarrior2Notes": "Capucha de anillas de metal entrelazadas. Aumenta la fuerza en <%= str %>.",
     "headWarrior3Text": "Casco de Placas",
     "headWarrior3Notes": "Casco grueso de acero, a prueba de prácticamente cualquier golpe. Aumenta la Fuerza en <%= str %>.",
     "headWarrior4Text": "Casco rojo",
@@ -271,21 +271,21 @@
     "headSpecial0Text": "Casco de Sombras",
     "headSpecial0Notes": "Blood and ash, lava and obsidian give this helm its imagery and power. Increases Intelligence by <%= int %>.",
     "headSpecial1Text": "Casco de cristal",
-    "headSpecial1Notes": "La corona preferida de aquellos que lideran con el ejemplo. Aumenta <%= attrs %> todos los atributos",
+    "headSpecial1Notes": "La corona preferida de aquellos que lideran con el ejemplo. Aumenta <%= attrs %> todos los atributos.",
     "headSpecial2Text": "Casco sin nombre",
     "headSpecial2Notes": "A testament to those who gave of themselves while asking nothing in return. Increases Intelligence and Strength by <%= attrs %> each.",
     "headSpecialNyeText": "Sombrero Absurdo de Fiesta",
-    "headSpecialNyeNotes": "You've received an Absurd Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",
+    "headSpecialNyeNotes": "¡Has recibido un Sombrero Absurdo de Fiesta! ¡Llévalo con orgullo mientras celebras el Año Nuevo! No proporciona ningún beneficio.",
     "headSpecialYetiText": "Casco de domador de Yetis",
-    "headSpecialYetiNotes": "An adorably fearsome hat. Increases Strength by <%= str %>. Limited Edition 2013-2014 Winter Gear.",
+    "headSpecialYetiNotes": "Un casco adorablemente aterrador. Aumenta la fuerza en <%= str %>. Equipo de Invierno Edición Limitada 2013-2014.",
     "headSpecialSkiText": "Casco de Ski-asesino",
-    "headSpecialSkiNotes": "Keeps the wearer's identity secret... and their face toasty. Increases Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.",
-    "headSpecialCandycaneText": "Sombrero de baston de caramelo.",
-    "headSpecialCandycaneNotes": "This is the most delicious hat in the world. It's also known to appear and disappear mysteriously. Increases Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.",
+    "headSpecialSkiNotes": "Mantiene la identidad del portador en secreto... y su cara calentita. Aumenta la percepción en <%= per %>. Equipo de Invierno Edición Limitada 2013-2014.",
+    "headSpecialCandycaneText": "Sombrero de bastón de caramelo.",
+    "headSpecialCandycaneNotes": "El sombrero más delicioso del mundo. También se sabe que aparece y desaparece misteriosamente. Aumenta la percepción en <%= per %>. Equipo de Invierno Edición Limitada 2013-2014.",
     "headSpecialSnowflakeText": "Corona de copo de nieve",
-    "headSpecialSnowflakeNotes": "The wearer of this crown is never cold. Increases Intelligence by <%= int %>. Limited Edition 2013-2014 Winter Gear.",
+    "headSpecialSnowflakeNotes": "Quien lleva esta corona nunca tiene frío. Aumenta la inteligencia en <%= int %>. Equipo de Invierno Edición Limitada 2013-2014.",
     "headSpecialSpringRogueText": "Máscara Gatuna Sigilosa",
-    "headSpecialSpringRogueNotes": "Nobody will EVER guess that you are a cat burglar! Increases Perception by <%= per %>. Limited Edition 2014 Spring Gear.",
+    "headSpecialSpringRogueNotes": "¡Nadie podrá adivinar NUNCA que eres un ladrón gatuno! Aumenta la percepción en un <%= per %>. Equipo de Primavera Edición Limitada 2014.",
     "headSpecialSpringWarriorText": "Casco de Acero de Trébol",
     "headSpecialSpringWarriorNotes": "Welded from sweet meadow clover, this helmet can resist even the mightiest blow. Increases Strength by <%= str %>. Limited Edition 2014 Spring Gear.",
     "headSpecialSpringMageText": "Sombrero de queso suizo",
@@ -297,11 +297,11 @@
     "headSpecialSummerWarriorText": "Pañuelo de espadachín",
     "headSpecialSummerWarriorNotes": "This soft, salty cloth fills its wearer with strength. Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.",
     "headSpecialSummerMageText": "Sombrero Envuelto en Algas",
-    "headSpecialSummerMageNotes": "What could be more magical than a hat wrapped in seaweed? Increases Perception by <%= per %>. Limited Edition 2014 Summer Gear.",
+    "headSpecialSummerMageNotes": "¿Qué podría ser más mágico que un sombrero envuelto en algas marinas? Aumenta tu percepción en un <%= per %>. Equipo de Verano Edición Limitada 2014.",
     "headSpecialSummerHealerText": "Corona de Coral",
-    "headSpecialSummerHealerNotes": "Enables its wearer to heal damaged reefs. Increases Intelligence by <%= int %>. Limited Edition 2014 Summer Gear.",
-    "headSpecialFallRogueText": "Capucha roja sangre",
-    "headSpecialFallRogueNotes": "A Vampire Smiter's identity must always be hidden. Increases Perception by <%= per %>. Limited Edition 2014 Autumn Gear.",
+    "headSpecialSummerHealerNotes": "Permite a su portador sanar arrecifes dañados. Aumenta la inteligencia en un <%= int %>. Equipo de Verano Edición Limitada 2014.",
+    "headSpecialFallRogueText": "Capucha rojo sangre",
+    "headSpecialFallRogueNotes": "La identidad de un Cazavampiros debe permanecer siempre oculta. Aumenta tu percepción en <%= per %>. Equipo de Otoño Edición Limitada 2014. ",
     "headSpecialFallWarriorText": "monstruoso cuero cabelludo de las ciencias",
     "headSpecialFallWarriorNotes": "Graft on this helm! It's only SLIGHTLY used. Increases Strength by <%= str %>. Limited Edition 2014 Autumn Gear.",
     "headSpecialFallMageText": "Sombrero puntiagudo",
@@ -310,8 +310,8 @@
     "headSpecialFallHealerNotes": "Highly sanitary and very fashionable. Increases Intelligence by <%= int %>. Limited Edition 2014 Autumn Gear.",
     "headSpecialNye2014Text": "Sombrero de fiesta tonto.",
     "headSpecialNye2014Notes": "You've received a Silly Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",
-    "headSpecialWinter2015RogueText": "Icicle Drake Mask",
-    "headSpecialWinter2015RogueNotes": "You are truly, definitely, absolutely a genuine Icicle Drake. You are not infiltrating the Icicle Drake hives. You have no interest at all in the hoards of riches rumored to lie in their frigid tunnels. Rawr. Increases Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.",
+    "headSpecialWinter2015RogueText": "Máscara de Dragón del Hielo",
+    "headSpecialWinter2015RogueNotes": "Definitivamente, de verdad de verdad, que eres un Dragón del Hielo auténtico. Para nada te estás infiltrando en las guaridas de los Dragones del Hielo. Y por supuesto no tienes ningún interés en los montones de riquezas que se rumorea yacen en sus frígidos túneles. ¡Groar! Aumenta la percepción en <%= per %>. Equipo de Invierno Edición Limitada 2014-2015.",
     "headSpecialWinter2015WarriorText": "Casco de pan de jengibre",
     "headSpecialWinter2015WarriorNotes": "Think, think, think as hard as you can. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.",
     "headSpecialWinter2015MageText": "Sombrero Aurora",

common/locales/es/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Ordenar por fecha de ingreso al grupo",
     "sortName": "Ordenar por nombre del avatar",
     "sortBackgrounds": "Ordenar por fondo",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "¿Crear Gremio por 4 gemas?",
     "leaveGroupCha": "Abandonar los desafíos del Gremio y...",
     "confirm": "Confirmar",

common/locales/es/limited.json

@@ -18,18 +18,18 @@
     "seasonalShopTitle": "<%= linkStart %>Hechicera Estacional<%= 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! From now until January 31st, we're stocking lots of seasonal edition winter goodies. After that, these items won't be back for another year, so get them while they're hot!! Or, er, cold.",
-    "candycaneSet": "Candy Cane (Mage)",
-    "skiSet": "Ski-sassin (Rogue)",
-    "snowflakeSet": "Snowflake (Healer)",
-    "yetiSet": "Yeti Tamer (Warrior)",
-    "nyeCard": "New Year's Card",
-    "nyeCardNotes": "Send a New Year's card to a friend.",
-    "seasonalItems": "Seasonal Items",
+    "candycaneSet": "Bastón de Caramelo (Mag0)",
+    "skiSet": "Ski-asesino (Ladrón)",
+    "snowflakeSet": "Copo de nieve (Sanador)",
+    "yetiSet": "Domador de Yetis (Guerrero)",
+    "nyeCard": "Carta de Nuevo Año",
+    "nyeCardNotes": "Enviar una carta de Nuevo Año a un amigo.",
+    "seasonalItems": "Cosas de la temporada",
     "auldAcquaintance": "Auld Acquaintance",
-    "auldAcquaintanceText": "Happy New Year! Sent or received <%= cards %> New Year's cards.",
-    "newYear0": "Happy New Year! May you slay many a bad Habit.",
-    "newYear1": "Happy New Year! May you reap many Rewards.",
-    "newYear2": "Happy New Year! May you earn many a Perfect Day.",
+    "auldAcquaintanceText": "Feliz Año Nuevo! Se enviaron o mandaron <%= cards %> cartas de Año Nuevo.",
+    "newYear0": "Feliz Año Nuevo! Que mates a muchos malos Hábitos.",
+    "newYear1": "Feliz Año Nuevo! Que ganes muchas Recompensas.",
+    "newYear2": "Feliz Año Nuevo! Que ganes muchos Días Perfectos.",
     "newYear3": "Happy New Year! May your To-Do list stay short and sweet.",
     "newYear4": "Happy New Year! May you not get attacked by a raging Hippogriff."
 }

common/locales/es/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "¿Te traigo tu corcel,  <%= name %>? Clic en una montura para ensillar.",
     "mattBochText1": "¡Bienvenidos al Establo! Soy Matt, el maestro de las bestias. Escoge un mascota aquí para que viaje a tu lado. Aliméntalas y se convertirán en poderosas monturas.",
-    "mattBochText2": "Echa un vistazo",
-    "mattBochText3": "a todas las mascotas que puedes coleccionar.",
     "daniel": "Daniel",
     "danielText": "Bienvenido a la Taberna! Quedate un rato y conoce al personal. Si necesitas descansar (¿vacaciones?, ¿enfermedad?), te prepararé una habitación en la posada. Durante el tiempo que permanezcas con nosotros, tus Diarias quedarán congeladas tal y como están (marcadas/desmarcadas) hasta el día que marches. No sufrirás por no completarlas al final de cada día.",
     "danielText2": "Te advertimos: ¡Si participas en una misión contra un Jefe, el Jefe te seguirá dañando a ti y a tus compañeros de grupo por las Diarias perdidas!",

common/locales/es/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "Mascotas Encontradas",
     "rarePets": "Mascotas Raras",
     "questPets": "Mascotas de Misión",
-    "beastmasterProgress": "Progreso en Maestro de Bestias",
     "mounts": "Monturas",
     "mountsTamed": "Monturas Domadas",
     "questMounts": "Monturas de Misión",
@@ -27,10 +26,21 @@
     "inventoryText": "Haz click sobre un huevo para ver las pociones usables destacadas en verde, y después clic una de las pociones para incubar tu mascota. Si ninguna poción se destacó, clic en ese huevo otra vez para anular la selección, y clic una poción primero para destacar los huevos usables. También puedes vender objetos que no quieras a Alexander el Mercader.",
     "food": "Comida y Sillas de montar",
     "noFood": "No tienes comida ni sillas de montar",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "¡Has ganado el logro \"Maestro de Bestias\" por conseguir todas las mascotas!",
-    "beastMastName": "Maestro de Bestias",
-    "beastMastText": "Ha encontrado todos los 90 mascotas (increíblemente difícil, felicita a este usuario!)",
-    "beastMastText2": "y ha soltado sus mascotas un total de  <%= count %> veces",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "¡Botín Activado!",
     "itemDrop": "¡Un objeto ha caído!",
     "firstDrop": "¡Has desbloqueado el Sistema de Botín! Ahora, cuando realizas tareas, tendrás una pequeña probabilidad de encontrar un objeto. Has encontrado un <strong><%= eggText %> Huevo</strong>! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= egg %> <%= potion %>",
     "mountName": "<%= mount %> <%= potion %>",
     "petKeyName": "Llave de la caseta",
-    "petKeyPop": "Deja a tus mascotas vagar libremente, suéltalas para que comienzan su propia aventura y vuelve a sentir la emoción de ser el Maestro de Bestias una vez más.",
-    "petKeyBegin": "La Llave de las Perreras: Experiencia  Maestro de la Bestias Una Vez Mas!",
-    "petKeyInfo": "Ama suficiente a tus mascotas como para dejarlas ir, y que así los botines vuelvan a tener significado.",
-    "petKeyInfo2": "La Llave de la caseta reinicializa todas las mascotas que no fueron conseguidas en misiones como si nunca las hubieras encontrado. Cuando la hayas usado, podrás amontonar el logro Maestro de la bestias mostrando cuantas veces has podido vencer el RNG.",
-    "petKeyInfo3": "Hay dos juegos de Llaves: puedes liberar o bien solo a tus mascotas por cuatro gemas o bien a tus mascotas y monturas por ocho gemas. Si todavía estas trabajando para conseguir todas las monturas, ¡quizás no quieras darles su libertad todavía!",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Soltar mis mascotas",
-    "petKeyMounts": "Soltar ambas por favor",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Aún no",
     "gemsEach": "gemas cada uno"
 }

common/locales/es/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Ramitas Rotas",
     "questEvilSanta2DropBearCubPolarPet": "Oso polar (Mascota)",
     "questGryphonText": "El Grifo Ardiente",
-    "questGryphonNotes": "El gran señor de las bestias, <strong>baconsaur</strong>, se ha acercado a tu grupo en busca de ayuda. \"¡Por favor, aventureros, tenéis que ayudarme! ¡Mi grifa preciada se ha liberado y está aterrorizando Habit City! ¡Si puedes detenerla, podría recompensaros con algunos de sus huevos!\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Derrotada, la poderosa bestia escabulle con vergüenza a su amo. \"¡Oh! Bien hecho, aventureros!\" <strong>@baconsaur</strong> exclama, \"Por favor, toma un poco de los huevos del Grifo. Estoy seguro de que vas a criar bien a estos jóvenes!\"",
     "questGryphonBoss": "Grifo Ardiente",
     "questGryphonDropGryphonEgg": "Grifo (huevo)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "La Cadena de la Piedra Lunar Parte 3: Retraso  Trasformado  (Pergamino)",
     "questMoonstone3Text": "Retraso Transformado",
     "questMoonstone3Notes": "<p>Reincidencia cae al suelo y tu la atacas con la cadena de piedras lunares. Horrorizado contemplas como Reincidencia agarra las gemas con una mirada triunfal.</p><br/><p> \"¡Estúpida criatura de carne!\" grita. \"Estas piedras lunares me restauraran a una forma física, cierto, pero no como tu imaginabas. De la forma en que la luna llena se alimenta de la oscuridad, también así mi poder crece, y de las sombras ¡invoco el espectro del enemigo que más temes!\"</p><br/><p>Una niebla verde nauseabunda se eleva desde el pantano, y el cuerpo de Reincidencia se retuerce y contorsiona para adaptarse a una silueta que te llena del peor de los miedos – el cuerpo no-muerto de Vicio, renacido para tu horror.</p>",
-    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beastmaster swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Necro-Vicio",
     "questMoonstone3DropRottenMeat": "Carne podrida (Comida)",
     "questMoonstone3DropZombiePotion": "Poción de eclosión Zombie",
@@ -152,6 +152,7 @@
     "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
     "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
     "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questTRexText": "King of the Dinosaurs",

common/locales/es/settings.json

@@ -45,11 +45,11 @@
     "misc": "Varios",
     "showHeader": "Mostrar encabezamiento",
     "changePass": "Cambiar contraseña",
-    "changeUsername": "Cambiar Nombre de Usuario",
+    "changeUsername": "Change Login Name",
     "oldPass": "Contraseña antigua",
     "newPass": "Contraseña nueva",
     "confirmPass": "Confirmar la nueva contraseña",
-    "newUsername": "Nuevo Nombre de Usuario",
+    "newUsername": "New Login Name",
     "dangerZone": "Zona Peligrosa",
     "resetText1": "¡PELIGRO! Eso resetea muchas partes de tu cuenta. Esto es altamente desalentador, pero algunas personas lo encuentran útil al principio después de jugar durante un tiempo. ",
     "resetText2": "Perderás todos tus niveles, oro y bonus de experiencia. Todas tus tareas serán borradas permanentemente y perderás todos los datos históricos de tus tareas. Perderás todo tu equipo pero podrás comprarlo de nuevo, incluyendo todos los equipos de edición limitada o objetos Misteriosos por suscribirse que ya poseas (necesitarás estar en la clase correcta para re-comprar un equipo de una clase específica). Mantendrás tu clase actual con tus mascotas y monturas. Quizás prefieras usar en su lugar un Orbe de Renacimiento, el cual es una opción mucho más segura y que mantendrá todas tus tareas. ",
@@ -68,7 +68,16 @@
     "enterNumber": "Por favor, introduce un número entre 0 y 24",
     "fillAll": "Por favor, rellene todos los campos",
     "passSuccess": "Contraseña cambiada con éxito",
-    "usernameSuccess": "Nombre de Usuario cambiado con éxito",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Datos",
-    "exportData": "Exportar Datos"
+    "exportData": "Exportar Datos",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/es/tasks.json

@@ -36,8 +36,10 @@
     "todos": "tareas Pendientes",
     "newTodo": "Nueva tarea Pendiente",
     "dueDate": "Fecha de Vencimiento",
-    "remaining": "Sin Hacer",
-    "complete": "Completadas",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Por vencer",
     "grey": "Gris",
     "rewards": "Recompensas",

common/locales/es_419/character.json

@@ -129,5 +129,8 @@
     "youCast": "Lanzas <%= spell %>.",
     "youCastTarget": "Lanzas <%= spell %> a <%= target %>.",
     "youCastParty": "Lanzas <%= spell %> para el grupo.",
-    "critBonus": "¡Golpe Crítico! Bono:"
+    "critBonus": "¡Golpe Crítico! Bono:",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/es_419/content.json

@@ -47,8 +47,8 @@
     "questEggOwlAdjective": "sabio",
     "questEggPenguinText": "Pingüino",
     "questEggPenguinAdjective": "perspicaz",
-    "questEggTRexText": "Tyrannosaur",
-    "questEggTRexAdjective": "tiny-armed",
+    "questEggTRexText": "Tyranosaurio",
+    "questEggTRexAdjective": "Brazos pequeños",
     "eggNotes": "Encuentra una poción para verter sobre este huevo y nacerá un <%= eggText() %> <%= eggAdjective() %>.",
     "hatchingPotionBase": "Básico",
     "hatchingPotionWhite": "Blanco",

common/locales/es_419/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "Cuando se implemente tu <strong>quinta</strong> contribución, el <strong>Escudo de cristal</strong> estará disponible en la tienda de Recompensas. Como premio por tu trabajo también recibirás <strong>4 Gemas</strong>.",
     "championSixth": "Cuando se implemente tu <strong>sexta</strong> contribución, recibirás una <strong>Mascota hidra</strong>. Como premio por tu trabajo también recibirás <strong>4 Gemas</strong>.",
     "legendary": "Legendario",
-    "legSeventh": "Cuando tu <strong>séptimo</strong> conjunto de contribuciones es desplegado, recibirás <strong>4 gemas</strong> y ¡pasarás a formar parte del honorable Gremio de Colaboradores y estar enterado de los detalles \"entre bastidores\" de HabitRPG! Contribuiciones más allá de esto no incrementarán tu nivel, pero podrás seguir ganando premios de gemas y títulos.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Moderador",
     "guardian": "Guardián",
-    "guardianText": "Los moderadores fueron seleccionados cuidadosamente de los contribuidores de alto nivel, por favor de les tu respeto y escucha sus sugerencias.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Personal",
     "heroic": "Heroico",
-    "heroicText": "El nivel Heroico es para el personal de HabitRPG y los colaboradores que están al nivel del personal. Si tienes este título, te lo designaron (¡o te contrataron por él!).",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "Los NPCs contribuyeron al Kickstarter de HabitRPG en su nivel más alto. ¡Puedes encontrar sus avatares velando sobre las características del sitio!",
     "modalContribAchievement": "¡Logro de colaborador!",
-    "contribModal": "<%= name %>, ¡qué persona increíble! Ahora eres un colaborador de nivel <%= level %> por ayudar a HabitRPG. ¡Revisa",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "los premios que has ganado por tu colaboración!",
     "contribName": "Colaborador",
     "contribText": "Ha contribuido a HabitRPG (código, diseño, arte, sugerencias legales, etc.). ¿Quieres esta medalla?",
@@ -42,7 +42,7 @@
     "moreDetails2": "más detalles (8-9)",
     "contributions": "Contribuciones",
     "admin": "Administración",
-    "notGems": "es en dólares, <em>no</em> en Gemas. Es decir, si este número es 1 significa 4 gemas. Utilice esta opción sólo cuando otorga gemas a los jugadores de forma manual, no lo use al otorgar niveles de colaborador. Los niveles de colaborador agregarán automáticamente 2G/nvl.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Esconder anuncios",
     "gamemaster": "Maestro del juego (personal/moderador)",
     "backerTier": "Nivel de sponsor",

common/locales/es_419/generic.json

@@ -87,5 +87,5 @@
     "December": "Diciembre",
     "dateFormat": "Formato de fecha",
     "achievementStressbeast": "Salvador de Stoïkalm",
-    "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2015 Winter Wonderland Event!"
+    "achievementStressbeastText": "Ayuda a vencer a la Abominable Bestia durante el Evento de 2015 de la Tierra de las Maravillas Invernal!"
 }

common/locales/es_419/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Ordenar por fecha de ingreso al equipo",
     "sortName": "Ordenar por nombre de avatar",
     "sortBackgrounds": "Ordenar por fondo",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "¿Crear Gremio por 4 gemas?",
     "leaveGroupCha": "Abandonar los retos del gremio y...",
     "confirm": "Confirmar",

common/locales/es_419/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "¿Te traigo tu corcel,  <%= name %>? Haz clic en una montura para ensillarlo.",
     "mattBochText1": "¡Bienvenidos al Establo! Soy Matt, el maestro de las bestias. Escoge una mascota aquí para que aventure a tu lado. Aliméntalas y se convertirán en corceles poderosos.",
-    "mattBochText2": "Échale un vistazo",
-    "mattBochText3": "a todas las mascotas que puedes coleccionar.",
     "daniel": "Daniel",
     "danielText": "¡Bienvenidos a la Taberna! Quédate un rato y conoce a los lugareños. Si necesitas descansar (¿vas de vacaciones? ¿enfermedad repentina?), te invito a visitar la posada. Mientras estés registrado en la posada tus Diarias quedan congeladas tal cual (seleccionadas/en blanco) hasta el día siguiente de la salida. No se te penalizará al finalizar el día por no cumplirlas.",
     "danielText2": "Aviso: Si estas participando en una misión contra un jefe, ¡el jefe todavía te hará daño si los de tu equipo no completan sus Diarias!",

common/locales/es_419/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "Mascotas encontradas",
     "rarePets": "Mascotas raras",
     "questPets": "Mascotas de misión",
-    "beastmasterProgress": "Progreso de Maestro de las bestias",
     "mounts": "Monturas",
     "mountsTamed": "Monturas domadas",
     "questMounts": "Monturas de misión",
@@ -27,10 +26,21 @@
     "inventoryText": "Haz clic en un huevo para ver las pociones utilizables resaltadas en verde, y después haz clic en una de las pociones para incubar tu mascota. Si ninguna poción se destacó, haz clic en ese huevo de nuevo para anular la selección, y haz clic en una poción primero para destacar los huevos utilizables. También puedes vender objetos no deseados a Alexander el Comerciante.",
     "food": "Comida y Monturas",
     "noFood": "No tienes ni comida ni monturas.",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "¡Has ganado el Logro de \"Maestro de las Bestias\" por haber coleccionado todas las mascotas!",
-    "beastMastName": "Maestro de las Bestias",
-    "beastMastText": "Ha encontrado las 90 mascotas disponibles (increíblemente difícil, ¡dale un aplauso a este usuario!)",
-    "beastMastText2": "y ha liberado sus mascotas un total de <%= count %> veces.",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "¡Botines activados!",
     "itemDrop": "¡Un objeto se ha caído!",
     "firstDrop": "¡Has desbloqueado el Sistema de botín! Ahora, cuando realizas tareas, tendrás una probabilidad pequeña de encontrar un objeto. Has encontrado un <strong><%= eggText %> Huevo</strong>! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= egg %> <%= potion %>",
     "mountName": "<%= mount %> <%= potion %>",
     "petKeyName": "Llave de la caseta",
-    "petKeyPop": "¡Suelta tus mascotas, liberalos para que comienzan su propia aventura, y sienta de nuevo la emocion de ser el Maestro de las bestias!",
-    "petKeyBegin": "Llave de la caseta: ¡Conviértete en Maestro de la bestias una vez más! ",
-    "petKeyInfo": "Ama a tus mascotas lo suficiente para soltarlos y los botines tendrán importancia de nuevo. ",
-    "petKeyInfo2": "La Llave de la caseta reinicializa todas las mascotas que no fueron conseguidas en misiones como si nunca las hubieras encontrado. Cuando la hayas usado, podrás amontonar el logro Maestro de la bestias mostrando cuantas veces has podido vencer el RNG.",
-    "petKeyInfo3": "Hay dos juegos de Llaves: puedes o soltar sólo tus mascotas para cuatro gemas o tus mascotas y tus monturas por ocho gemas. Si todavía estas trabajando para conseguir todas las monturas, ¡quizás no quieres dejarlos en libertad por el momento!",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Liberar mis mascotas",
-    "petKeyMounts": "Liberar los dos por favor",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Todavía no",
     "gemsEach": "gemas cada uno"
 }

common/locales/es_419/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Ramitas rotas",
     "questEvilSanta2DropBearCubPolarPet": "Oso polar (Mascota)",
     "questGryphonText": "El Grifo de Fuego",
-    "questGryphonNotes": "El gran maestro de bestias, <strong>baconsaur</strong>, ha acudido a tu equipo en busca de ayuda. \"Por favor aventureros, ¡deben ayudarme! ¡Mi preciado grifo se ha escapado y está aterrorizando Habit City! Si pueden detenerla, ¡podría recompensarlos con algunos de sus huevos!",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Derrotada, la poderosa bestia se escabulle avergonzada hacia su amo. \"¡Oh, bien hecho aventureros!\" exclama <strong>baconsaur</strong>. \"Por favor, tomen algunos de los huevos del grifo. ¡Estoy seguro de que cuidarán bien a estos pequeños!\"",
     "questGryphonBoss": "Grifo de fuego",
     "questGryphonDropGryphonEgg": "Grifo (Huevo)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "La Cadena de la piedra de luna parte 3: Recidiva transformada (Pergamino)",
     "questMoonstone3Text": "Recidiva transformada",
     "questMoonstone3Notes": "<p>Recidiva se desploma al suelo, y lq golpeas con tu cadena de piedras de luna. Para tu terror, Recidiva se apodera de las gemas, sus ojos ardiendo triunfantes.</p><br/><p>\"¡Tonta criatura de carne!\" grita. \"Estas piedras de luna me restaurarán a mi forma física, es cierto, pero no como tú imaginaste. A medida de que la luna crezca en la oscuridad, también crecen mis poderes, y de las sombras convoco al espectro de tu más temido enemigo!\" </p><br/><p> Una enfermiza neblina verde se levanta de la ciénaga, y el cuerpo Recidiva se retuerce y se contorsiona en una forma que te llena de horror – el cuerpo no-muerto de Vicio, horriblemente renacido.</p>",
-    "questMoonstone3Completion": "<p>Tu aliento sale difícilmente y el sudor hace que ardan tus ojos conforme el muerto viviente Guivre se colapsa. Los restos de Recidiva se desvanecen formando una gruesa bruma gris que desaparece rápidamente bajo una ráfaga de brisa refrescante, y escuchas en la distancia los gritos de multitudes de Habiticanos derrotando sus Malos Hábitos de una vez por todas.</p><br/><p>@Baconsaur el maestro de las bestias se abalanza montado en un grifo. \"Vi el final de tu batalla desde el cielo, y fue increíblemente conmovedora. Por favor, toma esta túnica encantada –  tu valentía habla de un noble corazón, y creo que estabas destinado a tenerla.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Necrovicio",
     "questMoonstone3DropRottenMeat": "Carne podrida (Comida)",
     "questMoonstone3DropZombiePotion": "Poción de ecolsion Zombie",
@@ -147,14 +147,15 @@
     "questStressbeastBoss": "The Abominable Stressbeast",
     "questStressbeastBossRageTitle": "Stress Strike",
     "questStressbeastBossRageDescription": "When this gauge fills, the Abominable Stressbeast will unleash its Stress Strike on Habitica!",
-    "questStressbeastDropMammothPet": "Mammoth (Pet)",
-    "questStressbeastDropMammothMount": "Mammoth (Mount)",
+    "questStressbeastDropMammothPet": "Mamut (Mascota)",
+    "questStressbeastDropMammothMount": "Mamut (Montura)",
     "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
     "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
     "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
-    "questTRexText": "King of the Dinosaurs",
+    "questTRexText": "Rey de los dinosaurios",
     "questTRexNotes": "Now that ancient creatures from the Stoïkalm Steppes are roaming throughout all of Habitica, @Urse has decided to adopt a full-grown Tyrannosaur. What could go wrong?<br><br>Everything.",
     "questTRexCompletion": "The wild dinosaur finally stops its rampage and settles down to make friends with the giant roosters. @Urse beams down at it. \"They're not such terrible pets, after all! They just need a little discipline. Here, take some Tyrannosaur eggs for yourself.\"",
     "questTRexBoss": "Flesh Tyrannosaur",
@@ -165,5 +166,5 @@
     "questTRexUndeadRageTitle": "Skeleton Healing",
     "questTRexUndeadRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Skeletal Tyrannosaur will heal 30% of its remaining health!",
     "questTRexUndeadRageEffect": "`Skeletal Tyrannosaur uses SKELETON HEALING!`\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!",
-    "questTRexDropTRexEgg": "Tyrannosaur (Egg)"
+    "questTRexDropTRexEgg": "Tiranosaurio (huevo)"
 }

common/locales/es_419/settings.json

@@ -45,11 +45,11 @@
     "misc": "Varios",
     "showHeader": "Mostrar cabecera",
     "changePass": "Cambiar contraseña",
-    "changeUsername": "Cambiar el nombre de usuario",
+    "changeUsername": "Change Login Name",
     "oldPass": "Contraseña antigua",
     "newPass": "Contraseña nueva",
     "confirmPass": "Confirmar la nueva contraseña",
-    "newUsername": "Nuevo nombre de usuario",
+    "newUsername": "New Login Name",
     "dangerZone": "Zona peligrosa",
     "resetText1": "¡AVISO! Esto reinicia muchas partes de tu cuenta. Esto no se recomienda, pero ha resultado útil para algunas personas al inicio después de jugar con el sitio web por un corto tiempo.",
     "resetText2": "Perderás todas tus niveles, oro, y puntos de experiencia. Todas tus tareas y la data historial de tus tareas serán borradas permanentemente. Perderás todo tu equipamiento pero podrás comprarlo de nuevo en el futuro, incluyendo todo el equipamiento equipamiento de edición limitada o artículos misterio de suscriptor de que ya posees (tendrás que estar en la clase correcta para poder comprar equipamiento que es limitada a cierta clases). Te quedaras con tu clase actual y tus mascotas y monturas. Es aconsejado usar una Esfera de renacimiento al lugar de reiniciar la cuenta porque es una alternativa más segura que preservara tus tareas.",
@@ -68,7 +68,16 @@
     "enterNumber": "Por favor, introduce un número entre 0 y 24",
     "fillAll": "Por favor, rellene todos los campos",
     "passSuccess": "Contraseña cambiada exitosamente",
-    "usernameSuccess": "Nombre de usuario cambiado exitosamente",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Datos",
-    "exportData": "Exportar datos"
+    "exportData": "Exportar datos",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/es_419/tasks.json

@@ -36,8 +36,10 @@
     "todos": "Pendientes",
     "newTodo": "Nueva Pendiente",
     "dueDate": "Fecha de vencimiento",
-    "remaining": "Sin hacer",
-    "complete": "Completadas",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Por hacer",
     "grey": "Gris",
     "rewards": "Recompensas",

common/locales/fr/character.json

@@ -129,5 +129,8 @@
     "youCast": "Vous avez lancé <%= spell %>.",
     "youCastTarget": "Vous avez lancé <%= spell %> sur <%= target %>.",
     "youCastParty": "Vous avez lancé <%= spell%> pour l'équipe.",
-    "critBonus": "Coup critique ! Bonus :"
+    "critBonus": "Coup critique ! Bonus :",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/fr/content.json

@@ -47,7 +47,7 @@
     "questEggOwlAdjective": "avisée",
     "questEggPenguinText": "Manchot",
     "questEggPenguinAdjective": "perspicace",
-    "questEggTRexText": "Tyrannosaur",
+    "questEggTRexText": "Tyrannosaure",
     "questEggTRexAdjective": "tiny-armed",
     "eggNotes": "Trouvez une potion d’éclosion à verser sur cet œuf et il en sortira un <%= eggText() %> <%= eggAdjective() %>.",
     "hatchingPotionBase": "de Base",

common/locales/fr/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "Lorsque votre <strong>cinquième</strong>  lot de contributions sera intégré, le <strong>Bouclier de Cristal</strong> sera disponible à l'achat dans la boutique. Comme récompense pour votre travail, vous recevrez aussi <strong>4 Gemmes</strong>.",
     "championSixth": "Lorsque votre <strong>sixième</strong> lot de contributions sera intégré, vous recevrez un <strong>Familier Hydre</strong>, ainsi que <strong>4 Gemmes</strong>.",
     "legendary": "Légendaire",
-    "legSeventh": "Lorsque votre <strong>septième</strong> lot de contributions sera intégré, vous recevrez <strong>4 Gemmes</strong> et deviendrez alors un membre de l'honorable Guilde des Contributeurs. Vous serez également tenu informé des coulisses de HabitRPG ! De nouvelles contributions n'augmenteront plus votre niveau mais vous continuerez à recevoir des Gemmes et des titres",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Modérateur",
     "guardian": "Gardien",
-    "guardianText": "Les modérateurs ont été choisis avec soin parmi les contributeurs de plus haut rang, nous vous invitons donc à faire preuve de politesse et à prêter l'oreille à leurs suggestions.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Équipe",
     "heroic": "Héroïque",
-    "heroicText": "Le niveau Héroïque rassemble l'équipe de HabitRPG ainsi que les contributeurs au niveau de l'équipe. Si vous avez ce titre, vous avez été commissionné·e pour celui-ci (ou engagé·e !). ",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "Les PNJs ont soutenu HabitRPG sur Kickstarter au plus haut palier. Vous pouvez voir leurs avatars veiller sur les fonctionnalités du site !",
     "modalContribAchievement": "le succès \"Contributeur\" !",
-    "contribModal": "<%= name %>, vous êtes une personne géniale ! Vous êtes maintenant un contributeur de niveau <%= level %> pour avoir aidé HabitRPG. Voyez vous même",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "quelles récompenses vous avez gagnées grâce à votre contribution !",
     "contribName": "Contributeur",
     "contribText": "A contribué au développement d'HabitRPG (code, design, pixel art, conseils juridiques, documents, etc). Vous voulez ce badge ?",
@@ -42,7 +42,7 @@
     "moreDetails2": "plus de détails (8-9)",
     "contributions": "Contributions",
     "admin": "Admin",
-    "notGems": "est exprimé en USD, <em>pas </em> en Gemmes. Autrement dit, si ce nombre vaut 1, cela signifie 4 gemmes. N'utilisez cette option que quand vous récompensez manuellement les joueurs en gemmes, ne l'utilisez pas quand vous attribuez des niveaux de contributeur. Les niveaux de contributeur allouent automatiquement 2 Gemmes/niveau.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Cacher les publicités",
     "gamemaster": "Maître du Jeu (équipe/modérateur)",
     "backerTier": "Palier de Soutien",

common/locales/fr/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Classer par date d'arrivée dans l'équipe",
     "sortName": "Classer par nom d'avatar",
     "sortBackgrounds": "Classer par arrière-plan",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "Créer une Guilde pour 4 Gemmes ?",
     "leaveGroupCha": "Quitter les défis de Guilde et…",
     "confirm": "Confirmer",

common/locales/fr/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "Dois-je amener votre destrier, <%= name%> ? Cliquez sur une monture pour monter en selle.",
     "mattBochText1": "Bienvenue à l’Écurie ! Je suis Matt, le Maîtres des Bêtes. Choisissez ici un familier qui partira à l'aventure à vos côtés. Nourrissez-les et ils évolueront en de puissantes montures. ",
-    "mattBochText2": "Jetez un coup d’œil",
-    "mattBochText3": "à tous les familiers que vous pouvez collectionner.",
     "daniel": "Daniel",
     "danielText": "Bienvenue à la Taverne ! Restez un moment et rencontrez les habitants. Si vous avez besoin de vous reposer (vacances ?  maladie soudaine ?), je vous mettrai dans l'auberge. Vos Quotidiennes seront conservées en l'état (complétées ou non) jusqu'au jour suivant votre sortie, et ne vous blesseront pas durant toute la durée de votre séjour.",
     "danielText2": "Soyez prudent·e : si vous êtes au milieu d'une quête contre un boss, celui-ci vous infligera tout de même des blessures en fonction des Quotidiennes ratées des membres de votre groupe.",

common/locales/fr/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "Familiers trouvés",
     "rarePets": "Familiers rares",
     "questPets": "Familiers de Quête",
-    "beastmasterProgress": "Progrès Maître des Bêtes",
     "mounts": "Montures",
     "mountsTamed": "Montures apprivoisées",
     "questMounts": "Montures de Quête",
@@ -27,10 +26,21 @@
     "inventoryText": "Cliquez sur un œuf pour voir les potions utilisables surlignées en vert puis cliquez sur une des potions surlignées pour faire éclore votre familier. Si aucune potion n'est surlignée, cliquez à nouveau sur l’œuf pour le désélectionner et cliquez plutôt sur une potion d'abord pour voir les œufs utilisables. Vous pouvez aussi vendre votre surplus d'objets à Alexander le Marchand.",
     "food": "Nourriture et Selles",
     "noFood": "Vous n'avez ni nourriture ni selle.",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "Vous avez remporté le succès \"Maître des Bêtes\" pour avoir collectionné tous les familiers !",
-    "beastMastName": "Maître des Bêtes",
-    "beastMastText": "A trouvé les 90 familiers (extrêmement difficile, félicitez cet utilisateur !)",
-    "beastMastText2": "et a libéré ses familiers <%= count %> fois",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Butins Activés !",
     "itemDrop": "Vous avez trouvé un objet !",
     "firstDrop": "Vous avez débloqué le système de Butins ! À présent lorsque vous complétez des tâches, vous avez une petite chance de trouver un objet. Vous venez juste de trouver un <strong>Œuf <%= eggText %></strong> ! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= egg %> <%= potion %>",
     "mountName": "<%= mount %> <%= potion %>",
     "petKeyName": "Clé du Chenil",
-    "petKeyPop": "Rendez la liberté à vos familiers en leur laissant démarrer leur propre aventure, et redécouvrez le frisson du Maître des Bêtes !",
-    "petKeyBegin": "Clé du Chenil : revivez l'expérience du succès Maître des Bêtes !",
-    "petKeyInfo": "Aimez suffisamment vos familiers pour les laisser partir, et redonnez un sens aux butins.",
-    "petKeyInfo2": "La Clé du Chenil remet à zéro votre liste de familiers non liés à des quêtes, comme si vous ne les aviez jamais trouvés. Une fois que vous l'aurez utilisée, vous serez capable de cumuler plusieurs fois le succès Maître des Bêtes, exhibant ainsi le nombre de fois où vous avez pu dominer le hasard.",
-    "petKeyInfo3": "Il existe deux jeux de Clés : vous pouvez libérer uniquement vos familiers pour quatre gemmes, ou bien vos familiers et vos montures pour huit gemmes. Si vous ne disposez pas encore de toutes les montures, vous ne voulez sûrement pas les relâcher tout de suite !",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Libérer Mes Familiers",
-    "petKeyMounts": "Merci de Libérer les Deux",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Pas Encore",
     "gemsEach": "gemmes chacun"
 }

common/locales/fr/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Brindilles Brisées",
     "questEvilSanta2DropBearCubPolarPet": "Ours Polaire (Familier)",
     "questGryphonText": "Le Griffon Flamboyant",
-    "questGryphonNotes": "Le grand Maître des Bêtes, @baconsaur, est venu voir votre équipe pour trouver de l'aide. \"Je vous en prie, aventuriers, aidez-moi ! Mon précieux griffon s'est échappé et terrorise Habit City ! Si vous réussissez à l'arrêter, je vous récompenserai en vous donnant certains de ses œufs !\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Vaincue, la puissante bête retourne vers son maître en rampant avec honte. \"Alors ça ! Bien joué, aventuriers !\" s'exclame <strong>@baconsaur</strong>. : \"Tenez, prenez ces œufs de griffon. Je suis sûr que vous élèverez bien ces petits !\"",
     "questGryphonBoss": "Griffon Flamboyant",
     "questGryphonDropGryphonEgg": "Griffon (Œuf)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "La Chaîne de Pierres de Lune, Partie 3 : La Transformation de Récidive (Parchemin)",
     "questMoonstone3Text": "La Transformation de Récidive",
     "questMoonstone3Notes": "<p>Récidive s'effondre, et vous lui assénez un coup avec la chaîne de pierres de Lune. Devant vos yeux horrifiés, Récidive s'empare des gemmes, les yeux brillants de triomphe.</p><br/><p>\"Stupide créature de chair !\" s'écrie-t-elle. \"Ces pierres de Lune me rendront une forme physique, c'est vrai, mais pas celle que vous imaginiez. Comme la pleine lune émerge des ténèbres, mes pouvoirs aussi grandissent, et des ombres j'invoque le spectre de votre ennemi le plus redouté !\"</p><br/><p>Une grenouille d'un vert maladif remonte du Marais, et le corps de Récidive se tord et se contorsionne en une forme qui vous remplit d'effroi – l'horrible corps mort-vivant de Vice, ressuscité.</p>",
-    "questMoonstone3Completion": "<p>Votre souffle se raccourcit et la sueur vous pique les yeux alors que la Vouivre mort-vivante s'écroule. Les restes de Récidive se dissipent en un fin brouillard grisâtre, qu'une brise rafraîchissante a tôt fait de dissiper ; vous entendez au loin les cris de ralliement des Habiticien·ne·s abattant leurs mauvaises Habitudes une fois pour toutes.</p><br/><p>Le maître des bêtes @Baconsaur descend en piqué sur son griffon. \"J'ai assisté à la fin de votre bataille depuis le ciel, et elle m'a fortement ému. Je vous en prie, prenez cette tunique enchantée – votre bravoure révèle un cœur noble, je pense qu'elle vous était destinée.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Nécro-Vice",
     "questMoonstone3DropRottenMeat": "Viande Pourrie (Nourriture)",
     "questMoonstone3DropZombiePotion": "Potion d'Éclosion Zombie",
@@ -138,23 +138,24 @@
     "questOwlBoss": "L'Oiseau de Nuit",
     "questOwlDropOwlEgg": "Chouette (œuf)",
     "questPenguinText": "Le Gorfou Glacé",
-    "questPenguinNotes": "Bien qu’il s’agisse d’une chaude journée d’été pour les résidents de la pointe sud d’Habitica, un étrange froid vient de s’abattre sur le Lac Vif. Des vents forts et glaciaux soufflent sur la rive qui commence à geler. L’herbe et la terre font désormais place à des pics de glace jaillissant du sol. @Melynnrose et @Breadstrings accourent vers vous. .<br><br>\"A l’aide !\" crie @Melynnrose. \" Nous avons ramené un manchot géant au lac en espérant qu’il allait suffisamment le geler pour que nous puissions transformer le lac en patinoire mais nous n’avons plus assez de poissons pour le nourrir !\"<br><br>\"Il s’est alors mis dans une colère froide et utilise désormais son souffle glacial pour tout geler sur son passage ! \" dit @Breadstrings. \"S’il vous plaît, maîtrisez le avant que nous ne soyons tous transformés en statue de glace ! \" On dirait que vous avez besoin de…<em>refroidir</em> les ardeurs de ce manchot.",
-    "questPenguinCompletion": "Après la défaite du manchot, la glace fond comme neige au soleil. Le manchot géant s’installe alors tranquillement au soleil, dévorant bruyamment le seau de poissons que vous veniez de trouver. Il se lève ensuite pour un tour de patinage sur le lac tout en soufflant afin de créer une fine couche de glace étincelante. Quel drôle d’oiseau ! \"Il semble qu’il ait laissé quelques œufs derrière lui\" dit @Painter de Cluster. <br><br> @Rattify s’esclaffa. « Peut-être que ces manchots seront un peu plus…cool ? \"",
+    "questPenguinNotes": "Bien qu’il s’agisse d’une chaude journée d’été pour les résidents de la pointe sud d’Habitica, un étrange froid vient de s’abattre sur le Lac Vif. Des vents forts et glaciaux soufflent sur la rive qui commence à geler. L’herbe et la terre font désormais place à des pics de glace jaillissant du sol. @Melynnrose et @Breadstrings accourent vers vous. .<br><br>\"À l’aide !\" crie @Melynnrose. \" Nous avons ramené un manchot géant au lac en espérant qu’il allait le geler et nous permettre d'en faire une patinoire mais nous n’avons plus assez de poissons pour le nourrir !\"<br><br>\"Il s’est mis dans une colère froide et utilise désormais son souffle glacial pour tout geler sur son passage ! \" dit @Breadstrings. \"S’il vous plaît, maîtrisez-le avant que nous ne soyons tous transformés en statue de glace ! \" On dirait que vous avez besoin de…<em>refroidir</em> les ardeurs de ce manchot.",
+    "questPenguinCompletion": "Après la défaite du manchot, la glace fond comme neige au soleil. Le manchot géant s’installe alors tranquillement au soleil, dévorant bruyamment le seau de poissons que vous venez de trouver. Il se lève ensuite pour un tour de patinage sur le lac tout en soufflant afin de créer une fine couche de glace étincelante. Quel drôle d’oiseau ! \"Il semble qu’il ait laissé quelques œufs derrière lui\" dit @Painter de Cluster. <br><br> @Rattify s’esclaffe. « Peut-être que ces manchots seront un peu plus…cool ? \"",
     "questPenguinBoss": "Manchot Givré",
     "questPenguinDropPenguinEgg": "Manchot (œuf)",
-    "questStressbeastText": "L'Abominable Monstress des Steppes Stoïkalmes",
+    "questStressbeastText": "L'Abominable Monstressé des Steppes Stoïcalmes",
     "questStressbeastNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.<br><br>~*~<br><br>The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.<br><br>We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.<br><br>\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"<br><br>\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.<br><br>\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"<br><br>There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...",
-    "questStressbeastBoss": "L'Abominable Monstress",
+    "questStressbeastBoss": "L'Abominable Monstressé",
     "questStressbeastBossRageTitle": "Coup de Stress",
-    "questStressbeastBossRageDescription": "Lorsque la jauge sera remplie, l'Abominable Homme du Stress frappera tout Habitica d'un Coup de Stress !",
+    "questStressbeastBossRageDescription": "Lorsque la jauge sera remplie, l'Abominable Monstressé frappera tout Habitica d'un Coup de Stress !",
     "questStressbeastDropMammothPet": "Mammouth (Familier)",
     "questStressbeastDropMammothMount": "Mammouth (Monture)",
     "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
     "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
     "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
-    "questTRexText": "King of the Dinosaurs",
+    "questTRexText": "Le Roi des Dinosaures",
     "questTRexNotes": "Now that ancient creatures from the Stoïkalm Steppes are roaming throughout all of Habitica, @Urse has decided to adopt a full-grown Tyrannosaur. What could go wrong?<br><br>Everything.",
     "questTRexCompletion": "The wild dinosaur finally stops its rampage and settles down to make friends with the giant roosters. @Urse beams down at it. \"They're not such terrible pets, after all! They just need a little discipline. Here, take some Tyrannosaur eggs for yourself.\"",
     "questTRexBoss": "Flesh Tyrannosaur",
@@ -165,5 +166,5 @@
     "questTRexUndeadRageTitle": "Skeleton Healing",
     "questTRexUndeadRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Skeletal Tyrannosaur will heal 30% of its remaining health!",
     "questTRexUndeadRageEffect": "`Skeletal Tyrannosaur uses SKELETON HEALING!`\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!",
-    "questTRexDropTRexEgg": "Tyrannosaur (Egg)"
+    "questTRexDropTRexEgg": "Tyrannosaure (Œuf)"
 }

common/locales/fr/settings.json

@@ -45,11 +45,11 @@
     "misc": "Divers",
     "showHeader": "Montrer le Bandeau",
     "changePass": "Changer le mot de passe",
-    "changeUsername": "Changer l'Identifiant",
+    "changeUsername": "Change Login Name",
     "oldPass": "Ancien mot de passe",
     "newPass": "Nouveau mot de passe",
     "confirmPass": "Confirmer le nouveau mot de passe",
-    "newUsername": "Nouvel Identifiant",
+    "newUsername": "New Login Name",
     "dangerZone": "Zone de Danger",
     "resetText1": "ATTENTION ! Cette action va réinitialiser une grand partie de votre compte. Ceci est fortement déconseillé, mais certaines personnes y trouvent une utilité dans les premiers temps, après une courte utilisation de l'application.",
     "resetText2": "Vous perdrez tous vos niveaux, or et points d'expérience. Toutes vos tâches seront supprimées de façon permanente et vous perdrez tout l'historique associé aux tâches. Vous perdrez tout votre équipement mais il vous sera possible de l'acheter à nouveau, y compris les équipements en Edition Limitée et les Equipements Mystères d'abonné (vous devrez cependant être de la classe correspondante pour racheter les équipements de classe). Vous conserverez votre classe actuelle, ainsi que vos familiers et montures. Vous préférerez peut-être utiliser un Orbe de Renaissance à la place, une option bien plus sûre qui vous permettra de conserver toutes vos tâches.",
@@ -68,7 +68,16 @@
     "enterNumber": "Veuillez entrer un chiffre entre 0 et 24",
     "fillAll": "Veuillez remplir tous les champs",
     "passSuccess": "Mot de passe changé avec succès ",
-    "usernameSuccess": "Identifiant changé avec succès ",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "Données",
-    "exportData": "Exporter les Données"
+    "exportData": "Exporter les Données",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/fr/tasks.json

@@ -36,8 +36,10 @@
     "todos": "À faire",
     "newTodo": "Nouvelle tâche À faire",
     "dueDate": "Date d'échéance",
-    "remaining": "Restantes",
-    "complete": "Accomplies",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Restantes",
     "grey": "Grisées",
     "rewards": "Récompenses",

common/locales/he/character.json

@@ -129,5 +129,8 @@
     "youCast": "הטלת <%= spell %>.",
     "youCastTarget": "הטלת <%= spell %> על <%= target %>.",
     "youCastParty": "הטלת <%= spell %> בשביל החבר'ה שלך. כל הכבוד!",
-    "critBonus": "פגיעה חמורה! בונוס:"
+    "critBonus": "פגיעה חמורה! בונוס:",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/he/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "When your <strong>fifth</strong> set of submissions is deployed, the <strong>Crystal Shield</strong> will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive <strong>4 Gems</strong>.",
     "championSixth": "When your <strong>sixth</strong> set of submissions is deployed, you will receive a <strong>Hydra Pet</strong>. You will also receive <strong>4 Gems</strong>.",
     "legendary": "אגדה",
-    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your level, but you may continue to earn Gem bounties and titles.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "עורך/ת",
     "guardian": "שומר/ת",
-    "guardianText": "עורכים נבחרו בקפידה מבין התורמים הנאמנים ביותר שלנו, אז אנא התייחסו אליהם בכבוד ושמעו לעצתם.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "צוות",
     "heroic": "הירואי",
-    "heroicText": "הרמה ההירואית כוללת אנשים ברמת הצוות של habitRPG. אם יש לך את התואר הזה, כנראה שנבחרת למשימה (או נשכרת!)",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "דב\"שים גיבו את הקיקסטארטר של habitRPG ברמה הגבוהה ביותר. תוכל למצוא את האווטארים שלהם משגיחים על האתר!",
     "modalContribAchievement": "הישג תורמים!",
-    "contribModal": "<%= name %>, את/ה בנאדם סופר מגניב! זכית ברמת תורם <%= level %> עבור עזרתך לhabitRPG. ראה/י",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "אילו פרסים הרווחת עבור תרומתך!",
     "contribName": "תורם/ת",
     "contribText": "תרם/ה להאביט (קוד, עיצוב, אמנות, עצה משפטית, מסמכים וכיוב'). רוצה תג כזה לעצמך?",
@@ -42,7 +42,7 @@
     "moreDetails2": "פרטים נוספים (8-9)",
     "contributions": "תרומות",
     "admin": "מנהל",
-    "notGems": "מדובר בדולרים, <em>לא</em> באבני חן. כלומר, אם המספר הזה הוא 1, זה אומר 4 אבני חן. השתמש באופציה זו כאשר אתה מעניק אבני חן באופן ידני לשחקנים, ולא כאשר אתה מעניק רמות תורם. רמות תורם יוסיפו 2 אבני חן לרמה באופן אוטומטי.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "החבא פרסומות",
     "gamemaster": "שליט משחק (צוות/מנהל)",
     "backerTier": "רמת גיבוי",

common/locales/he/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "מיון לפי פז\"מ",
     "sortName": "מיון לפי שם דמות",
     "sortBackgrounds": "מיון לפי רקע",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "צור גילדה בתמורה ל4 אבני חן?",
     "leaveGroupCha": "עזוב את אתגרי הגילדה וגם...",
     "confirm": "אישור",

common/locales/he/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "מאט בוך",
     "mattShall": "שאביא לך את חיית הרכיבה שלך,  <%= name %>? לחץ/י על החיה עליה ברצונך לרכב.",
     "mattBochText1": "ברוכים הבאים לאורווה! אני מאט, אדון החיות. בחר/י חיית מחמד מאלו המופיעות כאן אשר תלך לצידך. האכל/האכילי אותן היטב והן תגדלנה לחיות רכיבה מרשימות.",
-    "mattBochText2": "העף/העיפי מבט",
-    "mattBochText3": "בכל החיות שניתן לאסוף.",
     "daniel": "דניאל",
     "danielText": "ברוכים הבאים לפונדק! השארו לזמן מה והכירו את המקומיים. אם את/ה צריך/ה מנוחה (יוצא/ת לחופשה? מחלה פתאומית?) אכין לך חדר באכסניה שלנו. כל עוד תנוח/י כאן, כך המטלות היומיות שלך יישארו במצב בו היו כשנכנסת (מסומנות או לא), עד היום אחרי שתצא/י. כך הן לא יגרמו לך נזק בסוף היום.",
     "danielText2": "ראה/י הוזהרת: אם את/ה משתתף/ת במשימת קרב, האויב עדיין יפגע בך עבור משימות יומיות של חברי קבוצתך שלא הושלמו.",

common/locales/he/pets.json

@@ -3,7 +3,6 @@
     "petsFound": "חיות מחמד שנאספו",
     "rarePets": "חיות מחמד נדירות",
     "questPets": "חיות משימה",
-    "beastmasterProgress": "התקדמות אלוף החיות",
     "mounts": "חיות רכיבה",
     "mountsTamed": "חיות רכיבה שאולפו",
     "questMounts": "חיות רכיבה ממשימות",
@@ -27,10 +26,21 @@
     "inventoryText": "לחצו על ביצה בכדי לראות שיקויים שמישים מסומנים בירוק ואז לחצו על אחד מאותם שיקויים כדי להבקיע את ביצת החיה שלכם. אם אף שיקוי לא מסומן, לחצו על הביצה בשנית כדי לבטל את הסימון, ותחת זאת לחצו על שיקוי כדי לראות ביצים שניתן להבקיע בעזרתו. ניתן גם למכור מוצרים לא נחוצים לאלכסנדר הסוחר.",
     "food": "אוכל ואוכפים",
     "noFood": "אין לך אוכל או אוכפים",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "הרווחת את הישג \"אדון החיות\" על איסוף כל חיות המחמד!",
-    "beastMastName": "אדון חיות",
-    "beastMastText": "מצא/ה את כל 90 חיות המחמד הבסיסיות (משימה קשה להחריד! תנו לו/ה בכפיים!)",
-    "beastMastText2": "ושחרר/ה את חיות המחמד שלו/ה  <%= count %> פעמים סך הכל.",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "ניתן לבזוז!",
     "itemDrop": "יש לך דבר חדש!",
     "firstDrop": "מערכת הביזה כעת פתוחה בפניך! מעתה, בכל פעם שתושלם משימה, יהיה לך סיכוי קטן למצוא חפץ בעל ערך. הרגע מצאת <strong><%= eggText %> ביצה</strong>! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= egg %> <%= potion %>",
     "mountName": " <%= mount %> <%= potion %>",
     "petKeyName": "מפתח למכלאות",
-    "petKeyPop": "שחרר/י את חיות המחמד שלך לחופשי, כדי שיוכלו להתחיל הרפתקאות משלהן, ונסה/י להשיג את תואר \"אדון החיות\" פעם נוספת!",
-    "petKeyBegin": "מפתח למלונות: הפכו ל\"אדון החיות\" פעם נוספת!",
-    "petKeyInfo": "אם את/ה אוהב/ת את חיות המחמד שלך מספיק כדי לשחרר אותן, ואם את/ה רוצה שהביזה שלך תרגיש משמעותית שוב",
-    "petKeyInfo2": "המפתח למלונות מאתחל את כל חיות המחמד שלא הגיעו ממשימות כאילו מעולם לא מצאת אותם. ",
-    "petKeyInfo3": "ישנם שני צרורות של מפתחות: תוכל/י או לשחרר את חיות המחמד שלך בתמורה ל4 אבני חן, או את חיות המחמד וחיות הרכיבה שלך תמורת 8. אם עדיין לא השגת את כל חיות הרכיבה עדיין, אולי לא תרצה/י לוותר עליהם!",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "שחררו את חיות המחמד שלי",
-    "petKeyMounts": "יאללה,  שחררו את כולם!",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "עוד לא",
     "gemsEach": "אבני חן לכל אחד."
 }

common/locales/he/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "ענפים שבורים",
     "questEvilSanta2DropBearCubPolarPet": "דובון קוטב (חיית מחמד)",
     "questGryphonText": "הגריפון הבוער",
-    "questGryphonNotes": "אלוף החיות המהולל, <strong>בייקונוזאורוס רקס</strong>, בא למסיבה שלך בחיפוש אחר עזרה. \"אנא, הרפתקנים! אתם מוכרחים לעזור לי! הגריפונית היפייפיה שלו השתחרר ומשליט טרור בהאביט סיטי! אם תוכלו לעצור אותה, אתן לכם כמה מביציה כפרס!\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Defeated, the mighty beast ashamedly slinks back to its master. \"My word! Well done, adventurers!\" <strong>baconsaur</strong> exclaims, \"Please, have some of the gryphon's eggs. I am sure you will raise these young ones well!\"",
     "questGryphonBoss": "גריפון בוער",
     "questGryphonDropGryphonEgg": "גריפון (ביצה)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "The Moonstone Chain Part 3: Recidivate Transformed (Scroll)",
     "questMoonstone3Text": "Recidivate Transformed",
     "questMoonstone3Notes": "<p>Recidivate crumples to the ground, and you strike at her with the moonstone chain. To your horror, Recidivate seizes the gems, eyes burning with triumph.</p><br/><p>\"Foolish creature of flesh!\" she shouts. \"These moonstones will restore me to a physical form, true, but not as you imagined. As the full moon waxes from the dark, so too does my power flourish, and from the shadows I summon the specter of your most feared foe!\"</p><br/><p>A sickly green fog rises from the swamp, and Recidivate’s body writhes and contorts into a shape that fills you with dread – the undead body of Vice, horribly reborn.</p>",
-    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beastmaster swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Necro-Vice",
     "questMoonstone3DropRottenMeat": "בשר רקוב (אוכל)",
     "questMoonstone3DropZombiePotion": "Zombie Hatching Potion",
@@ -152,6 +152,7 @@
     "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
     "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
     "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questTRexText": "King of the Dinosaurs",

common/locales/he/settings.json

@@ -45,11 +45,11 @@
     "misc": "שונות",
     "showHeader": "הראה כותרת",
     "changePass": "שנה סיסמה",
-    "changeUsername": "שנה/י שם משתמש/ת",
+    "changeUsername": "Change Login Name",
     "oldPass": "סיסמה ישנה",
     "newPass": "סיסמה חדשה",
     "confirmPass": "אשרר סיסמה חדשה",
-    "newUsername": "שם משתמש/ת חדש",
+    "newUsername": "New Login Name",
     "dangerZone": "אזור מסוכן",
     "resetText1": "אזהרה! פעולה זו תמחוק חלקים רבים מהמשתמש שלך. זה ממש לא מומלץ כי תאבד/י מידע היסטורי, השימושי למעקב אחר ההתקדמות שלך לאורך זמן, אם כי, ישנם האנשים שזה שימושי עבורם אחרי שהם משחקים עם האתר לזמן מה.",
     "resetText2": "את/ה תאבד/י את כל הדרגות, הזהב, ונקודות הניסיון שלך. כל המשימות שלך ימחקו לצמיתות יחד עם ההיסטוריה שלהן. את/ה תאבד/י את כל הציוד שלך אך תוכלי לקנות את כולו בחזרה, כולל את כל הציוד ממהדורה מוגבלת או חפצי תורם שכבר בבעלותך (תיאלצ/י להיות במקצוע הנכון בשביל לקנות מחדש ציוד מקצועי מתאים). את/ה תשמור/י על המקצוע שלך, חיות המחמד וחיות הרכיבה. אולי תעדיפ/י להשתמש בכדור הלידה מחדש במקום זאת, שהוא אפשרות הרבה יותר בטוחה שתשמר את המשימות שלך.",
@@ -68,7 +68,16 @@
     "enterNumber": "אנא הכנס/י מספר בין 0 ל24",
     "fillAll": "אנא מלא/י את כל השדות",
     "passSuccess": "הסיסמא שונתה בהצלחה",
-    "usernameSuccess": "שם משתמש/ת השתנה בהצלחה!",
+    "usernameSuccess": "Login Name successfully changed",
     "data": "מידע",
-    "exportData": "ייצוא מידע"
+    "exportData": "ייצוא מידע",
+    "emailChange1": "To change your email address, please send an email to",
+    "emailChange2": "admin@habitrpg.com",
+    "emailChange3": "including both your old and new email address as well as your User ID.",
+    "username": "Login Name",
+    "email": "Email",
+    "registeredWithFb": "Registered with Facebook",
+    "loginNameDescription1": "This is what you use to login to HabitRPG. Go to",
+    "loginNameDescription2": "User->Profile",
+    "loginNameDescription3": "to change the name that appears in your avatar and chat messages."
 }

common/locales/he/tasks.json

@@ -36,8 +36,10 @@
     "todos": "מטרות",
     "newTodo": "משימה חדשה",
     "dueDate": "תאריך השלמה",
-    "remaining": "נותרו",
-    "complete": "הושלמו",
+    "remaining": "Active",
+    "complete": "Done",
+    "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "עכשווי",
     "grey": "אפור",
     "rewards": "פרסים",

common/locales/hu/character.json

@@ -129,5 +129,8 @@
     "youCast": "Egy <%= spell %>-t varázsoltál.",
     "youCastTarget": "Egy <%= spell %>-t varázsoltál  <%= target %>-n.",
     "youCastParty": " Egy <%= spell %>-t varázsoltál a csapatodnak.",
-    "critBonus": "Kritikus sebzés! Bónusz:"
+    "critBonus": "Kritikus sebzés! Bónusz:",
+    "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
+    "displayNameDescription2": "Settings->Site",
+    "displayNameDescription3": "and scroll down to the Registration section to change your login name."
 }

common/locales/hu/contrib.json

@@ -9,16 +9,16 @@
     "championFifth": "Amikor az <strong>ötödik</strong> hozzájárulásodat telepítjük, akkor a <strong>Kristály Pajzs</strong> megvásárolhatóvá válik a Jutalmak boltjában. Jutalmul kapsz továbbá <strong>4 Drágakövet.</strong> is.",
     "championSixth": "Amikor a <strong>hatodik</strong> hozzájárulásodat telepítjük, akkor megkapod a <strong>Hydra Háziállatot</strong>. Jutalmul kapsz továbbá <strong>4 Drágakövet.</strong> is.",
     "legendary": "Legendás",
-    "legSeventh": "Amikor a <strong>hetedik</strong> hozzájárulásodat telepítjük, akkor kapsz <strong>4 Drágakövet</strong> és a megtisztelő Közreműködők Céhében kapsz tagságot és illetékessé válsz a HabitRPG színfalak mögötti részleteiben. A további hozzájárulásaid nem növelik a szintedet, de továbbra is kaphatsz Drágaköveket és titulusokat.",
+    "legSeventh": "When your <strong>seventh</strong> set of submissions is deployed, you will receive <strong>4 Gems</strong> and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.",
     "moderator": "Moderátor",
     "guardian": "Védelmező",
-    "guardianText": "A Moderátorokat óvatosan választottuk ki a magas szintű támogatók közül, szóval add meg a nekik járó tiszteletet és figyelj a javaslataikra.",
+    "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
     "staff": "Munkatárs",
     "heroic": "Hősies",
-    "heroicText": "A Hősies szint a HabitRPG személyzetét és személyzeti szintű támogatóit tartalmazza. Ha neked ez a szinted, akkor megválasztottak (vagy felbéreltek!).",
+    "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
     "npcText": "Az NJK-k a legmagasabb szinten támogatták a Kickstarter projektet. Láthatod az avatárjaikat, az oldal különböző részein.",
     "modalContribAchievement": "Közreműködői Kitűntetés!",
-    "contribModal": "Király vagy, <%= name %>! Mostantól te egy <%= level %> szintű közreműködő vagy, amiért segítetted a HabtRPG-t. Nézd meg",
+    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
     "contribLink": "milyen díjakat értél el a közreműködésedért!",
     "contribName": "Közreműködő",
     "contribText": "Támogatta a HabitRPG-t (kód, dizájn, pixel képek, jogi tanács, dokumentumok, stb). Kell ez a kitűző?",
@@ -42,7 +42,7 @@
     "moreDetails2": "További részletek(8-9)",
     "contributions": "Hozzájárulások",
     "admin": "Adminisztrátor",
-    "notGems": "USD-ben értve, <em>nem</em> Drágakövekben. Tehát, ha ez a szám 1, az 4 drágakövet jelent. Csak akkor használd ezt az opciót, ha kézzel adsz drágaköveket játékosoknak, ne használd, ha támogatói szinteket adsz. Támogatói szintek automatikusan 2G-t adnak szintenként.",
+    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
     "hideAds": "Reklámok elrejtése",
     "gamemaster": "Játék mester(üzemeltetők/moderátorok)",
     "backerTier": "Támogatói szint",

common/locales/hu/groups.json

@@ -67,6 +67,10 @@
     "sortJoined": "Rendezés a csapathoz csatlakozás ideje alapján",
     "sortName": "Rendezés avatár név alapján",
     "sortBackgrounds": "Rendezés háttér alapján",
+    "sortHabitrpgJoined": "Sort by HabitRPG date joined",
+    "sortHabitrpgLastLoggedIn": "Sort by last time user logged in",
+    "ascendingSort": "Sort Ascending",
+    "descendingSort": "Sort Descending",
     "confirmGuild": "Létre hozol egy céhet 4 drágakőért?",
     "leaveGroupCha": "Csoport kihívások elhagyása és...",
     "confirm": "Megerősítés",

common/locales/hu/npc.json

@@ -4,8 +4,6 @@
     "mattBoch": "Matt Boch",
     "mattShall": "Hozzam-e elő a paripád, <%= name %>? Klikkelj, hogy felpattanj a nyeregbe.",
     "mattBochText1": "Üdvözlet az Istállóban! Én Matt vagyok, a bestiamester. Itt választhatsz háziállatot kísérőnek. Ha eteted őket, akkor erős paripákká fognak nőni.",
-    "mattBochText2": "Tekintsd meg",
-    "mattBochText3": "az összes háziállatod amit összegyűjthetsz.",
     "daniel": "Daniel",
     "danielText": "Üdvözöllek a Kocsmában! Maradj egy csöppet és találkozz a helyiekkel. Ha pihenni kívánsz (szabadság? betegség?), akkor elszállásollak a fogadóban. Amíg be vagy jelentkezve, addig a napi feladataid be vannak fagyasztva, ahogy vannak (kipipálva vagy nem) addig, amíg ki nem jelentkezel. Nem sebződsz addig tőlük, ha kihagyod őket a nap végén.",
     "danielText2": "Figyelem: Ha egy főellenség elleni küldetés részese vagy, akkor a főellenség így is sebez téged a csapattagjaid hiányosságaiért.",

common/locales/hu/pets.json

@@ -1,9 +1,8 @@
 {
     "pets": "Háziállatok",
-    "petsFound": "Megtalált háziállatok",
+    "petsFound": "Megtalált háziállat",
     "rarePets": "Ritka háziállatok",
     "questPets": "Küldetés háziállatok",
-    "beastmasterProgress": "Bestiamester haladás",
     "mounts": "Hátasok",
     "mountsTamed": "Megszelídített hátasok",
     "questMounts": "Küldetés hátasok",
@@ -27,10 +26,21 @@
     "inventoryText": "Kattintsa tojásra, hogy a lásd a használható főzeteket zöldben és kattints egy kijelölt főzetre, hogy kikeltesd a háziállatod. Ha nincs kijelölt főzet, akkor kattints a tojásra újra, hogy megszűntesd a kijelölést és kattints egy főzetre inkább, hogy lásd a tojásokat, amiken használhatod. A nem kívánt tárgyakat eladhatod Alexandernek, a kereskedőnek.",
     "food": "Ételek és nyergek",
     "noFood": "Nincs ételed vagy nyerged.",
+    "beastMasterProgress": "Beast Master Progress",
     "beastAchievement": "Megkaptad a \"Bestiamester\" Kitűntetést, amiért összegyűjtötted az összes háziállatot!",
-    "beastMastName": "Bestiamester",
-    "beastMastText": "Megtalálta az mind a 90 háziállatot (őrülten nehéz, gratulálj ennek a felhasználónak!)",
-    "beastMastText2": "és elengedte a háziállatait <%= count %>  alkalommal",
+    "beastMasterName": "Beast Master",
+    "beastMasterText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
+    "beastMasterText2": "and has released their pets a total of <%= count %> times",
+    "mountMasterProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMasterName": "Mount Master",
+    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMasterText2": "and has released all 90 of their mounts a total of <%= count %> times",
+    "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": "and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Mostantól tárgyakat találhatsz!",
     "itemDrop": "Egy tárgyat találtál.",
     "firstDrop": "Feloldottad a tárgyesés rendszert. Ha elkészülsz egy feladattal, akkor mostantól van egy kis esélyed tárgyat találni. Most épp találtál egy <strong><%= eggText %> tojást</strong>! <%= eggNotes %>",
@@ -41,13 +51,14 @@
     "petName": "<%= potion %> <%= egg %>",
     "mountName": "<%= potion %> <%= mount %>",
     "petKeyName": "Kulcs a ólakhoz",
-    "petKeyPop": "Engedd szabadon az állataidat, hogy a saját kalandjukat folytassák és add meg magadnak újra a Bestiamester izgalmát!",
-    "petKeyBegin": "Kulcs a ólakhoz: legyél újra Bestiamester!",
-    "petKeyInfo": "Szeresd annyira a háziállataidat, hogy el tudd őket engedni, és a tárgyak megtalálását újra jelentőségteljesnek érezd.",
-    "petKeyInfo2": "A Kulcs az Ólakhoz visszaállítja az összes nem-küldetéses háziállatodat, mintha soha nem találtad volna meg őket. Amint használtad, képes leszel a Bestiamester kitüntetés halmozására, hogy megmutasd hányszor voltál képes az RNG (véletlenszám generátor) legyőzésére.",
-    "petKeyInfo3": "Két kulcskészlet érhető el: szabadon engedheted a háziállataidat négy drágakőért, vagy a hátasaiddal együtt nyolc drágakőért. Ha még azon dolgozol, hogy az összes hátast megszerezd, akkor nem biztos, hogy szabadon szeretnéd engedni őket!",
+    "petKeyPop": "Let your pets roam free, release them to start their own adventure, and give yourself the thrill of Beast Master once more!",
+    "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
+    "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
+    "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Háziállataim elengedése",
-    "petKeyMounts": "Mindkettő elengedése",
+    "petKeyMounts": "Release My Mounts",
+    "petKeyBoth": "Release Both",
     "petKeyNeverMind": "Még Nem",
     "gemsEach": "drágakő egyenként"
 }

common/locales/hu/questscontent.json

@@ -11,7 +11,7 @@
     "questEvilSanta2CollectBranches": "Törött gallyak",
     "questEvilSanta2DropBearCubPolarPet": "Jegesmedve (háziállat)",
     "questGryphonText": "A tüzes griffmadár",
-    "questGryphonNotes": "A hatalmas vadállat idomár, <strong>baconsaur</strong> megkereste a csapatodat, hogy segítsetek neki. \"Kérlek, kalandozók, segítsetek nekem! Az én díjnyertes griffem elszabadult és terrorizálja Habit Várost! Ha meg tudjátok állítani, akkor cserébe megajándékozlak titeket pár tojásával!\"",
+    "questGryphonNotes": "The grand beast master, <strong>baconsaur</strong>, has come to your party seeking help. \"Please, adventurers, you must help me! My prized gryphon has broken free and is terrorizing Habit City! If you can stop her, I could reward you with some of her eggs!\"",
     "questGryphonCompletion": "Miután legyőzted, a hatalmas bestia megszégyenülten visszasomfordál a gazdájához. \"Szavamra! Kiváló munka, kalandorok!\" <strong>baconsaur</strong> felkiált: \"Kérlek fogadjátok el pár grifftojást. Biztos vagyok benne, hogy jól fel fogjátok őket nevelni!\"",
     "questGryphonBoss": "A tüzes griffmadár",
     "questGryphonDropGryphonEgg": "Griff  (tojás)",
@@ -75,7 +75,7 @@
     "questMoonstone2DropMoonstone3Quest": "The Moonstone Chain Part 3: Recidivate Transformed (Scroll)",
     "questMoonstone3Text": "Recidivate Transformed",
     "questMoonstone3Notes": "<p>Recidivate crumples to the ground, and you strike at her with the moonstone chain. To your horror, Recidivate seizes the gems, eyes burning with triumph.</p><br/><p>\"Foolish creature of flesh!\" she shouts. \"These moonstones will restore me to a physical form, true, but not as you imagined. As the full moon waxes from the dark, so too does my power flourish, and from the shadows I summon the specter of your most feared foe!\"</p><br/><p>A sickly green fog rises from the swamp, and Recidivate’s body writhes and contorts into a shape that fills you with dread – the undead body of Vice, horribly reborn.</p>",
-    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beastmaster swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
+    "questMoonstone3Completion": "<p>Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.</p><br/><p>@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"</p>",
     "questMoonstone3Boss": "Necro-Vice",
     "questMoonstone3DropRottenMeat": "Romlott Hús (Étel)",
     "questMoonstone3DropZombiePotion": "Zombi keltető főzet",
@@ -142,16 +142,17 @@
     "questPenguinCompletion": "Upon the penguin's defeat, the ice melts away. The giant penguin settles down in the sunshine, slurping up an extra bucket of fish you found. He skates off across the lake, blowing gently downwards to create smooth, sparkling ice. What an odd bird! \"It appears he left behind a few eggs, as well,\" says @Painter de Cluster. <br><br>@Rattify laughs. \"Maybe these penguins will be a little more... chill?\"",
     "questPenguinBoss": "Fagyott Pingvin",
     "questPenguinDropPenguinEgg": "Pingvin (tojás)",
-    "questStressbeastText": "The Abominable Stressbeast of the Stoïkalm Steppes",
+    "questStressbeastText": "A Stoïkalm Sztyeppék Utálatos Stresszörnye",
     "questStressbeastNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.<br><br>~*~<br><br>The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.<br><br>We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.<br><br>\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"<br><br>\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.<br><br>\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"<br><br>There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...",
-    "questStressbeastBoss": "The Abominable Stressbeast",
-    "questStressbeastBossRageTitle": "Stress Strike",
+    "questStressbeastBoss": "Az Utálatos Stresszörny",
+    "questStressbeastBossRageTitle": "Stressz csapás",
     "questStressbeastBossRageDescription": "When this gauge fills, the Abominable Stressbeast will unleash its Stress Strike on Habitica!",
     "questStressbeastDropMammothPet": "Mammoth (Pet)",
     "questStressbeastDropMammothMount": "Mammoth (Mount)",
-    "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
+    "questStressbeastBossRageStables": "`Az Utálatos Stresszörny Stressz csapást hajt végre!`\n\nA stresszhullám az Utálatos Stresszörnyet gyógyítja!!\n\n\nJaj ne! A legjobb erőfeszítéseink ellenére néhány napi teendő kicsúszott a markunkból és a sötét piros színük feldühítette az Utálatos Stresszörnyet és ettől visszanyerte az életereje egy részét! A borzalmas teremtmény az istállók felé tör, de Matt a bestiamester hősiesen harcba száll, hogy megvédje a háziállatokat és a hátasokat. A Stresszörny markába ragadta Matt-ot, de legalább ez elvonta a figyelmét. Siessetek! Tartsuk kordában a napi teendőinket és győzzük le ezt a szörnyet, mielőtt újra támad! ",
     "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
     "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!",
     "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
     "questTRexText": "King of the Dinosaurs",