Merge branch 'develop' into sabrecat/more-modals

Gruntfile.js

@@ -140,7 +140,7 @@ module.exports = function(grunt) {
 
   grunt.registerTask('test:prepare:translations', function() {
     require('coffee-script');
-    var i18n  = require('./website/src/i18n'),
+    var i18n  = require('./website/src/libs/i18n'),
         fs    = require('fs');
     fs.writeFileSync('test/spec/mocks/translations.js',
       "if(!window.env) window.env = {};\n" +

common/css/index.css

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

common/dist/sprites/spritesmith-largeSprites-0.css

@@ -1,24 +1,24 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -475px -950px;
+  background-position: -387px -950px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -970px -392px;
+  background-position: -970px -483px;
   width: 120px;
   height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -970px -589px;
+  background-position: -970px -680px;
   width: 105px;
   height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -566px -950px;
+  background-position: -569px -950px;
   width: 90px;
   height: 90px;
 }
@@ -48,7 +48,7 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -839px -950px;
+  background-position: -660px -950px;
   width: 90px;
   height: 90px;
 }
@@ -60,7 +60,7 @@
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -507px -859px;
+  background-position: -289px -859px;
   width: 217px;
   height: 90px;
 }
@@ -72,10 +72,16 @@
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -293px -950px;
+  background-position: -933px -950px;
   width: 90px;
   height: 90px;
 }
+.promo_enchanted_armoire_201511 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -970px -392px;
+  width: 122px;
+  height: 90px;
+}
 .promo_habitica {
   background-image: url(spritesmith-largeSprites-0.png);
   background-position: -723px -166px;
@@ -102,115 +108,115 @@
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px -91px;
+  background-position: -1111px -182px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -970px -680px;
+  background-position: -970px -771px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px -613px;
+  background-position: -1111px -704px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px -337px;
+  background-position: -1111px -428px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -748px -950px;
+  background-position: -842px -950px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px -273px;
+  background-position: -1111px -364px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -930px -950px;
+  background-position: -1111px 0px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1154px -543px;
+  background-position: -1154px -634px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px -479px;
+  background-position: -1111px -570px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -384px -950px;
+  background-position: -478px -950px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px -182px;
+  background-position: -1111px -273px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px -409px;
+  background-position: -1111px -500px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -657px -950px;
+  background-position: -751px -950px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px -543px;
+  background-position: -1111px -634px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -970px -483px;
+  background-position: -970px -574px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -199px -950px;
+  background-position: -293px -950px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1111px 0px;
+  background-position: -1111px -91px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -970px -777px;
+  background-position: -199px -950px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -289px -859px;
+  background-position: -507px -859px;
   width: 217px;
   height: 90px;
 }
@@ -228,13 +234,13 @@
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -775px;
+  background-position: 0px -775px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -790px;
+  background-position: -25px -790px;
   width: 60px;
   height: 60px;
 }
@@ -252,13 +258,13 @@
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -775px;
+  background-position: -331px -775px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -25px -790px;
+  background-position: -356px -790px;
   width: 60px;
   height: 60px;
 }
@@ -276,13 +282,13 @@
 }
 .promo_springclasses2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -859px;
+  background-position: -430px -461px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -430px -461px;
+  background-position: 0px -859px;
   width: 288px;
   height: 90px;
 }

common/locales/cs/character.json

@@ -52,7 +52,7 @@
     "classEquipBonus": "Bonus třídy",
     "battleGear": "Bojová výzbroj",
     "battleGearText": "Tohle je tvé vybavení, které máš na sobě do bitvy; ovlivňuje čísla, když pracuješ se svými úkoly.",
-    "autoEquipBattleGear": "Auto-equip new gear",
+    "autoEquipBattleGear": "Automaticky použít nové vybavení",
     "costume": "Kostým",
     "costumeText": "Pokud se ti více líbí vzhled jiného vybavení, než toho, které máš na sobě, zaškrtni \"použít kostým\". Kostým se ti zobrazí na tvém právě používaném vybavení, které tak hezky schová.",
     "useCostume": "Použít kostým",

common/locales/cs/generic.json

@@ -28,7 +28,7 @@
     "market": "Trh",
     "subscriberItem": "Záhadný předmět",
     "newSubscriberItem": "Nový záhadný předmět",
-    "subscriberItemText": "Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month. See the wiki's 'Mystery Item' page for more information.",
+    "subscriberItemText": "Předplatitelé obdrží každý měsíc záhadný předmět. Ten je zpravidla představen týden před koncem měsíce. Pro více informací mrkni na stránku 'Mystery Item' na wiki.",
     "all": "Vše",
     "none": "Žádné",
     "or": "Nebo",
@@ -79,7 +79,7 @@
     "errorUpCase": "CHYBA:",
     "newPassSent": "Nové heslo odesláno.",
     "serverUnreach": "Server je momentálně nedostupný.",
-    "requestError": "Yikes, an error occurred! <strong>Please reload the page,</strong> your last action may not have been saved correctly.",
+    "requestError": "Jéje, chybka! <strong>Prosíme, načti stránku znovu,</strong> tvé poslední akce se nemusely uložit správně.",
     "seeConsole": "Pokud chyba přetrvává, prosíme, nahlaš jí přes Nápověda > Nahlásit chybu. Pokud znáš konzoli svého prohlížeče, prosíme, připoj k hlášení všechny chybové hlášky z ní,",
     "error": "Chyba",
     "menu": "Menu",

common/locales/cs/messages.json

@@ -31,19 +31,25 @@
     "armoireEquipment": "<%= image %> Ve zbrojnici jsi našel kus vzácného vybavení ve Zbrojnici: <%= dropText %>! Skvělé!",
     "armoireFood": "<%= image %> Prohledáváš zbrojnici a nacházíš <%= dropArticle %><%= dropText %>. Co to tu dělá?",
     "armoireExp": "Zápasíš se Zbrojnicí a získáváš zkušenost. To jsi jí to nandal!",
-    "messageInsufficientGems": "Not enough gems!",
-    "messageAuthPasswordMustMatch": ":password and :confirmPassword don't match",
-    "messageAuthCredentialsRequired": ":username, :email, :password, :confirmPassword required",
-    "messageAuthUsernameTaken": "Username already taken",
-    "messageAuthEmailTaken": "Email already taken",
-    "messageAuthNoUserFound": "No user found.",
-    "messageAuthMustBeLoggedIn": "You must be logged in.",
-    "messageAuthMustIncludeTokens": "You must include a token and uid (user id) in your request",
-    "messageGroupNotFound": "Group not found or you don't have access.",
-    "messageGroupAlreadyInParty": "Already in a party, try refreshing.",
-    "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
-    "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
-    "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
-    "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
-    "messageUserOperationNotFound": "<%= operation %> operation not found"
+    "messageInsufficientGems": "Nedostatek drahokamů!",
+    "messageAuthPasswordMustMatch": ":password a :confirmPassword se neshodují",
+    "messageAuthCredentialsRequired": "Je vyžadováno :username, :email, :password, :confirmPassword ",
+    "messageAuthUsernameTaken": "Toto jméno již existuje.",
+    "messageAuthEmailTaken": "Email se již používá",
+    "messageAuthNoUserFound": "Uživatel nenalezen.",
+    "messageAuthMustBeLoggedIn": "Musíš být přihlášen.",
+    "messageAuthMustIncludeTokens": "Ve svém požadavku musíš uvést token a uid (uživatelské id)",
+    "messageGroupNotFound": "Družina nenalezena, nebo do ní nemáš přístup.",
+    "messageGroupAlreadyInParty": "Již jsi ve skupině, zkus znovu načíst stránku.",
+    "messageGroupOnlyLeaderCanUpdate": "Pouze velitel družiny může jí může upravovat!",
+    "messageGroupRequiresInvite": "Nemůžeš se přidat do družiny, do které nejsi pozván.",
+    "messageGroupCannotRemoveSelf": "Nemůžeš se sám odebrat!",
+    "messageGroupChatBlankMessage": "You cannot send a blank message",
+    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
+    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
+    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
+    "messageGroupChatNotFound": "Message not found!",
+    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
+    "messageUserOperationProtected": "cesta `<%= operation %>` nebyla uložena, protože je chráněná.",
+    "messageUserOperationNotFound": "<%= operation %> operace nebyla nalezena"
 }

common/locales/cs/npc.json

@@ -11,9 +11,10 @@
     "danielText2Broken": "Eh... Jestli se účastníš boje s příšerou, ublíží ti i za nesplněné denní úkoly ostatních členů tvé družiny... Navíc, jakákoliv újma, kterou uštědříš příšeře (nebo nasbírané předměty) se ti nepřipíšou dokud se z Hostince neodhlásíš...",
     "alexander": "Obchodník Alexander",
     "welcomeMarket": "Vítej na trhu! Kup si vzácná vejce a lektvary! Prodej, co máš navíc! Objednej si užitečné služby! Přijď se podívat, co všechno nabízíme.",
-    "sellForGold": "Prodej <%= item %> za <%= gold %> zlaťáků",
-    "sellEggForGold": "Prodej vejce <%= itemType %>a za <%= gold %> zlaťáky.",
-    "sellPotionForGold": "Prodej <%= itemType %> lektvar za <%= gold %> zlaťáky.",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Kup drahokamy",
     "justin": "Justin",
     "ian": "Ian",

common/locales/cs/rebirth.json

@@ -16,9 +16,11 @@
     "rebirthEarnAchievement": "Také dostaneš ocenění za začátek nového dobrodružství.",
     "beReborn": "Buď znovuzrozen",
     "rebirthAchievement": "Začal jsi nové dobrodružství! Tohle je Znovuzrození číslo <%= number %> a nejvyšší úroveň, které jsi dosáhl je <%= level %>. K dosažení dalšího ocenění začni nové dobrodružství až dosáhneš ještě vyšší úrovně!",
+    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
     "rebirthBegan": "Začal nové dobrodružství",
     "rebirthText": "Začal <%= rebirths %> nových dobrodružství",
     "rebirthOrb": "Použil Kouli znovuzrození, aby začal odznovu po dosažení úrovně",
+    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "Začni s novou postavou na úrovni 1 a přitom si zachovej ocenění, sběratelské předměty a úkoly s historií.",
     "rebirthName": "Koule znovuzrození",
     "reborn": "Znovuzrozen, maximální úroveň <%= reLevel %>"

common/locales/da/messages.json

@@ -44,6 +44,12 @@
     "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
     "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
     "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
+    "messageGroupChatBlankMessage": "You cannot send a blank message",
+    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
+    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
+    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
+    "messageGroupChatNotFound": "Message not found!",
+    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
     "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
     "messageUserOperationNotFound": "<%= operation %> operation not found"
 }

common/locales/da/npc.json

@@ -11,9 +11,10 @@
     "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
     "alexander": "Købmanden Alexander",
     "welcomeMarket": "Velkommen til Markedet! Her kan du købe æg og eliksirer, der er svære at finde, eller sælge dine overskydende! Bestil nyttige tjenester! Kom og se hvad vi har at tilbyde.",
-    "sellForGold": "Sælg <%= item %> for <%= gold %> Guld",
-    "sellEggForGold": "Sælg <%= itemType %> Æg for <%= gold %> Guld",
-    "sellPotionForGold": "Sælg <%= itemType %> Eliksir for <%= gold %> Guld",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Køb Ædelsten",
     "justin": "Justin",
     "ian": "Ian",

common/locales/da/rebirth.json

@@ -16,9 +16,11 @@
     "rebirthEarnAchievement": "Du får også en Præstation for at begynde et nyt eventyr!",
     "beReborn": "Bliv Genfødt",
     "rebirthAchievement": "Du har begyndt et nyt eventyr! Dette er Genfødsel nummer <%= number %> for dig, og det højeste Niveau du har opnået er <%= level %>. Hvis du vil slå denne Præstation skal du først begynde et nyt eventyr, når du har opnået et endnu højere Niveau!",
+    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
     "rebirthBegan": "Begyndte et Nyt Eventyr",
     "rebirthText": "Begyndte <%= rebirths %> Nye Eventyr",
     "rebirthOrb": "Brugte en Genfødselskugle til at starte forfra efter at have opnået Niveau",
+    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "Begynd en ny karakter på Niveau 1 mens du beholder præstationer, samlerobjekter, og opgaver med historik.",
     "rebirthName": "Genfødselskugle",
     "reborn": "Genfødt, højeste Niveau <%= reLevel %>"

common/locales/de/challenge.json

@@ -60,6 +60,6 @@
     "noPermissionEditChallenge": "Du hast keine Berechtigung, um diesen Wettbewerb zu ändern.",
     "noPermissionDeleteChallenge": "Du hast keine Berechtigung, um diesen Wettbewerb zu löschen.",
     "noPermissionCloseChallenge": "Du hast keine Berechtigung, um diesen Wettbewerb zu schließen.",
-    "noChallengeOwner": "no owner",
-    "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account."
+    "noChallengeOwner": "Kein Besitzer",
+    "noChallengeOwnerPopover": "Dieser Wettbewerb hat keinen Besitzer, da der Spieler, der den Wettbewerb erstellt hat, sein Benutzerkonto gelöscht hat."
 }

common/locales/de/character.json

@@ -52,7 +52,7 @@
     "classEquipBonus": "Klassenbonus",
     "battleGear": "Kampfausrüstung",
     "battleGearText": "Das ist deine Kampfausrüstung; sie beeinflusst Zahlen, wenn du mit deinen Aufgaben interagierst.",
-    "autoEquipBattleGear": "Auto-equip new gear",
+    "autoEquipBattleGear": "Neue Ausrüstung automatisch verwenden",
     "costume": "Verkleidung",
     "costumeText": "Wenn Du das Aussehen einer anderen Ausrüstung Deiner Kampfausrüstung vorziehst, dann klicke auf die \"Verkleidung tragen\" Box um über Deiner Kampfausrüstung andere Ausrüstungsgegenstände zu tragen.",
     "useCostume": "Verkleidung tragen",

common/locales/de/content.json

@@ -95,9 +95,9 @@
     "questEggHorseText": "Hengst",
     "questEggHorseMountText": "Hengst",
     "questEggHorseAdjective": "ein galoppierender",
-    "questEggFrogText": "Frog",
-    "questEggFrogMountText": "Frog",
-    "questEggFrogAdjective": "a princely",
+    "questEggFrogText": "Frosch",
+    "questEggFrogMountText": "Frosch",
+    "questEggFrogAdjective": "ein fürstlicher",
     "eggNotes": "Finde einen Schlüpftrank, den du über dieses Ei gießen kannst, damit ein <%= eggAdjective(locale) %> <%= eggText(locale) %> schlüpfen kann.",
     "hatchingPotionBase": "Normaler",
     "hatchingPotionWhite": "Weißer",

common/locales/de/death.json

@@ -4,7 +4,7 @@
     "deathPenaltyDetails": "Du hast einen Level, dein Gold und ein Stück Ausrüstung verloren, aber du kannst alles durch harte Arbeit wieder zurückbekommen! Viel Glück -- Du schaffst das.",
     "refillHealthTryAgain": "Leben wieder auffüllen & Nochmal versuchen",
     "dyingOftenTips": "Passiert das öfters? <a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Hier gibt es einige Tipps!</a>",
-    "losingHealthWarning": "Vorsicht - Du verlierst Leben!",
+    "losingHealthWarning": "Vorsicht - Du verlierst Lebenspunkte!",
     "losingHealthWarning2": "Lass Deine Lebensenergie nicht auf null fallen! Sollte das passieren wirst Du ein Level, Dein Gold und einen Gegenstand Deiner Ausrüstung verlieren.",
     "toRegainHealth": "Um Deine Lebensenergie aufzufüllen:",
     "lowHealthTips1": "Steige ein Level auf um Dich voll zu heilen!",

common/locales/de/faq.json

@@ -36,7 +36,7 @@
     "faqQuestion11": "Wie melde ich einen Fehler oder schlage ein Feature vor?",
     "iosFaqAnswer11": "Um einen Fehler zu melden, ein Feature vorzuschlagen oder Feedback zu senden, gehe im Menü unter Hilfe > Melde einen Fehler und Hilfe > Feature vorschlagen! Wir werden alles tun, um dir zu helfen.",
     "webFaqAnswer11": "Gemeldete Fehler werden in GitHub gesammelt. Gehe zu [Hilfe > Melde einen Fehler](https://github.com/HabitRPG/habitrpg/issues/2760) und folge den Anweisungen. Keine Sorge, wir werden ihn so bald wie möglich beheben!\n<br><br>\nVorgeschlagene Features werden in Trello gesammelt. Gehe zu [Hilfe > Feature vorschlagen](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) und folge den Anweisungen. Tadaa!",
-    "faqQuestion12": "How do I battle a World Boss?",
+    "faqQuestion12": "Wie bekämpfe ich einen Weltboss?",
     "iosFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
     "webFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and skills will damage the Boss as usual.\n<br><br>\n You can also be in a normal Quest at the same time. Your tasks and skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n<br><br>\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n<br><br>\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
     "iosFaqStillNeedHelp": "Wenn du eine Frage hast, die hier nicht beantwortet wurde, stelle sie im Chat im Gasthaus unter Soziales > Gasthaus! Wir helfen dir gerne.",

common/locales/de/messages.json

@@ -31,19 +31,25 @@
     "armoireEquipment": "<%= image %> Du hast ein Stück seltener Ausrüstung im verzauberten Schrank gefunden: <%= dropText %>! Wow!",
     "armoireFood": "<%= image %> Du wühlst im verzauberten Schrank herum und findest <%= dropArticle %><%= dropText %>. Was macht das denn da drin?",
     "armoireExp": "Du ringst mit dem verzauberten Schrank und gewinnst Erfahrung. Nimm das!",
-    "messageInsufficientGems": "Not enough gems!",
-    "messageAuthPasswordMustMatch": ":password and :confirmPassword don't match",
-    "messageAuthCredentialsRequired": ":username, :email, :password, :confirmPassword required",
-    "messageAuthUsernameTaken": "Username already taken",
-    "messageAuthEmailTaken": "Email already taken",
-    "messageAuthNoUserFound": "No user found.",
-    "messageAuthMustBeLoggedIn": "You must be logged in.",
-    "messageAuthMustIncludeTokens": "You must include a token and uid (user id) in your request",
-    "messageGroupNotFound": "Group not found or you don't have access.",
-    "messageGroupAlreadyInParty": "Already in a party, try refreshing.",
-    "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
-    "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
-    "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
-    "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
-    "messageUserOperationNotFound": "<%= operation %> operation not found"
+    "messageInsufficientGems": "Nicht genügend Edelsteine!",
+    "messageAuthPasswordMustMatch": ":password und :confirmPassword stimmen nicht überein",
+    "messageAuthCredentialsRequired": ":username, :email, :password, :confirmPassword erforderlich",
+    "messageAuthUsernameTaken": "Benutzername existiert bereits",
+    "messageAuthEmailTaken": "E-Mail existiert bereits",
+    "messageAuthNoUserFound": "Kein Benutzer gefunden",
+    "messageAuthMustBeLoggedIn": "Du musst angemeldet sein.",
+    "messageAuthMustIncludeTokens": "Deine Anfrage muss ein Token und eine UID (Benutzer-Kennung) beinhalten",
+    "messageGroupNotFound": "Gruppe nicht gefunden, oder du hast keine Zugriffsrechte.",
+    "messageGroupAlreadyInParty": "Der Gruppe bereits beigetreten, versuche neu zu laden.",
+    "messageGroupOnlyLeaderCanUpdate": "Nur der Gruppenleiter kann die Gruppe aktualisieren!",
+    "messageGroupRequiresInvite": "Du kannst keiner Gruppe beitreten, zu der du nicht eingeladen wurdest.",
+    "messageGroupCannotRemoveSelf": "Du kannst dich nicht selbst entfernen!",
+    "messageGroupChatBlankMessage": "You cannot send a blank message",
+    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
+    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
+    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
+    "messageGroupChatNotFound": "Message not found!",
+    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
+    "messageUserOperationProtected": "Pfad `<%= operation %>` nicht gespeichert, da dieser geschützt ist.",
+    "messageUserOperationNotFound": "<%= operation %> Operation nicht gefunden"
 }

common/locales/de/npc.json

@@ -11,9 +11,10 @@
     "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
     "alexander": "Alexander der Händler",
     "welcomeMarket": "Willkommen auf dem Marktplatz! Kaufe schwer zu findende Eier und Tränke! Verkaufe Überflüssiges! Gib' wichtige Dienste in Auftrag! Komm' und schau', was wir anzubieten haben.",
-    "sellForGold": "Verkaufe <%= item %> für <%= gold %> Gold",
-    "sellEggForGold": "Verkaufe <%= itemType %> Ei für <%= gold %> Gold",
-    "sellPotionForGold": "Verkaufe <%= itemType %> Trank für <%= gold %> Gold",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Kaufe Edelsteine",
     "justin": "Justin",
     "ian": "Jan",

common/locales/de/quests.json

@@ -43,7 +43,7 @@
     "bossColl1": "Um Gegenstände zu sammeln musst Du Deine Aufgaben erfüllen. Quest Gegenstände sind genauso wie normale Gegenstände zu finden, aber Du kannst das Ergebnis erst zum Tageswechsel sehen. Dann wird alles, was jeder Teilnehmer gefunden hat zusammengerechnet und dem Quest zugerechnet.",
     "bossColl2": "Nur Teilnehmer können Gegenstände sammeln und erhalten ihren Anteil an der Beute.",
     "bossColl1Broken": "To collect items, do your positive tasks... Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile...",
-    "bossColl2Broken": "Only participants can collect items and share in the quest loot...",
+    "bossColl2Broken": "Nur Mitglieder können Gegenstände sammeln und sich die Quest-Beute teilen ...",
     "abort": "Abbrechen",
     "leaveQuest": "Quest verlassen",
     "sureLeave": "Willst Du die aktive Quest wirklich verlassen? Dein kompletter Questfortschritt wird verlorengehen.",
@@ -62,7 +62,7 @@
     "alreadyEarnedQuestReward": "Du hast diese Quest bereits durch Abschließen der Quest <%= priorQuest %> freigeschaltet.",
     "completedQuests": "Hat die folgenden Quests abgeschlossen",
     "mustComplete": "Du musst vorher das <%= quest %> Quest abschließen.",
-    "mustLevel": "Um diese Quest zu starten, musst Dein Level mindestens <%= level %> betragen.",
+    "mustLevel": "Du musst Level <%= level %> sein, um diese Quest zu starten.",
     "mustLvlQuest": "Du musst Level <%= level %> sein um dieses Quest zu erwerben!",
     "mustInviteFriend": "Um diese Quest freizuschalten, musst du einen Freund in deine Gruppe einladen. Jetzt jemanden einladen?",
     "unlockByQuesting": "Um diese Quest freizuschalten, schließe <%= title %> ab.",

common/locales/de/questscontent.json

@@ -12,7 +12,7 @@
     "questEvilSanta2DropBearCubPolarPet": "Eisbär (Haustier)",
     "questGryphonText": "Der Feurige Greif",
     "questGryphonNotes": "Der große Herr aller Bestien, <strong>baconsaur</strong>, kommt zu deiner Gruppe, denn er sucht nach Hilfe. \"Abenteurer, bitte, ihr müsst mir helfen! Mein preisgekrönter Greif ist ausgebrochen und terrorisiert nun Habit City! Wenn ihr sie aufhaltet, kann ich euch mit einigen von ihren Eiern belohnen!\"",
-    "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!\"",
+    "questGryphonCompletion": "Das mächtige Tier schleicht 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)",
     "questGryphonUnlockText": "Ermöglicht den Kauf von Greifeneiern auf dem Marktplatz.",
@@ -96,7 +96,7 @@
     "questGoldenknight2Boss": "Goldene Ritterin",
     "questGoldenknight2DropGoldenknight3Quest": "Die Goldene Ritterin-Kette Teil 3: Der Eiserne Ritter (Rolle)",
     "questGoldenknight3Text": "Der goldene Ritter, Teil 3: Der eiserne Ritter",
-    "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 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 ruft zu Dir, um deine Aufmerksamkeit zu erlangen. Im Nachspiel Deiner Schlacht ist eine neue Figur aufgetaucht. Ein Ritter, gerüstet in schwarz geflecktem Eisen, kommt Dir langsam mit einem Schwert in der Hand entgegen. Die goldene Ritterin ruft ihm zu: \"Vater, nein!\" Aber der Ritter zeigt keinerlei Anzeichen anzuhalten. Sie wendet sich an Dich: \"Es tut mir Leid. Ich war ein Narr und zu stolz zu erkennen, wie grausam ich war. Aber mein Vater ist noch viel grausamer als ich es je sein könnte. Wenn er nicht aufgehalten wird, dann wird er uns alle vernichten. Hier, nimm meinen Morgenstern und halte den eisernen Ritter auf!\"</p>",
     "questGoldenknight3Completion": "<p>Mit einem befriedigenden Geklirr fällt der Eiserne Ritter zu Knie und sackt zusammen. \"Du bist ziemlich stark,\" keucht er. \"Mir wurde heute Bescheidenheit gelehrt.\" Die Goldene Ritterin kommt zu dir und sagt, \"Ich danke dir. Ich glaube, wir beide haben aus der Begegnung mit dir etwas Bescheidenheit gelernt. Ich werde mit meinem Vater sprechen und ihm die Beschwerden über uns erklären. Vielleicht sollten wir damit anfangen, uns bei den anderen Habiticanern zu entschuldigen.\" Sie denkt darüber nach und wendet sich dann wieder dir zu. \"Hier: als ein Geschenk für dich gebe ich dir meinen Morgenstern. Er gehört jetzt dir.\"</p>",
     "questGoldenknight3Boss": "Der Eiserne Ritter",
     "questGoldenknight3DropHoney": "Honig (Futter)",

common/locales/de/rebirth.json

@@ -16,9 +16,11 @@
     "rebirthEarnAchievement": "Du erhältst den Erfolg für das Beginnen eines neuen Abenteuers!",
     "beReborn": "Werde wiedergeboren",
     "rebirthAchievement": "Du hast ein neues Abenteuer begonnen! Das ist Wiedergeburt Nummer <%= number %> für Dich, Dein höchstes jemals erreichtes Level ist <%= level %>. Um diesen Erfolg zu stapeln, beginne Dein nächstes Abenteuer wenn Du ein noch höheres Level erreicht hast!",
+    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
     "rebirthBegan": "Hat ein neues Abenteuer begonnen",
     "rebirthText": "Hat <%= rebirths %> neue Abenteuer begonnen",
     "rebirthOrb": "Hat eine Sphäre der Wiedergeburt verwendet nachdem er folgendes Level erreicht hatte:",
+    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "Starte einen neuen Charakter mit Level 1, aber behalte Erfolge, Sammlungen und Aufgaben mit Verlauf bei.",
     "rebirthName": "Sphäre der Wiedergeburt",
     "reborn": "Wiedergeboren, max. Level <%= reLevel %>"

common/locales/en/backgrounds.json

@@ -135,6 +135,14 @@
   "backgroundSlimySwampText": "Slimy Swamp",
   "backgroundSlimySwampNotes": "Slog through a Slimy Swamp.",
   "backgroundSwarmingDarknessText": "Swarming Darkness",
-  "backgroundSwarmingDarknessNotes": "Shiver in the Swarming Darkness."
+  "backgroundSwarmingDarknessNotes": "Shiver in the Swarming Darkness.",
+
+  "backgrounds112015": "SET 18: Released November 2015",
+  "backgroundFloatingIslandsText": "Floating Islands",
+  "backgroundFloatingIslandsNotes": "Hop across the Floating Islands.",
+  "backgroundNightDunesText": "Night Dunes",
+  "backgroundNightDunesNotes": "Walk peacefully through the Night Dunes.",
+  "backgroundSunsetOasisText": "Sunset Oasis",
+  "backgroundSunsetOasisNotes": "Bask in the Sunset Oasis."
 }
 

common/locales/en/gear.json

@@ -172,6 +172,8 @@
   "weaponArmoireGoldWingStaffNotes": "The wings on this staff constantly flutter and twist. Increases all attributes by <%= attrs %> each. Enchanted Armoire: Independent Item.",
   "weaponArmoireBatWandText": "Bat Wand",
   "weaponArmoireBatWandNotes": "This wand can turn any task into a bat! Wave it about and watch them fly away. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+  "weaponArmoireShepherdsCrookText": "Shepherd's Crook",
+  "weaponArmoireShepherdsCrookNotes": "Useful for herding gryphons. Increases Constitution by <%= con %>. Enchanted Armoire: Shepherd Set (Item 1 of 3).",
 
   "armor": "armor",
 
@@ -355,6 +357,10 @@
   "armorArmoireHornedIronArmorNotes": "Fiercely hammered from iron, this horned armor is nearly impossible to break. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Horned Iron Set (Item 2 of 3).",
   "armorArmoirePlagueDoctorOvercoatText": "Plague Doctor Overcoat",
   "armorArmoirePlagueDoctorOvercoatNotes": "An authentic overcoat worn by the doctors who battle the Plague of Procrastination! Increases Intelligence by <%= int %>, Strength by <%= str %>, and Constitution by <%= con %>. Enchanted Armoire: Plague Doctor Set (Item 3 of 3).",
+  "armorArmoireShepherdRobesText": "Shepherd Robes",
+  "armorArmoireShepherdRobesNotes": "The fabric is cool and breathable, perfect for a hot day herding gryphons in the desert. Increases Strength and Perception by <%= attrs %> each. Enchanted Armoire: Shepherd Set (Item 2 of 3).",
+  "armorArmoireRoyalRobesText": "Royal Robes",
+  "armorArmoireRoyalRobesNotes": "Wonderful ruler, rule all day long! Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Royal Set (Item 3 of 3).",
 
   "headgear": "headgear",
 
@@ -533,7 +539,7 @@
   "headArmoireBlueHairbowText": "Blue Hairbow",
   "headArmoireBlueHairbowNotes": "Become perceptive, tough, and smart while wearing this beautiful Blue Hairbow! Increases Perception by <%= per %>, Constitution by <%= con %>, and Intelligence by <%= int %>. Enchanted Armoire: Independent Item.",
   "headArmoireRoyalCrownText": "Royal Crown",
-  "headArmoireRoyalCrownNotes": "Hooray for the ruler, mighty and strong! Increases Strength by <%= str %>. Enchanted Armoire: Independent Item.",
+  "headArmoireRoyalCrownNotes": "Hooray for the ruler, mighty and strong! Increases Strength by <%= str %>. Enchanted Armoire: Royal Set (Item 1 of 3).",
   "headArmoireGoldenLaurelsText": "Golden Laurels",
   "headArmoireGoldenLaurelsNotes": "These golden laurels reward those who have conquered bad habits. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Golden Toga Set (Item 2 of 3).",
   "headArmoireHornedIronHelmText": "Horned Iron Helm",
@@ -548,6 +554,10 @@
   "headArmoireBlackCatNotes": "This black hat is... purring. And twitching its tail. And breathing? Yeah, you just have a sleeping cat on your head. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.",
   "headArmoireOrangeCatText": "Orange Cat Hat",
   "headArmoireOrangeCatNotes": "This orange hat is... purring. And twitching its tail. And breathing? Yeah, you just have a sleeping cat on your head. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+  "headArmoireBlueFloppyHatText": "Blue Floppy Hat",
+  "headArmoireBlueFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a brilliant blue color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+  "headArmoireShepherdHeaddressText": "Shepherd Headdress",
+  "headArmoireShepherdHeaddressNotes": "Sometimes the gryphons that you herd like to chew on this headdress, but it makes you seem more intelligent nonetheless. Increases Intelligence by <%= int %>. Enchanted Armoire: Shepherd Set (Item 3 of 3).",
 
   "offhand": "shield-hand item",
 
@@ -647,6 +657,8 @@
   "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).",
   "shieldArmoireMidnightShieldText": "Midnight Shield",
   "shieldArmoireMidnightShieldNotes": "This shield is most powerful at the stroke of midnight! Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Independent Item.",
+  "shieldArmoireRoyalCaneText": "Royal Cane",
+  "shieldArmoireRoyalCaneNotes": "Hooray for the ruler, worthy of song! Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Royal Set (Item 2 of 3).",
 
   "back": "Back Accessory",
   "backBase0Text": "No Back Accessory",

common/locales/en/npc.json

@@ -11,9 +11,10 @@
     "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
     "alexander": "Alexander the Merchant",
     "welcomeMarket": "Welcome to the Market! Buy hard-to-find eggs and potions! Sell your extras! Commission useful services! Come see what we have to offer.",
-    "sellForGold": "Sell <%= item %> for <%= gold %> Gold",
-    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
-    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Buy Gems",
     "justin": "Justin",
     "ian": "Ian",

common/locales/en/rebirth.json

@@ -16,9 +16,11 @@
     "rebirthEarnAchievement": "You also earn an Achievement for beginning a new adventure!",
     "beReborn": "Be Reborn",
     "rebirthAchievement": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is <%= level %>. To stack this Achievement, begin your next new adventure when you've reached an even higher Level!",
+    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
     "rebirthBegan": "Began a New Adventure",
     "rebirthText": "Began <%= rebirths %> New Adventures",
     "rebirthOrb": "Used an Orb of Rebirth to start over after attaining Level",
+    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.",
     "rebirthName": "Orb of Rebirth",
     "reborn": "Reborn, max level <%= reLevel %>"

common/locales/en@pirate/faq.json

@@ -30,7 +30,7 @@
     "faqQuestion9": "How do I fight monsters and go on Quests?",
     "iosFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party on the [website](https://habitica.com/#/options/groups/party), you'll be rewarded with the Basi-List Scroll! (We will add this feature to the app in a future update.)\n - You can buy Quests from the Quests Page on the [website](https://habitica.com/#/options/inventory/quests) for gold and gems. (We will add this feature to the app in a future update.)\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
     "webFaqAnswer9": "First, you need to join or start a party (under Social > Party). Although you can battle monsters alone, we recommend playing in a group, because this will make quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n<br><br>\n Next, you need a Quest Scroll, which are stored under Inventory > Quests. There are three ways to get a scroll:\n<br><br>\n * When you invite people to your party, you’ll be rewarded with the Basi-List Scroll!\n * At level 15, you get a Quest-line, i.e., three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively.\n * You can buy Quests from the Quests Page (Inventory > Quests) for Gold and Gems.\n<br><br>\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading may be required to see the Boss's Health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your party at the same time that you damage the Boss.\n<br><br>\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
-    "faqQuestion10": "What are gems, and how do I get them?",
+    "faqQuestion10": "What be gems, and how do I get them?",
     "iosFaqAnswer10": "Gems are purchased with real money by tapping on the gem icon in the header. When people buy gems, they are helping us to keep the site running. We're very grateful for their support!\n\n In addition to buying gems directly, there are three other ways players can gain gems:\n\n * Win a Challenge on the [website](https://habitica.com) that has been set up by another player under Social > Challenges. (We will be adding Challenges to the app in a future update!)\n * Subscribe on the [website](https://habitica.com/#/options/settings/subscription) and unlock the ability to buy a certain number of gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with gems do not offer any statistical advantages, so players can still make use of the app without them!",
     "webFaqAnswer10": "Gems are [purchased with real money](https://habitica.com/#/options/settings/subscription), although [subscribers](https://habitica.com/#/options/settings/subscription) can purchase them with Gold. When people subscribe or buy Gems, they are helping us to keep the site running. We're very grateful for their support!\n<br><br>\n In addition to buying Gems directly or becoming a subscriber, there are two other ways players can gain Gems:\n<br><br>\n * Win a Challenge that has been set up by another player under Social > Challenges.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica)\n<br><br>\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the site without them!",
     "faqQuestion11": "How do I report a bug or request a feature?",

common/locales/en@pirate/messages.json

@@ -44,6 +44,12 @@
     "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
     "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
     "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
+    "messageGroupChatBlankMessage": "You cannot send a blank message",
+    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
+    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
+    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
+    "messageGroupChatNotFound": "Message not found!",
+    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
     "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
     "messageUserOperationNotFound": "<%= operation %> operation not found"
 }

common/locales/en@pirate/npc.json

@@ -11,9 +11,10 @@
     "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
     "alexander": "Alexander th' Sutler",
     "welcomeMarket": "Welcome t' th' Market! Buy harrrd-to-find eggs 'n potions! Sell yer extras! Commission useful services! Come 'n see what we have to offer ye.",
-    "sellForGold": "Sell <%= item %> fer <%= gold %> Doubloons",
-    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
-    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Buy Sapphires",
     "justin": "Justin",
     "ian": "Shipmate Ian",

common/locales/en@pirate/rebirth.json

@@ -16,9 +16,11 @@
     "rebirthEarnAchievement": "Ye also earn an Achievement fer embarkin' on a new adventure!",
     "beReborn": "Be Reborn",
     "rebirthAchievement": "Ye've begun a new adventure! 'tis be Rebirth <%= number %> fer ye, 'n th' highest Level ye've attained be <%= level %>. To stack 'tis Achievement, begin ye next new adventure when ye've reached an even higher Level!",
+    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
     "rebirthBegan": "Embarked on a New Adventure",
     "rebirthText": "Embarked on <%= rebirths %> New Adventures",
     "rebirthOrb": "Used an Orb o' Rebirth to start ov'r after attainin' Level",
+    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "Begin a new character at Level 1 whilst retainin' achievements, collectibles, an' tasks with history.",
     "rebirthName": "Orb o' Rebirth",
     "reborn": "Reborn, max level <%= reLevel %>"

common/locales/en_GB/messages.json

@@ -44,6 +44,12 @@
     "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
     "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
     "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
+    "messageGroupChatBlankMessage": "You cannot send a blank message",
+    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
+    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
+    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
+    "messageGroupChatNotFound": "Message not found!",
+    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
     "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
     "messageUserOperationNotFound": "<%= operation %> operation not found"
 }

common/locales/en_GB/npc.json

@@ -11,9 +11,10 @@
     "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
     "alexander": "Alexander the Merchant",
     "welcomeMarket": "Welcome to the Market! Buy hard-to-find eggs and potions! Sell your extras! Commission useful services! Come see what we have to offer.",
-    "sellForGold": "Sell <%= item %> for <%= gold %> Gold",
-    "sellEggForGold": "Sell <%= itemType %> Egg for <%= gold %> Gold",
-    "sellPotionForGold": "Sell <%= itemType %> Potion for <%= gold %> Gold",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Buy Gems",
     "justin": "Justin",
     "ian": "Ian",

common/locales/en_GB/rebirth.json

@@ -16,9 +16,11 @@
     "rebirthEarnAchievement": "You also earn an Achievement for beginning a new adventure!",
     "beReborn": "Be Reborn",
     "rebirthAchievement": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is <%= level %>. To stack this Achievement, begin your next new adventure when you've reached an even higher Level!",
+    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
     "rebirthBegan": "Began a New Adventure",
     "rebirthText": "Began <%= rebirths %> New Adventures",
     "rebirthOrb": "Used an Orb of Rebirth to start over after attaining Level",
+    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.",
     "rebirthName": "Orb of Rebirth",
     "reborn": "Reborn, max level <%= reLevel %>"

common/locales/es/messages.json

@@ -44,6 +44,12 @@
     "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
     "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
     "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
+    "messageGroupChatBlankMessage": "You cannot send a blank message",
+    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
+    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
+    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
+    "messageGroupChatNotFound": "Message not found!",
+    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
     "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
     "messageUserOperationNotFound": "<%= operation %> operation not found"
 }

common/locales/es/npc.json

@@ -11,9 +11,10 @@
     "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
     "alexander": "Alexander el Mercader",
     "welcomeMarket": "¡Bienvenido al Mercado! ¡Compra huevos dificiles de encontrar y pociones! ¡Vende los que te sobren! ¡Encarga servicios utiles! Ven a ver lo que tenemos que ofrecer.",
-    "sellForGold": "Vender <%= item %> por <%= gold %> Oro",
-    "sellEggForGold": "Vender Huevo <%= itemType %> por <%= gold %> oro",
-    "sellPotionForGold": "Vender Poción <%= itemType %> por <%= gold %> oro",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Comprar Gemas",
     "justin": "Justin",
     "ian": "Ian",

common/locales/es/rebirth.json

@@ -16,9 +16,11 @@
     "rebirthEarnAchievement": "¡También recibirás un Logro por haber empezado una nueva aventura!",
     "beReborn": "Renacer",
     "rebirthAchievement": "¡Has comenzado una nueva aventura! Este es Renacimiento <%= number %> para ti, y el Nivel más alto que has conseguido es <%= level %>. Para apilar este Logro, ¡empieza tu aventura siguiente después de haber conseguido un  nivel más alto!",
+    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
     "rebirthBegan": "Comienza una nueva aventura",
     "rebirthText": "Comenzó <%= rebirths %>  nuevas aventuras",
     "rebirthOrb": "Usó una Esfera de Renacimiento para comenzar de nuevo después de llegar al Nivel",
+    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "Comienza con un personaje en Nivel 1, manteniendo logros, coleccionables, y tareas con historial.",
     "rebirthName": "Esfera de Renacimiento",
     "reborn": "Renacido, nivel máximo <%= reLevel %>"

common/locales/es_419/character.json

@@ -52,7 +52,7 @@
     "classEquipBonus": "Bono por Equipamiento de clase",
     "battleGear": "Equipamiento de combate",
     "battleGearText": "Este es el equipamiento que usas en combate, afecta los resultados cuando interactúas con tus tareas.",
-    "autoEquipBattleGear": "Auto-equip new gear",
+    "autoEquipBattleGear": "Auto vestir nuevo equipamiento",
     "costume": "Disfraz",
     "costumeText": "Si prefieres el aspecto de otro equipo al que estás usando, marca la casilla \"Usar Disfraz\" para llevarlo como disfraz mientras usas tu equipo de batalla por debajo.",
     "useCostume": "Llevar disfraz",

common/locales/es_419/generic.json

@@ -28,7 +28,7 @@
     "market": "Mercado",
     "subscriberItem": "Objeto misterio",
     "newSubscriberItem": "Nuevo objeto misterio",
-    "subscriberItemText": "Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month. See the wiki's 'Mystery Item' page for more information.",
+    "subscriberItemText": "Cada mes, suscriptores recibirán un ítem misterioso. Esto sucede usualmente una semana antes de fin de mes. Ve la pagina de la wiki llamada \"Ítem Misterioso\" para más información.",
     "all": "Todo",
     "none": "Ninguno",
     "or": "O",
@@ -79,7 +79,7 @@
     "errorUpCase": "ERROR:",
     "newPassSent": "Nueva contraseña enviada.",
     "serverUnreach": "Error en la conexión al servidor.",
-    "requestError": "Yikes, an error occurred! <strong>Please reload the page,</strong> your last action may not have been saved correctly.",
+    "requestError": "Rayos!, ha ocurrido un error! <strong>Por favor recarga la página,</strong> tu última acción puede no haberse guardado correctamente.",
     "seeConsole": "Si el error persiste, por favor reportalo en Ayuda > Reportar un error. Si estas familiarizado con la consola de tu navegador, por favor incluye cualquier mensaje de error.",
     "error": "Error",
     "menu": "Menú",

common/locales/es_419/groups.json

@@ -3,7 +3,7 @@
     "innCheckOut": "Dejar la posada",
     "innCheckIn": "Descansar en la posada",
     "innText": "¡Has entrado a descansar en la Posada! Mientras permanezcas aquí tus Diarias no te dañarán al finalizar el día, pero sí se renovarán cada día.\nTen cuidado: si tu equipo está en medio de una Batalla contra un Jefe ¡sus Diarias incompletas te seguirán haciendo daño! Además, tú no dañarás al jefe (ni obtendrás los objetos recolectados) hasta que no hayas salido de la Posada.",
-    "innTextBroken": "You're resting in the Inn, I guess... While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day...  If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies... unless they are also in the Inn... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn... so tired...",
+    "innTextBroken": "Te quedarás en la Posada supongo.... Mientras estés aquí , tus diarias no reducirán tu salud al acabar el dia, pero sí se refrescarán... Si estás participando en una misión contra un Jefe, él te hará daño igualmente si tus compañeros no realizan sus diarias... a menos que ellos también estén en la Posada... Además, tu daño contra el Jefe (o inventario que hayas obtenido) no será aplicado hasta que dejes la Posada... que cansancio....",
     "lfgPosts": "Publicaciones en la búsqueda de un grupo (Se busca Equipo)",
     "tutorial": "Tutoría",
     "glossary": "Glosario",
@@ -147,5 +147,5 @@
     "partyChatEmpty": "¡El chat de tu equipo está vacío! Escribe un mensaje en el recuadro de arriba para empezar a conversar.",
     "guildChatEmpty": "¡El chat de este gremio está vacío! Escribe un mensaje en el recuadro de arriba para empezar a conversar.",
     "possessiveParty": "El equipo de <%= name %>",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Communit Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "Si quieres publicar mensajes en la Taberna o en cualquier chat de grupo o gremio, por favor primero lee nuestras Normas de la Comunidad y selecciona el botón \"Acepto las Normas\" para indicar que las aceptas."
 }

common/locales/es_419/messages.json

@@ -5,7 +5,7 @@
     "messageTagNotFound": "Etiqueta no encontrada.",
     "messagePetNotFound": ":pet no encontrado en user.items.pets",
     "messageFoodNotFound": ":food no encontrado en user.items.food",
-    "messageNotAvailable": "This item is not currently available for purchase.",
+    "messageNotAvailable": "Esta cosa no está disponible para comprar.",
     "messageCannotFeedPet": "No se pudo alimentar a esta mascota.",
     "messageAlreadyMount": "Ya posees esta montura. Intenta alimentar a otra mascota.",
     "messageEvolve": "Has domesticado a <%= egg %>, ¡vamos a dar una vuelta!",
@@ -32,10 +32,10 @@
     "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropArticle %><%= dropText %>. What's that doing in here?",
     "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!",
     "messageInsufficientGems": "Not enough gems!",
-    "messageAuthPasswordMustMatch": ":password and :confirmPassword don't match",
+    "messageAuthPasswordMustMatch": ":password y :confirmPassword no coinciden",
     "messageAuthCredentialsRequired": ":username, :email, :password, :confirmPassword required",
-    "messageAuthUsernameTaken": "Username already taken",
-    "messageAuthEmailTaken": "Email already taken",
+    "messageAuthUsernameTaken": "El nombre de usuario no está disponible",
+    "messageAuthEmailTaken": "Esta dirección de correo electrónico ya esta siendo usada",
     "messageAuthNoUserFound": "No user found.",
     "messageAuthMustBeLoggedIn": "You must be logged in.",
     "messageAuthMustIncludeTokens": "You must include a token and uid (user id) in your request",
@@ -44,6 +44,12 @@
     "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
     "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
     "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
+    "messageGroupChatBlankMessage": "You cannot send a blank message",
+    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
+    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
+    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
+    "messageGroupChatNotFound": "Message not found!",
+    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
     "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
     "messageUserOperationNotFound": "<%= operation %> operation not found"
 }

common/locales/es_419/npc.json

@@ -11,9 +11,10 @@
     "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
     "alexander": "Alexander el Comerciante",
     "welcomeMarket": "¡Bienvenidos al Mercado! ¡Compra huevos difíciles de encontrar y pociones! ¡Vende tus extras! ¡Encarga servicios útiles! Ven a ver lo que tenemos para ofrecer.",
-    "sellForGold": "Vender <%= item %> por <%= gold %> Oro",
-    "sellEggForGold": "Vender huevo de <%= itemType %> por <%= gold %>  monedas de oro",
-    "sellPotionForGold": "Vender pócima <%= itemType %> por <%= gold %> monedas de oro",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Comprar Gemas",
     "justin": "Justin",
     "ian": "Ian",

common/locales/es_419/questscontent.json

@@ -58,45 +58,45 @@
     "questSpiderBoss": "Araña",
     "questSpiderDropSpiderEgg": "Araña (Huevo)",
     "questSpiderUnlockText": "Desbloquea huevos de araña comprables en el Mercado",
-    "questVice1Text": "Vice, Part 1: Free Yourself of the Dragon's Influence",
+    "questVice1Text": "Vicio, Parte 1: Libérate de la Influencia del Dragón",
     "questVice1Notes": "<p> Dicen que se encuentra un mal terrible en las cavernas del monte Habitica. Un monstruo cuya presencia retuerce la voluntad de los gran héroes del país, conduciéndolos a los malos hábitos y a la pereza. La bestia es un gran dragón de inmenso poder, compuesto de las mismas sombras. Vicio, el traicionero Guivre Sombrío. ¡Valientes héroes, levántense y venzan a esta bestia infame de una vez por todas, pero sólo si creen que pueden mantenerse firmes contra su inmenso poder. </p><h3> Vice Parte 1: </h3><p> ¿Cómo puedes pretender enfrentarte a la bestia si ya tiene control sobre ti? ¡No caigas víctima de la pereza y el vicio! ¡Trabaja duro para vencer la oscura influencia del dragón, y disipar su control sobre ti! </p>",
     "questVice1Boss": "Sombra de Vicio",
     "questVice1DropVice2Quest": "Vicio parte 2 (Pergamino)",
-    "questVice2Text": "Vice, Part 2: Find the Lair of the Wyrm",
+    "questVice2Text": "Vicio, Parte 2: Encuentra la Guarida del Guivre",
     "questVice2Notes": "Al disiparse la influencia que Vicio tenía sobre ti, sientes un arrebato de fuerza que no sabías que tenías volver a ti. Sintiéndose seguros de sí mismos y de su capacidad de soportar la influencia del guivre, tú y tu equipo marchan hacia Monte Habitica. Se aproximan a la entrada de las cavernas de la montaña y hacen una pausa. Oleadas de sombras, casi como niebla, flotan en la entrada. Es casi imposible ver lo que tienen enfrente. La luz de sus linternas parecen terminar abruptamente donde las sombras comienzan. Se dice que sólo luz mágica puede atravesar la niebla infernal del dragón. Si fueran capaces de encontrar suficientes cristales de luz, podrían abrirse camino hacia el dragón.",
     "questVice2CollectLightCrystal": "Cristales de luz",
     "questVice2DropVice3Quest": "Vicio parte 3 (Pergamino)",
-    "questVice3Text": "Vice, Part 3: Vice Awakens",
+    "questVice3Text": "Vicio, Parte 3: Vicio Despierta",
     "questVice3Notes": "Tras mucho esfuerzo, tu equipo ha descubierto la guarida de Vicio. El enorme monstruo observa a tu equipo repugnado. Mientras sombras se retuercen a tu alrededor, una voz susurra en tu interior, \"¿Más necios de Habitica que intentan detenerme? Qué lindos. Hubiera sido más inteligente no haber venido.\" El escamado titán alza su cabeza y se prepara para atacar. ¡Es tu oportunidad! ¡Da lo mejor de ti y derrota a Vicio de una vez por todas!",
     "questVice3Completion": "Las sombras se disipan de la caverna mientras se asienta un férreo silencio. ¡Vaya, lo has logrado! ¡Haz vencido a Vicio! Tú y tu equipo al fin podrán respirar tranquilos. Disfruten de la victoria, valientes Habiteros, pero recuerdan las lecciones que han aprendido al combatir a Vicio y sigan adelante. Todavía hay tareas que completar y peores males que conquistar.",
     "questVice3Boss": "Vicio, el Guivre Sombrío",
     "questVice3DropWeaponSpecial2": "La vara del Dragón de Stephen Weber",
     "questVice3DropDragonEgg": "Dragón (Huevo)",
     "questVice3DropShadeHatchingPotion": "Poción de eclosión de sombra",
-    "questMoonstone1Text": "The Moonstone Chain, Part 1: The Moonstone Chain",
+    "questMoonstone1Text": "La Cadena de Piedra Lunar, Parte 1: La Cadena de Piedra Lunar",
     "questMoonstone1Notes": "<p>Una terrible aflicción ha golpeado a los Habiticanos. Malos Hábitos que se creían muertos hace tiempo, se han levantado de nuevo en venganza. Los platos se encuentran sin lavar, los libros de texto permanecen sin leer, ¡y la procrastinación corre sin nadie que la detenga!</p><br/><p>Sigues el rastro de algunos de tus propios Malos Hábitos a las Ciénagas del Estancamiento y descubres a la culpable: la fantasmal Necromante, Recidiva. Te lanzas a atacarla, pero tus armas atraviesan su cuerpo espectral inútilmente.</p><br/><p>\"No te molestes,\" susurra con un tono áspero y seco. \"Sin una cadena de piedras de luna, nada puede hacerme daño – ¡y el maestro joyero @aurakami dispersó todas las piedras de luna a través de Habitica hace mucho tiempo!\" Jadeante, te retiras... pero sabes qué es lo que debes hacer.</p>",
     "questMoonstone1CollectMoonstone": "Piedras de luna",
     "questMoonstone1DropMoonstone2Quest": "La Cadena de la piedra de luna parte 2: Recidiva la Necromante (Pergamino)",
-    "questMoonstone2Text": "The Moonstone Chain, Part 2: Recidivate The Necromancer",
+    "questMoonstone2Text": "La Cadena de Piedra Lunar, Parte 2: Reincidencia La Necromante",
     "questMoonstone2Notes": "<p>El valiente armero @Inventrix te ayuda a dar forma a las piedras de luna encantadas hasta hacerlas una cadena. Estás listo para confrontar finalmente a Recidiva, pero en cuanto entras a las Ciénagas de Estancamiento, te recorre un terrible escalofrío.</p><br/><p> Un soplo podrido susurra en tu oído. \"¿Has regresado? Qué deleite...\" Giras y atacas, y bajo la luz de la cadena de piedras de luna, tu arma golpea la carne sólida. \"Tal vez me hayas atado al mundo una vez más,\" gruñe Recidiva, \"¡pero ahora es tiempo de que lo dejes!\"</p>",
     "questMoonstone2Boss": "La Necromante",
     "questMoonstone2DropMoonstone3Quest": "La Cadena de la piedra de luna parte 3: Recidiva transformada (Pergamino)",
-    "questMoonstone3Text": "The Moonstone Chain, Part 3: Recidivate Transformed",
+    "questMoonstone3Text": "La Cadena de Piedra Lunar, Parte 3: Reincidencia 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>Respiras difícilmente y el sudor hace que ardan tus ojos mentras el Guivre se colapsa. Los restos de Recidiva se desvanecen formando una gruesa bruma gris que desaparece rápidamente bajo la ráfaga de una refrescante brisa, y escuchas en la distancia los gritos de multitudes de Habiticanos derrotando a 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>",
     "questMoonstone3Boss": "Necrovicio",
     "questMoonstone3DropRottenMeat": "Carne podrida (Comida)",
     "questMoonstone3DropZombiePotion": "Poción de ecolsion Zombie",
-    "questGoldenknight1Text": "El Caballero dorado, Parte 1: Un regaño severo",
+    "questGoldenknight1Text": "El Caballero Dorado, Parte 1: Un Regaño Severo",
     "questGoldenknight1Notes": "<p>La Dama de oro ha estado molestando a los pobres Habiticanos. ¿No cumpliste todas tus Diarias? ¿Marcaste un hábito negativo? Ella lo usará como razón para acosarte y decir que tienes que seguir su ejemplo. Ella es el ejemplo brillante de un Habiticano perfecto y tú no eres más que un fracaso. Bueno, ¡eso no es para nada agradable! Todos comiten errores y no debieran ser tratados con tanta negatividad. ¡Tal vez es hora para reunir unos cuantos testimonios de los Habitacanos ofendidos y darle una a la Dama de oro una severa reprimenda!</p>",
     "questGoldenknight1CollectTestimony": "Testimonios",
     "questGoldenknight1DropGoldenknight2Quest": "La Cadena de la Dama de oro parte 2: Oro deslustrado (Pergamino)",
-    "questGoldenknight2Text": "El Caballero dorado, Parte 2: El Caballero de oro",
+    "questGoldenknight2Text": "El Caballero Dorado, Parte 2: El Caballero de Oro",
     "questGoldenknight2Notes": "<p>Armado con cientos de testimonios de Habiticanos, enfrentas finalmente a la Dama de oro. Empiezas a recitar las quejas de los Habiticanos, una por una. \"Y @Pfeffernusse dice que tus constantes fanfarronadas-\" Ella alza su mano para silenciarte y se burla, \"Por favor, estas personas simplemente están celosas de mi éxito. En lugar de quejarse, ¡deberían trabajar tan duro como yo! ¡Quizás pueda mostrarte el poder que puedes obtener mediante una diligencia como la mía!\" Entonces levanta su lucero del alba, ¡y se prepara para atacarte!</p>",
     "questGoldenknight2Boss": "Dama de oro",
     "questGoldenknight2DropGoldenknight3Quest": "La Cadena de la Dama de oro parte 3: El Caballero de hierro (Pergamino)",
-    "questGoldenknight3Text": "El Caballero dorado, Parte 1: El Caballero de hierro",
-    "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 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>",
+    "questGoldenknight3Text": "El Caballero Dorado, Parte 3: El Caballero de Hierro",
+    "questGoldenknight3Notes": "<p>@Jon Arinbjorn grita para llamar tu atención. En los momentos siguientes a tu batalla, una nueva figura ha aparecido. Un caballero revestido de hierro teñido de negro se aproxima a ti lentamente con su espada en mano. La Dama Dorada vocifera hacia la figura \"¡Padre, no!\" pero el otro caballero no parece querer detenerse. Ella se vuelve hacia ti y dice \"Lo siento. He sido una tonta, con un ego demasiado grande para ver lo cruel que he sido. Pero mi padre es aún más cruel de lo que yo jamás podría ser. Si nadie lo detiene nos destruirá a todos. ¡Toma, usa mi Lucero del Alba y termina con el Caballero de Hierro!\"</p>",
     "questGoldenknight3Completion": "<p>Con un satisfactorio sonido metálico, el Caballero de hierro cae de rodillas y se desploma. \"Eres bastante fuerte\", jadea. \"Hoy me han humillado\". La Dama de oro se acerca a ti y dice: \"Gracias. Creo que hemos ganado algo de humildad al enfrentarnos contigo. Hablaré con mi padre y le explicaré las quejas sobre nosotros. Quizás deberíamos empezar por disculparnos ante los otros Habiticanos\". Se detiene a pensar por un momento antes de volverse nuevamente hacia ti. \"Ten: como obsequio, quiero que te quedes con mi Lucero del Alba. Es tuyo ahora\".</p>",
     "questGoldenknight3Boss": "El Caballero de hierro",
     "questGoldenknight3DropHoney": "Miel (Comida)",
@@ -128,15 +128,15 @@
     "questSeahorseBoss": "Semental de mar",
     "questSeahorseDropSeahorseEgg": "Caballito de mar (Huevo)",
     "questSeahorseUnlockText": "Desbloquea huevos de caballito de mar comprables en el Mercado",
-    "questAtom1Text": "Attack of the Mundane, Part 1: Dish Disaster!",
+    "questAtom1Text": "Ataque de lo Mundano, Parte 1: ¡Desastre de Platos!",
     "questAtom1Notes": "Llegas a la orilla del Lago Lavado para relajación bien merecida... ¡Pero el lago está contaminado con platos sucios! ¿Cómo sucedió esto? Bueno, simplemente no puedes permitir que el lago siga en este estado. Sólo hay una cosa que puedes hacer: ¡limpiar los platos y salvar tu lugar de vacaciones! Mejor encontrar un poco de jabón para limpiar este desastre. Mucho jabón...",
     "questAtom1CollectSoapBars": "Barras de jabón",
-    "questAtom1Drop": "The SnackLess Monster (Quest Scroll)",
-    "questAtom2Text": "Attack of the Mundane, Part 2: The SnackLess Monster",
+    "questAtom1Drop": "El Monstruo SnackLess (Pergamino de Misión)",
+    "questAtom2Text": "Ataque de lo Mundano, Parte 2: El Monstruo SnackLess",
     "questAtom2Notes": "Puf, este lugar se ve mucho más bonito con todos estos platos limpiados. Quizás, al fin, podrás pasar un buen rato. Oh - parece que hay una caja de pizza flotando en el lago. Bueno, realmente ¿que es una cosa más para limpiar? Con una súbita oleada la caja se levanta del agua y se revela como la cabeza de un monstruo. ¡No puede ser! ¡¿El legendario Monstruo SnackLess?! Se dice que ha existido escondido en el lago desde la prehistoria: una criatura engendrado de los restos de comida y basura de los antiguos Habiticanos. ¡Qué asco!",
     "questAtom2Boss": "El Monstruo SnackLess",
-    "questAtom2Drop": "The Laundromancer (Quest Scroll)",
-    "questAtom3Text": "Ataque del Mundano, Parte 3: El Lavandomante",
+    "questAtom2Drop": "El Lavadomante (Pergamino de Misión)",
+    "questAtom3Text": "Ataque de lo Mundano, Parte 3: El Lavadomante",
     "questAtom3Notes": "Con un grito ensordecedor, y cinco deliciosos tipos de queso emergiendo de su boca, el Monstruo SnackLess se cae a pedazos. \"¡CÓMO TE ATREVES!\" resuena una voz desde debajo de la superficie del agua. Una figura azul, con túnica, emerge del agua, empuñando un cepillo de baño mágico. Ropa sucia comienza a burbujear a la superficie del lago. \"Soy el Lavandomante!\" anuncia furiosamente. \"Que desfachatez - lavar mis esplendidamente sucio platos, destruir mi mascota, y entrar a mi dominio con ropa tan limpia. ¡Prepárate a sentir la ira empapada de mi magia anti-lavado!\"",
     "questAtom3Completion": "¡El malvado Lavandomante ha sido vencido! Ropa limpia cae en pilas a tu alrededor. Las cosas se ven mucho mejor por aquí. Mientras comienzas a vadear por la armadura recién planchada, un centelleo de metal llama tu atención, y tu mirada cae sobre un casco resplandeciente. El dueño original de este objeto radiante puede ser desconocido, pero mientras te lo pones, sientes la presencia alentadora de un espíritu generoso. Lástima que no le cocieron sus iniciales.",
     "questAtom3Boss": "El Lavandomante",
@@ -165,7 +165,7 @@
     "questStressbeastBossRageGuide": "`¡La Abominable  Bestia del Estrés usó Ataque de Estrés!`\n\nEl aumento del estrés cura a La Abominable Bestia del Estrés!\n\n¡Cuidado! Justin el Guía está tratando de distraer a La Abominable Bestia del Estrés corriendo alrededor de sus tobillos, gritando consejos de productividad! La Abominable Bestia del Estrés está pisoteando locamente, pero parece que realmente estamos desgastando a esta bestia. Dudo que tenga suficiente energía para otro ataque. No te rindas... ¡estamos muy cerca de acabar con ella!",
     "questStressbeastDesperation": "`¡LaAbominable Bestia del Estrés llega a 500K de salud! ¡La Abominable Bestia del Estrés usa Defensa Desesperada!`\n\n¡Ya casi estamos, Habiticanos! ¡Con diligencia y Diarias, hemos dejado a La Abominable Bestia del Estrés en solo 500K! La criatura ruge y golpea desesperadamente, mientras su furia aumenta más rápido que nunca. Bailey y Matt gritan de terror a medida que comienza a moverlos de un lado al otro a un ritmo terrador, levantando una enceguecedora tormenta de nieve que hace más difícil golpearla.\n\n¡Tendremos que redoblar nuestros esfuerzos, pero tomen valor - esto es una señal de que La Abominable Bestia del Estrés sabe que está a punto de ser derrotada! ¡No te rindas ahora!",
     "questStressbeastCompletion": "<strong>¡LaAbominable Bestia del Estrés ha sido DERROTADA!</strong><br><br>¡Lo hicimos! Con un rugido final la Abominable Bestia del Estrés se disipa en una nube de nieve. Las copos de nieve brillan a través del aire mientras los Habiticanos aplauden y abrazan a sus mascotas y monturas. ¡Nuestros animales y nuestros NPCs están seguros una vez más!<br><br><strong>¡Stoïkalm se ha salvado!</strong><br><br>SabreCat habla suavemente a un pequeño tigre dientes de sable. \"Encuentra los ciudadanos de las Estepas de Stoïkalm y tréelos a nosotros,\" dice. Varias horas más tarde, el tigre diente de sable regresa, con una manada de jinetes de mamut siguiéndolo lentamente detrás. Reconoces al jinete a la cabeza como Lady Glaciate, líder de Stoïkalm.<br><br>\"Valientes Habiticanos,\" dice, \"Mis ciudadanos y yo les debemos el más profundo agradecimiento, y las más sinceras disculpas. En un esfuerzo por proteger nuestras Estepas de la agitación, empezamos a desterrar en secreto todo nuestro estrés hacia las montañas heladas. ¡No teníamos idea de que con las generaciones se convertiria en la Abominable Bestia del Estrés que vieron! Cuando se desató, nos dejó atrapados en su lugar a todos en las montañas y se fue en un alboroto contra nuestros queridos animales.\" Su triste mirada sigue el caer de la nieve. \"Pusimos a todos en riesgo con nuestra necedad. Tengan por seguro que en el futuro, vamos a ir a ustedes con nuestros problemas antes de que nuestros problemas vayan a ustedes\".<br><br>Ella se vuelve hacia donde @Baconsaur abraza a unos mamuts bebé. \"Hemos traído a tus animales una ofrenda de alimentos para disculparnos por asustarlos, y como un símbolo de confianza, vamos a dejar algunas de nuestras mascotas y monturas contigo. Sabemos que todos ustedes van cuidar bien de ellos\".",
-    "questStressbeastCompletionChat": "`La Bestia Abominable del Estrés ha sido VENCIDA`\n\nLo hemos hecho! Con un rugido final La Bestia Abominable del Estrés se disipa en una nube de nieve. Las copos de nieve brillan a través del aire mientras Habiticanos aplaudiendo abrazan a sus mascotas y monturas. ¡Nuestros animales y nuestros NPCs están seguros una vez más!\n\n`¡Stoïkalm se ha salvado!`\n\nSabreCat le habla suavemente a un pequeño dientes de sable. \"Encuentra los ciudadanos de las Estepas de Stoïkalm y tráelos a nosotros,\" dice. Varias horas más tarde, el dientes de sable regresa, con una manada de jinetes de mamut siguiendo lentamente detrás. Reconoces al jinete a la cabeza como Lady glaciate, líder de Stoïkalm.\n\n\"Valientes Habiticanos,\" ella dice, \"Mis ciudadanos y yo les debemos el más profundo agradecimiento, y las más sinceras disculpas. En un esfuerzo por proteger nuestras Estepas de la agitación, empezamos a desterrar en secreto todo nuestro estrés en las montañas heladas. ¡No teníamos idea de que con las generaciones se convertiría en La Bestia Abominable del Estrés que viste! Cuando se desató, nos atrapó a todos nosotros en las montañas en su lugar y se fue en un alboroto contra nuestros queridos animales.\" Su triste mirada sigue el caer de la nieve. \"Pusimos a todos en riesgo con nuestra necedad. Ten por seguro que en el futuro, vamos a ir a ustedes con nuestros problemas antes de que nuestros problemas vayan a ustedes.\"\n\nSe vuelve hacia donde @Baconsaur está abrazando a unos mamuts bebé. \"Hemos traído a tus animales una ofrenda de alimentos para disculparnos por asustarlos, y como símbolo de confianza, vamos a dejar algunas de nuestras mascotas y monturas contigo. Sabemos que todos ustedes van cuidar bien de ellos.\"",
+    "questStressbeastCompletionChat": "`¡La Abominable Bestia del Estrés ha sido VENCIDA!`\n\n¡Lo hemos hecho! Con un rugido final La Abominable Bestia del Estrés se disipa en una nube de nieve. Las copos de nieve brillan a través del aire mientras Habiticanos entusiastas abrazan a sus mascotas y monturas. ¡Nuestros animales y nuestros PNJs están seguros una vez más!\n\n`¡Stoïkalm se ha salvado!`\n\nSabreCat le habla suavemente a un pequeño dientes de sable. \"Encuentra a los ciudadanos de las Estepas de Stoïkalm y tráelos a nosotros,\" dice. Varias horas más tarde, el dientes de sable regresa, con una manada de jinetes de mamut avanzando lentamente detrás. Reconoces al jinete a la cabeza como Lady Glaciate, líder de Stoïkalm.\n\n\"Valientes Habiticanos,\" ella dice, \"Mis ciudadanos y yo les debemos el más profundo agradecimiento, y las más sinceras disculpas. En un esfuerzo por proteger nuestras Estepas de la agitación, empezamos a desterrar en secreto a todo nuestro estrés a las montañas heladas. ¡No teníamos idea de que con las generaciones se convertiría en la Bestia del Estrés que vieron! Cuando se liberó, nos atrapó a todos nosotros en las montañas en su lugar y salió en un frenesí a arremeter contra nuestros queridos animales.\" Su triste mirada sigue el caer de la nieve. \"Pusimos a todos en riesgo con nuestra necedad. Ten por seguro que en el futuro, nos acercaremos a ustedes con nuestros problemas antes de que nuestros problemas lleguen a ustedes.\"\n\nSe vuelve hacia donde @Baconsaur está abrazando a unos mamuts bebé. \"Hemos traído a tus animales una ofrenda de alimentos para disculparnos por asustarlos, y como símbolo de confianza, vamos a dejar algunas de nuestras mascotas y monturas con ustedes. Sabemos que todos ustedes van cuidar bien de ellos.\"",
     "questTRexText": "Rey de los dinosaurios",
     "questTRexNotes": "Ahora que las antiguas criaturas de las estepas de Stoïkalm están vagando por toda Habitica, @Urse ha decidido adoptar un Tiranosaurio completamente desarrollado. ¿Que podría salir mal?<br><br>Todo.",
     "questTRexCompletion": "El salvaje dinosaurio finalmente frena su acometida y se aquieta para hacer amigos con los gallos gigantes. @Urse exclama viendo esto. \"¡No son tan malas mascotas después de todo! Todo lo que necesitan es un poco de disciplina. Ten, toma algunos huevos de dinosaurio para ti mismo\".",
@@ -191,81 +191,81 @@
     "questBunnyCompletion": "Con un golpe final el conejo asesino se hunde en el suelo. Una niebla brillante se levanta de su cuerpo mientras se encoge en un diminuto conejito ... ya no es como la bestia cruel a la que te enfrentaste tan solo un momento antes. Su nariz se movió de manera adorable y saltó a otro lado, dejando algunos huevos atrás. @Gully ríe. \"El Monte Procastinación hace que incluso los desafíos más pequeños parezcan insuperables. Reunamos estos huevos y vayamos a casa\".",
     "questBunnyDropBunnyEgg": "Conejito (huevo)",
     "questBunnyUnlockText": "Desbloquea huevos de conejito comprables en el Mercado",
-    "questSlimeText": "The Jelly Regent",
-    "questSlimeNotes": "As you work on your tasks, you notice you are moving slower and slower. \"It's like walking through molasses,\" @Leephon grumbles. \"No, like walking through jelly!\" @starsystemic says. \"That slimy Jelly Regent has slathered his stuff all over Habitica. It's gumming up the works. Everybody is slowing down.\" You look around. The streets are slowly filling with clear, colorful ooze, and Habiticans are struggling to get anything done. As others flee the area, you grab a mop and prepare for battle!",
-    "questSlimeBoss": "Jelly Regent",
-    "questSlimeCompletion": "With a final jab, you trap the Jelly Regent in an over-sized donut, rushed in by @Overomega, @LordDarkly, and @Shaner, the quick-thinking leaders of the pastry club. As everyone is patting you on the back, you feel someone slip something into your pocket. It’s the reward for your sweet success: three Marshmallow Slime eggs.",
-    "questSlimeDropSlimeEgg": "Slime de malvavisco (Huevo)",
-    "questSlimeUnlockText": "Desbloquea huevos de babosa comprables en el Mercado",
+    "questSlimeText": "La Jalea Regente",
+    "questSlimeNotes": "Mientras te ocupas de tus tareas, te das cuenta de que te estás moviendo más y más lento. \"Es como caminar a través de melaza,\" se queja @Leephon. \"¡No, como atravesar jalea!\" dice @starsystemic. \"Esa babosa Jalea Regente ha untado su sustancia por toda Habitica. Está arruinando los trabajos. Todo el mundo se está volviendo más lento.\" Tú miras alrededor. Las calles se están llenando de a poco con un cieno claro y colorido, y los Habiticanos están luchando para poder terminar algo. Mientras otros huyen del área, ¡tú agarras un trapeador y te preparas para la batalla!",
+    "questSlimeBoss": "Jalea Regente",
+    "questSlimeCompletion": "Con un golpe final, atrapas a la Jalea Regente en una dona demasiado grande que te fue alcanzada por @Overomega, @LordDarkly y @Shaner, los líderes con reflejos rápidos del club de pastelería. Mientras todos te dan palmadas en la espalda, sientes a alguien poner discretamente algo en tu bolsillo. Es la recompensa por tu dulce éxito: tres huevos de Baba de Malvavisco.",
+    "questSlimeDropSlimeEgg": "Baba de Malvavisco (Huevo)",
+    "questSlimeUnlockText": "Desbloquea huevos de baba adquiribles en el Mercado",
     "questSheepText": "El carnero del trueno",
-    "questSheepNotes": "Mientras deambulas por las campiñas de Taskan con tus amigos, tomando un \"rápido descanso\" de tus obligaciones, encuentras una acogedora tienda de estambre. Estás tan sumergido en tu procastinación que apenas y te das cuenta de las siniestras nubes que cubren el cielo. \"Tengo un ma-a-al presentimiento de este clima\", balbucea @Misceo mientras miras hacia arriba. Las tempestuosas nubes se arremolinan y se parecen mucho a... \"¡No tenemos tiempo para mirar nubes!\" grita @starsystemic. \"¡Está atacando!\" ¡El carnero del trueno se abalanza, lanzando relámpagos y truenos hacia ti!",
+    "questSheepNotes": "Mientras deambulas por las campiñas de Taskan con tus amigos, tomando un \"rápido descanso\" de tus obligaciones, encuentras una acogedora tienda de estambre. Estás tan sumergido en tu procrastinación que apenas y te das cuenta de las siniestras nubes que cubren el cielo. \"Tengo un ma-a-al presentimiento de este clima\", balbucea @Misceo mientras miras hacia arriba. Las tempestuosas nubes se arremolinan y se parecen mucho a... \"¡No tenemos tiempo para mirar nubes!\" grita @starsystemic. \"¡Está atacando!\" ¡El carnero del trueno se abalanza, lanzando relámpagos y truenos hacia ti!",
     "questSheepBoss": "Carnero del trueno",
     "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
     "questSheepDropSheepEgg": "Oveja (Huevo)",
-    "questSheepUnlockText": "Desbloquea huevos de oveja comprables en el Mercado",
-    "questKrakenText": "El Kraken de lo incompleto",
-    "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
-    "questKrakenBoss": "El Kraken de lo incompleto",
-    "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
-    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
-    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market",
+    "questSheepUnlockText": "Desbloquea huevos de oveja adquiribles en el Mercado",
+    "questKrakenText": "El Kraken de Inkompleta",
+    "questKrakenNotes": "Es un día cálido y soleado mientras navegas a través de la Bahía Inkompleta, pero tus pensamientos están llenos de preocupaciones sobre todo lo que aún te queda por hacer. Pareciera que apenas terminas una tarea, otra brota de la nada, y luego otra...<br><br>De pronto, el bote da una horrible sacudida, ¡y tentáculos babosos emergen del agua por todas partes! \"¡Estamos siendo atacados por el Kraken de Inkompleta!\" grita Wolvenhalo.<br><br>\"¡Rápido!\" te llama Lemoness. \"¡Derriba la mayor cantidad de tentáculos que puedas antes de que otros se alzen y tomen su lugar!\"",
+    "questKrakenBoss": "El Kraken de Inkompleta",
+    "questKrakenCompletion": "Mientras el Kraken huye, varios huevos flotan hacia la superficie del agua. Lemoness los examina, y su recelo se transforma en placer. \"¡Huevos de sepia!\" dice. \"Aquí tienes, tómalos como recompensa por todo lo que has completado.\"",
+    "questKrakenDropCuttlefishEgg": "Sepia (Huevo)",
+    "questKrakenUnlockText": "Desbloquea huevos de sepia adquiribles en el Mercado",
     "questWhaleText": "El lamento de la ballena",
     "questWhaleNotes": "You arrive at the Diligent Docks, hoping to take a submarine to watch the Dilatory Derby. Suddenly, a deafening bellow forces you to stop and cover your ears. \"Thar she blows!\" cries Captain @krazjega, pointing to a huge, wailing whale. \"It's not safe to send out the submarines while she's thrashing around!\"<br><br>\"Quick,\" calls @UncommonCriminal. \"Help me calm the poor creature so we can figure out why she's making all this noise!\"",
     "questWhaleBoss": "Ballena lamentosa ",
     "questWhaleCompletion": "After much hard work, the whale finally ceases her thunderous cry. \"Looks like she was drowning in waves of negative habits,\" @zoebeagle explains. \"Thanks to your consistent effort, we were able to turn the tides!\" As you step into the submarine, several whale eggs bob towards you, and you scoop them up.",
     "questWhaleDropWhaleEgg": "Ballena (Huevo)",
-    "questWhaleUnlockText": "Desbloquea huevos de ballena comprables en el Mercado",
-    "questDilatoryDistress1Text": "Dilatory Distress, Part 1: Message in a Bottle",
+    "questWhaleUnlockText": "Desbloquea huevos de ballena adquiribles en el Mercado",
+    "questDilatoryDistress1Text": "Peligro en Dilatoria, Parte 1: Mensaje en una Botella",
     "questDilatoryDistress1Notes": "A message in a bottle arrived from the newly rebuilt city of Dilatory! It reads: \"Dear Habiticans, we need your help once again. Our princess has disappeared and the city is under siege by some unknown watery demons! The mantis shrimps are holding the attackers at bay. Please aid us!\" To make the long journey to the sunken city, one must be able to breathe water. Fortunately, the alchemists @Benga and @hazel can make it all possible! You only have to find the proper ingredients.",
     "questDilatoryDistress1Completion": "You don the the finned armor and swim to Dilatory as quickly as you can. The merfolk and their mantis shrimp allies have managed to keep the monsters outside the city for the moment, but they are losing. No sooner are you within the castle walls than the horrifying siege descends!",
     "questDilatoryDistress1CollectFireCoral": "Coral de fuego",
     "questDilatoryDistress1CollectBlueFins": "Aletas Azules",
     "questDilatoryDistress1DropArmor": "Armadura Oceánica con Aletas (Armadura)",
-    "questDilatoryDistress2Text": "Dilatory Distress, Part 2: Creatures of the Crevasse",
+    "questDilatoryDistress2Text": "Peligro en Dilatoria, Parte 2: Criaturas de la Grieta",
     "questDilatoryDistress2Notes": "The siege can be seen from miles away: thousands of disembodied skulls rushing through a portal in the crevasse walls and making their way towards Dilatory.<br><br>When you meet King Manta in his war room, his eyes seem sunken, and his face is worried. \"My daughter Adva disappeared into the Dark Crevasse just before this siege began. Please find her and bring her back home safely! I will lend you my Fire Coral Circlet to aid you. If you succeed, it is yours.\"",
     "questDilatoryDistress2Completion": "You vanquish the nightmarish horde of skulls, but you feel no closer to finding Adva. You speak to @Kiwibot, the royal tracker, to see if she has any ideas. \"The mantis shrimps that defend the city must have seen Adva escape,\" @Kiwibot says. \"Try following them into the Dark Crevasse.\"",
     "questDilatoryDistress2Boss": "Water Skull Swarm",
     "questDilatoryDistress2RageTitle": "Swarm Respawn",
     "questDilatoryDistress2RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Water Skull Swarm will heal 30% of its remaining health!",
     "questDilatoryDistress2RageEffect": "`Water Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls pour forth from the crevasse, bolstering the swarm!",
-    "questDilatoryDistress2DropSkeletonPotion": "Poción Esqueleto",
-    "questDilatoryDistress2DropCottonCandyBluePotion": "Poción Algodón de Azúcar Azul",
+    "questDilatoryDistress2DropSkeletonPotion": "Poción de Eclosión Esqueleto",
+    "questDilatoryDistress2DropCottonCandyBluePotion": "Poción de Eclosión de Algodón de Azúcar Azul",
     "questDilatoryDistress2DropHeadgear": "Fire Coral Circlet (Headgear)",
-    "questDilatoryDistress3Text": "Dilatory Distress, Part 3: Not a Mere Maid",
+    "questDilatoryDistress3Text": "Peligro en Dilatoria, Parte 3: No Sólo una Simple Doncella",
     "questDilatoryDistress3Notes": "You follow the mantis shrimps deep into the Crevasse, and discover an underwater fortress. Princess Adva, escorted by more watery skulls, awaits you inside the main hall. \"My father has sent you, has he not? Tell him I refuse to return. I am content to stay here and practice my sorcery. Leave now, or you shall feel the wrath of the ocean's new queen!\" Adva seems very adamant, but as she speaks you notice a strange, ruby pendant on her neck glowing ominously... Perhaps her delusions would cease should you break it?",
     "questDilatoryDistress3Completion": "Finally, you manage to pull the bewitched pendant from Adva's neck and throw it away. Adva clutches her head. \"Where am I? What happened here?\" After hearing your story, she frowns. \"This necklace was given to me by a strange ambassador - a lady called 'Tzina'. I don't remember anything after that!\"<br><br>Back at Dilatory, Manta is overjoyed by your success. \"Allow me to reward you with this trident and shield! I ordered them from @aiseant and @starsystemic as a gift for Adva, but... I'd rather not put weapons in her hands any time soon.\"",
-    "questDilatoryDistress3Boss": "Adva, the Usurping Mermaid",
+    "questDilatoryDistress3Boss": "Adva, la Sirena Usurpadora",
     "questDilatoryDistress3DropFish": "Pescado (Comida)",
-    "questDilatoryDistress3DropWeapon": "Trident of Crashing Tides (Weapon)",
+    "questDilatoryDistress3DropWeapon": "Tridente de Mareas Estruendosas (Arma)",
     "questDilatoryDistress3DropShield": "Escudo Luna perlada (Objeto Escudo-Mano)",
-    "questCheetahText": "Como un Chita",
+    "questCheetahText": "Como un Guepardo",
     "questCheetahNotes": "As you hike across the Sloensteadi Savannah with your friends @PainterProphet, @tivaquinn, @Unruly Hyena, and @Crawford, you're startled to see a Cheetah screeching past with a new Habitican clamped in its jaws. Under the Cheetah's scorching paws, tasks burn away as though complete -- before anyone has the chance to actually finish them! The Habitican sees you and yells, \"Please help me! This Cheetah is making me level too quickly, but I'm not getting anything done. I want to slow down and enjoy the game. Make it stop!\" You fondly remember your own fledgling days, and know that you have to help the newbie by stopping the Cheetah!",
     "questCheetahCompletion": "The new Habitican is breathing heavily after the wild ride, but thanks you and your friends for your help. \"I'm glad that Cheetah won't be able to grab anyone else. It did leave some Cheetah eggs for us, so maybe we can raise them into more trustworthy pets!\"",
-    "questCheetahBoss": "Chita",
-    "questCheetahDropCheetahEgg": "Chita (Huevo)",
-    "questCheetahUnlockText": "Desbloquea huevos de Chita comprables en el Mercado",
+    "questCheetahBoss": "Guepardo",
+    "questCheetahDropCheetahEgg": "Guepardo (Huevo)",
+    "questCheetahUnlockText": "Desbloquea huevos de Guepardo adquiribles en el Mercado",
     "questHorseText": "Ride the Night-Mare",
     "questHorseNotes": "While relaxing in the Tavern with @beffymaroo and @JessicaChase, the talk turns to good-natured boasting about your adventuring accomplishments. Proud of your deeds, and perhaps getting a bit carried away, you brag that you can tame any task around. A nearby stranger turns toward you and smiles. One eye twinkles as he invites you to prove your claim by riding his horse.\nAs you all head for the stables, @UncommonCriminal whispers, \"You may have bitten off more than you can chew. That's no horse - that's a Night-Mare!\" Looking at its stamping hooves, you begin to regret your words...",
     "questHorseCompletion": "It takes all your skill, but finally the horse stamps a couple of hooves and nuzzles you in the shoulder before allowing you to mount. You ride briefly but proudly around the Tavern grounds while your friends cheer. The stranger breaks into a broad grin.\n\"I can see that was no idle boast! Your determination is truly impressive. Take these eggs to raise horses of your own, and perhaps we'll meet again one day.\" You take the eggs, the stranger tips his hat... and vanishes.",
     "questHorseBoss": "Night-Mare",
     "questHorseDropHorseEgg": "Caballo (Huevo)",
-    "questHorseUnlockText": "Desbloquea huevos de Caballo comprables en el Mercado",
-    "questBurnoutText": "Burnout and the Exhaust Spirits",
+    "questHorseUnlockText": "Desbloquea huevos de Caballo adquiribles en el Mercado",
+    "questBurnoutText": "Burnout y los Espíritus Consumidos",
     "questBurnoutNotes": "It is well past midnight, still and stiflingly hot, when Redphoenix and scout captain Kiwibot abruptly burst through the city gates. \"We need to evacuate all the wooden buildings!\" Redphoenix shouts. \"Hurry!\"<br><br>Kiwibot grips the wall as she catches her breath. \"It's draining people and turning them into Exhaust Spirits! That's why everything was delayed. That's where the missing people have gone. It's been stealing their energy!\"<br><br>\"'It'?'\" asks Lemoness.<br><br>And then the heat takes form.<br><br>It rises from the earth in a billowing, twisting mass, and the air chokes with the scent of smoke and sulphur. Flames lick across the molten ground and contort into limbs, writhing to horrific heights. Smoldering eyes snap open, and the creature lets out a deep and crackling cackle.<br><br> Kiwibot whispers a single word.<br><br><em>\"Burnout.\"</em>",
     "questBurnoutCompletion": "<strong>Burnout is DEFEATED!</strong><br><br>With a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.<br><br>Ian, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!<br><br>\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!<br><br>One of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"<br><br>Her tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"<br><br>She claps her hands. \"Now - let's celebrate!\"",
     "questBurnoutCompletionChat": "`Burnout is DEFEATED!`\n\nWith a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.\n\nIan, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!\n\n\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!\n\nOne of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"\n\nHer tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"\n\nShe claps her hands. \"Now - let's celebrate!\"\n\nAll Habiticans receive:\n\nPhoenix Pet\nPhoenix Mount\nAchievement: Savior of the Flourishing Fields\nBasic Candy\nVanilla Candy\nSand Candy\nCinnamon Candy\nChocolate Candy\nRotten Candy\nSour Pink Candy\nSour Blue Candy\nHoney Candy",
     "questBurnoutBoss": "Burnout",
-    "questBurnoutBossRageTitle": "Exhaust Strike",
-    "questBurnoutBossRageDescription": "When this gauge fills, Burnout will unleash its Exhaust Strike on Habitica!",
-    "questBurnoutDropPhoenixPet": "Phoenix (Pet)",
-    "questBurnoutDropPhoenixMount": "Phoenix (Mount)",
+    "questBurnoutBossRageTitle": "Ataque Consumidor",
+    "questBurnoutBossRageDescription": "¡Cuando este medidor se llene, Burnout desatará su Ataque Consumidor sobre Habitica!",
+    "questBurnoutDropPhoenixPet": "Fénix (Mascota)",
+    "questBurnoutDropPhoenixMount": "Fénix (Montura)",
     "questBurnoutBossRageQuests": "`Burnout uses EXHAUST STRIKE!`\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and now Burnout is inflamed with energy! With a crackling snarl, it engulfs Ian the Quest Master in a surge of spectral fire. As fallen quest scrolls smolder, the smoke clears, and you see that Ian has been drained of energy and turned into a drifting Exhaust Spirit!\n\nOnly defeating Burnout can break the spell and restore our beloved Quest Master. Let's keep our Dailies in check and defeat this monster before it attacks again!",
     "questBurnoutBossRageSeasonalShop": "`Burnout uses EXHAUST STRIKE!`\n\nAhh!!! Our incomplete Dailies have fed the flames of Burnout, and now it has enough energy to strike again! It lets loose a gout of spectral flame that sears the Seasonal Shop. You're horrified to see that the cheery Seasonal Sorceress has been transformed into a drooping Exhaust Spirit.\n\nWe have to rescue our NPCs! Hurry, Habiticans, complete your tasks and defeat Burnout before it strikes for a third time!",
     "questBurnoutBossRageTavern": "`Burnout uses EXHAUST STRIKE!`\n\nMany Habiticans have been hiding from Burnout in the Tavern, but no longer! With a screeching howl, Burnout rakes the Tavern with its white-hot hands. As the Tavern patrons flee, Daniel is caught in Burnout's grip, and transforms into an Exhaust Spirit right in front of you!\n\nThis hot-headed horror has gone on for too long. Don't give up... we're so close to vanquishing Burnout for once and for all!",
-    "questFrogText": "Swamp of the Clutter Frog",
+    "questFrogText": "Pantano de la Rana Desastrosa",
     "questFrogNotes": "As you and your friends are slogging through the Swamps of Stagnation, @starsystemic points at a large sign. \"Stay on the path -- if you can.\"<br><br>\"Surely that isn't hard!\" @RosemonkeyCT says. \"It's broad and clear.\"<br><br>But as you continue, you notice that path is gradually overtaken by the muck of the swamp, laced with bits of strange blue debris and clutter, until it's impossible to proceed.<br><br>As you look around, wondering how it got this messy, @Jon Arjinborn shouts, \"Look out!\" An angry frog leaps from the sludge, clad in dirty laundry and lit by blue fire. You will have to overcome this poisonous Clutter Frog to progress!",
     "questFrogCompletion": "The frog cowers back into the muck, defeated. As it slinks away, the blue slime fades, leaving the way ahead clear.<br><br>Sitting in the middle of the path are three pristine eggs. \"You can even see the tiny tadpoles and through the clear casing!\" @Breadstrings says. \"Here, you should take them.\"",
-    "questFrogBoss": "Clutter Frog",
-    "questFrogDropFrogEgg": "Frog (Egg)",
-    "questFrogUnlockText": "Unlocks purchasable Frog eggs in the Market"
+    "questFrogBoss": "Rana Desastrosa",
+    "questFrogDropFrogEgg": "Rana (Huevo)",
+    "questFrogUnlockText": "Desbloquea huevos de Rana adquiribles en el Mercado"
 }

common/locales/es_419/rebirth.json

@@ -16,9 +16,11 @@
     "rebirthEarnAchievement": "¡También recibirás un Logro por haber empezado una nueva aventura!",
     "beReborn": "Ser renacido",
     "rebirthAchievement": "¡Has comenzado una nueva aventura! Este es tu <%= number %> Renacimiento, y el Nivel más alto que has logrado es <%= level %>. Para apilar este Logro, ¡empieza tu aventura siguiente después de haber conseguido un nivel aún más alto!",
+    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
     "rebirthBegan": "Comienzo una aventura nueva",
     "rebirthText": "Comenzó <%= rebirths %>  aventuras nuevas",
     "rebirthOrb": "Uso una Esfera derenacimiento para comenzar de nuevo después de conseguir Nivel",
+    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "Comenzar con un personaje nuevo a Nivel 1, mientras manteniendo logros, lo coleccionable, y tareas con historial.",
     "rebirthName": "Esfera de renacimiento",
     "reborn": "Renacido, nivel máximo <%= reLevel %>"

common/locales/fr/challenge.json

@@ -60,6 +60,6 @@
     "noPermissionEditChallenge": "Vous n'avez pas le droit d'éditer ce défi.",
     "noPermissionDeleteChallenge": "Vous n'avez pas le droit de supprimer ce défi.",
     "noPermissionCloseChallenge": "Vous n'avez pas le droit de fermer ce défi.",
-    "noChallengeOwner": "no owner",
-    "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account."
+    "noChallengeOwner": "Sans propriétaire",
+    "noChallengeOwnerPopover": "Ce défi n'a pas de propriétaire, parce que la personne qui a créé le défi a supprimé son compte."
 }

common/locales/fr/character.json

@@ -52,7 +52,7 @@
     "classEquipBonus": "Bonus de Classe",
     "battleGear": "Équipement de combat",
     "battleGearText": "Voici l'équipement que vous portez au combat ; il affecte les chiffres obtenus lorsque vous interagissez avec vos tâches.",
-    "autoEquipBattleGear": "Auto-equip new gear",
+    "autoEquipBattleGear": "Équiper automatiquement le nouvel équipement",
     "costume": "Costume",
     "costumeText": "Si vous préférez l'apparence d'un équipement différent de celui que vous avez équipé, choisissez \"Utiliser un Costume\" pour le porter en costume tout en conservant les bonus de votre équipement.",
     "useCostume": "Utiliser un Costume",

common/locales/fr/content.json

@@ -95,9 +95,9 @@
     "questEggHorseText": "Cheval",
     "questEggHorseMountText": "Cheval",
     "questEggHorseAdjective": "un galopant",
-    "questEggFrogText": "Frog",
-    "questEggFrogMountText": "Frog",
-    "questEggFrogAdjective": "a princely",
+    "questEggFrogText": "Grenouille",
+    "questEggFrogMountText": "Grenouille",
+    "questEggFrogAdjective": "un prestigieux",
     "eggNotes": "Trouvez une potion d’éclosion à verser sur cet œuf et il en sortira <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "de Base",
     "hatchingPotionWhite": "Blanc",

common/locales/fr/faq.json

@@ -36,9 +36,9 @@
     "faqQuestion11": "Comment signaler un bug ou demander une fonctionnalité ?",
     "iosFaqAnswer11": "Vous pouvez signaler une erreur, demander une fonctionnalité ou envoyer un avis depuis Menu > Signaler une erreur et Menu > Envoyer un avis ! Nous ferons notre possible pour vous aider.",
     "webFaqAnswer11": "Les rapports d'erreur sont rassemblés sur GitHub. Aller dans [Aide > Signaler un Bug](https://github.com/HabitRPG/habitrpg/issues/2760) et suivez les instructions. Ne vous en faites pas, nous corrigerons ça rapidement !\n<br><br>\nLes demandes de fonctionnalités sont rassemblées sur Trello. Allez dans [Aide > Demander une Fonctionnalité](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) et suivez les instructions. Ta-Da!",
-    "faqQuestion12": "How do I battle a World Boss?",
-    "iosFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
-    "webFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and skills will damage the Boss as usual.\n<br><br>\n You can also be in a normal Quest at the same time. Your tasks and skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n<br><br>\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n<br><br>\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
+    "faqQuestion12": "Comment combat-on un Boss Mondial?",
+    "iosFaqAnswer12": "Les Boss Mondiaux sont des monstres spéciaux qui apparaissent dans la Taverne. Tous les membres actifs combattent automatiquement le boss : leurs tâches et habiletés blesseront le Boss comme à l'habitude.\n\nVous pouvez également participer à une quête normale en même temps. Vos tâches et habiletés seront pris en compte pour les deux boss : le Boss Mondial et le Boss/Quête de collection de votre équipe.\n\nUn Boss Mondial ne blessera jamais, vous et votre compte, de quelque manière que ce soit. Il a plutôt une Barre de colère qui se remplit lorsque les membres manquent les Quotidiennes. Si la Barre se remplit, il attaque l'un des Personnages non-joueurs du site et son image changera.\n\nPour en savoir plus, visitez la page [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) (en anglais) du wiki.",
+    "webFaqAnswer12": "Les Boss Mondiaux sont des monstres spéciaux qui apparaissent dans la Taverne. Tous les membres actifs combattent automatiquement le boss : leurs tâches et habiletés blesseront le Boss comme à l'habitude.\n<br><br>\nVous pouvez également participer à une quête normale en même temps. Vos tâches et habiletés seront pris en compte pour les deux boss : le Boss Mondial et le Boss/Quête de collection de votre équipe.\n<br><br>\nUn Boss Mondial ne blessera jamais, vous et votre compte, de quelque manière que ce soit. Il a plutôt une Barre de colère qui se remplit lorsque les membres manquent les Quotidiennes. Si la Barre se remplit, il attaque l'un des Personnages non-joueurs du site et son image changera.\n<br><br>\nPour en savoir plus, visitez la page [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) (en anglais) du wiki.",
     "iosFaqStillNeedHelp": "Si vous avez une question qui n'est pas dans cette liste, venez la poser dans la Taverne depuis Menu > Taverne ! Nous serons heureux de vous aider.",
     "webFaqStillNeedHelp": "Si vous avez une question qui n'est pas dans cette liste, venez la poser dans la [Guilde des Nouveaux Arrivants](https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a) ! Nous serons heureux de vous aider."
 }

common/locales/fr/gear.json

@@ -592,8 +592,8 @@
     "backMystery201504Notes": "Bzzz bzzz bzzz ! Voltigez de tâche en tâche. Ne confère aucun bonus. Équipement d'Abonné d'Avril 2015",
     "backMystery201507Text": "Planche de surf excellente",
     "backMystery201507Notes": "Surfez loin du Quai Assidu et domptez les vagues de la Baie d'Inkomplet ! N'apporte aucun bonus. Équipement d'Abonné de Juillet 2015.",
-    "backMystery201510Text": "Goblin Tail",
-    "backMystery201510Notes": "Prehensile and powerful! Confers no benefit. October 2015 Subscriber Item.",
+    "backMystery201510Text": "Queue de Goblin",
+    "backMystery201510Notes": "Préhensile et puissante! Aucun bénéfice. Objet d'Abonné d'Octobre 2015.",
     "backSpecialWonderconRedText": "Cape de Puissance",
     "backSpecialWonderconRedNotes": "Bruisse avec force et élégance. N'apporte aucun bonus. Équipement de Convention en Édition Spéciale.",
     "backSpecialWonderconBlackText": "Cape de Dissimulation",
@@ -664,8 +664,8 @@
     "headAccessoryMystery201409Notes": "Cette puissante ramure change de couleur en harmonie avec celle des feuilles. N'apporte aucun bonus. Équipement d'Abonné de Septembre 2014.",
     "headAccessoryMystery201502Text": "Ailes de la Pensée",
     "headAccessoryMystery201502Notes": "Laissez votre imagination s'envoler ! N'apporte aucun bonus. Équipement d'Abonné de Février 2015.",
-    "headAccessoryMystery201510Text": "Goblin Horns",
-    "headAccessoryMystery201510Notes": "These fearsome horns are slightly slimy. Confers no benefit. October 2015 Subscriber Item.",
+    "headAccessoryMystery201510Text": "Cornes de Goblin",
+    "headAccessoryMystery201510Notes": "Terrifiantes et un peu visqueuses. N'apportent aucun bonus. Equipement d'abonné d'Octobre 2015.",
     "headAccessoryMystery301405Text": "Lunettes Frontales",
     "headAccessoryMystery301405Notes": "\"Les lunettes c'est pour les yeux,\" disaient-ils. \"Personne ne voudrait de lunettes qu'on ne peut porter que sur la tête\" disaient-ils. Ha ! Vous leur avez bien montré ! N'apporte aucun bonus. Équipement d'Abonné d'Août 3015.",
     "eyewear": "Lunettes",

common/locales/fr/generic.json

@@ -28,7 +28,7 @@
     "market": "Marché",
     "subscriberItem": "Objet mystère",
     "newSubscriberItem": "Nouvel Objet Mystère",
-    "subscriberItemText": "Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month. See the wiki's 'Mystery Item' page for more information.",
+    "subscriberItemText": "Les Abonnés recevront chaque mois un objet mystère. Celui-ci est généralement dévoilé une semaine avant la fin du mois. Consultez la page \"Mystery Item\" du wiki pour avoir plus d'information.",
     "all": "Tous",
     "none": "Aucun",
     "or": "Ou",
@@ -79,7 +79,7 @@
     "errorUpCase": "ERREUR :",
     "newPassSent": "Nouveau mot de passe envoyé.",
     "serverUnreach": "Serveur inaccessible.",
-    "requestError": "Yikes, an error occurred! <strong>Please reload the page,</strong> your last action may not have been saved correctly.",
+    "requestError": "Oups, il y a eu une erreur! <strong>Veuillez s.v.p. actualiser la page,</strong> votre dernière action peut ne pas avoir été enregistrée correctement.",
     "seeConsole": "Si l'erreur persiste, veuillez la signaler à Aide > Signaler un Bug. Si vous avez connaissance de la console de votre navigateur, veuillez inclure les messages d'erreur de celle-ci.",
     "error": "Erreur",
     "menu": "Menu",

common/locales/fr/groups.json

@@ -3,7 +3,7 @@
     "innCheckOut": "Quitter l'Auberge",
     "innCheckIn": "Se reposer à l'Auberge",
     "innText": "Vous êtes installé à l'Auberge ! Tant que vous y séjournez, vous n'êtes pas affecté par vos Quotidiennes à la fin de la journée, mais elles vont tout de même se remettre à zéro tous les jours. Attention : si vous êtes en pleine Quête contre un Boss, il pourra toujours vous blesser pour les Quotidiennes manquées par les potes de votre Equipe, sauf s'ils séjournent aussi à l'Auberge ! Et vous ne pourrez vous-même blesser le Boss (ou récolter des objets) que lorsque vous quitterez l'Auberge.",
-    "innTextBroken": "You're resting in the Inn, I guess... While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day...  If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies... unless they are also in the Inn... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn... so tired...",
+    "innTextBroken": "Vous êtes installé à l'Auberge, je suppose... Tant que vous y séjournez, vous n'êtes pas affecté par vos Quotidiennes à la fin de la journée, mais elles vont tout de même se remettre à zéro tous les jours... Si vous êtes en pleine Quête contre un Boss, il pourra toujours vous blesser pour les Quotidiennes manquées par les potes de votre Équipe... sauf s'ils séjournent aussi à l'Auberge... De plus, vous ne pourrez vous-même blesser le Boss (ou récolter des objets) que lorsque vous quitterez l'Auberge... si fatigué...",
     "lfgPosts": "Sujets de recherche de Groupe (Recherche d'Équipe)",
     "tutorial": "Tutoriel",
     "glossary": "Glossaire",
@@ -147,5 +147,5 @@
     "partyChatEmpty": "Votre discussion d'équipe est vide ! Écrivez un message dans le champ ci-dessus pour commencer la discussion.",
     "guildChatEmpty": "La discussion de cette guilde est vide ! Écrivez un message dans le champ ci-dessus pour commencer la discussion.",
     "possessiveParty": "Équipe de <%= name %>",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Communit Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "Avant de poster un message dans la Taverne, dans votre Équipe ou dans une Guilde, veuillez lire nos <%= linkStart %>Règles de Vie en Communauté<%= linkEnd %> et cliquer sur le bouton ci-dessous pour indiquer que vous les avez compris ."
 }

common/locales/fr/limited.json

@@ -30,7 +30,7 @@
     "seasonalShopText": "Bienvenue à la Boutique Saisonnière !! Nous avons actuellement reçu les nouveautés <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> du Printemps. Tout l'équipement est disponible à l'achat pendant la Fête du Printemps chaque année, mais nous ne sommes ouverts que jusqu'au 30 Avril, alors faites un stock dès maintenant, ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
     "seasonalShopSummerText": "Bienvenue à la Boutique Saisonnière !! Nous avons reçu les nouveautés <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> de l'Été. Tout l'équipement sera disponible à l'achat pendant la Fête de l'Été chaque année, mais nous ne sommes ouverts que jusqu'au 31 juillet, alors faites un stock dès maintenant ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
     "seasonalShopFallText": "Bienvenue à la Boutique Saisonnière !! Nous avons actuellement reçu les nouveautés <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> d'automne. Tout l'équipement est disponible à l'achat pendant le Festival d'Automne chaque année, mais nous ne sommes ouverts que jusqu'au 31 octobre, alors faites un stock dès maintenant, ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
-    "seasonalShopFallTextBroken": "Oh.... Welcome to the Seasonal Shop... We're stocking autumn Seasonal Edition goodies, or something... Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31... I guess you should to stock up now, or you'll have to wait... and wait... and wait... <strong>*sigh*</strong>",
+    "seasonalShopFallTextBroken": "Oh... Bienvenue à la Boutique Saisonnière... Nous avons actuellement reçu les nouveautés Édition Saisonnière d'automne, ou quelque chose du genre... Tout l'équipement est disponible à l'achat pendant le Festival d'Automne chaque année, mais nous ne sommes ouverts que jusqu'au 31 octobre... alors je suppose que vous devriez faire le stock dès maintenant, ou vous devrez attendre... et attendre... et attendre... <strong>*soupir*</strong>",
     "seasonalShopRebirth": "Si vous avez utilisé l'Orbe de Renaissance, vous pouvez racheter cet équipement dans la colonne des Récompenses. Au début, vous pourrez seulement acheter les objets associés à votre classe actuelle (Guerrier par défaut), mais n'ayez crainte, les objets spécifiques à une classe deviendront disponibles si vous choisissez cette classe.",
     "candycaneSet": "Sucre d'Orge (Mage)",
     "skiSet": "Ski-sassin (Voleur)",

common/locales/fr/messages.json

@@ -31,19 +31,25 @@
     "armoireEquipment": "<%= image %> Vous avez trouvé une pièce d'équipement rare dans l'Armoire : <%= dropText %> ! Génial !",
     "armoireFood": "<%= image %> Vous farfouillez dans l'Armoire et trouvez du/de la <%= dropArticle %><%= dropText %>. Qu'est-ce que ça fait là ?",
     "armoireExp": "Vous luttez contre l'Armoire et gagnez de l'Expérience. Prends ça !",
-    "messageInsufficientGems": "Not enough gems!",
-    "messageAuthPasswordMustMatch": ":password and :confirmPassword don't match",
-    "messageAuthCredentialsRequired": ":username, :email, :password, :confirmPassword required",
-    "messageAuthUsernameTaken": "Username already taken",
-    "messageAuthEmailTaken": "Email already taken",
-    "messageAuthNoUserFound": "No user found.",
-    "messageAuthMustBeLoggedIn": "You must be logged in.",
-    "messageAuthMustIncludeTokens": "You must include a token and uid (user id) in your request",
-    "messageGroupNotFound": "Group not found or you don't have access.",
-    "messageGroupAlreadyInParty": "Already in a party, try refreshing.",
-    "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
-    "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
-    "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
+    "messageInsufficientGems": "Pas assez de gemmes!",
+    "messageAuthPasswordMustMatch": ":password et :confirmPassword ne correspondent pas",
+    "messageAuthCredentialsRequired": ":username, :email, :password, :confirmPassword requis",
+    "messageAuthUsernameTaken": "Nom d'utilisateur déjà pris.",
+    "messageAuthEmailTaken": "E-mail déjà pris.",
+    "messageAuthNoUserFound": "Utilisateur introuvable.",
+    "messageAuthMustBeLoggedIn": "Vous devez être connecté.",
+    "messageAuthMustIncludeTokens": "Votre demande doit contenir un jeton d'API et un ID d'Utilisateur.",
+    "messageGroupNotFound": "Groupe introuvable ou vous n'y avez pas accès.",
+    "messageGroupAlreadyInParty": "Déjà dans un équipe, essayer d'actualiser.",
+    "messageGroupOnlyLeaderCanUpdate": "Seul le responsable du groupe mettre à jour le groupe!",
+    "messageGroupRequiresInvite": "Vous ne pouvez rejoindre un groupe sans invitation.",
+    "messageGroupCannotRemoveSelf": "Vous ne pouvez pas vous supprimer vous-même!",
+    "messageGroupChatBlankMessage": "You cannot send a blank message",
+    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
+    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
+    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
+    "messageGroupChatNotFound": "Message not found!",
+    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
     "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
-    "messageUserOperationNotFound": "<%= operation %> operation not found"
+    "messageUserOperationNotFound": "<%= operation %> opération introuvable"
 }

common/locales/fr/npc.json

@@ -7,18 +7,19 @@
     "daniel": "Daniel",
     "danielText": "Bienvenue à la Taverne ! Restez un moment et rencontrez les habitants. Si vous avez besoin de vous reposer (vacances ? maladie ?), je vous installerai à l'Auberge. Pendant votre séjour, vos tâches Quotidiennes ne vous infligeront pas de dommages à la fin de la journée, mais vous pourrez quand même les réaliser.",
     "danielText2": "Prenez garde : 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 manquées des membres de votre groupe ! De façon identique, vos propres dégâts au Boss (ou les objets récoltés) ne seront pas appliqués tant que vous ne quitterez pas l'Auberge.",
-    "danielTextBroken": "Welcome to the Tavern... I guess... If you need to rest, I'll set you up at the Inn... While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off... if you have the energy...",
-    "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
+    "danielTextBroken": "Bienvenue à la Taverne... je suppose... Si vous avez besoin de vous reposer, je vous installerai à l'Auberge... Pendant votre séjour, vos tâches Quotidiennes ne vous infligeront pas de dommages à la fin de la journée, mais vous pourrez quand même les réaliser... si vous en avez la force...",
+    "danielText2Broken": "Oh...: si vous êtes au milieu d'une quête contre un boss, celui-ci vous infligera tout de même des blessures si les membres de votre groupe rate des Quotidiennes! De plus, vos propres dégâts infligés au Boss (ou les objets récoltés) ne seront pas appliqués tant que vous n'aurez pas quitté l'Auberge.",
     "alexander": "Alexander le Marchand",
     "welcomeMarket": "Bienvenue au Marché ! Achetez des œufs rares et des potions ! Vendez vos surplus ! Commandez des services utiles ! Venez voir ce que nous avons à proposer.",
-    "sellForGold": "Vendre <%= item %> pour <%= gold %> Or",
-    "sellEggForGold": "Vendre un oeuf de <%= itemType %> pour <%= gold %> Or.",
-    "sellPotionForGold": "Vendre une potion <%= itemType %> pour <%= gold %> Or",
+    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
+    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
+    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "sellForGold": "Sell it for <%= gold %> Gold",
     "buyGems": "Acheter des Gemmes",
     "justin": "Justin",
     "ian": "Ian",
     "ianText": "Bienvenue à la boutique des Quêtes ! Vous pouvez utiliser des parchemins de quête pour battre des monstres avec vos amis. Soyez sûr de vérifier notre ensemble de parchemins de Quêtes à l'achat sur votre droite !",
-    "ianBrokenText": "Welcome to the Quest Shop... Here you can use Quest Scrolls to battle monsters with your friends... Be sure to check out our fine array of Quest Scrolls for purchase on the right...",
+    "ianBrokenText": "Bienvenue à la boutique des Quêtes... Ici, vous pouvez utiliser des Parchemins de quêtes pour combattre des monstres avec vos amis. Assurez-vous de regarder notre ensemble de Parchemins de quêtes en vente sur votre droite...",
     "USD": "USD",
     "newStuff": "Nouveauté",
     "cool": "Rappelez-le moi plus tard",