Merge branch 'develop' into release

test/api/v3/integration/user/POST-user_buy.test.js

@@ -56,6 +56,7 @@ describe('POST /user/buy/:key', () => {
         message: t('messageHealthAlreadyMax'),
       });
   });
+
   it('buys a piece of gear', async () => {
     let key = 'armor_warrior_1';
 
@@ -64,4 +65,21 @@ describe('POST /user/buy/:key', () => {
 
     expect(user.items.gear.owned.armor_warrior_1).to.eql(true);
   });
+
+  it('buys a special spell', async () => {
+    let key = 'spookySparkles';
+    let item = content.special[key];
+
+    await user.update({'stats.gp': 250});
+    let res = await user.post(`/user/buy/${key}`);
+    await user.sync();
+
+    expect(res.data).to.eql({
+      items: JSON.parse(JSON.stringify(user.items)), // otherwise dates can't be compared
+      stats: user.stats,
+    });
+    expect(res.message).to.equal(t('messageBought', {
+      itemText: item.text(),
+    }));
+  });
 });

website/assets/sprites/dist/spritesmith-largeSprites-0.css

@@ -1,24 +1,12 @@
-.promo_chat_avatars {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px 0px;
-  width: 617px;
-  height: 405px;
-}
 .promo_login_screen {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -406px;
+  background-position: 0px 0px;
   width: 524px;
   height: 274px;
 }
-.promo_seasonal_shop_fall_2017 {
+.promo_spooky_sparkles {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -618px 0px;
+  background-position: 0px -275px;
-  width: 752px;
+  width: 140px;
-  height: 248px;
+  height: 294px;
-}
-.promo_veteran_pets_2017 {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -618px -249px;
-  width: 363px;
-  height: 141px;
 }

website/client/app.vue

@@ -56,6 +56,10 @@
 </style>
 
 <style>
+  .modal {
+    overflow-y: scroll !important;
+  }
+
   .modal-backdrop.show {
     opacity: 1 !important;
     background-color: rgba(67, 40, 116, 0.9) !important;

website/client/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,24 +1,12 @@
-.promo_chat_avatars {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px 0px;
-  width: 617px;
-  height: 405px;
-}
 .promo_login_screen {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -406px;
+  background-position: 0px 0px;
   width: 524px;
   height: 274px;
 }
-.promo_seasonal_shop_fall_2017 {
+.promo_spooky_sparkles {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -618px 0px;
+  background-position: 0px -275px;
-  width: 752px;
+  width: 140px;
-  height: 248px;
+  height: 294px;
-}
-.promo_veteran_pets_2017 {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -618px -249px;
-  width: 363px;
-  height: 141px;
 }

website/client/components/chat/chatMessages.vue

@@ -472,10 +472,15 @@ export default {
       });
     },
     showMemberModal (memberId) {
+      const profile = this.cachedProfileData[memberId];
+
+      // Open the modal only if the data is available
+      if (profile && !profile.rejected) {
         // @TODO move to action or anyway move from here because it's super duplicate
-      this.$store.state.profileUser = this.cachedProfileData[memberId];
+        this.$store.state.profileUser = profile;
         this.$store.state.profileOptions.startingPage = 'profile';
         this.$root.$emit('show::modal', 'profile');
+      }
     },
   },
 };

website/client/components/groups/groupPlan.vue

@@ -1,6 +1,7 @@
 <template lang="pug">
+// @TODO: Move to group plans folder
 div
-  amazon-payments-modal(:amazon-payments='amazonPayments')
+  amazon-payments-modal(:amazon-payments-prop='amazonPayments')
   div
     .header
       h1.text-center Need more for your Group?
@@ -390,21 +391,23 @@ export default {
       this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
-      this.paymentMethod = paymentMethod;
       let subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
+      let paymentData = {
+        subscription: subscriptionKey,
+        coupon: null,
+      };
+
+      if (this.upgradingGroup && this.upgradingGroup._id) {
+        paymentData.groupId = this.upgradingGroup._id;
+      } else {
+        paymentData.groupToCreate = this.newGroup;
+      }
+
+      this.paymentMethod = paymentMethod;
       if (this.paymentMethod === this.PAYMENTS.STRIPE) {
-        this.showStripe({
+        this.showStripe(paymentData);
-          subscription: subscriptionKey,
-          coupon: null,
-          groupToCreate: this.newGroup,
-        });
       } else if (this.paymentMethod === this.PAYMENTS.AMAZON) {
-        this.amazonPaymentsInit({
+        this.amazonPaymentsInit(paymentData);
-          type: 'subscription',
-          subscription: subscriptionKey,
-          coupon: null,
-          groupToCreate: this.newGroup,
-        });
       }
     },
   },

website/client/components/inventory/equipment/index.vue

@@ -38,6 +38,8 @@
     drawer(
       :title="$t('equipment')",
       :errorMessage="(costume && !user.preferences.costume) ? $t('costumeDisabled') : null",
+      :openStatus='openStatus',
+      v-on:toggled='drawerToggled'
     )
       div(slot="drawer-header")
         .drawer-tab-container
@@ -137,6 +139,8 @@
 
 <script>
 import { mapState } from 'client/libs/store';
+import { CONSTANTS, setLocalSetting, getLocalSetting } from 'client/libs/userlocalManager';
+
 import each from 'lodash/each';
 import map from 'lodash/map';
 import throttle from 'lodash/throttle';
@@ -220,6 +224,12 @@ export default {
       this.searchTextThrottled = this.searchText;
     }, 250),
   },
+  mounted () {
+    const drawerState = getLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE);
+    if (drawerState === CONSTANTS.valueConstants.DRAWER_CLOSED) {
+      this.$store.state.equipmentDrawerOpen = false;
+    }
+  },
   methods: {
     openEquipDialog (item) {
       this.gearToEquip = item;
@@ -241,6 +251,16 @@ export default {
     sortItems (items, sortBy) {
       return _reverse(_sortBy(items, sortGearTypeMap[sortBy]));
     },
+    drawerToggled (newState) {
+      this.$store.state.equipmentDrawerOpen = newState;
+
+      if (newState) {
+        setLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE, CONSTANTS.valueConstants.DRAWER_OPEN);
+        return;
+      }
+
+      setLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE, CONSTANTS.valueConstants.DRAWER_CLOSED);
+    },
   },
   computed: {
     ...mapState({
@@ -251,6 +271,9 @@ export default {
       costumeItems: 'user.data.items.gear.costume',
       flatGear: 'content.gear.flat',
     }),
+    openStatus () {
+      return this.$store.state.equipmentDrawerOpen ? 1 : 0;
+    },
     drawerPreference () {
       return this.costume === true ? 'costume' : 'autoEquip';
     },

website/client/components/notifications.vue

@@ -294,6 +294,7 @@ export default {
       this.$store.dispatch('user:fetch'),
       this.$store.dispatch('tasks:fetchUserTasks'),
     ]).then(() => {
+      // List of prompts for user on changes. Sounds like we may need a refactor here, but it is clean for now
       if (this.user.flags.newStuff) {
         this.$root.$emit('show::modal', 'new-stuff');
       }
@@ -312,6 +313,10 @@ export default {
         this.$root.$emit('show::modal', 'quest-completed');
       }
 
+      if (this.userClassSelect) {
+        this.$root.$emit('show::modal', 'choose-class');
+      }
+
       // @TODO: This is a timeout to ensure dom is loaded
       window.setTimeout(() => {
         this.initTour();

website/client/components/payments/amazonModal.vue

@@ -2,8 +2,10 @@
   b-modal#amazon-payment(title="Amazon", :hide-footer="true", size='md')
     h2.text-center Continue with Amazon
     #AmazonPayButton
-    #AmazonPayWallet(v-if="amazonPayments.loggedIn", style="width: 400px; height: 228px;")
+    | {{amazonPayments}}
-    #AmazonPayRecurring(v-if="amazonPayments.loggedIn && amazonPayments.type === 'subscription'",
+    | {{amazonLoggedIn}}
+    #AmazonPayWallet(v-if="amazonLoggedIn", style="width: 400px; height: 228px;")
+    #AmazonPayRecurring(v-if="amazonLoggedIn && amazonPayments.type === 'subscription'",
                         style="width: 400px; height: 140px;")
     .modal-footer
       .text-center
@@ -34,7 +36,7 @@ export default {
   components: {
     bModal,
   },
-  props: ['amazonPayments'],
+  props: ['amazonPaymentsProp'],
   data () {
     return {
       OffAmazonPayments: {},
@@ -43,11 +45,21 @@ export default {
       amazonPaymentsbillingAgreementId: '',
       amazonPaymentspaymentSelected: false,
       amazonPaymentsrecurringConsent: 'false',
+      amazonLoggedIn: false,
     };
   },
   computed: {
     ...mapState({user: 'user.data'}),
     ...mapState(['isAmazonReady']),
+    // @TODO: Eh, idk if we should move data props here or move these props to data. But we shouldn't have both
+    amazonPayments () {
+      let amazonPayments = {
+        type: 'single',
+        loggedIn: this.amazonLoggedIn,
+      };
+      amazonPayments = Object.assign({}, amazonPayments, this.amazonPaymentsProp);
+      return amazonPayments;
+    },
     amazonPaymentsCanCheckout () {
       if (this.amazonPayments.type === 'single') {
         return this.amazonPaymentspaymentSelected === true;
@@ -87,9 +99,10 @@ export default {
 
           onSignIn: async (contract) => {
             this.amazonPaymentsbillingAgreementId = contract.getAmazonBillingAgreementId();
+            this.amazonLoggedIn = true;
+            this.$set(this.amazonPayments, 'loggedIn', true);
 
             if (this.amazonPayments.type === 'subscription') {
-              this.amazonPayments.loggedIn = true;
               this.amazonPaymentsinitWidgets();
             } else {
               let url = '/amazon/createOrderReferenceId';
@@ -97,8 +110,7 @@ export default {
                 billingAgreementId: this.amazonPaymentsbillingAgreementId,
               });
 
-              if (response.status === 200) {
+              if (response.status <= 400) {
-                this.amazonPayments.loggedIn = true;
                 this.amazonPayments.orderReferenceId = response.data.data.orderReferenceId;
 
                 // @TODO: Clarify the deifference of these functions by renaming
@@ -228,6 +240,11 @@ export default {
           return;
         }
 
+        if (this.amazonPayments.groupId) {
+          this.$router.push(`/group-plans/${this.amazonPayments.groupId}/task-information`);
+          return;
+        }
+
         window.location.reload(true);
         this.reset();
       }
@@ -285,7 +302,7 @@ export default {
     reset () {
       this.amazonPaymentsmodal = null;
       this.amazonPayments.type = null;
-      this.amazonPayments.loggedIn = false;
+      this.amazonLoggedIn = false;
       this.amazonPaymentsgift = null;
       this.amazonPaymentsbillingAgreementId = null;
       this.amazonPayments.orderReferenceId = null;

website/client/components/payments/buyGemsModal.vue

@@ -7,7 +7,7 @@
       .col-md-8.align-self-center
         p=text
   div(v-if='user')
-    amazon-payments-modal(:amazon-payments='amazonPayments')
+    amazon-payments-modal(:amazon-payments-prop='amazonPayments')
     b-modal(:hide-footer='true', :hide-header='true', :id='"buy-gems"', size='lg')
       .container-fluid.purple-gradient
         .gemfall

website/client/components/settings/subscription.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   .standard-page
-    amazon-payments-modal(:amazon-payments='amazonPayments')
+    amazon-payments-modal(:amazon-payments-prop='amazonPayments')
 
     h1 {{ $t('subscription') }}
     .row

website/client/components/shops/seasonal/index.vue

@@ -372,12 +372,11 @@
         seasonal.featured.items = itemsNotOwned;
 
         // If we are out of gear, show the spells
-        // @TODO: Open this up when they are available.
         // @TODO: add dates to check instead?
-        // if (seasonal.featured.items.length === 0) {
+        if (seasonal.featured.items.length === 0) {
-        //   this.featuredGearBought = true;
+          this.featuredGearBought = true;
-        //   seasonal.featured.items = seasonal.featured.items.concat(seasonal.categories[0].items);
+          seasonal.featured.items = seasonal.featured.items.concat(seasonal.categories[0].items);
-        // }
+        }
 
         return seasonal;
       },

website/client/components/static/newStuff.vue

@@ -4,66 +4,70 @@
       .align-self-center.right-margin(:class='baileyClass')
       .media-body
         h1.align-self-center(v-markdown='$t("newStuff")')
-    h2 9/28/2017 - HABITICA'S WEBSITE LEVELS UP!
+    h2 10/2/2017 - SPOOKY SPARKLES, MOBILE UPDATES, AND BUG FIXES
     hr
-    p Welcome to the new Habitica! We're so excited to share it with you at last. This project, which has been a labor of love since last December, is the single biggest update that Habitica has ever released (with over 150 pages of designs, an entire rewrite of all of our front-end code, countless rounds of testing and iteration, and many, many meetings). Just refresh your page to load the new website!
+    .media
+      .media-body
+        h3 Spooky Sparkles and Seasonal Shop
+        p(v-markdown='"There\'s a new Gold-purchasable item in the Seasonal Shop: [Spooky Sparkles](/shops/seasonal)! Buy some and then cast it on your friends. I wonder what it will do?"')
+        p If you have Spooky Sparkles cast on you, you will receive the "Alarming Friends" badge! Don't worry, any mysterious effects will wear off the next day.... or you can cancel them early by buying an Opaque Potion!
+        p While you're at it, be sure to check out all the other items in the Seasonal Shop! There are lots of equipment items from the previous Fall Festivals. The Seasonal Shop will only be open until October 31st, so stock up now.
+        .small by Lemoness and SabreCat
+      .promo_spooky_sparkles
+    h3 Updates to iOS and Android Apps!
+    p(v-markdown='"There are exciting new updates to our [Android](https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica&hl=en) and [iOS](https://itunes.apple.com/us/app/habitica-gamified-task-manager/id994882113?mt=8) apps! In both, we\'ve updated the design of the Shops and your Rewards column. Plus, now you can pin items you want from Shops to your Rewards column! We hope this makes upgrading your avatar and earning Rewards from your tasks even more motivating."')
+    p Android users can also now reset their accounts via the app!
+    p In the iOS app, we've also added improved VoiceOver support for better accessibility. We welcome your feedback on this feature via the in-app "Send Feedback" option.
+    p We hope you enjoy the updates! Be sure to download them now for a better Habitica experience!
+    p If you like the improvements that we’ve been making to our apps, please consider reviewing these new versions. It really helps us out!
+    .small by viirus and piyorii
     .promo_login_screen.center-block
-    p(v-markdown="'You can find a full list of changes [here](http://habitica.wikia.com/wiki/Habitica_Redesign_Fact_Sheet), as well as explanations for why we made each, but here are a few quick tips to help you get oriented:'")
+    h3 New Post-Update Bug Fixes!
-    .grassy-meadow-backdrop
+    p Hello Habiticans! <3 We’ve released a big batch of bug fixes! Many thanks for your patience, and for taking the time to report these bugs. Some changes:
-      .daniel_front
     ul
-      li There's a ton of new art around the site! Peek at the NPCs and Guild chats to admire some of the changes.
+      li Due to concerns about accessibility and usability of the Tasks page, we’ve removed the scrollbars on the different Tasks columns.
-      li Click directly on your tasks to bring up the edit modal!
+      li Due to concerns about the skills bar being too large, we have released a new, more compact design! It should also now stay minimized once you’ve minimized it before, so that it won’t block your tasks all the time.
-      li The navigation bar contains several changes to be more intuitive for new users, so we recommend taking some time to open the drop-down menus and familiarize yourself with the new locations. Notably, the User menu has moved to an icon in the upper-right corner.
+      li Now you no longer need to click “Apply Filters” – they take automatic effect when you check them and uncheck them! The dropdown also closes when you move your mouse away, to further reduce the clicking required.
-      li You can now pin any purchasable item in the game to your Rewards. You can pin Backgrounds, too! Just hover over the shop icon and click the pin. When you head back to the tasks page, you'll see it in your Rewards column!
+      li Clicking “Scheduled” now correctly sorts your To-Dos by date
-      li There are lots of new filtering options, especially for Guilds and Challenges!
+      li Creating a task while a filter is selected now defaults to being tagged with that filter!
-      li There are visual upgrades for every aspect of the site, from the front page to the Seasonal Shop. We hope that you like them!
+      li Your Stables are now correctly configured so that the rows of pets and mounts don’t blend together on smaller screens!
-      li Some of these upgrades have made their way to our <a href='https://itunes.apple.com/us/app/habitica/id994882113?ls=1&mt=8' target='_blank'>iOS</a> and <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica' target='_blank'>Android</a> apps! Be sure to download the latest updates for the best performance.
+      li You can now click directly on a Mount to equip it!
-    .seasonal-shop-backdrop
+      li We’ve fixed a few bugs that were preventing some people from subscribing or buying gems, but some are remaining. Please be sure to report these in Report a Bug (linked below) and we will help you out ASAP!
-      .sorceress_front
+      li You should now be able to remove tasks when you leave a Challenge!
-    p Have general questions about how the new site works? Come ask in the <a href='https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a'>Habitica Help Guild</a>, and we'll be glad to assist! Likewise, if you encounter a persistent bug that isn't fixed by refreshing your page, you can report it in the <a href='https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac'>Report a Bug Guild</a> and we will investigate as soon as possible.
+      li You can edit Challenge Tags again!
-    p If you have thoughts about the new design, we look forward to hearing them. On <strong>October 12th</strong> we will be opening a Trello card for public comments on the redesign. This delay will give us time to focus our attention on answering general questions and fixing any bugs that might arise. For this reason, we ask that you hold back on sharing your feedback about the new designs until that Trello card is live and linked in a Bailey announcement. Thanks for understanding!
+      li We’ve fixed the confusing placement of the “Send” buttons in chat
-    .promo_veteran_pets_2017.center-block
+      li We’ve fixed some style issues that were causing the Quests to occasionally look strange
-    p This is a major time of change for Habitica, so to thank you for your patience, we've given everyone a Veteran Pet! Newer users have received a Veteran Wolf, and older users have received (depending on which pets they already had) a Veteran Tiger, a Veteran Lion, or a Veteran Bear. Head to the new <a href='https://habitica.com/inventory/stable'>Stable</a> page and filter to the Special Pets section to see the latest addition to your menagerie!"')
+      li When you edit a Guild, it will default to you as the leader
-    p We are so excited to continue to build Habitica with you. Now go check it out!
+      li The "Members" label is now called the "Member list" to help clarify that you can click it to see all the members of a Party, Guild, or Challenge!
-    p Thank you for playing, and good luck with your tasks <3
+      li If you have a pending quest, you can now see which members have accepted before you start your quest.
-    .small by Apollo, piyorii, TheHollidayInn, Paglias, Negue, Sabe, Alys, viirus, Lemoness, redphoenix, beffymaroo, and all our awesome testers!
+      li When you complete a quest, the final reward popups are appearing again!
+      li You can now edit Parties normally!
+      li You can now correctly allocate your Stat points without needing to refresh the page!
+      li If you opted out of choosing a class, it will no longer give you an unnecessary warning about costing 3 Gems.
+      li You can no longer accidentally block yourself from your profile.
+      li Mystic Hourglasses now only show in the header if you have more than one. (Thanks for subscribing!)
+      li Markdown works in Challenge titles again!
+      li You can now Clone Challenges again!
+      li The Bailey news loads on the mobile apps again!
+      li The red User ID notifications in the corner should be gone!
+      li(v-markdown='"Chat performance should be better. (We’re still investigating to make it even better, so please let us know in the [Report a Bug Guild](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) if chat lag is still happening to you!)"')
+    p(v-markdown='"Refresh the page to enjoy these fixes! If you’re still having trouble with them after refreshing the page, please let us know in the [Report a Bug Guild](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and we will investigate :) If you have feedback about the update that is not related to bugs or immediate accessibility issues, we’re opening a public Trello card for these comments on October 5!"')
+    p Thanks for being such a great community! It means a lot to us <3
     br
 </template>
 
 <style lang='scss' scoped>
   @import '~client/assets/scss/static.scss';
-
   .center-block {
-    margin: 0 auto;
+    margin: 0 auto 1em auto;
   }
 
-  .grassy-meadow-backdrop {
+  .right-margin {
-    background-image: url('~assets/images/npc/fall/tavern_background.png');
+    margin-right: 1em;
-    background-repeat: repeat-x;
-    width: 100%;
-    height: 246px;
   }
 
-  .daniel_front {
+  .small {
-    background-image: url('~assets/images/npc/fall/tavern_npc.png');
+    margin-bottom: 1em;
-    height: 246px;
-    width: 471px;
-    background-repeat: no-repeat;
-    margin: 0 auto;
-  }
-
-  .seasonal-shop-backdrop {
-    background: url('~assets/images/npc/fall/seasonal_shop_opened_background.png');
-    background-repeat: repeat-x;
-  }
-
-  .sorceress_front {
-    background-image: url('~assets/images/npc/fall/seasonal_shop_opened_npc.png');
-    height: 246px;
-    width: 471px;
-    background-repeat: no-repeat;
-    margin: 0 auto;
   }
 </style>
 

website/client/components/tasks/spells.vue

@@ -195,8 +195,9 @@ export default {
       this.castCancel();
     });
 
+    // @TODO: should we abstract the drawer state/local store to a library and mixing combo? We use a similar pattern in equipment
     const spellDrawerState = getLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE);
-    if (spellDrawerState === CONSTANTS.valueConstants.SPELL_DRAWER_CLOSED) {
+    if (spellDrawerState === CONSTANTS.valueConstants.DRAWER_CLOSED) {
       this.$store.state.spellOptions.spellDrawOpen = false;
     }
   },
@@ -211,11 +212,11 @@ export default {
       this.$store.state.spellOptions.spellDrawOpen = newState;
 
       if (newState) {
-        setLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE, CONSTANTS.valueConstants.SPELL_DRAWER_OPEN);
+        setLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE, CONSTANTS.valueConstants.DRAWER_OPEN);
         return;
       }
 
-      setLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE, CONSTANTS.valueConstants.SPELL_DRAWER_CLOSED);
+      setLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE, CONSTANTS.valueConstants.DRAWER_CLOSED);
     },
     spellDisabled (skill) {
       if (skill === 'frost' && this.user.stats.buffs.streaks) {

website/client/components/tasks/user.vue

@@ -374,6 +374,7 @@ export default {
   methods: {
     ...mapActions({setUser: 'user:set'}),
     checkMouseOver: throttle(function throttleSearch () {
+      if (this.editingTags) return;
       this.closeFilterPanel();
     }, 250),
     editTags () {

website/client/components/userMenu/profile.vue

@@ -111,7 +111,7 @@ div
           .achievement-icon.achievement-alien
           h2.text-center {{$t('challengesWon')}}
           div(v-for='chal in user.achievements.challenges')
-            span {{chal}}
+            span(v-markdown='chal')
             hr
         .col-6(v-if='user.achievements.quests')
           .achievement-icon.achievement-karaoke

website/client/libs/notifications.js

@@ -1,15 +1,17 @@
-export function getDropClass (item) {
+export function getDropClass ({type, key}) {
   let dropClass = '';
-  if (item) {
+
-    switch (item.type) {
+  if (type) {
+    switch (type) {
       case 'Egg':
-        dropClass = `Pet_Egg_${item.key}`;
+        dropClass = `Pet_Egg_${key}`;
         break;
       case 'HatchingPotion':
-        dropClass = `Pet_HatchingPotion_${item.key}`;
+        dropClass = `Pet_HatchingPotion_${key}`;
         break;
       case 'Food':
-        dropClass = `Pet_Food_${item.key}`;
+      case 'food':
+        dropClass = `Pet_Food_${key}`;
         break;
       case 'armor':
       case 'back':
@@ -19,11 +21,32 @@ export function getDropClass (item) {
       case 'headAccessory':
       case 'shield':
       case 'weapon':
-        dropClass = `shop_${item.key}`;
+      case 'gear':
+        dropClass = `shop_${key}`;
         break;
       default:
         dropClass = 'glyphicon glyphicon-gift';
     }
   }
+
   return dropClass;
 }
+
+export function getSign (number) {
+  let sign = '+';
+
+  if (number && number < 0) {
+    sign = '-';
+  }
+
+  return sign;
+}
+
+export function round (number, nDigits) {
+  return Math.abs(number.toFixed(nDigits || 1));
+}
+
+export function getXPMessage (val) {
+  if (val < -50) return; // don't show when they level up (resetting their exp)
+  return `${getSign(val)} ${round(val)}`;
+}

website/client/libs/userlocalManager.js

@@ -1,10 +1,12 @@
+// @TODO: This might become too generic. If so, check the refactor docs
 const CONSTANTS = {
   keyConstants: {
     SPELL_DRAWER_STATE: 'spell-drawer-state',
+    EQUIPMENT_DRAWER_STATE: 'equipment-drawer-state',
   },
   valueConstants: {
-    SPELL_DRAWER_CLOSED: 'spell-drawer-closed',
+    DRAWER_CLOSED: 'drawer-closed',
-    SPELL_DRAWER_OPEN: 'spell-drawer-open',
+    DRAWER_OPEN: 'drawer-open',
   },
 };
 

website/client/mixins/notifications.js

@@ -1,6 +1,6 @@
 import habiticaMarkdown from 'habitica-markdown';
 import { mapState } from 'client/libs/store';
-import { getDropClass } from 'client/libs/notifications';
+import { getDropClass, getXPMessage, getSign, round } from 'client/libs/notifications';
 
 export default {
   computed: {
@@ -22,8 +22,7 @@ export default {
       this.notify(this.$t(type, { val }), 'success');
     },
     exp (val) {
-      if (val < -50) return; // don't show when they level up (resetting their exp)
+      let message = getXPMessage(val);
-      let message = `${this.sign(val)} ${this.round(val)}`;
       this.notify(message, 'xp', 'glyphicon glyphicon-star', this.sign(val));
     },
     error (error) {
@@ -60,14 +59,10 @@ export default {
       this.notify(val, 'info', null, null, onClick);
     },
     sign (number) {
-      let sign = '+';
+      return getSign(number);
-      if (number && number < 0) {
-        sign = '-';
-      }
-      return sign;
     },
     round (number, nDigits) {
-      return Math.abs(number.toFixed(nDigits || 1));
+      return round(number, nDigits);
     },
     notify (html, type, icon, sign) {
       this.notifications.push({

website/client/mixins/payments.js

@@ -100,6 +100,11 @@ export default {
             return;
           }
 
+          if (data.groupId) {
+            this.$router.push(`/group-plans/${data.groupId}/task-information`);
+            return;
+          }
+
           window.location.reload(true);
         },
       });

website/client/store/actions/shops.js

@@ -70,28 +70,33 @@ export function unlock (store, params) {
   };
 }
 
-export function genericPurchase (store, params) {
+export async function genericPurchase (store, params) {
   switch (params.pinType) {
     case 'mystery_set':
       return purchaseMysterySet(store, params);
     case 'armoire': // eslint-disable-line
       let buyResult = buyArmoire(store.state.user.data);
 
-      // @TODO: We might need to abstract notifications to library rather than mixin
+      // We need the server result because armoir has random item in the result
-      if (buyResult[1]) {
+      let result = await axios.post('/api/v3/user/buy-armoire');
-        const resData = buyResult[0];
+      buyResult = result.data.data;
+
+      if (buyResult) {
+        const resData = buyResult;
         const item = resData.armoire;
 
+        const isExperience = item.type === 'experience';
+
+        // @TODO: We might need to abstract notifications to library rather than mixin
         store.state.notificationStore.push({
           title: '',
-          text: buyResult[1],
+          text: isExperience ? item.value : item.dropText,
-          type: item.type === 'experience' ? 'xp' : 'drop',
+          type: isExperience ? 'xp' : 'drop',
-          icon: item.type === 'experience' ? null : getDropClass({type: item.type, key: item.dropKey}),
+          icon: isExperience ? null : getDropClass({type: item.type, key: item.dropKey}),
           timeout: true,
         });
       }
 
-      axios.post('/api/v3/user/buy-armoire');
       return;
     case 'fortify': {
       let rerollResult = rerollOp(store.state.user.data);

website/client/store/index.js

@@ -134,6 +134,7 @@ export default function () {
       modalStack: [],
       userIdToMessage: '',
       brokenChallengeTask: {},
+      equipmentDrawerOpen: true,
     },
   });
 

website/common/locales/bg/character.json

@@ -125,7 +125,7 @@
     "mystery": "Тайнствен",
     "changeClass": "Промяна на класа, възстановяване на показателни точки",
     "lvl10ChangeClass": "За да промените класа си, трябва да бъдете поне ниво 10.",
-    "changeClassConfirmCost": "Are you sure you want to change your class for 3 Gems?",
+    "changeClassConfirmCost": "Наистина ли искате да смените класа си за 3 диаманта?",
     "invalidClass": "Неправилен клас. Моля, посочете един от следните: „warrior“, „rogue“, „wizard“ или „healer“.",
     "levelPopover": "Всяко ниво Ви дава една точка, която можете да разпределите на показател по свой избор. Можете да го направите ръчно или да оставите играта да реши вместо Вас, използвайки една възможностите за автоматично разпределяне.",
     "unallocated": "Неразпределени показателни точки",
@@ -159,7 +159,7 @@
     "respawn": "Възкръсване!",
     "youDied": "Вие умряхте!",
     "dieText": "Изгубихте ниво, всичкото си злато и случаен предмет от екипировката. Станете, хабитанецо, и опитайте отново! Обуздайте вредните навици, следете зорко изпълнението на ежедневните си задачи и дръжте смъртта на една ръка разстояние с Лековита отвара, ако залитнете!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 Gems.",
+    "sureReset": "Наистина ли искате това? Това ще нулира класа на героя Ви и разпределените точки (ще си ги получите обратно за повторно разпределение), както и ще струва 3 диаманта.",
     "purchaseFor": "Купуване за <%= cost %> диамант(а)?",
     "notEnoughMana": "Няма достатъчно мана.",
     "invalidTarget": "Не може да използвате умение върху това.",

website/common/locales/bg/groups.json

@@ -80,7 +80,7 @@
     "logoUrl": "Адрес на логото",
     "assignLeader": "Задаване на водач на групата",
     "members": "Членове",
-    "memberList": "Member List",
+    "memberList": "Списък на членовете",
     "partyList": "Подредба на членовете на групата",
     "banTip": "Изритване",
     "moreMembers": "още членове",
@@ -387,8 +387,8 @@
     "areYouSureDeleteMessage": "Наистина ли искате да изтриете това съобщение?",
     "reverseChat": "Обръщане на разговора",
     "invites": "Покани",
-    "details": "Details",
+    "details": "Подробности",
-    "participantDesc": "Once all members have either accepted or declined, the Quest begins. Only those that clicked 'accept' will be able to participate in the Quest and receive the drops.",
+    "participantDesc": "След като всички членове са приели или отказали, мисията започва. Само онези, които са натиснали „Приемам“, могат да участват в мисията и да им се падат предмети.",
-    "groupGems": "Group Gems",
+    "groupGems": "Групови диаманти",
-    "groupGemsDesc": "Guild Gems can be spent to make Challenges! In the future, you will be able to add more Guild Gems."
+    "groupGemsDesc": "Диамантите на гилдията могат да бъдат използвани за създаване на предизвикателства! В бъдеще ще можете да добавяте още диаманти в гилдията."
 }

website/common/locales/bg/limited.json

@@ -118,6 +118,6 @@
     "dateEndJune": "14 юни",
     "dateEndJuly": "29 юли",
     "dateEndAugust": "31 август",
-    "dateEndOctober": "October 31",
+    "dateEndOctober": "31 октомври",
     "discountBundle": "пакет"
 }

website/common/locales/bg/subscriber.json

@@ -19,7 +19,7 @@
     "exclusiveJackalopePetText": "Вземете царствено лилавия рогат заек, достъпен само за абонати!",
     "giftSubscription": "Искате ли да подарите някому абонамент?",
     "giftSubscriptionText1": "Отворете профила му! Можете да направите това като щракнете героя му в заглавната част на групата, в която сте заедно, или като щракнете името му в чата.",
-    "giftSubscriptionText2": "Click on the gift icon in the top right of their profile.",
+    "giftSubscriptionText2": "Натиснете иконката с подарък в горната дясна част на профила му.",
     "giftSubscriptionText3": "Изберете „абонамент“ и въведете своята платежна информация.",
     "giftSubscriptionText4": "Благодарим Ви за това, че подкрепяте Хабитика!",
     "monthUSD": "$ / месец",
@@ -70,7 +70,7 @@
     "subCanceled": "Абонаментът Ви изтича на",
     "buyGemsGoldTitle": "За да можете да купувате диаманти със злато",
     "becomeSubscriber": "Станете абонат",
-    "subGemPop": "Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.",
+    "subGemPop": "Тъй като сте абонат на Хабитика, всеки месец можете да купувате определен брой диаманти със злато.",
     "subGemName": "Диаманти от абонамента",
     "freeGemsTitle": "Получаване на безплатни диаманти",
     "maxBuyGems": "Не можете да купите повече диаманти този месец. Ограничението се премахва през първите три дни на всеки месец. Благодарим Ви за абонамента!",
@@ -176,7 +176,7 @@
     "paypalCanceled": "Абонаментът Ви е прекратен",
     "earnGemsMonthly": "Получавайте до **<%= cap %> диаманта** на месец",
     "receiveMysticHourglass": "Получете Тайнствен пясъчен часовник!",
-    "receiveMysticHourglasses": "Получете **<%= amount %> Тайнствени пясъчни часовници**!",
+    "receiveMysticHourglasses": "Получете **<%= amount %> Тайнствени пясъчни часовника**!",
     "everyMonth": "Всеки месец",
     "everyXMonths": "Всеки <%= interval %> месеца",
     "everyYear": "Всяка година",

website/common/locales/bg/tasks.json

@@ -7,7 +7,7 @@
     "editATask": "Редактиране на <%= type %>",
     "createTask": "Създаване на <%= type %>",
     "addTaskToUser": "Създаване",
-    "scheduled": "Планирано",
+    "scheduled": "С краен срок",
     "theseAreYourTasks": "Това са Вашите <%= taskType %>",
     "habit": "Навик",
     "habits": "Навици",
@@ -69,7 +69,7 @@
     "dueDate": "Крайна дата",
     "remaining": "Незавършени",
     "complete": "Завършени",
-    "complete2": "Завършено",
+    "complete2": "Завършени",
     "dated": "С краен срок",
     "today": "Днес",
     "dueIn": "Краен срок: <%= dueIn %>",

website/common/locales/de/character.json

@@ -125,7 +125,7 @@
     "mystery": "Überraschung",
     "changeClass": "Wechsle die Klasse und erhalte alle Attributpunkte zurück",
     "lvl10ChangeClass": "Um Deine Klasse zu ändern, musst Du mindestens auf Level 10 sein.",
-    "changeClassConfirmCost": "Are you sure you want to change your class for 3 Gems?",
+    "changeClassConfirmCost": "Bist Du Dir sicher, dass Du deine Klasse für 3 Edelsteine wechseln möchtest?",
     "invalidClass": "Ungültige Klasse. Bitte gib 'warrior', 'rogue', 'wizard' oder 'healer' an.",
     "levelPopover": "Jedes Level erhältst Du einen Punkt, den Du in ein Attribut Deiner Wahl setzen kannst. Du kannst Deine Punkte manuell verteilen, oder das Spiel entscheiden lassen indem Du eines der vorgegebenen Verteilungsmuster auswählst.",
     "unallocated": "Freie Attributpunkte",
@@ -159,7 +159,7 @@
     "respawn": "Auferstehen!",
     "youDied": "Du bist gestorben!",
     "dieText": "Du hast ein Level, Dein gesamtes Gold und einen zufälliges Teil Deiner Ausrüstung verloren. Erhebe Dich, Habiticaner, und versuche es erneut! Gebiete diesen schlechten Gewohnheiten Einhalt, sei gewissenhaft bei der Erfüllung Deiner täglichen Aufgaben und halte Dir den Tod mit Heiltränken vom Leib, wenn Du einmal straucheln solltest!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 Gems.",
+    "sureReset": "Bist Du sicher? Dies wird Deine Klasse und Attributpunkte zurücksetzen (Du erhältst alle Punkte zurück, um sie neu zuzuweisen). Es kostet 3 Edelsteine.",
     "purchaseFor": "Für <%= cost %> Edelsteine erwerben?",
     "notEnoughMana": "Nicht genug Mana.",
     "invalidTarget": "Du kannst Deine Fähigkeit hierauf nicht anwenden.",

website/common/locales/de/faq.json

@@ -51,8 +51,8 @@
     "faqQuestion12": "Wie bekämpfe ich einen Weltboss?",
     "iosFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
     "androidFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
-    "webFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual. You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party. A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change. You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
+    "webFaqAnswer12": "Weltbosse sind spezielle Monster, welche im Gasthaus erscheinen. Alle aktiven Benutzer kämpfen automatisch gegen den Boss und ihre Aufgaben und Fähigkeiten werden dem Boss wie üblich schaden. \n<br><br>\nDu kannst Dich gleichzeitig in einer normalen Quest befinden. Deine Aufgaben und Fähigkeiten werden sowohl beim Weltboss, sowie auch bei dem Boss/der Sammelquest von Deiner Gruppe dazugezählt. \n<br><br>\nEin Weltboss wird niemals Dich oder Deinen Account verletzten. Stattdessen hat dieser einen Raserei-Balken, welcher sich füllt, wenn Benutzer ihre täglichen Aufgaben überspringen. Falls der Raserei-Balken gefüllt ist, wird der Weltboss einen der Nicht-Spieler-Charakter der Seite angreifen und ihr Aussehen wird sich verändern.\n<br><br>\nDu kannst mehr über [frühere Weltbosse](http://habitica.wikia.com/wiki/World_Bosses) im Wiki erfahren",
     "iosFaqStillNeedHelp": "Wenn Du eine Frage hast, die hier oder im [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ) nicht beantwortet wurde, stelle sie im Gasthaus unter Soziales > Gasthaus-Chat! Wir helfen Dir gerne.",
     "androidFaqStillNeedHelp": "Wenn Du eine Frage hast, die hier oder im [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ) nicht beantwortet wurde, stelle sie im Gasthaus unter Soziales > Gasthaus-Chat! Wir helfen Dir gerne.",
-    "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! We're happy to help."
+    "webFaqStillNeedHelp": "Wenn Du eine Frage hast, die hier oder im [Wiki-FAQ](http://habitica.wikia.com/wiki/FAQ) nicht beantwortet wurde, stelle sie in der [Habitica-Hilfe-Gilde](https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Wir helfen Dir gerne."
 }

website/common/locales/de/front.json

@@ -41,7 +41,7 @@
     "forgotPassword": "Passwort vergessen?",
     "emailNewPass": "Einen Link per E-Mail senden, um das Passwort zurückzusetzen",
     "forgotPasswordSteps": "Tragen Sie die E-Mail-Adresse ein, mit der Sie Ihren Habitica-Account aktiviert haben.",
-    "sendLink": "Send Link",
+    "sendLink": "Link senden",
     "evagantzQuote": "Mein erster Zahnarztbesuch, bei dem die Assistentin tatsächlich begeistert über meine Zahnseide-Gewohnheiten war. Danke [Habitica]!",
     "examplesHeading": "Spieler benutzen Habitica, um folgendes zu organisieren ...",
     "featureAchievementByline": "Etwas total großartiges gemacht? Erhalte ein Abzeichen und prahle damit!",
@@ -105,7 +105,7 @@
     "marketing1Lead3Title": "Finde zufällige Preise",
     "marketing1Lead3": "Für einige ist es das Spielen, das sie motiviert: \"Glückspiel\". Habitica hat alles, was dazu gehört: Zuckerbrot und Peitsche: positiv, negativ, planbar und zufällig.",
     "marketing2Header": "Messe Dich mit Freunden, schließe Dich Interessensgruppen an",
-    "marketing2Lead1Title": "Social Productivity",
+    "marketing2Lead1Title": "Gesellschaftliche Produktivität",
     "marketing2Lead1": "Obwohl Du Habitica im Alleingang spielen kannst, wird es erst richtig spaßig, wenn Du anfängst, mit anderen zusammenzuarbeiten, zu wetteifern und sich gegenseitig zur Verantwortung zu ziehen. Der effektivste Teil von allen Persönlichkeitsentwicklungsprogrammen ist die soziale Verantwortlichkeit - und wo gibt es eine bessere Umgebung für Verantwortung und Wettkampf, als in einem Videospiel?",
     "marketing2Lead2Title": "Bezwinge Monster",
     "marketing2Lead2": "Was ist schon ein Rollenspiel ohne Kämpfe? Bekämpfe Monster mit Deiner Gruppe. Monster sind der \"super Verantwortlichkeitsmodus\": wenn Du an einem Tag nicht ins Fitnessstudio gehst, dann verletzt das Monster *alle!*",
@@ -113,7 +113,7 @@
     "marketing2Lead3": "Bei Wettbewerben kannst Du dich mit Freunden und Unbekannten messen. Wer sich bis zum Ende des Wettbewerbs am besten schlägt, gewinnt spezielle Preise.",
     "marketing3Header": "Apps und Erweiterungen",
     "marketing3Lead1": "Mit den **iPhone & Android** apps kannst Du alles von Unterwegs erledigen. Wir wissen, dass es manchmal schwierig ist die Webseite zu benutzen.",
-    "marketing3Lead2Title": "Integrations",
+    "marketing3Lead2Title": "Einbindungen",
     "marketing3Lead2": "Andere **Tools von Drittanbietern** binden Habitica in Bereiche Deines Lebens ein. Unser API stellt eine einfache Verknüpfung z.B. mit  [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US) her, die es ermöglicht, für das Besuchen unproduktiver Webseiten Punkte zu verlieren oder für das Besuchen produktiver Webseiten, Punkte zu erhalten. [Mehr dazu hier](http://habitica.wikia.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
     "marketing4Header": "Verwendung zur Organisation",
     "marketing4Lead1": "Bildung ist einer der besten Bereiche für Gamifizierung. Wir wissen alle, wie sehr Schüler heutzutage an ihren Handys und Spielen hängen. Nutze diese Macht! Lass Deine Schüler in freundlichen Wettbewerben gegeneinander antreten und belohne gutes Verhalten mit seltenen Preisen. Beobachte, wie sich ihre Noten und ihr Verhalten verbessern.",
@@ -275,21 +275,21 @@
     "heroIdRequired": "\"herold\" muss eine gültige UUID sein.",
     "cannotFulfillReq": "Deine Anfrage kann nicht erfüllt werden. Schreibe eine E-Mail an admin@habitica.com, falls dieser Fehler weiterhin auftritt.",
     "modelNotFound": "Diese Vorlage existiert nicht.",
-    "signUpWithSocial": "Sign up with <%= social %>",
+    "signUpWithSocial": "Bei <%= social %> registrieren",
-    "loginWithSocial": "Log in with <%= social %>",
+    "loginWithSocial": "Bei <%= social %> anmelden",
     "confirmPassword": "Passwort bestätigen",
     "usernamePlaceholder": "z.B., HabitRabbit",
     "emailPlaceholder": "z.B., rabbit@beispiel.com",
     "passwordPlaceholder": "z.B., ******************",
     "confirmPasswordPlaceholder": "Stelle sicher, dass es das gleiche Passwort ist!",
-    "joinHabitica": "Join Habitica",
+    "joinHabitica": "Habitica beitreten",
-    "alreadyHaveAccountLogin": "Already have a Habitica account? <strong>Log in.</strong>",
+    "alreadyHaveAccountLogin": "Du hast schon einen Habitica-Account? <strong>Anmelden.</strong>",
     "dontHaveAccountSignup": "Du hast noch keine Habitica Konto? <strong>Melde dich an.</strong>",
     "motivateYourself": "Motiviere Dich selber, Deine Ziele zu erreichen.",
     "timeToGetThingsDone": "It's time to have fun when you get things done! Join over 2.5 million Habiticans and improve your life one task at a time.",
-    "singUpForFree": "Sign Up For Free",
+    "singUpForFree": "Kostenlos registrieren",
-    "or": "OR",
+    "or": "ODER",
-    "gamifyYourLife": "Gamify Your Life",
+    "gamifyYourLife": "Mach Dein Leben zum Spiel",
     "aboutHabitica": "Habitica 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, Habitica can help you achieve your goals to become healthy, hard-working, and happy.",
     "trackYourGoals": "Track Your Habits and Goals",
     "trackYourGoalsDesc": "Stay accountable by tracking and managing your Habits, Daily goals, and To-Do list with Habitica’s easy-to-use mobile apps and web interface.",

website/common/locales/de/generic.json

@@ -132,9 +132,9 @@
     "audioTheme_luneFoxTheme": "Lunefox-Motiv",
     "audioTheme_rosstavoTheme": "Rosstavo-Motiv",
     "audioTheme_dewinTheme": "Dewins-Motiv",
-    "audioTheme_airuTheme": "Airu's-Set",
+    "audioTheme_airuTheme": "Airu's Melodie",
-    "audioTheme_beatscribeNesTheme": "Beatscribe's NES Motiv",
+    "audioTheme_beatscribeNesTheme": "Beatscribe's NES Melodie",
-    "audioTheme_arashiTheme": "Arashi's Motiv",
+    "audioTheme_arashiTheme": "Arashi's Melodie",
     "askQuestion": "Stelle eine Frage",
     "reportBug": "Melde einen Fehler",
     "HabiticaWiki": "Das Habitica-Wiki",
@@ -199,7 +199,7 @@
     "congratsCardAchievementTitle": "Gratulierender Gefährte",
     "congratsCardAchievementText": "Es ist großartig, die Erfolge seiner Freunde zu feiern! Hat <%= count %> Glückwunschkarten verschickt oder erhalten.",
     "getwellCard": "\"Gute Besserung\"-Karte",
-    "getwellCardExplanation": "Ihr beide erhaltet die 'sich kümmernder Vertrauter' Erfolg!",
+    "getwellCardExplanation": "Ihr beide erhaltet den 'sich kümmernder Vertrauter' Erfolg!",
     "getwellCardNotes": "Sende einem Gruppenmitglied eine Gute-Besserung-Karte.",
     "getwell0": "Hoffentlich geht's Dir bald besser!",
     "getwell1": "Achte auf Dich! <3",
@@ -256,18 +256,18 @@
     "self_care": "Selbstfürsorge",
     "habitica_official": "Habitica offiziell",
     "academics": "Akademiker",
-    "advocacy_causes": "Advocacy + Causes",
+    "advocacy_causes": "Interessengruppen",
     "entertainment": "Unterhaltung",
     "finance": "Finanzen",
     "health_fitness": "Gesundheit + Fitness",
     "hobbies_occupations": "Hobby + Beruf",
     "location_based": "Ortsspezifisch",
     "mental_health": "Geistige Gesundheit + Selbstfürsorge",
-    "getting_organized": "Getting Organized",
+    "getting_organized": "Organisierter Werden",
     "self_improvement": "Selbstverbesserung",
     "spirituality": "Spiritualität",
     "time_management": "Zeitmanagement + Verantwortlichkeit",
-    "recovery_support_groups": "Recovery + Support Groups",
+    "recovery_support_groups": "Heilung + Selbsthilfegruppen",
     "messages": "Nachrichten",
     "emptyMessagesLine1": "Du hast im Moment keine Nachrichten",
     "emptyMessagesLine2": "Beginne eine Unterhaltung, indem Du eine Nachricht verschickst!",

website/common/locales/de/limited.json

@@ -118,6 +118,6 @@
     "dateEndJune": "14. Juni",
     "dateEndJuly": "29. Juli",
     "dateEndAugust": "31. August",
-    "dateEndOctober": "October 31",
+    "dateEndOctober": "31. Oktober",
     "discountBundle": "Paket"
 }

website/common/locales/de/npc.json

@@ -11,7 +11,7 @@
     "introTour": "Los geht's! Basierend auf Deinen Interessen, habe ich Dir ein paar Aufgaben erstellt, damit Du gleich loslegen kannst. Klicke auf eine Aufgabe um sie zu bearbeiten oder erstelle neue Aufgaben, wie Du sie brauchst!",
     "prev": "Zurück",
     "next": "Vor",
-    "randomize": "Randomize",
+    "randomize": "Zufällig anordnen",
     "mattBoch": "Matt Boch",
     "mattShall": "Soll ich Dir Dein Ross bringen, <%= name %>? Sobald Du einem Haustier so viel Futter gegeben hast, dass es zu einem Reittier werden konnte, wird es hier erscheinen. Klicke auf ein Reittier um aufzusteigen!",
     "mattBochText1": "Willkommen im Stall! Ich bin Matt, der Bestienmeister. Ab Level 3 kannst Du mit Hilfe von Eiern und Elixieren Haustiere ausbrüten. Wenn Du auf dem Marktplatz ein Haustier schlüpfen lässt, wird es hier erscheinen! Klicke auf ein Haustier, um es Deinem Avatar hinzuzufügen. Füttere Deine Tiere mit dem Futter, das Du ab Level 3 findest, damit sie zu mächtigen Reittieren heranwachsen.",
@@ -94,7 +94,7 @@
     "alreadyUnlocked": "Komplettes Set ist bereits freigeschaltet.",
     "alreadyUnlockedPart": "Set ist bereits teilweise freigeschaltet.",
     "USD": "(USD)",
-    "newStuff": "New Stuff by [Bailey](https://twitter.com/Mihakuu)",
+    "newStuff": "Neuigkeiten von [Bailey](https://twitter.com/Mihakuu)",
     "cool": "Erzähl es mir später",
     "dismissAlert": "Als gelesen markieren",
     "donateText1": "Fügt Deinem Konto 20 Edelsteine hinzu. Edelsteine werden benutzt um Spielgegenstände wie Shirts und Frisuren zu kaufen.",
@@ -128,7 +128,7 @@
     "tourScrollDown": "Gehe sicher, dass Du auch ganz nach unten scrollst um alle Optionen zu sehen! Klicke erneut auf Deinen Avatar um zur Aufgabenseite zurückzukehren.",
     "tourMuchMore": "Wenn Du Aufgaben erledigt hast, kannst Du mit Freunden eine Gruppe gründen, Dich in den Gilden nach Gesprächen über verschiedene Themen umsehen, Wettbewerben beitreten und vieles mehr!",
     "tourStatsPage": "Auf dieser Seite kannst Du Deine Statuswerte im Auge behalten. Erreiche neue Erfolge indem Du die aufgelisteten Aufgaben erledigst.",
-    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Pause Damage\". Come say hi!",
+    "tourTavernPage": "Willkommen im Gasthaus, einem Gesprächsraum für alle Altersklassen! Falls Du krank bist oder verreist, kannst Du verhindern, dass Du Leben durch nicht erledigte tägliche Aufgaben verlierst, indem Du auf \"Im Gasthaus erholen\" klickst. Komm herein und sag Hallo!",
     "tourPartyPage": "Deine Gruppe wird Dir dabei helfen weiterhin verantwortungsbewusst Deine Aufgaben zu erledigen. Lade Freunde ein um neue Quest-Schriftrollen freizuschalten!",
     "tourGuildsPage": "Gilden sind Chatgruppen mit einem gemeinsamen Interesse. Sie sind von Spielern für Spieler erstellt worden. Durchforste die Liste und tritt den Gilden bei, die Dich interessieren. Schau dir auch einmal die Habitica Help: Ask a Question Gilde an, in der jeder Fragen über Habitica stellen kann!",
     "tourChallengesPage": "Wettbewerbe sind themenbezogene Aufgabenlisten, welche von Benutzern erstellt wurden! Wenn Du an einem Wettbewerb teilnimmst, werden die Aufgaben Deinem Konto hinzugefügt. Trete gegen andere Benutzer an, um Edelsteine zu gewinnen!",

website/common/locales/de/overview.json

@@ -7,8 +7,8 @@
   "step2": "Schritt 2: Sammel Punkte indem du im wirklichen Leben Dinge erledigst",
   "webStep2Text": "Fange nun damit an, Ziele von Deiner Liste anzugehen! Indem Du Aufgaben erledigst und in Habitica abhakst, erhältst Du [Erfahrung](http://de.habitica.wikia.com/wiki/Erfahrungspunkte), die Dich Level aufsteigen lässt, und [Gold](http://de.habitica.wikia.com/wiki/Goldpunkte), das es Dir ermöglicht, Belohnungen zu erwerben. Wenn Du schlechten Gewohnheiten verfällst oder Tägliche Aufgaben verpasst, verlierst Du [Lebenspunkte](http://de.habitica.wikia.com/wiki/Lebenspunkte). Auf diese Weise dienen die Habitica Erfahrungs- und Lebenspunkt-Leiste als unterhaltsame Anzeige des Fortschritts hin zu Deinen Zielen. Dein echtes Leben wird sich sichtbar verbessern, während Dein Charakter im Spiel vorankommt.",
 
-  "step3": "Schritt 3: Entdecke Habitica und passe es Deinen Bedürfnissen an",
+  "step3": "Schritt 3: Entdecke Habitica und passe es deinen Bedürfnissen an",
   "webStep3Text": "Once you're familiar with the basics, you can get even more out of Habitica with these nifty features:\n * Organize your tasks with [tags](http://habitica.wikia.com/wiki/Tags) (edit a task to add them).\n * Customize your [avatar](http://habitica.wikia.com/wiki/Avatar) by clicking the user icon in the upper-right corner.\n * Buy your [Equipment](http://habitica.wikia.com/wiki/Equipment) under Rewards or from the [Shops](/shops/market), and change it under [Inventory > Equipment](/inventory/equipment).\n * Connect with other users via the [Tavern](http://habitica.wikia.com/wiki/Tavern).\n * Starting at Level 3, hatch [Pets](http://habitica.wikia.com/wiki/Pets) by collecting [eggs](http://habitica.wikia.com/wiki/Eggs) and [hatching potions](http://habitica.wikia.com/wiki/Hatching_Potions). [Feed](http://habitica.wikia.com/wiki/Food) them to create [Mounts](http://habitica.wikia.com/wiki/Mounts).\n * At level 10: Choose a particular [class](http://habitica.wikia.com/wiki/Class_System) and then use class-specific [skills](http://habitica.wikia.com/wiki/Skills) (levels 11 to 14).\n * Form a party with your friends (by clicking [Party](/party) in the navigation bar) to stay accountable and earn a Quest scroll.\n * Defeat monsters and collect objects on [quests](http://habitica.wikia.com/wiki/Quests) (you will be given a quest at level 15).",
 
-  "overviewQuestions": "Have questions? Check out the [FAQ](/static/faq/)! If your question isn't mentioned there, you can ask for further help in the [Habitica Help guild](/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a).\n\nGood luck with your tasks!"
+  "overviewQuestions": "Du hast Fragen? Schau doch einmal in die [FAQ](https://habitica.com/static/faq/)! Wenn Du Deine Frage hier nicht findest, kannst du in der [Habitica-Help-Gilde](https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a) nach Hilfe fragen. \n\nViel Glück mit Deinen Aufgaben!"
 }

website/common/locales/de/quests.json

@@ -8,7 +8,7 @@
     "unlockableQuests": "Freischaltbare Quests",
     "goldQuests": "Mit Gold käufliche Quests",
     "questDetails": "Quest-Details",
-    "questDetailsTitle": "Quest Details",
+    "questDetailsTitle": "Quest-Details",
     "questDescription": "Quests allow players to focus on long-term, in-game goals with the members of their party.",
     "invitations": "Einladungen",
     "completed": "abgeschlossen!",
@@ -102,7 +102,7 @@
     "noActiveQuestToLeave": "Keine Quest zum Verlassen aktiv",
     "questLeaderCannotLeaveQuest": "Quest-Leiter können die Quest nicht verlassen",
     "notPartOfQuest": "Du nimmst nicht an der Quest teil",
-    "youAreNotOnQuest": "You're not on a quest",
+    "youAreNotOnQuest": "Du bist kein Teilnehmer einer Quest",
     "noActiveQuestToAbort": "Es ist keine Quest zum Abbruch aktiv.",
     "onlyLeaderAbortQuest": "Nur der Gruppen- oder Quest-Leiter kann die Quest abbrechen.",
     "questAlreadyRejected": "Du hast die Questeinladung bereits abgelehnt.",

website/common/locales/es/backgrounds.json

@@ -201,7 +201,7 @@
     "backgroundOrchardText": "Huerto de árboles frutales",
     "backgroundOrchardNotes": "Coge fruta madura en el huerto.",
     "backgrounds102016": "29.ª serie: octubre del 2016",
-    "backgroundSpiderWebText": "Tela de Araña",
+    "backgroundSpiderWebText": "Telaraña",
     "backgroundSpiderWebNotes": "Quédate atrapado en una tela de araña.",
     "backgroundStrangeSewersText": "Alcantarillas Extrañas",
     "backgroundStrangeSewersNotes": "Deslízate por las Alcantarillas Extrañas.",
@@ -291,10 +291,10 @@
     "backgroundSummerFireworksText": "Fuegos Artificiales de Verano",
     "backgroundSummerFireworksNotes": "¡Celebra el Día del Nombramiento de Habitica con Fuegos Artificiales de Verano!",
     "backgrounds092017": "SET 40: Released September 2017",
-    "backgroundBesideWellText": "Beside a Well",
+    "backgroundBesideWellText": "Al lado de un pozo",
-    "backgroundBesideWellNotes": "Stroll Beside a Well.",
+    "backgroundBesideWellNotes": "Paseo junto a un pozo.",
-    "backgroundGardenShedText": "Garden Shed",
+    "backgroundGardenShedText": "Cobertizo de jardín",
-    "backgroundGardenShedNotes": "Work in a Garden Shed.",
+    "backgroundGardenShedNotes": "Trabajo en un cobertizo de jardín",
-    "backgroundPixelistsWorkshopText": "Pixelist's Workshop",
+    "backgroundPixelistsWorkshopText": "Taller de Pixelist",
-    "backgroundPixelistsWorkshopNotes": "Create masterpieces in the Pixelist's Workshop."
+    "backgroundPixelistsWorkshopNotes": "Crea una obra maestra en el Taller de Pixelist"
 }

website/common/locales/fr/character.json

@@ -68,8 +68,8 @@
     "costumeText": "Si vous préférez l'apparence d'un équipement différent de celui que vous avez équipé, choisissez \"Utiliser un costume\" pour porter en costume le look de votre choix, tout en conservant les bonus de votre tenue de combat.",
     "useCostume": "Utiliser un costume",
     "useCostumeInfo1": "Cliquez sur \"Utiliser un costume\" pour mettre des vêtements à votre avatar sans modifier les statistiques de votre tenue de combat ! Vous pouvez donc vous armer des meilleures statistiques à gauche et déguiser votre avatar avec l'équipement à droite.",
-    "useCostumeInfo2": "Une fois cliqué sur \"Utiliser Costume\", votre avatar aura l'air assez basique... mais ne vous inquiétez pas ! Regardez à gauche, vous verrez que votre tenue de combat est toujours équipée. À présent, vous pouvez faire de belles choses ! Tout ce que vous équipez sur la droite n'affectera en rien vos stats mais vous donnera un air stupéfiant. Essayez différentes combinaisons, mélangez les sets et accordez votre Costume avec vos animaux, vos montures et vos arrières-plan.<br><br>Des questions ? Jetez un oeil sur <a href=\"http://habitica.wikia.com/wiki/Equipment#Costumes\">la page des Costume</a> sur le wiki. Une fois votre parfait ensemble trouvé, affichez-le dans la <a href=\"/groups/guild/3884eeaa-2d6a-45e8-a279-ada6de9709e1\">carnaval des costumes en guilde</a> ou à la taverne !",
+    "useCostumeInfo2": "Lorsque vous cliquez sur \"Utiliser un costume\", votre avatar aura l'air plutôt basique... mais pas d'inquiétude ! Si vous regardez à gauche, vous verrez que votre tenue de combat est toujours active. Ensuite, vous pouvez faire jouer votre imagination ! Tout ce que vous activez à droite ne modifiera pas vos statistiques mais peut vous donner un look d'enfer. Essayez différentes associations en mélangeant les ensembles et en accordant votre costume avec vos familiers, montures et arrière-plans. <br><br>Vous avez d'autres questions ? Allez voir la <a href=\"http://fr.habitica.wikia.com/wiki/%C3%89quipement#Costumes\">page sur les costumes</a> sur le wiki. Vous avez trouvé l'ensemble parfait ? Exhibez-le sur la <a href=\"/#/options/groups/guilds/3884eeaa-2d6a-45e8-a279-ada6de9709e1\">guilde du festival des costumes </a> ou fanfaronnez à la taverne !",
-    "costumePopoverText": "Sélectionnez \"Utiliser Costume\" pour mettre des vêtements à votre avatar sans modifier les statistiques de votre tenue de combat ! Cela signifie que vous pouvez habiller votre avatar de n'importe quelle tenue que vous aimez tout en conservant votre meilleure tenue de combat.",
+    "costumePopoverText": "Sélectionnez \"Utiliser un costume\" pour équiper votre avatar sans modifier les statistiques de votre tenue de combat ! Cela signifie que vous pouvez habiller votre avatar de n'importe quelle tenue que vous aimez, tout en conservant votre meilleure tenue de combat.",
     "autoEquipPopoverText": "Sélectionnez cette option pour vous équiper automatiquement d'une tenue dès que vous l'achetez.",
     "costumeDisabled": "Vous avez désactivé l'utilisation du costume.",
     "gearAchievement": "Vous avez gagné le succès \"Armé jusqu'aux dents\" pour avoir atteint le niveau maximal de l'ensemble d'équipement de votre classe ! Vous avez acquis les ensembles complets suivants:",
@@ -125,7 +125,7 @@
     "mystery": "Mystère",
     "changeClass": "Changer de classe et rembourser les points d'attribut.",
     "lvl10ChangeClass": "Vous devez être au moins au niveau 10 pour changer de classe.",
-    "changeClassConfirmCost": "Are you sure you want to change your class for 3 Gems?",
+    "changeClassConfirmCost": "Êtes-vous sûr de vouloir changer de classe pour 3 gemmes ?",
     "invalidClass": "Classe invalide. Veuillez préciser 'warrior,' 'rogue,' 'wizard,' ou 'healer.'",
     "levelPopover": "Vous pouvez affecter un point à un attribut de votre choix à chaque niveau gagné. Cette attribution peut se faire manuellement ou en laissant le jeu décider pour vous, en utilisant une des options d'Attribution Automatique.",
     "unallocated": "Points d'attribut non alloués",
@@ -168,7 +168,7 @@
     "youCastParty": "Vous avez lancé <%= spell %> pour l'équipe.",
     "critBonus": "Coup critique ! Bonus :",
     "gainedGold": "Vous gagnez de l'or",
-    "gainedMana": "Vous gagnez de la mana",
+    "gainedMana": "Vous gagnez du mana",
     "gainedHealth": "Vous gagnez de la vie",
     "gainedExperience": "Vous gagnez de l'expérience",
     "lostGold": "Vous avez dépensé de l'or",
@@ -207,9 +207,9 @@
     "totalLogins": "Total de connexions",
     "latestCheckin": "Dernière connexion",
     "editProfile": "Modifier le profil",
-    "challengesWon": "Défis gagnés",
+    "challengesWon": "Défis remportés",
     "questsCompleted": "Quêtes complétées",
-    "headGear": "Casque",
+    "headGear": "Couvre-chef",
     "headAccess": "Accessoire de tête",
     "backAccess": "Accessoire dorsal",
     "bodyAccess": "Accessoire de torse",

website/common/locales/fr/communityguidelines.json

@@ -13,7 +13,7 @@
     "commGuideList01C": "<strong>Un esprit d'entraide.</strong>Les Habiticiens et Habiticiennes acclament les victoires des leurs compatriotes et se réconfortent durant les jours difficiles. Nous échangeons nos forces, comptons sur les autres, et apprenons des autres. Au sein des équipes, nous faisons cela grâce à nos sortilèges ; dans les lieux d’échanges, avec des mots de soutien et d'encouragements.",
     "commGuideList01D": "<strong>Une attitude respectueuse.</strong> Nous avons tous et toutes des passés différents, différentes compétences et différentes opinions. C’est en partie ce qui rend notre communauté si merveilleuse ! Les Habiticiens et Habiticiennes respectent les différences et s'en réjouissent. Restez un peu parmi nous, et vous aurez bientôt des acolytes de tous les horizons.",
     "commGuideHeadingMeet": "Rencontrez l'équipe derrière Habitica et ses modérateurs !",
-    "commGuidePara006": "Habitica compte plusieurs chevaliers-errants qui unissent leurs forces avec celles des membres de l'équipe d'administration afin de préserver le calme et le contentement de la communauté et de la protéger des trolls. Tous et toutes ont leur domaine spécifique, mais certains peuvent être appelés à l'occasion à servir dans d'autres sphères sociales. Les administrateurs et les modérateurs précèdent souvent leurs déclarations officielles par les mots \"Mod Talk\" ou \"Mod Hat On\".",
+    "commGuidePara006": "Habitica compte plusieurs chevaliers-errants qui unissent leurs forces avec celles des membres de l'équipe d'administration afin de préserver le calme et le contentement de la communauté et de la protéger des trolls. Tous et toutes ont leur domaine spécifique, mais certains peuvent être parfois appelés à servir dans d'autres sphères sociales. Les administrateurs et les modérateurs précèdent souvent leurs déclarations officielles par les mots \"Mod Talk\" ou \"Mod Hat On\".",
     "commGuidePara007": "Les membres du staff ont une étiquette de couleur pourpre, marquée d'une couronne. Ils portent le titre \"Héroïque\".",
     "commGuidePara008": "Les Mods ont une étiquette bleu foncé, marquée d'une étoile. Leur titre est \"Gardien\". Bailey fait exception ; étant un PNJ, son étiquette est noire et verte, surmontée d'une étoile.",
     "commGuidePara009": "Les membres actuels du staff sont (de gauche à droite) :",
@@ -90,7 +90,7 @@
     "commGuideList04H": "Assurez-vous que le contenu du wiki est pertinent pour l’ensemble de Habitica et pas seulement pour une guilde ou une équipe particulière (de telles informations peuvent être déplacées dans les forums)",
     "commGuidePara049": "Les personnes suivantes sont actuellement admins du wiki :",
     "commGuidePara049A": "Les modérateurs suivants peuvent procéder à des modifications urgentes, quand une modération est nécessaire et que les administrateurs cités plus haut sont indisponibles :",
-    "commGuidePara018": "Wiki Administrators Emeritus are:",
+    "commGuidePara018": "Les Administrateurs et Administratrices Émérites du wiki sont :",
     "commGuideHeadingInfractionsEtc": "Infractions, Conséquences et Restauration",
     "commGuideHeadingInfractions": "Infractions",
     "commGuidePara050": "La vaste majorité des Habiticiens et Habiticiennes est respectueuse, assiste les autres et travaille à faire de la communauté un espace agréable et amical. Cependant, il peut arriver qu’une personne enfreigne l’une des règles énoncées ci-dessus. Lorsque cela arrive, les Mods peuvent prendre les mesures qu’ils jugent nécessaires pour que Habitica reste un endroit sain et agréable pour tout le monde.",

website/common/locales/fr/front.json

@@ -110,7 +110,7 @@
     "marketing2Lead2Title": "Combattez des monstres",
     "marketing2Lead2": "Qu'est-ce qu'un jeu de rôle sans batailles ? Combattez des monstres avec votre équipe. Les monstres sont \"en mode super responsable\" - un jour ou vous loupez la gym c'est un jour où le monstre attaque tout le monde!",
     "marketing2Lead3Title": "Défiez vous les uns les autre",
-    "marketing2Lead3": "Les défis vous permettent de vous confronter avec des amis et des étrangers. Quiconque est le meilleur à la fin d'un défis gagne des prix spéciaux. ",
+    "marketing2Lead3": "Les <strong>défis</strong> vous permettent d'être en compétition avec vos amis ou des étrangers. Celui qui a fait de son mieux à la fin du défi gagne des prix spéciaux.",
     "marketing3Header": "Applications et extensions",
     "marketing3Lead1": "Les applications iPhone et Android vous permettent de vous occuper de vos affaires en déplacement. Nous somme conscient que se connecter sur le site web pour cliquer sur des boutons peut être un frein.",
     "marketing3Lead2Title": "Intégrations",
@@ -245,9 +245,9 @@
     "altAttrSlack": "Slack",
     "missingAuthHeaders": "En-têtes d'authentification manquants.",
     "missingAuthParams": "Paramètres d'authentification manquants.",
-    "missingUsernameEmail": "Il manque le nom de connexion ou l'email.",
+    "missingUsernameEmail": "Il manque le nom d'utilisateur ou l'adresse courriel.",
     "missingEmail": "Courriel manquant.",
-    "missingUsername": "Il manque le nom de connexion",
+    "missingUsername": "Il manque le nom d'utilisateur.",
     "missingPassword": "Mot de passe manquant.",
     "missingNewPassword": "Nouveau mot de passe manquant.",
     "invalidEmailDomain": "Vous ne pouvez pas vous enregistrer avec une adresse courriel appartenant aux domaines suivants : %= domains %>",

website/common/locales/fr/gear.json

@@ -238,7 +238,7 @@
     "weaponSpecialFall2017MageText": "Bâton effrayant",
     "weaponSpecialFall2017MageNotes": "La magie et le mystère irradient des yeux du crâne brillant à l'extrémité de ce bâton. Augmente l'Intelligence de <%= int %> et la Perception de <%= per %>. Équipement en édition limitée de l'automne 2017.",
     "weaponSpecialFall2017HealerText": "Candélabre horrifique",
-    "weaponSpecialFall2017HealerNotes": "Cette lumière désenchante la peur et laisse savoir aux autres que vous êtes là pour les aider. Augmente l'intelligence de <%= int %>. Équipement d'automne 2017 en édition limitée.",
+    "weaponSpecialFall2017HealerNotes": "Cette lumière désamorce la peur et fait savoir aux autres que vous êtes là pour les aider. Augmente l'Intelligence de <%= int %>. Équipement en édition limitée de l'automne 2017.",
     "weaponMystery201411Text": "Fourche festive",
     "weaponMystery201411Notes": "Embrochez vos ennemis ou plantez-la dans votre nourriture préférée : cette fourche multi-fonctions peut tout faire ! N'apporte aucun bonus. Équipement d'abonné·e de novembre 2014.",
     "weaponMystery201502Text": "Bâton chatoyant ailé d'amour et aussi de vérité",

website/common/locales/fr/generic.json

@@ -239,30 +239,30 @@
     "categories": "Catégories",
     "habiticaOfficial": "Habitica officiel",
     "animals": "Animaux",
-    "artDesign": "Art & Design",
+    "artDesign": "Art & design",
     "booksWriting": "Livres et écritures",
-    "comicsHobbies": "BD & Loisirs",
+    "comicsHobbies": "BD & loisirs",
     "diyCrafts": "DIY & fabrications",
     "education": "Éducation",
-    "foodCooking": "Cuisine & Nourriture",
+    "foodCooking": "Cuisine & nourriture",
-    "healthFitness": "Santé & Fitness",
+    "healthFitness": "Santé & fitness",
     "music": "Musique",
     "relationship": "Relationnel",
-    "scienceTech": "Sciences & Technologies",
+    "scienceTech": "Sciences & technologies",
     "exercise": "Sport",
     "creativity": "Créativité",
     "budgeting": "Budget",
-    "health_wellness": "Santé & Bien-être",
+    "health_wellness": "Santé & bien-être",
     "self_care": "Développement personnel",
     "habitica_official": "Habitica officiel",
     "academics": "Études",
-    "advocacy_causes": "Engagement + Causes",
+    "advocacy_causes": "Engagement + causes",
     "entertainment": "Divertissements",
     "finance": "Finance",
-    "health_fitness": "Santé + Fitness",
+    "health_fitness": "Santé + fitness",
-    "hobbies_occupations": "Loisirs + Occupations",
+    "hobbies_occupations": "Loisirs + occupations",
     "location_based": "Localisé",
-    "mental_health": "Psychologie + Développement personnel",
+    "mental_health": "Psychologie + développement personnel",
     "getting_organized": "Organisation",
     "self_improvement": "Epanouissement",
     "spirituality": "Spiritualité",

website/common/locales/fr/groups.json

@@ -7,12 +7,12 @@
     "innTextBroken": "Vous êtes installé à l'auberge, je suppose... Tant que vous y séjournez, vous n'êtes pas affecté par vos Quotidiennes à la fin de la journée, mais elles vont tout de même se remettre à zéro tous les jours... Si vous êtes en pleine quête contre un boss, il pourra toujours vous blesser pour les Quotidiennes manquées par les membres de votre équipe... sauf s'ils séjournent aussi à l'auberge... De plus, vous ne pourrez vous-même blesser le boss (ou récolter des objets) que lorsque vous quitterez l'auberge... si fatigué...",
     "helpfulLinks": "Liens utiles",
     "communityGuidelinesLink": "Règles de vie en communauté",
-    "lookingForGroup": "Postes de recherche de groupe (recherche d'équipe)",
+    "lookingForGroup": "Messages de recherche de groupe (\"Party Wanted\")",
     "dataDisplayTool": "Outil d'affichage des données",
     "reportProblem": "Signaler un bug",
     "requestFeature": "Demander une fonctionnalité",
     "askAQuestion": "Poser une question",
-    "askQuestionGuild": "Poser une question (Guilde d'aide Habitica)",
+    "askQuestionGuild": "Poser une question (Guilde d'aide de Habitica)",
     "contributing": "Contribuer",
     "faq": "FAQ",
     "lfgPosts": "Sujets de recherche de groupe (Recherche d'équipe)",
@@ -385,7 +385,7 @@
     "upgrade": "Améliorer",
     "selectPartyMember": "Sélectionner un Membre de l’Équipe ",
     "areYouSureDeleteMessage": "Êtes-vous sûr de vouloir supprimer ce message ?",
-    "reverseChat": "Inverser le fil de discussiono",
+    "reverseChat": "Inverser le fil de discussion",
     "invites": "Invitations",
     "details": "Details",
     "participantDesc": "Once all members have either accepted or declined, the Quest begins. Only those that clicked 'accept' will be able to participate in the Quest and receive the drops.",

website/common/locales/fr/messages.json

@@ -21,9 +21,9 @@
     "messageNotEnoughGold": "Pas assez d'Or",
     "messageTwoHandedEquip": "Manier ceci demande deux mains : <%= twoHandedText %>. Vous ne portez donc plus ceci : <%= offHandedText %>.",
     "messageTwoHandedUnequip": "Manier ceci demande deux mains : <%= twoHandedText %>. Vous ne le portez donc plus car vous vous avez saisi ceci : <%= offHandedText %>.",
-    "messageDropFood": "Vous avez trouvé <%= dropArticle %><%= dropText %> ! ",
+    "messageDropFood": "Vous avez trouvé une <%= dropArticle %><%= dropText %> ! ",
     "messageDropEgg": "Vous avez trouvé un œuf de <%= dropText %> !",
-    "messageDropPotion": "Vous avez trouvé une Potion d'Éclosion de <%= dropText %>",
+    "messageDropPotion": "Vous avez trouvé une potion d'éclosion <%= dropText %> !",
     "messageDropQuest": "Vous avez trouvé une quête !",
     "messageDropMysteryItem": "Vous ouvrez la boite et trouvez <%= dropText %> !",
     "messageFoundQuest": "Vous avez trouvé la quête \"<%= questText %>\" !",
@@ -37,7 +37,7 @@
     "messageInsufficientGems": "Pas assez de gemmes!",
     "messageAuthPasswordMustMatch": ":password et :confirmPassword ne correspondent pas",
     "messageAuthCredentialsRequired": ":username, :email, :password, :confirmPassword requis",
-    "messageAuthUsernameTaken": "Le nom de connexion est déjà pris",
+    "messageAuthUsernameTaken": "Nom d'utilisateur déjà pris",
     "messageAuthEmailTaken": "Adresse courriel déjà prise.",
     "messageAuthNoUserFound": "Utilisateur introuvable.",
     "messageAuthMustBeLoggedIn": "Vous devez être connecté.",

website/common/locales/fr/npc.json

@@ -8,7 +8,7 @@
     "justinIntroMessage1": "Bonjour bonjour ! On dirait que vous venez tout juste d'arriver. Je m'appelle Justin, votre guide dans Habitica.",
     "justinIntroMessage2": "Pour commencer, vous aurez besoin d'un avatar.",
     "justinIntroMessage3": "Great! Now, what are you interested in working on throughout this journey?",
-    "introTour": "Here we are! I've filled out some Tasks for you based on your interests, so you can get started right away. Click a Task to edit or add new Tasks to fit your routine!",
+    "introTour": "Et voilà ! Pour que tu puisses commencer, j'ai ajouté quelques tâches à partir de tes centres d'intérêts. Clique sur une tâche pour l'éditer, ou crées-en de nouvelles pour perfectionner ta routine !",
     "prev": "Prev",
     "next": "Suivant",
     "randomize": "Aléatoire",
@@ -17,15 +17,15 @@
     "mattBochText1": "Bienvenue à l'écurie ! Je suis Matt, le Maître des bêtes. Après avoir passé le niveau 3, vous pourrez collecter des œufs de familiers et des potions d'éclosion en accomplissant vos tâches. Lorsque vous faites éclore un œuf de familier au marché, il apparaît ici ! Cliquez sur l'image d'un familier pour qu'il rejoigne votre avatar. Donnez à vos familiers la nourriture que vous trouvez dès la fin du niveau 3, et ils deviendront de puissantes montures.",
     "welcomeToTavern": "Bienvenue dans la taverne !",
     "sleepDescription": "Need a break? Check into Daniel's Inn to pause some of Habitica's more difficult game mechanics:",
-    "sleepBullet1": "Missed Dailies won't damage you",
+    "sleepBullet1": "Les Quotidiennes non validées ne feront plus de dommages",
-    "sleepBullet2": "Tasks won't lose streaks or decay in color",
+    "sleepBullet2": "Les séries ne seront pas interrompues et leur couleur n'évoluera plus",
     "sleepBullet3": "Bosses won't do damage for your missed Dailies",
-    "sleepBullet4": "Your boss damage or collection Quest items will stay pending until check-out",
+    "sleepBullet4": "Les dommages du boss et la collecte des objets de quête resteront en attente jusqu'à la sortie de la taverne",
     "pauseDailies": "Pause Damage",
     "unpauseDailies": "Unpause Damage",
     "staffAndModerators": "Staff and Moderators",
-    "communityGuidelinesIntro": "Habitica tries to create a welcoming environment for users of all ages and backgrounds, especially in public spaces like the Tavern. If you have any questions, please consult our <a href='/static/community-guidelines' target='_blank'>Community Guidelines</a>.",
+    "communityGuidelinesIntro": "Habitica souhaite créer un environnement accueillant pour les utilisateurs de tous âges et de tous horizons, particulièrement dans les espaces publiques comme la taverne. Si vous avez la moindre question, n'hésitez pas à consulter les <a href='/static/community-guidelines' target='_blank'>Règles de vie en communauté</a>.",
-    "acceptCommunityGuidelines": "I agree to follow the Community Guidelines",
+    "acceptCommunityGuidelines": "J'accepte de suivre les Règles de vie en communauté",
     "daniel": "Daniel",
     "danielText": "Bienvenue à la taverne ! Installez-vous et faites connaissance avec les autres personnes. Si vous avez besoin de vous reposer (vacances ? maladie ?), je vous installerai à l'auberge. Pendant votre séjour, vos tâches Quotidiennes ne vous infligeront pas de dommages à la fin de la journée, mais vous pourrez quand même les réaliser.",
     "danielText2": "Prenez garde : si vous êtes au milieu d'une quête contre un boss, celui-ci vous infligera tout de même des blessures en fonction des Quotidiennes manquées des membres de votre groupe ! De façon identique, vos propres dégâts au boss (ou les objets récoltés) ne seront pas appliqués tant que vous ne quitterez pas l'auberge.",
@@ -46,27 +46,27 @@
     "featuredItems": "Featured Items!",
     "hideLocked": "Hide locked",
     "hidePinned": "Hide pinned",
-    "amountExperience": "<%= amount %> Experience",
+    "amountExperience": "<%= amount %> Expérience",
-    "amountGold": "<%= amount %> Gold",
+    "amountGold": "<%= amount %> Or",
-    "namedHatchingPotion": "<%= type %> Hatching Potion",
+    "namedHatchingPotion": "<%= type %> Potion d'Éclosion",
     "buyGems": "Acheter des gemmes",
     "purchaseGems": "Acheter des gemmes",
-    "items": "Items",
+    "items": "Objets",
     "AZ": "A-Z",
-    "sort": "Sort",
+    "sort": "Trier",
-    "sortBy": "Sort By",
+    "sortBy": "Trier par",
-    "groupBy2": "Group By",
+    "groupBy2": "Grouper par",
-    "sortByName": "Name",
+    "sortByName": "Nom",
-    "quantity": "Quantity",
+    "quantity": "Quantité",
-    "cost": "Cost",
+    "cost": "Prix",
-    "shops": "Shops",
+    "shops": "Boutiques",
     "custom": "Custom",
     "wishlist": "Wishlist",
     "wrongItemType": "The item type \"<%= type %>\" is not valid.",
     "wrongItemPath": "The item path \"<%= path %>\" is not valid.",
     "unpinnedItem": "You unpinned <%= item %>! It will no longer display in your Rewards column.",
     "cannotUnpinArmoirPotion": "The Health Potion and Enchanted Armoire cannot be unpinned.",
-    "purchasedItem": "You bought <%= itemName %>",
+    "purchasedItem": "Vous avez acheté <%= itemName %>",
     "ian": "Ian",
     "ianText": "Bienvenue à la boutique des quêtes ! Vous pouvez utiliser des parchemins de quête pour battre des monstres avec vos amis. Jetez un œil à notre ensemble de parchemins de quêtes disponibles à l'achat, sur votre droite !",
     "ianTextMobile": "Puis-je vous proposer quelques parchemins de quête ? Activez-les pour combattre des monstres avec votre équipe !",
@@ -111,9 +111,9 @@
     "classStats": "Voici les attributs de votre classe ; ils affectent la façon de jouer. Chaque fois que vous gagnez un niveau, vous obtenez un point à allouer à un attribut spécifique. Passez au dessus de chaque attribut pour plus d'information.",
     "autoAllocate": "Distribution automatique",
     "autoAllocateText": "Si \"attribution automatique\" est sélectionné, votre avatar gagne des attributs automatiquement selon les attributs de vos tâches, que vous pouvez trouver dans <strong>TÂCHES > Modifier > Options Avancées > Attributs</strong>. Par exemple, si vous allez souvent à la salle de sport et que votre Quotidienne \"Sport\" est définie à 'Force', vous gagnerez de la Force automatiquement.",
-    "spells": "Skills",
+    "spells": "Compétences",
     "spellsText": "You can now unlock class-specific skills. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed <a target='_blank' href='http://habitica.wikia.com/wiki/Todos'>To-Do</a>.",
-    "skillsTitle": "Skills",
+    "skillsTitle": "Compétences",
     "toDo": "À faire",
     "moreClass": "Pour en apprendre plus sur le système de classe, consultez <a href='http://fr.habitica.wikia.com/wiki/Système_de_Classe' target='_blank'>Wikia</a>.",
     "tourWelcome": "Bienvenue à Habitica ! Ceci est votre liste de Tâches. Cochez une tâche pour continuer !",

website/common/locales/fr/pets.json

@@ -18,7 +18,7 @@
     "veteranWolf": "Loup Vétéran",
     "veteranTiger": "Tigre Vétéran",
     "veteranLion": "Lion Vétéran",
-    "veteranBear": "Ours Vétéran",
+    "veteranBear": "Ours vétéran",
     "cerberusPup": "Chiot Cerbère",
     "hydra": "Hydre",
     "mantisShrimp": "Crevette-mante",
@@ -40,12 +40,12 @@
     "hatchingPotion": "potion d'éclosion",
     "noHatchingPotions": "Vous n'avez pas de potion d'éclosion.",
     "inventoryText": "Cliquez sur un œuf pour voir les potions utilisables surlignées en vert, puis cliquez sur une des potions surlignées pour faire éclore votre familier. Si aucune potion n'est surlignée, cliquez à nouveau sur l’œuf pour le désélectionner et cliquez plutôt sur une potion d'abord pour voir les œufs utilisables. Vous pouvez aussi vendre votre surplus d'objets à Alexander le marchand.",
-    "haveHatchablePet": "Vous avez <%= potion %>potion d'éclosion et <%= egg %>œuf pour faire éclore ce familier! <b>Cliquez</b> sur l'empreinte pour le faire éclore.",
+    "haveHatchablePet": "Vous avez une potion d'éclosion <%= potion %> et un œuf de <%= egg %> qui peuvent faire éclore ce familier ! <b>Cliquez</b> sur l'empreinte pour le faire naître.",
-    "quickInventory": "Inventaire Rapide",
+    "quickInventory": "Inventaire rapide",
     "foodText": "nourriture",
     "food": "Nourriture et selles",
-    "noFoodAvailable": "Vous n'avez pas de Nourriture.",
+    "noFoodAvailable": "Vous n'avez pas de nourriture.",
-    "noSaddlesAvailable": "Vous n'avez pas de Selle.",
+    "noSaddlesAvailable": "Vous n'avez pas de selle.",
     "noFood": "Vous n'avez ni nourriture ni selle.",
     "dropsExplanation": "Récupérez ces objets plus vite avec des gemmes, si vous ne voulez pas attendre de les recevoir comme butin. <a href=\"http://fr.habitica.wikia.com/wiki/Butins\">Apprenez-en plus sur le système de butin.</a>",
     "dropsExplanationEggs": "Dépensez des gemmes pour obtenir des œufs plus rapidement si vous ne voulez pas attendre d'en obtenir comme butin, ou si vous souhaitez obtenir de nouveaux œufs de quête sans refaire les quêtes associées. <a href=\"http://fr.habitica.wikia.com/wiki/Butins\">Apprenez-en plus sur le système de butin.</a>",

website/common/locales/fr/quests.json

@@ -9,7 +9,7 @@
     "goldQuests": "Quêtes achetables avec de l'or",
     "questDetails": "Détails de la quête",
     "questDetailsTitle": "Détails de la quête",
-    "questDescription": "Les quêtes permettent aux joueurs de se concentrer sur les objectifs à long terme dans le jeu avec les membres de leur équipe.",
+    "questDescription": "Les quêtes permettent aux joueurs de se concentrer, avec les membres de leur équipe, sur des objectifs de jeu à long terme.",
     "invitations": "Invitations",
     "completed": " complétée !",
     "rewardsAllParticipants": "Récompenses individuelles",

website/common/locales/fr/questscontent.json

@@ -58,7 +58,7 @@
     "questSpiderBoss": "Araignée givrée",
     "questSpiderDropSpiderEgg": "Araignée (Œuf)",
     "questSpiderUnlockText": "Déverrouille l'achat d’œufs d'araignée au marché",
-    "questGroupVice": "Vice the Shadow Wyrm",
+    "questGroupVice": "Vice la vouivre des ténèbres",
     "questVice1Text": "Vice, 1re partie : libérez-vous de l'influence du dragon",
     "questVice1Notes": "<p>On dit que repose un mal terrible dans les cavernes du Mont Habitica. Un monstre dont la présence écrase la volonté des plus forts héros de la contrée, les poussant aux mauvaises habitudes et à la paresse ! La bête est un grand dragon, aux pouvoirs immenses, et constitué des ténèbres elles-mêmes : Vice, la perfide vouivre de l'ombre. Braves Habiticiens et Habiticiennes, levez-vous et vainquez cette ignoble bête une fois pour toutes, mais seulement si vous pensez pouvoir affronter son immense pouvoir.</p><h3> Vice, 1ère partie : </h3><p>Comment pourriez-vous vaincre une bête qui a déjà le contrôle sur vous ? Alors ne tombez pas victime de la paresse et du vice ! Travaillez dur pour contrer l'influence noire du dragon et dissiper son emprise sur vous !</p>",
     "questVice1Boss": "Ombre de Vice",
@@ -74,7 +74,7 @@
     "questVice3DropWeaponSpecial2": "Hampe du dragon de Stephen Weber",
     "questVice3DropDragonEgg": "Dragon (Œuf)",
     "questVice3DropShadeHatchingPotion": "Potion d'éclosion sombre",
-    "questGroupMoonstone": "Recidivate Rising",
+    "questGroupMoonstone": "Le Soulèvement de Récidive",
     "questMoonstone1Text": "Récidive, 1e partie : la chaîne de pierres de lune",
     "questMoonstone1Notes": "Un terrible mal a frappé les Habiticiens et Habiticiennes. Les mauvaises habitudes qu'on croyait mortes depuis longtemps se relèvent pour se venger. La vaisselle sale s'accumule, les livres traînent délaissés, et la procrastination se répand au galop !<br><br>Vous traquez certaines de vos propres mauvaises habitudes, revenues vous hanter, et votre chasse vous mène jusqu'aux Marais de la stagnation. Là, vous découvrez la responsable de vos malheurs : Récidive, la nécromancienne fantôme. Vous foncez, armes au clair, mais elles passent à travers son corps spectral, sans lui causer la moindre douleur.<br><br>\"Ne te fatigue pas\", siffle-t-elle d'un grincement sec. \"Sans une chaîne de pierres de lune, rien ne peut m'atteindre. Et le maître joaillier @aurakami a dispersé toutes les pierres à travers Habitica il y a longtemps !\" Vous faites retraite... mais vous savez ce qu'il vous reste à faire.",
     "questMoonstone1CollectMoonstone": "Pierres de lune",
@@ -104,7 +104,7 @@
     "questGoldenknight3Boss": "Chevalier de fer",
     "questGoldenknight3DropHoney": "Once de miel (Nourriture)",
     "questGoldenknight3DropGoldenPotion": "Potion d'éclosion d'or",
-    "questGoldenknight3DropWeapon": "Mustaine's Milestone Mashing Morning Star (Off-hand Weapon)",
+    "questGoldenknight3DropWeapon": "Masse massacreuse majeure de l'étoile du matin (arme secondaire)",
     "questGroupEarnable": "Quêtes gagnables",
     "questBasilistText": "Le basi-liste",
     "questBasilistNotes": "Il règne une certaine agitation sur la place du marché. Le genre d'agitation qui devrait vous faire fuir. Pourtant, votre courage vous pousse à vous précipiter dans la mêlée, et vous découvrez un basi-liste, émergeant d'un agglomérat de tâches non-complétées ! Les Habiticiens et Habiticiennes les plus proches du basi-liste sont paralysés par la peur, incapables de se mettre au travail. De quelque part dans les environs, vous entendez @Arcosine s'écrier : \"Vite ! Complétez vos tâches À Faire et Quotidiennes pour affaiblir le monstre, avant que quelqu'un ne soit blessé !\" Aventurières, aventuriers... frappez rapidement, et cochez quelque chose, mais prenez garde ! Si vous laissez ne serait-ce qu'une Quotidienne inachevée, le basi-liste vous attaquera, vous et votre équipe !",
@@ -243,7 +243,7 @@
     "questDilatoryDistress3Boss": "Adva, la sirène usurpatrice",
     "questDilatoryDistress3DropFish": "Sardine (Nourriture)",
     "questDilatoryDistress3DropWeapon": "Trident des marées déferlantes (Arme)",
-    "questDilatoryDistress3DropShield": "Moonpearl Shield (Off-Hand Item)",
+    "questDilatoryDistress3DropShield": "Bouclier perle-de-lune (équipement secondaire)",
     "questCheetahText": "Quel tricheur, ce guépard",
     "questCheetahNotes": "Alors que vous vous promenez dans la savane Tanfépaï avec vos amis @PainterProphet, @tivaquinn, @Unruly Hyena et @Crawford, vous êtes surpris de voir un guépard tenant un nouvel Habiticien dans sa gueule. Sous les pattes enflammées du guépard, les tâches se consument comme si elles étaient complétées – avant même que quiconque ne puisse les achever ! L'Habiticien vous voit et crie : \"Aidez-moi s'il vous plait ! Ce guépard me fait gagner des niveaux trop vite, mais je n'accomplis rien. Je veux prendre mon temps et profiter du jeu. Arrêtez-le !\" Vous vous souvenez de votre premier jour et vous savez que vous devez aider le petit nouveau à arrêter ce guépard !",
     "questCheetahCompletion": "Le nouvel Habiticien respire lourdement après cette chevauchée sauvage, mais vous remercie, vous et vos amis, pour votre aide. \"Je suis content que ce guépard ne puisse plus attraper qui que ce soit. Il a laissé quelques œufs de guépard pour vous, peut-être pourrions-nous en élever quelques-uns pour en faire des familiers dignes de confiance !\"",
@@ -443,7 +443,7 @@
     "questStoikalmCalamity3Completion": "Vous maîtrisez la reine guivre-givre, donnant à Dame Givre le temps de briser les bracelets scintillants. La reine se fige, meurtrie, mais se ressaisit rapidement et prend un air hautain. \"Vous pouvez disposer de ces objets en surplus, lance-t-elle, je crains qu'ils n'aillent pas du tout avec la déco.\"<br><br>\"Oui, et puis... vous les avez dérobés, en invoquant des monstres de terre\", ajoute @Beffymaro.<br><br>La reine guivre-givre semble piquée au vif. \"Voyez ça avec cette maudite vendeuse de bracelets, cette Tzina. Je n'ai rien à voir avec tout cela.\"<br><br>Dame Givre vous serre le bras. \"Beau boulot\", dit-elle en vous tendant une lance et un olifant pris de la pile. \"Vous êtes digne des chevaucheurs\".",
     "questStoikalmCalamity3Boss": "Reine guivre-givre",
     "questStoikalmCalamity3DropBlueCottonCandy": "Barbe-à-papa bleue (Nourriture)",
-    "questStoikalmCalamity3DropShield": "Mammoth Rider's Horn (Off-Hand Item)",
+    "questStoikalmCalamity3DropShield": "Olifant de chevaucheur de mammouths (équipement secondaire)",
     "questStoikalmCalamity3DropWeapon": "Lance de chevaucheur de mammouths (Arme)",
     "questGuineaPigText": "Le gang des cochons d'Inde",
     "questGuineaPigNotes": "Vous vous baladez nonchalamment sur le célèbre marché d'Habitiville quand @Pandah vous fait signe. \"Hé, regardez ça !\" Plus loin, un groupe exhibe à Alexandre le marchand un œuf aux teintes brunes et beiges, que vous n'arrivez pas à identifier.<br><br>Alexandre fronce les sourcils. \"Je ne me souviens pas avoir proposé cet œuf à la vente. D'où peut-il bien...\" Une petite patte lui coupe la parole.<br><br>\"D'inde-nous tout ton argent, marchand !\" couine une petite voix machiavélique.<br><br>\"Oh non, l’œuf était un hameçon !\" s'exclame @mewrose. \"Ces brutes avides forment le gang des cochons d'Inde ! Ils ne font jamais leurs Quotidiennes. Du coup, ils passent leur temps à voler de l'or pour s'acheter des potions de santé !\"<br><br>\"Dévaliser le marché ?\", dit @emmavig. \"Pas si nous sommes là !\" Sans plus attendre, vous vous lancez au secours d'Alexandre.",
@@ -486,8 +486,8 @@
     "questMayhemMistiflying3Completion": "Alors que vous commenciez à vous dire que vous n'alliez plus résister au vent très longtemps, vous parvenez à arracher le masque du visage du bise-émissaire. La tornade est instantanément dissipée, ne laissant derrière elle qu'une douce brise et un soleil éclatant. Le bise-émissaire regarde tout autour de lui, saisi d'étonnement. \"Où est-elle passée ?\"<br><br>\"Qui ça ?\" demande votre camarade @khdarkwolf.<br><br>\"Cette charmante dame qui s'est proposée de livrer un colis pour moi. Tzina.\" En jetant un œil à la ville dessous lui, balayée par les vents, son visage s'assombrit. \"Et en même temps, peut-être n'était-elle pas si gentille...\"<br><br>Le Fou d'avril lui tapote le dos, puis vous tend deux enveloppes scintillantes. \"Tenez. Pourquoi vous ne laisseriez pas ce pauvre bougre se reposer, en prenant en charge le reste du courrier ? Je crois savoir que la magie contenue dans ces deux enveloppes vous récompensera de vos efforts.\"",
     "questMayhemMistiflying3Boss": "Le bise-émissaire",
     "questMayhemMistiflying3DropPinkCottonCandy": "Barbe-à-papa rose (Nourriture)",
-    "questMayhemMistiflying3DropShield": "Roguish Rainbow Message (Off-Hand Item)",
+    "questMayhemMistiflying3DropShield": "Missive arc-en-ciel (équipement secondaire)",
-    "questMayhemMistiflying3DropWeapon": "Roguish Rainbow Message (Main-Hand Item)",
+    "questMayhemMistiflying3DropWeapon": "Missive arc-en-ciel (équipement principal)",
     "featheredFriendsText": "Lot de quêtes des amis à plumes",
     "featheredFriendsNotes": "Contient \"À l'aide ! Harpie !\", \"L'oiseau de nuit\" et \"Les oiseaux de la proiecrastination\". Disponible jusqu'au 31 mai.",
     "questNudibranchText": "L'infestation des nudibranches cépadimanches",

website/common/locales/fr/tasks.json

@@ -4,11 +4,11 @@
     "deleteToDosExplanation": "Si vous cliquez sur le bouton ci-dessous, toutes vos tâches À Faire complétées et archivées seront supprimées définitivement, à l'exception des tâches de défis actifs et des offres de groupe. Exportez-les d'abord si vous souhaitez en garder une trace.",
     "addmultiple": "Ajout multiple",
     "addsingle": "Ajout unitaire",
-    "editATask": "Editer un <%= type %>",
+    "editATask": "Éditer une <%= type %>",
     "createTask": "Créer <%= type %>",
     "addTaskToUser": "Créer",
     "scheduled": "Planifié",
-    "theseAreYourTasks": "Ce sont vos <%= taskType %>",
+    "theseAreYourTasks": "Voici vos <%= taskType %>",
     "habit": "Habitude",
     "habits": "Habitudes",
     "newHabit": "Nouvelle habitude",

website/common/locales/hu/challenge.json

@@ -1,6 +1,6 @@
 {
     "challenge": "Kihívás",
-    "challengeDetails": "Challenges are community events in which players compete and earn prizes by completing a group of related tasks.",
+    "challengeDetails": "A kihívások olyan közösségi események, ahol a játékosok egymáshoz kötődő feladatokat teljesítenek és díjakat nyernek.",
     "brokenChaLink": "Érvénytelen kihívás link",
     "brokenTask": "Érvénytelen kihívás link: ez a feladat része volt egy kihívásnak, de a kihívásból törölték. Mit szeretnél csinálni vele?",
     "keepIt": "Megtartom",
@@ -28,8 +28,8 @@
     "notParticipating": "Nem vesz részt",
     "either": "Bármelyik",
     "createChallenge": "Kihívás létrehozása",
-    "createChallengeAddTasks": "Add Challenge Tasks",
+    "createChallengeAddTasks": "Kihíváshoz tartozó feladat hozzáadása",
-    "addTaskToChallenge": "Add Task",
+    "addTaskToChallenge": "Feladat hozzáadása",
     "discard": "Elvet",
     "challengeTitle": "Kihívás címe",
     "challengeTag": "Címke neve",
@@ -39,7 +39,7 @@
     "prizePop": "Ha valaki \"megnyeri\" a kihívásodat, akkor lehetőséged van őt drágakövekkel megjutalmazni. Maximum annyi drágakövet tűzhetsz ki jutalomként, amennyivel rendelkezel (plusz a céh drágaköveit, ha te hoztad létre a céhet amibe a kihívás tartozik). Megjegyzés: A jutalom nagysága később nem változtatható.",
     "prizePopTavern": "Ha valaki meg tudja \"nyerni\" a kihívásodat, akkor ajándékozhatsz neki drágakövet. Max = drágaköveid száma. Megjegyzés: A jutalmat nem tudod később megváltoztatni és a Fogadó kihívások nem lesznek visszatérítve, ha a kihívást visszavonják.",
     "publicChallenges": "Legalább 1 drágakő <strong> nyílvános kihívásoknak </strong>. Segít megakadályozni a spamelést (valóban segít).",
-    "publicChallengesTitle": "Public Challenges",
+    "publicChallengesTitle": "Nyilvános kihívások",
     "officialChallenge": "Hivatalos Habitica Kihívás",
     "by": "által",
     "participants": "<%= membercount %> résztvevők",
@@ -55,10 +55,10 @@
     "leaveCha": "Kihívás elhagyása és ...",
     "challengedOwnedFilterHeader": "Tulajdonos",
     "challengedOwnedFilter": "Saját",
-    "owned": "Owned",
+    "owned": "Saját",
     "challengedNotOwnedFilter": "Nem saját",
-    "not_owned": "Not Owned",
+    "not_owned": "Nem saját",
-    "not_participating": "Not Participating",
+    "not_participating": "Nem vesz részt",
     "challengedEitherOwnedFilter": "Bármelyik",
     "backToChallenges": "Vissza a kihívásokhoz",
     "prizeValue": "Nyeremény <%= gemcount %>&nbsp;<%= gemicon %>",
@@ -73,7 +73,7 @@
     "noChallengeOwnerPopover": "Ennek a kihívásnak nincs tulajdonosa, mert a felhasználó, aki létrehozta a kihívást, törölte fiókját.",
     "challengeMemberNotFound": "Ez a felhasználó nem található a kihívás résztvevői között",
     "onlyGroupLeaderChal": "Csak a csapatvezető hozhat létre kihívásokat",
-    "tavChalsMinPrize": "Prize must be at least 1 Gem for Public Challenges.",
+    "tavChalsMinPrize": "A jutalomnak legalább 1 drágakőnek kell lennie nyilvános kihívás létrehozásához.",
     "cantAfford": "Ezt a jutalmat nem engedheted meg magadnak. Vásárolj több drágakövet vagy csökkentsd a jutalom nagyságát.",
     "challengeIdRequired": "\"challengeId\" valódi UUID-nek kell lennie.",
     "winnerIdRequired": "\"winnerId\" valódi UUID-nek kell lennie.",
@@ -89,41 +89,41 @@
     "shortNameTooShort": "Egy címke nevének legalább 3 betűből kell állnia.",
     "joinedChallenge": "Csatlakozotál egy kihíváshoz",
     "joinedChallengeText": "Ez a felhasználó próbára tette magát azzal, hogy csatlakozott egy kihíváshoz!",
-    "myChallenges": "My Challenges",
+    "myChallenges": "Saját kihívásaim",
-    "findChallenges": "Discover Challenges",
+    "findChallenges": "Kihívások böngészése",
-    "noChallengeTitle": "You don't have any Challenges.",
+    "noChallengeTitle": "Nem veszel részt egy kihívásban sem.",
-    "challengeDescription1": "Challenges are community events in which players compete and earn prizes by completing a group of related tasks.",
+    "challengeDescription1": "A kihívások olyan közösségi események, ahol a játékosok egymáshoz kötődő feladatokat teljesítenek és díjakat nyernek.",
     "challengeDescription2": "Find recommended Challenges based on your interests, browse Habitica's public Challenges, or create your own Challenges.",
-    "createdBy": "Created By",
+    "createdBy": "Készítette",
-    "joinChallenge": "Join Challenge",
+    "joinChallenge": "Csatlakozás kihíváshoz",
-    "leaveChallenge": "Leave Challenge",
+    "leaveChallenge": "Kihívás elhagyása",
-    "addTask": "Add Task",
+    "addTask": "Feladat hozzáadása",
-    "editChallenge": "Edit Challenge",
+    "editChallenge": "Kihívás szerkesztése",
-    "challengeDescription": "Challenge Description",
+    "challengeDescription": "Kihívás leírása",
-    "selectChallengeWinnersDescription": "Select winners from the Challenge participants",
+    "selectChallengeWinnersDescription": "Nyertesek kiválasztása a kihívásban résztvevő felhasználók közül",
-    "awardWinners": "Award Winners",
+    "awardWinners": "Nyertesek",
-    "doYouWantedToDeleteChallenge": "Do you want to delete this Challenge?",
+    "doYouWantedToDeleteChallenge": "Ki akarod törölni ezt a kihívást?",
-    "deleteChallenge": "Delete Challenge",
+    "deleteChallenge": "Kihívás törlése",
-    "challengeNamePlaceholder": "What is your Challenge name?",
+    "challengeNamePlaceholder": "Mi a kihívásod neve?",
-    "challengeSummary": "Summary",
+    "challengeSummary": "Összefoglalás",
     "challengeSummaryPlaceholder": "Write a short description advertising your Challenge to other Habiticans. What is the main purpose of your Challenge and why should people join it? Try to include useful keywords in the description so that Habiticans can easily find it when they search!",
     "challengeDescriptionPlaceholder": "Use this section to go into more detail about everything that Challenge participants should know about your Challenge.",
-    "challengeGuild": "Add to",
+    "challengeGuild": "Hozzáadás",
-    "challengeMinimum": "Minimum 1 Gem for public Challenges (helps prevent spam, it really does).",
+    "challengeMinimum": "Legalább 1 drágakő nyilvános kihívásokra (segít megelőzni a spamot, de tényleg).",
-    "participantsTitle": "Participants",
+    "participantsTitle": "Résztvevők",
-    "shortName": "Short Name",
+    "shortName": "Rövid cím",
-    "shortNamePlaceholder": "What short tag should be used to identify your Challenge?",
+    "shortNamePlaceholder": "Milyen rövid címkével legyen a kihívásod beazonosítható?",
-    "updateChallenge": "Update Challenge",
+    "updateChallenge": "Kihívás frissítése",
-    "haveNoChallenges": "You don't have any Challenges",
+    "haveNoChallenges": "Nem veszel részt egy kihívásban sem",
     "loadMore": "Több betöltése",
-    "exportChallengeCsv": "Export Challenge",
+    "exportChallengeCsv": "Kihívás exportálása",
-    "editingChallenge": "Editing Challenge",
+    "editingChallenge": "Kihívás szerkesztése",
-    "nameRequired": "Name is required",
+    "nameRequired": "Név szükséges",
-    "tagTooShort": "Tag name is too short",
+    "tagTooShort": "Címke túl rövid",
-    "summaryRequired": "Summary is required",
+    "summaryRequired": "Összefoglalás szükséges",
-    "summaryTooLong": "Summary is too long",
+    "summaryTooLong": "Összefoglalás túl hosszú",
-    "descriptionRequired": "Description is required",
+    "descriptionRequired": "Leírás szükséges",
-    "locationRequired": "Location of challenge is required ('Add to')",
+    "locationRequired": "Kihívás helyének kiválasztása szükséges ('Hozzáadás')",
-    "categoiresRequired": "One or more categories must be selected",
+    "categoiresRequired": "Egy vagy több katergória kiválasztás kötelező",
-    "viewProgressOf": "View Progress Of"
+    "viewProgressOf": "Haladás megtekintése"
 }

website/common/locales/id/groups.json

@@ -5,8 +5,8 @@
     "innCheckIn": "Beristirahat di Penginapan",
     "innText": "Kamu beristirahat di Penginapan! Ketika menginap, kamu tidak akan dilukai oleh keseharianmu yang belum selesai, tapi mereka tetap akan diperbarui setiap hari. Ingat: jika kamu sedang ikut misi melawan musuh, musuh masih bisa melukaimu lewat keseharian yang tidak diselesaikan teman party-mu kecuali mereka ada di Penginapan juga! Selain itu kamu tidak akan bisa menyerang musuh (atau menemukan item misi) jika masih di dalam Penginapan.",
     "innTextBroken": "Kamu beristirahat di dalam Penginapan, kurasa... Ketika menginap, kamu tidak akan dilukai oleh keseharianmu yang belum selesai, tapi mereka masih akan diperbarui setiap hari... Jika kamu sedang ikut misi melawan musuh, musuh masih bisa melukaimu karena tugas yang tidak diselesaikan teman party-mu... kecuali mereka ada di Penginapan juga... Selain itu kamu tidak akan bisa menyerang musuh (atau menemukan item misi) jika masih di dalam Penginapan... capek banget...",
-    "helpfulLinks": "Helpful Links",
+    "helpfulLinks": "Tautan Berguna",
-    "communityGuidelinesLink": "Community Guidelines",
+    "communityGuidelinesLink": "Pedoman Komunitas",
     "lookingForGroup": "Looking for Group (Party Wanted) Posts",
     "dataDisplayTool": "Data Display Tool",
     "reportProblem": "Report a Bug",

website/common/locales/it/challenge.json

@@ -125,5 +125,5 @@
     "descriptionRequired": "Description is required",
     "locationRequired": "Location of challenge is required ('Add to')",
     "categoiresRequired": "One or more categories must be selected",
-    "viewProgressOf": "View Progress Of"
+    "viewProgressOf": "Vedi i progressi di"
 }

website/common/locales/it/character.json

@@ -125,7 +125,7 @@
     "mystery": "Mistero",
     "changeClass": "Cambia classe, recupera Punti Attributo allocati",
     "lvl10ChangeClass": "Per cambiare classe devi essere almeno al livello 10.",
-    "changeClassConfirmCost": "Are you sure you want to change your class for 3 Gems?",
+    "changeClassConfirmCost": "Vuoi davvero cambiare Classe per 3 gemme?",
     "invalidClass": "Classe non valida. Per favore specifica 'warrior', 'rogue', 'wizard', o 'healer'.",
     "levelPopover": "Ogni volta che sali di livello ottieni un punto da assegnare ad un attributo a tua scelta. Puoi farlo manualmente, o lasciare che se ne occupi il gioco selezionando una delle opzioni di allocazione automatica.",
     "unallocated": "Punti Attributo non allocati",
@@ -200,7 +200,7 @@
     "invalidAttribute": "\"<%= attr %>\" non è un attributo valido.",
     "notEnoughAttrPoints": "Non hai abbastanza punti attributo.",
     "style": "Stile",
-    "facialhair": "Facial",
+    "facialhair": "Barba e baffi",
     "photo": "Foto",
     "info": "Info",
     "joined": "Iscritto",
@@ -216,5 +216,5 @@
     "mainHand": "Mano principale",
     "offHand": "Mano secondaria",
     "pointsAvailable": "Punti disponibili",
-    "pts": "pts"
+    "pts": "punti"
 }

website/common/locales/it/communityguidelines.json

@@ -1,6 +1,6 @@
 {
     "iAcceptCommunityGuidelines": "Accetto di rispettare le linee guida della community",
-    "tavernCommunityGuidelinesPlaceholder": "Friendly reminder: this is an all-ages chat, so please keep content and language appropriate! Consult the Community Guidelines in the sidebar if you have questions.",
+    "tavernCommunityGuidelinesPlaceholder": "Nota amichevole: questa è una chat per utenti di ogni età, quindi per favore assicurati che il tuo linguaggio e i contenuti che pubblichi siano appropriati. Consulta le Linee guida della community nella sezione qui a destra se hai qualche domanda.",
     "commGuideHeadingWelcome": "Benvenuto ad Habitica!",
     "commGuidePara001": "Salute, avventuriero! Benvenuto ad Habitica, la terra della produttività, dello stile di vita salutare e occasionalmente di grifoni infuriati. Abbiamo un'allegra community piena di persone disponibili che si supportano a vicenda nel percorso per migliorarsi.",
     "commGuidePara002": "Per aiutare a mantenere la sicurezza, la felicità e la produttività nella community, abbiamo alcune linee guida. Le abbiamo stilate accuratamente per renderle il più semplici possibile. Per favore, leggile con attenzione.",
@@ -13,7 +13,7 @@
     "commGuideList01C": "<strong>Propensione al supporto.</strong> Gli Habitichesi festeggiano le vittorie altrui, e si supportano a vicenda durante i periodi di difficoltà. Si aiutano a vicenda e imparano gli uni dagli altri. Nelle squadre facciamo tutto questo con i nostri incantesimi; nelle chat, lo facciamo con parole gentili e di supporto.",
     "commGuideList01D": "<strong>Rispetto verso il prossimo.</strong> Abbiamo tutti esperienze, abilità e opinioni differenti. Questo è ciò che fa di noi una community così spettacolare! Gli Habitichesi rispettano queste differenze e le esaltano. Prova a frequentare questo posto, e presto avrai degli amici di ogni tipo.",
     "commGuideHeadingMeet": "Incontra lo Staff e i moderatori!",
-    "commGuidePara006": "Habitica has some tireless knights-errant who join forces with the staff members to keep the community calm, contented, and free of trolls. Each has a specific domain, but will sometimes be called to serve in other social spheres. Staff and Mods will often precede official statements with the words \"Mod Talk\" or \"Mod Hat On\".",
+    "commGuidePara006": "Habitica dispone di instancabili cavalieri erranti che hanno unito le forze con lo staff per mantenere la community calma, allegra e libera dai troll. Ognuno ha uno specifico dominio, ma alcune volte può accadere che vengano chiamati per servire altre sfere sociali. Staff e moderatori spesso precedono le dichiarazioni ufficiali con le parole \"Mod Talk\" (ovvero \"parla il moderatore\") oppure \"Mod Hat On\" (ovvero \"modalità moderatore On\").",
     "commGuidePara007": "I membri dello Staff hanno etichette viola contrassegnate da una corona. Il loro titolo è \"Eroico\".",
     "commGuidePara008": "I moderatori hanno etichette blu scuro contrassegnate da una stella. Il loro titolo è \"Guardiano\". L'unica eccezione è Bailey che, in quanto NPC, ha un'etichetta nera e verde contrassegnata da una stella.",
     "commGuidePara009": "L'attuale gruppo dello staff è composto da (partendo da sinistra verso destra):",

website/common/locales/it/generic.json

@@ -261,7 +261,7 @@
     "finance": "Finance",
     "health_fitness": "Salute + Fitness",
     "hobbies_occupations": "Hobbies + Occupations",
-    "location_based": "Location-based",
+    "location_based": "Basate su luoghi",
     "mental_health": "Mental Health + Self-Care",
     "getting_organized": "Getting Organized",
     "self_improvement": "Crescita personale",
@@ -269,7 +269,7 @@
     "time_management": "Gestione del tempo + Responsabilità",
     "recovery_support_groups": "Recovery + Support Groups",
     "messages": "Messaggi",
-    "emptyMessagesLine1": "You don't have any messages",
+    "emptyMessagesLine1": "Non hai alcun messaggio",
     "emptyMessagesLine2": "Invia un messaggio per creare una conversazione!",
     "letsgo": "Let's Go!",
     "selected": "Selezionato"

website/common/locales/it/groups.json

@@ -7,13 +7,13 @@
     "innTextBroken": "Stai riposando nella Locanda, credo... Mentre sei qui, le tue Daily non ti danneggeranno alla fine della giornata, ma si resetteranno comunque ogni giorno... Se stai partecipando ad una missione Boss, il Boss ti danneggerà comunque per le Daily mancate dei tuoi compagni di squadra... a meno che non stiano riposando anche loro nella Locanda... Inoltre, il tuo danno al Boss (o gli oggetti raccolti) non avrà effetto finché non lasci la Locanda... che stanchezza...",
     "helpfulLinks": "Link utili",
     "communityGuidelinesLink": "Linee guida della community",
-    "lookingForGroup": "Looking for Group (Party Wanted) Posts",
+    "lookingForGroup": "Sei in cerca di una squadra? Guarda qui! (in inglese)",
-    "dataDisplayTool": "Data Display Tool",
+    "dataDisplayTool": "Visualizzazione dati utente (in inglese)",
     "reportProblem": "Segnala un bug",
     "requestFeature": "Richiedi una funzionalità",
     "askAQuestion": "Fai una domanda",
     "askQuestionGuild": "Fai una domanda (gilda Habitica Help)",
-    "contributing": "Contributing",
+    "contributing": "Contribuire",
     "faq": "FAQ",
     "lfgPosts": "Sei in cerca di una squadra? Guarda qui! (in inglese)",
     "tutorial": "Tutorial",
@@ -80,7 +80,7 @@
     "logoUrl": "URL Logo",
     "assignLeader": "Assegna un leader al gruppo",
     "members": "Membri",
-    "memberList": "Member List",
+    "memberList": "Lista membri",
     "partyList": "Ordine dei membri della squadra nell'header",
     "banTip": "Creatore del gruppo",
     "moreMembers": "altri membri",
@@ -325,7 +325,7 @@
     "viewParty": "Visualizza Squadra",
     "newGuildPlaceholder": "Inserisci il nome della tua gilda.",
     "guildMembers": "Membri gilda.",
-    "guildBank": "Guild Bank",
+    "guildBank": "Banca Gilda",
     "chatPlaceholder": "Type your message to Guild members here",
     "partyChatPlaceholder": "Type your message to Party members here",
     "fetchRecentMessages": "Fetch Recent Messages",
@@ -344,9 +344,9 @@
     "guildOrPartyLeader": "Leader",
     "guildLeader": "Guild Leader",
     "member": "Membro",
-    "goldTier": "Gold Tier",
+    "goldTier": "Rango oro",
-    "silverTier": "Silver Tier",
+    "silverTier": "Rango argento",
-    "bronzeTier": "Bronze Tier",
+    "bronzeTier": "Rango bronzo",
     "privacySettings": "Impostazioni privacy",
     "onlyLeaderCreatesChallenges": "Only the Leader can create Challenges",
     "privateGuild": "Gilda privata",
@@ -355,21 +355,21 @@
     "guildSummaryPlaceholder": "Write a short description advertising your Guild to other Habiticans. What is the main purpose of your Guild and why should people join it? Try to include useful keywords in the summary so that Habiticans can easily find it when they search!",
     "groupDescription": "Descrizione",
     "guildDescriptionPlaceholder": "Use this section to go into more detail about everything that Guild members should know about your Guild. Useful tips, helpful links, and encouraging statements all go here!",
-    "markdownFormattingHelp": "Markdown formatting help",
+    "markdownFormattingHelp": "Guida per la formattazione",
     "partyDescriptionPlaceholder": "This is our party's description. It describes what we do in this party. If you want to learn more about what we do in this party, read the description. Party on.",
     "guildGemCostInfo": "A Gem cost promotes high quality Guilds and is transferred into your Guild's bank.",
     "noGuildsTitle": "You aren't a member of any Guilds.",
     "noGuildsParagraph1": "Guilds are social groups created by other players that can offer you support,  accountability, and encouraging chat.",
     "noGuildsParagraph2": "Click the Discover tab to see recommended Guilds based on your interests, browse Habitica's public Guilds, or create your own Guild.",
     "privateDescription": "A private Guild will not be displayed in Habitica's Guild directory. New members can be added by invitation only.",
-    "removeMember": "Remove Member",
+    "removeMember": "Rimuovi membro",
     "sendMessage": "Invia messaggio",
     "removeManager2": "Remove Manager",
     "promoteToLeader": "Promote to Leader",
     "inviteFriendsParty": "Inviting friends to your party will grant you an exclusive <br/> Quest Scroll to battle the Basi-List together!",
     "upgradeParty": "Upgrade Party",
     "createParty": "Crea una Squadra",
-    "inviteMembersNow": "Would you like to invite members now?",
+    "inviteMembersNow": "Vuoi invitare dei membri ora?",
     "playInPartyTitle": "Play Habitica in a Party!",
     "playInPartyDescription": "Take on amazing quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.",
     "startYourOwnPartyTitle": "Crea la tua Squadra",
@@ -383,12 +383,12 @@
     "questOwnerRewards": "Quest Owner Rewards",
     "updateParty": "Update Party",
     "upgrade": "Upgrade",
-    "selectPartyMember": "Select a Party Member",
+    "selectPartyMember": "Seleziona un membro della squadra",
     "areYouSureDeleteMessage": "Vuoi davvero eliminare questo messaggio?",
     "reverseChat": "Inverti chat",
     "invites": "Inviti",
-    "details": "Details",
+    "details": "Dettagli",
     "participantDesc": "Once all members have either accepted or declined, the Quest begins. Only those that clicked 'accept' will be able to participate in the Quest and receive the drops.",
-    "groupGems": "Group Gems",
+    "groupGems": "Gemme gruppo",
     "groupGemsDesc": "Guild Gems can be spent to make Challenges! In the future, you will be able to add more Guild Gems."
 }

website/common/locales/it/limited.json

@@ -111,13 +111,13 @@
     "fall2017HabitoweenSet": "Guerriero Habitoween (Guerriero)",
     "fall2017MasqueradeSet": "Masquerade Mage (Mage)",
     "fall2017HauntedHouseSet": "Haunted House Healer (Healer)",
-    "fall2017TrickOrTreatSet": "Trick or Treat Rogue (Rogue)",
+    "fall2017TrickOrTreatSet": "Dolcetto o scasseggio (Assassino)",
     "eventAvailability": "Disponibile fino al <%= date(locale) %>.",
     "dateEndApril": "19 aprile",
     "dateEndMay": "17 maggio",
     "dateEndJune": "14 giugno",
     "dateEndJuly": "29 luglio",
     "dateEndAugust": "31 agosto",
-    "dateEndOctober": "October 31",
+    "dateEndOctober": "31 ottobre",
     "discountBundle": "pacchetto"
 }

website/common/locales/it/npc.json

@@ -38,7 +38,7 @@
     "displayEggForGold": "Vuoi vendere un <strong>Uovo di <%= itemType %></strong>?",
     "displayPotionForGold": "Vuoi vendere una <strong>Pozione <%= itemType %></strong>?",
     "sellForGold": "Vendilo per <%= gold %> Oro",
-    "howManyToSell": "How many would you like to sell?",
+    "howManyToSell": "Quanti vorresti venderne?",
     "yourBalance": "Your balance",
     "sell": "Vendi",
     "buyNow": "Compra ora",
@@ -112,7 +112,7 @@
     "autoAllocate": "Assegnazione automatica dei punti",
     "autoAllocateText": "Se l'opzione \"allocazione automatica\" è selezionata, il tuo avatar guadagna automaticamente statistiche basate sugli attributi delle tue attività, che puoi trovare in <strong>ATTIVITÀ > Modifica > Avanzate > Attributi</strong>. Per esempio, se vai spesso in palestra, e la tua Daily \"Palestra\" è impostata sull'attributo \"Forza\", guadagnerai Forza automaticamente.",
     "spells": "Abilità",
-    "spellsText": "You can now unlock class-specific skills. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed <a target='_blank' href='http://habitica.wikia.com/wiki/Todos'>To-Do</a>.",
+    "spellsText": "Ora puoi sbloccare abilità specifiche per la tua classe! Potrai vedere la prima una volta raggiunto il livello 11. Il tuo mana si rigenera di 10 punti al giorno, più 1 punto per ogni <a target='_blank' href='http://habitica.wikia.com/wiki/Todos'>Cosa Da Fare</a> completata.",
     "skillsTitle": "Abilità",
     "toDo": "Cose Da Fare",
     "moreClass": "Per avere maggiori informazioni sul sistema delle classi, vai su <a href='http://habitica.wikia.com/wiki/Class_System' target='_blank'>Wikia</a>.",

website/common/locales/it/pets.json

@@ -40,7 +40,7 @@
     "hatchingPotion": "pozione di schiusura",
     "noHatchingPotions": "Non hai nessuna pozione di schiusura.",
     "inventoryText": "Clicca su un uovo per vedere le pozioni utilizzabili (che verranno evidenziate in verde) e scegline una con cui far comparire il tuo animale. Se nessuna pozione viene evidenziata, clicca di nuovo sull'uovo per deselezionarlo, e questa volta clicca prima su una pozione, in modo da evidenziare le uova su cui poterla utilizzare. Se lo desideri, puoi anche vendere gli oggetti che ti avanzano ad Alexander il Mercante.",
-    "haveHatchablePet": "You have a <%= potion %> hatching potion and <%= egg %> egg to hatch this pet! <b>Click</b> the paw print to hatch.",
+    "haveHatchablePet": "Hai una Pozione <%= potion %> e un uovo di <%= egg %> per far nascere questo animale! <b>Clicca</b> l'orma per far schiudere l'uovo.",
     "quickInventory": "Inventario veloce",
     "foodText": "cibo",
     "food": "Cibo e Selle",
@@ -119,6 +119,6 @@
     "dragThisFood": "Trascina questo <%= foodName %> su un Animale e guardalo crescere!",
     "clickOnPetToFeed": "Clicca su un Animale per dargli <%= foodName %> e guardalo crescere!",
     "dragThisPotion": "Drag this <%= potionName %> to an Egg and hatch a new pet!",
-    "clickOnEggToHatch": "Click on an Egg to use your <%= potionName %> hatching potion and hatch a new pet!",
+    "clickOnEggToHatch": "Clicca su un Uovo per usare la tua Pozione <%= potionName %> e far nascere un nuovo animale!",
     "hatchDialogText": "Versa la tua Pozione <%= potionName %> sul tuo uovo di <%= eggName %>, e nascerà <%= petName %>."
 }

website/common/locales/it/settings.json

@@ -49,7 +49,7 @@
     "customDayStart": "Inizio giorno personalizzato",
     "sureChangeCustomDayStartTime": "Are you sure you want to change your Custom Day Start time? Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before then!",
     "changeCustomDayStart": "Cambiare l'ora di inizio della giornata?",
-    "sureChangeCustomDayStart": "Vuoi davvere cambiare l'ora di inizio della giornata?",
+    "sureChangeCustomDayStart": "Vuoi davvero cambiare l'ora di inizio della giornata?",
     "customDayStartHasChanged": "La tua ora di inizio giorno è stata cambiata.",
     "nextCron": "Le tue Daily verranno ripristinate la prima volta che usi Habitica dopo <%= time %>. Assicurati di aver completato le tue Daily prima di allora!",
     "customDayStartInfo1": "Habitica è impostato per resettare le tue Daily a mezzanotte (nel tuo fuso orario) ogni giorno. Qui puoi modificare l'ora di \"reset\".",

website/common/locales/it/tasks.json

@@ -50,7 +50,7 @@
     "dailysDesc": "Le attività giornaliere si ripetono regolarmente. Scegli di farle ripetere ogni quanto preferisci!",
     "streakCounter": "Contatore Serie",
     "repeat": "Ripeti",
-    "repeats": "Si ripete",
+    "repeats": "Ripetizione",
     "repeatEvery": "Ripeti ogni",
     "repeatHelpTitle": "Quanto spesso dovrebbe essere ripetuta questa attività?",
     "dailyRepeatHelpContent": "Questa attività andrà completata ogni X giorni. Puoi impostare questo valore qui sotto.",

website/common/locales/ja/challenge.json

@@ -103,9 +103,9 @@
     "selectChallengeWinnersDescription": "Select winners from the Challenge participants",
     "awardWinners": "Award Winners",
     "doYouWantedToDeleteChallenge": "Do you want to delete this Challenge?",
-    "deleteChallenge": "Delete Challenge",
+    "deleteChallenge": "チャレンジを削除する",
     "challengeNamePlaceholder": "What is your Challenge name?",
-    "challengeSummary": "Summary",
+    "challengeSummary": "概要",
     "challengeSummaryPlaceholder": "Write a short description advertising your Challenge to other Habiticans. What is the main purpose of your Challenge and why should people join it? Try to include useful keywords in the description so that Habiticans can easily find it when they search!",
     "challengeDescriptionPlaceholder": "Use this section to go into more detail about everything that Challenge participants should know about your Challenge.",
     "challengeGuild": "Add to",
@@ -119,7 +119,7 @@
     "exportChallengeCsv": "Export Challenge",
     "editingChallenge": "Editing Challenge",
     "nameRequired": "Name is required",
-    "tagTooShort": "タグの名称が短すぎます。",
+    "tagTooShort": "タグの名称が短すぎます",
     "summaryRequired": "Summary is required",
     "summaryTooLong": "Summary is too long",
     "descriptionRequired": "Description is required",

website/common/locales/ja/front.json

@@ -27,7 +27,7 @@
     "communityForum": "<a target='_blank' href='http://habitica.wikia.com/wiki/Special:Forum'>フォーラム</a>",
     "communityKickstarter": "Kickstarter",
     "communityReddit": "Reddit",
-    "companyAbout": "How It Works",
+    "companyAbout": "機能説明",
     "companyBlog": "ブログ",
     "devBlog": "開発者ブログ",
     "companyDonate": "寄付",
@@ -38,17 +38,17 @@
     "dragonsilverQuote": "この10年以上、どれだけの時間・仕事管理システムを試したことか...。その中で仕事をやり遂げるのを実際に手助けしてくれたのは、 [Habitica] だけだったよ。",
     "dreimQuote": "去年の夏、試験の半分ぐらいがダメだったときに [Habitica] を見つけた。自分の生活に整理と規律をつくってくれて、1 カ月後の試験はホントにいい結果で通ったんだよ。日課の機能に「ありがとう」をいいたいな。",
     "elmiQuote": "毎朝、早起きするのが楽しみ。だってゴールドをゲットできるから!",
-    "forgotPassword": "Forgot Password?",
+    "forgotPassword": "パスワードを忘れた？",
     "emailNewPass": "パスワード再設定リンクをメールで受け取る",
-    "forgotPasswordSteps": "Enter the email address you used to register your Habitica account.",
+    "forgotPasswordSteps": "Habiticaのアカウント登録に使ったメールアドレスを入力してください。",
-    "sendLink": "Send Link",
+    "sendLink": "リンクを送る",
-    "evagantzQuote": "初めての歯医者さんで、私がデンタルフロスを習慣にしていることを話したら、すごくうれしそうだった。ありがとう、[Habitica]!",
+    "evagantzQuote": "デンタルフロスの習慣を設定していると歯医者で話したら、歯科衛生士に大感激されました。こんな体験は生まれて初めてです。ありがとう、[Habitica]!",
     "examplesHeading": "ユーザーは Habitica をこんなふうに使っています :    ",
-    "featureAchievementByline": "とっても素晴らしいことをした？バッジを得てそれを見せびらかす！",
+    "featureAchievementByline": "ゲーム内ですごいことを達成しましたか？　実績バッジを手に入れて自慢しましょう！",
     "featureAchievementHeading": "実績バッジ",
     "featureEquipByline": "タスクをこなしたごほうびで、限定アイテム、薬、その他のゲーム内グッズを市場で買いましょう!",
     "featureEquipHeading": "アイテムその他",
-    "featurePetByline": "タスクを終えたときに、たまごとアイテムが手に入ります。できるだけ生産的につとめ、ペットと乗騎を集めましょう!",
+    "featurePetByline": "タスクを終えると、ペットのたまごやアイテムが手に入ります。できるだけ生産的につとめ、ペットと乗騎を集めましょう!",
     "featurePetHeading": "ペットと乗騎",
     "featureSocialByline": "共通の趣味をもつ人たちが集まるグループに参加してみましょう。チャレンジを作成して、ほかのユーザーたちと競争しましょう。",
     "featureSocialHeading": "グループ プレー",
@@ -60,7 +60,7 @@
     "footerMobile": "モバイル",
     "footerSocial": "ソーシャル",
     "forgotPass": "パスワードを忘れた",
-    "frabjabulousQuote": "私が、超すごい、おいしい仕事につけたのは [Habitica] のおかげ。しかも、自分でも奇跡的だと思うけど、毎日デンタルフロスする人になっちゃった!",
+    "frabjabulousQuote": "私が高収入でやりがいのある憧れの仕事につけたのは [Habitica] のおかげ。しかも、自分でも奇跡的だと思うけど、毎日デンタルフロスする人になっちゃった!",
     "free": "参加無料",
     "gamifyButton": "今日からあなたの人生がゲームに!",
     "goalSample1": "1時間ピアノを練習する",
@@ -78,10 +78,10 @@
     "healthSample5": "1時間汗をかく",
     "history": "履歴",
     "infhQuote": "大学院時代、[Habitica]は私の学生生活を形づくる大きな手助けだったわ。",
-    "invalidEmail": "パスワードのリセットに対応したメールアドレスではありません。",
+    "invalidEmail": "パスワードのリセットには有効なメールアドレスが必要です。",
-    "irishfeet123Quote": "ぼくには、食後のかたづけができないのと、カップをいろんなところに置いちゃうサイアクの癖があったんだ。[Habitica]がその癖を治してくれんだ。",
+    "irishfeet123Quote": "ぼくには、食後のかたづけができないのと、カップをいろんなところに置いちゃうサイアクの癖があったんだ。[Habitica]がその癖を治してくれたんだ。",
     "joinOthers": "<%= userCount %> 人ものユーザーが、それぞれの目標を達成するのを楽しんでいます!",
-    "kazuiQuote": "[Habitica] をやる前は論文にいきづまってたし、同じように家事もできずに生活が乱れてて、語学やGo理論の勉強もうまくいってなかった。やるべきことを、小さく分割して管理できるチェックリストにしたことで、やる気が出たし、つづけられるようになったんだ。",
+    "kazuiQuote": "[Habitica] をやる前は論文にいきづまってたし、同じように家事もできずに生活が乱れてて、語学や囲碁の理論の勉強もうまくいってなかった。やるべきことを、小さく分割して管理できるチェックリストにしたことで、やる気が出たし、つづけられるようになったんだ。",
     "landingend": "まだ決心がつきませんか?",
     "landingend2": "See a more detailed list of [our features](/static/overview). Are you looking for a more private approach? Check out our [administrative packages](/static/plans), which are perfect for families, teachers, support groups, and businesses.",
     "landingp1": "市場にある多くの生産性向上ツールには、使いつづけようとするインセンティブがありません。\nHabitica はこの問題を、習慣づけを楽しくすることで解決しました!　自分自身の成功にはごほうびを、失敗にはペナルティーを...。Habitica は、日々の行動で目標を達成するためのやる気を提供します。",
@@ -101,19 +101,19 @@
     "marketing1Lead1Title": "Your Life, the Role Playing Game",
     "marketing1Lead1": "Habitica は実生活での習慣を改善するゲームです。すべてのタスク(習慣、日課、To-Do) を倒すべき小さなモンスターとみなすことで、あなたの人生を「ゲーム化」します。あなたがよりよく生きれば、ゲームも前進します。一方、実生活で失敗すると、ゲーム内の分身であるキャラクターも後戻りしてしまいますよ。",
     "marketing1Lead2Title": "すばらしい装備を手に入れよう",
-    "marketing1Lead2": "Improve your habits to build up your avatar. Show off the sweet gear you've earned!",
+    "marketing1Lead2": "習慣を改善して、アバターを成長させましょう。手に入れたカッコいい衣装をみんなに披露しましょう!",
     "marketing1Lead3Title": "ときどきボーナスが入ります",
-    "marketing1Lead3": "For some, it's the gamble that motivates them: a system called \"stochastic rewards.\" Habitica accommodates all reinforcement and punishment styles: positive, negative, predictable, and random.",
+    "marketing1Lead3": "ギャンブルこそがやる気につながる、そんな人たちには、「確率的報酬」とよんでいるシステムがあります。Habiticaには、積極的、消極的、確実、気まぐれ…すべてのやる気対策が入っています。",
     "marketing2Header": "友達と競争しましょう!　興味のあるグループに参加しましょう!",
     "marketing2Lead1Title": "Social Productivity",
     "marketing2Lead1": "Habitica を一人でプレーすることもできますが、だれかと協力し、競争し、責任を感じあいはじめてこそ、Habitica の本領発揮です。自分を成長させるプログラムでいちばん効果的なのは、社会的な責任感です。責任感と競争を実現する環境として、ビデオゲーム以上のものがあるでしょうか?",
     "marketing2Lead2Title": "Fight Monsters",
-    "marketing2Lead2": "What's a Role Playing Game without battles? Fight monsters with your party. Monsters are \"super accountability mode\" - a day you miss the gym is a day the monster hurts *everyone!*",
+    "marketing2Lead2": "戦いのないロールプレイングゲームがありますか?　あなたの仲間のパーティーでボスと戦いましょう。ボス戦は 「連帯責任モード」になります。あなたがスポーツジムに行くのをさぼった日は、ボスが *パーティ全員*にダメージを与えます！",
     "marketing2Lead3Title": "Challenge Each Other",
-    "marketing2Lead3": "Challenges let you compete with friends and strangers. Whoever does the best at the end of a challenge wins special prizes.",
+    "marketing2Lead3": "「チャレンジ」を通して友達やHabiticaで出会った人と競争してみましょう。チャレンジの勝者は特別な賞を手にすることができます。",
     "marketing3Header": "アプリと拡張機能",
-    "marketing3Lead1": "The **iPhone & Android** apps let you take care of business on the go. We realize that logging into the website to click buttons can be a drag.",
+    "marketing3Lead1": "**iPhone もしくは Android** アプリを使えば、外出先でも Habitica が操作できます。私たちは日課などのボタンをクリックするためにwebサイトにいちいちログインするのはめんどうだと気づきました。",
-    "marketing3Lead2Title": "Integrations",
+    "marketing3Lead2Title": "サードパーティーとの連動",
     "marketing3Lead2": "Other **3rd Party Tools** tie Habitica into various aspects of your life. Our API provides easy integration for things like the [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US), for which you lose points when browsing unproductive websites, and gain points when on productive ones. [See more here](http://habitica.wikia.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
     "marketing4Header": "組織での利用",
     "marketing4Lead1": "教育は、ゲーム化のもっとも適した分野の一つです。近年、電話機とゲームが、どれだけ学生・生徒たちとぴったりくっついていることか－－みなさんご存知でしょう。力を解き放つのです!　学生・生徒たちを友達同士の競争のスタートラインに並べましょう。よい行いにはレアな賞をあげましょう。学生・生徒の成績と態度が急上昇するのを見ていましょう。",
@@ -132,8 +132,8 @@
     "oldNews": "ニュース",
     "newsArchive": "Wikiaに保存されたこれまでのお知らせ(多言語版)",
     "passConfirm": "新しいパスワードを確認する",
-    "setNewPass": "Set New Password",
+    "setNewPass": "新しいパスワードの設定",
-    "passMan": "パスーワード管理ソフト(例 : 1Password )を使用している場合、ログイン時に問題が発生する場合があります。その場合は、ユーザー名とパスワードを手で入力してください。",
+    "passMan": "パスワード管理ソフト(例 : 1Password )を使用している場合、ログイン時に問題が発生する場合があります。その場合は、ユーザー名とパスワードを手で入力してください。",
     "password": "パスワード",
     "playButton": "遊ぶ",
     "playButtonFull": "Habitica をプレー",

website/common/locales/ja/generic.json

@@ -5,8 +5,8 @@
     "habitica": "Habitica",
     "habiticaLink": "<a href='http://ja.habitica.wikia.com/wiki/' target='_blank'>Habitica</a>",
     "onward": "Onward!",
-    "done": "Done",
+    "done": "完了",
-    "gotIt": "Got it!",
+    "gotIt": "了解！",
     "titleTasks": "タスク",
     "titleAvatar": "アバター",
     "titleBackgrounds": "背景",
@@ -28,9 +28,9 @@
     "titleTimeTravelers": "タイムトラベラー",
     "titleSeasonalShop": "季節の店",
     "titleSettings": "設定",
-    "saveEdits": "Save Edits",
+    "saveEdits": "編集を保存",
-    "showMore": "Show More",
+    "showMore": "もっと表示する",
-    "showLess": "Show Less",
+    "showLess": "表示を減らす",
     "expandToolbar": "ツールバーを開く",
     "collapseToolbar": "ツールバーを閉じる",
     "markdownBlurb": "Habiticaはメッセージの書式にマークダウンを利用しています。詳しくは<a href='http://ja.habitica.wikia.com/wiki/マークダウン便利表' target='_blank'>マークダウン便利表</a>をご覧ください。",
@@ -85,8 +85,8 @@
     "gemsPopoverTitle": "ジェム",
     "gems": "ジェム",
     "gemButton": "現在ジェムを <%= number %>個持っています。",
-    "needMoreGems": "Need More Gems?",
+    "needMoreGems": "ジェムがもっと欲しい？",
-    "needMoreGemsInfo": "Purchase Gems now, or become a subscriber to buy Gems with Gold, get monthly mystery items, enjoy increased drop caps and more!",
+    "needMoreGemsInfo": "ジェムを購入するか、寄付会員になって、ゴールドでのジェムの購入、毎月のミステリー アイテムの入手、アイテムドロップの上限増加などの恩恵を受けましょう！",
     "moreInfo": "詳細情報",
     "moreInfoChallengesURL": "http://habitica.wikia.com/wiki/Challenges",
     "moreInfoTagsURL": "http://habitica.wikia.com/wiki/Tags",
@@ -157,10 +157,10 @@
     "achievementStressbeast": "オダヤカニの救世主",
     "achievementStressbeastText": "2014年冬のワンダーランドイベントで「不快なストレス獣」の打倒に協力しました!",
     "achievementBurnout": "繁栄の地の救世主",
-    "achievementBurnoutText": "2015年秋の収穫祭イベントで「燃えつきと消耗の悪霊」の打倒に協力しました!",
+    "achievementBurnoutText": "2015年秋の収穫祭イベントで「モエツ鬼」の打倒と「消耗した魂」の救済に協力しました!",
-    "achievementBewilder": "霧がかりの救世主",
+    "achievementBewilder": "マドワシティーの救世主",
     "achievementBewilderText": "2016年春の元気なダンス イベントで、「まどわしのビ・ワイルダー」の打倒に協力しました!",
-    "checkOutProgress": "Habatica での進行状況を見てください!",
+    "checkOutProgress": "Habiticaでの私の成長を見てください!",
     "cards": "カード",
     "cardReceived": "カードが届きました!",
     "cardReceivedFrom": "<%= userName %> からの <%= cardType %>",
@@ -169,7 +169,7 @@
     "greetingCardNotes": "パーティーの仲間にあいさつのカードを送りましょう。",
     "greeting0": "こんにちは!",
     "greeting1": "ちょっとあいさつしてみただけ (^_^)",
-    "greeting2": "（割れんばかりの拍手）",
+    "greeting2": "（遠くから手をブンブン振る）",
     "greeting3": "そこのあなた!",
     "greetingCardAchievementTitle": "Kawaii",
     "greetingCardAchievementText": "やあ!　よう! 　こんにちは!　<%= count %> 通のあいさつカードをやりとりしました。",
@@ -189,7 +189,7 @@
     "birthdayCardAchievementTitle": "誕生日プレゼント",
     "birthdayCardAchievementText": "たくさんの幸せがめぐっています。<%= count %>通の誕生日カードをやりとりしました。",
     "congratsCard": "お祝いのカード",
-    "congratsCardExplanation": "You both receive the Congratulatory Companion achievement!",
+    "congratsCardExplanation": "お二人とも、仲間への祝福 の実績を解除しました!",
     "congratsCardNotes": "パーティーの仲間にお祝いのカードを送りましょう。",
     "congrats0": "あなたの成功を心から喜んでいます！",
     "congrats1": "あなたのことを誇りに思います！",
@@ -199,7 +199,7 @@
     "congratsCardAchievementTitle": "仲間への祝福",
     "congratsCardAchievementText": "友達の成果を祝福するのはすばらしいことです! 　<%= count %> 通のお祝いのカードをやりとりしました。",
     "getwellCard": "お見舞いのカード",
-    "getwellCardExplanation": "You both receive the Caring Confidant achievement!",
+    "getwellCardExplanation": "お二人とも、いたわりの友 の実績を解除しました!",
     "getwellCardNotes": "パーティーの仲間にお見舞いのカードを送りましょう。",
     "getwell0": "早くよくなりますように！",
     "getwell1": "お大事に！<3",
@@ -234,27 +234,27 @@
     "onlineCount": "<%= count %> 人がオンライン",
     "loading": "読み込み中...",
     "userIdRequired": "ユーザー ID が必要です。",
-    "resetFilters": "Clear all filters",
+    "resetFilters": "フィルターを元に戻す",
-    "applyFilters": "Apply Filters",
+    "applyFilters": "フィルターを適用",
-    "categories": "Categories",
+    "categories": "カテゴリ",
-    "habiticaOfficial": "Habitica Official",
+    "habiticaOfficial": "Habitica 公式",
-    "animals": "Animals",
+    "animals": "動物",
-    "artDesign": "Art & Design",
+    "artDesign": "芸術・デザイン",
-    "booksWriting": "Books & Writing",
+    "booksWriting": "書籍・文筆",
-    "comicsHobbies": "Comics & Hobbies",
+    "comicsHobbies": "漫画・ホビー",
-    "diyCrafts": "DIY & Crafts",
+    "diyCrafts": "工作・手芸",
-    "education": "Education",
+    "education": "教育・学習",
-    "foodCooking": "Food & Cooking",
+    "foodCooking": "食事・料理",
-    "healthFitness": "Health & Fitness",
+    "healthFitness": "健康・フィットネス",
-    "music": "Music",
+    "music": "音楽",
-    "relationship": "Relationships",
+    "relationship": "人間関係",
-    "scienceTech": "Science & Technology",
+    "scienceTech": "科学・技術",
-    "exercise": "Exercise",
+    "exercise": "運動",
-    "creativity": "Creativity",
+    "creativity": "クリエイティブ",
-    "budgeting": "Budgeting",
+    "budgeting": "家計",
-    "health_wellness": "Health & Wellness",
+    "health_wellness": "健康維持・向上",
-    "self_care": "Self-Care",
+    "self_care": "セルフケア",
-    "habitica_official": "Habitica Official",
+    "habitica_official": "Habitica 公式",
     "academics": "Academics",
     "advocacy_causes": "Advocacy + Causes",
     "entertainment": "Entertainment",
@@ -263,8 +263,8 @@
     "hobbies_occupations": "Hobbies + Occupations",
     "location_based": "Location-based",
     "mental_health": "Mental Health + Self-Care",
-    "getting_organized": "Getting Organized",
+    "getting_organized": "整理整頓",
-    "self_improvement": "Self-Improvement",
+    "self_improvement": "自己啓発",
     "spirituality": "Spirituality",
     "time_management": "Time-Management + Accountability",
     "recovery_support_groups": "Recovery + Support Groups",
@@ -272,5 +272,5 @@
     "emptyMessagesLine1": "You don't have any messages",
     "emptyMessagesLine2": "Send a message to start a conversation!",
     "letsgo": "Let's Go!",
-    "selected": "Selected"
+    "selected": "選択中"
 }

website/common/locales/pt/gear.json

@@ -15,7 +15,7 @@
     "sortByPrice": "Preço",
     "sortByCon": "CON",
     "sortByPer": "PER",
-    "sortByStr": "STR",
+    "sortByStr": "FOR",
     "sortByInt": "INT",
     "weapon": "arma",
     "weaponCapitalized": "Item de mão principal",
@@ -26,7 +26,7 @@
     "weaponWarrior1Text": "Espada",
     "weaponWarrior1Notes": "Lâmina comum dos soldados. Aumenta Força em <%= str %>.",
     "weaponWarrior2Text": "Machado",
-    "weaponWarrior2Notes": "Double-bitted chopping weapon. Increases Strength by <%= str %>",
+    "weaponWarrior2Notes": "Arma de corte de dupla lâmina. Aumenta Força em <%= str %>",
     "weaponWarrior3Text": "Estrela Da Manhã",
     "weaponWarrior3Notes": "Clava pesada com espinhos brutais. Aumenta Força em <%= str %>.",
     "weaponWarrior4Text": "Lâmina de Safira",

website/common/locales/pt_BR/challenge.json

@@ -53,11 +53,11 @@
     "keepTasks": "Manter Tarefas",
     "closeCha": "Terminar desafio e...",
     "leaveCha": "Sair do desafio e...",
-    "challengedOwnedFilterHeader": "Propriedade",
+    "challengedOwnedFilterHeader": "Titularidade",
     "challengedOwnedFilter": "Meus",
-    "owned": "Pertences",
+    "owned": "Meus",
     "challengedNotOwnedFilter": "Dos outros",
-    "not_owned": "Not Owned",
+    "not_owned": "De Outros",
     "not_participating": "Não participando",
     "challengedEitherOwnedFilter": "Ambos",
     "backToChallenges": "Voltar para todos os desafios",
@@ -90,10 +90,10 @@
     "joinedChallenge": "Entrou em um Desafio",
     "joinedChallengeText": "Este usuário testou seus limites ao entrar em um Desafio!",
     "myChallenges": "Meus desafios",
-    "findChallenges": "Encontrar desafios",
+    "findChallenges": "Encontre Desafios",
     "noChallengeTitle": "Você não participa de nenhum desafio",
     "challengeDescription1": "Desafios são eventos comunitários em que os jogadores competem e ganham prêmios ao completarem um grupo de tarefas relacionadas a esses desafios.",
-    "challengeDescription2": "Find recommended Challenges based on your interests, browse Habitica's public Challenges, or create your own Challenges.",
+    "challengeDescription2": "Encontre Desafios recomendados baseado nos seus interesses. Pesquise nos Desafios Públicos do Habitica ou crie seus próprios Desafios.",
     "createdBy": "Criado por:",
     "joinChallenge": "Se juntar ao desafio",
     "leaveChallenge": "Deixar o desafio",
@@ -106,8 +106,8 @@
     "deleteChallenge": "Deletar Desafio",
     "challengeNamePlaceholder": "Qual é o nome do seu desafio?",
     "challengeSummary": "Resumo",
-    "challengeSummaryPlaceholder": "Write a short description advertising your Challenge to other Habiticans. What is the main purpose of your Challenge and why should people join it? Try to include useful keywords in the description so that Habiticans can easily find it when they search!",
+    "challengeSummaryPlaceholder": "Escreva uma breve descrição anunciando seu Desafio para outros Habiticanos. Qual é o principal objetivo do Desafio e por que as pessoas deveriam entrar nele? Tente incluir palavras chave úteis na descrição de forma que Habiticanos possam encontrá-lo facilmente em suas buscas.",
-    "challengeDescriptionPlaceholder": "Use this section to go into more detail about everything that Challenge participants should know about your Challenge.",
+    "challengeDescriptionPlaceholder": "Use essa seção para dar maiores informações sobre tudo que os participantes do Desafio deveriam saber sobre seu Desafio.",
     "challengeGuild": "Adicionar a",
     "challengeMinimum": "É necessário o mínimo de 1 Gema para desafios públicos (Ajuda a prevenir o spam, ajuda mesmo).",
     "participantsTitle": "Participantes",

website/common/locales/pt_BR/character.json

@@ -125,7 +125,7 @@
     "mystery": "Mistério",
     "changeClass": "Alterar classe e restituir pontos de atributos",
     "lvl10ChangeClass": "Para mudar de classe você precisa ser pelo menos nível 10.",
-    "changeClassConfirmCost": "Are you sure you want to change your class for 3 Gems?",
+    "changeClassConfirmCost": "Tem certeza que quer troca sua classe por 3 Gemas?",
     "invalidClass": "Classe inválida. Por favor, use 'guerreiro', 'ladino', 'mago', ou 'curandeiro'.",
     "levelPopover": "A cada nível que alcançar você terá um ponto para distribuir para um atributo de sua escolha. Você pode fazer isso manualmente, ou deixar o jogo decidir por você usando uma das opções de Distribuição Automática.",
     "unallocated": "Pontos de Atributo não Distribuídos",
@@ -159,7 +159,7 @@
     "respawn": "Reviver!",
     "youDied": "Você Morreu!",
     "dieText": "Você perdeu um Nível, todo seu Ouro, e uma peça aleatória de Equipamento. Erga-se, Habiticano, e tente novamente! Acabe com esses Hábitos negativos, esteja atento à realização de suas Diárias, e afaste a morte com uma Poção de Vida se vacilar!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 Gems.",
+    "sureReset": "Tem certeza? Isto irá reiniciar a classe e os pontos de atributos do seu personagem (você receberá os pontos de volta para realocar) e custa 3 Gemas.",
     "purchaseFor": "Comprar por <%= cost %> Gemas?",
     "notEnoughMana": "Mana insuficiente.",
     "invalidTarget": "Você não pode utilizar uma habilidade aqui.",

website/common/locales/pt_BR/front.json

@@ -1,6 +1,6 @@
 {
     "FAQ": "FAQ",
-    "termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.",
+    "termsAndAgreement": "Ao clicar no botão abaixo, você afirma que leu e aceitou os <a href='/static/terms'>Termos de Serviço</a> e <a href='/static/privacy'>Política de Privacidade</a>.",
     "accept1Terms": "Ao clicar no botão abaixo, eu concordo com os",
     "accept2Terms": "e com a",
     "alexandraQuote": "Não consegui NÃO falar sobre o [Habitica] durante meu discurso em Madri. Ferramenta obrigatória para autônomos que ainda precisam de um chefe.",
@@ -27,7 +27,7 @@
     "communityForum": "<a target='_blank' href='http://habitica.wikia.com/wiki/Special:Forum'>Fórum</a>",
     "communityKickstarter": "Kickstarter",
     "communityReddit": "Reddit",
-    "companyAbout": "How It Works",
+    "companyAbout": "Como Funciona",
     "companyBlog": "Blog",
     "devBlog": "Blog do Desenvolvedor",
     "companyDonate": "Doar",
@@ -40,7 +40,7 @@
     "elmiQuote": "Toda manhã eu me apresso em levantar para conseguir mais ouro!",
     "forgotPassword": "Esqueceu a senha?",
     "emailNewPass": "Enviar por Email uma Nova Senha ",
-    "forgotPasswordSteps": "Enter the email address you used to register your Habitica account.",
+    "forgotPasswordSteps": "Digite o endereço de e-mail que você usou para registrar sua conta no Habitica.",
     "sendLink": "Enviar Link",
     "evagantzQuote": "Minha primeira consulta na qual o dentista ficou impressionado com meu hábito de usar fio dental. Obrigado, [Habitica]!",
     "examplesHeading": "Jogadores usam Habitica para gerenciar...",
@@ -83,7 +83,7 @@
     "joinOthers": "Junte-se a <%= userCount %> de pessoas que estão atingindo metas de forma divertida!",
     "kazuiQuote": "Antes do [Habitica], eu estava empacado com minha tese, além de insatisfeito com minha disciplina nas atividades domésticas e coisas como aprendizado de idiomas e estudo da teoria Go. No final das contas, dividir estas tarefas em pequenas listas foi a coisa certa para me manter motivado e constantemente trabalhando.",
     "landingend": "Ainda não está convencido?",
-    "landingend2": "See a more detailed list of [our features](/static/overview). Are you looking for a more private approach? Check out our [administrative packages](/static/plans), which are perfect for families, teachers, support groups, and businesses.",
+    "landingend2": "Veja uma lista detalhada de [nossas funcionalidades](/static/overview). Está em busca de algo mais privado? Conheça nossos [pacotes administrativos](/static/plans), que são perfeitos para famílias, professores, grupos de apoio, e empresas.",
     "landingp1": "O problema com a maioria dos apps de produtividade no mercado é que eles não fornecem nenhum incentivo para continuarem sendo usados. Habitica resolve esse problema fazendo com que construir hábitos seja divertido! Recompensando-o por seu sucesso e o penalizando por seus deslizes, Habitica fornece motivações externas para completar atividades do dia-a-dia.",
     "landingp2": "Sempre que você reforçar um hábito positivo, completar uma diária, ou resolver um afazer antigo, o Habitica imediatamente o recompensará com pontos de experiência e Ouro. Conforme você ganha experiência, você sobe de nível, aumentando seus atributos e liberando mais funcionalidades, como classes e mascotes. Ouro pode ser gasto em itens do jogo que alteram sua experiência ou em recompensas personalizadas que você crie para se motivar. Quando até os menores sucessos oferecem recompensas imediatas, é menos provável que você procrastine.",
     "landingp2header": "Gratificação Imediata",
@@ -98,23 +98,23 @@
     "loginGoogleAlt": "Logar com Google",
     "logout": "Desconectar",
     "marketing1Header": "Melhore Seus Hábitos Jogando",
-    "marketing1Lead1Title": "Your Life, the Role Playing Game",
+    "marketing1Lead1Title": "Sua Vida, O Jogo de RPG",
     "marketing1Lead1": "Habitica é um jogo que o ajuda a melhorar hábitos da vida real. Ele \"gamifica\" sua vida ao tornar todas suas tarefas (diárias, hábitos e afazeres) em pequenos monstros que você precisa derrotar. Quanto melhor você for nisso, mais você avança no jogo. Se você deslizar na vida real, seu personagem começa a retroceder no jogo.",
     "marketing1Lead2Title": "Consiga Equipamentos Incríveis",
-    "marketing1Lead2": "Improve your habits to build up your avatar. Show off the sweet gear you've earned!",
+    "marketing1Lead2": "Melhore seus hábitos para desenvolver seu avatar. Mostre os belos equipamentos que você ganhou!",
     "marketing1Lead3Title": "Encontre Prêmios Aleatórios",
-    "marketing1Lead3": "For some, it's the gamble that motivates them: a system called \"stochastic rewards.\" Habitica accommodates all reinforcement and punishment styles: positive, negative, predictable, and random.",
+    "marketing1Lead3": "Para alguns, é a aposta que os motiva: um sistema chamado \"gratificação estocástica\". O Habitica acomoda todos os estilos de reforço e punição: positivo, negativo, previsível e aleatório.",
     "marketing2Header": "Combata Com Amigos, Junte-se a Grupos em Comum",
-    "marketing2Lead1Title": "Social Productivity",
+    "marketing2Lead1Title": "Produtividade Social",
     "marketing2Lead1": "Enquanto você pode jogar Habitica sozinho, as coisas ficam realmente interessantes quando você começa a colaborar, competir e ajudar uns aos outros. A parte mais efetiva de qualquer programa de auto-aperfeiçoamento é a cobrança social, e qual o melhor ambiente para responsabilidade e competição do que um jogo?",
-    "marketing2Lead2Title": "Lute contra monstros",
+    "marketing2Lead2Title": "Lute Contra Monstros",
-    "marketing2Lead2": "What's a Role Playing Game without battles? Fight monsters with your party. Monsters are \"super accountability mode\" - a day you miss the gym is a day the monster hurts *everyone!*",
+    "marketing2Lead2": "O que é um RPG sem batalhas? Enfrente monstros junto com seu grupo. Chefões são um \"modo de super cobrança\", um dia que você falta à academia é um dia que o chefão machuca *todo mundo!*",
-    "marketing2Lead3Title": "Challenge Each Other",
+    "marketing2Lead3Title": "Desafiem-se",
-    "marketing2Lead3": "Challenges let you compete with friends and strangers. Whoever does the best at the end of a challenge wins special prizes.",
+    "marketing2Lead3": "Desafios lhe permite competir com amigos e desconhecidos. Quem se sair melhor ao final do desafio ganha prêmios especiais.",
     "marketing3Header": "Apps e Extensões",
-    "marketing3Lead1": "The **iPhone & Android** apps let you take care of business on the go. We realize that logging into the website to click buttons can be a drag.",
+    "marketing3Lead1": "Os aplicativos para **iPhone e Android** permitem que você cuide de suas tarefas em qualquer lugar. Nós sabemos que conectar no website para clicar em botões pode ser chato.",
-    "marketing3Lead2Title": "Integrations",
+    "marketing3Lead2Title": "Integrações",
-    "marketing3Lead2": "Other **3rd Party Tools** tie Habitica into various aspects of your life. Our API provides easy integration for things like the [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US), for which you lose points when browsing unproductive websites, and gain points when on productive ones. [See more here](http://habitica.wikia.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
+    "marketing3Lead2": "Outras **Ferramentas de Terceiros** conectam o Habitica a vários outros aspectos da sua vida. Nossa API fornece uma integração fácil a ferramentas como a [Extensão do Chrome](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US), pela qual você perde pontos ao navegar em sites improdutivos e ganha pontos nos sites produtivos. [Veja mais informações aqui](http://habitica.wikia.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
     "marketing4Header": "Uso Organizacional",
     "marketing4Lead1": "Educação é um dos melhores setores para gamificação. Todos nós sabemos o quanto estudantes estão grudados no telefone e em jogos hoje em dia - aproveite esse poder! Coloque seus estudantes uns contra os outros em uma competição amigável. Recompense bons comportamentos com prêmios raros. Veja suas notas e comportamentos melhorarem.",
     "marketing4Lead1Title": "Gamificação na Educação",
@@ -132,7 +132,7 @@
     "oldNews": "Notícias",
     "newsArchive": "Arquivo de notícias na Wikia (multilíngue)",
     "passConfirm": "Confirmar Senha",
-    "setNewPass": "Defina a nova senha",
+    "setNewPass": "Defina a Nova Senha",
     "passMan": "Se você estiver utilizando um gerenciador de senhas (como o 1Password) e estiver tendo problemas para logar, tente digitar o seu nome de usuário e sua senha manualmente.",
     "password": "Senha",
     "playButton": "Jogar",
@@ -194,8 +194,8 @@
     "unlockByline2": "Desbloqueie novas ferramentas motivacionais como coleta de mascotes, recompensas aleatórias, uso de magias e mais!",
     "unlockHeadline": "À medida que você é produtivo, você desbloqueia novos conteúdos!",
     "useUUID": "Use UUID / API Token (Para Usuários do Facebook)",
-    "username": "Login Name",
+    "username": "Nome de Usuário",
-    "emailOrUsername": "Email or Login Name",
+    "emailOrUsername": "E-mail ou Nome de Usuário",
     "watchVideos": "Veja Vídeos",
     "work": "Trabalho",
     "zelahQuote": "Com o [Habitica], eu sou persuadido a ir para a cama na hora pelos pontos que ganho por dormir cedo ou pela vida que perco dormindo tarde!",
@@ -245,9 +245,9 @@
     "altAttrSlack": "Slack",
     "missingAuthHeaders": "Faltando cabeçalhos de autenticação.",
     "missingAuthParams": "Faltando parâmetros de autenticação.",
-    "missingUsernameEmail": "Missing Login Name or email.",
+    "missingUsernameEmail": "Digite o Nome de Usuário ou E-mail.",
     "missingEmail": "Faltando e-mail.",
-    "missingUsername": "Missing Login Name.",
+    "missingUsername": "Digite o Nome de Usuário.",
     "missingPassword": "Faltando senha.",
     "missingNewPassword": "Faltando nova senha.",
     "invalidEmailDomain": "Você não pode se registrar com emails destes domínios: <%= domains %>",
@@ -256,7 +256,7 @@
     "notAnEmail": "Endereço de e-mail inválido.",
     "emailTaken": "Endereço de e-mail já está sendo usado em uma conta.",
     "newEmailRequired": "Faltando novo endereço de e-mail.",
-    "usernameTaken": "Login Name already taken.",
+    "usernameTaken": "Nome de Usuário já cadastrado.",
     "passwordConfirmationMatch": "A confirmação de senha não corresponde à senha.",
     "invalidLoginCredentials": "Nome de usuário e/ou e-mail e/ou senha incorretos.",
     "passwordResetPage": "Mudar a Senha",
@@ -275,41 +275,41 @@
     "heroIdRequired": "\"heroId\" precisa ser um UUID válido.",
     "cannotFulfillReq": "Sua solicitação não pode ser cumprida. Mande um e-mail para admin@habitica.com se esse erro persistir.",
     "modelNotFound": "Este modelo não existe.",
-    "signUpWithSocial": "Sign up with <%= social %>",
+    "signUpWithSocial": "Cadastre-se com <%= social %>",
-    "loginWithSocial": "Log in with <%= social %>",
+    "loginWithSocial": "Entre com <%= social %>",
-    "confirmPassword": "Confirm Password",
+    "confirmPassword": "Confirmar Senha",
-    "usernamePlaceholder": "e.g., HabitRabbit",
+    "usernamePlaceholder": "Ex: HabitIcante",
-    "emailPlaceholder": "e.g., rabbit@example.com",
+    "emailPlaceholder": "Ex: habiticante@exemplo.com",
-    "passwordPlaceholder": "e.g., ******************",
+    "passwordPlaceholder": "Ex: ******************",
     "confirmPasswordPlaceholder": "Certifique-se de que é a mesma senha!",
-    "joinHabitica": "Join Habitica",
+    "joinHabitica": "Entre no Habitica",
-    "alreadyHaveAccountLogin": "Already have a Habitica account? <strong>Log in.</strong>",
+    "alreadyHaveAccountLogin": "Já possui uma conta no Habitica? <strong>Faça login.</strong>",
-    "dontHaveAccountSignup": "Don’t have a Habitica account? <strong>Sign up.</strong>",
+    "dontHaveAccountSignup": "Não possui uma conta no Habitica? <strong>Cadastre-se.</strong>",
-    "motivateYourself": "Motivate yourself to achieve your goals.",
+    "motivateYourself": "Motive-se a alcançar seus objetivos.",
-    "timeToGetThingsDone": "It's time to have fun when you get things done! Join over 2.5 million Habiticans and improve your life one task at a time.",
+    "timeToGetThingsDone": "É hora de se divertir enquanto termina seus afazeres! Junte-se a 2,5 milhões de Habiticanos e melhore sua vida uma tarefa por vez.",
-    "singUpForFree": "Sign Up For Free",
+    "singUpForFree": "Cadastre-se De Graça",
     "or": "OU",
-    "gamifyYourLife": "Gamify Your Life",
+    "gamifyYourLife": "Gamifique Sua Vida",
     "aboutHabitica": "Habitica 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, Habitica can help you achieve your goals to become healthy, hard-working, and happy.",
-    "trackYourGoals": "Acompanhe seus hábitos e objetivos",
+    "trackYourGoals": "Acompanhe Seus Hábitos e Objetivos",
     "trackYourGoalsDesc": "Stay accountable by tracking and managing your Habits, Daily goals, and To-Do list with Habitica’s easy-to-use mobile apps and web interface.",
-    "earnRewards": "Ganhe recompensas por suas metas",
+    "earnRewards": "Ganhe Recompensas por Suas Metas",
     "earnRewardsDesc": "Check off tasks to level up your Avatar and unlock in-game features such as battle armor, mysterious pets, magic skills, and even quests!",
-    "battleMonsters": "Enfrente monstros junto com seus amigos",
+    "battleMonsters": "Enfrente Monstros Junto com Seus Amigos",
-    "battleMonstersDesc": "Fight monsters with other Habiticans! Use the Gold that you earn to buy in-game or custom rewards, like watching an episode of your favorite TV show.",
+    "battleMonstersDesc": "Enfrente monstros com outros Habiticanos! Use o Ouro obtido para adquirir recompensas do jogo ou customizáveis, como assistir um episódio do seu programa favorito.",
-    "playersUseToImprove": "Players Use Habitica to Improve",
+    "playersUseToImprove": "Jogadores Usam Habitica para Melhorar",
     "healthAndFitness": "Saúde e Condicionamento Físico",
     "healthAndFitnessDesc": "Nunca se sente motivado a passar fio dental? Sempre falta a academia? O Habitica faz com que ser saudável finalmente seja divertido.",
     "schoolAndWork": "Escola e Trabalho",
     "schoolAndWorkDesc": "Se você está preparando um relatório para o seu professor ou seu chefe, é fácil acompanhar seu progresso à medida que você lida com suas tarefas mais difíceis.",
     "muchmuchMore": "E muito, muito mais!",
     "muchmuchMoreDesc": "Nossa lista de tarefas completamente personalizada permite que você molde o Habitica para que ele se encaixe em suas metas pessoais. Trabalhe em projetos criativos, cuide de sua saúde ou siga um sonho diferente - tudo depende de você.",
-    "levelUpAnywhere": "Suba de nível em qualquer lugar",
+    "levelUpAnywhere": "Suba de Nível em Qualquer Lugar",
     "levelUpAnywhereDesc": "Nossos aplicativos móveis simplificam o controle de suas tarefas em qualquer lugar. Realize seus objetivos num único toque, não importa onde esteja.",
     "joinMany": "Junte-se a mais de 2.000.000 de pessoas que se divertem enquanto cumprem seus objetivos!",
     "joinToday": "Entre para o Habitica hoje",
     "signup": "Registre-se",
-    "getStarted": "Comece já",
+    "getStarted": "Comece Já",
-    "mobileApps": "Aplicativos móveis",
+    "mobileApps": "Aplicativos Móveis",
-    "learnMore": "Aprenda mais"
+    "learnMore": "Aprenda Mais"
 }

website/common/locales/pt_BR/groups.json

@@ -80,7 +80,7 @@
     "logoUrl": "URL do Logo",
     "assignLeader": "Nomear Líder do Grupo",
     "members": "Membros",
-    "memberList": "Member List",
+    "memberList": "Lista de Membros",
     "partyList": "Ordem dos membros do grupo no cabeçalho",
     "banTip": "Expulsar Membro",
     "moreMembers": "mais membros",
@@ -340,7 +340,7 @@
     "memberCount": "Quantidade de Membros",
     "recentActivity": "Atividade Recente",
     "myGuilds": "Minhas Guildas",
-    "guildsDiscovery": "Descubra Guildas",
+    "guildsDiscovery": "Encontre Guildas",
     "guildOrPartyLeader": "Líder",
     "guildLeader": "Líder da Guilda",
     "member": "Membro",
@@ -387,8 +387,8 @@
     "areYouSureDeleteMessage": "Tem certeza que quer deletar esta mensagem?",
     "reverseChat": "Chat em Ordem Reversa",
     "invites": "Convites",
-    "details": "Details",
+    "details": "Detalhes",
-    "participantDesc": "Once all members have either accepted or declined, the Quest begins. Only those that clicked 'accept' will be able to participate in the Quest and receive the drops.",
+    "participantDesc": "Quando todos os membros tiverem ou aceitado ou rejeitado, a Missão começa. Apenas quem tiver clicado em \"Aceitar\" poderá participar da Missão e receber os drops.",
-    "groupGems": "Group Gems",
+    "groupGems": "Gemas do Grupo",
-    "groupGemsDesc": "Guild Gems can be spent to make Challenges! In the future, you will be able to add more Guild Gems."
+    "groupGemsDesc": "Gemas da Guildas podem ser gastas para criar Desafios! No futuro, você poderá adicionar mais Gemas da Guilda."
 }

website/common/locales/pt_BR/limited.json

@@ -118,6 +118,6 @@
     "dateEndJune": "14 de Junho",
     "dateEndJuly": "29 de Julho",
     "dateEndAugust": "31 de Agosto",
-    "dateEndOctober": "October 31",
+    "dateEndOctober": "31 de Outubro",
     "discountBundle": "pacote"
 }

website/common/locales/pt_BR/npc.json

@@ -2,29 +2,29 @@
     "npc": "NPC",
     "npcAchievementName": "<%= key %> NPC",
     "npcAchievementText": "Apoiou o projeto no Kickstarter no nível máximo!",
-    "welcomeTo": "Welcome to",
+    "welcomeTo": "Boas Vindas a",
     "welcomeBack": "Bem Vindo(a) de volta! ",
     "justin": "Justin",
-    "justinIntroMessage1": "Hello there! You must be new here. My name is Justin, your guide to Habitica.",
+    "justinIntroMessage1": "Olá! Primeira vez por aqui? Meu nome é Justin, seu guia do Habitica.",
     "justinIntroMessage2": "De início, você precisará criar um avatar.",
-    "justinIntroMessage3": "Great! Now, what are you interested in working on throughout this journey?",
+    "justinIntroMessage3": "Ótimo! Agora, no que você tem interesse em trabalhar durante essa jornada?",
-    "introTour": "Here we are! I've filled out some Tasks for you based on your interests, so you can get started right away. Click a Task to edit or add new Tasks to fit your routine!",
+    "introTour": "Prontinho, aqui está! Eu te fiz algumas Tarefas baseado nos seus interesses de modo que você já possa começar. Clique numa Tarefa para editar ou adicione novas Tarefas pra completar sua rotina!",
-    "prev": "Prev",
+    "prev": "Ant",
     "next": "Próximo",
     "randomize": "Aleatorizar",
     "mattBoch": "Matt Boch",
     "mattShall": "Devo trazer seu corcel, <%= name %>? Uma vez que você alimentou o seu mascote o suficiente para torná-lo uma montaria, ele aparecerá aqui. Clique em uma montaria para montá-la.",
     "mattBochText1": "Bem-vindo ao meu Estábulo! Sou Matt, o mestre das bestas. Começando no nível 3, você pode chocar mascotes usando ovos e poções. Quando você choca um mascote no Mercado, ele aparecerá aqui! Clique na imagem de um mascote para adicioná-lo ao seu avatar. Alimente-os usando a comida que você encontrar depois do nível 3 e eles se transformarão em poderosas montarias.",
-    "welcomeToTavern": "Bem vindo à Taverna!",
+    "welcomeToTavern": "Boas vindas à Taverna!",
     "sleepDescription": "Precisa de um descanso? Faça uma visita à Pousada do Daniel e pare algumas das mecânicas de jogo mais difíceis do Habitica.",
-    "sleepBullet1": "Diárias perdidas não lhe causarão dano",
+    "sleepBullet1": "Diárias não feitas não lhe causarão dano",
-    "sleepBullet2": "As tarefas não vão perder seus combos ou decaírem de cor",
+    "sleepBullet2": "As tarefas não vão perder seus combos ou decair de cor",
-    "sleepBullet3": "Os chefões não causarão dano pelas Diárias perdidas.",
+    "sleepBullet3": "Os Chefões não causarão dano pelas Diárias não feitas.",
-    "sleepBullet4": "Your boss damage or collection Quest items will stay pending until check-out",
+    "sleepBullet4": "Seu dano no chefão ou items de Missão de coleta ficarão acumulados até o fim do dia",
-    "pauseDailies": "Pause Damage",
+    "pauseDailies": "Pausar Diárias",
-    "unpauseDailies": "Unpause Damage",
+    "unpauseDailies": "Reativar Diárias",
     "staffAndModerators": "Equipe e Moderadores",
-    "communityGuidelinesIntro": "Habitica tries to create a welcoming environment for users of all ages and backgrounds, especially in public spaces like the Tavern. If you have any questions, please consult our <a href='/static/community-guidelines' target='_blank'>Community Guidelines</a>.",
+    "communityGuidelinesIntro": "O Habitica tentar criar um ambiente convidativo para usuários de todas as idades e contexto, especialmente em espaços públicos como a Taverna. Se você tiver qualquer dúvida, por favor consulte nossas <a href='/static/community-guidelines' target='_blank'>Diretrizes da Comunidade</a>.",
     "acceptCommunityGuidelines": "Eu aceito cumprir as Diretrizes da Comunidade",
     "daniel": "Daniel",
     "danielText": "Boas vindas à Pousada! Fique um pouco e conheça os nativos. Se precisar descansar (férias? problemas de saúde?), eu me encarregarei de deixá-lo à vontade na Pousada. Enquanto descansa, suas Diárias não lhe causarão dano na virada do dia, mas você ainda pode marcá-las como realizadas.",
@@ -33,45 +33,45 @@
     "danielText2Broken": "Oh... Se você estiver participando de uma missão de Chefão, ele ainda te causará dano pelas Diárias não feitas dos teus colegas de grupo... Além disso, seu dano no Chefão (ou itens coletados) não serão calculados até que você saia da Pousada...",
     "alexander": "Alexander, o Comerciante",
     "welcomeMarket": "Boas vindas ao Mercado! Compre ovos e poções difíceis de encontrar! Venda seus extras! Encomende serviços úteis! Venha ver o que temos para oferecer.",
-    "welcomeMarketMobile": "Welcome to the Market! Buy hard-to-find eggs and potions! Come see what we have to offer.",
+    "welcomeMarketMobile": "Boas vindas ao Mercado! Compre ovos raros e poções! Venha ver o que temos a oferecer.",
     "displayItemForGold": "Você quer vender um <strong><%= itemType %></strong>?",
     "displayEggForGold": "Você quer vender um <strong>Ovo <%= itemType %></strong>?",
     "displayPotionForGold": "Você quer vender uma <strong>Poção <%= itemType %></strong>?",
     "sellForGold": "Venda por  <%= gold %> Ouro",
-    "howManyToSell": "How many would you like to sell?",
+    "howManyToSell": "Qual a quantidade que gostaria de vender?",
-    "yourBalance": "Your balance",
+    "yourBalance": "Seu saldo",
-    "sell": "Sell",
+    "sell": "Vender",
-    "buyNow": "Buy Now",
+    "buyNow": "Comprar Agora",
     "sortByNumber": "Número",
-    "featuredItems": "Featured Items!",
+    "featuredItems": "Itens em Destaque!",
-    "hideLocked": "Hide locked",
+    "hideLocked": "Esconder bloqueados",
-    "hidePinned": "Hide pinned",
+    "hidePinned": "Esconder fixados",
-    "amountExperience": "<%= amount %> Experience",
+    "amountExperience": "<%= amount %> de Experiência",
-    "amountGold": "<%= amount %> Gold",
+    "amountGold": "<%= amount %> de Ouro",
-    "namedHatchingPotion": "<%= type %> Poção de Eclosão",
+    "namedHatchingPotion": "Poção de Eclosão <%= type %>",
     "buyGems": "Comprar Gemas",
     "purchaseGems": "Comprar Gemas",
     "items": "Itens",
     "AZ": "A-Z",
-    "sort": "Classificar",
+    "sort": "Ordenar",
-    "sortBy": "Classificar por",
+    "sortBy": "Ordenar Por",
     "groupBy2": "Organizar Por",
     "sortByName": "Nome",
-    "quantity": "Quantity",
+    "quantity": "Quantidade",
-    "cost": "Cost",
+    "cost": "Custo",
-    "shops": "Shops",
+    "shops": "Lojas",
-    "custom": "Custom",
+    "custom": "Personalizado",
     "wishlist": "Lista de Desejos",
-    "wrongItemType": "The item type \"<%= type %>\" is not valid.",
+    "wrongItemType": "O tipo de item \"<%= type %>\" não é válido.",
-    "wrongItemPath": "The item path \"<%= path %>\" is not valid.",
+    "wrongItemPath": "O caminho de item \"<%= path %>\" não é válido.",
-    "unpinnedItem": "You unpinned <%= item %>! It will no longer display in your Rewards column.",
+    "unpinnedItem": "Você removeu <%= item %>! Não será mais exibido na coluna de Recompensas.",
-    "cannotUnpinArmoirPotion": "The Health Potion and Enchanted Armoire cannot be unpinned.",
+    "cannotUnpinArmoirPotion": "A Poção de Vida e Armário Encantado não podem ser removidos.",
-    "purchasedItem": "You bought <%= itemName %>",
+    "purchasedItem": "Você comprou <%= itemName %>",
     "ian": "Ian",
     "ianText": "Boas Vindas à Loja de Missões! Aqui você pode usar os Pergaminhos de Missões para lutar contra monstros com seus amigos. Não deixe de verificar nossa refinada lista de Pergaminhos de Missões para comprar à direita.",
     "ianTextMobile": "Será que um pergaminho de missão te interessaria? Ative-os para lutar contra monstros com seu Grupo!",
     "ianBrokenText": "Boas Vindas à Loja de Missões... Aqui você pode usar Pergaminhos de Missões para enfrentar monstros com seus amigos... Não deixe de dar uma olhada na nossa refinada coleção de Pergaminhos de Missões à venda na direita...",
-    "featuredQuests": "Featured Quests!",
+    "featuredQuests": "Missões em Destaque!",
     "missingKeyParam": "\"req.params.key\" é necessário.",
     "itemNotFound": "Item \"<%= key %>\" não encontrado.",
     "cannotBuyItem": "Você não pode comprar este item.",
@@ -94,7 +94,7 @@
     "alreadyUnlocked": "Conjunto completo já destravado.",
     "alreadyUnlockedPart": "Conjunto completo parcialmente destravado.",
     "USD": "(Dólar)",
-    "newStuff": "New Stuff by [Bailey](https://twitter.com/Mihakuu)",
+    "newStuff": "Novidades Pela [Bailey](https://twitter.com/Mihakuu)",
     "cool": "Lembre Mais Tarde",
     "dismissAlert": "Remover Alerta",
     "donateText1": "Adiciona 20 Gemas em sua conta. Gemas são usadas para comprar itens especiais dentro do jogo, como camisetas e estilos de cabelo.",
@@ -111,8 +111,8 @@
     "classStats": "Esses são seus atributos da classe; eles afetam a jogabilidade. Cada vez que subir de nível, ganhará um ponto para distribuir em um atributo particular. Passe o mouse em cima de cada atributo para mais informações.",
     "autoAllocate": "Distribuição Automática",
     "autoAllocateText": "Se a \"Distribuição Automática\" estiver marcada, seu avatar distribuirá atributos automaticamente baseado nos atributos das suas tarefas, os quais podem ser encontrados em <strong> TAREFA > Editar > Avançado > Atributos </strong>. Por exemplo, se você malhar com frequência e sua Diária de \"Malhar\" estiver programada para \"Força\", você distribuirá Força automaticamente.",
-    "spells": "Skills",
+    "spells": "Habilidades",
-    "spellsText": "You can now unlock class-specific skills. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed <a target='_blank' href='http://habitica.wikia.com/wiki/Todos'>To-Do</a>.",
+    "spellsText": "Você pode agora desbloquear habilidades específicas de classe. Você irá ver a primeira no nível 11. Sua mana recupera em 10 pontos por dia e mais 1 ponto por <a target='_blank' href='http://habitica.wikia.com/wiki/Todos'>Afazer</a> completado.",
     "skillsTitle": "Habilidades",
     "toDo": "Afazeres",
     "moreClass": "Para mais informações sobre o sistema de classes, veja a <a href='http://pt-br.habitica.wikia.com/wiki/Class_System' target='_blank'>Wikia</a>.",
@@ -128,7 +128,7 @@
     "tourScrollDown": "Certifique-se de rolar a página até o final para ver todas as opções! Clique no seu avatar novamente para retornar à página de tarefas.",
     "tourMuchMore": "Quando tiver terminado suas tarefas, você pode formar um grupo com amigos, conversar nas guildas temáticas, participar de desafios e mais!",
     "tourStatsPage": "Essa é a sua página de Atributos! Conquiste medalhas completando as tarefas listadas,",
-    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Pause Damage\". Come say hi!",
+    "tourTavernPage": "Boas Vindas à Taverna, um chat para todas as idades! Você poderá prevenir suas Diárias de te causarem dano em caso de doença ou viajem clicando em \"Pausar Diárias\". Venha dizer Oi!",
     "tourPartyPage": "Seu Grupo vai te ajudar a se manter responsável. Convide amigos para destravar um Pergaminho de Missão!",
     "tourGuildsPage": "Guildas são grupos de chat com interesses em comum criados por jogadores e para jogadores. Navegue pela lista e entre na Guilda que te interessar. Verifique também a popular guilda Brasil, onde brasileiros ajudam brasileiros.",
     "tourChallengesPage": "Desafios são listas de tarefas temáticas criadas por usuários! Participar de um Desafio adicionará tarefas à sua conta. Compita contra outros usuários para ganhar prêmios em gemas!",

website/common/locales/pt_BR/overview.json

@@ -2,13 +2,13 @@
   "needTips": "\nPrecisa de algumas dicas sobre como começar? Aqui está um guia simples!",
 
   "step1": "1º Passo: Inserir Tarefas",
-  "webStep1Text": "Habitica is nothing without real-world goals, so enter a few tasks. You can add more later as you think of them! All tasks can be added by clicking the green \"Create\" button.\n* **Set up [To-Dos](http://habitica.wikia.com/wiki/To-Dos):** Enter tasks you do once or rarely in the To-Dos column, one at a time. You can click on the tasks to edit them and add checklists, due dates, and more!\n* **Set up [Dailies](http://habitica.wikia.com/wiki/Dailies):** Enter activities you need to do daily or on a particular day of the week, month, or year in the Dailies column. Click task to edit when it will be due and/or set a start date. You can also make it due on a repeating basis, for example, every 3 days.\n* **Set up [Habits](http://habitica.wikia.com/wiki/Habits):** Enter habits you want to establish in the Habits column. You can edit the Habit to change it to just a good habit :heavy_plus_sign: or a bad habit :heavy_minus_sign:\n* **Set up [Rewards](http://habitica.wikia.com/wiki/Rewards):** In addition to the in-game Rewards offered, add activities or treats which you want to use as a motivation to the Rewards column. It's important to give yourself a break or allow some indulgence in moderation!\n* If you need inspiration for which tasks to add, you can look at the wiki's pages on [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies), [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos), and [Sample Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
+  "webStep1Text": "Habitica não é nada sem objetivos reais, então coloque algumas tarefas. Você pode adicionar mais depois. Todas as tarefas podem ser criadas clicando no botão verde \"Criar\". \n* **Crie [Afazeres](http://pt-br.habitica.wikia.com/wiki/To-Dos):** Coloque tarefas que você uma vez ou raramente na coluna de Afazeres, um de cada vez. Você pode clicar no lápis para editá-los, adicionar listas, datas, dentre outros!\n* **Crie [Diárias](http://pt-br.habitica.wikia.com/wiki/Dailies):** Coloque atividades que você precisa fazer diariamente ou em dias específicos da semana, mês ou ano na coluna de Diárias. Clique na tarefa para editar os dias da semana e/ou data de início. Também é possível por a diária para reaparecer a cada, por exemplo, 3 dias.\n* **Crie [Hábitos](http://pt-br.habitica.wikia.com/wiki/Habits):** Coloque hábitos que você quer fixar na coluna Hábitos. Você pode editar o Hábito para mudar para ser um hábito somente bom :heavy_plus_sign: ou um ruim :heavy_minus_sign:\n* **Crie [Recompensas](http://pt-br.habitica.wikia.com/wiki/Rewards):** Além das recompensas oferecidas pelo jogo, adicione atividades ou recompensas que você quer usar como motivação na coluna de Recompensas. É importante se dar uma pausa ou se permitir relaxar um pouco! Se você precisa de inspiração sobre quais tarefas adicionar, você pode olhar na página da wiki em [Exemplos de Hábitos](http://pt-br.habitica.wikia.com/wiki/Sample_Habits), [Exemplos de Diárias](http://pt-br.habitica.wikia.com/wiki/Sample_Dailies), [Exemplos de Afazeres](http://pt-br.habitica.wikia.com/wiki/Sample_To-Dos), and [Exemplos de Recompensa](http://pt-br.habitica.wikia.com/wiki/Sample_Custom_Rewards).",
 
   "step2": "2º Passo: Ganhe Pontos Fazendo Coisas na Vida Real",
   "webStep2Text": "Agora, comece enfrentando seus objetivos da lista! Quando completar as tarefas e marcar no Habitica, você ganhará [Experiência] (http://pt-br.habitica.wikia.com/wiki/Experience_Points), que ajuda você a subir de nível, e [Ouro] (http://pt-br.habitica.wikia.com/wiki/Gold_Points), que te permite comprar recompensas. Se você cair em maus hábitos ou perder sua Diárias, você vai perder [Vida] (http://pt-br.habitica.wikia.com/wiki/Health_Points). Dessa forma, as barras de Experiência e de Vida servem como um divertido indicador de seu progresso em direção a seus objetivos. Você começará a ver sua vida real melhorar assim como seu personagem avança no jogo.",
 
   "step3": "3º Passo: Personalizar e explorar o Habitica",
-  "webStep3Text": "Once you're familiar with the basics, you can get even more out of Habitica with these nifty features:\n * Organize your tasks with [tags](http://habitica.wikia.com/wiki/Tags) (edit a task to add them).\n * Customize your [avatar](http://habitica.wikia.com/wiki/Avatar) by clicking the user icon in the upper-right corner.\n * Buy your [Equipment](http://habitica.wikia.com/wiki/Equipment) under Rewards or from the [Shops](/shops/market), and change it under [Inventory > Equipment](/inventory/equipment).\n * Connect with other users via the [Tavern](http://habitica.wikia.com/wiki/Tavern).\n * Starting at Level 3, hatch [Pets](http://habitica.wikia.com/wiki/Pets) by collecting [eggs](http://habitica.wikia.com/wiki/Eggs) and [hatching potions](http://habitica.wikia.com/wiki/Hatching_Potions). [Feed](http://habitica.wikia.com/wiki/Food) them to create [Mounts](http://habitica.wikia.com/wiki/Mounts).\n * At level 10: Choose a particular [class](http://habitica.wikia.com/wiki/Class_System) and then use class-specific [skills](http://habitica.wikia.com/wiki/Skills) (levels 11 to 14).\n * Form a party with your friends (by clicking [Party](/party) in the navigation bar) to stay accountable and earn a Quest scroll.\n * Defeat monsters and collect objects on [quests](http://habitica.wikia.com/wiki/Quests) (you will be given a quest at level 15).",
+  "webStep3Text": "Uma vez que você tenha acostumado com o básico, você pode obter ainda mais do Habitica com esses recursos estilosos:\n * Organize suas tarefas com [etiquetas](http://pt-br.habitica.wikia.com/wiki/Tags) (edite uma tarefa para adicioná-las).\n * Personalize o seu [avatar](http://pt-br.habitica.wikia.com/wiki/Avatar) clicando no ícone de usuário no canto superior direito.\n * Compre seu [equipamento](http://habitica.wikia.com/wiki/Equipment) nas Recompensas ou nas [Lojas](/shops/market) e modifique-o em [Inventário > Equipamento](/inventory/equipment)\n * Conecte-se com outros usuários através da [Taverna](http://pt-br.habitica.wikia.com/wiki/Taverna).\n * Começando no nível 3, crie [mascotes](http://pt-br.habitica.wikia.com/wiki/Pets) coletando [ovos](http://pt-br.habitica.wikia.com/wiki/Eggs) e [poções de eclosão](http://pt-br.habitica.wikia.com/wiki/Hatching_Potions). [Alimente-os](http://pt-br.habitica.wikia.com/wiki/Food) para criar [montarias](http://pt-br.habitica.wikia.com/wiki/Mounts).\n * No nível 10: Escolha uma [classe](http://pt-br.habitica.wikia.com/wiki/Class_System) e então use [habilidades] específicas da classe (http://pt-br.habitica.wikia.com/wiki/Skills) (Níveis 11 a 14).\n * Forme um grupo com seus amigos (clicando em [Grupo](/party) na barra de navegação) para se manter responsável e ganhar um Pergaminho de Missão.\n * Derrote monstros e colete objetos em [missões](http://pt-br.habitica.wikia.com/wiki/Quests) (você receberá uma missão no nível 15).",
 
   "overviewQuestions": "Tem alguma questão? Confira o [FAQ](/static/faq/)! Se a sua pergunta ainda não foi mencionada lá, você pode optar por pedir ajuda em [Habitica Help guild](/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a).\n\nBoa sorte com as suas tarefas!"
 }

website/common/locales/pt_BR/quests.json

@@ -9,7 +9,7 @@
     "goldQuests": "Missões Compráveis com Ouro",
     "questDetails": "Detalhes da Missão",
     "questDetailsTitle": "Detalhes da Missão",
-    "questDescription": "Missões permitem que os jogadores foquem em objetivos do jogo a longo com membros de seus grupos.",
+    "questDescription": "Missões permitem que os jogadores foquem em objetivos do jogo junto com membros de seus grupos.",
     "invitations": "Convites",
     "completed": "Completo!",
     "rewardsAllParticipants": "Recompensas para Todos os Participantes da Missão",
@@ -102,7 +102,7 @@
     "noActiveQuestToLeave": "Não há missão ativa para sair",
     "questLeaderCannotLeaveQuest": "O líder da missão não pode sair dela",
     "notPartOfQuest": "Você não faz parte da missão",
-    "youAreNotOnQuest": "You're not on a quest",
+    "youAreNotOnQuest": "Você não está em uma missão",
     "noActiveQuestToAbort": "Não há missão ativa para abortar.",
     "onlyLeaderAbortQuest": "Somente o líder do grupo ou da missão podem abortá-la.",
     "questAlreadyRejected": "Você já rejeitou o convite para a missão.",

website/common/locales/pt_BR/questscontent.json

@@ -58,7 +58,7 @@
     "questSpiderBoss": "Aranha",
     "questSpiderDropSpiderEgg": "Aranha (Ovo)",
     "questSpiderUnlockText": "Desbloqueia ovos de Aranha para compra no Mercado",
-    "questGroupVice": "Vice the Shadow Wyrm",
+    "questGroupVice": "Vício, o Dragão Sombrio",
     "questVice1Text": "Vício, Parte 1: Liberte-se do Controle do Dragão",
     "questVice1Notes": "Os rumores dizem que um mal horrível vive nas cavernas da montanha Habitica. Um monstro cuja presença corrompe a mente dos heróis mais fortes da terra, levando-os a maus hábitos e preguiça! A besta é um grande dragão de poder imenso e composto pelas próprias sombras: Vício, o traiçoeiro Dragão das Sombras. Bravos Habiticanos, se acreditam que podem sobreviver a este poder imenso, peguem as suas armas e derrotem esta besta imunda de uma vez por todas. </p><h3> Vício, Parte 1: </h3><p>Como podem pensar que podem lutar contra a besta se ela já tem controle sobre vocês? Não sejam vítimas da preguiça e do vício! Trabalhem arduamente contra a influência negra do dragão e libertem-se da influência que ele tem sobre vocês!</p>",
     "questVice1Boss": "A Sombra do Vício",
@@ -74,7 +74,7 @@
     "questVice3DropWeaponSpecial2": "Mastro do Dragão de Stephen Weber",
     "questVice3DropDragonEgg": "Dragão (Ovo)",
     "questVice3DropShadeHatchingPotion": "Poção de Eclosão Sombra",
-    "questGroupMoonstone": "Recidivate Rising",
+    "questGroupMoonstone": "O Levantar da Recaída",
     "questMoonstone1Text": "Recaída, Parte 1: A Corrente de Pedras da Lua",
     "questMoonstone1Notes": "Uma doença terrível atingiu os Habiticanos. Maus Hábitos que achávamos estarem mortos a muito tempo estão voltando à vida para vingança. Louças ficam sujas, livros esquecidos e a procrastinação corre livremente!<br><br>Você segue alguns de seus velhos Maus Hábitos até os Pântanos da Estagnação e descobre o culpado: Recaída, a Necromante! Você avança para atacá-la com armas em mãos mas as armas passam direto pelo espectro dela.<br><br>\"Nem tente\", ela fala baixinho com a voz rouca. \"Sem uma corrente de pedras da lua, nada pode me machucar - e joalheiro @aurakami espalhou todas as pedras da lua por toda a Habitica a muito tempo atrás!\" Ofegante, você foge... mas você sabe o que precisa fazer.",
     "questMoonstone1CollectMoonstone": "Pedras da Lua",
@@ -104,8 +104,8 @@
     "questGoldenknight3Boss": "O Cavaleiro de Ferro",
     "questGoldenknight3DropHoney": "Mel (Comida)",
     "questGoldenknight3DropGoldenPotion": "Poção de Eclosão Dourada",
-    "questGoldenknight3DropWeapon": "Mustaine's Milestone Mashing Morning Star (Off-hand Weapon)",
+    "questGoldenknight3DropWeapon": "Clava Esmagadora do Marcos do Mustaine (Mão Secundária)",
-    "questGroupEarnable": "Earnable Quests",
+    "questGroupEarnable": "Missões Possíveis",
     "questBasilistText": "A Basi-Lista",
     "questBasilistNotes": "Há uma comoção no mercado -- do tipo que deveria fazer você fugir. Sendo o corajoso aventureiro que é, você corre para lá, ao invés, e descobre a Basi-Lista, misturada a um amontoado de afazeres incompletos! Habiticanos próximos estão paralizados com medo do tamanho da Basi-lista, incapazes de começar a trabalhar. De algum lugar próximo você ouve @Arcosine gritar: \"Rápido! Complete as suas Diárias e afazeres para derrotar o monstro, antes que ele cause um corte de papel em alguém!\" Ataque rápido, aventureiro, e marque algo como feito - mas cuidado! Se deixar alguma Diária por fazer, a Basi-Lista vai atacar você e seu grupo!",
     "questBasilistCompletion": "A Basi-lista se dispersa em retalhos de papel, que brilham suavemente em cores de arco-íris. \"Ufa!\" diz @Arcosline. \"Ainda bem que vocês estavam aqui!\" Sentindo-se mais experiente do que antes, você recolhe um pouco de ouro de entre os papéis.",
@@ -243,7 +243,7 @@
     "questDilatoryDistress3Boss": "Adva, a Sereia Usurpadora",
     "questDilatoryDistress3DropFish": "Peixe (Comida)",
     "questDilatoryDistress3DropWeapon": "Tridente da Maré Absoluta (Arma)",
-    "questDilatoryDistress3DropShield": "Moonpearl Shield (Off-Hand Item)",
+    "questDilatoryDistress3DropShield": "Escudo de Pérola Lunar (Mão Secundária)",
     "questCheetahText": "Tão Guepardo",
     "questCheetahNotes": "Enquanto você caminha pela Savana Tvagaresempr com seus amigos @PainterProphet, @tivaquinn, @Unruly Hyena e @Crawford, você fica assustado ao ver um Guepardo correndo com um novo Habiticano na boca. Embaixo das patas ferozes do Guepardo, tarefas somem mesmo sem serem completadas -- antes de alguém sequer ter a chance de finalizá-las! O Habiticano vê você e grita \"Por favor, me ajude! Este Guepardo está me fazendo subir de nível muito rápido, mas não estou terminando tarefa nenhuma. Quero ir mais devagar e aproveitar o jogo. Faça ele parar!\" Você lembra com carinho dos seus dias de iniciante e sabe que precisa ajudar o novato parando o Guepardo!",
     "questCheetahCompletion": "O novo Habiticano está ofegante depois do ocorrido com o Guepardo, mas agradece a você e aos seus amigos pela ajuda. \"Estou feliz que o Guepardo não poderá mais abocanhar ninguém. Ele até deixou alguns ovos de Guepardo para a gente, talvez possamos criá-los como mascotes mais confiáveis!\"",
@@ -487,7 +487,7 @@
     "questMayhemMistiflying3Boss": "O Manipulador do Vento",
     "questMayhemMistiflying3DropPinkCottonCandy": "Algodão-Doce Rosa (Comida)",
     "questMayhemMistiflying3DropShield": "Mensagem do Arco-Íris Ladino (Mão Secundária)",
-    "questMayhemMistiflying3DropWeapon": "Mensagem do Arco-Íris Ladino (Arma da Mão Principal)",
+    "questMayhemMistiflying3DropWeapon": "Mensagem do Arco-Íris Ladino (Mão Primária)",
     "featheredFriendsText": "Pacote de Missões dos Amigos Emplumados",
     "featheredFriendsNotes": "Contém 'Socorro, Harpia!,' 'A Coruja Noturna,' e 'As Aves de Rapinrolação.' Disponível até 31 de Maio.",
     "questNudibranchText": "Infestação das Lesmas Marinhas FaçAgora",

website/common/locales/pt_BR/settings.json

@@ -47,7 +47,7 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Início de Dia Personalizado",
-    "sureChangeCustomDayStartTime": "Are you sure you want to change your Custom Day Start time? Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before then!",
+    "sureChangeCustomDayStartTime": "Tem certeza que quer modificar seu Início de Dia Personalizado? Suas Diárias irão reiniciar no primeiro uso do Habitica após <%= time %>. Garanta de ter completado suas Diárias antes disso!",
     "changeCustomDayStart": "Modificar o Início de Dia Personalizado?",
     "sureChangeCustomDayStart": "Você tem certeza que quer mudar o início de dia personalizado?",
     "customDayStartHasChanged": "Seu início de dia personalizado foi modificado.",
@@ -106,7 +106,7 @@
     "email": "E-mail",
     "registerWithSocial": "Conectar <%= network %>",
     "registeredWithSocial": "Registro feito com <%= network %>",
-    "loginNameDescription": "This is what you use to log in to Habitica. To change it, use the form below. If instead you want to change the Display Name that appears on your avatar and in chat messages, go to the User Icon &gt; Profile and click the Edit button.",
+    "loginNameDescription": "Isto é o que você usa para entrar no Habitica. Para modificar, use o formulário abaixo. Se ao invés disso você preferir modificar seu Nome de Exibição que aparecer no seu avatar e nas mensagens do chat, vá para o Ícone de Usuário &gt; Perfil e clique no botão Editar.",
     "emailNotifications": "Notificações de E-mail",
     "wonChallenge": "Você venceu um Desafio!",
     "newPM": "Recebeu Mensagem Privada",
@@ -129,7 +129,7 @@
     "remindersToLogin": "Lembretes para entrar no Habitica",
     "subscribeUsing": "Assinar usando",
     "unsubscribedSuccessfully": "Assinatura cancelada!",
-    "unsubscribedTextUsers": "You have successfully unsubscribed from all Habitica emails. You can enable only the emails you want to receive from <a href=\"/user/settings/notifications\">Settings > &gt; Notifications</a> (requires login).",
+    "unsubscribedTextUsers": "Você cancelou o recebimento de todos os emails do Habitica. Você poderá habilitar apenas os emails que quer receber indo em <a href=\"/user/settings/notifications\">Configurações > &gt; Notificações</a> (requer login).",
     "unsubscribedTextOthers": "Você não recebera mais nenhum outro e-mail do Habitica.",
     "unsubscribeAllEmails": "Marque para cancelar a assinatura de E-mails",
     "unsubscribeAllEmailsText": "Marcando esta caixa, eu certifico que entendo que, por não assinar nenhum e-mail, o Habitica nunca será capaz de me notificar via e-mail sobre mudanças importantes do site ou da minha conta.",
@@ -185,5 +185,5 @@
     "timezoneUTC": "O Habitica usa o fuso horário definido no seu computador, que é <strong><%= utc %></strong>",
     "timezoneInfo": "Se esse fuso horário não for o correto, recarregue esta página utilizando o botão de recarregar do seu navegador para garantir que o Habitica tenha a informação mais recente. Se ainda estiver errado, ajuste o fuso horário no seu computador e recarregue esta página novamente.<br><br><strong>Se você usa o Habitica em outros computadores ou dispositivos móveis, o fuso horário deve ser o mesmo em todos eles.</strong> Se suas Diárias têm sido reiniciadas na hora errada, repita esta operação em todos os outros computadores e em um navegador em seus dispositivos móveis.",
     "push": "Enviar",
-    "about": "About"
+    "about": "Sobre"
 }

website/common/locales/pt_BR/subscriber.json

@@ -2,7 +2,7 @@
     "subscription": "Assinatura",
     "subscriptions": "Assinaturas",
     "subDescription": "Compre Gemas com ouro, ganhe itens misteriosos mensalmente, mantenha o histórico do progresso, dobre o limite de drop diário e ajude os desenvolvedores. Clique para mais informações.",
-    "sendGems": "Gemas enviadas",
+    "sendGems": "Enviar Gemas",
     "buyGemsGold": "Comprar Gemas com Ouro",
     "buyGemsGoldText": "Alexander, o Mercador, venderá suas Gemas por 20 de ouro cada Gema. Suas remessas mensais serão limitados a 25 Gemas por mês, mas para cada 3 meses consecutivos de assinatura, este limite aumenta em 5 Gemas até o máximo de 50 Gemas por mês!",
     "mustSubscribeToPurchaseGems": "É necessário ser assinante para comprar gemas com Ouro.",
@@ -19,7 +19,7 @@
     "exclusiveJackalopePetText": "Ganhe o Mascote Lebrílope Roxo Real, disponível apenas para assinantes!",
     "giftSubscription": "Deseja presentear uma assinatura para alguém?",
     "giftSubscriptionText1": "Abra o perfil deles! Você pode fazer isso clicando no avatar deles na parte superior da janela ou clicando no nome deles no chat.",
-    "giftSubscriptionText2": "Click on the gift icon in the top right of their profile.",
+    "giftSubscriptionText2": "Clique no ícone de presente no canto direito superior do perfil do jogador.",
     "giftSubscriptionText3": "Selecione \"assinatura\" e insira suas informações de pagamento.",
     "giftSubscriptionText4": "Obrigado por ajudar o Habitica!",
     "monthUSD": "USD / Mês",
@@ -39,7 +39,7 @@
     "manageSub": "Clique para gerenciar assinatura",
     "cancelSub": "Cancelar Assinatura",
     "cancelSubInfoGoogle": "Por favor vá até \"Conta\" > \"Assinaturas\" no aplicativo da Play Store para cancelar sua assinatura ou ver o período em que sua assinatura irá ser encerrada se você já tiver cancelado. Essa seção não consegue mostrar se sua assinatura já foi cancelada.",
-    "cancelSubInfoApple": "Please follow <a href=\"https://support.apple.com/en-us/HT202039\">Apple's official instructions</a> to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.",
+    "cancelSubInfoApple": "Por favor siga as <a href=\"https://support.apple.com/en-us/HT202039\">instruções oficiais da Apple</a> para cancelar sua assinatura ou para ver a data de cancelamento da assinatura caso já a tenha cancelado. Esta seção não pode mostrar se sua assinatura foi cancelada.",
     "canceledSubscription": "Assinatura Cancelada",
     "cancelingSubscription": "Cancelando a assinatura.",
     "adminSub": "Assinaturas Administrativas",
@@ -70,15 +70,15 @@
     "subCanceled": "Assinatura ficará inativa em",
     "buyGemsGoldTitle": "Comprar Gemas com Ouro",
     "becomeSubscriber": "Seja um Assinante",
-    "subGemPop": "Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.",
+    "subGemPop": "Agora que assinou o Habitica, você pode comprar uma quantidade de Genas a cada mês usando Ouro.",
     "subGemName": "Gemas de Assinante",
     "freeGemsTitle": "Obter Gemas Gratuitamente",
     "maxBuyGems": "Você comprou todas as gemas que você pode este mês. Mais ficarão disponíveis nos primeiros três dias do próximo mês. Obrigado por assinar!",
     "buyGemsAllow1": "Você pode comprar",
     "buyGemsAllow2": "mais Gemas este mês",
     "purchaseGemsSeparately": "Comprar Gemas Adicionais",
-    "subFreeGemsHow": "Habitica players can earn Gems for free by winning <a href=\"/challenges/findChallenges\">challenges</a> that award Gems as a prize, or as a <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">contributor reward by helping the development of Habitica.</a>",
+    "subFreeGemsHow": "Jogadores do Habitica podem ganhar Gemas de graça vencendo <a href=\"/challenges/findChallenges\">desafios</a> que dão Gemas como prêmios ou com a <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">recompensa de contribuidor ao ajudar o desenvolvimento do Habitica.</a>",
-    "seeSubscriptionDetails": "Go to <a href='/user/settings/subscription'>Settings &gt; Subscription</a> to see your subscription details!",
+    "seeSubscriptionDetails": "Vá até <a href='/user/settings/subscription'>Configurações &gt; Assinatura</a> para verificar os detalhes de sua assinatura!",
     "timeTravelers": "Viajantes do Tempo",
     "timeTravelersTitleNoSub": "<%= linkStartTyler %>Tyler<%= linkEnd %> e <%= linkStartVicky %>Vicky<%= linkEnd %>",
     "timeTravelersTitle": "Misteriosos Viajantes do Tempo",
@@ -174,25 +174,25 @@
     "missingPaypalBlock": "Faltando req.session.paypalBlock",
     "missingSubKey": "Faltando req.query.sub",
     "paypalCanceled": "Sua assinatura foi cancelada",
-    "earnGemsMonthly": "Earn up to **<%= cap %> Gems** per month",
+    "earnGemsMonthly": "Ganhe até **<%= cap %> Gemas** por mês",
     "receiveMysticHourglass": "Receba uma Ampulheta Mística!",
-    "receiveMysticHourglasses": "Receive **<%= amount %> Mystic Hourglasses**!",
+    "receiveMysticHourglasses": "Receba **<%= amount %> Ampulhetas Místicas**!",
     "everyMonth": "Todo mês",
-    "everyXMonths": "Every <%= interval %> Months",
+    "everyXMonths": "Cada <%= interval %> Meses",
-    "everyYear": "Todo ano",
+    "everyYear": "Todo Ano",
-    "choosePaymentMethod": "Choose your payment method",
+    "choosePaymentMethod": "Escolha seu método de pagamento",
-    "subscribeSupportsDevs": "Subscribing supports the developers and helps keep Habitica running",
+    "subscribeSupportsDevs": "As assinaturas dão o apoio necessário para os desenvolvedores continuarem movimentando o Habitica",
-    "buyGemsSupportsDevs": "Purchasing Gems supports the developers and helps keep Habitica running",
+    "buyGemsSupportsDevs": "A compra de Gemas dá o apoio necessário para os desenvolvedores continuarem movimentando o Habitica",
-    "support": "SUPPORT",
+    "support": "SUPORTE",
-    "gemBenefitLeadin": "Gems allow you to buy fun extras for your account, including:",
+    "gemBenefitLeadin": "As Gemas permitem que você compre coisas divertidas para sua conta, incluindo:",
-    "gemBenefit1": "Unique and fashionable costumes for your avatar.",
+    "gemBenefit1": "Trajes únicos e elegantes para o seu avatar.",
-    "gemBenefit2": "Backgrounds to immerse your avatar in the world of Habitica!",
+    "gemBenefit2": "Cenários para a imersão do seu avatar no mundo de Habitica!",
-    "gemBenefit3": "Exciting Quest chains that drop pet eggs.",
+    "gemBenefit3": "Sequências empolgantes de Missões que dropam ovos de mascotes.",
     "gemBenefit4": "Redistribua os pontos de atributo do seu avatar e altere sua Classe.",
-    "subscriptionBenefitLeadin": "Support Habitica by becoming a subscriber and you'll receive these useful benefits!",
+    "subscriptionBenefitLeadin": "Apoie o Habitica tornando-se um assinante e receba estes benefícios incríveis!",
-    "subscriptionBenefit1": "Alexander the Merchant will sell you Gems, for 20 Gold each!",
+    "subscriptionBenefit1": "Alexander, o Mercador venderá suas Gemas por 20 de ouro cada!",
-    "subscriptionBenefit2": "Completed To-Dos and task history are available for longer.",
+    "subscriptionBenefit2": "Complete Afazeres e o histórico de tarefa ficará disponível por mais tempo.",
-    "subscriptionBenefit3": "Discover more items in Habitica with a doubled daily drop cap.",
+    "subscriptionBenefit3": "Descubra mais items em Habitica com um limite de drops diários duplicado.",
     "subscriptionBenefit4": "Unique cosmetic items for your avatar each month.",
     "subscriptionBenefit5": "Receive the exclusive Royal Purple Jackalope pet!",
     "subscriptionBenefit6": "Earn Mystic Hourglasses for use in the Time Travelers' Shop!",

website/common/locales/ru/front.json

@@ -27,7 +27,7 @@
     "communityForum": "<a target='_blank' href='http://habitica.wikia.com/wiki/Special:Forum'>Форум</a>",
     "communityKickstarter": "Kickstarter",
     "communityReddit": "Reddit",
-    "companyAbout": "How It Works",
+    "companyAbout": "Как это работает",
     "companyBlog": "Блог",
     "devBlog": "Блог разработчиков",
     "companyDonate": "Пожертвования",
@@ -38,9 +38,9 @@
     "dragonsilverQuote": "Не скажу точно, сколько разных программ планировки времени и учёта задач я испробовала за десятилетия... [Habitica] – единственный проект, который действительно помогает мне выполнять задачи, а не просто вносить их в список дел.",
     "dreimQuote": "К тому времени, как я узнала про [Habitica] летом прошлого года, я провалила где-то половину своих экзаменов. Благодаря ежедневным заданиям... я смогла навести в голове порядок и дисциплинировать себя. И месяц назад я действительно сдала все экзамены на хорошие оценки.",
     "elmiQuote": "Каждое утро я встаю в нетерпении, предвкушая, что смогу заработать немного золота!",
-    "forgotPassword": "Forgot Password?",
+    "forgotPassword": "Забыли пароль?",
     "emailNewPass": "Отправьте мне ссылку на сброс пароля",
-    "forgotPasswordSteps": "Enter the email address you used to register your Habitica account.",
+    "forgotPasswordSteps": "Введите адрес электронной почты, который вы использовали при регистрации.",
     "sendLink": "Send Link",
     "evagantzQuote": "Я впервые был на приёме у стоматолога, и врач был впечатлён моей привычкой регулярно пользоваться зубной нитью. Спасибо, [Habitica]!",
     "examplesHeading": "Игроки используют Habitica, чтобы организовывать работу...",
@@ -107,7 +107,7 @@
     "marketing2Header": "Соревнуйтесь с друзьями, вступайте в группы по интересам",
     "marketing2Lead1Title": "Social Productivity",
     "marketing2Lead1": "Играть в Habitica можно в одиночку, но все краски по-настоящему заиграют, когда вы начнете сотрудничать, соперничать и разделять ответственность с другими игроками. Наиболее эффективная часть любой программы самосовершенствования — социальная ответственность, а какая среда подходит для создания духа ответственности и соревновательности лучше, чем компьютерная игра?",
-    "marketing2Lead2Title": "Fight Monsters",
+    "marketing2Lead2Title": "Сражайтесь с монстрами",
     "marketing2Lead2": "What's a Role Playing Game without battles? Fight monsters with your party. Monsters are \"super accountability mode\" - a day you miss the gym is a day the monster hurts *everyone!*",
     "marketing2Lead3Title": "Challenge Each Other",
     "marketing2Lead3": "Challenges let you compete with friends and strangers. Whoever does the best at the end of a challenge wins special prizes.",
@@ -132,7 +132,7 @@
     "oldNews": "Новости",
     "newsArchive": "Архив новостей на вики (мультиязычный)",
     "passConfirm": "Подтвердить пароль",
-    "setNewPass": "Set New Password",
+    "setNewPass": "Введите новый пароль",
     "passMan": "В случае, если вы используете менеджер паролей (например, 1Password) и у вас возникли проблемы при входе, попробуйте ввести имя пользователя и пароль вручную.",
     "password": "Пароль",
     "playButton": "Играть",
@@ -194,7 +194,7 @@
     "unlockByline2": "Откройте новые инструменты мотивации, включая коллекционирование питомцев, случайные награды, заклинания и другое!",
     "unlockHeadline": "Пока вы остаетесь продуктивными, вы открываете что-то новое!",
     "useUUID": "Используйте UUID / токен API (для пользователей Facebook)",
-    "username": "Login Name",
+    "username": "Имя пользователя",
     "emailOrUsername": "Email or Login Name",
     "watchVideos": "Смотреть видео",
     "work": "Работа",
@@ -216,7 +216,7 @@
     "alreadyHaveAccount": "У меня уже есть аккаунт!",
     "getStartedNow": "Начните сейчас!",
     "altAttrNavLogo": "Дом Habitica",
-    "altAttrLifehacker": "Lifehacker",
+    "altAttrLifehacker": "Лайфхакер",
     "altAttrNewYorkTimes": "The New York Times",
     "altAttrMakeUseOf": "MakeUseOf",
     "altAttrForbes": "Forbes",
@@ -247,7 +247,7 @@
     "missingAuthParams": "Отсутствуют параметры аутентификации.",
     "missingUsernameEmail": "Missing Login Name or email.",
     "missingEmail": "Отсутствует адрес электронной почты.",
-    "missingUsername": "Missing Login Name.",
+    "missingUsername": "Отсутствует имя пользователя",
     "missingPassword": "Отсутствует пароль.",
     "missingNewPassword": "Отсутствует новый пароль.",
     "invalidEmailDomain": "Нельзя регистрироваться с электронной почтой этих доменов: <%= domains %>",
@@ -289,7 +289,7 @@
     "timeToGetThingsDone": "It's time to have fun when you get things done! Join over 2.5 million Habiticans and improve your life one task at a time.",
     "singUpForFree": "Sign Up For Free",
     "or": "OR",
-    "gamifyYourLife": "Gamify Your Life",
+    "gamifyYourLife": "Живи играючи",
     "aboutHabitica": "Habitica 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, Habitica can help you achieve your goals to become healthy, hard-working, and happy.",
     "trackYourGoals": "Track Your Habits and Goals",
     "trackYourGoalsDesc": "Stay accountable by tracking and managing your Habits, Daily goals, and To-Do list with Habitica’s easy-to-use mobile apps and web interface.",

website/common/locales/ru/groups.json

@@ -12,9 +12,9 @@
     "reportProblem": "Сообщить о проблеме",
     "requestFeature": "Предложить новую функцию",
     "askAQuestion": "Задать вопрос",
-    "askQuestionGuild": "Ask a Question (Habitica Help guild)",
+    "askQuestionGuild": "Задать вопрос (гильдия Habitica Help)",
-    "contributing": "Contributing",
+    "contributing": "Вклад",
-    "faq": "FAQ",
+    "faq": "ЧаВо",
     "lfgPosts": "Объявления о поиске команды",
     "tutorial": "Обучение",
     "glossary": "<a target='_blank' href='http://ru.habitica.wikia.com/wiki/Терминология'>Словарь</a>",
@@ -37,13 +37,13 @@
     "party": "Команда",
     "createAParty": "Создать команду",
     "updatedParty": "Настройки команды обновлены.",
-    "errorNotInParty": "You are not in a Party",
+    "errorNotInParty": "Вы не состоите в команде",
     "noPartyText": "Вы не в команде, либо ее загрузка занимает время. Вы можете создать новую команду и пригласить друзей или, если хотите присоединиться к существующей, попросите ее участников ввести ваш персональный ID:",
     "LFG": "Объявить о создании новой команды или найти подходящую и присоединиться к ней можно в гильдии <%= linkStart %>Требуется команда (поиск команды)<%= linkEnd %>.",
     "wantExistingParty": "Хотите присоединиться к уже существующей команде? Перейдите в <%= linkStart %>гильдию по поиску команды<%= linkEnd %> и оставьте там свой ID пользователя.",
     "joinExistingParty": "Присоединиться к чьей-либо команде",
     "needPartyToStartQuest": "Ой! Вам нужно <a href='http://habitica.wikia.com/wiki/Party' target='_blank'>создать или вступить в команду</a> перед тем, что бы начать задание!",
-    "createGroupPlan": "Create",
+    "createGroupPlan": "Создать",
     "create": "Создать",
     "userId": "ID пользователя",
     "invite": "Пригласить",
@@ -70,7 +70,7 @@
     "guildBankPop1": "Банк гильдии",
     "guildBankPop2": "Самоцветы, которые глава гильдии может использовать как приз за испытания.",
     "guildGems": "самоцв. гильдии",
-    "group": "Group",
+    "group": "Группа",
     "editGroup": "Редактировать группу",
     "newGroupName": "Название (<%= groupType %>)",
     "groupName": "Название группы",
@@ -80,7 +80,7 @@
     "logoUrl": "Ссылка на логотип",
     "assignLeader": "Назначить лидера группы",
     "members": "Участники",
-    "memberList": "Member List",
+    "memberList": "Список участников",
     "partyList": "Порядок участников команды в области персонажа",
     "banTip": "Выгнать",
     "moreMembers": "других членов",
@@ -94,7 +94,7 @@
     "search": "Поиск",
     "publicGuilds": "Открытые гильдии",
     "createGuild": "Создать гильдию",
-    "createGuild2": "Create",
+    "createGuild2": "Создать",
     "guild": "Гильдия",
     "guilds": "Гильдии",
     "guildsLink": "<a href='http://habitica.wikia.com/wiki/Guilds' target='_blank'>Гильдии</a>",
@@ -138,7 +138,7 @@
     "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> месяцев подписки!",
     "cannotSendGemsToYourself": "Невозможно отправить самоцветы самому себе. Лучше опробуйте подписку.",
     "badAmountOfGemsToSend": "Сумма должна быть в пределах 1 и текущего количества самоцветов.",
-    "report": "Report",
+    "report": "Пожаловаться",
     "abuseFlag": "Сообщить о нарушении Правил сообщества",
     "abuseFlagModalHeading": "Сообщить о нарушении со стороны <%= name %>?",
     "abuseFlagModalBody": "Вы уверены, что хотите пожаловаться на этот пост? На пост следует жаловаться ИСКЛЮЧИТЕЛЬНО в случае, если в нем нарушаются <%= firstLinkStart %>Правила сообщества<%= linkEnd %> и/или <%= secondLinkStart %>Условия использования<%= linkEnd %>. Неуместная жалоба на пост является нарушением Правил сообщества и может послужить поводом для принятия соответствующих мер. Допустимые поводы подачи жалобы на пост включают, но не ограничены следующим:<br><br><ul style='margin-left: 10px;'><li>ругань, религиозные проклятья</li><li>оскорбления, нецензурные выражения</li><li>\"взрослые\" темы</li><li>насилие, включая \"шуточное\"</li><li>спам, бессмысленные сообщения</li></ul>",
@@ -148,7 +148,7 @@
     "needsText": "Пожалуйста введите сообщение.",
     "needsTextPlaceholder": "Напечатайте сообщение здесь.",
     "copyMessageAsToDo": "Скопировать сообщение как Задачу",
-    "copyAsTodo": "Copy as To-Do",
+    "copyAsTodo": "Скопировать как задачу",
     "messageAddedAsToDo": "Сообщение скопировано как Задача",
     "messageWroteIn": "Cообщение от <%= user %> в чате: <%= group %>",
     "taskFromInbox": "<%= from %> написал '<%= message %>'",
@@ -315,32 +315,32 @@
     "userMustBeMember": "Пользователь должен быть участником группы",
     "userIsNotManager": "Этот пользователь не является руководителем",
     "canOnlyApproveTaskOnce": "Это задание уже было одобрено.",
-    "addTaskToGroupPlan": "Create",
+    "addTaskToGroupPlan": "Создать",
     "leaderMarker": "- Глава",
     "managerMarker": "- Руководитель",
     "joinedGuild": "Присоединился к гильдии",
     "joinedGuildText": "Участвуйте в социальной стороне страны Хабитики, присоединившись к Гильдии!",
     "badAmountOfGemsToPurchase": "Количество должно быть как минимум 1.",
     "groupPolicyCannotGetGems": "Правила группы, в которой вы состоите, не разрешают приобретать самоцветы членам группы.",
-    "viewParty": "View Party",
+    "viewParty": "Посмотреть команду",
-    "newGuildPlaceholder": "Enter your guild's name.",
+    "newGuildPlaceholder": "Введите имя вашей гильдии",
-    "guildMembers": "Guild Members",
+    "guildMembers": "Члены гильдии",
-    "guildBank": "Guild Bank",
+    "guildBank": "Банк гильдии",
-    "chatPlaceholder": "Type your message to Guild members here",
+    "chatPlaceholder": "Введите здесь сообщение для членов гильдии",
-    "partyChatPlaceholder": "Type your message to Party members here",
+    "partyChatPlaceholder": "Введите здесь сообщение для членов команды",
-    "fetchRecentMessages": "Fetch Recent Messages",
+    "fetchRecentMessages": "Получить последние сообщения",
-    "like": "Like",
+    "like": "Нравится",
-    "liked": "Liked",
+    "liked": "Понравилось",
-    "joinGuild": "Join Guild",
+    "joinGuild": "Присоединиться к гильдии",
-    "inviteToGuild": "Invite to Guild",
+    "inviteToGuild": "Пригласить в гильдию",
-    "messageGuildLeader": "Message Guild Leader",
+    "messageGuildLeader": "Написать главе гильдии",
-    "donateGems": "Donate Gems",
+    "donateGems": "Пожертвовать самоцветы",
-    "updateGuild": "Update Guild",
+    "updateGuild": "Обновить гильдию",
-    "viewMembers": "View Members",
+    "viewMembers": "Посмотреть участников",
-    "memberCount": "Member Count",
+    "memberCount": "Количество участников",
-    "recentActivity": "Recent Activity",
+    "recentActivity": "Недавние действия",
-    "myGuilds": "My Guilds",
+    "myGuilds": "Мои гильдии",
-    "guildsDiscovery": "Discover Guilds",
+    "guildsDiscovery": "Найти гильдии",
     "guildOrPartyLeader": "Leader",
     "guildLeader": "Guild Leader",
     "member": "Member",

website/common/locales/sv/groups.json

@@ -80,7 +80,7 @@
     "logoUrl": "URL till logga",
     "assignLeader": "Tilldela Gruppledare",
     "members": "Medlemmar",
-    "memberList": "Member List",
+    "memberList": "Medlemslista",
     "partyList": "Order for party members in header",
     "banTip": "Sparka Medlem",
     "moreMembers": "fler medlemmar",
@@ -259,7 +259,7 @@
     "groupBenefitsDescription": "We've just launched the beta version of our group plans! Upgrading to a group plan unlocks some unique features to optimize the social side of Habitica.",
     "groupBenefitOneTitle": "Skapa en gemensam uppgiftslista",
     "groupBenefitOneDescription": "Set up a shared task list for the group that everyone can easily view and edit.",
-    "groupBenefitTwoTitle": "Assign tasks to group members",
+    "groupBenefitTwoTitle": "Tilldela uppgifter till gruppmedlemmar",
     "groupBenefitTwoDescription": "Want a coworker to answer a critical email? Need your roommate to pick up the groceries? Just assign them the tasks you create, and they'll automatically appear in that person's task dashboard.",
     "groupBenefitThreeTitle": "Claim a task that you are working on",
     "groupBenefitThreeDescription": "Stake your claim on any group task with a simple click. Make it clear what everybody is working on!",
@@ -272,7 +272,7 @@
     "groupBenefitSevenTitle": "Get a brand-new exclusive Jackalope Mount",
     "groupBenefitEightTitle": "Add Group Managers to help manage tasks",
     "groupBenefitEightDescription": "Want to share your group's responsibilities? Promote people to Group Managers to help the Leader add, assign, and approve tasks!",
-    "groupBenefitMessageLimitTitle": "Increase message limit",
+    "groupBenefitMessageLimitTitle": "Öka gränsen på meddelanden",
     "groupBenefitMessageLimitDescription": "Your message limit is doubled to house up to 400 messages at a time!",
     "teamBasedTasks": "Gruppbaserade Uppgifter",
     "specializedCommunication": "Specialized Communication",

website/common/locales/sv/limited.json

@@ -118,6 +118,6 @@
     "dateEndJune": "Juni 14",
     "dateEndJuly": "Juli 29",
     "dateEndAugust": "Augusti 31",
-    "dateEndOctober": "October 31",
+    "dateEndOctober": "Den 31:a Oktober",
     "discountBundle": "bunt"
 }

website/common/locales/sv/npc.json

@@ -44,7 +44,7 @@
     "buyNow": "Köp Nu",
     "sortByNumber": "Nummer",
     "featuredItems": "Featured Items!",
-    "hideLocked": "Hide locked",
+    "hideLocked": "Göm låsta",
     "hidePinned": "Hide pinned",
     "amountExperience": "<%= amount %> Erfarenhet",
     "amountGold": "<%= amount %> Guld",

website/common/locales/sv/pets.json

@@ -40,7 +40,7 @@
     "hatchingPotion": "kläckningsdryck",
     "noHatchingPotions": "Du har inga kläckningsdrycker.",
     "inventoryText": "Klicka på ett ägg för att se användbara drycker markerade i grönt och klicka sedan på en av de markerade dryckerna för att kläcka ditt husdjur. Om inga drycker är markerade: tryck igen för att avmarkera ägget och klicka istället på en dryck för att få de användbara äggen markerade. Du kan också sälja oönskade drops till Köpmannen Alexander.",
-    "haveHatchablePet": "You have a <%= potion %> hatching potion and <%= egg %> egg to hatch this pet! <b>Click</b> the paw print to hatch.",
+    "haveHatchablePet": "Du har en <%= potion %> kläckningsdryck och <%= egg %> ägg för att kläcka detta husdjur! <b>Klicka</b> på tassavtrycket för att kläcka.",
     "quickInventory": "Quick Inventory",
     "foodText": "Mat",
     "food": "Mat och Sadlar",
@@ -55,7 +55,7 @@
     "beastAchievement": "Du har erhållit bedriften \"Djurmästare\" genom att ha samlat alla husdjur!",
     "beastMasterName": "Bestmästare",
     "beastMasterText": "Har hittat alla 90 husdjur (extremt svårt, gratulera den här användaren!)",
-    "beastMasterText2": "and has released their pets a total of <%= count %> time(s)",
+    "beastMasterText2": "och har befriat deras husdjur totalt <%= count %> gång(er)",
     "mountMasterProgress": "Framsteg mot Riddjursmästare",
     "stableMountMasterProgress": "Stallmästar-framsteg: <%= number %> Riddjur Tämjda",
     "mountAchievement": "Du har erhållit bedriften \"Riddjursmästare\" genom att samla alla riddjur!",
@@ -65,7 +65,7 @@
     "beastMountMasterName": "Bestmästare och Riddjursmästare",
     "triadBingoName": "Triadbingo",
     "triadBingoText": "Har hittat alla 90 husdjur, alla 90 riddjur, och alla 90 husdjur IGEN (HUR GJORDE DU DET?)",
-    "triadBingoText2": "and has released a full stable a total of <%= count %> time(s)",
+    "triadBingoText2": "och har befriat ett fullt stall totalt <%= count %> gång(er)",
     "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Dropsystem Aktiverat!",
     "itemDrop": "Ett föremål har droppat!",
@@ -118,7 +118,7 @@
     "foodTitle": "Mat",
     "dragThisFood": "Dra den här <%= foodName %> till ett Husdjur och se när den växer!",
     "clickOnPetToFeed": "Klicka på ett Husdjur för att mata den med <%= foodName %> och se den växa!",
-    "dragThisPotion": "Drag this <%= potionName %> to an Egg and hatch a new pet!",
+    "dragThisPotion": "Dra denna <%= potionName %> till ett Ägg för att kläcka ett nytt husdjur!",
     "clickOnEggToHatch": "Click on an Egg to use your <%= potionName %> hatching potion and hatch a new pet!",
     "hatchDialogText": "Pour your <%= potionName %> hatching potion on your <%= eggName %> egg, and it will hatch into a <%= petName %> ."
 }

website/common/locales/sv/quests.json

@@ -117,5 +117,5 @@
     "createAccountQuest": "Du fick det här uppdraget när du gick med i Habitica! Om en vän går med får dom också en.",
     "questBundles": "Rabatt på Uppdragsbuntar",
     "buyQuestBundle": "Köp Uppdragsbunt",
-    "noQuestToStart": "Can’t find a quest to start? Try checking out the Quest Shop in the Market for new releases!"
+    "noQuestToStart": "Kan du inte hitta ett uppdrag att starta? Kolla in Uppdragsaffären i Marknaden för nya utgåvor!"
 }

website/common/locales/zh/character.json

@@ -125,7 +125,7 @@
     "mystery": "神秘",
     "changeClass": "更改职业，重新分配属性点",
     "lvl10ChangeClass": "你最少要到等級10才能變更職業。",
-    "changeClassConfirmCost": "Are you sure you want to change your class for 3 Gems?",
+    "changeClassConfirmCost": "你确定你想使用3颗宝石来更换你的职业吗？",
     "invalidClass": "无效的职业。请指定'战士', '盗贼', '法师', 或'治愈师'。",
     "levelPopover": "每一级你可以获得一个可自由分配的属性点。你可以手动分配，或者让系统为你自动分配。",
     "unallocated": "未分配的属性点",
@@ -159,7 +159,7 @@
     "respawn": "重生！",
     "youDied": "你已经死亡！",
     "dieText": "你掉了一级，失去所有的金币，和随机的一件装备。起来吧，Habit世界的居民，再接再厉！远离那些坏习惯、注意完成每日任务、并在快支撑不住的时候使用生命药水免于死亡！",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 Gems.",
+    "sureReset": "你确定吗？这将会重置你的角色职业和已分配的属性点（它们会被返还并让你重新分配），这将会消耗3个宝石。",
     "purchaseFor": "花费<%= cost %>宝石购买？",
     "notEnoughMana": "魔法值不足。",
     "invalidTarget": "无效的目标。",

website/common/locales/zh/generic.json

@@ -4,7 +4,7 @@
     "titleIndex": "Habitica | 你的生活游戏",
     "habitica": "Habitica",
     "habiticaLink": "<a href='http://habitica.wikia.com/wiki/Habitica' target='_blank'>Habitica</a>",
-    "onward": "Onward!",
+    "onward": "前进！",
     "done": "已完成",
     "gotIt": "Got it!",
     "titleTasks": "任务",

website/common/locales/zh/overview.json

@@ -2,7 +2,7 @@
   "needTips": "不清楚怎样开始游戏？看看这个简明指南吧！",
 
   "step1": "第一步：输入任务",
-  "webStep1Text": "Habitica is nothing without real-world goals, so enter a few tasks. You can add more later as you think of them! All tasks can be added by clicking the green \"Create\" button.\n* **Set up [To-Dos](http://habitica.wikia.com/wiki/To-Dos):** Enter tasks you do once or rarely in the To-Dos column, one at a time. You can click on the tasks to edit them and add checklists, due dates, and more!\n* **Set up [Dailies](http://habitica.wikia.com/wiki/Dailies):** Enter activities you need to do daily or on a particular day of the week, month, or year in the Dailies column. Click task to edit when it will be due and/or set a start date. You can also make it due on a repeating basis, for example, every 3 days.\n* **Set up [Habits](http://habitica.wikia.com/wiki/Habits):** Enter habits you want to establish in the Habits column. You can edit the Habit to change it to just a good habit :heavy_plus_sign: or a bad habit :heavy_minus_sign:\n* **Set up [Rewards](http://habitica.wikia.com/wiki/Rewards):** In addition to the in-game Rewards offered, add activities or treats which you want to use as a motivation to the Rewards column. It's important to give yourself a break or allow some indulgence in moderation!\n* If you need inspiration for which tasks to add, you can look at the wiki's pages on [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies), [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos), and [Sample Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
+  "webStep1Text": "没有现实世界中的目标，habitica什么也不是，所以，输入几个任务。在你考虑之后，可以多加一些！\n* **建立 [待办事项](http://habitica.wikia.com/wiki/To-Dos):**\n\n输入只做一次或者很少做的任务到待办事项的列表中，一次一个。你可以点击铅笔来编辑它们或添加清单、时限等等！\n* **建立 [每日任务](http://habitica.wikia.com/wiki/Dailies):**\n\n输入需要每天或者每周的特定日子来做的事到每日任务的列表中。点击项目的铅笔图标来“编辑”每周的特定日子。你也可以设定它为重复的任务，例如，每3天一次。\n* **建立 [习惯](http://habitica.wikia.com/wiki/Habits):**\n\n输入你想养成的习惯到习惯列表中。你可以编辑习惯让它变成一个单纯的好习惯或者坏习惯。\n* **建立 [奖励](http://habitica.wikia.com/wiki/Rewards):**\n\n除了游戏中的奖励，你还可以增加一些活动或者你想把它们当做动力的东西到奖励列表中。重要的是要给自己一个休息或允许一些适度放纵！\n如果你需要一些添加任务的灵感，可以看看这几页维基百科 [习惯的例子](http://habitica.wikia.com/wiki/Sample_Habits), [每日任务的例子](http://habitica.wikia.com/wiki/Sample_Dailies), [待办事项的例子](http://habitica.wikia.com/wiki/Sample_To-Dos), and [奖励的例子](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
 
   "step2": "第二步：完成现实生活中的任务以获取经验值",
   "webStep2Text": "现在，开始解决你列表中的目标！你在Habitica中完成了任务后会获得能让你升级的[经验](http://habitica.wikia.com/wiki/Experience_Points)，和能让你购买奖励的[金币](http://habitica.wikia.com/wiki/Gold_Points)。如果你有了坏习惯或者没有完成每日任务，你会失去 [生命](http://habitica.wikia.com/wiki/Health_Points)。以这种方式，Habitica的经验条和生命条就会像指示器一样显示出你完成目标的进度。你就能通过你的游戏角色看见你在现实生活中的提升。",

website/common/locales/zh/subscriber.json

@@ -19,7 +19,7 @@
     "exclusiveJackalopePetText": "获得皇家紫鹿角兔宠物，定期捐赠者特有！",
     "giftSubscription": "想要赠送他人一个会员么？",
     "giftSubscriptionText1": "要打开别人的个人资料，可以点击小组成员的头像，或者是在聊天界面中点击他们的名字。",
-    "giftSubscriptionText2": "Click on the gift icon in the top right of their profile.",
+    "giftSubscriptionText2": "点击他们资料界面右上角的“赠送”图标。",
     "giftSubscriptionText3": "选择\"订阅\"来查看你的付款信息",
     "giftSubscriptionText4": "感谢你对habitica的支持！",
     "monthUSD": "USD/每月",
@@ -70,7 +70,7 @@
     "subCanceled": "捐助将失效于",
     "buyGemsGoldTitle": "用金币购买宝石",
     "becomeSubscriber": "成为一名捐助者",
-    "subGemPop": "Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.",
+    "subGemPop": "由于您捐助了Habitica，您可以每月使用金币购买一些宝石。",
     "subGemName": "定期捐助者的宝石",
     "freeGemsTitle": "免费获得宝石",
     "maxBuyGems": "你购买宝石的数量已经达到了本月购买宝石的上限。在下个月的前三天重置上限后，你才可以购买更多的宝石。感谢您的捐助！",

website/common/locales/zh/tasks.json

@@ -4,7 +4,7 @@
     "deleteToDosExplanation": "如果你点击下方的按钮，除了正在进行的挑战或者团队任务，所有你已完成的待办事项和历史记录将永远删除，如果你想留下这些记录请先把他们导出哦！",
     "addmultiple": "添加多个",
     "addsingle": "添加单个",
-    "editATask": "Edit a <%= type %>",
+    "editATask": "编辑一个<%= type %>",
     "createTask": "Create <%= type %>",
     "addTaskToUser": "Create",
     "scheduled": "限时",
@@ -23,7 +23,7 @@
     "addChecklist": "新增清单",
     "checklist": "清单",
     "checklistText": "把大任务分割开！清单能增加单条待办事项的经验和金币收入，还能减少日常任务失败的伤害。",
-    "newChecklistItem": "New checklist item",
+    "newChecklistItem": "新的清单项目",
     "expandCollapse": "展开 / 折叠",
     "text": "标题",
     "extraNotes": "额外注解",
@@ -47,10 +47,10 @@
     "dailies": "每日任务",
     "newDaily": "新每日任务",
     "newDailyBulk": "新每日任务（每行新建一个）",
-    "dailysDesc": "Dailies repeat on a regular basis. Choose the schedule that works best for you!",
+    "dailysDesc": "每日任务可以定期重复。请选择最适合您的日程表！",
     "streakCounter": "连击记录",
     "repeat": "重复",
-    "repeats": "Repeats",
+    "repeats": "重复",
     "repeatEvery": "每 天重复",
     "repeatHelpTitle": "这个任务多久重复一次？",
     "dailyRepeatHelpContent": "你可以在下方设置这个任务会每隔X天重复。",
@@ -60,12 +60,12 @@
     "day": "天",
     "days": "天",
     "restoreStreak": "恢复连击数",
-    "resetStreak": "Reset Streak",
+    "resetStreak": "恢复连击数",
     "todo": "待办事项",
     "todos": "待办事项",
     "newTodo": "新待办事项",
     "newTodoBulk": "新待办事项（每行新建一个）",
-    "todosDesc": "To-Dos need to be completed once. Add checklists to your To-Dos to increase their value.",
+    "todosDesc": "待办事项只需要完成一次。 添加清单到您的代办项目以增加其价值。",
     "dueDate": "截止日",
     "remaining": "进行中",
     "complete": "已完成",
@@ -79,7 +79,7 @@
     "score": "成绩",
     "reward": "奖励",
     "rewards": "奖励",
-    "rewardsDesc": "Rewards are a great way to use Habitica and complete your tasks. Try adding a few today!",
+    "rewardsDesc": "奖励是使用Habitica并完成任务的好方法。 今天就尝试添加几个！",
     "ingamerewards": "装备&技能",
     "gold": "金币",
     "silver": "银币 (100银币 = 1金币)",
@@ -142,7 +142,7 @@
     "taskNotFound": "找不到任务。",
     "invalidTaskType": "任务类型必须是\"习惯\"，\"每日任务\"，\"待办事项\"，\"奖励\"中的一个。",
     "cantDeleteChallengeTasks": "属于一个挑战的任务不能被删除。",
-    "checklistOnlyDailyTodo": "Checklists are supported only on Dailies and To-Dos",
+    "checklistOnlyDailyTodo": "仅有每日任务和待办事项支持添加清单功能",
     "checklistItemNotFound": "用给出的id找不到清单项目。",
     "itemIdRequired": "\"itemId\"必须是一个有效的UUID。",
     "tagNotFound": "用给出的id找不到标签项目。",

website/common/script/content/index.js

@@ -102,7 +102,7 @@ api.bundles = {
       'sheep',
     ],
     canBuy () {
-      return moment().isBetween('2017-09-12', '2017-10-02');
+      return moment().isBetween('2017-09-12', '2017-10-07');
     },
     type: 'quests',
     value: 7,

website/common/script/content/mystery-sets.js

@@ -176,7 +176,7 @@ let mysterySets = {
   },
   201709: {
     start: '2017-09-19',
-    end: '2017-10-02',
+    end: '2017-10-07',
   },
   301404: {
     start: '3014-03-24',

website/server/controllers/api-v3/user.js

@@ -870,7 +870,16 @@ api.buy = {
   url: '/user/buy/:key',
   async handler (req, res) {
     let user = res.locals.user;
-    let buyRes = common.ops.buy(user, req, res.analytics);
+
+    let buyRes;
+    let specialKeys = ['snowball', 'spookySparkles', 'shinySeed', 'seafoam'];
+
+    if (specialKeys.indexOf(req.params.key) !== -1) {
+      buyRes = common.ops.buySpecialSpell(user, req);
+    } else {
+      buyRes = common.ops.buy(user, req, res.analytics);
+    }
+
     await user.save();
     res.respond(200, ...buyRes);
   },