Merge branch 'develop' into fixes-issue-5183

Gruntfile.js

@@ -57,25 +57,6 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
-    git_changelog: {
-        minimal: {
-            options: {
-                repo_url: 'https://github.com/habitrpg/habitrpg',
-                appName : 'HabitRPG',
-                branch_name: 'develop'
-            }
-        },
-        extended: {
-            options: {
-                file: 'EXTENDEDCHANGELOG.md',
-                repo_url: 'https://github.com/habitrpg/habitrpg',
-                appName : 'HabitRPG',
-                branch_name: 'develop',
-                grep_commits: '^perf|^style|^fix|^feat|^docs|^refactor|^chore|BREAKING'
-            }
-        }
-    },
-
     karma: {
       unit: {
         configFile: 'karma.conf.js'
@@ -271,6 +252,5 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-spritesmith');
   grunt.loadNpmTasks('grunt-hashres');
   grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('git-changelog');
 
 };

archive/CHANGELOG_ARCHIVED.md

@@ -1,9 +1,11 @@
 <a name="">My app - Changelog</a>
-#  (2015-05-02)
+#  (2015-05-08)
 
 
 ## Bug Fixes
 
+- **Spring:** WHO IS LESLIE
+  ([6685e935](watch/commits/6685e93554a1274dedb55dae054e787fb80eb440))
 - **invite-friends:** text should be valid for both parties and guilds
   ([54e82a14](watch/commits/54e82a14a252c3b9923449a7ef7cee6033a5d160))
 - **mystery:** It's 2015 now, Sabe
@@ -16,6 +18,8 @@
 
 ## Features
 
+- **Spring:** Flung
+  ([d50d4ad8](watch/commits/d50d4ad8bb0f89e39ceb6562e0f8f392f94b5444))
 - **emails:** add support for weekly recap emails
   ([37f7db3c](watch/commits/37f7db3c4e3859d03fd55a44e63819e273a06442))
 - **i18n:** upload japanese, serbian and chinese (taiwan)

common/locales/cs/backgrounds.json

@@ -76,5 +76,12 @@
     "backgroundFloralMeadowText": "Rozkvetlá louka",
     "backgroundFloralMeadowNotes": "Piknik na rozkvetlé louce",
     "backgroundGumdropLandText": "Gumídková země",
-    "backgroundGumdropLandNotes": "Kousek scenérie z gumídkové země"
+    "backgroundGumdropLandNotes": "Kousek scenérie z gumídkové země",
+    "backgrounds052015": "SET 12: Released May 2015",
+    "backgroundMarbleTempleText": "Marble Temple",
+    "backgroundMarbleTempleNotes": "Pose in front of a Marble Temple.",
+    "backgroundMountainLakeText": "Mountain Lake",
+    "backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
+    "backgroundPagodasText": "Pagodas",
+    "backgroundPagodasNotes": "Climb to the top of Pagodas."
 }

common/locales/cs/communityguidelines.json

@@ -173,5 +173,6 @@
     "commGuideLink07": "Art Trello",
     "commGuideLink07description": "na posílání pixel art.",
     "commGuideLink08": "Trello Výprav",
-    "commGuideLink08description": "pro posílání napsaných výprav."
+    "commGuideLink08description": "pro posílání napsaných výprav.",
+    "lastUpdated": "Last updated"
 }

common/locales/cs/content.json

@@ -54,7 +54,7 @@
     "questEggRockAdjective": "živý",
     "questEggBunnyText": "Králíček",
     "questEggBunnyAdjective": "přítulný",
-    "questEggSlimeText": "Marshmallow sliz",
+    "questEggSlimeText": "Marshmallow želé",
     "questEggSlimeAdjective": "sladký",
     "eggNotes": "Najdi líhnoucí lektvar, nalij ho na vejce a to se vylíhne v  <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Základní",

common/locales/cs/front.json

@@ -2,22 +2,22 @@
     "FAQ": "FAQ",
     "accept1Terms": "Kliknutím na následující tlačítko souhlasím s",
     "accept2Terms": "a",
-    "alexandraQuote": "Couldn't NOT talk about HabitRPG during my speech in Madrid. Must-have tool for freelancers who still need a boss.",
-    "althaireQuote": "Having a quest constantly on really motivates me to do all my dailies and do all my to-dos. My biggest motivation is not letting my party down.",
-    "andeeliaoQuote": "Awesome product, just started a few days ago and already more conscious and productive with my time!",
-    "autumnesquirrelQuote": "I'm procrastinating less on work and housework and pay bills on time.",
-    "businessSample1": "Confirm 1 page of Inventory",
-    "businessSample2": "20 mins Filing",
-    "businessSample3": "Sort and Process Inbox",
-    "businessSample4": "Prepare 1 Document for Client",
-    "businessSample5": "Call Clients/Put Off Phone Calls",
-    "businessText": "Use HabitRPG at your business",
-    "choreSample1": "Put Dirty Clothes in Hamper",
-    "choreSample2": "20 mins of Housework",
-    "choreSample3": "Wash a Load of Dishes",
-    "choreSample4": "Tidy One Room",
-    "choreSample5": "Wash and Dry a Load of Clothes",
-    "chores": "Chores",
+    "alexandraQuote": "Nemohla jsem o HabitRPG nemluvit při svém proslovu v Madridu. Nástroj, který musí mít každý živnostník, který by potřeboval nějakého šéfa nad sebou.",
+    "althaireQuote": "Být neustále na nějaké výpravě mě hodně motivuje plnit denní úkoly a úkoly v úkolníčku. Mou největší motivací je nenechat mou družinu ve štychu.",
+    "andeeliaoQuote": "Úžasný produkt, začala jsem teprve před pár dny  a již si více hlídám čas a jsem mnohem produktivnější!",
+    "autumnesquirrelQuote": "Už se tolik neflákám jak v práci, tak doma, a platím účty včas.",
+    "businessSample1": "Potvrď 1 stranu Inventáře",
+    "businessSample2": "20 minut archivace",
+    "businessSample3": "Seřadit a zpracovat příchozí poštu",
+    "businessSample4": "Připravit 1 dokument pro klienta",
+    "businessSample5": "Zavolat klientům/Odložit telefonáty",
+    "businessText": "Používejte HabitRPG při podnikání",
+    "choreSample1": "Dát špinavé prádlo do koše",
+    "choreSample2": "20 minut domácích prací",
+    "choreSample3": "Umýt nádobí",
+    "choreSample4": "Uklidit jeden pokoj",
+    "choreSample5": "Vyprat a usušit várku prádla",
+    "chores": "Domácí práce",
     "communityBug": "Nahlásit chybu",
     "communityExtensions": "Dodatky a rozšíření",
     "communityFacebook": "Facebook",
@@ -32,50 +32,50 @@
     "companyPrivacy": "Soukromí",
     "companyTerms": "Podmínky",
     "companyVideos": "Videa",
-    "contribUse": "HabitRPG contributors use",
-    "dragonsilverQuote": "I can't tell you how many time and task tracking systems I've tried over the decades... HRPG is the only thing I've used that actually helps me get things done rather than just list them.",
-    "dreimQuote": "When I discovered HabitRPG last summer, I had just failed about half of my exams. Thanks to the Dailies… I was able to organize and discipline myself, and I actually passed all my exams with really good grades a month ago.",
-    "elmiQuote": "Every morning I'm looking forward to getting up so I can earn some gold!",
+    "contribUse": "Přispěvatelé HabitRPG používají",
+    "dragonsilverQuote": "Ani už nedokážu vyjmenovat všechny aplikace na sledování úkolů a management času, které jsem v minulosti vyzkoušel... HRPG je jediný, který mi opravdu pomohl něco udělat a ne jen si věci vypsat.",
+    "dreimQuote": "Když jsem minulé léto objevila HabitRPG, neudělala jsem asi polovinu zkoušek. Ale díky denním úkolů jsem byla schopná zorganizovat si svůj čas a srovnat se do latě. A nakonec jsem udělala všechny zkoušky minulý měsíc na velice dobré známky.",
+    "elmiQuote": "Každý den se těším, až vstanu a získám další zlato!",
     "email": "Email",
     "emailNewPass": "Poslat nové heslo na email",
-    "evagantzQuote": "My very first dentist appointment where the hygienist was actually excited about my flossing habits. Thanks Habitrpg!",
-    "examplesHeading": "Players use HabitRPG to manage...",
-    "featureAchievementByline": "Do something totally awesome? Get a badge and show it off!",
-    "featureAchievementHeading": "Achievement Badges",
-    "featureEquipByline": "Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!",
-    "featureEquipHeading": "Equipment and extras",
-    "featurePetByline": "Eggs and items drop when you complete your tasks. Be as productive as possible to collect pets and mounts!",
-    "featurePetHeading": "Pets and Mounts",
-    "featureSocialByline": "Join common-interest groups with like-minded people. Create Challenges to compete against other users.",
-    "featureSocialHeading": "Social play",
-    "featuredIn": "Featured in",
-    "featuresHeading": "We also feature...",
+    "evagantzQuote": "První kontrola u zubaře, který byl poprvé spokojen s mými čistícími návyky. Děkuju, HabiRPG!",
+    "examplesHeading": "Hráči používají HabitRPG ke zvládnutí...",
+    "featureAchievementByline": "Děláš něco úžasného? Získej odznak a všem ho ukaž!",
+    "featureAchievementHeading": "Odznaky za úspěchy",
+    "featureEquipByline": "Kup si limitované edice výzbroje, lektvary, a další virtuální zboží na našem Trhu za odměny za úkoly!",
+    "featureEquipHeading": "Vybavení a další",
+    "featurePetByline": "Vejce a předměty nacházíš po splnění úkolů. Buď tak produktivní, jak jen dokážeš, a nasbírej mazlíčky a zvířata!",
+    "featurePetHeading": "Mazlíčci a zvířata",
+    "featureSocialByline": "Přidej se ke skupinám se stejnými zájmy a stejně smýšlejícími lidmi. Vytvářej Výzvy a soutěž s dalšími uživateli.",
+    "featureSocialHeading": "Sociální hra",
+    "featuredIn": "Zmíněno v",
+    "featuresHeading": "Také tu máme...",
     "footerCommunity": "Komunita",
     "footerCompany": "Společnost",
     "footerMobile": "Mobilní aplikace",
     "footerSocial": "Komunita",
-    "forgotPass": "Zapoměl jsem heslo",
-    "frabjabulousQuote": "HabitRPG is the reason I got a killer, high-paying job... and even more miraculous, I'm now a daily flosser!",
-    "free": "Play for free",
-    "gamifyButton": "Gamify your life today!",
-    "goalSample1": "Practice Piano for 1 Hour",
-    "goalSample2": "Work on article for publication",
-    "goalSample3": "Work on blog post",
-    "goalSample4": "Japanese lesson on Duolingo",
-    "goalSample5": "Read an Informative Article",
-    "goals": "Goals",
-    "health": "Health",
-    "healthSample1": "Drink Water/Soda",
-    "healthSample2": "Chew Gum/Smoke",
-    "healthSample3": "Take Stairs/Elevator",
-    "healthSample4": "Eat Healthy/Junk Food",
-    "healthSample5": "Break a Sweat for 1 hr",
+    "forgotPass": "Zapomněl jsem heslo",
+    "frabjabulousQuote": "Díky HabitRPG jsem dostala naprosto suprovou práci... A co víc, každý den používám zubní nit!",
+    "free": "Hraj zdarma",
+    "gamifyButton": "Ať je život hrou již dnes!",
+    "goalSample1": "Cvičit na piáno 1 hodinu",
+    "goalSample2": "Pracovat na článku na publikaci",
+    "goalSample3": "Pracovat na příspěvku na blogu",
+    "goalSample4": "Lekce japonštiny na Duolingo",
+    "goalSample5": "Přečíst si naučný článek",
+    "goals": "Cíle",
+    "health": "Zdraví",
+    "healthSample1": "Vypít vodu/limonádu",
+    "healthSample2": "Vzít si žvýkačku/Zapálit si",
+    "healthSample3": "Jít po schodech/Jet výtahem",
+    "healthSample4": "Jíst zdravě/nezdravě",
+    "healthSample5": "Zapotit se na 1 hodinu",
     "history": "Historie",
-    "infhQuote": "HabitRPG has really helped me impart structure to my life in graduate school.",
+    "infhQuote": "HabitRPG mi opravdu pomohlo dát mému životu nějakou strukturu.",
     "invalidEmail": "Aby mohlo proběhnout resetování hesla, musí být zadán platný email.",
-    "irishfeet123Quote": "I've had horrible habits with clearing my place completely after meals and leaving cups all over the place. HabitRPG has cured that!",
-    "joinOthers": "Join 200,000 people making it fun to achieve goals!",
-    "kazuiQuote": "Before HabitRPG, I was stuck with my thesis, as well as dissatisfied with my personal discipline regarding housework and things like learning vocabulary and studying Go theory.  It turns out breaking down these tasks into smaller manageable checklists is quite the thing to keep me motivated and constantly working.",
+    "irishfeet123Quote": "Měla jsem problém s úklidem. Nechávala jsem všude nádobí a skleničky. HabitRPG mi pomohlo!",
+    "joinOthers": "Přidej se k 200 000 lidí, kteří se již baví při dosahování svých cílů!",
+    "kazuiQuote": "Před HabitRPG jsem se zasekla s diplomkou a byla jsem nespokojena se svou disciplínou ohledně domácích prací a věcí jako učením se slovíček. Ukázalo se, že když si tyhle cíle rozdělím na menší, je mnohem snazší se motivovat a neustále pracovat.",
     "landingadminlink": "administrační balíčky",
     "landingend": "Stále nejsi přesvědčen?",
     "landingend2": "Podívej se na detailnější seznam",
@@ -89,7 +89,7 @@
     "landingp3header": "Následky",
     "landingp4": "Aktivní komunita, kterou HabitRPG poskytuje, ti dává odpovědnost, kterou potřebuješ k vytrvání v úkolech. Díky systému družin se můžeš nechat motivovat svými přáteli. Systém cechů ti umožní najít lidi s podobnými zájmy nebo problémy, takže budeš moci sdílet své cíle a rady jak překonávat překážky. Právě komunita na HabitRPG zajišťuje podporu a odpovědnost, kterou potřebuješ k úspěchu. ",
     "landingp4header": "Odpovědnost",
-    "leadText": "HabitRPG is a free habit building and productivity app that treats your real life like a game. With in-game rewards and punishments to motivate you and a strong social network to inspire you, HabitRPG can help you achieve your goals to become healthy, hard-working, and happy.",
+    "leadText": "HabitRPG je aplikace na vytváření zvyků a udržení produktivity, která ti z reálného života udělá hru. Díky odměnám a trestům budeš motivován, a silná sociální síť tě bude inspirovat. HabitRPG ti pomůže dosáhnout tvých cílů, a´t už chceš být zdravý, pilný, nebo šťastný.",
     "login": "Přihlásit",
     "loginAndReg": "Přihlásit / Registrovat",
     "loginFacebookAlt": "Přihlásit / Registrovat pomocí Facebooku",
@@ -119,56 +119,58 @@
     "marketing4Lead3Title": "Proměň vše ve hru",
     "mobileAndroid": "Android",
     "mobileIOS": "iOS",
-    "motivate": "Motivate yourself and your team!",
+    "motivate": "Motivuj sebe a svůj tým!",
+    "motivate1": "Motivuj se k nemožnému.",
+    "motivate2": "Zorganizuj se. Motivuj se. Sbírej zlato.",
     "passConfirm": "Potvrdit heslo",
     "passMan": "Pokud používáš správce hesel ( jako 1Password) a máš problémy se přihlásit, zkus napsat uživatelské jméno a heslo ručně.",
     "password": "Heslo",
     "playButton": "Hraj",
-    "playButtonFull": "Play HabitRPG",
+    "playButtonFull": "Hraj HabitRPG",
     "presskit": "Pro novináře",
     "presskitDownload": "Stáhnout všechny obrázky:",
     "presskitText": "Děkujeme za zájem o HabitRPG! Následující obrázky mohou být použity pro články nebo videa o HabitRPG. pro více informací, prosíme, kontaktujte Sienu Leslie na leslie@habitrpg.com.",
     "privacy": "Ochranou soukromí",
     "psst": "Psst",
-    "punishByline": "Break bad habits and procrastination cycles with immediate consequences.",
-    "punishHeading1": "Miss a daily goal?",
-    "punishHeading2": "Lose health!",
-    "questByline1": "Playing with your friends keeps you accountable for your tasks.",
-    "questByline2": "Issue each other Challenges to complete a goal together!",
-    "questHeading1": "Battle monsters with your friends!",
-    "questHeading2": "If you slack off, they all get hurt!",
+    "punishByline": "Zlom zlozvyky a skonči s flákáním díky okamžitým následkům.",
+    "punishHeading1": "Nesplnil jsi denní cíl?",
+    "punishHeading2": "Ztratíš zdraví!",
+    "questByline1": "Hraní s přáteli tě činí odpovědným za tvé úkoly.",
+    "questByline2": "Zadávejte si navzájem Výzvy a dosáhněte cílů společně!",
+    "questHeading1": "Bojuj s přáteli proti příšerám!",
+    "questHeading2": "Když se budeš flákat, odnesou to všichni!",
     "register": "Registrovat",
-    "rewardByline1": "Spend gold on virtual and real-life rewards.",
-    "rewardByline2": "Instant rewards keep you motivated!",
-    "rewardHeading": "Complete a task to earn gold!",
-    "sampleDailies": "Sample Dailies",
-    "sampleHabits": "Sample Habits",
-    "sampleToDo": "Sample To-Dos",
-    "school": "School",
-    "schoolSample1": "Finish 1 Assignment",
-    "schoolSample2": "Study 1 hour",
-    "schoolSample3": "Meet with Study Group",
-    "schoolSample4": "Notes for 1 Chapter",
-    "schoolSample5": "Read 1 Chapter",
-    "sixteenBitFilQuote": "I'm getting my jobs and tasks done in record time thanks to HabitRPG. I'm just always so eager to reach my next level-up!",
-    "skysailorQuote": "My party and our quests keep me engaged in the game, which keeps me motivated to get things done and change my life in positive ways",
+    "rewardByline1": "Utrácej zlato za virtuální i reálné odměny.",
+    "rewardByline2": "Okamžité odměny tě budou motivovat!",
+    "rewardHeading": "Splň úkol a získej za to zlato!",
+    "sampleDailies": "Příklad denních úkolů",
+    "sampleHabits": "Příklad zvyků",
+    "sampleToDo": "Příklad úkolů v úkolníčku",
+    "school": "Škola",
+    "schoolSample1": "Dokončit 1 úlohu",
+    "schoolSample2": "Studovat 1 hodinu",
+    "schoolSample3": "Sejít se se studijní skupinou",
+    "schoolSample4": "Poznámky k 1 kapitole",
+    "schoolSample5": "Přečíst 1 kapitolu",
+    "sixteenBitFilQuote": "Plním své úkoly v rekordním čase díky HabitRPG. Vždycky se hrozně těším, až dosáhnu další úrovně!",
+    "skysailorQuote": "Moje družina a naše výpravy mě drží stále ve hře, což mě motivuje plnit své závazky a měnit tak svůj život k lepšímu.",
     "socialTitle": "HabitRPG - Ať je život hrou",
-    "supermouse35Quote": "I'm exercising more and I haven't forgotten to take my meds for months! Thanks, Habit. :D",
+    "supermouse35Quote": "Víc cvičím a už měsíc jsem si nezapomněla vzít léky! Díky, Habit :D",
     "sync": "Synchronizovat",
     "tasks": "Úkoly",
-    "teamSample1": "Outline Meeting Itinerary for Tuesday",
-    "teamSample2": "Brainstorm Growth Hacking",
-    "teamSample3": "Discuss this week’s KPIs",
-    "teams": "Teams",
+    "teamSample1": "Načrtnout itinerář meetingu na úterý",
+    "teamSample2": "Brainstorming ohledně hacknutí růstu",
+    "teamSample3": "Prodiskutovat KPI na tento týden",
+    "teams": "Týmy",
     "terms": "Podmínkami",
-    "testimonialHeading": "What people say...",
+    "testimonialHeading": "Co o nás říkají...",
     "tutorials": "Průvodci",
-    "unlockByline1": "Achieve your goals and level up.",
-    "unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!",
-    "unlockHeadline": "As you stay productive, you unlock new content!",
+    "unlockByline1": "Dosáhni svých cílů a postup na vyšší úroveň.",
+    "unlockByline2": "Odemkni novou motivaci, jako je sbírání mazlíčků, náhodné odměny, sesílání kouzel a mnohem víc!",
+    "unlockHeadline": "Čím jsi produktivnější, tím více obsahu odemkneš!",
     "useUUID": "Použij UUID / API Token (pro uživatele Facebooku) ",
     "username": "Uživatelské jméno",
     "watchVideos": "Podívej se na videa",
-    "work": "Work",
-    "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+    "work": "Práce",
+    "zelahQuote": "HabitRPG mi pomáhá rozhodnout se, jestli jít do postele a získat za to body, nebo zůstat vzhůru a přijít o zdraví!"
 }

common/locales/cs/groups.json

@@ -96,5 +96,10 @@
     "abuseReported": "Děkujeme za nahlášení tohoto příspěvku. Moderátoři byli upozorněni.",
     "abuseAlreadyReported": "Již jsi tento příspěvek nahlásil.",
     "needsText": "Prosím, napiš zprávu.",
-    "needsTextPlaceholder": "Napiš svou zprávu sem."
+    "needsTextPlaceholder": "Napiš svou zprávu sem.",
+    "copyMessageAsToDo": "Copy message as To-Do",
+    "messageAddedAsToDo": "Message copied as To-Do.",
+    "messageWroteIn": "<%= user %> wrote in <%= group %>",
+    "msgPreviewHeading": "Message Preview",
+    "leaderOnlyChallenges": "Only group leader can create challenges"
 }

common/locales/cs/messages.json

@@ -17,7 +17,7 @@
     "messageHatched": "Tvé vejce se vylíhlo! Navštiv svou stáj, abys svého mazlíčka mohl vybavit.",
     "messageNotEnoughGold": "Nedostatek zlaťáků",
     "messageTwoHandled": "<%= gearText %> je dvouruční.",
-    "messageDropFood": "Našel jsi <%= dropArticle %><%= dropText %>! <%= dropNotes %>",
+    "messageDropFood": "Copak to je? A hele, <%= dropArticle %><%= dropText %>! <%= dropNotes %>",
     "messageDropEgg": "Našel jsi vejce, ze kterého se vylíhne <%= dropText %> ! <%= dropNotes %>",
     "messageDropPotion": "Našel jsi <%= dropText %> líhnoucí lektvar! <%= dropNotes %>",
     "messageFoundQuest": "Našel jsi výpravu \"<%= questText %>\"!"

common/locales/cs/npc.json

@@ -5,8 +5,8 @@
     "mattShall": "<%= name %>, cítíš se na projížďku? Klikni na zvíře, které si chceš osedlat. ",
     "mattBochText1": "Vítej u mazlíčků! Jsem Matt, pán šelem. Zvol si mazlíčka, který tě bude doprovázet po tvém boku. Krm je a oni vyrostou v silná zvířata.",
     "daniel": "Daniel",
-    "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
-    "danielText2": "Be warned: 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.",
+    "danielText": "Vítej v krčmě! Chvilku se zdrž a poznej místní. Pokud si potřebuješ odpočinout (jedeš na dovolenou? náhlá nemoc?), nabízím ti pokoj v hostinci. Zatímco tu budeš ubytovaný, tvé denní úkoly budou zmrazeny tak, jak jsou (zaškrtnuté/nezaškrtnuté), do dalšího dne od odhlášení z hostince. Na konci dne ti nijak neublíží.",
+    "danielText2": "Dej pozor: Pokud se účastníš boje s bossem, ublíží ti i za nesplněné denní úkoly ostatních členů tvé družiny!",
     "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ů",

common/locales/cs/questscontent.json

@@ -191,10 +191,10 @@
     "questBunnyCompletion": "Posledním úderem srážíš zabijáckého králíčka k zemi. Třpytivá mlha se zvedne z jejího těla a smrskne se na obyčejného králíčka... vůbec nevypadá jako ta obluda, se kterou ses bil před chvílí. Její nosík se zaklepe a odhopká pryč zanechávajíc za sebou vejce. @Gully  se směje. \"Hora Prokrastinace dokáže z malých výzev udělat skoro neporazitelné. Vezměme tato vejce a pojďme domů.\"",
     "questBunnyDropBunnyEgg": "Králíček (vejce)",
     "questBunnyUnlockText": "Odemyká vejce králíčka na Trhu",
-    "questSlimeText": "Vládce slizu",
-    "questSlimeNotes": "Během práce na svých úkolech si všimneš že se pohybuješ pomaleji a pomaleji. \"Je to jako prodírat se melasou\", bručí @Leephon. \"Ne, jako prodírat se slizem!\", říká @starsystemic. \"Ten slizký Vládce slizu napatlal ten svůj sliz po celé Habitice. Lepí se to na práci. Všichni se zpomalují.\" Rozhlížíš se. Ulice se pomalu plní průhledným, barevným slizem a Habiťané zápasí se svými úkoly. Zatímco ostatní prchají z oblasti, ty si bereš mop a připravuješ se k bitvě!",
-    "questSlimeBoss": "Vládce slizu",
-    "questSlimeCompletion": "S posledním bodnutím chytáš Vládce slizu do přerostlé koblihy, kterou rychle donesli @Overomega, @LordDarkly a @Shaner, bystří vedoucí pekařského klubu. Jak tě každý poplácává po zádech, ucítíš jak ti někdo vložil něco do kapes. Je to odměna za tvůj sladký úspěch: tři vejce Marshmallow slizu.",
-    "questSlimeDropSlimeEgg": "Marshmallow sliz (vejce)",
-    "questSlimeUnlockText": "Odemyká vejce slizu na Trhu"
+    "questSlimeText": "Želésprávce",
+    "questSlimeNotes": "Během práce na svých úkolech si všimneš, že se pohybuješ pomaleji a pomaleji. \"Je to jako prodírat se melasou\", bručí @Leephon. \"Ne, jako prodírat se želé!\", říká @starsystemic. \"Ten slizký Želésprávce napatlal to své želé po celé Habitice. Lepí se to na práci. Všichni se zpomalují.\" Rozhlížíš se. Ulice se pomalu plní průhledným, barevným želé a Habiťané zápasí se svými úkoly. Zatímco ostatní prchají z oblasti, ty si bereš mop a připravuješ se k bitvě!",
+    "questSlimeBoss": "Želésprávce",
+    "questSlimeCompletion": "S posledním bodnutím chytáš Želésprávce do přerostlé koblihy, kterou rychle donesli @Overomega, @LordDarkly a @Shaner, bystří vedoucí pekařského klubu. Jak tě každý poplácává po zádech, ucítíš jak ti někdo vložil něco do kapes. Je to odměna za tvůj sladký úspěch: tři vejce Marshmallow želé.",
+    "questSlimeDropSlimeEgg": "Marshmallow želé (vejce)",
+    "questSlimeUnlockText": "Odemyká vejce želé na Trhu"
 }

common/locales/cs/settings.json

@@ -41,10 +41,10 @@
     "json": "(JSON)",
     "customDayStart": "Vlastní začátek dne",
     "24HrClock": "24hod mód",
-    "customDayStartInfo1": "HabitRPG implicitně kontroluje a resetuje tvé denní úkoly vždy o půlnoci tvé časové zóny. Měl by sis přečíst následující informace než to změníš:",
+    "customDayStartInfo1": "HabitRPG implicitně kontroluje a resetuje tvé denní úkoly vždy o půlnoci tvé časové zóny. Měl by sis přečíst následující informace, než to změníš:",
     "customDayStartInfo2": "(zobrazit více)",
     "customDayStartInfo3": "(zobrazit méně)",
-    "customDayStartInfo4": "<strong>Dokonči všechny své denní úkoly před změnou vlastního začátku dne</strong> nebo ten den <a href='http://habitrpg.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Odpočívej v hostinci</a>. Změna vlastního začátku dne může způsobit okamžité spuštění <a href='http://habitrpg.wikia.com/wiki/Cron' target='_blank'>kronu</a>, ale po prvním dnu bude vše fungovat jak má.<br><br><strong>Změna může trvat až dvě hodiny.</strong> Například pokud je nyní nastaven na 0 (půlnoc), změň ho před 22. hodinou; pokud ho chceš nastavit na 9. hodinu, změň ho před 7. hodinou.<br><br>Zadej hodinu od 0 do 23 (používá 24-hodinový formát). Psaní je efektivnější než použití šipek. Jakmile máš nastaveno, obnov stránku pro kontrolu, že se již objevuje nová hodnota.",
+    "customDayStartInfo4": "<strong>Dokonči všechny své denní úkoly před změnou vlastního začátku dne</strong> nebo ten den <a href='http://habitrpg.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Odpočívej v hostinci</a>. Změna vlastního začátku dne může způsobit okamžité spuštění <a href='http://habitrpg.wikia.com/wiki/Cron' target='_blank'>kronu</a>, ale po prvním dnu bude vše fungovat tak, jak má.<br><br><strong>Změna může trvat až dvě hodiny.</strong> Například pokud je nyní nastaven na 0 (půlnoc), změň ho před 22. hodinou; pokud ho chceš nastavit na 9. hodinu, změň ho před 7. hodinou.<br><br>Zadej hodinu od 0 do 23 (používá se 24-hodinový formát). Psaní je efektivnější než použití šipek. Jakmile máš nastaveno, obnov stránku pro kontrolu, že se již objevuje nová hodnota.",
     "misc": "Ostatní",
     "showHeader": "Zobrazit horní info panel",
     "changePass": "Změnit heslo",
@@ -97,7 +97,7 @@
     "invitedParty": "Pozván do Družiny",
     "invitedGuild": "Pozván do Cechu",
     "inactivityEmails": "Tvůj účet není aktivní",
-    "weeklyRecaps": "Shrnutí aktivity tvého účtu za poslední týden",
+    "weeklyRecaps": "Summaries of your account activity in the past week",
     "questStarted": "Tvá výprava započla",
     "invitedQuest": "Pozván na Výpravu",
     "kickedGroup": "Vykopnut z družiny",
@@ -112,5 +112,10 @@
     "benefits": "Benefity",
     "coupon": "Kupón",
     "couponPlaceholder": "Zadej kód z kupónu",
-    "couponText": "Někdy pořádáme události a rozdáváme kupónové kódy na speciální výbavu. (např. těm, kdo se zastaví u našeho stánku na Wonderconu)"
+    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "apply": "Apply",
+    "resubscribe": "Resubscribe",
+    "promoCode": "Promo Code",
+    "promoCodeApplied": "Promo Code Applied! Check your inventory",
+    "promoPlaceholder": "Enter Promotion Code"
 }

common/locales/cs/spells.json

@@ -30,7 +30,7 @@
     "spellHealerProtectAuraText": "Ochranná aura",
     "spellHealerProtectAuraNotes": "Chráníš svou družinu před újmou. Celá tvá družina získá bonus k Obraně! (vypočteno na základě: OBR před bonusem)",
     "spellHealerHealAllText": "Požehnání",
-    "spellHealerHealAllNotes": "Obklopuje tě ukliďnující aura. Celá tvá družina obnovuje své zdraví! (vypočteno na základě: OBR a INT)",
+    "spellHealerHealAllNotes": "Obklopuje tě uklidňující aura. Celé tvé družině se obnoví zdraví! (vypočteno na základě: OBR a INT)",
     "spellSpecialSnowballAuraText": "Sněhová koule",
     "spellSpecialSnowballAuraNotes": "Hoď sněhovou koulí po členu družiny, co by se tak mohlo stát? Vydrží mu až do druhého dne.",
     "spellSpecialSaltText": "Sůl",

common/locales/da/backgrounds.json

@@ -76,5 +76,12 @@
     "backgroundFloralMeadowText": "Blomstereng",
     "backgroundFloralMeadowNotes": "Hold Picnic på en Blomstereng.",
     "backgroundGumdropLandText": "Vingummiland",
-    "backgroundGumdropLandNotes": "Nyd udsigten i Vingummiland - nam nam!"
+    "backgroundGumdropLandNotes": "Nyd udsigten i Vingummiland - nam nam!",
+    "backgrounds052015": "SET 12: Released May 2015",
+    "backgroundMarbleTempleText": "Marble Temple",
+    "backgroundMarbleTempleNotes": "Pose in front of a Marble Temple.",
+    "backgroundMountainLakeText": "Mountain Lake",
+    "backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
+    "backgroundPagodasText": "Pagodas",
+    "backgroundPagodasNotes": "Climb to the top of Pagodas."
 }

common/locales/da/communityguidelines.json

@@ -173,5 +173,6 @@
     "commGuideLink07": "Kunst-Trello",
     "commGuideLink07description": "for at indsende pixelkunst.",
     "commGuideLink08": "Quest-Trello",
-    "commGuideLink08description": "for at indsende Quest-tekst."
+    "commGuideLink08description": "for at indsende Quest-tekst.",
+    "lastUpdated": "Last updated"
 }

common/locales/da/front.json

@@ -120,6 +120,8 @@
     "mobileAndroid": "Android",
     "mobileIOS": "iOS",
     "motivate": "Motivate yourself and your team!",
+    "motivate1": "Motivate yourself to do anything.",
+    "motivate2": "Get Organized. Get Motivated. Get Gold.",
     "passConfirm": "Bekræft Kodeord",
     "passMan": "Hvis du bruger en kodeordshusker (som 1Password) og har problemer med at logge ind, så prøv at skrive dit brugernavn og kodeord manuelt.",
     "password": "Kodeord",

common/locales/da/groups.json

@@ -96,5 +96,10 @@
     "abuseReported": "Tak for at anmelde denne overtrædelse. Moderatorerne er blevet informeret.",
     "abuseAlreadyReported": "Du har allerede anmeldt denne besked.",
     "needsText": "Indtast venligst en besked.",
-    "needsTextPlaceholder": "Skriv din besked her."
+    "needsTextPlaceholder": "Skriv din besked her.",
+    "copyMessageAsToDo": "Copy message as To-Do",
+    "messageAddedAsToDo": "Message copied as To-Do.",
+    "messageWroteIn": "<%= user %> wrote in <%= group %>",
+    "msgPreviewHeading": "Message Preview",
+    "leaderOnlyChallenges": "Only group leader can create challenges"
 }

common/locales/da/npc.json

@@ -5,8 +5,8 @@
     "mattShall": "Skal jeg hente dit ridedyr, <%= name %>? Klik på et ridedyr for at bestige det.",
     "mattBochText1": "Velkommen til Stalden! Jeg er Matt, bæstmesteren. Vælg det kæledyr, du vil have til at følge dig, her. Giv dem mad, og de vil vokse sig til kraftfulde ridedyr.",
     "daniel": "Daniel",
-    "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
-    "danielText2": "Be warned: 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.",
+    "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the inn. While checked-in, your Dailies are frozen as-is (checked/unchecked) until the day after check-out. You will not suffer for missing them at the day's end.",
+    "danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies!",
     "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",

common/locales/da/settings.json

@@ -97,7 +97,7 @@
     "invitedParty": "Gruppeinvitation",
     "invitedGuild": "Klaninvitation",
     "inactivityEmails": "Din konto er inaktiv",
-    "weeklyRecaps": "Summaries of your acccount activity in the past week",
+    "weeklyRecaps": "Summaries of your account activity in the past week",
     "questStarted": "Jeres Quest er Begyndt",
     "invitedQuest": "Inviteret til Quest",
     "kickedGroup": "Fjernet fra gruppe",
@@ -112,5 +112,10 @@
     "benefits": "Fordele",
     "coupon": "Kupon",
     "couponPlaceholder": "Indtast Kuponkode",
-    "couponText": "Nogen gange har vi events og giver kuponkoder til specielt udstyr (f.eks. til dem, der svinger forbi vores stand på Wondercon)."
+    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "apply": "Apply",
+    "resubscribe": "Resubscribe",
+    "promoCode": "Promo Code",
+    "promoCodeApplied": "Promo Code Applied! Check your inventory",
+    "promoPlaceholder": "Enter Promotion Code"
 }

common/locales/de/backgrounds.json

@@ -76,5 +76,12 @@
     "backgroundFloralMeadowText": "Blumenwiese",
     "backgroundFloralMeadowNotes": "Picknicke auf der Blumenwiese",
     "backgroundGumdropLandText": "Weingummiland",
-    "backgroundGumdropLandNotes": "Nasche ein wenig vom Weingummiland"
+    "backgroundGumdropLandNotes": "Nasche ein wenig vom Weingummiland",
+    "backgrounds052015": "SET 12: Released May 2015",
+    "backgroundMarbleTempleText": "Marble Temple",
+    "backgroundMarbleTempleNotes": "Pose in front of a Marble Temple.",
+    "backgroundMountainLakeText": "Mountain Lake",
+    "backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
+    "backgroundPagodasText": "Pagodas",
+    "backgroundPagodasNotes": "Climb to the top of Pagodas."
 }

common/locales/de/communityguidelines.json

@@ -173,5 +173,6 @@
     "commGuideLink07": "Das Kunst Trello",
     "commGuideLink07description": "um Pixelkunst einzureichen",
     "commGuideLink08": "Das Quest-Trello",
-    "commGuideLink08description": "um geschriebene Quests einzureichen"
+    "commGuideLink08description": "um geschriebene Quests einzureichen",
+    "lastUpdated": "Last updated"
 }

common/locales/de/front.json

@@ -2,22 +2,22 @@
     "FAQ": "FAQ",
     "accept1Terms": "Durch Klicken auf diesen Knopf, stimme ich den",
     "accept2Terms": "zu, sowie der",
-    "alexandraQuote": "Couldn't NOT talk about HabitRPG during my speech in Madrid. Must-have tool for freelancers who still need a boss.",
-    "althaireQuote": "Having a quest constantly on really motivates me to do all my dailies and do all my to-dos. My biggest motivation is not letting my party down.",
-    "andeeliaoQuote": "Awesome product, just started a few days ago and already more conscious and productive with my time!",
-    "autumnesquirrelQuote": "I'm procrastinating less on work and housework and pay bills on time.",
-    "businessSample1": "Confirm 1 page of Inventory",
-    "businessSample2": "20 mins Filing",
-    "businessSample3": "Sort and Process Inbox",
-    "businessSample4": "Prepare 1 Document for Client",
-    "businessSample5": "Call Clients/Put Off Phone Calls",
-    "businessText": "Use HabitRPG at your business",
-    "choreSample1": "Put Dirty Clothes in Hamper",
-    "choreSample2": "20 mins of Housework",
-    "choreSample3": "Wash a Load of Dishes",
-    "choreSample4": "Tidy One Room",
-    "choreSample5": "Wash and Dry a Load of Clothes",
-    "chores": "Chores",
+    "alexandraQuote": "Ich konnte während meiner Rede in Madrid nicht NICHT über HabitRPG reden. Ein absolutes Must-have Hilfmittel für Freiberufler, die trotzdem einen Chef brauchen.",
+    "althaireQuote": "Kontinuierlich eine Quest zu haben, motiviert mich dazu alle meine täglichen und einmaligen Aufgaben zu erledigen. Meine größte Motivation ist, meine Gruppe nicht im Stich zu lassen.",
+    "andeeliaoQuote": "Großartiges Produkt, habe gerade erst vor einigen Tagen angefangen und gehe bereits bewusster und produktiv mit meiner Zeit um!",
+    "autumnesquirrelQuote": "Ich prokrastiniere weniger bei der Arbeit und zu Hause und zahle meine Rechnung rechtzeitig.",
+    "businessSample1": "1 Seite des Inventars überprüfen",
+    "businessSample2": "20 min Ablagen erledigen",
+    "businessSample3": "Sortieren und abarbeiten des Posteingangs",
+    "businessSample4": "Bereite 1 Dokument für den Kunden vor",
+    "businessSample5": "Kunden anrufen/Anrufe aufschieben",
+    "businessText": "HabitRPG auf der Arbeit benutzen",
+    "choreSample1": "Dreckige Klamotten in Wäschekorb stecken",
+    "choreSample2": "20 Minuten Hausarbeit",
+    "choreSample3": "Geschirr abspülen",
+    "choreSample4": "Einen Raum aufräumen ",
+    "choreSample5": "Geschirr abspülen und trocknen",
+    "chores": "Arbeiten im Haushalt",
     "communityBug": "Bug mitteilen",
     "communityExtensions": "Add-ons & Extensions",
     "communityFacebook": "Facebook",
@@ -32,50 +32,50 @@
     "companyPrivacy": "Datenschutz",
     "companyTerms": "AGB",
     "companyVideos": "Videos",
-    "contribUse": "HabitRPG contributors use",
-    "dragonsilverQuote": "I can't tell you how many time and task tracking systems I've tried over the decades... HRPG is the only thing I've used that actually helps me get things done rather than just list them.",
-    "dreimQuote": "When I discovered HabitRPG last summer, I had just failed about half of my exams. Thanks to the Dailies… I was able to organize and discipline myself, and I actually passed all my exams with really good grades a month ago.",
-    "elmiQuote": "Every morning I'm looking forward to getting up so I can earn some gold!",
+    "contribUse": "HabitRPG Mitwirkende nutze ",
+    "dragonsilverQuote": "Ich habe unzählige Zeit- und Aufgabenerfassungssysteme ausprobiert… HRPG ist das einzige, das mir wirklich hilft Dinge zu erledigen, anstatt sie nur aufzuschreiben.",
+    "dreimQuote": "Als ich letzten Sommer HabitRPG entdeckte, war ich gerade durch die Hälfte meiner Prüfungen gefallen. Durch die täglichen Aufgaben konnte ich mich organisieren und zur Disziplin zwingen und tatsächlich habe ich letzten Monat alle Prüfungen mit echt guten Noten bestanden.",
+    "elmiQuote": "Jeden Morgen freue ich mich aufzustehen und etwas Gold zu verdienen!",
     "email": "E-Mail",
     "emailNewPass": "E-Mail neues Passwort",
-    "evagantzQuote": "My very first dentist appointment where the hygienist was actually excited about my flossing habits. Thanks Habitrpg!",
-    "examplesHeading": "Players use HabitRPG to manage...",
-    "featureAchievementByline": "Do something totally awesome? Get a badge and show it off!",
-    "featureAchievementHeading": "Achievement Badges",
-    "featureEquipByline": "Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!",
-    "featureEquipHeading": "Equipment and extras",
-    "featurePetByline": "Eggs and items drop when you complete your tasks. Be as productive as possible to collect pets and mounts!",
-    "featurePetHeading": "Pets and Mounts",
-    "featureSocialByline": "Join common-interest groups with like-minded people. Create Challenges to compete against other users.",
-    "featureSocialHeading": "Social play",
-    "featuredIn": "Featured in",
-    "featuresHeading": "We also feature...",
+    "evagantzQuote": "Mein erster Zahnartztbesuch, bei dem die Assistentin begeistert über meine Zahnseide Gewohnheiten war. Danke HabitRPG!",
+    "examplesHeading": "Spieler benutzen HabitRPG, um folgendes zu organisieren...",
+    "featureAchievementByline": "Etwas total großartiges gemacht? Erhalte ein Abzeichen und prahle damit!",
+    "featureAchievementHeading": "Erfolgsabzeichen",
+    "featureEquipByline": "Kaufe Gegenstände in limitierter Auflage, Zaubertränke und andere virtuelle Leckerbissen auf unserem Marktplatz mit den Belohnungen für abgeschlossene Aufgaben!",
+    "featureEquipHeading": "Ausrüstung und Extras",
+    "featurePetByline": "Eier und Gegenstände erscheinen wenn du deine Aufgaben erfüllst. Sei so produktiv wie möglich, um Haus- und Reittiere zu sammeln!",
+    "featurePetHeading": "Haus- und Reittiere",
+    "featureSocialByline": "Tritt Interessensgemeinschaften bei und finde Gleichgesinnte. Erstelle Herausforderungen und tritt gegen andere an.",
+    "featureSocialHeading": "Gemeinsames Spielen",
+    "featuredIn": "Vorgestellt in",
+    "featuresHeading": "Weitere Funktionen …",
     "footerCommunity": "Community",
     "footerCompany": "Unternehmen",
     "footerMobile": "Mobil",
     "footerSocial": "Soziales",
     "forgotPass": "Passwort vergessen",
-    "frabjabulousQuote": "HabitRPG is the reason I got a killer, high-paying job... and even more miraculous, I'm now a daily flosser!",
-    "free": "Play for free",
-    "gamifyButton": "Gamify your life today!",
-    "goalSample1": "Practice Piano for 1 Hour",
-    "goalSample2": "Work on article for publication",
-    "goalSample3": "Work on blog post",
-    "goalSample4": "Japanese lesson on Duolingo",
-    "goalSample5": "Read an Informative Article",
-    "goals": "Goals",
-    "health": "Health",
-    "healthSample1": "Drink Water/Soda",
-    "healthSample2": "Chew Gum/Smoke",
-    "healthSample3": "Take Stairs/Elevator",
-    "healthSample4": "Eat Healthy/Junk Food",
-    "healthSample5": "Break a Sweat for 1 hr",
+    "frabjabulousQuote": "HabitRPG ist der Grund weshalb ich einen tollen, gutbezahlten Job habe… und was mich noch mehr verwundert nutze ich nun täglich Zahnseide!",
+    "free": "Umsonst spielen",
+    "gamifyButton": "Gestalte dein Leben spielerisch!",
+    "goalSample1": "1 Stunde Klavier üben",
+    "goalSample2": "An einem zu veröffentlichen Artikel arbeiten",
+    "goalSample3": "Einen Blogpost schreiben",
+    "goalSample4": "Japanischkurs auf Duolingo",
+    "goalSample5": "Einen informativen Zeitungsartikel lesen",
+    "goals": "Ziele",
+    "health": "Gesundheit",
+    "healthSample1": "Trinke Wasser/Soda",
+    "healthSample2": "Kaue Kaugummi/Rauchen",
+    "healthSample3": "Die Treppe/den Aufzug nehmen",
+    "healthSample4": "Esse gesund/Junkfood",
+    "healthSample5": "Für 1 Stunde ins Schwitzen kommen",
     "history": "Verlauf",
-    "infhQuote": "HabitRPG has really helped me impart structure to my life in graduate school.",
+    "infhQuote": "HabitRPG hat mir geholfen Struktur in mein Leben an der Universität zu bringen.",
     "invalidEmail": "Um das Passwort zurückzusetzen, ist eine gültige Email-Adresse notwendig.",
-    "irishfeet123Quote": "I've had horrible habits with clearing my place completely after meals and leaving cups all over the place. HabitRPG has cured that!",
-    "joinOthers": "Join 200,000 people making it fun to achieve goals!",
-    "kazuiQuote": "Before HabitRPG, I was stuck with my thesis, as well as dissatisfied with my personal discipline regarding housework and things like learning vocabulary and studying Go theory.  It turns out breaking down these tasks into smaller manageable checklists is quite the thing to keep me motivated and constantly working.",
+    "irishfeet123Quote": "Ich hatte schreckliche Angewohnheiten, dass ich nach Mahlzeiten nicht aufgeräumt habe und Tassen in der ganzen Wohnung rumstanden.  HabitRPG hat dies beseitigt.",
+    "joinOthers": "Tritt bei! Über 200 000 Leute haben Spaß dabei, ihre Ziele zu erreichen.",
+    "kazuiQuote": "Bevor HabitRPG kam ich mit meiner Dissertation nicht weiter und ich war unzufrieden mit meiner persönlichen Disziplin was Hausarbeit angeht und Dingen wie Vokabellernen und das Studium der Go-Theorie. Es stellte sich heraus, dass das Aufteilen der Aufgaben in kleinere machbare Checklisten, etwas ist, das mich motiviert und zum konstanten Arbeiten anregt.",
     "landingadminlink": "Verwaltungspakete",
     "landingend": "Noch nicht überzeugt?",
     "landingend2": "Hier ist eine genauere Liste",
@@ -89,7 +89,7 @@
     "landingp3header": "Konsequenzen",
     "landingp4": "Mit einer lebendigen Community bietet HabitRPG die Verantwortung die Ihr braucht um auf Eure Aufgaben konzentriert zu bleiben. Mit dem Gruppensystem, könnt Ihr eine Gruppe Eurer besten Freunde zur Unterstützung rufen. Das Gildensystem erlaubt Euch Spieler mit ähnlichen Interessen oder Hindernissen zu finden, damit Ihr Eure Ziele gemeinsam erreichen und Tips, wie Ihr Eure Probleme angehen könnt, austauschen könnt. Auf HabitRPG steht die Community für die Unterstützung und die Verantwortung die Ihr braucht um Erfolg zu haben.",
     "landingp4header": "Verantwortung",
-    "leadText": "HabitRPG is a free habit building and productivity app that treats your real life like a game. With in-game rewards and punishments to motivate you and a strong social network to inspire you, HabitRPG can help you achieve your goals to become healthy, hard-working, and happy.",
+    "leadText": "HabitRPG ist eine kostenlose Anwendung zur Gewohnheitsbildung und Steigerung der Produktivität, die dein Leben als Spiel betrachtet. Mit Belohnungen und Bestafungen zur Motivation und einem starken sozialem Netzwerk zur Inspiration hilft HabitRPG dir deine Ziele zu erreichen und ein gesunder, fleißiger und glücklicher Mensch zu werden.",
     "login": "Einloggen",
     "loginAndReg": "Einloggen / Registrieren",
     "loginFacebookAlt": "Einloggen / Registrieren mit Facebook",
@@ -119,56 +119,58 @@
     "marketing4Lead3Title": "Mache Alles zum Spiel",
     "mobileAndroid": "Android",
     "mobileIOS": "iOS",
-    "motivate": "Motivate yourself and your team!",
+    "motivate": "Motiviere dich und dein Team!",
+    "motivate1": "Motiviere dich, egal wozu.",
+    "motivate2": "Organiziere dich. Motiviere dich. Verdiene Gold.",
     "passConfirm": "Passwort bestätigen",
     "passMan": "Falls Du einen Passwort-Manager verwendest (wie 1Password) und Probleme hast Dich einzuloggen, versuche Deinen Benutzernamen und Dein Passwort manuell einzugeben.",
     "password": "Passwort",
     "playButton": "Spielen",
-    "playButtonFull": "Play HabitRPG",
+    "playButtonFull": "Spiele HabitPRG",
     "presskit": "Pressemappe",
     "presskitDownload": "Alle Bilder herunterladen:",
     "presskitText": "Danke für euer Interesse an HabitRPG! Die folgenden Bilder können für Artikel oder Videos über HabitRPG verwendet werden. Für weitere Informationen kontaktiert bitte Siena Leslie unter leslie@habitrpg.com.",
     "privacy": "Datenschutzrichtlinie",
     "psst": "Psst",
-    "punishByline": "Break bad habits and procrastination cycles with immediate consequences.",
-    "punishHeading1": "Miss a daily goal?",
-    "punishHeading2": "Lose health!",
-    "questByline1": "Playing with your friends keeps you accountable for your tasks.",
-    "questByline2": "Issue each other Challenges to complete a goal together!",
-    "questHeading1": "Battle monsters with your friends!",
-    "questHeading2": "If you slack off, they all get hurt!",
+    "punishByline": "Überwinde schlechte Gewohnheiten und Nichtstun durch direkte Konsequenzen.",
+    "punishHeading1": "Eine tägliche Aufgabe verfehlt?",
+    "punishHeading2": "Gesundheit verloren!",
+    "questByline1": "Durch das gemeinsame Spielen, trägst du die Verantwortung für deine Aufgaben.",
+    "questByline2": "Stellt euch gegenseitig Herausforderungen und meistert das Ziel gemeinsam!",
+    "questHeading1": "Besiege Monster mit deinen Freunden!",
+    "questHeading2": "Falls du faulenzt, schadet das allen!",
     "register": "Registrieren",
-    "rewardByline1": "Spend gold on virtual and real-life rewards.",
-    "rewardByline2": "Instant rewards keep you motivated!",
-    "rewardHeading": "Complete a task to earn gold!",
-    "sampleDailies": "Sample Dailies",
-    "sampleHabits": "Sample Habits",
-    "sampleToDo": "Sample To-Dos",
-    "school": "School",
-    "schoolSample1": "Finish 1 Assignment",
-    "schoolSample2": "Study 1 hour",
-    "schoolSample3": "Meet with Study Group",
-    "schoolSample4": "Notes for 1 Chapter",
-    "schoolSample5": "Read 1 Chapter",
-    "sixteenBitFilQuote": "I'm getting my jobs and tasks done in record time thanks to HabitRPG. I'm just always so eager to reach my next level-up!",
-    "skysailorQuote": "My party and our quests keep me engaged in the game, which keeps me motivated to get things done and change my life in positive ways",
+    "rewardByline1": "Kaufe mit dem Gold virtuelle Belohnungen und Belohnungen im richtigen Leben.",
+    "rewardByline2": "Sofortige Belohnungen halten dich bei Laune!",
+    "rewardHeading": "Erfülle eine Aufgabe, um Gold zu verdienen!",
+    "sampleDailies": "Musteraufgaben",
+    "sampleHabits": "Beispielgewohnheiten",
+    "sampleToDo": "Beispielaufgaben",
+    "school": "Schule",
+    "schoolSample1": "1 Aufgabe erfüllen",
+    "schoolSample2": "1 Stunde lernen",
+    "schoolSample3": "Treffen mit derLerngruppe",
+    "schoolSample4": "Notizen für 1 Kapitel machen",
+    "schoolSample5": "1 Kapitel lesen",
+    "sixteenBitFilQuote": "Dank HabitRPG erledige ich meine Arbeit in Rekordzeit. Ich bin immer so eifrig um meinen nächsten Level zu erreichen!",
+    "skysailorQuote": "Meine Gruppe und unsere Questes halten mich im Spiel, was mich motiviert, Dinge zu erledigen und was mein Leben auf eine positive Art ändert",
     "socialTitle": "HabitRPG - Spiele dein Leben",
-    "supermouse35Quote": "I'm exercising more and I haven't forgotten to take my meds for months! Thanks, Habit. :D",
+    "supermouse35Quote": "Ich trainiere mehr und habe meine Medikamente seit Monaten nicht vergessen. Danek Habit. :D",
     "sync": "Synchronisieren",
     "tasks": "Aufgaben",
-    "teamSample1": "Outline Meeting Itinerary for Tuesday",
-    "teamSample2": "Brainstorm Growth Hacking",
-    "teamSample3": "Discuss this week’s KPIs",
+    "teamSample1": "Besprechung für Dienstag vorbereiten",
+    "teamSample2": "Gedanken zur Marketingstrategie machen",
+    "teamSample3": "Leistungskennzahlen der Woche diskutieren",
     "teams": "Teams",
     "terms": "AGB",
-    "testimonialHeading": "What people say...",
+    "testimonialHeading": "Was andere sagen…",
     "tutorials": "Anleitungen",
-    "unlockByline1": "Achieve your goals and level up.",
-    "unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!",
-    "unlockHeadline": "As you stay productive, you unlock new content!",
+    "unlockByline1": "Erreiche deine Ziele und steige ein Level auf.",
+    "unlockByline2": "Schalte neue motivierende Dinge frei, wie zum Beispiel Haustiere, zufällige Belohnungen, Zaubersprüche und mehr!",
+    "unlockHeadline": "Je mehr du tust, desto mehr neue Inhalte kannst du freigeschalten!",
     "useUUID": "Benutze UUID / API Token (Für Facebook Benutzer)",
     "username": "Benutzername",
     "watchVideos": "Sehen Sie sich die Videos an",
-    "work": "Work",
-    "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+    "work": "Arbeit",
+    "zelahQuote": "Dadurch, dass ich Punkte bekomme, wenn ich früh ins Bett gehe und Schaden nehme, wenn ich spät ins Bett gehe, habe ich es mit HabitRPG geschafft, rechtzeitig ins Bett zu gehen."
 }

common/locales/de/groups.json

@@ -96,5 +96,10 @@
     "abuseReported": "Danke, dass Du diesen Verstoß gemeldet hast. Die Moderatoren wurden benachrichtigt.",
     "abuseAlreadyReported": "Du hast diese Nachricht bereits gemeldet.",
     "needsText": "Bitte gib eine Nachricht ein.",
-    "needsTextPlaceholder": "Gib Deine Nachricht hier ein."
+    "needsTextPlaceholder": "Gib Deine Nachricht hier ein.",
+    "copyMessageAsToDo": "Copy message as To-Do",
+    "messageAddedAsToDo": "Message copied as To-Do.",
+    "messageWroteIn": "<%= user %> wrote in <%= group %>",
+    "msgPreviewHeading": "Message Preview",
+    "leaderOnlyChallenges": "Only group leader can create challenges"
 }

common/locales/de/npc.json

@@ -5,8 +5,8 @@
     "mattShall": "Soll ich Dir Dein Ross bringen, <%= name %>? Klicke auf ein Reittier um aufzusteigen.",
     "mattBochText1": "Wilkommen in den Ställen! Ich bin Matt, der Meister aller Bestien. Wähle hier ein Haustier aus damit es Dir treu zur Seite steht. Füttere sie und sie werden zu mächtigen Rössern heranwachsen.",
     "daniel": "Daniel",
-    "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
-    "danielText2": "Be warned: 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.",
+    "danielText": "Willkommen im Gasthaus! Setze Dich und triff die Stammgäste. Willst Du Dich ausruhen (Urlaub? Krankheit), dann besorge ich Dir ein schönes Zimmer. Solange Du dort eingecheckt bist, werden Deine täglichen Aufgaben so eingefroren, wie sie gerade sind (abgehakt oder nicht), bis Du wieder aus Deinem Zimmer auscheckst. Du wirst am Ende des Tages keinen Schaden von nicht abgehakten Aufgaben nehmen.",
+    "danielText2": "Sei gewarnt: Falls Du an einem Boss Quest teilnimmst, wirst Du immer noch Bossschaden durch die nicht abgehakten Aufgaben Deiner Gruppenmitglieder nehmen!",
     "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",

common/locales/de/settings.json

@@ -97,7 +97,7 @@
     "invitedParty": "In die Gruppe eingeladen",
     "invitedGuild": "In die Gilde eingeladen",
     "inactivityEmails": "Dein Account ist inaktiv",
-    "weeklyRecaps": "Zusammenfassungen Deiner Account-Aktivitäten der letzten Woche",
+    "weeklyRecaps": "Summaries of your account activity in the past week",
     "questStarted": "Dein Quest hat begonnen",
     "invitedQuest": "Zu einem Quest eingeladen",
     "kickedGroup": "Aus Gruppe entfernt.",
@@ -112,5 +112,10 @@
     "benefits": "Vorteile",
     "coupon": "Gutschein",
     "couponPlaceholder": "Gib Deinen Gutschein Code ein",
-    "couponText": "Manchmal nehmen wir an besonderen Events Teil und geben Gutschein Codes für spezielle Ausrüstungsgegenstände aus. (z.B. an die, die bei unserem Wondercon Stand vorbeischauen)"
+    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "apply": "Apply",
+    "resubscribe": "Resubscribe",
+    "promoCode": "Promo Code",
+    "promoCodeApplied": "Promo Code Applied! Check your inventory",
+    "promoPlaceholder": "Enter Promotion Code"
 }

common/locales/de/spells.json

@@ -1,36 +1,36 @@
 {
     "spellWizardFireballText": "Flammenstoß",
-    "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! (Based on: INT)",
+    "spellWizardFireballNotes": "Flammen schießen aus deinen Händen. Du erhältst XP und fügst Bossen zusätzlichen Schaden zu! (Basiert auf: INT Wert)",
     "spellWizardMPHealText": "Ätherischer Schwall",
-    "spellWizardMPHealNotes": "You sacrifice mana to help your friends. The rest of your party gains MP! (Based on: INT)",
+    "spellWizardMPHealNotes": "Du opferst Mana um Deinen Freunden zu helfen. Der Rest Deiner Gruppe erhält MP! (Basiert auf: INT Wert)",
     "spellWizardEarthText": "Erdbeben",
-    "spellWizardEarthNotes": "Your mental power shakes the earth. Your whole party gains a buff to Intelligence! (Based on: Unbuffed INT)",
+    "spellWizardEarthNotes": "Deine mentalen Kräfte bringen die Erde zum beben. Deine ganze Gruppe erhält Bonus Intelligenzpunkte! (Basiert auf: INT ohne Boni)",
     "spellWizardFrostText": "Klirrender Frost",
-    "spellWizardFrostNotes": "Ice covers your tasks. None of your streaks will reset to zero tomorrow! (One cast affects all streaks.)",
+    "spellWizardFrostNotes": "Eine Eisschicht überzieht deine Aufgaben. Keine Deiner Strähnen wird morgen auf null zurückgesetzt! (Einmal gewirkt wirkt der Effekt auf all Deine Strähnen)",
     "spellWarriorSmashText": "Gewaltschlag",
-    "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! (Based on: STR)",
+    "spellWarriorSmashNotes": "Du triffst eine Aufgabe mit aller Kraft. Sie wird blauer/weniger rot, und Du fügst Bossen extra Schaden zu! (Basiert auf: STR)",
     "spellWarriorDefensiveStanceText": "Verteidigungstellung",
-    "spellWarriorDefensiveStanceNotes": "You prepare yourself for the onslaught of your tasks. You gain a buff to Constitution! (Based on: Unbuffed CON)",
+    "spellWarriorDefensiveStanceNotes": "Du bereitest dich auf den Ansturm deiner Aufgaben vor. Du erhälst einen Ausdauerbonus! (Basiert auf: CON ohne Boni)",
     "spellWarriorValorousPresenceText": "Tapferer Charakter",
-    "spellWarriorValorousPresenceNotes": "Your presence emboldens your party. Your whole party gains a buff to Strength! (Based on: Unbuffed STR)",
+    "spellWarriorValorousPresenceNotes": "Deine Anwesenheit ermutigt deine Gruppe. Deine ganze Gruppe erhält einen Stärkebonus (Basiert auf: STR ohne Boni)",
     "spellWarriorIntimidateText": "Einschüchternder Blick",
-    "spellWarriorIntimidateNotes": "Your gaze strikes fear into your enemies. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)",
+    "spellWarriorIntimidateNotes": "Dein Blick erfüllt die Herzen Deiner Feinde mit Angst. Deine ganze Gruppe erhält einen Ausdauerbonus! (Basiert auf: CON ohne Boni)",
     "spellRoguePickPocketText": "Taschendiebstahl",
-    "spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! (Based on: PER)",
+    "spellRoguePickPocketNotes": "Du bestiehlst eine Aufgabe in der Nähe. Du erhältst Gold! (Basiert auf: PER)",
     "spellRogueBackStabText": "Überraschungsangriff",
-    "spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! (Based on: STR)",
+    "spellRogueBackStabNotes": "Du hälst eine Aufgabe zum Narren. Du erhälst Gold und Erfahrungspunkte! (Basiert auf: STR)",
     "spellRogueToolsOfTradeText": "Handwerkszeug",
-    "spellRogueToolsOfTradeNotes": "You share your talents with friends. Your whole party gains a buff to Perception! (Based on: Unbuffed PER)",
+    "spellRogueToolsOfTradeNotes": "Du teilst Deine Talente mit Deinen Freunden. Deine ganze Gruppe erhält einen Wahrnehmungsbonus! (Basiert auf: PER ohne Boni)",
     "spellRogueStealthText": "Schleichen",
-    "spellRogueStealthNotes": "You are too sneaky to spot. Some of your undone Dailies will not cause damage tonight, and their streaks/color will not change. (Cast multiple times to affect more Dailies)",
+    "spellRogueStealthNotes": "Du bist zu raffiniert, um entdeckt zu werden. Einige deiner täglichen Aufgaben werden heute Nacht nicht zu Schaden führen und ihre Strähnen/Farbe wird sich nicht ändern. (Mehrfache Anwendung hat Auswirkung auf mehr täglichen Aufgaben)",
     "spellHealerHealText": "Heilendes Licht",
-    "spellHealerHealNotes": "Light covers your body, healing your wounds. You regain health! (Based on: CON and INT)",
+    "spellHealerHealNotes": "Licht strömt aus Deinem Körper, es heilt Deine Wunden. Du erhältst Lebenspunkte zurück! (Basiert auf: CON und INT)",
     "spellHealerBrightnessText": "Brennende Helle",
-    "spellHealerBrightnessNotes": "A burst of light dazzles your tasks. They become more blue and less red! (Based on: INT)",
+    "spellHealerBrightnessNotes": "Ein Lichtstoß lässt Deine Aufgaben schillern. Sie werden blauer / weniger rot! (Basiert auf: INT)",
     "spellHealerProtectAuraText": "Schutzaura",
-    "spellHealerProtectAuraNotes": "You shield your party from damage. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)",
+    "spellHealerProtectAuraNotes": "Du beschützt Deine Gruppe vor Schaden. Deine Gruppe erhält einen Ausdauerbonus! (Basiert auf: CON ohne Boni)",
     "spellHealerHealAllText": "Segnung",
-    "spellHealerHealAllNotes": "A soothing aura surrounds you. Your whole party regains health! (Based on: CON and INT)",
+    "spellHealerHealAllNotes": "Eine schmerzlindernde Aura umfängt Dich. Deine Gruppe erhält Lebenspunkte zurück! (Basiert auf: CON und INT)",
     "spellSpecialSnowballAuraText": "Schneeball",
     "spellSpecialSnowballAuraNotes": "Wirf einen Schneeball auf ein Gruppenmitglied! Was kann dabei schon schief gehen? Dauert bis zum Tageswechsel des Gruppenmitglieds an.",
     "spellSpecialSaltText": "Salz",

common/locales/en/backgrounds.json

@@ -87,5 +87,13 @@
   "backgroundFloralMeadowText": "Flowering Meadow",
   "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
   "backgroundGumdropLandText": "Gumdrop Land",
-  "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
+  "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land.",
+
+  "backgrounds052015": "SET 12: Released May 2015",
+  "backgroundMarbleTempleText": "Marble Temple",
+  "backgroundMarbleTempleNotes": "Pose in front of a Marble Temple.",
+  "backgroundMountainLakeText": "Mountain Lake",
+  "backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
+  "backgroundPagodasText": "Pagodas",
+  "backgroundPagodasNotes": "Climb to the top of Pagodas."
 }

common/locales/en/character.json

@@ -138,5 +138,6 @@
     "displayNameDescription3": "and scroll down to the Registration section to change your login name.",
     "unequipBattleGear": "Unequip Battle Gear",
     "unequipCostume": "Unequip Costume",
-    "unequipPetMountBackground": "Unequip Pet, Mount, Background"
+    "unequipPetMountBackground": "Unequip Pet, Mount, Background",
+    "animalSkins": "Animal Skins"
 }

common/locales/en/communityGuidelines.json

@@ -180,5 +180,7 @@
     "commGuideLink07": "The Art Trello",
     "commGuideLink07description": "for submitting pixel art.",
     "commGuideLink08": "The Quest Trello",
-    "commGuideLink08description": "for submitting quest writing."
+    "commGuideLink08description": "for submitting quest writing.",
+
+    "lastUpdated": "Last updated"
 }

common/locales/en/front.json

@@ -120,6 +120,8 @@
     "mobileAndroid": "Android",
     "mobileIOS": "iOS",
     "motivate": "Motivate yourself and your team!",
+    "motivate1": "Motivate yourself to do anything.",
+    "motivate2": "Get Organized. Get Motivated. Get Gold.",
     "passConfirm": "Confirm Password",
     "passMan": "In case you are using a password manager (like 1Password) and have problems logging in, try typing username and password manually.",
     "password": "Password",

common/locales/en/gear.json

@@ -529,6 +529,8 @@
   "bodySpecialSummerHealerNotes": "A stylish collar of live coral! Confers no benefit. Limited Edition 2014 Summer Gear.",
 
   "headAccessory": "head accessory",
+  "accessories": "Accessories",
+  "animalEars": "Animal Ears",
 
   "headAccessoryBase0Text": "No Head Accessory",
   "headAccessoryBase0Notes": "No Head Accessory.",
@@ -550,7 +552,24 @@
   "headAccessorySpecialSpring2015MageNotes": "These ears listen keenly, in case somewhere a magician is revealing secrets. Confers no benefit. Limited Edition 2015 Spring Gear.",
   "headAccessorySpecialSpring2015HealerText": "Green Kitty Ears",
   "headAccessorySpecialSpring2015HealerNotes": "These cute kitty ears will make others green with envy. Confers no benefit. Limited Edition 2015 Spring Gear.",
-  
+
+  "headAccessoryBearEarsText": "Bear Ears",
+  "headAccessoryBearEarsNotes": "These ears make you look like a cuddly bear! Confers no benefit.",
+  "headAccessoryCactusEarsText": "Cactus Ears",
+  "headAccessoryCactusEarsNotes": "These ears make you look like a prickly cactus! Confers no benefit.",
+  "headAccessoryFoxEarsText": "Fox Ears",
+  "headAccessoryFoxEarsNotes": "These ears make you look like a wily fox! Confers no benefit.",
+  "headAccessoryLionEarsText": "Lion Ears",
+  "headAccessoryLionEarsNotes": "These ears make you look like a regal lion! Confers no benefit.",
+  "headAccessoryPandaEarsText": "Panda Ears",
+  "headAccessoryPandaEarsNotes": "These ears make you look like a gentle panda! Confers no benefit.",
+  "headAccessoryPigEarsText": "Pig Ears",
+  "headAccessoryPigEarsNotes": "These ears make you look like a whimsical pig! Confers no benefit.",
+  "headAccessoryTigerEarsText": "Tiger Ears",
+  "headAccessoryTigerEarsNotes": "These ears make you look like a fierce tiger! Confers no benefit.",
+  "headAccessoryWolfEarsText": "Wolf Ears",
+  "headAccessoryWolfEarsNotes": "These ears make you look like a loyal wolf! Confers no benefit.",
+
   "headAccessoryMystery201403Text": "Forest Walker Antlers",
   "headAccessoryMystery201403Notes": "These antlers shimmer with moss and lichen. Confers no benefit. March 2014 Subscriber Item.",
   "headAccessoryMystery201404Text": "Twilight Butterfly Antennae",

common/locales/en/groups.json

@@ -2,7 +2,7 @@
     "tavern": "Tavern",
     "innCheckOut": "Check Out of Inn",
     "innCheckIn": "Rest in the Inn",
-    "innText": "How's your stay in the Inn, <%= name %>? To protect you, your daily list is frozen. Your checkmarks won't be processed or cleared until tomorrow (the day after you check out). Be careful, if your party's in a Boss Battle, their misses will hurt you! Also, you won't hurt the boss. Ready to leave? Check out.",
+    "innText": "You're resting in the Inn! While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day. Be warned: 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.",
     "lfgPosts": "Looking for Group (Party Wanted) Posts",
     "tutorial": "Tutorial",
     "glossary": "Glossary",
@@ -96,5 +96,10 @@
     "abuseReported": "Thank you for reporting this violation. The moderators have been notified.",
     "abuseAlreadyReported": "You have already reported this message.",
     "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsTextPlaceholder": "Type your message here.",
+    "copyMessageAsToDo": "Copy message as To-Do",
+    "messageAddedAsToDo": "Message copied as To-Do.",
+    "messageWroteIn": "<%= user %> wrote in <%= group %>",
+    "msgPreviewHeading": "Message Preview",
+    "leaderOnlyChallenges": "Only group leader can create challenges"
 }

common/locales/en/settings.json

@@ -97,7 +97,7 @@
     "invitedParty": "Invited To Party",
     "invitedGuild": "Invited To Guild",
     "inactivityEmails": "Your account is inactive",
-    "weeklyRecaps": "Summaries of your acccount activity in the past week",
+    "weeklyRecaps": "Summaries of your account activity in the past week",
     "questStarted": "Your Quest has Begun",
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
@@ -112,5 +112,10 @@
     "benefits": "Benefits",
     "coupon": "Coupon",
     "couponPlaceholder": "Enter Coupon Code",
-    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)"
+    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "apply": "Apply",
+    "resubscribe": "Resubscribe",
+    "promoCode": "Promo Code",
+    "promoCodeApplied": "Promo Code Applied! Check your inventory",
+    "promoPlaceholder": "Enter Promotion Code"
 }

common/locales/en/tasks.json

@@ -77,5 +77,6 @@
     "streakCoins": "Streak Bonus!",
     "pushTaskToTop": "Push task to top",
     "pushTaskToBottom": "Push task to bottom",
-    "emptyTask": "Enter the task's title first."
+    "emptyTask": "Enter the task's title first.",
+    "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies."
 }

common/locales/en@pirate/backgrounds.json

@@ -76,5 +76,12 @@
     "backgroundFloralMeadowText": "Flowering Meadow",
     "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
     "backgroundGumdropLandText": "Gumdrop Land",
-    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land.",
+    "backgrounds052015": "SET 12: Released May 2015",
+    "backgroundMarbleTempleText": "Marble Temple",
+    "backgroundMarbleTempleNotes": "Pose in front of a Marble Temple.",
+    "backgroundMountainLakeText": "Mountain Lake",
+    "backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
+    "backgroundPagodasText": "Pagodas",
+    "backgroundPagodasNotes": "Climb to the top of Pagodas."
 }

common/locales/en@pirate/communityguidelines.json

@@ -173,5 +173,6 @@
     "commGuideLink07": "The Art Trello",
     "commGuideLink07description": "for submitting pixel art.",
     "commGuideLink08": "The Quest Trello",
-    "commGuideLink08description": "for submitting quest writing."
+    "commGuideLink08description": "for submitting quest writing.",
+    "lastUpdated": "Last updated"
 }

common/locales/en@pirate/front.json

@@ -120,6 +120,8 @@
     "mobileAndroid": "Android",
     "mobileIOS": "iOS",
     "motivate": "Motivate yourself and your team!",
+    "motivate1": "Motivate yourself to do anything.",
+    "motivate2": "Get Organized. Get Motivated. Get Gold.",
     "passConfirm": "Confirm Passcode",
     "passMan": "In case ye be usin' a passcode manager (like 1Password) 'n have problems loggin' in, give a go' typin' piratename 'n passcode manually.",
     "password": "Passcode",

common/locales/en@pirate/groups.json

@@ -96,5 +96,10 @@
     "abuseReported": "Thank you for reporting this violation. The moderators have been notified.",
     "abuseAlreadyReported": "You have already reported this message.",
     "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsTextPlaceholder": "Type your message here.",
+    "copyMessageAsToDo": "Copy message as To-Do",
+    "messageAddedAsToDo": "Message copied as To-Do.",
+    "messageWroteIn": "<%= user %> wrote in <%= group %>",
+    "msgPreviewHeading": "Message Preview",
+    "leaderOnlyChallenges": "Only group leader can create challenges"
 }

common/locales/en@pirate/npc.json

@@ -5,8 +5,8 @@
     "mattShall": "Shall I bring ye yer steed, <%= name %>? Click a mount t' saddle up.",
     "mattBochText1": "Ahoy there! Welcome to the Stable! I be Matt, the beast master. Choose a pet here to venture at yer side. Feed them 'n they'll grow into powerful steeds.",
     "daniel": "Daniel",
-    "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
-    "danielText2": "Be warned: 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.",
+    "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the inn. While checked-in, your Dailies are frozen as-is (checked/unchecked) until the day after check-out. You will not suffer for missing them at the day's end.",
+    "danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies!",
     "alexander": "Alexander th' Sutler",
     "welcomeMarket": "Welcome to the Market! Buy harrrd-to-find eggs 'n potions! Sell yer extras! Commission useful services! Come 'n see what we have to offer ye.",
     "sellForGold": "Sell <%= item %> fer <%= gold %> Doubloons",

common/locales/en@pirate/settings.json

@@ -97,7 +97,7 @@
     "invitedParty": "Invited To Party",
     "invitedGuild": "Invited To Guild",
     "inactivityEmails": "Your account is inactive",
-    "weeklyRecaps": "Summaries of your acccount activity in the past week",
+    "weeklyRecaps": "Summaries of your account activity in the past week",
     "questStarted": "Your Quest has Begun",
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
@@ -112,5 +112,10 @@
     "benefits": "Benefits",
     "coupon": "Coupon",
     "couponPlaceholder": "Enter Coupon Code",
-    "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)"
+    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "apply": "Apply",
+    "resubscribe": "Resubscribe",
+    "promoCode": "Promo Code",
+    "promoCodeApplied": "Promo Code Applied! Check your inventory",
+    "promoPlaceholder": "Enter Promotion Code"
 }

common/locales/en_GB/backgrounds.json

@@ -76,5 +76,12 @@
     "backgroundFloralMeadowText": "Flowering Meadow",
     "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
     "backgroundGumdropLandText": "Gumdrop Land",
-    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land.",
+    "backgrounds052015": "SET 12: Released May 2015",
+    "backgroundMarbleTempleText": "Marble Temple",
+    "backgroundMarbleTempleNotes": "Pose in front of a Marble Temple.",
+    "backgroundMountainLakeText": "Mountain Lake",
+    "backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
+    "backgroundPagodasText": "Pagodas",
+    "backgroundPagodasNotes": "Climb to the top of Pagodas."
 }

common/locales/en_GB/communityguidelines.json

@@ -173,5 +173,6 @@
     "commGuideLink07": "The Art Trello",
     "commGuideLink07description": "for submitting pixel art.",
     "commGuideLink08": "The Quest Trello",
-    "commGuideLink08description": "for submitting quest writing."
+    "commGuideLink08description": "for submitting quest writing.",
+    "lastUpdated": "Last updated"
 }

common/locales/en_GB/front.json

@@ -12,7 +12,7 @@
     "businessSample4": "Prepare 1 Document for Client",
     "businessSample5": "Call Clients/Put Off Phone Calls",
     "businessText": "Use HabitRPG at your business",
-    "choreSample1": "Put Dirty Clothes in Hamper",
+    "choreSample1": "Put Dirty Clothes in Laundry Basket",
     "choreSample2": "20 mins of Housework",
     "choreSample3": "Wash a Load of Dishes",
     "choreSample4": "Tidy One Room",
@@ -120,6 +120,8 @@
     "mobileAndroid": "Android",
     "mobileIOS": "iOS",
     "motivate": "Motivate yourself and your team!",
+    "motivate1": "Motivate yourself to do anything.",
+    "motivate2": "Get Organized. Get Motivated. Get Gold.",
     "passConfirm": "Confirm Password",
     "passMan": "In case you are using a password manager (like 1Password) and have problems logging in, try typing username and password manually.",
     "password": "Password",

common/locales/en_GB/gear.json

@@ -281,7 +281,7 @@
     "headWizard3Text": "Astrologer Hat",
     "headWizard3Notes": "Adorned with the rings of Saturn. Increases Perception by <%= per %>.",
     "headWizard4Text": "Archmage Hat",
-    "headWizard4Notes": "Focuses the mind for intensive spellcasting. Increases perception by <%= per %>.",
+    "headWizard4Notes": "Focuses the mind for intensive spellcasting. Increases Perception by <%= per %>.",
     "headWizard5Text": "Royal Magus Hat",
     "headWizard5Notes": "Shows authority over fortune, weather, and lesser mages. Increases Perception by <%= per %>.",
     "headHealer1Text": "Quartz Circlet",

common/locales/en_GB/groups.json

@@ -96,5 +96,10 @@
     "abuseReported": "Thank you for reporting this violation. The moderators have been notified.",
     "abuseAlreadyReported": "You have already reported this message.",
     "needsText": "Please type a message.",
-    "needsTextPlaceholder": "Type your message here."
+    "needsTextPlaceholder": "Type your message here.",
+    "copyMessageAsToDo": "Copy message as To-Do",
+    "messageAddedAsToDo": "Message copied as To-Do.",
+    "messageWroteIn": "<%= user %> wrote in <%= group %>",
+    "msgPreviewHeading": "Message Preview",
+    "leaderOnlyChallenges": "Only group leader can create challenges"
 }

common/locales/en_GB/npc.json

@@ -5,8 +5,8 @@
     "mattShall": "Shall I bring you your steed, <%= name %>? Click a mount to saddle up.",
     "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. Feed them and they'll grow into powerful steeds.",
     "daniel": "Daniel",
-    "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
-    "danielText2": "Be warned: 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.",
+    "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (holiday? illness?), I'll set you up at the inn. While checked-in, your Dailies are frozen as-is (ticked/unticked) until the day after check-out. You will not suffer for missing them at the day's end.",
+    "danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies!",
     "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",

common/locales/en_GB/settings.json

@@ -97,7 +97,7 @@
     "invitedParty": "Invited To Party",
     "invitedGuild": "Invited To Guild",
     "inactivityEmails": "Your account is inactive",
-    "weeklyRecaps": "Summaries of your acccount activity in the past week",
+    "weeklyRecaps": "Summaries of your account activity in the past week",
     "questStarted": "Your Quest has Begun",
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
@@ -112,5 +112,10 @@
     "benefits": "Benefits",
     "coupon": "Coupon",
     "couponPlaceholder": "Enter Coupon Code",
-    "couponText": "We sometimes have events and give out coupon codes for special gear (e.g., those who stop by our Wondercon booth)."
+    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+    "apply": "Apply",
+    "resubscribe": "Resubscribe",
+    "promoCode": "Promo Code",
+    "promoCodeApplied": "Promo Code Applied! Check your inventory",
+    "promoPlaceholder": "Enter Promotion Code"
 }

common/locales/es/backgrounds.json

@@ -76,5 +76,12 @@
     "backgroundFloralMeadowText": "Campo florido",
     "backgroundFloralMeadowNotes": "Ve de picnic en un campo florido",
     "backgroundGumdropLandText": "Gumdrop Land",
-    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
+    "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land.",
+    "backgrounds052015": "SET 12: Released May 2015",
+    "backgroundMarbleTempleText": "Marble Temple",
+    "backgroundMarbleTempleNotes": "Pose in front of a Marble Temple.",
+    "backgroundMountainLakeText": "Mountain Lake",
+    "backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
+    "backgroundPagodasText": "Pagodas",
+    "backgroundPagodasNotes": "Climb to the top of Pagodas."
 }

common/locales/es/communityguidelines.json

@@ -173,5 +173,6 @@
     "commGuideLink07": "Trello de Artes",
     "commGuideLink07description": "para entregar  arte de pixeles.",
     "commGuideLink08": "Trello de Misiónes",
-    "commGuideLink08description": "para entregar escritura de misiones."
+    "commGuideLink08description": "para entregar escritura de misiones.",
+    "lastUpdated": "Last updated"
 }

common/locales/es/front.json

@@ -2,22 +2,22 @@
     "FAQ": "Preguntas Frecuentes",
     "accept1Terms": "Al hacer clíck en el botón de abajo, acepto los",
     "accept2Terms": "y la",
-    "alexandraQuote": "Couldn't NOT talk about HabitRPG during my speech in Madrid. Must-have tool for freelancers who still need a boss.",
+    "alexandraQuote": "No pude NO hablar sobre HabitRPG durante mi conferencia en Madrid. Necesitamos tener una herramienta para los freelancers quienes aun necesitan un Jefe",
     "althaireQuote": "Having a quest constantly on really motivates me to do all my dailies and do all my to-dos. My biggest motivation is not letting my party down.",
     "andeeliaoQuote": "Awesome product, just started a few days ago and already more conscious and productive with my time!",
     "autumnesquirrelQuote": "I'm procrastinating less on work and housework and pay bills on time.",
     "businessSample1": "Confirm 1 page of Inventory",
     "businessSample2": "20 mins Filing",
     "businessSample3": "Sort and Process Inbox",
-    "businessSample4": "Prepare 1 Document for Client",
+    "businessSample4": "Preparar 1 Documento para Cliente",
     "businessSample5": "Call Clients/Put Off Phone Calls",
-    "businessText": "Use HabitRPG at your business",
-    "choreSample1": "Put Dirty Clothes in Hamper",
-    "choreSample2": "20 mins of Housework",
+    "businessText": "Usar HabitRPG en su negocio",
+    "choreSample1": "Poner Ropa Sucia en la Canasta",
+    "choreSample2": "20 minutos de las Tareas del Hogar",
     "choreSample3": "Wash a Load of Dishes",
     "choreSample4": "Tidy One Room",
     "choreSample5": "Wash and Dry a Load of Clothes",
-    "chores": "Chores",
+    "chores": "Quehaceres",
     "communityBug": "Enviar un Informe de Error",
     "communityExtensions": "Complementos y Extensiones",
     "communityFacebook": "Facebook",
@@ -43,9 +43,9 @@
     "featureAchievementByline": "Do something totally awesome? Get a badge and show it off!",
     "featureAchievementHeading": "Achievement Badges",
     "featureEquipByline": "Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!",
-    "featureEquipHeading": "Equipment and extras",
+    "featureEquipHeading": "Equipamiento y extras",
     "featurePetByline": "Eggs and items drop when you complete your tasks. Be as productive as possible to collect pets and mounts!",
-    "featurePetHeading": "Pets and Mounts",
+    "featurePetHeading": "Mascotas y Monturas",
     "featureSocialByline": "Join common-interest groups with like-minded people. Create Challenges to compete against other users.",
     "featureSocialHeading": "Social play",
     "featuredIn": "Featured in",
@@ -56,17 +56,17 @@
     "footerSocial": "Social",
     "forgotPass": "Olvidé mi Contraseña",
     "frabjabulousQuote": "HabitRPG is the reason I got a killer, high-paying job... and even more miraculous, I'm now a daily flosser!",
-    "free": "Play for free",
+    "free": "Jugar gratis",
     "gamifyButton": "Gamify your life today!",
-    "goalSample1": "Practice Piano for 1 Hour",
+    "goalSample1": "Practica el Piano por 1 Hora",
     "goalSample2": "Work on article for publication",
     "goalSample3": "Work on blog post",
-    "goalSample4": "Japanese lesson on Duolingo",
-    "goalSample5": "Read an Informative Article",
-    "goals": "Goals",
-    "health": "Health",
-    "healthSample1": "Drink Water/Soda",
-    "healthSample2": "Chew Gum/Smoke",
+    "goalSample4": "Lección de japonés en Duolingo",
+    "goalSample5": "Leer un Artículo Informativo",
+    "goals": "Metas",
+    "health": "Salud",
+    "healthSample1": "Beber Agua/Refresco",
+    "healthSample2": "Masticar Chicle/Fumar",
     "healthSample3": "Take Stairs/Elevator",
     "healthSample4": "Eat Healthy/Junk Food",
     "healthSample5": "Break a Sweat for 1 hr",
@@ -120,11 +120,13 @@
     "mobileAndroid": "Android",
     "mobileIOS": "iOS",
     "motivate": "Motivate yourself and your team!",
+    "motivate1": "Motivate yourself to do anything.",
+    "motivate2": "Get Organized. Get Motivated. Get Gold.",
     "passConfirm": "Confirmar Contraseña",
     "passMan": "Si estás utilizando un gesto de contraseñas (como 1Password) y tienes problemas al entrar, prueba a escribir tu nombre de usuario y contraseña manualmente.",
     "password": "Contraseña",
     "playButton": "Jugar",
-    "playButtonFull": "Play HabitRPG",
+    "playButtonFull": "Jugar HabitRPG",
     "presskit": "Paquete de Prensa",
     "presskitDownload": "Descarga todas las imágenes:",
     "presskitText": "¡Gracias por vuestro interés en HabitRPG! Las siguientes imágenes se pueden utilizar para artículos o videos sobre HabitRPG. Para más información, porfavor contacte a Siena Leslie en leslie@habitrpg.com",
@@ -146,10 +148,10 @@
     "sampleToDo": "Sample To-Dos",
     "school": "School",
     "schoolSample1": "Finish 1 Assignment",
-    "schoolSample2": "Study 1 hour",
+    "schoolSample2": "Estudiar por 1 hora",
     "schoolSample3": "Meet with Study Group",
     "schoolSample4": "Notes for 1 Chapter",
-    "schoolSample5": "Read 1 Chapter",
+    "schoolSample5": "Leer 1 Capítulo",
     "sixteenBitFilQuote": "I'm getting my jobs and tasks done in record time thanks to HabitRPG. I'm just always so eager to reach my next level-up!",
     "skysailorQuote": "My party and our quests keep me engaged in the game, which keeps me motivated to get things done and change my life in positive ways",
     "socialTitle": "HabitRPG - Tu Vida, Un Juego",
@@ -159,7 +161,7 @@
     "teamSample1": "Outline Meeting Itinerary for Tuesday",
     "teamSample2": "Brainstorm Growth Hacking",
     "teamSample3": "Discuss this week’s KPIs",
-    "teams": "Teams",
+    "teams": "Equipos",
     "terms": "Términos y Condiciones",
     "testimonialHeading": "What people say...",
     "tutorials": "Tutoriales",
@@ -169,6 +171,6 @@
     "useUUID": "Utilizar UUID / API Token (Para Usuarios de Facebook)",
     "username": "Nombre de Usuario",
     "watchVideos": "Ver Vídeos",
-    "work": "Work",
+    "work": "Trabajar",
     "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
 }