Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01

README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/HabitRPG/habitrpg-shared.png?branch=master)](https://travis-ci.org/HabitRPG/habitrpg-shared)
 
-## We're in the process of migraring this repository to the main HabitRPG repository, you can report any issue [here](https://github.com/HabitRPG/habitrpg).
+## We're in the process of migrating this repository to the main HabitRPG repository, you can report any issue [here](https://github.com/HabitRPG/habitrpg).
 Shared resources useful for the multiple HabitRPG repositories, that way all the repositories remain in-sync with common characteristics. Includes things like:
  * Assets - sprites, images, etc
  * CSS - especially, esp. sprite-sheet mapping

locales/cs/backgrounds.json

@@ -49,11 +49,11 @@
     "backgroundTwinklyLightsNotes": "Procházej se mezi stromy posetými svátečními světýlky",
     "backgroundSouthPoleText": "Jižní pól",
     "backgroundSouthPoleNotes": "Navštiv ledový jižní pól",
-    "backgrounds012015": "SET 8: Released January 2015",
-    "backgroundIceCaveText": "Ice Cave",
-    "backgroundIceCaveNotes": "Descend into an Ice Cave.",
-    "backgroundFrigidPeakText": "Frigid Peak",
-    "backgroundFrigidPeakNotes": "Summit a Frigid Peak.",
-    "backgroundSnowyPinesText": "Snowy Pines",
-    "backgroundSnowyPinesNotes": "Shelter amid Snowy Pines."
+    "backgrounds012015": "SET 8: Vydán v lednu 2015",
+    "backgroundIceCaveText": "Ledová jeskyně",
+    "backgroundIceCaveNotes": "Sestup do ledové jeskyně.",
+    "backgroundFrigidPeakText": "Mrazivý vrch",
+    "backgroundFrigidPeakNotes": "Vrchol mrazivého vrchu",
+    "backgroundSnowyPinesText": "Zasněžené jedle",
+    "backgroundSnowyPinesNotes": "Přístřeší mezi zasněženými jedlemi"
 }

locales/cs/content.json

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

locales/cs/gear.json

@@ -338,8 +338,8 @@
     "headMystery301404Notes": "Fešný cylindr pro ty největší džentlmeny.  Předmět pro předplatitele leden 2015. Nepřináší žádný benefit.",
     "headMystery301405Text": "Obyčejný cylindr",
     "headMystery301405Notes": "Obyčejný cylindr, který si přímo žádá o doplnění nějakým fešáckým ohozem. Nepřináší žádný benefit.  Předmět pro předplatitele květen 3015.",
-    "offhand": "shield-hand item",
-    "shieldBase0Text": "No Shield-Hand Equipment",
+    "offhand": "štít v ruce",
+    "shieldBase0Text": "Bez štítu v ruce",
     "shieldBase0Notes": "Bez štítu nebo druhé zbraně.",
     "shieldWarrior1Text": "Dřevěný štít",
     "shieldWarrior1Notes": "Kulatý štít z tlustého dřeva. Zvyšuje Obranu o <%= con %>.",

locales/cs/generic.json

@@ -85,5 +85,7 @@
     "October": "Říjen",
     "November": "Listopad",
     "December": "Prosinec",
-    "dateFormat": "Formát data"
+    "dateFormat": "Formát data",
+    "achievementStressbeast": "Savior of Stoïkalm",
+    "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2015 Winter Wonderland Event!"
 }

locales/cs/npc.json

@@ -27,7 +27,7 @@
     "card": "Kartou",
     "paymentMethods": "Platební metody:",
     "welcomeHabit": "Vítej v HabitRPG",
-    "welcomeHabitT1": "Vítej v HabitRPG, aplikaci, kde sleduješ své zvyky a získáváš body za úkoly jako ve hře. Já jsem",
+    "welcomeHabitT1": "Welcome to HabitRPG, a habit tracker that treats your tasks like a Role Playing Game. I'm",
     "welcomeHabitT2": ", tvůj průvodce!",
     "yourAvatar": "Tvá postava",
     "yourAvatarText": "Tohle je tvá postava. Reprezentuje Tě ve světě Habitika. Za plnění úkolů bude postupovat do vyšších úrovní, získávat zlaťáky a vybavení potřebné v dalších dobrodružstvích, které leží před tebou.",

locales/cs/pets.json

@@ -13,6 +13,7 @@
     "cerberusPup": "Štěně Kerbera",
     "hydra": "Hydra",
     "mantisShrimp": "Strašek paví",
+    "mammoth": "Woolly Mammoth",
     "rarePetPop1": "Klikni na zlatou packu pro více informací o tom, jak získat toto vzácné zvíře za přispívání HabitRPG!",
     "rarePetPop2": "Jak získat toto zvíře!",
     "potion": "<%= potionType %> lektvar",

locales/cs/questscontent.json

@@ -93,7 +93,7 @@
     "questGoldenknight3Boss": "Železný rytíř",
     "questGoldenknight3DropHoney": "Med (jídlo)",
     "questGoldenknight3DropGoldenPotion": "Zlatý líhnoucí lektvar",
-    "questGoldenknight3DropWeapon": "Mustaine's Milestone Mashing Morning Star (Shield-hand Weapon)",
+    "questGoldenknight3DropWeapon": "Řemdih milníku Mustaine rmutování (kryjící zbraň)",
     "questBasilistText": "Bazi-lístek",
     "questBasilistNotes": "Na tržišti se něco děje - něco, kvůli čemu bys měl utíkat. Ale protože jsi odvážný dobrodruh, vydáš se tomu naproti a objevíš bazi-lístka plazícího se z kupy nesplněných úkolů! Přihlížející Habiťané jsou paralyzováni strachem z bazi-lístkovy délky a nemohou začít pracovat. Nedaleko slyšíš @Arcosine  křičet \"Rychle! Splňte své úkoly a denní úkoly abyste přemohly to stvoření než někoho pořeže papír!\" Zasaď úder rychle, dobrodruhu, a splň něco - avšak pozor! Pokus nesplníš nějaké denní úkoly, Bazi-lístek zaútočí na tvou družinu!",
     "questBasilistCompletion": "Bazi-lístek se rozpadl ve změť papírů, které se ve vzduchu blýskají jako duha. \"Ufff!\" říká @Arcosine. \"Dobře, že jste tu byli!\" Nabytí zkušenostmi posbíráte popadané zlato mezi papíry.",
@@ -141,5 +141,29 @@
     "questPenguinNotes": "I když je v nejjižnějším cípu Habitiky horký letní den, na Živé jezero padl nebývalý chlad. Silný, mrazivý vítr hučí všude kolem a pobřeží začíná zamrzat. Ledové bodce vyráží ze země a přitom rvou trávu z kořenů. @Melynnrose a @Breadstrings k tobě běží. <br><br> \"Pomoc!\" říká @Melynnrose. \"Přivedli jsme sem obřího tučňáka, aby zmrazil jezero a my na něm mohli bruslit, jenže nám došly ryby, kterými jsme ho krmili!\"<br><br>\"Naštval se a dýchá svým ledovým dechem na vše, co vidí!\" říká @Breadstrings. \"Prosím, musíš ho umírnit než nás všechny pokryje ledem!\" Vypadá to, že budeš muset tohohle tučňáka... <em>dát k ledu.</em>",
     "questPenguinCompletion": "Když tučňáka porazíš, led roztaje. Tučňák se usadí na sluníčku a srká z kyblík plného ryb, který jste našli. Foukajíc před sebe jemný třpytivý led odbruslí přes jezero. Jaký to divní pták! \"Zdá se, že tu za sebou nechal pár vajec,\" říká @Painter de Cluster. <br><br>@Rattify se směje \"Možná budou tihle tučňáčci trochu... chladnější?\"",
     "questPenguinBoss": "Mrazivý tučňák",
-    "questPenguinDropPenguinEgg": "Tučňák (vejce)"
+    "questPenguinDropPenguinEgg": "Tučňák (vejce)",
+    "questStressbeastText": "The Abominable Stressbeast of the Stoïkalm Steppes",
+    "questStressbeastNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.<br><br>~*~<br><br>The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.<br><br>We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.<br><br>\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"<br><br>\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.<br><br>\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"<br><br>There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...",
+    "questStressbeastBoss": "The Abominable Stressbeast",
+    "questStressbeastBossRageTitle": "Stress Strike",
+    "questStressbeastBossRageDescription": "When this gauge fills, the Abominable Stressbeast will unleash its Stress Strike on Habitica!",
+    "questStressbeastDropMammothPet": "Mammoth (Pet)",
+    "questStressbeastDropMammothMount": "Mammoth (Mount)",
+    "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!",
+    "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!",
+    "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!",
+    "questStressbeastCompletion": "<strong>The Abominable Stressbeast is DEFEATED!</strong><br><br>We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!<br><br><strong>Stoïkalm is Saved!</strong><br><br>SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.<br><br>\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"<br><br>She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
+    "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"",
+    "questTRexText": "King of the Dinosaurs",
+    "questTRexNotes": "Now that ancient creatures from the Stoïkalm Steppes are roaming throughout all of Habitica, @Urse has decided to adopt a full-grown Tyrannosaur. What could go wrong?<br><br>Everything.",
+    "questTRexCompletion": "The wild dinosaur finally stops its rampage and settles down to make friends with the giant roosters. @Urse beams down at it. \"They're not such terrible pets, after all! They just need a little discipline. Here, take some Tyrannosaur eggs for yourself.\"",
+    "questTRexBoss": "Flesh Tyrannosaur",
+    "questTRexUndeadText": "The Dinosaur Unearthed",
+    "questTRexUndeadNotes": "As the ancient dinosaurs from the Stoïkalm Steppes roam through Habit City, a cry of terror emanates from the Grand Museum. @Baconsaur shouts, \"The Tyrannosaur skeleton in the museum is stirring! It must have sensed its kin!\" The bony beast bares its teeth and clatters towards you. How can you defeat a creature that is already dead? You'll have to strike fast before it heals itself!",
+    "questTRexUndeadCompletion": "The Tyrannosaur's glowing eyes grow dark, and it settles back onto its familiar pedestal. Everyone sighs with relief. \"Look!\" @Baconsaur says. \"Some of the fossilized eggs are shiny and new! Maybe they'll hatch for you.\"",
+    "questTRexUndeadBoss": "Skeletal Tyrannosaur",
+    "questTRexUndeadRageTitle": "Skeleton Healing",
+    "questTRexUndeadRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Skeletal Tyrannosaur will heal 30% of its remaining health!",
+    "questTRexUndeadRageEffect": "`Skeletal Tyrannosaur uses SKELETON HEALING!`\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!",
+    "questTRexDropTRexEgg": "Tyrannosaur (Egg)"
 }

locales/cs/subscriber.json

@@ -8,7 +8,7 @@
     "disableAds": "Zablokuj reklamy",
     "disableAdsText": "Reklamy zůstanou vypnuté, dokud je předplatné aktivní. (pro uživatele kteří si reklamy odstranili v dřívější akci to neplatí)",
     "buyGemsGold": "Kup drahokamy za zlato",
-    "buyGemsGoldText": "(1 drahokam stojí <%= gemCost %> zlaťáků) Řeší obavu o \"zaplacení výhry\", jelikož vše lze nyní získat tvrdou prací. Existuje měsíční limit převodu <%= gemLimit %> drahokamů, kvůli omezení farmingu.",
+    "buyGemsGoldText": "(1 Gem costs <%= gemCost %> Gold) Addresses the \"pay to win\" concern, as everything is now achievable through hard work. There's a <%= gemLimit %> Gem monthly conversion cap to prevent farming.",
     "retainHistory": "Ponech si veškeré položky historie",
     "retainHistoryText": "Tvá plná historie bude k dispozici v grafu a pro export. Ostatním uživatelům se historie kvůli optimalizaci databáze slučuje.",
     "doubleDrops": "Denně získáš dvakrát více předmětů",

locales/da/backgrounds.json

@@ -49,11 +49,11 @@
     "backgroundTwinklyLightsNotes": "Spadser mellem træer pyntet med festlige lys.",
     "backgroundSouthPoleText": "Sydpolen",
     "backgroundSouthPoleNotes": "Besøg den kolde Sydpol.",
-    "backgrounds012015": "SET 8: Released January 2015",
-    "backgroundIceCaveText": "Ice Cave",
-    "backgroundIceCaveNotes": "Descend into an Ice Cave.",
-    "backgroundFrigidPeakText": "Frigid Peak",
-    "backgroundFrigidPeakNotes": "Summit a Frigid Peak.",
-    "backgroundSnowyPinesText": "Snowy Pines",
-    "backgroundSnowyPinesNotes": "Shelter amid Snowy Pines."
+    "backgrounds012015": "SÆT 8: Udgivet Januar 2015",
+    "backgroundIceCaveText": "Isgrotte",
+    "backgroundIceCaveNotes": "Bevæg dig ind i en Isgrotte.",
+    "backgroundFrigidPeakText": "Iskold Bjergtop",
+    "backgroundFrigidPeakNotes": "Kom til tops på en Iskold Bjergtop.",
+    "backgroundSnowyPinesText": "Tilsneede Grantræer",
+    "backgroundSnowyPinesNotes": "Find læ mellem Tilsneede Grantræer."
 }

locales/da/character.json

@@ -94,7 +94,7 @@
     "changeClass": "Skift klasse, Refunder attributpoint",
     "levelPopover": "Hvert niveau giver dig et point du kan tildele en attribut efter eget valg. Du kan gøre det manuelt, eller lade spillet bestemme for dig ved hjælp af en af de automatiske tildelingsmuligheder.",
     "unallocated": "Ufordelte attributpoint",
-    "haveUnallocated": "Du har <%= points %> ubrugte attributpoint",
+    "haveUnallocated": "Du har <%= points %> ubrugt(e) attributpoint",
     "autoAllocation": "Automatisk tildeling",
     "autoAllocationPop": "Tildel point til dine attributter i forhold til dine ønsker, når du går et niveau op. ",
     "evenAllocation": "Fordel attributpoint jævnt",
@@ -129,5 +129,5 @@
     "youCast": "Du kaster <%= spell %>.",
     "youCastTarget": "Du kaster <%= spell %> på <%= target %>.",
     "youCastParty": "Du kaster <%= spell %> for hele selskabet.",
-    "critBonus": "Fuldtræffer! Bonus:"
+    "critBonus": "Fuldtræffer! Bonus: "
 }

locales/da/content.json

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

locales/da/contrib.json

@@ -28,12 +28,12 @@
     "helped": "Hjalp Habit med at vokse",
     "helpedText1": "Hjalp HabitRPG med at vokse ved at udfylde",
     "helpedText2": "dette spørgeskema",
-    "hall": "Sal",
+    "hall": "Sale",
     "contribTitle": "Bidragsydertitel (fx, \"Grovsmed\")",
     "contribLevel": "Bidragstrin",
     "contribHallText": "1-7 for normale bidragsydere, 8 for moderatorer, 9 for ansatte. Dette har betydning for, hvilke varer, kæledyr og ridedyr, der er tilgængelige. Bestemmer også navne-farve. Trin 8 og 9 får automatisk administratorstatus.",
-    "hallHeroes": "Heltenes sal",
-    "hallPatrons": "Protektorernes sal",
+    "hallHeroes": "Heltenes Sal",
+    "hallPatrons": "Protektorernes Sal",
     "rewardUser": "Beløn bruger",
     "UUID": "Unikt Bruger-ID",
     "loadUser": "Indlæs bruger",