From c0bf2cffeaebb2a39edce5df3ca3e1a49b772edc Mon Sep 17 00:00:00 2001
From: Jalansh <jalansh.munshi1366@gmail.com>
Date: Sun, 9 Aug 2020 21:55:59 +0530
Subject: [PATCH 01/16] Casting Chilling Frost and Stealth skill again will not
 be processed and return an error instead. Fixes #12361. (#12404)

* Added logic for a repeating Chilling Frost skill. Added test case for redundant chilling frost skill cast. Added comments for the logic of repeating Stealth skill because of an error.

* Added logic for a repeating Stealth skill. Avoiding MP reduction still pending because of console error. Test cases pending.

* Completed the logic for a repeated Stealth skill. Added repeated frost skill cast check in common. Removed exclusive test. Test cases are pending.

* Added test case for Stealth skill recast. Fixed lint errors. Fixed a flaw in if statement which led to test case failure.

* Fixed lint errors in test case.

* Added a common JSON entry for skil recasts in three files. Other files remaining. Added Chilling Frost recast check in common code. Modified test cases.

* Added spellDisabled condition in client code.

* Reverted JSON messages for three languages. Added spellAlreadyCast attribute to JSON file in locales/en. Made changes for showing appropriate message in client code.

* Added an import for throwing BadRequest in common code. Modified test case accordingly.

* Update website/common/script/content/spells.js

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>

* Added target and req attributes in cast() method arguments.

* Changed common code test case because of increased function parameters. Moved chilling frost test casse to common tests instead of server tests.

* Changed the test case format in common tests.

* Added a missing done statement.

* Fixed a minor error which led to failing test case. Removed the exclusive test which led to lint error.

* Fixed lint errors.

* Added a class named 'disabled' for the frontend change.

* fix(skills): style cleanup

* fix(skills): unfix

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
---
 .../user/POST-user_class_cast_spellId.test.js | 17 +++++++++++++++
 test/common/ops/spells.js                     | 21 ++++++++++++++++++-
 .../client/src/components/tasks/spells.vue    | 21 +++++++++++--------
 website/common/locales/en/spells.json         |  5 ++---
 website/common/script/content/spells.js       | 11 ++++++----
 website/server/libs/spells.js                 | 14 +++++++++++++
 6 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js b/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js
index 56c6a0a940..78a9d0d4b8 100644
--- a/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js
+++ b/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js
@@ -161,6 +161,23 @@ describe('POST /user/class/cast/:spellId', () => {
       });
   });
 
+  it('Issue #12361: returns an error if stealth has already been cast', async () => {
+    await user.update({
+      'stats.class': 'rogue',
+      'stats.lvl': 15,
+      'stats.mp': 400,
+      'stats.buffs.stealth': 1,
+    });
+    await user.sync();
+    await expect(user.post('/user/class/cast/stealth'))
+      .to.eventually.be.rejected.and.eql({
+        code: 400,
+        error: 'BadRequest',
+        message: t('spellAlreadyCast'),
+      });
+    expect(user.stats.mp).to.equal(400);
+  });
+
   it('returns an error if targeted party member doesn\'t exist', async () => {
     const { groupLeader } = await createAndPopulateGroup({
       groupDetails: { type: 'party', privacy: 'private' },
diff --git a/test/common/ops/spells.js b/test/common/ops/spells.js
index 939b7caab5..1f185c37f2 100644
--- a/test/common/ops/spells.js
+++ b/test/common/ops/spells.js
@@ -4,6 +4,7 @@ import {
 import spells from '../../../website/common/script/content/spells';
 import {
   NotAuthorized,
+  BadRequest,
 } from '../../../website/common/script/libs/errors';
 import i18n from '../../../website/common/script/i18n';
 
@@ -25,7 +26,7 @@ describe('shared.ops.spells', () => {
     const spell = spells.healer.heal;
 
     try {
-      spell.cast(user);
+      spell.cast(user, null, { language: 'en' });
     } catch (err) {
       expect(err).to.be.an.instanceof(NotAuthorized);
       expect(err.message).to.equal(i18n.t('messageHealthAlreadyMax'));
@@ -35,4 +36,22 @@ describe('shared.ops.spells', () => {
       done();
     }
   });
+
+  it('Issue #12361: returns an error if chilling frost has already been cast', done => {
+    user.stats.class = 'wizard';
+    user.stats.lvl = 15;
+    user.stats.mp = 400;
+    user.stats.buffs.streaks = true;
+
+    const spell = spells.wizard.frost;
+    try {
+      spell.cast(user, null, { language: 'en' });
+    } catch (err) {
+      expect(err).to.be.an.instanceof(BadRequest);
+      expect(err.message).to.equal(i18n.t('spellAlreadyCast'));
+      expect(user.stats.mp).to.eql(400);
+
+      done();
+    }
+  });
 });
diff --git a/website/client/src/components/tasks/spells.vue b/website/client/src/components/tasks/spells.vue
index 481539a9d6..216e85c613 100644
--- a/website/client/src/components/tasks/spells.vue
+++ b/website/client/src/components/tasks/spells.vue
@@ -42,12 +42,14 @@
                 :key="key"
                 v-b-popover.hover.auto="skillNotes(skill)"
                 class="col-12 col-md-3"
-                @click="castStart(skill)"
+                @click="!spellDisabled(key) ? castStart(skill) : null"
               >
                 <!-- eslint-enable vue/no-use-v-if-with-v-for -->
-                <div class="spell col-12 row">
+                <div
+                  class="spell col-12 row"
+                  :class="{'disabled': spellDisabled(key)}"
+                >
                   <div class="col-8 details">
-                    <a :class="{'disabled': spellDisabled(key)}"></a>
                     <div
                       class="img"
                       :class="`shop_${skill.key} shop-sprite item-img`"
@@ -88,9 +90,6 @@
     }
   }
 
-  .drawer-container {
-  }
-
   .drawer-slider {
     margin-top: 1em;
   }
@@ -100,7 +99,7 @@
     white-space: initial;
   }
 
-  .spell:hover {
+  .spell:hover:not(.disabled) {
     cursor: pointer;
     border: solid 2px #50b5e9;
   }
@@ -116,6 +115,10 @@
     padding-left: 0;
     overflow: hidden;
 
+    &.disabled {
+      opacity: 0.5;
+    }
+
     .details {
       text-align: left;
       padding-top: .5em;
@@ -280,9 +283,9 @@ export default {
       let notes = skill.notes();
 
       if (skill.key === 'frost' && this.spellDisabled(skill.key)) {
-        notes = this.$t('spellWizardFrostAlreadyCast');
+        notes = this.$t('spellAlreadyCast');
       } else if (skill.key === 'stealth' && this.spellDisabled(skill.key)) {
-        notes = this.$t('spellRogueStealthMaxedOut');
+        notes = this.$t('spellAlreadyCast');
       } else if (skill.key === 'stealth') {
         notes = this.$t('spellRogueStealthDaliesAvoided', {
           originalText: notes,
diff --git a/website/common/locales/en/spells.json b/website/common/locales/en/spells.json
index 231a944476..3b9ad6b227 100644
--- a/website/common/locales/en/spells.json
+++ b/website/common/locales/en/spells.json
@@ -10,7 +10,6 @@
 
   "spellWizardFrostText": "Chilling Frost",
   "spellWizardFrostNotes": "With one cast, ice freezes all your streaks so they won't reset to zero tomorrow! ",
-  "spellWizardFrostAlreadyCast": "You have already cast this today. Your streaks are frozen, and there's no need to cast this again.",
 
 
   "spellWarriorSmashText": "Brutal Smash",
@@ -37,7 +36,6 @@
   "spellRogueStealthText": "Stealth",
   "spellRogueStealthNotes": "With each cast, a few of your undone Dailies won't cause damage tonight. Their streaks and colors won't change. (Based on: PER)",
   "spellRogueStealthDaliesAvoided": "<%= originalText %> Number of dailies that will be avoided: <%= number %>.",
-  "spellRogueStealthMaxedOut": "You have already avoided all your dailies; there's no need to cast this again.",
 
   "spellHealerHealText": "Healing Light",
   "spellHealerHealNotes": "Shining light restores your health! (Based on: CON and INT)",
@@ -76,5 +74,6 @@
   "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.",
   "groupTasksNoCast": "Casting a skill on group tasks is not allowed.",
   "spellNotOwned": "You don't own this skill.",
-  "spellLevelTooHigh": "You must be level <%= level %> to use this skill."
+  "spellLevelTooHigh": "You must be level <%= level %> to use this skill.",
+  "spellAlreadyCast": "You've cast this skill already. It won't have any additional effect."
 }
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index 29d6c019af..93940c3ba5 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -1,6 +1,6 @@
 import each from 'lodash/each';
 import t from './translation';
-import { NotAuthorized } from '../libs/errors';
+import { NotAuthorized, BadRequest } from '../libs/errors';
 import statsComputed from '../libs/statsComputed'; // eslint-disable-line import/no-cycle
 import setDebuffPotionItems from '../libs/setDebuffPotionItems'; // eslint-disable-line import/no-cycle
 import crit from '../fns/crit'; // eslint-disable-line import/no-cycle
@@ -104,7 +104,10 @@ spells.wizard = {
     lvl: 14,
     target: 'self',
     notes: t('spellWizardFrostNotes'),
-    cast (user) {
+    cast (user, target, req) {
+      // Check if chilling frost skill has been previously casted or not.
+      // See #12361 for more details.
+      if (user.stats.buffs.streaks === true) throw new BadRequest(t('spellAlreadyCast')(req.language));
       user.stats.buffs.streaks = true;
     },
   },
@@ -226,8 +229,8 @@ spells.healer = {
     lvl: 11,
     target: 'self',
     notes: t('spellHealerHealNotes'),
-    cast (user) {
-      if (user.stats.hp >= 50) throw new NotAuthorized(t('messageHealthAlreadyMax')(user.language));
+    cast (user, target, req) {
+      if (user.stats.hp >= 50) throw new NotAuthorized(t('messageHealthAlreadyMax')(req.language));
       user.stats.hp += (statsComputed(user).con + statsComputed(user).int + 5) * 0.075;
       if (user.stats.hp > 50) user.stats.hp = 50;
     },
diff --git a/website/server/libs/spells.js b/website/server/libs/spells.js
index 231402a453..c185bbf471 100644
--- a/website/server/libs/spells.js
+++ b/website/server/libs/spells.js
@@ -163,6 +163,20 @@ async function castSpell (req, res, { isV3 = false }) {
       task: results[1],
     });
   } else if (targetType === 'self') {
+    const spellName = spell.key;
+    // Check if stealth skill has been previously casted or not.
+    // See #12361 for more details.
+    if (spellName === 'stealth') {
+      const incompleteDailiesDue = await Tasks.Task.countDocuments({
+        userId: user._id,
+        type: 'daily',
+        completed: false,
+        isDue: true,
+      }).exec();
+      if (user.stats.buffs.stealth >= incompleteDailiesDue) {
+        throw new BadRequest(res.t('spellAlreadyCast'));
+      }
+    }
     await castSelfSpell(req, user, spell, quantity);
 
     let userToJson = user;

From 0a47af4ac3d3bcaa1faf6c1d06640e5598d9a1a1 Mon Sep 17 00:00:00 2001
From: Rogesson <rogessonb@gmail.com>
Date: Sun, 9 Aug 2020 14:44:46 -0300
Subject: [PATCH 02/16] update group members after accepting the quest (without
 page reload) (#12358)

* update group members after accepting the quest (without page reload)

* show quest information after starting

* removing quest.progress.up assignment

Co-authored-by: rogesson <rogesson.barboza@locaweb.com.br>
---
 website/client/src/components/groups/questSidebarSection.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/website/client/src/components/groups/questSidebarSection.vue b/website/client/src/components/groups/questSidebarSection.vue
index 24da128790..6adb4055f1 100644
--- a/website/client/src/components/groups/questSidebarSection.vue
+++ b/website/client/src/components/groups/questSidebarSection.vue
@@ -162,7 +162,7 @@
                   progress on the group doc? Each user could have different progress.-->
                 <span
                   class="float-right"
-                >{{ user.party.quest.progress.up | floor(10) }} {{ $t('pendingDamageLabel') }}</span> <!-- eslint-disable-line max-len -->
+                >{{ (user.party.quest.progress.up || 0) | floor(10) }} {{ $t('pendingDamageLabel') }}</span> <!-- eslint-disable-line max-len -->
                 <!-- player's pending damage uses floor so you
                   don't overestimate damage you've already done-->
               </div>
@@ -425,6 +425,7 @@ export default {
     async questAccept (partyId) {
       const quest = await this.$store.dispatch('quests:sendAction', { groupId: partyId, action: 'quests/accept' });
       this.user.party.quest = quest;
+      this.group.quest = quest;
     },
     async questReject (partyId) {
       const quest = await this.$store.dispatch('quests:sendAction', { groupId: partyId, action: 'quests/reject' });

From 13a5b276e94e3e571e9a5d1fc641d5d0c82ac138 Mon Sep 17 00:00:00 2001
From: Carlton McFarlane <carlton@ilicmcfarlane.io>
Date: Sun, 9 Aug 2020 19:58:40 +0200
Subject: [PATCH 03/16] fix(quest shop): add an index to v-for loop (#12446)

---
 website/client/src/components/shops/quests/questInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/client/src/components/shops/quests/questInfo.vue b/website/client/src/components/shops/quests/questInfo.vue
index 11e3e1e75b..b3020dc255 100644
--- a/website/client/src/components/shops/quests/questInfo.vue
+++ b/website/client/src/components/shops/quests/questInfo.vue
@@ -28,8 +28,8 @@
         <dt>{{ $t('difficulty') + ':' }}</dt>
         <dd>
           <div
-            v-for="star of stars()"
-            :key="star"
+            v-for="(star, index) of stars()"
+            :key="index"
             class="svg-icon inline icon-16"
             v-html="icons[star]"
           ></div>

From d2fc7c0c3d5e8d54af752a8bfaf17615f4a93ab1 Mon Sep 17 00:00:00 2001
From: negue <negue@users.noreply.github.com>
Date: Sun, 9 Aug 2020 22:25:56 +0200
Subject: [PATCH 04/16] UI: redesign DatePicker  (#12418)

* extract datepicker & settings as component + redesign

* fix updating values + fix button styling + popover position

* remove eslint-config-standard / html
---
 package-lock.json                             |  16 +-
 website/client/config/storybook/config.js     |   1 -
 website/client/package-lock.json              |   4 +-
 website/client/package.json                   |   2 +-
 .../client/src/assets/scss/datepicker.scss    |  26 ---
 website/client/src/assets/scss/index.scss     |   1 -
 .../client/src/components/tasks/taskModal.vue |  44 +---
 .../src/components/ui/datepicker.stories.js   |  19 ++
 .../client/src/components/ui/datepicker.vue   | 198 ++++++++++++++++++
 website/common/locales/en/tasks.json          |   1 +
 10 files changed, 239 insertions(+), 73 deletions(-)
 delete mode 100644 website/client/src/assets/scss/datepicker.scss
 create mode 100644 website/client/src/components/ui/datepicker.stories.js
 create mode 100644 website/client/src/components/ui/datepicker.vue

diff --git a/package-lock.json b/package-lock.json
index c75305ea29..fd360a4251 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1153,11 +1153,6 @@
         "uuid": "^8.0.0"
       }
     },
-    "@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
-    },
     "@sinonjs/commons": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz",
@@ -6665,9 +6660,9 @@
       },
       "dependencies": {
         "@sindresorhus/is": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.0.0.tgz",
-          "integrity": "sha512-kqA5I6Yun7PBHk8WN9BBP1c7FfN2SrD05GuVSEYPqDb4nerv7HqYfgBfMIKmT/EuejURkJKLZuLyGKGs6WEG9w=="
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.0.tgz",
+          "integrity": "sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ=="
         },
         "@szmarczak/http-timer": {
           "version": "4.0.5",
@@ -10573,6 +10568,11 @@
         "semver": "^6.2.0"
       },
       "dependencies": {
+        "@sindresorhus/is": {
+          "version": "0.14.0",
+          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+          "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
+        },
         "got": {
           "version": "9.6.0",
           "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
diff --git a/website/client/config/storybook/config.js b/website/client/config/storybook/config.js
index fb3957a25e..63aa9f0c1d 100644
--- a/website/client/config/storybook/config.js
+++ b/website/client/config/storybook/config.js
@@ -2,7 +2,6 @@
 import { configure } from '@storybook/vue';
 import './margin.css';
 import '../../src/assets/scss/index.scss';
-import '../../src/assets/scss/spacing.scss';
 import '../../src/assets/css/sprites.css';
 
 import '../../src/assets/css/sprites/spritesmith-main-0.css';
diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index d93e03ac43..57343a7022 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -19885,8 +19885,8 @@
       }
     },
     "vuejs-datepicker": {
-      "version": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
-      "from": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec"
+      "version": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
+      "from": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0"
     },
     "w3c-hr-time": {
       "version": "1.0.2",
diff --git a/website/client/package.json b/website/client/package.json
index 04e4c330fe..8df0f2d610 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -59,7 +59,7 @@
     "vue-router": "^3.3.4",
     "vue-template-compiler": "^2.6.11",
     "vuedraggable": "^2.24.0",
-    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
+    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
     "webpack": "^4.44.1"
   }
 }
diff --git a/website/client/src/assets/scss/datepicker.scss b/website/client/src/assets/scss/datepicker.scss
deleted file mode 100644
index 7ec0a7711b..0000000000
--- a/website/client/src/assets/scss/datepicker.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.vdp-datepicker .vdp-datepicker__calendar  {
-
-    .cell:not(.blank):not(.disabled).day:hover {
-        border-radius: 2px;
-        border: 1px solid $purple-400;
-    }
-    
-    .cell.selected, 
-    .cell.selected.highlighted, 
-    .cell.selected:hover {
-        color: $white;
-        background: $purple-300;
-    }
-
-    .cell.highlighted {
-        background: rgba($purple-400, 0.24);
-        color: $purple-200;
-    }
-
-    .cell.highlighted,
-    .cell.selected {
-        border-radius: 2px;
-        font-weight: bold;
-    }
-
-}
\ No newline at end of file
diff --git a/website/client/src/assets/scss/index.scss b/website/client/src/assets/scss/index.scss
index 63dfcbc85f..424cffb0e7 100644
--- a/website/client/src/assets/scss/index.scss
+++ b/website/client/src/assets/scss/index.scss
@@ -36,5 +36,4 @@
 @import './iconalert';
 @import './tiers';
 @import './payments';
-@import './datepicker.scss';
 @import './spacing';
diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue
index 6669042b85..a02e8ce078 100644
--- a/website/client/src/components/tasks/taskModal.vue
+++ b/website/client/src/components/tasks/taskModal.vue
@@ -264,13 +264,8 @@
               :text="$t('dueDate')"
             />
             <datepicker
-              v-model="task.date"
-              :calendar-icon="icons.calendar"
-              :clear-button="!challengeAccessRequired && !groupAccessRequiredAndOnPersonalPage"
-              :clear-button-text="$t('clear')"
-              :today-button="false"
-              :disabled-picker="challengeAccessRequired || groupAccessRequiredAndOnPersonalPage"
-              :class="{disabled: challengeAccessRequired || groupAccessRequiredAndOnPersonalPage}"
+              :date.sync="task.date"
+              :disabled="challengeAccessRequired || groupAccessRequiredAndOnPersonalPage"
               :highlighted="calendarHighlights"
             />
           </div>
@@ -285,12 +280,8 @@
               :text="$t('startDate')"
             />
             <datepicker
-              v-model="task.startDate"
-              :calendar-icon="icons.calendar"
-              :clear-button="false"
-              :today-button="false"
-              :disabled-picker="challengeAccessRequired || groupAccessRequiredAndOnPersonalPage"
-              :class="{disabled: challengeAccessRequired || groupAccessRequiredAndOnPersonalPage}"
+              :date.sync="task.startDate"
+              :disabled="challengeAccessRequired || groupAccessRequiredAndOnPersonalPage"
               :highlighted="calendarHighlights"
             />
           </div>
@@ -787,27 +778,12 @@
       }
     }
 
-    .vdp-datepicker.disabled, .input-group-outer.disabled {
-      .input-group:hover {
-        border-color: $gray-400;
-      }
+    .datetime-buttons {
+      display: flex;
+      flex-direction: row;
 
-      .input-group .form-control {
-        background-color: $gray-700;
-        border-color: $gray-500;
-        color: $gray-200;
-      }
-
-      svg path {
-        opacity: 0.75;
-        fill: $gray-200;
-      }
-    }
-
-    .vdp-datepicker {
-      .input-group-append {
-        width: auto;
-        min-width: 2rem;
+      .btn {
+        flex: 1;
       }
     }
 
@@ -1067,8 +1043,8 @@
 <script>
 import axios from 'axios';
 import clone from 'lodash/clone';
-import Datepicker from 'vuejs-datepicker';
 import moment from 'moment';
+import Datepicker from '@/components/ui/datepicker';
 import toggleSwitch from '@/components/ui/toggleSwitch';
 import toggleCheckbox from '@/components/ui/toggleCheckbox';
 import markdownDirective from '@/directives/markdown';
diff --git a/website/client/src/components/ui/datepicker.stories.js b/website/client/src/components/ui/datepicker.stories.js
new file mode 100644
index 0000000000..a7f05bf59d
--- /dev/null
+++ b/website/client/src/components/ui/datepicker.stories.js
@@ -0,0 +1,19 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { storiesOf } from '@storybook/vue';
+import { withKnobs } from '@storybook/addon-knobs';
+
+import datepicker from './datepicker.vue';
+
+const stories = storiesOf('Date Picker', module);
+
+stories.addDecorator(withKnobs);
+
+stories
+  .add('simple', () => ({
+    components: { datepicker },
+    template: `
+      <div style="position: absolute; margin: 20px">
+        <datepicker></datepicker>
+      </div>
+    `,
+  }));
diff --git a/website/client/src/components/ui/datepicker.vue b/website/client/src/components/ui/datepicker.vue
new file mode 100644
index 0000000000..12fd519eac
--- /dev/null
+++ b/website/client/src/components/ui/datepicker.vue
@@ -0,0 +1,198 @@
+<template>
+  <datepicker
+    v-model="value"
+    @input="upDate($event)"
+    :calendarButton="true"
+    :calendarButtonIconContent="icons.calendar"
+    :bootstrapStyling="true"
+    :clear-button="false"
+    :today-button="false"
+    :disabled-picker="disabled"
+    :class="{disabled: disabled}"
+    :highlighted="highlighted"
+    calendar-class="calendar-padding"
+  >
+    <div slot="beforeCalendarHeader">
+      <div class="datetime-buttons">
+       <button
+          class="btn btn-flat"
+          @click="setToday()"
+          type="button"
+        >
+          {{ $t('today') }}
+        </button>
+        <button
+            class="btn btn-flat"
+            @click="setTomorrow()"
+            type="button"
+          >
+            {{ $t('tomorrow') }}
+        </button>
+      </div>
+    </div>
+  </datepicker>
+</template>
+
+<script>
+import moment from 'moment';
+import datepicker from 'vuejs-datepicker';
+import calendarIcon from '@/assets/svg/calendar.svg';
+
+export default {
+  components: {
+    datepicker,
+  },
+  props: ['date', 'disabled', 'highlighted'],
+  data () {
+    return {
+      value: this.date,
+      icons: Object.freeze({
+        calendar: calendarIcon,
+      }),
+    };
+  },
+  watch: {
+    date () {
+      this.value = this.date;
+    },
+  },
+  methods: {
+    upDate (after) {
+      this.value = after;
+      this.$emit('update:date', after);
+    },
+    setToday () {
+      this.upDate(moment().toDate());
+    },
+    setTomorrow () {
+      this.upDate(moment().add(1, 'day').toDate());
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+  @import '~@/assets/scss/colors.scss';
+
+  .vdp-datepicker__calendar {
+    bottom: 2.125rem;  // 2rem input control height + 0.125rem margin above
+  }
+
+ .vdp-datepicker {
+    .input-group-append {
+      width: auto;
+      min-width: 2rem;
+    }
+  }
+
+  .vdp-datepicker__calendar-button .svg-icon {
+    width: 12px;
+    height: 12px;
+  }
+
+   .vdp-datepicker.disabled, .input-group-outer.disabled {
+      .input-group:hover {
+        border-color: $gray-400;
+      }
+
+      .input-group .form-control {
+        background-color: $gray-700;
+        border-color: $gray-500;
+        color: $gray-200;
+      }
+
+      svg path {
+        opacity: 0.75;
+        fill: $gray-200;
+      }
+    }
+
+  .vdp-datepicker .vdp-datepicker__calendar {
+    width: 100%;
+    padding: 0.5rem;
+
+    .datetime-buttons {
+      height: 50px;
+
+      button {
+        padding: 0;
+        margin: 0.5rem;
+        height: 1.5rem;
+        border-radius: 2px;
+        background-color: $gray-600;
+        color: $gray-100;
+
+        &:not(:hover) {
+          box-shadow: none;
+        }
+
+        &:hover {
+          color: $purple-300;
+        }
+      }
+    }
+
+    header, .datetime-buttons {
+      min-height: 40px;
+      margin-top: -0.5rem;
+      margin-left: -0.5rem;
+      margin-right: -0.5rem;
+      background-color: $gray-700 !important;
+    }
+
+    .calendar-padding {
+      margin: 0.25rem;
+    }
+
+    &.picker_day {
+      .cell:not(.disabled) {
+        width: calc(100% / 7);
+        border-radius: 2px;
+        font-size: 14px;
+        line-height: 1.21;
+        text-align: center;
+        padding: 0.65rem 0.35rem;
+      }
+    }
+
+    .cell:not(.blank):not(.disabled).day:hover {
+      border-radius: 2px;
+      border: 1px solid $purple-400;
+    }
+
+    .cell.selected,
+    .cell.selected.highlighted,
+    .cell.selected:hover {
+      color: $white;
+      background: $purple-300;
+    }
+
+    .cell.highlighted {
+      background: rgba($purple-600, 0.25);
+      color: $purple-300;
+
+      font-weight: bold;
+    }
+
+    .cell.highlighted,
+    .cell.selected {
+      border-radius: 2px;
+      font-weight: bold;
+    }
+
+    .cell.day-header {
+      font-size: 12px;
+      font-weight: bold;
+      line-height: 1.33;
+      text-align: center;
+      color: $gray-100;
+    }
+
+    .month__year_btn, .day__month_btn {
+      font-size: 14px;
+      font-weight: bold;
+      text-align: center;
+      color: $gray-50;
+    }
+  }
+</style>
diff --git a/website/common/locales/en/tasks.json b/website/common/locales/en/tasks.json
index b2bd6b26cd..f6c87b9873 100644
--- a/website/common/locales/en/tasks.json
+++ b/website/common/locales/en/tasks.json
@@ -81,6 +81,7 @@
   "complete2": "Complete",
   "dated": "Dated",
   "today": "Today",
+  "tomorrow": "Tomorrow",
   "dueIn": "Due <%= dueIn %>",
   "due": "Due",
   "notDue": "Not Due",

From 8796dbd8b8c834ffb24647fab3aebfd99a5db108 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:25:31 +0200
Subject: [PATCH 05/16] build(deps): bump mongoose from 5.9.27 to 5.9.28
 (#12449)

Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.9.27 to 5.9.28.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.9.27...5.9.28)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fd360a4251..06f36d7732 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9391,9 +9391,9 @@
       }
     },
     "mongoose": {
-      "version": "5.9.27",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.27.tgz",
-      "integrity": "sha512-N8zj4pj9J2xJ2BnQ4NiIHEtmjPldtbmbEZOMz4phLTQr3KFWPR0T0I6EzQxNioHwmDbHD4VFzbEd755oD2SJxA==",
+      "version": "5.9.28",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.28.tgz",
+      "integrity": "sha512-A8lNRk4eCQDzk+DagSMYdH94LAYrbTK83LgrUlzqdig3YXvizW3DApJqOWQ5DdhuimvsfiD0Z5NTVzXl/rgi2w==",
       "requires": {
         "bson": "^1.1.4",
         "kareem": "2.3.1",
diff --git a/package.json b/package.json
index 963132caa5..a692ce5541 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "method-override": "^3.0.0",
     "moment": "^2.27.0",
     "moment-recur": "^1.0.7",
-    "mongoose": "^5.9.27",
+    "mongoose": "^5.9.28",
     "morgan": "^1.10.0",
     "nconf": "^0.10.0",
     "node-gcm": "^1.0.3",

From 2ff3c7326c439397d3586f76db935bfb439ec871 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:28:07 +0200
Subject: [PATCH 06/16] build(deps): bump csv-stringify from 5.5.0 to 5.5.1
 (#12451)

Bumps [csv-stringify](https://github.com/adaltas/node-csv-stringify) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/adaltas/node-csv-stringify/releases)
- [Changelog](https://github.com/adaltas/node-csv-stringify/blob/master/CHANGELOG.md)
- [Commits](https://github.com/adaltas/node-csv-stringify/compare/v5.5.0...v5.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 06f36d7732..998e58d0f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3951,9 +3951,9 @@
       }
     },
     "csv-stringify": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.5.0.tgz",
-      "integrity": "sha512-G05575DSO/9vFzQxZN+Srh30cNyHk0SM0ePyiTChMD5WVt7GMTVPBQf4rtgMF6mqhNCJUPw4pN8LDe8MF9EYOA=="
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.5.1.tgz",
+      "integrity": "sha512-HM0/86Ks8OwFbaYLd495tqTs1NhscZL52dC4ieKYumy8+nawQYC0xZ63w1NqLf0M148T2YLYqowoImc1giPn0g=="
     },
     "currently-unhandled": {
       "version": "0.4.1",
diff --git a/package.json b/package.json
index a692ce5541..fffdbe4e0a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "compression": "^1.7.4",
     "cookie-session": "^1.4.0",
     "coupon-code": "^0.4.5",
-    "csv-stringify": "^5.5.0",
+    "csv-stringify": "^5.5.1",
     "cwait": "^1.1.1",
     "domain-middleware": "~0.1.0",
     "eslint": "^6.8.0",

From 24afffc2ae782fa47bdb2f466564dff6be083a66 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:28:31 +0200
Subject: [PATCH 07/16] build(deps): bump @babel/core from 7.11.0 to 7.11.1
 (#12452)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.11.0 to 7.11.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.11.1/packages/babel-core)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 998e58d0f8..bbcdcd734e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,15 +23,15 @@
       }
     },
     "@babel/core": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.0.tgz",
-      "integrity": "sha512-mkLq8nwaXmDtFmRkQ8ED/eA2CnVw4zr7dCztKalZXBvdK5EeNUAesrrwUqjQEzFgomJssayzB0aqlOsP1vGLqg==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz",
+      "integrity": "sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/generator": "^7.11.0",
         "@babel/helper-module-transforms": "^7.11.0",
         "@babel/helpers": "^7.10.4",
-        "@babel/parser": "^7.11.0",
+        "@babel/parser": "^7.11.1",
         "@babel/template": "^7.10.4",
         "@babel/traverse": "^7.11.0",
         "@babel/types": "^7.11.0",
@@ -78,9 +78,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw=="
+          "version": "7.11.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
+          "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA=="
         },
         "@babel/traverse": {
           "version": "7.11.0",
diff --git a/package.json b/package.json
index fffdbe4e0a..9152bae27f 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "4.151.3",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@babel/core": "^7.11.0",
+    "@babel/core": "^7.11.1",
     "@babel/preset-env": "^7.11.0",
     "@babel/register": "^7.10.3",
     "@google-cloud/trace-agent": "^5.1.0",

From 5ed007190a588001e0e0414e8f8667cd481a21e7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:28:41 +0200
Subject: [PATCH 08/16] build(deps): bump got from 11.5.1 to 11.5.2 (#12454)

Bumps [got](https://github.com/sindresorhus/got) from 11.5.1 to 11.5.2.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v11.5.1...v11.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package-lock.json | 22 +++++++++++-----------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbcdcd734e..14c08819e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1153,6 +1153,11 @@
         "uuid": "^8.0.0"
       }
     },
+    "@sindresorhus/is": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.0.tgz",
+      "integrity": "sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ=="
+    },
     "@sinonjs/commons": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz",
@@ -6642,9 +6647,9 @@
       }
     },
     "got": {
-      "version": "11.5.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.5.1.tgz",
-      "integrity": "sha512-reQEZcEBMTGnujmQ+Wm97mJs/OK6INtO6HmLI+xt3+9CvnRwWjXutUvb2mqr+Ao4Lu05Rx6+udx9sOQAmExMxA==",
+      "version": "11.5.2",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.5.2.tgz",
+      "integrity": "sha512-yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww==",
       "requires": {
         "@sindresorhus/is": "^3.0.0",
         "@szmarczak/http-timer": "^4.0.5",
@@ -6659,11 +6664,6 @@
         "responselike": "^2.0.0"
       },
       "dependencies": {
-        "@sindresorhus/is": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.0.tgz",
-          "integrity": "sha512-n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ=="
-        },
         "@szmarczak/http-timer": {
           "version": "4.0.5",
           "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
@@ -6700,9 +6700,9 @@
           "integrity": "sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg=="
         },
         "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
           "requires": {
             "pump": "^3.0.0"
           }
diff --git a/package.json b/package.json
index 9152bae27f..767eec572b 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "express-basic-auth": "^1.1.5",
     "express-validator": "^5.2.0",
     "glob": "^7.1.6",
-    "got": "^11.5.0",
+    "got": "^11.5.2",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0",
     "gulp-imagemin": "^7.1.0",

From 8a548a6a4de097e201bf936578503001fbd89431 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:29:36 +0200
Subject: [PATCH 09/16] build(deps): bump bootstrap from 4.5.0 to 4.5.2 in
 /website/client (#12456)

Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.5.0 to 4.5.2.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.5.0...v4.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 6 +++---
 website/client/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 57343a7022..725854ad42 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -7148,9 +7148,9 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
     },
     "bootstrap": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz",
-      "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA=="
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.2.tgz",
+      "integrity": "sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A=="
     },
     "bootstrap-vue": {
       "version": "2.16.0",
diff --git a/website/client/package.json b/website/client/package.json
index 8df0f2d610..dc1583673c 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -28,7 +28,7 @@
     "axios": "^0.19.2",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
-    "bootstrap": "^4.5.0",
+    "bootstrap": "^4.5.2",
     "bootstrap-vue": "^2.16.0",
     "chai": "^4.1.2",
     "core-js": "^3.6.5",

From 7393ef5162396299682cf2b73cef075769ae04f3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:29:58 +0200
Subject: [PATCH 10/16] build(deps): bump vue-router from 3.3.4 to 3.4.2 in
 /website/client (#12457)

Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.3.4 to 3.4.2.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.3.4...v3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 6 +++---
 website/client/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 725854ad42..d482cf2fc2 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -19842,9 +19842,9 @@
       }
     },
     "vue-router": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
-      "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg=="
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.2.tgz",
+      "integrity": "sha512-n3Ok70hW0EpcJF4lcWIwSHAQbFTnIOLl/fhO8+oTs4jHNtBNsovcVvPZeTOyKEd8C3xF1Crft2ASuOiVT5K1mw=="
     },
     "vue-style-loader": {
       "version": "4.1.2",
diff --git a/website/client/package.json b/website/client/package.json
index dc1583673c..fe64c758af 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -56,7 +56,7 @@
     "vue": "^2.6.11",
     "vue-cli-plugin-storybook": "^0.6.1",
     "vue-mugen-scroll": "^0.2.6",
-    "vue-router": "^3.3.4",
+    "vue-router": "^3.4.2",
     "vue-template-compiler": "^2.6.11",
     "vuedraggable": "^2.24.0",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",

From 5b2b51e4f6c4c701b069ea378e6d5ebb8cb10e6f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:31:26 +0200
Subject: [PATCH 11/16] build(deps): bump superagent from 5.3.1 to 6.0.0
 (#12450)

Bumps [superagent](https://github.com/visionmedia/superagent) from 5.3.1 to 6.0.0.
- [Release notes](https://github.com/visionmedia/superagent/releases)
- [Changelog](https://github.com/visionmedia/superagent/blob/master/HISTORY.md)
- [Commits](https://github.com/visionmedia/superagent/compare/v5.3.1...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 14c08819e4..35d6d8d316 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12774,9 +12774,9 @@
       "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
     },
     "superagent": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
-      "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-6.0.0.tgz",
+      "integrity": "sha512-gBiyDSUR3zbYO8za+MudSNxMFSOhKcZfQ1Anya1DWzk9R32zl++cYUFHXzP3VnyvQO8h/1/uPPA9FUDDtE+qdA==",
       "requires": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.2",
diff --git a/package.json b/package.json
index 767eec572b..48b48de8b9 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "rimraf": "^3.0.2",
     "short-uuid": "^3.0.0",
     "stripe": "^7.15.0",
-    "superagent": "^5.3.1",
+    "superagent": "^6.0.0",
     "universal-analytics": "^0.4.23",
     "useragent": "^2.1.9",
     "uuid": "^8.3.0",

From d016c1fa0a6e90d6241c46c40d48ac4d04b37b4b Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Mon, 10 Aug 2020 16:20:29 +0200
Subject: [PATCH 12/16] Revert "build(deps): bump mongoose from 5.9.27 to
 5.9.28 (#12449)" (#12458)

This reverts commit 8796dbd8b8c834ffb24647fab3aebfd99a5db108.
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 35d6d8d316..8fc203e12a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9391,9 +9391,9 @@
       }
     },
     "mongoose": {
-      "version": "5.9.28",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.28.tgz",
-      "integrity": "sha512-A8lNRk4eCQDzk+DagSMYdH94LAYrbTK83LgrUlzqdig3YXvizW3DApJqOWQ5DdhuimvsfiD0Z5NTVzXl/rgi2w==",
+      "version": "5.9.27",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.27.tgz",
+      "integrity": "sha512-N8zj4pj9J2xJ2BnQ4NiIHEtmjPldtbmbEZOMz4phLTQr3KFWPR0T0I6EzQxNioHwmDbHD4VFzbEd755oD2SJxA==",
       "requires": {
         "bson": "^1.1.4",
         "kareem": "2.3.1",
diff --git a/package.json b/package.json
index 48b48de8b9..b2a6f8c7b1 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "method-override": "^3.0.0",
     "moment": "^2.27.0",
     "moment-recur": "^1.0.7",
-    "mongoose": "^5.9.28",
+    "mongoose": "^5.9.27",
     "morgan": "^1.10.0",
     "nconf": "^0.10.0",
     "node-gcm": "^1.0.3",

From 8c3a9c6dbc0460884fa2f6fa723b2b9feaa3c65f Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Mon, 10 Aug 2020 11:27:19 -0500
Subject: [PATCH 13/16] fix(teams): smol tweaks (#12443)

---
 .../client/src/components/tasks/approvalFooter.vue   |  4 +++-
 .../components/tasks/modal-controls/selectMulti.vue  | 12 +++++++++---
 website/client/src/components/tasks/taskModal.vue    |  3 ++-
 website/server/controllers/api-v3/tasks/groups.js    |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/website/client/src/components/tasks/approvalFooter.vue b/website/client/src/components/tasks/approvalFooter.vue
index 519adbffa5..c984247b1c 100644
--- a/website/client/src/components/tasks/approvalFooter.vue
+++ b/website/client/src/components/tasks/approvalFooter.vue
@@ -3,6 +3,8 @@
     <approval-modal :task="task" />
     <div
       class="claim-bottom-message d-flex align-items-center"
+      v-if="!(userIsAssigned && task.group.approval.approved
+        && !task.completed && task.type !== 'habit')"
     >
       <div
         class="mr-auto ml-2"
@@ -108,7 +110,7 @@ export default {
         assignedUsers.forEach(userId => {
           const index = findIndex(this.group.members, member => member._id === userId);
           const assignedMember = this.group.members[index];
-          assignedUsersNames.push(assignedMember.profile.name);
+          assignedUsersNames.push(`@${assignedMember.auth.local.username}`);
         });
       }
 
diff --git a/website/client/src/components/tasks/modal-controls/selectMulti.vue b/website/client/src/components/tasks/modal-controls/selectMulti.vue
index 7614f0ab9a..7d45f91c84 100644
--- a/website/client/src/components/tasks/modal-controls/selectMulti.vue
+++ b/website/client/src/components/tasks/modal-controls/selectMulti.vue
@@ -57,10 +57,16 @@ multi<template>
           ></div>
           <div
             v-if="item.challenge"
-            class="challenge"
+            class="addl-text"
           >
             {{ $t('challenge') }}
           </div>
+          <div
+            v-else-if="item.addlText"
+            class="addl-text"
+          >
+            {{ item.addlText }}
+          </div>
         </b-dropdown-item-button>
 
         <div
@@ -111,7 +117,7 @@ multi<template>
         flex: 1;
       }
 
-      .challenge {
+      .addl-text {
         height: 1rem;
         font-size: 12px;
         font-weight: normal;
@@ -128,7 +134,7 @@ multi<template>
       }
 
       &:hover {
-        .challenge {
+        .addl-text {
           color: $purple-300;
         }
       }
diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue
index a02e8ce078..4b68ca249a 100644
--- a/website/client/src/components/tasks/taskModal.vue
+++ b/website/client/src/components/tasks/taskModal.vue
@@ -1265,7 +1265,8 @@ export default {
         this.members.forEach(member => {
           this.membersNameAndId.push({
             id: member._id,
-            name: member.auth.local.username,
+            name: member.profile.name,
+            addlText: `@${member.auth.local.username}`,
           });
           this.memberNamesById[member._id] = member.profile.name;
         });
diff --git a/website/server/controllers/api-v3/tasks/groups.js b/website/server/controllers/api-v3/tasks/groups.js
index 4a3112f94b..0e059ec995 100644
--- a/website/server/controllers/api-v3/tasks/groups.js
+++ b/website/server/controllers/api-v3/tasks/groups.js
@@ -215,7 +215,7 @@ api.assignTask = {
 
     const promises = [];
     const taskText = task.text;
-    const userName = user.profile.name;
+    const userName = `@${user.auth.local.username}`;
 
     if (user._id === assignedUserId) {
       const managerIds = Object.keys(group.managers);

From d7ee1ec4f4e59ea34e87e79553a234fe921e8fb9 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Mon, 10 Aug 2020 18:38:24 +0200
Subject: [PATCH 14/16] remove modals stack (#12423)

---
 website/client/src/app.vue                    | 110 ------------------
 .../components/achievements/firstDrops.vue    |   2 +-
 .../components/challenges/challengeModal.vue  |   4 +-
 .../challenges/closeChallengeModal.vue        |   4 +-
 .../src/components/payments/buyGemsModal.vue  |  24 ++--
 .../components/payments/selectUserModal.vue   |   2 +-
 .../src/components/payments/sendGemsModal.vue |   2 +-
 .../src/components/payments/successModal.vue  |   2 +-
 website/client/src/pages/private-messages.vue |   4 +-
 9 files changed, 26 insertions(+), 128 deletions(-)

diff --git a/website/client/src/app.vue b/website/client/src/app.vue
index 5f9a888b35..97061e1fff 100644
--- a/website/client/src/app.vue
+++ b/website/client/src/app.vue
@@ -513,13 +513,9 @@ export default {
     } else {
       this.hideLoadingScreen();
     }
-
-    this.initializeModalStack();
   },
   beforeDestroy () {
     this.$root.$off('playSound');
-    this.$root.$off('bv::modal::hidden');
-    this.$root.$off('bv::show::modal');
     this.$root.$off('buyModal::showItem');
     this.$root.$off('selectMembersModal::showItem');
   },
@@ -549,112 +545,6 @@ export default {
       this.$store.dispatch('auth:logout', { redirectToLogin: true });
       return true;
     },
-    initializeModalStack () {
-      // Manage modals
-      this.$root.$on('bv::show::modal', (modalId, data = {}) => {
-        if (data.fromRoot) return;
-        const { modalStack } = this.$store.state;
-
-        this.trackGemPurchase(modalId, data);
-
-        // Add new modal to the stack
-        const prev = modalStack[modalStack.length - 1];
-        const prevId = prev ? prev.modalId : undefined;
-        modalStack.push({ modalId, prev: prevId });
-      });
-
-      this.$root.$on('bv::modal::hidden', bvEvent => {
-        let modalId = bvEvent.target && bvEvent.target.id;
-
-        // sometimes the target isn't passed to the hidden event, fallback is the vueTarget
-        if (!modalId) {
-          modalId = bvEvent.vueTarget && bvEvent.vueTarget.id;
-        }
-
-        if (!modalId) {
-          return;
-        }
-
-        const { modalStack } = this.$store.state;
-
-        const modalOnTop = modalStack[modalStack.length - 1];
-
-        // Check for invalid modal. Event systems can send multiples
-        if (!this.validStack(modalStack)) return;
-
-        // If we are moving forward
-        if (modalOnTop && modalOnTop.prev === modalId) return;
-
-        // Remove modal from stack
-        this.$store.state.modalStack.pop();
-
-        // Get previous modal
-        const modalBefore = modalOnTop ? modalOnTop.prev : undefined;
-
-        if (modalBefore) this.$root.$emit('bv::show::modal', modalBefore, { fromRoot: true });
-      });
-
-      // Dismiss modal aggressively. Pass a modal ID to remove a modal instance from the stack
-      // (both the stack entry itself and its "prev" reference) so we don't reopen it
-      this.$root.$on('habitica::dismiss-modal', oldModal => {
-        if (!oldModal) return;
-        this.$root.$emit('bv::hide::modal', oldModal);
-        let removeIndex = this.$store.state.modalStack
-          .map(modal => modal.modalId)
-          .indexOf(oldModal);
-        if (removeIndex >= 0) {
-          this.$store.state.modalStack.splice(removeIndex, 1);
-        }
-        removeIndex = this.$store.state.modalStack
-          .map(modal => modal.prev)
-          .indexOf(oldModal);
-        if (removeIndex >= 0) {
-          delete this.$store.state.modalStack[removeIndex].prev;
-        }
-      });
-    },
-    validStack (modalStack) {
-      const modalsThatCanShowTwice = ['profile'];
-      const modalCount = {};
-      const prevAndCurrent = 2;
-
-      for (const current of modalStack) {
-        if (!modalCount[current.modalId]) modalCount[current.modalId] = 0;
-        modalCount[current.modalId] += 1;
-        if (
-          modalCount[current.modalId] > prevAndCurrent
-          && modalsThatCanShowTwice.indexOf(current.modalId) === -1
-        ) {
-          this.$store.state.modalStack = [];
-          return false;
-        }
-
-        if (!current.prev) continue; // eslint-disable-line
-        if (!modalCount[current.prev]) modalCount[current.prev] = 0;
-        modalCount[current.prev] += 1;
-        if (
-          modalCount[current.prev] > prevAndCurrent
-          && modalsThatCanShowTwice.indexOf(current.prev) === -1
-        ) {
-          this.$store.state.modalStack = [];
-          return false;
-        }
-      }
-
-      return true;
-    },
-    trackGemPurchase (modalId, data) {
-      // Track opening of gems modal unless it's been already tracked
-      // For example the gems button in the menu already tracks the event by itself
-      if (modalId === 'buy-gems' && data.alreadyTracked !== true) {
-        Analytics.track({
-          hitType: 'event',
-          eventCategory: 'button',
-          eventAction: 'click',
-          eventLabel: 'Gems > Wallet',
-        });
-      }
-    },
     itemSelected (item) {
       this.selectedItemToBuy = item;
     },
diff --git a/website/client/src/components/achievements/firstDrops.vue b/website/client/src/components/achievements/firstDrops.vue
index 7aeb7f0569..4a340ef664 100644
--- a/website/client/src/components/achievements/firstDrops.vue
+++ b/website/client/src/components/achievements/firstDrops.vue
@@ -126,7 +126,7 @@ export default {
         egg: '',
         hatchingPotion: '',
       };
-      this.$root.$emit('habitica::dismiss-modal', 'first-drops');
+      this.$root.$emit('bv::hide::modal', 'first-drops');
     },
     toInventory () {
       this.$router.push('/inventory/items');
diff --git a/website/client/src/components/challenges/challengeModal.vue b/website/client/src/components/challenges/challengeModal.vue
index 2db570b114..282e9367c4 100644
--- a/website/client/src/components/challenges/challengeModal.vue
+++ b/website/client/src/components/challenges/challengeModal.vue
@@ -607,7 +607,7 @@ export default {
       this.$emit('createChallenge', challenge);
       this.resetWorkingChallenge();
 
-      this.$root.$emit('habitica::dismiss-modal', 'challenge-modal');
+      this.$root.$emit('bv::hide::modal', 'challenge-modal');
       this.$router.push(`/challenges/${challenge._id}`);
     },
     async updateChallenge () {
@@ -628,7 +628,7 @@ export default {
       const challenge = await this.$store.dispatch('challenges:updateChallenge', { challenge: challengeDetails });
       this.$emit('updatedChallenge', { challenge });
       this.resetWorkingChallenge();
-      this.$root.$emit('habitica::dismiss-modal', 'challenge-modal');
+      this.$root.$emit('bv::hide::modal', 'challenge-modal');
     },
     toggleCategorySelect () {
       this.showCategorySelect = !this.showCategorySelect;
diff --git a/website/client/src/components/challenges/closeChallengeModal.vue b/website/client/src/components/challenges/closeChallengeModal.vue
index f722797c3d..a7f43455bf 100644
--- a/website/client/src/components/challenges/closeChallengeModal.vue
+++ b/website/client/src/components/challenges/closeChallengeModal.vue
@@ -144,7 +144,7 @@ export default {
         challengeId: this.challengeId,
         winnerId: this.winner._id,
       });
-      this.$root.$emit('habitica::dismiss-modal', 'close-challenge-modal');
+      this.$root.$emit('bv::hide::modal', 'close-challenge-modal');
       this.$router.push('/challenges/myChallenges');
     },
     async deleteChallenge () {
@@ -153,7 +153,7 @@ export default {
         challengeId: this.challengeId,
         prize: this.prize,
       });
-      this.$root.$emit('habitica::dismiss-modal', 'close-challenge-modal');
+      this.$root.$emit('bv::hide::modal', 'close-challenge-modal');
       this.$router.push('/challenges/myChallenges');
     },
   },
diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue
index 6aea148462..fa1ab47486 100644
--- a/website/client/src/components/payments/buyGemsModal.vue
+++ b/website/client/src/components/payments/buyGemsModal.vue
@@ -295,6 +295,7 @@
 </style>
 
 <script>
+import * as Analytics from '@/libs/analytics';
 import { mapState } from '@/libs/store';
 import markdown from '@/directives/markdown';
 import planGemLimits from '@/../../common/script/libs/planGemLimits';
@@ -305,10 +306,7 @@ import creditCardIcon from '@/assets/svg/credit-card-icon.svg';
 import heart from '@/assets/svg/health.svg';
 import logo from '@/assets/svg/habitica-logo.svg';
 
-import fourGems from '@/assets/svg/4-gems.svg';
 import twentyOneGems from '@/assets/svg/21-gems.svg';
-import fortyTwoGems from '@/assets/svg/42-gems.svg';
-import eightyFourGems from '@/assets/svg/84-gems.svg';
 
 import amazonButton from '@/components/payments/amazonButton';
 
@@ -326,16 +324,12 @@ export default {
         logo,
         check: checkIcon,
         creditCardIcon,
-        fourGems,
         heart,
         twentyOneGems,
-        fortyTwoGems,
-        eightyFourGems,
       }),
       gemAmount: 0,
-      subscriptionPlan: '',
-      selectedPage: 'subscribe',
       planGemLimits,
+      alreadyTracked: false,
     };
   },
   computed: {
@@ -349,6 +343,20 @@ export default {
         >= (this.user.purchased.plan.consecutive.gemCapExtra + this.planGemLimits.convCap);
     },
   },
+  mounted () {
+    this.$root.$on('bv::show::modal', (modalId, data = {}) => {
+      // Track opening of gems modal unless it's been already tracked
+      // For example the gems button in the menu already tracks the event by itself
+      if (modalId === 'buy-gems' && data.alreadyTracked !== true) {
+        Analytics.track({
+          hitType: 'event',
+          eventCategory: 'button',
+          eventAction: 'click',
+          eventLabel: 'Gems > Wallet',
+        });
+      }
+    });
+  },
   methods: {
     close () {
       this.$root.$emit('bv::hide::modal', 'buy-gems');
diff --git a/website/client/src/components/payments/selectUserModal.vue b/website/client/src/components/payments/selectUserModal.vue
index 1947436c0e..dfb42a60ac 100644
--- a/website/client/src/components/payments/selectUserModal.vue
+++ b/website/client/src/components/payments/selectUserModal.vue
@@ -177,7 +177,7 @@ export default {
   },
   methods: {
     close () {
-      this.$root.$emit('habitica::dismiss-modal', 'select-user-modal');
+      this.$root.$emit('bv::hide::modal', 'select-user-modal');
     },
     searchUser: debounce(async function userSearch (searchTerm) {
       this.foundUser = {};
diff --git a/website/client/src/components/payments/sendGemsModal.vue b/website/client/src/components/payments/sendGemsModal.vue
index 0ebd99f380..d8d5a5054a 100644
--- a/website/client/src/components/payments/sendGemsModal.vue
+++ b/website/client/src/components/payments/sendGemsModal.vue
@@ -296,7 +296,7 @@ export default {
       this.sendingInProgress = false;
     },
     close () {
-      this.$root.$emit('habitica::dismiss-modal', 'send-gems');
+      this.$root.$emit('bv::hide::modal', 'send-gems');
     },
   },
 };
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 46e6097f7b..f460404aed 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -244,7 +244,7 @@ export default {
   methods: {
     close () {
       this.paymentData = {};
-      this.$root.$emit('habitica::dismiss-modal', 'payments-success-modal');
+      this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
   },
 };
diff --git a/website/client/src/pages/private-messages.vue b/website/client/src/pages/private-messages.vue
index a0b31391b3..fc973c4e86 100644
--- a/website/client/src/pages/private-messages.vue
+++ b/website/client/src/pages/private-messages.vue
@@ -644,8 +644,8 @@ export default {
     await this.reload();
 
     // close members modal if the Private Messages page is opened in an existing tab
-    this.$root.$emit('habitica::dismiss-modal', 'profile');
-    this.$root.$emit('habitica::dismiss-modal', 'members-modal');
+    this.$root.$emit('bv::hide::modal', 'profile');
+    this.$root.$emit('bv::hide::modal', 'members-modal');
 
     const data = this.$store.state.privateMessageOptions;
     if (data && data.userIdToMessage) {

From 5d169d477a4caecf83881c2ee8e110531574bb44 Mon Sep 17 00:00:00 2001
From: Scott <31902527+Scottd125@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:38:56 +0200
Subject: [PATCH 15/16] Added bannedWordsAllowed attribute to Group attributes
 (Partial fix for #12405) (#12440)

* Added bannedWordsAllowed attribute to Group attributes

Added an optional Boolean attribute which will determine if banned words are allowed

* Added bannedWordsAllowed attribute to non-settable fields
---
 website/server/models/group.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/website/server/models/group.js b/website/server/models/group.js
index 8223df0743..7d764c1fdb 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -85,6 +85,7 @@ export const schema = new Schema({
     $type: String, enum: ['private', 'public'], default: 'private', required: true,
   },
   chat: Array, // Used for backward compatibility, but messages aren't stored here
+  bannedWordsAllowed: { $type: Boolean, required: false },
   leaderOnly: { // restrict group actions to leader (members can't do them)
     challenges: { $type: Boolean, default: false, required: true },
     // invites: {$type: Boolean, default: false, required: true},
@@ -150,7 +151,7 @@ export const schema = new Schema({
 });
 
 schema.plugin(baseModel, {
-  noSet: ['_id', 'balance', 'quest', 'memberCount', 'chat', 'challengeCount', 'tasksOrder', 'purchased', 'managers'],
+  noSet: ['_id', 'balance', 'quest', 'memberCount', 'chat', 'bannedWordsAllowed', 'challengeCount', 'tasksOrder', 'purchased', 'managers'],
   private: ['purchased.plan'],
   toJSONTransform (plainObj, originalDoc) {
     if (plainObj.purchased) plainObj.purchased.active = originalDoc.hasActiveGroupPlan();

From bce138f9c2afc1cf96638b0f8b94431649b594d3 Mon Sep 17 00:00:00 2001
From: Melior <admin@habitica.com>
Date: Tue, 11 Aug 2020 05:10:44 +0200
Subject: [PATCH 16/16] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (702 of 702 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/

Translated using Weblate (Japanese)

Currently translated at 90.4% (1923 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/

Translated using Weblate (Czech)

Currently translated at 86.7% (1843 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (251 of 251 strings)

Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hans/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2125 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/

Translated using Weblate (Filipino)

Currently translated at 80.0% (1701 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fil/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2125 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/

Translated using Weblate (Czech)

Currently translated at 86.3% (1834 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (702 of 702 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/

Translated using Weblate (Korean)

Currently translated at 80.9% (51 of 63 strings)

Translation: Habitica/Defaulttasks
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/ko/

Translated using Weblate (Korean)

Currently translated at 95.2% (343 of 360 strings)

Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/ko/

Translated using Weblate (Korean)

Currently translated at 88.8% (192 of 216 strings)

Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/ko/

Translated using Weblate (Czech)

Currently translated at 85.8% (1824 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/

Translated using Weblate (Czech)

Currently translated at 85.7% (1823 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/

Translated using Weblate (Czech)

Currently translated at 98.6% (213 of 216 strings)

Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/cs/

Translated using Weblate (Czech)

Currently translated at 85.4% (1816 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/

Translated using Weblate (Italian)

Currently translated at 100.0% (173 of 173 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/it/

Translated using Weblate (Italian)

Currently translated at 100.0% (8 of 8 strings)

Translation: Habitica/Overview
Translate-URL: https://translate.habitica.com/projects/habitica/overview/it/

Translated using Weblate (Italian)

Currently translated at 100.0% (493 of 493 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/it/

Translated using Weblate (Italian)

Currently translated at 100.0% (328 of 328 strings)

Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/it/

Translated using Weblate (Italian)

Currently translated at 100.0% (124 of 124 strings)

Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/it/

Translated using Weblate (Italian)

Currently translated at 100.0% (212 of 212 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/it/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2125 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (702 of 702 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/

Translated using Weblate (Czech)

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/cs/

Translated using Weblate (Czech)

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/cs/

Translated using Weblate (Czech)

Currently translated at 91.0% (51 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/cs/

Translated using Weblate (Polish)

Currently translated at 100.0% (251 of 251 strings)

Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pl/

Translated using Weblate (Japanese)

Currently translated at 100.0% (67 of 67 strings)

Translation: Habitica/Messages
Translate-URL: https://translate.habitica.com/projects/habitica/messages/ja/

Translated using Weblate (Polish)

Currently translated at 99.4% (497 of 500 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pl/

Translated using Weblate (Japanese)

Currently translated at 99.8% (499 of 500 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/

Translated using Weblate (Polish)

Currently translated at 81.5% (1732 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pl/

Translated using Weblate (Japanese)

Currently translated at 90.4% (1921 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/

Translated using Weblate (Polish)

Currently translated at 100.0% (124 of 124 strings)

Translation: Habitica/Communityguidelines
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pl/

Translated using Weblate (Polish)

Currently translated at 100.0% (86 of 86 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pl/

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (140 of 140 strings)

Translation: Habitica/Quests
Translate-URL: https://translate.habitica.com/projects/habitica/quests/vi/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (702 of 702 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2125 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2125 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/

Translated using Weblate (Czech)

Currently translated at 100.0% (328 of 328 strings)

Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/cs/

Translated using Weblate (Czech)

Currently translated at 91.0% (51 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/cs/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2125 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/

Translated using Weblate (Japanese)

Currently translated at 90.3% (1919 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (702 of 702 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (702 of 702 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/

Translated using Weblate (Dutch)

Currently translated at 100.0% (2125 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/

Translated using Weblate (Japanese)

Currently translated at 90.1% (1915 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (298 of 298 strings)

Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt_BR/

Translated using Weblate (Czech)

Currently translated at 85.4% (1815 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/

Translated using Weblate (Czech)

Currently translated at 87.5% (49 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/cs/

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (216 of 216 strings)

Translation: Habitica/Tasks
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/vi/

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (251 of 251 strings)

Translation: Habitica/Subscriber
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/vi/

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (86 of 86 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/vi/

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (500 of 500 strings)

Translation: Habitica/Groups
Translate-URL: https://translate.habitica.com/projects/habitica/groups/vi/

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (702 of 702 strings)

Translation: Habitica/Questscontent
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/

Translated using Weblate (Dutch)

Currently translated at 100.0% (146 of 146 strings)

Translation: Habitica/Pets
Translate-URL: https://translate.habitica.com/projects/habitica/pets/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (31 of 31 strings)

Translation: Habitica/Maintenance
Translate-URL: https://translate.habitica.com/projects/habitica/maintenance/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (31 of 31 strings)

Translation: Habitica/Maintenance
Translate-URL: https://translate.habitica.com/projects/habitica/maintenance/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (2125 of 2125 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (56 of 56 strings)

Translation: Habitica/Faq
Translate-URL: https://translate.habitica.com/projects/habitica/faq/nl/
---
 website/common/locales/cs/faq.json            |  34 +--
 website/common/locales/cs/front.json          |  10 +-
 website/common/locales/cs/gear.json           |  38 +++-
 website/common/locales/cs/tasks.json          |   6 +-
 website/common/locales/fil/gear.json          |   4 +-
 .../locales/it/communityguidelines.json       |   2 +-
 website/common/locales/it/front.json          |   2 +-
 website/common/locales/it/groups.json         |   2 +-
 website/common/locales/it/npc.json            |   2 +-
 website/common/locales/it/overview.json       |   4 +-
 website/common/locales/it/settings.json       |   6 +-
 website/common/locales/ja/gear.json           |  14 +-
 website/common/locales/ja/groups.json         |   2 +-
 website/common/locales/ja/messages.json       |   2 +-
 website/common/locales/ko/content.json        | 205 ++++++++++--------
 website/common/locales/ko/defaulttasks.json   |  16 +-
 website/common/locales/ko/tasks.json          |  23 +-
 website/common/locales/nl/faq.json            |  12 +-
 website/common/locales/nl/gear.json           |  16 +-
 website/common/locales/nl/maintenance.json    |  22 +-
 website/common/locales/nl/pets.json           |   5 +-
 website/common/locales/pl/achievements.json   |   5 +-
 .../locales/pl/communityguidelines.json       |   2 +-
 website/common/locales/pl/gear.json           |   6 +-
 website/common/locales/pl/groups.json         |  10 +-
 website/common/locales/pl/subscriber.json     |   3 +-
 website/common/locales/pt_BR/gear.json        |   4 +-
 website/common/locales/pt_BR/generic.json     |   6 +-
 website/common/locales/vi/achievements.json   |   5 +-
 website/common/locales/vi/groups.json         |  13 +-
 website/common/locales/vi/quests.json         |  19 +-
 website/common/locales/vi/subscriber.json     |   3 +-
 website/common/locales/vi/tasks.json          |   5 +-
 website/common/locales/zh/gear.json           |  14 +-
 website/common/locales/zh/questscontent.json  |  30 +--
 website/common/locales/zh/subscriber.json     |   2 +-
 36 files changed, 336 insertions(+), 218 deletions(-)

diff --git a/website/common/locales/cs/faq.json b/website/common/locales/cs/faq.json
index af610e2f8c..ca749ab714 100644
--- a/website/common/locales/cs/faq.json
+++ b/website/common/locales/cs/faq.json
@@ -5,13 +5,13 @@
     "androidFaqAnswer0": "Nejprve si nastavíš úkoly, které chceš dělat v každodenním životě. Poté, zatímco budeš plnit své úkoly v reálném životě a odškrtávat si je, budeš dostávat zkušenosti a zlato. Zlato můžeš použít na nákup vybavení a i nějakých položek v obchodě, ale také na své vlastní odměny. Zkušenosti způsobují to, že se tvoje postava dostane na další úroveň (level) a tím se ti postupně odemyká další obsah jako domácí mazlíčci, dovednosti a úkoly. Můžeš si svoji postavu upravit pod Menu > [Inventář] > [Avatar].\n\nNěkteré základní způsoby interakce: klikni na (+) v pravém dolním rohu pro přidání nového úkolu. Klikni na již vytvořený úkol pro jeho úpravu a přejeď prstem doleva na úkolu pro jeho odstranění. Můžeš si úkoly seřadit za použití Štítků v pravém horním rohu a rozbalit či zabalit seznamy tím, že klikneš na počítadlo seznamu.",
     "webFaqAnswer0": "Nejprve si zadáš nějaký úkol, který chceš splnit v reálném životě. Až ho splníš a odškrtneš, dostaneš Zkušenostní body a zlato. Zlato se používá na nákup vybavení nebo jiných předmětů a vlastních odměn. Díky zkušenosti budeš získávat vyšší a vyšší úrovně a odemykat obsah, jakým jsou třeba Mazlíčci, Dovednosti, nebo Výpravy! Pro více informací se podívej na přehled krok-za-krokem v [Nápověda -> Přehled pro nové uživatele] (https://habitica.com/static/overview).",
     "faqQuestion1": "Jak si přidám úkoly?",
-    "iosFaqAnswer1": "Dobré zvyky (ty s +), jsou věci, které můžeš plnit kolikrát chceš, například jedení zeleniny. Zlozvyky (ty s -) jsou věci, kterým se chceš vyhnout, třeba kousání nehtů. Zvyky s + a - jsou takové věci, kde můžeš udělat dobré či špatné rozhodnutí, jako třeba když jdeš po schodech vs. jízda výtahem. Dobré zvyky tě za splnění odmění Zkušenostmi a zlatem. Zlozvyky ti uberou Zdraví.\n\nDenní úkoly jsou věci, které musíš dělat každý den, jako třeba čištění zubů nebo kontrola emailu. Můžeš si nastavit ve které dny máš plnit které denní úkoly tak, že na ně ťukneš. Pokud naplánovaný Denní úkol nesplníš, odečte se ti přes noc Zdraví. Dávej pozor, aby sis nepřidal moc Denních úkolů najednou!\n\nÚkolníček obsahuje tvoje naplánované úkoly. Když je splníš, přinesou ti Zkušenost a zlato. Za nesplněné úkoly v Úkolníčku nikdy neztratíš Zdraví. Můžeš jim přiřadit datum splnění tím, že na ně ťukneš.",
-    "androidFaqAnswer1": "Dobré zvyky (ty s +), jsou věci, které můžeš plnit kolikrát chceš, například jedení zeleniny. Zlozvyky (ty s -) jsou věci, kterým se chceš vyhnout, třeba kousání nehtů. Zvyky s + a - jsou takové věci, kde můžeš udělat dobré či špatné rozhodnutí, jako třeba když jdeš po schodech vs. jízda výtahem. Dobré zvyky tě za splnění odmění Zkušenostmi a zlatem. Zlozvyky ti uberou Zdraví.\n\nDenní úkoly jsou věci, které musíš dělat každý den, jako třeba čištění zubů nebo kontrola emailu. Můžeš si nastavit ve které dny máš plnit které denní úkoly tak, že na ně ťukneš. Pokud naplánovaný Denní úkol nesplníš, odečte se ti přes noc Zdraví. Dávej pozor, aby sis nepřidal moc Denních úkolů najednou!\n\nÚkolníček obsahuje tvoje naplánované úkoly. Když je splníš, přinesou ti Zkušenost a zlato. Za nesplněné úkoly v Úkolníčku nikdy neztratíš Zdraví. Můžeš jim přiřadit datum splnění tím, že na ně ťukneš.",
-    "webFaqAnswer1": "* Dobré zvyky (ty s +), jsou věci, které můžeš plnit kolikrát chceš, například jedení zeleniny. Zlozvyky (ty s -) jsou věci, kterým se chceš vyhnout, třeba kousání nehtů. Zvyky s + a - jsou takové věci, kde můžeš udělat dobré či špatné rozhodnutí, jako třeba když jdeš po schodech vs. jízda výtahem. Dobré zvyky tě za splnění odmění Zkušenostmi a zlatem. Zlozvyky ti uberou Zdraví.\n* Denní úkoly jsou věci, které musíš dělat každý den, jako třeba čištění zubů nebo kontrola emailu. Můžeš si nastavit ve které dny máš plnit které denní úkoly tak, že klikneš na ikonku tužky pro úpravu.. Pokud naplánovaný Denní úkol nesplníš, odečte se ti přes noc Zdraví. Dávej pozor, aby sis nepřidal moc Denních úkolů najednou!\n* Úkolníček obsahuje tvoje naplánované úkoly. Když je splníš, přinesou ti Zkušenost a zlato. Za nesplněné úkoly v Úkolníčku nikdy neztratíš Zdraví. Můžeš jim přiřadit datum splnění tím, že klikneš na ikonku tužky pro úpravu.",
+    "iosFaqAnswer1": "Dobré zvyky (ty s +), jsou takové, které můžeš plnit kolikrát chceš, například jedení zeleniny. Zlozvyky (ty s -) jsou ty, kterým se chceš vyhnout, třeba kousání nehtů. Zvyky s + a - jsou takové věci, kde můžeš udělat dobré či špatné rozhodnutí, jako třeba když jdeš po schodech vs. jízda výtahem. Dobré zvyky tě za splnění odmění zkušenostmi a zlatem. Zlozvyky ti uberou zdraví.\n\nDenní úkoly jsou věci, které musíš dělat každý den, jako třeba čištění zubů nebo kontrola emailu. Můžeš si nastavit ve které dny máš plnit které denní úkoly tak, že na ně ťukneš. Pokud naplánovaný denní úkol nesplníš, tvoje postava bude přes noc zraněna. Dávej pozor, aby sis nepřidal moc denních úkolů najednou!\n\nÚkolníček obsahuje tvoje naplánované úkoly. Když je splníš, přinesou ti zlato a zkušenosti. Za nesplněné úkoly v úkolníčku nikdy neztratíš zdraví. Můžeš jim přiřadit datum splnění tím, že na ně ťukneš.",
+    "androidFaqAnswer1": "Dobré zvyky (ty s +), jsou takové, které můžeš plnit kolikrát chceš, například jedení zeleniny. Zlozvyky (ty s -) jsou ty, kterým se chceš vyhnout, třeba kousání nehtů. Zvyky s + a - jsou takové věci, kde můžeš udělat dobré či špatné rozhodnutí, jako třeba když jdeš po schodech vs. jízda výtahem. Dobré zvyky tě za splnění odmění zkušenostmi a zlatem. Zlozvyky ti uberou zdraví.\n\nDenní úkoly jsou věci, které musíš dělat každý den, jako třeba čištění zubů nebo kontrola emailu. Můžeš si nastavit ve které dny máš plnit které denní úkoly tak, že na ně ťukneš. Pokud naplánovaný denní úkol nesplníš, tvoje postava bude přes noc zraněna. Dávej pozor, aby sis nepřidal moc denních úkolů najednou!\n\nÚkolníček obsahuje tvoje naplánované úkoly. Když je splníš, přinesou ti zlato a zkušenosti. Za nesplněné úkoly v úkolníčku nikdy neztratíš zdraví. Můžeš jim přiřadit datum splnění tím, že na ně ťukneš.",
+    "webFaqAnswer1": "* Dobré zvyky (ty s :heavy_plus_sign:), jsou takové, které můžeš plnit kolikrát chceš, například jedení zeleniny. Zlozvyky (ty s :heavy_minus_sign:) jsou ty, kterým se chceš vyhnout, třeba kousání nehtů. Zvyky s + a - jsou takové věci, kde můžeš udělat dobré či špatné rozhodnutí, jako třeba když jdeš po schodech vs. jízda výtahem. Dobré zvyky tě za splnění odmění zkušenostmi a zlatem. Zlozvyky ti uberou zdraví.\n* Denní úkoly jsou věci, které musíš dělat každý den, jako třeba čištění zubů nebo kontrola emailu. Můžeš si nastavit ve které dny máš plnit které denní úkoly tak, že na ně ťukneš. Pokud naplánovaný denní úkol nesplníš, tvoje postava bude přes noc zraněna. Dávej pozor, aby sis nepřidal moc denních úkolů najednou!\n* Úkolníček obsahuje tvoje naplánované úkoly. Když je splníš, přinesou ti zlato a zkušenosti. Za nesplněné úkoly v úkolníčku nikdy neztratíš zdraví. Můžeš jim přiřadit datum splnění tím, že na ně ťukneš.",
     "faqQuestion2": "Co jsou ukázkové úkoly?",
-    "iosFaqAnswer2": "Wiki má čtyři seznamy ukázkových úkolů, kterými se můžeš inspirovat:\n<br><br>\n* [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n* [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n* [Sample To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-    "androidFaqAnswer2": "Habitica wiki má čtyři seznamy ukázkových úkolů pro inspiraci:\n<br><br>\n * [Ukázkové zvyky](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Ukázkové Denní úkoly](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Ukázkové úkoly(http://habitica.fandom.com/wiki/Sample_To-Dos)\n * [Ukázkové vlastní odměny](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-    "webFaqAnswer2": "Wiki má čtyři seznamy ukázkových úkolů, kterými se můžeš inspirovat:\n [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n* [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n* [Sample To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "iosFaqAnswer2": "Wiki má čtyři seznamy příkladů úkolů, kterými se můžeš inspirovat:\n<br><br>\n* [Ukázky návyků](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Ukázky denních úkolů](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Ukázky úkolníčku](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Ukázky vlastních odměn](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "androidFaqAnswer2": "Wiki má čtyři seznamy příkladů úkolů, kterými se můžeš inspirovat:\n<br><br>\n* [Ukázky návyků](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Ukázky denních úkolů](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Ukázky úkolníčku](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Ukázky vlastních odměn](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "webFaqAnswer2": "Wiki má čtyři seznamy příkladů úkolů, kterými se můžeš inspirovat:\n* [Ukázky návyků](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Ukázky denních úkolů](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Ukázky úkolníčku](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Ukázky vlastních odměn](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
     "faqQuestion3": "Proč moje úkoly mění barvu?",
     "iosFaqAnswer3": "Tvé úkoly mění barvu v závislosti na tom, jak dobře si v nich vedeš! Každý nový úkol začíná na neutrální žluté. Plň Denní úkoly a Zvyky často a začnou modrat. Když nesplníš Denní úkol nebo se poddáš zlozvyku, začnou tvé úkoly červenat. Čím červenější úkol bude, tím více odměn za něj získáš, ale pokud to je Denní úkol nebo Zvyk, tak tím více ti ublíží! Tento systém tě pomáhá motivovat a plnit úkoly, se kterými máš problém.",
     "androidFaqAnswer3": "Tvé úkoly mění barvu v závislosti na tom, jak dobře si v nich vedeš! Každý nový úkol začíná na neutrální žluté. Plň Denní úkoly a Zvyky často a začnou modrat. Když nesplníš Denní úkol nebo se poddáš zlozvyku, začnou tvé úkoly červenat. Čím červenější úkol bude, tím více odměn za něj získáš, ale pokud to je Denní úkol nebo Zvyk, tak tím více ti ublíží! Tento systém tě pomáhá motivovat a plnit úkoly, se kterými máš problém.",
@@ -25,17 +25,17 @@
     "androidFaqAnswer5": "Nejlepším způsobem je pozvat je do družiny s tebou! Družiny mohou chodit na výpravy, bojovat s příšerami, a sesílat kouzla a schopnosti pro vzájemnou podporu. Jdi na [stránka] (https://habitica.com/) pro vytvoření nové družiny, pokud žádnou již nemáš. Můžete se také spolu přidat do cechu (Komunita > Cechy). Cechy jsou chatovací místnosti se zaměřením na společný zájem, nebo na honbu za společným cílem, a mohou být veřejné i soukromé. Můžeš se přidat ke kolika cechům jen chceš, ale můžeš se přidat pouze do jedné družiny.\n\nPro více detailnější info, koukni na naše wiki stránky na [Parties / Družiny](http://habitica.fandom.com/wiki/Party) a [Guilds / Cechy](http://habitica.fandom.com/wiki/Guilds).",
     "webFaqAnswer5": "The best way is to invite them to a Party with you by clicking \"Party\" in the navigation bar! Parties can go on quests, battle monsters, and cast skills to support each other. You can also join Guilds together (click on \"Guilds\" in the navigation bar). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many Guilds as you'd like, but only one Party. For more detailed info, check out the wiki pages on [Parties](http://habitica.fandom.com/wiki/Party) and [Guilds](http://habitica.fandom.com/wiki/Guilds).",
     "faqQuestion6": "Jak získám Mazlíčka nebo Zvíře?",
-    "iosFaqAnswer6": "Ve 3. úrovni odemkneš systém nálezů. Pokaždé, když splní úkol, naskytne se ti náhodná šance nalézt vejce, líhnoucí lektvar, nebo jídlo. Budou se ti ukládat v Menu > Předměty.\n\nAbys mohl vylíhnout mazlíčka, musíš mít vejce a líhnoucí lektvar. Ťukni na vejce, aby bylo jasné, kterého mazlíčka chceš vylíhnout, a vyber \"Vylíhnout vejce\". Poté si vyber líhnoucí lektvar a tím zvolíš bravu mazlíčka! Jdi do Menu > Mazlíčci a kliknutím můžeš svého mazlíčka přidat ke své postavě.\n\nTaké můžeš z mazlíčků vykrmit Zvířata v Menu > Mazlíčci. Ťukni na mazlíčka a poté vyber \"Nakrmit mazlíčka!\" Budeš ho muset nakrmit několikrát, aby vyrostl ve velké zvíře, ale když zjistíš, které jídlo mu chutná, poroste rychleji. Zkus metodu pokus a omyl, nebo [použij tenhle tahák](http://habitica.fandom.com/wiki/Food#Food_Preferences).  Jakmile zvíře vykrmíš, jdi do Menu > Zvířata a ťuknutím si ho tvoje postava osedlá.\n\nTaké můžeš získat vejce z výprav po jejich dokončení. (O výpravách více níže.)",
-    "androidFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored in Menu > Items.\n\n To hatch a Pet, you'll need an egg and a hatching potion. Tap on the egg to determine the species you want to hatch, and select \"Hatch with potion.\" Then choose a hatching potion to determine its color! To equip your new Pet, go to Menu > Stable > Pets, select a species, click on the desired Pet, and select \"Use\"(Your avatar doesn't update to reflect the change). \n\n You can also grow your Pets into Mounts by feeding them under Menu > Stable [ > Pets ]. Tap on a Pet, and then select \"Feed\"! You'll have to feed a pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.fandom.com/wiki/Food#Food_Preferences). To equip your Mount, go to Menu > Stable > Mounts, select a species, click on the desired Mount, and select \"Use\"(Your avatar doesn't update to reflect the change).\n\n You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
-    "webFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored under Inventory > Items. To hatch a Pet, you'll need an egg and a hatching potion. Once you have both an egg and a potion, go to Inventory > Stable to hatch your pet by clicking on its image. Once you've hatched a pet, you can equip it by clicking on it. You can also grow your Pets into Mounts by feeding them under Inventory > Stable. Drag a piece of food from the action bar at the bottom of the screen and drop it on a pet to feed it! You'll have to feed a Pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.fandom.com/wiki/Food#Food_Preferences). Once you have a Mount, click on it to equip it to your avatar. You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
+    "iosFaqAnswer6": "Pokaždé, když splní úkol, naskytne se ti náhodná šance nalézt vejce, líhnoucí lektvar, nebo jídlo. Budou se ti ukládat v Menu > Předměty.\n\nAbys mohl vylíhnout mazlíčka, musíš mít vejce a líhnoucí lektvar. Ťukni na vejce, aby bylo jasné, kterého mazlíčka chceš vylíhnout, a vyber \"Vylíhnout vejce\". Poté si vyber líhnoucí lektvar a tím zvolíš barvu mazlíčka! Jdi do Menu > Mazlíčci a kliknutím můžeš svého mazlíčka přidat ke své postavě.\n\nTaké můžeš z mazlíčků vykrmit Zvířata v Menu > Mazlíčci. Ťukni na mazlíčka a poté vyber \"Nakrmit mazlíčka!\" Budeš ho muset nakrmit několikrát, aby vyrostl ve velké zvíře, ale když zjistíš, které jídlo mu chutná, poroste rychleji. Zkus metodu pokus a omyl, nebo [použij tenhle tahák](http://habitica.fandom.com/wiki/Food#Food_Preferences). Jakmile zvíře vykrmíš, jdi do Menu > Zvířata a ťuknutím si ho tvoje postava osedlá.\n\nTaké můžeš získat vejce z výprav po jejich dokončení. (O výpravách více níže.)",
+    "androidFaqAnswer6": "Pokaždé, když splní úkol, naskytne se ti náhodná šance nalézt vejce, líhnoucí lektvar, nebo jídlo. Budou se ti ukládat v Menu > Předměty.\n\nAbys mohl vylíhnout mazlíčka, musíš mít vejce a líhnoucí lektvar. Ťukni na vejce, aby bylo jasné, kterého mazlíčka chceš vylíhnout, a vyber \"Vylíhnout vejce\". Poté si vyber líhnoucí lektvar a tím zvolíš barvu mazlíčka! Jdi do Menu > Mazlíčci a kliknutím můžeš svého mazlíčka přidat ke své postavě.\n\nTaké můžeš z mazlíčků vykrmit Zvířata v Menu > Mazlíčci. Ťukni na mazlíčka a poté vyber \"Nakrmit mazlíčka!\" Budeš ho muset nakrmit několikrát, aby vyrostl ve velké zvíře, ale když zjistíš, které jídlo mu chutná, poroste rychleji. Zkus metodu pokus a omyl, nebo [použij tenhle tahák](https://habitica.fandom.com/wiki/Food#Food_Preferences). Jakmile zvíře vykrmíš, jdi do Menu > Zvířata a ťuknutím si ho tvoje postava osedlá.\n\nTaké můžeš získat vejce z výprav po jejich dokončení. (O výpravách více níže.)",
+    "webFaqAnswer6": "Pokaždé, když splníš úkol, máš náhodnou šanci získat vajíčko, líhnoucí lektvar, nebo kus jídla pro mazlíčky. Budou uloženy ve tvém Inventáři > Předměty. Aby se mazlíček vylíhnul, potřebuješ vejce a líhnoucí lektvar. Ve chvíli, kdy máš obojí, vejce a líhnoucí lektvar, přesuň se do Inventáře > Stáje a klikni na obrázek mazlíčka, aby se vylíhnul. Poté, co se mazlíček vylíhnul, ho můžeš vybavit tím, že na něj klikneš. Taky můžeš ze svých mazlíčků udělat zvířata, tím že je nakrmíš v Inventář > Stáj. Potáhni kus jídla z akční lišty ve spodní části obrazovky na mazlíčka, abys ho nakrmil! Budeš muset svého mazlíčka několikrát nakrmit, než se z něj stane zvíře, ale pokud zjistíš, co jí nejradši, půjde to rychleji. Vyzkoušej to, nebo [se podívej na nápovědu tady](http://habitica.fandom.com/wiki/Food#Food_Preferences). Až budeš mít zvíře, klikni na něj, abys ho vybavil/a. Vajíčka můžeš taky získal na zvířecích výpravách. (Podívej se dolů, aby ses dozvěděl/a víc o výpravách.)",
     "faqQuestion7": "Jak se stanu Válečníkem, Mágem, Zlodějem, nebo Léčitelem?",
     "iosFaqAnswer7": "Na 10. úrovni si můžeš vybrat mezi Válečníkem, Mágem, Zlodějem, nebo Léčitelem. (Všichni hráči začínají jako Válečníci). Každé povolání má různé možnosti vybavení, různé dovednosti, které mohou používat od 11. úrovně, a různé výhody. Válečníci snadno ublíží příšerám, vydrží více a zocelují družinu. Mágové také snadno ublíží příšerám a rychle získávají další úrovně a doplňují Manu pro družinu. Zloději získávají nejvíce zlata, nachází nejvíce předmětů a mohou pomoci družině ke stejným nálezům. Nakonec, léčitelé mohou uzdravit sebe a členy své družiny.\n\nPokud si nechceš povolání vybrat hned - například pokud sis ještě nenakoupil všechno vybavení pro své stávající povolání - můžeš kliknout na \"Rozhodnout se později\"  a vybrat si později v Menu > Vybrat povolání.",
     "androidFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click “Opt Out” and choose later under Menu > Choose Class.",
     "webFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most Gold and find the most item drops, and they can help their party do the same. Finally, Healers can heal themselves and their party members. If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click \"Opt Out\" and re-enable it later under Settings.",
-    "faqQuestion8": "What is the blue Stat bar that appears in the Header after level 10?",
-    "iosFaqAnswer8": "Ta modrá lišta, která se objevila když jsi dosáhl úrovně 10 a vybral si povolání, je lišta Many. S každou další úrovní budeš odemykat speciální dovednosti, za jejichž použití platíš Manou. Každé povolání má jiné dovednosti, které se objeví po 11. úrovni v Menu > Použít dovednosti. Na rozdíl od lišty Zdraví se lišta Many nedoplní s každou novou úrovní. Místo toho se doplňuje když plníš dobré zvyky, denní úkoly, a úkoly v Úkolníčku a naopak ubývá při podlehnutí zlozvyku. Také se ti trocha doplní přes noc - čím více denních úkolů splníš, tím více se ti jí doplní.",
-    "androidFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
-    "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in the action bar at the bottom of the screen. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
+    "faqQuestion8": "Co je zač ten modrý pruh u statistik, který se objevil v hlavičce po 10. úrovni?",
+    "iosFaqAnswer8": "Ta modrá lišta, která se objevila když jsi dosáhl úrovně 10 a vybral si povolání, je lišta Many. S každou další úrovní budeš odemykat speciální dovednosti, za jejichž použití platíš Manou. Každé povolání má jiné dovednosti, které se objeví po 11. úrovni v Menu > Použít dovednosti. Na rozdíl od lišty Zdraví se lišta Many nedoplní s každou novou úrovní. Místo toho se doplňuje když plníš dobré zvyky, denní úkoly, a úkoly v úkolníčku a naopak ubývá při podlehnutí zlozvyku. Také se ti trocha doplní přes noc - čím více denních úkolů splníš, tím více se ti jí doplní.",
+    "androidFaqAnswer8": "Ta modrá lišta, která se objevila poté, co jsi dosáhnul/a 10. úrovně a vybral si svou třídu, je lišta s manou. Svým dalším vývojem si odemkneš speciální schopnosti, jejichž použití stojí manu. Každá třída má různé schopnosti, které se po dosažení 11. úrovně pod Menu > Schopnosti. Narozdíl od lišty se zdravím, tvá mana se neresetuje, když dosáhneš vyšší úrovně. Místo toho získáváš manu když splníš dobrý návyk, denní úkol nebo úkol, pokud si užiješ špatný zvyk, manu ztratíš. Také získáš nějakou manu přes noc -- čím víc denních úkolů splníš, o to víc získáš.",
+    "webFaqAnswer8": "Ta modrá lišta, která se objevila když jsi dosáhl úrovně 10 a vybral si povolání, je lišta Many. S každou další úrovní budeš odemykat speciální dovednosti, za jejichž použití platíš Manou. Každé povolání má jiné dovednosti, které se objeví po 11. úrovni v Menu > Použít dovednosti. Na rozdíl od lišty Zdraví se lišta Many nedoplní s každou novou úrovní. Místo toho se doplňuje když plníš dobré zvyky, denní úkoly, a úkoly v úkolníčku a naopak ubývá při podlehnutí zlozvyku. Také se ti trocha doplní přes noc - čím více denních úkolů splníš, tím více se ti jí doplní.",
     "faqQuestion9": "Jak můžu bojovat s příšerami a vydávat se na výpravy?",
     "iosFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
     "androidFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
@@ -45,14 +45,14 @@
     "androidFaqAnswer10": "Gems are purchased with real money by tapping on the Gem icon in the header. When people buy Gems, they are helping us to keep the site running. We're very grateful for their support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Social > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
     "webFaqAnswer10": "Gems are purchased with real money, although [subscribers](https://habitica.com/user/settings/subscription) can purchase them with Gold. When people subscribe or buy Gems, they are helping us to keep the site running. We're very grateful for their support! In addition to buying Gems directly or becoming a subscriber, there are two other ways players can gain Gems:\n* Win a Challenge that has been set up by another player. Go to Challenges > Discover Challenges to join some.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica). Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the site without them!",
     "faqQuestion11": "Jak mohu nahlásit chybu nebo zažádat o funkci?",
-    "iosFaqAnswer11": "You can report a bug, request a feature, or send feedback under Menu > About > Report a Bug and Menu > About > Send Feedback! We'll do everything we can to assist you.",
+    "iosFaqAnswer11": "Nahlásit chybu, požádat o funkci nebo poslat zpětnou vazbu můžeš přes menu > Popis > Poslat zpětnou vazbu resp. Náhlásit chybu. Uděláme vše pro to, abychom ti mohli.",
     "androidFaqAnswer11": "You can report a bug, request a feature, or send feedback under About > Report a Bug and About > Send us Feedback! We'll do everything we can to assist you.",
-    "webFaqAnswer11": "To report a bug, go to [Help > Report a Bug](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and read the points above the chat box. If you're unable to log in to Habitica, send your login details (not your password!) to [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Don't worry, we'll get you fixed up soon! Feature requests are collected on Trello. Go to [Help > Request a Feature](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) and follow the instructions. Ta-da!",
+    "webFaqAnswer11": "K nahlášení chyby, navštiv [Pomoc > Nahlásit bug](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) a pročti si poznámky nad chatovým okénkem. Pokud se nemůžeš zaregistrovat do Habitica, pošli své přihlašovací údaje (ale ne heslo!) na [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Neboj se, postaráme se o tebe co nejrychleji! Návrhy na vylepšení sbíráme na skrze Google formulář. Navštiv [Pomoc> Žádost o vylepšení](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) a postupuj podle instrukcí. Ta-dá!",
     "faqQuestion12": "Jak mám bojovat se Světovou příšerou?",
     "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.fandom.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.fandom.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.fandom.com/wiki/World_Bosses) on the wiki.",
     "iosFaqStillNeedHelp": "Jestli máš otázku, která není na tomto seznamu nebo na [Wiki FAQ] (http://habitica.fandom.com/wiki/FAQ), zeptej se v Krčmě v menu > Krčma! Jsme rádi když můžeme pomoct.",
     "androidFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",
-    "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.fandom.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."
-}
\ No newline at end of file
+    "webFaqStillNeedHelp": "Pokud máš otázku, která není na tomto seznamu nebo na [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), přijď se zeptat do [Cechu „Habitica Help‟](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Rádi ti pomůžeme."
+}
diff --git a/website/common/locales/cs/front.json b/website/common/locales/cs/front.json
index 9f5e48852e..b0fb8ebff7 100644
--- a/website/common/locales/cs/front.json
+++ b/website/common/locales/cs/front.json
@@ -212,7 +212,7 @@
     "unlockHeadline": "Čím jsi produktivnější, tím více obsahu odemkneš!",
     "useUUID": "Použij UUID / API Token (pro uživatele Facebooku)",
     "username": "Username",
-    "emailOrUsername": "Email or Username (case-sensitive)",
+    "emailOrUsername": "Email nebo uživatelské jméno (velká a malá písmena hrají roli)",
     "watchVideos": "Podívej se na videa",
     "work": "Práce",
     "zelahQuote": "[Program Habitica] mi pomáhá rozhodnout se, jestli jít do postele a získat za to body, nebo zůstat vzhůru a přijít o zdraví!",
@@ -273,7 +273,7 @@
     "usernameTime": "Je čas nastavit si uživatelské jméno!",
     "usernameInfo": "Login names are now unique usernames that will be visible beside your display name and used for invitations, chat @mentions, and messaging.<br><br>If you'd like to learn more about this change, <a href='http://habitica.fandom.com/wiki/Player_Names' target='_blank'>visit our wiki</a>.",
     "usernameTOSRequirements": "Usernames must conform to our <a href='/static/terms' target='_blank'>Terms of Service</a> and <a href='/static/community-guidelines' target='_blank'>Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.",
-    "usernameTaken": "Username already taken.",
+    "usernameTaken": "Uživatelské jméno je již používá někdo jiný.",
     "passwordConfirmationMatch": "Hesla se neshodují.",
     "invalidLoginCredentials": "Špatné uživatelské jméno, e-mail nebo heslo.",
     "passwordResetPage": "Obnovit heslo",
@@ -282,12 +282,12 @@
     "passwordResetEmailText": "If you requested a password reset for <%= username %> on Habitica, head to <%= passwordResetLink %> to set a new one. The link will expire after 24 hours. If you haven't requested a password reset, please ignore this email.",
     "passwordResetEmailHtml": "If you requested a password reset for <strong><%= username %></strong> on Habitica, <a href=\"<%= passwordResetLink %>\">click here</a> to set a new one. The link will expire after 24 hours.<br/><br>If you haven't requested a password reset, please ignore this email.",
     "invalidLoginCredentialsLong": "Uh-oh - your email address / username or password is incorrect.\n- Make sure they are typed correctly. Your username and password are case-sensitive.\n- You may have signed up with Facebook or Google-sign-in, not email so double-check by trying them.\n- If you forgot your password, click \"Forgot Password\".",
-    "invalidCredentials": "There is no account that uses those credentials.",
+    "invalidCredentials": "Účet používající tyto přístupové údaje neexistuje.",
     "accountSuspended": "Tento účet, ID uživatele \"<%= userId %>\", byl zablokován kvůli porušení pokynů pro komunitu (https://habitica.com/static/community-guidelines) nebo smluvních podmínek (https://habitica.com/static/terms). Chcete-li získat podrobnosti nebo požádat o odblokování, pošlete e-mail našemu Správci komunity na <%= communityManagerEmail %> nebo požádejte svého rodiče nebo zákonného zástupce o zaslání e-mailu. Do e-mailu uveďte prosím své @uživatelské_jméno.",
-    "accountSuspendedTitle": "Account has been suspended",
+    "accountSuspendedTitle": "Účet byl pozastaven",
     "unsupportedNetwork": "Tato síť není momentálně dostupná.",
     "cantDetachSocial": "Account lacks another authentication method; can't detach this authentication method.",
-    "onlySocialAttachLocal": "Local authentication can be added to only a social account.",
+    "onlySocialAttachLocal": "Lokální ověření lze přidat pouze k účtu ze sociální sítě.",
     "invalidReqParams": "Neplatné parametry požadavku.",
     "memberIdRequired": "\"member\" musí být platné UUID.",
     "heroIdRequired": "\"heroId\" musí být platné UUID.",
diff --git a/website/common/locales/cs/gear.json b/website/common/locales/cs/gear.json
index d94c9e704a..ee8896e84d 100644
--- a/website/common/locales/cs/gear.json
+++ b/website/common/locales/cs/gear.json
@@ -327,13 +327,13 @@
     "weaponArmoireBasicLongbowText": "Základní dlouhý luk",
     "weaponArmoireBasicLongbowNotes": "Funkční použitý luk. Zvyšuje Sílu o <%= str %>. Začarovaná almara: Základní lučištnická sada (předmět 1 ze 3).",
     "weaponArmoireHabiticanDiplomaText": "Habitican Diploma",
-    "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).",
+    "weaponArmoireHabiticanDiplomaNotes": "Certifikát důležitého úspěchu -- skvělá práce! Zvyšuje inteligenci o  <%= int %>. Začarovaná truhla: sada absolventa (předmět 1 ze 3).",
     "weaponArmoireSandySpadeText": "Sandy Spade",
-    "weaponArmoireSandySpadeNotes": "A tool for digging, as well as flicking sand into the eyes of enemy monsters. Increases Strength by <%= str %>. Enchanted Armoire: Seaside Set (Item 1 of 3).",
+    "weaponArmoireSandySpadeNotes": "Nástroj ke kopání, ale také házení písku do očí monster. Zvyšuje sílu o <%= str %>. Začarovaná truhla: přímořská sada (předmět 1 ze 3).",
     "weaponArmoireCannonText": "Cannon",
     "weaponArmoireCannonNotes": "Arr! Set your aim with determination. Increases Strength by <%= str %>. Enchanted Armoire: Cannoneer Set (Item 1 of 3).",
     "weaponArmoireVermilionArcherBowText": "Vermilion Archer Bow",
-    "weaponArmoireVermilionArcherBowNotes": "Your arrow will fly like a shooting star from this brilliant red bow! Increases Strength by <%= str %>. Enchanted Armoire: Vermilion Archer Set (Item 1 of 3).",
+    "weaponArmoireVermilionArcherBowNotes": "Tvůj šíp poletí z tohoto úžasného červeného luku jako kometa! Zvyšuje sílu o <%= str %>. Začarovaná truhla: sada nachového lukostřelce (předmět 1 ze 3).",
     "weaponArmoireOgreClubText": "Ogre Club",
     "weaponArmoireOgreClubNotes": "This club was salvaged from an actual Ogre's lair. Increases Strength by <%= str %>. Enchanted Armoire: Ogre Outfit (Item 2 of 3).",
     "weaponArmoireWoodElfStaffText": "Wood Elf Staff",
@@ -1479,7 +1479,7 @@
     "shieldArmoireAntiProcrastinationShieldText": "Anti-Procrastination Shield",
     "shieldArmoireAntiProcrastinationShieldNotes": "This strong steel shield will help you block distractions when they approach! Increases Constitution by <%= con %>. Enchanted Armoire: Anti-Procrastination Set (Item 3 of 3).",
     "shieldArmoireHorseshoeText": "Horseshoe",
-    "shieldArmoireHorseshoeNotes": "Help protect the feet of your hooved mounts with this iron shoe. Increases Constitution, Perception, and Strength by <%= attrs %> each. Enchanted Armoire: Farrier Set (Item 3 of 3)",
+    "shieldArmoireHorseshoeNotes": "Chraň kopyta svých zvířat těmito podkovami. Zvyšuje obranu, vnímání a sílu o <%= attrs %>. Začarovaná truhla: sada zvěrolékaře (předmět 1 ze 3).",
     "shieldArmoireHandmadeCandlestickText": "Ručně výrobený svícen",
     "shieldArmoireHandmadeCandlestickNotes": "Your fine wax wares provide light and warmth to grateful Habiticans! Increases Strength by <%= str %>. Enchanted Armoire: Candlestick Maker Set (Item 3 of 3).",
     "shieldArmoireWeaversShuttleText": "Weaver's Shuttle",
@@ -1503,7 +1503,7 @@
     "shieldArmoireSoftGreenPillowText": "Měkký zelený polštář",
     "shieldArmoireSoftGreenPillowNotes": "The practical warrior packs a pillow for any expedition. Ward off those pesky chores... even while you nap. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Green Loungewear Set (Item 3 of 3).",
     "shieldArmoireMightyQuillText": "Mighty Quill",
-    "shieldArmoireMightyQuillNotes": "Mightier than the sword, they say! Increases Perception by <%= per %>. Enchanted Armoire: Scribe Set (Item 2 of 3).",
+    "shieldArmoireMightyQuillNotes": "Říkají, že je silnější než meč! Zvyšuje vnímání o <%= per %>. Začarovaná truhla: sada písaře (předmět 2 ze 3).",
     "back": "Příslušenství na záda",
     "backCapitalized": "Back Accessory",
     "backBase0Text": "Bez příslušenství na zádech",
@@ -1848,5 +1848,31 @@
     "weaponSpecialSummer2020HealerNotes": "Tak jako proud zjemní ostré hrany, tvá magie sníží bolest tvých přátel. Zvyšuje inteligenci o <%= int %>. Limitovaná edice 2020 letní výzbroj.",
     "weaponSpecialSummer2020HealerText": "Hůl z mléčného skla",
     "weaponSpecialSummer2020RogueNotes": "Tví nepřátele tě nevidí, ale tvým tesákům neutečou. Zvyšuje sílu o <%= str %>. Limitovaná edice 2020 letní výzbroj.",
-    "weaponSpecialSummer2020RogueText": "Tesáková čepel"
+    "weaponSpecialSummer2020RogueText": "Tesáková čepel",
+    "weaponSpecialSpring2020HealerText": "Mečíková hůl",
+    "headArmoireVernalHenninNotes": "Tento špičatý čepec je víc než jenom hezká pokrývka hlavy. Navíc v sobě může schovat tvůj srolovaný úkolníček. Zvyšuje vnímání o <%= per %>. Začarovaná truhla: sada jarního roucha (předmět 1 ze 3).",
+    "headArmoireVernalHenninText": "Jarní čepec",
+    "armorArmoireVernalVestmentNotes": "V tomto hedvábném rouchu si perfektně stylově užiješ jemné jarní počasí. Zvyšuje sílu a inteligenci o <%= attrs %>. Začarovaná truhla: sada jarního roucha (předmět 2 ze 3).",
+    "armorArmoireVernalVestmentText": "Jarní roucho",
+    "weaponArmoireVernalTaperNotes": "Dny se prodlužují, ale tahle svíčka ti pomůže, abys našel cestu před západem slunce. Zvyšuje obranu o <%= con %>. Začarovaná truhla: sada jarního roucha (předmět 3 ze tří).",
+    "weaponSpecialSpring2020HealerNotes": "Kosatec je nádherný, ale jeho listy jsou ostré jako břitvy... nenech se zmást těmi květy, tahle hůl je silná jako ocel! Zvyšuje inteligenci o <%= int %>. Limitovaná edice 2020 jarní výzbroj.",
+    "weaponArmoireHappyBannerNotes": "Je to \"H\" pro houževnatý, nebo pro Habitica? Ty se rozhodni. Zvyšuje vnímání o <%= per %>. Začarovaná truhla: narozeninová sada (předmět 3 ze 4).",
+    "weaponArmoireHappyBannerText": "Houževnatá standarta",
+    "weaponArmoireAlchemistsDistillerNotes": "Čisti metaly a jiné magické součásti s tímto lesklým bronzový nástrojem. Zvyšuje sílu o <%= str %>. Začarovaná truhla: sada alchymisty. (předmět 3 ze 4).",
+    "weaponArmoireAlchemistsDistillerText": "Alchymistův destilátor",
+    "weaponArmoireShadowMastersMaceNotes": "Stvůry temnoty budou poslouchat každý tvůj rozkaz, když se rozmáchneš touto planoucí palicí. Zvyšuje vnímání o <%= per %>. Začarovná truhla: sada pána temnoty (předmět 3 ze 4).",
+    "weaponArmoireShadowMastersMaceText": "Palice pána temnoty",
+    "weaponArmoireResplendentRapierNotes": "Předveď své šermířské umění s touto špičatou zbraní. Zvyšuje vnímání o <%= per %>. Začarovaná truhlice: nezávislý předmět.",
+    "weaponArmoireFloridFanNotes": "Tento překrásný hedvábný vějíř můžeš kdykoli zase složit. Zvyšuje obranu o <%= con %>. Začarovaná truhla: nezávislý předmět.",
+    "weaponArmoireBambooCaneNotes": "Perfektní na procházku nebo k tančení charlestonu. Zvyšuje inteligenci, vnímání a obranu o <%= attrs %>. Začarovaná truhla: sada na projížďku člunem (předmět 3 ze 3).",
+    "weaponArmoireJugglingBallsNotes": "Habitičané jsou mistři multitaskingu, takže bys neměl/a mít problém, udržet tyhle míčky ve vzduchu. Zvyšuje inteligenci o <%= int %>. Začarovaná truhla: nezávislý předmět.",
+    "armorSpecialBirthday2020Text": "Pobuřující party róby",
+    "armorSpecialBirthday2020Notes": "Všechno nejlepší Habitica! Obleč si tuhle pobuřující party róbu k oslavě tohoto skvělého dne. Nepřináší žádné výhody.",
+    "weaponArmoireBeachFlagText": "Plážová vlajka",
+    "weaponArmoireFiddlersBowNotes": "S tímhle šmytcem můžeš vymámit hudbu z čehokoli! ...Housle budou ale fungovat nejlépe. Zvyšuje sílu o <%= str %>. Začarovaná truhla: sada houslisty (předmět 3 ze 4).",
+    "weaponArmoireFiddlersBowText": "Houslistův smyčec",
+    "weaponArmoireBaseballBatNotes": "Zařiď si homerun s těmito dobrými návyky! Zvyšuje obranu <%= con %>. Začarovaná truhla: baseballová sada (předmět 3 ze 4).",
+    "weaponArmoireBaseballBatText": "Baseballová pálka",
+    "weaponArmoireLivelyMatchNotes": "Dokud ji budeš držet, rozhodně zapálíš něčí zájem! Zvyšuje sílu o <%= str %>. Začarovaná truhla: sada sirkaře (předmět 3 ze 4).",
+    "weaponArmoireLivelyMatchText": "Živoucí sirka"
 }
diff --git a/website/common/locales/cs/tasks.json b/website/common/locales/cs/tasks.json
index 5eba557228..03d4d36935 100644
--- a/website/common/locales/cs/tasks.json
+++ b/website/common/locales/cs/tasks.json
@@ -49,7 +49,7 @@
     "attributeAllocation": "Přidělení vlastnostních bodů",
     "attributeAllocationHelp": "Rozdělení vlastnostních bodů je možnost, která poskytuje metody pro Habiticu pro automatické přidělení získaného bodu k vlastnostem hned, jakmile se dostaneš na novou úroveň. <br/><br/>Můžeš si nastavit tvé Automatické Přidělení bodů na základě tvých úkolů v sekci Statistiky ve tvém profilu.",
     "progress": "Pokrok",
-    "daily": "Denně",
+    "daily": "Denní úkol",
     "dailies": "Denní úkoly",
     "newDaily": "Nový denní úkol",
     "newDailyBulk": "Nové Denní úkoly (jeden na řádek)",
@@ -210,8 +210,8 @@
     "searchTasks": "Vyhledat názvy a popisy...",
     "sessionOutdated": "Tvá relace je zastaralá. Prosím, zkus ji obnovit nebo synchronizovat.",
     "errorTemporaryItem": "Tento předmět je dočasný a nemůže být připnut.",
-    "sureDeleteType": "Chceš tohle <%= type %> opravdu smazat?",
-    "deleteTaskType": "Tohle <%= type %> smazat",
+    "sureDeleteType": "Chceš tento <%= type %> opravdu smazat?",
+    "deleteTaskType": "Tento <%= type %> smazat",
     "addNotes": "Přidej poznámky",
     "addATitle": "Přidej název"
 }
diff --git a/website/common/locales/fil/gear.json b/website/common/locales/fil/gear.json
index 02b63057e5..ccc52af260 100755
--- a/website/common/locales/fil/gear.json
+++ b/website/common/locales/fil/gear.json
@@ -24,7 +24,7 @@
     "weaponBase0Notes": "No Weapon.",
     "weaponWarrior0Text": "Training Sword",
     "weaponWarrior0Notes": "Practice weapon. Confers no benefit.",
-    "weaponWarrior1Text": "Sword",
+    "weaponWarrior1Text": "Espada",
     "weaponWarrior1Notes": "Common soldier's blade. Increases Strength by <%= str %>.",
     "weaponWarrior2Text": "Axe",
     "weaponWarrior2Notes": "Double-bitted chopping weapon. Increases Strength by <%= str %>",
@@ -1742,4 +1742,4 @@
     "eyewearArmoireGoofyGlassesText": "Goofy Glasses",
     "eyewearArmoireGoofyGlassesNotes": "Perfect for going incognito or just making your partymates giggle. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
     "twoHandedItem": "Two-handed item."
-}
\ No newline at end of file
+}
diff --git a/website/common/locales/it/communityguidelines.json b/website/common/locales/it/communityguidelines.json
index 835a83f48c..8a0d479526 100644
--- a/website/common/locales/it/communityguidelines.json
+++ b/website/common/locales/it/communityguidelines.json
@@ -21,7 +21,7 @@
     "commGuideList02I": "<strong>Le conversazioni di divisione/contenziose devono essere segnalate ai moderatori</strong> segnalando i messaggi coinvolti o usando il <a href='https://contact.habitica.com/' target='_blank'>Modulo di Contatto Moderatori</a>. Se trovi che una conversazione diventa troppo animata, troppo emotiva o offensiva, non coinvolgerti. Invece, segnala le pubblicazioni in modo che noi lo sappiamo. I Moderatori reagiranno al più presto. È nostro compito tenerti al sicuro. Se trovi che più contesto sia necessario, puoi segnalare il problema tramite il <a href='https://contact.habitica.com/' target='_blank'>Modulo Contatto Moderatori</a>.",
     "commGuideList02J": "<strong>Non inviare spam</strong>. Lo spam può includere, ma non è limitato a: postare lo stesso commento o domanda in posizioni diverse, pubblicare link senza contesto o spiegazione, postare messaggi senza senso, pubblicare messaggi promozionali multipli relativi a una Gilda, Squadra o Sfida, oppure molti messaggi consecutivamente. Anche elemosinare continuamente gemme o abbonamenti nelle chat o via messaggi privati è considerato spam. Se quando le persone cliccano un tuo link ciò ti porta vantaggi, dovrai indicarlo nel testo del tuo messaggio, altrimenti sarà ritenuto spam.<br/><br/>È compito dei moderatori decidere se qualcosa rappresenta spam o potrebbe generarlo, persino se tu non ritieni che lo sia. Ad esempio, la pubblicizzazione di una Gilda è ritenuta accettabile una o due volte, ma postarla più volte in una giornata probabilmente sarebbe ritenuto spam, a prescindere dall'utilità della Gilda!",
     "commGuideList02K": "<strong>Evita di pubblicare grossi titoli negli spazi pubblici di chat, in particolare nella Taverna</strong>. Nella stessa maniera delle MAIUSCOLE, sembra tu stia urlando, e può interferire con l'atmosfera confortevole.",
-    "commGuideList02L": "<strong>Scoraggiamo fortemente lo scambio di informazioni personali nelle chat degli spazi pubblici, in particolare di quelle che possono essere usate per identificarti.</strong>. Le informazioni di questo tipo possono essere, ma non sono limitate a: il tuo indirizzo, il tuo indirizzo email e la tua Chiave API/password. È per la tua sicurezza! Lo staff e i moderatori potranno rimuovere post di questo tipo quando lo riterranno necessario. Se ti vengono chieste informazioni personali in una Gilda privata, in una Squadra o tramite messaggio privato, ti consigliamo caldamente di rifiutare con gentilezza e informare lo staff e i moderatori 1) segnalando il messaggio con l'apposito bottone a forma di bandiera se si trova in una Squadra o in una Gilda, oppure 2) compilando il <a href='https://contact.habitica.com/' target='_blank'>Modulo di Contatto Moderatori</a> e allegando le screenshot.",
+    "commGuideList02L": "<strong>Scoraggiamo fortemente lo scambio di informazioni personali nelle chat degli spazi pubblici, in particolare di quelle che possono essere usate per identificarti.</strong>. Le informazioni di questo tipo possono essere, ma non sono limitate a: il tuo indirizzo, il tuo indirizzo email e la tua Chiave API/password. È per la tua sicurezza! Lo staff e i moderatori potranno rimuovere post di questo tipo quando lo riterranno necessario. Se ti vengono chieste informazioni personali in una Gilda privata, in una Squadra o tramite messaggio privato, ti consigliamo caldamente di rifiutare con gentilezza e informare lo staff e i moderatori 1) segnalando il messaggio con l'apposito pulsante a forma di bandiera se si trova in una Squadra o in una Gilda, oppure 2) compilando il <a href='https://contact.habitica.com/' target='_blank'>Modulo di Contatto Moderatori</a> e allegando le screenshot.",
     "commGuidePara019": "<strong>Negli spazi privati</strong>, gli utenti hanno più libertà di discutere di quello che vogliono, ma possono comunque violare i Termini e Condizioni di utilizzo. Ciò include gli insulti e qualsiasi contenuto discriminatorio, violento o minaccioso. Nota che, siccome i nomi delle Sfide appaiono sul profilo pubblico dei vincitori, i nomi di TUTTE le sfide devono rispettare le linee guida per gli spazi pubblici, ciò anche se le sfide appaiono in uno spazio privato.",
     "commGuidePara020": "<strong>I Messaggi Privati (MP)</strong> hanno alcune linee guida aggiuntive. Se qualcuno ti ha bloccato, non contattarlo da qualche altra parte per chiedergli di sbloccarti. Inoltre, non dovresti mandare un MP a qualcuno che richiede assistenza (dato che le risposte pubbliche alle richieste di assistenza sono utili a tutta la community). Infine, non mandare a nessuno un MP pregandolo di regalarti gemme o un abbonamento, in quanto può essere considerato spam.",
     "commGuidePara020A": "<strong>Se credi che un post che hai visto violi le linee guida per gli spazi pubblici descritte qua sopra, o se vedi un post o un messaggio privato che ti preoccupa o ti mette a disagio, puoi portarlo all'attenzione dei Moderatori e dello Staff usando l'icona a forma di bandiera per segnalarlo.</strong>. Un membro dello Staff o un Moderatore si occuperà della faccenda il più presto possibile. Ricorda che segnalare intenzionalmente post innocenti è un'infrazione di queste linee guida (vedi sotto la sezione \"Infrazioni\"). Puoi contattare i moderatori dal modulo presente nella pagina \"Contattaci\", a cui puoi accedere anche dal menu della guida, cliccando \"<a href='https://contact.habitica.com/' target='_blank'>Contatta il Team dei Moderatori</a>.\" Puoi farlo in presenza di più post problematici della stessa persona all'interno di Gilde diverse, oppure se la situazione richiede spiegazioni. Puoi contattarci nella tua lingua madre se ti è più facile: potremmo dover ricorrere a Google Translate, ma desideriamo che tu sia a tuo agio nel contattarci in caso di problemi.",
diff --git a/website/common/locales/it/front.json b/website/common/locales/it/front.json
index a28ec3d042..a420a5a351 100644
--- a/website/common/locales/it/front.json
+++ b/website/common/locales/it/front.json
@@ -200,7 +200,7 @@
     "terms": "Termini e condizioni",
     "testimonialHeading": "Cosa dicono gli utenti...",
     "tumblr": "Tumblr",
-    "localStorageTryFirst": "Se stai avendo problemi con Habitica, premi il bottone qui sotto per cancellare i dati locali e la maggior parte dei cookies di questo sito (gli altri siti non verranno affetti). Dopo averlo fatto dovrai accedere nuovamente, quindi assicurati di conoscere i tuoi dati di Log-In, che possono essere trovati in Impostazioni -> <%= linkStart %>Sito<%= linkEnd %>.",
+    "localStorageTryFirst": "Se stai avendo problemi con Habitica, premi il pulsante qui sotto per cancellare i dati locali e la maggior parte dei cookies di questo sito (gli altri siti non verranno affetti). Dopo averlo fatto dovrai accedere nuovamente, quindi assicurati di conoscere i tuoi dati di Log-In, che possono essere trovati in Impostazioni -> <%= linkStart %>Sito<%= linkEnd %>.",
     "localStorageTryNext": "Se il problema persiste, per favore <%= linkStart %>segnalate un bug<%= linkEnd %> se non lo avete già fatto.",
     "localStorageClearing": "Pulizia dati in corso",
     "localStorageClearingExplanation": "Stiamo cancellando dal tuo browser i dati locali di Habitica. Verrai disconnesso e inviato alla pagina principale. Per favore, attendi.",
diff --git a/website/common/locales/it/groups.json b/website/common/locales/it/groups.json
index eb4e69b737..63da1829c1 100644
--- a/website/common/locales/it/groups.json
+++ b/website/common/locales/it/groups.json
@@ -71,7 +71,7 @@
     "chat": "Chat",
     "sendChat": "Invia messaggio",
     "toolTipMsg": "Recupera messaggi recenti",
-    "sendChatToolTip": "Puoi inviare un messaggio usando solo la tastiera premendo tab per selezionare il bottone \"Invia messaggio\" e poi Invio, o premendo Ctrl + Invio (o Command + Invio sui Mac).",
+    "sendChatToolTip": "Puoi inviare un messaggio usando solo la tastiera premendo tab per selezionare il pulsante \"Invia messaggio\" e poi Invio, o premendo Ctrl + Invio (o Command + Invio sui Mac).",
     "syncPartyAndChat": "Sincronizza squadra e chat",
     "guildBankPop1": "Banca della Gilda",
     "guildBankPop2": "Gemme che il leader della tua Gilda può usare per i premi delle sfide.",
diff --git a/website/common/locales/it/npc.json b/website/common/locales/it/npc.json
index 09622f8e7e..0725c95933 100644
--- a/website/common/locales/it/npc.json
+++ b/website/common/locales/it/npc.json
@@ -104,7 +104,7 @@
     "payWithCard": "Paga con carta di credito",
     "payNote": "Nota: PayPal a volte richiede molto tempo per completare la transazione. Consigliamo di pagare con una carta di credito.",
     "card": "Carta di credito",
-    "amazonInstructions": "Clicca sul bottone per pagare usando Amazon Payments",
+    "amazonInstructions": "Clicca sul pulsante per pagare usando Amazon Payments",
     "paymentMethods": "Paga utilizzando",
     "paymentSuccessful": "Il tuo pagamento ha avuto successo!",
     "paymentYouReceived": "Hai ricevuto:",
diff --git a/website/common/locales/it/overview.json b/website/common/locales/it/overview.json
index 10ed5f4345..8f32160410 100644
--- a/website/common/locales/it/overview.json
+++ b/website/common/locales/it/overview.json
@@ -1,10 +1,10 @@
 {
     "needTips": "Hai bisogno di alcune dritte su come cominciare? Ecco una semplice guida!",
     "step1": "Passo 1: Inserisci le Attività",
-    "webStep1Text": "Habitica non è nulla senza obiettivi nella vita reale, perciò inserisci alcune attività. Puoi aggiungerne di più anche dopo, appena ti verranno in mente! Tutte le attività possono essere aggiunte cliccando sul bottone verde \"Crea\".\n* **Imposta [Cose da Fare](http://habitica.fandom.com/wiki/To-Dos):** Inserisci le attività che fai solo una volta o raramente nella colonna delle Cose da Fare. Puoi cliccare sulle attività per modificarle e aggiungere delle liste, date di scadenza e molto altro!\n* **Imposta [Attività Giornaliere](http://habitica.fandom.com/wiki/Dailies):** Inserisci le attività che hai bisogno di compiere giornalmente oppure in un particolare giorno della settimana, mese, o anno nella colonna delle Attività Giornaliere. Clicca su attività per modificare quando dovrebbe essere completata,o per impostare una data di inizio. Puoi anche renderla ripetibile, per esempio ogni 3 giorni.\n* **Imposta [Abitudini](http://habitica.fandom.com/wiki/Habits):** Inserisci le abitudini che vuoi consolidare nella colonna Abitudini. Puoi modificare l'abitudine per cambiarla in un'abitudine solo positiva :heavy_plus_sign: o solo negativa :heavy_minus_sign:\n* **Imposta [Ricompense](http://habitica.fandom.com/wiki/Rewards):** In aggiunta alle ricompense presenti in gioco, puoi aggiungere le attività o i premi che preferisci usare come motivazione nella colonna Ricompense. È importante darsi delle pause o permettere qualche piccolo strappo alla regola con moderazione!\n* se ti serve ispirazione per decidere che attività aggiungere, puoi guardare nelle pagine della wiki su [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies), [Sample To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos), e [Sample Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards).",
+    "webStep1Text": "Habitica non è nulla senza obiettivi nella vita reale, perciò inserisci alcune attività. Puoi aggiungerne di più anche dopo, appena ti verranno in mente! Tutte le attività possono essere aggiunte cliccando sul pulsante verde \"Crea\".\n* **Imposta [Cose da Fare](http://habitica.fandom.com/wiki/To-Dos):** Inserisci le attività che fai solo una volta o raramente nella colonna delle Cose da Fare. Puoi cliccare sulle attività per modificarle e aggiungere delle liste, date di scadenza e molto altro!\n* **Imposta [Attività Giornaliere](http://habitica.fandom.com/wiki/Dailies):** Inserisci le attività che hai bisogno di compiere giornalmente oppure in un particolare giorno della settimana, mese, o anno nella colonna delle Attività Giornaliere. Clicca su attività per modificare quando dovrebbe essere completata,o per impostare una data di inizio. Puoi anche renderla ripetibile, per esempio ogni 3 giorni.\n* **Imposta [Abitudini](http://habitica.fandom.com/wiki/Habits):** Inserisci le abitudini che vuoi consolidare nella colonna Abitudini. Puoi modificare l'abitudine per cambiarla in un'abitudine solo positiva :heavy_plus_sign: o solo negativa :heavy_minus_sign:\n* **Imposta [Ricompense](http://habitica.fandom.com/wiki/Rewards):** In aggiunta alle ricompense presenti in gioco, puoi aggiungere le attività o i premi che preferisci usare come motivazione nella colonna Ricompense. È importante darsi delle pause o permettere qualche piccolo strappo alla regola con moderazione!\n* se ti serve ispirazione per decidere che attività aggiungere, puoi guardare nelle pagine della wiki su [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies), [Sample To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos), e [Sample Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards).",
     "step2": "Passo 2: Guadagna Punti portando a termine le attività nella vita reale",
     "webStep2Text": "Inizia a lavorare sugli obiettivi nella tua lista! Man mano che completi le attività e che ne spunti le voci su Habitica, guadagnerai punti [Esperienza](http://habitica.fandom.com/wiki/Experience_Points), che ti faranno salire di livello, e [Oro](http://habitica.fandom.com/wiki/Gold_Points), che ti permetterà di acquistare le Ricompense. Invece, se ricadi in una cattiva abitudine o se salti una Attività Giornaliera, perderai punti [Salute](http://habitica.fandom.com/wiki/Health_Points). Puoi quindi considerare la barra Esperienza e la barra Salute di Habitica come un simpatico indicatore del tuo progresso verso il completamento dei tuoi obiettivi. Man mano che il tuo personaggio progredirà nel gioco, inizierai a veder migliorare anche la tua vita reale.",
     "step3": "Passo 3: Personalizza ed Esplora Habitica",
-    "webStep3Text": "Una volta che hai familiarità con le basi, puoi ottenere ancora di più da Habitica con queste fantastiche caratteristiche:\n * Organizza le tue Attività con le [etichette](http://habitica.fandom.com/wiki/Tags) (modifica una Attività per aggiungerle).\n* Personalizza il tuo [Avatar](http://habitica.fandom.com/wiki/Avatar) usando l'icona Utente nel'angolo in alto a destra.\n * Compra il tuo [Equipaggiamento](http://habitica.fandom.com/wiki/Equipment) nella colonna delle Ricompense o nel [Mercato](<%= shopUrl %>), e cambialo andando a [Inventario > Equipaggmento](<%= equipUrl %>).\n * Connetti con altri utenti nella [Taverna](http://habitica.fandom.com/wiki/Tavern).\n * Ottieni [Animali](http://habitica.fandom.com/wiki/Pets) collezionando [Uova](http://habitica.fandom.com/wiki/Eggs) e [Pozioni di Schiusa](http://habitica.fandom.com/wiki/Hatching_Potions). Dai da [mangiare](http://habitica.fandom.com/wiki/Food) agli Animali per ottenere [Cavalcature](http://habitica.fandom.com/wiki/Mounts).\n * Al livello 10: scegli una particolare [Classe](http://habitica.fandom.com/wiki/Class_System), e poi usa specifiche [abilità di Classe](http://habitica.fandom.com/wiki/Skills) (livelli 11-14).\n * Forma una Squadra con i tuoi amici (usando il bottone [Squadra](<%= partyUrl %>) nella barra di navigazione) per rimanere responsabile e guadagnare pergamene Missione.\n * Sconfiggi mostri e colleziona oggetti mentre fai le [Missioni](http://habitica.fandom.com/wiki/Quests) (riceverai una pergamena Missione al livelo 15).",
+    "webStep3Text": "Una volta che hai familiarità con le basi, puoi ottenere ancora di più da Habitica con queste fantastiche caratteristiche:\n * Organizza le tue Attività con le [etichette](http://habitica.fandom.com/wiki/Tags) (modifica una Attività per aggiungerle).\n* Personalizza il tuo [Avatar](http://habitica.fandom.com/wiki/Avatar) usando l'icona Utente nel'angolo in alto a destra.\n * Compra il tuo [Equipaggiamento](http://habitica.fandom.com/wiki/Equipment) nella colonna delle Ricompense o nel [Mercato](<%= shopUrl %>), e cambialo andando a [Inventario > Equipaggmento](<%= equipUrl %>).\n * Connetti con altri utenti nella [Taverna](http://habitica.fandom.com/wiki/Tavern).\n * Ottieni [Animali](http://habitica.fandom.com/wiki/Pets) collezionando [Uova](http://habitica.fandom.com/wiki/Eggs) e [Pozioni di Schiusa](http://habitica.fandom.com/wiki/Hatching_Potions). Dai da [mangiare](http://habitica.fandom.com/wiki/Food) agli Animali per ottenere [Cavalcature](http://habitica.fandom.com/wiki/Mounts).\n * Al livello 10: scegli una particolare [Classe](http://habitica.fandom.com/wiki/Class_System), e poi usa specifiche [abilità di Classe](http://habitica.fandom.com/wiki/Skills) (livelli 11-14).\n * Forma una Squadra con i tuoi amici (usando il pulsante [Squadra](<%= partyUrl %>) nella barra di navigazione) per rimanere responsabile e guadagnare pergamene Missione.\n * Sconfiggi mostri e colleziona oggetti mentre fai le [Missioni](http://habitica.fandom.com/wiki/Quests) (riceverai una pergamena Missione al livelo 15).",
     "overviewQuestions": "Hai una domanda? Controlla le [Domande Frequenti](<%= faqUrl %>)! Se hai domande che non sono elencate lì, puoi chiedere aiuto nella gilda [Habitica Help](<%= helpGuildUrl %>).\n\nBuona fortuna con le tue attività!"
 }
diff --git a/website/common/locales/it/settings.json b/website/common/locales/it/settings.json
index f0a73f71ab..052b5cf773 100644
--- a/website/common/locales/it/settings.json
+++ b/website/common/locales/it/settings.json
@@ -107,7 +107,7 @@
     "email": "Email",
     "registerWithSocial": "Registrati con <%= network %>",
     "registeredWithSocial": "Registrato con <%= network %>",
-    "loginNameDescription": "Questo è il nome che usi per accedere ad Habitica. Per cambiarlo, usa il modulo qui sotto. Se invece vuoi modificare il nome pubblico, ovvero quello che compare sul tuo avatar e in chat, vai su Icona Utente &gt; Profilo e clicca sul bottone Modifica.",
+    "loginNameDescription": "Questo è il nome che usi per accedere ad Habitica. Per cambiarlo, usa il modulo qui sotto. Se invece vuoi modificare il nome pubblico, ovvero quello che compare sul tuo avatar e in chat, vai su Icona Utente &gt; Profilo e clicca sul pulsante Modifica.",
     "emailNotifications": "Notifiche via email",
     "wonChallenge": "Hai vinto una Sfida!",
     "newPM": "Hai ricevuto un messaggio privato",
@@ -148,7 +148,7 @@
     "promoCode": "Codice promozionale",
     "promoCodeApplied": "Codice promozionale applicato! Controlla il tuo inventario",
     "promoPlaceholder": "Inserisci codice promozionale",
-    "displayInviteToPartyWhenPartyIs1": "Mostra il bottone di invito alla squadra quando la squadra ha solo 1 membro.",
+    "displayInviteToPartyWhenPartyIs1": "Mostra il pulsante di invito alla squadra quando la squadra ha solo 1 membro.",
     "saveCustomDayStart": "Salva Inizio del Giorno Personalizzato",
     "registration": "Registrazione",
     "addLocalAuth": "Aggiungi login con Email e Password",
@@ -188,7 +188,7 @@
     "amazonPaymentsRecurring": "Marcare la casella sottostante è necessario per creare il tuo abbonamento. Permette che il tuo account Amazon sia usato per il pagamento ricorrente di <strong>questo</strong> abbonamento. Non pernette che il tuo account Amazon sia usato automaticamente per futuri acquisti.",
     "timezone": "Fuso orario",
     "timezoneUTC": "Habitica usa il fuso orario impostato sul tuo PC, ovvero: <strong><%= utc %></strong>",
-    "timezoneInfo": "Se il fuso orario è sbagliato, ricarica questa pagina tramite il bottone di ricarica o aggiornamento della pagina del browser, per assicurarti che Habitica contenga le informazioni più aggiornate. Se è ancora sbagliato, imposta il fuso orario corretto sul tuo PC e poi ricarica di nuovo questa pagina.<br><br> <strong>Se usi Habitica su altri PC o su altri dispositivi mobili, il fuso orario deve essere identico su ognuno di essi.</strong> Se le tue Attività Giornaliere sono state reimpostate ad un'ora sbagliata, ripeti questo controllo su tutti gli altri PC e su un browser sui tuoi dispositivi mobili.",
+    "timezoneInfo": "Se il fuso orario è sbagliato, ricarica questa pagina tramite il pulsante di ricarica o aggiornamento della pagina del browser, per assicurarti che Habitica contenga le informazioni più aggiornate. Se è ancora sbagliato, imposta il fuso orario corretto sul tuo PC e poi ricarica di nuovo questa pagina.<br><br> <strong>Se usi Habitica su altri PC o su altri dispositivi mobili, il fuso orario deve essere identico su ognuno di essi.</strong> Se le tue Attività Giornaliere sono state reimpostate ad un'ora sbagliata, ripeti questo controllo su tutti gli altri PC e su un browser sui tuoi dispositivi mobili.",
     "push": "Push",
     "about": "Info",
     "setUsernameNotificationTitle": "Conferma il tuo nome utente!",
diff --git a/website/common/locales/ja/gear.json b/website/common/locales/ja/gear.json
index ab73290bdd..6c39498bf6 100644
--- a/website/common/locales/ja/gear.json
+++ b/website/common/locales/ja/gear.json
@@ -1942,5 +1942,17 @@
     "bodyMystery202008Notes": "今のところ、マントの翼は折りたたまれています。しかし、知恵を授け終えたとき、あるいは草むらの中にえさを見つけたときは、気をつけて！効果なし。2020年8月の寄付会員アイテム。",
     "bodyMystery202008Text": "フクロウ賢者のマント",
     "headMystery202008Notes": "ホーホー、そこにいるのは誰じゃ？助言をお望みかな？効果なし。2020年8月の寄付会員アイテム。",
-    "headMystery202008Text": "フクロウ賢者の頭飾り"
+    "headMystery202008Text": "フクロウ賢者の頭飾り",
+    "weaponArmoirePaperCutterNotes": "見た目は怖くないかもしれませんが、紙で指を切ったことのない人はいないでしょ？力が<%= str %>上がります。ラッキー宝箱：紙の騎士セット（3個中1個目のアイテム）。",
+    "weaponArmoirePaperCutterText": "紙の剣",
+    "shieldArmoireFiddleNotes": "楽団の中にいても、常に正しい音を奏でられる、完璧な楽器です。知能が<%= int %>上がります。ラッキー宝箱：バイオリン弾きセット（4個中4個目のアイテム）。",
+    "shieldArmoireFiddleText": "バイオリン弾きのバイオリン",
+    "armorArmoireBoxArmorNotes": "箱型の鎧：あなたにぴったり合っているから、しっかり座って……じゃない、あなたにぴったり合っているから、戦闘で着れば、勇敢な戦士のようになりますよ！知覚と体質がそれぞれ<%= attrs %>上がります。ラッキー宝箱：紙の騎士セット（3個中3個目のアイテム）。",
+    "armorArmoireBoxArmorText": "箱型の鎧",
+    "shieldArmoireHobbyHorseNotes": "自分への純粋なごほうびのために、このりりしいおもちゃの馬にまたがりましょう！知覚と体質がそれぞれ<%= attrs %>上がります。ラッキー宝箱：紙の騎士セット（3個中2個目のアイテム）。",
+    "shieldArmoireHobbyHorseText": "おもちゃの馬",
+    "weaponArmoireBambooCaneNotes": "散歩の完璧なお供であり、チャールストンを踊るのにも適しています。知能、知覚、体質がそれぞれ<%= attrs %>上がります。ラッキー宝箱：ボート遊びセット（3個中1個目のアイテム）。",
+    "weaponArmoireBambooCaneText": "竹のステッキ",
+    "armorArmoireBoatingJacketNotes": "このジャケットとネクタイを着ていれば、しゃれたヨットの上やおんぼろ自動車に乗っていても、ネコのようにくつろげます。力と知能と知覚がそれぞれ<%= attrs %>上がります。ラッキー宝箱：ボート遊びセット（3個中1個目のアイテム）。",
+    "armorArmoireBoatingJacketText": "ボート乗りのジャケット"
 }
diff --git a/website/common/locales/ja/groups.json b/website/common/locales/ja/groups.json
index f22b6b152a..71b01f1be9 100644
--- a/website/common/locales/ja/groups.json
+++ b/website/common/locales/ja/groups.json
@@ -325,7 +325,7 @@
     "approvalsTitle": "承認待ちのタスク",
     "upgradeTitle": "アップグレード",
     "blankApprovalsDescription": "あなたのグループが、あなたの承認を必要とするタスクを片付けた場合はここに表示されます!タスクの編集にて承認の条件について設定することができます。",
-    "userIsClamingTask": "<%= username %>が担当しています：<%= task %>",
+    "userIsClamingTask": "`<%= username %>が担当しています：`<%= task %>",
     "approvalRequested": "承認が申請されました",
     "refreshApprovals": "承認の更新",
     "refreshGroupTasks": "グループタスクの更新",
diff --git a/website/common/locales/ja/messages.json b/website/common/locales/ja/messages.json
index e525a18fe2..41bec2a0ef 100644
--- a/website/common/locales/ja/messages.json
+++ b/website/common/locales/ja/messages.json
@@ -54,7 +54,7 @@
     "messageCannotFlagSystemMessages": "システムメッセージを報告することはできません。このメッセージに関してコミュニティガイドラインの違反を報告する必要がある場合は、スクリーンショットと説明をコミュニティ管理者（<%= communityManagerEmail %>）にメールで送ってください。",
     "messageGroupChatSpam": "おおっと!たくさんのメッセージを投稿しすぎたようです!少しだけ待ってから再度お試しください。キャンプ場では200個のメッセージまでしか一度に表示されませんので,Habiticaでは熟慮と吟味がなされた返信を奨励しています。あなたが言いかけたことを楽しみにしています。:)",
     "messageCannotLeaveWhileQuesting": "あなたはクエストを実行中のため、このパーティーへの招待を承認できません。もしこのパーティーに加わりたい場合は、まずパーティー画面から実行中のクエストを中止してください。中止したクエストの巻物は手元に戻ります。",
-    "messageUserOperationProtected": "「<%= operation %>」パスは、保護されたパスなので保存できません。",
+    "messageUserOperationProtected": "`<%= operation %>`パスは、保護されたパスなので保存できません。",
     "messageUserOperationNotFound": "<%= operation %> の操作は見つかりません",
     "messageNotificationNotFound": "通知はありません。",
     "messageNotAbleToBuyInBulk": "このアイテムは1つ以上購入することができません。",
diff --git a/website/common/locales/ko/content.json b/website/common/locales/ko/content.json
index 76def92e79..c5ca819d68 100755
--- a/website/common/locales/ko/content.json
+++ b/website/common/locales/ko/content.json
@@ -148,40 +148,40 @@
     "questEggGuineaPigAdjective": "어지러운",
     "questEggPeacockText": "공작",
     "questEggPeacockMountText": "공작",
-    "questEggPeacockAdjective": "a prancing",
-    "questEggButterflyText": "Caterpillar",
+    "questEggPeacockAdjective": "거드름 피우는",
+    "questEggButterflyText": "애벌레",
     "questEggButterflyMountText": "나비",
     "questEggButterflyAdjective": "귀여운",
-    "questEggNudibranchText": "Nudibranch",
-    "questEggNudibranchMountText": "Nudibranch",
+    "questEggNudibranchText": "바다달팽이",
+    "questEggNudibranchMountText": "바다달팽이",
     "questEggNudibranchAdjective": "a nifty",
     "questEggHippoText": "하마",
     "questEggHippoMountText": "하마",
     "questEggHippoAdjective": "행복한",
     "questEggYarnText": "Yarn",
-    "questEggYarnMountText": "Flying Carpet",
+    "questEggYarnMountText": "하늘을 나는 양탄자",
     "questEggYarnAdjective": "woolen",
     "questEggPterodactylText": "Pterodactyl",
     "questEggPterodactylMountText": "Pterodactyl",
     "questEggPterodactylAdjective": "a trusting",
-    "questEggBadgerText": "Badger",
-    "questEggBadgerMountText": "Badger",
+    "questEggBadgerText": "오소리",
+    "questEggBadgerMountText": "오소리",
     "questEggBadgerAdjective": "a bustling",
-    "questEggSquirrelText": "Squirrel",
-    "questEggSquirrelMountText": "Squirrel",
-    "questEggSquirrelAdjective": "a bushy-tailed",
+    "questEggSquirrelText": "다람쥐",
+    "questEggSquirrelMountText": "다람쥐",
+    "questEggSquirrelAdjective": "털북숭이 꼬리의",
     "questEggSeaSerpentText": "Sea Serpent",
     "questEggSeaSerpentMountText": "Sea Serpent",
-    "questEggSeaSerpentAdjective": "a shimmering",
-    "questEggKangarooText": "Kangaroo",
-    "questEggKangarooMountText": "Kangaroo",
+    "questEggSeaSerpentAdjective": "반짝이는",
+    "questEggKangarooText": "캥거루",
+    "questEggKangarooMountText": "캥거루",
     "questEggKangarooAdjective": "a keen",
-    "questEggAlligatorText": "Alligator",
-    "questEggAlligatorMountText": "Alligator",
-    "questEggAlligatorAdjective": "a cunning",
+    "questEggAlligatorText": "악어",
+    "questEggAlligatorMountText": "악어",
+    "questEggAlligatorAdjective": "교활한",
     "questEggVelociraptorText": "벨로시랩터",
     "questEggVelociraptorMountText": "벨로시랩터",
-    "questEggVelociraptorAdjective": "a clever",
+    "questEggVelociraptorAdjective": "영리한",
     "eggNotes": "부화 물약을 찾아서 이 알에 부으면 <%= eggAdjective(locale) %> <%= eggText(locale) %>(으)로 부화합니다.",
     "hatchingPotionBase": "기본",
     "hatchingPotionWhite": "하얀색",
@@ -204,110 +204,143 @@
     "hatchingPotionHolly": "성스러운",
     "hatchingPotionCupid": "큐피드",
     "hatchingPotionShimmer": "희미하게 빛나는",
-    "hatchingPotionFairy": "Fairy",
+    "hatchingPotionFairy": "요정",
     "hatchingPotionStarryNight": "Starry Night",
-    "hatchingPotionRainbow": "Rainbow",
-    "hatchingPotionGlass": "Glass",
-    "hatchingPotionGlow": "Glow-in-the-Dark",
+    "hatchingPotionRainbow": "무지개",
+    "hatchingPotionGlass": "유리",
+    "hatchingPotionGlow": "야광",
     "hatchingPotionFrost": "Frost",
     "hatchingPotionIcySnow": "Icy Snow",
     "hatchingPotionNotes": "이것을 알에 부으면 <%= potText(locale) %> 펫으로 부화하게 됩니다.",
-    "premiumPotionAddlNotes": "퀘스트 펫 알에 사용할 수 없음",
+    "premiumPotionAddlNotes": "퀘스트 펫 알에 사용할 수 없음.  <%= date(locale) %> 까지 구매 가능.",
     "foodMeat": "고기",
-    "foodMeatThe": "the Meat",
-    "foodMeatA": "Meat",
+    "foodMeatThe": "고기",
+    "foodMeatA": "고기 한 덩이",
     "foodMilk": "우유",
-    "foodMilkThe": "the Milk",
-    "foodMilkA": "Milk",
+    "foodMilkThe": "우유",
+    "foodMilkA": "우유 한 컵",
     "foodPotatoe": "감자",
-    "foodPotatoeThe": "the Potato",
-    "foodPotatoeA": "a Potato",
+    "foodPotatoeThe": "감자",
+    "foodPotatoeA": "감자 한 개",
     "foodStrawberry": "딸기",
-    "foodStrawberryThe": "the Strawberry",
-    "foodStrawberryA": "a Strawberry",
+    "foodStrawberryThe": "딸기",
+    "foodStrawberryA": "딸기 하나",
     "foodChocolate": "초콜릿",
-    "foodChocolateThe": "the Chocolate",
-    "foodChocolateA": "Chocolate",
+    "foodChocolateThe": "초콜릿",
+    "foodChocolateA": "초콜릿 한 조각",
     "foodFish": "생선",
-    "foodFishThe": "the Fish",
-    "foodFishA": "a Fish",
+    "foodFishThe": "생선",
+    "foodFishA": "생선 한 마리",
     "foodRottenMeat": "썩은 고기",
-    "foodRottenMeatThe": "the Rotten Meat",
-    "foodRottenMeatA": "Rotten Meat",
+    "foodRottenMeatThe": "썩은 고기",
+    "foodRottenMeatA": "썩은 고기 한 덩이",
     "foodCottonCandyPink": "핑크 솜사탕",
-    "foodCottonCandyPinkThe": "the Pink Cotton Candy",
-    "foodCottonCandyPinkA": "Pink Cotton Candy",
+    "foodCottonCandyPinkThe": "핑크 솜사탕",
+    "foodCottonCandyPinkA": "핑크 솜사탕 하나",
     "foodCottonCandyBlue": "파란 솜사탕",
-    "foodCottonCandyBlueThe": "the Blue Cotton Candy",
-    "foodCottonCandyBlueA": "Blue Cotton Candy",
+    "foodCottonCandyBlueThe": "파란 솜사탕",
+    "foodCottonCandyBlueA": "파란 솜사탕 하나",
     "foodHoney": "꿀",
-    "foodHoneyThe": "the Honey",
-    "foodHoneyA": "Honey",
+    "foodHoneyThe": "꿀",
+    "foodHoneyA": "꿀 한 스푼",
     "foodCakeSkeleton": "말라빠진 케이크",
-    "foodCakeSkeletonThe": "the Bare Bones Cake",
-    "foodCakeSkeletonA": "a Bare Bones Cake",
+    "foodCakeSkeletonThe": "말라빠진 케이크",
+    "foodCakeSkeletonA": "말라빠진 케이크 한 조각",
     "foodCakeBase": "기본 케이크",
-    "foodCakeBaseThe": "the Basic Cake",
-    "foodCakeBaseA": "a Basic Cake",
+    "foodCakeBaseThe": "기본 케이크",
+    "foodCakeBaseA": "기본 케이크 한 조각",
     "foodCakeCottonCandyBlue": "캔디 블루 케이크",
-    "foodCakeCottonCandyBlueThe": "the Candy Blue Cake",
-    "foodCakeCottonCandyBlueA": "a Candy Blue Cake",
+    "foodCakeCottonCandyBlueThe": "캔디 블루 케이크",
+    "foodCakeCottonCandyBlueA": "캔디 블루 케이크 한 조각",
     "foodCakeCottonCandyPink": "캔디 핑크 케이크",
-    "foodCakeCottonCandyPinkThe": "the Candy Pink Cake",
-    "foodCakeCottonCandyPinkA": "a Candy Pink Cake",
-    "foodCakeShade": "초콜렛 케이크",
-    "foodCakeShadeThe": "the Chocolate Cake",
-    "foodCakeShadeA": "a Chocolate Cake",
+    "foodCakeCottonCandyPinkThe": "캔디 핑크 케이크",
+    "foodCakeCottonCandyPinkA": "캔디 핑크 케이크 한 조각",
+    "foodCakeShade": "초콜릿 케이크",
+    "foodCakeShadeThe": "초콜릿 케이크",
+    "foodCakeShadeA": "초콜릿 케이크 한 조각",
     "foodCakeWhite": "크림 케이크",
-    "foodCakeWhiteThe": "the Cream Cake",
-    "foodCakeWhiteA": "a Cream Cake",
+    "foodCakeWhiteThe": "크림 케이크",
+    "foodCakeWhiteA": "크림 케이크 한 조각",
     "foodCakeGolden": "꿀 케이크",
-    "foodCakeGoldenThe": "the Honey Cake",
-    "foodCakeGoldenA": "a Honey Cake",
+    "foodCakeGoldenThe": "꿀 케이크",
+    "foodCakeGoldenA": "꿀 케이크 한 조각",
     "foodCakeZombie": "썩은 케이크",
-    "foodCakeZombieThe": "the Rotten Cake",
-    "foodCakeZombieA": "a Rotten Cake",
+    "foodCakeZombieThe": "썩은 케이크",
+    "foodCakeZombieA": "썩은 케이크 한 조각",
     "foodCakeDesert": "모래 케이크",
-    "foodCakeDesertThe": "the Sand Cake",
-    "foodCakeDesertA": "a Sand Cake",
+    "foodCakeDesertThe": "모래 케이크",
+    "foodCakeDesertA": "모래 케이크 한 조각",
     "foodCakeRed": "딸기 케이크",
-    "foodCakeRedThe": "the Strawberry Cake",
-    "foodCakeRedA": "a Strawberry Cake",
+    "foodCakeRedThe": "딸기 케이크",
+    "foodCakeRedA": "딸기 케이크 한 조각",
     "foodCandySkeleton": "말라빠진 사탕",
-    "foodCandySkeletonThe": "the Bare Bones Candy",
-    "foodCandySkeletonA": "Bare Bones Candy",
+    "foodCandySkeletonThe": "말라빠진 사탕",
+    "foodCandySkeletonA": "말라빠진 사탕 한 개",
     "foodCandyBase": "기본 사탕",
-    "foodCandyBaseThe": "the Basic Candy",
-    "foodCandyBaseA": "Basic Candy",
+    "foodCandyBaseThe": "기본 사탕",
+    "foodCandyBaseA": "기본 사탕 한 개",
     "foodCandyCottonCandyBlue": "새콤한 파란 사탕",
-    "foodCandyCottonCandyBlueThe": "the Sour Blue Candy",
-    "foodCandyCottonCandyBlueA": "Sour Blue Candy",
+    "foodCandyCottonCandyBlueThe": "새콤한 파란 사탕",
+    "foodCandyCottonCandyBlueA": "새콤한 파란 사탕 한 개",
     "foodCandyCottonCandyPink": "새콤한 핑크 사탕",
-    "foodCandyCottonCandyPinkThe": "the Sour Pink Candy",
-    "foodCandyCottonCandyPinkA": "Sour Pink Candy",
-    "foodCandyShade": "초콜렛 사탕",
-    "foodCandyShadeThe": "the Chocolate Candy",
-    "foodCandyShadeA": "Chocolate Candy",
+    "foodCandyCottonCandyPinkThe": "새콤한 핑크 사탕",
+    "foodCandyCottonCandyPinkA": "새콤한 핑크 사탕 한 개",
+    "foodCandyShade": "초콜릿 사탕",
+    "foodCandyShadeThe": "초콜릿 사탕",
+    "foodCandyShadeA": "초콜릿 사탕 한 개",
     "foodCandyWhite": "바닐라 사탕",
-    "foodCandyWhiteThe": "the Vanilla Candy",
-    "foodCandyWhiteA": "Vanilla Candy",
+    "foodCandyWhiteThe": "바닐라 사탕",
+    "foodCandyWhiteA": "바닐라 사탕 한 개",
     "foodCandyGolden": "꿀 사탕",
-    "foodCandyGoldenThe": "the Honey Candy",
-    "foodCandyGoldenA": "Honey Candy",
+    "foodCandyGoldenThe": "꿀 사탕",
+    "foodCandyGoldenA": "꿀 사탕 한 개",
     "foodCandyZombie": "썩은 사탕",
-    "foodCandyZombieThe": "the Rotten Candy",
-    "foodCandyZombieA": "Rotten Candy",
+    "foodCandyZombieThe": "썩은 사탕",
+    "foodCandyZombieA": "썩은 사탕 한 개",
     "foodCandyDesert": "모래 사탕",
-    "foodCandyDesertThe": "the Sand Candy",
-    "foodCandyDesertA": "Sand Candy",
+    "foodCandyDesertThe": "모래 사탕",
+    "foodCandyDesertA": "모래 사탕 한 개",
     "foodCandyRed": "계피 사탕",
-    "foodCandyRedThe": "the Cinnamon Candy",
-    "foodCandyRedA": "Cinnamon Candy",
+    "foodCandyRedThe": "계피 사탕",
+    "foodCandyRedA": "계피 사탕 한 개",
     "foodSaddleText": "안장",
     "foodSaddleNotes": "즉시 펫 한마리를 탑승펫으로 성장시킵니다.",
-    "foodSaddleSellWarningNote": "Hey! This is a pretty useful item! Are you familiar with how to use a Saddle with your Pets?",
+    "foodSaddleSellWarningNote": "꽤 유용한 아이템을 구하셨군요! 펫에게 안장을 어떻게 써야하는지 알고 계시나요?",
     "foodNotes": "이것을 펫에게 먹이면 튼튼한 탑승펫으로 성장시킬 수 있습니다.",
     "questEggRobotText": "로봇",
     "questEggDolphinText": "돌고래",
-    "questEggDolphinMountText": "돌고래"
+    "questEggDolphinMountText": "돌고래",
+    "foodPieGoldenA": "황금빛 바나나크림 파이 한 조각",
+    "foodPieGoldenThe": "황금빛 바나나크림 파이",
+    "foodPieGolden": "황금빛 바나나크림 파이",
+    "foodPieCottonCandyBlueA": "블루베리 파이 한 조각",
+    "foodPieCottonCandyBlueThe": "블루베리 파이",
+    "foodPieCottonCandyBlue": "블루베리 파이",
+    "foodPieBaseA": "기본 사과 파이 한 조각",
+    "foodPieBaseThe": "기본 사과 파이",
+    "foodPieBase": "기본 사과 파이",
+    "premiumPotionUnlimitedNotes": "퀘스트 펫 알에 사용할 수 없음.",
+    "hatchingPotionSilver": "은빛",
+    "questEggRobotMountText": "로봇",
+    "foodPieWhiteA": "바닐라푸딩 파이 한 조각",
+    "foodPieWhiteThe": "바닐라푸딩 파이",
+    "foodPieWhite": "바닐라푸딩 파이",
+    "foodPieShadeA": "다크초콜릿 파이 한 조각",
+    "foodPieShadeThe": "다크초콜릿 파이",
+    "foodPieShade": "다크초콜릿 파이",
+    "foodPieRedA": "빨간 체리 파이 한 조각",
+    "foodPieRedThe": "빨간 체리 파이",
+    "foodPieRed": "빨간 체리 파이",
+    "foodPieDesertA": "사막 디저트 파이 한 조각",
+    "foodPieDesertThe": "사막 디저트 파이",
+    "foodPieDesert": "사막 디저트 파이",
+    "foodPieZombieA": "썩은 파이 한 조각",
+    "foodPieZombieThe": "썩은 파이",
+    "foodPieZombie": "썩은 파이",
+    "hatchingPotionSandSculpture": "모래 조각상",
+    "hatchingPotionRuby": "루비",
+    "hatchingPotionShadow": "그림자",
+    "hatchingPotionAurora": "오로라",
+    "hatchingPotionSunshine": "햇빛",
+    "hatchingPotionRoseQuartz": "로즈쿼츠"
 }
diff --git a/website/common/locales/ko/defaulttasks.json b/website/common/locales/ko/defaulttasks.json
index 9d6f1aea5d..792211b2b5 100755
--- a/website/common/locales/ko/defaulttasks.json
+++ b/website/common/locales/ko/defaulttasks.json
@@ -15,12 +15,12 @@
     "defaultTodo2Text": "Justin의 과제 튜토리얼 완료",
     "defaultTodo2Notes": "아래의 항목의 섹션들 모두 방문",
     "defaultReward1Text": "15분간 휴식",
-    "defaultReward1Notes": "맞춤형 보상은 본인이 원하는대로 정할 수 있습니다. 어떤 사람들은 가장 좋아하는 방송 프로그램을 골드를 지불해야만 볼 수 있도록 설정하기도 합니다.",
+    "defaultReward1Notes": "맞춤형 보상은 본인이 원하는 대로 정할 수 있습니다. 어떤 사람들은 가장 좋아하는 방송 프로그램을 골드를 지불해야만 볼 수 있도록 설정하기도 합니다.",
     "defaultReward2Text": "스스로에게 보상을 주세요",
     "defaultReward2Notes": "TV를 보거나, 게임을 하거나, 간식을 먹거나, 당신이 정하세요!",
     "defaultTag1": "회사업무",
     "defaultTag2": "운동",
-    "defaultTag3": "웰빙, 건강유지",
+    "defaultTag3": "웰빙, 건강 유지",
     "defaultTag4": "학교",
     "defaultTag5": "팀",
     "defaultTag6": "집안일",
@@ -33,7 +33,7 @@
     "healthTodoNotes": "눌러서 체크리스트를 추가하세요!",
     "healthDailyNotes": "눌러서 수정하세요!",
     "workTodoProjectNotes": "눌러서 현재 프로젝트의 이름이나 마감일을 정하세요",
-    "exerciseTodoNotes": "눌러서 체크리스트를 추가하세요",
+    "exerciseTodoNotes": "눌러서 체크리스트를 추가하세요!",
     "choresDailyNotes": "일정을 선택하려면 누르세요!",
     "choresHabit": "10분 청소",
     "selfCareTodoNotes": "실천할 계획을 지정하려면 누르세요!",
@@ -48,5 +48,13 @@
     "exerciseDailyNotes": "눌러서 스케줄 및 운동을 지정하세요!",
     "exerciseTodoText": "운동 일정 설정",
     "exerciseDailyText": "스트레칭 >> 일일 운동 순서",
-    "workDailyImportantTaskNotes": "가장 중요한 할 일로 지정하려면 누르세요"
+    "workDailyImportantTaskNotes": "가장 중요한 할 일로 지정하려면 누르세요",
+    "creativityTodoNotes": "눌러서 프로젝트 이름을 지정하세요.",
+    "creativityDailyNotes": "눌러서 현재 프로젝트 이름과 일정을 지정하세요!",
+    "defaultHabitNotes": "아니면 수정 화면에서 삭제할 수 있어요",
+    "defaultHabitText": "이제 그만두고 싶은 나쁜 습관으로 수정하고 싶다면 여기를 누르세요.",
+    "schoolTodoNotes": "눌러서 과제 이름과 마감일을 설정하세요!",
+    "schoolHabit": "공부하기/미루기",
+    "healthDailyText": "치실 사용하기",
+    "exerciseHabit": "유산소 운동 10분 >> 유산소 운동 10분 더하기(+)"
 }
diff --git a/website/common/locales/ko/tasks.json b/website/common/locales/ko/tasks.json
index b25b3fb71a..088becbc3d 100755
--- a/website/common/locales/ko/tasks.json
+++ b/website/common/locales/ko/tasks.json
@@ -5,21 +5,21 @@
     "sureDeleteCompletedTodos": "완료한 할 일 목록을 삭제하시겠습니까?",
     "lotOfToDos": "최근 완료한 할 일 30개가 이곳에 보여집니다.. 더 오래된 것은 데이터 > 데이터 보기 도구 및 데이터 > 데이터 내보내기 > 사용자 데이터에서 볼 수 있습니다.",
     "deleteToDosExplanation": "If you click the button below, all of your completed To-Dos and archived To-Dos will be permanently deleted, except for To-Dos from active challenges and Group Plans. Export them first if you want to keep a record of them.",
-    "addMultipleTip": "<strong>Tip:</strong> To add multiple <%= taskType %>, separate each one using a line break (Shift + Enter) and then press \"Enter.\"",
+    "addMultipleTip": "<strong>Tip:</strong>한 번에 여러 개 추가를 원한다면 <%= taskType %>, 줄 바꿈 (Shift + Enter)을 이용해서 한 줄에 하나씩 입력한 뒤 \"Enter\"를 누르시면 됩니다.",
     "addsingle": "하나 추가",
-    "addATask": "Add a <%= type %>",
-    "editATask": "Edit a <%= type %>",
-    "createTask": "Create <%= type %>",
+    "addATask": "<%= type %> 추가",
+    "editATask": "<%= type %> 수정",
+    "createTask": "<%= type %> 생성",
     "addTaskToUser": "할일 추가",
     "scheduled": "일정",
-    "theseAreYourTasks": "These are your <%= taskType %>",
+    "theseAreYourTasks": "<%= taskType %> 목록입니다.",
     "habit": "습관",
     "habits": "습관",
     "newHabit": "새로운 습관",
     "newHabitBulk": "새로운 습관들 (한 줄에 하나씩)",
-    "habitsDesc": "Habits don't have a rigid schedule. You can check them off multiple times per day.",
-    "positive": "Positive",
-    "negative": "Negative",
+    "habitsDesc": "습관은 정해진 시간에만 해야하는 항목이 아닙니다. 하루에 여러 번 체크해도 됩니다.",
+    "positive": "긍정적",
+    "negative": "부정적",
     "yellowred": "부족함",
     "greenblue": "강함",
     "edit": "수정",
@@ -27,9 +27,9 @@
     "addChecklist": "체크리스트 사용",
     "checklist": "체크리스트",
     "checklistText": "과제를 조금씩 나눠서 하세요! 해야 할 일에 체크리스트를 더하면 완료했을 때 얻는 경험치와 골드가 증가하고 빼먹은 일일과제에서 받는 데미지를 줄여줍니다.",
-    "newChecklistItem": "New checklist item",
+    "newChecklistItem": "새로운 체크리스트 항목",
     "expandChecklist": "체크리스트 확장",
-    "collapseChecklist": "Collapse Checklist",
+    "collapseChecklist": "체크리스트 접기",
     "text": "제목",
     "extraNotes": "세부사항",
     "notes": "Notes",
@@ -209,5 +209,6 @@
     "repeatDayError": "Please ensure that you have at least one day of the week selected.",
     "searchTasks": "Search titles and descriptions...",
     "sessionOutdated": "Your session is outdated. Please refresh or sync.",
-    "errorTemporaryItem": "This item is temporary and cannot be pinned."
+    "errorTemporaryItem": "This item is temporary and cannot be pinned.",
+    "addATitle": "제목 추가"
 }
diff --git a/website/common/locales/nl/faq.json b/website/common/locales/nl/faq.json
index 00ad4fb573..b6d1e89c46 100644
--- a/website/common/locales/nl/faq.json
+++ b/website/common/locales/nl/faq.json
@@ -5,13 +5,13 @@
     "androidFaqAnswer0": "Eerst stel je de taken in die je in je dagelijkse leven wil doen. Vervolgens, als je de taken volbrengt en afvinkt, verdien je ervaring en Goud. Goud wordt gebruikt om uitrustingsstukken en sommige voorwerpen te kopen, evenals voor aangepaste beloningen. Ervaring zorgt ervoor dat je karakter stijgt in niveau en dat je spelinhoud als huisdieren, vaardigheden en queesten vrijspeelt! Je kunt je karakter aanpassen onder Menu > [Boedel >] Avatar.\n\nWat simpele dingen om te beginnen: klik op de (+) in de rechter onderhoek om een nieuwe taak toe te voegen. Tik op een bestaande taak om hem aan te passen en veeg hem naar links om de taak te verwijderen. Je kunt taken sorteren door labels te gebruiken in de rechter bovenhoek en checklists in- en uitklappen door op het checklist-bolletje te klikken.",
     "webFaqAnswer0": "Allereerst creëer je de taken die je in je dagelijkse leven wil voltooien. Door vervolgens de taken te voltooien in het echte leven en deze af te vinken, verdien je ervaringspunten en goud. Goud wordt gebruikt om uitrusting en sommige voorwerpen te kopen, evenals persoonlijke beloningen. Ervaring zorgt ervoor dat je karakter omhoog gaat in speelniveau en dat je spelinhoud als huisdieren, vaardigheden en queesten vrijspeelt! Voor meer informatie kan je de de stap-voor-stap uitleg van het spel lezen op [Help -> Overzicht voor nieuwe gebruikers](https://habitica.com/static/overview).",
     "faqQuestion1": "Hoe stel ik mijn taken in?",
-    "iosFaqAnswer1": "Goede gewoonten (degenen met een +) zijn taken die je meerdere keren per dag kunt doen, zoals groenten eten. Slechte gewoonten (degenen met een -) zijn taken die je zou moeten nalaten, zoals op je nagels bijten. Gewoonten met een + en een - hebben een goede en een slechte keuze, bijvoorbeeld de trap nemen tegenover de lift nemen. Goede gewoonten belonen je met ervaring en goud. Slechte gewoonten doen je levenspunten verliezen.\n\nDagelijkse taken zijn taken die je iedere dag moet doen, zoals je tanden poetsen of je e-mail bekijken. Je kunt de dagen aanpassen waarop je een bepaalde dagelijkse taak moet doen door erop te drukken en hem te bewerken. Als je een dagelijkse taak overslaat op een dag dat hij gedaan moet worden, zal je avatar gedurende de nacht schade oplopen. Wees voorzichtig en voeg niet teveel dagelijkse taken tegelijk toe!\n\nTo-do's zijn de dingen die je nog een keer moet doen. Een to-do afvinken levert geld en ervaringspunten op. Je kunt nooit levenspunten kwijtraken door een to-do. Je kunt een geplande voltooiingsdatum toevoegen aan een to-do door er op te tikken om hem aan te passen.",
-    "androidFaqAnswer1": "Goede gewoontes (gewoontes met een +) zijn taken die je meerdere keren op een dag kan doen, zoals groenten eten. Slechte gewoontes (gewoontes met een -) zijn taken die je moet vermijden, zoals nagels bijten. Gewoontes met een + en een - hebben een goede keuze en een slechte keuze, zoals de trappen nemen tegenover de lift nemen. Goede gewoontes belonen je met ervaring en goud. Slechte gewoontes verlagen je gezondheid.\n\n\nDagelijkse taken zijn taken die je iedere dag moet doen, zoals je tanden poetsen of je email nakijken. Je kan de dagen waarop een dagelijkse taak gedaan moet worden instellen door erop te klikken om het te bewerken. Als je een dagelijkse taak mist die op die dag afgewerkt moest zijn, dan verliest je personage gezondheid de volgende dag. Wees voorzichtig en voeg niet te veel dagelijkse taken tegelijk toe!\n\n\nTo-do's zijn je To-do-lijst. Een to-do voltooien levert je goud en ervaring op. Je verliest nooit gezondheid van To-do's. Je kan de dag waarop een to-do afgewerkt moet zijn kiezen door erop te klikken en het te bewerken.",
-    "webFaqAnswer1": "* Goede gewoontes (gewoontes met een :heavy_plus_sign:) zijn taken die je meerdere keren op een dag kan doen, zoals groenten eten. Slechte gewoontes (gewoontes met een :heavy_minus_sign:) zijn taken die je moet vermijden, zoals nagels bijten. Gewoontes met een :heavy_plus_sign: en een :heavy_minus_sign: hebben een goede keuze en een slechte keuze, zoals de trappen nemen tegenover de lift nemen. Goede gewoontes belonen je met ervaring en goud. Slechte gewoontes verlagen je gezondheid.\n* Dagelijkse taken zijn taken die je iedere dag moet doen, zoals je tanden poetsen of je email nakijken. Je kan de dagen waarop een dagelijkse taak gedaan moet worden instellen door op het potlood-icoon te klikken en het te bewerken. Als je een dagelijkse taak mist die op die dag afgewerkt moest zijn, dan verliest je personage gezondheid de volgende dag. Wees voorzichtig en voeg niet te veel dagelijkse taken tegelijk toe.\n* To-do's zijn je To-do-lijst. Een to-do voltooien levert je goud en ervaring op. Je verliest nooit gezondheid van To-do's. Je kan de dag waarop een to-do afgewerkt moet zijn kiezen door op het potlood-icoon te klikken en het te bewerken.",
+    "iosFaqAnswer1": "Goede gewoonten (deze met een +) zijn taken die je meerdere keren per dag kunt doen, zoals groenten eten. Slechte gewoonten (deze met een -) zijn taken die je zou moeten nalaten, zoals op je nagels bijten. Gewoonten met een + en een - hebben een goede en een slechte optie, bijvoorbeeld de trap nemen tegenover de lift nemen. Goede gewoonten belonen je met ervaring en goud. Slechte gewoonten doen je levenspunten verliezen.\n\nDagelijkse taken zijn taken die je iedere dag moet doen, zoals je tanden poetsen of je e-mail bekijken. Je kunt de dagen aanpassen waarop je een bepaalde dagelijkse taak moet doen door erop te drukken en hem te bewerken. Als je een dagelijkse taak overslaat op een dag dat hij gedaan moet worden, zal je avatar gedurende de nacht schade oplopen. Wees voorzichtig en voeg niet teveel dagelijkse taken tegelijk toe!\n\n'To do's' zijn de dingen die je maar één keer moet uitvoeren. Een 'to do' afvinken levert geld en ervaringspunten op. Je kunt nooit levenspunten kwijtraken door een 'to do'. Je kunt een geplande voltooiingsdatum toevoegen aan een 'to do' door hem aan te klikkenen vervolgens aan te passen.",
+    "androidFaqAnswer1": "Goede gewoonten (deze met een +) zijn taken die je meerdere keren per dag kunt doen, zoals groenten eten. Slechte gewoonten (deze met een -) zijn taken die je zou moeten nalaten, zoals op je nagels bijten. Gewoonten met een + en een - hebben een goede en een slechte optie, bijvoorbeeld de trap nemen tegenover de lift nemen. Goede gewoonten belonen je met ervaring en goud. Slechte gewoonten doen je levenspunten verliezen.\n\nDagelijkse taken zijn taken die je iedere dag moet doen, zoals je tanden poetsen of je e-mail bekijken. Je kunt de dagen aanpassen waarop je een bepaalde dagelijkse taak moet doen door erop te drukken en hem te bewerken. Als je een dagelijkse taak overslaat op een dag dat hij gedaan moet worden, zal je avatar gedurende de nacht schade oplopen. Wees voorzichtig en voeg niet teveel dagelijkse taken tegelijk toe!\n\n'To do's' zijn de dingen die je maar één keer moet uitvoeren. Een 'to do' afvinken levert geld en ervaringspunten op. Je kunt nooit levenspunten kwijtraken door een 'to do'. Je kunt een geplande voltooiingsdatum toevoegen aan een 'to do' door hem aan te klikkenen vervolgens aan te passen.",
+    "webFaqAnswer1": "* Goede gewoonten (deze met een +) zijn taken die je meerdere keren per dag kunt doen, zoals groenten eten. Slechte gewoonten (deze met een -) zijn taken die je zou moeten nalaten, zoals op je nagels bijten. Gewoonten met een + en een - hebben een goede en een slechte optie, bijvoorbeeld de trap nemen tegenover de lift nemen. Goede gewoonten belonen je met ervaring en goud. Slechte gewoonten doen je levenspunten verliezen.\n* Dagelijkse taken zijn taken die je iedere dag moet doen, zoals je tanden poetsen of je e-mail bekijken. Je kunt de dagen aanpassen waarop je een bepaalde dagelijkse taak moet doen door erop te drukken en hem te bewerken. Als je een dagelijkse taak overslaat op een dag dat hij gedaan moet worden, zal je avatar gedurende de nacht schade oplopen. Wees voorzichtig en voeg niet teveel dagelijkse taken tegelijk toe!\n* 'To do's' zijn de dingen die je maar één keer moet uitvoeren. Een 'to do' afvinken levert geld en ervaringspunten op. Je kunt nooit levenspunten kwijtraken door een 'to do'. Je kunt een geplande voltooiingsdatum toevoegen aan een 'to do' door hem aan te klikkenen vervolgens aan te passen.",
     "faqQuestion2": "Welke soort taken kunnen er zijn?",
-    "iosFaqAnswer2": "De wiki heeft vier lijsten van voorbeeldtaken om als inspiratie te gebruiken:\n<br><br>\n* [Voorbeeld gewoontes](https://habitica.fandom.com/nl/wiki/Voorbeeldgewoontes)\n* [Voorbeeld dagelijkse taken](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_dagelijkse_taken)\n* [Voorbeeld to-do's](https://habitica.fandom.com/nl/wiki/Voorbeeld_To-do%27s)\n* [Voorbeeld persoonlijke beloningen](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_aangepaste_beloningen)",
-    "androidFaqAnswer2": "De wiki bevat vier lijsten van voorbeelden van taken om te gebruiken voor inspiratie:\n<br><br>\n * [Voorbeelden van gewoontes](https://habitica.fandom.com/nl/wiki/Voorbeeldgewoontes)\n * [Voorbeelden van dagelijkse taken](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_dagelijkse_taken)\n * [Voorbeelden van to-do's](https://habitica.fandom.com/nl/wiki/Voorbeeld_To-do%27s)\n * [Voorbeelden van aangepaste beloningen](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_aangepaste_beloningen)",
-    "webFaqAnswer2": "De wiki heeft vier lijsten van voorbeeldtaken om als inspiratie te gebruiken:\n* [Voorbeeld gewoontes](https://habitica.fandom.com/nl/wiki/Voorbeeldgewoontes)\n* [Voorbeeld dagelijkse taken](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_dagelijkse_taken)\n* [Voorbeeld to-do's](https://habitica.fandom.com/nl/wiki/Voorbeeld_To-do%27s)\n* [Voorbeeld persoonlijke beloningen](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_aangepaste_beloningen)",
+    "iosFaqAnswer2": "De wiki bevat vier lijsten van voorbeeldtaken om te gebruiken bij wijze van inspiratie:\n<br><br>\n* [Voorbeeld van Gewoontes](https://habitica.fandom.com/nl/wiki/Voorbeeldgewoontes)\n* [Voorbeeld van Dagelijkse Taken](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_dagelijkse_taken)\n* [Voorbeeld van To Do's](https://habitica.fandom.com/nl/wiki/To-do%27s)\n* [Voorbeeld van Persoonlijke Beloningen](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_aangepaste_beloningen)",
+    "androidFaqAnswer2": "De wiki bevat vier lijsten van voorbeeldtaken om te gebruiken bij wijze van inspiratie:\n<br><br>\n* [Voorbeeld van Gewoontes](https://habitica.fandom.com/nl/wiki/Voorbeeldgewoontes)\n* [Voorbeeld van Dagelijkse Taken](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_dagelijkse_taken)\n* [Voorbeeld van To Do's](https://habitica.fandom.com/nl/wiki/To-do%27s)\n* [Voorbeeld van Persoonlijke Beloningen](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_aangepaste_beloningen)",
+    "webFaqAnswer2": "De wiki bevat vier lijsten van voorbeeldtaken om te gebruiken bij wijze van inspiratie:\n* [Voorbeeld van Gewoontes](https://habitica.fandom.com/nl/wiki/Voorbeeldgewoontes)\n* [Voorbeeld van Dagelijkse Taken](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_dagelijkse_taken)\n* [Voorbeeld van To Do's](https://habitica.fandom.com/nl/wiki/To-do%27s)\n* [Voorbeeld van Persoonlijke Beloningen](https://habitica.fandom.com/nl/wiki/Voorbeelden_van_aangepaste_beloningen)",
     "faqQuestion3": "Waarom veranderen mijn taken van kleur?",
     "iosFaqAnswer3": "Je taken veranderen van kleur afhankelijk van hoe goed je ze op dat moment voltooit! Iedere taak begint als neutraal geel. Voltooi dagelijkse taken of positieve gewoonten en ze veranderen naar blauw. Mis een dagelijkse taak of geef toe aan een slechte gewoonte en de taak verandert naar rood. Hoe roder de taak, hoe meer je beloond zult worden, maar als het een dagelijkse taak of slechte gewoonte is, des te meer schade doet hij je! Dit helpt je te motiveren om problematische taken te voltooien.",
     "androidFaqAnswer3": "Je taken veranderen van kleur op basis van hoe goed je ze momenteel uitvoert! Elke nieuwe taak begint als neutraal geel. Wanneer je dagelijkse taken of positieve gewoonten vaker uitvoert, worden ze blauwer. Een dagelijkse taak missen of toegeven aan een slechte gewoonte maakt de taak roder. Hoe roder de taak, hoe meer beloningen je ervan krijgt, maar als het een dagelijkse taak of een slechte gewoonte is, zal het je ook meer schade toebrengen! Dit helpt om je te motiveren de taken waarmee je moeite hebt te volbrengen.",
diff --git a/website/common/locales/nl/gear.json b/website/common/locales/nl/gear.json
index a559ab4df2..02c398c06f 100644
--- a/website/common/locales/nl/gear.json
+++ b/website/common/locales/nl/gear.json
@@ -786,8 +786,8 @@
     "armorArmoireCandlestickMakerOutfitNotes": "This sturdy set of clothes will protect you from hot wax spills as you ply your craft! Increases Constitution by <%= con %>. Enchanted Armoire: Candlestick Maker Set (Item 1 of 3).",
     "armorArmoireWovenRobesText": "Geweven gewaad",
     "armorArmoireWovenRobesNotes": "Display your weaving work proudly by wearing this colorful robe! Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Weaver Set (Item 1 of 3).",
-    "armorArmoireLamplightersGreatcoatText": "Lamplighter's Greatcoat",
-    "armorArmoireLamplightersGreatcoatNotes": "This heavy woolen coat can stand up to the harshest wintry night! Increases Perception by <%= per %>. Enchanted Armoire: Lamplighter's Set (Item 2 of 4).",
+    "armorArmoireLamplightersGreatcoatText": "Grote mantel voor Lampaanstekers",
+    "armorArmoireLamplightersGreatcoatNotes": "Deze zwaren wollen mantel maakt dat je de koudste winternacht trotseert! Verhoogt Perceptie met <%= per %>. Betoverd Kabinet: Lampaanstekersset (Item 2 van 4).",
     "armorArmoireCoachDriverLiveryText": "Coach Driver's Livery",
     "armorArmoireCoachDriverLiveryNotes": "This heavy overcoat will protect you from the weather as you drive. Plus it looks pretty snazzy, too! Increases Strength by <%= str %>. Enchanted Armoire: Coach Driver Set (Item 1 of 3).",
     "armorArmoireRobeOfDiamondsText": "Gewaad van diamanten",
@@ -801,9 +801,9 @@
     "armorArmoireBluePartyDressText": "Blauwe gezelschaps jurk",
     "armorArmoireBluePartyDressNotes": "You're perceptive, tough, smart, and so fashionable! Increases Perception, Strength, and Constitution by <%= attrs %> each. Enchanted Armoire: Blue Hairbow Set (Item 2 of 2).",
     "armorArmoirePiraticalPrincessGownText": "Piraten princes jurk",
-    "armorArmoirePiraticalPrincessGownNotes": "This luxuriant garment has many pockets for concealing weapons and loot! Increases Perception by <%= per %>. Enchanted Armoire: Piratical Princess Set (Item 2 of 4).",
-    "armorArmoireJeweledArcherArmorText": "Jeweled Archer Armor",
-    "armorArmoireJeweledArcherArmorNotes": "This finely crafted armor will protect you from projectiles or errant red Dailies! Increases Constitution by <%= con %>. Enchanted Armoire: Jeweled Archer Set (Item 2 of 3).",
+    "armorArmoirePiraticalPrincessGownNotes": "Deze luxueuse tooi heeft vele zakken om wapens en buit te verbergen! Verhoogt Perceptie met <%= per %>. Betoverd Kabinet: Piratige princessenset (Item 2 van 4).",
+    "armorArmoireJeweledArcherArmorText": "Boogschutterpantser bezet met juwelen",
+    "armorArmoireJeweledArcherArmorNotes": "Dit superieur vervaardigd pantser zal je beschermen tegen geschut of verdwaalde rode Dagelijkse taken! Verhoogt Lichaam met <%= con %>. Betoverd Kabinet: Juwelen Boogschutterset (Item 2 van 3).",
     "armorArmoireCoverallsOfBookbindingText": "Coveralls of Bookbinding",
     "armorArmoireCoverallsOfBookbindingNotes": "Everything you need in a set of coveralls, including pockets for everything. A pair of goggles, loose change, a golden ring... Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Bookbinder Set (Item 2 of 4).",
     "armorArmoireRobeOfSpadesText": "Robe of Spades",
@@ -1530,7 +1530,7 @@
     "backMystery201704Text": "Sprookjesvleugels",
     "backMystery201704Notes": "Deze glimmende vleugels zullen je overal brengen, zelfs de verborgen rijken beheerst door magische wezens. Verleent geen voordelen. April 2017 abonnee voorwerp.",
     "backMystery201706Text": "Aan flarden gescheurde vrijbuitersvlag",
-    "backMystery201706Notes": "Het gezicht van deze Jolly Roger-emblazoned vlag vult elke dag, of dagelijks, met vrees! Geen voordeel uitbetaald. Juni 2017 Abonnee Item.",
+    "backMystery201706Notes": "Het zicht van deze Jolly Roger-versierde vlag alleen al vervult elke To Do of Dagelijkse Taak met vrees! Levert geen voordelen. Juni 2017 item voor Abonnees.",
     "backMystery201709Text": "Opeengestapelde Toverboeken",
     "backMystery201709Notes": "Het leren van magie vereist veel lezen, maar je zal zeker genieten van je studies! Verleent geen voordelen. Abonnee-uitrusting september 2017.",
     "backMystery201801Text": "Vorstflitsvleugels",
@@ -1744,9 +1744,9 @@
     "eyewearMystery301703Text": "Pauw maskerade masker",
     "eyewearMystery301703Notes": "Perfect voor een elegante maskerade of om geniepig door een mooi gekleed publiek te bewegen. Verleent geen voordelen. Abonnee-artikel Maart 3017.",
     "eyewearArmoirePlagueDoctorMaskText": "Pestmeestersmasker",
-    "eyewearArmoirePlagueDoctorMaskNotes": "An authentic mask worn by the doctors who battle the Plague of Procrastination. Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Plague Doctor Set (Item 2 of 3).",
+    "eyewearArmoirePlagueDoctorMaskNotes": "Een authentiek masker dat gedragen wordt door dokters die de strijd aangaan met de Uitstelplaag. Verhoogt Lichaam en Intelligentie elk met <%=attrs%>. Betoverd Kabinet: Pestmeestersset (Item 2 van 3).",
     "eyewearArmoireGoofyGlassesText": "Gekke Bril",
-    "eyewearArmoireGoofyGlassesNotes": "Perfect for going incognito or just making your partymates giggle. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "eyewearArmoireGoofyGlassesNotes": "Perfect om incognito te gaan of alleen maar om je gezelschap aan het gniffelen te brengen. Verhoogt Perceptie met <%=%>. Betoverd Kabinet: Onafhankelijk item.",
     "twoHandedItem": "Tweehandig voorwerp.",
     "weaponSpecialSpring2019RogueText": "Bliksemschicht",
     "weaponSpecialSpring2019RogueNotes": "Deze wapens bevatten de kracht van de lucht en de regen. We raden aan dat je ze niet gebruikt wanneer je jou in het water bevindt. Verhoogte Sterkte met <%= str %>. Beperkte Editie 2019 Voorjaarsuitrusting.",
diff --git a/website/common/locales/nl/maintenance.json b/website/common/locales/nl/maintenance.json
index 4ff1d44bf2..8411d851fe 100644
--- a/website/common/locales/nl/maintenance.json
+++ b/website/common/locales/nl/maintenance.json
@@ -11,23 +11,23 @@
     "maintenanceInfoWhat": "Wat gebeurt er?",
     "maintenanceInfoWhatText": "Op 21 Mei, zal Habitica uit de lucht zijn wegens onderhoud voor bijna de gehele dag. Je zult geen schade aan ondervinden of schade krijgen in het weekend, zelfs als je niet kan inloggen voor het afvinken van je Dagtaken. We zullen zo hard mogelijk werken om zo snel mogelijk weer in de lucht te zijn en plaatsen updates op <a href='https://twitter.com/habitica' target='_blank'> onze Twitter-account</a>. Aan het einde van het onderhoud ontvangt iedereen als bedankje voor het geduld een zeldzaam dier!",
     "maintenanceInfoWhy": "Waarom gebeurt dit?",
-    "maintenanceInfoWhyText": "De afgelopen maanden hebben wij achter de schermen hard nagedacht over Habitica. We hebben vooral de API herschreven. Hoewel dit op het eerste gezicht niet heel anders lijkt te zijn, is er in werkelijkheid heel veel vernieuwd. Dit geeft ons veel meer flexibiliteit wanneer we in de toekomst andere functies willen toevoegen, en het leidt tot verbeterde prestaties!",
-    "maintenanceInfoTechDetails": "Wil je meer details over de technische kant van het proces? Bezoek <a href='http://devs.habitica.com/' target='_blank'>The Forge, ons dev blog</a>.",
+    "maintenanceInfoWhyText": "De afgelopen maanden hebben wij achter de schermen hard nagedacht over een make-over voor Habitica. We hebben vooral de API herschreven. Hoewel dit op het eerste gezicht niet heel anders lijkt te zijn, is er in werkelijkheid heel wat vernieuwd. Dit geeft ons veel meer flexibiliteit wanneer we in de toekomst andere functies willen toevoegen, en het leidt tot verbeterde prestaties!",
+    "maintenanceInfoTechDetails": "Wil je meer details over de technische kant van het proces? Bezoek <a href='http://devs.habitica.com/' target='_blank'>De Smidse, ons dev blog</a>.",
     "maintenanceInfoMore": "Meer informatie",
     "maintenanceInfoAccountChanges": "Wat voor veranderingen zie ik in mijn account nadat de herschrijving voltooid is?",
-    "maintenanceInfoAccountChangesText": "In het begin zullen er geen noemenswaardige veranderingen zijn behalve prestatieverbetering voor functies zoals uitdagingen. Als je veranderingen opmerkt die er niet zou moeten zijn, stuur dan een e-mail naar <%= hrefTechAssistanceEmail %> en we zullen het voor je uitzoeken!",
+    "maintenanceInfoAccountChangesText": "In het begin zullen er geen noemenswaardige veranderingen zijn behalve prestatieverbetering voor functies zoals Uitdagingen. Als je veranderingen opmerkt die er niet zouden moeten zijn, stuur dan een e-mail naar <%= hrefTechAssistanceEmail %> en we zullen het voor je uitzoeken!",
     "maintenanceInfoAddFeatures": "Wat voor functies zal dit Habitica in staat stellen toe te voegen?",
-    "maintenanceInfoAddFeaturesText": "Alles herschrijven zal ons in staat stellen om een verbeterde chat in de gilden te plaatsen, plannen op te stellen voor organisaties en families, additionele productiviteitsfuncties als maandelijkse taken en de mogelijkheid om taken van gisteren af te vinken. Dit zijn allemaal op zichzelf staande functies, dus het kost tijd om ze te bouwen, maar het was onmogelijk om eraan te beginnen voordat alles herschreven is.",
+    "maintenanceInfoAddFeaturesText": "Alles herschrijven zal ons in staat stellen om een verbeterde chat in de gilden te plaatsen, plannen op te stellen voor organisaties en families, additionele productiviteitsfuncties zoals maandelijkse taken en de mogelijkheid om taken van gisteren af te vinken. Dit zijn allemaal op zichzelf staande functies, dus het kost tijd om ze te bouwen, maar het was onmogelijk om eraan te beginnen voordat alles herschreven is.",
     "maintenanceInfoHowLong": "Hoe lang zal dit onderhoud duren?",
-    "maintenanceInfoHowLongText": "We moeten taken en data verhuizen voor alle 1,3 miljoen Habitica gebruikers -- geen makkelijke taak! We verwachten dat het plaats zal vinden tussen 13:00 uur Pacifische tijd (20:00 uur UTC) en 22:00 uur Pacifische tijd (5:00 uur UTC). Wees gerust, we doen er alles aan om het zo snel mogelijk te volbrengen. Je kunt updates volgen <a href='https://twitter.com/habitica' target='_blank'>op onze Twitter</a>.",
+    "maintenanceInfoHowLongText": "We moeten taken en data verhuizen voor alle 1,3 miljoen Habitica gebruikers -- geen makkelijke taak! We verwachten dat dit plaats zal vinden tussen 13:00 uur Pacifische tijd (20:00 uur UTC) en 22:00 uur Pacifische tijd (5:00 uur UTC). Wees gerust, we doen er alles aan om het zo snel mogelijk te volbrengen. Je kunt updates volgen <a href='https://twitter.com/habitica' target='_blank'>op onze Twitter</a>.",
     "maintenanceInfoStatsAffected": "Wat voor effect heeft dit op mijn Dagtaken, Series, Versterkingen en Queesten?",
-    "maintenanceInfoStatsAffectedText1": "Je zult GEEN enkele schade of verlies van streak krijgen dit weekend, je dag zal normaal resetten. Dagelijkse taken die je afgevinkt hebt zullen weer on-aangevinkt worden, buffs gereset etc. Als je in een verzamelqueeste zit, zul je nog steeds voorwerpen vinden. Als je in een eindbazengevecht zit, zul jij nog steeds schade toebrengen aan de baas maar de baas niet aan jou. (Ook monsters hebben immers een pauze nodig!)",
-    "maintenanceInfoStatsAffectedText2": "Na lang nagedacht te hebben, kwam ons team tot de conlusie dat dit het eerlijkste manier was om om te gaan met het feit dat veel gebruikers niet in staat waren om hun Dagtaken af te vinken tijdens het onderhoud. Onze excuses voor het ongemak dat hierdoor wordt veroorzaakt!",
+    "maintenanceInfoStatsAffectedText1": "Je zult GEEN enkele schade of verlies van streak krijgen dit weekend, je dag zal normaal resetten. Dagelijkse taken die je afgevinkt had zullen weer onafgevinkt staan, buffs gereset etc. Als je in een verzamelqueeste zit, zul je nog steeds voorwerpen vinden. Als je in een eindbazengevecht zit, zul jij nog steeds schade toebrengen aan de baas maar de baas niet aan jou. (Ook monsters hebben immers een pauze nodig!)",
+    "maintenanceInfoStatsAffectedText2": "Na lang nagedacht te hebben, kwam ons team tot de conclusie dat dit de eerlijkste manier was om goed te maken voor het feit dat veel gebruikers niet in staat waren om hun Dagelijkse Taken af te vinken tijdens het onderhoud. Onze excuses voor het ongemak dat hierdoor werd veroorzaakt!",
     "maintenanceInfoSeeTasks": "Wat als ik mijn takenlijst moet zien?",
-    "maintenanceInfoSeeTasksText": "Als je al weet dat je zaterdag je takenlijst moet bekijken voor jezelf, dan raden wij het je aan om een screenshot te nemen van je takenlijst, vóór het onderhoud, zodat je daarop kunt kijken.",
+    "maintenanceInfoSeeTasksText": "Als je al weet dat je zaterdag je takenlijst moet bekijken, dan raden wij je aan om een screenshot te nemen van je takenlijst vóór het onderhoud, zodat je daarop je daginvulling zal kunnen volgen tijdens het siteonderhoud.",
     "maintenanceInfoRarePet": "Wat voor zeldzaam dier zal ik ontvangen?",
-    "maintenanceInfoRarePetText": "Aan het einde van het onderhoud, ontvangt iedereen als bedankje voor het geduld een Veteraandier! Als je nooit een Veteraandier hebt ontvangen zul je nu een Veteraanwolf krijgen. Als je al een Veteraanwolf hebt zul je een Veteraantijger krijgen. Als je beide al hebt dan zul je een nooit eerder gezien Veteraandier ontvangen. Na het Onderhoud kan het enkele uren duren voordat je het dier kunt zien, maar wees niet ongerust: iedereen krijgt er een.",
+    "maintenanceInfoRarePetText": "Aan het einde van het onderhoud, ontvangt iedereen als bedankje voor het geduld een Veteraandier! Als je nooit een Veteraandier hebt ontvangen zul je nu een Veteraanwolf krijgen. Als je al een Veteraanwolf hebt zul je een Veteraantijger krijgen. En als al je beide hebt, dan zul je een nooit eerder gezien Veteraandier ontvangen! Na het technisch onderhoud kan het enkele uren duren voordat je het Veteraandier zal zien, maar wees niet ongerust: iedereen krijgt er een.",
     "maintenanceInfoWho": "Wie heeft er gewerkt aan dit enorme project?",
-    "maintenanceInfoWhoText": "We zijn blij dat je het vraagt! Het is gelukt door onze fantastische contributor Paglias, met veel hulp van Blade, TheHollidayInn, SabreCat, Victor Pudeyev, TheUnknown en Alys.",
-    "maintenanceInfoTesting": "De nieuwe versie is ontelbaar keer getest door een stel geweldige open-source vrijwilligers. Bedankt, we konden dit niet doen zonder jullie."
+    "maintenanceInfoWhoText": "We zijn blij dat je het vraagt! Het is gelukt door onze fantastische bijdrager Paglias, en met veel hulp van Blade, TheHollidayInn, SabreCat, Victor Pudeyev, TheUnknown en Alys.",
+    "maintenanceInfoTesting": "De nieuwe versie is ontelbare keren getest door een stel geweldige open-source vrijwilligers. Bedankt, we zouden hier zonder jullie nooit in geslaagd zijn."
 }
diff --git a/website/common/locales/nl/pets.json b/website/common/locales/nl/pets.json
index c577a1ac7f..bdcd55b36f 100644
--- a/website/common/locales/nl/pets.json
+++ b/website/common/locales/nl/pets.json
@@ -145,5 +145,8 @@
     "notEnoughPetsMounts": "Je hebt niet genoeg huis- en rijdieren verzameld",
     "filterByWacky": "Maf",
     "gryphatrice": "Grifalisk",
-    "wackyPets": "Maffe Huisdieren"
+    "wackyPets": "Maffe Huisdieren",
+    "invalidAmount": "Ongeldige hoeveelheid voedsel, moet een positief geheel getal zijn",
+    "tooMuchFood": "Je probeert je huisdier teveel voedsel te voeren, handeling geannuleerd",
+    "notEnoughFood": "Je hebt niet genoeg voedsel"
 }
diff --git a/website/common/locales/pl/achievements.json b/website/common/locales/pl/achievements.json
index 770b652cc4..f6e5e0bc2f 100644
--- a/website/common/locales/pl/achievements.json
+++ b/website/common/locales/pl/achievements.json
@@ -81,5 +81,8 @@
     "achievementTickledPink": "Łaskocący Róż",
     "achievementAllYourBase": "Wszystkie podstawowe",
     "achievementMindOverMatterModalText": "Wypełniłeś(-aś) misje z chowańcami: Skałą, Piankowym Śluzem i Przędzą!",
-    "achievementMindOverMatterText": "Ukończono misje z chowańcami: Skałą, Piankowym Śluzem i Przędzą."
+    "achievementMindOverMatterText": "Ukończono misje z chowańcami: Skałą, Piankowym Śluzem i Przędzą.",
+    "achievementFreshwaterFriendsModalText": "Ukończyłeś(-aś) misje z chowańcami: Aksolotlem, Żabą i Hipopotamem!",
+    "achievementFreshwaterFriendsText": "Ukończono misje z chowańcami: Aksolotlem, Żabą i Hipciem.",
+    "achievementFreshwaterFriends": "Słodkowodni Przyjaciele"
 }
diff --git a/website/common/locales/pl/communityguidelines.json b/website/common/locales/pl/communityguidelines.json
index 2e7ce814fb..a1d7b26bdd 100644
--- a/website/common/locales/pl/communityguidelines.json
+++ b/website/common/locales/pl/communityguidelines.json
@@ -24,7 +24,7 @@
     "commGuideList02L": "<strong>Mocno odradzamy wymianę danych osobowych w publicznych miejscach rozmów - zwłaszcza informacji umożliwiających identyfikację użytkownika</strong>. Dane identyfikacyjne mogą obejmować między innymi: twój adres zamieszkania, twój adres e-mail oraz twój token API/hasło. To dla twojego bezpieczeństwa! Personel lub moderatorzy mogą usunąć takie wiadomości wg własnego uznania. Jeżeli ktoś zapyta cię o informację osobową w prywatnej gildii, drużynie czy w prywatnej wiadomości, stanowczo zalecamy, aby uprzejmie odmówić oraz zawiadomić personel i moderatorów poprzez: 1) oflagowanie wiadomości, jeśli jest ona opublikowana w drużynie lub prywatnej gildii, lub 2) wypełniając <a href='https://contact.habitica.com/' target='_blank'>Formularz Kontaktu z Moderatorem</a> i załączając zrzuty ekranów.",
     "commGuidePara019": "<strong>W prywatnych miejscach</strong>, użytkownicy mają większą swobodę w dyskusjach na dowolne tematy, jednakże nadal nie mogą naruszać Zasad i Warunków, włączając publikowanie obelg, treści dyskryminujących, agresywnych czy zawierających groźby. Pamiętaj, że nazwy Wyzwań pojawiają się w publicznej części profilu zwycięzcy, dlatego też WSZYSTKIE nazwy Wyzwań muszą być zgodne z wytycznymi, nawet jak są tworzone w prywatnych miejscach.",
     "commGuidePara020": "<strong>Prywatnymi wiadomościami (PW)</strong> rządzi kilka dodatkowych wytycznych. Jeżeli ktoś Cię zablokował, nie kontaktuj się z tą osobą nigdzie indziej, aby poprosić o odblokowanie. Poza tym, nie powinno się wysyłać prywatnych wiadomości do kogoś, kto prosi o pomoc w rozwiązaniu problemu (publiczne odpowiedzi na takie pytania są pomocne dla społeczności). Ostatnia zasada: nie wolno wysyłać nikomu prywatnych wiadomości zachęcających do podzielenia się klejnotami lub subskrypcji, ponieważ uznaje się to za spam.",
-    "commGuidePara020A": "<strong>Jeśli zobaczysz wpis, który Twoim zdaniem narusza opisane powyżej wytyczne przestrzeni publicznej lub wpis, którego się obawiasz albo wprowadza Cię w zakłopotanie, możesz zwrócić uwagę Moderatorów i Zespołu zgłaszając go poprzez kliknięcie ikonki z flagą</strong>. Członek zespołu lub Moderator zajmie się tą sprawą, tak szybko, jak to będzie możliwe. Pamiętaj, że umyślne zgłaszanie niewinnych postów stanowi naruszenie niniejszych Wytycznych (patrz poniżej w \"Naruszeniach\"). Wiadomości prywatne (PM) nie mogą obecnie być zgłaszane w ten sposób, jeśli więc potrzebujesz zgłosić Wiadomość Prywatną, proszę skontaktować się z Moderatorami poprzez formularz na stronie \"Skontaktuj się z nami\" do której masz również dostęp z menu Pomocy poprzez kliknięcie “<a href='https://contact.habitica.com/' target='_blank'>Skontaktuj się z Drużyną Moderatorów</a>.” Możesz to zrobić również wtedy, gdy pojawiło się wiele problematycznych wpisów tej samej osoby w różnych gildiach lub jeśli sytuacja wymaga wyjaśnienia. Możesz napisać do nas w swoim ojczystym języku jeśli tak jest Tobie łatwiej: możemy potrzebować skorzystać z tłumacza Google, ale chcemy, abyś czuł się swobodnie, kontaktując się z nami w sprawie jakiegoś problemu.",
+    "commGuidePara020A": "<strong>Jeśli zobaczysz wpis lub prywatną wiadomość, które Twoim zdaniem naruszają opisane powyżej wytyczne przestrzeni publicznej albo wpis lub prywatną wiadomość, których się obawiasz albo wprowadzają Cię w zakłopotanie, możesz zwrócić uwagę Moderatorów i Zespołu zgłaszając go poprzez kliknięcie ikonki z flagą</strong>. Członek zespołu lub Moderator zajmie się tą sprawą, tak szybko, jak to będzie możliwe. Pamiętaj, że umyślne zgłaszanie niewinnych postów stanowi naruszenie niniejszych Wytycznych (patrz poniżej w \"Naruszeniach\"). Możesz również skontaktować się z Moderatorami poprzez formularz na stronie \"Skontaktuj się z nami\" do której masz również dostęp z menu Pomocy poprzez kliknięcie “<a href='https://contact.habitica.com/' target='_blank'>Skontaktuj się z Drużyną Moderatorów</a>.” Możesz to zrobić również wtedy, gdy pojawiło się wiele problematycznych wpisów tej samej osoby w różnych gildiach lub jeśli sytuacja wymaga wyjaśnienia. Możesz napisać do nas w swoim ojczystym języku jeśli tak jest Tobie łatwiej: możemy potrzebować skorzystać z tłumacza Google, ale chcemy, abyś czuł się swobodnie, kontaktując się z nami w sprawie jakiegoś problemu.",
     "commGuidePara021": "Ponadto, niektóre przestrzenie publiczne w Habitice mają dodatkowe regulaminy.",
     "commGuideHeadingTavern": "Karczma",
     "commGuidePara022": "Tawerna jest głównym miejscem przebywania różnorodnych mieszkańców krainy Habitca. Karczmarz Daniel utrzymuje to miejsce lśniącej czystości, a Lemoness z radością wyczaruje trochę lemoniady, gdy będziesz siedzieć i rozmawiać. Tylko pamiętaj …",
diff --git a/website/common/locales/pl/gear.json b/website/common/locales/pl/gear.json
index ceb091ad88..9c439d1dfb 100644
--- a/website/common/locales/pl/gear.json
+++ b/website/common/locales/pl/gear.json
@@ -1767,5 +1767,9 @@
     "headSpecialWinter2020MageNotes": "Oh! Jak dzwonki / Słodkie złote dzwonki / Wszystkie wydają się mówić, / “Rzuć ‘Eksplozję Płomieni’” (w oparciu o słowa piosenki \"Carol of the Bells\" - przyp. tłum.) Zwiększa Percepcję o <%= per %>. Edycja Limitowana 2019-2020 Zimowe Wyposażenie.",
     "armorMystery202006Text": "Wielobarwny Ogon Syreny",
     "armorMystery202006Notes": "Nawet pośród najjaśniejszych koralowców i ukwiałów, ogon ten dumnie wyróżnia się z tłumu! Nie przynosi korzyści. Przedmiot Subskrybenta, czerwiec 2020 r.",
-    "armorSpecialSummer2020WarriorText": "Ogon Pstrąga Tęczowego"
+    "armorSpecialSummer2020WarriorText": "Ogon Pstrąga Tęczowego",
+    "bodyMystery202008Notes": "Tymczasem Twoje skrzydła są złożone. Lecz jeśli zakończysz udzielania swojej mądrości lub zobaczysz zdobycz pośród traw, uważaj! Brak dodatkowych korzyści. Przedmiot Subskrybenta, sierpień 2020.",
+    "bodyMystery202008Text": "Płaszcz Sowiastej Wyroczni",
+    "headMystery202008Notes": "KTO? KTO? KTO zwraca się o poradę? Brak dodatkowych korzyści. Przedmiot Subskrybenta, sierpień 2020.",
+    "headMystery202008Text": "Stroik Sowiastej Wyroczni"
 }
diff --git a/website/common/locales/pl/groups.json b/website/common/locales/pl/groups.json
index c59997a5b2..d349898884 100644
--- a/website/common/locales/pl/groups.json
+++ b/website/common/locales/pl/groups.json
@@ -249,11 +249,11 @@
     "onlyCreatorOrAdminCanDeleteChat": "Nie masz uprawnień do usunięcia tej wiadomości!",
     "onlyGroupLeaderCanEditTasks": "Nie masz uprawnień do zarządzania zadaniami!",
     "onlyGroupTasksCanBeAssigned": "Można przypisywać wyłącznie zadania grupowe",
-    "assignedTo": "Przyznany do",
+    "assignedTo": "Przypisz do",
     "assignedToUser": "Przyznany do <strong><%= userName %></strong>",
     "assignedToMembers": "Przyznano do <strong><%= userCount %> użytkowników</strong>",
     "assignedToYouAndMembers": "Przyznany do ciebie i <strong><%= userCount %> użytkowników</strong>",
-    "youAreAssigned": "Zostałeś/aś przyznany/a do tego zadania",
+    "youAreAssigned": "Przypisane do Ciebie",
     "taskIsUnassigned": "To zadanie nie jest przypisane",
     "confirmClaim": "Czy jesteś pewny, że chcesz sobie rościć to zadanie?",
     "confirmUnClaim": "Czy jesteś pewien, że chcesz odpuścić roszczenia do tego zadania?",
@@ -494,5 +494,9 @@
     "PMUnblockUserToSendMessages": "Odblokuj tego użytkownika, aby móc wysyłać oraz otrzymywać wiadomości.",
     "PMUserDoesNotReceiveMessages": "Ten użytkownik nie otrzymuje wiadomości prywatnych",
     "PMCanNotReply": "Nie możesz odpowiadać w tym wątku",
-    "newPartyPlaceholder": "Wprowadź nazwę twojej drużyny."
+    "newPartyPlaceholder": "Wprowadź nazwę twojej drużyny.",
+    "managerNotes": "Notatki Menedżera",
+    "thisTaskApproved": "Te zadanie zostało zatwierdzone",
+    "chooseTeamMember": "Wybierz członka grupy",
+    "unassigned": "Nieprzypisane"
 }
diff --git a/website/common/locales/pl/subscriber.json b/website/common/locales/pl/subscriber.json
index 9bfbfb0ccf..4840ca2600 100644
--- a/website/common/locales/pl/subscriber.json
+++ b/website/common/locales/pl/subscriber.json
@@ -251,5 +251,6 @@
     "subscribersReceiveBenefits": "Abonenci otrzymują przydatne korzyści!",
     "giftASubscription": "Podaruj Abonament",
     "mysterySet202007": "Zestaw Wybitnej Orki",
-    "mysterySet202006": "Zestaw Wielobarwnej Syreny"
+    "mysterySet202006": "Zestaw Wielobarwnej Syreny",
+    "mysterySet202008": "Zestaw Sowiastej Wyroczni"
 }
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index 44a050701d..c593fb7b16 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -2131,7 +2131,7 @@
     "headSpecialSummer2020HealerText": "Capacete Cravejado de Vidro",
     "armorArmoirePirateOutfitNotes": "Basta, seus marinheiros de água doce! A roupa perfeita para esfregar o convés e contar seus espólios. Aumenta a Constituição e a Inteligência em <%= attrs %> cada. Gabinete Encantado: Conjunto de Piratas (Item 2 de 3).",
     "armorSpecialSummer2020HealerText": "Regalia de Ondas Quebradas",
-    "shieldArmoirePiratesCompanionNotes": "Perfeito, se você quiser matar seus inimigos com palavras, este papagaio nunca se cala. Talvez ele também possa lembrar você de suas tarefas! Aumenta a Percepção em <%= por %>. Gabinete Encantado: Conjunto de Piratas (Item 3 de 3).",
+    "shieldArmoirePiratesCompanionNotes": "Perfeito, se você quiser matar seus inimigos com palavras, este papagaio nunca se cala. Talvez ele também possa lembrar você de suas tarefas! Aumenta a Percepção em <%= per %>. Gabinete Encantado: Conjunto de Piratas (Item 3 de 3).",
     "shieldArmoirePiratesCompanionText": "O Companheiro do Pirata",
     "shieldSpecialSummer2020HealerNotes": "Como o movimento da areia e da água transforma o lixo em tesouro, assim também suas feridas mágicas transformarão as feridas em força. Aumenta a Constituição em <%= con %>. Edição Limitada 2020 Equipamento de Verão.",
     "shieldSpecialSummer2020HealerText": "Égide de Vidro Tombado",
@@ -2143,7 +2143,7 @@
     "headSpecialSummer2020MageText": "Crista do Regaleco",
     "headSpecialSummer2020WarriorNotes": "\"Trute\" a sua força e habilidade com este capacete altamente visível. Aumenta a Força em <%= str %>. Edição Limitada 2020 Equipamento de Verão.",
     "headSpecialSummer2020WarriorText": "Boné do Peixe Cintilante",
-    "headSpecialSummer2020RogueNotes": "Complete o seu disfarce Gatuno com este capacete! Talvez você possa enganar os seus inimigos com as suas lágrimas de crocodilo... Aumenta a Percepção em <%= por %>. Edição Limitada 2020 Equipamento de Verão.",
+    "headSpecialSummer2020RogueNotes": "Complete o seu disfarce Gatuno com este capacete! Talvez você possa enganar os seus inimigos com as suas lágrimas de crocodilo... Aumenta a Percepção em <%= per %>. Edição Limitada 2020 Equipamento de Verão.",
     "headSpecialSummer2020RogueText": "Capacete do Crocodilo",
     "armorArmoirePirateOutfitText": "Roupa de Pirata",
     "armorMystery202007Notes": "Nade, vire, mergulhe e corra com esta bela e poderosa cauda! Não traz nenhum benefício. Item de Assinante de Julho de 2020.",
diff --git a/website/common/locales/pt_BR/generic.json b/website/common/locales/pt_BR/generic.json
index cb39d40fb8..64dfb47dff 100644
--- a/website/common/locales/pt_BR/generic.json
+++ b/website/common/locales/pt_BR/generic.json
@@ -102,9 +102,9 @@
     "habitBirthday": "Festança de Aniversário do Habitica",
     "habitBirthdayText": "Celebrou a Festança de Aniversário do Habitica!",
     "habitBirthdayPluralText": "Comemorou <%= count %> Festas de Aniversário do Habitica!",
-    "habiticaDay": "Habitversário",
-    "habiticaDaySingularText": "Celebrou o Habiticaversário! Obrigado por ser um usuário fantástico.",
-    "habiticaDayPluralText": "Comemorou <%= count %> Aniversário(s) do Habitica! Obrigado por ser um usuário fantástico.",
+    "habiticaDay": "Dia da Nomeação do Habitica ",
+    "habiticaDaySingularText": "Celebrou o Dia da Nomeação do Habitica! Obrigado por ser um usuário fantástico.",
+    "habiticaDayPluralText": "Comemorou <%= count %> Aniversário(s) da Nomeação do Habitica! Obrigado por ser um usuário fantástico.",
     "achievementDilatory": "Salvador de Lentópolis",
     "achievementDilatoryText": "Ajudou a derrotar o Terrível Dragão de Lentópolis durante o Evento Banho de Verão de 2014!",
     "costumeContest": "Participante do Concurso de Fantasia",
diff --git a/website/common/locales/vi/achievements.json b/website/common/locales/vi/achievements.json
index 0560015d94..dced9e3ef5 100755
--- a/website/common/locales/vi/achievements.json
+++ b/website/common/locales/vi/achievements.json
@@ -81,5 +81,8 @@
     "achievementBugBonanzaModalText": "Bạn đã hoàn thành những Nhiệm vụ Thú cưng Bọ cánh cứng, Bướm, Ốc sên, và Nhện!",
     "achievementBugBonanza": "Quá trời Bọ",
     "achievementRosyOutlook": "Hồng Cá tính",
-    "achievementTickledPink": "Hồng Quyến rũ"
+    "achievementTickledPink": "Hồng Quyến rũ",
+    "achievementFreshwaterFriendsModalText": "Bạn đã hoàn thành những nhiệm vụ thú cưng Axolotl, Ếch và Hải mã!",
+    "achievementFreshwaterFriendsText": "Đã hoàn thành những nhiệm vụ thú cưng Axolotl, Ếch, và Hải mã.",
+    "achievementFreshwaterFriends": "Người bạn Nước ngọt"
 }
diff --git a/website/common/locales/vi/groups.json b/website/common/locales/vi/groups.json
index e233342463..7a32b9e44c 100755
--- a/website/common/locales/vi/groups.json
+++ b/website/common/locales/vi/groups.json
@@ -249,11 +249,11 @@
     "onlyCreatorOrAdminCanDeleteChat": "Not authorized to delete this message!",
     "onlyGroupLeaderCanEditTasks": "Not authorized to manage tasks!",
     "onlyGroupTasksCanBeAssigned": "Only group tasks can be assigned",
-    "assignedTo": "Assigned To",
+    "assignedTo": "Giao cho",
     "assignedToUser": "Assigned to  <%= userName %>",
     "assignedToMembers": "Assigned to <%= userCount %> members",
     "assignedToYouAndMembers": "Assigned to you and <%= userCount %> members",
-    "youAreAssigned": "You are assigned to this task",
+    "youAreAssigned": "Đã giao cho bạn",
     "taskIsUnassigned": "This task is unassigned",
     "confirmClaim": "Are you sure you want to claim this task?",
     "confirmUnClaim": "Are you sure you want to unclaim this task?",
@@ -494,5 +494,12 @@
     "newPartyPlaceholder": "Nhập tên Tổ đội của bạn.",
     "taskClaimed": "<%= userName %>đã nhận công việc <span class=\"notification-bold\"><%= taskText %></span>.",
     "youHaveBeenAssignedTask": "<%= managerName %> đã phân công bạn công việc <span class=\"notification-bold\"><%= taskText %></span>.",
-    "userWithUsernameOrUserIdNotFound": "Tên đặng nhập hoặc ID Người chơi không tìm thấy."
+    "userWithUsernameOrUserIdNotFound": "Tên đặng nhập hoặc ID Người chơi không tìm thấy.",
+    "claimRewards": "Nhận Phần thưởng",
+    "assignedDateAndUser": "Đã được giao bởi <strong>@<%= username %></strong> vào <strong><%= date %></strong>",
+    "assignedDateOnly": "Đã được giao vào ngày <strong><%= date %></strong>",
+    "managerNotes": "Ghi chú của người Quản lí",
+    "thisTaskApproved": "Công việc này đã được công nhận",
+    "chooseTeamMember": "Chọn một thành viên trong nhóm",
+    "unassigned": "Chưa giao"
 }
diff --git a/website/common/locales/vi/quests.json b/website/common/locales/vi/quests.json
index 5286726222..64082f7caf 100755
--- a/website/common/locales/vi/quests.json
+++ b/website/common/locales/vi/quests.json
@@ -49,8 +49,8 @@
     "bossDmg2": "Only participants will fight the boss and share in the quest loot.",
     "bossDmg1Broken": "Mỗi lần hoàn thành Việc hằng ngày và Việc cần làm và mỗi Thói quen tích cực gây sát thương cho quái. Gây sát thương nó nhiều hơn với công việc màu đỏ hoặc Cú chém tàn bạo và Ngọn lửa bùng nổ .Quái vật sẽ gây sát thương cho mỗi người tham gia nhiệm vụ cho mỗi Việc hàng ngày bạn đã bỏ lỡ (nhân với Sức mạnh của quái vật) ngoài những sát thương thông thường của bạn, vì vậy giữ cho Tổ đội của bạn khỏe mạnh bằng cách hoàn thành Việc hằng ngày... <strong>Tất cả các sát thương đến từ Quái vật được tung ra ra theo cron (thời điểm bắt đầu ngày mới)...</strong>",
     "bossDmg2Broken": "Only participants will fight the boss and share in the quest loot...",
-    "tavernBossInfo": "Hoàn thành Việc hằng ngày và Việc cần làm và hoàn thành Thói quen tốt để tổn thương Quái vật Thế giới! Việc hằng ngày chưa được hoàn thành sẽ làm đầy Thanh Cuồng nộ. Khi thanh Cuồng nộ đầy, Quái vật Thế giới sẽ tấn công một NPC. Một",
-    "tavernBossInfoBroken": "Complete Dailies and To-Dos and score positive Habits to damage the World Boss... Incomplete Dailies fill the Exhaust Strike Bar... When the Exhaust Strike bar is full, the World Boss will attack an NPC... A World Boss will never damage individual players or accounts in any way... Only active accounts not resting in the Inn will have their tasks tallied...",
+    "tavernBossInfo": "Hoàn thành Việc hằng ngày và Việc cần làm và ghi điểm Thói quen tốt để gây sát thương Boss Thế giới! Việc hằng ngày chưa được hoàn thành sẽ làm đầy Thanh Cuồng nộ. Khi thanh Cuồng nộ đầy, Boss Thế giới sẽ tấn công một NPC. Một Boss Thế giới sẽ không bao giờ tấn công người chơi riêng lẻ hay người dùng ở bất kỳ cách nào. Chỉ những tài khoản hoạt động không nghỉ trong Quán trọ sẽ có công việc của họ được đếm.",
+    "tavernBossInfoBroken": "Hoàn thành Việc hàng ngày và Việc cần làm và ghi điểm Thói quen tốt để gây sát thương cho Boss Thế giới... Việc hàng ngày chưa được hoàn thành làm đầy Thanh Đòn đánh Mệt mỏi... Khi thanh Đòn đánh Mệt mỏi đầy, Boss Thế giới sẽ tấn công một NPC... Một Boss Thế giới sẽ không bao giờ gây sát thương lên người chơi riêng lẻ hay tài khoản trong bất kỳ cách nào... Chỉ tài khoản hoạt động không nghỉ trong Quán trọ có công việc của họ được tính...",
     "bossColl1": "To collect items, do your positive tasks. Quest items drop just like normal items; you can monitor your quest item drops by hovering over the quest progress icon.",
     "bossColl2": "Chỉ những người tham gia mới có thể thu thập vật phẩm và chia phần vào kho báu chung.",
     "bossColl1Broken": "Để thu thập vật phẩm, làm những công việc tích cực... Những vật phẩm Nhiệm vụ sẽ rớt ra như những vật phẩm bình thường; bạn có thể theo dõi số vật phẩm rớt ra bằng cách di chuyển chuột tới biểu tượng tiến trình của nhiệm vụ...",
@@ -71,8 +71,8 @@
     "scrollsText1": "Nhiệm vụ chỉ dành cho cả đội. Nếu bạn muốn một mình làm nhiệm vụ,",
     "scrollsText2": "hãy thành lập đội 1 người",
     "scrollsPre": "You haven't unlocked this quest yet!",
-    "alreadyEarnedQuestLevel": "You already earned this quest by attaining Level <%= level %>.",
-    "alreadyEarnedQuestReward": "You already earned this quest by completing <%= priorQuest %>.",
+    "alreadyEarnedQuestLevel": "Bạn đã kiếm được Nhiệm vụ này qua việc đạt được Cấp độ <%= level %>.",
+    "alreadyEarnedQuestReward": "Bạn đã kiếm được Nhiệm vụ này bằng việc hoàn thành <%= priorQuest %>.",
     "completedQuests": "Hoàn thành những nhiệm vụ sau",
     "mustComplete": "Trước hết bạn phải hoàn thành nhiệm vụ <%= quest %>.",
     "mustLevel": "You must be level <%= level %> to begin this quest.",
@@ -131,5 +131,14 @@
     "chatQuestStarted": "Nhiệm vụ của bạn, <%= questName %>, đã bắt đầu.",
     "questInvitationNotificationInfo": "Bạn đã được mời tham gia một Nhiệm vụ",
     "hatchingPotionQuests": "Nhiệm vụ Lọ thuốc Ấp trứng Ma thuật",
-    "bossDamage": "Bạn đã gây sát thương cho con quái!"
+    "bossDamage": "Bạn đã gây sát thương cho con quái!",
+    "tavernBossTired": "<%= bossName %> đã thử giải phóng <%= rageName %> nhưng lại quá mệt.",
+    "chatQuestCancelled": "<%= username %> đã hủy Nhiệm vụ Tổ đội <%= questName %>.",
+    "chatQuestAborted": "<%= username %> hủy nhiệm vụ tổ đội <%= questName %>.",
+    "chatItemQuestFinish": "Tất cả vật phẩm đã được tìm thấy! Tổ đội đã nhận phần thưởng của mình.",
+    "chatFindItems": "<%= username %> đã tìm được <%= items %>.",
+    "chatBossDefeated": "Bạn đã đánh bại <%= bossName %>! Thành viên Tổ đội tham gia Nhiệm vụ nhận phần thưởng chiến thắng.",
+    "chatBossDontAttack": "<%= username %> tấn công <%= bossName %> với <%= userDamage%> sát thương. <%= bossName %> không tấn công, bởi vì nó tôn trọng sự thật rằng có một vài lỗi bảo trì, và nó không muốn tổn thương bất cứ ai một cách không công bằng. Nó sẽ tiếp tục cơn cuồng nộ của mình sớm thôi!",
+    "questAlreadyStartedFriendly": "Nhiệm vụ đã bắt đầu rồi, nhưng bạn luôn có thể bắt kịp cái tiếp theo!",
+    "questAlreadyStarted": "Nhiệm vụ đã bắt đầu rồi."
 }
diff --git a/website/common/locales/vi/subscriber.json b/website/common/locales/vi/subscriber.json
index 5ed13342a1..772d0e5279 100755
--- a/website/common/locales/vi/subscriber.json
+++ b/website/common/locales/vi/subscriber.json
@@ -251,5 +251,6 @@
     "mysterySet201911": "Bộ Pha lê quyến rũ",
     "mysterySet201910": "Bộ Ngọn lửa bí hiểm",
     "mysterySet201909": "Bộ Hạt sồi khả ái",
-    "mysterySet201908": "Bộ Người dê rảnh rỗi"
+    "mysterySet201908": "Bộ Người dê rảnh rỗi",
+    "mysterySet202008": "Bộ Cú sấm truyền"
 }
diff --git a/website/common/locales/vi/tasks.json b/website/common/locales/vi/tasks.json
index e45d2e3fd0..3580754211 100755
--- a/website/common/locales/vi/tasks.json
+++ b/website/common/locales/vi/tasks.json
@@ -213,5 +213,8 @@
     "addNotes": "Thêm ghi chú",
     "addATitle": "Thêm một tiêu đề",
     "sureDeleteType": "Bạn có chắc muốn xóa <%= type %> này không?",
-    "deleteTaskType": "Xóa <%= type %> này"
+    "deleteTaskType": "Xóa <%= type %> này",
+    "pressEnterToAddTag": "Nhấn Enter để thêm thẻ: '<%= tagName %>'",
+    "enterTag": "Nhập một thẻ",
+    "addTags": "Thêm thẻ..."
 }
diff --git a/website/common/locales/zh/gear.json b/website/common/locales/zh/gear.json
index 2093d5d184..079f5f9f32 100644
--- a/website/common/locales/zh/gear.json
+++ b/website/common/locales/zh/gear.json
@@ -869,9 +869,9 @@
     "headSpecialTakeThisText": "Take This之头盔",
     "headSpecialTakeThisNotes": "这个头盔是通过参与“Take This”赞助的挑战获得的。祝贺你！增加全属性<%= attrs %>点。",
     "headSpecialFireCoralCircletText": "火珊瑚头饰",
-    "headSpecialFireCoralCircletNotes": "这个由炼金术士设计的头饰，能够让你在水中呼吸并潜水寻找宝藏。增加<%= per %>点感知。",
+    "headSpecialFireCoralCircletNotes": "这个由炼金术士设计的头饰，能够让你在水中呼吸，潜入水中寻找宝藏！增加<%= per %>点感知。",
     "headSpecialPyromancersTurbanText": "烈焰术士头巾",
-    "headSpecialPyromancersTurbanNotes": "这个神奇的头巾能帮助你呼吸，甚至在浓密的烟雾中！并且它非常舒适！增加<%= str %>点力量。",
+    "headSpecialPyromancersTurbanNotes": "这个神奇的头巾能在浓密的烟雾中帮助你顺畅呼吸！佩戴非常舒适！增加<%= str %>点力量。",
     "headSpecialBardHatText": "吟游诗人的帽子",
     "headSpecialBardHatNotes": "在你的帽子上插一根羽毛，称之为“生产力”！增加<%= int %>点智力。",
     "headSpecialLunarWarriorHelmText": "月亮战士头盔",
@@ -2091,15 +2091,15 @@
     "weaponArmoirePaperCutterNotes": "这可能看起来并不可怕，但你有没有被纸割伤过吗？增加<%= str %>点力量。魔法衣橱：纸骑士套装（1/3）。",
     "weaponArmoirePaperCutterText": "裁纸器",
     "headAccessoryMystery202005Notes": "有了这么强大的角，哪一个生物敢挑战你呢？没有属性加成。2020年5月订阅者物品。",
-    "headAccessoryMystery202005Text": "美妙的飞龙角",
+    "headAccessoryMystery202005Text": "奇妙飞龙角",
     "backMystery202005Notes": "虽然翅膀有些破烂，但它还能让你飞向你的目的地。没有属性加成。2020年5月订阅者物品。",
-    "backMystery202005Text": "美妙的飞龙翅膀",
+    "backMystery202005Text": "奇妙飞龙翅膀",
     "weaponArmoireFiddlersBowText": "小提琴手琴弓",
     "shieldArmoireFiddleNotes": "完美的乐器使你与正确的音符同行。增加<%= per %>点智力。魔法衣橱：小提琴手套装（4/4）。",
     "headArmoireFiddlersCapNotes": "戴上这顶高贵的帽子，大家都为你的曲调而舞。增加<%= per %>点感知。魔法衣橱：小提琴手套装（2/4）。",
     "shieldArmoireFiddleText": "小提琴手的小提琴",
     "headArmoireFiddlersCapText": "小提琴手帽子",
-    "headMystery202006Notes": "这些紫色石头所发射的正能量将海洋中最友好的生物吸引到你身边。没有属性加成。2020年6月订阅者物品。",
+    "headMystery202006Notes": "这些紫色石头所发射的积极能量将海洋中最友好的生物吸引到你身边。没有属性加成。2020年6月订阅者物品。",
     "headMystery202006Text": "舒俱来石饰环",
     "weaponArmoireFiddlersBowNotes": "将音乐从万物之中引诱出来！……尤其适用于小提琴。增加<%= str %>点力量。魔法衣橱：小提琴手套装（3/4）。",
     "armorArmoireFiddlersCoatNotes": "外套实用，有更大的空间大展身手！增加<%= con %>点体质。魔法衣橱：小提琴手套装（2/4）。",
@@ -2151,9 +2151,9 @@
     "weaponArmoireHandyHookNotes": "有人持反对的意见？这钩子对所有人都很“方便”。增加<%= str %>点力量。魔法衣橱：海盗套装（1/3）。",
     "weaponArmoireHandyHookText": "便捷钓钩",
     "bodyMystery202008Notes": "此刻，两翼张开。但当你凝练智慧，或捕食草丛中猎物时，请小心！没有属性加成。2020年8月订阅者物品。",
-    "bodyMystery202008Text": "猫头鹰的预言斗篷",
+    "bodyMystery202008Text": "猫头鹰神谕斗篷",
     "backSpecialNamingDay2020Notes": "命名节快乐！甩动火红像素尾来一起庆祝吧！没有属性加成。",
     "backSpecialNamingDay2020Text": "紫御狮鹫之尾",
     "headMystery202008Notes": "谁？是谁？到底是谁向你走近寻求忠告？没有属性加成。2020年8月订阅者物品。",
-    "headMystery202008Text": "猫头鹰的预言头饰"
+    "headMystery202008Text": "猫头鹰神谕头饰"
 }
diff --git a/website/common/locales/zh/questscontent.json b/website/common/locales/zh/questscontent.json
index e60d1caf55..09a15bfbfc 100644
--- a/website/common/locales/zh/questscontent.json
+++ b/website/common/locales/zh/questscontent.json
@@ -60,18 +60,18 @@
     "questSpiderUnlockText": "在市场中解锁蜘蛛蛋以购买",
     "questGroupVice": "恶习之龙",
     "questVice1Text": "恶习之龙，第1部：逃出恶习之龙的控制",
-    "questVice1Notes": "<p>传说中Habitica山里有一个可怕的恶魔，它的现身即会扭曲这片土地上英雄的意志，使他们染上恶习，变得懒惰！这个怪兽有着强大的力量，由恶习的暗影组成，并化身为一条奸诈的暗影巨龙——恶习之龙。勇敢的Habitica居民，一起站出来，彻彻底底地击败这个邪恶的怪物。但是，只有你相信自己能抵抗积习那强大的业力，才能做到。</p><h3>恶习之龙，第1部：</h3><p>如果你落入它的控制，你还怎么和他战斗？不要成为懒惰和恶习的牺牲品！努力与巨龙战斗吧，克服他黑暗之力的影响，祓除他加诸于你的控制！</p>",
+    "questVice1Notes": "<p>传说中Habitica的山里有一个可怕的恶魔，它的现身即会摧毁这片土地上英雄的意志，使他们染上恶习，变得懒惰！这个怪兽有着强大的力量，由恶习的暗影组成，化身为一条奸诈的暗影巨龙——恶习之龙。勇敢的Habitica居民，请站出来，彻底击败这个邪恶的怪物。但是，只有你相信自己能抵抗那强大的业力，才能做到。</p><h3>恶习之龙，第1部：</h3><p>如果你落入它的控制，你还怎么和他战斗？不要成为懒惰和恶习的牺牲品！努力与巨龙战斗吧，克服他的黑暗之力，祓除他加诸于你的控制！</p>",
     "questVice1Boss": "恶习的阴影",
     "questVice1Completion": "当你祓除恶习的影响，你感到一股前所未闻的力量回到了你身上。恭喜你！但一个更可怕的敌人在等待着……",
     "questVice1DropVice2Quest": "恶习之龙，第2部（卷轴）",
     "questVice2Text": "恶习之龙，第2部：寻找巨龙的巢穴",
-    "questVice2Notes": "带着必胜的信念，你的队伍又一次充满自信地踏上了前往Habitica山的路。你们在山洞的入口停了下来。从洞里不断涌出漆黑的暗影，像雾一样笼罩着洞口。洞里漆黑一片，伸手不见五指。从灯笼里发出的光根本无法触及暗影笼罩的区域。据说只有用魔力点亮的光可以渗入巨龙的阴霾中。如果能找到足够多的神光水晶，你就可以找到去巨龙那里的路了。",
+    "questVice2Notes": "带着必胜的信念，你的队伍又一次充满自信地踏上了前往Habitica山的路。你们在山洞的入口停了下来。从洞里不断涌出漆黑的暗影，像雾一样笼罩着洞口。洞里漆黑一片，伸手不见五指。从灯笼里发出的光根本无法触及暗影笼罩的区域。据说只有用魔力点亮的光可以渗入巨龙的阴霾中。如果能找到足够多的神光水晶，你就可以照亮寻找巨龙的路了。",
     "questVice2CollectLightCrystal": "神光水晶",
-    "questVice2Completion": "当你把神光水晶高高举起，阴影被驱散了，你前进的道路变得清晰起来。随着心跳的加速，你向前走进洞穴。",
+    "questVice2Completion": "当你把神光水晶高高举起，阴影被驱散了，前进的道路变得清晰起来。随着心跳的加速，你向前走进洞穴。",
     "questVice2DropVice3Quest": "恶习之龙，第3部（卷轴）",
     "questVice3Text": "恶习之龙，第3部：恶习缓醒",
-    "questVice3Notes": "在不断的努力之下，你的队伍终于发现了恶习之龙的巢穴。这个庞大的怪物用厌恶的眼神盯着你的队伍。黑暗的漩涡围绕着你们，一个声音在你们的脑海中耳语：“又有更多愚蠢的Habitica居民来阻止我了吗？有意思，你们会后悔来到这里的。”这只长满鳞片的巨龙拱起头颅，以一种准备攻击的姿态蓄势待发。你们的机会来了！尽你们所能，斩草除根地击败恶习吧！",
-    "questVice3Completion": "阴影从洞穴中消散，钢铁般的寂静降临。我们一言为定过的，你做到了！你战胜了恶习！你和你的队伍终于松了一口气。享受胜利吧，勇敢的habitica居民，但要带着你从这场与恶习的战斗中学到的教训继续前进。你还有一些想养成的习惯可以去多做几次，也许还会有更糟糕的妖魔鬼怪要去战胜！",
+    "questVice3Notes": "在不断的努力之下，你的队伍终于找到了恶习之龙的巢穴。这个庞大的怪物用厌恶的眼神盯着你的队伍。黑暗的漩涡围绕着你们，一个声音在你们的脑海中耳语：“又有更多愚蠢的Habitica居民来阻止我了吗？有意思，你们会后悔来到这里的。”这只长满鳞片的巨龙拱起头颅，以一种准备攻击的姿态蓄势待发。你们的机会来了！尽你们所能，根除恶习吧！",
+    "questVice3Completion": "阴影从洞穴中消散，钢铁般的寂静降临。说到做到！你们战胜了恶习！你和你的队伍终于松了一口气。享受胜利吧，勇敢的habitica居民，背负这场与恶习的战斗中学到的教训继续前进。更多习惯等待完成，更多妖魔鬼怪等待战胜！",
     "questVice3Boss": "恶习之龙",
     "questVice3DropWeaponSpecial2": "Stephen Weber的巨龙长矛",
     "questVice3DropDragonEgg": "龙（宠物蛋）",
@@ -218,7 +218,7 @@
     "questSheepUnlockText": "在市场中解锁羊蛋以购买",
     "questKrakenText": "未完成海妖",
     "questKrakenNotes": "这是一个温暖充满阳光的日子，你正在未完成海湾驾船穿行，脑子里充满了对那些你还没能去做完的事情的忧虑，好像你做完一个，就会出现另外一个……<br><br>突然间，船底一阵猛震，湿滑的触手破海而出，从船两边爬了上来！“我们被攻击了！是未完成海妖！”Wolvenhalo喊道。<br><br>“快！”Lemoness呼唤着你，“尽你所能打退触手和任务，不然新的就会再升上来填补它们的空缺！”",
-    "questKrakenBoss": "象征着未完成的北海巨妖",
+    "questKrakenBoss": "未完成海妖",
     "questKrakenCompletion": "海妖逃之夭夭了，留下几枚蛋在海面上漂浮着。Lemoness检查了一下，她的疑问转为欣喜。“是墨鱼蛋！”她说，“这儿，拿几个作为你完成的任务的奖励吧。”",
     "questKrakenDropCuttlefishEgg": "墨鱼（宠物蛋）",
     "questKrakenUnlockText": "在市场中解锁墨鱼蛋以购买",
@@ -236,7 +236,7 @@
     "questDilatoryDistress1CollectBlueFins": "湛蓝之鳍",
     "questDilatoryDistress1DropArmor": "海鳞衣（铠甲）",
     "questDilatoryDistress2Text": "拖拉灾难，第2部：裂缝中的生物",
-    "questDilatoryDistress2Notes": "这场攻城战从几里之外就能看到：上千个没有身躯的骷髅从城墙的破缺处涌了进来，直冲进拖拉城。<br><br>你在魟鱼国王的作战室见到他时，他的目光黯淡，神色忧虑。“我的女儿Adva在攻城刚刚开始之前消失在了黑暗裂隙里。请找到她，把她平安带回来！我可以借给你烈焰珊瑚头环，只要能帮上你。如果你成功了，它就是你的了。”",
+    "questDilatoryDistress2Notes": "这场攻城战从几里之外就能看到：上千个灵魂态的骷髅从城墙的破缺处钻了进来，涌入拖拉城。<br><br>你在作战室见到了魟鱼国王，他目光黯淡、神色忧虑。“我的女儿Adva在攻城开始前被拖入了黑暗裂隙。请你找到她，把她平安带回来！我将烈焰珊瑚头环借给你，它能助你一臂之力。如果你成功了，它就是你的了。”",
     "questDilatoryDistress2Completion": "你打败了可怕的骷髅群，但仍然找不到Adva。你向皇家追踪者@Kiwibot 询问，看看她有没有什么意见。“守护了城市的螳螂虾一定看到了Adva的叛逃。”@Kiwibot 说，“试试跟着他们走进黑暗裂隙。”",
     "questDilatoryDistress2Boss": "水骷髅群",
     "questDilatoryDistress2RageTitle": "富集重生",
@@ -246,11 +246,11 @@
     "questDilatoryDistress2DropCottonCandyBluePotion": "蓝色棉花糖孵化药水",
     "questDilatoryDistress2DropHeadgear": "烈焰珊瑚头环（头饰）",
     "questDilatoryDistress3Text": "拖拉灾难，第3部：不只是人鱼姑娘",
-    "questDilatoryDistress3Notes": "你跟随着螳螂虾深入了裂隙，发现了一座水下要塞。Adva公主身边环绕着更多的骸骨，在大厅等着你的到来。“我父亲派你来的，对吗？告诉他我不回去。我很满意留在这里，研习巫术。现在走吧，不然你会感受这片海的新女王的愤怒！”Adva看上去非常坚定，但就在她说话的时候，你发现她脖子上挂着一个奇怪的红宝石挂坠……也许等你把它打破，她的错觉就会消失？",
+    "questDilatoryDistress3Notes": "你跟随着螳螂虾深入裂隙，发现了一座水下要塞。Adva公主身边环绕着更多的骸骨，在大厅等着你的到来。“我父亲派你来的，对吗？告诉他我不回去。我很满意留在这里，研习巫术。现在走吧，不然你会感受到这片海域新女王的愤怒！”Adva看上去非常坚定，但就在她说话的时候，你发现她脖子上挂着一个奇怪的红宝石挂坠……也许把它打破后，对她施加的幻术就会消失？",
     "questDilatoryDistress3Completion": "终于，你把那块施了咒的吊坠从Adva脖子上拉了下来，扔到一边。Adva抓挠着自己的头：“我在哪？出了什么事？”在听你把事情讲述一遍之后，她皱紧眉头：“这个项链是一位陌生的大使给我的，一位叫Tzina的女士。之后我就什么都不记得了！”<br><br>回到拖拉城，魟鱼国王为你的胜利高兴坏了。“请允许我奖励你这把三叉戟和这面盾牌！我要求@asieant 和@starsystemic 做了这些作为给Adva的礼物，但是……恐怕我不想在她手里放任何武器了。”",
     "questDilatoryDistress3Boss": "Adva，暴怒的美人鱼",
     "questDilatoryDistress3DropFish": "鱼（食物）",
-    "questDilatoryDistress3DropWeapon": "咆哮海浪的三叉戟（武器）",
+    "questDilatoryDistress3DropWeapon": "怒潮三叉戟（武器）",
     "questDilatoryDistress3DropShield": "玉轮明珠盾（副手装备）",
     "questCheetahText": "真是一个猎豹",
     "questCheetahNotes": "你正和朋友@PainterProphet，@tivaquinn，@Unruly Hyena 和@Crawford 在坚定稀树草原上漫步，你看到一只经过的猎豹，叼着一个Habitica新人路过。在这只猎豹的利爪之下，所有的任务都蒸发殆尽，即使是根本没能完成的那些也一样！那个Habitica居民看见了你，并向你喊道：“救救我！这只猎豹让我升级得太快了，但我什么事都没来得及做。我想慢下来享受游戏，求你让它停下来！”你想起了自己打拼的日子，明白你必须帮帮这个新手，让猎豹停下！",
@@ -370,8 +370,8 @@
     "questBeetleUnlockText": "在市场中解锁甲虫蛋以购买",
     "questGroupTaskwoodsTerror": "恐怖的任务森林",
     "questTaskwoodsTerror1Text": "恐怖的任务森林，第1部：任务树林中的大火",
-    "questTaskwoodsTerror1Notes": "你从未见过快乐收割者如此不安。繁荣土地的主人乘坐她的骷髅狮鹫降落在生产力广场中央，来不及下坐骑便开始呼喊。“可爱的habitica居民们，我们需要你们的帮忙！有些东西正开始在任务树林中燃烧，而我们还没有完全从战斗的劳累中恢复。如果火焰不停止，它会吞噬我们所有的野生果树和浆果！”<br><br>你马上答应帮忙，并加速到达了任务树林。当你进入habitica最大的果林时，突然听到叮当声和破裂声从前方的远处传来，还嗅到了淡淡的烟味。很快，一群咯咯叫、燃烧着的头骨怪物飞过你，咬断树枝并把树梢扔到了火焰上！",
-    "questTaskwoodsTerror1Completion": "在快乐收割者和著名的火占师@Beffymaroo 的帮助下，你尝试着击退他们。Beffymaroo给了你她的烈焰术士头巾以示团结，你们进入森林的更深处。",
+    "questTaskwoodsTerror1Notes": "从未见过快乐收割者如此不安。全盛田野的主人乘坐着她的骷髅狮鹫降落在生产力广场中央，来不及下坐骑，便开始呼喊。“可爱的habitica居民们，我们需要帮忙！任务树林在燃烧，而我们还没有完全从战斗的劳累中恢复。如果火焰不停止，它会吞噬我们所有的野生果树、浆果！”<br><br>你马上答应前去帮忙，加速到达了任务树林。你进入habitica最大的果林，突然听到叮当声和破裂声从前方的远处传来，还嗅到了淡淡的烟味。很快，一群咯咯叫、燃烧着的骷髅怪物向你飞来，将咬断的树枝丢向火焰！",
+    "questTaskwoodsTerror1Completion": "在快乐收割者和著名的火占师@Beffymaroo 的帮助下，你击退了骷髅群。Beffymaroo将她的烈焰术士头巾交给你，表示团结的决心，你们前往森林的更深处。",
     "questTaskwoodsTerror1Boss": "火骷髅群",
     "questTaskwoodsTerror1RageTitle": "骨群重生",
     "questTaskwoodsTerror1RageDescription": "骨群重生：如果你没有完成每日任务，怒气值会增加。当怒气槽攒满，烈焰骸骨群会恢复至当前生命值的130%！",
@@ -387,8 +387,8 @@
     "questTaskwoodsTerror2CollectDryads": "树妖",
     "questTaskwoodsTerror2DropArmor": "烈焰术士长袍（护甲）",
     "questTaskwoodsTerror3Text": "恐怖的任务森林，第3部：杰克南瓜灯",
-    "questTaskwoodsTerror3Notes": "你的队伍走到森林深处，准备战斗。在那里，一个叛变的精灵正试图摧毁被肥沃浆果丛林包围的古老苹果树。他的南瓜头不管转向哪里都散发出一种可怕的光，左手持一根顶端挂着灯笼的长杆。然而，灯笼中的并不是火焰或者焰光，而是一种黑色晶体，令你脊背发寒。<br><br>快乐收割者用她骨瘦如柴的手捂住嘴。“那是——那是Jacko，灯笼精灵！但他是一个对收获有帮助的精灵，指导着我们的农民。是什么让这位亲爱的精灵做这样的事？”<br><br>“我不知道，”@bridgetteempress 说，“但看起来这个‘亲爱的精灵’要攻击我们了！”",
-    "questTaskwoodsTerror3Completion": "一番争斗之后，你看准时机打落了Jacko携带的那个灯笼！里面的晶体被砸碎了！Jacko突然恢复了理智，流下发光的泪水。“哦，我美丽的森林！我做了什么？！”他痛哭着。他的眼泪熄灭了余火，救下了苹果树和野生浆果。<br><br>在你让他平静下来之后，他解释说：“我遇见了一个很有魅力的女士，叫Tzina，她给了我这个发光的晶体，作为礼物。在她的催促下，我把它放进我的灯笼……这是我能回忆起的最后一件事。”他金黄色的脑袋转向你微笑着说：“也许在我帮助野生果园重建的时候，你可以保管着它。”",
+    "questTaskwoodsTerror3Notes": "你的队伍走到森林深处，准备战斗。在那里，一个叛变的精灵正试图摧毁被肥沃浆果丛林包围的古老苹果树。他的南瓜头不管转向哪里都散发出一种可怕的光，左手持一根顶端挂着灯笼的长杆。然而，灯笼中的并不是火焰或者焰光，而是一种黑色晶体，令你脊背发寒。<br><br>快乐收割者骨瘦如柴的手捂住了嘴。“那——那是Jacko，灯笼精灵！但他指导收获，指导着我们的农民。是什么让这位亲爱的精灵去做这样的事？”<br><br>“我不知道，”@bridgetteempress 说，“但看起来这个‘亲爱的精灵’要攻击我们了！”",
+    "questTaskwoodsTerror3Completion": "一番争斗之后，你看准时机打落了Jacko携带的那个灯笼！里面的晶体被砸碎了！Jacko突然恢复了理智，流下发光的泪水。“哦，我美丽的森林！我做了什么？！”他痛哭着。他的眼泪熄灭了余火，救下了苹果树和野生浆果。<br><br>在你让他平静下来之后，他解释说：“我遇见了一个很有魅力的女士，叫Tzina，她给了我这个发光的晶体，作为礼物。在她的催促下，我把它放进我的灯笼……这是我能回忆起的最后一件事。”他金黄色的脑袋转向你微笑着说：“在重建野生果园时，请你保管好它。”",
     "questTaskwoodsTerror3Boss": "杰克南瓜灯",
     "questTaskwoodsTerror3DropStrawberry": "草莓（食物）",
     "questTaskwoodsTerror3DropWeapon": "任务森林的灯笼（双手武器）",
@@ -543,8 +543,8 @@
     "questLostMasterclasser3DropShadePotion": "暗影孵化药水",
     "questLostMasterclasser3DropZombiePotion": "僵尸孵化药水",
     "questLostMasterclasser4Text": "大师鉴别者的秘密，第4部：迷失的大师鉴别者",
-    "questLostMasterclasser4Notes": "你浮出传送阵的表面，但你仍然悬浮在一个奇怪的、变幻莫测的幽冥空间中。“好大的胆子，”一个冷酷的声音响起，“我得承认，我的计划里此前没有当面对峙这项。”一个女人从翻腾的漩涡中升起。“欢迎来到虚空领域。”<br><br>你拼命忍住一阵反胃呕吐的感觉。“你就是Zinnya？”你问她。<br><br>“一个年轻的理想主义者的曾用名，”她答道，撇了撇嘴，世界在你们下方痛苦地扭曲着，“我并不是。如果非得扯上点关系的话，你应该叫现在的我Zinnya的反对者，Anti’zinnya（Tzina），鉴于我的所作所为和还没来及做的一切。”<br><br>传送阵突然在你身后重新开启，并且把4位大师鉴别者在你面前甩了出来。Anti’zinnya的双眼闪着仇恨的光芒。“我看到我那些可怜的替代品们竟然跟着你来了。”<br><br>你盯着她问道：“替代品？”<br><br>“作为大师级的以太术士，我曾是第一位大师鉴别者——也是唯一的大师鉴别者。这4个人充其量算拙劣的模仿者，他们每个人只有我曾拥有的力量的一点零碎！我能够调遣一切咒语，也学过任何一种技能。你们因我心血来潮的创世造物而存在，直到力量背叛了我，以太因无法承受我的才华，以及我完美而合理的愿景之重而崩溃。我在此间被困千年，制造虚空，逐渐康复。想象一下当我知道我遗落世间的才学被玷污时那恶心的心情吧。”她疯狂地大笑，笑声在这诡异的空间中回响。“我的计划是在毁灭他们之前先毁灭他们的领地，但现在我觉得顺序也无关紧要了。”迸发出不可思议之力的同时，她冲上前来，整个虚空领域爆裂成一片混乱。",
-    "questLostMasterclasser4Completion": "在你的猛攻之下，迷失的大师鉴别者发出了充满挫败感的哀嚎，她的身形摇曳闪烁着变成了半透明状。像鞭子一样猛烈抽打着一切的虚空仍然环绕在跌落的她周围，然而刹那之后，她的存在发生了变化。她变成了更年轻、冷静、脸上浮现出平静表情的样子……然后，一切都悄无声息地消散了，你又一次跪倒在沙漠的沙地上。<br><br>“看来咱们对自己的历史有很多要去了解的啊。”魟鱼国王凝视着残破的废墟，“在以太术士大师被自己的能力压垮而失去控制之后，倾盆而出的空虚肯定让整片大陆生灵涂炭了。可能一切都变成了像这样的沙漠。”<br><br>“难怪建立Habitica的祖先们一再强调要保持生产力和健康的平衡，”快乐收割者低声说，“想想重建世界那么重的任务足以使人望而却步了，但他们也曾想避免这种天灾人祸再次发生。”<br><br>“哦嚯，看看这些恶灵附过的东西！”愚者说。显然，在你让Anti’zinnya的亡灵得以安息时，这些装备沾最后一阵以太爆发的光，变成了影影绰绰的半透明质，闪着苍白的光芒。“真是令人眼花缭乱的效果，我得把这些记录下来。”<br><br>“也许此地的动物能隐形也是因为残存的以太凝聚在这里。”冰川夫人把手伸向耳后，抓了一把空气。你感觉到有个看不见的毛茸茸的小脑袋在蹭你的手，这下等回头到家，你得跟马厩里的其他坐骑好好解释一通了。你最后再看了一眼这片废墟，发现史上第一的那位大师鉴别者最终唯一留下来的东西：她那件明灭闪烁的斗篷。你将它披在肩上，回头向Habit城走去，回味着你刚刚经历的一切。<br><br>",
+    "questLostMasterclasser4Notes": "虽浮出传送阵的表面，但你仍然悬浮在一个奇怪的、变幻莫测的幽冥空间中。“好大的胆子，”一个冷酷的声音响起，“不得不承认，我的计划里可没有当面对峙这项。”一个女人从翻腾的漩涡中升起。“欢迎来到虚空领域。”<br><br>你拼命忍住一阵反胃呕吐的感觉。“你就是Zinnya？”你问她。<br><br>“一个年轻理想主义者的曾用名，”她答道，撇了撇嘴，世界在你们下方痛苦地扭曲着，“我并不是。如果非得扯上点关系的话，鉴于我的所作所为和还没来及做的一切，你应该称呼现在的我是Zinnya的反对者Anti’zinnya（Tzina）。”<br><br>传送阵突然在你身后重新开启，4位大师鉴别者被甩到你面前。Anti’zinnya的双眼闪着仇恨的光芒。“我那些可怜的替代品们竟然跟着你来了。”<br><br>你盯着她问道：“替代品？”<br><br>“作为大师级的以太术士，我曾是第一位大师鉴别者——也是唯一的大师鉴别者。这4个人充其量算拙劣的模仿者，他们每个人只有我曾拥有的力量的一点零碎！我能够调遣一切咒语，学过任何一种技能。你们因我心血来潮的创世造物而存在，直到力量背叛了我，以太因无法承受我的才华，以及我完美而合理的愿景之重而崩溃。我在此间被困千年，制造虚空，逐渐康复。想象一下当我知道我遗落世间的才学被玷污时那恶心的心情吧。”她疯狂地大笑，笑声在这诡异的空间中回响。“我的计划是在毁灭他们之前先毁灭他们的领地，但现在我觉得顺序也无关紧要了。”迸发出不可思议之力的同时，她冲上前来，整个虚空领域爆裂成一片混乱。",
+    "questLostMasterclasser4Completion": "在你的猛攻之下，迷失的大师鉴别者发出了充满挫败感的哀嚎，她的身形摇曳闪烁着变成了半透明状。像鞭子一样猛烈抽打着一切的虚空仍然环绕在跌落的她周围，然而刹那之后，她的存在发生了变化。她变成了更年轻、冷静、脸上浮现出平静表情的样子……然后，一切都悄无声息地消散了，你又一次跪倒在沙漠的沙地上。<br><br>“看来咱们对自己的历史有很多要去了解的啊。”魟鱼国王凝视着残破的废墟，“在以太术士大师被自己的能力压垮而失去控制之后，倾盆而出的空虚肯定让整片大陆生灵涂炭了。可能一切都变成了像这样的沙漠。”<br><br>“难怪建立Habitica的祖先们一再强调要保持生产力和健康的平衡，”快乐收割者低声说，“想想重建世界那么重的任务足以使人望而却步了，但他们也曾想避免这种天灾人祸再次发生。”<br><br>“哦嚯，看看这些恶灵附过的东西！”愚者说。显然，在你让Anti’zinnya的亡灵得以安息时，这些装备沾上了一些能量，爆发出一阵以太的光，逐渐变成了影影绰绰的半透明质，闪着苍白的光芒。“真是令人眼花缭乱的效果，我得把这些记录下来。”<br><br>“也许此地的动物能隐形也是因为残存的以太凝聚在这里。”冰川夫人把手伸向耳后，抓了一把空气。你感觉到有个看不见的毛茸茸的小脑袋在蹭你的手，看来等你回到家，得跟马厩里的其他坐骑好好解释一通了。你最后再看了一眼这片废墟，发现了史上第一位大师鉴别者的最后遗物：她那件明灭闪烁的斗篷。你将它披在肩上，回头向Habit城走去，回味着刚刚经历的一切。<br><br>",
     "questLostMasterclasser4Boss": "Anti'zinnya",
     "questLostMasterclasser4RageTitle": "虚空抽取",
     "questLostMasterclasser4RageDescription": "虚空抽取：如果你没有完成每日任务，怒气值会增加。当怒气槽攒满，Anti'zinnya将会抽空全队的魔法值！",
diff --git a/website/common/locales/zh/subscriber.json b/website/common/locales/zh/subscriber.json
index b399c1fecd..de57f4309b 100644
--- a/website/common/locales/zh/subscriber.json
+++ b/website/common/locales/zh/subscriber.json
@@ -249,7 +249,7 @@
     "mysterySet202003": "倒刺斗士套装",
     "giftASubscription": "赠送订阅",
     "mysterySet202004": "强大的君主斑蝶套装",
-    "mysterySet202005": "美妙的飞龙套装",
+    "mysterySet202005": "奇妙飞龙套装",
     "mysterySet202006": "多彩人鱼套装",
     "mysterySet202007": "极品逆戟鲸套装",
     "mysterySet202008": "猫头鹰神谕套装"