From ba22c18cd9c59f3bd53785378fcec4cba899aefd Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 26 Jul 2022 16:59:53 -0400
Subject: [PATCH 001/134] separating group plan creation modal out from
 groupPlan.vue

---
 .../groups/groupPlanCreationModal.vue         | 230 ++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 website/client/src/components/groups/groupPlanCreationModal.vue

diff --git a/website/client/src/components/groups/groupPlanCreationModal.vue b/website/client/src/components/groups/groupPlanCreationModal.vue
new file mode 100644
index 0000000000..2a71afd919
--- /dev/null
+++ b/website/client/src/components/groups/groupPlanCreationModal.vue
@@ -0,0 +1,230 @@
+<template>
+  <div>
+    <b-modal
+      id="group-plan-modal"
+      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
+      size="md"
+      hide-footer="hide-footer"
+    >
+      <div
+        v-if="activePage === PAGES.CREATE_GROUP"
+        class="col-12"
+      >
+        <div class="form-group">
+          <label
+            class="control-label"
+            for="new-group-name"
+          >Name</label>
+          <input
+            id="new-group-name"
+            v-model="newGroup.name"
+            class="form-control input-medium option-content"
+            required="required"
+            type="text"
+            placeholder="Name"
+          >
+        </div>
+        <div class="form-group">
+          <label for="new-group-description">{{ $t('description') }}</label>
+          <textarea
+            id="new-group-description"
+            v-model="newGroup.description"
+            class="form-control option-content"
+            cols="3"
+            :placeholder="$t('description')"
+          ></textarea>
+        </div>
+        <div
+          v-if="type === 'guild'"
+          class="form-group"
+        >
+          <div class="custom-control custom-radio">
+            <input
+              v-model="newGroup.privacy"
+              class="custom-control-input"
+              type="radio"
+              name="new-group-privacy"
+              value="private"
+            >
+            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <input
+              id="create-group-leaderOnlyChallenges-checkbox"
+              v-model="newGroup.leaderOnly.challenges"
+              class="custom-control-input"
+              type="checkbox"
+            >
+            <label
+              class="custom-control-label"
+              for="create-group-leaderOnlyChallenges-checkbox"
+            >{{ $t('leaderOnlyChallenges') }}</label>
+          </div>
+        </div>
+        <div
+          v-if="type === 'party'"
+          class="form-group"
+        >
+          <button
+            class="btn btn-secondary form-control"
+            :value="$t('create')"
+            @click="createGroup()"
+          ></button>
+        </div>
+        <div class="form-group">
+          <button
+            class="btn btn-primary btn-lg btn-block"
+            :disabled="!newGroupIsReady"
+            @click="createGroup()"
+          >
+            {{ $t('create') }}
+          </button>
+        </div>
+      </div>
+      <div
+        v-if="activePage === PAGES.PAY"
+        class="col-12"
+      >
+        <div class="text-center">
+          <payments-buttons
+            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
+            :amazon-data="pay(PAYMENTS.AMAZON)"
+          />
+        </div>
+      </div>
+    </b-modal>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .payment-options {
+    margin-bottom: 4em;
+
+    .purple-box {
+      background-color: #4f2a93;
+      color: #fff;
+      padding: .5em;
+      border-radius: 8px;
+      width: 200px;
+      height: 215px;
+
+      .dollar {
+      }
+
+      .number {
+        font-size: 60px;
+      }
+
+      .name {
+        width: 100px;
+        margin-left: .3em;
+      }
+
+      .plus {
+        width: 100%;
+        text-align: center;
+      }
+
+      div {
+        display: inline-block;
+      }
+    }
+
+    .box, .purple-box {
+      display: inline-block;
+      vertical-align: bottom;
+    }
+  }
+</style>
+
+<script>
+import paymentsMixin from '../../mixins/payments';
+import { mapState } from '@/libs/store';
+import positiveIcon from '@/assets/svg/positive.svg';
+import paymentsButtons from '@/components/payments/buttons/list';
+
+export default {
+  components: {
+    paymentsButtons,
+  },
+  mixins: [paymentsMixin],
+  data () {
+    return {
+      amazonPayments: {},
+      icons: Object.freeze({
+        positiveIcon,
+      }),
+      PAGES: {
+        CREATE_GROUP: 'create-group',
+        UPGRADE_GROUP: 'upgrade-group',
+        PAY: 'pay',
+      },
+      PAYMENTS: {
+        AMAZON: 'amazon',
+        STRIPE: 'stripe',
+      },
+      paymentMethod: '',
+      newGroup: {
+        type: 'guild',
+        privacy: 'private',
+        name: '',
+        leaderOnly: {
+          challenges: false,
+        },
+      },
+      activePage: '',
+      type: 'guild', // Guild or Party @TODO enum this
+    };
+  },
+  computed: {
+    newGroupIsReady () {
+      return Boolean(this.newGroup.name);
+    },
+    upgradingGroup () {
+      return this.$store.state.upgradingGroup;
+    },
+    // @TODO: can we move this to payment mixin?
+    ...mapState({ user: 'user.data' }),
+  },
+  mounted () {
+    this.activePage = this.PAGES.BENEFITS;
+    this.$store.dispatch('common:setTitle', {
+      section: this.$t('groupPlans'),
+    });
+  },
+  methods: {
+    createGroup () {
+      this.changePage(this.PAGES.PAY);
+    },
+    pay (paymentMethod) {
+      const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
+      const paymentData = {
+        subscription: subscriptionKey,
+        coupon: null,
+      };
+
+      if (this.upgradingGroup && this.upgradingGroup._id) {
+        paymentData.groupId = this.upgradingGroup._id;
+        paymentData.group = this.upgradingGroup;
+      } else {
+        paymentData.groupToCreate = this.newGroup;
+      }
+
+      this.paymentMethod = paymentMethod;
+
+      if (this.paymentMethod === this.PAYMENTS.AMAZON) {
+        paymentData.type = 'subscription';
+        return paymentData;
+      }
+
+      if (this.paymentMethod === this.PAYMENTS.STRIPE) {
+        this.redirectToStripe(paymentData);
+      }
+
+      return null;
+    },
+  },
+};
+</script>

From 8ecd152b411e9126b1c24b9da941e07d3b8508ba Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 27 Jul 2022 18:25:56 -0400
Subject: [PATCH 002/134] moved modal file from /groups into /group-plans

---
 .../group-plans/groupPlanCreationModal.vue    | 230 ++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 website/client/src/components/group-plans/groupPlanCreationModal.vue

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
new file mode 100644
index 0000000000..2a71afd919
--- /dev/null
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -0,0 +1,230 @@
+<template>
+  <div>
+    <b-modal
+      id="group-plan-modal"
+      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
+      size="md"
+      hide-footer="hide-footer"
+    >
+      <div
+        v-if="activePage === PAGES.CREATE_GROUP"
+        class="col-12"
+      >
+        <div class="form-group">
+          <label
+            class="control-label"
+            for="new-group-name"
+          >Name</label>
+          <input
+            id="new-group-name"
+            v-model="newGroup.name"
+            class="form-control input-medium option-content"
+            required="required"
+            type="text"
+            placeholder="Name"
+          >
+        </div>
+        <div class="form-group">
+          <label for="new-group-description">{{ $t('description') }}</label>
+          <textarea
+            id="new-group-description"
+            v-model="newGroup.description"
+            class="form-control option-content"
+            cols="3"
+            :placeholder="$t('description')"
+          ></textarea>
+        </div>
+        <div
+          v-if="type === 'guild'"
+          class="form-group"
+        >
+          <div class="custom-control custom-radio">
+            <input
+              v-model="newGroup.privacy"
+              class="custom-control-input"
+              type="radio"
+              name="new-group-privacy"
+              value="private"
+            >
+            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <input
+              id="create-group-leaderOnlyChallenges-checkbox"
+              v-model="newGroup.leaderOnly.challenges"
+              class="custom-control-input"
+              type="checkbox"
+            >
+            <label
+              class="custom-control-label"
+              for="create-group-leaderOnlyChallenges-checkbox"
+            >{{ $t('leaderOnlyChallenges') }}</label>
+          </div>
+        </div>
+        <div
+          v-if="type === 'party'"
+          class="form-group"
+        >
+          <button
+            class="btn btn-secondary form-control"
+            :value="$t('create')"
+            @click="createGroup()"
+          ></button>
+        </div>
+        <div class="form-group">
+          <button
+            class="btn btn-primary btn-lg btn-block"
+            :disabled="!newGroupIsReady"
+            @click="createGroup()"
+          >
+            {{ $t('create') }}
+          </button>
+        </div>
+      </div>
+      <div
+        v-if="activePage === PAGES.PAY"
+        class="col-12"
+      >
+        <div class="text-center">
+          <payments-buttons
+            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
+            :amazon-data="pay(PAYMENTS.AMAZON)"
+          />
+        </div>
+      </div>
+    </b-modal>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .payment-options {
+    margin-bottom: 4em;
+
+    .purple-box {
+      background-color: #4f2a93;
+      color: #fff;
+      padding: .5em;
+      border-radius: 8px;
+      width: 200px;
+      height: 215px;
+
+      .dollar {
+      }
+
+      .number {
+        font-size: 60px;
+      }
+
+      .name {
+        width: 100px;
+        margin-left: .3em;
+      }
+
+      .plus {
+        width: 100%;
+        text-align: center;
+      }
+
+      div {
+        display: inline-block;
+      }
+    }
+
+    .box, .purple-box {
+      display: inline-block;
+      vertical-align: bottom;
+    }
+  }
+</style>
+
+<script>
+import paymentsMixin from '../../mixins/payments';
+import { mapState } from '@/libs/store';
+import positiveIcon from '@/assets/svg/positive.svg';
+import paymentsButtons from '@/components/payments/buttons/list';
+
+export default {
+  components: {
+    paymentsButtons,
+  },
+  mixins: [paymentsMixin],
+  data () {
+    return {
+      amazonPayments: {},
+      icons: Object.freeze({
+        positiveIcon,
+      }),
+      PAGES: {
+        CREATE_GROUP: 'create-group',
+        UPGRADE_GROUP: 'upgrade-group',
+        PAY: 'pay',
+      },
+      PAYMENTS: {
+        AMAZON: 'amazon',
+        STRIPE: 'stripe',
+      },
+      paymentMethod: '',
+      newGroup: {
+        type: 'guild',
+        privacy: 'private',
+        name: '',
+        leaderOnly: {
+          challenges: false,
+        },
+      },
+      activePage: '',
+      type: 'guild', // Guild or Party @TODO enum this
+    };
+  },
+  computed: {
+    newGroupIsReady () {
+      return Boolean(this.newGroup.name);
+    },
+    upgradingGroup () {
+      return this.$store.state.upgradingGroup;
+    },
+    // @TODO: can we move this to payment mixin?
+    ...mapState({ user: 'user.data' }),
+  },
+  mounted () {
+    this.activePage = this.PAGES.BENEFITS;
+    this.$store.dispatch('common:setTitle', {
+      section: this.$t('groupPlans'),
+    });
+  },
+  methods: {
+    createGroup () {
+      this.changePage(this.PAGES.PAY);
+    },
+    pay (paymentMethod) {
+      const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
+      const paymentData = {
+        subscription: subscriptionKey,
+        coupon: null,
+      };
+
+      if (this.upgradingGroup && this.upgradingGroup._id) {
+        paymentData.groupId = this.upgradingGroup._id;
+        paymentData.group = this.upgradingGroup;
+      } else {
+        paymentData.groupToCreate = this.newGroup;
+      }
+
+      this.paymentMethod = paymentMethod;
+
+      if (this.paymentMethod === this.PAYMENTS.AMAZON) {
+        paymentData.type = 'subscription';
+        return paymentData;
+      }
+
+      if (this.paymentMethod === this.PAYMENTS.STRIPE) {
+        this.redirectToStripe(paymentData);
+      }
+
+      return null;
+    },
+  },
+};
+</script>

From 9bee9d0a069f456609a641ef301a654a9b816501 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 1 Aug 2022 17:11:15 -0400
Subject: [PATCH 003/134] working on editing code so the modal emits from
 group-plans instead of from within the file

---
 website/client/src/components/groups/groupPlan.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 6fc137a31f..4c54990d6b 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -495,6 +495,13 @@ export default {
       this.changePage(this.PAGES.CREATE_GROUP);
       this.$root.$emit('bv::show::modal', 'group-plan-modal');
     },
+    // launchModal () {
+    //   this.$root.$on('group-plan-modal') {
+    //     console.log('hello i am a modal');
+    //     this.activePage = page;
+    //     this.$root.$emit('bv::show::modal', 'group-plan-modal');
+    //   };
+    // },
     changePage (page) {
       this.activePage = page;
       window.scrollTo(0, 0);

From 999071a15c91dcf0c953c4380f9161c5c56f3303 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 2 Aug 2022 16:05:41 -0400
Subject: [PATCH 004/134] still trying to get modal to work

---
 .../group-plans/groupPlanCreationModal.vue    | 192 +++++++++---------
 .../src/components/groups/groupPlan.vue       | 111 +---------
 2 files changed, 97 insertions(+), 206 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 2a71afd919..c4694bcd2c 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -1,101 +1,100 @@
 <template>
-  <div>
-    <b-modal
-      id="group-plan-modal"
-      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
-      size="md"
-      hide-footer="hide-footer"
+  <b-modal
+    id="group-plan-creation-modal"
+    :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
+    :hide-footer="true"
+    size="md"
+    @hide="onHide()"
+  >
+    <div
+      v-if="activePage === PAGES.CREATE_GROUP"
+      class="col-12"
     >
+      <div class="form-group">
+        <label
+          class="control-label"
+          for="new-group-name"
+        >Name</label>
+        <input
+          id="new-group-name"
+          v-model="newGroup.name"
+          class="form-control input-medium option-content"
+          required="required"
+          type="text"
+          placeholder="Name"
+        >
+      </div>
+      <div class="form-group">
+        <label for="new-group-description">{{ $t('description') }}</label>
+        <textarea
+          id="new-group-description"
+          v-model="newGroup.description"
+          class="form-control option-content"
+          cols="3"
+          :placeholder="$t('description')"
+        ></textarea>
+      </div>
       <div
-        v-if="activePage === PAGES.CREATE_GROUP"
-        class="col-12"
+        v-if="type === 'guild'"
+        class="form-group"
       >
-        <div class="form-group">
-          <label
-            class="control-label"
-            for="new-group-name"
-          >Name</label>
+        <div class="custom-control custom-radio">
           <input
-            id="new-group-name"
-            v-model="newGroup.name"
-            class="form-control input-medium option-content"
-            required="required"
-            type="text"
-            placeholder="Name"
+            v-model="newGroup.privacy"
+            class="custom-control-input"
+            type="radio"
+            name="new-group-privacy"
+            value="private"
           >
+          <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
         </div>
-        <div class="form-group">
-          <label for="new-group-description">{{ $t('description') }}</label>
-          <textarea
-            id="new-group-description"
-            v-model="newGroup.description"
-            class="form-control option-content"
-            cols="3"
-            :placeholder="$t('description')"
-          ></textarea>
-        </div>
-        <div
-          v-if="type === 'guild'"
-          class="form-group"
-        >
-          <div class="custom-control custom-radio">
-            <input
-              v-model="newGroup.privacy"
-              class="custom-control-input"
-              type="radio"
-              name="new-group-privacy"
-              value="private"
-            >
-            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <input
-              id="create-group-leaderOnlyChallenges-checkbox"
-              v-model="newGroup.leaderOnly.challenges"
-              class="custom-control-input"
-              type="checkbox"
-            >
-            <label
-              class="custom-control-label"
-              for="create-group-leaderOnlyChallenges-checkbox"
-            >{{ $t('leaderOnlyChallenges') }}</label>
-          </div>
-        </div>
-        <div
-          v-if="type === 'party'"
-          class="form-group"
-        >
-          <button
-            class="btn btn-secondary form-control"
-            :value="$t('create')"
-            @click="createGroup()"
-          ></button>
-        </div>
-        <div class="form-group">
-          <button
-            class="btn btn-primary btn-lg btn-block"
-            :disabled="!newGroupIsReady"
-            @click="createGroup()"
+      </div>
+      <div class="form-group">
+        <div class="custom-control custom-checkbox">
+          <input
+            id="create-group-leaderOnlyChallenges-checkbox"
+            v-model="newGroup.leaderOnly.challenges"
+            class="custom-control-input"
+            type="checkbox"
           >
-            {{ $t('create') }}
-          </button>
+          <label
+            class="custom-control-label"
+            for="create-group-leaderOnlyChallenges-checkbox"
+          >{{ $t('leaderOnlyChallenges') }}</label>
         </div>
       </div>
       <div
-        v-if="activePage === PAGES.PAY"
-        class="col-12"
+        v-if="type === 'party'"
+        class="form-group"
       >
-        <div class="text-center">
-          <payments-buttons
-            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
-            :amazon-data="pay(PAYMENTS.AMAZON)"
-          />
-        </div>
+        <button
+          class="btn btn-secondary form-control"
+          :value="$t('create')"
+          @click="createGroup()"
+        ></button>
       </div>
-    </b-modal>
-  </div>
+      <div class="form-group">
+        <button
+          class="btn btn-primary btn-lg btn-block"
+          :disabled="!newGroupIsReady"
+          @click="createGroup()"
+        >
+          {{ $t('create') }}
+        </button>
+      </div>
+    </div>
+    <div
+      v-if="activePage === PAGES.PAY"
+      class="col-12"
+    >
+      <div class="text-center">
+        <payments-buttons
+          :stripe-fn="() => pay(PAYMENTS.STRIPE)"
+          :amazon-data="pay(PAYMENTS.AMAZON)"
+        />
+      </div>
+    </div>
+  </b-modal>
 </template>
 
 <style lang="scss" scoped>
@@ -122,11 +121,6 @@
         margin-left: .3em;
       }
 
-      .plus {
-        width: 100%;
-        text-align: center;
-      }
-
       div {
         display: inline-block;
       }
@@ -142,7 +136,6 @@
 <script>
 import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
-import positiveIcon from '@/assets/svg/positive.svg';
 import paymentsButtons from '@/components/payments/buttons/list';
 
 export default {
@@ -154,7 +147,7 @@ export default {
     return {
       amazonPayments: {},
       icons: Object.freeze({
-        positiveIcon,
+        // positiveIcon,
       }),
       PAGES: {
         CREATE_GROUP: 'create-group',
@@ -179,22 +172,19 @@ export default {
     };
   },
   computed: {
+    ...mapState({ user: 'user.data' }),
     newGroupIsReady () {
       return Boolean(this.newGroup.name);
     },
-    upgradingGroup () {
-      return this.$store.state.upgradingGroup;
-    },
-    // @TODO: can we move this to payment mixin?
-    ...mapState({ user: 'user.data' }),
   },
   mounted () {
-    this.activePage = this.PAGES.BENEFITS;
-    this.$store.dispatch('common:setTitle', {
-      section: this.$t('groupPlans'),
-    });
+    console.log('i am mounted');
   },
   methods: {
+    changePage (page) {
+      this.activePage = page;
+      window.scrollTo(0, 0);
+    },
     createGroup () {
       this.changePage(this.PAGES.PAY);
     },
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 4c54990d6b..83f4a5adf1 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -1,6 +1,7 @@
 <template>
   <!-- @TODO: Move to group plans folder-->
   <div>
+    <group-plan-creation=modal />
     <div>
       <div class="header">
         <h1 class="text-center">
@@ -114,7 +115,7 @@
           <div class="col-12 text-center">
             <button
               class="btn btn-primary create-group"
-              @click="launchModal('create')"
+              @click="launchModal('group-plan-creation-modal')"
             >
               Create Your New Group
             </button>
@@ -153,102 +154,6 @@
         </div>
       </div>
     </div>
-    <b-modal
-      id="group-plan-modal"
-      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
-      size="md"
-      hide-footer="hide-footer"
-    >
-      <div
-        v-if="activePage === PAGES.CREATE_GROUP"
-        class="col-12"
-      >
-        <div class="form-group">
-          <label
-            class="control-label"
-            for="new-group-name"
-          >Name</label>
-          <input
-            id="new-group-name"
-            v-model="newGroup.name"
-            class="form-control input-medium option-content"
-            required="required"
-            type="text"
-            placeholder="Name"
-          >
-        </div>
-        <div class="form-group">
-          <label for="new-group-description">{{ $t('description') }}</label>
-          <textarea
-            id="new-group-description"
-            v-model="newGroup.description"
-            class="form-control option-content"
-            cols="3"
-            :placeholder="$t('description')"
-          ></textarea>
-        </div>
-        <div
-          v-if="type === 'guild'"
-          class="form-group"
-        >
-          <div class="custom-control custom-radio">
-            <input
-              v-model="newGroup.privacy"
-              class="custom-control-input"
-              type="radio"
-              name="new-group-privacy"
-              value="private"
-            >
-            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <input
-              id="create-group-leaderOnlyChallenges-checkbox"
-              v-model="newGroup.leaderOnly.challenges"
-              class="custom-control-input"
-              type="checkbox"
-            >
-            <label
-              class="custom-control-label"
-              for="create-group-leaderOnlyChallenges-checkbox"
-            >{{ $t('leaderOnlyChallenges') }}</label>
-          </div>
-        </div>
-        <div
-          v-if="type === 'party'"
-          class="form-group"
-        >
-          <button
-            class="btn btn-secondary form-control"
-            :value="$t('create')"
-            @click="createGroup()"
-          ></button>
-        </div>
-        <div class="form-group">
-          <button
-            class="btn btn-primary btn-lg btn-block"
-            :disabled="!newGroupIsReady"
-            @click="createGroup()"
-          >
-            {{ $t('create') }}
-          </button>
-        </div>
-      </div>
-      <div
-        v-if="activePage === PAGES.PAY"
-        class="col-12"
-      >
-        <div class="text-center">
-          <h3>Choose your payment method</h3>
-          <payments-buttons
-            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
-            :amazon-data="pay(PAYMENTS.AMAZON)"
-          />
-        </div>
-      </div>
-    </b-modal>
   </div>
 </template>
 
@@ -440,10 +345,12 @@ import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import positiveIcon from '@/assets/svg/positive.svg';
 import paymentsButtons from '@/components/payments/buttons/list';
+import groupPlanCreationModal from '../group-plans/groupPlanCreationModal';
 
 export default {
   components: {
     paymentsButtons,
+    groupPlanCreationModal,
   },
   mixins: [paymentsMixin],
   data () {
@@ -492,16 +399,10 @@ export default {
   },
   methods: {
     launchModal () {
+      console.log('hello world');
       this.changePage(this.PAGES.CREATE_GROUP);
-      this.$root.$emit('bv::show::modal', 'group-plan-modal');
+      this.$root.$emit('bv::show::modal', 'group-plan-creation-modal');
     },
-    // launchModal () {
-    //   this.$root.$on('group-plan-modal') {
-    //     console.log('hello i am a modal');
-    //     this.activePage = page;
-    //     this.$root.$emit('bv::show::modal', 'group-plan-modal');
-    //   };
-    // },
     changePage (page) {
       this.activePage = page;
       window.scrollTo(0, 0);

From bd28a282dfca1f7ad8cba9013e40ead867afabeb Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 2 Aug 2022 18:34:09 -0400
Subject: [PATCH 005/134] updates: add demographic strings & drop-down and
 translated array code

---
 .../group-plans/createGroupModalPages.vue     |  1 +
 .../group-plans/groupPlanCreationModal.vue    | 90 +++++++++++++++++--
 .../selectGroupTranslatedArray.vue            | 86 ++++++++++++++++++
 .../src/components/groups/groupPlan.vue       | 18 ++--
 website/common/locales/en/groups.json         |  9 ++
 5 files changed, 189 insertions(+), 15 deletions(-)
 create mode 100644 website/client/src/components/group-plans/selectGroupTranslatedArray.vue

diff --git a/website/client/src/components/group-plans/createGroupModalPages.vue b/website/client/src/components/group-plans/createGroupModalPages.vue
index b354f6ac63..cc1470837a 100644
--- a/website/client/src/components/group-plans/createGroupModalPages.vue
+++ b/website/client/src/components/group-plans/createGroupModalPages.vue
@@ -1,3 +1,4 @@
+ <!-- THIS IS A VERY OLD FILE DO NOT USE -->
 <template>
   <div class="create-group-modal-pages">
     <div
diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index c4694bcd2c..6be98bffe8 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -1,8 +1,9 @@
 <template>
   <b-modal
-    id="group-plan-creation-modal"
+    id="create-group"
     :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
     :hide-footer="true"
+    :hide-header="true"
     size="md"
     @hide="onHide()"
   >
@@ -10,6 +11,17 @@
       v-if="activePage === PAGES.CREATE_GROUP"
       class="col-12"
     >
+      <div
+        class="modal-close"
+        @click="close()"
+      >
+        <div
+          class="icon-close"
+          v-html="icons.closeIcon"
+        >
+        </div>
+      </div>
+      <h2>{{ $t('createGroup') }}</h2>
       <div class="form-group">
         <label
           class="control-label"
@@ -62,6 +74,24 @@
             for="create-group-leaderOnlyChallenges-checkbox"
           >{{ $t('leaderOnlyChallenges') }}</label>
         </div>
+        <div class="form-group">
+          <lockable-label
+            :text="$t('groupUse')"
+          />
+          <select-group-translated-array
+            :items="[
+              'groupUseDefault',
+              'groupParentChildren',
+              'groupCouple',
+              'groupFriends',
+              'groupCoworkers',
+              'groupManager',
+              'groupTeacher'
+            ]"
+            :value="groupUseDefault"
+            @select="groupUseDefault"
+          />
+        </div>
       </div>
       <div
         v-if="type === 'party'"
@@ -132,23 +162,62 @@
     }
   }
 </style>
+<style lang="scss">
+  @import '~@/assets/scss/mixins.scss';
+  #create-group {
+    .modal-dialog {
+      max-width: 448px;
+    }
+
+    .modal-content {
+      width: 448px;
+      border-radius: 8px;
+      box-shadow: 0 14px 28px 0 rgba(26, 24, 29, 0.24), 0 10px 10px 0 rgba(26, 24, 29, 0.28);
+    }
+    .modal-body{
+      padding: 0px;
+    }
+
+    .modal-close {
+      position: absolute;
+      right: 16px;
+      top: 16px;
+      cursor: pointer;
+
+      .icon-close {
+        width: 18px;
+        height: 18px;
+        vertical-align: middle;
+
+        & ::v-deep svg path {
+          fill: #878190;
+        }
+         & :hover {
+          fill: #686274;
+        }
+      }
+    }
+  }
+</style>
 
 <script>
 import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import paymentsButtons from '@/components/payments/buttons/list';
+import selectGroupTranslatedArray from '@/components/group-plans/selectGroupTranslatedArray';
+import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
+import closeIcon from '@/assets/svg/close.svg';
 
 export default {
   components: {
     paymentsButtons,
+    selectGroupTranslatedArray,
+    lockableLabel,
   },
   mixins: [paymentsMixin],
   data () {
     return {
       amazonPayments: {},
-      icons: Object.freeze({
-        // positiveIcon,
-      }),
       PAGES: {
         CREATE_GROUP: 'create-group',
         UPGRADE_GROUP: 'upgrade-group',
@@ -167,8 +236,11 @@ export default {
           challenges: false,
         },
       },
-      activePage: '',
+      activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this
+      icons: Object.freeze({
+        closeIcon,
+      }),
     };
   },
   computed: {
@@ -181,11 +253,14 @@ export default {
     console.log('i am mounted');
   },
   methods: {
+    close () {
+      this.$root.$emit('bv::hide::modal', 'create-group');
+    },
     changePage (page) {
       this.activePage = page;
-      window.scrollTo(0, 0);
     },
     createGroup () {
+      console.log('i am giving habitica money now');
       this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
@@ -215,6 +290,9 @@ export default {
 
       return null;
     },
+    onHide () {
+      this.sendingInProgress = false;
+    },
   },
 };
 </script>
diff --git a/website/client/src/components/group-plans/selectGroupTranslatedArray.vue b/website/client/src/components/group-plans/selectGroupTranslatedArray.vue
new file mode 100644
index 0000000000..0b201f3d11
--- /dev/null
+++ b/website/client/src/components/group-plans/selectGroupTranslatedArray.vue
@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <select-list
+      :items="items"
+      :value="selected"
+      class="array-select"
+      :class="{disabled: disabled}"
+      :disabled="disabled"
+      :right="right"
+      :hide-icon="false"
+      :inline-dropdown="inlineDropdown"
+      @select="selectItem($event)"
+    >
+      <template v-slot:item="{ item }">
+        <span class="label">{{ $t(item) }}</span>
+      </template>
+    </select-list>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+</style>
+
+<style lang="scss">
+  @import '~@/assets/scss/colors.scss';
+
+  .array-select.disabled {
+    .btn-secondary:disabled, .btn-secondary.disabled, .dropdown >
+    .btn-secondary.dropdown-toggle:not(.btn-success):disabled, .dropdown >
+    .btn-secondary.dropdown-toggle:not(.btn-success).disabled, .show >
+    .btn-secondary.dropdown-toggle:not(.btn-success):disabled, .show >
+    .btn-secondary.dropdown-toggle:not(.btn-success).disabled {
+      background: $gray-700;
+    }
+
+    .dropdown-toggle::after {
+      color: $gray-300;
+      border-top-color: $gray-300;
+    }
+
+    .label {
+      color: $gray-200;
+    }
+  }
+
+  .array-select .disabled, .array-select .disabled:hover {
+    box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
+  }
+</style>
+
+<script>
+import selectList from '@/components/ui/selectList';
+
+export default {
+  components: {
+    selectList,
+  },
+  props: {
+    items: {
+      type: Array,
+    },
+    disabled: {
+      type: Boolean,
+    },
+    value: [String, Number, Object],
+    right: {
+      type: Boolean,
+    },
+    inlineDropdown: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data () {
+    return {
+      selected: this.items.find(i => i === this.value),
+    };
+  },
+  methods: {
+    selectItem (item) {
+      this.selected = item;
+      this.$emit('select', item);
+    },
+  },
+};
+</script>
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 83f4a5adf1..4bc9bb2209 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- @TODO: Move to group plans folder-->
   <div>
-    <group-plan-creation=modal />
+    <group-plan-creation-modal />
     <div>
       <div class="header">
         <h1 class="text-center">
@@ -115,7 +115,7 @@
           <div class="col-12 text-center">
             <button
               class="btn btn-primary create-group"
-              @click="launchModal('group-plan-creation-modal')"
+              @click="launchModal('create-page')"
             >
               Create Your New Group
             </button>
@@ -399,14 +399,14 @@ export default {
   },
   methods: {
     launchModal () {
-      console.log('hello world');
-      this.changePage(this.PAGES.CREATE_GROUP);
-      this.$root.$emit('bv::show::modal', 'group-plan-creation-modal');
-    },
-    changePage (page) {
-      this.activePage = page;
-      window.scrollTo(0, 0);
+      console.log('i am creating a group');
+      // this.changePage(this.PAGES.CREATE_GROUP);
+      this.$root.$emit('bv::show::modal', 'create-group');
     },
+    // changePage (page) {
+    //   this.activePage = 'page';
+    //   window.scrollTo(0, 0);
+    // },
     createGroup () {
       this.changePage(this.PAGES.PAY);
     },
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index e6c0f943cc..034b5fae2a 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -341,6 +341,15 @@
   "exampleGroupName": "Example: Avengers Academy",
   "exampleGroupDesc": "For those selected to join the training academy for The Avengers Superhero Initiative",
   "thisGroupInviteOnly": "This group is invitation only.",
+  "createGroup": "Create a Group",
+  "groupUse": "Which best describes the use of your Group?*",
+  "groupUseDefault": "Choose an answer",
+  "groupParentChildren": "Parent(s) setting up tasks for children",
+  "groupCouple": "Couple sharing tasks",
+  "groupFriends": "Friends sharing tasks",
+  "groupCoworkers": "Coworkers sharing tasks",
+  "groupManager": "Manager setting up tasks for employees",
+  "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
   "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
   "whatsIncludedGroup": "What's included in the subscription",

From edcb3f42891b6e73df9fa1984d08a23734557ccc Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 3 Aug 2022 12:07:30 -0400
Subject: [PATCH 006/134] update: making dropdown go with PROPS

---
 .../group-plans/groupPlanCreationModal.vue    | 73 +++++++++++-----
 .../selectGroupTranslatedArray.vue            | 86 -------------------
 website/common/locales/en/groups.json         |  2 +
 3 files changed, 54 insertions(+), 107 deletions(-)
 delete mode 100644 website/client/src/components/group-plans/selectGroupTranslatedArray.vue

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 6be98bffe8..1044693d81 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -13,13 +13,20 @@
     >
       <div
         class="modal-close"
-        @click="close()"
       >
         <div
-          class="icon-close"
-          v-html="icons.closeIcon"
+          class="cancel-text"
+          @click="close()"
         >
+          {{ $t('cancel') }}
         </div>
+        <button
+          class="btn btn-primary"
+          :value="$t('next')"
+          @click="close()"
+        >
+          {{ $t('next') }}
+        </button>
       </div>
       <h2>{{ $t('createGroup') }}</h2>
       <div class="form-group">
@@ -78,7 +85,7 @@
           <lockable-label
             :text="$t('groupUse')"
           />
-          <select-group-translated-array
+          <select-translated-array
             :items="[
               'groupUseDefault',
               'groupParentChildren',
@@ -128,6 +135,8 @@
 </template>
 
 <style lang="scss" scoped>
+  @import '~@/assets/scss/colors.scss';
+
   .payment-options {
     margin-bottom: 4em;
 
@@ -168,7 +177,6 @@
     .modal-dialog {
       max-width: 448px;
     }
-
     .modal-content {
       width: 448px;
       border-radius: 8px;
@@ -177,24 +185,19 @@
     .modal-body{
       padding: 0px;
     }
-
     .modal-close {
       position: absolute;
       right: 16px;
       top: 16px;
       cursor: pointer;
 
-      .icon-close {
-        width: 18px;
-        height: 18px;
-        vertical-align: middle;
-
-        & ::v-deep svg path {
-          fill: #878190;
-        }
-         & :hover {
-          fill: #686274;
-        }
+      .cancel-text {
+        color: #2995cd;
+        font-size: 0.875rem;
+        min-height: 24px;
+        margin: 16px 0 0;
+        text-align: center;
+        cursor: pointer;
       }
     }
   }
@@ -204,17 +207,46 @@
 import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import paymentsButtons from '@/components/payments/buttons/list';
-import selectGroupTranslatedArray from '@/components/group-plans/selectGroupTranslatedArray';
+import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
-import closeIcon from '@/assets/svg/close.svg';
 
 export default {
   components: {
     paymentsButtons,
-    selectGroupTranslatedArray,
+    selectTranslatedArray,
     lockableLabel,
   },
   mixins: [paymentsMixin],
+  props: {
+    groupUseDefault: {
+      type: String,
+      default: 'groupUseDefault',
+    },
+    groupParentChildren: {
+      type: String,
+      default: 'groupParentChildren',
+    },
+    groupCouple: {
+      type: String,
+      default: 'groupCouple',
+    },
+    groupFriends: {
+      type: String,
+      default: 'groupFriends',
+    },
+    groupCoworkers: {
+      type: String,
+      default: 'groupCoworkers',
+    },
+    groupManager: {
+      type: String,
+      default: 'groupManager',
+    },
+    groupTeacher: {
+      type: String,
+      default: 'groupTeacher',
+    },
+  },
   data () {
     return {
       amazonPayments: {},
@@ -239,7 +271,6 @@ export default {
       activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this
       icons: Object.freeze({
-        closeIcon,
       }),
     };
   },
diff --git a/website/client/src/components/group-plans/selectGroupTranslatedArray.vue b/website/client/src/components/group-plans/selectGroupTranslatedArray.vue
deleted file mode 100644
index 0b201f3d11..0000000000
--- a/website/client/src/components/group-plans/selectGroupTranslatedArray.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <div>
-    <select-list
-      :items="items"
-      :value="selected"
-      class="array-select"
-      :class="{disabled: disabled}"
-      :disabled="disabled"
-      :right="right"
-      :hide-icon="false"
-      :inline-dropdown="inlineDropdown"
-      @select="selectItem($event)"
-    >
-      <template v-slot:item="{ item }">
-        <span class="label">{{ $t(item) }}</span>
-      </template>
-    </select-list>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-</style>
-
-<style lang="scss">
-  @import '~@/assets/scss/colors.scss';
-
-  .array-select.disabled {
-    .btn-secondary:disabled, .btn-secondary.disabled, .dropdown >
-    .btn-secondary.dropdown-toggle:not(.btn-success):disabled, .dropdown >
-    .btn-secondary.dropdown-toggle:not(.btn-success).disabled, .show >
-    .btn-secondary.dropdown-toggle:not(.btn-success):disabled, .show >
-    .btn-secondary.dropdown-toggle:not(.btn-success).disabled {
-      background: $gray-700;
-    }
-
-    .dropdown-toggle::after {
-      color: $gray-300;
-      border-top-color: $gray-300;
-    }
-
-    .label {
-      color: $gray-200;
-    }
-  }
-
-  .array-select .disabled, .array-select .disabled:hover {
-    box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
-  }
-</style>
-
-<script>
-import selectList from '@/components/ui/selectList';
-
-export default {
-  components: {
-    selectList,
-  },
-  props: {
-    items: {
-      type: Array,
-    },
-    disabled: {
-      type: Boolean,
-    },
-    value: [String, Number, Object],
-    right: {
-      type: Boolean,
-    },
-    inlineDropdown: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  data () {
-    return {
-      selected: this.items.find(i => i === this.value),
-    };
-  },
-  methods: {
-    selectItem (item) {
-      this.selected = item;
-      this.$emit('select', item);
-    },
-  },
-};
-</script>
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 034b5fae2a..dcc92184f6 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -351,6 +351,8 @@
   "groupManager": "Manager setting up tasks for employees",
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
+  "next": "Next",
+  "cancel": "Cancel",
   "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
   "whatsIncludedGroup": "What's included in the subscription",
   "whatsIncludedGroupDesc": "All members of the Group receive full subscription benefits, including the monthly subscriber items, the ability to buy Gems with Gold, and the Royal Purple Jackalope mount, which is exclusive to users with a Group Plan membership.",

From cff6c5674f231c4500a1e8f151289da19530c923 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 4 Aug 2022 17:26:04 -0400
Subject: [PATCH 007/134] update: add styling

---
 habitica-images                               |  2 +-
 .../group-plans/groupPlanCreationModal.vue    | 68 +++++++++++++------
 website/common/locales/en/groups.json         |  4 ++
 3 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/habitica-images b/habitica-images
index 58b8905b08..6e9d17b8a4 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 58b8905b0825159b6ba4eb5a37459b97bca79947
+Subproject commit 6e9d17b8a4af295ba2d9dc9870b2904035d6fba7
diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 1044693d81..01e559ea1a 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -11,17 +11,18 @@
       v-if="activePage === PAGES.CREATE_GROUP"
       class="col-12"
     >
+      <!-- HEADER -->
       <div
         class="modal-close"
       >
-        <div
+        <span
           class="cancel-text"
           @click="close()"
         >
           {{ $t('cancel') }}
-        </div>
+        </span>
         <button
-          class="btn btn-primary"
+          class="btn btn-primary next-button"
           :value="$t('next')"
           @click="close()"
         >
@@ -29,31 +30,35 @@
         </button>
       </div>
       <h2>{{ $t('createGroup') }}</h2>
+
+      <!-- FORM -->
       <div class="form-group">
-        <label
-          class="control-label"
-          for="new-group-name"
-        >Name</label>
+        <lockable-label
+          :text="$t('nameStar')"
+        />
         <input
           id="new-group-name"
           v-model="newGroup.name"
           class="form-control input-medium option-content"
           required="required"
           type="text"
-          placeholder="Name"
+          :placeholder="$t('nameStarText')"
         >
       </div>
       <div class="form-group">
-        <label for="new-group-description">{{ $t('description') }}</label>
+        <lockable-label
+          for="new-group-description"
+          :text="$t('descriptionOptional')"
+        />
         <textarea
           id="new-group-description"
           v-model="newGroup.description"
           class="form-control option-content"
           cols="3"
-          :placeholder="$t('description')"
+          :placeholder="$t('descriptionOptionalText')"
         ></textarea>
       </div>
-      <div
+<!--       <div
         v-if="type === 'guild'"
         class="form-group"
       >
@@ -67,7 +72,7 @@
           >
           <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
         </div>
-      </div>
+      </div> -->
       <div class="form-group">
         <div class="custom-control custom-checkbox">
           <input
@@ -137,6 +142,31 @@
 <style lang="scss" scoped>
   @import '~@/assets/scss/colors.scss';
 
+  h2 {
+    color: $purple-300;
+    font-size: 1.25rem;
+    height: 28px;
+    width: 120px;
+    margin-top: 24px;
+    align-self: center;
+  }
+
+  .cancel-text {
+    color: $blue-10;
+    font-size: 0.875rem;
+    margin-right: 16px;
+    text-align: center;
+    cursor: pointer;
+  }
+  .next-button {
+    align-self: center;
+  }
+
+  .form-control::placeholder {
+    color: $gray-50;
+    height: 32px;
+  }
+
   .payment-options {
     margin-bottom: 4em;
 
@@ -170,6 +200,7 @@
       vertical-align: bottom;
     }
   }
+
 </style>
 <style lang="scss">
   @import '~@/assets/scss/mixins.scss';
@@ -184,21 +215,14 @@
     }
     .modal-body{
       padding: 0px;
+      margin-left: 12px;
+      margin-right: 12px;
     }
     .modal-close {
       position: absolute;
       right: 16px;
-      top: 16px;
       cursor: pointer;
-
-      .cancel-text {
-        color: #2995cd;
-        font-size: 0.875rem;
-        min-height: 24px;
-        margin: 16px 0 0;
-        text-align: center;
-        cursor: pointer;
-      }
+      top: 0px;
     }
   }
 </style>
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index dcc92184f6..dee4012171 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -353,6 +353,10 @@
   "gettingStarted": "Getting Started",
   "next": "Next",
   "cancel": "Cancel",
+  "nameStar": "Name*",
+  "nameStarText": "Add a title",
+  "descriptionOptional": "Description",
+  "descriptionOptionalText": "Add a description",
   "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
   "whatsIncludedGroup": "What's included in the subscription",
   "whatsIncludedGroupDesc": "All members of the Group receive full subscription benefits, including the monthly subscriber items, the ability to buy Gems with Gold, and the Royal Purple Jackalope mount, which is exclusive to users with a Group Plan membership.",

From 5d81c6389745a1a06f744e33dd099280b2624906 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 8 Aug 2022 16:36:14 -0400
Subject: [PATCH 008/134] update: upgrade groups sign up page (slightly)

---
 .../src/components/groups/groupPlan.vue       | 91 +++++++++----------
 1 file changed, 45 insertions(+), 46 deletions(-)

diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 4bc9bb2209..a96766c402 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -108,7 +108,7 @@
       >
         <div class="row">
           <h1 class="col-12 text-center purple-header">
-            Create your Group today!
+            Create Your Group Today!
           </h1>
         </div>
         <div class="row">
@@ -117,39 +117,33 @@
               class="btn btn-primary create-group"
               @click="launchModal('create-page')"
             >
-              Create Your New Group
+              Create Your New Group!
             </button>
           </div>
         </div>
-        <div class="row pricing">
-          <div class="col-5">
-            <div class="dollar">
-              $
-            </div>
-            <div class="number">
-              9
-            </div>
-            <div class="name">
-              <div>Group Owner</div>
-              <div>Subscription</div>
-            </div>
+        <div class="row pricing justify-content-center align-items-center">
+          <div class="dollar">
+            $
           </div>
-          <div class="col-1">
-            <div class="plus">
-              +
-            </div>
+          <div class="number">
+            9
           </div>
-          <div class="col-6">
-            <div class="dollar">
-              $
-            </div>
-            <div class="number">
-              3
-            </div>
-            <div class="name">
-              <div>Each Additional</div>
-              <div>Member</div>
-            </div>
+          <div class="name">
+            <div>Group Owner</div>
+            <div>Subscription</div>
+          </div>
+          <div class="plus">
+            +
+          </div>
+          <div class="dollar">
+            $
+          </div>
+          <div class="number">
+            3
+          </div>
+          <div class="name">
+            <div>Each Additional</div>
+            <div>Member</div>
           </div>
         </div>
       </div>
@@ -165,8 +159,8 @@
 
     .dollar {
       position: absolute;
-      left: -1em;
-      top: 1em;
+      left: -16px;
+      top: 16px;
     }
 
     .purple-box {
@@ -191,9 +185,9 @@
     background: #432874;
     background: linear-gradient(180deg, #4F2A93 0%, #432874 100%);
     color: #fff;
-    padding: 2em;
+    padding: 32px;
     height: 340px;
-    margin-bottom: 2em;
+    margin-bottom: 32px;
     margin-left: -12px;
     margin-right: -12px;
 
@@ -217,6 +211,7 @@
 
     .box {
       height: 416px;
+      border-radius: 8px;
     }
 
     h2 {
@@ -259,17 +254,19 @@
   button.create-group {
     width: 330px;
     height: 96px;
+    border-radius: 8px;
+    font-size: 1.5rem;
   }
 
   .purple-header {
     color: #6133b4;
     font-size: 48px;
-    margin-top: 1em;
+    margin-top: 16px;
   }
 
   .pricing {
-    margin-top: 2em;
-    margin-bottom: 4em;
+    margin-top: 32px;
+    margin-bottom: 64px;
 
     .dollar, .number, .name {
       display: inline-block;
@@ -278,35 +275,37 @@
     }
 
     .plus {
-      font-size: 34px;
+      font-size: 2.125rem;
       color: #a5a1ac;
+      margin-left: 16px;
+      margin-right: 16px;
     }
 
     .dollar {
-      margin-bottom: 1.5em;
-      font-size: 32px;
+      margin-bottom: 24px;
+      font-size: 2rem;
       font-weight: bold;
     }
 
     .name {
-      font-size: 24px;
-      margin-bottom: .8em;
-      margin-left: .5em;
+      font-size: 1.5rem;
+      margin-left: 8px;
+      margin-right: 8px;
     }
 
     .number {
-      font-size: 72px;
+      font-size: 4.5rem;
       font-weight: bolder;
     }
   }
 
   .payment-options {
-    margin-bottom: 4em;
+    margin-bottom: 64px;
 
     .purple-box {
       background-color: #4f2a93;
       color: #fff;
-      padding: .5em;
+      padding: 8px;
       border-radius: 8px;
       width: 200px;
       height: 215px;
@@ -320,7 +319,7 @@
 
       .name {
         width: 100px;
-        margin-left: .3em;
+        margin-left: 4.8px;
       }
 
       .plus {

From cfd601e7bfd4d86051760b0943dd04815c1bc6e0 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 8 Aug 2022 17:16:41 -0400
Subject: [PATCH 009/134] update: styling and some function work

---
 .../group-plans/groupPlanCreationModal.vue    | 68 ++++++++++++-------
 website/common/locales/en/groups.json         |  1 +
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 01e559ea1a..d9a81ef7dc 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -24,6 +24,7 @@
         <button
           class="btn btn-primary next-button"
           :value="$t('next')"
+          :disabled="!newGroupIsReady"
           @click="close()"
         >
           {{ $t('next') }}
@@ -39,7 +40,7 @@
         <input
           id="new-group-name"
           v-model="newGroup.name"
-          class="form-control input-medium option-content"
+          class="form-control input-medium option-content name-input"
           required="required"
           type="text"
           :placeholder="$t('nameStarText')"
@@ -53,7 +54,7 @@
         <textarea
           id="new-group-description"
           v-model="newGroup.description"
-          class="form-control option-content"
+          class="form-control option-content description-input"
           cols="3"
           :placeholder="$t('descriptionOptionalText')"
         ></textarea>
@@ -86,24 +87,28 @@
             for="create-group-leaderOnlyChallenges-checkbox"
           >{{ $t('leaderOnlyChallenges') }}</label>
         </div>
-        <div class="form-group">
-          <lockable-label
-            :text="$t('groupUse')"
-          />
-          <select-translated-array
-            :items="[
-              'groupUseDefault',
-              'groupParentChildren',
-              'groupCouple',
-              'groupFriends',
-              'groupCoworkers',
-              'groupManager',
-              'groupTeacher'
-            ]"
-            :value="groupUseDefault"
-            @select="groupUseDefault"
-          />
-        </div>
+      </div>
+      <div class="form-group">
+        <lockable-label
+          :text="$t('groupUse')"
+        />
+        <select-translated-array
+          v-model="newGroup.demographics"
+          :items="[
+            'groupUseDefault',
+            'groupParentChildren',
+            'groupCouple',
+            'groupFriends',
+            'groupCoworkers',
+            'groupManager',
+            'groupTeacher'
+          ]"
+          :value="groupUseDefault"
+          class="group-input"
+          @select="groupUseDefault"
+        />
+        <!-- need to figure out what goes in @select
+          there's an error being thrown in the component, perhaps I can't reuse it?   -->
       </div>
       <div
         v-if="type === 'party'"
@@ -117,11 +122,11 @@
       </div>
       <div class="form-group">
         <button
-          class="btn btn-primary btn-lg btn-block"
+          class="btn btn-primary btn-lg btn-block btn-payment"
           :disabled="!newGroupIsReady"
           @click="createGroup()"
         >
-          {{ $t('create') }}
+          {{ $t('nextPaymentMethod') }}
         </button>
       </div>
     </div>
@@ -167,6 +172,22 @@
     height: 32px;
   }
 
+  .name-input, .description-input, .group-input {
+    margin-top: -4px;
+  }
+
+  .description-input {
+    height: 56px;
+  }
+
+  .spacer {
+    margin-bottom: 16px !important;
+  }
+
+  .btn-payment {
+    margin-top: 1.5rem;
+  }
+
   .payment-options {
     margin-bottom: 4em;
 
@@ -291,6 +312,7 @@ export default {
         leaderOnly: {
           challenges: false,
         },
+        demographics: '',
       },
       activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this
@@ -301,7 +323,7 @@ export default {
   computed: {
     ...mapState({ user: 'user.data' }),
     newGroupIsReady () {
-      return Boolean(this.newGroup.name);
+      return Boolean(this.newGroup.name) && Boolean(this.newGroup.demographics);
     },
   },
   mounted () {
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index dee4012171..1f824f7448 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -357,6 +357,7 @@
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",
   "descriptionOptionalText": "Add a description",
+  "nextPaymentMethod": "Next: Payment Method",
   "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
   "whatsIncludedGroup": "What's included in the subscription",
   "whatsIncludedGroupDesc": "All members of the Group receive full subscription benefits, including the monthly subscriber items, the ability to buy Gems with Gold, and the Royal Purple Jackalope mount, which is exclusive to users with a Group Plan membership.",

From 8d1f7e77edfd049018f6959faa06383a14475ba5 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 10 Aug 2022 14:00:46 -0400
Subject: [PATCH 010/134] update: styling and dropdown

---
 .../group-plans/groupPlanCreationModal.vue    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index d9a81ef7dc..4d87ca5969 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -95,7 +95,6 @@
         <select-translated-array
           v-model="newGroup.demographics"
           :items="[
-            'groupUseDefault',
             'groupParentChildren',
             'groupCouple',
             'groupFriends',
@@ -103,12 +102,11 @@
             'groupManager',
             'groupTeacher'
           ]"
-          :value="groupUseDefault"
+          :placeholder="$t('groupUseDefault')"
           class="group-input"
-          @select="groupUseDefault"
+          :value="newGroup.demographics"
+          @select="newGroup.demographics = $event"
         />
-        <!-- need to figure out what goes in @select
-          there's an error being thrown in the component, perhaps I can't reuse it?   -->
       </div>
       <div
         v-if="type === 'party'"
@@ -185,7 +183,8 @@
   }
 
   .btn-payment {
-    margin-top: 1.5rem;
+    margin: 24px 112px 24px 112px;
+    width: 177px;
   }
 
   .payment-options {
@@ -263,10 +262,10 @@ export default {
   },
   mixins: [paymentsMixin],
   props: {
-    groupUseDefault: {
-      type: String,
-      default: 'groupUseDefault',
-    },
+    // groupUseDefault: {
+    //   type: String,
+    //   default: 'groupUseDefault',
+    // },
     groupParentChildren: {
       type: String,
       default: 'groupParentChildren',
@@ -312,7 +311,7 @@ export default {
         leaderOnly: {
           challenges: false,
         },
-        demographics: '',
+        demographics: null,
       },
       activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this

From e3c552dd5419088afe2c7d2889cf30405549b7d8 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 10 Aug 2022 14:59:19 -0500
Subject: [PATCH 011/134] WIP(dropdown): add placeholder text

---
 .../group-plans/groupPlanCreationModal.vue    | 33 +------------------
 .../modal-controls/selectTranslatedArray.vue  |  4 +++
 .../client/src/components/ui/selectList.vue   |  5 ++-
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 4d87ca5969..2c95562fcb 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -93,7 +93,6 @@
           :text="$t('groupUse')"
         />
         <select-translated-array
-          v-model="newGroup.demographics"
           :items="[
             'groupParentChildren',
             'groupCouple',
@@ -102,8 +101,8 @@
             'groupManager',
             'groupTeacher'
           ]"
-          :placeholder="$t('groupUseDefault')"
           class="group-input"
+          :placeholder="'groupUseDefault'"
           :value="newGroup.demographics"
           @select="newGroup.demographics = $event"
         />
@@ -261,36 +260,6 @@ export default {
     lockableLabel,
   },
   mixins: [paymentsMixin],
-  props: {
-    // groupUseDefault: {
-    //   type: String,
-    //   default: 'groupUseDefault',
-    // },
-    groupParentChildren: {
-      type: String,
-      default: 'groupParentChildren',
-    },
-    groupCouple: {
-      type: String,
-      default: 'groupCouple',
-    },
-    groupFriends: {
-      type: String,
-      default: 'groupFriends',
-    },
-    groupCoworkers: {
-      type: String,
-      default: 'groupCoworkers',
-    },
-    groupManager: {
-      type: String,
-      default: 'groupManager',
-    },
-    groupTeacher: {
-      type: String,
-      default: 'groupTeacher',
-    },
-  },
   data () {
     return {
       amazonPayments: {},
diff --git a/website/client/src/components/tasks/modal-controls/selectTranslatedArray.vue b/website/client/src/components/tasks/modal-controls/selectTranslatedArray.vue
index 0b201f3d11..21e0cad24f 100644
--- a/website/client/src/components/tasks/modal-controls/selectTranslatedArray.vue
+++ b/website/client/src/components/tasks/modal-controls/selectTranslatedArray.vue
@@ -9,6 +9,7 @@
       :right="right"
       :hide-icon="false"
       :inline-dropdown="inlineDropdown"
+      :placeholder="placeholder"
       @select="selectItem($event)"
     >
       <template v-slot:item="{ item }">
@@ -70,6 +71,9 @@ export default {
       type: Boolean,
       default: true,
     },
+    placeholder: {
+      type: String,
+    },
   },
   data () {
     return {
diff --git a/website/client/src/components/ui/selectList.vue b/website/client/src/components/ui/selectList.vue
index c5607b1e60..1d8c93cca2 100644
--- a/website/client/src/components/ui/selectList.vue
+++ b/website/client/src/components/ui/selectList.vue
@@ -12,7 +12,7 @@
       <template v-slot:button-content>
         <slot
           name="item"
-          :item="selected"
+          :item="selected || placeholder"
           :button="true"
         >
           <!-- Fallback content -->
@@ -114,6 +114,9 @@ export default {
       type: Boolean,
       default: true,
     },
+    placeholder: {
+      type: String,
+    },
   },
   data () {
     return {

From a07c2e6268997b17a100b78a349cbf4c16bb8dc5 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 10 Aug 2022 16:48:09 -0400
Subject: [PATCH 012/134] update: dropdown and delete duplicated file

---
 .../group-plans/groupPlanCreationModal.vue    |  40 +--
 .../groups/groupPlanCreationModal.vue         | 230 ------------------
 2 files changed, 9 insertions(+), 261 deletions(-)
 delete mode 100644 website/client/src/components/groups/groupPlanCreationModal.vue

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 2c95562fcb..fde0ec2d9f 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -25,7 +25,7 @@
           class="btn btn-primary next-button"
           :value="$t('next')"
           :disabled="!newGroupIsReady"
-          @click="close()"
+          @click="createGroup()"
         >
           {{ $t('next') }}
         </button>
@@ -59,21 +59,6 @@
           :placeholder="$t('descriptionOptionalText')"
         ></textarea>
       </div>
-<!--       <div
-        v-if="type === 'guild'"
-        class="form-group"
-      >
-        <div class="custom-control custom-radio">
-          <input
-            v-model="newGroup.privacy"
-            class="custom-control-input"
-            type="radio"
-            name="new-group-privacy"
-            value="private"
-          >
-          <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-        </div>
-      </div> -->
       <div class="form-group">
         <div class="custom-control custom-checkbox">
           <input
@@ -104,19 +89,8 @@
           class="group-input"
           :placeholder="'groupUseDefault'"
           :value="newGroup.demographics"
-          @select="newGroup.demographics = $event"
         />
       </div>
-      <div
-        v-if="type === 'party'"
-        class="form-group"
-      >
-        <button
-          class="btn btn-secondary form-control"
-          :value="$t('create')"
-          @click="createGroup()"
-        ></button>
-      </div>
       <div class="form-group">
         <button
           class="btn btn-primary btn-lg btn-block btn-payment"
@@ -127,9 +101,10 @@
         </button>
       </div>
     </div>
+    <!-- PAYMENT -->
     <div
       v-if="activePage === PAGES.PAY"
-      class="col-12"
+      class="col-12 payments"
     >
       <div class="text-center">
         <payments-buttons
@@ -186,6 +161,10 @@
     width: 177px;
   }
 
+  .payments {
+    padding: 24px;
+  }
+
   .payment-options {
     margin-bottom: 4em;
 
@@ -284,14 +263,12 @@ export default {
       },
       activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this
-      icons: Object.freeze({
-      }),
     };
   },
   computed: {
     ...mapState({ user: 'user.data' }),
     newGroupIsReady () {
-      return Boolean(this.newGroup.name) && Boolean(this.newGroup.demographics);
+      return Boolean(this.newGroup.name);
     },
   },
   mounted () {
@@ -307,6 +284,7 @@ export default {
     createGroup () {
       console.log('i am giving habitica money now');
       this.changePage(this.PAGES.PAY);
+      console.log(this.newGroup);
     },
     pay (paymentMethod) {
       const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
diff --git a/website/client/src/components/groups/groupPlanCreationModal.vue b/website/client/src/components/groups/groupPlanCreationModal.vue
deleted file mode 100644
index 2a71afd919..0000000000
--- a/website/client/src/components/groups/groupPlanCreationModal.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
-  <div>
-    <b-modal
-      id="group-plan-modal"
-      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
-      size="md"
-      hide-footer="hide-footer"
-    >
-      <div
-        v-if="activePage === PAGES.CREATE_GROUP"
-        class="col-12"
-      >
-        <div class="form-group">
-          <label
-            class="control-label"
-            for="new-group-name"
-          >Name</label>
-          <input
-            id="new-group-name"
-            v-model="newGroup.name"
-            class="form-control input-medium option-content"
-            required="required"
-            type="text"
-            placeholder="Name"
-          >
-        </div>
-        <div class="form-group">
-          <label for="new-group-description">{{ $t('description') }}</label>
-          <textarea
-            id="new-group-description"
-            v-model="newGroup.description"
-            class="form-control option-content"
-            cols="3"
-            :placeholder="$t('description')"
-          ></textarea>
-        </div>
-        <div
-          v-if="type === 'guild'"
-          class="form-group"
-        >
-          <div class="custom-control custom-radio">
-            <input
-              v-model="newGroup.privacy"
-              class="custom-control-input"
-              type="radio"
-              name="new-group-privacy"
-              value="private"
-            >
-            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <input
-              id="create-group-leaderOnlyChallenges-checkbox"
-              v-model="newGroup.leaderOnly.challenges"
-              class="custom-control-input"
-              type="checkbox"
-            >
-            <label
-              class="custom-control-label"
-              for="create-group-leaderOnlyChallenges-checkbox"
-            >{{ $t('leaderOnlyChallenges') }}</label>
-          </div>
-        </div>
-        <div
-          v-if="type === 'party'"
-          class="form-group"
-        >
-          <button
-            class="btn btn-secondary form-control"
-            :value="$t('create')"
-            @click="createGroup()"
-          ></button>
-        </div>
-        <div class="form-group">
-          <button
-            class="btn btn-primary btn-lg btn-block"
-            :disabled="!newGroupIsReady"
-            @click="createGroup()"
-          >
-            {{ $t('create') }}
-          </button>
-        </div>
-      </div>
-      <div
-        v-if="activePage === PAGES.PAY"
-        class="col-12"
-      >
-        <div class="text-center">
-          <payments-buttons
-            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
-            :amazon-data="pay(PAYMENTS.AMAZON)"
-          />
-        </div>
-      </div>
-    </b-modal>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-  .payment-options {
-    margin-bottom: 4em;
-
-    .purple-box {
-      background-color: #4f2a93;
-      color: #fff;
-      padding: .5em;
-      border-radius: 8px;
-      width: 200px;
-      height: 215px;
-
-      .dollar {
-      }
-
-      .number {
-        font-size: 60px;
-      }
-
-      .name {
-        width: 100px;
-        margin-left: .3em;
-      }
-
-      .plus {
-        width: 100%;
-        text-align: center;
-      }
-
-      div {
-        display: inline-block;
-      }
-    }
-
-    .box, .purple-box {
-      display: inline-block;
-      vertical-align: bottom;
-    }
-  }
-</style>
-
-<script>
-import paymentsMixin from '../../mixins/payments';
-import { mapState } from '@/libs/store';
-import positiveIcon from '@/assets/svg/positive.svg';
-import paymentsButtons from '@/components/payments/buttons/list';
-
-export default {
-  components: {
-    paymentsButtons,
-  },
-  mixins: [paymentsMixin],
-  data () {
-    return {
-      amazonPayments: {},
-      icons: Object.freeze({
-        positiveIcon,
-      }),
-      PAGES: {
-        CREATE_GROUP: 'create-group',
-        UPGRADE_GROUP: 'upgrade-group',
-        PAY: 'pay',
-      },
-      PAYMENTS: {
-        AMAZON: 'amazon',
-        STRIPE: 'stripe',
-      },
-      paymentMethod: '',
-      newGroup: {
-        type: 'guild',
-        privacy: 'private',
-        name: '',
-        leaderOnly: {
-          challenges: false,
-        },
-      },
-      activePage: '',
-      type: 'guild', // Guild or Party @TODO enum this
-    };
-  },
-  computed: {
-    newGroupIsReady () {
-      return Boolean(this.newGroup.name);
-    },
-    upgradingGroup () {
-      return this.$store.state.upgradingGroup;
-    },
-    // @TODO: can we move this to payment mixin?
-    ...mapState({ user: 'user.data' }),
-  },
-  mounted () {
-    this.activePage = this.PAGES.BENEFITS;
-    this.$store.dispatch('common:setTitle', {
-      section: this.$t('groupPlans'),
-    });
-  },
-  methods: {
-    createGroup () {
-      this.changePage(this.PAGES.PAY);
-    },
-    pay (paymentMethod) {
-      const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
-      const paymentData = {
-        subscription: subscriptionKey,
-        coupon: null,
-      };
-
-      if (this.upgradingGroup && this.upgradingGroup._id) {
-        paymentData.groupId = this.upgradingGroup._id;
-        paymentData.group = this.upgradingGroup;
-      } else {
-        paymentData.groupToCreate = this.newGroup;
-      }
-
-      this.paymentMethod = paymentMethod;
-
-      if (this.paymentMethod === this.PAYMENTS.AMAZON) {
-        paymentData.type = 'subscription';
-        return paymentData;
-      }
-
-      if (this.paymentMethod === this.PAYMENTS.STRIPE) {
-        this.redirectToStripe(paymentData);
-      }
-
-      return null;
-    },
-  },
-};
-</script>

From b593db2150df7339c5fbdfb251068b18b553847a Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 10 Aug 2022 16:20:32 -0500
Subject: [PATCH 013/134] feat(admin): show subscription data

---
 .../admin-panel/user-support/index.vue        |  6 ++
 .../user-support/subscriptionAndPerks.vue     | 68 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue

diff --git a/website/client/src/components/admin-panel/user-support/index.vue b/website/client/src/components/admin-panel/user-support/index.vue
index d94d6d44c4..7506b91b48 100644
--- a/website/client/src/components/admin-panel/user-support/index.vue
+++ b/website/client/src/components/admin-panel/user-support/index.vue
@@ -17,6 +17,10 @@
           :reset-counter="resetCounter"
         />
 
+        <subscription-and-perks
+          :subscription="hero.purchased.plan"
+        />
+
         <cron-and-auth
           :hero="hero"
           :reset-counter="resetCounter"
@@ -97,6 +101,7 @@ import AvatarAndDrops from './avatarAndDrops';
 import PrivilegesAndGems from './privilegesAndGems';
 import ContributorDetails from './contributorDetails';
 import Transactions from './transactions';
+import SubscriptionAndPerks from './subscriptionAndPerks';
 
 import { userStateMixin } from '../../../mixins/userState';
 
@@ -110,6 +115,7 @@ export default {
     PrivilegesAndGems,
     ContributorDetails,
     Transactions,
+    SubscriptionAndPerks,
   },
   mixins: [userStateMixin],
   data () {
diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
new file mode 100644
index 0000000000..924a445b12
--- /dev/null
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -0,0 +1,68 @@
+<template>
+  <div class="accordion-group">
+    <h3
+      class="expand-toggle"
+      :class="{'open': expand}"
+      @click="expand = !expand"
+    >
+      Subscription, Monthly Perks
+    </h3>
+    <div v-if="expand">
+      <div v-if="subscription.paymentMethod">
+        Payment Method:
+        <strong>{{ subscription.paymentMethod }}</strong>
+      </div>
+      <div v-if="subscription.planId">
+        Payment Schedule ("basic-earned" is monthly):
+        <strong>{{ subscription.planId }}</strong>
+      </div>
+      <div v-if="subscription.dateCreated">
+        Creation Date:
+        <strong>{{ moment(subscription.dateCreated).format('YYYY/MM/DD') }}</strong>
+      </div>
+      <div v-if="subscription.dateTerminated">
+        Termination Date:
+        <strong>{{ moment(subscription.dateTerminated).format('YYYY/MM/DD') }}</strong>
+      </div>
+      <div>
+        Consecutive Months:
+        <strong>{{ subscription.consecutive.count }}</strong>
+      </div>
+      <div>
+        Months Until Renewal:
+        <strong>{{ subscription.consecutive.offset }}</strong>
+      </div>
+      <div>
+        Gem Cap:
+        <strong>{{ subscription.consecutive.gemCapExtra + 25 }}</strong>
+      </div>
+      <div
+        v-if="subscription.extraMonths > 0"
+      >
+        Additional Credit (applied upon cancellation):
+        <strong>{{ subscription.extraMonths }}</strong>
+      </div>
+      <div>
+        Mystery Items:
+        <span
+          v-for="(item, index) in subscription.mysteryItems"
+          :key="index"
+        >
+          <strong v-if="index < subscription.mysteryItems.length"> {{ item }}, </strong>
+          <strong v-else> {{ item }} </strong>
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    subscription: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>

From 0aadee550e23ecc7f73e3db5494e96173a3ee4a4 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 11 Aug 2022 14:16:27 -0500
Subject: [PATCH 014/134] fix(admin): add data value for expand state

---
 .../admin-panel/user-support/subscriptionAndPerks.vue        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index 924a445b12..0211a0f531 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -64,5 +64,10 @@ export default {
       required: true,
     },
   },
+  data () {
+    return {
+      expand: false,
+    };
+  },
 };
 </script>

From 0435e3537a2fd6902823742f4a01b13c3b0449c8 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 11 Aug 2022 16:39:49 -0400
Subject: [PATCH 015/134] update: add temp button & function for triggering
 success modal; add comments

---
 habitica-images                               |  2 +-
 .../group-plans/groupPlanCreationModal.vue    | 33 ++++++++++++++-----
 .../src/components/groups/groupPlan.vue       |  2 ++
 .../src/components/payments/successModal.vue  |  6 ++--
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/habitica-images b/habitica-images
index 6e9d17b8a4..6610fcd017 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 6e9d17b8a4af295ba2d9dc9870b2904035d6fba7
+Subproject commit 6610fcd01761149ce5391cbe85a249fd80d7983c
diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index fde0ec2d9f..cf837b13e5 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -89,6 +89,7 @@
           class="group-input"
           :placeholder="'groupUseDefault'"
           :value="newGroup.demographics"
+          @select="newGroup.demographics = $event"
         />
       </div>
       <div class="form-group">
@@ -102,6 +103,7 @@
       </div>
     </div>
     <!-- PAYMENT -->
+    <!-- @TODO: Separate payment into a separate modal -->
     <div
       v-if="activePage === PAGES.PAY"
       class="col-12 payments"
@@ -112,6 +114,13 @@
           :amazon-data="pay(PAYMENTS.AMAZON)"
         />
       </div>
+      <!-- TEMPORARY BUTTON FOR TESTING -->
+      <button
+        class="btn btn-primary btn-payment"
+        @click="success()"
+      >
+        Clicky click click!
+      </button>
     </div>
   </b-modal>
 </template>
@@ -244,7 +253,7 @@ export default {
       amazonPayments: {},
       PAGES: {
         CREATE_GROUP: 'create-group',
-        UPGRADE_GROUP: 'upgrade-group',
+        // UPGRADE_GROUP: 'upgrade-group',
         PAY: 'pay',
       },
       PAYMENTS: {
@@ -262,18 +271,15 @@ export default {
         demographics: null,
       },
       activePage: 'create-group',
-      type: 'guild', // Guild or Party @TODO enum this
+      type: 'guild',
     };
   },
   computed: {
     ...mapState({ user: 'user.data' }),
     newGroupIsReady () {
-      return Boolean(this.newGroup.name);
+      return Boolean(this.newGroup.name) && Boolean(this.newGroup.demographics);
     },
   },
-  mounted () {
-    console.log('i am mounted');
-  },
   methods: {
     close () {
       this.$root.$emit('bv::hide::modal', 'create-group');
@@ -282,9 +288,8 @@ export default {
       this.activePage = page;
     },
     createGroup () {
-      console.log('i am giving habitica money now');
-      this.changePage(this.PAGES.PAY);
       console.log(this.newGroup);
+      this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
       const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
@@ -313,9 +318,21 @@ export default {
 
       return null;
     },
+    // need to figure out where/how to create the event in amplitude
+    // right now being sent to console in success()
+    sendAnalytics () {
+      return this.newGroup.demographics;
+    },
     onHide () {
       this.sendingInProgress = false;
     },
+    // temporary function to go with temporary button
+    success () {
+      console.log(this.sendAnalytics());
+      this.sendAnalytics();
+      this.$root.$emit('bv::hide::modal', 'create-group');
+      this.$root.$emit('bv::show::modal', 'payments-success-modal');
+    },
   },
 };
 </script>
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index a96766c402..a4667cc7a2 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -52,6 +52,7 @@
           </div>
         </div>
       </div>
+      <!-- Upgrading an existing group -->
       <div
         v-if="upgradingGroup._id"
         id="upgrading-group"
@@ -102,6 +103,7 @@
           </div>
         </div>
       </div>
+      <!-- Create a new group -->
       <div
         v-if="!upgradingGroup._id"
         class="container col-6 offset-3 create-option"
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index c816a3300d..2e0af41cdb 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -124,14 +124,14 @@
   border-bottom: none;
 
   h2 {
-    color: white;
+    color: $green-1;
   }
 
   .check-container {
     width: 64px;
     height: 64px;
     border-radius: 50%;
-    background: #1CA372;
+    background: $green-1;
     margin: 0 auto;
     margin-bottom: 16px;
   }
@@ -139,7 +139,7 @@
   .check {
     width: 35.1px;
     height: 28px;
-    color: white;
+    color: $white;
   }
 }
 

From e08d0f4016582cbd13150ef0f67b1a8c701ae3a7 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 12 Aug 2022 16:44:58 -0400
Subject: [PATCH 016/134] update: style changes, add upgraded group
 demographics to success modal, add description counter

---
 website/client/src/assets/scss/form.scss      | 20 +++++----
 .../group-plans/groupPlanCreationModal.vue    | 23 ++++++++++
 .../src/components/payments/successModal.vue  | 45 +++++++++++++++++++
 website/common/locales/en/groups.json         |  2 +-
 4 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/website/client/src/assets/scss/form.scss b/website/client/src/assets/scss/form.scss
index 8e21bc06a4..b161472271 100644
--- a/website/client/src/assets/scss/form.scss
+++ b/website/client/src/assets/scss/form.scss
@@ -180,8 +180,8 @@ input, textarea, input.form-control, textarea.form-control {
 }
 
 // used in checkboxes and radios
-$bg-focused-active-control: #4f2993;
-$bg-disabled-control: #34303a;
+$bg-focused-active-control: $purple-200;
+$bg-disabled-control: $gray-10;
 
 // custom control
 .custom-control {
@@ -231,17 +231,21 @@ $bg-disabled-control: #34303a;
       background-color: inherit;
     }
 
-    &:focus:not(:checked):not(:disabled)~.custom-control-label::before, &:active:not(:checked):not(:disabled)~.custom-control-label::before  {
-      box-shadow: 0 0 0 6px rgba($bg-focused-active-control, 0.1);
+    &:focus:not(:checked):not(:disabled)~.custom-control-label::before, 
+    &:active:not(:checked):not(:disabled)~.custom-control-label::before  {
+      border: 2px solid $gray-300;
+      box-shadow: 0 0 0 2px rgba(146, 92, 243, 0.5);
     }
 
-    &:focus:checked:not(:disabled)~.custom-control-label::before, &:active:checked:not(:disabled)~.custom-control-label::before  {
-      box-shadow: 0 0 0 6px rgba($bg-focused-active-control, 0.1);
-      border-color: $purple-400;
+    &:focus:checked:not(:disabled)~.custom-control-label::before, 
+    &:active:checked:not(:disabled)~.custom-control-label::before  {
+      box-shadow: 0 0 0 2px rgba(146, 92, 243, 0.5);
+      border-color: 2 px solid $purple-400;
       background-color: $purple-400;
     }
 
-    &:focus:disabled~.custom-control-label::before, &:active:disabled~.custom-control-label::before  {
+    &:focus:disabled~.custom-control-label::before, 
+    &:active:disabled~.custom-control-label::before  {
       box-shadow: 0 0 0 6px rgba($bg-disabled-control, 0.1);
     }
 
diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index cf837b13e5..5c2158e579 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -50,13 +50,18 @@
         <lockable-label
           for="new-group-description"
           :text="$t('descriptionOptional')"
+          class="description-label"
         />
+        <div class="characters-remaining">
+          {{ $t('charactersRemaining', {characters: charactersRemaining}) }}
+        </div>
         <textarea
           id="new-group-description"
           v-model="newGroup.description"
           class="form-control option-content description-input"
           cols="3"
           :placeholder="$t('descriptionOptionalText')"
+          maxlength="250"
         ></textarea>
       </div>
       <div class="form-group">
@@ -153,10 +158,22 @@
     height: 32px;
   }
 
+  .description-label {
+    margin-bottom: -24px;
+  }
+
   .name-input, .description-input, .group-input {
     margin-top: -4px;
   }
 
+ .characters-remaining {
+  color: $gray-100;
+  font-size: 0.75rem;
+  line-height: 1.33;
+  text-align: right;
+  margin-bottom: 12px;
+ }
+
   .description-input {
     height: 56px;
   }
@@ -217,6 +234,7 @@
     }
     .modal-content {
       width: 448px;
+      height: 436px;
       border-radius: 8px;
       box-shadow: 0 14px 28px 0 rgba(26, 24, 29, 0.24), 0 10px 10px 0 rgba(26, 24, 29, 0.28);
     }
@@ -265,6 +283,7 @@ export default {
         type: 'guild',
         privacy: 'private',
         name: '',
+        description: '',
         leaderOnly: {
           challenges: false,
         },
@@ -279,6 +298,10 @@ export default {
     newGroupIsReady () {
       return Boolean(this.newGroup.name) && Boolean(this.newGroup.demographics);
     },
+    charactersRemaining () {
+      const currentLength = this.newGroup.description ? this.newGroup.description.length : 0;
+      return 250 - currentLength;
+    },
   },
   methods: {
     close () {
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 2e0af41cdb..bc96b35f03 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -85,6 +85,38 @@
             v-once
             class="small-text auto-renew"
           >{{ $t('paymentAutoRenew') }}</span>
+          <div
+            v-if="paymentData.paymentType === 'groupPlan'
+              && paymentData.newGroup === 'groupPlanUpgraded'"
+            class="form-group"
+          >
+            <lockable-label
+              :text="$t('groupUse')"
+              class="justify-content-center"
+            />
+            <select-translated-array
+              :items="[
+                'groupParentChildren',
+                'groupCouple',
+                'groupFriends',
+                'groupCoworkers',
+                'groupManager',
+                'groupTeacher'
+              ]"
+              class="group-input"
+              :placeholder="'groupUseDefault'"
+              :value="newGroup.demographics"
+              @select="newGroup.demographics = $event"
+            />
+          </div>
+          <div class="form-group">
+            <button
+              class="btn btn-primary btn-lg btn-block btn-payment"
+              @click="closeGroup()"
+            >
+              {{ $t('submit') }}
+            </button>
+          </div>
         </template>
         <button
           v-once
@@ -200,6 +232,9 @@
   .small-text {
     font-style: normal;
   }
+  .group-input {
+    margin-top: -4px;
+  }
 }
 </style>
 
@@ -207,10 +242,16 @@
 import checkIcon from '@/assets/svg/check.svg';
 import gemIcon from '@/assets/svg/gem.svg';
 import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
+import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
+import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
 
 export default {
   data () {
     return {
+      components: {
+        selectTranslatedArray,
+        lockableLabel,
+      },
       icons: Object.freeze({
         check: checkIcon,
         gem: gemIcon,
@@ -246,6 +287,10 @@ export default {
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
+    closeGroup () {
+      this.close();
+      return this.groupName.analytics; // this needs to go to Amplitude somehow
+    },
   },
 };
 </script>
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 1f824f7448..2907b58c07 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -214,7 +214,7 @@
   "userIsClamingTask": "`<%= username %> has claimed:` <%= task %>",
   "approvalRequested": "Approval Requested",
   "cantDeleteAssignedGroupTasks": "Can't delete group tasks that are assigned to you.",
-  "groupPlanUpgraded": "<strong><%- groupName %></strong> was upgraded to a Group Plan!",
+  "groupPlanUpgraded": "<strong><%- groupName %></strong> was successfully upgraded to a Group Plan!",
   "groupPlanCreated": "<strong><%- groupName %></strong> was created!",
   "onlyGroupLeaderCanInviteToGroupPlan": "Only the group leader can invite users to a group with a subscription.",
   "paymentDetails": "Payment Details",

From d70dd2e6dd8d6f0e041e9000fcd3d3b741181ddb Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 15 Aug 2022 17:13:51 -0400
Subject: [PATCH 017/134] update: add analytics event upon group
 creation/upgrade (temp code & console.logs commented out)

---
 .../group-plans/groupPlanCreationModal.vue    | 27 ++++++++++++-------
 .../src/components/payments/successModal.vue  | 11 +++++---
 website/client/src/mixins/payments.js         |  5 ++++
 website/server/libs/payments/subscriptions.js |  7 +++++
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 5c2158e579..cf85712ba6 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -120,12 +120,12 @@
         />
       </div>
       <!-- TEMPORARY BUTTON FOR TESTING -->
-      <button
+<!--       <button
         class="btn btn-primary btn-payment"
         @click="success()"
       >
         Clicky click click!
-      </button>
+      </button> -->
     </div>
   </b-modal>
 </template>
@@ -234,7 +234,7 @@
     }
     .modal-content {
       width: 448px;
-      height: 436px;
+      max-height: 436px;
       border-radius: 8px;
       box-shadow: 0 14px 28px 0 rgba(26, 24, 29, 0.24), 0 10px 10px 0 rgba(26, 24, 29, 0.28);
     }
@@ -277,6 +277,7 @@ export default {
       PAYMENTS: {
         AMAZON: 'amazon',
         STRIPE: 'stripe',
+        // OTHER: 'tempcode', // TEMP CODE
       },
       paymentMethod: '',
       newGroup: {
@@ -316,9 +317,11 @@ export default {
     },
     pay (paymentMethod) {
       const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
+      const demographicsKey = this.newGroup.demographics;
       const paymentData = {
         subscription: subscriptionKey,
         coupon: null,
+        demographics: demographicsKey,
       };
 
       if (this.upgradingGroup && this.upgradingGroup._id) {
@@ -339,6 +342,11 @@ export default {
         this.redirectToStripe(paymentData);
       }
 
+      // TEMP CODE
+      if (this.paymentMethod === this.PAYMENTS.OTHER) {
+        console.log(paymentData);
+      }
+
       return null;
     },
     // need to figure out where/how to create the event in amplitude
@@ -350,12 +358,13 @@ export default {
       this.sendingInProgress = false;
     },
     // temporary function to go with temporary button
-    success () {
-      console.log(this.sendAnalytics());
-      this.sendAnalytics();
-      this.$root.$emit('bv::hide::modal', 'create-group');
-      this.$root.$emit('bv::show::modal', 'payments-success-modal');
-    },
+    // success () {
+    //   this.pay(this.PAYMENTS.OTHER);
+    //   console.log(this.sendAnalytics());
+    //   this.sendAnalytics();
+    //   this.$root.$emit('bv::hide::modal', 'create-group');
+    //   this.$root.$emit('bv::show::modal', 'payments-success-modal');
+    // },
   },
 };
 </script>
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index bc96b35f03..805013db51 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -105,8 +105,8 @@
               ]"
               class="group-input"
               :placeholder="'groupUseDefault'"
-              :value="newGroup.demographics"
-              @select="newGroup.demographics = $event"
+              :value="upgradedGroup.demographics"
+              @select="upgradedGroup.demographics = $event"
             />
           </div>
           <div class="form-group">
@@ -119,7 +119,7 @@
           </div>
         </template>
         <button
-          v-once
+          v-else
           class="btn btn-primary"
           @click="close()"
         >
@@ -257,6 +257,9 @@ export default {
         gem: gemIcon,
       }),
       paymentData: {},
+      upgradedGroup: {
+        demographics: null,
+      },
     };
   },
   computed: {
@@ -288,8 +291,8 @@ export default {
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
     closeGroup () {
+      console.log(this.updatedGroup.demographics);
       this.close();
-      return this.groupName.analytics; // this needs to go to Amplitude somehow
     },
   },
 };
diff --git a/website/client/src/mixins/payments.js b/website/client/src/mixins/payments.js
index bce95ff76d..5b8a1439a5 100644
--- a/website/client/src/mixins/payments.js
+++ b/website/client/src/mixins/payments.js
@@ -140,6 +140,7 @@ export default {
       if (data.subscription) postData.sub = sub.key;
       if (data.coupon) postData.coupon = data.coupon;
       if (data.groupId) postData.groupId = data.groupId;
+      if (data.demographics) postData.demographics = data.demographics;
 
       const response = await axios.post(url, postData);
 
@@ -267,6 +268,10 @@ export default {
         this.amazonPayments.groupToCreate = data.groupToCreate;
       }
 
+      if (data.demographics) { // sending demographics
+        this.amazonPayments.demographics = data.demographics;
+      }
+
       this.amazonPayments.gift = data.gift;
       this.amazonPayments.type = data.type;
     },
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index eaee4d9803..2052dc4c9a 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -86,6 +86,13 @@ async function createSubscription (data) {
       user: data.user, groupId: data.groupId, populateLeader: false, groupFields,
     });
 
+    if (group) {
+      analytics.track(
+        this.groupID,
+        data.demographics,
+      );
+    }
+
     if (!group) {
       throw new NotFound(shared.i18n.t('groupNotFound'));
     }

From 40f433b0996325070b9d7b579e0affac0e531705 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 25 Aug 2022 15:47:24 -0400
Subject: [PATCH 018/134] update: work on success modal

---
 .../src/components/payments/successModal.vue  | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 805013db51..a5945d96ee 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -65,10 +65,13 @@
             ></span>
           </div>
         </template>
-        <template v-if="paymentData.paymentType === 'groupPlan'">
+        <!-- not sure this is right -->
+        <template
+          v-if="paymentData.paymentType === 'groupPlan'
+            && paymentData.paymentType === 'newGroup'"
+        >
           <span
-            v-html="$t(paymentData.newGroup
-              ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
+            v-html="$t('groupPlanCreated', {groupName: paymentData.group.name})"
           ></span>
           <div class="details-block">
             <span
@@ -77,6 +80,7 @@
             ></span>
           </div>
         </template>
+
         <template
           v-if="paymentData.paymentType === 'groupPlan'
             || paymentData.paymentType === 'subscription'"
@@ -85,11 +89,26 @@
             v-once
             class="small-text auto-renew"
           >{{ $t('paymentAutoRenew') }}</span>
+        </template>
+        <!-- not sure this is right -->
+        <template
+          v-if="paymentData.newGroup === 'groupPlanUpgraded'
+            && paymentData.paymentType === 'upgradedGroup'"
+        >
+          <span
+            v-html="$t('groupPlanUpdated', {groupName: paymentData.group.name})"
+          ></span>
+          <div class="details-block">
+            <span
+              v-html="$t('paymentSubBilling', {
+                amount: groupPlanCost, months: paymentData.subscription.months})"
+            ></span>
+          </div>
           <div
-            v-if="paymentData.paymentType === 'groupPlan'
-              && paymentData.newGroup === 'groupPlanUpgraded'"
             class="form-group"
           >
+            <span>{{ $t('groupUse') }}</span>
+            <p>this is text</p>
             <lockable-label
               :text="$t('groupUse')"
               class="justify-content-center"
@@ -108,11 +127,9 @@
               :value="upgradedGroup.demographics"
               @select="upgradedGroup.demographics = $event"
             />
-          </div>
-          <div class="form-group">
             <button
               class="btn btn-primary btn-lg btn-block btn-payment"
-              @click="closeGroup()"
+              @click="close()"
             >
               {{ $t('submit') }}
             </button>
@@ -257,7 +274,11 @@ export default {
         gem: gemIcon,
       }),
       paymentData: {},
+      newGroup: {
+        name: '',
+      },
       upgradedGroup: {
+        name: '',
         demographics: null,
       },
     };
@@ -287,13 +308,10 @@ export default {
   },
   methods: {
     close () {
+      console.log(this.upgradedGroup.demographics);
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
-    closeGroup () {
-      console.log(this.updatedGroup.demographics);
-      this.close();
-    },
   },
 };
 </script>

From 8a809c382877aa4addc4d46bfedf07629092d3b3 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 26 Aug 2022 17:58:51 -0400
Subject: [PATCH 019/134] update: work on success modal, update to payment
 mixin to calculate monthly billing date

---
 .../group-plans/groupPlanCreationModal.vue    |   6 +-
 .../src/components/payments/successModal.vue  | 115 ++++++++----------
 website/client/src/mixins/payments.js         |   7 ++
 3 files changed, 58 insertions(+), 70 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index cf85712ba6..5b63bafb93 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -343,9 +343,9 @@ export default {
       }
 
       // TEMP CODE
-      if (this.paymentMethod === this.PAYMENTS.OTHER) {
-        console.log(paymentData);
-      }
+      // if (this.paymentMethod === this.PAYMENTS.OTHER) {
+      //   console.log(paymentData);
+      // }
 
       return null;
     },
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index a5945d96ee..3044313222 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -65,53 +65,28 @@
             ></span>
           </div>
         </template>
-        <!-- not sure this is right -->
-        <template
-          v-if="paymentData.paymentType === 'groupPlan'
-            && paymentData.paymentType === 'newGroup'"
-        >
+        <template v-if="paymentData.paymentType === 'groupPlan'">
           <span
-            v-html="$t('groupPlanCreated', {groupName: paymentData.group.name})"
+            v-html="$t(paymentData.newGroup
+              ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
           ></span>
-          <div class="details-block">
+<!--           <div class="details-block">
             <span
               v-html="$t('paymentSubBilling', {
                 amount: groupPlanCost, months: paymentData.subscription.months})"
             ></span>
-          </div>
-        </template>
-
-        <template
-          v-if="paymentData.paymentType === 'groupPlan'
-            || paymentData.paymentType === 'subscription'"
-        >
-          <span
-            v-once
-            class="small-text auto-renew"
-          >{{ $t('paymentAutoRenew') }}</span>
-        </template>
-        <!-- not sure this is right -->
-        <template
-          v-if="paymentData.newGroup === 'groupPlanUpgraded'
-            && paymentData.paymentType === 'upgradedGroup'"
-        >
-          <span
-            v-html="$t('groupPlanUpdated', {groupName: paymentData.group.name})"
-          ></span>
-          <div class="details-block">
-            <span
-              v-html="$t('paymentSubBilling', {
-                amount: groupPlanCost, months: paymentData.subscription.months})"
-            ></span>
-          </div>
+          </div> -->
           <div
+            v-if="!paymentData.newGroup"
             class="form-group"
           >
-            <span>{{ $t('groupUse') }}</span>
-            <p>this is text</p>
+            <div class="details-block">
+              <span>
+                Your next billing date is <strong>{{ dateRenewal }}</strong>.
+              </span>
+            </div>
             <lockable-label
               :text="$t('groupUse')"
-              class="justify-content-center"
             />
             <select-translated-array
               :items="[
@@ -124,24 +99,36 @@
               ]"
               class="group-input"
               :placeholder="'groupUseDefault'"
-              :value="upgradedGroup.demographics"
-              @select="upgradedGroup.demographics = $event"
+              :value="groupPlanUpgraded.demographics"
+              @select="groupPlanUpgraded.demographics = $event"
             />
-            <button
-              class="btn btn-primary btn-lg btn-block btn-payment"
-              @click="close()"
-            >
-              {{ $t('submit') }}
-            </button>
           </div>
         </template>
-        <button
-          v-else
-          class="btn btn-primary"
-          @click="close()"
+        <template
+          v-if="paymentData.paymentType === 'groupPlan'
+            || paymentData.paymentType === 'subscription'"
         >
-          {{ $t('onwards') }}
-        </button>
+          <span
+            v-once
+            class="small-text auto-renew"
+          >{{ $t('paymentAutoRenew') }}</span>
+        </template>
+        <div>
+          <button
+            v-if="!paymentData.newGroup"
+            class="btn btn-primary"
+            @click="close()"
+          >
+            {{ $t('submit') }}
+          </button>
+          <button
+            v-else
+            class="btn btn-primary"
+            @click="close()"
+          >
+            {{ $t('onwards') }}
+          </button>
+        </div>
       </div>
     </div>
   </b-modal>
@@ -151,7 +138,7 @@
 @import '~@/assets/scss/colors.scss';
 
 #payments-success-modal .modal-md {
-  max-width: 20.5rem;
+  max-width: 448px;
 }
 
 #payments-success-modal .modal-content {
@@ -193,9 +180,8 @@
 }
 
 #payments-success-modal .modal-body {
-  padding-top: 16px;
-  padding-bottom: 24px;
-  background: white;
+  padding: 16px 32px 24px 32px;
+  background: $white;
 
   .modal-body-col {
     display: flex;
@@ -249,9 +235,6 @@
   .small-text {
     font-style: normal;
   }
-  .group-input {
-    margin-top: -4px;
-  }
 }
 </style>
 
@@ -261,24 +244,22 @@ import gemIcon from '@/assets/svg/gem.svg';
 import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
+import paymentsMixin from '@/mixins/payments';
 
 export default {
+  components: {
+    selectTranslatedArray,
+    lockableLabel,
+  },
+  mixins: [paymentsMixin],
   data () {
     return {
-      components: {
-        selectTranslatedArray,
-        lockableLabel,
-      },
       icons: Object.freeze({
         check: checkIcon,
         gem: gemIcon,
       }),
       paymentData: {},
-      newGroup: {
-        name: '',
-      },
-      upgradedGroup: {
-        name: '',
+      groupPlanUpgraded: {
         demographics: null,
       },
     };
@@ -287,6 +268,7 @@ export default {
     groupPlanCost () {
       const sub = this.paymentData.subscription;
       const memberCount = this.paymentData.group.memberCount || 1;
+      console.log(this.paymentData);
       return sub.price + 3 * (memberCount - 1);
     },
     isFromBalance () {
@@ -308,7 +290,6 @@ export default {
   },
   methods: {
     close () {
-      console.log(this.upgradedGroup.demographics);
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
diff --git a/website/client/src/mixins/payments.js b/website/client/src/mixins/payments.js
index 5b8a1439a5..17cf1aea88 100644
--- a/website/client/src/mixins/payments.js
+++ b/website/client/src/mixins/payments.js
@@ -39,6 +39,13 @@ export default {
       return moment(this.user.purchased.plan.dateTerminated)
         .format(this.user.preferences.dateFormat.toUpperCase());
     },
+    dateRenewal () {
+      if (!this.user.preferences || !this.user.preferences.dateFormat) {
+        return this.user.purchased.plan.dateRenewal;
+      }
+      return moment(this.user.purchased.plan.dateRenewal).add(1, 'months')
+        .format(this.user.preferences.dateFormat.toUpperCase());
+    },
   },
   methods: {
     encodeGift (uuid, gift) {

From a3e6aff33072da6440e71de4dadaa0b425d77989 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 29 Aug 2022 16:12:53 -0400
Subject: [PATCH 020/134] update: more work on success modal

---
 .../src/components/payments/successModal.vue  | 87 ++++++++++++-------
 website/common/locales/en/npc.json            |  2 +
 2 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 3044313222..8b160422c6 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -70,7 +70,7 @@
             v-html="$t(paymentData.newGroup
               ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
           ></span>
-<!--           <div class="details-block">
+          <!--<div class="details-block">
             <span
               v-html="$t('paymentSubBilling', {
                 amount: groupPlanCost, months: paymentData.subscription.months})"
@@ -80,33 +80,47 @@
             v-if="!paymentData.newGroup"
             class="form-group"
           >
-            <div class="details-block">
+            <div class="details-block group-billing-date">
               <span>
-                Your next billing date is <strong>{{ dateRenewal }}</strong>.
+                {{ $t('groupPaymentSubBilling') }}
               </span>
             </div>
-            <lockable-label
-              :text="$t('groupUse')"
-            />
-            <select-translated-array
-              :items="[
-                'groupParentChildren',
-                'groupCouple',
-                'groupFriends',
-                'groupCoworkers',
-                'groupManager',
-                'groupTeacher'
-              ]"
-              class="group-input"
-              :placeholder="'groupUseDefault'"
-              :value="groupPlanUpgraded.demographics"
-              @select="groupPlanUpgraded.demographics = $event"
-            />
+            <div class="small-text group-auto-renew">
+              <span
+                v-once
+              >{{ $t('groupsPaymentAutoRenew') }}
+              </span>
+            </div>
+            <div class="demographics">
+              <lockable-label
+                :text="$t('groupUse')"
+              />
+              <select-translated-array
+                :items="[
+                  'groupParentChildren',
+                  'groupCouple',
+                  'groupFriends',
+                  'groupCoworkers',
+                  'groupManager',
+                  'groupTeacher'
+                ]"
+                class="group-input"
+                :placeholder="'groupUseDefault'"
+                :value="groupPlanUpgraded.demographics"
+                @select="groupPlanUpgraded.demographics = $event"
+              />
+            </div>
           </div>
+          <button
+            v-oncee="!paymentData.newGroup"
+            class="btn btn-primary"
+            @click="close()"
+          >
+            {{ $t('submit') }}
+          </button>
         </template>
         <template
-          v-if="paymentData.paymentType === 'groupPlan'
-            || paymentData.paymentType === 'subscription'"
+          v-if="paymentData.paymentType === 'subscription'"
         >
           <span
             v-once
@@ -115,14 +129,7 @@
         </template>
         <div>
           <button
-            v-if="!paymentData.newGroup"
-            class="btn btn-primary"
-            @click="close()"
-          >
-            {{ $t('submit') }}
-          </button>
-          <button
-            v-else
+            v-if="paymentData.paymentType === 'subscription'"
             class="btn btn-primary"
             @click="close()"
           >
@@ -223,6 +230,26 @@
     color: $orange-10;
     font-style: normal;
   }
+  .group-auto-renew {
+    margin-top: 16px;
+    margin-bottom: 16px;
+    color: $yellow-5;
+    font-style: normal;
+  }
+
+  .group-billing-date {
+    width: 269px;
+    text-align: center;
+    margin-left: 57px;
+  }
+  .form-group {
+    // padding-top: 32px;
+  }
+
+  .demographics {
+    background-color: $gray-700;
+    width: 100%;
+  }
 }
 
 #payments-success-modal .modal-footer {
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 7c173cae02..f967e41b3f 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -93,8 +93,10 @@
   "paymentYouSentGems": "You sent <strong><%- name %></strong>:",
   "paymentYouSentSubscription": "You sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
   "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
+  "groupPaymentSubBilling": "Your subscription will auto-renew on <strong><%= dateRenewal %></strong>.",
   "paymentSubBillingWithMethod": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong> via <strong><%= paymentMethod %></strong>.",
   "paymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel this subscription, you can do so from your settings.",
+  "groupsPaymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel, you can do so from the Group Billing tab.",
   "paymentCanceledDisputes": "We’ve sent a cancelation confirmation to your email. If you don’t see the email, please contact us to prevent future billing disputes.",
   "success": "Success!",
   "classGear": "Class Gear",

From 09d6dae75cd0cffd85a4f5708424db6e0ce5661c Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 30 Aug 2022 15:35:50 -0500
Subject: [PATCH 021/134] feat(admin): provide reset cron button

---
 .../admin-panel/user-support/cronAndAuth.vue           | 10 ++++++++++
 website/server/controllers/api-v3/hall.js              |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/website/client/src/components/admin-panel/user-support/cronAndAuth.vue b/website/client/src/components/admin-panel/user-support/cronAndAuth.vue
index 1a28b044c7..260bc46177 100644
--- a/website/client/src/components/admin-panel/user-support/cronAndAuth.vue
+++ b/website/client/src/components/admin-panel/user-support/cronAndAuth.vue
@@ -36,6 +36,12 @@
           ("auth.timestamps.loggedin" and "lastCron" dates are different).
         </span>
       </div>
+      <button
+        class="btn btn-primary"
+        @click="resetCron()"
+      >
+        Reset Cron to Yesterday
+      </button>
       <div class="subsection-start">
         Time zone:
         <strong>{{ hero.preferences.timezoneOffset | formatTimeZone }}</strong>
@@ -218,6 +224,10 @@ export default {
       await this.saveHero({ hero: this.hero, msg: 'API Token' });
       this.tokenModified = true;
     },
+    resetCron () {
+      this.hero.resetCron = true;
+      this.saveHero({ hero: this.hero, msg: 'Last Cron', clearData: true });
+    },
   },
 };
 </script>
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index 2ee18a6044..a05b1e4f0f 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -331,6 +331,13 @@ api.updateHero = {
       hero.apiToken = common.uuid();
     }
 
+    if (updateData.resetCron) {
+      // Set last cron to yesterday. Quick approach so we don't need moment() for one line
+      const yesterday = new Date(new Date().setDate(new Date().getDate() - 1));
+      hero.lastCron = yesterday;
+      hero.auth.timestamps.loggedin = yesterday; // so admin panel doesn't gripe about mismatch
+    }
+
     const savedHero = await hero.save();
     const heroJSON = savedHero.toJSON();
     heroJSON.secret = savedHero.getSecretData();

From e2bb7fda60bcd0c3eff568d520b0aa2db218cd9d Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 30 Aug 2022 17:43:36 -0400
Subject: [PATCH 022/134] update: success modal

---
 .../src/components/payments/successModal.vue  | 38 +++++++++----------
 website/common/locales/en/npc.json            |  2 +-
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 8b160422c6..197e691400 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -78,11 +78,11 @@
           </div> -->
           <div
             v-if="!paymentData.newGroup"
-            class="form-group"
+            class=""
           >
             <div class="details-block group-billing-date">
               <span>
-                {{ $t('groupPaymentSubBilling') }}
+                {{ $t('groupsPaymentSubBilling') }}
               </span>
             </div>
             <div class="small-text group-auto-renew">
@@ -109,15 +109,15 @@
                 :value="groupPlanUpgraded.demographics"
                 @select="groupPlanUpgraded.demographics = $event"
               />
+              <button
+                v-if="!paymentData.newGroup"
+                class="btn btn-primary"
+                @click="close()"
+              >
+                {{ $t('submit') }}
+              </button>
             </div>
           </div>
-          <button
-            v-oncee="!paymentData.newGroup"
-            class="btn btn-primary"
-            @click="close()"
-          >
-            {{ $t('submit') }}
-          </button>
         </template>
         <template
           v-if="paymentData.paymentType === 'subscription'"
@@ -157,6 +157,7 @@
   border-bottom-left-radius: 8px;
 }
 
+
 #payments-success-modal .modal-header {
   justify-content: center;
   padding-top: 24px;
@@ -206,7 +207,7 @@
     border-radius: 4px;
     padding: 8px 24px;
     margin-top: 16px;
-    display: flex;
+    display: inline-flex;
     flex-direction: row;
     text-align: center;
 
@@ -236,22 +237,17 @@
     color: $yellow-5;
     font-style: normal;
   }
-
-  .group-billing-date {
-    width: 269px;
-    text-align: center;
-    margin-left: 57px;
-  }
-  .form-group {
-    // padding-top: 32px;
-  }
-
   .demographics {
     background-color: $gray-700;
     width: 100%;
+    padding: 0 12px;
+    width: 100%;
+    padding: 16px 32px 32px 32px;
+  }
+  .group-billing-date {
+    width: 269px;
   }
 }
-
 #payments-success-modal .modal-footer {
   background: $gray-700;
   border-bottom-right-radius: 8px;
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index f967e41b3f..76b34fb15b 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -93,7 +93,7 @@
   "paymentYouSentGems": "You sent <strong><%- name %></strong>:",
   "paymentYouSentSubscription": "You sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
   "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
-  "groupPaymentSubBilling": "Your subscription will auto-renew on <strong><%= dateRenewal %></strong>.",
+  "groupsPaymentSubBilling": "Your next billing date is <strong>11/11/1111</strong>.",
   "paymentSubBillingWithMethod": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong> via <strong><%= paymentMethod %></strong>.",
   "paymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel this subscription, you can do so from your settings.",
   "groupsPaymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel, you can do so from the Group Billing tab.",

From ae23ac12ffd2c1f1477f40393c480f81ee2297e1 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 30 Aug 2022 16:55:10 -0500
Subject: [PATCH 023/134] feat(admin): interactive subscription section fields

---
 .../admin-panel/user-support/index.vue        |   2 +-
 .../user-support/subscriptionAndPerks.vue     | 155 +++++++++++++-----
 website/server/controllers/api-v3/hall.js     |   9 +
 3 files changed, 121 insertions(+), 45 deletions(-)

diff --git a/website/client/src/components/admin-panel/user-support/index.vue b/website/client/src/components/admin-panel/user-support/index.vue
index 7506b91b48..8d156077f2 100644
--- a/website/client/src/components/admin-panel/user-support/index.vue
+++ b/website/client/src/components/admin-panel/user-support/index.vue
@@ -18,7 +18,7 @@
         />
 
         <subscription-and-perks
-          :subscription="hero.purchased.plan"
+          :hero="hero"
         />
 
         <cron-and-auth
diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index 0211a0f531..61abb08294 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -8,58 +8,113 @@
       Subscription, Monthly Perks
     </h3>
     <div v-if="expand">
-      <div v-if="subscription.paymentMethod">
-        Payment Method:
-        <strong>{{ subscription.paymentMethod }}</strong>
-      </div>
-      <div v-if="subscription.planId">
-        Payment Schedule ("basic-earned" is monthly):
-        <strong>{{ subscription.planId }}</strong>
-      </div>
-      <div v-if="subscription.dateCreated">
-        Creation Date:
-        <strong>{{ moment(subscription.dateCreated).format('YYYY/MM/DD') }}</strong>
-      </div>
-      <div v-if="subscription.dateTerminated">
-        Termination Date:
-        <strong>{{ moment(subscription.dateTerminated).format('YYYY/MM/DD') }}</strong>
-      </div>
-      <div>
-        Consecutive Months:
-        <strong>{{ subscription.consecutive.count }}</strong>
-      </div>
-      <div>
-        Months Until Renewal:
-        <strong>{{ subscription.consecutive.offset }}</strong>
-      </div>
-      <div>
-        Gem Cap:
-        <strong>{{ subscription.consecutive.gemCapExtra + 25 }}</strong>
-      </div>
-      <div
-        v-if="subscription.extraMonths > 0"
-      >
-        Additional Credit (applied upon cancellation):
-        <strong>{{ subscription.extraMonths }}</strong>
-      </div>
-      <div>
-        Mystery Items:
-        <span
-          v-for="(item, index) in subscription.mysteryItems"
-          :key="index"
+      <form @submit.prevent="saveHero({hero, msg: 'Subscription Perks'})">
+        <div v-if="hero.purchased.plan.paymentMethod">
+          Payment method:
+          <strong>{{ hero.purchased.plan.paymentMethod }}</strong>
+        </div>
+        <div v-if="hero.purchased.plan.planId">
+          Payment schedule ("basic-earned" is monthly):
+          <strong>{{ hero.purchased.plan.planId }}</strong>
+        </div>
+        <div v-if="hero.purchased.plan.dateCreated">
+          Creation date:
+          <strong>{{ dateFormat(hero.purchased.plan.dateCreated) }}</strong>
+        </div>
+        <div>
+          Termination date:
+          <strong
+            v-if="hero.purchased.plan.dateTerminated"
+          >
+            {{ dateFormat(hero.purchased.plan.dateTerminated) }}
+          </strong>
+          <strong v-else> None </strong>
+        </div>
+        <div>
+          Consecutive months:
+          <strong>{{ hero.purchased.plan.consecutive.count }}</strong>
+        </div>
+        <div>
+          Months until renewal:
+          <strong>{{ hero.purchased.plan.consecutive.offset || 1}}</strong>
+        </div>
+          <div>
+            Next Mystic Hourglass:
+            <strong>{{ nextHourGlassDate }}</strong>
+          </div>
+          <div class="form-inline">
+            <label>
+              Mystic Hourglasses:
+              <input
+                v-model="hero.purchased.plan.consecutive.trinkets"
+                class="form-control"
+                type="number"
+                min="0"
+                step="1"
+              >
+            </label>
+          </div>
+          <div>
+            Gem cap:
+            <strong>{{ hero.purchased.plan.consecutive.gemCapExtra + 25 }}</strong>
+          </div>
+          <div class="form-inline">
+          <label>
+            Gems bought this month:
+            <input
+              v-model="hero.purchased.plan.gemsBought"
+              class="form-control"
+              type="number"
+              min="0"
+              :max="hero.purchased.plan.consecutive.gemCapExtra + 25"
+              step="1"
+            >
+            </label>
+          </div>
+        <div
+          v-if="hero.purchased.plan.extraMonths > 0"
         >
-          <strong v-if="index < subscription.mysteryItems.length"> {{ item }}, </strong>
-          <strong v-else> {{ item }} </strong>
-        </span>
-      </div>
+          Additional credit (applied upon cancellation):
+          <strong>{{ hero.purchased.plan.extraMonths }}</strong>
+        </div>
+        <div>
+          Mystery Items:
+          <span
+            v-if="hero.purchased.plan.mysteryItems.length > 0"
+          >
+            <span
+              v-for="(item, index) in hero.purchased.plan.mysteryItems"
+              :key="index"
+            >
+              <strong v-if="index < hero.purchased.plan.mysteryItems.length - 1">
+                {{ item }},
+              </strong>
+              <strong v-else> {{ item }} </strong>
+            </span>
+          </span>
+          <span v-else>
+            <strong>None</strong>
+          </span>
+        </div>
+        <input
+          type="submit"
+          value="Save"
+          class="btn btn-primary mt-1"
+        >
+      </form>
     </div>
   </div>
 </template>
 
 <script>
+import moment from 'moment';
+import saveHero from '../mixins/saveHero';
+import { getPlanContext } from '@/../../common/script/cron';
+
 export default {
+  mixins: [saveHero],
   props: {
-    subscription: {
+    hero: {
       type: Object,
       required: true,
     },
@@ -69,5 +124,17 @@ export default {
       expand: false,
     };
   },
+  computed: {
+    nextHourGlassDate () {
+      const currentPlanContext = getPlanContext(this.hero, new Date());
+
+      return currentPlanContext.nextHourglassDate.format('MMMM');
+    },
+  },
+  methods: {
+    dateFormat (date) {
+      return moment(date).format('YYYY/MM/DD');
+    },
+  },
 };
 </script>
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index a05b1e4f0f..e3f950b08a 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -273,6 +273,15 @@ api.updateHero = {
       hero.balance = updateData.balance;
     }
 
+    if (updateData.purchased && updateData.purchased.plan) {
+      if (updateData.purchased.plan.gemsBought) {
+        hero.purchased.plan.gemsBought = updateData.purchased.plan.gemsBought;
+      }
+      if (updateData.purchased.plan.consecutive && updateData.purchased.plan.consecutive.trinkets) {
+        hero.purchased.plan.consecutive.trinkets = updateData.purchased.plan.consecutive.trinkets;
+      }
+    }
+
     // give them gems if they got an higher level
     // tier = level in this context
     let newTier = updateData.contributor && updateData.contributor.level;

From f364b3c06fe70a5c781e488bfbef272d03a8caed Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 31 Aug 2022 16:09:20 -0500
Subject: [PATCH 024/134] feat(admin): consecutive months editable field and
 automatic calcs

---
 .../admin-panel/user-support/cronAndAuth.vue  | 24 ++++---
 .../user-support/subscriptionAndPerks.vue     | 69 +++++++++++++++----
 website/server/controllers/api-v3/hall.js     |  9 ++-
 3 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/website/client/src/components/admin-panel/user-support/cronAndAuth.vue b/website/client/src/components/admin-panel/user-support/cronAndAuth.vue
index 260bc46177..8b107ebf21 100644
--- a/website/client/src/components/admin-panel/user-support/cronAndAuth.vue
+++ b/website/client/src/components/admin-panel/user-support/cronAndAuth.vue
@@ -22,11 +22,6 @@
         Account created:
         <strong>{{ hero.auth.timestamps.created | formatDate }}</strong>
       </div>
-      <div>
-        Most recent cron:
-        <strong>{{ hero.auth.timestamps.loggedin | formatDate }}</strong>
-        ("auth.timestamps.loggedin")
-      </div>
       <div v-if="cronError">
         "lastCron" value:
         <strong>{{ hero.lastCron | formatDate }}</strong>
@@ -36,12 +31,19 @@
           ("auth.timestamps.loggedin" and "lastCron" dates are different).
         </span>
       </div>
-      <button
-        class="btn btn-primary"
-        @click="resetCron()"
-      >
-        Reset Cron to Yesterday
-      </button>
+      <div class="form-inline">
+        <div>
+          Most recent cron:
+          <strong>{{ hero.auth.timestamps.loggedin | formatDate }}</strong>
+          ("auth.timestamps.loggedin")
+        </div>
+        <button
+          class="btn btn-primary ml-2"
+          @click="resetCron()"
+        >
+          Reset Cron to Yesterday
+        </button>
+      </div>
       <div class="subsection-start">
         Time zone:
         <strong>{{ hero.preferences.timezoneOffset | formatTimeZone }}</strong>
diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index 61abb08294..05856a31c5 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -8,7 +8,7 @@
       Subscription, Monthly Perks
     </h3>
     <div v-if="expand">
-      <form @submit.prevent="saveHero({hero, msg: 'Subscription Perks'})">
+      <form @submit.prevent="saveSubscriptionData()">
         <div v-if="hero.purchased.plan.paymentMethod">
           Payment method:
           <strong>{{ hero.purchased.plan.paymentMethod }}</strong>
@@ -30,9 +30,20 @@
           </strong>
           <strong v-else> None </strong>
         </div>
-        <div>
-          Consecutive months:
-          <strong>{{ hero.purchased.plan.consecutive.count }}</strong>
+        <div class="form-inline">
+          <label>
+            Consecutive months:
+            <input
+              v-model="consecutiveMonths"
+              class="form-control"
+              type="number"
+              min="0"
+              step="1"
+            >
+          </label>
+          <span class="small">
+            Updates Hourglasses and Gem cap automatically. Next Mystic Hourglass updates on save.
+          </span>
         </div>
         <div>
           Months until renewal:
@@ -59,16 +70,16 @@
             <strong>{{ hero.purchased.plan.consecutive.gemCapExtra + 25 }}</strong>
           </div>
           <div class="form-inline">
-          <label>
-            Gems bought this month:
-            <input
-              v-model="hero.purchased.plan.gemsBought"
-              class="form-control"
-              type="number"
-              min="0"
-              :max="hero.purchased.plan.consecutive.gemCapExtra + 25"
-              step="1"
-            >
+            <label>
+              Gems bought this month:
+              <input
+                v-model="hero.purchased.plan.gemsBought"
+                class="form-control"
+                type="number"
+                min="0"
+                :max="hero.purchased.plan.consecutive.gemCapExtra + 25"
+                step="1"
+              >
             </label>
           </div>
         <div
@@ -107,6 +118,7 @@
 </template>
 
 <script>
+import clone from 'lodash/clone';
 import moment from 'moment';
 import saveHero from '../mixins/saveHero';
 import { getPlanContext } from '@/../../common/script/cron';
@@ -121,6 +133,8 @@ export default {
   },
   data () {
     return {
+      consecutiveMonths: 0,
+      startingHourglasses: 0,
       expand: false,
     };
   },
@@ -131,10 +145,37 @@ export default {
       return currentPlanContext.nextHourglassDate.format('MMMM');
     },
   },
+  watch: {
+    consecutiveMonths () {
+      const startingMonths = this.hero.purchased.plan.consecutive.count;
+      const monthsAdded = Math.max(0, this.consecutiveMonths - startingMonths);
+      this.hero.purchased.plan.consecutive.gemCapExtra = Math.min(
+        Math.floor(this.consecutiveMonths / 3) * 5, 25,
+      );
+      if (monthsAdded >= 0) {
+        this.hero.purchased.plan.consecutive.trinkets = this.startingHourglasses
+          + Math.floor(monthsAdded / 3);
+      }
+      if (this.hero.purchased.plan.gemsBought
+        > this.hero.purchased.plan.consecutive.gemCapExtra + 25) {
+        this.hero.purchased.plan.gemsBought = this.hero.purchased.plan.consecutive.gemCapExtra + 25;
+      }
+    },
+  },
+  mounted () {
+    this.consecutiveMonths = clone(this.hero.purchased.plan.consecutive.count);
+    this.startingHourglasses = clone(this.hero.purchased.plan.consecutive.trinkets);
+  },
   methods: {
     dateFormat (date) {
       return moment(date).format('YYYY/MM/DD');
     },
+    saveSubscriptionData () {
+      if (this.consecutiveMonths !== this.hero.purchased.plan.consecutive.count) {
+        this.hero.purchased.plan.consecutive.count = this.consecutiveMonths;
+      }
+      this.saveHero({ hero: this.hero, msg: 'Subscription Perks' });
+    },
   },
 };
 </script>
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index e3f950b08a..6473f30ab0 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -277,8 +277,13 @@ api.updateHero = {
       if (updateData.purchased.plan.gemsBought) {
         hero.purchased.plan.gemsBought = updateData.purchased.plan.gemsBought;
       }
-      if (updateData.purchased.plan.consecutive && updateData.purchased.plan.consecutive.trinkets) {
-        hero.purchased.plan.consecutive.trinkets = updateData.purchased.plan.consecutive.trinkets;
+      if (updateData.purchased.plan.consecutive) {
+        if (updateData.purchased.plan.consecutive.trinkets) {
+          hero.purchased.plan.consecutive.trinkets = updateData.purchased.plan.consecutive.trinkets;
+        }
+        if (updateData.purchased.plan.consecutive.gemCapExtra) {
+          hero.purchased.plan.consecutive.gemCapExtra = updateData.purchased.plan.consecutive.gemCapExtra; // eslint-disable-line max-len
+        }
       }
     }
 

From 008314676d7957c4f35841d6e9ae744b8ff6b08c Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 1 Sep 2022 17:16:51 -0500
Subject: [PATCH 025/134] fix(admin): reactivity on next hourglass

---
 .../user-support/subscriptionAndPerks.vue     | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index 05856a31c5..9b4970586b 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -41,9 +41,6 @@
               step="1"
             >
           </label>
-          <span class="small">
-            Updates Hourglasses and Gem cap automatically. Next Mystic Hourglass updates on save.
-          </span>
         </div>
         <div>
           Months until renewal:
@@ -51,7 +48,7 @@
         </div>
           <div>
             Next Mystic Hourglass:
-            <strong>{{ nextHourGlassDate }}</strong>
+            <strong>{{ nextHourglassDate }}</strong>
           </div>
           <div class="form-inline">
             <label>
@@ -134,28 +131,23 @@ export default {
   data () {
     return {
       consecutiveMonths: 0,
-      startingHourglasses: 0,
       expand: false,
     };
   },
   computed: {
-    nextHourGlassDate () {
-      const currentPlanContext = getPlanContext(this.hero, new Date());
+    nextHourglassDate () {
+      const pendingHero = clone(this.hero);
+      pendingHero.purchased.plan.consecutive.count = this.consecutiveMonths;
+      const currentPlanContext = getPlanContext(pendingHero, new Date());
 
       return currentPlanContext.nextHourglassDate.format('MMMM');
     },
   },
   watch: {
     consecutiveMonths () {
-      const startingMonths = this.hero.purchased.plan.consecutive.count;
-      const monthsAdded = Math.max(0, this.consecutiveMonths - startingMonths);
       this.hero.purchased.plan.consecutive.gemCapExtra = Math.min(
         Math.floor(this.consecutiveMonths / 3) * 5, 25,
       );
-      if (monthsAdded >= 0) {
-        this.hero.purchased.plan.consecutive.trinkets = this.startingHourglasses
-          + Math.floor(monthsAdded / 3);
-      }
       if (this.hero.purchased.plan.gemsBought
         > this.hero.purchased.plan.consecutive.gemCapExtra + 25) {
         this.hero.purchased.plan.gemsBought = this.hero.purchased.plan.consecutive.gemCapExtra + 25;
@@ -164,7 +156,6 @@ export default {
   },
   mounted () {
     this.consecutiveMonths = clone(this.hero.purchased.plan.consecutive.count);
-    this.startingHourglasses = clone(this.hero.purchased.plan.consecutive.trinkets);
   },
   methods: {
     dateFormat (date) {

From 796d7529749894974b9027b87f9e9cc9b21b2342 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 2 Sep 2022 16:55:28 -0400
Subject: [PATCH 026/134] update: success modal

---
 .../src/components/payments/successModal.vue  | 77 +++++++++++++++----
 1 file changed, 62 insertions(+), 15 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 197e691400..98b71c63a9 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -17,11 +17,42 @@
     </div>
     <div slot="modal-footer">
       <div
-        v-once
+        v-if="!paymentData.paymentType === 'groupPlan' && !paymentData.newGroup"
         class="small-text"
       >
         {{ $t('giftSubscriptionText4') }}
       </div>
+      <div
+        v-else
+        class="demographics"
+      >
+        <lockable-label
+          :text="$t('groupUse')"
+          class="demo-label"
+        />
+        <select-translated-array
+          :items="[
+            'groupParentChildren',
+            'groupCouple',
+            'groupFriends',
+            'groupCoworkers',
+            'groupManager',
+            'groupTeacher'
+          ]"
+          class="group-input"
+          :placeholder="'groupUseDefault'"
+          :value="groupPlanUpgraded.demographics"
+          @select="groupPlanUpgraded.demographics = $event"
+        />
+        <button
+          v-if="!paymentData.newGroup"
+          class="btn btn-primary"
+          :disabled="!'groupPlanUpgraded.demographics'"
+          @click="close()"
+        >
+          {{ $t('submit') }}
+        </button>
+      </div>
     </div>
     <div class="row">
       <div class="col-12 modal-body-col">
@@ -81,8 +112,9 @@
             class=""
           >
             <div class="details-block group-billing-date">
-              <span>
-                {{ $t('groupsPaymentSubBilling') }}
+              <span
+                v-html="$t('groupsPaymentSubBilling')"
+              >
               </span>
             </div>
             <div class="small-text group-auto-renew">
@@ -91,7 +123,7 @@
               >{{ $t('groupsPaymentAutoRenew') }}
               </span>
             </div>
-            <div class="demographics">
+<!--             <div class="demographics">
               <lockable-label
                 :text="$t('groupUse')"
               />
@@ -116,7 +148,7 @@
               >
                 {{ $t('submit') }}
               </button>
-            </div>
+            </div> -->
           </div>
         </template>
         <template
@@ -205,7 +237,7 @@
   .details-block {
     background: $gray-700;
     border-radius: 4px;
-    padding: 8px 24px;
+    padding: 8px 16px;
     margin-top: 16px;
     display: inline-flex;
     flex-direction: row;
@@ -232,22 +264,15 @@
     font-style: normal;
   }
   .group-auto-renew {
-    margin-top: 16px;
-    margin-bottom: 16px;
+    margin: 12px 20px -8px 20px;
     color: $yellow-5;
     font-style: normal;
   }
-  .demographics {
-    background-color: $gray-700;
-    width: 100%;
-    padding: 0 12px;
-    width: 100%;
-    padding: 16px 32px 32px 32px;
-  }
   .group-billing-date {
     width: 269px;
   }
 }
+
 #payments-success-modal .modal-footer {
   background: $gray-700;
   border-bottom-right-radius: 8px;
@@ -259,6 +284,28 @@
     font-style: normal;
   }
 }
+  .demographics {
+    background-color: $gray-700;
+    padding: 16px 0px;
+    margin-top: -16px;
+    width: 400px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+
+    .btn.btn-primary {
+      margin-top: 24px;
+      width: 77px;
+      align-self: center;
+
+    }
+  #lockable-label .modal-footer label {
+    text-align: center !important;
+    width: 400px !important;
+  }
+
+  }
+
 </style>
 
 <script>

From 90f1977a497911670cb4ab8c3c99d6d483e35645 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 6 Sep 2022 15:09:40 -0500
Subject: [PATCH 027/134] fix(admin): sometimes 0 is correct

---
 .../admin-panel/user-support/subscriptionAndPerks.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index 9b4970586b..ae0f5a59aa 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -44,7 +44,7 @@
         </div>
         <div>
           Months until renewal:
-          <strong>{{ hero.purchased.plan.consecutive.offset || 1}}</strong>
+          <strong>{{ hero.purchased.plan.consecutive.offset }}</strong>
         </div>
           <div>
             Next Mystic Hourglass:

From abdb6244d3b9665effc71607565efc1f140b985f Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 6 Sep 2022 17:06:19 -0400
Subject: [PATCH 028/134] updates: add comments to success modal to flag issues

---
 .../src/components/payments/successModal.vue      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 98b71c63a9..8398653006 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -5,6 +5,9 @@
     :hide-footer="isFromBalance"
     :modal-class="isFromBalance ? ['modal-hidden-footer'] : []"
   >
+    <!-- there are basically 3 footer conditions: isFromBalance, groupPlanUpgraded, & everyone else
+     was trying to make that work with a separate footer for groupPlanUpgraded
+    but that's not working-->
     <div slot="modal-header">
       <div class="check-container d-flex align-items-center justify-content-center">
         <div
@@ -17,7 +20,8 @@
     </div>
     <div slot="modal-footer">
       <div
-        v-if="!paymentData.paymentType === 'groupPlan' && !paymentData.newGroup"
+        v-if="!paymentData.paymentType === 'groupPlan'
+          && !groupPlanUpgraded"
         class="small-text"
       >
         {{ $t('giftSubscriptionText4') }}
@@ -26,6 +30,7 @@
         v-else
         class="demographics"
       >
+      <!-- lockable label needs to be centered -->
         <lockable-label
           :text="$t('groupUse')"
           class="demo-label"
@@ -44,6 +49,7 @@
           :value="groupPlanUpgraded.demographics"
           @select="groupPlanUpgraded.demographics = $event"
         />
+        <!-- need to add correct :disabled value here 'cause this one ain't working -->
         <button
           v-if="!paymentData.newGroup"
           class="btn btn-primary"
@@ -123,7 +129,10 @@
               >{{ $t('groupsPaymentAutoRenew') }}
               </span>
             </div>
-<!--             <div class="demographics">
+          <!-- this is the demographics code if needed to move back down here from footer
+            this was working BUT I couldn't get the CSS working which is why I moved it to footer
+          <div class="demographics">
+              lockable label needs to be centered
               <lockable-label
                 :text="$t('groupUse')"
               />
@@ -141,6 +150,7 @@
                 :value="groupPlanUpgraded.demographics"
                 @select="groupPlanUpgraded.demographics = $event"
               />
+              need to add correct :disabled value here 'cause this one ain't working
               <button
                 v-if="!paymentData.newGroup"
                 class="btn btn-primary"
@@ -363,6 +373,7 @@ export default {
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
+    // how is amplitude formed?
   },
 };
 </script>

From 0081bad831a8c51980ca334fc997aa717350c89a Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 6 Sep 2022 16:15:04 -0500
Subject: [PATCH 029/134] feat(admin): track hourglasses as transactions

---
 website/common/locales/en/settings.json   |  3 ++-
 website/server/controllers/api-v3/hall.js |  5 +++++
 website/server/models/transaction.js      |  2 +-
 website/server/models/user/methods.js     | 19 +++++++++++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index eeca1cd565..3f8a2371bc 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -213,5 +213,6 @@
     "transaction_release_mounts": "Released mounts",
     "transaction_reroll": "Used Fortify Potion",
     "transaction_subscription_perks": "From subscription perk",
-    "transaction_admin_update_balance": "Admin given"
+    "transaction_admin_update_balance": "Admin given",
+    "transaction_admin_update_hourglasses": "Admin updated"
 }
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index 6473f30ab0..15183c686f 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -279,6 +279,11 @@ api.updateHero = {
       }
       if (updateData.purchased.plan.consecutive) {
         if (updateData.purchased.plan.consecutive.trinkets) {
+          await hero.updateHourglasses(
+            updateData.purchased.plan.consecutive.trinkets
+              - hero.purchased.plan.consecutive.trinkets,
+            'admin_update_hourglasses', '', 'Updated by Habitica staff',
+          );
           hero.purchased.plan.consecutive.trinkets = updateData.purchased.plan.consecutive.trinkets;
         }
         if (updateData.purchased.plan.consecutive.gemCapExtra) {
diff --git a/website/server/models/transaction.js b/website/server/models/transaction.js
index 56687f86c9..88a3ca8550 100644
--- a/website/server/models/transaction.js
+++ b/website/server/models/transaction.js
@@ -5,7 +5,7 @@ import baseModel from '../libs/baseModel';
 const { Schema } = mongoose;
 
 export const currencies = ['gems', 'hourglasses'];
-export const transactionTypes = ['buy_money', 'buy_gold', 'spend', 'gift_send', 'gift_receive', 'debug', 'create_challenge', 'create_bank_challenge', 'create_guild', 'change_class', 'rebirth', 'release_pets', 'release_mounts', 'reroll', 'contribution', 'subscription_perks', 'admin_update_balance'];
+export const transactionTypes = ['buy_money', 'buy_gold', 'spend', 'gift_send', 'gift_receive', 'debug', 'create_challenge', 'create_bank_challenge', 'create_guild', 'change_class', 'rebirth', 'release_pets', 'release_mounts', 'reroll', 'contribution', 'subscription_perks', 'admin_update_balance', 'admin_update_hourglasses'];
 
 export const schema = new Schema({
   currency: { $type: String, enum: currencies, required: true },
diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js
index f339cff896..bb25eea9b5 100644
--- a/website/server/models/user/methods.js
+++ b/website/server/models/user/methods.js
@@ -577,3 +577,22 @@ schema.methods.updateBalance = async function updateBalance (amount,
     currentAmount: this.balance,
   });
 };
+
+schema.methods.updateHourglasses = async function updateHourglasses (
+  amount,
+  transactionType,
+  reference,
+  referenceText,
+) {
+  this.purchased.plan.consecutive.trinkets += amount;
+
+  await Transaction.create({
+    currency: 'hourglasses',
+    userId: this._id,
+    transactionType,
+    amount,
+    reference,
+    referenceText,
+    currentAmount: this.purchased.plan.consecutive.trinkets,
+  });
+};

From c6ba1d8402dcbb7983e8ea7958cc1cc17146212b Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 8 Sep 2022 12:55:53 -0400
Subject: [PATCH 030/134] update: success modal

---
 .../src/components/payments/successModal.vue  | 151 ++++++++----------
 website/client/src/mixins/payments.js         |   8 +-
 website/common/locales/en/npc.json            |   2 +-
 3 files changed, 73 insertions(+), 88 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 8398653006..ad9ba387c2 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -5,9 +5,6 @@
     :hide-footer="isFromBalance"
     :modal-class="isFromBalance ? ['modal-hidden-footer'] : []"
   >
-    <!-- there are basically 3 footer conditions: isFromBalance, groupPlanUpgraded, & everyone else
-     was trying to make that work with a separate footer for groupPlanUpgraded
-    but that's not working-->
     <div slot="modal-header">
       <div class="check-container d-flex align-items-center justify-content-center">
         <div
@@ -19,21 +16,21 @@
       <h2>{{ $t(isFromBalance ? 'success' : 'paymentSuccessful') }}</h2>
     </div>
     <div slot="modal-footer">
+      <!-- everyone else -->
       <div
-        v-if="!paymentData.paymentType === 'groupPlan'
-          && !groupPlanUpgraded"
+        v-if="paymentData.paymentType !== 'groupPlan' || paymentData.newGroup"
         class="small-text"
       >
         {{ $t('giftSubscriptionText4') }}
       </div>
+      <!-- upgradedGroup -->
       <div
         v-else
-        class="demographics"
+        class="demographics d-flex flex-column justify-content-center"
       >
-      <!-- lockable label needs to be centered -->
         <lockable-label
           :text="$t('groupUse')"
-          class="demo-label"
+          class="mx-auto label-text"
         />
         <select-translated-array
           :items="[
@@ -49,12 +46,11 @@
           :value="groupPlanUpgraded.demographics"
           @select="groupPlanUpgraded.demographics = $event"
         />
-        <!-- need to add correct :disabled value here 'cause this one ain't working -->
         <button
           v-if="!paymentData.newGroup"
-          class="btn btn-primary"
-          :disabled="!'groupPlanUpgraded.demographics'"
-          @click="close()"
+          class="btn btn-primary mx-auto"
+          :disabled="!groupPlanUpgraded.demographics"
+          @click="submit()"
         >
           {{ $t('submit') }}
         </button>
@@ -62,6 +58,7 @@
     </div>
     <div class="row">
       <div class="col-12 modal-body-col">
+        <!-- buy gems for self -->
         <template v-if="paymentData.paymentType === 'gems'">
           <strong v-once>{{ $t('paymentYouReceived') }}</strong>
           <div class="details-block gems">
@@ -73,6 +70,7 @@
             <span>{{ paymentData.gemsBlock.gems }}</span>
           </div>
         </template>
+        <!-- buy or gift gems to someone else -->
         <template
           v-if="paymentData.paymentType === 'gift-gems'
             || paymentData.paymentType === 'gift-gems-balance'"
@@ -87,12 +85,16 @@
             <span>{{ paymentData.gift.gems.amount }}</span>
           </div>
         </template>
+        <!-- give gift subscription (non-recurring)-->
         <template v-if="paymentData.paymentType === 'gift-subscription'">
-          <span
-            v-html="$t('paymentYouSentSubscription', {
-              name: paymentData.giftReceiver, months: paymentData.subscription.months})"
-          ></span>
+          <div>
+            <span
+              v-html="$t('paymentYouSentSubscription', {
+                name: paymentData.giftReceiver, months: paymentData.subscription.months})"
+            ></span>
+          </div>
         </template>
+        <!-- buy self subscription (recurring) -->
         <template v-if="paymentData.paymentType === 'subscription'">
           <strong v-once>{{ $t('nowSubscribed') }}</strong>
           <div class="details-block">
@@ -101,25 +103,37 @@
                 amount: paymentData.subscription.price, months: paymentData.subscription.months})"
             ></span>
           </div>
+          <div
+            v-once
+            class="small-text auto-renew"
+          >
+            {{ $t('paymentAutoRenew') }}
+          </div>
         </template>
+        <!-- buttons for subscriptions -->
+        <div>
+          <button
+            v-if="paymentData.paymentType === 'subscription'
+              || paymentData.paymentType === 'gift-subscription'"
+            class="btn btn-primary"
+            @click="onwards()"
+          >
+            {{ $t('onwards') }}
+          </button>
+        </div>
+        <!-- group plan new or upgraded -->
         <template v-if="paymentData.paymentType === 'groupPlan'">
           <span
             v-html="$t(paymentData.newGroup
               ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
           ></span>
-          <!--<div class="details-block">
-            <span
-              v-html="$t('paymentSubBilling', {
-                amount: groupPlanCost, months: paymentData.subscription.months})"
-            ></span>
-          </div> -->
           <div
-            v-if="!paymentData.newGroup"
+            v-if="!paymentData.newGroup || paymentData.newGroup"
             class=""
           >
             <div class="details-block group-billing-date">
               <span
-                v-html="$t('groupsPaymentSubBilling')"
+                v-html="$t('groupsPaymentSubBilling', { renewalDate })"
               >
               </span>
             </div>
@@ -129,55 +143,17 @@
               >{{ $t('groupsPaymentAutoRenew') }}
               </span>
             </div>
-          <!-- this is the demographics code if needed to move back down here from footer
-            this was working BUT I couldn't get the CSS working which is why I moved it to footer
-          <div class="demographics">
-              lockable label needs to be centered
-              <lockable-label
-                :text="$t('groupUse')"
-              />
-              <select-translated-array
-                :items="[
-                  'groupParentChildren',
-                  'groupCouple',
-                  'groupFriends',
-                  'groupCoworkers',
-                  'groupManager',
-                  'groupTeacher'
-                ]"
-                class="group-input"
-                :placeholder="'groupUseDefault'"
-                :value="groupPlanUpgraded.demographics"
-                @select="groupPlanUpgraded.demographics = $event"
-              />
-              need to add correct :disabled value here 'cause this one ain't working
-              <button
-                v-if="!paymentData.newGroup"
-                class="btn btn-primary"
-                @click="close()"
-              >
-                {{ $t('submit') }}
-              </button>
-            </div> -->
           </div>
         </template>
-        <template
+        <!-- buy self subscription auto renew -->
+<!--         <template
           v-if="paymentData.paymentType === 'subscription'"
         >
           <span
             v-once
             class="small-text auto-renew"
           >{{ $t('paymentAutoRenew') }}</span>
-        </template>
-        <div>
-          <button
-            v-if="paymentData.paymentType === 'subscription'"
-            class="btn btn-primary"
-            @click="close()"
-          >
-            {{ $t('onwards') }}
-          </button>
-        </div>
+        </template> -->
       </div>
     </div>
   </b-modal>
@@ -294,30 +270,33 @@
     font-style: normal;
   }
 }
-  .demographics {
-    background-color: $gray-700;
-    padding: 16px 0px;
-    margin-top: -16px;
-    width: 400px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
 
-    .btn.btn-primary {
-      margin-top: 24px;
-      width: 77px;
-      align-self: center;
+.demographics {
+  background-color: $gray-700;
 
-    }
-  #lockable-label .modal-footer label {
-    text-align: center !important;
+  .label-text {
+    margin-bottom: 20px;
+  }
+
+  .group-input {
     width: 400px !important;
+    margin-top: -24px !important;
   }
+  .btn {
+    margin-top: 0px;
+    width: 77px;
+    margin-bottom: 20px;
+  }
+}
+</style>
+
+<style lang="scss">
+  @import '~@/assets/scss/mixins.scss';
 
-  }
 
 </style>
 
+
 <script>
 import checkIcon from '@/assets/svg/check.svg';
 import gemIcon from '@/assets/svg/gem.svg';
@@ -325,6 +304,7 @@ import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
 import paymentsMixin from '@/mixins/payments';
+import * as Analytics from '@/libs/analytics';
 
 export default {
   components: {
@@ -369,11 +349,16 @@ export default {
     this.$root.$off('habitica:payments-success');
   },
   methods: {
-    close () {
+    submit () {
+      this.paymentData = {};
+      this.$root.$emit('bv::hide::modal', 'payments-success-modal');
+      Analytics.track({ },
+        console.log(Analytics.track));
+    },
+    onwards () {
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
-    // how is amplitude formed?
   },
 };
 </script>
diff --git a/website/client/src/mixins/payments.js b/website/client/src/mixins/payments.js
index 17cf1aea88..f22c5ffc5f 100644
--- a/website/client/src/mixins/payments.js
+++ b/website/client/src/mixins/payments.js
@@ -39,12 +39,12 @@ export default {
       return moment(this.user.purchased.plan.dateTerminated)
         .format(this.user.preferences.dateFormat.toUpperCase());
     },
-    dateRenewal () {
+    renewalDate () {
+      const renewalDate = moment().add(1, 'months');
       if (!this.user.preferences || !this.user.preferences.dateFormat) {
-        return this.user.purchased.plan.dateRenewal;
+        return renewalDate;
       }
-      return moment(this.user.purchased.plan.dateRenewal).add(1, 'months')
-        .format(this.user.preferences.dateFormat.toUpperCase());
+      return renewalDate.format(this.user.preferences.dateFormat.toUpperCase());
     },
   },
   methods: {
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 76b34fb15b..a9d0e6c007 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -93,7 +93,7 @@
   "paymentYouSentGems": "You sent <strong><%- name %></strong>:",
   "paymentYouSentSubscription": "You sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
   "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
-  "groupsPaymentSubBilling": "Your next billing date is <strong>11/11/1111</strong>.",
+  "groupsPaymentSubBilling": "Your next billing date is <strong><%= renewalDate %></strong>.",
   "paymentSubBillingWithMethod": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong> via <strong><%= paymentMethod %></strong>.",
   "paymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel this subscription, you can do so from your settings.",
   "groupsPaymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel, you can do so from the Group Billing tab.",

From 36a4ec69d55d19941512c79b1343ff5c21ee6b64 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 8 Sep 2022 15:53:26 -0400
Subject: [PATCH 031/134] update: success modal (testing something)

---
 .../src/components/payments/successModal.vue  | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index ad9ba387c2..5827423ea5 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -87,12 +87,10 @@
         </template>
         <!-- give gift subscription (non-recurring)-->
         <template v-if="paymentData.paymentType === 'gift-subscription'">
-          <div>
-            <span
-              v-html="$t('paymentYouSentSubscription', {
-                name: paymentData.giftReceiver, months: paymentData.subscription.months})"
-            ></span>
-          </div>
+          <span
+            v-html="$t('paymentYouSentSubscription', {
+              name: paymentData.giftReceiver, months: paymentData.subscription.months})"
+          ></span>
         </template>
         <!-- buy self subscription (recurring) -->
         <template v-if="paymentData.paymentType === 'subscription'">
@@ -103,24 +101,7 @@
                 amount: paymentData.subscription.price, months: paymentData.subscription.months})"
             ></span>
           </div>
-          <div
-            v-once
-            class="small-text auto-renew"
-          >
-            {{ $t('paymentAutoRenew') }}
-          </div>
         </template>
-        <!-- buttons for subscriptions -->
-        <div>
-          <button
-            v-if="paymentData.paymentType === 'subscription'
-              || paymentData.paymentType === 'gift-subscription'"
-            class="btn btn-primary"
-            @click="onwards()"
-          >
-            {{ $t('onwards') }}
-          </button>
-        </div>
         <!-- group plan new or upgraded -->
         <template v-if="paymentData.paymentType === 'groupPlan'">
           <span
@@ -146,14 +127,24 @@
           </div>
         </template>
         <!-- buy self subscription auto renew -->
-<!--         <template
+        <template
           v-if="paymentData.paymentType === 'subscription'"
         >
           <span
             v-once
             class="small-text auto-renew"
           >{{ $t('paymentAutoRenew') }}</span>
-        </template> -->
+        </template>
+        <!-- buttons for subscriptions -->
+        <div>
+          <button
+            v-if="paymentData.paymentType === 'subscription'"
+            class="btn btn-primary"
+            @click="onwards()"
+          >
+            {{ $t('onwards') }} to Mayhem!
+          </button>
+        </div>
       </div>
     </div>
   </b-modal>

From 5c13bf1980a415e2353f659c7738d93f80b6db2e Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 8 Sep 2022 17:34:36 -0400
Subject: [PATCH 032/134] update: add analytics to create and success modals

---
 .../group-plans/groupPlanCreationModal.vue    | 34 ++++--------------
 .../src/components/groups/groupPlan.vue       |  6 ----
 .../src/components/payments/successModal.vue  | 35 ++++++++++++-------
 3 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 5b63bafb93..ffc4466cbe 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -119,13 +119,6 @@
           :amazon-data="pay(PAYMENTS.AMAZON)"
         />
       </div>
-      <!-- TEMPORARY BUTTON FOR TESTING -->
-<!--       <button
-        class="btn btn-primary btn-payment"
-        @click="success()"
-      >
-        Clicky click click!
-      </button> -->
     </div>
   </b-modal>
 </template>
@@ -258,6 +251,7 @@ import { mapState } from '@/libs/store';
 import paymentsButtons from '@/components/payments/buttons/list';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
+// import * as Analytics from '@/libs/analytics';
 
 export default {
   components: {
@@ -277,7 +271,6 @@ export default {
       PAYMENTS: {
         AMAZON: 'amazon',
         STRIPE: 'stripe',
-        // OTHER: 'tempcode', // TEMP CODE
       },
       paymentMethod: '',
       newGroup: {
@@ -312,7 +305,10 @@ export default {
       this.activePage = page;
     },
     createGroup () {
-      console.log(this.newGroup);
+      // Analytics.track({
+      //   name: this.paymentData.demographics,
+      // },
+      // console.log(this.paymentData.demographics));
       this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
@@ -342,29 +338,13 @@ export default {
         this.redirectToStripe(paymentData);
       }
 
-      // TEMP CODE
-      // if (this.paymentMethod === this.PAYMENTS.OTHER) {
-      //   console.log(paymentData);
-      // }
-
       return null;
     },
-    // need to figure out where/how to create the event in amplitude
-    // right now being sent to console in success()
-    sendAnalytics () {
-      return this.newGroup.demographics;
-    },
+
     onHide () {
       this.sendingInProgress = false;
     },
-    // temporary function to go with temporary button
-    // success () {
-    //   this.pay(this.PAYMENTS.OTHER);
-    //   console.log(this.sendAnalytics());
-    //   this.sendAnalytics();
-    //   this.$root.$emit('bv::hide::modal', 'create-group');
-    //   this.$root.$emit('bv::show::modal', 'payments-success-modal');
-    // },
+
   },
 };
 </script>
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index a4667cc7a2..0eb76a8ae4 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -400,14 +400,8 @@ export default {
   },
   methods: {
     launchModal () {
-      console.log('i am creating a group');
-      // this.changePage(this.PAGES.CREATE_GROUP);
       this.$root.$emit('bv::show::modal', 'create-group');
     },
-    // changePage (page) {
-    //   this.activePage = 'page';
-    //   window.scrollTo(0, 0);
-    // },
     createGroup () {
       this.changePage(this.PAGES.PAY);
     },
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 5827423ea5..577c06d619 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -2,8 +2,8 @@
   <b-modal
     id="payments-success-modal"
     :title="$t('accountSuspendedTitle')"
-    :hide-footer="isFromBalance"
-    :modal-class="isFromBalance ? ['modal-hidden-footer'] : []"
+    :hide-footer="isFromBalance || paymentData.newGroup"
+    :modal-class="isFromBalance || paymentData.newGroup ? ['modal-hidden-footer'] : []"
   >
     <div slot="modal-header">
       <div class="check-container d-flex align-items-center justify-content-center">
@@ -136,15 +136,14 @@
           >{{ $t('paymentAutoRenew') }}</span>
         </template>
         <!-- buttons for subscriptions -->
-        <div>
-          <button
-            v-if="paymentData.paymentType === 'subscription'"
-            class="btn btn-primary"
-            @click="onwards()"
-          >
-            {{ $t('onwards') }} to Mayhem!
-          </button>
-        </div>
+        <button
+          v-if="paymentData.paymentType !== 'groupPlan'"
+          v-once
+          class="btn btn-primary"
+          @click="onwards()"
+        >
+          {{ $t('onwards') }}
+        </button>
       </div>
     </div>
   </b-modal>
@@ -325,6 +324,14 @@ export default {
     isFromBalance () {
       return this.paymentData.paymentType === 'gift-gems-balance';
     },
+    upgradedGroup () {
+      const upgradedGroup = (this.paymentData.paymentType !== 'groupPlan' || this.paymentData.newGroup);
+      const demographicsKey = upgradedGroup.demographics;
+      const groupPlanUpgraded = {
+        demographics: demographicsKey,
+      };
+      return groupPlanUpgraded.demographics;
+    },
   },
   mounted () {
     this.$root.$on('habitica:payment-success', data => {
@@ -341,10 +348,12 @@ export default {
   },
   methods: {
     submit () {
+      Analytics.track({
+        name: this.groupPlanUpgraded.demographics,
+      },
+      console.log(Analytics.track));
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
-      Analytics.track({ },
-        console.log(Analytics.track));
     },
     onwards () {
       this.paymentData = {};

From e6f903fd2eaea84ae780ebb94dded90faa3d7435 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 9 Sep 2022 15:37:08 -0400
Subject: [PATCH 033/134] update: more analytics work

---
 .../group-plans/groupPlanCreationModal.vue    | 17 +++++++----
 .../src/components/payments/successModal.vue  | 23 ++++++++++----
 website/client/src/libs/analytics.js          | 30 +++++++++++++++++++
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index ffc4466cbe..7b5546c78d 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -251,7 +251,7 @@ import { mapState } from '@/libs/store';
 import paymentsButtons from '@/components/payments/buttons/list';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
-// import * as Analytics from '@/libs/analytics';
+import * as Analytics from '@/libs/analytics';
 
 export default {
   components: {
@@ -282,6 +282,7 @@ export default {
           challenges: false,
         },
         demographics: null,
+        user: '',
       },
       activePage: 'create-group',
       type: 'guild',
@@ -305,10 +306,6 @@ export default {
       this.activePage = page;
     },
     createGroup () {
-      // Analytics.track({
-      //   name: this.paymentData.demographics,
-      // },
-      // console.log(this.paymentData.demographics));
       this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
@@ -320,6 +317,16 @@ export default {
         demographics: demographicsKey,
       };
 
+      Analytics.track({
+        hitType: 'event',
+        eventName: 'group plan create',
+        eventAction: 'group plan create',
+        eventCategory: 'behavior',
+        createGroupName: this.newGroup.name,
+        demographicsCreated: this.newGroup.demographics,
+        typeCreated: this.newGroup.type,
+      });
+
       if (this.upgradingGroup && this.upgradingGroup._id) {
         paymentData.groupId = this.upgradingGroup._id;
         paymentData.group = this.upgradingGroup;
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 577c06d619..b708cd3b42 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -290,6 +290,7 @@
 <script>
 import checkIcon from '@/assets/svg/check.svg';
 import gemIcon from '@/assets/svg/gem.svg';
+import { mapState } from '@/libs/store';
 import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
@@ -309,16 +310,16 @@ export default {
         gem: gemIcon,
       }),
       paymentData: {},
-      groupPlanUpgraded: {
+      upgradedGroupInfo: {
         demographics: null,
       },
     };
   },
   computed: {
+    ...mapState({ user: 'user.data', group: 'group.data' }),
     groupPlanCost () {
       const sub = this.paymentData.subscription;
       const memberCount = this.paymentData.group.memberCount || 1;
-      console.log(this.paymentData);
       return sub.price + 3 * (memberCount - 1);
     },
     isFromBalance () {
@@ -327,10 +328,15 @@ export default {
     upgradedGroup () {
       const upgradedGroup = (this.paymentData.paymentType !== 'groupPlan' || this.paymentData.newGroup);
       const demographicsKey = upgradedGroup.demographics;
+      const upgradedGroupName = upgradedGroup.name;
+      const upgradedGroupType = upgradedGroup.type;
       const groupPlanUpgraded = {
         demographics: demographicsKey,
+        name: upgradedGroupName,
+        type: upgradedGroupType,
       };
-      return groupPlanUpgraded.demographics;
+      console.log(groupPlanUpgraded.demographics, groupPlanUpgraded.name, groupPlanUpgraded.type);
+      return (groupPlanUpgraded.demographics, groupPlanUpgraded.name, groupPlanUpgraded.type);
     },
   },
   mounted () {
@@ -349,9 +355,14 @@ export default {
   methods: {
     submit () {
       Analytics.track({
-        name: this.groupPlanUpgraded.demographics,
-      },
-      console.log(Analytics.track));
+        hitType: 'event',
+        eventName: 'group plan upgrade',
+        eventAction: 'group plan upgrade',
+        eventCategory: 'behavior',
+        upgradedGroupName: this.upgradedGroup.name,
+        demographicsUpgraded: this.upgradedGroup.demographics,
+        typeUpgraded: this.upgradedGroup.type,
+      });
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 14648d70e3..42bb296215 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -75,6 +75,22 @@ function _gatherUserStats (properties) {
   if (user.purchased.plan.planId) properties.subscription = user.purchased.plan.planId;
 }
 
+// added to gather group stats
+function _gatherGroupStats (properties) {
+  const store = getStore();
+  const user = store.state.user.data;
+  const group = store.state.groups.data;
+
+  properties.UUID = user._id;
+
+  properties.createGroupName = group.newGroup.name;
+  properties.demographicsCreated = group.newGroup.demographics;
+  properties.typeCreated = group.newGroup.type;
+  properties.upgradedGroupName = group.upgradedGroup.name;
+  properties.demographicsUpgraded = group.upgradedGroup.demographics;
+  properties.typeUpgraded = group.upgradedGroup.type;
+}
+
 export function setUser () {
   const store = getStore();
   const user = store.state.user.data;
@@ -89,6 +105,7 @@ export function track (properties, options = {}) {
     if (_doesNotHaveAllowedHitType(properties)) return;
 
     const trackOnClient = options && options.trackOnClient === true;
+    console.log(properties, options); // delete this!
     // Track events on the server by default
     if (trackOnClient === true) {
       amplitude.getInstance().logEvent(properties.eventAction, properties);
@@ -114,6 +131,19 @@ export function updateUser (properties = {}) {
   });
 }
 
+// added to get group data
+export function updateGroup (properties = {}) {
+  Vue.nextTick(() => {
+    _gatherGroupStats(properties);
+
+    forEach(properties, (value, key) => {
+      const idGroup = new amplitude.Identify().set(key, value);
+      amplitude.getInstance().identify(idGroup);
+    });
+    window.ga('set', properties);
+  });
+}
+
 export function setup () {
   // Setup queues until the real scripts are loaded
 

From 771558e1fd067e77369fe8b75a2f849f527ca238 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 9 Sep 2022 16:27:25 -0400
Subject: [PATCH 034/134] update: analytics debugging

---
 .../src/components/payments/successModal.vue  | 56 +++++++++----------
 website/client/src/libs/analytics.js          |  6 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index b708cd3b42..3c098d9887 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -140,7 +140,7 @@
           v-if="paymentData.paymentType !== 'groupPlan'"
           v-once
           class="btn btn-primary"
-          @click="onwards()"
+          @click="submit()"
         >
           {{ $t('onwards') }}
         </button>
@@ -310,7 +310,8 @@ export default {
         gem: gemIcon,
       }),
       paymentData: {},
-      upgradedGroupInfo: {
+      upgradedGroup: {
+        name: '',
         demographics: null,
       },
     };
@@ -325,19 +326,21 @@ export default {
     isFromBalance () {
       return this.paymentData.paymentType === 'gift-gems-balance';
     },
-    upgradedGroup () {
-      const upgradedGroup = (this.paymentData.paymentType !== 'groupPlan' || this.paymentData.newGroup);
-      const demographicsKey = upgradedGroup.demographics;
-      const upgradedGroupName = upgradedGroup.name;
-      const upgradedGroupType = upgradedGroup.type;
-      const groupPlanUpgraded = {
-        demographics: demographicsKey,
-        name: upgradedGroupName,
-        type: upgradedGroupType,
-      };
-      console.log(groupPlanUpgraded.demographics, groupPlanUpgraded.name, groupPlanUpgraded.type);
-      return (groupPlanUpgraded.demographics, groupPlanUpgraded.name, groupPlanUpgraded.type);
-    },
+    // upgradedGroup () {
+    //   const upgradedGroup = (this.paymentData.paymentType === 'groupPlan'
+    // && !this.paymentData.newGroup);
+    //   const demographicsKey = upgradedGroup.demographics;
+    //   const upgradedGroupName = upgradedGroup.name;
+    //   const upgradedGroupType = upgradedGroup.type;
+    //   const groupPlanUpgraded = {
+    //     demographics: demographicsKey,
+    //     name: upgradedGroupName,
+    //     type: upgradedGroupType,
+    //   };
+    //   console.log(groupPlanUpgraded.demographics,
+    //     groupPlanUpgraded.name, groupPlanUpgraded.type);
+    //   return groupPlanUpgraded;
+    // },
   },
   mounted () {
     this.$root.$on('habitica:payment-success', data => {
@@ -354,19 +357,16 @@ export default {
   },
   methods: {
     submit () {
-      Analytics.track({
-        hitType: 'event',
-        eventName: 'group plan upgrade',
-        eventAction: 'group plan upgrade',
-        eventCategory: 'behavior',
-        upgradedGroupName: this.upgradedGroup.name,
-        demographicsUpgraded: this.upgradedGroup.demographics,
-        typeUpgraded: this.upgradedGroup.type,
-      });
-      this.paymentData = {};
-      this.$root.$emit('bv::hide::modal', 'payments-success-modal');
-    },
-    onwards () {
+      if (!this.paymentData.newGroup) {
+        Analytics.track({
+          hitType: 'event',
+          eventName: 'group plan upgrade',
+          eventAction: 'group plan upgrade',
+          eventCategory: 'behavior',
+          demographics: this.paymentData.group.demographics, // if that's where this lives?
+          typeUpgraded: this.paymentData.group.type,
+        });
+      }
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 42bb296215..6493a07f5f 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -86,9 +86,9 @@ function _gatherGroupStats (properties) {
   properties.createGroupName = group.newGroup.name;
   properties.demographicsCreated = group.newGroup.demographics;
   properties.typeCreated = group.newGroup.type;
-  properties.upgradedGroupName = group.upgradedGroup.name;
-  properties.demographicsUpgraded = group.upgradedGroup.demographics;
-  properties.typeUpgraded = group.upgradedGroup.type;
+  // properties.upgradedGroupName = group.upgradedGroup.name;
+  // properties.demographicsUpgraded = group.upgradedGroup.demographics;
+  // properties.typeUpgraded = group.upgradedGroup.type;
 }
 
 export function setUser () {

From 5a85e0730c9c142c5819f90d24a7c90deb43d65b Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 9 Sep 2022 16:56:19 -0400
Subject: [PATCH 035/134] update: analytics debugging

---
 .../components/group-plans/groupPlanCreationModal.vue  |  5 ++---
 .../client/src/components/payments/successModal.vue    | 10 +++++-----
 website/client/src/libs/analytics.js                   |  8 ++------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 7b5546c78d..ff61a904b6 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -322,9 +322,8 @@ export default {
         eventName: 'group plan create',
         eventAction: 'group plan create',
         eventCategory: 'behavior',
-        createGroupName: this.newGroup.name,
-        demographicsCreated: this.newGroup.demographics,
-        typeCreated: this.newGroup.type,
+        demographics: this.newGroup.demographics,
+        type: this.newGroup.type,
       });
 
       if (this.upgradingGroup && this.upgradingGroup._id) {
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 3c098d9887..fb3abaf39e 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -43,13 +43,13 @@
           ]"
           class="group-input"
           :placeholder="'groupUseDefault'"
-          :value="groupPlanUpgraded.demographics"
-          @select="groupPlanUpgraded.demographics = $event"
+          :value="upgradedGroup.demographics"
+          @select="upgradedGroup.demographics = $event"
         />
         <button
           v-if="!paymentData.newGroup"
           class="btn btn-primary mx-auto"
-          :disabled="!groupPlanUpgraded.demographics"
+          :disabled="!upgradedGroup.demographics"
           @click="submit()"
         >
           {{ $t('submit') }}
@@ -363,8 +363,8 @@ export default {
           eventName: 'group plan upgrade',
           eventAction: 'group plan upgrade',
           eventCategory: 'behavior',
-          demographics: this.paymentData.group.demographics, // if that's where this lives?
-          typeUpgraded: this.paymentData.group.type,
+          demographics: this.upgradedGroup.demographics,
+          type: this.paymentData.group.type, // also tried this.upgradedGroup.type
         });
       }
       this.paymentData = {};
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 6493a07f5f..9f81f6272f 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -83,12 +83,8 @@ function _gatherGroupStats (properties) {
 
   properties.UUID = user._id;
 
-  properties.createGroupName = group.newGroup.name;
-  properties.demographicsCreated = group.newGroup.demographics;
-  properties.typeCreated = group.newGroup.type;
-  // properties.upgradedGroupName = group.upgradedGroup.name;
-  // properties.demographicsUpgraded = group.upgradedGroup.demographics;
-  // properties.typeUpgraded = group.upgradedGroup.type;
+  properties.demographics = group.newGroup.demographics || group.upgradedGroup.demographics;
+  properties.type = group.newGroup.type || group.upgradedGroup.type;
 }
 
 export function setUser () {

From 21185b689c787ac9ad9380821b408036c1e2a5e6 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 12 Sep 2022 11:42:39 -0400
Subject: [PATCH 036/134] update: add 'type' to amazonModal.vue, removed
 extraneous analytics.js code

---
 .../src/components/payments/amazonModal.vue   |  2 +-
 website/client/src/libs/analytics.js          | 26 -------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/website/client/src/components/payments/amazonModal.vue b/website/client/src/components/payments/amazonModal.vue
index 8641a957bb..fcae0e01ec 100644
--- a/website/client/src/components/payments/amazonModal.vue
+++ b/website/client/src/components/payments/amazonModal.vue
@@ -196,7 +196,7 @@ export default {
           appState.group = pick(this.amazonPayments.groupToCreate, ['_id', 'memberCount', 'name']);
         } else {
           appState.newGroup = false;
-          appState.group = pick(this.amazonPayments.group, ['_id', 'memberCount', 'name']);
+          appState.group = pick(this.amazonPayments.group, ['_id', 'memberCount', 'name', 'type']);
         }
       } else if (paymentType && paymentType.indexOf('gift-') === 0) {
         appState.gift = this.amazonPayments.gift;
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 9f81f6272f..14648d70e3 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -75,18 +75,6 @@ function _gatherUserStats (properties) {
   if (user.purchased.plan.planId) properties.subscription = user.purchased.plan.planId;
 }
 
-// added to gather group stats
-function _gatherGroupStats (properties) {
-  const store = getStore();
-  const user = store.state.user.data;
-  const group = store.state.groups.data;
-
-  properties.UUID = user._id;
-
-  properties.demographics = group.newGroup.demographics || group.upgradedGroup.demographics;
-  properties.type = group.newGroup.type || group.upgradedGroup.type;
-}
-
 export function setUser () {
   const store = getStore();
   const user = store.state.user.data;
@@ -101,7 +89,6 @@ export function track (properties, options = {}) {
     if (_doesNotHaveAllowedHitType(properties)) return;
 
     const trackOnClient = options && options.trackOnClient === true;
-    console.log(properties, options); // delete this!
     // Track events on the server by default
     if (trackOnClient === true) {
       amplitude.getInstance().logEvent(properties.eventAction, properties);
@@ -127,19 +114,6 @@ export function updateUser (properties = {}) {
   });
 }
 
-// added to get group data
-export function updateGroup (properties = {}) {
-  Vue.nextTick(() => {
-    _gatherGroupStats(properties);
-
-    forEach(properties, (value, key) => {
-      const idGroup = new amplitude.Identify().set(key, value);
-      amplitude.getInstance().identify(idGroup);
-    });
-    window.ga('set', properties);
-  });
-}
-
 export function setup () {
   // Setup queues until the real scripts are loaded
 

From 1a869437114e5d84ec820b5ff4ac632d9ae52927 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 12 Sep 2022 15:17:39 -0500
Subject: [PATCH 037/134] fix(subscriptions): better next-hourglass logic

---
 website/common/script/cron.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/website/common/script/cron.js b/website/common/script/cron.js
index 6e678f144b..10f8c89195 100644
--- a/website/common/script/cron.js
+++ b/website/common/script/cron.js
@@ -8,6 +8,7 @@ import defaults from 'lodash/defaults';
 import invert from 'lodash/invert';
 import moment from 'moment';
 import 'moment-recur';
+import subscriptionBlocks from './content/subscriptionBlocks';
 
 export const DAY_MAPPING = {
   0: 'su',
@@ -286,7 +287,13 @@ export function getPlanContext (user, now) {
   const dateUpdatedMoment = moment(plan.dateUpdated).startOf('month');
   const elapsedMonths = moment(subscriptionEndDate).diff(dateUpdatedMoment, 'months');
 
-  const monthsTillNextHourglass = plan.consecutive.offset || (3 - (plan.consecutive.count % 3));
+  const planMonths = subscriptionBlocks[plan.planId].months || 1;
+  let monthsTillNextHourglass;
+  if (planMonths > 1) {
+    monthsTillNextHourglass = plan.consecutive.offset + 1;
+  } else {
+    monthsTillNextHourglass = 3 - (plan.consecutive.count % 3);
+  }
 
   const possibleNextHourglassDate = moment(plan.dateUpdated)
     .add(monthsTillNextHourglass, 'months');

From d4f9555f11c94fae8996d25743332883fe5844e4 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 13 Sep 2022 10:11:17 -0500
Subject: [PATCH 038/134] 4.243.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54b6165b1d..d5643fb2c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.243.0",
+  "version": "4.243.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b32ca0a27a..df6999527f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.243.0",
+  "version": "4.243.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From fb780c9a2daa71545526537d990028813c351d5e Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 13 Sep 2022 15:52:03 -0500
Subject: [PATCH 039/134] fix(admin): reactivity with subscriptions

---
 .../user-support/subscriptionAndPerks.vue     | 27 ++++---------------
 website/server/controllers/api-v3/hall.js     |  3 +++
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index ae0f5a59aa..50c3c1b135 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -8,7 +8,7 @@
       Subscription, Monthly Perks
     </h3>
     <div v-if="expand">
-      <form @submit.prevent="saveSubscriptionData()">
+      <form @submit.prevent="saveHero({ hero, msg: 'Subscription Perks' })">
         <div v-if="hero.purchased.plan.paymentMethod">
           Payment method:
           <strong>{{ hero.purchased.plan.paymentMethod }}</strong>
@@ -34,7 +34,7 @@
           <label>
             Consecutive months:
             <input
-              v-model="consecutiveMonths"
+              v-model="hero.purchased.plan.consecutive.count"
               class="form-control"
               type="number"
               min="0"
@@ -115,7 +115,6 @@
 </template>
 
 <script>
-import clone from 'lodash/clone';
 import moment from 'moment';
 import saveHero from '../mixins/saveHero';
 import { getPlanContext } from '@/../../common/script/cron';
@@ -130,43 +129,27 @@ export default {
   },
   data () {
     return {
-      consecutiveMonths: 0,
       expand: false,
     };
   },
   computed: {
     nextHourglassDate () {
-      const pendingHero = clone(this.hero);
-      pendingHero.purchased.plan.consecutive.count = this.consecutiveMonths;
-      const currentPlanContext = getPlanContext(pendingHero, new Date());
+      const currentPlanContext = getPlanContext(this.hero, new Date());
 
       return currentPlanContext.nextHourglassDate.format('MMMM');
     },
   },
   watch: {
-    consecutiveMonths () {
+    'hero.purchased.plan.consecutive.count' () { // eslint-disable-line object-shorthand
       this.hero.purchased.plan.consecutive.gemCapExtra = Math.min(
-        Math.floor(this.consecutiveMonths / 3) * 5, 25,
+        Math.floor(this.hero.purchased.plan.consecutive.count / 3) * 5, 25,
       );
-      if (this.hero.purchased.plan.gemsBought
-        > this.hero.purchased.plan.consecutive.gemCapExtra + 25) {
-        this.hero.purchased.plan.gemsBought = this.hero.purchased.plan.consecutive.gemCapExtra + 25;
-      }
     },
   },
-  mounted () {
-    this.consecutiveMonths = clone(this.hero.purchased.plan.consecutive.count);
-  },
   methods: {
     dateFormat (date) {
       return moment(date).format('YYYY/MM/DD');
     },
-    saveSubscriptionData () {
-      if (this.consecutiveMonths !== this.hero.purchased.plan.consecutive.count) {
-        this.hero.purchased.plan.consecutive.count = this.consecutiveMonths;
-      }
-      this.saveHero({ hero: this.hero, msg: 'Subscription Perks' });
-    },
   },
 };
 </script>
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index 15183c686f..456c62a396 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -289,6 +289,9 @@ api.updateHero = {
         if (updateData.purchased.plan.consecutive.gemCapExtra) {
           hero.purchased.plan.consecutive.gemCapExtra = updateData.purchased.plan.consecutive.gemCapExtra; // eslint-disable-line max-len
         }
+        if (updateData.purchased.plan.consecutive.count) {
+          hero.purchased.plan.consecutive.count = updateData.purchased.plan.consecutive.count; // eslint-disable-line max-len
+        }
       }
     }
 

From 37e5d6b40aa9c75e192a6ad01a143be80b41007c Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 14 Sep 2022 17:06:33 -0400
Subject: [PATCH 040/134] update: remove duplicate key from groups.json

---
 website/common/locales/en/groups.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index f46fed3316..f9e1cdd157 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -353,7 +353,6 @@
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
   "next": "Next",
-  "cancel": "Cancel",
   "nameStar": "Name*",
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",

From 014a4b653ae99638dd527f7d2f9baca6ebf5da34 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 14 Sep 2022 17:24:29 -0400
Subject: [PATCH 041/134] update: remove another duplicate key from groups.json

---
 website/common/locales/en/groups.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index f9e1cdd157..9d3aea4ff7 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -352,7 +352,6 @@
   "groupManager": "Manager setting up tasks for employees",
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
-  "next": "Next",
   "nameStar": "Name*",
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",

From 9a8d1854b93d08dc9b84de812658e206f5a82e4d Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 15 Sep 2022 11:40:48 -0500
Subject: [PATCH 042/134] fix(promo): handle Gems sale defined outside of
 single top event

---
 website/server/libs/payments/gems.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/website/server/libs/payments/gems.js b/website/server/libs/payments/gems.js
index adb05b906d..831f88213a 100644
--- a/website/server/libs/payments/gems.js
+++ b/website/server/libs/payments/gems.js
@@ -1,5 +1,6 @@
+import find from 'lodash/find';
 import { getAnalyticsServiceByEnvironment } from '../analyticsService';
-import { getCurrentEvent } from '../worldState'; // eslint-disable-line import/no-cycle
+import { getCurrentEventList } from '../worldState'; // eslint-disable-line import/no-cycle
 import { // eslint-disable-line import/no-cycle
   getUserInfo,
   sendTxn as txnEmail,
@@ -86,9 +87,10 @@ function getAmountForGems (data) {
 
   const { gemsBlock } = data;
 
-  const currentEvent = getCurrentEvent();
-  if (currentEvent && currentEvent.gemsPromo && currentEvent.gemsPromo[gemsBlock.key]) {
-    return currentEvent.gemsPromo[gemsBlock.key] / 4;
+  const currentEventsList = getCurrentEventList();
+  const promoEvent = find(currentEventsList, event => Boolean(event.gemsPromo));
+  if (promoEvent && promoEvent.gemsPromo[gemsBlock.key]) {
+    return promoEvent.gemsPromo[gemsBlock.key] / 4;
   }
 
   return gemsBlock.gems / 4;

From 4c34c68d780aa5a7fe58dea5d111eb8d22a3cd37 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 15 Sep 2022 12:20:11 -0500
Subject: [PATCH 043/134] fix(test): stub newly relevant function

---
 test/api/unit/libs/payments/payments.test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index 6083744658..fb9928d51d 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -692,14 +692,14 @@ describe('payments/index', () => {
 
     context('Active Promotion', () => {
       beforeEach(() => {
-        sinon.stub(worldState, 'getCurrentEvent').returns({
+        sinon.stub(worldState, 'getCurrentEventList').returns([{
           ...common.content.events.fall2020,
           event: 'fall2020',
-        });
+        }]);
       });
 
       afterEach(() => {
-        worldState.getCurrentEvent.restore();
+        worldState.getCurrentEventList.restore();
       });
 
       it('applies a discount', async () => {

From 719fab8d4bb1c226035565eb4b0c1aca56789541 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 16 Sep 2022 16:12:34 -0400
Subject: [PATCH 044/134] chore: merge develop in

---
 habitica-images                               |    2 +-
 test/api/unit/libs/email.test.js              |   25 -
 test/api/unit/libs/password.test.js           |    2 +-
 .../v3/integration/user/DELETE-user.test.js   |   39 -
 .../DELETE-user_auth_social_network.test.js   |   64 -
 .../user/auth/POST-user_auth_social.test.js   |  141 ---
 .../auth/POST-user_reset_password.test.js     |   13 +
 website/client/src/assets/svg/facebook.svg    |    4 +-
 website/client/src/assets/svg/instagram.svg   |    4 +-
 website/client/src/assets/svg/tumblr.svg      |    3 +
 website/client/src/assets/svg/twitter.svg     |    4 +-
 website/client/src/components/appFooter.vue   | 1119 +++++++++++------
 .../client/src/components/auth/authForm.vue   |   20 -
 .../components/auth/registerLoginReset.vue    |    4 -
 .../src/components/groups/groupPlan.vue       |   12 +-
 .../src/components/payments/buyGemsModal.vue  |    8 -
 .../client/src/components/settings/site.vue   |    4 +-
 .../client/src/components/static/privacy.vue  |    7 +-
 .../src/components/static/staticWrapper.vue   |  104 +-
 website/client/vue.config.js                  |    1 -
 website/common/locales/da/backgrounds.json    |    3 +-
 website/common/locales/da/challenge.json      |    3 +-
 .../locales/da/communityguidelines.json       |  104 +-
 website/common/locales/da/content.json        |    2 +-
 website/common/locales/da/contrib.json        |    5 +-
 website/common/locales/da/death.json          |    4 +-
 website/common/locales/da/defaulttasks.json   |    4 +-
 website/common/locales/da/faq.json            |   36 +-
 website/common/locales/da/front.json          |    9 +-
 website/common/locales/da/gear.json           |    9 +-
 website/common/locales/da/groups.json         |    7 +-
 website/common/locales/da/limited.json        |  173 ++-
 website/common/locales/da/npc.json            |    9 +-
 website/common/locales/da/overview.json       |    6 +-
 website/common/locales/da/pets.json           |    8 +-
 website/common/locales/da/quests.json         |   12 +-
 website/common/locales/da/questscontent.json  |    2 +-
 website/common/locales/da/rebirth.json        |    2 +-
 website/common/locales/da/settings.json       |    8 +-
 website/common/locales/da/subscriber.json     |   16 +-
 website/common/locales/da/tasks.json          |   22 +-
 website/common/locales/de/groups.json         |    2 +-
 website/common/locales/en/front.json          |   11 +-
 website/common/locales/en/npc.json            |    3 +-
 website/common/locales/en/questsContent.json  |    2 +-
 website/common/locales/en/subscriber.json     |    2 +-
 website/common/locales/es/gear.json           |   34 +-
 website/common/locales/it/backgrounds.json    |    9 +-
 website/common/locales/it/gear.json           |    6 +-
 website/common/locales/ja/backgrounds.json    |    9 +-
 website/common/locales/ja/gear.json           |    6 +-
 website/common/locales/ja/generic.json        |    4 +-
 website/common/locales/ja/quests.json         |    2 +-
 website/common/locales/pt_BR/backgrounds.json |    9 +-
 website/common/locales/pt_BR/gear.json        |    6 +-
 website/common/locales/ru/backgrounds.json    |    9 +-
 website/common/locales/ru/groups.json         |   22 +-
 website/common/locales/ru/settings.json       |    3 +-
 website/common/locales/ru/subscriber.json     |    4 +-
 website/common/locales/uk/backgrounds.json    |    9 +-
 website/common/locales/uk/gear.json           |   18 +-
 website/common/locales/uk/questscontent.json  |   38 +-
 website/common/locales/zh/backgrounds.json    |    9 +-
 website/common/locales/zh/faq.json            |    3 +-
 website/common/locales/zh/gear.json           |   10 +-
 website/common/locales/zh/npc.json            |    4 +-
 website/common/script/constants.js            |    1 -
 website/common/script/content/bundles.js      |    3 +-
 .../common/script/content/constants/events.js |    6 +
 .../script/content/shop-featuredItems.js      |   14 +-
 website/server/libs/auth/index.js             |    7 +-
 website/server/libs/auth/social.js            |   10 +-
 website/server/libs/setupPassport.js          |   15 -
 73 files changed, 1297 insertions(+), 1017 deletions(-)
 create mode 100644 website/client/src/assets/svg/tumblr.svg

diff --git a/habitica-images b/habitica-images
index 8d63ff55e5..ce1e117dc9 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 8d63ff55e5c63872f95a3c9106d0b5f90af9ab6f
+Subproject commit ce1e117dc94ac4b1757f144e6897e332ccdaf119
diff --git a/test/api/unit/libs/email.test.js b/test/api/unit/libs/email.test.js
index b3fe180086..8673e03b62 100644
--- a/test/api/unit/libs/email.test.js
+++ b/test/api/unit/libs/email.test.js
@@ -13,11 +13,6 @@ function getUser () {
         username: 'username',
         email: 'email@email',
       },
-      facebook: {
-        emails: [{
-          value: 'email@facebook',
-        }],
-      },
       google: {
         emails: [{
           value: 'email@google',
@@ -62,30 +57,12 @@ describe('emails', () => {
       expect(data).to.have.property('canSend', true);
     });
 
-    it('returns correct user data [facebook users]', () => {
-      const attachEmail = requireAgain(pathToEmailLib);
-      const { getUserInfo } = attachEmail;
-      const user = getUser();
-      delete user.profile.name;
-      delete user.auth.local.email;
-      delete user.auth.google.emails;
-      delete user.auth.apple.emails;
-
-      const data = getUserInfo(user, ['name', 'email', '_id', 'canSend']);
-
-      expect(data).to.have.property('name', user.auth.local.username);
-      expect(data).to.have.property('email', user.auth.facebook.emails[0].value);
-      expect(data).to.have.property('_id', user._id);
-      expect(data).to.have.property('canSend', true);
-    });
-
     it('returns correct user data [google users]', () => {
       const attachEmail = requireAgain(pathToEmailLib);
       const { getUserInfo } = attachEmail;
       const user = getUser();
       delete user.profile.name;
       delete user.auth.local.email;
-      delete user.auth.facebook.emails;
       delete user.auth.apple.emails;
 
       const data = getUserInfo(user, ['name', 'email', '_id', 'canSend']);
@@ -103,7 +80,6 @@ describe('emails', () => {
       delete user.profile.name;
       delete user.auth.local.email;
       delete user.auth.google.emails;
-      delete user.auth.facebook.emails;
 
       const data = getUserInfo(user, ['name', 'email', '_id', 'canSend']);
 
@@ -118,7 +94,6 @@ describe('emails', () => {
       const { getUserInfo } = attachEmail;
       const user = getUser();
       delete user.auth.local.email;
-      delete user.auth.facebook;
       delete user.auth.google;
       delete user.auth.apple;
 
diff --git a/test/api/unit/libs/password.test.js b/test/api/unit/libs/password.test.js
index 3ca2643b6d..d9f1572ab5 100644
--- a/test/api/unit/libs/password.test.js
+++ b/test/api/unit/libs/password.test.js
@@ -246,7 +246,7 @@ describe('Password Utilities', () => {
     it('returns false if the user has no local auth', async () => {
       const user = await generateUser({
         auth: {
-          facebook: {},
+          google: {},
         },
       });
       const res = await validatePasswordResetCodeAndFindUser(encrypt(JSON.stringify({
diff --git a/test/api/v3/integration/user/DELETE-user.test.js b/test/api/v3/integration/user/DELETE-user.test.js
index 18be9792ce..5c176fe141 100644
--- a/test/api/v3/integration/user/DELETE-user.test.js
+++ b/test/api/v3/integration/user/DELETE-user.test.js
@@ -289,45 +289,6 @@ describe('DELETE /user', () => {
     });
   });
 
-  context('user with Facebook auth', async () => {
-    beforeEach(async () => {
-      user = await generateUser({
-        auth: {
-          facebook: {
-            id: 'facebook-id',
-          },
-        },
-      });
-    });
-
-    it('returns an error if confirmation phrase is wrong', async () => {
-      await expect(user.del('/user', {
-        password: 'just-do-it',
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('incorrectDeletePhrase', { magicWord: 'DELETE' }),
-      });
-    });
-
-    it('returns an error if confirmation phrase is not supplied', async () => {
-      await expect(user.del('/user', {
-        password: '',
-      })).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('missingPassword'),
-      });
-    });
-
-    it('deletes a Facebook user', async () => {
-      await user.del('/user', {
-        password: DELETE_CONFIRMATION,
-      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
-    });
-  });
-
   context('user with Google auth', async () => {
     beforeEach(async () => {
       user = await generateUser({
diff --git a/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js b/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js
index 12bef95459..522a49d369 100644
--- a/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js
+++ b/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js
@@ -20,44 +20,6 @@ describe('DELETE social registration', () => {
     });
   });
 
-  context('Facebook', () => {
-    it('fails if user does not have an alternative registration method', async () => {
-      await user.update({
-        'auth.facebook.id': 'some-fb-id',
-        'auth.local': { ok: true },
-      });
-      await expect(user.del('/user/auth/social/facebook')).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('cantDetachSocial'),
-      });
-    });
-
-    it('succeeds if user has a local registration', async () => {
-      await user.update({
-        'auth.facebook.id': 'some-fb-id',
-      });
-
-      const response = await user.del('/user/auth/social/facebook');
-      expect(response).to.eql({});
-      await user.sync();
-      expect(user.auth.facebook).to.be.undefined;
-    });
-
-    it('succeeds if user has a google registration', async () => {
-      await user.update({
-        'auth.facebook.id': 'some-fb-id',
-        'auth.google.id': 'some-google-id',
-        'auth.local': { ok: true },
-      });
-
-      const response = await user.del('/user/auth/social/facebook');
-      expect(response).to.eql({});
-      await user.sync();
-      expect(user.auth.facebook).to.be.undefined;
-    });
-  });
-
   context('Google', () => {
     it('fails if user does not have an alternative registration method', async () => {
       await user.update({
@@ -81,19 +43,6 @@ describe('DELETE social registration', () => {
       await user.sync();
       expect(user.auth.google).to.be.undefined;
     });
-
-    it('succeeds if user has a facebook registration', async () => {
-      await user.update({
-        'auth.google.id': 'some-google-id',
-        'auth.facebook.id': 'some-facebook-id',
-        'auth.local': { ok: true },
-      });
-
-      const response = await user.del('/user/auth/social/google');
-      expect(response).to.eql({});
-      await user.sync();
-      expect(user.auth.goodl).to.be.undefined;
-    });
   });
 
   context('Apple', () => {
@@ -119,18 +68,5 @@ describe('DELETE social registration', () => {
       await user.sync();
       expect(user.auth.apple).to.be.undefined;
     });
-
-    it('succeeds if user has a facebook registration', async () => {
-      await user.update({
-        'auth.apple.id': 'some-apple-id',
-        'auth.facebook.id': 'some-facebook-id',
-        'auth.local': { ok: true },
-      });
-
-      const response = await user.del('/user/auth/social/apple');
-      expect(response).to.eql({});
-      await user.sync();
-      expect(user.auth.goodl).to.be.undefined;
-    });
   });
 });
diff --git a/test/api/v3/integration/user/auth/POST-user_auth_social.test.js b/test/api/v3/integration/user/auth/POST-user_auth_social.test.js
index c4ffe57efb..df976d0987 100644
--- a/test/api/v3/integration/user/auth/POST-user_auth_social.test.js
+++ b/test/api/v3/integration/user/auth/POST-user_auth_social.test.js
@@ -12,7 +12,6 @@ describe('POST /user/auth/social', () => {
   let user;
   const endpoint = '/user/auth/social';
   let randomAccessToken = '123456';
-  let randomFacebookId = 'facebookId';
   let randomGoogleId = 'googleId';
   let network = 'NoNetwork';
 
@@ -33,146 +32,6 @@ describe('POST /user/auth/social', () => {
     });
   });
 
-  describe('facebook', () => {
-    beforeEach(async () => {
-      randomFacebookId = generateUUID();
-      const expectedResult = {
-        id: randomFacebookId,
-        displayName: 'a facebook user',
-        emails: [
-          { value: `${user.auth.local.username}+facebook@example.com` },
-        ],
-      };
-      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
-      network = 'facebook';
-    });
-
-    afterEach(async () => {
-      passport._strategies.facebook.userProfile.restore();
-    });
-
-    it('registers a new user', async () => {
-      const response = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.exist;
-      expect(response.id).to.exist;
-      expect(response.newUser).to.be.true;
-      expect(response.username).to.exist;
-
-      await expect(getProperty('users', response.id, 'profile.name')).to.eventually.equal('a facebook user');
-      await expect(getProperty('users', response.id, 'auth.local.lowerCaseUsername')).to.exist;
-      await expect(getProperty('users', response.id, 'auth.local.email')).to.eventually.equal(`${user.auth.local.username}+facebook@example.com`);
-      await expect(getProperty('users', response.id, 'auth.facebook.id')).to.eventually.equal(randomFacebookId);
-    });
-
-    it('logs an existing user in', async () => {
-      const registerResponse = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      const response = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.eql(registerResponse.apiToken);
-      expect(response.id).to.eql(registerResponse.id);
-      expect(response.newUser).to.be.false;
-      expect(registerResponse.newUser).to.be.true;
-    });
-
-    it('logs an existing user in if they have local auth with matching email', async () => {
-      passport._strategies.facebook.userProfile.restore();
-      const expectedResult = {
-        id: randomFacebookId,
-        displayName: 'a facebook user',
-        emails: [
-          { value: user.auth.local.email },
-        ],
-      };
-      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
-
-      const response = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.eql(user.apiToken);
-      expect(response.id).to.eql(user._id);
-      expect(response.newUser).to.be.false;
-    });
-
-    it('logs an existing user into their social account if they have local auth with matching email', async () => {
-      const registerResponse = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-      expect(registerResponse.newUser).to.be.true;
-      // This is important for existing accounts before the new social handling
-      passport._strategies.facebook.userProfile.restore();
-      const expectedResult = {
-        id: randomFacebookId,
-        displayName: 'a facebook user',
-        emails: [
-          { value: user.auth.local.email },
-        ],
-      };
-      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
-
-      const response = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.eql(registerResponse.apiToken);
-      expect(response.id).to.eql(registerResponse.id);
-      expect(response.apiToken).not.to.eql(user.apiToken);
-      expect(response.id).not.to.eql(user._id);
-      expect(response.newUser).to.be.false;
-    });
-
-    it('add social auth to an existing user', async () => {
-      const response = await user.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.eql(user.apiToken);
-      expect(response.id).to.eql(user._id);
-      expect(response.newUser).to.be.false;
-    });
-
-    it('does not log into other account if social auth already exists', async () => {
-      const registerResponse = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-      expect(registerResponse.newUser).to.be.true;
-
-      await expect(user.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('socialAlreadyExists'),
-      });
-    });
-
-    xit('enrolls a new user in an A/B test', async () => {
-      await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      await expect(getProperty('users', user._id, '_ABtests')).to.eventually.be.a('object');
-    });
-  });
-
   describe('google', () => {
     beforeEach(async () => {
       randomGoogleId = generateUUID();
diff --git a/test/api/v3/integration/user/auth/POST-user_reset_password.test.js b/test/api/v3/integration/user/auth/POST-user_reset_password.test.js
index 8603fa7cb3..da66e5fd3e 100644
--- a/test/api/v3/integration/user/auth/POST-user_reset_password.test.js
+++ b/test/api/v3/integration/user/auth/POST-user_reset_password.test.js
@@ -25,6 +25,19 @@ describe('POST /user/reset-password', async () => {
     expect(user.auth.local.hashed_password).to.not.eql(previousPassword);
   });
 
+  it('resets password for social users', async () => {
+    const email = `${user.auth.local.username}+google@example.com`;
+    await user.update({ 'auth.google.emails': [{ value: email }] });
+    await user.sync();
+    const previousPassword = user.auth.local.passwordResetCode;
+    const response = await user.post(endpoint, {
+      email,
+    });
+    expect(response).to.eql({ data: {}, message: t('passwordReset') });
+    await user.sync();
+    expect(user.auth.local.passwordResetCode).to.not.eql(previousPassword);
+  });
+
   it('same message on error as on success', async () => {
     const response = await user.post(endpoint, {
       email: 'nonExistent@email.com',
diff --git a/website/client/src/assets/svg/facebook.svg b/website/client/src/assets/svg/facebook.svg
index 3150f4d0f9..02315b15bf 100644
--- a/website/client/src/assets/svg/facebook.svg
+++ b/website/client/src/assets/svg/facebook.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16">
-    <path fill-rule="evenodd" d="M7.145 8.006H4.903V16H1.58V8.006H0V5.182h1.58V3.354C1.58 2.045 2.202 0 4.933 0l2.461.01v2.742H5.608c-.291 0-.705.145-.705.77v1.66h2.533l-.291 2.824z"/>
+<svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <path d="M20,0H4C1.79,0,0,1.79,0,4V20c0,2.21,1.79,4,4,4H20c2.21,0,4-1.79,4-4V4c0-2.21-1.79-4-4-4Zm-3.72,6.66h-1.26c-1.24,0-1.63,.77-1.63,1.56v1.88h2.78l-.44,2.9h-2.33v7h-3.13v-7h-2.54v-2.9h2.54v-2.21c0-2.51,1.5-3.9,3.78-3.9,1.1,0,2.24,.2,2.24,.2v2.47Z" fill-rule="evenodd"/>
 </svg>
diff --git a/website/client/src/assets/svg/instagram.svg b/website/client/src/assets/svg/instagram.svg
index 80ff7254f5..c5ee2c2447 100644
--- a/website/client/src/assets/svg/instagram.svg
+++ b/website/client/src/assets/svg/instagram.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-    <path fill-rule="evenodd" d="M8 0c2.173 0 2.445.01 3.298.048.852.04 1.433.174 1.942.372.526.205.973.478 1.418.922.444.445.717.892.922 1.418.198.509.333 1.09.372 1.942C15.99 5.555 16 5.827 16 8s-.01 2.445-.048 3.298c-.04.852-.174 1.433-.372 1.942a3.924 3.924 0 0 1-.922 1.418 3.924 3.924 0 0 1-1.418.922c-.509.198-1.09.333-1.942.372-.853.04-1.125.048-3.298.048s-2.445-.009-3.298-.048c-.852-.04-1.433-.174-1.942-.372a3.924 3.924 0 0 1-1.418-.922A3.924 3.924 0 0 1 .42 13.24c-.198-.509-.333-1.09-.372-1.942C.01 10.445 0 10.173 0 8s.01-2.445.048-3.298C.088 3.85.222 3.269.42 2.76c.205-.526.478-.973.922-1.418A3.924 3.924 0 0 1 2.76.42C3.269.222 3.85.087 4.702.048 5.555.01 5.827 0 8 0zm0 3.892a4.108 4.108 0 1 0 0 8.216 4.108 4.108 0 0 0 0-8.216zm5.23-.162a.96.96 0 1 0-1.92 0 .96.96 0 0 0 1.92 0zM8 10.667a2.666 2.666 0 1 1 0-5.333 2.666 2.666 0 0 1 0 5.333z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path d="M14.67,12A2.67,2.67,0,1,1,12,9.33,2.67,2.67,0,0,1,14.67,12Zm3.89,0c0,1.16.1,3.66-.32,4.71a2.7,2.7,0,0,1-1.52,1.52c-1.06.42-3.55.33-4.72.33s-3.66.09-4.71-.33a2.65,2.65,0,0,1-1.52-1.52c-.42-1.05-.33-3.55-.33-4.71s-.09-3.67.33-4.72A2.65,2.65,0,0,1,7.29,5.76c1-.42,3.55-.32,4.71-.32a18,18,0,0,1,4.72.32,2.7,2.7,0,0,1,1.52,1.52C18.66,8.34,18.56,10.83,18.56,12ZM16.1,12A4.1,4.1,0,1,0,12,16.1,4.09,4.09,0,0,0,16.1,12Zm1.13-4.27a1,1,0,1,0-1,1A1,1,0,0,0,17.23,7.73ZM24,4V20a4,4,0,0,1-4,4H4a4,4,0,0,1-4-4V4A4,4,0,0,1,4,0H20A4,4,0,0,1,24,4ZM19.94,8.7a4.71,4.71,0,0,0-1.29-3.35A4.71,4.71,0,0,0,15.3,4.06C14,4,10,4,8.7,4.06A4.76,4.76,0,0,0,5.35,5.34,4.75,4.75,0,0,0,4.06,8.7C4,10,4,14,4.06,15.3a4.73,4.73,0,0,0,1.29,3.35A4.77,4.77,0,0,0,8.7,19.94c1.32.08,5.28.08,6.6,0a4.71,4.71,0,0,0,3.35-1.29,4.73,4.73,0,0,0,1.29-3.35C20,14,20,10,19.94,8.7Z" />
 </svg>
diff --git a/website/client/src/assets/svg/tumblr.svg b/website/client/src/assets/svg/tumblr.svg
new file mode 100644
index 0000000000..4e8eabc27e
--- /dev/null
+++ b/website/client/src/assets/svg/tumblr.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path d="M20,0H4A4,4,0,0,0,0,4V20a4,4,0,0,0,4,4H20a4,4,0,0,0,4-4V4A4,4,0,0,0,20,0ZM16.68,19a4.47,4.47,0,0,1-3,1C9.86,20,9,17.22,9,15.61v-4.5H7.56a.31.31,0,0,1-.31-.32V8.67a.52.52,0,0,1,.35-.5,4,4,0,0,0,2.63-3.66c0-.34.21-.51.51-.51H13a.31.31,0,0,1,.32.31v3.6h2.59a.31.31,0,0,1,.31.31v2.55a.31.31,0,0,1-.31.32H13.25v4.16c0,1.07.74,1.67,2.13,1.12a.67.67,0,0,1,.4-.07.36.36,0,0,1,.23.25l.68,2C16.75,18.71,16.8,18.89,16.68,19Z" fill-rule="evenodd"/>
+</svg>
diff --git a/website/client/src/assets/svg/twitter.svg b/website/client/src/assets/svg/twitter.svg
index c48698bcdb..b477dbb472 100644
--- a/website/client/src/assets/svg/twitter.svg
+++ b/website/client/src/assets/svg/twitter.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13">
-    <path fill-rule="evenodd" d="M14.362 3.238c.007.141.01.281.01.424 0 4.338-3.302 9.34-9.34 9.34A9.284 9.284 0 0 1 0 11.527c.257.029.518.045.783.045a6.576 6.576 0 0 0 4.076-1.404 3.288 3.288 0 0 1-3.065-2.28 3.312 3.312 0 0 0 1.481-.056A3.288 3.288 0 0 1 .642 4.613v-.041c.444.246.949.393 1.488.41A3.28 3.28 0 0 1 .67 2.25c0-.602.162-1.166.444-1.651a9.315 9.315 0 0 0 6.766 3.43A3.28 3.28 0 0 1 11.078 0c.943 0 1.797.398 2.395 1.035a6.565 6.565 0 0 0 2.085-.797 3.289 3.289 0 0 1-1.443 1.816A6.543 6.543 0 0 0 16 1.539a6.665 6.665 0 0 1-1.638 1.699"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path d="M20,0H4A4,4,0,0,0,0,4V20a4,4,0,0,0,4,4H20a4,4,0,0,0,4-4V4A4,4,0,0,0,20,0ZM18.36,8.74c0,.14,0,.29,0,.43A9.34,9.34,0,0,1,4,17a6.85,6.85,0,0,0,.79,0,6.57,6.57,0,0,0,4.07-1.4A3.29,3.29,0,0,1,5.8,13.39a4.1,4.1,0,0,0,.62,0,3.49,3.49,0,0,0,.86-.11,3.28,3.28,0,0,1-2.63-3.22v0a3.35,3.35,0,0,0,1.48.42A3.29,3.29,0,0,1,4.67,7.76,3.22,3.22,0,0,1,5.12,6.1a9.3,9.3,0,0,0,6.76,3.43,3.67,3.67,0,0,1-.08-.75,3.28,3.28,0,0,1,5.67-2.24,6.54,6.54,0,0,0,2.08-.79,3.22,3.22,0,0,1-1.44,1.8A6.67,6.67,0,0,0,20,7.05,7.31,7.31,0,0,1,18.36,8.74Z" fill-rule="evenodd"/>
 </svg>
diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue
index c3e0b81ac0..963cd6d9d9 100644
--- a/website/client/src/components/appFooter.vue
+++ b/website/client/src/components/appFooter.vue
@@ -1,487 +1,792 @@
 <template>
-  <div class="row footer-row">
+  <div>
     <buy-gems-modal v-if="user" />
     <!--modify-inventory(v-if="isUserLoaded")-->
-    <footer class="col-12 expanded">
-      <div class="row">
-        <div class="col-12 col-md-2">
-          <h3>
+    <footer>
+      <!-- Product -->
+      <div class="product">
+        <h3>{{ $t('footerProduct') }}</h3>
+        <ul>
+          <li>
             <a
               href="https://itunes.apple.com/us/app/habitica/id994882113?ls=1&mt=8"
               target="_blank"
-            >{{ $t('mobileIOS') }}</a>
-          </h3>
-          <h3>
+            >{{ $t('mobileIOS') }}
+            </a>
+          </li>
+          <li>
             <a
               href="https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica"
               target="_blank"
-            >{{ $t('mobileAndroid') }}</a>
-          </h3>
+            >{{ $t('mobileAndroid') }}
+            </a>
+          </li>
+          <li>
+            <router-link to="/group-plans">
+              {{ $t('groupPlans') }}
+            </router-link>
+          </li>
+          <li>
+            <router-link to="/static/features">
+              {{ $t('companyAbout') }}
+            </router-link>
+          </li>
+        </ul>
+      </div>
+      <!-- Company -->
+      <div class="company">
+        <h3>{{ $t('footerCompany') }}</h3>
+        <ul>
+          <li>
+            <router-link to="/static/contact">
+              {{ $t('contactUs') }}
+            </router-link>
+          </li>
+          <li>
+            <router-link to="/static/press-kit">
+              {{ $t('presskit') }}
+            </router-link>
+          </li>
+          <li>
+            <a
+              href="https://habitica.wordpress.com/"
+              target="_blank"
+            >{{ $t('companyBlog') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/wiki/Whats_New"
+              target="_blank"
+            >{{ $t('oldNews') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+      <!-- Community -->
+      <div class="community">
+        <h3>{{ $t('footerCommunity') }}</h3>
+        <ul>
+          <li>
+            <a
+              target="_blank"
+              href="/static/community-guidelines"
+            >{{ $t('communityGuidelines') }}
+            </a>
+          </li>
+          <li>
+            <router-link to="/hall/contributors">
+              {{ $t('hall') }}
+            </router-link>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/wiki/Contributing_to_Habitica"
+              target="_blank"
+            >{{ $t('companyContribute') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+      <!-- Support -->
+      <div class="support">
+        <h3>{{ $t ('support') }}</h3>
+        <ul>
+          <li>
+            <router-link to="/static/faq">
+              {{ $t('FAQ') }}
+            </router-link>
+          </li>
+          <li
+            v-if="user"
+          >
+            <a
+              target="_blank"
+              @click.prevent="openBugReportModal()"
+            >
+              {{ $t('reportBug') }}
+            </a>
+          </li>
+          <li
+            v-else
+          >
+            <a
+              href="mailto:admin@habitica.com?subject=Habitica Web Bug Report"
+              target="_blank"
+            >
+              {{ $t('reportBug') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link"
+              target="_blank"
+            >{{ $t('requestFeature') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/"
+              target="_blank"
+            >{{ $t('wiki') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+      <!-- Developers -->
+      <div class="developers">
+        <h3>{{ $t('footerDevs') }}</h3>
+        <ul>
+          <li>
+            <a
+              href="/apidoc"
+              target="_blank"
+            >{{ $t('APIv3') }}
+            </a>
+          </li>
+          <li>
+            <a
+              :href="getDataDisplayToolUrl"
+              target="_blank"
+            >{{ $t('dataDisplayTool') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths"
+              target="_blank"
+            >{{ $t('guidanceForBlacksmiths') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations"
+              target="_blank"
+            >{{ $t('communityExtensions') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+
+      <!-- Help Support Habitica -->
+      <div class="donate">
+        <div>
+          <h3>{{ $t('helpSupportHabitica') }}</h3>
+          <p class="donate-text">
+            {{ $t('donateText3') }}
+          </p>
         </div>
-        <div class="col-12 col-md-2">
-          <h3>{{ $t('footerCompany') }}</h3>
-          <ul>
-            <li>
-              <router-link to="/static/features">
-                {{ $t('companyAbout') }}
-              </router-link>
-            </li>
-            <li>
-              <a
-                href="https://habitica.wordpress.com/"
-                target="_blank"
-              >{{ $t('companyBlog') }}</a>
-            </li>
-            <li>
-              <a
-                href="https://blog.habitrpg.com/"
-                target="_blank"
-              >{{ $t('tumblr') }}</a>
-            </li>
-            <li>
-              <router-link to="/static/faq">
-                {{ $t('FAQ') }}
-              </router-link>
-            </li>
-            <li>
-              <a
-                href="https://habitica.fandom.com/wiki/Whats_New"
-                target="_blank"
-              >{{ $t('oldNews') }}</a>
-            </li>
-            <!-- Commenting out merch page see https://github.com/HabitRPG/habitica/issues/12039
-            <li>
-              <router-link to="/static/merch">
-                {{ $t('merch') }}
-              </router-link>
-            </li>
-            -->
-            <li>
-              <router-link to="/static/press-kit">
-                {{ $t('presskit') }}
-              </router-link>
-            </li>
-            <li>
-              <router-link to="/static/contact">
-                {{ $t('contactUs') }}
-              </router-link>
-            </li>
-          </ul>
-        </div>
-        <div class="col-12 col-md-2">
-          <h3>{{ $t('footerCommunity') }}</h3>
-          <ul>
-            <li>
-              <a
-                target="_blank"
-                href="/static/community-guidelines"
-              >{{ $t('communityGuidelines') }}</a>
-            </li>
-            <li>
-              <router-link to="/hall/contributors">
-                {{ $t('hall') }}
-              </router-link>
-            </li>
-            <li v-if="user">
-              <a
-                target="_blank"
-                @click.prevent="openBugReportModal()"
-              >
-                {{ $t('reportBug') }}
-              </a>
-            </li>
-            <li v-else>
-              <a
-                href="mailto:admin@habitica.com?subject=Habitica Web Bug Report"
-                target="_blank"
-              >
-                {{ $t('reportBug') }}
-              </a>
-            </li>
-            <li>
-              <a
-                href="https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link"
-                target="_blank"
-              >{{ $t('requestFeature') }}</a>
-            </li>
-            <li v-html="$t('communityExtensions')"></li>
-            <li>
-              <a
-                href="https://www.facebook.com/Habitica"
-                target="_blank"
-              >{{ $t('communityFacebook') }}</a>
-            </li>
-            <li>
-              <a
-                href="https://www.instagram.com/habitica"
-                target="_blank"
-              >{{ $t('communityInstagram') }}</a>
-            </li>
-          </ul>
-        </div>
-        <div class="col-12 col-md-6">
-          <div class="row">
-            <div class="col-6">
-              <h3>{{ $t('footerDevs') }}</h3>
-              <ul>
-                <li>
-                  <a
-                    href="/apidoc"
-                    target="_blank"
-                  >{{ $t('APIv3') }}</a>
-                </li>
-                <li>
-                  <a
-                    :href="getDataDisplayToolUrl"
-                    target="_blank"
-                  >{{ $t('dataDisplayTool') }}</a>
-                </li>
-                <li>
-                  <a
-                    href="https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths"
-                    target="_blank"
-                  >{{ $t('guidanceForBlacksmiths') }}</a>
-                </li>
-              </ul>
-            </div>
-            <div class="col-6 social">
-              <h3>{{ $t('footerSocial') }}</h3>
-              <div class="icons">
-                <a
-                  class="social-circle"
-                  href="https://twitter.com/habitica"
-                  target="_blank"
-                >
-                  <div
-                    class="social-icon svg-icon"
-                    v-html="icons.twitter"
-                  ></div>
-                </a>
-                <a
-                  class="social-circle"
-                  href="https://www.instagram.com/habitica/"
-                  target="_blank"
-                >
-                  <div
-                    class="social-icon svg-icon instagram"
-                    v-html="icons.instagram"
-                  ></div>
-                </a>
-                <a
-                  class="social-circle"
-                  href="https://www.facebook.com/Habitica"
-                  target="_blank"
-                >
-                  <div
-                    class="social-icon facebook svg-icon"
-                    v-html="icons.facebook"
-                  ></div>
-                </a>
-              </div>
-            </div>
+      </div>
+      <div class="donate-button">
+        <button
+          class="button btn-contribute"
+          @click="donate()"
+        >
+          <div class="text">
+            💜 {{ $t('companyDonate') }}
           </div>
-          <div class="row">
-            <div class="col-12 col-md-8">
-              {{ $t('donateText3') }}
-            </div>
-            <div class="col-12 col-md-4">
-              <button
-                v-if="user"
-                class="btn btn-contribute btn-front btn-flat"
-                @click="donate()"
-              >
-                <div
-                  class="svg-icon heart"
-                  v-html="icons.heart"
-                ></div>
-                <div class="text">
-                  {{ $t('companyDonate') }}
-                </div>
-              </button>
+        </button>
+      </div>
+
+      <!-- Social - Desktop/Tablet -->
+      <div class="social">
+        <div>
+          <h3>{{ $t('footerSocial') }}</h3>
+          <div class="icons">
+            <a
+              class="social-circle"
+              href="https://www.instagram.com/habitica/"
+              target="_blank"
+            >
               <div
-                v-else
-                class="btn btn-contribute btn-front btn-flat"
-              >
-                <a
-                  href="https://habitica.fandom.com/wiki/Contributing_to_Habitica"
-                  target="_blank"
-                >
-                  <div
-                    class="svg-icon heart"
-                    v-html="icons.heart"
-                  ></div>
-                  <div class="text">{{ $t('companyContribute') }}</div>
-                </a>
-              </div>
-            </div>
+                class="social-icon svg-icon instagram"
+                v-html="icons.instagram"
+              ></div>
+            </a>
+            <a
+              class="social-circle"
+              href="https://twitter.com/habitica"
+              target="_blank"
+            >
+              <div
+                class="social-icon svg-icon twitter"
+                v-html="icons.twitter"
+              ></div>
+            </a>
+            <a
+              class="social-circle"
+              href="https://www.facebook.com/Habitica"
+              target="_blank"
+            >
+              <div
+                class="social-icon facebook svg-icon"
+                v-html="icons.facebook"
+              ></div>
+            </a><a
+              class="social-circle"
+              href="https://www.tumblr.com/Habitica"
+              target="_blank"
+            >
+              <div
+                class="social-icon tumblr svg-icon"
+                v-html="icons.tumblr"
+              ></div>
+            </a>
           </div>
         </div>
       </div>
-      <div class="row">
-        <div class="col-12">
+
+      <div class="hr">
+        <div>
           <hr>
         </div>
       </div>
-      <div class="row">
-        <div class="col-12 col-md-5 text-center text-md-left">
+      <!-- Colophon -->
+      <div class=" copyright">
+        <div>
           © {{ currentYear }} Habitica. All rights reserved.
-          <div
-            v-if="!IS_PRODUCTION && isUserLoaded"
-            class="debug float-left"
-          >
-            <button
-              class="btn btn-primary"
-              @click="debugMenuShown = !debugMenuShown"
-            >
-              Toggle Debug Menu
-            </button>
-            <div
-              v-if="debugMenuShown"
-              class="debug-group"
-            >
-              <a
-                class="btn btn-secondary"
-                @click="setHealthLow()"
-              >Health = 1</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMissedDay(1)"
-              >+1 Missed Day</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMissedDay(2)"
-              >+2 Missed Days</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMissedDay(8)"
-              >+8 Missed Days</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMissedDay(32)"
-              >+32 Missed Days</a>
-              <a
-                class="btn btn-secondary"
-                @click="addTenGems()"
-              >+10 Gems</a>
-              <a
-                class="btn btn-secondary"
-                @click="addHourglass()"
-              >+1 Mystic Hourglass</a>
-              <a
-                class="btn btn-secondary"
-                @click="addGold()"
-              >+500GP</a>
-              <a
-                class="btn btn-secondary"
-                @click="plusTenHealth()"
-              >+ 10HP</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMana()"
-              >+MP</a>
-              <a
-                class="btn btn-secondary"
-                @click="addLevelsAndGold()"
-              >+Exp +GP +MP</a>
-              <a
-                class="btn btn-secondary"
-                @click="addExp()"
-              >+Exp</a>
-              <a
-                class="btn btn-secondary"
-                @click="addOneLevel()"
-              >+1 Level</a>
-              <a
-                class="btn btn-secondary"
-                tooltip="+1000 to boss quests. 300 items to collection quests"
-                @click="addQuestProgress()"
-              >Quest Progress Up</a>
-              <a
-                class="btn btn-secondary"
-                @click="makeAdmin()"
-              >Make Admin</a>
-              <a
-                class="btn btn-secondary"
-                @click="openModifyInventoryModal()"
-              >Modify Inventory</a>
-            </div>
+        </div>
+      </div>
+      <div class="melior">
+        <div
+          class="logo svg-icon"
+          v-html="icons.gryphon"
+        ></div>
+      </div>
+      <!-- DESKTOP PRIVACY & TERMS -->
+      <div class="privacy-terms">
+        <span class="privacy-policy">
+          <a
+            target="_blank"
+            href="/static/privacy"
+          >{{ $t('privacy') }}</a>
+        </span>
+        <span class="terms">
+          <a
+            target="_blank"
+            href="/static/terms"
+          >{{ $t('terms') }}</a>
+        </span>
+      </div>
+      <!-- MOBILE PRIVACY & TERMS -->
+      <div class="privacy-policy mobile desktop">
+        <a
+          target="_blank"
+          href="/static/privacy"
+        >{{ $t('privacy') }}</a>
+      </div>
+      <div class="mobile-terms mobile desktop">
+        <a
+          target="_blank"
+          href="/static/terms"
+        >{{ $t('terms') }}</a>
+      </div>
+
+      <div
+        v-if="!IS_PRODUCTION && isUserLoaded"
+        class="debug-toggle"
+      >
+        <button
+          class="debug btn-primary"
+          @click="debugMenuShown = !debugMenuShown"
+        >
+          Toggle Debug Menu
+        </button>
+        <div
+          v-if="debugMenuShown"
+          class="debug-toggle debug-group"
+        >
+          <div class="debug-pop">
+            <a
+              class="btn btn-secondary"
+              @click="setHealthLow()"
+            >Reduce Health to 1</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMissedDay(1)"
+            >+1 Missed Day</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMissedDay(2)"
+            >+2 Missed Days</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMissedDay(8)"
+            >+8 Missed Days</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMissedDay(32)"
+            >+32 Missed Days</a>
+            <a
+              class="btn btn-secondary"
+              @click="addTenGems()"
+            >+10 Gems</a>
+            <a
+              class="btn btn-secondary"
+              @click="addHourglass()"
+            >+1 Mystic Hourglass</a>
+            <a
+              class="btn btn-secondary"
+              @click="addGold()"
+            >+500GP</a>
+            <a
+              class="btn btn-secondary"
+              @click="plusTenHealth()"
+            >+ 10HP</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMana()"
+            >+MP</a>
+            <a
+              class="btn btn-secondary"
+              @click="addLevelsAndGold()"
+            >+Exp +GP +MP</a>
+            <a
+              class="btn btn-secondary"
+              @click="addExp()"
+            >+Exp</a>
+            <a
+              class="btn btn-secondary"
+              @click="addOneLevel()"
+            >+1 Level</a>
+            <a
+              class="btn btn-secondary"
+              tooltip="+1000 to boss quests. 300 items to collection quests"
+              @click="addQuestProgress()"
+            >Quest Progress Up</a>
+            <a
+              class="btn btn-secondary"
+              @click="makeAdmin()"
+            >Make Admin</a>
           </div>
         </div>
-        <div class="col-12 col-md-2 text-center">
-          <div
-            class="logo svg-icon"
-            v-html="icons.gryphon"
-          ></div>
-        </div>
-        <div class="col-12 col-md-5 text-center text-md-right my-1">
-          <span class="ml-4">
-            <a
-              target="_blank"
-              href="/static/privacy"
-            >{{ $t('privacy') }}</a>
-          </span>
-          <span class="ml-4">
-            <a
-              target="_blank"
-              href="/static/terms"
-            >{{ $t('terms') }}</a>
-          </span>
-        </div>
       </div>
     </footer>
   </div>
 </template>
 
 <style lang="scss" scoped>
+  @import '~@/assets/scss/colors.scss';
 .footer-row {
   margin: 0;
   flex: 0 1 auto;
   z-index: 10;
 }
-footer {
-  color: #c3c0c7;
-  padding-bottom: 3em;
-  a {
-    color: #2995cd;
-  }
-}
-h3 {
-  color: #878190;
+
+button {
+  border: none;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 1.71;
+  font-weight: 700;
+  font-size: .875rem;
+  margin-bottom: 1rem;
+  padding: .5rem 1rem;
+  box-shadow: 0 1px 3px 0 rgb(26 24 29 / 12%), 0 1px 2px 0 rgb(26 24 29 / 24%);
 }
+
 ul {
-  padding-left: 0;
-  list-style-type: none;
+  list-style: none;
+  margin: 0;
+  padding: 0;
 }
+
 li {
-  margin-bottom: 0.5em;
+  margin: 0 0 .5rem 0;
+  padding: 0;
 }
-.social {
-  h3 {
-    text-align: right;
-  }
-}
-.icons {
+
+.product { grid-area: product; }
+.company { grid-area: company; }
+.community { grid-area: community; }
+.support { grid-area: support; }
+.developers { grid-area: developers; }
+
+// row 2
+.donate {
+  align-items: flex-end;
+  display: flex;
+  justify-content: start;
+  grid-area: donate;
+  padding-top: 12px;
+}
+.donate-text {
+  grid-area: donate-text;
+  font-size: 0.75rem;
+  font-color: $gray-100;
+  line-height: 1.33;
   display: flex;
-  justify-content: flex-end;
   flex-shrink: 1;
 }
-// smaller than desktop
-@media only screen and (max-width: 992px) {
-  .social-circle {
-    height: 32px !important;
-    width: 32px !important;
-    margin-left: 0.75em !important;
-  }
-}
-//mobile view
-@media screen and (max-width: 770px) {
-  .footer-main {
-    display: flex;
-    flex-direction: column;
-  }
-  .logo-container {
-    order: 1;
-  }
-}
-.social-circle {
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-  background-color: #c3c0c7;
+.donate-button {
+  grid-area: donate-button;
+  padding-top: 44px;
+ }
+.social {
+  align-items: flex-start;
   display: flex;
-  margin-left: 1em;
+  justify-content: start;
+  grid-area: social;
+  padding-top: 12px;
+}
+
+// row 3
+.hr {
+  color: $gray-400;
+  grid-area: hr;
+}
+
+// row 4
+.copyright {
+  grid-area: copyright;
+  line-height: 1.71;
+}
+.melior { grid-area: melior; }
+.privacy-terms {
+  grid-area: privacy-terms;
+  display: flex;
+  justify-content: end;
+  line-height: 1.71;
+}
+.terms {
+  padding-left: 16px;
+  }
+  .mobile {
+    display: none;
+  }
+
+// row 5
+.debug-toggle { grid-area: debug-toggle;}
+.debog-pop {
+  grid-area: debug-pop;
+   }
+
+footer {
+  background-color: $gray-500;
+  color: $gray-50;
+  padding: 32px 142px 40px;
+  a {
+    color: $gray-50;
+  }
+  a:hover {
+    color: $purple-300;
+    text-decoration: underline;
+  }
+  a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct
+    color: $purple-300;
+    text-decoration: underline;
+  }
+
+  column-gap: 1.5rem;
+  display: grid;
+  grid-template-areas:
+    "product company community support developers"
+    "donate donate donate donate-button social"
+    "donate-text donate-text donate-text donate-button social"
+    "hr hr hr hr hr"
+    "copyright copyright melior privacy-terms privacy-terms"
+    "debug-toggle debug-toggle debug-toggle blank blank";
+  grid-template-columns: repeat(5, 1fr);
+  grid-template-rows: auto;
+
+}
+
+h3 {
+  font-weight: bold;
+}
+
+.icons {
+  display: flex;
+  height: 24px;
+  padding-top: 4px;
+}
+
+.social-circle {
+  width: 24px;
+  height: 24px;
+  border-radius: 4px;
+  background-color: $gray-50;
+  display: flex;
+  margin: 0 8px 0 8px;
   &:first-child {
     margin-left: 0;
   }
-  &:hover {
-    background-color: #a5a1ac;
-  }
-  .social-icon {
-    color: #e1e0e3;
-    width: 16px;
-    margin: auto;
+  &:last-child {
+    margin-right: 0;
   }
 }
+
 .logo {
   width: 24px;
   height: 24px;
-  margin: 0 auto;
-  color: #e1e0e3;
+  margin: 0px auto 5px;
+  color: $gray-200;
 }
+
+.terms {
+  padding-left: 16px;
+  display:flex;
+  justify-content: end;
+}
+
+.desktop {
+  display: none;
+}
+
+.debug {
+  margin-top: 16px;
+  display: flex;
+  justify-content: center;
+}
+
 .debug-group {
-  position: absolute;
-  background: #fff;
-  top: -300px;
-  border-radius: 2px;
-  padding: 2em;
-}
-.btn-contribute {
-  background: #c3c0c7;
-  box-shadow: none;
   border-radius: 4px;
-  font-family: Roboto Condensed, sans-serif;
-  &:hover {
-    background: #a5a1ac;
-    .text {
-      color: white;
+  padding: 16px;
+  box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
+  font-weight: 700;
+  background-color: $gray-600;
+
+ .btn {
+  margin: 2px;
+  }
+}
+
+.btn-contribute {
+  background: $white;
+  border-radius: 2px;
+  width: 175px;
+  height: 32px;
+  color: $gray-50;
+  text-align: center;
+  vertical-align: middle;
+  padding: 0;
+  margin: 0;
+    &:hover {
+      color:$purple-300;
+      box-shadow: 0 3px 6px 0 rgba(26, 24, 29, 0.16), 0 3px 6px 0 rgba(26, 24, 29, 0.24);
+    &:active:not(:disabled) {
+      color:$purple-300;
+      border: 1px solid $purple-400;
+      box-shadow: 0 3px 6px 0 rgba(26, 24, 29, 0.16), 0 3px 6px 0 rgba(26, 24, 29, 0.24);
     }
   }
+
   a {
     display: flex;
   }
-  .heart {
-    max-height: 25px;
-    width: 18px;
-    margin-right: 0.5em;
-    margin-bottom: 0.2em;
-  }
-  .text,
-  .heart {
+
+  .text{
     display: inline-block;
     vertical-align: bottom;
   }
 }
+
+// media breakpoints
+
+// Small devices (landscape phones, 576px and under)
+@media (max-width: 767.99px) {
+
+  // row 1
+  .product {
+    grid-area: product;
+    padding-top: 12px;
+     }
+  .company {
+    grid-area: company;
+    padding-top: 12px;
+  }
+
+  //row 2
+  .community {
+    grid-area: community;
+    padding-top: 12px;
+  }
+  .support {
+    grid-area: support;
+    padding-top: 12px;
+  }
+
+  //row 3
+  .developers {
+    grid-area: developers;
+    padding-top: 12px;
+  }
+  .social {
+    grid-area: social;
+    padding-top: 12px;
+  }
+
+  // row 4
+  .donate {
+    grid-area: donate;
+  }
+  // row 5
+  .donate-text {
+    grid-area: donate-text;
+  }
+  //row 6
+  .donate-button {
+    grid-area: donate-button;
+    padding-top: 0px;
+   }
+
+  // row 7
+  .hr {
+    grid-area: hr;
+    padding-top: 8px;
+  }
+
+  // row 8
+  .copyright {
+    grid-area: copyright;
+    display: flex;
+    justify-content: center;
+  }
+  // row 9
+  .privacy-terms {
+    display: none;
+  }
+  .desktop {
+    display: none;
+  }
+  .privacy-policy {
+    grid-area: privacy-policy;
+    display: grid;
+    justify-content: center;
+    line-height: 1.71;
+    padding-top: 10px;
+  }
+  //row 10
+  .mobile-terms {
+    grid-area: mobile-terms;
+    display:grid;
+    justify-content: center;
+    padding: 8px 0px 16px 0px;
+  }
+  // row 11
+  .melior { grid-area: melior; }
+
+  // row 12
+  .debug-toggle {
+    grid-area: debug-toggle;
+    width: 100%;
+  }
+
+  footer {
+    padding: 24px 16px;
+    a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct
+      color: $purple-300;
+      text-decoration: underline;
+    }
+
+    column-gap: 1.5rem;
+    display: grid;
+    grid-template-areas:
+      "product company"
+      "community support"
+      "developers social"
+      "donate donate"
+      "donate-text donate-text"
+      "donate-button donate-button"
+      "hr hr"
+      "copyright copyright"
+      "privacy-policy privacy-policy"
+      "mobile-terms mobile-terms"
+      "melior melior"
+      "debug-toggle debug-toggle";
+    grid-template-columns: repeat(2, 2fr);
+    grid-template-rows: auto;
+    }
+  .btn-contribute {
+    width: 100%;
+  }
+  .debug {
+    width: 100%;
+  }
+  .social-circle {
+    margin: 0 6px 0 6px;
+      &:first-child {
+    margin-left: 0;
+    }
+      &:last-child {
+    margin-right: 0;
+    }
+  }
+}
+
+// Medium devices (tablets, 768px and under)
+@media (max-width: 1024px) and (min-width: 768px) {
+  footer {
+    padding: 24px 24px;
+    a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct
+      color: $purple-300;
+      text-decoration: underline;
+    }
+  }
+
+  .desktop {
+   display: none;
+  }
+ }
 </style>
 
 <style lang="scss">
-.heart svg {
-  margin-top: 0.1em;
+.instagram svg {
+  background-color: #e1e0e3;
+  fill: #878190;
+  height: 24px;
+  width: 24px;
+    &:hover {
+    fill: #6133B4;
+  }
 }
+
+.twitter svg {
+  background-color: #e1e0e3;
+  fill: #878190;
+  height: 24px;
+  width: 24px;
+    &:hover {
+    fill: #6133B4;
+  }
+}
+
 .facebook svg {
-  width: 10px;
-  margin: 0 auto;
+  background-color: #e1e0e3;
+  fill: #878190;
+  height: 24px;
+  width: 24px;
+    &:hover {
+    fill: #6133B4;
+  }
 }
-footer {
-  &.expanded {
-    padding-left: 6em;
-    padding-right: 6em;
-    padding-top: 3em;
-    background: #e1e0e3;
-    color: #878190;
-    min-height: 408px;
-    a {
-      color: #878190;
-    }
-    .logo {
-      color: #c3c0c7;
-    }
-    @media screen and (max-width: 770px) {
-      padding-left: 1em;
-      padding-right: 1em;
-    }
+
+.tumblr svg {
+  background-color: #e1e0e3;
+  fill: #878190;
+  height: 24px;
+  width: 24px;
+      &:hover {
+    fill: #6133B4;
   }
 }
 </style>
 
 <script>
+// modules
 import axios from 'axios';
 import moment from 'moment';
-import { mapState } from '@/libs/store';
+
+// images
 import gryphon from '@/assets/svg/gryphon.svg';
 import twitter from '@/assets/svg/twitter.svg';
 import facebook from '@/assets/svg/facebook.svg';
 import instagram from '@/assets/svg/instagram.svg';
+import tumblr from '@/assets/svg/tumblr.svg';
 import heart from '@/assets/svg/heart.svg';
+
+// components & modals
+import { mapState } from '@/libs/store';
 import buyGemsModal from './payments/buyGemsModal.vue';
 import reportBug from '@/mixins/reportBug.js';
 
@@ -498,6 +803,7 @@ export default {
         twitter,
         facebook,
         instagram,
+        tumblr,
         heart,
       }),
       debugMenuShown: false,
@@ -592,9 +898,6 @@ export default {
       // Reload the website then go to Help > Admin Panel to set contributor level, etc.');
       // @TODO: sync()
     },
-    openModifyInventoryModal () {
-      this.$root.$emit('bv::show::modal', 'modify-inventory');
-    },
     donate () {
       this.$root.$emit('bv::show::modal', 'buy-gems', { alreadyTracked: true });
     },
diff --git a/website/client/src/components/auth/authForm.vue b/website/client/src/components/auth/authForm.vue
index e24951f496..6354f6d160 100644
--- a/website/client/src/components/auth/authForm.vue
+++ b/website/client/src/components/auth/authForm.vue
@@ -1,21 +1,5 @@
 <template>
   <div class="form">
-    <div class="form-group row text-center">
-      <div class="col-12">
-        <div
-          class="btn btn-secondary social-button"
-          @click="socialAuth('facebook')"
-        >
-          <div
-            class="svg-icon social-icon"
-            v-html="icons.facebookIcon"
-          ></div>
-          <span>{{ registering
-            ? $t('signUpWithSocial', {social: 'Facebook'})
-            : $t('loginWithSocial', {social: 'Facebook'}) }}</span>
-        </div>
-      </div>
-    </div>
     <div class="form-group row text-center">
       <div class="col-12">
         <div
@@ -243,7 +227,6 @@ import debounce from 'lodash/debounce';
 import isEmail from 'validator/lib/isEmail';
 import { setUpAxios, buildAppleAuthUrl } from '@/libs/auth';
 import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
-import facebookSquareIcon from '@/assets/svg/facebook-square.svg';
 import googleIcon from '@/assets/svg/google.svg';
 import appleIcon from '@/assets/svg/apple_black.svg';
 
@@ -260,7 +243,6 @@ export default {
     };
 
     data.icons = Object.freeze({
-      facebookIcon: facebookSquareIcon,
       googleIcon,
       appleIcon,
     });
@@ -308,8 +290,6 @@ export default {
   },
   mounted () {
     hello.init({
-      facebook: process.env.FACEBOOK_KEY, // eslint-disable-line
-      // windows: WINDOWS_CLIENT_ID,
       google: process.env.GOOGLE_CLIENT_ID, // eslint-disable-line
     });
   },
diff --git a/website/client/src/components/auth/registerLoginReset.vue b/website/client/src/components/auth/registerLoginReset.vue
index 890581ca5f..f48bbd2811 100644
--- a/website/client/src/components/auth/registerLoginReset.vue
+++ b/website/client/src/components/auth/registerLoginReset.vue
@@ -621,7 +621,6 @@ import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
 import exclamation from '@/assets/svg/exclamation.svg';
 import gryphon from '@/assets/svg/gryphon.svg';
 import habiticaIcon from '@/assets/svg/habitica-logo.svg';
-import facebookSquareIcon from '@/assets/svg/facebook-square.svg';
 import googleIcon from '@/assets/svg/google.svg';
 import appleIcon from '@/assets/svg/apple_black.svg';
 
@@ -644,7 +643,6 @@ export default {
       exclamation,
       gryphon,
       habiticaIcon,
-      facebookIcon: facebookSquareIcon,
       googleIcon,
       appleIcon,
     });
@@ -734,8 +732,6 @@ export default {
   },
   mounted () {
     hello.init({
-      facebook: process.env.FACEBOOK_KEY, // eslint-disable-line
-      // windows: WINDOWS_CLIENT_ID,
       google: process.env.GOOGLE_CLIENT_ID, // eslint-disable-line
     });
   },
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 0eb76a8ae4..c628774d9e 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -94,7 +94,6 @@
               </div>
             </div>
             <div class="box payment-providers">
-              <h3>Choose your payment method</h3>
               <payments-buttons
                 :stripe-fn="() => pay(PAYMENTS.STRIPE)"
                 :amazon-data="pay(PAYMENTS.AMAZON)"
@@ -167,6 +166,11 @@
 
     .purple-box {
       color: #bda8ff;
+      border-top-right-radius: 0px;
+      border-bottom-right-radius: 0px;
+      border-top-left-radius: 8px;
+      border-bottom-left-radius: 8px;
+      box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
     }
 
     .number {
@@ -180,6 +184,8 @@
 
     .payment-providers {
       width: 350px;
+      border-top-right-radius: 8px;
+      border-bottom-right-radius: 8px;
     }
   }
 
@@ -304,6 +310,10 @@
   .payment-options {
     margin-bottom: 64px;
 
+    h4 {
+      color: #34313a;
+    }
+
     .purple-box {
       background-color: #4f2a93;
       color: #fff;
diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue
index 701ae8026a..02ebfe31ac 100644
--- a/website/client/src/components/payments/buyGemsModal.vue
+++ b/website/client/src/components/payments/buyGemsModal.vue
@@ -153,14 +153,6 @@
             </span>
           </div>
         </div>
-        <div class="row text-center">
-          <h4
-            v-once
-            class="col-12 text-payment mb-3"
-          >
-            {{ $t('choosePaymentMethod') }}
-          </h4>
-        </div>
         <payments-buttons
           :disabled="!selectedGemsBlock"
           :stripe-fn="() => redirectToStripe({ gemsBlock: selectedGemsBlock })"
diff --git a/website/client/src/components/settings/site.vue b/website/client/src/components/settings/site.vue
index bbb475473a..671e94da39 100644
--- a/website/client/src/components/settings/site.vue
+++ b/website/client/src/components/settings/site.vue
@@ -387,9 +387,7 @@
               {{ $t('saveAndConfirm') }}
             </button>
           </div>
-          <h5
-            v-if="user.auth.local.email"
-          >
+          <h5 v-if="user.auth.local.has_password">
             {{ $t('changeEmail') }}
           </h5>
           <div
diff --git a/website/client/src/components/static/privacy.vue b/website/client/src/components/static/privacy.vue
index 6ae0a9f1ca..8fbbfbe2ae 100644
--- a/website/client/src/components/static/privacy.vue
+++ b/website/client/src/components/static/privacy.vue
@@ -3,7 +3,7 @@
   <div class="container-fluid">
     <h1>Privacy Notice</h1>
     <p class="strong pagemeta">
-      Last Updated: December 10, 2021
+      Last Updated: September 15, 2022
     </p>
     <p>
       HabitRPG, Inc. (“HabitRPG,” “we,” “us,” or “our”) welcomes you. This privacy notice (the “Privacy
@@ -39,8 +39,9 @@
       In connection with the creation of an account on our Platforms, we collect account credentials such as
       your email, username, and password. We use this account information to create your account, including to
       verify your identity. We also use this information to manage your account, including your transactions. If
-      you choose to log into your account through Google, Apple or Facebook, we capture and store the User
-      ID and email address connected to the respective account, so we can verify your identity when you log in.
+      you choose to log into your account through Google or Apple, we capture and store the User ID and email
+      address connected to the respective account, so we can verify your identity when you log in.
+      (We no longer offer the ability to log in using Facebook's authentication procedure.)
     </p>
     <h3>User Content</h3>
     <p>
diff --git a/website/client/src/components/static/staticWrapper.vue b/website/client/src/components/static/staticWrapper.vue
index 878be4158c..73952d1f59 100644
--- a/website/client/src/components/static/staticWrapper.vue
+++ b/website/client/src/components/static/staticWrapper.vue
@@ -33,7 +33,7 @@
   @import '~@/assets/scss/colors.scss';
 
   .home-header {
-    background: #6133b4 !important;
+    background: $purple-300 !important;
     position: static;
     box-shadow: none !important;
     height: 100px !important;
@@ -46,13 +46,13 @@
 
     .nav-item a {
       font-size: 14px !important;
-      color: #d5c8ff !important;
+      color: $purple-600 !important;
       padding-top: 2.8em !important;
     }
 
     .nav-item a:hover {
       background: transparent !important;
-      color: #fff !important;
+      color: $white !important;
     }
 
     .nav-item .nav-link {
@@ -73,20 +73,20 @@
   }
 
   .white-header {
-    background: #fff !important;
-    background-color: #fff !important;
+    background: $white !important;
+    background-color: $white !important;
 
     a {
-      color: #271b3d !important;
+      color: $header-dark-background !important;
     }
 
     a:hover {
-      color: #fff !important;
+      color: $white !important;
     }
   }
 
   #purple-footer {
-    background-color: #271b3d;
+    background-color: $header-dark-background;
 
     .row {
       margin: 0;
@@ -94,19 +94,91 @@
 
     footer, footer a {
       background: transparent;
-      color: #d5c8ff;
+      color: $purple-500;
+      &:hover {
+        color: $white;
+      }
+    }
+
+    h3 {
+      color: $purple-400;
+    }
+
+    hr {
+      border-top-color: $purple-100;
+    }
+
+    .donate-text {
+      color: $purple-500;
     }
 
     .logo {
-      color: #bda8ff;
+      color: $purple-300;
     }
 
-    .social-circle, .btn-contribute {
-      background: #36205d;
-      color: #bda8ff;
+    .colophon {
+      color: $purple-500;
+    }
 
-      .svg-icon {
-        color: #bda8ff;
+    .social-circle {
+      background: $purple-50;
+      color: $purple-500;
+
+      .instagram svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .twitter svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .facebook svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .tumblr svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+    }
+    .btn-contribute {
+      background: $white;
+      box-shadow: none;
+      border-radius: 2px;
+      width: 175px;
+      height: 32px;
+      color: $gray-50;
+      text-align: center;
+      line-height: 1.71;
+      font-weight: bold;
+      font-size: 0.875rem;
+      vertical-align: middle;
+      padding: 0;
+      margin: 32px 0 32px 24px;
+      box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
+
+      a {
+        display: flex;
+      }
+
+      .text{
+        display: inline-block;
+        vertical-align: bottom;
       }
     }
   }
@@ -142,7 +214,7 @@
 
 <style lang="scss" scoped>
   #bottom-wrap.purple-4 {
-    background-color: #271b3d;
+    background-color: #271B3D;
   }
 
   #bottom-wrap {
diff --git a/website/client/vue.config.js b/website/client/vue.config.js
index 6dd491b224..fd9f24185f 100644
--- a/website/client/vue.config.js
+++ b/website/client/vue.config.js
@@ -23,7 +23,6 @@ const envVars = [
   'BASE_URL',
   'GA_ID',
   'STRIPE_PUB_KEY',
-  'FACEBOOK_KEY',
   'GOOGLE_CLIENT_ID',
   'APPLE_AUTH_CLIENT_ID',
   'AMPLITUDE_KEY',
diff --git a/website/common/locales/da/backgrounds.json b/website/common/locales/da/backgrounds.json
index 248204ea8c..23b0eea03c 100644
--- a/website/common/locales/da/backgrounds.json
+++ b/website/common/locales/da/backgrounds.json
@@ -492,5 +492,6 @@
     "backgroundParkWithStatueText": "Park med Statue",
     "backgroundDojoNotes": "Lær nye teknikker i en Dojo.",
     "backgroundDojoText": "Dojo",
-    "backgrounds052019": "SET 60: Frigivet Maj 2019"
+    "backgrounds052019": "SET 60: Frigivet Maj 2019",
+    "hideLockedBackgrounds": "Skjul låste baggrunde"
 }
diff --git a/website/common/locales/da/challenge.json b/website/common/locales/da/challenge.json
index 485c28ec48..0067022823 100644
--- a/website/common/locales/da/challenge.json
+++ b/website/common/locales/da/challenge.json
@@ -103,5 +103,6 @@
     "selectParticipant": "Vælg en deltager",
     "filters": "Filtre",
     "wonChallengeDesc": "<%= challengeName %> udvalgte dig som vinder! Din sejr er noteret i dine Præstationer.",
-    "yourReward": "Din Belønning"
+    "yourReward": "Din Belønning",
+    "removeTasks": "Fjern opgaver"
 }
diff --git a/website/common/locales/da/communityguidelines.json b/website/common/locales/da/communityguidelines.json
index 8e4bb8ce29..60d0198d4a 100644
--- a/website/common/locales/da/communityguidelines.json
+++ b/website/common/locales/da/communityguidelines.json
@@ -2,25 +2,25 @@
     "tavernCommunityGuidelinesPlaceholder": "Venlig påmindelse: Det her er en chat for alle aldre, så hold venligst en passende tone og vær opmærksom på indholdet af dine beskeder! Læs Retningslinjer for fællesskabet i sidepanelet, hvis du har spørgsmål.",
     "lastUpdated": "Sidst opdateret:",
     "commGuideHeadingWelcome": "Velkommen til Habitica!",
-    "commGuidePara001": "Vær hilset, eventyrer! Velkommen til Habitica, et land af produktivitet, sund levemåde, og til tider en enkelt hærgende grif. Vi er et muntert fællesskab fuld af hjælpsomme folk der støtter op om hinanden på deres vej til at forbedre sig selv. For at passe ind har du kun brug for en positiv attitude, respektfuld opførsel, og forståelse for at alle har forskellige evner of begrænsninger -- inklusiv dig! Habiticanere er tålmodige med hinanden og forsøger at hjælpe hvor de kan.",
-    "commGuidePara002": "For at sikre at alle er trygge, glade, og produktive i vores fællesskab, har vi nogle retningslinjer. Vi har omhyggeligt konstrueret dem så de er så venlige og letlæselige som muligt. Brug venligt et øjeblik på at læse dem inden du begynder at chatte.",
-    "commGuidePara003": "Disse regler gælder alle de sociale områder vi bruger, inklusiv (men ikke nødvendigvis begrænset til) Trello, GitHub, Weblate og Wikia (wiki'en). Sommetider vil der opstå uforudsete situationer, eksempelvis en ny kilde til konflikt eller en ondskabsfuld åndemaner. Når det sker, kan moderatorer reagere ved at ændre disse retningslinjer for at beskytte fællesskabet mod ny trusler. Frygt ikke: Du vil blive gjort opmærksom på ændringer i retningslinjerne via en påmindelse fra Bailey.",
+    "commGuidePara001": "Vær hilset, eventyrer! Velkommen til Habitica, et land af produktivitet, sund levemåde, og til tider en enkelt hærgende grif. Vi er et muntert fællesskab fuld af hjælpsomme folk der støtter op om hinanden på deres vej til at forbedre sig selv. For at passe ind har du kun brug for en positiv attitude, respektfuld opførsel, og forståelse for at alle har forskellige evner of begrænsninger - inklusiv dig! Habiticanere er tålmodige med hinanden og forsøger at hjælpe hvor de kan.",
+    "commGuidePara002": "For at sikre at alle er trygge, glade, og produktive i vores fællesskab, har vi nogle retningslinjer. Vi har omhyggeligt konstrueret dem så de er så venlige og letlæselige som muligt. Brug venligst et øjeblik på at læse dem inden du begynder at chatte.",
+    "commGuidePara003": "Disse regler gælder alle de sociale områder vi bruger, inklusiv (men ikke nødvendigvis begrænset til) Trello, GitHub, Weblate og Habitica wiki'en på fandom.com. Efterhånden som Habitica vokser og forandres, kan det ske at vores regler bliver ændret. Når der er sket bemærkelsesværdige ændringer af retningslinjerne for fællesskabet, vil du kunne høre om det i en meddelelse fra Bailey og/eller på vores sociale medier!",
     "commGuideHeadingInteractions": "Interaktioner i Habitica",
-    "commGuidePara015": "Habitica har to slags sociale rum: offentlige og private. Offentlige rum inkluderer Værtshuset, Offentlige klaner, GitHub, Trello og Wiki'en. Private rum er Private klaner, Holdchatten og Private beskeder. Alle display names skal følge retningslinjerne for offentlige rum. Gå til Bruger > Indstillinger > Side for at ændre dit brugernavn.",
-    "commGuidePara016": "Når du navigerer rundt i de offentlige steder af Habitica, er der nogle generelle regler for at sørge for, at alle er sikre og glade. De burde være lette for eventyrere som dig!",
-    "commGuideList02A": "<strong>Respekter hinanden</strong>. Vær høflig, venlig og hjælpsom. Husk: Habiticanere kommer fra alle baggrunde og har haft vildt skiftende oplevelser og erfaringer. Det er en del af det, der gør Habitica så cool! At bygge et fællesskab betyder at vi respekterer og fejrer vores forskelle såvel som vores ligheder. Her er nogle nemme måder at vise respekt for hinanden på:",
-    "commGuideList02B": "<strong>Adlyd alt i <a href='/static/terms' target='_blank'>Vilkår og betingelser</a></strong>.",
-    "commGuideList02C": "<strong>Læg ikke billeder eller tekst op, der er voldeligt, truende eller seksuelt eksplicit/antydende, eller som promoverer diskrimination, fordomme, racisme, sexisme, had, chikane eller skade mod et individ eller en gruppe</strong>. Ikke engang som en joke. Dette inkluderer skældsord såvel som udtalelser. Ikke alle har den samme form for humor, så noget du anser som en joke er muligvis sårende for en anden. Angrib jeres Daglige opgaver, ikke hinanden.",
-    "commGuideList02D": "<strong>Hold diskussioner passende for alle aldre</strong>. Vi har mange unge Habiticanere der bruger hjemmesiden! Lad os ikke genere nogen uskyldige eller forhindre nogen Habiticanere i at opnår deres mål.",
-    "commGuideList02E": "<strong>Undgå bandeord. Dette inkluderer mildere, religiøst baserede bandeord der kan være acceptable andre steder</strong>. Vi har folk fra alle religiøse og kulturelle baggrunde, og vi vil gerne sørge for at de alle føler sig trygge i offentlige rum. <strong>Hvis en moderator eller medarbejder fortæller dig at et udtryk ikke er tilladt i Habitica, selvom det er et udtryk, du ikke vidste var problematisk, er den beslutning endegyldig</strong>. Der vil blive slået særlig hårdt ned på skældsord, da de også går imod vores Vilkår og betingelser.",
-    "commGuideList02F": "<strong>Undgå lange diskussioner af opsplittende emner i Værtshuset og hvor det ellers ikke ville være et passende emne</strong>. Hvis du føler nogen har sagt noget uhøfligt eller sårende, så svar dem ikke. Hvis nogen nævner noget der er tilladt ifølge retningslinjerne, men sårende for dig, er det okay høfligt at sige det til dem. Hvis det er imod retningslinjerne eller Vilkår og betingelser, så rapporter det og lad en moderator håndtere det. Hvis du er i tvivl, så rapporter beskeden.",
-    "commGuideList02G": "<strong>Overhold omgående enhver anmodning fra en Moderator.</strong>. Dette kan inkludere, men er ikke begrænset til, at bede dig begrænse antallet af dine beskeder i et bestemt rum, at fjerne upassende indhold fra din profil, at bede dig om at tage din diskussion et mere passende sted osv.",
-    "commGuideList02J": "<strong>Spam ikke</strong>. Spam inkluderer, men er ikke begrænset til: at skrive den samme kommentar eller spørgsmål flere steder, at lægge links op uden forklaring eller kontekst, at skrive meningsløse beskeder, at skrive adskillige promoverende beskeder om en Klan, Hold eller Udfordring, eller at skrive mange beskeder på én gang. At tigge om ædelsten eller et abonnement i ethvert chatrum eller via Privatbesked betragtes også som spam.<br/><br/>Det er op til moderatorerne at beslutte om noget er spam eller kan føre til spam, selv hvis du ikke mener du har spammet. For eksempel er det i orden at reklamere for en Klan en enkelt eller to gange, men adskillige beskeder samme da ville sikkert blive betragtet som spam, uanset hvor nyttig Klanen er!",
+    "commGuidePara015": "Habitica har to slags sociale rum: offentlige og private. Offentlige rum inkluderer Værtshuset, offentlige klaner, GitHub, Trello og wiki'en. Private rum tæller private klaner, Holdchatten og private beskeder. Alle displaynavne og @brugernavne skal følge retningslinjerne for offentlige rum. Gå til Menu > Indstillinger > Profil for at ændre dit displaynavn eller @brugernavn i app'en. På Habiticas hjemmeside skal du gå til Bruger > Indstillinger.",
+    "commGuidePara016": "Når du navigerer rundt i de offentlige rum af Habitica, er der nogle generelle regler for at sørge for, at alle er sikre og glade.",
+    "commGuideList02A": "<strong>Respekter hinanden</strong>. Vær høflig, venlig og hjælpsom. Husk: Habiticanere kommer fra alle baggrunde og har haft vildt skiftende oplevelser og erfaringer. Det er en del af det, der gør Habitica så cool! At bygge et fællesskab betyder at vi respekterer og fejrer vores forskelle såvel som vores ligheder.",
+    "commGuideList02B": "<strong>Adlyd alt i <a href='/static/terms' target='_blank'>Vilkår og betingelser</a></strong> i både offentlige og private rum.",
+    "commGuideList02C": "<strong>Læg ikke billeder eller tekst op, der er voldeligt, truende eller seksuelt eksplicit/antydende, eller som promoverer diskrimination, fordomme, racisme, sexisme, had, chikane eller skade mod et individ eller en gruppe</strong>. Ikke engang som en joke. Dette inkluderer skældsord såvel som udtalelser. Ikke alle har den samme form for humor, så noget du anser som en joke er muligvis sårende for en anden.",
+    "commGuideList02D": "<strong>Hold diskussioner passende for alle aldre</strong>. Dette betyder at 18+ emner ikke bør diskuteres i offentlige rum. Vi har mange unge Habiticanere der bruger hjemmesiden, og vores brugere kommer fra mange steder i verden. Vi vil gerne have, at Habitica er så rart og inkluderende et sted som muligt.",
+    "commGuideList02E": "<strong>Undgå bandeord. Dette inkluderer mildere, religiøst baserede bandeord der kan være acceptable andre steder, og forkortede eller forklædte bandeord.</strong> Vi har folk fra alle religiøse og kulturelle baggrunde, og vi vil gerne sørge for at de alle føler sig trygge i offentlige rum. <strong>Hvis en moderator eller medarbejder fortæller dig at et udtryk ikke er tilladt i Habitica, selvom det er et udtryk, du ikke vidste var problematisk, er den beslutning endegyldig.</strong> Der vil blive slået særlig hårdt ned på skældsord, da de også går imod vores Vilkår og betingelser.",
+    "commGuideList02F": "Undgå lange diskussioner af opsplittende emner i Værtshuset og hvor det ellers ikke ville være et passende emne. Hvis nogen siger noget der er tilladt under vores retningslinjer, men som er sårende for dig, er det okay høfligt at sige det til dem. Hvis nogen siger til dig, at du har gjort dem ubehageligt til mode, så tag et øjeblik til at tænke over dine ord frem for at svare i vrede. Hvis du føler, at en samtale er ved at blive overophedet, følelsesladet eller sårende, <strong>så hold op med at svare. Rapportér i stedet de relevante beskeder for at sende besked til os.</strong> Moderatorerne vil se på det, så hurtigt de kan. Du kan også sende en email til <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> og er velkommen til at sende screenshots, hvis det ville hjælpe os med at forstå sagen.",
+    "commGuideList02G": "<strong>Overhold omgående enhver anmodning fra en Moderator.</strong> Dette kan inkludere, men er ikke begrænset til, at bede dig begrænse antallet af dine beskeder i et bestemt rum, at fjerne upassende indhold fra din profil, at bede dig om at tage din diskussion et mere passende sted osv. Begynd ikke at diskutere med moderatorerne. Hvis du har kommentarer til Habiticas moderering, så send en email til <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> for at komme i kontakt med vores community manager.",
+    "commGuideList02J": "<strong>Spam ikke</strong>. Spam inkluderer, men er ikke begrænset til: at skrive den samme kommentar eller spørgsmål flere steder, <strong>at lægge links op uden forklaring eller kontekst</strong>, at skrive meningsløse beskeder, at skrive adskillige promoverende beskeder om en Klan, Hold eller Udfordring, eller at skrive mange beskeder på én gang. Hvis det at andre brugere følger et link vil give nogen form for afkast eller fordel til dig, skal det stå i beskeden, ellers vil det også blive regnet for spam. Det er op til moderatorerne at beslutte om noget er spam.",
     "commGuideList02K": "<strong>Undgå at skrive store overskrifter i offentlige chatrum, især Værtshuset</strong>. Ligesom ALL CAPS læses det som om du råber, og forstyrrer den behagelige stemning.",
-    "commGuideList02L": "<strong>Vi fraråder kraftigt deling af personlig information -- især information der kan bruges til at identificere dig - i offentlige chatrum</strong>. Identificerende personlig information inkluderer, men er ikke begrænset til: din adresse, emailadresse og din API token/password. Det er for din sikkerheds skyld! Medarbejdere eller moderatorer kan fjerne sådanne beskeder efter forgodtbefindende. Hvis du bliver bedt om personlig information i en privat Klan, Hold eller Besked, anbefaler vi kraftigt at du høfligt afviser og gør medarbejderne og moderatorerne opmærksomme ved enten 1) at rapportere beskeden hvis det er i chatten tilhørende et Hold eller privat Klan, eller 2) at udfylde <a href='https://contact.habitica.com/' target='_blank'>Moderatorkontaktformularen</a> og vedlægger screenshots.",
+    "commGuideList02L": "<strong>Vi fraråder kraftigt deling af personlig information -- især information der kan bruges til at identificere dig - i offentlige chatrum</strong>. Identificerende personlig information inkluderer, men er ikke begrænset til: din adresse, emailadresse og din API token/password. Det er for din sikkerheds skyld! Medarbejdere eller moderatorer kan fjerne sådanne beskeder efter forgodtbefindende. Hvis du bliver bedt om personlig information i en privat Klan, Hold eller Besked, anbefaler vi kraftigt at du høfligt afviser og gør medarbejderne og moderatorerne opmærksomme ved enten 1) at rapportere beskeden, eller 2) at sende en email til <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> og vedhæfte screenshots.",
     "commGuidePara019": "<strong>I private rum</strong> har brugere mere frihed til at diskutere hvilke emner de har lyst til, men de må stadig ikke gå imod Vilkår og betingelser, inklusiv at skrive nedværdigende skældsord eller noget diskriminerende, voldeligt eller truende indhold. Bemærk, at fordi navne på Udfordringer kan ses i vinderens offentlige profil skal ALLE navne på Udfrodringer adlyde retningslinjerne for offentlige rum, selv hvis de foregår i et privat rum.",
-    "commGuidePara020": "<strong>Privatbeskeder</strong> har nogle ekstra retningslinjer. Hvis nogen har blokeret dig må du ikke kontakte dem på andre måder for at bede dem om at fjerne blokeringen. Derudover må du ikke sende privatbeskeder til andre for at bede om hjælp (fordi offentlige svar til spørgsmål om hjælp også kan hjælpe resten af fællesskabet). Sidst men ikke mindst må du ikke sende privatbeskeder til nogen for at tigge om ædelsten eller et abonnement, da dette kan anses som spamming.",
-    "commGuidePara020A": "<strong>Hvis du ser et indlæg eller en privatbesked, du mener går imod retningslinjerne for offenlige rum, beskrevet ovenfor, eller hvis du ser indlæg eller privatbeskeder, der bekymrer dig eller gør dig utryg, kan du gøre Moderatorer og Medarbejdere opmærksomme på den ved at klikke på flag-ikonet for at rapportere det</strong>. En Medarbejder eller Moderator vil tage sig af situationen, så snart de kan. Bemærk venligst, at det at rapportere uskyldige indlæg går imod disse Retningslinjer (se \"Overtrædelser\" nedenunder). Du kan også kontakte Moderatorerne via formularen “<a href='https://contact.habitica.com/' target='_blank'>Kontakt Moderatorerne</a>.” Det kan være det bedste at gøre dette hvis der er flere problematiske indlæg af den samme person i forskellige Klaner, eller hvis situationen kræver en forklaring. Du kan kontakte os på dit eget sprog hvis det er lettere for dig. Vi bliver muligvis nødt til at bruge Google Translate, men vi vil gerne have at du føler dig tryg ved at tage kontakt til os, hvis du har et problem.",
+    "commGuidePara020": "<strong>Privatbeskeder</strong> har nogle ekstra retningslinjer. Hvis nogen har blokeret dig må du ikke kontakte dem på andre måder for at bede dem om at fjerne blokeringen. Derudover må du ikke sende privatbeskeder til andre for at bede om hjælp (fordi offentlige svar til spørgsmål om hjælp også kan hjælpe resten af fællesskabet). Sidst men ikke mindst må du ikke sende privatbeskeder til nogen for at tigge om nogen form for service, der koster rigtige penge.",
+    "commGuidePara020A": "<strong>Hvis du ser et indlæg eller en privatbesked, du mener går imod retningslinjerne for offentlige rum, beskrevet ovenfor, eller hvis du ser indlæg eller privatbeskeder, der bekymrer dig eller gør dig utryg, kan du gøre Moderatorer og Medarbejdere opmærksomme på den ved at klikke på flag-ikonet for at rapportere det</strong>. En Medarbejder eller Moderator vil tage sig af situationen, så snart de kan. Bemærk venligst, at det at rapportere uskyldige indlæg går imod disse retningslinjer (se \"Overtrædelser\" nedenunder). Du kan også kontakte Moderatorerne ved at emaile <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>. Det kan være det bedste at gøre dette, hvis der er flere problematiske indlæg af den samme person i forskellige Klaner, eller hvis situationen kræver en forklaring. Du kan kontakte os på dit eget sprog hvis det er lettere for dig. Vi bliver muligvis nødt til at bruge Google Translate, men vi vil gerne have at du føler dig tryg ved at tage kontakt til os, hvis du har et problem.",
     "commGuidePara021": "Herudover har nogen offentlige steder i Habitica ekstra retningslinjer.",
     "commGuideHeadingTavern": "Værtshuset",
     "commGuidePara022": "Værtshuset er det primære sted Habiticanere hænger ud. Kroværten Daniel holder stedet funklende rent, og Lemoness vil med glæde fremtrylle dig et glas lemonade mens du sidder og snakker. Bare husk…",
@@ -31,8 +31,8 @@
     "commGuidePara029": "<strong>Offentlige Klaner er meget ligesom Værtshuset, bortset fra at de i stedet for at være til generelle samtaler har et bestemt tema</strong>. Chat i offentlige Klaner bør have fokus på dette tema. For eksempel ville medlemmer af Klanen Wordsmiths måske blive fornærmede, hvis samtalen pludselig handler om havearbejde, og Klanen for Dragefans har nok ikke meget interesse i at tyde oldtidens runer. Nogle Klaner er meget afslappede om dette end andre, men forsøg generelt <strong>at holde dig til emnet</strong>!",
     "commGuidePara031": "I nogle offentlige Klaner omtales der følsomme emner som depression, religion, politik osv. Dette er helt i orden, så længe samtalerne i Klanen ikke bryder nogle Vilkår og betingelser eller Regler for offentlige rum, og så længe de holder sig til Klanens emne.",
     "commGuidePara033": "<strong>Offentlige Klaner må IKKE indeholde indhold for aldersgruppen 18+. Hvis de planlægger jævnligt at diskutere følsomt indhold, skal dette stå i Klanens beskrivelse</strong>. Dette er for at holde Habitica sikkert of trygt for alle.",
-    "commGuidePara035": "<strong>Hvis en Klan omhandler flere forskellige følsomme emner, er det hensynsfuldt over for dine med-Habiticanere at skrive din kommentar efter en advarsel (fx \"Advarsel: Omtaler selvskade\")</strong>. Disse kan karakteriseres som trigger warnings og/eller noter om indholdet, og Klaner kan have deres egne regler om disse udover dem, der er givet her. Hvis det er muligt, så brug venligst <a href='http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a> for at gemme det potentielt følsomme indhold under flere linjeskift, så de, der ikke ønsker at læse det, kan scrolle forbi uden at se indholdet. Habiticas medarbejdere og moderatorer kan stadig fjerne dette indhold efter eget skøn.",
-    "commGuidePara036": "Desuden bør følsomt indhold stadig være aktuelt for Klanens emne - at tale om selvskade i en Klan hvor fokus er på at kæmpe mod depression giver mening, men er mindre passende i en Klan for musik. Hvis du ser nogen, som gentagne gange går imod denne retningslinje, især efter at være blevet bedt om at stoppe flere gange, så rapportér venligst deres indlæg og gør moderatorerne opmærksom på dette via <a href='https://contact.habitica.com/' target='_blank'>Moderatorkontaktformularen</a>.",
+    "commGuidePara035": "<strong>Hvis en Klan omhandler flere forskellige følsomme emner, er det hensynsfuldt over for dine med-Habiticanere at skrive din kommentar efter en advarsel (fx \"Advarsel: Omtaler selvskade\")</strong>. Disse kan karakteriseres som trigger warnings og/eller noter om indholdet, og Klaner kan have deres egne regler om disse udover dem, der er givet her. Hvis det er muligt, så brug venligst <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a> for at gemme det potentielt følsomme indhold under flere linjeskift, så de, der ikke ønsker at læse det, kan scrolle forbi uden at se indholdet. Habiticas medarbejdere og moderatorer kan stadig fjerne dette indhold efter eget skøn.",
+    "commGuidePara036": "Desuden bør følsomt indhold stadig være aktuelt for Klanens emne - at tale om selvskade i en Klan hvor fokus er på at kæmpe mod depression giver mening, men er mindre passende i en Klan for musik. Hvis du ser nogen, som gentagne gange går imod denne retningslinje, især efter at være blevet bedt om at stoppe flere gange, så rapportér deres beskeder.",
     "commGuidePara037": "<strong>Ingen Klaner, hverken Offentlige eller Private, bør oprettes med det formål at angribe en gruppe eller et individ</strong>. At oprette en sådan Klan er grundlæg for øjeblikkelig bortvisning fra Habitica. Nedkæmp dårlige vaner, ikke dine med-eventyrere!",
     "commGuidePara038": "<strong>Alle Udfordringer i Værtshuset og Offentlige Klaner skal også følge disse regler</strong>.",
     "commGuideHeadingInfractionsEtc": "Overtrædelser, Konsekvenser og Genskabelse",
@@ -44,24 +44,24 @@
     "commGuidePara053": "De følgende er eksempler på større overtrædelser. Listen er ikke fyldestgørende.",
     "commGuideList05A": "Brud på Betingelser og Vilkår",
     "commGuideList05B": "Hadtale/billeder, Chikane/stalking, Cyber-mobning, Flaming og Trolling",
-    "commGuideList05C": "Brud på Prøvetid",
-    "commGuideList05D": "At udgive sig for at være Ansat eller Moderator",
-    "commGuideList05E": "Gentagne Moderate Overtrædelser",
+    "commGuideList05C": "Brud på prøvetid",
+    "commGuideList05D": "At udgive sig for at være Ansat eller Moderator - dette inkluderer at påstå, at brugerskabte platforme, der ikke at associerede med Habitica, er officielle og/eller modereret af Habitica eller deres mods/medarbejdere",
+    "commGuideList05E": "Gentagne moderate overtrædelser",
     "commGuideList05F": "Oprettelse af en ekstra konto for at undgå konsekvenser (for eksempel at oprette en ny konto til at chatte med, efter at have fået frataget ens chat-privilegier)",
     "commGuideList05G": "Bevidst bedrag af Ansatte eller Moderatorer med det formål at undgå konsekvenser eller bringe en anden bruger i vanskeligheder",
-    "commGuideHeadingModerateInfractions": "Moderate Overtrædelser",
+    "commGuideHeadingModerateInfractions": "Moderate overtrædelser",
     "commGuidePara054": "Moderate overtrædelser gør ikke fællesskabet usikkert, men de gør det ubehageligt. Disse overtrædelser har moderate konsekvenser. Når de står sammen med andre overtrædelser, kan konsekvenserne blive større.",
-    "commGuidePara055": "De følgende er eksempler på Moderate Overtrædelser. Listen er ikke endelig.",
+    "commGuidePara055": "De følgende er eksempler på moderate overtrædelser. Listen er ikke fyldestgørende.",
     "commGuideList06A": "At ignorere, opføre respektløst overfor, eller skændes med en Moderator. Dette inkluderer offentlige at klage over moderatorer eller andre brugere, offentligt at forherlige eller forsvare bortviste brugere, eller at debatterer hvorvidt en moderators handlinger var passende. Hvis du er bekymret om en af reglerne eller en Moderators opførsel, så kontakt venligst de ansatte via email (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
     "commGuideList06B": "Backseat Modding. For at tydeliggøre en relevant pointe: En venlig påmindelse om reglerne er helt fint. Backseat modding består i at fortælle, kræve, og/eller stærkt antyde at nogen bør gøre som du siger for at rette op på en fejl. Du kan gøre nogen opmærksom på at de har begået en overtrædelse, men forlang venligst ikke at de skal gøre noget - for eksempel er det bedre at sige \"Bare så du ved det er det ikke så godt at bande i Værtshuset, så det kan være du skulle slette det\" end \"Jeg er nødt til at bede dig slette det indlæg.\"",
     "commGuideList06C": "At rapportere uskyldige indlæg med vilje.",
     "commGuideList06D": "Gentagne gange at bryde Retningslinjerne for offentlige rum",
     "commGuideList06E": "Gentagne gange at begå mindre overtrædelser",
-    "commGuideHeadingMinorInfractions": "Mindre Overtrædelser",
+    "commGuideHeadingMinorInfractions": "Mindre overtrædelser",
     "commGuidePara056": "Mindre overtrædelser har kun mindre konsekvenser, men er stadig ikke anbefalede. Hvis de sker gentagne gange kan det føre til større konsekvenser.",
-    "commGuidePara057": "De følgende er eksempler på Mindre Overtrædelser. Listen er ikke fyldestgørende.",
+    "commGuidePara057": "De følgende er eksempler på mindre overtrædelser. Listen er ikke fyldestgørende.",
     "commGuideList07A": "Førstegangsbrud på Retningslinjer for Offentlige Steder",
-    "commGuideList07B": "Alle udsagn eller handlinger, som udløser et \"Lad venligst være\". Når en Moderator er nødt til at sige \"Lad venligst være med det\" til en bruger, kan det tælle som en meget lille overtrædelse for den bruger. Et eksempel kunne være \"Lad venligst være med at blive ved med at argumentere for indførslen af den funktion, når vi har sgat til dig adskillige gange at det ikke kan lade sig gøre.\" I mange tilfælde vil 'Lad venligst være' blot være konsekvensen af overtrædelsen, men hvis Moderatorerne er nødt til at bede den samme bruger flere gange om at holde op, vil de Mindre Overtrædelser begynde at tælle som Moderate Overtrædelser.",
+    "commGuideList07B": "Alle udsagn eller handlinger, som udløser et \"lad venligst være\" fra en moderator. Når du offentligt bliver bedt om at stoppe en handling, kan dette i sig selv tælle som en mindre overtrædelse. Hvis mods er nødt til gentagne gange at irettesætte den samme person, kan det komme til at tælle som en grovere overtrædelse",
     "commGuidePara057A": "Nogle indlæg kan blive skjult fordi de indeholder følsom information eller kan give folk det forkerte indtryk. Typisk gælder dette ikke som en overtrædelser, især ikke den første gang det sker!",
     "commGuideHeadingConsequences": "Konsekvenser",
     "commGuidePara058": "I Habitica - som i virkeligheden - har alle handlinger også konsekvenser, hvad enten det er at komme i bedre form fordi du har løbet, få huller i tænderne fordi du har spist for meget sukker, eller bestå et fag fordi du har studeret.",
@@ -71,53 +71,63 @@
     "commGuideList08B": "hvad konsekvensen er",
     "commGuideList08C": "hvad der skal til for at rette fejlen og genoprette din status, hvis muligt.",
     "commGuidePara060A": "Hvis situationen påkræver det kan du også modtage en PM eller email plus et indlæg i det forum, hvor overtrædelsen blev begået. I nogle tilfælde bliver du slet ikke irettesat offentligt.",
-    "commGuidePara060B": "Hvis din konto bortvises (en alvorlig konsekvens), vil du ikke være i stand til at logge på Habitica, og vil få en fejl-besked når du prøver. <strong>Hvis du ønsker at undskylde eller argumentere for genoprettelse af din konto, så skriv venligst en email til de ansatte på <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> med dit UUID (unikke bruger-ID)</strong> (som vil blive oplyst i fejl-beskeden). Det er <strong>dit</strong> ansvar at tage kontakt, hvis du ønsker en genovervejelse af situationen, eller genoprettelse.",
-    "commGuideHeadingSevereConsequences": "Eksempler på Større Konsekvenser",
+    "commGuidePara060B": "Hvis din konto bortvises (en alvorlig konsekvens), vil du ikke være i stand til at logge på Habitica, og vil få en fejl-besked når du prøver. <strong>Hvis du ønsker at undskylde eller argumentere for genoprettelse af din konto, så skriv venligst en email til de ansatte på <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> med dit bruger-ID</strong> (som vil blive oplyst i fejlbeskeden) eller @brugernavn. Det er <strong>dit</strong> ansvar at tage kontakt, hvis du ønsker en genovervejelse af situationen, eller genoprettelse.",
+    "commGuideHeadingSevereConsequences": "Eksempler på større konsekvenser",
     "commGuideList09A": "Kontoudelukkelser (se ovenstående)",
     "commGuideList09C": "Permanent deaktivering (\"indefrysning\") af fremskridt i Bidragsyder-niveauer",
-    "commGuideHeadingModerateConsequences": "Eksempler på Moderate Konsekvenser",
+    "commGuideHeadingModerateConsequences": "Eksempler på moderate konsekvenser",
     "commGuideList10A": "Begrænsede offentlige og/eller private chatprivilegier",
-    "commGuideList10A1": "Hvis dine handlinger resulterer i fradragelse af dine rettigheder til chatten, vil en Moderator eller Ansat sende dig en privatbesked og/eller et indlæg i det forum du blev suspenderet fra for at fortælle dig grunden til og længden af din suspendering. Efter denne periode vil du få dine chatrettigheder tilbage, forudsat at du er villig til at ændre ved den opførsel du blev suspenderet for og overholde Fællesskabets Retningslinjer.",
+    "commGuideList10A1": "Hvis dine handlinger resulterer i fradragelse af dine rettigheder til chatten, vil en Moderator eller Ansat sende dig en privatbesked og/eller et indlæg i det forum du blev suspenderet fra for at fortælle dig grunden til og længden af din suspendering, og/eller hvad du skal gøre for at få dine chatprivilegier tilbage. Du vil få dem igen, hvis du høfligt følger de anvisninger du får, og erklærer dig villig til at følge vores Retningslinjer for Fællesskabet og Betingelser & Vilkår",
     "commGuideList10C": "Begrænsede Klan/Udfordringsoprettelsesprivilegier",
     "commGuideList10D": "Midlertidig deaktivering (\"indefrysning\") af fremskridt i Bidragsyder-niveauer",
     "commGuideList10E": "Degradering af Bidragsyder-niveauer",
-    "commGuideList10F": "Sætte brugere på \"Prøvetid\"",
-    "commGuideHeadingMinorConsequences": "Eksempler på Mindre Konsekvenser",
+    "commGuideList10F": "At sætte brugere på \"prøvetid\"",
+    "commGuideHeadingMinorConsequences": "Eksempler på mindre konsekvenser",
     "commGuideList11A": "Påmindelser om Retningslinjer for Offentlige Steder",
     "commGuideList11B": "Advarsler",
     "commGuideList11C": "Anmodninger",
     "commGuideList11D": "Slettelser (Moderatorer/Ansatte kan slette problematisk indhold)",
-    "commGuideList11E": "Rettelser (Moderatorer/Ansatte kan slette problematisk indhold)",
+    "commGuideList11E": "Rettelser (Moderatorer/Ansatte kan redigere problematisk indhold)",
     "commGuideHeadingRestoration": "Genoprettelse",
     "commGuidePara061": "Habitica er en land dedikeret til forbedring, og vi tror på at give en chance til <strong>Hvis du begår en overtrædelse og bliver udsat for en konsekvens som følge, så se det som en mulighed for at evaluere dine handlinger og forbedre din opførsel som medlem af fællesskabet</strong>.",
     "commGuidePara062": "Den bekendtgørelse, besked og/eller email du modtager, der forklarer konsekvenserne af dine handlinger, er en god kilde til information. Hold dig til de begrænsninger der er blevet påført, og bestræb dig på at møde de krav, der kan få eventuelle straffe ophævet.",
     "commGuidePara063": "Hvis du ikke forstår konsekvenserne eller arten af din overtrædelse, så bed Medarbejderne/Moderatorerne om hjælp, så du kan undgå at begå overtrædelser i fremtiden. Hvis du føler at en bestemt beslutning var uretfærdig, kan du kontakte de ansatte for at diskutere det på <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
     "commGuideHeadingMeet": "Mød de Ansatte og Moderatorerne!",
-    "commGuidePara006": "Habitica har nogle utrættelige omvandrende riddere, der kæmper sammen med de ansatta for at holde fællesskabet roligt, tilfreds, og frit for trolde. Hver har et specifikt domæne, men vil sommetider blive  kaldt ind for at hjælpe i andre sociale sfærer.",
+    "commGuidePara006": "Habitica har nogle utrættelige omvandrende riddere, der kæmper sammen med de ansatte for at holde fællesskabet roligt, tilfreds, og frit for trolde. Hver har et specifikt domæne, men vil sommetider blive kaldt ind for at hjælpe i andre sociale sfærer.",
     "commGuidePara007": "Ansatte har lilla tags markeret med kroner. Deres titel er \"Heltemodig\".",
-    "commGuidePara008": "Moderatorer har mørkeblå tags markeret med stjerner. Deres titel er \"Beskytter\". Den eneste undtagelse er Bailey, der som NPC har et sort og grønt tag markeret med en stjerne.",
-    "commGuidePara009": "De nuværende Ansatte er (fra venstre mod højre):",
-    "commGuideAKA": "<%= habitName %> aka <%= realName %>",
+    "commGuidePara008": "Moderatorer har mørkeblå tags markeret med stjerner. Deres titel er \"Beskytter\".",
+    "commGuidePara009": "De nuværende ansatte er (fra venstre mod højre):",
+    "commGuideAKA": "<%= habitName %>, aka <%= realName %>",
     "commGuideOnTrello": "<%= trelloName %> på Trello",
     "commGuideOnGitHub": "<%= gitHubName %> på GitHub",
     "commGuidePara010": "Der er også flere Moderatorer, der hjælper de ansatte. Disse er omhyggeligt udvalgt, så vis dem respekt og lyt til deres forslag.",
-    "commGuidePara011": "De nuværende Moderatorer er (fra venstre mod højre):",
-    "commGuidePara011b": "På GitHub/Wikia",
-    "commGuidePara011c": "på Wikia",
+    "commGuidePara011": "De nuværende moderatorer er (fra venstre mod højre):",
+    "commGuidePara011b": "på GitHub/Fandom",
+    "commGuidePara011c": "på wiki'en",
     "commGuidePara011d": "på GitHub",
     "commGuidePara012": "Hvis du har et problem eller bekymring, der drejer sig om en bestemt Moderator, så send venligst en email til vores Medarbejdere (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
     "commGuidePara013": "Brugere kommer og går i et fællesskab så stort som Habitica. Sommetider bliver en medarbejder eller moderator nødt til at fralægge sig deres ædle kappe, og slappe lidt af. De følgende er Ansatte og Moderatorer Emeritus. De løfter ikke længere et ansvar som Ansat eller Moderator, men vi vil stadig gerne mindes deres indsats!",
-    "commGuidePara014": "Ansatte og Moderatorer Emeritus:",
-    "commGuideHeadingFinal": "Den Sidste Sektion",
-    "commGuidePara067": "Det var så det, modige Habiticaner - Retningslinjerne for fællesskabet! Tør sveden af panden og giv dig selv nogle Erfaringpoint for at læse det hele. Hvis du har nogle spørgsmål om disse Retningslinjer for fællesskabet, så tag venligst fat i os via <a href='https://contact.habitica.com/' target='_blank'>Moderatorkontaktformularen</a>, og vi vil med glæde forsøge at gøre tingene klart for dig.",
-    "commGuidePara068": "Tag afsted, modige eventyrer, og bekæmp nogle Daglige!",
+    "commGuidePara014": "Ansatte og Moderatorer emeritus:",
+    "commGuideHeadingFinal": "Den sidste sektion",
+    "commGuidePara067": "Det var så det, modige Habiticaner - Retningslinjerne for fællesskabet! Tør sveden af panden og giv dig selv nogle Erfaringpoint for at læse det hele. Hvis du har nogle spørgsmål om disse Retningslinjer for fællesskabet, så tag venligst fat i os via <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, og vi vil med glæde forsøge at gøre tingene klart for dig.",
+    "commGuidePara068": "Tag afsted, modige eventyrer, og nedkæmp nogle Daglige!",
     "commGuideHeadingLinks": "Nyttige links",
     "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>: en Klan hvor brugere kan stille spørgsmål!",
-    "commGuideLink02": "<a href='http://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>Wiki'en</a>: den største samling af information om Habitica.",
-    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: til bug-rapporter eller hjælp med kodning!",
+    "commGuideLink02": "<a href='https://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>Wiki'en</a>: den største samling af information om Habitica.",
+    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: for at hjælpe med kodning!",
     "commGuideLink04": "<a href='https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link' target='_blank'>Feedbackformularen</a>: til forslag til hjemmesiden og app'en.",
     "commGuideLink05": "<a href='https://trello.com/b/mXK3Eavg/' target='_blank'>Den mobile Trello</a>: til at bede om funktioner til vores apps.",
     "commGuideLink06": "<a href='https://trello.com/b/vwuE9fbO/' target='_blank'>Kunst-Trello</a>: til at indsende pixel art.",
     "commGuideLink07": "<a href='https://trello.com/b/nnv4QIRX/' target='_blank'>Quest-Trello</a>: til at indsende tekst til quests.",
-    "commGuidePara069": "Følgende talentfulde kunstnere har bidraget med disse illustrationer:"
+    "commGuidePara069": "Følgende talentfulde kunstnere har bidraget med disse illustrationer:",
+    "commGuidePara017": "Her er den hurtige version, men vi opfordrer dig til at læse den mere detaljerede udgave nedenunder:",
+    "commGuideList01A": "Vores Betingelser & Vilkår gælder alle steder i Habitica, inklusiv private klaner, holdchatten og private beskeder.",
+    "commGuideList02M": "Bed eller tig ikke andre om at give dig ædelsten, et abonnement eller medlemskab i gruppeplaner. Dette er ikke tilladt at gøre i hverken Værtshuset, offentlige eller private rum, eller i privatbeskeder. Hvis du får en besked med en anmodning om ting, der koster rigtige penge, så rapportér dem venligst. Gentaget eller groft tiggeri, især efter en advarsel er blevet udstedt, kan resulterer i en blokering af din konto.",
+    "commGuideList01B": "Forbudt: Al kommunikation der er voldeligt, truende, opfordrer til diskrimination osv., inklusiv memes, billeder og jokes.",
+    "commGuideList01C": "Al samtale skal være passende for enhver aldersgruppe og ikke indeholde skælds- ellers bandeord.",
+    "commGuideList01D": "Følg venligst moderatorernes anvisninger.",
+    "commGuideList01E": "Start og deltag ikke i diskussioner i Værtshuset, der kan føre til skænderier.",
+    "commGuideList01F": "Bed ikke andre om at give dig ting der koster rigtige penge, spam ikke, og skriv ikke beskeder i all caps eller stor overskriftstekst.",
+    "commGuideList05H": "Grove eller gentagne forsøg på at bedrage eller presse andre spillere til at give dig genstande/services, der koster rigtige penge",
+    "commGuideList09D": "Fjernelse af Bidragsyder-niveauer"
 }
diff --git a/website/common/locales/da/content.json b/website/common/locales/da/content.json
index 411aeda35b..24dc9bd63e 100644
--- a/website/common/locales/da/content.json
+++ b/website/common/locales/da/content.json
@@ -200,7 +200,7 @@
     "hatchingPotionEmber": "Glødende",
     "hatchingPotionThunderstorm": "Tordenvejr",
     "hatchingPotionGhost": "Spøgelse",
-    "hatchingPotionRoyalPurple": "Royal lilla",
+    "hatchingPotionRoyalPurple": "Purpur",
     "hatchingPotionHolly": "Kristtorn",
     "hatchingPotionCupid": "Amor",
     "hatchingPotionShimmer": "Glimmer",
diff --git a/website/common/locales/da/contrib.json b/website/common/locales/da/contrib.json
index 61d0a1d553..e858d56429 100644
--- a/website/common/locales/da/contrib.json
+++ b/website/common/locales/da/contrib.json
@@ -49,9 +49,10 @@
     "balance": "Balance",
     "playerTiers": "Spillertrin",
     "tier": "Trin",
-    "conRewardsURL": "http://habitica.fandom.com/wiki/Contributor_Rewards",
+    "conRewardsURL": "https://habitica.fandom.com/wiki/Contributor_Rewards",
     "surveysSingle": "Hjalp Habitica med at vokse ved at udfylde et spørgeskema eller var en stor hjælp ved test. Tusind tak!",
     "surveysMultiple": "Hjalp Habitica med at vokse ved <%= count %> lejligheder, enten ved at udfylde et spørgeskema eller hjalp med et større test-arbejde. Tusind tak!",
     "blurbHallPatrons": "Dette er Protektorernes Sal, hvor vi ærer de ædle eventyrere, der støttede Habiticas originale Kickstarter. Vi takker dem for at hjælpe os med at vække Habitica til live!",
-    "blurbHallContributors": "Dette er Bidragsydernes Sal, hvor dem, der har bidraget med open-source materiale til Habitica, bliver æret. Om det er gennem kode, grafik, musik, tekst eller bare generel hjælpsomhed, har de modtaget <a href='http://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> ædelsten, eksklusivt udstyr</a>, og <a href='http://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>prestigefyldte titler</a>. Du kan også bidrage til Habitica! <a href='http://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Find ud af mere her. </a>"
+    "blurbHallContributors": "Dette er Bidragsydernes Sal, hvor dem, der har bidraget med open-source materiale til Habitica, bliver æret. Om det er gennem kode, grafik, musik, tekst eller bare generel hjælpsomhed, har de modtaget <a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> ædelsten, eksklusivt udstyr</a>, og <a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>prestigefyldte titler</a>. Du kan også bidrage til Habitica! <a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Find ud af mere her. </a>",
+    "noPrivAccess": "Du har ikke de påkrævede rettigheder."
 }
diff --git a/website/common/locales/da/death.json b/website/common/locales/da/death.json
index b24a8ac49b..eeadc8213f 100644
--- a/website/common/locales/da/death.json
+++ b/website/common/locales/da/death.json
@@ -3,7 +3,7 @@
     "dontDespair": "Bare rolig!",
     "deathPenaltyDetails": "Du mistede et Niveau, dit Guld og et stykke Udstyr, men du kan få det hele igen med hårdt arbejde! Held og lykke - du skal nok klare den.",
     "refillHealthTryAgain": "Genfyld Liv og Prøv Igen",
-    "dyingOftenTips": "Sker dette ofte? <a href='http://habitica.fandom.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Her er nogle fif!</a>",
+    "dyingOftenTips": "Sker dette ofte? <a href='https://habitica.fandom.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Her er nogle fif!</a>",
     "losingHealthWarning": "Pas på - du mister Liv!",
     "losingHealthWarning2": "Lad ikke dit Liv falde til nul! Hvis du gør det vil du tabe et niveau, alt dit guld og et stykke udstyr.",
     "toRegainHealth": "For at genopfylde Liv:",
@@ -14,4 +14,4 @@
     "lowHealthTips4": "Hvis en Daglig ikke er forfalden på en given dag, kan du deaktivere den ved at klikke på blyanten.",
     "goodLuck": "Held og lykke!",
     "cannotRevive": "Du kan ikke genoplive hvis du ikke er død"
-}
\ No newline at end of file
+}
diff --git a/website/common/locales/da/defaulttasks.json b/website/common/locales/da/defaulttasks.json
index d51a9c3a14..4c09693337 100644
--- a/website/common/locales/da/defaulttasks.json
+++ b/website/common/locales/da/defaulttasks.json
@@ -3,9 +3,9 @@
     "defaultHabit2Text": "Spis junk food (Klik på blyanten for at redigere)",
     "defaultHabit3Text": "Tag trapperne/elevatoren (Klik på blyanten for at redigere)",
     "defaultHabit4Text": "Tilføj en opgave til Habitica",
-    "defaultHabit4Notes": "Enten en Vane, en Daglig eller en To-Do",
+    "defaultHabit4Notes": "Enten en Vane, en Daglig eller en To Do",
     "defaultTodo1Text": "Begynd at bruge Habitica (Markér mig som færdig!)",
-    "defaultTodoNotes": "Du kan enten færdiggøre denne To-Do, ændre den, eller fjerne den.",
+    "defaultTodoNotes": "Du kan enten færdiggøre denne To Do, ændre den eller fjerne den.",
     "defaultReward1Text": "15 minutters pause",
     "defaultReward2Text": "Beløn dig selv",
     "defaultReward2Notes": "Se fjernsyn, spil et spil, spis noget guf, det er op til dig!",
diff --git a/website/common/locales/da/faq.json b/website/common/locales/da/faq.json
index 3bbf684819..7fd793e1d0 100644
--- a/website/common/locales/da/faq.json
+++ b/website/common/locales/da/faq.json
@@ -9,9 +9,9 @@
     "androidFaqAnswer1": "Gode vaner (med et +) er opgaver du kan gøre mange gange om dagen, som for eksempel at spise grøntsager. Dårlige vaner (med et -) er opgaver du bør undgå, som for eksempel at bide negle. Vaner med både + og - involverer et godt og et dårligt valg, som for eksempel at tage trappen vs. at tage elevatoren. Gode vaner belønner dig med erfaring og guld. Dårlige vaner trækker fra dit Helbred (HP).\n\n Daglige er opgaver du skal gøre hver dag, såsom at børste dine tænder eller tjekke din email. Du kan justere de dage du skal udføre en Daglig opgave ved at trykke let for at redigere den. Hvis du springer en Daglig opgave over, som du skulle have udført, tager din karakter skade i løbet af natten. Vær forsigtig ikke at tilføje for mange Daglige opgaver ad gangen!\n\n To Do's er din To Do liste. At gennemføre en To Do giver guld og erfaring. Du mister aldrig Helbred ved ikke at udføre en To Do. Du kan tilføje en dato, hvor du skal have udført din To Do ved at trykke let for at redigere den.",
     "webFaqAnswer1": "* Gode Vaner (the ones with a :heavy_plus_sign:) er opgaver du kan gøre flere gange om dagen, såsom at spise grøntsager. Dårlige Vaner (the ones with a :heavy_minus_sign:) er opgaver du bør undgå, såsom at bide negle. Vaner med både et :heavy_plus_sign: og et :heavy_minus_sign: har et godt og et skidt valg, som fx at tage trappen VS at tage elevatoren. Gode Vaner belønner dig med Erfaring og Guld. Dårlige Vaner trækker fra dit Helbred (HP).\n* Daglige er opgaver du skal gøre hver dag, såsom at børste tænder eller checke din email. Du kan justere de dage, en Daglig er forfalden på, ved at klikke på blyantsikonet for at redigere opgaven. Hvis du skipper en Daglig, der er fordalden, vil din avatar tage skade i løbet af natten. Tilføj ikke for mange Daglige af gangen!\n* To Do's er din To Doliste. At fuldføre en To Do giver dig Guld og Erfaring. Du vil aldrig miste Liv fra To Do's. Du kan give en To Do en forfaldsdato, ved at klikke på blyantsikonet for at redigere den.",
     "faqQuestion2": "Har I nogle eksempler på opgaver?",
-    "iosFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-    "androidFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-    "webFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "iosFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "androidFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "webFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
     "faqQuestion3": "Hvorfor skifter mine opgaver farve?",
     "iosFaqAnswer3": "Dine opgaver ændrer farve baseret på hvor godt du klarer dig i øjeblikket! Hver ny opgave begynder som neutral gul. Udfør Daglige opgaver eller gode Vaner oftere, og de vil begynde at ændre sig til blå. Undlad at udføre en daglig opgave, eller buk under for en dårlig vane, og opgaven vil ændre sig til rød. Jo rødere en opgave er, jo større er belønningen for at udføre den, men hvis det er en daglig opgave eller en dårlig vane, jo mere vil den skade dit helbred! Dette hjælper med at motivere dig til at udføre de opgaver, der ellers giver dig problemer.",
     "androidFaqAnswer3": "Dine opgaver ændrer farve baseret på hvor godt du klarer dig i øjeblikket! Hver ny opgave begynder som neutral gul. Udfør Daglige opgaver eller gode Vaner oftere, og de vil begynde at ændre sig til blå. Undlad at udføre en daglig opgave, eller buk under for en dårlig vane, og opgaven vil ændre sig til rød. Jo rødere en opgave er, jo større er belønningen for at udføre den, men hvis det er en daglig opgave eller en dårlig vane, jo mere vil den skade dit helbred! Dette hjælper med at motivere dig til at udføre de opgaver, der ellers giver dig problemer.",
@@ -22,12 +22,12 @@
     "webFaqAnswer4": "Der er adskillige ting, der kan få dig til at miste HP. For det første, hvis du undlod at sætte mærke ved Daglige opgaver i løbet af natten, og heller ikke satte mærke ved dem i pop-up vinduet næste morgen, vil de uudførte Daglige skade dig. For det andet vil du tage skade, hvis du klikker på en dårlig Vane. Til slut vil du, hvis du er ved at kæmpe mod en Boss med dit Hold, og et af dine Holdmedlemmer ikke udfører alle deres daglige, blive angrebet af Bossen og tage skade. Den primære måde at få Helbred tilbage er ved at stige i niveau, hvilket giver dig fuldt HP igen. Du kan også købe en Livseliksir med guld fra kolonnen 'Belønninger'. Desuden kan du, fra niveau 10 og opefter, vælge at blive en Helbreder, og du vil da lære helende Evner. Hvis du er på Hold med en Helbreder, kan de også hele dig. Lær mere ved at trykke på \"Hold\" i navigationen.",
     "faqQuestion5": "Hvordan spiller jeg Habitica med mine venner?",
     "iosFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit Hold! Hold kan gå på Quests, slås mod monstre, og bruge Evner for at støtte hinanden.\n\nHvis du vil starte dit eget Hold, så gå til Menu > [Hold](https://habitica.com/party) og tap Opret nyt Hold\". Bagefter scroller du ned og finder \"Inviter et Medlem\" for at invitere dine venner ved at indtaste deres @brugernavn. Hvis du hellere vil være med på en andens Hold, så bare giv dem dit @brugernavn, og så kan de invitere dig!\n\nDu og dine venner kan også være med i Klaner, som er offentlige chatrum der bringer folk sammen baseret på fælles interesser! Der er mange hjælpsomme og sjove fællesskaber at opdage.\n\nHvis du føler dig mere konkurrencelysten, kan du og dine venner lave eller deltage i Udfordringer for at tackle et bestemt sæt opgaver. Der er alle mulige slags offentlige Udfordringer for en bred vifte af interesser og mål. Nogle offentlige Udfordringer har endda en belønning i form af Ædelsten, hvis du bliver den endelige vinder.",
-    "androidFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit hold! Hold kan lave quests, kæmpe mod monstre, og kaste evner for at hjælpe hinanden. Gå til [websitet](https://habitica.com) for at oprette et, hvis du ikke allerede har et hold. I kan også melde jer ind i Klaner sammen (Social > Klaner). Klaner er chatrum med fokus på en bestemt interesse eller fælles mål, og kan være offentlige eller private. Du kan være med i så mange Klaner du har lyst, men kun et Hold.\n\n For mere detaljeret info, så læs wiki'en om [Hold](http://habitica.fandom.com/wiki/Party) og [Klaner](http://habitica.fandom.com/wiki/Guilds). Habitica wiki'en er endnu ikke oversat til dansk.",
-    "webFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit hold sammen med dig ved at klikke på \"Hold\" i navigationen! Hold kan lave quests, kæmpe mod monstre, og kaste evner for at hjælpe hinanden. I kan også melde jer ind i Klaner sammen (klike på \"Klaner\" i navigationen). Klaner er chatrum med fokus på en bestemt interesse eller fælles mål, og kan være offentlige eller private. Du kan være med i så mange Klaner du har lyst, men kun et Hold. For mere detaljeret info, så læs wiki'en om [Hold](http://habitica.fandom.com/wiki/Party) og [Klaner](http://habitica.fandom.com/wiki/Guilds). Habitica wiki'en er endnu ikke oversat til dansk.",
+    "androidFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit hold! Hold kan lave quests, kæmpe mod monstre, og kaste evner for at hjælpe hinanden. Gå til [websitet](https://habitica.com) for at oprette et, hvis du ikke allerede har et hold. I kan også melde jer ind i Klaner sammen (Social > Klaner). Klaner er chatrum med fokus på en bestemt interesse eller fælles mål, og kan være offentlige eller private. Du kan være med i så mange Klaner du har lyst, men kun et Hold.\n\n For mere detaljeret info, så læs wiki'en om [Hold](https://habitica.fandom.com/wiki/Party) og [Klaner](https://habitica.fandom.com/wiki/Guilds). Habitica wiki'en er endnu ikke oversat til dansk.",
+    "webFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit hold sammen med dig ved at klikke på \"Hold\" i navigationen! Hold kan lave quests, kæmpe mod monstre, og kaste evner for at hjælpe hinanden. I kan også melde jer ind i Klaner sammen (klike på \"Klaner\" i navigationen). Klaner er chatrum med fokus på en bestemt interesse eller fælles mål, og kan være offentlige eller private. Du kan være med i så mange Klaner du har lyst, men kun et Hold. For mere detaljeret info, så læs wiki'en om [Hold](https://habitica.fandom.com/wiki/Party) og [Klaner](https://habitica.fandom.com/wiki/Guilds). Habitica wiki'en er endnu ikke oversat til dansk.",
     "faqQuestion6": "Hvordan får jeg et kæledyr eller ridedyr?",
     "iosFaqAnswer6": "Hver gang du fuldfører en opgave har du en tilfældig chance for at få et Kæledyrsæg, en Udrugningseliksir, eller et stykke Kæledyrsmad. Du kan finde dem alle under Menu > Genstande.\n\nFor at udklække et Kæledyr har du brug for et Æg og en Eliksir. Tryk på Ægget for at finde ud af, hvilken art du vil udklække, og vælg \"Udklæk Æg\". Vælg derefter en Udrugningseliksir for at vælge Kæledyrets farve! Få til Menu > Kæledyr og tryk på dit nye Kæledyr for at lade det følges med din avatar.\n\nDu kan også lade Kæledyr vokse til Rudedyr ved at fodre dem under Menu > Kæledyr. Tryk på dit Kæledyr og vælg \"Fodr Kæledyr\"!. Du er nødt til at fodre et Kæledyr mange gange før det bliver til et Ridedyr, men hvis du kan regne dets livret ud, vil det vokse hurtigere. Prøv dig frem eller [se svaret her](https://habitica.fandom.com/wiki/Food#Food_Preferences). Når du har et Ridedyr, så gå til Menu > Ridedyr og tryk på det for at lade det følges med din avatar.\n\nDu kan også få Æg af Questkæledyr ved at klare bestemte Quests (for at lære mere om Quests, se [Hvordan slås jeg mod monstre og deltager i Quests](https://habitica.com/static/faq/#monsters-quests)).",
     "androidFaqAnswer6": "Ved niveau 3 aktiveres Dropsystemet. Hver gang du fuldfører en opgave, vil du have en tilfældig chance for at modtage et Æg, en Udrugningseleksir, eller et stykke Kæledyrsmad. De vil opbevares i Menu > Genstande.\n\n For at udruge et Kæledyr skal du bruge et Æg og en Udrugningseleksir. Klik på Ægget for at afklare hvilken art du vil udruge, og klik så på \"Udrug Æg\". Vælg derefter en Udrugningseleksir for at vælge dets farve! For at anvende et nyt Kæledyr skal du gå til Menu > Stald > Kæledyr, vælge en art, klikke på det Kæledyr du ønsker og vælge \"Brug\" (Din Avatar opdateres ikke med det nye valg).\n\n Du kan også opfostre dine Kæledyr til Ridedyr ved at fodre dem under Menu > Stald [ > Kæledyr ]. Tryk på et Kæledyr og vælg \"Fodr\"! Du skal fodre et Kæledyr mange gange før det bliver et Ridedyr, men hvis du kan regne ud hvilken slags mad det kan lide, vil det vokse langt hurtigere. Prøv dig frem, eller [se løsningen her](https://habitica.fandom.com/wiki/Food#Food_Preferences). For at tilføje dit Ridedyr skal du gå til Menu > Stald > Ridedyr, klikke på det Ridedyr du vil ønsker og vælge \"Brug\" (Din Avatar opdateres ikke med det nye valg).\n\n Du kan også få Æg til Questkæledyr ved at fuldføre visse Quests. (Se herunder for at få mere at vide om Quests.)",
-    "webFaqAnswer6": "Ved niveau 3 aktiveres Dropsystemet. Hver gang du fuldfører en opgave, vil du have en tilfældig chance for at modtage et Æg, en Udrugningseleksir, eller et stykke Kæledyrsmad. De vil opbevares i Menu > Genstande. For at udruge et Kæledyr skal du bruge et Æg og en Udrugningseleksir. Når du har både et Æg og en Udrugningseliksir, så gå til Inventar > Stald for at udklække dit Kæledyr ved at klikke på dets billede. Når du har udklækket et Kæledyr, kan du tage det med dig ved at klikke på det. Du kan også opfostre dine Kæledyr til Ridedyr ved at fodre dem under Inventar > Stald. Træk et stykke mad fra den grå bar nederst på skærmen over på et Kæledyr for at fodre det! Du skal fodre et Kæledyr mange gange før det bliver et Ridedyr, men hvis du kan regne ud hvilken slags mad det bedst kan lide, vil det vokse langt hurtigere. Prøv dig frem, eller [se løsningen her](http://habitica.fandom.com/wiki/Food#Food_Preferences). Når du har et Ridedyr, så klik på den for at tilføje den til din avatar. Du kan også få Æg til Questkæledyr ved at gennemføre visse Quests. (Se herunder for at få mere at vide om Quests.)",
+    "webFaqAnswer6": "Ved niveau 3 aktiveres Dropsystemet. Hver gang du fuldfører en opgave, vil du have en tilfældig chance for at modtage et Æg, en Udrugningseleksir, eller et stykke Kæledyrsmad. De vil opbevares i Menu > Genstande. For at udruge et Kæledyr skal du bruge et Æg og en Udrugningseleksir. Når du har både et Æg og en Udrugningseliksir, så gå til Inventar > Stald for at udklække dit Kæledyr ved at klikke på dets billede. Når du har udklækket et Kæledyr, kan du tage det med dig ved at klikke på det. Du kan også opfostre dine Kæledyr til Ridedyr ved at fodre dem under Inventar > Stald. Træk et stykke mad fra den grå bar nederst på skærmen over på et Kæledyr for at fodre det! Du skal fodre et Kæledyr mange gange før det bliver et Ridedyr, men hvis du kan regne ud hvilken slags mad det bedst kan lide, vil det vokse langt hurtigere. Prøv dig frem, eller [se løsningen her](https://habitica.fandom.com/wiki/Food#Food_Preferences). Når du har et Ridedyr, så klik på den for at tilføje den til din avatar. Du kan også få Æg til Questkæledyr ved at gennemføre visse Quests. (Se herunder for at få mere at vide om Quests.)",
     "faqQuestion7": "Hvordan bliver jeg en Kriger, Magiker, Slyngel eller Helbreder?",
     "iosFaqAnswer7": "Når du når niveau 10, kan du vælge at blive en Kriger, Magiker, Slyngel eller Helbreder. (Alle spillere starter som Krigere.) Hver klasse har forskellige muligheder for udstyr, forskellige Evner de kan kaste efter niveau 11, og forskellige fordele. Krigere kan let gøre skade på bosser, tåle mere skade fra deres uudførte opgaver, og hjælpe med at gøre deres gruppe mere hårdføre. Magikere kan også let gøre skade på bosser, samt stige hurtigt i niveau og genskabe mana for deres gruppe. Slyngler er dem, der tjener mest guld og finder de fleste genstande, og de kan hjælpe deres Hold med at gøre det samme. Endelig kan Helbredere hele sig selv og deres holdmedlemmer.\n\nHvis du ikke vil vælge en klasse med det samme - hvis du for eksempel stadig er i gang med at købe alt udstyret til din nuværende klasse - kan du vælge \"Fravælg\" og vælge senere ved at åbne Menuen, derefter ikonet for Indstilliger, og så \"Vælg Klasse\".",
     "androidFaqAnswer7": "Når du når niveau 10 kan du vælge at blive en Kriger, Magiker, Slyngel eller Helbreder. (Alle spillere starter som Krigere.) Hver klasse har forskellige muligheder for udstyr, forskellige Evner du kan kaste efter niveau 11, og forskellige fordele. Krigere kan let gøre skade på bosser, tåle mere skade fra deres u-udførte opgaver, og hjælpe med at gøre deres gruppe sejere. Magikere kan også let gøre skade på bosser, samt stige hurtigt i niveau og genskabe mana for deres gruppe. Slyngler er dem der tjener mest guld og finder de fleste genstande, og de kan hjælpe deres Hold med at gøre det samme. Endelig kan Helbredere hele sig selv og deres holdmedlemmer.\n\nHvis du ikke vil vælge en klasse med det samme - hvis du for eksempel stadig er i gang med at købe alt udstyret til din nuværende klasse -- an du vælge \"Fravælg\", og vælge senere ved at åbne Menuen, derefter ikonet for Indstilliger, og så \"Vælg Klasse\".",
@@ -41,18 +41,20 @@
     "androidFaqAnswer9": "Først er du nødt til at starte eller blive en del af et Hold (se ovenfor). Selvom du kan kæmpe mod monstre alene, så anbefaler vi en gruppe, fordi det vil gøre Quests meget lettere. Desuden er det meget motiverende med en ven, som hepper på dig mens du klarer dine opgaver!\n\n Som det næste skal du bruge en Questskriftrulle, som findes under Menu > Items. Der er fire måder at få en skriftrulle på:\n\n - På niveau 15 får du en Questserie, altså tre sammenhængende quests. Der bliver låst op for flere questserier ved niveau 30, 40 og 60.\n - Når du inviterer folk til dit Hold, vil du blive belønnet med skriftrullen 'Basi-list'!\n - Du kan købe questskriftruller fra questbutikken for Guld og Ædelsten.\n - Når du checker ind i Habitica et bestemt antal gange, vil du blive belønnet med Questskriftruller. Du får en skriftrulle ved check-in nr. 1, 7, 22 og 40.\n\n For at kæmpe mod bossen, eller indsamle genstande til en indsamlingsquest, så udfør bare dine opgaver som normalt, og de vil blive talt med som skade i løbet af natten. (Det kan være nødvendigt at genindlæse data ved at trække ned på skærmen, for at se Bossens HP falde.) Hvis du kæmper mod en Boss og ikke udfører alle Daglige opgaver, vil Bossen skade dit Hold samtidig med at du skader bossen.\n\n Efter niveau 11 vil Krigere og Magikere få Evner, der tillader dem at påføre Bossen ekstra skade, så disse to er gode valg at tage på niveau 10, hvis du ønsker at være en, der slår hårdt!",
     "webFaqAnswer9": "Først er du nødt til at starte eller blive en del af et Hold ved at klikke på \"Hold\" i navigationen. Selvom du kan kæmpe mod monstre alene, så anbefaler vi en gruppe, fordi det vil gøre Quests meget lettere. Desuden er det meget motiverende med en ven, som hepper på dig mens du klarer dine opgaver! Som det næste skal du bruge en Questskriftrulle, som findes under Inventar > Quests. Der er fire måder at få en skriftrulle på:\n * På niveau 15 får du en Questserie, altså tre sammenhængende quests. Der bliver låst op for flere questserier ved niveau 30, 40 og 60.\n * Når du inviterer folk til dit Hold, vil du blive belønnet med skriftrullen 'Basi-list'!\n * Du kan købe questskriftruller fra questbutikken for Guld og Ædelsten.\n * Når du checker ind i Habitica et bestemt antal gange, vil du blive belønnet med Questskriftruller. Du får en skriftrulle ved check-in nr. 1, 7, 22 og 40.\n For at kæmpe mod bossen, eller indsamle genstande til en indsamlingsquest, så udfør bare dine opgaver som normalt, og de vil blive talt med som skade i løbet af natten. (Det kan være nødvendigt at genindlæse siden for at se Bossens HP falde.) Hvis du kæmper mod en Boss og ikke udfører alle Daglige opgaver, vil Bossen skade dit Hold samtidig med at du skader bossen. Efter niveau 11 vil Krigere og Magikere få Evner, der tillader dem at påføre Bossen ekstra skade, så disse to er gode valg at tage på niveau 10, hvis du ønsker at være en, der slår hårdt!",
     "faqQuestion10": "Hvad er Ædelsten, og hvordan får jeg fat i dem?",
-    "iosFaqAnswer10": "Ædelsten købes for rigtige penge via Menu > Køb Ædelsten. Når du køber Ædelsten hjælper du os med at holde Habitica kørende. Vi er sætter stor pris på al mulig støtte!\n\n Udover at købe Ædelsten direkte er der tre andre måder spillere kan optjene Ædelsten på:\n\n * Vind en Udfordring der er blevet lavet af en anden spiller. Gå til Menu > Udfordringer for at finde nogen at deltage i.\n * Bliv abonnent og få adgang til at købe et begrænset antal Ædelsten med Guld hver måned.\n * Bidrag med dine egne færdigheder til Habitica! Se denne side for flere detaljer: [Bidrag til Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica) (engelsk).\n\nVær opmærksom på, at genstande der er købt med Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig bruge app'en uden dem!",
-    "androidFaqAnswer10": "Ædelsten købes for rigtige penge via Menu > Køb Ædelsten. Når du køber Ædelsten hjælper du os med at holde Habitica kørende. Vi er sætter stor pris på al mulig støtte!\n\n Udover at købe Ædelsten direkte er der tre andre måder spillere kan optjene Ædelsten på:\n\n * Vind en Udfordring der er blevet lavet af en anden spiller. Gå til Menu > Udfordringer for at finde nogen at deltage i.\n * Bliv abonnent og få adgang til at købe et begrænset antal Ædelsten med Guld hver måned.\n * Bidrag med dine egne færdigheder til Habitica! Se denne side for flere detaljer: [Bidrag til Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica) (engelsk).\n\nVær opmærksom på, at genstande der er købt med Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig bruge app'en uden dem!",
-    "webFaqAnswer10": "Ædelsten købes for rigtige penge, selvom [abonnenter](https://habitica.com/user/settings/subscription) can købe dem for Guld. Når folk abonnnerer eller køber Ædelsten, hjælper de os med at holde hjemmesiden kørende. Vi er meget taknemmelige for deres støtte! Udover at købe Ædelsten direkte, eller blive abonnent, er der to andre måder spillere kan optjene Ædelsten:\n* Vind en Udfordring oprette af en anden spiller. Gå til Udfordringer > Opdag udfordringer for at finde nogle at deltage i.\n * Bidrag med dine egne færdigheder til Habitica. Se denne side på wiki'en for flere detaljer: [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica). Vær opmærksom på, at genstande købt for Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig sagtens bruge hjemmesiden uden dem!",
+    "iosFaqAnswer10": "Ædelsten købes for rigtige penge via Menu > Køb Ædelsten. Når du køber Ædelsten hjælper du os med at holde Habitica kørende. Vi er sætter stor pris på al mulig støtte!\n\n Udover at købe Ædelsten direkte er der tre andre måder spillere kan optjene Ædelsten på:\n\n * Vind en Udfordring der er blevet lavet af en anden spiller. Gå til Menu > Udfordringer for at finde nogen at deltage i.\n * Bliv abonnent og få adgang til at købe et begrænset antal Ædelsten med Guld hver måned.\n * Bidrag med dine egne færdigheder til Habitica! Se denne side for flere detaljer: [Bidrag til Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica) (engelsk).\n\nVær opmærksom på, at genstande der er købt med Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig bruge app'en uden dem!",
+    "androidFaqAnswer10": "Ædelsten købes for rigtige penge via Menu > Køb Ædelsten. Når du køber Ædelsten hjælper du os med at holde Habitica kørende. Vi er sætter stor pris på al mulig støtte!\n\n Udover at købe Ædelsten direkte er der tre andre måder spillere kan optjene Ædelsten på:\n\n * Vind en Udfordring der er blevet lavet af en anden spiller. Gå til Menu > Udfordringer for at finde nogen at deltage i.\n * Bliv abonnent og få adgang til at købe et begrænset antal Ædelsten med Guld hver måned.\n * Bidrag med dine egne færdigheder til Habitica! Se denne side for flere detaljer: [Bidrag til Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica) (engelsk).\n\nVær opmærksom på, at genstande der er købt med Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig bruge app'en uden dem!",
+    "webFaqAnswer10": "Ædelsten købes for rigtige penge, selvom [abonnenter](https://habitica.com/user/settings/subscription) can købe dem for Guld. Når folk abonnnerer eller køber Ædelsten, hjælper de os med at holde hjemmesiden kørende. Vi er meget taknemmelige for deres støtte! Udover at købe Ædelsten direkte, eller blive abonnent, er der to andre måder spillere kan optjene Ædelsten:\n* Vind en Udfordring oprette af en anden spiller. Gå til Udfordringer > Opdag udfordringer for at finde nogle at deltage i.\n * Bidrag med dine egne færdigheder til Habitica. Se denne side på wiki'en for flere detaljer: [Contributing to Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica). Vær opmærksom på, at genstande købt for Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig sagtens bruge hjemmesiden uden dem!",
     "faqQuestion11": "Hvordan rapporterer jeg en fejl eller foreslår en ny funktion?",
     "iosFaqAnswer11": "Hvis du mener du har fundet en fejl,  så gå ind under Menu>Support>Get Help for at finde hurtige løsninger, kendte problemer, eller for at indrapportere fejlen til os. Vi vil gøre alt hvad vi kan for at hjælpe dig.\n\nFor at afgive feedback eller komme med forslag til en funktion, kan du finde vores feedback-formular fra Menu>Support>Submit Feedback. Hvis vi har nogle spørgsmål, vil vi kontakte dig for information.",
-    "androidFaqAnswer11": "Hvis du mener du er stødt på en fejl, så gå til Menu>Hjælp>Rapportér en fejl for at finde hurtige løsninger, kendte fejl, eller  anmelde fejlen til os. Vi vil gøre alt hvad vi kan for at hjælpe dig.\n\nFor at give feedback eller foreslå en funktion, kan du finde vores feedbackformular under Menu>Hjælp>Anmod om en funktion. Hvis vi har spørgsmål, vil vi tage kontakt til dig for at få mere information!",
-    "webFaqAnswer11": "For at rapportere en fejl, så gå til [Hjælp > Rapporter en fejl](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) og læs punkterne over chatboksen. Hvis du er ude af stand til at logge på Habitica, så send din log-in information (ikke dit password!) til [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Der er ingen grund til bekymring, vi får snart rettet op på dig! Foreslag om funktioner bliver samlet på via en Google formular. Gå til [Hjælp > Foreslå en funktion](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) og følg instruktionerne. Ta-da!",
+    "androidFaqAnswer11": "Hvis du mener du er stødt på en fejl, så gå til Menu > Hjælp & FAQ > Få hjælp en fejl for at finde hurtige løsninger, se kendte fejl, eller anmelde fejlen til os. Vi vil gøre alt hvad vi kan for at hjælpe dig.\n\nFor at give feedback eller foreslå en funktion, kan du finde vores feedbackformular under Menu > Hjælp & FAQ > Anmod om funktion. Hvis vi har spørgsmål, vil vi tage kontakt til dig for at få mere information!",
+    "webFaqAnswer11": "For at rapportere en fejl, så gå til Hjælp > Rapporter en fejl for at sende os en email (det er muligt, at du skal undersøge om din browser støtter 'mailto' links). Hvis du er ude af stand til at logge på Habitica, så send din log-in information (ikke dit password!) til [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Der er ingen grund til bekymring, vi får snart rettet op på det! Foreslag om funktioner bliver samlet på via en Google-formular. Gå til [Hjælp > Foreslå en funktion](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) og følg instruktionerne. Ta-da!",
     "faqQuestion12": "Hvordan bekæmper jeg en verdensboss?",
-    "iosFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk mod Bossen, og deres opgaver og Evner vil skade Bossen som normalt.\n\n Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold.\n\n En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig.\n\n Du kan læse mere om [tidligere Verdensbosser](http://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
-    "androidFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk mod Bossen, og deres opgaver og Evner vil skade Bossen som normalt.\n\n Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold.\n\n En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig.\n\n Du kan læse mere om [tidligere Verdensbosser](http://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
-    "webFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk Bossen, og deres opgaver og Evner vil skade Bossen som normalt. Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold. En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig. Du kan læse mere om [tidligere Verdensbosser](http://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
-    "iosFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i  [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i værtshuset under Social > Værtshus! Vi hjælper gerne.",
-    "androidFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i Værtshuschatten under Menu > Værtshus! Vi hjælper gerne.",
-    "webFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i Klanen [Habitica Help](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Vi hjælper gerne."
+    "iosFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk mod Bossen, og deres opgaver og Evner vil skade Bossen som normalt.\n\n Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold.\n\n En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig.\n\n Du kan læse mere om [tidligere Verdensbosser](https://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
+    "androidFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk mod Bossen, og deres opgaver og Evner vil skade Bossen som normalt.\n\n Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold.\n\n En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig.\n\n Du kan læse mere om [tidligere Verdensbosser](https://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
+    "webFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk Bossen, og deres opgaver og Evner vil skade Bossen som normalt. Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold. En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig. Du kan læse mere om [tidligere Verdensbosser](https://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
+    "iosFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i værtshuset under Menu > Værtshus! Vi hjælper gerne.",
+    "androidFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i Værtshuschatten under Menu > Værtshus! Vi hjælper gerne.",
+    "webFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i Klanen [Habitica Help](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Vi hjælper gerne.",
+    "faqQuestion13": "Hvad er en Gruppeplan?",
+    "webFaqAnswer13": "## Hvordan virker gruppeplaner?\n\nEn [gruppeplan](/group-plans) giver dit Hold eller Klan adgang til et delt dashboard med opgaver, der ligner dit eget! Det er en delt oplevelse på Habitica, hvor opgaver kan oprettes og markeres som færdige af alle i gruppen.\n\nDer er også andre funktioner, såsom medlemsroller, et statusoverblik og fordeling af opgaver, der giver dig en mere kontrolleret oplevelse. [Besøg vores wiki](https://habitica.fandom.com/wiki/Group_Plans) (EN) for at lære mere om Gruppeplanens funktioner!\n\n## Hvem har nytte af en gruppeplan?\n\nGruppeplaner virker bedst, når du har et mindre hold der gerne vil samarbejde. Vi anbefaler 2-5 medlemmer.\n\nGruppeplaner er geniale til familier, uanset om det er en forælder og et barn, eller dig selv og din partner. Delte mål, huslige opgaver eller ansvar er lette at holde styr på med ét dashboard.\n\nGruppeplaner kan også være nyttige for teams af kollegaer med fælles mål, eller managere der vil introducere deres ansatte til gamification.\n\n## Hurtige tips til at bruge grupper\n\nHer er nogle hurtige tips til dig, så du kan komme i gang med din nye Gruppe. Vi vil komme med flere detaljer i de følgende afsnit:\n\n* Gør et medlem til manager for at give dem evnen til at oprette og redigere opgaver\n* Lad opgaver ikke tilhøre nogen, hvis alle kan udføre den og det kun skal gøres én gang\n* Tildel en opgave til én person for at være sikker på, at ingen andre kan fuldføre den opgave\n* Tildel en opgave til flere personer, hvis de alle skal fuldføre den\n* Slå evnen til at se gruppeopgaver på dit personlige dashboard til, så du ikke går glip af noget\n* Du bliver belønnet for alle de opgaver du klarer, også hvis flere skal udføre dem\n* Belønninger for at fuldføre opgaver bliver ikke opsplittet eller delt mellem holdmedlemmer\n* Brug opgavernes farve på gruppens dashboard for at bedømme den gennemsnitlige færdiggørelsesrate\n* Gennemgå jævnligt opgaverne på gruppens dashboard for at sikre dig, at de stadig er relevante\n* Det vil ikke skade hverken dig eller din gruppe hvis du misser en Daglig, men den vil stadig skifte farve\n\n## Hvordan kan andre i gruppen oprette opgaver?\n\nKun gruppelederen og managere kan oprette opgaver. Hvis du gerne vil have at et gruppemedlem skal kunne gøre dette, skal du gøre dem til manager ved at gå til fanen Gruppeinformation, finde medlemslisten, og klikke på prik-ikonet ved deres navn.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## Hvordan virker opgaver, der ikke er tildelt nogen?\n\nOpgaver, der ikke tilhører nogen, kan fuldføres af alle i gruppen, for eksempel at gå ud med skraldet. Den der går ud med skraldet kan markere opgaven som fuldført, og den vil da være markeret som sådan for alle i gruppen.\n\n## Hvordan virker det synkroniserede starttidspunkt?\n\nDelte opgaver vil nulstille på samme tidspunkt for alle for at synkronisere gruppens dashboard. Dette tidspunkt kan ses på gruppens dashboard, og afhænger af lederens personlige starttidspunkt. Da delte opgaver nulstilles automatisk, vil du ikke få mulighed for at fuldføre gårsdagens delte Daglige, når du checker ind den følgende dag.\n\nDelte Daglige vil ikke skade dig hvis et holdmedlem ikke udfører dem, men de vil begynde at skifte til en rødere farve for at visualisere denne proces. Vi vil ikke have at den delte oplevelse bliver en dårlig en!\n\n## Hvordan bruger jeg min Gruppe på Habiticas apps?\n\nDe mobile apps understøtter endnu ikke alle de funktioner, der hører med i en gruppeplan. Dog kan du stadig udføre delte opgaver fra vores iOS og Android apps. Besøg din gruppes dashboard i browserversionen af Habitica, og slå funktionen 'kopiér opgaver' til. Nu vil alle åbne og tildelte opgaver være synlige på dit eget personlige dashboard på alle platforme.\n\n## Hvad er forskellen på en Gruppes delte opgaver, og Udfordringer?\n\nDe delte dashboards der hører til gruppeplaner er mere dynamiske end dem, der hører til udfordringer, da de konstant kan opdateres og interageres med. Udfordringer er gode, hvis du har ét sæt opgaver, der alle skal klares af flere mennesker.\n\nGruppeplaner koster også rigtige penge at benytte, mens udfordringer er gratis for alle.\n\nDu kan ikke tildele specifikke opgaver til nogen i udfordringer, og udfordringer har ikke et fælles tidspunkt, hvor opgaverne nulstilles. Generelt giver udfordringer ejeren mindre kontrol og direkte interaktion end gruppeplaner."
 }
diff --git a/website/common/locales/da/front.json b/website/common/locales/da/front.json
index f6b8ee2785..bdb8030db4 100644
--- a/website/common/locales/da/front.json
+++ b/website/common/locales/da/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "og",
     "chores": "Pligter",
     "clearBrowserData": "Ryd browserdata",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Tilføjelser og udvidelser</a>",
+    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Tilføjelser og udvidelser</a>",
     "communityFacebook": "Facebook",
     "companyAbout": "Hvordan det virker",
     "companyBlog": "Blog",
@@ -13,7 +13,7 @@
     "companyDonate": "Donér",
     "forgotPassword": "Glemt kodeord?",
     "emailNewPass": "E-mail et nulstillings-link til kodeord",
-    "forgotPasswordSteps": "Skriv den e-mail adresse du benyttede til at registrere din Habitica-konto.",
+    "forgotPasswordSteps": "Skriv dit @brugernavn eller den e-mail adresse, du benyttede til at registrere din Habitica-konto.",
     "sendLink": "Send link",
     "featuredIn": "Omtalt i",
     "footerDevs": "Udviklere",
@@ -44,7 +44,7 @@
     "marketing3Header": "Apps og Udvidelser",
     "marketing3Lead1": "**iPhone & Android** apps lader dig klare dine ting på farten. Vi ved, at det nogen gange er for meget at skulle logge ind på websiden for at klikke på knapper.",
     "marketing3Lead2Title": "Integrationer",
-    "marketing3Lead2": "Andre **tredjepartsværktøjer** kan binde Habitica sammen med andre dele af dit liv. Vores API muliggør integrationer som [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US), med hvilken du mister point ved at bruge unyttige hjemmesider, og optjener point når du browser de nyttige i stedet. [Se mere her](http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
+    "marketing3Lead2": "Andre **tredjepartsværktøjer** kan binde Habitica sammen med andre dele af dit liv. Vores API muliggør integrationer som [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US), med hvilken du mister point ved at bruge unyttige hjemmesider, og optjener point når du browser de nyttige i stedet. [Se mere her](https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
     "marketing4Header": "Organisatorisk brug",
     "marketing4Lead1": "Uddannelse er en af de bedste områder at bruge spilelementer. Vi ved alle, hvordan studerende nærmest er limet til deres telefon disse dage, så brug dette! Sæt dine elever til at kæmpe mod hinanden som hyggelig konkurrence. Beløn god opførsel med sjældne præmier. Se deres karakterer og opførsel blive forbedret.",
     "marketing4Lead1Title": "Brug af Spilelementer i Undervisning",
@@ -184,5 +184,6 @@
     "mobileApps": "Mobile apps",
     "learnMore": "Lær mere",
     "communityInstagram": "Instagram",
-    "minPasswordLength": "Kodeord skal bestå af 8 eller flere tegn."
+    "minPasswordLength": "Kodeord skal bestå af 8 eller flere tegn.",
+    "enterHabitica": "Spil Habitica"
 }
diff --git a/website/common/locales/da/gear.json b/website/common/locales/da/gear.json
index 55aa315903..b6c9a2b3c6 100644
--- a/website/common/locales/da/gear.json
+++ b/website/common/locales/da/gear.json
@@ -19,7 +19,7 @@
     "sortByStr": "STY",
     "sortByInt": "INT",
     "weapon": "våben",
-    "weaponCapitalized": "Main-Hand Item",
+    "weaponCapitalized": "Primær hånd",
     "weaponBase0Text": "Intet våben",
     "weaponBase0Notes": "Intet våben.",
     "weaponWarrior0Text": "Træningssværd",
@@ -892,7 +892,7 @@
     "headSpecialDandyHatNotes": "Sikke en herlig hat! Den vil klæde dig så nydeligt på en gåtur. Forøger Konstitution med <%= con %>.",
     "headSpecialKabutoText": "Samuraihjelm",
     "headSpecialKabutoNotes": "Denne hjelm er funktionel og smuk! Dine fjender vil være helt distraherede af den. Forøger Intelligens med <%= int %>.",
-    "headSpecialNamingDay2017Text": "Royal lilla grifhjelm",
+    "headSpecialNamingDay2017Text": "Purpurfarvet grifhjelm",
     "headSpecialNamingDay2017Notes": "Glædelig Navngivningsdag! Ifør dig denne truende og fjerklædte hjelm for at fejre Habitica. Giver ingen bonusser.",
     "headSpecialTurkeyHelmBaseText": "Kalkunhjelm",
     "headSpecialTurkeyHelmBaseNotes": "Dit Thanksgiving-look vil være fuldendt med denne næbbede hjelm! Giver ingen bonusser.",
@@ -1599,7 +1599,7 @@
     "bodySpecialSummer2015MageNotes": "Dette spænde giver ingen krafter overhovedet, men det er pænt. Giver ingen bonusser. Specielt 2015 Sommerudstyr.",
     "bodySpecialSummer2015HealerText": "Matrostørklæde",
     "bodySpecialSummer2015HealerNotes": "Hiv Ohøj? Nej nej nej! Giver ingen bonusser. Specielt 2015 Sommerudstyr.",
-    "bodySpecialNamingDay2018Text": "Royal Purple Gryphon Cloak",
+    "bodySpecialNamingDay2018Text": "Purpurfarvet grif-kappe",
     "bodySpecialNamingDay2018Notes": "Happy Naming Day! Wear this fancy and feathery cloak as you celebrate Habitica. Confers no benefit.",
     "bodyMystery201705Text": "Folded Feathered Fighter Wings",
     "bodyMystery201705Notes": "These folded wings don't just look snazzy: they will give you the speed and agility of a gryphon! Confers no benefit. May 2017 Subscriber Item.",
@@ -1873,5 +1873,6 @@
     "headSpecialNye2020Notes": "Du har modtaget en Ekstravagant Festhat! Bær den med stolthed imens du byder det nye år velkommen! Giver ingen fordele.",
     "headSpecialNye2020Text": "Ekstravagant Festhat",
     "weaponSpecialWinter2021MageNotes": "Dette mægtige våben er bestemt mere end en fase. Kanalisér din energi, fokusér på en måneds flow, og studér tid og rum. Øger Intelligens med <%= int %> og Opfattelse med <%= per %>. Begrænset 2020-2021 Vinterudstyr.",
-    "weaponSpecialWinter2021MageText": "Magisk Måne-faser"
+    "weaponSpecialWinter2021MageText": "Magisk Måne-faser",
+    "backSpecialNamingDay2020Text": "Purpurfarvet grifhale"
 }
diff --git a/website/common/locales/da/groups.json b/website/common/locales/da/groups.json
index 56ee92366f..818783f149 100644
--- a/website/common/locales/da/groups.json
+++ b/website/common/locales/da/groups.json
@@ -14,7 +14,7 @@
     "contributing": "Sådan bidrager du",
     "faq": "FAQ",
     "tutorial": "Vejledning",
-    "glossary": "<a target='_blank' href='http://habitica.fandom.com/wiki/Glossary'>Ordliste (EN)</a>",
+    "glossary": "<a target='_blank' href='https://habitica.fandom.com/wiki/Glossary'>Ordliste (EN)</a>",
     "wiki": "Wiki",
     "requestAF": "Anmod om en funktion",
     "dataTool": "Datavisningsværktøj",
@@ -324,7 +324,7 @@
     "gettingStarted": "Kom i gang",
     "congratsOnGroupPlan": "Tillykke med oprettelsen af din nye Gruppe! Her er nogle svar på flere af de mest almindelige spørgsmål.",
     "whatsIncludedGroup": "Hvad er inkluderet i abonnementet",
-    "whatsIncludedGroupDesc": "Alle medlemmer af Gruppen får alle fordele ved et abonnement, inklusiv de månedlige abonnentgenstande, evnen til at købe Ædelsten for Guld, og det Royale Lilla Jackalope-ridedyr, som er en eksklusiv belønning for medlemmer af en Gruppeplan.",
+    "whatsIncludedGroupDesc": "Alle medlemmer af Gruppen får alle fordele ved et abonnement, inklusiv de månedlige abonnentgenstande, evnen til at købe Ædelsten for Guld, og det purpur Jackalope-ridedyr, som er en eksklusiv belønning for medlemmer af en Gruppeplan.",
     "howDoesBillingWork": "Hvordan fungerer betalingen?",
     "howDoesBillingWorkDesc": "Gruppeledere faktureres baseret på antallet af gruppemedlemmer på en månedlig basis. Regningen omfatter prisen for Gruppelederens abonnement ($9 USD) plus $3 USD for hvert ekstra gruppemedlem. Fx: En gruppe af fire brugere vil koste $18 USD om måneden, da gruppen består af 1 Gruppeleder + 3 gruppemedlemmer.",
     "howToAssignTask": "Hvordan tildeler du en Opgave?",
@@ -339,5 +339,6 @@
     "recurringCompletion": "Ingen - Gruppeopgave kan ikke udføres",
     "singleCompletion": "Single - Completes when any assigned user finishes",
     "allAssignedCompletion": "All - Completes when all assigned users finish",
-    "pmReported": "Tak, fordi du rapporterede denne besked."
+    "pmReported": "Tak, fordi du rapporterede denne besked.",
+    "features": "Funktioner"
 }
diff --git a/website/common/locales/da/limited.json b/website/common/locales/da/limited.json
index 8c121779b4..954dfbf998 100644
--- a/website/common/locales/da/limited.json
+++ b/website/common/locales/da/limited.json
@@ -27,10 +27,10 @@
     "seasonalShopClosedTitle": "<%= linkStart %>Leslie<%= linkEnd %>",
     "seasonalShopTitle": "<%= linkStart %>Sæson-heksen<%= linkEnd %>",
     "seasonalShopClosedText": "Sæson-markedet er lukket lige nu!! Det er kun åbent under Habiticas fire Grandiøse Gallaer.",
-    "seasonalShopSummerText": "Glædeligt Sommerplask!! Vil du købe nogle sjældne genstande? De vil kun være tilgængelige indtil 31. juli!",
-    "seasonalShopFallText": "Glædelig Efterårsfestival!! Vil du købe nogle sjældne genstande? De vil kun være tilgængelige indtil 31. oktober!",
-    "seasonalShopWinterText": "Velkommen til Vintereventyret!! Vil du købe nogle sjældne genstande? De vil kun være tilgængelige indtil 31. januar!",
-    "seasonalShopSpringText": "Glædelig Forårsfest!! Vil du købe nogle sjældne genstande? De vil kun være tilgængelige indtil 30. april!",
+    "seasonalShopSummerText": "Glædeligt Sommerplask!! Vil du købe nogle sjældne genstande? Sørg for at købe dem før Gallaen slutter!",
+    "seasonalShopFallText": "Glædelig Efterårsfestival!! Vil du købe nogle sjældne genstande? Sørg for at købe dem før Gallaen slutter!",
+    "seasonalShopWinterText": "Velkommen til Vintereventyret!! Vil du købe nogle sjældne genstande? Sørg for at købe dem før Gallaen slutter!",
+    "seasonalShopSpringText": "Glædelig Forårsfest!! Vil du købe nogle sjældne genstande? Sørg for at købe dem før Gallaen slutter!",
     "seasonalShopFallTextBroken": "Åh.... Velkommen til Sæson-markedet... Vi har efterårs-sæson varer, eller noget... Alting her kan købes under Efterårsfestival-eventet hvert år, men vi har kun åbent indtil den 31. oktober... Du burde nok købe ind nu, ellers vil du skulle vente... og vente... og vente... <strong>*suk*</strong>",
     "seasonalShopBrokenText": "Min pavillon!!!!!!! Mine dekorationer!!!! Åh, den Dysheartener har ødelagt det hele :( Hjælp med at bekæmpe den i Værtshuset, så jeg kan genopbygge!",
     "seasonalShopRebirth": "Hvis du har købt noget af detteudstyr før, men ikke ejer det i øjeblikket, kan du genkøbe det i Belønningskolonnen. I starten vil du kun kunne købe de ting der passer til din nuværende klasse (Kriger som standard), men frygt ej, de andre klasse-specifikke varer bliver tilgængelige hvis du skifter til den klasse.",
@@ -45,7 +45,7 @@
     "snowDaySet": "Snedagskriger (Kriger)",
     "snowboardingSet": "Snowboardende Sortkunstner (Magiker)",
     "festiveFairySet": "Festlig Fe (Helbreder)",
-    "cocoaSet": "Kakao Slyngel (Slyngel)",
+    "cocoaSet": "Kakao (Slyngel)",
     "toAndFromCard": "Til: <%= toName %>, Fra: <%= fromName %>",
     "nyeCard": "Nytårskort",
     "nyeCardExplanation": "Da I har fejret nytår sammen, modtager I begge \"Gammel Kending\"-emblemet!",
@@ -56,7 +56,7 @@
     "nye0": "Godt Nytår! Må du overvinde mange dårlige Vaner.",
     "nye1": "Godt Nytår! Må du modtage mange Belønninger.",
     "nye2": "Godt Nytår! Må du udføre mange Perfekte Dage.",
-    "nye3": "Godt Nytår! Må din To-Do-liste forblive kort og overskuelig.",
+    "nye3": "Godt nytår! Må din To-Do-liste forblive kort og overskuelig.",
     "nye4": "Godt nytår! Må du undgå at blive angrebet af vrede Hippogriffer.",
     "mightyBunnySet": "Kraftfuld Kanin (Kriger)",
     "magicMouseSet": "Magisk Mus (Magiker)",
@@ -74,11 +74,11 @@
     "magicianBunnySet": "Tryllekunstners Kanin (Magiker)",
     "comfortingKittySet": "Trøstende Kat (Helbreder)",
     "sneakySqueakerSet": "Pibende Sniger (Slyngel)",
-    "sunfishWarriorSet": "Solfiskekriger (Kriger)",
+    "sunfishWarriorSet": "Solfisk (Kriger)",
     "shipSoothsayerSet": "Skibs-sandsigerske (Magiker)",
     "strappingSailorSet": "Spændstig Sømand (Helbreder)",
     "reefRenegadeSet": "Røver på Revet (Slyngel)",
-    "scarecrowWarriorSet": "Fægtende Fugleskræmsel (Kriger)",
+    "scarecrowWarriorSet": "Fugleskræmsel (Kriger)",
     "stitchWitchSet": "Skrædderheks (Magiker)",
     "potionerSet": "Eleksirmager (Helbreder)",
     "battleRogueSet": "Flager-Fusker (Slyngel)",
@@ -86,40 +86,40 @@
     "grandMalkinSet": "Mester-malkin (Magiker)",
     "cleverDogSet": "Kløgtig Hund (Slyngel)",
     "braveMouseSet": "Modig Mus (Kriger)",
-    "summer2016SharkWarriorSet": "Hajkriger (Kriger)",
-    "summer2016DolphinMageSet": "Delfinmagiker (Magiker)",
-    "summer2016SeahorseHealerSet": "Søhesthelbreder (Helbreder)",
-    "summer2016EelSet": "Åleslyngel (Slyngel)",
+    "summer2016SharkWarriorSet": "Haj (Kriger)",
+    "summer2016DolphinMageSet": "Delfin (Magiker)",
+    "summer2016SeahorseHealerSet": "Søhest (Helbreder)",
+    "summer2016EelSet": "Ål (Slyngel)",
     "fall2016SwampThingSet": "Sump-ting (Kriger)",
     "fall2016WickedSorcererSet": "Skummel Sortkunstner (Magiker)",
-    "fall2016GorgonHealerSet": "Gorgon-helbreder (Helbreder)",
-    "fall2016BlackWidowSet": "Sort Enke-slyngel (Slyngel)",
+    "fall2016GorgonHealerSet": "Gorgon (Helbreder)",
+    "fall2016BlackWidowSet": "Sort enke (Slyngel)",
     "winter2017IceHockeySet": "Ishockey (Kriger)",
     "winter2017WinterWolfSet": "Vinterulv (Magiker)",
-    "winter2017SugarPlumSet": "Sukkerblomme-helbreder (Helbreder)",
-    "winter2017FrostyRogueSet": "Sukkerslyngel (Slyngel)",
-    "spring2017FelineWarriorSet": "Kattekriger (Kriger)",
+    "winter2017SugarPlumSet": "Sukkerblomme (Helbreder)",
+    "winter2017FrostyRogueSet": "Frost (Slyngel)",
+    "spring2017FelineWarriorSet": "Kattedyr (Kriger)",
     "spring2017CanineConjurorSet": "Hundehekser (Magiker)",
     "spring2017FloralMouseSet": "Blomstermus (Helbreder)",
     "spring2017SneakyBunnySet": "Krybende Kanin (Slyngel)",
-    "summer2017SandcastleWarriorSet": "Sandslotskriger (Kriger)",
-    "summer2017WhirlpoolMageSet": "Malstrømsmagiker (Magiker)",
+    "summer2017SandcastleWarriorSet": "Sandslot (Kriger)",
+    "summer2017WhirlpoolMageSet": "Malstrøm(Magiker)",
     "summer2017SeashellSeahealerSet": "Havmuslingehelbreder (Helbreder)",
     "summer2017SeaDragonSet": "Sødrage (Slyngel)",
-    "fall2017HabitoweenSet": "Habitoweenkriger (Kriger)",
-    "fall2017MasqueradeSet": "Maskerademagiker (Magiker)",
-    "fall2017HauntedHouseSet": "Spøgelseshuslæge (Helbreder)",
-    "fall2017TrickOrTreatSet": "Ballademagerbandit (Slyngel)",
-    "winter2018ConfettiSet": "Konfettimagiker (Magiker)",
-    "winter2018GiftWrappedSet": "Indpakket Kriger (Kriger)",
-    "winter2018MistletoeSet": "Misteltenshelbreder (Helbreder)",
-    "winter2018ReindeerSet": "Rendsdyrslyngel (Slyngel)",
-    "spring2018SunriseWarriorSet": "Solopgangskriger (Kriger)",
-    "spring2018TulipMageSet": "Tulipanmagiker (Magiker)",
-    "spring2018GarnetHealerSet": "Granatrød Helbreder (Helbreder)",
-    "spring2018DucklingRogueSet": "Ællingeslyngel (Slyngel)",
-    "summer2018BettaFishWarriorSet": "Kampfiskkriger (Kriger)",
-    "summer2018LionfishMageSet": "Dragefiskmagiker (Magiker)",
+    "fall2017HabitoweenSet": "Habitoween (Kriger)",
+    "fall2017MasqueradeSet": "Maskerade(Magiker)",
+    "fall2017HauntedHouseSet": "Spøgelseshus (Helbreder)",
+    "fall2017TrickOrTreatSet": "Ballademager (Slyngel)",
+    "winter2018ConfettiSet": "Konfetti (Magiker)",
+    "winter2018GiftWrappedSet": "Gavepapir (Kriger)",
+    "winter2018MistletoeSet": "Mistelten (Helbreder)",
+    "winter2018ReindeerSet": "Rensdyr (Slyngel)",
+    "spring2018SunriseWarriorSet": "Solopgang (Kriger)",
+    "spring2018TulipMageSet": "Tulipan (Magiker)",
+    "spring2018GarnetHealerSet": "Granatrød (Helbreder)",
+    "spring2018DucklingRogueSet": "Ælling (Slyngel)",
+    "summer2018BettaFishWarriorSet": "Kampfisk (Kriger)",
+    "summer2018LionfishMageSet": "Dragefisk (Magiker)",
     "summer2018MerfolkMonarchSet": "Havfruehertug(inde) (Helbreder)",
     "summer2018FisherRogueSet": "Fiskerslyngel (Slyngel)",
     "fall2018MinotaurWarriorSet": "Minotaur (Kriger)",
@@ -131,21 +131,98 @@
     "winter2019WinterStarSet": "Vinterstjerne (Helbreder)",
     "winter2019PoinsettiaSet": "Julestjerne (Slyngel)",
     "eventAvailability": "Tilgændelig til køb indtil <%= date(locale) %>.",
-    "dateEndMarch": "April 30",
-    "dateEndApril": "19. april",
-    "dateEndMay": "May 31",
-    "dateEndJune": "Juni 14",
-    "dateEndJuly": "July 31",
-    "dateEndAugust": "August 31",
-    "dateEndSeptember": "September 21",
-    "dateEndOctober": "October 31",
-    "dateEndNovember": "December 3",
-    "dateEndJanuary": "January 31",
-    "dateEndFebruary": "February 28",
-    "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Til og med 15. januar vil du få det samme abonnement med til dig selv, når du køber et abonnement til nogen i gave!",
+    "dateEndMarch": "31. marts",
+    "dateEndApril": "30. april",
+    "dateEndMay": "31. maj",
+    "dateEndJune": "30. juni",
+    "dateEndJuly": "31. juli",
+    "dateEndAugust": "31. august",
+    "dateEndSeptember": "30. september",
+    "dateEndOctober": "31. oktober",
+    "dateEndNovember": "30. november",
+    "dateEndJanuary": "31. januar",
+    "dateEndFebruary": "28. februar",
+    "winterPromoGiftHeader": "GIV ET ABONNEMENT I GAVE, OG FÅ ET GRATIS!",
+    "winterPromoGiftDetails1": "Til og med 6. januar vil du få det samme abonnement med til dig selv, når du køber et abonnement til nogen i gave!",
     "winterPromoGiftDetails2": "Bemærk venligst, at hvis du eller modtageren af din gave allerede har et tilbagevendende abonnement, vil gave-abonnementet kun starte efter det tilbagevendende er blevet opsagt eller er udløbet. Tusind tak for din støtte! <3",
     "discountBundle": "pakke",
-    "g1g1Announcement": "<strong>Giv et abonnement, få et abonnement gratis!</strong> Tilbuddet gælder lige nu!",
-    "g1g1Details": "Send et gave-abonnement til en ven fra deres profil, og du vil få det samme abonnement til dig selv gratis!"
+    "g1g1Announcement": "<strong>Giv et abonnement og få et abonnement gratis!</strong> Tilbuddet gælder lige nu!",
+    "g1g1Details": "Send et gave-abonnement til en ven, og du vil få det samme abonnement til dig selv gratis!",
+    "g1g1": "Send et, få et",
+    "winter2020EvergreenSet": "Stedsegrøn (Kriger)",
+    "winter2020CarolOfTheMageSet": "Magisk julesang (Magiker)",
+    "winter2020WinterSpiceSet": "Vinterkrydderi (Helbreder)",
+    "spring2020IrisHealerSet": "Iris (Helbreder)",
+    "spring2019OrchidWarriorSet": "Orkidé (Kriger)",
+    "spring2019AmberMageSet": "Rav (Magiker)",
+    "summer2020OarfishMageSet": "Sildekonge (Magiker)",
+    "spring2019RobinHealerSet": "Rødhals (Helbreder)",
+    "summer2020SeaGlassHealerSet": "Havglas (Helbreder)",
+    "spring2019CloudRogueSet": "Sky (Slyngel)",
+    "fall2020DeathsHeadMothHealerSet": "Dødningehovednatsværmer (Helbreder)",
+    "summer2019SeaTurtleWarriorSet": "Havskildpadde (Kriger)",
+    "winter2021IceFishingWarriorSet": "Isfisker (Kriger)",
+    "summer2019WaterLilyMageSet": "Åkande (Magiker)",
+    "winter2021WinterMoonMageSet": "Vintermåne (Magiker)",
+    "summer2019ConchHealerSet": "Konkylie (Helbreder)",
+    "spring2021SwanMageSet": "Svane (Magiker)",
+    "summer2019HammerheadRogueSet": "Hammerhaj (Slyngel)",
+    "fall2019CyclopsSet": "Kyklop (Magiker)",
+    "summer2021NautilusMageSet": "Nautilus (Magiker)",
+    "summer2021ParrotHealerSet": "Papegøje (Helbreder)",
+    "summer2021ClownfishRogueSet": "Klovnefisk (Slyngel)",
+    "fall2020TwoHeadedRogueSet": "Tohovedet (Slyngel)",
+    "spring2020PuddleMageSet": "Vandpyt (Magiker)",
+    "fall2020WraithWarriorSet": "Genfærd (Kriger)",
+    "summer2021FlyingFishWarriorSet": "Flyvefisk (Kriger)",
+    "spring2021SunstoneWarriorSet": "Solsten (Kriger)",
+    "summer2020RainbowTroutWarriorSet": "Regnbueørred (Kriger)",
+    "fall2020ThirdEyeMageSet": "Treøjet (Magiker)",
+    "fall2019RavenSet": "Ravn (Kriger)",
+    "spring2021TwinFlowerRogueSet": "Kaprifolie (Slyngel)",
+    "spring2021WillowHealerSet": "Piletræ (Helbreder)",
+    "winter2020LanternSet": "Lanterne (Slyngel)",
+    "spring2020BeetleWarriorSet": "Næsehornsbille (Kriger)",
+    "summer2020CrocodileRogueSet": "Krokodille (Slyngel)",
+    "winter2021HollyIvyRogueSet": "Kristtjørn og vedbend (Slyngel)",
+    "winter2021ArcticExplorerHealerSet": "Arktisk udforsker (Helbreder)",
+    "spring2020LapisLazuliRogueSet": "Lapis lazuli (Slyngel)",
+    "fall2019OperaticSpecterSet": "Operaspøgelse (Slyngel)",
+    "g1g1Limitations": "Dette er et tidsbegrænset tilbud der begynder d. 16. december kl. 14:00 (UTC+1), og slutter d. 6. januar kl. 02:00 (UTC+1). Dette tilbud gælder kun, når du giver et gave-abonnement til en anden Habiticaner. Hvis du eller modtageren allerede har et abonnement, vil gave-abonnementet tilføje yderligere tid, der kun vil blive brugt så snart det nuværende abonnement opsiges eller udløber.",
+    "mayYYYY": "maj <%= year %>",
+    "limitations": "Begrænsninger",
+    "summer2022CrabRogueSet": "Krabbe (Slyngel)",
+    "summer2022WaterspoutWarriorSet": "Vandsøjle (Kriger)",
+    "summer2022MantaRayMageSet": "Djævlerokke (Magiker)",
+    "summer2022AngelfishHealerSet": "Englefisk (Helbreder)",
+    "dateEndDecember": "31. december",
+    "februaryYYYY": "februar <%= year %>",
+    "julyYYYY": "juli <%= year %>",
+    "octoberYYYY": "oktober <%= year %>",
+    "howItWorks": "Sådan virker det",
+    "noLongerAvailable": "Denne genstand er ikke længere tilgængelig.",
+    "spring2022MagpieRogueSet": "Skade (Slyngel)",
+    "spring2022RainstormWarriorSet": "Uvejr (Kriger)",
+    "spring2022ForsythiaMageSet": "Forsythia (Magiker)",
+    "g1g1HowItWorks": "Skriv brugernavnet på den konto, du vil sende gave-abonnementet til. Derefter skal du vælge længden på abonnementet, og så checke ud. Din konto vil automatisk få tildelt den samme type abonnement, du lige har givet en anden.",
+    "fall2021OozeRogueSet": "Slim (Slyngel)",
+    "fall2021HeadlessWarriorSet": "Hovedløs (Kriger)",
+    "fall2021BrainEaterMageSet": "Hjerneæder (Magiker)",
+    "fall2021FlameSummonerHealerSet": "Flammehidkalder (Helbreder)",
+    "eventAvailabilityReturning": "Kan købes indtil <%= availableDate(locale) %>. Denne eliksir var sidst tilgængelig <%= previousDate(locale) %>.",
+    "septemberYYYY": "september <%= year %>",
+    "marchYYYY": "marts <%= year %>",
+    "juneYYYY": "juni <%= year %>",
+    "novemberYYYY": "november <%= year %>",
+    "decemberYYYY": "december <%= year %>",
+    "augustYYYY": "august <%= year %>",
+    "winter2022FireworksRogueSet": "Fyrværkeri (Slyngel)",
+    "winter2022StockingWarriorSet": "Julesok (Kriger)",
+    "winter2022PomegranateMageSet": "Granatæble (Magiker)",
+    "winter2022IceCrystalHealerSet": "Iskrystal (Helbreder)",
+    "g1g1Event": "Send et, få et - tilbuddet gælder nu!",
+    "g1g1Returning": "For at fejre nytåret bringer vi et ganske særligt tilbud tilbage. Lige nu, når du køber et abonnement som gave, får du det samme abonnement selv!",
+    "januaryYYYY": "januar <%= year %>",
+    "aprilYYYY": "april <%= year %>",
+    "royalPurpleJackolantern": "Purpur Græskarlygte"
 }
diff --git a/website/common/locales/da/npc.json b/website/common/locales/da/npc.json
index c5b9bc7695..034703225f 100644
--- a/website/common/locales/da/npc.json
+++ b/website/common/locales/da/npc.json
@@ -17,9 +17,9 @@
     "mattBochText1": "Velkommen til Stalden! Jeg er Staldmesteren Matt. Hver gang du færdiggør en opgave, vil du have en chance for at modtage et tilfældigt Æg eller Udklækningseliksir til at udklække Kæledyr. Når du udruger et Kæledyr, vil det dukke op her! Klik på billedet af Kæledyret for at føje det til din Avatar. Giv dem det Dyrefoder du finder, og de vil vokse sig til kraftfulde Ridedyr.",
     "welcomeToTavern": "Velkommen til Værtshuset!",
     "sleepDescription": "Har du brug for en pause? Check ind i Daniels Værtshus for at sætte nogle af Habiticas svære elementer på pause:",
-    "sleepBullet1": "Missede Daglige vil ikke skade dig",
-    "sleepBullet2": "Opgavers stribe-præstation vil ikke blive tabt",
-    "sleepBullet3": "Bosser vil ikke skade dig på grund af dine egne missede Daglige",
+    "sleepBullet1": "Dine missede Daglige vil ikke skade dig (bosser vil stadig kunne skade dig baseret på andre Holdmedlemmers missede Daglige)",
+    "sleepBullet2": "Dagliges stribe-præstation og Vanetæller vil ikke blive nulstillet",
+    "sleepBullet3": "Den skade, du vil påføre bossen, eller dine indsamlede questgenstande, vil først tælle med i questen, når du checker ud af Værtshuset",
     "sleepBullet4": "Du vil beholde din afventende skade til bosser eller indsamlede questgenstande indtil du checker ud",
     "pauseDailies": "Sæt skade på pause",
     "unpauseDailies": "Skade er ikke længere på pause",
@@ -129,5 +129,6 @@
     "cannotUnpinItem": "Denne genstand kan ikke frigøres.",
     "nMonthsSubscriptionGift": "<%= nMonths %> Måned(ers) Abonnement (Gave)",
     "nGemsGift": "<%= nGems %> Ædelsten (Gave)",
-    "nGems": "<%= nGems %> Ædelsten"
+    "nGems": "<%= nGems %> Ædelsten",
+    "amountExp": "<%= amount %> Exp"
 }
diff --git a/website/common/locales/da/overview.json b/website/common/locales/da/overview.json
index 5d029583e5..6900d74d9c 100644
--- a/website/common/locales/da/overview.json
+++ b/website/common/locales/da/overview.json
@@ -1,10 +1,10 @@
 {
     "needTips": "Brug for noget hjælp til at starte? Her er en enkel guide!",
     "step1": "Trin 1: Indtast opgaver",
-    "webStep1Text": "Habitica er intet uden mål i det virkelige liv, så opret et par opgaver. Du kan altid tilføje flere! Alle opgaver kan tilføjes ved at klikke på den grønne 'Opret' knap.\n* **Opret [To-Dos](http://habitica.fandom.com/wiki/To-Dos):** Tilføj opgaver, du kun skal gøre én gang, eller sjældent, i kolonnen 'To-Dos', en af gangen. Du kan klikke på opgaverne for at redigere dem og tilføje checklister, forfaldsdag og mere!\n* **Opret [Daglige](http://habitica.fandom.com/wiki/Dailies):** Tilføj aktiviteter, du skal klare hver dag, eller på en bestemt dag i ugen, måneden, eller året i kolonnen 'Daglige'. Klik på en opgaver for at ændre, hvornår den skal være forfalden og/eller fastsætte en startdato. Du kan også sætte den til at være forfalden med jævne mellemrum, for eksempel hver tredje dag.\n* **Opret [Vaner](http://habitica.fandom.com/wiki/Habits):** Tilføj vaner, du gerne vil tillægge dig, i kolonnen 'Vaner'. Du kan ændre Vanen for kun at gøre den til en god vane :heavy_plus_sign: eller en dårlig vane :heavy_minus_sign:\n* **Opret [Belønninger](http://habitica.fandom.com/wiki/Rewards):** Udover de Belønninger, der tilbydes i spillet, kan du tilføje aktiviteter eller små gaver/lækkerier, du kan bruge som motivation, i kolonnen 'Belønninger'. Det er vigtigt at give dig selv en pause eller tillade en lille luksus sommetider!\n* Hvis du har brug for inspiration til dine opgaver, kan du se [eksempler på Vaner](http://habitica.fandom.com/wiki/Sample_Habits), [eksempler på Daglige](http://habitica.fandom.com/wiki/Sample_Dailies), [eksempler på To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos), og [eksempler på Belønninger](http://habitica.fandom.com/wiki/Sample_Custom_Rewards) på wiki'en (engelsk).",
+    "webStep1Text": "Habitica er intet uden mål i det virkelige liv, så opret et par opgaver. Du kan altid tilføje flere! Alle opgaver kan tilføjes ved at klikke på den grønne 'Opret' knap.\n* **Opret [To Do's](https://habitica.fandom.com/wiki/To_Do%27s):** Tilføj opgaver, du kun skal gøre én gang, eller sjældent, i kolonnen To Do's, en af gangen. Du kan klikke på opgaverne for at redigere dem og tilføje checklister, forfaldsdag og mere!\n* **Opret [Daglige](https://habitica.fandom.com/wiki/Dailies):** Tilføj aktiviteter, du skal klare hver dag, eller på en bestemt dag i ugen, måneden, eller året i kolonnen 'Daglige'. Klik på en opgaver for at ændre, hvornår den skal være forfalden og/eller fastsætte en startdato. Du kan også sætte den til at være forfalden med jævne mellemrum, for eksempel hver tredje dag.\n* **Opret [Vaner](https://habitica.fandom.com/wiki/Habits):** Tilføj vaner, du gerne vil tillægge dig, i kolonnen 'Vaner'. Du kan ændre Vanen for kun at gøre den til en god vane :heavy_plus_sign: eller en dårlig vane :heavy_minus_sign:\n* **Opret [Belønninger](https://habitica.fandom.com/wiki/Rewards):** Udover de Belønninger, der tilbydes i spillet, kan du tilføje aktiviteter eller små gaver/lækkerier, du kan bruge som motivation, i kolonnen 'Belønninger'. Det er vigtigt at give dig selv en pause eller tillade en lille luksus sommetider!\n* Hvis du har brug for inspiration til dine opgaver, kan du se [eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits), [eksempler på Daglige](https://habitica.fandom.com/wiki/Sample_Dailies), [eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s), og [eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards) på wiki'en (engelsk).",
     "step2": "Trin 2: Optjen Point ved at gøre ting i det virkelig liv",
-    "webStep2Text": "Begynd nu på dine mål fra listen! Efterhånden som du fuldfører opgaver og krydser dem af i Habitica vil du få [Erfaring](http://habitica.fandom.com/wiki/Experience_Points), som vil lade dig stige i niveau, og [Guld](http://habitica.fandom.com/wiki/Gold_Points), som du kan købe Belønninger for. Hvis du giver efter for dårlige vaner eller misser dine Daglige, vil du miste [Liv](http://habitica.fandom.com/wiki/Health_Points). På denne måde vil Habiticas Erfarings- og Helbredsbjælker være en morsom indikater for fremskridt mod dine mål. Du vil begynde at se forbedringer i dit virkelige liv mens din karakter avancerer i spillet.",
+    "webStep2Text": "Begynd nu på dine mål fra listen! Efterhånden som du fuldfører opgaver og krydser dem af i Habitica vil du få [Erfaring](https://habitica.fandom.com/wiki/Experience_Points), som vil lade dig stige i niveau, og [Guld](https://habitica.fandom.com/wiki/Gold_Points), som du kan købe Belønninger for. Hvis du giver efter for dårlige vaner eller misser dine Daglige, vil du miste [Liv](https://habitica.fandom.com/wiki/Health_Points). På denne måde vil Habiticas Erfarings- og Helbredsbjælker være en morsom indikator for fremskridt mod dine mål. Du vil begynde at se forbedringer i dit virkelige liv, mens din karakter avancerer i spillet.",
     "step3": "Trin 3: Brugerdefiner og udforsk Habitica",
-    "webStep3Text": "Når du er blevet tryg ved nøglefunktionerne, kan du få endnu mere ud af Habitica med de følgende fikse detaljer:\n * Hold styr på dine opgaver med [tags](http://habitica.fandom.com/wiki/Tags) (rediger en opgave for at tilføje dem).\n * Tilpas din [avatar](http://habitica.fandom.com/wiki/Avatar) ved at klikke på brugerikonet i øverste højre hjørne.\n * Køb [Udstyr](http://habitica.fandom.com/wiki/Equipment) under Belønninger eller fra [Butikkerne](<%= shopUrl %>), og skift det ud under [Inventar > Udstyr](<%= equipUrl %>).\n * Sig hej til andre brugere i [Værtshuset](http://habitica.fandom.com/wiki/Tavern).\n * Fra niveau 3 kan du udklække [Kæledyr](http://habitica.fandom.com/wiki/Pets) ved at samle [æg](http://habitica.fandom.com/wiki/Eggs) og [udrugningseliksirer](http://habitica.fandom.com/wiki/Hatching_Potions). [Fodr](http://habitica.fandom.com/wiki/Food) dem for at få [Ridedyr](http://habitica.fandom.com/wiki/Mounts).\n * Fra niveau 10 kan du vælge en [klasse](http://habitica.fandom.com/wiki/Class_System), og får adgang til specielle [evner](http://habitica.fandom.com/wiki/Skills) (låses op fra niveau 11 til 14).\n * Lav et hold med dine venner (ved at klikke på [Hold](<%= partyUrl %>) i navigationsbarren), for at blive holdt ansvarlig og få en Questskriftrulle.\n * Du kan besejre monstre og indsamle genstande på [quests](http://habitica.fandom.com/wiki/Quests) (du vil få en quest på niveau 15).",
+    "webStep3Text": "Når du er blevet tryg ved nøglefunktionerne, kan du få endnu mere ud af Habitica med de følgende fikse detaljer:\n * Hold styr på dine opgaver med [tags](https://habitica.fandom.com/wiki/Tags) (rediger en opgave for at tilføje dem).\n * Tilpas din [avatar](https://habitica.fandom.com/wiki/Avatar) ved at klikke på brugerikonet i øverste højre hjørne.\n * Køb [udstyr](https://habitica.fandom.com/wiki/Equipment) under Belønninger eller fra [Butikkerne](<%= shopUrl %>), og skift det ud under [Inventar > Udstyr](<%= equipUrl %>).\n * Sig hej til andre brugere i [Værtshuset](https://habitica.fandom.com/wiki/Tavern).\n * Udklæk [kæledyr](https://habitica.fandom.com/wiki/Pets) ved at samle [æg](https://habitica.fandom.com/wiki/Eggs) og [udrugningseliksirer](https://habitica.fandom.com/wiki/Hatching_Potions). [Fodr](https://habitica.fandom.com/wiki/Food) dem for at få [ridedyr](https://habitica.fandom.com/wiki/Mounts).\n * Fra niveau 10 kan du vælge en [klasse](https://habitica.fandom.com/wiki/Class_System), og får adgang til specielle [evner](https://habitica.fandom.com/wiki/Skills) (låses op fra niveau 11 til 14).\n * Lav et hold med dine venner (ved at klikke på [Hold](<%= partyUrl %>) i navigationsbarren), for at blive holdt ansvarlig og få en Questskriftrulle.\n * Du kan besejre monstre og indsamle genstande på [quests](https://habitica.fandom.com/wiki/Quests) (du vil få en quest på niveau 15).",
     "overviewQuestions": "Har du flere spørgsmål? Læs vores [FAQ](<%= faqUrl %>)! Hvis du ikke kan finde et svar der, kan du bede om hjælp i Klanen [Habitica Help](<%= helpGuildUrl %>).\n\nHeld og lykke med dine opgaver!"
 }
diff --git a/website/common/locales/da/pets.json b/website/common/locales/da/pets.json
index ac4d09f3dd..8cfd7e1079 100644
--- a/website/common/locales/da/pets.json
+++ b/website/common/locales/da/pets.json
@@ -23,12 +23,12 @@
     "mantisShrimp": "Knælerreje",
     "mammoth": "Ulden mammut",
     "orca": "Spækhugger",
-    "royalPurpleGryphon": "Royal Lilla Grif",
+    "royalPurpleGryphon": "Purpur Grif",
     "phoenix": "Føniks",
     "magicalBee": "Magisk bi",
     "hopefulHippogriffPet": "Håbefuld hippogrif",
     "hopefulHippogriffMount": "Håbefuld hippogrif",
-    "royalPurpleJackalope": "Royal Lilla Jackalope",
+    "royalPurpleJackalope": "Purpur Jackalope",
     "invisibleAether": "Usynlig æter",
     "potion": "<%= potionType %> eliksir",
     "egg": "<%= eggType %> æg",
@@ -44,8 +44,8 @@
     "noFoodAvailable": "Du har ikke noget Dyrefoder.",
     "noSaddlesAvailable": "Du har ikke nogle sadler.",
     "noFood": "Du har hverken mad eller sadler.",
-    "dropsExplanation": "Du kan få fat i disse ting hurtigere med ædelsten, hvis du ikke længere vil vente på at finde dem når du gennemfører en opgave. <a href=\"http://habitica.fandom.com/wiki/Drops\">Lær mere om drop-systemet.</a>",
-    "dropsExplanationEggs": "Brug Ædelsten for hurtigere at få æg, hvis du ikke vil vente på at få standard-æg som drops, eller gentage Quests for at vinde Quest-æg.  <a href=\"http://habitica.fandom.com/wiki/Drops\">Læs mere om dropsystemet her.</a>",
+    "dropsExplanation": "Du kan få fat i disse ting hurtigere med ædelsten, hvis du ikke længere vil vente på at finde dem når du gennemfører en opgave. <a href=\"https://habitica.fandom.com/wiki/Drops\">Lær mere om drop-systemet.</a>",
+    "dropsExplanationEggs": "Brug Ædelsten for hurtigere at få æg, hvis du ikke vil vente på at få standard-æg som drops, eller gentage Quests for at vinde Quest-æg.  <a href=\"https://habitica.fandom.com/wiki/Drops\">Læs mere om dropsystemet her.</a>",
     "premiumPotionNoDropExplanation": "Magiske udrugningseliksirer kan ikke blive brugt på æg, der er modtaget fra quests. Den eneste måde at få en magisk udrugningseliksir på, er ved at købe dem nedenfor, ikke fra tilfældige drop.",
     "beastMasterProgress": "Dyretæmmerfremskridt",
     "beastAchievement": "Du har opnået \"Dyretæmmer\"-præstationen ved at samle alle kæledyr!",
diff --git a/website/common/locales/da/quests.json b/website/common/locales/da/quests.json
index bab7a48374..dc60cca6d3 100644
--- a/website/common/locales/da/quests.json
+++ b/website/common/locales/da/quests.json
@@ -35,9 +35,9 @@
     "mustComplete": "Du skal færdiggøre <%= quest %> først.",
     "mustLvlQuest": "Du skal være niveau <%= level %> for at købe denne quest!",
     "unlockByQuesting": "For at låse op for denne quest, skal du fuldføre <%= title %>.",
-    "questConfirm": "Er du sikker? Kun <%= questmembers %> af dine <%= totalmembers %> holdmedlemmer har valgt at deltage i denne quest! Quests begynder automatisk, når alle spillere enten har accepteret eller afvist invitationen.",
-    "sureCancel": "Er du sikker på at du vil afbryde denne quest? Alle invitation-accepter vil gå tabt. Quest-lederen vil beholde quest-skriftrullen.",
-    "sureAbort": "Er du sikker på at du vil afbryde missionen? Det vil afbryde den for alle i gruppen og al fremskridt vil gå tabt. Quest-skriftrullen vil blive returneret til quest-lederen.",
+    "questConfirm": "Er du sikker på at du vil starte denne quest? Ikke alle holdmedlemmer har accepteret invitationen. Quests begynder automatisk, når alle medlemmer har svaret.",
+    "sureCancel": "Er du sikker på at du vil afbryde denne quest? Hvis du afbryder, vil alle accepterede og åbne invitationer blive afvist. Quest-lederen vil få skriftrullen igen.",
+    "sureAbort": "Er du sikker på at du vil afbryde missionen? Al fremskridt vil gå tabt. Quest-lederen vil få skriftrullen igen.",
     "doubleSureAbort": "Er du helt sikker? Tjek lige at de ikke vil hade dig for evigt!",
     "bossRageTitle": "Vrede",
     "bossRageDescription": "Når denne bar bliver fyldt vil bossen udføre et specielt angreb!",
@@ -85,5 +85,9 @@
     "questAlreadyStarted": "Questen er allerede begyndt.",
     "bossDamage": "Du har skadet bossen!",
     "questInvitationNotificationInfo": "Du har fået en invitation til at deltage i en quest",
-    "hatchingPotionQuests": "Magisk Udrugningseliksirquest"
+    "hatchingPotionQuests": "Magisk Udrugningseliksirquest",
+    "questItemsPending": "<%= amount %> genstande fundet",
+    "sureLeaveInactive": "Er du sikker på, du vil forlade questen? Du vil ikke kunne deltage igen.",
+    "selectQuest": "Vælg quest",
+    "yourPartyIsNotOnQuest": "Dit hold er ikke på en quest"
 }
diff --git a/website/common/locales/da/questscontent.json b/website/common/locales/da/questscontent.json
index 6c78636b93..ecd07ba276 100644
--- a/website/common/locales/da/questscontent.json
+++ b/website/common/locales/da/questscontent.json
@@ -4,7 +4,7 @@
     "questEvilSantaCompletion": "Pelsjægerjulemanden skriger i vrede og løber bort i natten. Den taknemmelige hunbjørn forsøger gennem brøl og knurren at fortælle dig noget. Du tager hende med tilbage til stalden hvor Matt Boch, Hviskeren, lytter til hendes historie med et rædselsslagent gisp. Hun har en unge! Han løb ud på issletterne da bjørnemor blev fanget. Hjælp med at redde hendes barn!",
     "questEvilSantaBoss": "Pelsjægerjulemand",
     "questEvilSantaDropBearCubPolarMount": "Isbjørn (Ridedyr)",
-    "questEvilSanta2Text": "Find Bjørneungen",
+    "questEvilSanta2Text": "Find bjørneungen",
     "questEvilSanta2Notes": "Da pelsjægeren fangede Isbjørneridedyret, løb hendes unge ud på issletterne. Du kan høre grene knække og sne knirke gennem den krystalklare lyd af skoven. Poteaftryk! I begynder begge at løbe for at følge sporet. Find alle sporene og de brækkede grene, og hent ungen!<br><br><strong>Bemærk</strong>: “Find isbjørneungen” belønnes med en stackable quest-præstation, men giver et sjældent Kæledyr, som kun kan tilføjes til din Stald en enkelt gang.",
     "questEvilSanta2Completion": "Du har fundet ungen! Den vil holde dig med selskab til evig tid.",
     "questEvilSanta2CollectTracks": "Spor",
diff --git a/website/common/locales/da/rebirth.json b/website/common/locales/da/rebirth.json
index 0a5900bf5a..58bcd67bc5 100644
--- a/website/common/locales/da/rebirth.json
+++ b/website/common/locales/da/rebirth.json
@@ -8,7 +8,7 @@
     "rebirthOrb": "Brugte en Genfødselskugle til at starte forfra efter at have opnået Niveau <%= level %>.",
     "rebirthOrb100": "Brugte en Genfødselskugle til at starte forfra efter at have opnået Niveau 100 eller mere.",
     "rebirthOrbNoLevel": "Brugte en Genfødselskugle til at starte forfra.",
-    "rebirthPop": "Genstart omgående din karakter som Niveau 1 Kriger, men behold præstationer, samlerobjekter og udstyr. Du vil beholde dine opgaver og deres historie, men de vil blive nulstillet til gul. Dine striber vil blive fjernet, bortset fra opgaver tilhørende aktive Udfordringer og Gruppeplaner. Dit Guld, Erfaring, Mana, og alle effekter fra Evner vil blive fjernet. Alt dette vil ske omgående. For mere information, se siden <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> på wiki'en (engelsk).",
+    "rebirthPop": "Genstart omgående din karakter som Niveau 1 Kriger, men behold præstationer, samlerobjekter og udstyr. Du vil beholde dine opgaver og deres historie, men de vil blive nulstillet til gul. Dine striber vil blive fjernet, bortset fra opgaver tilhørende aktive Udfordringer og Gruppeplaner. Dit Guld, Erfaring, Mana, og alle effekter fra Evner vil blive fjernet. Alt dette vil ske omgående. For mere information, se siden <a href='https://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> på wiki'en (engelsk).",
     "rebirthName": "Genfødselskugle",
     "rebirthComplete": "Du er blevet genfødt!",
     "nextFreeRebirth": "<strong><%= days %> dage</strong> til <strong>GRATIS</strong> Genfødselskugle"
diff --git a/website/common/locales/da/settings.json b/website/common/locales/da/settings.json
index a68541c1c3..6960f86651 100644
--- a/website/common/locales/da/settings.json
+++ b/website/common/locales/da/settings.json
@@ -42,7 +42,7 @@
     "sureChangeCustomDayStartTime": "Er du sikker på, at du vil ændre dit brugerdefinerede starttidspunkt? Dine Daglige vil blive opdateret næste gang du bruger Habitica efter <%= time %>. Vær sikker på, at du har udført dine Daglige før da!",
     "customDayStartHasChanged": "Dit brugerdefinerede starttidspunkt er ændret.",
     "nextCron": "Dine Daglige vil blive nulstillet første gang du bruger Habitica efter <%= time %>. Vær sikker på, at du har færdiggjort dine Daglige før dette tidspunkt!",
-    "customDayStartInfo1": "Som udgangspunkt vil Habitica tjekke og nulstille dine Daglige ved midnat hver dag. Du kan ændre dette her.",
+    "customDayStartInfo1": "Habitica tjekke og nulstille dine Daglige ved midnat hver dag i din egen tidszone. Du kan ændre det til et andet tidspunkt efter midnat her.",
     "misc": "Diverse",
     "showHeader": "Vis sidehoved",
     "changePass": "Skift kodeord",
@@ -55,7 +55,7 @@
     "newUsername": "Nyt brugernavn",
     "dangerZone": "Farezone",
     "resetText1": "ADVARSEL! Dette nulstiller mange dele af din konto. Vi fraråder på det kraftigste dette, men nogen finder det brugbart i begyndelsen efter at have eksperimenteret med Habitica i et kort stykke tid.",
-    "resetText2": "Du vil miste alle niveauer, Guld, og Erfaringspoint. Alle dine Opgaver (bortset fra dem fra Udfordringer) vil blive slettet permanent, og du vil miste al deres historik. Du vil miste alt dit udstyr, men du vil være i stand til at købe det hele igen, inklusiv tidsbegrænset udstyr eller Mystiske abonnentsgenstande, som du allerede ejer (du vil være nødt til at være den rigtige klasse for at kunne købe klasse-udstyr igen). Du vil beholde din nuværende klasse og dine kæle- og ridedyr. Du ville måske foretrække at bruge en Genfødselskugle i stedet. Det er en meget sikrere mulighed, og du vil beholde dine opgaver og udstyr.",
+    "resetText2": "Du vil miste alle niveauer, Guld, og Erfaringspoint. Alle dine Opgaver (bortset fra dem fra Udfordringer) vil blive slettet permanent, og du vil miste al deres historik. Du vil miste alt dit udstyr, undtagen gratis gave-udstyr eller Mystiske abonnentsgenstande. Du vil være i stand til at købe alle de mistede genstand igen, inklusiv tidsbegrænset udstyr (du skal være den korrekte klasse for at købe klasse-begrænset udstyr). Du vil beholde din nuværende klasse, præstationer og dine kæle- og ridedyr. Du ville måske foretrække at bruge en Genfødselskugle i stedet. Det er en meget sikrere mulighed, og du vil beholde dine opgaver og udstyr.",
     "deleteLocalAccountText": "Er du sikker? Dette vil slette din konto for evigt, og den kan aldrig gendannes! Du skal registrere en ny konto for at kunne bruge Habitica igen. Ædelsten du har brugt eller har på lager vil ikke blive refunderet. Hvis du er fuldstændig sikker, så skriv dit kodeord i boksen herunder.",
     "deleteSocialAccountText": "Er du sikker? Dette vil slette din brugerkonto for evigt, og den kan aldrig gendannes! Du vil være nødt til at oprette en ny konto for at bruge Habitica igen. Ædelsten i en Klanbank eller som er blevet brugt vil ikke blive refunderet. Hvis du virkelig er helt sikker, så indtast \"<%= magicWord %>\" i tekstboksen nedenunder.",
     "API": "API",
@@ -189,5 +189,7 @@
     "suggestMyUsername": "Foreslå mit brugernavn",
     "mentioning": "Nævne",
     "displaynameIssueNewline": "Displaynavne må ikke indeholde backslashes efterfulgt af bogstavet N.",
-    "bannedWordUsedInProfile": "Dit Displaynavn eller Om-tekst indeholder upassende sprog."
+    "bannedWordUsedInProfile": "Dit Displaynavn eller Om-tekst indeholder upassende sprog.",
+    "adjustment": "Tilpasning",
+    "dayStartAdjustment": "Tilpasning af starttidspunkt"
 }
diff --git a/website/common/locales/da/subscriber.json b/website/common/locales/da/subscriber.json
index 32b426ce8f..f666156b56 100644
--- a/website/common/locales/da/subscriber.json
+++ b/website/common/locales/da/subscriber.json
@@ -5,7 +5,7 @@
     "buyGemsGold": "Køb Ædelsten med Guld",
     "mustSubscribeToPurchaseGems": "Skal abonnere for at kunne købe ædelsten med GP",
     "reachedGoldToGemCap": "Du har nået Guld => Ædelstens-maksimum <%= convCap %> for denne måned. Vi har dettee for at undgå misbrug/farming. Vekselmaksimummet nulstiller inden for de tre første dage af hver måned.",
-    "reachedGoldToGemCapQuantity": "Det antal Ædelsten du har anmodet om, <%= quantity %>, overstiger Guld => Ædelstens-vekselmaksimummet <%= convCap %> for denne måned. Vi har denne begrænsning for at forhindre misbrug/farming. Begrænsningen nulstilles inden for de første tre dage i hver måned.",
+    "reachedGoldToGemCapQuantity": "Det antal Ædelsten du har anmodet om, <%= quantity %>, overstiger det antal du kan købe denne måned <%= convCap %>. Begrænsningen nulstilles inden for de første tre dage i hver måned. Tak, fordi du abonnerer!",
     "mysteryItem": "Eksklusive månedlige genstande",
     "mysteryItemText": "Hver måned modtager alle abonnenter en unik kosmetisk ting til deres avatar! Derudover vil de Mystiske Tidsrejsende give dig adgang til yderligere historisk (og futuristisk!) kosmetisk udstyr for hver tre måneders fortsat abonnement.",
     "exclusiveJackalopePet": "Eksklusivt kæledyr",
@@ -15,7 +15,7 @@
     "subscribe": "Abonnér",
     "nowSubscribed": "Du abonnerer nu på Habitica!",
     "cancelSub": "Opsig abonnement",
-    "cancelSubInfoGroupPlan": "Fordi du har fået et gratis abonnement gennem en Gruppeplan, kan du ikke opsige det. Det vil ophøre, når du ikke længere er i Gruppen. Hvis du er Gruppelederen, og vil opsige hele Gruppeplanen, kan du gøre det fra fanen 'Betalingsoplysninger' på gruppens side.",
+    "cancelSubInfoGroupPlan": "Fordi du har fået et gratis abonnement gennem en Gruppeplan, kan du ikke opsige det. Det vil ophøre, når du ikke længere er medlem af Gruppeplanen. Hvis du er Gruppelederen, og vil opsige hele Gruppeplanen, kan du gøre det fra fanen 'Betaling' på gruppens side.",
     "cancelingSubscription": "Annullerer abonnementet",
     "contactUs": "Kontakt os",
     "checkout": "Til kassen",
@@ -129,7 +129,7 @@
     "subscriptionBenefit1": "Købmanden Alexander vil sælge dig Ædelsten for 20 Guld pr. styk!",
     "subscriptionBenefit3": "Opdag flere genstande i Habitica med en fordoblet drop-cap.",
     "subscriptionBenefit4": "Unikke, dekorative genstande til din avatar hver måned.",
-    "subscriptionBenefit5": "Modtag det eksklusive royale lilla Jackalopekæledyr!",
+    "subscriptionBenefit5": "Modtag det purpur Jackalopekæledyr, når du bliver abonnenent.",
     "subscriptionBenefit6": "Optjen mystiske timeglas du kan bruge på de Tidsrejsendes marked!",
     "purchaseAll": "Køb sæt",
     "gemsRemaining": "ædelsten tilbage",
@@ -151,5 +151,13 @@
     "mysterySet201905": "Dramatisk dragesæt",
     "mysterySet201904": "Overdådigt opalsæt",
     "mysterySet201903": "Æg-cellent sæt",
-    "mysterySet201902": "Kryptisk kærlighedssæt"
+    "mysterySet201902": "Kryptisk kærlighedssæt",
+    "organization": "Organisation",
+    "howManyGemsPurchase": "Hvor mange Ædelsten vil du gerne købe?",
+    "howManyGemsSend": "Hvor mange Ædelsten vil du gerne sende?",
+    "needToPurchaseGems": "Vil du købe Ædelsten som en gave til nogen?",
+    "wantToSendOwnGems": "Vil du sende dine egne Ædelsten?",
+    "giftASubscription": "Giv et abonnement",
+    "cancelSubInfoGoogle": "Gå venligst til sektionen Konto > Abonnementer i Google Play Store app'en for at afmelde dit abonnement, eller for at se hvornår det udløber, hvis du allerede har opsagt det. Denne skærm kan ikke fortælle dig, hvorvidt dit abonnement er blevet afmeldt.",
+    "cancelSubInfoApple": "Følg venligst <a href=\"https://support.apple.com/en-us/HT202039\">Apples officielle instruktioner</a> for at opsige dit abonnement, eller for at se hvornår det udløber, hvis du allerede har afmeldt det. Denne skærm kan ikke vise dig, hvorvidt dit abonnement er blevet afmeldt."
 }
diff --git a/website/common/locales/da/tasks.json b/website/common/locales/da/tasks.json
index 57abbe230c..72199761ee 100644
--- a/website/common/locales/da/tasks.json
+++ b/website/common/locales/da/tasks.json
@@ -1,10 +1,10 @@
 {
     "clearCompleted": "Slet færdiggjorte",
-    "clearCompletedDescription": "Færdiggjorte To-Do's bliver slettet efter 30 dage for ikke-abonnenter og 90 dage for abonnenter.",
-    "clearCompletedConfirm": "Er du sikker på, du vil slette dine færdiggjorte to-dos?",
+    "clearCompletedDescription": "Færdiggjorte To Do's bliver slettet efter 30 dage for ikke-abonnenter og 90 dage for abonnenter.",
+    "clearCompletedConfirm": "Er du sikker på, du vil slette dine færdiggjorte To Do's?",
     "addMultipleTip": "<strong>Tip:</strong> For at tilføje flere <%= taskType %>, så adskil dem ved at bruge linjeskift (Shift+Enter) og tryk enter igen, når du er klar.",
     "addATask": "Tilføj en <%= type %>",
-    "editATask": "Ret en <%= type %>",
+    "editATask": "Rediger <%= type %>",
     "createTask": "Opret <%= type %>",
     "addTaskToUser": "Tilføj opgave",
     "scheduled": "Planlagt",
@@ -27,7 +27,7 @@
     "notes": "Noter",
     "advancedSettings": "Avancerede indstillinger",
     "difficulty": "Sværhedsgrad",
-    "difficultyHelp": "Sværhedsgraden beskriver, hvor udfordrende en Vane, Daglig eller To-Do er for dig at fuldføre. En højere sværhedsgrad resulterer i højere gevinster, når en opgave er fuldført, men det gør også højere skade når en Daglig opgave bliver sprunget over, eller hvis en negativ Vane udføres.",
+    "difficultyHelp": "Sværhedsgraden beskriver, hvor udfordrende en Vane, Daglig eller To Do er for dig at fuldføre. En højere sværhedsgrad resulterer i højere gevinster, når en opgave er fuldført, men det gør også højere skade når en Daglig opgave bliver sprunget over, eller hvis en negativ Vane udføres.",
     "trivial": "Triviel",
     "easy": "Let",
     "medium": "Middel",
@@ -46,9 +46,9 @@
     "days": "Dage",
     "restoreStreak": "Ret stribe",
     "resetStreak": "Nulstil stribe",
-    "todo": "To-Do",
-    "todos": "To-Dos",
-    "todosDesc": "To-Do's skal kun færdiggøres en gang. Tilføje Tjeklister til dine To-Dos for at øge deres værdi.",
+    "todo": "To Do",
+    "todos": "To Do's",
+    "todosDesc": "To Do's skal kun færdiggøres en gang. Tilføje tjeklister til dine To Do's for at øge deres værdi.",
     "dueDate": "Forfaldsdato",
     "remaining": "Aktive",
     "complete": "Færdige",
@@ -127,5 +127,11 @@
     "checkOffYesterDailies": "Markér de daglige opgaver du udførte i går:",
     "yesterDailiesCallToAction": "Start min nye dag!",
     "sessionOutdated": "Din session er forældet. Genindlæs din browser eller synkronisér.",
-    "errorTemporaryItem": "Denne genstand er midlertidig og kan ikke fastgøres."
+    "errorTemporaryItem": "Denne genstand er midlertidig og kan ikke fastgøres.",
+    "adjustCounter": "Justér tæller",
+    "addATitle": "Tilføj en titel",
+    "addNotes": "Tilføj noter",
+    "counter": "Tæller",
+    "resetCounter": "Nulstil tæller",
+    "tomorrow": "I morgen"
 }
diff --git a/website/common/locales/de/groups.json b/website/common/locales/de/groups.json
index fb88fb407a..73f5f6d95a 100644
--- a/website/common/locales/de/groups.json
+++ b/website/common/locales/de/groups.json
@@ -162,7 +162,7 @@
     "onlyCreatorOrAdminCanDeleteChat": "Keine Berechtigung diese Nachricht zu löschen!",
     "onlyGroupLeaderCanEditTasks": "Nicht berechtigt, Aufgaben zu bearbeiten!",
     "onlyGroupTasksCanBeAssigned": "Nur Team-Aufgaben können verteilt werden",
-    "assignedTo": "Zuweisen an",
+    "assignedTo": "Zugewiesen an",
     "assignedToUser": "<strong><%- userName %></strong> zugewiesen",
     "assignedToMembers": "<strong><%= userCount %></strong> Mitgliedern zugewiesen",
     "assignedToYouAndMembers": "Dir und <strong><%= userCount %> Mitliedern</strong> zugewiesen",
diff --git a/website/common/locales/en/front.json b/website/common/locales/en/front.json
index 086d3ce5a6..65b89d50b2 100644
--- a/website/common/locales/en/front.json
+++ b/website/common/locales/en/front.json
@@ -3,13 +3,13 @@
   "termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.",
   "chores": "Chores",
   "clearBrowserData": "Clear Browser Data",
-  "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Extensions</a>",
+  "communityExtensions": "Add-ons & Extensions",
   "communityFacebook": "Facebook",
   "communityInstagram": "Instagram",
   "companyAbout": "How It Works",
   "companyBlog": "Blog",
-  "companyContribute": "Contribute",
-  "companyDonate": "Donate",
+  "companyContribute": "Contributing to Habitica",
+  "companyDonate": "Donate to Habitica",
   "forgotPassword": "Forgot Password?",
   "emailNewPass": "Email a Password Reset Link",
   "forgotPasswordSteps": "Enter your username or the email address you used to register your Habitica account.",
@@ -18,6 +18,7 @@
   "footerCommunity": "Community",
   "footerCompany": "Company",
   "footerMobile": "Mobile",
+  "footerProduct": "Product",
   "footerSocial": "Social",
   "free": "Join for free",
   "guidanceForBlacksmiths": "Guidance for Blacksmiths",
@@ -51,8 +52,8 @@
   "marketing4Lead3-1": "Want to gamify your life?",
   "marketing4Lead3-2": "Interested in running a group in education, wellness, and more?",
   "marketing4Lead3Title": "Gamify Everything",
-  "mobileAndroid": "Android",
-  "mobileIOS": "iOS",
+  "mobileAndroid": "Android App",
+  "mobileIOS": "iOS App",
   "oldNews": "News",
   "newsArchive": "News archive on Wikia (multilingual)",
   "setNewPass": "Set New Password",
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index a9d0e6c007..443b4eb8e9 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -85,7 +85,8 @@
   "newBaileyUpdate": "New Bailey Update!",
   "tellMeLater": "Tell Me Later",
   "dismissAlert": "Dismiss This Alert",
-  "donateText3": "Habitica is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
+  "donateText3": "Habitica is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteers",
+  "helpSupportHabitica": "Help Support Habitica",
   "card": "Credit Card",
   "paymentMethods": "Purchase using",
   "paymentSuccessful": "Your payment was successful!",
diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json
index 92437a7f12..99143ddf3c 100644
--- a/website/common/locales/en/questsContent.json
+++ b/website/common/locales/en/questsContent.json
@@ -596,7 +596,7 @@
   "questHippoUnlockText": "Unlocks Hippo Eggs for purchase in the Market",
 
   "farmFriendsText": "Farm Friends Quest Bundle",
-  "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until August 31.",
+  "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until September 30.",
 
   "witchyFamiliarsText": "Witchy Familiars Quest Bundle",
   "witchyFamiliarsNotes": "Contains 'The Rat King', 'The Icy Arachnid', and 'Swamp of the Clutter Frog'. Available until October 31.",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index e7cc53175a..b199612950 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -172,7 +172,7 @@
     "couponCodeRequired": "The coupon code is required.",
     "subCanceledTitle": "Subscription Canceled",
     "choosePaymentMethod": "Choose your payment method",
-    "support": "SUPPORT",
+    "support": "Support",
     "supportHabitica": "Support Habitica",
     "gemBenefitLeadin": "What can you buy with Gems?",
     "gemBenefit1": "Unique and fashionable costumes for your avatar.",
diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index 77f1970eef..2bc8616497 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -987,39 +987,39 @@
     "headSpecialSummer2016RogueText": "Casco de Anguila",
     "headSpecialSummer2016RogueNotes": "Espía por entre las grietas de las rocas mientras usas este sigiloso casco. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2016.",
     "headSpecialSummer2016WarriorText": "Casco Tiburón",
-    "headSpecialSummer2016WarriorNotes": "¡Muerde esas tareas difíciles con este temible casco! Incrementa fuerza en <%= str %>. Edición Limitada 2016 Equipamiento de Verano.",
+    "headSpecialSummer2016WarriorNotes": "¡Muerde esas tareas difíciles con este temible casco! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2016.",
     "headSpecialSummer2016MageText": "Sombrero Espiráculo",
-    "headSpecialSummer2016MageNotes": "Agua mágica rocía constantemente de este sombrero. Incrementa Percepción en <%= per %>. Edición Limitada 2016 Equipamiento de Verano.",
+    "headSpecialSummer2016MageNotes": "Agua mágica rocía constantemente de este sombrero. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2016.",
     "headSpecialSummer2016HealerText": "Casco de Caballito de Mar",
-    "headSpecialSummer2016HealerNotes": "Este sombrero indica que su usuario fue entrenado por los Caballitos de Mar sanadores de Dilatory. Incrementa Inteligencia en <%= int %>. Edición Limitada 2016 Equipamiento de Verano.",
+    "headSpecialSummer2016HealerNotes": "Este sombrero indica que su usuario fue entrenado por los Caballitos de Mar sanadores de Dilatory. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2016.",
     "headSpecialFall2016RogueText": "Casco Viuda Negra",
-    "headSpecialFall2016RogueNotes": "Las patas en este casco están crispando constantemente. Incrementa la Percepción por <%= per %>. Equipamiento de Edición Limitada de Otoño 2016.",
+    "headSpecialFall2016RogueNotes": "Las patas en este casco están crispando constantemente. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2016.",
     "headSpecialFall2016WarriorText": "Casco de Corteza Nudosa",
-    "headSpecialFall2016WarriorNotes": "Este casco empapado en agua de pantano está cubierto con trocitos de ciénaga. Incrementa la Fuerza en <%= str %>. Equipamiento de Otoño Edición Limitada 2016.",
+    "headSpecialFall2016WarriorNotes": "Este casco empapado en agua de pantano está cubierto con trocitos de ciénaga. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2016.",
     "headSpecialFall2016MageText": "Capucha de Maldad",
-    "headSpecialFall2016MageNotes": "Oculta tus planes bajo esta capucha sombría. Incrementa la Percepción en <%= per %>. Equipamiento de Otoño, Edición Limitada 2016.",
+    "headSpecialFall2016MageNotes": "Oculta tus planes bajo esta capucha sombría. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2016.",
     "headSpecialFall2016HealerText": "Corona de Medusa",
-    "headSpecialFall2016HealerNotes": "Miseria a cualquiera te mire en los ojos... Incrementa la Inteligencia por <%= int %>. Equipamiento de Otoño Edición Limitada 2016.",
+    "headSpecialFall2016HealerNotes": "Miseria a cualquiera te mire en los ojos... Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2016.",
     "headSpecialNye2016Text": "Sombrero Extravagante de Fiesta",
-    "headSpecialNye2016Notes": "¡Has recibido el Sombrero Extravagante de Fiesta! ¡Llévalo con orgullo en el Nuevo Año! No proporciona ventajas.",
+    "headSpecialNye2016Notes": "¡Has recibido el Sombrero Extravagante de Fiesta! ¡Llévalo con orgullo en el año nuevo! No otorga ningún beneficio.",
     "headSpecialWinter2017RogueText": "Yelmo Helado",
-    "headSpecialWinter2017RogueNotes": "Hecho a partir de cristales de hielo, este yelmo te ayudará a pasar desapercibido por los paisajes invernales. Aumenta la Percepción en <%= per %>. Equipamiento Invernal Edición Limitada 2016-2017.",
+    "headSpecialWinter2017RogueNotes": "Hecho a partir de cristales de hielo, este yelmo te ayudará a pasar desapercibido por los paisajes invernales. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2016-2017.",
     "headSpecialWinter2017WarriorText": "Yelmo de Hockey",
-    "headSpecialWinter2017WarriorNotes": "¡Este yelmo es duro y duradero, hecho para soportar impactos de hielo o incluso de las tareas Diarias de color rojo oscuro! Aumenta la Fuerza en <%= str %>. Equipamiento Invernal Edición Limitada 2016-2017.",
+    "headSpecialWinter2017WarriorNotes": "¡Este yelmo es duro y duradero, hecho para soportar impactos de hielo o incluso de las tareas Diarias de color rojo oscuro! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de invierno 2016-2017.",
     "headSpecialWinter2017MageText": "Yelmo de Lobo Invernal",
-    "headSpecialWinter2017MageNotes": "Este yelmo, hecho a imagen del legendario Lobo Invernal, mantendrá tu cabeza caliente y tu visión aguda. Aumenta la Percepción en <%= per %>. Equipamiento Invernal Edición Limitada 2016-2017.",
+    "headSpecialWinter2017MageNotes": "Este yelmo, hecho a imagen del legendario Lobo Invernal, mantendrá tu cabeza caliente y tu visión aguda. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2016-2017.",
     "headSpecialWinter2017HealerText": "Yelmo de Flor Chispeante",
-    "headSpecialWinter2017HealerNotes": "¡Estos brillantes pétalos focalizan tu poder cerebral! Aumenta la Inteligencia en <%= int %>. Equipamiento Invernal Edición Limitada 2016-2017.",
+    "headSpecialWinter2017HealerNotes": "¡Estos brillantes pétalos focalizan tu poder cerebral! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2016-2017.",
     "headSpecialSpring2017RogueText": "Yelmo de Conejo Furtivo",
-    "headSpecialSpring2017RogueNotes": "¡Esta máscara impedirá que tu monería te traicione mientras te aproximas furtivamente a tus Diarias (o a los tréboles)! Aumenta la Percepción en <%= per %>. Equipamiento de Edición Limitada de primavera de 2017.",
+    "headSpecialSpring2017RogueNotes": "¡Esta máscara impedirá que tu monería te traicione mientras te aproximas furtivamente a tus Diarias (o a los tréboles)! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2017.",
     "headSpecialSpring2017WarriorText": "Yelmo Felino",
-    "headSpecialSpring2017WarriorNotes": "Proteje tu adorable y confusa cabeza con este yelmo finamente decorado. Aumenta la Fuerza en <%= str %>. Equipamiento de Edición Limitada de primavera de 2017.",
+    "headSpecialSpring2017WarriorNotes": "Proteje tu adorable y confusa cabeza con este yelmo finamente decorado. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2017.",
     "headSpecialSpring2017MageText": "Sombrero de Hechicero Canino",
-    "headSpecialSpring2017MageNotes": "Este sombrero puede ayudarte a lanzar poderosos hechizos... O simplemente puedes usarlo para invocar pelotas de tenis. A tu elección. Aumenta la Percepción en <%= per %>. Equipamiento de Edición Limitada de primavera de 2017.",
+    "headSpecialSpring2017MageNotes": "Este sombrero puede ayudarte a lanzar poderosos hechizos... O simplemente puedes usarlo para invocar pelotas de tenis. A tu elección. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2017.",
     "headSpecialSpring2017HealerText": "Diadema de Pétalos",
-    "headSpecialSpring2017HealerNotes": "Esta delicada corona emite el aroma reconfortante de las nuevas flores de primavera. Aumenta la inteligencia en <%= int %>. Equipamiento de Edición Limitada de primavera de 2017.",
+    "headSpecialSpring2017HealerNotes": "Esta delicada corona emite el aroma reconfortante de las nuevas flores de primavera. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2017.",
     "headSpecialSummer2017RogueText": "Yelmo de Dragón Marino",
-    "headSpecialSummer2017RogueNotes": "Este yelmo cambia de color ayudándote a camuflarte con el entorno. Aumenta la Percepción en <%= per %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017RogueNotes": "Este yelmo cambia de color ayudándote a camuflarte con el entorno. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017WarriorText": "Yelmo Castilloarena",
     "headSpecialSummer2017WarriorNotes": "El más fino yelmo que podrías esperar vestir... al menos, hasta que suba la marea. Aumenta la Fuerza en <%= str %>. Equipo de Edición Limitada Verano 2017.",
     "headSpecialSummer2017MageText": "Sombrero Torbellino",
diff --git a/website/common/locales/it/backgrounds.json b/website/common/locales/it/backgrounds.json
index 71088994d6..b33cb01299 100644
--- a/website/common/locales/it/backgrounds.json
+++ b/website/common/locales/it/backgrounds.json
@@ -721,5 +721,12 @@
     "backgroundRainbowEucalyptusText": "Eucalipto Arcobaleno",
     "backgroundByACampfireText": "Accanto ad un Falò",
     "backgroundRainbowEucalyptusNotes": "Ammira un boschetto di Eucalipto Arcobaleno.",
-    "backgroundMessyRoomNotes": "Riordina una Stanza Disordinata."
+    "backgroundMessyRoomNotes": "Riordina una Stanza Disordinata.",
+    "backgrounds092022": "SET 100: Rilasciato a settembre 2022",
+    "backgroundTheatreStageText": "Palcoscenico Teatrale",
+    "backgroundTheatreStageNotes": "Esibisciti su di un Palcoscenico Teatrale.",
+    "backgroundAutumnPicnicText": "Picnic Autunnale",
+    "backgroundAutumnPicnicNotes": "Goditi un Picnic Autunnale.",
+    "backgroundOldPhotoText": "Vecchia Foto",
+    "backgroundOldPhotoNotes": "Mettiti in posa in una Vecchia Foto."
 }
diff --git a/website/common/locales/it/gear.json b/website/common/locales/it/gear.json
index f37bd0f611..5cf5dd3aec 100644
--- a/website/common/locales/it/gear.json
+++ b/website/common/locales/it/gear.json
@@ -2694,5 +2694,9 @@
     "weaponMystery202209Text": "Manuale di Magia",
     "weaponMystery202209Notes": "Questo libro ti guiderà lungo il viaggio di apprendimento nella creazione di magie. Non conferisce alcun bonus. Oggetto abbonati settembre 2022.",
     "shieldMystery202209Notes": "Accrescere la tua conoscenza sulla magia richiede molto studio, ma puoi esser certo che apprezzerai la tua istruzione. Oggetto abbonati settembre 2022.",
-    "shieldMystery202209Text": "Pila di Libri Magici"
+    "shieldMystery202209Text": "Pila di Libri Magici",
+    "eyewearArmoireComedyMaskText": "Maschera della Commedia",
+    "eyewearArmoireTragedyMaskText": "Maschera della Tragedia",
+    "eyewearArmoireComedyMaskNotes": "Urrà! Ecco una maschera pittoresca per il vostro cuor contento, ludico, che esprime gaiezza ed ilarità sul palco. Aumenta la Costituzione di <%= con %>. Scrigno Incantato: Set Maschere Teatrali (oggetto 1 di 2).",
+    "eyewearArmoireTragedyMaskNotes": "Ahimè! Ecco una maschera gravosa per il vostro povero attore, impettito, afflitto, che esprime affanno e rammarico sul palco. Aumenta l'Intelligenza di <%= int %>. Scrigno Incantato: Set Maschere Teatrali (oggetto 2 di 2)."
 }
diff --git a/website/common/locales/ja/backgrounds.json b/website/common/locales/ja/backgrounds.json
index fb7d3f7b69..3673f3db75 100644
--- a/website/common/locales/ja/backgrounds.json
+++ b/website/common/locales/ja/backgrounds.json
@@ -721,5 +721,12 @@
     "backgroundByACampfireText": "キャンプファイアのかたわらで",
     "backgroundByACampfireNotes": "キャンプファイアの火にあたりましょう。",
     "backgroundRainbowEucalyptusText": "虹のユーカリ",
-    "backgroundRainbowEucalyptusNotes": "虹のユーカリの木立を鑑賞しましょう。"
+    "backgroundRainbowEucalyptusNotes": "虹のユーカリの木立を鑑賞しましょう。",
+    "backgrounds092022": "セット100：2022年9月リリース",
+    "backgroundTheatreStageText": "劇場の大舞台",
+    "backgroundTheatreStageNotes": "劇場の大舞台でパフォーマンスしよう。",
+    "backgroundAutumnPicnicText": "秋のピクニック",
+    "backgroundAutumnPicnicNotes": "秋のピクニックを楽しもう。",
+    "backgroundOldPhotoText": "古写真",
+    "backgroundOldPhotoNotes": "古写真風にポーズを決めよう。"
 }
diff --git a/website/common/locales/ja/gear.json b/website/common/locales/ja/gear.json
index be0002b0d9..9bcf0c4211 100644
--- a/website/common/locales/ja/gear.json
+++ b/website/common/locales/ja/gear.json
@@ -2694,5 +2694,9 @@
     "weaponMystery202209Text": "魔法マニュアル",
     "weaponMystery202209Notes": "魔法使いへの道のりへと、あなたを導くのがこの本です。効果なし。2022年9月の有料会員アイテム。",
     "shieldMystery202209Notes": "魔術の知識を身につけるには多くの本を読まなければいけませんが、その過程はきっと楽しいはず。効果なし。2022年9月有料会員アイテム。",
-    "shieldMystery202209Text": "山積みの魔法書"
+    "shieldMystery202209Text": "山積みの魔法書",
+    "eyewearArmoireComedyMaskText": "喜劇の仮面",
+    "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しよう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
+    "eyewearArmoireTragedyMaskText": "悲劇の仮面",
+    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しよう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
 }
diff --git a/website/common/locales/ja/generic.json b/website/common/locales/ja/generic.json
index 98738b9621..1bbaf073c2 100644
--- a/website/common/locales/ja/generic.json
+++ b/website/common/locales/ja/generic.json
@@ -175,8 +175,8 @@
     "self_care": "セルフケア",
     "habitica_official": "Habitica 公式",
     "academics": "学術分野",
-    "advocacy_causes": "主張・提言",
-    "entertainment": "エンタメ",
+    "advocacy_causes": "主義主張",
+    "entertainment": "エンターテイメント",
     "finance": "ファイナンス",
     "health_fitness": "健康・フィットネス",
     "hobbies_occupations": "ホビー・趣味",
diff --git a/website/common/locales/ja/quests.json b/website/common/locales/ja/quests.json
index fa487fc5d2..d50d61605a 100644
--- a/website/common/locales/ja/quests.json
+++ b/website/common/locales/ja/quests.json
@@ -17,7 +17,7 @@
     "invitedToQuest": "<span class=\"notification-bold-blue\"><%= quest %></span> クエストに招待されました",
     "askLater": "あとで答える",
     "buyQuest": "クエストを買う",
-    "accepted": "承認しました",
+    "accepted": "承認済み",
     "declined": "辞退済み",
     "rejected": "拒否しました",
     "pending": "保留",
diff --git a/website/common/locales/pt_BR/backgrounds.json b/website/common/locales/pt_BR/backgrounds.json
index 561ea373d3..0975219d32 100644
--- a/website/common/locales/pt_BR/backgrounds.json
+++ b/website/common/locales/pt_BR/backgrounds.json
@@ -717,5 +717,12 @@
     "backgroundByACampfireNotes": "Aqueça-se na faísca Perto de uma Fogueira.",
     "backgrounds082022": "Conjunto 99: Lançado em Agosto de 2022",
     "backgroundRainbowEucalyptusText": "Eucalipto Arco-íris",
-    "backgroundRainbowEucalyptusNotes": "Admire um bosque de Eucalipto Arco-íris."
+    "backgroundRainbowEucalyptusNotes": "Admire um bosque de Eucalipto Arco-íris.",
+    "backgrounds092022": "CONJUNTO 100: Lançado em setembro de 2022",
+    "backgroundOldPhotoNotes": "Faça uma pose em um Retrato Antigo.",
+    "backgroundOldPhotoText": "Retrato Antigo",
+    "backgroundAutumnPicnicNotes": "Aproveite um Piquenique de Outono.",
+    "backgroundAutumnPicnicText": "Piquenique de Outono",
+    "backgroundTheatreStageText": "Palco de Teatro",
+    "backgroundTheatreStageNotes": "Performe em um Palco de Teatro."
 }
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index a3a6cad844..484b60a3e5 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -2694,5 +2694,9 @@
     "weaponMystery202209Notes": "Este livro irá te guiar durante sua jornada de mágicas. Não confere benefícios. Item de Assinante de setembro de 2022",
     "shieldMystery202209Text": "Monte dos Livros Mágicos",
     "shieldMystery202209Notes": "Construir seu conhecimento sobre feitiçaria precisa de muita leitura, mas com certeza irá aproveitar sua educação. Não confere benefícios. Item de Assinante de setembro de 2022.",
-    "weaponMystery202209Text": "Manual Mágico"
+    "weaponMystery202209Text": "Manual Mágico",
+    "eyewearArmoireComedyMaskText": "Máscara da Comédia",
+    "eyewearArmoireComedyMaskNotes": "Com alegria! Aqui está uma máscara pitoresca para seu coração feliz, tocando, anunciando e expressando alegria no palco. Aumenta Constituição em <%= con %>. Armário Encantado: Conjunto Máscaras de Teatro (Item 1 de 2).",
+    "eyewearArmoireTragedyMaskText": "Máscara da Tragédia",
+    "eyewearArmoireTragedyMaskNotes": "Com lástima! Aqui está uma máscara pesada para seu pobre personagem, se escorando, se preocupando e expressando aflição e tristeza no palco. Aumenta Inteligência em <%= int %>. Armário Encantado: Conjunto Máscaras de Teatro (Item 2 de 2)."
 }
diff --git a/website/common/locales/ru/backgrounds.json b/website/common/locales/ru/backgrounds.json
index 4b5c57780e..cef11441a8 100644
--- a/website/common/locales/ru/backgrounds.json
+++ b/website/common/locales/ru/backgrounds.json
@@ -721,5 +721,12 @@
     "backgroundMountainWaterfallNotes": "Полюбуйтесь горным водопадом.",
     "backgroundSailboatAtSunsetText": "Парусник на закате",
     "backgroundSailboatAtSunsetNotes": "Насладитесь красотой парусника на закате.",
-    "backgrounds062022": "Набор 97: Выпущен в июне 2022"
+    "backgrounds062022": "Набор 97: Выпущен в июне 2022",
+    "backgrounds092022": "Набор 100 : Выпущен в сентябре 2022",
+    "backgroundTheatreStageText": "Театральная сцена",
+    "backgroundTheatreStageNotes": "Выступайте на театральной сцене.",
+    "backgroundAutumnPicnicText": "Осенний пикник",
+    "backgroundAutumnPicnicNotes": "Насладитесь осенним пикником.",
+    "backgroundOldPhotoText": "Старая фотография",
+    "backgroundOldPhotoNotes": "Примите таинственную позу на старом фото."
 }
diff --git a/website/common/locales/ru/groups.json b/website/common/locales/ru/groups.json
index 22ab631af6..1189eb7352 100644
--- a/website/common/locales/ru/groups.json
+++ b/website/common/locales/ru/groups.json
@@ -162,11 +162,11 @@
     "onlyCreatorOrAdminCanDeleteChat": "Вы не авторизованы чтобы удаить это сообщение!",
     "onlyGroupLeaderCanEditTasks": "Вы не авторизованы, чтобы редактировать задачи!",
     "onlyGroupTasksCanBeAssigned": "Можно назначать только командные задачи",
-    "assignedTo": "Назначить",
-    "assignedToUser": "Назначено для <strong><%- userName %></strong>",
-    "assignedToMembers": "Назначено <strong><%= userCount %> участникам</strong>",
-    "assignedToYouAndMembers": "Назначено вам и <strong><%= userCount %> участникам</strong>",
-    "youAreAssigned": "Назначено вам",
+    "assignedTo": "Назначено",
+    "assignedToUser": "Назначено для: <strong>@<%- userName %></strong>",
+    "assignedToMembers": "<%= userCount %> пользователям",
+    "assignedToYouAndMembers": "<strong>Вам</strong>, <%= userCount %> пользователям",
+    "youAreAssigned": "Назначено: <strong>вам</strong>",
     "taskIsUnassigned": "Эта задача не назначена",
     "confirmUnClaim": "Вы уверены, что хотите освободить эту задачу?",
     "confirmNeedsWork": "Вы уверены, что хотите пометить эту задачу как нуждающуюся в работе?",
@@ -183,7 +183,7 @@
     "removeClaim": "Удалить претензию",
     "onlyGroupLeaderCanManageSubscription": "Только предводитель группы может управлять общей подпиской",
     "yourTaskHasBeenApproved": "Ваше задание <span class=\"notification-green notification-bold\"><%- taskText %></span> было одобрено.",
-    "taskNeedsWork": "<span class=\"notification-bold\"><%- managerName %></span> отметил <span class=\"notification-bold\"><%- taskText %></span> как требующей дополнительной работы.",
+    "taskNeedsWork": "<span class=\"notification-bold\"><%- taskText %></span> отправлено на доработку <span class=\"notification-bold\">@<%- managerName %></span>. Ваши награды за выполнение задачи были аннулированы.",
     "userHasRequestedTaskApproval": "<span class=\"notification-bold\"><%- user %></span> просит одобрить <span class=\"notification-bold\"><%- taskName %></span>",
     "approve": "Одобрить",
     "approveTask": "Одобрить задание",
@@ -361,14 +361,14 @@
     "assignedDateOnly": "Назначено на <strong><%= date %></strong>",
     "cannotRemoveQuestOwner": "Вы не можете удалить владельца активного задания. Сначала отмените задание.",
     "blockYourself": "Вы не можете заблокировать себя",
-    "assignedDateAndUser": "Назначено <strong>@<%- username %></strong> на <strong><%= date %></strong>",
+    "assignedDateAndUser": "Назначено @<%- username %> на <%= date %>",
     "bannedWordsAllowedDetail": "Выбрав эту опцию, вы разрешаете использование запрещенных слов в этой гильдии.",
     "bannedWordsAllowed": "Разрешить запрещенные слова",
     "thisTaskApproved": "Это задание было одобрено",
     "giftMessageTooLong": "Максимальная длина поздравительных сообщений <%= maxGiftMessageLength %>.",
     "onlyPrivateGuildsCanUpgrade": "Только приватные гильдии могут быть улучшены до группы.",
     "managerNotes": "Заметки менеджера",
-    "chooseTeamMember": "Выберете члена команды",
+    "chooseTeamMember": "Найдите члена команды",
     "unassigned": "Не назначено",
     "viewDetails": "Посмотреть детали",
     "upgradeToGroup": "Улучшить до группы",
@@ -390,5 +390,9 @@
     "newGroupsWelcome": "Добро пожаловать в новый общий список задач!",
     "newGroupsWhatsNew": "Посмотрите, что нового:",
     "newGroupsBullet01": "Взаимодействуйте с задачами непосредственно через общий список задач",
-    "newGroupsBullet05": "Цвет общих задач будет меняться, если они не были завершены, чтобы было легче отслеживать прогресс"
+    "newGroupsBullet05": "Цвет общих задач будет меняться, если они не были завершены, чтобы было легче отслеживать прогресс",
+    "lastCompleted": "Последнее выполненное",
+    "newGroupsBullet06": "Просмотр статуса задания позволяет быстро увидеть, кто его выполнил",
+    "newGroupsBullet07": "Включите функцию отображения общих задач на вашей персональной доске задач",
+    "newGroupsBullet08": "Лидер группы и менеджеры могут быстро добавлять задачи из верхней части столбцов задач"
 }
diff --git a/website/common/locales/ru/settings.json b/website/common/locales/ru/settings.json
index 9713ee1169..1d9bc9585c 100644
--- a/website/common/locales/ru/settings.json
+++ b/website/common/locales/ru/settings.json
@@ -216,5 +216,6 @@
     "noGemTransactions": "У вас пока что нет переводов самоцветов.",
     "noHourglassTransactions": "У вас пока что нет переводов песочных часов.",
     "transaction_debug": "Действие по отладке",
-    "passwordSuccess": "Пароль успешно изменен"
+    "passwordSuccess": "Пароль успешно изменен",
+    "giftSubscriptionRateText": "<strong>$<%= price %> долларов США</strong> за <strong><%= months %> месяц(-а/-ев)</strong>"
 }
diff --git a/website/common/locales/ru/subscriber.json b/website/common/locales/ru/subscriber.json
index 1863652bfe..0346647337 100644
--- a/website/common/locales/ru/subscriber.json
+++ b/website/common/locales/ru/subscriber.json
@@ -211,5 +211,7 @@
     "mysterySet202204": "Набор виртуального искателя приключений",
     "mysterySet202205": "Набор крылатого сумеречного дракона",
     "mysterySet202206": "Набор Морской Феи",
-    "mysterySet202208": "Набор Задорный хвостик"
+    "mysterySet202208": "Набор Задорный хвостик",
+    "mysterySet202209": "Набор магического учёного",
+    "mysterySet202207": "Набор желейной медузы"
 }
diff --git a/website/common/locales/uk/backgrounds.json b/website/common/locales/uk/backgrounds.json
index ddb59fd512..7da88a1469 100644
--- a/website/common/locales/uk/backgrounds.json
+++ b/website/common/locales/uk/backgrounds.json
@@ -717,5 +717,12 @@
     "backgroundByACampfireNotes": "Грійтеся в сяйві поблизу багаття.",
     "backgrounds082022": "Набір 99: серпень 2022",
     "backgroundMessyRoomNotes": "Наведіть порядок у безладній кімнаті.",
-    "backgroundByACampfireText": "Біля багаття"
+    "backgroundByACampfireText": "Біля багаття",
+    "backgrounds092022": "Набір 100: вересень 2022",
+    "backgroundTheatreStageText": "Театральна сцена",
+    "backgroundTheatreStageNotes": "Зіграйте на театральній сцені.",
+    "backgroundAutumnPicnicText": "Осінній пікнік",
+    "backgroundAutumnPicnicNotes": "З'їздіть на осінній пікнік.",
+    "backgroundOldPhotoText": "Старе фото",
+    "backgroundOldPhotoNotes": "Прийміть загадкову позу на старому фото."
 }
diff --git a/website/common/locales/uk/gear.json b/website/common/locales/uk/gear.json
index effd40ceaf..c729b05ddd 100644
--- a/website/common/locales/uk/gear.json
+++ b/website/common/locales/uk/gear.json
@@ -3,7 +3,7 @@
     "equipmentType": "Тип",
     "klass": "Клас",
     "groupBy": "Групувати по <%= type %>",
-    "classBonus": "",
+    "classBonus": "(Цей предмет відповідає вашому класу, тому він отримує додатковий множник характеристик 1.5)",
     "classArmor": "Класова броня",
     "featuredset": "Рекомандований комплект <%= name %>",
     "mysterySets": "Містичний комплект",
@@ -11,7 +11,7 @@
     "noGearItemsOfType": "Ви не володієте жодним з цих предметів.",
     "noGearItemsOfClass": "Ви вже зібрали все спорядження для свого класу! Більше буде випущено до Великих Свят, під час сонцестояння та рівнодення.",
     "classLockedItem": "This item is only available to a specific class. Change your class under the User icon > Settings > Character Build!",
-    "tierLockedItem": "",
+    "tierLockedItem": "Цей товар доступний лише після того, як ви купите попередні товари з послідовності. Продовжуйте працювати!",
     "sortByType": "Тип",
     "sortByPrice": "Ціна",
     "sortByCon": "ВИТ",
@@ -79,19 +79,19 @@
     "weaponHealer6Text": "Золотий скіпетр",
     "weaponHealer6Notes": "Заспокоює біль тих, хто дивиться на нього. Збільшує Інтеллект на <%= int %>.",
     "weaponSpecial0Text": "Клинок чорних душ",
-    "weaponSpecial0Notes": "",
+    "weaponSpecial0Notes": "Поїдає життєву силу ворогів, щоб посилити свої злі удари. Збільшує силу на <%= str %>.",
     "weaponSpecial1Text": "Кришталевий клинок",
-    "weaponSpecial1Notes": "",
+    "weaponSpecial1Notes": "Його блискучі грані розповідають про героя. Збільшує всі характеристики на <%= attrs %>.",
     "weaponSpecial2Text": "Патериця дракона Стефана Вебера",
     "weaponSpecial2Notes": "Відчуйте могутність сили дракона! Збільшує силу та спритність на <%= attrs %>.",
     "weaponSpecial3Text": "Моргенштерн неперевної послідовності",
-    "weaponSpecial3Notes": "",
+    "weaponSpecial3Notes": "Із зустрічами, монстрами, нездужанням - покінчено! Стерто в пил! Збільшує силу, інтелект та витривалість на <%= attrs %>.",
     "weaponSpecialCriticalText": "Убивчий молот Баґо-руба",
-    "weaponSpecialCriticalNotes": "",
+    "weaponSpecialCriticalNotes": "Цей чемпіон убив критичного ворога GitHub, де полягло багато воїнів. Цей молот, виготовлений із кісток Жука, завдає потужного критичного удару. Збільшує силу та спритність на <%= attrs %>.",
     "weaponSpecialTakeThisText": "Візьміть Цей Меч",
-    "weaponSpecialTakeThisNotes": "",
-    "weaponSpecialTridentOfCrashingTidesText": "",
-    "weaponSpecialTridentOfCrashingTidesNotes": "",
+    "weaponSpecialTakeThisNotes": "Цей меч було отримано за участь у випробуванні, спонсорованому кампанією Take This. Щиро вітаємо! Збільшує всі характеристики на <%= attrs %>.",
+    "weaponSpecialTridentOfCrashingTidesText": "Тризуб руйнівних приливів",
+    "weaponSpecialTridentOfCrashingTidesNotes": "Дає вам можливість керувати рибами, а також наносити кілька могутніх ударів під час ваших завдань. Збільшує інтелект на <%= int %>.",
     "weaponSpecialTaskwoodsLanternText": "",
     "weaponSpecialTaskwoodsLanternNotes": "",
     "weaponSpecialBardInstrumentText": "Лютня Барда",
diff --git a/website/common/locales/uk/questscontent.json b/website/common/locales/uk/questscontent.json
index 6123039e96..a15e9888c7 100644
--- a/website/common/locales/uk/questscontent.json
+++ b/website/common/locales/uk/questscontent.json
@@ -1,5 +1,5 @@
 {
-    "questEvilSantaText": "Санта-Звіролов",
+    "questEvilSantaText": "Санта-Мисливець",
     "questEvilSantaNotes": "Ви чуєте агонізований рев глибоко в крижаних полях. Ви слідуєте за гарчанням, перерваним гудінням, - до галявини в лісі, де ви бачите повністю дорослого білого ведмедя. Він перебуває в клітках і в кайданах, бореться за своє життя. Танцює на верхній частині клітини злісний маленький чорт, одягнений у порваний костюм. Переможіть Санта-звіролова та рятуйте звіра! <br><br> <strong> Примітка </strong>: „Санта-звіролов” нагороджує досягнення, яке можна скласти, але дає рідкісне кріплення, яке можна додати до вашої стайні лише один раз.",
     "questEvilSantaCompletion": "Санта-звіролов сердито кричить і тікає в ніч. Вдячна ведмедиця крізь рев і гарчання намагається вам щось сказати. Ви повертаєте її до стайні, де Матвей, доглядач тварин, слухає її розповідь, зітхнувши від жаху. У неї є дитинча! Воно втекло на крижані поля, коли маму-ведмедицю схопили.",
     "questEvilSantaBoss": "Санта Звіролов",
@@ -17,7 +17,7 @@
     "questGryphonDropGryphonEgg": "Яйце ґрифона",
     "questGryphonUnlockText": "Відкриває покупні яйця грифона на ринку",
     "questHedgehogText": "Тинозвір",
-    "questHedgehogNotes": "",
+    "questHedgehogNotes": "Їжаки - веселі тваринки. Вони є одними з найбільш ласкавих домашніх улюбленців, які можуть бути у габітиканців. Але подейкують, якщо погодувати їх молоком після опівночі, вони стають досить дратівливими. І в п’ятдесят разів більшими. На жаль, <strong>InspectorCaracal</strong> зробив саме це. Ой-йой.",
     "questHedgehogCompletion": "Ваш гурт успішно заспокоїв Їжачиху! Вона зменшилася до нормального розміру та пошкутильгала до своїх яєць. Вона щось пищить та викочує деякі свої яйця до Вашого гурту. Будемо сподіватися, що ці їжачки полюблять молочко!",
     "questHedgehogBoss": "Тинозвір",
     "questHedgehogDropHedgehogEgg": "Яйце їжака",
@@ -29,14 +29,14 @@
     "questGhostStagDropDeerEgg": "Яйце оленя",
     "questGhostStagUnlockText": "Розблоковує оленячі яйця для придбання на ринку",
     "questRatText": "Щурячий король",
-    "questRatNotes": "",
-    "questRatCompletion": "",
+    "questRatNotes": "Сміття! Величезні купи невиконаних щоденок лежать по всій Габітиці. Проблема стала настільки серйозною, що натовпи пацюків тепер можна побачити повсюди. Ви помітили, як @Pandah ніжно гладить одного з них. Вона пояснює, що щури — це ніжні істоти, які харчуються невиконаними щоденками. Справжня проблема полягає в тому, що щоденки впали в каналізацію, утворивши небезпечний затор, який потрібно розчистити. Коли ви спускаєтесь у каналізацію, величезний щур із криваво-червоними очима та кривими жовтими зубами нападає на вас, захищаючи свою гору сміття. Чи вистачить вам сміливості, щоб зіткнутись з легендарним Щурячим королем?",
+    "questRatCompletion": "Ваш останній удар позбавив гігантського щура сили, його очі стали тьмяно-сірими. Звір розпадається на безліч крихітних мишенят, які злякано тікають геть. Ви помічаєте @Pandah, яка стоїть позаду вас і дивиться на колись могутню істоту. Вона пояснює, що жителі Habitica надихнулися вашою мужністю і швидко виконують усі свої щоденки. Вона попереджає вас, що ми повинні бути пильними, бо якщо ми ослабимо пильність, Щурячий король повернеться. В якості оплати @Pandah пропонує вам кілька щурячих яєць. Помітивши ваш неспокійний вираз обличчя, вона посміхається: «З них вилупляться чудові домашні тварини».",
     "questRatBoss": "Щурячий король",
     "questRatDropRatEgg": "Яйце щура",
     "questRatUnlockText": "Розблоковує щурячі яйця для придбання на ринку",
     "questOctopusText": "Поклик Октотулу",
     "questOctopusNotes": "@Urse, банькатий молодий писар, попрохав вас допомогти з оглядом таємничої печери на морському узбережжі. Серед напівтемних припливних озерцят стоїть величезна брама зі сталактитів та сталагмітів. Коли ви підходите ближче, унизу воріт починає кружляти темний вир. Ви з подивом дивитесь, як звідти вилазить спрутоподібний дракон. „Липке чадо зірок прокинулося“, — несамовито реве @Urse. „Через вігинтильйони років великий Октотулу знову вільний і спраглий до насолод!“",
-    "questOctopusCompletion": "",
+    "questOctopusCompletion": "З останнім ударом істота вислизає у вир, з якого вона прийшла. Ви не можете сказати, чи @Urse радий вашій перемозі чи засмучений тим, що звір йде. Ваш напарник без слів показує на три слизькі гігантські яйця в сусідній ямі, покладені в гніздо із золотими монетами. «Мабуть, це яйця восьминога», — нервово кажете ви. Коли ви повертаєтеся додому, @Urse несамовито строчить у щоденнику, і ви підозрюєте, що це не востаннє, коли ви чуєте про великого Октотулу.",
     "questOctopusBoss": "Октотулу",
     "questOctopusDropOctopusEgg": "Яйце спрута",
     "questOctopusUnlockText": "Відкриває покупні яйця восьминогів на ринку",
@@ -47,14 +47,14 @@
     "questHarpyDropParrotEgg": "Яйце папуги",
     "questHarpyUnlockText": "Розблоковує яйця папуг для придбання на ринку",
     "questRoosterText": "Півняче шаленство",
-    "questRoosterNotes": "",
+    "questRoosterNotes": "Протягом багатьох років фермер @extrajordanary використовував півнів як будильник. Але тепер з’явився гігантський когут, який кукурікає голосніше, ніж будь-хто раніше – і будить усіх в Габітиці! Позбавлені сну габітиканці важко справляються зі своїми повсякденними завданнями. @Pandoro вирішує, що настав час покласти цьому край. — Будь ласка, чи є хтось, хто навчить того Півника тихо кукурікати? Одного ранку ви вирушаєте добровольцем, щоб вгомонити півня, але він обертається, змахуючи гігантськими крилами й показуючи гострі пазурі, і кричить бойовий клич.",
     "questRoosterCompletion": "Силою та вправністю вам вдалося приборкати цю знавіснілу тварину. Вуха півня були забиті пір'ям та напівзабутими завданнями, але тепер вони чисті, як віночок. Він тихенько до вас сокоче, притулившись дзьобом до вашого плеча. Наступного дня ви якраз були зібралися в дорогу, аж підбігає до вас @EmeraldOx з укритим кошичком. „Стривайте! Сьогодні вранці півень припхав оце до дверей, де ви спали. Гадаю, він хоче, аби ви їх узяли.“ Ви розкриваєте кошик і бачите три охайні яєчка.",
     "questRoosterBoss": "Півень",
     "questRoosterDropRoosterEgg": "Яйце півня",
     "questRoosterUnlockText": "Розблоковує купівлю півнячих яєць на ринку",
     "questSpiderText": "Льодяний Арахнід",
     "questSpiderNotes": "Як тільки наступили холода, легенький іній почав з'являтись у хабітчанських вікнах у вигляді кружева павутинь... окрім Аркосінових, чиї вікна є повністю заморожені Морозяним Павуком, який зараз вирішує поселитись в його домі.",
-    "questSpiderCompletion": "",
+    "questSpiderCompletion": "Морозний павук падає, залишаючи за собою невелику купу інею та кілька зачарованих яєць. @Arcosine пропонує їх вам як нагороду — можливо, ви можете виростити небезпечних павуків як домашніх тварин?",
     "questSpiderBoss": "Павук",
     "questSpiderDropSpiderEgg": "Яйце павука",
     "questSpiderUnlockText": "Розблоковує купівлю павука в яйці на ринку",
@@ -97,7 +97,7 @@
     "questGoldenknight1Text": "Золотий лицар (частина 1): Сувора догана",
     "questGoldenknight1Notes": "Золотий Лицар завжди незадоволена бідними жителями Габітики. Не впоралися з усіма щоденними завданнями? Піддалися негативній звичці? Для неї це привід нагадати Вам, що Ви повинні наслідувати її. Вона – яскравий приклад ідеального габітиканця, а Ви - невдаха. Що ж, це зовсім не чемно! Усі роблять помилки, тому ви не повинні терпіти подібних обвинувачень. Напевно, настав час Вам зібрати скарги скривджених жителів країни Габітика і винести Золотому Лицареві сувору догану!",
     "questGoldenknight1CollectTestimony": "Скарги",
-    "questGoldenknight1Completion": "",
+    "questGoldenknight1Completion": "Подивіться на всі ці догани! Напевно, цього буде достатньо, щоб переконати Золотого Лицаря. Тепер все, що вам потрібно зробити, це знайти її.",
     "questGoldenknight1DropGoldenknight2Quest": "Золотий лицар (частина 2): Золотий лицар (сувій)",
     "questGoldenknight2Text": "Золотий лицар (частина 2): Золотий лицар",
     "questGoldenknight2Notes": "Озброївшись десятками скарг від габітиканців, Ви нарешті стоїте навпроти Золотого лицаря. Ви починаєте декламувати їй скарги жителів Габітики, одну за одною. «І @Pfeffernusse каже про твої постійні хвастощі…» Лицар піднімає руку, щоб змусити Вас замовкнути, і насміхається: «Будь ласка, ці люди просто заздрять моїм успіхам. Замість того, щоб скаржитися, вони повинні просто працювати так само наполегливо, як я! Можливо, мені варто показати вам силу, яку ви можете отримати завдяки працьовитості, як у мене!» Вона піднімає свій моргенштерн і готується напасти на Вас!",
@@ -114,11 +114,11 @@
     "questGroupEarnable": "Зароблені квести",
     "questBasilistText": "Спискозмій",
     "questBasilistNotes": "На ринку панує переполох — такий, що мав би змусити Вас тікати. Однак будучи сміливим шукачем пригод, Ви замість цього біжите назустріч і зустрічаєте Спискозмія, що утворений зі списків невиконаних справ! Габітиканці, що знаходяться поруч, паралізовані від страху довжиною Спискозмія. Вони не можуть почати працювати. Звідкись неподалік ви чуєте, як @Arcosine кричить: \"Швидко! Виконуйте свої завдання та щоденки, щоб знешкодити монстра, перш ніж він встигне порізати когось папером!\". Бийте швидко, шукачу пригод, і викреслюйте завдання, але будьте обережні - якщо Ви не виконаєте які-небудь щоденки, Спискозмій атакуватиме Вас і Вашу групу!",
-    "questBasilistCompletion": "",
+    "questBasilistCompletion": "Спискозмій розсипався на папірці всіх кольорів веселки. \"Вау!\" каже @Arcosine. — Добре, що ви були тут!\" Відчуваючи себе більш досвідченим, ніж раніше, ви знаходите трохи золота серед паперів.",
     "questBasilistBoss": "Спискозмій",
     "questEggHuntText": "Яйцелови",
     "questEggHuntNotes": "За ніч дивні яйця з’явилися скрізь: у стайні у Матвея, за прилавком у таверні і навіть серед яєць домашніх тварин на Ринку! Яка неприємність! \"Ніхто не знає, звідки вони з'явилися і що з них може вилупитися, - каже Меган, - але ми не можемо просто залишити їх валятися ось так! Наполегливо працюйте і шукайте, щоб допомогти мені зібрати ці таємничі яйця. Можливо, якщо Ви зберете достатньо, то щось знайдеться і для Вас...\"",
-    "questEggHuntCompletion": "",
+    "questEggHuntCompletion": "Ви зробили це! На знак подяки <strong>Меган</strong> дарує вам десять яєць. «Б’юся об заклад, що зілля вилуплення пофарбує їх у прекрасні кольори! І мені цікаво, що станеться, коли вони перетворяться на верхових тварин…»",
     "questEggHuntCollectPlainEgg": "Прості яйця",
     "questEggHuntDropPlainEgg": "Просте яйце",
     "questDilatoryText": "Жахливий Драк'он Неквапливості",
@@ -143,7 +143,7 @@
     "questAtom1Notes": "Ви добралися до берегів Чистого озера, щоб заслужено відпочити... Але озеро забруднене немитим посудом! Як таке могло трапитись? Що ж, Ви просто не дозволите, щоб озеро було у такому стані. Існує лише один вихід: помити посуд і врятувати це місце відпочинку! Варто пошукати якогось мила, щоб усе це перемити. Багато мила...",
     "questAtom1CollectSoapBars": "Брусочки мила",
     "questAtom1Drop": "Чудовисько озера Недої-Десс (сувій)",
-    "questAtom1Completion": "",
+    "questAtom1Completion": "Після ретельного миття весь посуд безпечно складений на березі! Ви стоїте осторонь і з гордістю оглядаєте свою важку роботу.",
     "questAtom2Text": "Битва з Буденністю (частина 2): Чудовисько озера Недої-Десс",
     "questAtom2Notes": "Хух, тут значно краще, коли увесь посуд чистий. Може, нарешті Ви можете трохи розважитися. Гей, по озері, здається, плаває коробка від піци. Залишилось прибрати ще її, еге ж? Однак, це не проста коробка від піци! Раптом коробка швидко підіймається і виявляється, що це голова чудовиська. Неймовірно! Легендарне чудовисько Недоїдессі?! Кажуть, начебто воно переховується в озері з прадавніх часів: істота, яка виникла із залишків їжі та сміття давніх габітиканців. Фе!",
     "questAtom2Boss": "Чудовисько Недоїдессі",
@@ -222,10 +222,10 @@
     "questKrakenCompletion": "",
     "questKrakenDropCuttlefishEgg": "Яйце каракатиці",
     "questKrakenUnlockText": "Яйця каракатиць розблоковуються для придбання на ринку",
-    "questWhaleText": "",
-    "questWhaleNotes": "",
+    "questWhaleText": "Стогін кита",
+    "questWhaleNotes": "Ви прибуваєте в Diligent Docks, сподіваючись сісти на підводний човен, щоб подивитися «Повільне дербі». Раптом оглушливий стогін змушує вас зупинитися й затулити вуха. \"Так вона голосить!\" — кричить капітан @krazjega, вказуючи на величезного кита, що ридає. «Небезпечно відправляти підводні човни, поки вона там!»<br><br>«Швидко», закликає @UncommonCriminal. «Допоможи мені заспокоїти бідолашну істоту, щоб ми могли зрозуміти, чому вона так шумить!»",
     "questWhaleBoss": "Плач Кита",
-    "questWhaleCompletion": "",
+    "questWhaleCompletion": "Після важкої праці кит нарешті припинила свій громовий рев. «Схоже, вона потонула у хвилях негативних звичок», — пояснює @zoebeagle. «Завдяки вашим послідовним зусиллям ми змогли переламати ситуацію!» Коли ви входите в підводний човен, кілька китових яєць підкочуються до вас, і ви їх підіймаєте.",
     "questWhaleDropWhaleEgg": "Яйце кита",
     "questWhaleUnlockText": "Розблоковує китові яйця для придбання на ринку",
     "questGroupDilatoryDistress": "Затяжна біда",
@@ -258,10 +258,10 @@
     "questCheetahBoss": "Гепард",
     "questCheetahDropCheetahEgg": "Яйце гепарда",
     "questCheetahUnlockText": "Відкриває яйця гепардів для придбання на ринку",
-    "questHorseText": "",
-    "questHorseNotes": "",
-    "questHorseCompletion": "",
-    "questHorseBoss": "",
+    "questHorseText": "КІНецЬ світу",
+    "questHorseNotes": "Під час відпочинку в таверні з @beffymaroo та @JessicaChase розмова перетворюється на добродушне вихваляння вашими пригодницькими досягненнями. Пишаючись своїми вчинками, і, можливо, трохи захопившись, ви хвалитеся тим, що можете приборкати будь-яке завдання. Незнайомець повертається до вас і посміхається. Одне око блищить, коли він запрошує вас довести свої слова, осідлавши його коня.\nКоли ви всі прямуєте до хліву, @UncommonCriminal шепоче: «Можливо, ви відкусили більше, ніж можете проковтнути. Це не кінь, а справжній КІН-ец-Ь!» Чуючи його тупіт копит, ви починаєте шкодувати про свої слова...",
+    "questHorseCompletion": "Від вас потрібні були всі ваші навички, але нарешті кінь тупоче своїми копитами і тикає вас носом у плече, перш ніж дозволити вам сісти верхи. Ви коротко, але гордо катаєтеся по території поблизу таверни, поки ваші друзі споглядають за вами. Незнайомець широко посміхається.\n«Я бачу, що це не було пустим вихвалянням! Ваша рішучість справді вражає. Візьміть ці яйця, щоб мати змогу виростити своїх коней, і, можливо, ми одного разу зустрінемося». Ви берете яйця, незнайомець знімає капелюх в знак пошани... і зникає.",
+    "questHorseBoss": "КІНецЬ",
     "questHorseDropHorseEgg": "Яйце коня",
     "questHorseUnlockText": "Розблоковує коні яйця для придбання на ринку",
     "questBurnoutText": "",
@@ -347,7 +347,7 @@
     "questTurtleText": "",
     "questTurtleNotes": "",
     "questTurtleCompletion": "",
-    "questTurtleBoss": "",
+    "questTurtleBoss": "Засмічене море",
     "questTurtleDropTurtleEgg": "Яйце черпахи",
     "questTurtleUnlockText": "Розблоковує купівлю черепахи в яйці на ринку",
     "questArmadilloText": "",
diff --git a/website/common/locales/zh/backgrounds.json b/website/common/locales/zh/backgrounds.json
index 751e9ab8dd..b2d57c860c 100644
--- a/website/common/locales/zh/backgrounds.json
+++ b/website/common/locales/zh/backgrounds.json
@@ -717,5 +717,12 @@
     "backgroundMessyRoomNotes": "收拾一间散乱房间。",
     "backgroundByACampfireText": "在硬货旁边",
     "backgrounds082022": "第99组：2022年8月推出",
-    "backgroundByACampfireNotes": "晒营火旁边的光。"
+    "backgroundByACampfireNotes": "晒营火旁边的光。",
+    "backgrounds092022": "第100组：2022年9月推出",
+    "backgroundTheatreStageText": "剧场舞台",
+    "backgroundTheatreStageNotes": "在剧场舞台上表演。",
+    "backgroundAutumnPicnicText": "秋季野餐",
+    "backgroundAutumnPicnicNotes": "享受秋季野餐。",
+    "backgroundOldPhotoText": "老照片",
+    "backgroundOldPhotoNotes": "在老照片里摆好姿势。"
 }
diff --git a/website/common/locales/zh/faq.json b/website/common/locales/zh/faq.json
index 0482a41ee6..d0085ede89 100644
--- a/website/common/locales/zh/faq.json
+++ b/website/common/locales/zh/faq.json
@@ -54,5 +54,6 @@
     "webFaqAnswer12": "世界Boss是出现在酒馆的特殊怪物。所有活跃的玩家都会自动参战，玩家们的完成的任务和技能都会对Boss造成伤害。你可以同时像平时那样开副本。你完成的任务和放的技能会同时被算入世界Boss以及你队伍副本的进度当中。世界Boss并不会对你或者你的号造成伤害。它会有一个怒气值，随着用户没完成的日常任务数量而增加。如果怒气槽满了，它会攻击一个本站的NPC并使这个NPC的形象发生变化。你可以前往维基了解更多关于[过去的世界Boss](https://habitica.fandom.com/zh/wiki/世界Boss)的信息。",
     "iosFaqStillNeedHelp": "如果[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在酒馆聊天中咨询。进入方式：菜单 > 酒馆！我们很乐意为你提供帮助。",
     "androidFaqStillNeedHelp": "如果[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在酒馆聊天中咨询。进入方式：菜单 > 酒馆！我们很乐意为你提供帮助。",
-    "webFaqStillNeedHelp": "如果问题列表和[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在[Habitica 帮助公会](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)中咨询。我们很乐意为你提供帮助。"
+    "webFaqStillNeedHelp": "如果问题列表和[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在[Habitica 帮助公会](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)中咨询。我们很乐意为你提供帮助。",
+    "faqQuestion13": "什么是团体计划？"
 }
diff --git a/website/common/locales/zh/gear.json b/website/common/locales/zh/gear.json
index fa43fa4040..6db98d4f82 100644
--- a/website/common/locales/zh/gear.json
+++ b/website/common/locales/zh/gear.json
@@ -2690,5 +2690,13 @@
     "eyewearMystery202208Text": "闪亮眼睛",
     "headMystery202208Text": "活泼马尾",
     "headMystery202208Notes": "享受炫耀这丰盈蓬松的头发 — 迫不得已的时候也可以是一根鞭子！没有属性加成。2022年8月订阅者物品。",
-    "eyewearMystery202208Notes": "用这双可爱到令人发指的眼睛让你的敌人产生一种虚假的安全感。没有属性加成。2022年8月订阅者物品。"
+    "eyewearMystery202208Notes": "用这双可爱到令人发指的眼睛让你的敌人产生一种虚假的安全感。没有属性加成。2022年8月订阅者物品。",
+    "weaponMystery202209Text": "魔法手册",
+    "weaponMystery202209Notes": "这本书将会指导你完成魔术的制作。没有属性加成。2022年9月订阅者物品。",
+    "shieldMystery202209Notes": "你必须大量的阅读书籍才能完成魔法的学习，但这个你会享受这个过程。没有属性加成。2022年9月订阅者物品。",
+    "eyewearArmoireComedyMaskNotes": "哦呼！这是一个为快乐心灵制作的古朴面具，让我们在舞台上表演，玩乐，表现出快乐和欢笑吧！增加<%= con %>点体质。魔法衣橱：剧院面具套装（1/2）。",
+    "eyewearArmoireTragedyMaskText": "悲剧面具",
+    "eyewearArmoireTragedyMaskNotes": "呜啊！为可怜的表演者戴上沉重的面具，在舞台上昂首阔步，痛苦，悲伤，表达出所有的难过吧。增加<%= int %>点智力。魔法衣橱：剧院面具套装（2/2）。",
+    "shieldMystery202209Text": "山脉魔法书",
+    "eyewearArmoireComedyMaskText": "喜剧面具"
 }
diff --git a/website/common/locales/zh/npc.json b/website/common/locales/zh/npc.json
index 1351abd14c..aa248fc071 100644
--- a/website/common/locales/zh/npc.json
+++ b/website/common/locales/zh/npc.json
@@ -18,8 +18,8 @@
     "welcomeToTavern": "欢迎来到酒馆！",
     "sleepDescription": "需要休息吗？来逛逛Daniel的客栈，当你遇到困难时，能暂停Habitica的游戏机制：",
     "sleepBullet1": "错过每日任务不会对你造成伤害",
-    "sleepBullet2": "任务不会失去连击数",
-    "sleepBullet3": "Boss不会因你错过每日任务而造成伤害",
+    "sleepBullet2": "您的任务连胜和习惯计数器不会重置",
+    "sleepBullet3": "在您退出客栈之前，您对副本boss的伤害和找到的手机项目将会一直保持等待状态",
     "sleepBullet4": "结算前这里会预测你对boss造成的伤害以及收集到的物品数量",
     "pauseDailies": "暂停伤害",
     "unpauseDailies": "解除暂停",
diff --git a/website/common/script/constants.js b/website/common/script/constants.js
index f2eb56a4c0..4e34c0ab0f 100644
--- a/website/common/script/constants.js
+++ b/website/common/script/constants.js
@@ -21,7 +21,6 @@ export const CHAT_FLAG_FROM_SHADOW_MUTE = 10;
 // @TODO use those constants to replace hard-coded numbers
 
 export const SUPPORTED_SOCIAL_NETWORKS = [
-  { key: 'facebook', name: 'Facebook' },
   { key: 'google', name: 'Google' },
   { key: 'apple', name: 'Apple' },
 ];
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 42357c24d6..6f9e97ac26 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -52,8 +52,9 @@ const bundles = {
       'horse',
       'sheep',
     ],
+    event: EVENTS.bundle202209,
     canBuy () {
-      return moment().isBetween('2019-08-08', '2019-09-02');
+      return moment().isBetween(EVENTS.bundle202209.start, EVENTS.bundle202209.end);
     },
     type: 'quests',
     value: 7,
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index b1dfaeff63..49cb72cac6 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -15,6 +15,12 @@ export const EVENTS = {
     season: 'normal',
     npcImageSuffix: '',
   },
+  bundle202209: {
+    start: '2022-09-13T08:00-04:00',
+    end: '2022-09-30T20:00-04:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
   potions202208: {
     start: '2022-08-16T08:00-04:00',
     end: '2022-08-31T20:00-04:00',
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index b6e4e0705d..f79f352b6e 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -32,11 +32,11 @@ const featuredItems = {
       },
       {
         type: 'food',
-        path: 'food.RottenMeat',
+        path: 'food.Potatoe',
       },
       {
         type: 'hatchingPotions',
-        path: 'hatchingPotions.Zombie',
+        path: 'hatchingPotions.Desert',
       },
       {
         type: 'eggs',
@@ -45,26 +45,26 @@ const featuredItems = {
     ];
   },
   quests () {
-    if (moment().isBetween(EVENTS.bundle202208.start, EVENTS.bundle202208.end)) {
+    if (moment().isBetween(EVENTS.bundle202208.start, EVENTS.bundle202209.end)) {
       return [
         {
           type: 'bundles',
           path: 'bundles.forestFriends',
         },
         {
-          type: 'quests',
-          path: 'quests.owl',
+          type: 'bundles',
+          path: 'bundles.farmFriends',
         },
         {
           type: 'quests',
-          path: 'quests.snail',
+          path: 'quests.ferret',
         },
       ];
     }
     return [
       {
         type: 'quests',
-        path: 'quests.badger',
+        path: 'quests.guineapig',
       },
       {
         type: 'quests',
diff --git a/website/server/libs/auth/index.js b/website/server/libs/auth/index.js
index 30a5e70b15..bd5248c3f7 100644
--- a/website/server/libs/auth/index.js
+++ b/website/server/libs/auth/index.js
@@ -161,13 +161,16 @@ async function registerLocal (req, res, { isV3 = false }) {
   };
 
   if (existingUser) {
-    const hasSocialAuth = common.constants.SUPPORTED_SOCIAL_NETWORKS.find(network => {
+    const networks = common.constants.SUPPORTED_SOCIAL_NETWORKS;
+    // need to insert FB here to allow users who only have FB auth to connect local auth.
+    networks.push({ key: 'facebook', name: 'Facebook' });
+    const hasSocialAuth = networks.find(network => {
       if (existingUser.auth.hasOwnProperty(network.key)) { // eslint-disable-line no-prototype-builtins, max-len
         return existingUser.auth[network.key].id;
       }
       return false;
     });
-    if (!hasSocialAuth) throw new NotAuthorized(res.t('onlySocialAttachLocal'));
+    if (!hasSocialAuth && existingUser.auth.local.hashed_password) throw new NotAuthorized(res.t('onlySocialAttachLocal'));
     existingUser.auth.local = newUser.auth.local;
     newUser = existingUser;
   } else {
diff --git a/website/server/libs/auth/social.js b/website/server/libs/auth/social.js
index ec018f4893..36a0d8301d 100644
--- a/website/server/libs/auth/social.js
+++ b/website/server/libs/auth/social.js
@@ -60,11 +60,6 @@ export async function loginSocial (req, res) { // eslint-disable-line import/pre
     [`auth.${network}.id`]: profile.id,
   }, { _id: 1, apiToken: 1, auth: 1 }).exec();
 
-  let email;
-  if (profile.emails && profile.emails[0] && profile.emails[0].value) {
-    email = profile.emails[0].value.toLowerCase();
-  }
-
   // User already signed up
   if (user) {
     if (existingUser) {
@@ -79,6 +74,11 @@ export async function loginSocial (req, res) { // eslint-disable-line import/pre
     return loginRes(user, req, res);
   }
 
+  let email;
+  if (profile.emails && profile.emails[0] && profile.emails[0].value) {
+    email = profile.emails[0].value.toLowerCase();
+  }
+
   if (!existingUser && email) {
     existingUser = await User.findOne({ 'auth.local.email': email }).exec();
   }
diff --git a/website/server/libs/setupPassport.js b/website/server/libs/setupPassport.js
index 6520d07df8..69a776625f 100644
--- a/website/server/libs/setupPassport.js
+++ b/website/server/libs/setupPassport.js
@@ -1,6 +1,5 @@
 import passport from 'passport';
 import nconf from 'nconf';
-import { Strategy as FacebookStrategy } from 'passport-facebook';
 import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
 
 // Passport session setup.
@@ -13,20 +12,6 @@ import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
 passport.serializeUser((user, done) => done(null, user));
 passport.deserializeUser((obj, done) => done(null, obj));
 
-// TODO remove?
-// This auth strategy is no longer used.
-// It's just kept around for auth.js#loginFacebook() (passport._strategies.facebook.userProfile)
-// The proper fix would be to move to a general OAuth module simply to verify accessTokens
-passport.use(new FacebookStrategy({
-  clientID: nconf.get('FACEBOOK_KEY'),
-  clientSecret: nconf.get('FACEBOOK_SECRET'),
-  profileFields: ['id', 'email', 'displayName'],
-  profileURL: 'https://graph.facebook.com/v2.8/me',
-  authorizationURL: 'https://www.facebook.com/v2.8/dialog/oauth',
-  tokenURL: 'https://graph.facebook.com/v2.8/oauth/access_token',
-  // callbackURL: nconf.get("BASE_URL") + "/auth/facebook/callback"
-}, (accessToken, refreshToken, profile, done) => done(null, profile)));
-
 passport.use(new GoogleStrategy({
   clientID: nconf.get('GOOGLE_CLIENT_ID'),
   clientSecret: nconf.get('GOOGLE_CLIENT_SECRET'),

From 13eef6e4cf78ff3fc2d42f7fc905736ac2793751 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 19 Sep 2022 15:10:11 -0400
Subject: [PATCH 045/134] chore: merge develop

---
 package-lock.json                | 1091 +++++++++++++++++++++---------
 package.json                     |    6 +-
 website/client/package-lock.json |   75 +-
 website/client/package.json      |   10 +-
 4 files changed, 838 insertions(+), 344 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54b6165b1d..a8df13057e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -205,14 +205,14 @@
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
@@ -240,32 +240,101 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz",
-      "integrity": "sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
         "@babel/helper-member-expression-to-functions": "^7.18.9",
         "@babel/helper-optimise-call-expression": "^7.18.6",
         "@babel/helper-replace-supers": "^7.18.9",
         "@babel/helper-split-export-declaration": "^7.18.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/types": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.18.10",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz",
-      "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "regexpu-core": "^5.1.0"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz",
-      "integrity": "sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
       "requires": {
         "@babel/helper-compilation-targets": "^7.17.7",
         "@babel/helper-plugin-utils": "^7.16.7",
@@ -338,14 +407,14 @@
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
@@ -403,9 +472,9 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
-      "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
     },
     "@babel/helper-remap-async-to-generator": {
       "version": "7.18.9",
@@ -419,14 +488,14 @@
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
@@ -436,31 +505,120 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz",
-      "integrity": "sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-member-expression-to-functions": "^7.18.9",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.19.1",
+        "@babel/types": "^7.19.0"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
+        "@babel/code-frame": {
           "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+          "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+          "requires": {
+            "@babel/types": "^7.19.0",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+          "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.19.0",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.19.1",
+            "@babel/types": "^7.19.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
             "to-fast-properties": "^2.0.0"
           }
+        },
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
         }
       }
     },
@@ -481,14 +639,14 @@
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
@@ -521,14 +679,14 @@
       "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.18.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz",
-      "integrity": "sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
       "requires": {
-        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.18.11",
-        "@babel/types": "^7.18.10"
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -539,10 +697,29 @@
             "@babel/highlight": "^7.18.6"
           }
         },
+        "@babel/generator": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+          "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+          "requires": {
+            "@babel/types": "^7.19.0",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/highlight": {
           "version": "7.18.6",
@@ -555,9 +732,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.18.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz",
-          "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
         },
         "@babel/template": {
           "version": "7.18.10",
@@ -569,16 +746,43 @@
             "@babel/types": "^7.18.10"
           }
         },
+        "@babel/traverse": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+          "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.19.0",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.19.1",
+            "@babel/types": "^7.19.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
             "to-fast-properties": "^2.0.0"
           }
         },
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        },
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -664,12 +868,12 @@
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz",
-      "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
+      "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-remap-async-to-generator": "^7.18.9",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
@@ -962,18 +1166,134 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz",
-      "integrity": "sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-compilation-targets": "^7.19.0",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-replace-supers": "^7.18.9",
         "@babel/helper-split-export-declaration": "^7.18.6",
         "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/compat-data": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
+          "integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg=="
+        },
+        "@babel/helper-compilation-targets": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
+          "integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
+          "requires": {
+            "@babel/compat-data": "^7.19.1",
+            "@babel/helper-validator-option": "^7.18.6",
+            "browserslist": "^4.21.3",
+            "semver": "^6.3.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/types": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.18.10",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "browserslist": {
+          "version": "4.21.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+          "requires": {
+            "caniuse-lite": "^1.0.30001400",
+            "electron-to-chromium": "^1.4.251",
+            "node-releases": "^2.0.6",
+            "update-browserslist-db": "^1.0.9"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001405",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001405.tgz",
+          "integrity": "sha512-lbm+F6HaYFGfjejrTlgB6IZQSZjpA1qcrjGsuvecatP93emI66a41hmQJIW+KNMhcuusgQW0R0E9qvP+Hq7eLg=="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "update-browserslist-db": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+          "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+          "requires": {
+            "escalade": "^3.1.1",
+            "picocolors": "^1.0.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-computed-properties": {
@@ -985,9 +1305,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz",
-      "integrity": "sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==",
+      "version": "7.18.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz",
+      "integrity": "sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.18.9"
       }
@@ -1074,21 +1394,135 @@
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz",
-      "integrity": "sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
+      "integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
       "requires": {
         "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-validator-identifier": "^7.18.6",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
+        "@babel/code-frame": {
           "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+          "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+          "requires": {
+            "@babel/types": "^7.19.0",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+          "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-module-imports": "^7.18.6",
+            "@babel/helper-simple-access": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/template": "^7.18.10",
+            "@babel/traverse": "^7.19.0",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+          "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.19.0",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.19.1",
+            "@babel/types": "^7.19.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.18.10",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
         }
       }
     },
@@ -1102,12 +1536,12 @@
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz",
-      "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
     "@babel/plugin-transform-new-target": {
@@ -1169,11 +1603,11 @@
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz",
-      "integrity": "sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
       }
     },
@@ -1219,17 +1653,17 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz",
-      "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz",
+      "integrity": "sha512-c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA==",
       "requires": {
-        "@babel/compat-data": "^7.18.8",
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/compat-data": "^7.19.1",
+        "@babel/helper-compilation-targets": "^7.19.1",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-validator-option": "^7.18.6",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.18.10",
+        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
         "@babel/plugin-proposal-class-static-block": "^7.18.6",
         "@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -1263,9 +1697,9 @@
         "@babel/plugin-transform-async-to-generator": "^7.18.6",
         "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
         "@babel/plugin-transform-block-scoping": "^7.18.9",
-        "@babel/plugin-transform-classes": "^7.18.9",
+        "@babel/plugin-transform-classes": "^7.19.0",
         "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.18.9",
+        "@babel/plugin-transform-destructuring": "^7.18.13",
         "@babel/plugin-transform-dotall-regex": "^7.18.6",
         "@babel/plugin-transform-duplicate-keys": "^7.18.9",
         "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
@@ -1275,9 +1709,9 @@
         "@babel/plugin-transform-member-expression-literals": "^7.18.6",
         "@babel/plugin-transform-modules-amd": "^7.18.6",
         "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.18.9",
+        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
         "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
         "@babel/plugin-transform-new-target": "^7.18.6",
         "@babel/plugin-transform-object-super": "^7.18.6",
         "@babel/plugin-transform-parameters": "^7.18.8",
@@ -1285,40 +1719,81 @@
         "@babel/plugin-transform-regenerator": "^7.18.6",
         "@babel/plugin-transform-reserved-words": "^7.18.6",
         "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.18.9",
+        "@babel/plugin-transform-spread": "^7.19.0",
         "@babel/plugin-transform-sticky-regex": "^7.18.6",
         "@babel/plugin-transform-template-literals": "^7.18.9",
         "@babel/plugin-transform-typeof-symbol": "^7.18.9",
         "@babel/plugin-transform-unicode-escapes": "^7.18.10",
         "@babel/plugin-transform-unicode-regex": "^7.18.6",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.18.10",
-        "babel-plugin-polyfill-corejs2": "^0.3.2",
-        "babel-plugin-polyfill-corejs3": "^0.5.3",
-        "babel-plugin-polyfill-regenerator": "^0.4.0",
-        "core-js-compat": "^3.22.1",
+        "@babel/types": "^7.19.0",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "core-js-compat": "^3.25.1",
         "semver": "^6.3.0"
       },
       "dependencies": {
+        "@babel/compat-data": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
+          "integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg=="
+        },
+        "@babel/helper-compilation-targets": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
+          "integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
+          "requires": {
+            "@babel/compat-data": "^7.19.1",
+            "@babel/helper-validator-option": "^7.18.6",
+            "browserslist": "^4.21.3",
+            "semver": "^6.3.0"
+          }
+        },
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
             "to-fast-properties": "^2.0.0"
           }
         },
+        "browserslist": {
+          "version": "4.21.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+          "requires": {
+            "caniuse-lite": "^1.0.30001400",
+            "electron-to-chromium": "^1.4.251",
+            "node-releases": "^2.0.6",
+            "update-browserslist-db": "^1.0.9"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001405",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001405.tgz",
+          "integrity": "sha512-lbm+F6HaYFGfjejrTlgB6IZQSZjpA1qcrjGsuvecatP93emI66a41hmQJIW+KNMhcuusgQW0R0E9qvP+Hq7eLg=="
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "update-browserslist-db": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+          "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+          "requires": {
+            "escalade": "^3.1.1",
+            "picocolors": "^1.0.0"
+          }
         }
       }
     },
@@ -1347,9 +1822,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
-      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
+      "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
@@ -1502,6 +1977,12 @@
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
     },
+    "@esbuild/linux-loong64": {
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.7.tgz",
+      "integrity": "sha512-IKznSJOsVUuyt7cDzzSZyqBEcZe+7WlBqTVXiF1OXP/4Nm387ToaXZ0fyLwI1iBlI/bzpxVq411QE2/Bt2XWWw==",
+      "optional": true
+    },
     "@google-cloud/common": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.8.1.tgz",
@@ -1880,9 +2361,9 @@
       }
     },
     "@types/eslint": {
-      "version": "8.4.5",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
-      "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
+      "version": "8.4.6",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
+      "integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -2377,9 +2858,9 @@
       }
     },
     "apidoc": {
-      "version": "0.52.0",
-      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.52.0.tgz",
-      "integrity": "sha512-k0gaMI7LWxaqKt2D+twC6XpI8X5SHkJalfo8TmF72d2TSNABquqB8LyIrVYzLcadcHuLMRFDaDibOK271gD67w==",
+      "version": "0.53.0",
+      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.53.0.tgz",
+      "integrity": "sha512-H4hYToCrI6TgSksdVHxS7h5/Xoqr/rR9m9/IOQaYqXbX07cPVbg0O3RM4+bR4tJKG1aqBWKKm+xojQ8+4i7O5A==",
       "requires": {
         "bootstrap": "3.4.1",
         "commander": "^8.3.0",
@@ -3008,12 +3489,12 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz",
-      "integrity": "sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
       "requires": {
         "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.2",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
         "semver": "^6.1.1"
       },
       "dependencies": {
@@ -3025,20 +3506,20 @@
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz",
-      "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.2",
-        "core-js-compat": "^3.21.0"
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "core-js-compat": "^3.25.1"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz",
-      "integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.2"
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
       }
     },
     "babel-runtime": {
@@ -4738,39 +5219,33 @@
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.24.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz",
-      "integrity": "sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==",
+      "version": "3.25.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
+      "integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
       "requires": {
-        "browserslist": "^4.21.3",
-        "semver": "7.0.0"
+        "browserslist": "^4.21.4"
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.21.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
-          "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+          "version": "4.21.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
           "requires": {
-            "caniuse-lite": "^1.0.30001370",
-            "electron-to-chromium": "^1.4.202",
+            "caniuse-lite": "^1.0.30001400",
+            "electron-to-chromium": "^1.4.251",
             "node-releases": "^2.0.6",
-            "update-browserslist-db": "^1.0.5"
+            "update-browserslist-db": "^1.0.9"
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001376",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001376.tgz",
-          "integrity": "sha512-I27WhtOQ3X3v3it9gNs/oTpoE5KpwmqKR5oKPA8M0G7uMXh9Ty81Q904HpKUrM30ei7zfcL5jE7AXefgbOfMig=="
-        },
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
+          "version": "1.0.30001405",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001405.tgz",
+          "integrity": "sha512-lbm+F6HaYFGfjejrTlgB6IZQSZjpA1qcrjGsuvecatP93emI66a41hmQJIW+KNMhcuusgQW0R0E9qvP+Hq7eLg=="
         },
         "update-browserslist-db": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
-          "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+          "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
           "requires": {
             "escalade": "^3.1.1",
             "picocolors": "^1.0.0"
@@ -5534,9 +6009,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.4.219",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.219.tgz",
-      "integrity": "sha512-zoQJsXOUw0ZA0YxbjkmzBumAJRtr6je5JySuL/bAoFs0DuLiLJ+5FzRF7/ZayihxR2QcewlRZVm5QZdUhwjOgA=="
+      "version": "1.4.254",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz",
+      "integrity": "sha512-Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q=="
     },
     "emitter-listener": {
       "version": "1.1.2",
@@ -5687,122 +6162,123 @@
       }
     },
     "esbuild": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.49.tgz",
-      "integrity": "sha512-/TlVHhOaq7Yz8N1OJrjqM3Auzo5wjvHFLk+T8pIue+fhnhIMpfAzsG6PLVMbFveVxqD2WOp3QHei+52IMUNmCw==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.7.tgz",
+      "integrity": "sha512-7V8tzllIbAQV1M4QoE52ImKu8hT/NLGlGXkiDsbEU5PS6K8Mn09ZnYoS+dcmHxOS9CRsV4IRAMdT3I67IyUNXw==",
       "requires": {
-        "esbuild-android-64": "0.14.49",
-        "esbuild-android-arm64": "0.14.49",
-        "esbuild-darwin-64": "0.14.49",
-        "esbuild-darwin-arm64": "0.14.49",
-        "esbuild-freebsd-64": "0.14.49",
-        "esbuild-freebsd-arm64": "0.14.49",
-        "esbuild-linux-32": "0.14.49",
-        "esbuild-linux-64": "0.14.49",
-        "esbuild-linux-arm": "0.14.49",
-        "esbuild-linux-arm64": "0.14.49",
-        "esbuild-linux-mips64le": "0.14.49",
-        "esbuild-linux-ppc64le": "0.14.49",
-        "esbuild-linux-riscv64": "0.14.49",
-        "esbuild-linux-s390x": "0.14.49",
-        "esbuild-netbsd-64": "0.14.49",
-        "esbuild-openbsd-64": "0.14.49",
-        "esbuild-sunos-64": "0.14.49",
-        "esbuild-windows-32": "0.14.49",
-        "esbuild-windows-64": "0.14.49",
-        "esbuild-windows-arm64": "0.14.49"
+        "@esbuild/linux-loong64": "0.15.7",
+        "esbuild-android-64": "0.15.7",
+        "esbuild-android-arm64": "0.15.7",
+        "esbuild-darwin-64": "0.15.7",
+        "esbuild-darwin-arm64": "0.15.7",
+        "esbuild-freebsd-64": "0.15.7",
+        "esbuild-freebsd-arm64": "0.15.7",
+        "esbuild-linux-32": "0.15.7",
+        "esbuild-linux-64": "0.15.7",
+        "esbuild-linux-arm": "0.15.7",
+        "esbuild-linux-arm64": "0.15.7",
+        "esbuild-linux-mips64le": "0.15.7",
+        "esbuild-linux-ppc64le": "0.15.7",
+        "esbuild-linux-riscv64": "0.15.7",
+        "esbuild-linux-s390x": "0.15.7",
+        "esbuild-netbsd-64": "0.15.7",
+        "esbuild-openbsd-64": "0.15.7",
+        "esbuild-sunos-64": "0.15.7",
+        "esbuild-windows-32": "0.15.7",
+        "esbuild-windows-64": "0.15.7",
+        "esbuild-windows-arm64": "0.15.7"
       }
     },
     "esbuild-android-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.49.tgz",
-      "integrity": "sha512-vYsdOTD+yi+kquhBiFWl3tyxnj2qZJsl4tAqwhT90ktUdnyTizgle7TjNx6Ar1bN7wcwWqZ9QInfdk2WVagSww==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.7.tgz",
+      "integrity": "sha512-p7rCvdsldhxQr3YHxptf1Jcd86dlhvc3EQmQJaZzzuAxefO9PvcI0GLOa5nCWem1AJ8iMRu9w0r5TG8pHmbi9w==",
       "optional": true
     },
     "esbuild-android-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.49.tgz",
-      "integrity": "sha512-g2HGr/hjOXCgSsvQZ1nK4nW/ei8JUx04Li74qub9qWrStlysaVmadRyTVuW32FGIpLQyc5sUjjZopj49eGGM2g==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.7.tgz",
+      "integrity": "sha512-L775l9ynJT7rVqRM5vo+9w5g2ysbOCfsdLV4CWanTZ1k/9Jb3IYlQ06VCI1edhcosTYJRECQFJa3eAvkx72eyQ==",
       "optional": true
     },
     "esbuild-darwin-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.49.tgz",
-      "integrity": "sha512-3rvqnBCtX9ywso5fCHixt2GBCUsogNp9DjGmvbBohh31Ces34BVzFltMSxJpacNki96+WIcX5s/vum+ckXiLYg==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.7.tgz",
+      "integrity": "sha512-KGPt3r1c9ww009t2xLB6Vk0YyNOXh7hbjZ3EecHoVDxgtbUlYstMPDaReimKe6eOEfyY4hBEEeTvKwPsiH5WZg==",
       "optional": true
     },
     "esbuild-darwin-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.49.tgz",
-      "integrity": "sha512-XMaqDxO846srnGlUSJnwbijV29MTKUATmOLyQSfswbK/2X5Uv28M9tTLUJcKKxzoo9lnkYPsx2o8EJcTYwCs/A==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.7.tgz",
+      "integrity": "sha512-kBIHvtVqbSGajN88lYMnR3aIleH3ABZLLFLxwL2stiuIGAjGlQW741NxVTpUHQXUmPzxi6POqc9npkXa8AcSZQ==",
       "optional": true
     },
     "esbuild-freebsd-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.49.tgz",
-      "integrity": "sha512-NJ5Q6AjV879mOHFri+5lZLTp5XsO2hQ+KSJYLbfY9DgCu8s6/Zl2prWXVANYTeCDLlrIlNNYw8y34xqyLDKOmQ==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.7.tgz",
+      "integrity": "sha512-hESZB91qDLV5MEwNxzMxPfbjAhOmtfsr9Wnuci7pY6TtEh4UDuevmGmkUIjX/b+e/k4tcNBMf7SRQ2mdNuK/HQ==",
       "optional": true
     },
     "esbuild-freebsd-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.49.tgz",
-      "integrity": "sha512-lFLtgXnAc3eXYqj5koPlBZvEbBSOSUbWO3gyY/0+4lBdRqELyz4bAuamHvmvHW5swJYL7kngzIZw6kdu25KGOA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.7.tgz",
+      "integrity": "sha512-dLFR0ChH5t+b3J8w0fVKGvtwSLWCv7GYT2Y2jFGulF1L5HftQLzVGN+6pi1SivuiVSmTh28FwUhi9PwQicXI6Q==",
       "optional": true
     },
     "esbuild-linux-32": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.49.tgz",
-      "integrity": "sha512-zTTH4gr2Kb8u4QcOpTDVn7Z8q7QEIvFl/+vHrI3cF6XOJS7iEI1FWslTo3uofB2+mn6sIJEQD9PrNZKoAAMDiA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.7.tgz",
+      "integrity": "sha512-v3gT/LsONGUZcjbt2swrMjwxo32NJzk+7sAgtxhGx1+ZmOFaTRXBAi1PPfgpeo/J//Un2jIKm/I+qqeo4caJvg==",
       "optional": true
     },
     "esbuild-linux-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.49.tgz",
-      "integrity": "sha512-hYmzRIDzFfLrB5c1SknkxzM8LdEUOusp6M2TnuQZJLRtxTgyPnZZVtyMeCLki0wKgYPXkFsAVhi8vzo2mBNeTg==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.7.tgz",
+      "integrity": "sha512-LxXEfLAKwOVmm1yecpMmWERBshl+Kv5YJ/1KnyAr6HRHFW8cxOEsEfisD3sVl/RvHyW//lhYUVSuy9jGEfIRAQ==",
       "optional": true
     },
     "esbuild-linux-arm": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.49.tgz",
-      "integrity": "sha512-iE3e+ZVv1Qz1Sy0gifIsarJMQ89Rpm9mtLSRtG3AH0FPgAzQ5Z5oU6vYzhc/3gSPi2UxdCOfRhw2onXuFw/0lg==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.7.tgz",
+      "integrity": "sha512-JKgAHtMR5f75wJTeuNQbyznZZa+pjiUHV7sRZp42UNdyXC6TiUYMW/8z8yIBAr2Fpad8hM1royZKQisqPABPvQ==",
       "optional": true
     },
     "esbuild-linux-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.49.tgz",
-      "integrity": "sha512-KLQ+WpeuY+7bxukxLz5VgkAAVQxUv67Ft4DmHIPIW+2w3ObBPQhqNoeQUHxopoW/aiOn3m99NSmSV+bs4BSsdA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.7.tgz",
+      "integrity": "sha512-P3cfhudpzWDkglutWgXcT2S7Ft7o2e3YDMrP1n0z2dlbUZghUkKCyaWw0zhp4KxEEzt/E7lmrtRu/pGWnwb9vw==",
       "optional": true
     },
     "esbuild-linux-mips64le": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.49.tgz",
-      "integrity": "sha512-n+rGODfm8RSum5pFIqFQVQpYBw+AztL8s6o9kfx7tjfK0yIGF6tm5HlG6aRjodiiKkH2xAiIM+U4xtQVZYU4rA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.7.tgz",
+      "integrity": "sha512-T7XKuxl0VpeFLCJXub6U+iybiqh0kM/bWOTb4qcPyDDwNVhLUiPcGdG2/0S7F93czUZOKP57YiLV8YQewgLHKw==",
       "optional": true
     },
     "esbuild-linux-ppc64le": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.49.tgz",
-      "integrity": "sha512-WP9zR4HX6iCBmMFH+XHHng2LmdoIeUmBpL4aL2TR8ruzXyT4dWrJ5BSbT8iNo6THN8lod6GOmYDLq/dgZLalGw==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.7.tgz",
+      "integrity": "sha512-6mGuC19WpFN7NYbecMIJjeQgvDb5aMuvyk0PDYBJrqAEMkTwg3Z98kEKuCm6THHRnrgsdr7bp4SruSAxEM4eJw==",
       "optional": true
     },
     "esbuild-linux-riscv64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.49.tgz",
-      "integrity": "sha512-h66ORBz+Dg+1KgLvzTVQEA1LX4XBd1SK0Fgbhhw4akpG/YkN8pS6OzYI/7SGENiN6ao5hETRDSkVcvU9NRtkMQ==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.7.tgz",
+      "integrity": "sha512-uUJsezbswAYo/X7OU/P+PuL/EI9WzxsEQXDekfwpQ23uGiooxqoLFAPmXPcRAt941vjlY9jtITEEikWMBr+F/g==",
       "optional": true
     },
     "esbuild-linux-s390x": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.49.tgz",
-      "integrity": "sha512-DhrUoFVWD+XmKO1y7e4kNCqQHPs6twz6VV6Uezl/XHYGzM60rBewBF5jlZjG0nCk5W/Xy6y1xWeopkrhFFM0sQ==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.7.tgz",
+      "integrity": "sha512-+tO+xOyTNMc34rXlSxK7aCwJgvQyffqEM5MMdNDEeMU3ss0S6wKvbBOQfgd5jRPblfwJ6b+bKiz0g5nABpY0QQ==",
       "optional": true
     },
     "esbuild-loader": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.19.0.tgz",
-      "integrity": "sha512-urGNVE6Tl2rqx92ElKi/LiExXjGvcH6HfDBFzJ9Ppwqh4n6Jmx8x7RKAyMzSM78b6CAaJLhDncG5sPrL0ROh5Q==",
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.20.0.tgz",
+      "integrity": "sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==",
       "requires": {
-        "esbuild": "^0.14.39",
+        "esbuild": "^0.15.6",
         "joycon": "^3.0.1",
         "json5": "^2.2.0",
         "loader-utils": "^2.0.0",
@@ -5811,39 +6287,39 @@
       }
     },
     "esbuild-netbsd-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.49.tgz",
-      "integrity": "sha512-BXaUwFOfCy2T+hABtiPUIpWjAeWK9P8O41gR4Pg73hpzoygVGnj0nI3YK4SJhe52ELgtdgWP/ckIkbn2XaTxjQ==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.7.tgz",
+      "integrity": "sha512-yVc4Wz+Pu3cP5hzm5kIygNPrjar/v5WCSoRmIjCPWfBVJkZNb5brEGKUlf+0Y759D48BCWa0WHrWXaNy0DULTQ==",
       "optional": true
     },
     "esbuild-openbsd-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.49.tgz",
-      "integrity": "sha512-lP06UQeLDGmVPw9Rg437Btu6J9/BmyhdoefnQ4gDEJTtJvKtQaUcOQrhjTq455ouZN4EHFH1h28WOJVANK41kA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.7.tgz",
+      "integrity": "sha512-GsimbwC4FSR4lN3wf8XmTQ+r8/0YSQo21rWDL0XFFhLHKlzEA4SsT1Tl8bPYu00IU6UWSJ+b3fG/8SB69rcuEQ==",
       "optional": true
     },
     "esbuild-sunos-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.49.tgz",
-      "integrity": "sha512-4c8Zowp+V3zIWje329BeLbGh6XI9c/rqARNaj5yPHdC61pHI9UNdDxT3rePPJeWcEZVKjkiAS6AP6kiITp7FSw==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.7.tgz",
+      "integrity": "sha512-8CDI1aL/ts0mDGbWzjEOGKXnU7p3rDzggHSBtVryQzkSOsjCHRVe0iFYUuhczlxU1R3LN/E7HgUO4NXzGGP/Ag==",
       "optional": true
     },
     "esbuild-windows-32": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.49.tgz",
-      "integrity": "sha512-q7Rb+J9yHTeKr9QTPDYkqfkEj8/kcKz9lOabDuvEXpXuIcosWCJgo5Z7h/L4r7rbtTH4a8U2FGKb6s1eeOHmJA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.7.tgz",
+      "integrity": "sha512-cOnKXUEPS8EGCzRSFa1x6NQjGhGsFlVgjhqGEbLTPsA7x4RRYiy2RKoArNUU4iR2vHmzqS5Gr84MEumO/wxYKA==",
       "optional": true
     },
     "esbuild-windows-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.49.tgz",
-      "integrity": "sha512-+Cme7Ongv0UIUTniPqfTX6mJ8Deo7VXw9xN0yJEN1lQMHDppTNmKwAM3oGbD/Vqff+07K2gN0WfNkMohmG+dVw==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.7.tgz",
+      "integrity": "sha512-7MI08Ec2sTIDv+zH6StNBKO+2hGUYIT42GmFyW6MBBWWtJhTcQLinKS6ldIN1d52MXIbiJ6nXyCJ+LpL4jBm3Q==",
       "optional": true
     },
     "esbuild-windows-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.49.tgz",
-      "integrity": "sha512-v+HYNAXzuANrCbbLFJ5nmO3m5y2PGZWLe3uloAkLt87aXiO2mZr3BTmacZdjwNkNEHuH3bNtN8cak+mzVjVPfA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.7.tgz",
+      "integrity": "sha512-R06nmqBlWjKHddhRJYlqDd3Fabx9LFdKcjoOy08YLimwmsswlFBJV4rXzZCxz/b7ZJXvrZgj8DDv1ewE9+StMw==",
       "optional": true
     },
     "escalade": {
@@ -6798,9 +7274,9 @@
       "optional": true
     },
     "fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="
     },
     "fastq": {
       "version": "1.8.0",
@@ -9420,9 +9896,9 @@
       }
     },
     "jose": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz",
-      "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.6.tgz",
+      "integrity": "sha512-FVoPY7SflDodE4lknJmbAHSUjLCzE2H1F6MS0RYKMQ8SR+lNccpMf8R4eqkNYyyUjR5qZReOzZo5C5YiHOCjjg==",
       "requires": {
         "@panva/asn1.js": "^1.0.0"
       }
@@ -9438,9 +9914,9 @@
       "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
     },
     "jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="
     },
     "js-tokens": {
       "version": "4.0.0",
@@ -12127,9 +12603,9 @@
       }
     },
     "prismjs": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.28.0.tgz",
-      "integrity": "sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw=="
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
+      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -12309,9 +12785,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "rate-limiter-flexible": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.7.tgz",
-      "integrity": "sha512-dmc+J/IffVBvHlqq5/XClsdLdkOdQV/tjrz00cwneHUbEDYVrf4aUDAyR4Jybcf2+Vpn4NwoVrnnAyt/D0ciWw=="
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.10.tgz",
+      "integrity": "sha512-bXqRBBb85WmnJemw9+xLdA7ezLXwZ+hXcOD8ZzfGMhbus4jHRrjTMXZ1kJqpKnpGu34scZc6f0qYNSxBwO7yrg=="
     },
     "raw-body": {
       "version": "2.5.1",
@@ -12504,9 +12980,9 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "requires": {
         "regenerate": "^1.4.2"
       }
@@ -12544,14 +13020,14 @@
       "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
     },
     "regexpu-core": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
-      "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
       "requires": {
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsgen": "^0.7.1",
+        "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.0.0"
       }
@@ -12573,14 +13049,14 @@
       }
     },
     "regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
     },
     "regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "requires": {
         "jsesc": "~0.5.0"
       },
@@ -14277,9 +14753,9 @@
       "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="
     },
     "terser": {
-      "version": "5.14.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
-      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
+      "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
       "requires": {
         "@jridgewell/source-map": "^0.3.2",
         "acorn": "^8.5.0",
@@ -14288,9 +14764,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "8.7.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-          "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+          "version": "8.8.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+          "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
         },
         "commander": {
           "version": "2.20.3",
@@ -14314,15 +14790,26 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz",
-      "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
       "requires": {
-        "@jridgewell/trace-mapping": "^0.3.7",
+        "@jridgewell/trace-mapping": "^0.3.14",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.0",
-        "terser": "^5.7.2"
+        "terser": "^5.14.1"
+      },
+      "dependencies": {
+        "@jridgewell/trace-mapping": {
+          "version": "0.3.15",
+          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
+          "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
+          "requires": {
+            "@jridgewell/resolve-uri": "^3.0.3",
+            "@jridgewell/sourcemap-codec": "^1.4.10"
+          }
+        }
       }
     },
     "text-hex": {
@@ -14842,9 +15329,9 @@
       "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
     },
     "union-value": {
       "version": "1.0.1",
@@ -15428,20 +15915,20 @@
       "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
     },
     "webpack": {
-      "version": "5.73.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz",
-      "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==",
+      "version": "5.74.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
+      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/wasm-edit": "1.11.1",
         "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
+        "acorn": "^8.7.1",
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.9.3",
+        "enhanced-resolve": "^5.10.0",
         "es-module-lexer": "^0.9.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -15454,14 +15941,14 @@
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
+        "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.7.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-          "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+          "version": "8.8.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+          "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
         },
         "eslint-scope": {
           "version": "5.1.1",
diff --git a/package.json b/package.json
index b32ca0a27a..3e65e3feac 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",
-    "@babel/preset-env": "^7.18.10",
+    "@babel/preset-env": "^7.19.1",
     "@babel/register": "^7.18.9",
     "@google-cloud/trace-agent": "^5.1.6",
     "@parse/node-apn": "^5.1.3",
@@ -13,7 +13,7 @@
     "accepts": "^1.3.8",
     "amazon-payments": "^0.2.9",
     "amplitude": "^6.0.0",
-    "apidoc": "^0.52.0",
+    "apidoc": "^0.53.0",
     "apple-auth": "^1.0.7",
     "bcrypt": "^5.0.1",
     "body-parser": "^1.20.0",
@@ -61,7 +61,7 @@
     "paypal-rest-sdk": "^1.8.1",
     "pp-ipn": "^1.1.0",
     "ps-tree": "^1.0.0",
-    "rate-limiter-flexible": "^2.3.7",
+    "rate-limiter-flexible": "^2.3.10",
     "redis": "^3.1.2",
     "regenerator-runtime": "^0.13.9",
     "remove-markdown": "^0.5.0",
diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 0f25f93dfb..949372df0d 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -30,9 +30,9 @@
       }
     },
     "@amplitude/types": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.10.0.tgz",
-      "integrity": "sha512-xN0gnhutztv6kqHaZ2bre18anQV5GDmMXOeipTvI670g2VjNbPfOzMwu1LN4p1NadYq+GqYI223UcZrXR+R4Pw=="
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.10.2.tgz",
+      "integrity": "sha512-I8qenRI7uU6wKNb9LiZrAosSHVoNHziXouKY81CrqxH9xhVTEIJFXeuCV0hbtBr0Al/8ejnGjQRx+S2SvU/pPg=="
     },
     "@amplitude/ua-parser-js": {
       "version": "0.7.31",
@@ -40,12 +40,19 @@
       "integrity": "sha512-+z8UGRaj13Pt5NDzOnkTBy49HE2CX64jeL0ArB86HAtilpnfkPB7oqkigN7Lf2LxscMg4QhFD7mmCfedh3rqTg=="
     },
     "@amplitude/utils": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.10.0.tgz",
-      "integrity": "sha512-/R8j8IzFH0GYfA6ehQDm5IEzt71gIeMdiYYFIzZp6grERQlgJcwNJMAiza0o2JwwTDIruzqdB3c/vLVjuakp+w==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.10.2.tgz",
+      "integrity": "sha512-tVsHXu61jITEtRjB7NugQ5cVDd4QDzne8T3ifmZye7TiJeUfVRvqe44gDtf55A+7VqhDhyEIIXTA1iVcDGqlEw==",
       "requires": {
-        "@amplitude/types": "^1.10.0",
-        "tslib": "^1.9.3"
+        "@amplitude/types": "^1.10.2",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
       }
     },
     "@babel/code-frame": {
@@ -13127,13 +13134,13 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
     },
     "amplitude-js": {
-      "version": "8.18.5",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.18.5.tgz",
-      "integrity": "sha512-s43q4qKd7kvhYESQhYvyKDKUM1PpyAyoOFFlyMuFfQHRxyeDmZRhcfzrKnOhbrLhFxSWtPc0VEeh9tajJRNe5Q==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.0.tgz",
+      "integrity": "sha512-kC01TmmCdDrtms8LhvC/r65FtbmCbNHZ1/jiezXmTH82TsWI/SkN47jKs8CCwjZNakqTBN/hmficiZBUKv4myw==",
       "requires": {
         "@amplitude/analytics-connector": "1.4.4",
         "@amplitude/ua-parser-js": "0.7.31",
-        "@amplitude/utils": "^1.0.5",
+        "@amplitude/utils": "^1.10.1",
         "@babel/runtime": "^7.3.4",
         "blueimp-md5": "^2.10.0",
         "query-string": "5"
@@ -16812,9 +16819,9 @@
       }
     },
     "dompurify": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.10.tgz",
-      "integrity": "sha512-o7Fg/AgC7p/XpKjf/+RC3Ok6k4St5F7Q6q6+Nnm3p2zGWioAY6dh0CbbuwOhH2UcSzKsdniE/YnE2/92JcsA+g=="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.0.tgz",
+      "integrity": "sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="
     },
     "domutils": {
       "version": "1.7.0",
@@ -20668,9 +20675,9 @@
       }
     },
     "jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="
     },
     "js-message": {
       "version": "1.0.5",
@@ -28306,23 +28313,23 @@
       "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk="
     },
     "vue": {
-      "version": "2.7.8",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz",
-      "integrity": "sha512-ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ==",
+      "version": "2.7.10",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz",
+      "integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==",
       "requires": {
-        "@vue/compiler-sfc": "2.7.8",
+        "@vue/compiler-sfc": "2.7.10",
         "csstype": "^3.1.0"
       },
       "dependencies": {
         "@babel/parser": {
-          "version": "7.18.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz",
-          "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="
+          "version": "7.18.13",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz",
+          "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="
         },
         "@vue/compiler-sfc": {
-          "version": "2.7.8",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz",
-          "integrity": "sha512-2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q==",
+          "version": "2.7.10",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz",
+          "integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==",
           "requires": {
             "@babel/parser": "^7.18.4",
             "postcss": "^8.4.14",
@@ -28340,9 +28347,9 @@
           "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
         },
         "postcss": {
-          "version": "8.4.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-          "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+          "version": "8.4.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
+          "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
           "requires": {
             "nanoid": "^3.3.4",
             "picocolors": "^1.0.0",
@@ -28676,9 +28683,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.7.8",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.8.tgz",
-      "integrity": "sha512-eQqdcUpJKJpBRPDdxCNsqUoT0edNvdt1jFjtVnVS/LPPmr0BU2jWzXlrf6BVMeODtdLewB3j8j3WjNiB+V+giw==",
+      "version": "2.7.10",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
+      "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.2.0"
diff --git a/website/client/package.json b/website/client/package.json
index de0c012ae1..640a0b4d41 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -25,7 +25,7 @@
     "@vue/cli-plugin-unit-mocha": "^4.5.15",
     "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^8.18.5",
+    "amplitude-js": "^8.21.0",
     "axios": "^0.25.0",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
@@ -33,7 +33,7 @@
     "bootstrap-vue": "^2.22.0",
     "chai": "^4.3.6",
     "core-js": "^3.24.1",
-    "dompurify": "^2.3.10",
+    "dompurify": "^2.4.0",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",
     "eslint-plugin-mocha": "^5.3.0",
@@ -42,7 +42,7 @@
     "hellojs": "^1.19.5",
     "inspectpack": "^4.7.1",
     "intro.js": "^5.1.0",
-    "jquery": "^3.6.0",
+    "jquery": "^3.6.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",
@@ -55,11 +55,11 @@
     "svgo-loader": "^2.2.1",
     "uuid": "^8.3.2",
     "validator": "^13.7.0",
-    "vue": "^2.7.8",
+    "vue": "^2.7.10",
     "vue-cli-plugin-storybook": "2.1.0",
     "vue-mugen-scroll": "^0.2.6",
     "vue-router": "^3.5.4",
-    "vue-template-compiler": "^2.7.8",
+    "vue-template-compiler": "^2.7.10",
     "vuedraggable": "^2.24.3",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
     "webpack": "^4.46.0"

From 2c293104663ca057c7f4a6e0473d2a2697ef6b2f Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 19 Sep 2022 16:19:20 -0500
Subject: [PATCH 046/134] chore(privacy): official update note

---
 website/client/src/components/static/privacy.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/website/client/src/components/static/privacy.vue b/website/client/src/components/static/privacy.vue
index 8fbbfbe2ae..c2615ce69b 100644
--- a/website/client/src/components/static/privacy.vue
+++ b/website/client/src/components/static/privacy.vue
@@ -3,7 +3,7 @@
   <div class="container-fluid">
     <h1>Privacy Notice</h1>
     <p class="strong pagemeta">
-      Last Updated: September 15, 2022
+      Last Updated September 19, 2022: Removed reference to Facebook login, which is no longer supported.
     </p>
     <p>
       HabitRPG, Inc. (“HabitRPG,” “we,” “us,” or “our”) welcomes you. This privacy notice (the “Privacy
@@ -41,7 +41,6 @@
       verify your identity. We also use this information to manage your account, including your transactions. If
       you choose to log into your account through Google or Apple, we capture and store the User ID and email
       address connected to the respective account, so we can verify your identity when you log in.
-      (We no longer offer the ability to log in using Facebook's authentication procedure.)
     </p>
     <h3>User Content</h3>
     <p>

From f030135c8261bd3485114f8390a4e6e578f62837 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Mon, 19 Sep 2022 17:55:53 -0400
Subject: [PATCH 047/134] chore(content): add 2022 Fall Festival (#14244)

* chore(submodule): add August 2022 Mystery Items

* update(content): add 2022 Fall Festival content

* update(content): add 2022 Fall Festival content

* update(content): update event dates for release

* fix(lint): remove extra spaces
also correct typo in gear string keys

* feat(content): remaining descriptions

* fix(event): correct spell availability

* fix(test): work around first-match logic

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
---
 .../assets/css/sprites/spritesmith-main.css   | 170 ++++++++++++++++++
 website/common/locales/en/gear.json           |  32 ++++
 website/common/locales/en/limited.json        |   4 +
 .../common/script/content/appearance/sets.js  |   4 +-
 .../common/script/content/constants/events.js |  19 +-
 .../script/content/constants/seasonalSets.js  |   5 +
 .../script/content/gear/sets/special/index.js |  60 +++++++
 .../common/script/content/hatching-potions.js |  18 +-
 .../script/content/shop-featuredItems.js      |  10 +-
 website/common/script/content/spells.js       |   2 +-
 .../script/libs/shops-seasonal.config.js      |  15 +-
 11 files changed, 310 insertions(+), 29 deletions(-)

diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 277ff3f148..f91dc5b14f 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -22875,6 +22875,26 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fallHealer.png');
   width: 90px;
@@ -23045,6 +23065,26 @@
   width: 114px;
   height: 90px;
 }
+.head_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .head_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fallHealer.png');
   width: 90px;
@@ -23170,6 +23210,21 @@
   width: 114px;
   height: 90px;
 }
+.shield_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fallHealer.png');
   width: 90px;
@@ -23325,6 +23380,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fallHealer.png');
   width: 68px;
@@ -23495,6 +23570,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_head_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fallHealer.png');
   width: 68px;
@@ -23620,6 +23715,21 @@
   width: 68px;
   height: 68px;
 }
+.shop_shield_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fallHealer.png');
   width: 68px;
@@ -23775,6 +23885,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_weapon_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fallHealer.png');
   width: 68px;
@@ -23935,6 +24065,26 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fallHealer.png');
   width: 90px;
@@ -24095,6 +24245,26 @@
   width: 114px;
   height: 90px;
 }
+.weapon_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fallHealer.png');
   width: 90px;
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 3c81c01acf..076c94c917 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -447,6 +447,15 @@
   "weaponSpecialSpring2022HealerText": "Peridot Wand",
   "weaponSpecialSpring2022HealerNotes": "Use this wand to tap into peridot’s healing properties, whether it be to bring calm, positivity, or kindheartedness. Increases Intelligence by <%= int %>. Limited Edition 2022 Spring Gear.",
 
+  "weaponSpecialFall2022RogueText": "Cucumber Blade",
+  "weaponSpecialFall2022RogueNotes": "Not only can you defend yourself with this cucumber, it also makes for a tasty meal. Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022WarriorText": "Orcish Ripsword",
+  "weaponSpecialFall2022WarriorNotes": "Maybe more suited for cutting logs or crusty loaves of bread than enemy armor, but RAWR! It sure looks fearsome! Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022MageText": "Wind Blasts",
+  "weaponSpecialFall2022MageNotes": "These mighty gusts remain in your wake as you take off toward the skies. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022HealerText": "Right Peeker Eye",
+  "weaponSpecialFall2022HealerNotes": "To claim victory, hold it forth and utter the words of command: 'Eye One!' Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+
   "weaponMystery201411Text": "Pitchfork of Feasting",
   "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
   "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -1083,6 +1092,15 @@
   "armorSpecialSummer2022HealerText": "Angelfish Tail",
   "armorSpecialSummer2022HealerNotes": "Use your colorful fins to scoot about the reef and help those in need of rest and healing. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.",
 
+  "armorSpecialFall2022RogueText": "Kappa Armor",
+  "armorSpecialFall2022RogueNotes": "Whether you’re swimming, sneaking, or wrestling, you will be safe in this armor. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022WarriorText": "Orcish Armor",
+  "armorSpecialFall2022WarriorNotes": "RAWR! BIG SHOULDERS mean you are BIG STRONG! Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022MageText": "Harpy Armor",
+  "armorSpecialFall2022MageNotes": "Fly as fast as the wind with these wonderful wings and hold what you care most about tight in these terrifying talons. Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022HealerText": "Profusion of Peeker Pods",
+  "armorSpecialFall2022HealerNotes": "How many peeps could a Peeker peep, if a Peeker could peep peeps? Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+
   "armorMystery201402Text": "Messenger Robes",
   "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
   "armorMystery201403Text": "Forest Walker Armor",
@@ -1793,6 +1811,15 @@
   "headSpecialSpring2022HealerText": "Peridot Helmet",
   "headSpecialSpring2022HealerNotes": "This mysterious helmet preserves your privacy as you tackle your tasks. Increases Intelligence by <%= int %>. Limited Edition 2022 Spring Gear.",
 
+  "headSpecialFall2022RogueText": "Kappa Mask",
+  "headSpecialFall2022RogueNotes": "With this metal cap upon your head, you will have extra protection when you venture onto land. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022WarriorText": "Orc Mask",
+  "headSpecialFall2022WarriorNotes": "Tusks tough and sharp enough to pierce pumpkins! RAWR! Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022MageText": "Harpy Mask",
+  "headSpecialFall2022MageNotes": "Entrance and lure others close with this magical maiden mask. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022HealerText": "Peeker Mask",
+  "headSpecialFall2022HealerNotes": "Beauty is in there. Somewhere! Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+
   "headSpecialGaymerxText": "Rainbow Warrior Helm",
   "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
 
@@ -2345,6 +2372,11 @@
   "shieldSpecialSummer2022HealerText": "Remedial Ripples",
   "shieldSpecialSummer2022HealerNotes": "Send out restorative magic in gentle ripples through the reef. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.",
 
+  "shieldSpecialFall2022WarriorText": "Orc Shield",
+  "shieldSpecialFall2022WarriorNotes": "RAWR or TREAT! Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+  "shieldSpecialFall2022HealerText": "Left Peeker Eye",
+  "shieldSpecialFall2022HealerNotes": "Eye Two, look upon this costume and tremble. Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+
   "shieldMystery201601Text": "Resolution Slayer",
   "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
   "shieldMystery201701Text": "Time-Freezer Shield",
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 121b414b54..106f1caf69 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -187,6 +187,10 @@
   "summer2022WaterspoutWarriorSet": "Waterspout (Warrior)",
   "summer2022MantaRayMageSet": "Manta Ray (Mage)",
   "summer2022AngelfishHealerSet": "Angelfish (Healer)",
+  "fall2022KappaRogueSet": "Kappa (Rogue)",
+  "fall2022OrcWarriorSet": "Orc (Warrior)",
+  "fall2022HarpyMageSet": "Harpy (Mage)",
+  "fall2022WatcherHealerSet": "Watcher (Healer)",
   "eventAvailability": "Available for purchase until <%= date(locale) %>.",
   "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
   "dateEndJanuary": "January 31",
diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js
index c69ca9d7a2..65152186c0 100644
--- a/website/common/script/content/appearance/sets.js
+++ b/website/common/script/content/appearance/sets.js
@@ -15,7 +15,7 @@ export default prefill({
     setPrice: 5, availableFrom: '2022-04-14T08:00-05:00', availableUntil: '2022-04-30T20:00-05:00', text: t('shimmerColors'),
   },
   hauntedHairColors: {
-    setPrice: 5, availableFrom: '2021-09-28T08:00-04:00', availableUntil: '2021-10-31T20:00-04:00', text: t('hauntedColors'),
+    setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('hauntedColors'),
   },
   winteryHairColors: {
     setPrice: 5, availableFrom: '2021-12-23T08:00-05:00', availableUntil: '2022-01-31T20:00-05:00', text: t('winteryColors'),
@@ -27,7 +27,7 @@ export default prefill({
   },
   spookySkins: { setPrice: 5, availableUntil: '2016-01-01', text: t('spookySkins') },
   supernaturalSkins: {
-    setPrice: 5, availableFrom: '2021-09-28T08:00-04:00', availableUntil: '2021-10-31T20:00-04:00', text: t('supernaturalSkins'),
+    setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('supernaturalSkins'),
   },
   splashySkins: {
     setPrice: 5, availableFrom: '2022-07-05T08:00-05:00', availableUntil: EVENTS.summer2022.end, text: t('splashySkins'),
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 49cb72cac6..3073f0991c 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -9,17 +9,28 @@ const gemsPromo = {
 };
 
 export const EVENTS = {
-  noCurrentEvent: {
-    start: '2022-09-30T20:00-04:00',
+  afterGala: {
+    start: '2022-10-31T20:00-04:00',
     end: '2022-12-21T08:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  fall2022: {
+    start: '2022-09-20T08:00-04:00',
+    end: '2022-10-31T20:00-04:00',
+    npcImageSuffix: '_fall',
+    season: 'fall',
+    gear: true,
+  },
+  beforeGala: {
+    start: '2022-07-31T20:00-04:00',
+    end: '2022-09-20T08:00-04:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
   bundle202209: {
     start: '2022-09-13T08:00-04:00',
     end: '2022-09-30T20:00-04:00',
-    season: 'normal',
-    npcImageSuffix: '',
   },
   potions202208: {
     start: '2022-08-16T08:00-04:00',
diff --git a/website/common/script/content/constants/seasonalSets.js b/website/common/script/content/constants/seasonalSets.js
index 95697b3c7f..009ee62321 100644
--- a/website/common/script/content/constants/seasonalSets.js
+++ b/website/common/script/content/constants/seasonalSets.js
@@ -188,6 +188,11 @@ const SEASONAL_SETS = {
     'fall2021HeadlessWarriorSet',
     'fall2021BrainEaterMageSet',
     'fall2021FlameSummonerHealerSet',
+
+    'fall2022KappaRogueSet',
+    'fall2022OrcWarriorSet',
+    'fall2022HarpyMageSet',
+    'fall2022WatcherHealerSet',
   ],
 };
 
diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js
index 90d3a7df2b..55f9c2d7a6 100644
--- a/website/common/script/content/gear/sets/special/index.js
+++ b/website/common/script/content/gear/sets/special/index.js
@@ -702,15 +702,19 @@ const armor = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -754,6 +758,18 @@ const armor = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const armorStats = {
@@ -1792,15 +1808,19 @@ const head = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -1844,6 +1864,18 @@ const head = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const headStats = {
@@ -2592,12 +2624,15 @@ const shield = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -2626,6 +2661,15 @@ const shield = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const shieldStats = {
@@ -3288,15 +3332,19 @@ const weapon = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -3334,6 +3382,18 @@ const weapon = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const weaponStats = {
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index e4d75817ef..23f26f370d 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -161,13 +161,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionGhost'),
     limited: true,
-    event: EVENTS.fall2020,
+    event: EVENTS.fall2022,
     canBuy () {
-      return moment().isBefore('2020-11-02');
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2018 }),
+      previousDate: t('novemberYYYY', { year: 2020 }),
     }),
   },
   Holly: {
@@ -337,13 +337,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionShadow'),
     limited: true,
-    event: EVENTS.fall2020,
+    event: EVENTS.fall2022,
     canBuy () {
-      return moment().isBefore('2020-11-02');
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2019 }),
+      previousDate: t('novemberYYYY', { year: 2020 }),
     }),
   },
   Amber: {
@@ -424,13 +424,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionVampire'),
     limited: true,
-    event: EVENTS.fall2021,
+    event: EVENTS.fall2022,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2020 }),
+      previousDate: t('octoberYYYY', { year: 2021 }),
     }),
     canBuy () {
-      return moment().isBefore(EVENTS.fall2021.end);
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
   },
   AutumnLeaf: {
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index f79f352b6e..3fe7c933a8 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market () {
-    if (moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end)) {
+    if (moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end)) {
       return [
         {
           type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Moonglow',
+          path: 'premiumHatchingPotions.Vampire',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Porcelain',
+          path: 'premiumHatchingPotions.Ghost',
         },
         {
-          type: 'food',
-          path: 'food.Milk',
+          type: 'premiumHatchingPotion',
+          path: 'premiumHatchingPotions.Shadow',
         },
       ];
     }
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index d6d330e651..9d9748e08d 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -325,7 +325,7 @@ spells.special = {
     target: 'user',
     notes: t('spellSpecialSpookySparklesNotes'),
     canOwn () {
-      return moment().isBetween('2021-10-12T08:00-04:00', EVENTS.fall2021.end);
+      return moment().isBetween('2021-10-11T08:00-04:00', EVENTS.fall2022.end);
     },
     cast (user, target, req) {
       if (!user.items.special.spookySparkles) throw new NotAuthorized(t('spellNotOwned')(req.language));
diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index 634c20525b..077a011288 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -30,16 +30,15 @@ export default {
 
   pinnedSets: SHOP_OPEN
     ? {
-      healer: 'summer2022AngelfishHealerSet',
-      rogue: 'summer2022CrabRogueSet',
-      warrior: 'summer2022WaterspoutWarriorSet',
-      wizard: 'summer2022MantaRayMageSet',
+      healer: 'fall2022WatcherHealerSet',
+      rogue: 'fall2022KappaRogueSet',
+      warrior: 'fall2022OrcWarriorSet',
+      wizard: 'fall2022HarpyMageSet',
     }
     : {},
-
-  availableSpells: SHOP_OPEN && moment().isBetween('2022-07-12T08:00-05:00', CURRENT_EVENT.end)
+  availableSpells: SHOP_OPEN && moment().isBetween('2022-10-04T08:00-05:00', CURRENT_EVENT.end)
     ? [
-      'seafoam',
+      'spookySparkles',
     ]
     : [],
 
@@ -49,5 +48,5 @@ export default {
     ]
     : [],
 
-  featuredSet: 'summer2021NautilusMageSet',
+  featuredSet: 'fall2021BrainEaterMageSet',
 };

From 24430861ce75ea1b39f9fd9d25b7b0a4238e2318 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 19 Sep 2022 16:56:39 -0500
Subject: [PATCH 048/134] 4.244.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 89bb35f357..77b9dffc08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.243.1",
+  "version": "4.244.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 867793453f..8ef00d01a0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.243.1",
+  "version": "4.244.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From 80acb7071840f924614acf8967ea6cd28afc546d Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 19 Sep 2022 23:58:41 +0200
Subject: [PATCH 049/134] Translated using Weblate (German)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (207 of 207 strings)

Translated using Weblate (German)

Currently translated at 100.0% (129 of 129 strings)

Translated using Weblate (German)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Belarusian)

Currently translated at 81.4% (615 of 755 strings)

Translated using Weblate (Japanese)

Currently translated at 97.2% (176 of 181 strings)

Translated using Weblate (Spanish)

Currently translated at 96.2% (2562 of 2663 strings)

Translated using Weblate (Russian)

Currently translated at 99.2% (128 of 129 strings)

Translated using Weblate (Russian)

Currently translated at 99.9% (2662 of 2663 strings)

Translated using Weblate (Russian)

Currently translated at 99.4% (180 of 181 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (207 of 207 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (129 of 129 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2663 of 2663 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Czech)

Currently translated at 74.3% (1981 of 2663 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (207 of 207 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (129 of 129 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2663 of 2663 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (754 of 755 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (228 of 228 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2663 of 2663 strings)

Translated using Weblate (German)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (German)

Currently translated at 93.3% (363 of 389 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2663 of 2663 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (94 of 94 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (389 of 389 strings)

Translated using Weblate (Ukrainian)

Currently translated at 22.9% (612 of 2663 strings)

Translated using Weblate (Ukrainian)

Currently translated at 46.6% (352 of 755 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (127 of 127 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (47 of 47 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (2663 of 2663 strings)

Translated using Weblate (Spanish)

Currently translated at 96.2% (2562 of 2663 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Ukrainian)

Currently translated at 45.8% (346 of 755 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (German)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Russian)

Currently translated at 99.7% (388 of 389 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (2660 of 2663 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (207 of 207 strings)

Translated using Weblate (Russian)

Currently translated at 99.7% (388 of 389 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (2660 of 2663 strings)

Translated using Weblate (Russian)

Currently translated at 98.2% (57 of 58 strings)

Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Céu <marcel.ufscar@gmail.com>
Co-authored-by: David Kővári <davson.kovari@gmail.com>
Co-authored-by: Ike Osenberg <ike.osenberg@gmail.com>
Co-authored-by: Mara S. (Dolichotis) <marascherzer@gmail.com>
Co-authored-by: Natalie Luhrs <eilatan@gmail.com>
Co-authored-by: Nazar Paruna <nazarparuna@gmail.com>
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com>
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mattya 226 <worldworld1114@gmail.com>
Co-authored-by: そら <comi4work@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/it/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/front/de/
Translate-URL: https://translate.habitica.com/projects/habitica/front/it/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/front/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/cs/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/de/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/it/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/quests/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/be/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/de/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/it/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/de/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/it/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ru/
Translation: Habitica/Backgrounds
Translation: Habitica/Communityguidelines
Translation: Habitica/Contrib
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Npc
Translation: Habitica/Quests
Translation: Habitica/Questscontent
Translation: Habitica/Subscriber
---
 website/common/locales/be/questscontent.json  |  4 +-
 website/common/locales/cs/gear.json           |  6 +-
 website/common/locales/de/front.json          | 13 +--
 website/common/locales/de/groups.json         |  7 +-
 website/common/locales/de/npc.json            |  5 +-
 website/common/locales/de/questscontent.json  |  4 +-
 website/common/locales/de/subscriber.json     |  2 +-
 website/common/locales/es/gear.json           | 16 ++--
 website/common/locales/it/backgrounds.json    |  4 +-
 website/common/locales/it/front.json          | 13 +--
 website/common/locales/it/npc.json            |  5 +-
 website/common/locales/it/questscontent.json  |  2 +-
 website/common/locales/it/subscriber.json     |  2 +-
 website/common/locales/ja/front.json          |  2 +-
 website/common/locales/ja/gear.json           |  4 +-
 website/common/locales/ja/questscontent.json  |  2 +-
 website/common/locales/pt_BR/front.json       | 13 +--
 website/common/locales/pt_BR/gear.json        | 92 +++++++++----------
 website/common/locales/pt_BR/limited.json     |  2 +-
 website/common/locales/pt_BR/npc.json         |  5 +-
 .../common/locales/pt_BR/questscontent.json   |  2 +-
 website/common/locales/pt_BR/subscriber.json  |  2 +-
 website/common/locales/ru/faq.json            |  2 +-
 website/common/locales/ru/front.json          | 11 ++-
 website/common/locales/ru/gear.json           | 11 ++-
 website/common/locales/ru/groups.json         |  9 +-
 website/common/locales/ru/npc.json            |  2 +-
 website/common/locales/ru/questscontent.json  |  2 +-
 website/common/locales/ru/subscriber.json     |  2 +-
 .../locales/uk/communityguidelines.json       |  4 +-
 website/common/locales/uk/contrib.json        |  2 +-
 website/common/locales/uk/gear.json           | 10 +-
 website/common/locales/uk/groups.json         |  4 +-
 website/common/locales/uk/quests.json         |  4 +-
 website/common/locales/uk/questscontent.json  | 58 +++++++-----
 35 files changed, 183 insertions(+), 145 deletions(-)

diff --git a/website/common/locales/be/questscontent.json b/website/common/locales/be/questscontent.json
index 8a6d9be006..945647680f 100755
--- a/website/common/locales/be/questscontent.json
+++ b/website/common/locales/be/questscontent.json
@@ -609,7 +609,7 @@
     "questSeaSerpentNotes": "Your streaks have you feeling lucky—it’s the perfect time for a trip to the seahorse racetrack. You board the submarine at Diligent Docks and settle in for the trip to Dilatory, but you’ve barely submerged when an impact rocks the sub, sending its occupants tumbling. “What’s going on?” @AriesFaries shouts.<br><br>You glance through a nearby porthole and are shocked by the wall of shimmering scales passing by it. “Sea serpent!” Captain @Witticaster calls through the intercom. “Brace yourselves, it’s coming ‘round again!” As you grip the arms of your seat, your unfinished tasks flash before your eyes. ‘Maybe if we work together and complete them,’ you think, ‘we can drive this monster away!’",
     "questSeaSerpentCompletion": "Battered by your commitment, the sea serpent flees, disappearing into the depths. When you arrive in Dilatory, you breathe a sigh of relief before noticing @*~Seraphina~ approaching with three translucent eggs cradled in her arms. “Here, you should have these,” she says. “You know how to handle a sea serpent!” As you accept the eggs, you vow anew to remain steadfast in completing your tasks to ensure that there’s not a repeat occurrence.",
     "questSeaSerpentBoss": "The Mighty Sea Serpent",
-    "questSeaSerpentDropSeaSerpentEgg": "Sea Serpent (Egg)",
+    "questSeaSerpentDropSeaSerpentEgg": "",
     "questSeaSerpentUnlockText": "Unlocks purchasable Sea Serpent eggs in the Market",
     "questKangarooText": "Kangaroo Catastrophe",
     "questKangarooNotes": "Maybe you should have finished that last task… you know, the one you keep avoiding, even though it always comes back around? But @Mewrose and @LilithofAlfheim invited you and @stefalupagus to see a rare kangaroo troop hopping through the Sloensteadi Savannah; how could you say no?! As the troop comes into view, something hits you on the back of the head with a mighty <em>whack!</em><br><br>Shaking the stars from your vision, you pick up the responsible object--a dark red boomerang, with the very task you continually push back etched into its surface. A quick glance around confirms the rest of your party met a similar fate. One larger kangaroo looks at you with a smug grin, like she’s daring you to face her and that dreaded task once and for all!",
@@ -635,4 +635,4 @@
     "questVelociraptorBoss": "Veloci-Rapper",
     "questVelociraptorDropVelociraptorEgg": "Velociraptor (Egg)",
     "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market"
-}
\ No newline at end of file
+}
diff --git a/website/common/locales/cs/gear.json b/website/common/locales/cs/gear.json
index 4706d78a71..b4f92eb661 100644
--- a/website/common/locales/cs/gear.json
+++ b/website/common/locales/cs/gear.json
@@ -2014,5 +2014,9 @@
     "weaponMystery202102Notes": "Zářivý růžový drahokem v této hůlce dokáže šířit radost a přátelství všude možně! Nepřináší žádné výhody. Předmět pro předplatitele, únor 2021.",
     "weaponMystery202104Notes": "Tvoji nepřátele by si měli dávat pozor - máš totiž mocnou a pichlavou obranu! Nepřináší žádné výhody. Předmět pro předplatitele duben 2021.",
     "weaponMystery202102Text": "Okouzlující hůlka",
-    "weaponMystery202104Text": "Hůl trnitého bodláku"
+    "weaponMystery202104Text": "Hůl trnitého bodláku",
+    "weaponMystery202201Notes": "O silvestrovské půlnoci vypusť oblak zlatého a stříbrného třpytu. Štastný nový rok! Kdo to teď uklidí? Nepřináší žádné výhody. Předmět pro předplatitele leden 2022.",
+    "weaponMystery202201Text": "Konfetové dělo půlnoci",
+    "weaponMystery202111Text": "Chronomancerova hůl",
+    "weaponMystery202111Notes": "Ohýbej tok času s touto tajemnou a mocnou holí. Nepřináší žádné výhody. Předmět pro předplatitele listopad 2021."
 }
diff --git a/website/common/locales/de/front.json b/website/common/locales/de/front.json
index df71b09c58..9aff6c04b6 100644
--- a/website/common/locales/de/front.json
+++ b/website/common/locales/de/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "zu, sowie der",
     "chores": "Hausarbeiten",
     "clearBrowserData": "Browserdaten löschen",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Erweiterungen</a>",
+    "communityExtensions": "Add-ons & Erweiterungen",
     "communityFacebook": "Facebook",
     "companyAbout": "So funktioniert es",
     "companyBlog": "Blog",
-    "companyContribute": "Mitwirken",
-    "companyDonate": "Spenden",
+    "companyContribute": "Bei Habitica mitwirken",
+    "companyDonate": "An Habitica spenden",
     "forgotPassword": "Passwort vergessen?",
     "emailNewPass": "Einen Link per E-Mail senden, um das Passwort zurückzusetzen",
     "forgotPasswordSteps": "Trage Deinen Benutzernamen oder die E-Mail-Adresse ein, mit der Du Deinen Habitica-Account aktiviert hast.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Willst Du Dein Leben einmal als Spiel betrachten?",
     "marketing4Lead3-2": "Willst Du eine Gruppe für Ausbildung, Wohlbefinden usw. leiten?",
     "marketing4Lead3Title": "Mache Alles zum Spiel",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Android App",
+    "mobileIOS": "iOS App",
     "oldNews": "Neuigkeiten",
     "newsArchive": "Neuigkeiten-Archiv auf Wikia (mehrsprachig)",
     "setNewPass": "Neues Passwort setzen",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Das Passwort muss mindestens 8 Zeichen haben.",
     "enterHabitica": "Tritt ein in Habitica",
     "socialAlreadyExists": "Diese Social-Media-Zugangsdaten sind bereits mit einem schon bestehenden Habitica-Konto verknüpft.",
-    "emailUsernamePlaceholder": "z.B., habitrabbit oder gryphon@beispiel.com"
+    "emailUsernamePlaceholder": "z.B., habitrabbit oder gryphon@beispiel.com",
+    "footerProduct": "Produkt"
 }
diff --git a/website/common/locales/de/groups.json b/website/common/locales/de/groups.json
index 73f5f6d95a..88cf4f0851 100644
--- a/website/common/locales/de/groups.json
+++ b/website/common/locales/de/groups.json
@@ -163,8 +163,8 @@
     "onlyGroupLeaderCanEditTasks": "Nicht berechtigt, Aufgaben zu bearbeiten!",
     "onlyGroupTasksCanBeAssigned": "Nur Team-Aufgaben können verteilt werden",
     "assignedTo": "Zugewiesen an",
-    "assignedToUser": "<strong><%- userName %></strong> zugewiesen",
-    "assignedToMembers": "<strong><%= userCount %></strong> Mitgliedern zugewiesen",
+    "assignedToUser": "Zugewiesen: <strong>@<%- userName %></strong>",
+    "assignedToMembers": "<%= userCount %> Mitgliedern",
     "assignedToYouAndMembers": "Dir und <strong><%= userCount %> Mitliedern</strong> zugewiesen",
     "youAreAssigned": "Dir zugewiesen",
     "taskIsUnassigned": "Diese Aufgabe ist niemandem zugewiesen",
@@ -380,5 +380,6 @@
     "viewDetails": "Details ansehen",
     "upgradeToGroup": "Auf Gruppenplan upgraden",
     "sendGiftTotal": "Insgesamt:",
-    "chatTemporarilyUnavailable": "Chat aktuell nicht verfügbar. Bitte versuche es später erneut."
+    "chatTemporarilyUnavailable": "Chat aktuell nicht verfügbar. Bitte versuche es später erneut.",
+    "assignTo": "Zugewiesen an"
 }
diff --git a/website/common/locales/de/npc.json b/website/common/locales/de/npc.json
index 343a58e5e2..46c25a0323 100644
--- a/website/common/locales/de/npc.json
+++ b/website/common/locales/de/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Neues Update von Bailey!",
     "tellMeLater": "Erzähl es mir später",
     "dismissAlert": "Als gelesen markieren",
-    "donateText3": "Als Open-Source-Projekt ist Habitica auf die Hilfe unserer Benutzer angewiesen. Das Geld, was Du für Edelsteine ausgibst, hilft uns dabei unsere Server am Laufen zu halten, ein paar Mitarbeiter zu bezahlen, neue Features zu entwickeln und unseren ehrenamtlichen Programmierern Anreize zu bieten. Vielen Dank für Deine Großzügigkeit!",
+    "donateText3": "Als Open-Source-Projekt ist Habitica auf die Hilfe unserer Benutzer angewiesen. Das Geld, was Du für Edelsteine ausgibst, hilft uns dabei unsere Server am Laufen zu halten, ein paar Mitarbeiter zu bezahlen, neue Features zu entwickeln und unseren ehrenamtlichen Helferlein Anreize zu bieten.",
     "card": "Kreditkarte",
     "paymentMethods": "Kauf mit",
     "paymentSuccessful": "Die Zahlung war erfolgreich!",
@@ -131,5 +131,6 @@
     "limitedAvailabilityHours": "Für <%= days %>t <%= hours %>std und <%= minutes %>min verfügbar",
     "limitedAvailabilityDays": "Für <%= days %>t <%= hours %>std und <%= minutes %>min verfügbar",
     "amountExp": "<%= amount %> Exp",
-    "newStuffPostedOn": "Veröffentlicht am <%= publishDate %> um <%= publishTime %>"
+    "newStuffPostedOn": "Veröffentlicht am <%= publishDate %> um <%= publishTime %>",
+    "helpSupportHabitica": "Hilf Habitica zu unterstützen"
 }
diff --git a/website/common/locales/de/questscontent.json b/website/common/locales/de/questscontent.json
index 3aeddfa3e8..1d0499bcb6 100644
--- a/website/common/locales/de/questscontent.json
+++ b/website/common/locales/de/questscontent.json
@@ -184,7 +184,7 @@
     "questTRexCompletion": "Der wilde Dinosaurier hört endlich zu toben und zu randalieren auf, setzt sich ruhig hin und fängt an sich mit den riesigen Hähnen anzufreunden. @Urse strahlt ihn an. \"Sie sind doch gar keine so schlimmen Haustiere! Sie brauchen einfach nur ein bisschen Disziplin. Hier, nimm Dir ein paar Tyrannosaurus-Eier mit!\"",
     "questTRexBoss": "Fleischerner Tyrannosaurus",
     "questTRexUndeadText": "Der Dinosaurier aus den Tiefen der Erde",
-    "questTRexUndeadNotes": "Während die uralten Dinosaurier der Stoïstillen Steppen durch HabitCity wandern, hört man auf ein mal einen angstvollen Schrei aus Richtung des Grand Museums. @Baconsaur ruft: \"Das Tyrannosaurus-Skelett im Museum fängt an sich zu bewegen! Es muss die Anwesenheit seiner Artgenossen gewittert haben!\" Das knöcherne Biest bleckt seine monströsen Zähne und klappert auf Dich zu. Wie wirst Du in der Lage sein eine Kreatur zu besiegen, die bereits tot ist? Du wirst schnell zuschlagen müssen, bevor sie sich selbst heilt!",
+    "questTRexUndeadNotes": "Während die uralten Dinosaurier der Stoïstillen Steppen durch Habit City wandern, hört man auf ein mal einen angstvollen Schrei aus Richtung des Grand Museums. @Baconsaur ruft: \"Das Tyrannosaurus-Skelett im Museum fängt an sich zu bewegen! Es muss die Anwesenheit seiner Artgenossen gewittert haben!\" Das knöcherne Biest bleckt seine monströsen Zähne und klappert auf Dich zu. Wie wirst Du in der Lage sein eine Kreatur zu besiegen, die bereits tot ist? Du wirst schnell zuschlagen müssen, bevor sie sich selbst heilt!",
     "questTRexUndeadCompletion": "Die glühenden Augen des Tyrannosaurus werden dunkel und trüb und er begibt sich zurück zu seinem Sockel. Alle atmen vor Erleichterung auf. \"Seht nur!\", sagt @Baconsaur, \"einige der versteinerten Eier sind plötzlich wie neu! Vielleicht werden sie ja für Dich ausschlüpfen.\"",
     "questTRexUndeadBoss": "Skelettierter Tyrannosaurus",
     "questTRexUndeadRageTitle": "Knöcherne Heilung",
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Nilpferd (Ei)",
     "questHippoUnlockText": "Schaltet den Kauf von Nilpferdeiern auf dem Marktplatz frei",
     "farmFriendsText": "\"Farmfreunde\" Quest-Paket",
-    "farmFriendsNotes": "Beinhaltet 'Die Muhtantische Kuh', 'Reite die Nacht-Mähre', und 'Der Donner-Bock'. Verfügbar bis zum 31. August.",
+    "farmFriendsNotes": "Beinhaltet 'Die Muhtantische Kuh', 'Reite die Nacht-Mähre', und 'Der Donner-Bock'. Verfügbar bis zum 30. September.",
     "witchyFamiliarsText": "\"Hexenhafte Haustiere\" Quest-Paket",
     "witchyFamiliarsNotes": "Beinhaltet 'Der Rattenkönig', 'Die eisige Arachnoide', und 'Sumpf des Chaos-Froschs'. Verfügbar bis zum 31. Oktober.",
     "questGroupLostMasterclasser": "Geheimnis der Klassenmeister",
diff --git a/website/common/locales/de/subscriber.json b/website/common/locales/de/subscriber.json
index b8a5f1986d..bfac46a618 100644
--- a/website/common/locales/de/subscriber.json
+++ b/website/common/locales/de/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Dein Abonnement wurde gekündigt",
     "choosePaymentMethod": "Wähle Deine Zahlungsmethode",
     "buyGemsSupportsDevs": "Der Kauf von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten",
-    "support": "HILFE",
+    "support": "Hilfe",
     "gemBenefitLeadin": "Was kann man mit Edelsteinen kaufen?",
     "gemBenefit1": "Einzigartige und modische Verkleidungen für Deinen Avatar.",
     "gemBenefit2": "Hintergründe, die Deinen Avatar in die Welt von Habitica eintauchen lassen!",
diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index 2bc8616497..35f0061b27 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -1021,23 +1021,23 @@
     "headSpecialSummer2017RogueText": "Yelmo de Dragón Marino",
     "headSpecialSummer2017RogueNotes": "Este yelmo cambia de color ayudándote a camuflarte con el entorno. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017WarriorText": "Yelmo Castilloarena",
-    "headSpecialSummer2017WarriorNotes": "El más fino yelmo que podrías esperar vestir... al menos, hasta que suba la marea. Aumenta la Fuerza en <%= str %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017WarriorNotes": "El más fino yelmo que podrías esperar vestir... al menos, hasta que suba la marea. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017MageText": "Sombrero Torbellino",
-    "headSpecialSummer2017MageNotes": "Este sombre está compuesto enteramente por un giratorio torbellino invertido. Aumenta la Percepción en <%= per %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017MageNotes": "Este sombre está compuesto enteramente por un giratorio torbellino invertido. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017HealerText": "Corona de Criaturas Marinas",
-    "headSpecialSummer2017HealerNotes": "Este yelmo está hecho de amistosas criaturas marinas que estás descansando temporalmente sobre tu cabeza, dándote sabios consejos. Aumenta la Inteligencia en <%= int %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017HealerNotes": "Este yelmo está hecho de amistosas criaturas marinas que estás descansando temporalmente sobre tu cabeza, dándote sabios consejos. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialFall2017RogueText": "Casco de Calabaza",
-    "headSpecialFall2017RogueNotes": "¿Preparado para tratos? ¡Hora de ponerse este festivo y brillante casco! Aumenta la Percepción en <%= per %>. Edición Limitada 2017 del Equipamiento de Otoño.",
+    "headSpecialFall2017RogueNotes": "¿Preparado para tratos? ¡Hora de ponerse este festivo y brillante casco! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017WarriorText": "Casco de Golosinas de Maíz",
-    "headSpecialFall2017WarriorNotes": "Este casco puede parecer una delicia, ¡pero a las tareas pendientes obstinadas no les parecerá tan dulce! Aumenta la Fuerza en un <%= str %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017WarriorNotes": "Este casco puede parecer una delicia, ¡pero a las tareas pendientes obstinadas no les parecerá tan dulce! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017MageText": "Casco del Baile de Máscaras",
-    "headSpecialFall2017MageNotes": "¡Cuando aparezcas con este sombrero emplumado, todos se quedarán preguntándose la identidad del mágico extraño de la sala! Aumenta la Percepción en un <%= per %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017MageNotes": "¡Cuando aparezcas con este sombrero emplumado, todos se quedarán preguntándose la identidad del mágico extraño de la sala! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017HealerText": "Casco de Casa Encantada",
-    "headSpecialFall2017HealerNotes": "¡Invita a espíritus espeluznantes y a criaturas afables a buscar tus poderes curativos al llevar este casco! Aumenta la Inteligencia en un <%= int %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017HealerNotes": "¡Invita a espíritus espeluznantes y a criaturas afables a buscar tus poderes curativos al llevar este casco! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialNye2017Text": "Sombrero Festivo Rocambolesco",
     "headSpecialNye2017Notes": "¡Has recibido un Sombrero Festivo Rocambolesco! ¡Llévalo con orgullo mientras resuena en Año Nuevo! No otorga ningún beneficio.",
     "headSpecialWinter2018RogueText": "Casco de Reno",
-    "headSpecialWinter2018RogueNotes": "¡El disfraz festivo perfecto, con un foco delantero incorporado! Aumenta la Percepción en un <%= per %>. Equipamiento de Invierno de Edición Limitada del 2017-2018.",
+    "headSpecialWinter2018RogueNotes": "¡El disfraz festivo perfecto, con un foco delantero incorporado! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2017-2018.",
     "headSpecialWinter2018WarriorText": "Casco Caja de Regalo",
     "headSpecialWinter2018WarriorNotes": "La superficie y el lazo de esta desenfadada caja no solo son festivos, sino bastante robustos también. Aumenta la Fuerza en un <%= str %>. Armamento de Invierno de Edición Limitada del 2017-2018.",
     "headSpecialWinter2018MageText": "Sombrero de Copa Centelleante",
diff --git a/website/common/locales/it/backgrounds.json b/website/common/locales/it/backgrounds.json
index b33cb01299..68101e0850 100644
--- a/website/common/locales/it/backgrounds.json
+++ b/website/common/locales/it/backgrounds.json
@@ -661,8 +661,8 @@
     "backgroundFrozenPolarWatersNotes": "Esplora le ghiacciate acque polari.",
     "backgrounds122021": "SET 91: Rilasciato a dicembre 2021",
     "backgroundIcePalaceShopNotes": "Regna in un palazzo di ghiaccio.",
-    "backgroundWinterCanyonText": "Forra invernale",
-    "backgroundWinterCanyonNotes": "Avventurati in una forra invernale!",
+    "backgroundWinterCanyonText": "Canyon Invernale",
+    "backgroundWinterCanyonNotes": "Avventurati in un Canyon Invernale!",
     "backgroundIcePalaceText": "Palazzo di ghiaccio",
     "backgroundIcePalaceNotes": "Regna in un palazzo di ghiaccio.",
     "backgrounds012022": "SET 92: Rilasciato Gennaio 2022",
diff --git a/website/common/locales/it/front.json b/website/common/locales/it/front.json
index f6f661178c..fa8c79284f 100644
--- a/website/common/locales/it/front.json
+++ b/website/common/locales/it/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "e l'",
     "chores": "Faccende di casa",
     "clearBrowserData": "Pulizia dati del browser",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-on ed estensioni</a>",
+    "communityExtensions": "Add-on ed Estensioni",
     "communityFacebook": "Facebook",
     "companyAbout": "Come funziona",
     "companyBlog": "Blog",
-    "companyContribute": "Contribuisci",
-    "companyDonate": "Fai una donazione",
+    "companyContribute": "Contribuire ad Habitica",
+    "companyDonate": "Fai una donazione ad Habitica",
     "forgotPassword": "Password dimenticata?",
     "emailNewPass": "Ricevi per e-mail il link per reimpostare la password",
     "forgotPasswordSteps": "Inserisci il tuo nome utente o l'indirizzo e-mail che hai usato per registrare il tuo account Habitica.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Vuoi vivere la tua vita come in un gioco?",
     "marketing4Lead3-2": "Sei interessato a gestire un gruppo nel settore dell'educazione, del benessere e in altri settori?",
     "marketing4Lead3Title": "Trasforma tutto in gioco",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "App su Android",
+    "mobileIOS": "App su iOS",
     "oldNews": "Novità",
     "newsArchive": "Archivio delle notizie su Wikia (multilingua)",
     "setNewPass": "Imposta nuova password",
@@ -187,5 +187,6 @@
     "minPasswordLength": "La password deve essere di almeno 8 caratteri.",
     "enterHabitica": "Entra in Habitica",
     "socialAlreadyExists": "Questo social è già collegato ad un account di Habitica.",
-    "emailUsernamePlaceholder": "es. habitrabbit oppure grifone@example.com"
+    "emailUsernamePlaceholder": "es. habitrabbit oppure grifone@example.com",
+    "footerProduct": "Prodotto"
 }
diff --git a/website/common/locales/it/npc.json b/website/common/locales/it/npc.json
index cbf2ce303c..c1e152ab13 100644
--- a/website/common/locales/it/npc.json
+++ b/website/common/locales/it/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Nuovo aggiornamento da Bailey!",
     "tellMeLater": "Ricordamelo più tardi",
     "dismissAlert": "Nascondi questo annuncio",
-    "donateText3": "Habitica è un progetto open-source che dipende dal supporto degli utenti. I soldi che spendi in Gemme ci aiutano a tenere accesi i nostri server, mantenere un piccolo staff, sviluppare nuove funzionalità e dare degli incentivi ai volontari programmatori. Grazie per la tua generosità!",
+    "donateText3": "Habitica è un progetto open-source che dipende dal supporto degli utenti. I soldi che spendi in Gemme ci aiutano a tenere accesi i nostri server, mantenere un piccolo staff, sviluppare nuove funzionalità e dare degli incentivi ai nostri volontari",
     "card": "Carta di credito",
     "paymentMethods": "Paga utilizzando",
     "paymentSuccessful": "Il tuo pagamento ha avuto successo!",
@@ -130,5 +130,6 @@
     "limitedAvailabilityMinutes": "Disponibile per <%= minutes %> minuti e <%= seconds %> secondi",
     "limitedAvailabilityDays": "Disponibile per <%= days %> giorni, <%= hours %> ore e <%= minutes %> minuti",
     "limitedAvailabilityHours": "Disponibile per <%= hours %> ore e <%= minutes %> minuti",
-    "amountExp": "<%= amount %> Exp"
+    "amountExp": "<%= amount %> Exp",
+    "helpSupportHabitica": "Aiutare a Supportare Habitica"
 }
diff --git a/website/common/locales/it/questscontent.json b/website/common/locales/it/questscontent.json
index 66f856b81c..56d758b977 100644
--- a/website/common/locales/it/questscontent.json
+++ b/website/common/locales/it/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Ippopotamo (Uovo)",
     "questHippoUnlockText": "Sblocca le uova di Ippopotamo acquistabili nel Mercato",
     "farmFriendsText": "Pacchetto missioni Amici della Fattoria",
-    "farmFriendsNotes": "Contiente \"La Mucca Muutante\", \"Cavalca il Destriero dell'Incubo\", e \"L'Ariete Tuonante\". Disponibile fino al 31 agosto.",
+    "farmFriendsNotes": "Contiene \"La Mucca Muutante\", \"Cavalca il Destriero dell'Incubo\", e \"L'Ariete Tuonante\". Disponibile fino al 30 settembre.",
     "witchyFamiliarsText": "Pacchetto di Missioni dei Familiari Stregati",
     "witchyFamiliarsNotes": "Contiene 'Il Re dei Ratti', 'L'Aracnide Ghiacciato', 'Palude della Rana del Disordine'. Disponibile fino al 31 Ottobre.",
     "questGroupLostMasterclasser": "Mistero dei Masterclasser",
diff --git a/website/common/locales/it/subscriber.json b/website/common/locales/it/subscriber.json
index 1d3418e9a9..81d38b24bd 100644
--- a/website/common/locales/it/subscriber.json
+++ b/website/common/locales/it/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Il tuo abbonameno è stato disdetto",
     "choosePaymentMethod": "Scegli il metodo di pagamento",
     "buyGemsSupportsDevs": "Comprare Gemme supporta gli sviluppatori e aiuta Habitica a continuare a funzionare",
-    "support": "SUPPORTA",
+    "support": "Supporta",
     "gemBenefitLeadin": "Cosa puoi comprare con le Gemme?",
     "gemBenefit1": "Costumi unici e alla moda per il tuo avatar.",
     "gemBenefit2": "Sfondi per immergere il tuo avatar nel mondi di Habitica!",
diff --git a/website/common/locales/ja/front.json b/website/common/locales/ja/front.json
index 6a089706d3..b73f2bd4b7 100644
--- a/website/common/locales/ja/front.json
+++ b/website/common/locales/ja/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "そして",
     "chores": "雑用",
     "clearBrowserData": "ブラウザデータを削除する",
-    "communityExtensions": "<a href='https://habitica.fandom.com/ja/wiki/拡張機能・アドオン・カスタマイズ' target='_blank'>アドオンと拡張機能</a>",
+    "communityExtensions": "アドオンと拡張機能",
     "communityFacebook": "Facebook",
     "companyAbout": "機能説明",
     "companyBlog": "ブログ",
diff --git a/website/common/locales/ja/gear.json b/website/common/locales/ja/gear.json
index 9bcf0c4211..d6552bd7be 100644
--- a/website/common/locales/ja/gear.json
+++ b/website/common/locales/ja/gear.json
@@ -2696,7 +2696,7 @@
     "shieldMystery202209Notes": "魔術の知識を身につけるには多くの本を読まなければいけませんが、その過程はきっと楽しいはず。効果なし。2022年9月有料会員アイテム。",
     "shieldMystery202209Text": "山積みの魔法書",
     "eyewearArmoireComedyMaskText": "喜劇の仮面",
-    "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しよう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
+    "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しましょう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
     "eyewearArmoireTragedyMaskText": "悲劇の仮面",
-    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しよう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
+    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しましょう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
 }
diff --git a/website/common/locales/ja/questscontent.json b/website/common/locales/ja/questscontent.json
index af8d99c25c..215a921eeb 100644
--- a/website/common/locales/ja/questscontent.json
+++ b/website/common/locales/ja/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "カバ(たまご)",
     "questHippoUnlockText": "市場でカバのたまごを買えるようになります",
     "farmFriendsText": "「まきばの友達」クエストセット",
-    "farmFriendsNotes": "「モー変異した牛」「悪夢を乗りこなせ」「雷雄羊」のセット。8月31日まで購入できます。",
+    "farmFriendsNotes": "「モー変異した牛」「悪夢を乗りこなせ」「雷雄羊」のセット。9月30日まで購入できます。",
     "witchyFamiliarsText": "「魔女の使い魔」クエストセット",
     "witchyFamiliarsNotes": "「ネズミ王」「氷のクモ」「散らかしカエルの沼」のセット。10月31日まで購入できます。",
     "questGroupLostMasterclasser": "クラス・マスターの謎",
diff --git a/website/common/locales/pt_BR/front.json b/website/common/locales/pt_BR/front.json
index 00ec80fd2c..37322244b5 100644
--- a/website/common/locales/pt_BR/front.json
+++ b/website/common/locales/pt_BR/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "e com a",
     "chores": "Afazeres",
     "clearBrowserData": "Limpar Dados do Navegador",
-    "communityExtensions": "<a href='https://habitica.fandom.com/pt-br/wiki/Extens%C3%B5es,_Add-ons_e_Personaliza%C3%A7%C3%B5es' target='_blank'>Add-ons e Extensões</a>",
+    "communityExtensions": "Complementos e Extensões",
     "communityFacebook": "Facebook",
     "companyAbout": "Como funciona",
     "companyBlog": "Blog",
-    "companyContribute": "Contribuir",
-    "companyDonate": "Doar",
+    "companyContribute": "Contribuindo para o Habitica",
+    "companyDonate": "Doar para o Habitica",
     "forgotPassword": "Esqueceu a senha?",
     "emailNewPass": "Enviar por Email uma Nova Senha",
     "forgotPasswordSteps": "Digite seu nome de usuário ou o endereço de e-mail que você usou para registrar sua conta no Habitica.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Quer gamificar sua vida?",
     "marketing4Lead3-2": "Interessado em coordenar um grupo em educação, bem-estar e outros?",
     "marketing4Lead3Title": "Gamifique Tudo",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Aplicativo Android",
+    "mobileIOS": "Aplicativo iOS",
     "oldNews": "Notícias",
     "newsArchive": "Arquivo de notícias na Wikia (multilíngue)",
     "setNewPass": "Defina a Nova Senha",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Senhas devem possuir 8 caracteres ou mais.",
     "enterHabitica": "Entrar no Habitica",
     "emailUsernamePlaceholder": "Ex: habitilebre ou grifo@exemplo.com",
-    "socialAlreadyExists": "Este login já está vinculado a uma conta existente do Habitica."
+    "socialAlreadyExists": "Este login já está vinculado a uma conta existente do Habitica.",
+    "footerProduct": "Produto"
 }
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index 484b60a3e5..c021bccd96 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -125,9 +125,9 @@
     "weaponSpecialSpringRogueText": "Garras de Gancho",
     "weaponSpecialSpringRogueNotes": "Ótimo para escalar altos prédios, e também para rasgar carpetes. Aumenta Força em <%= str %>. Equipamento Edição Limitada de Primavera 2014.",
     "weaponSpecialSpringWarriorText": "Espada de Cenoura",
-    "weaponSpecialSpringWarriorNotes": "Essa poderosa espada pode cortar inimigos com facilidade! Também serve como um delicioso lanche no meio das batalhas. Aumenta Força em <%= str %>. Equipamento Edição Limitada de Primavera 2014.",
+    "weaponSpecialSpringWarriorNotes": "Essa poderosa espada pode cortar inimigos com facilidade! Também serve como um delicioso lanche no meio das batalhas. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "weaponSpecialSpringMageText": "Cajado de Queijo-Suíço",
-    "weaponSpecialSpringMageNotes": "Apenas os roedores mais poderosos podem confrontar sua fome para empunhar esse potente cajado. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento Edição Limitada de Primavera 2014.",
+    "weaponSpecialSpringMageNotes": "Apenas os roedores mais poderosos podem confrontar sua fome para empunhar esse potente cajado. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "weaponSpecialSpringHealerText": "Osso Encantador",
     "weaponSpecialSpringHealerNotes": "PEGA! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "weaponSpecialSummerRogueText": "Cutelo de Pirata",
@@ -159,9 +159,9 @@
     "weaponSpecialSpring2015WarriorText": "Clava de Osso",
     "weaponSpecialSpring2015WarriorNotes": "É uma legítima clava de osso para cachorrinhos super ferozes e definitivamente não um brinquedo de mastigar que a Feiticeira Sazonal te deu porque quem é um bom garoto? Queeem é um bom garoto?? Você!!! Você é um bom garoto!!! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "weaponSpecialSpring2015MageText": "Varinha de Mágico",
-    "weaponSpecialSpring2015MageNotes": "Invoque uma cenoura para si mesmo com essa elegante varinha. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "weaponSpecialSpring2015MageNotes": "Invoque uma cenoura para si mesmo com essa elegante varinha. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "weaponSpecialSpring2015HealerText": "Matraca de Gato",
-    "weaponSpecialSpring2015HealerNotes": "Quando você a sacode, faz um clique-claque fascinante que manteria QUALQUER UM entretido por horas. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "weaponSpecialSpring2015HealerNotes": "Quando você a sacode, faz um clique-claque fascinante que manteria QUALQUER UM entretido por horas. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "weaponSpecialSummer2015RogueText": "Coral Atirador",
     "weaponSpecialSummer2015RogueNotes": "Este parente do coral de fogo tem a habilidade de expelir seu veneno através da água. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2015.",
     "weaponSpecialSummer2015WarriorText": "Peixe-Espada Solar",
@@ -187,11 +187,11 @@
     "weaponSpecialWinter2016HealerText": "Canhão de Confetes",
     "weaponSpecialWinter2016HealerNotes": "ÊEEEEEEEEEEE!!!!!!! QUE COMECEM AS MARAVILHAS DE INVERNO!!!!!!!! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "weaponSpecialSpring2016RogueText": "Bolas de Fogo",
-    "weaponSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "weaponSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "weaponSpecialSpring2016WarriorText": "Marreta de Queijo",
     "weaponSpecialSpring2016WarriorNotes": "Ninguém tem tantos amigos quanto o rato com queijo mussarela. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "weaponSpecialSpring2016MageText": "Cajado de Sinos",
-    "weaponSpecialSpring2016MageNotes": "Abra-Ga-ta-Bra! Tão deslumbrante, você poderia se hipnotizar! Ooh... Ele brilha... Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "weaponSpecialSpring2016MageNotes": "Abra-Ga-ta-Bra! Tão deslumbrante, você poderia se hipnotizar! Ooh... Ele brilha... Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "weaponSpecialSpring2016HealerText": "Varinha de Flor da Primavera",
     "weaponSpecialSpring2016HealerNotes": "Com um aceno e uma piscada, você faz florestas e campos florescerem! Ou acerta ratos problemáticos na cabeça. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "weaponSpecialSummer2016RogueText": "Varinha Elétrica",
@@ -219,7 +219,7 @@
     "weaponSpecialWinter2017HealerText": "Varinha Açucarada",
     "weaponSpecialWinter2017HealerNotes": "Esta varinha pode atingir seus sonhos e te trazer visões de bombons dançantes. Aumenta a inteligência em <%= int %>. Equipamento de inverno da edição limitada 2016-2017.",
     "weaponSpecialSpring2017RogueText": "Cenouspada",
-    "weaponSpecialSpring2017RogueNotes": "Essas lâminas farão das tarefas algo fácil. E também servem para cortar vegetais! Yum! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "weaponSpecialSpring2017RogueNotes": "Essas lâminas farão das tarefas algo fácil. E também servem para cortar vegetais! Yum! Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "weaponSpecialSpring2017WarriorText": "Chicote Emplumado",
     "weaponSpecialSpring2017WarriorNotes": "Esse poderoso chicote servirá para dominar a tarefa mais difícil de todas. Mas... ela também é... muito DIVERTIDA E DISPERSANTE!! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "weaponSpecialSpring2017MageText": "Varinha Mágica Elegante",
@@ -477,11 +477,11 @@
     "armorSpecialGaymerxText": "Armadura do Guerreiro Arco-Íris",
     "armorSpecialGaymerxNotes": "Para celebrar a Conferência GaymerX, esta armadura especial foi decorada com uma colorida e radiante estampa arco-íris! A GaymerX é uma conferência de games que celebra a comunidade LGBT e jogos e é aberta para todos.",
     "armorSpecialSpringRogueText": "Traje Elegante de Gato",
-    "armorSpecialSpringRogueNotes": "Impecavelmente arrumado. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringRogueNotes": "Impecavelmente arrumado. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringWarriorText": "Armadura de Trevo Metálico",
-    "armorSpecialSpringWarriorNotes": "Suave como um trevo, forte como aço! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringWarriorNotes": "Suave como um trevo, forte como aço! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringMageText": "Túnica de Roedor",
-    "armorSpecialSpringMageNotes": "Ratos são um barato! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringMageNotes": "Ratos são um barato! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringHealerText": "Túnica de Filhote Felpudo",
     "armorSpecialSpringHealerNotes": "Quente e confortável, mas protege seu dono do perigo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "armorSpecialSummerRogueText": "Túnica de Pirata",
@@ -511,9 +511,9 @@
     "armorSpecialSpring2015RogueText": "Túnicas Guinchantes",
     "armorSpecialSpring2015RogueNotes": "Peludo, macio e definitivamente não inflamável. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "armorSpecialSpring2015WarriorText": "Cuidado: Armadura",
-    "armorSpecialSpring2015WarriorNotes": "Apenas o cachorinho mais feroz pode ser tão peludo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "armorSpecialSpring2015WarriorNotes": "Apenas o cachorinho mais feroz pode ser tão peludo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "armorSpecialSpring2015MageText": "Fantasia de Coelho do Mágico",
-    "armorSpecialSpring2015MageNotes": "O seu casaco combina com seu rabinho! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "armorSpecialSpring2015MageNotes": "O seu casaco combina com seu rabinho! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "armorSpecialSpring2015HealerText": "Fantasia Confortante de Gato",
     "armorSpecialSpring2015HealerNotes": "Essa macia fantasia de gato é confortável e reconfortante como chá de menta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "armorSpecialSummer2015RogueText": "Cauda de Rubi",
@@ -541,13 +541,13 @@
     "armorSpecialWinter2016HealerText": "Manto de Fada Festivo",
     "armorSpecialWinter2016HealerNotes": "Fadas Festivas enrolam suas asas do corpo em torno de si mesmas para proteção enquanto usam as asas da cabeça para pegar ventos contrários e voar por Habitica a velocidades de até 160 km/h, entregando presentes e pulverizando todos com confetes. Que divertido. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "armorSpecialSpring2016RogueText": "Traje Camuflado Canino",
-    "armorSpecialSpring2016RogueNotes": "Um pequeno filhote sabe escolher um disfarce colorido para se esconder quando tudo é verde e vibrante. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016RogueNotes": "Um pequeno filhote sabe escolher um disfarce colorido para se esconder quando tudo é verde e vibrante. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016WarriorText": "Armadura Poderosa",
-    "armorSpecialSpring2016WarriorNotes": "Embora pequeno, você é feroz! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016WarriorNotes": "Embora pequeno, você é feroz! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016MageText": "Túnica do Imponente Malkin",
-    "armorSpecialSpring2016MageNotes": "Brilhantemente colorido, para que você não seja confundido com um nec-ratomante. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016MageNotes": "Brilhantemente colorido, para que você não seja confundido com um nec-ratomante. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016HealerText": "Calções de Coelhinho Fofinho",
-    "armorSpecialSpring2016HealerNotes": "Saltando por ai! De colina a colina, curando aqueles que precisam. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016HealerNotes": "Saltando por ai! De colina a colina, curando aqueles que precisam. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSummer2016RogueText": "Cauda de Enguia",
     "armorSpecialSummer2016RogueNotes": "Essas eletrificantes vestes transformam seu usuário em um verdadeiro Gatuno Enguia! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão de 2016.",
     "armorSpecialSummer2016WarriorText": "Cauda de Tubarão",
@@ -577,9 +577,9 @@
     "armorSpecialSpring2017WarriorText": "Armadura Fofincrível",
     "armorSpecialSpring2017WarriorNotes": "Essa armadura extravagante é tão brilhante quanto seu melhor casaco, mas com resistência aumentada a ataques. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "armorSpecialSpring2017MageText": "Túnicas de Ilusionista Canino",
-    "armorSpecialSpring2017MageNotes": "Mágica pelo design, fofa por opção. Aumenta Inteligência em <%= int %>. Equipamento Edição Limitada 2017.",
+    "armorSpecialSpring2017MageNotes": "Mágica pelo design, fofa por opção. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "armorSpecialSpring2017HealerText": "Túnica do Descanso",
-    "armorSpecialSpring2017HealerNotes": "A suavidade dessa túnica conforta você assim como qualquer pessoa que precisa da sua ajuda de cura! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "armorSpecialSpring2017HealerNotes": "A suavidade dessa túnica conforta você assim como qualquer pessoa que precisa da sua ajuda de cura! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "armorSpecialSummer2017RogueText": "Cauda de Dragão do Mar",
     "armorSpecialSummer2017RogueNotes": "Esta capa colorida transforma o utilizador num Dragão do Mar de verdade! Aumenta Percepção em <%= per %>. Equipamento Edição Limitada, Verão de 2017.",
     "armorSpecialSummer2017WarriorText": "Armadura de Areia",
@@ -911,11 +911,11 @@
     "headSpecialSpringRogueText": "Máscara Furtiva de Gatinho",
     "headSpecialSpringRogueNotes": "Ninguém NUNCA adivinhará que você é um gatuno! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "headSpecialSpringWarriorText": "Capacete de Trevo Metálico",
-    "headSpecialSpringWarriorNotes": "Soldado a partir de belos trevos do campo, esse capacete resiste até mesmo aos mais poderosos golpes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringWarriorNotes": "Soldado a partir de belos trevos do campo, esse capacete resiste até mesmo aos mais poderosos golpes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSpringMageText": "Chapéu de Queijo-Suíço",
-    "headSpecialSpringMageNotes": "Esse chapéu possui muito poder mágico! Tente não mordê-lo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringMageNotes": "Esse chapéu possui muito poder mágico! Tente não mordê-lo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSpringHealerText": "Coroa da Amizade",
-    "headSpecialSpringHealerNotes": "Essa coroa simboliza lealdade e companheirismo. Afinal, um cachorro é o melhor amigo de um aventureiro! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringHealerNotes": "Essa coroa simboliza lealdade e companheirismo. Afinal, um cachorro é o melhor amigo de um aventureiro! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSummerRogueText": "Chapéu de Pirata",
     "headSpecialSummerRogueNotes": "Apenas os mais produtivos piratas podem usar este belo chapéu. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão de 2014.",
     "headSpecialSummerWarriorText": "Bandana de Marujo",
@@ -945,9 +945,9 @@
     "headSpecialSpring2015RogueText": "Elmo à Prova de Fogo",
     "headSpecialSpring2015RogueNotes": "Fogo? HA! Você guincha ferozmente na cara do fogo! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "headSpecialSpring2015WarriorText": "Cuidado: Elmo",
-    "headSpecialSpring2015WarriorNotes": "Cuidado com o Elmo! Só um cachorrinho feroz pode usá-lo. Pare de rir. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headSpecialSpring2015WarriorNotes": "Cuidado com o Elmo! Só um cachorrinho feroz pode usá-lo. Pare de rir. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "headSpecialSpring2015MageText": "Chapéu de Ilusionista",
-    "headSpecialSpring2015MageNotes": "O que veio primeiro, o coelhinho ou o chapéu? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headSpecialSpring2015MageNotes": "O que veio primeiro, o coelhinho ou o chapéu? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "headSpecialSpring2015HealerText": "Coroa Confortante",
     "headSpecialSpring2015HealerNotes": "A pérola no centro dessa coroa acalma e conforta aqueles ao seu redor. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "headSpecialSummer2015RogueText": "Chapéu dos Renegados",
@@ -977,13 +977,13 @@
     "headSpecialWinter2016HealerText": "Elmo Alado de Fada",
     "headSpecialWinter2016HealerNotes": "Essasasasbatemtãorápidoquenãodápraver! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "headSpecialSpring2016RogueText": "Máscara de Cachorrinho Bonitinho",
-    "headSpecialSpring2016RogueNotes": "Ooun, que cachorrinho fofo! Venha aqui e me deixe fazer carinho em você. ...Ei, onde todo meu Ouro foi parar? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headSpecialSpring2016RogueNotes": "Ooun, que cachorrinho fofo! Venha aqui e me deixe fazer carinho em você. ...Ei, onde todo meu Ouro foi parar? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "headSpecialSpring2016WarriorText": "Elmo de Rato Guarda",
     "headSpecialSpring2016WarriorNotes": "Nunca mais você será acertado na cabeça! Deixe-os tentarem! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "headSpecialSpring2016MageText": "Grande Chapéu de Malkin",
     "headSpecialSpring2016MageNotes": "Vestimenta para colocar você acima dos meros magos simples do mundo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "headSpecialSpring2016HealerText": "Diadema de Flores",
-    "headSpecialSpring2016HealerNotes": "Ele cintila com o potencial de uma nova vida pronta para florescer. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headSpecialSpring2016HealerNotes": "Ele cintila com o potencial de uma nova vida pronta para florescer. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "headSpecialSummer2016RogueText": "Capacete de Enguia",
     "headSpecialSummer2016RogueNotes": "Espie por frestas de rochas enquanto estiver usando esse elmo discreto. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão 2016.",
     "headSpecialSummer2016WarriorText": "Capacete de Tubarão",
@@ -1011,13 +1011,13 @@
     "headSpecialWinter2017HealerText": "Elmo Champagne",
     "headSpecialWinter2017HealerNotes": "Essas pétalas cintilantes concentram sua capacidade intelectual! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2016 e 2017.",
     "headSpecialSpring2017RogueText": "Elmo de Coelhinho Sorrateiro",
-    "headSpecialSpring2017RogueNotes": "Essa máscara vai evitar que a sua fofura te entregue quando você estiver se esgueirando para atacar Tarefas (ou trevos)! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headSpecialSpring2017RogueNotes": "Essa máscara vai evitar que a sua fofura te entregue quando você estiver se esgueirando para atacar Tarefas (ou trevos)! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSpring2017WarriorText": "Elmo Felino",
-    "headSpecialSpring2017WarriorNotes": "Proteja sua adorável e macia cabeça com este elmo finamente decorado. Aumenta Força em <%= str %>. Equipamento de Edição Limitada, Primavera de 2017.",
+    "headSpecialSpring2017WarriorNotes": "Proteja sua adorável e macia cabeça com este elmo finamente decorado. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSpring2017MageText": "Chapéu de Conjurador Canino",
     "headSpecialSpring2017MageNotes": "Este chapéu pode te ajudar a conjurar poderosos feitiços... Ou você pode usá-lo apenas para invocar bolas de tênis. Você escolhe. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "headSpecialSpring2017HealerText": "Tiara de Pétalas",
-    "headSpecialSpring2017HealerNotes": "Essa coroa delicada emite o confortante cheiro da Primavera. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada, Primavera de 2017.",
+    "headSpecialSpring2017HealerNotes": "Essa coroa delicada emite o confortante cheiro da Primavera. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSummer2017RogueText": "Elmo de Dragão do Mar",
     "headSpecialSummer2017RogueNotes": "Esse elmo muda de cor para te ajudar a se misturar com seus arredores. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada, Verão de 2017.",
     "headSpecialSummer2017WarriorText": "Elmo do Castelo de Areia",
@@ -1321,7 +1321,7 @@
     "shieldSpecialSpringRogueText": "Garras de Gancho",
     "shieldSpecialSpringRogueNotes": "Ótimo para escalar altos prédios e também para rasgar carpetes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "shieldSpecialSpringWarriorText": "Escudo de Ovo",
-    "shieldSpecialSpringWarriorNotes": "Esse escudo nunca racha, não importa o quão forte você bata nele! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "shieldSpecialSpringWarriorNotes": "Esse escudo nunca racha, não importa o quão forte você bata nele! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "shieldSpecialSpringHealerText": "Bola Barulhenta da Proteção Final",
     "shieldSpecialSpringHealerNotes": "Libera um barulho desagradável e contínuo quando mordida, afastando os inimigos para longe. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "shieldSpecialSummerRogueText": "Cutelo de Pirata",
@@ -1345,9 +1345,9 @@
     "shieldSpecialSpring2015RogueText": "Guinchado Explosivo",
     "shieldSpecialSpring2015RogueNotes": "Não deixe o som te enganar - esses explosivos são fortes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "shieldSpecialSpring2015WarriorText": "Disco de Prato",
-    "shieldSpecialSpring2015WarriorNotes": "Jogue nos seus inimigos... ou só segure, porque vai se encher de ração gostosa na hora da janta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "shieldSpecialSpring2015WarriorNotes": "Jogue nos seus inimigos... ou só segure, porque vai se encher de ração gostosa na hora da janta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "shieldSpecialSpring2015HealerText": "Travesseiro Estampado",
-    "shieldSpecialSpring2015HealerNotes": "Você pode descansar a cabeça neste travesseiro macio, ou você pode lutar contra ele com suas temíveis garras. Rawr! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "shieldSpecialSpring2015HealerNotes": "Você pode descansar a cabeça neste travesseiro macio, ou você pode lutar contra ele com suas temíveis garras. Rawr! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "shieldSpecialSummer2015RogueText": "Coral Atirador",
     "shieldSpecialSummer2015RogueNotes": "Este parente do coral de fogo tem a habilidade de expelir seu veneno através da água. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2015.",
     "shieldSpecialSummer2015WarriorText": "Escudo de Peixe Sol",
@@ -1369,9 +1369,9 @@
     "shieldSpecialSpring2016RogueText": "Bolas de Fogo",
     "shieldSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "shieldSpecialSpring2016WarriorText": "Roda de Queijo",
-    "shieldSpecialSpring2016WarriorNotes": "Você enfrentou diabólicas armadilhas para obter essa comida que aumenta defesa. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "shieldSpecialSpring2016WarriorNotes": "Você enfrentou diabólicas armadilhas para obter essa comida que aumenta defesa. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "shieldSpecialSpring2016HealerText": "Broquel Floral",
-    "shieldSpecialSpring2016HealerNotes": "O Primeiro de Abril diz que este pequeno escudo bloqueará Sementes Brilhantes. Não acredite nele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "shieldSpecialSpring2016HealerNotes": "O Primeiro de Abril diz que este pequeno escudo bloqueará Sementes Brilhantes. Não acredite nele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "shieldSpecialSummer2016RogueText": "Varinha Elétrica",
     "shieldSpecialSummer2016RogueNotes": "Qualquer um que batalhe com você terá uma surpresa chocante... Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2016.",
     "shieldSpecialSummer2016WarriorText": "Dente de Tubarão",
@@ -1393,7 +1393,7 @@
     "shieldSpecialSpring2017RogueText": "Karrotana",
     "shieldSpecialSpring2017RogueNotes": "Essas lâminas irão resolver rápido as tarefas, mas também são úteis para cortar vegetais! Uhmmm! Aumenta Força em <%= str %>. Equipamento de Edição Limitada, Primavera de 2017.",
     "shieldSpecialSpring2017WarriorText": "Escudo de Lã",
-    "shieldSpecialSpring2017WarriorNotes": "Toda fibra deste escudo é trançado com feitiços protetores! Tente não brincar (demais) com ele. Aumenta Constituição em <%= con %>. Equipamento de Primavera de 2017 Edição Limitada.",
+    "shieldSpecialSpring2017WarriorNotes": "Toda fibra deste escudo é trançado com feitiços protetores! Tente não brincar (demais) com ele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "shieldSpecialSpring2017HealerText": "Escudo de Cesta",
     "shieldSpecialSpring2017HealerNotes": "Protetor e também útil para guardar suas várias ervas de cura e acessórios. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "shieldSpecialSummer2017RogueText": "Nadadeiras de Dragão Marinho",
@@ -1618,37 +1618,37 @@
     "headAccessoryBase0Text": "Sem Acessório de Cabeça",
     "headAccessoryBase0Notes": "Sem Acessório de Cabeça.",
     "headAccessorySpecialSpringRogueText": "Orelhas Roxas de Gatinho",
-    "headAccessorySpecialSpringRogueNotes": "Essas orelhas felinas se contraem para detectar ameaças iminentes. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headAccessorySpecialSpringRogueNotes": "Essas orelhas felinas se contraem para detectar ameaças iminentes. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2014.",
     "headAccessorySpecialSpringWarriorText": "Orelhas Verdes de Coelhinho",
     "headAccessorySpecialSpringWarriorNotes": "Orelhas de coelho aguçadas, que detectam cada mordida em uma cenoura. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
     "headAccessorySpecialSpringMageText": "Orelhas Azuis de Ratinho",
     "headAccessorySpecialSpringMageNotes": "Essas orelhas de rato redondas são macias como seda. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
     "headAccessorySpecialSpringHealerText": "Orelhas Amarelas de Cachorrinho",
-    "headAccessorySpecialSpringHealerNotes": "De abano e fofas. Quer brincar? Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headAccessorySpecialSpringHealerNotes": "De abano e fofas. Quer brincar? Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2014.",
     "headAccessorySpecialSpring2015RogueText": "Orelhas Amarelas de Ratinho",
     "headAccessorySpecialSpring2015RogueNotes": "Essas orelhas se protegem do som de explosões. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
     "headAccessorySpecialSpring2015WarriorText": "Orelhas Roxas de Cachorrinho",
-    "headAccessorySpecialSpring2015WarriorNotes": "São roxas. São orelhas de cachorro. Não desperdice seu tempo com mais bobagens. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headAccessorySpecialSpring2015WarriorNotes": "São roxas. São orelhas de cachorro. Não desperdice seu tempo com mais bobagens. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2015.",
     "headAccessorySpecialSpring2015MageText": "Orelhas Azuis de Coelhinho",
     "headAccessorySpecialSpring2015MageNotes": "Essas orelhas escutam atentamente, caso em algum lugar um mágico esteja revelando segredos. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
     "headAccessorySpecialSpring2015HealerText": "Orelhas Verdes de Gatinho",
-    "headAccessorySpecialSpring2015HealerNotes": "Essas adoráveis orelhas de gatinho vão deixar os outro verdes de inveja. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headAccessorySpecialSpring2015HealerNotes": "Essas adoráveis orelhas de gatinho vão deixar os outro verdes de inveja. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2015.",
     "headAccessorySpecialSpring2016RogueText": "Orelhas Verdes de Cachorrinho",
-    "headAccessorySpecialSpring2016RogueNotes": "Com isto, você pode observar Magos astutos até mesmo quando estão invisíveis! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016RogueNotes": "Com isto, você pode observar Magos astutos até mesmo quando estão invisíveis! Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016WarriorText": "Orelhas Vermelhas de Ratinho",
-    "headAccessorySpecialSpring2016WarriorNotes": "Para melhor escutar sua canção tema pelos clamorosos campos de batalha. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016WarriorNotes": "Para melhor escutar sua canção tema pelos clamorosos campos de batalha. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016MageText": "Orelhas Amarelas de Gatinho",
-    "headAccessorySpecialSpring2016MageNotes": "Estas orelhas afiadas podem detectar o murmurar da Mana no ambiente, ou as passadas silenciosas de um Gatuno. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016MageNotes": "Estas orelhas afiadas podem detectar o murmurar da Mana no ambiente, ou as passadas silenciosas de um Gatuno. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016HealerText": "Orelhas Roxas de Coelhinho",
-    "headAccessorySpecialSpring2016HealerNotes": "Eles levantam como bandeiras sobre a briga, deixando os outros saberem onde correr por ajuda. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016HealerNotes": "Eles levantam como bandeiras sobre a briga, deixando os outros saberem onde correr por ajuda. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2017RogueText": "Orelhas Vermelhas de Coelhinho",
-    "headAccessorySpecialSpring2017RogueNotes": "Nenhum som irá escapá-lo graças a essas orelhas. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017RogueNotes": "Nenhum som irá escapá-lo graças a essas orelhas. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessorySpecialSpring2017WarriorText": "Orelhas Azuis de Gatinho",
-    "headAccessorySpecialSpring2017WarriorNotes": "Essas orelhas podem ouvir uma cesta de petiscos felinos ser aberta mesmo no momento mais estrépido de batalha! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017WarriorNotes": "Essas orelhas podem ouvir uma cesta de petiscos felinos ser aberta mesmo no momento mais estrépido de batalha! Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessorySpecialSpring2017MageText": "Orelhas Verde-Azuladas de Cachorrinho",
-    "headAccessorySpecialSpring2017MageNotes": "Você pode ouvir a mágica no ar! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017MageNotes": "Você pode ouvir a mágica no ar! Não confere benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
     "headAccessorySpecialSpring2017HealerText": "Orelhas Roxas de Ratinho",
-    "headAccessorySpecialSpring2017HealerNotes": "Essas orelhas irão ajudar você a ouvir segredos curadores. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017HealerNotes": "Essas orelhas irão ajudar você a ouvir segredos curadores. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessoryBearEarsText": "Orelhas de Urso",
     "headAccessoryBearEarsNotes": "Estas orelhas te fazem parecer com um corajoso urso! Não concede benefícios.",
     "headAccessoryCactusEarsText": "Orelhas de Cacto",
diff --git a/website/common/locales/pt_BR/limited.json b/website/common/locales/pt_BR/limited.json
index b00dd78f82..b4d0f55090 100644
--- a/website/common/locales/pt_BR/limited.json
+++ b/website/common/locales/pt_BR/limited.json
@@ -2,7 +2,7 @@
     "annoyingFriends": "Amigos(as) Irritantes",
     "annoyingFriendsText": "Foi atingido(a) por bolas de neve <%= count %> vezes por membros do grupo.",
     "alarmingFriends": "Amigos Alarmantes",
-    "alarmingFriendsText": "Foi atingido(a) por bolas de neve <%= count %> vezes pelos membros do grupo.",
+    "alarmingFriendsText": "Foi transformado(a) em fantasma <%= count %> vezes pelos membros do grupo.",
     "agriculturalFriends": "Amigos do Campo",
     "agriculturalFriendsText": "Foi transformado(a) em flor <%= count %> vezes pelos membros do grupo.",
     "aquaticFriends": "Amigos Aquáticos",
diff --git a/website/common/locales/pt_BR/npc.json b/website/common/locales/pt_BR/npc.json
index 9902245cbd..fb3ba3bfbd 100644
--- a/website/common/locales/pt_BR/npc.json
+++ b/website/common/locales/pt_BR/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Nova atualização da Bailey!",
     "tellMeLater": "Lembrar mais tarde",
     "dismissAlert": "Dispensar este alerta",
-    "donateText3": "Habitica é um projeto de código aberto que depende do suporte dos nossos usuários. O dinheiro que você gasta em gemas nos ajuda a manter os servidores funcionando, manter uma pequena equipe, desenvolver novas funcionalidades e oferecer incentivos para os nossos programadores voluntários. Obrigado pela sua generosidade!",
+    "donateText3": "Habitica é um projeto de código aberto que depende do suporte dos nossos usuários. O dinheiro que você gasta em gemas nos ajuda a manter os servidores funcionando, manter uma pequena equipe, desenvolver novas funcionalidades e oferecer incentivos para os nossos voluntários.",
     "card": "Cartão de crédito",
     "paymentMethods": "Comprar usando",
     "paymentSuccessful": "Seu pagamento foi efetuado com sucesso!",
@@ -130,5 +130,6 @@
     "limitedAvailabilityDays": "Disponível por <%= days %>d <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityHours": "Disponível por <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityMinutes": "Disponível por <%= minutes %>m <%= seconds %>s",
-    "amountExp": "<%= amount %> de EXP"
+    "amountExp": "<%= amount %> de EXP",
+    "helpSupportHabitica": "Ajude Apoiando o Habitica"
 }
diff --git a/website/common/locales/pt_BR/questscontent.json b/website/common/locales/pt_BR/questscontent.json
index 45a5d02eee..9c0ac2fb10 100644
--- a/website/common/locales/pt_BR/questscontent.json
+++ b/website/common/locales/pt_BR/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Hipopótamo (Ovo)",
     "questHippoUnlockText": "Desbloqueia Ovos de Hipopótamo para compra no mercado",
     "farmFriendsText": "Pacote de Missões Amigos da Fazenda",
-    "farmFriendsNotes": "Contém 'A Vaca Muutante', 'Cavalgue o Pesadelo' e 'O Carneiro do Trovão'. Disponível até 31 de Agosto.",
+    "farmFriendsNotes": "Contém 'A Vaca Muutante', 'Cavalgue o Pesadelo' e 'O Carneiro do Trovão'. Disponível até 30 de setembro.",
     "witchyFamiliarsText": "Pacote de Missões Familiares Bruxos",
     "witchyFamiliarsNotes": "Contém \"O Rei Rato\", \"O Aracnídeo de Gelo\" e \"Pântano do Sapo Bagunceiro\". Disponível até 31 de outubro.",
     "questGroupLostMasterclasser": "Mistério dos Mestres de Classe",
diff --git a/website/common/locales/pt_BR/subscriber.json b/website/common/locales/pt_BR/subscriber.json
index e53d31de20..05a2eaae08 100644
--- a/website/common/locales/pt_BR/subscriber.json
+++ b/website/common/locales/pt_BR/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Sua assinatura foi cancelada",
     "choosePaymentMethod": "Escolha seu método de pagamento",
     "buyGemsSupportsDevs": "A compra de Gemas dá o apoio necessário para os desenvolvedores continuarem movimentando o Habitica",
-    "support": "SUPORTE",
+    "support": "Suporte",
     "gemBenefitLeadin": "O que você pode comprar com Gemas?",
     "gemBenefit1": "Trajes únicos e elegantes para o seu avatar.",
     "gemBenefit2": "Cenários para a imersão do seu avatar no mundo do Habitica!",
diff --git a/website/common/locales/ru/faq.json b/website/common/locales/ru/faq.json
index 821dd55e4e..3abd34643b 100644
--- a/website/common/locales/ru/faq.json
+++ b/website/common/locales/ru/faq.json
@@ -55,5 +55,5 @@
     "iosFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВО), задайте его в чате Таверны через Меню > Таверна! Мы с радостью поможем вам.",
     "androidFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВо), задайте его в чате Таверны через Меню > Таверна! Мы с радостью поможем вам.",
     "webFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВО), задайте его в [Гильдии новичков](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Мы с радостью поможем вам.",
-    "faqQuestion13": "Что такое групповые тарифы?"
+    "faqQuestion13": "Что такое групповые планы?"
 }
diff --git a/website/common/locales/ru/front.json b/website/common/locales/ru/front.json
index dfc37e84c4..f946e8f47f 100644
--- a/website/common/locales/ru/front.json
+++ b/website/common/locales/ru/front.json
@@ -5,11 +5,11 @@
     "accept2Terms": "и",
     "chores": "Домашние дела",
     "clearBrowserData": "Очистить данные браузера",
-    "communityExtensions": "<a href='https://habitica.fandom.com/ru/wiki/Персонализация' target='_blank'>Персонализация</a>",
+    "communityExtensions": "Персонализация",
     "communityFacebook": "Facebook",
     "companyAbout": "Как это работает",
     "companyBlog": "Блог",
-    "companyContribute": "Сделать вклад",
+    "companyContribute": "Вклад в Habitica",
     "companyDonate": "Пожертвования",
     "forgotPassword": "Забыли пароль?",
     "emailNewPass": "Отправьте мне ссылку на сброс пароля",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Хотите жить играючи?",
     "marketing4Lead3-2": "Заинтересованы в создании группы в сферах образования, здоровья или других?",
     "marketing4Lead3Title": "Игра во всём",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Приложение для Android",
+    "mobileIOS": "Приложение для iOS",
     "oldNews": "Новости",
     "newsArchive": "Архив новостей на вики (мультиязычный)",
     "setNewPass": "Введите новый пароль",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Пароль должен состоять из 8 или более символов.",
     "enterHabitica": "Войти в Habitica",
     "emailUsernamePlaceholder": "Например, habitrabbit или gryphon@example.com",
-    "socialAlreadyExists": "Этот логин социальной сети уже привязан к существующему аккаунту Хабитики."
+    "socialAlreadyExists": "Этот логин социальной сети уже привязан к существующему аккаунту Хабитики.",
+    "footerProduct": "Продукт"
 }
diff --git a/website/common/locales/ru/gear.json b/website/common/locales/ru/gear.json
index eae64d779d..33c31d33b6 100644
--- a/website/common/locales/ru/gear.json
+++ b/website/common/locales/ru/gear.json
@@ -2688,5 +2688,14 @@
     "weaponMystery202209Text": "Руководство по магии",
     "weaponMystery202209Notes": "Эта книга станет вашим путеводителем на пути к созданию магии. Бонусов не дает. Подарок подписчикам сентября 2022.",
     "shieldMystery202209Notes": "Чтобы приобрести знания в области колдовства, нужно много читать, но вы непременно будете наслаждаться учёбой. Бонусов не дает. Подарок подписчикам сентября 2022.",
-    "shieldMystery202209Text": "Гора волшебных книг"
+    "shieldMystery202209Text": "Гора волшебных книг",
+    "headSpecialSpring2022RogueNotes": "Надев эту маску, вы станете умным, как сорока. Возможно вы даже сможете иммитировать ее стрекотание. Увеличивает восприятие на <%= per %>. Ограниченный выпуск весны 2022.",
+    "eyewearMystery202204BNotes": "Какое у вас сегодня настроение? Выражайте себя с помощью этих забавных экранов! Бонусов не дает. Подарок подписчикам апреля 2022.",
+    "eyewearArmoireComedyMaskText": "Комедийная Маска",
+    "eyewearArmoireComedyMaskNotes": "Весело! Вот причудливая маска для твоего счастливого сердца, возвещающая радость, выражающая веселье и счастье на сцене. Увеличивает телосложение на <%= con %>. Зачарованный сундук: Набор театральных масок (предмет 1 из 2).",
+    "eyewearArmoireTragedyMaskText": "Трагическая маска",
+    "eyewearMystery202204ANotes": "Какое у вас сегодня настроение? Выражайте себя с помощью этих забавных экранов! Бонусов не дает. Подарок подписчикам апреля 2022.",
+    "eyewearArmoireTragedyMaskNotes": "Увы! Здесь лежит грузная маска для твоего бедного актера, который мечется, выражая горе и печаль на сцене. Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор театральных масок (предмет 2 из 2).",
+    "headMystery202207Text": "Желейный шлем",
+    "armorMystery202207Text": "Желейная броня"
 }
diff --git a/website/common/locales/ru/groups.json b/website/common/locales/ru/groups.json
index 1189eb7352..9b262aeb70 100644
--- a/website/common/locales/ru/groups.json
+++ b/website/common/locales/ru/groups.json
@@ -394,5 +394,12 @@
     "lastCompleted": "Последнее выполненное",
     "newGroupsBullet06": "Просмотр статуса задания позволяет быстро увидеть, кто его выполнил",
     "newGroupsBullet07": "Включите функцию отображения общих задач на вашей персональной доске задач",
-    "newGroupsBullet08": "Лидер группы и менеджеры могут быстро добавлять задачи из верхней части столбцов задач"
+    "newGroupsBullet08": "Лидер группы и менеджеры могут быстро добавлять задачи из верхней части столбцов задач",
+    "newGroupsBullet09": "Общую задачу можно вернуть в работу, чтобы показать, что она еще нуждается в доработке",
+    "newGroupsBullet10": "Статус назначения определяет условие выполнения:",
+    "newGroupsBullet10a": "<strong>Оставьте задачу неназначенной</strong>, если любой из участников может ее выполнить",
+    "newGroupsBullet10b": "<strong>Назначьте задачу одному участнику</strong>, чтобы только он мог ее выполнить",
+    "newGroupsBullet10c": "<strong>Назначьте задачу нескольким участникам</strong>, если им всем нужно её выполнить",
+    "newGroupsVisitFAQ": "Посетите <a href='/static/faq#group-plans' target='_blank'>ЧаВо</a> из выпадающего меню \"Помощь\" для получения дополнительной информации.",
+    "newGroupsEnjoy": "Надеемся вам понравиться опыт работы с новыми групповым планами!"
 }
diff --git a/website/common/locales/ru/npc.json b/website/common/locales/ru/npc.json
index f83359a545..a46ef31a45 100644
--- a/website/common/locales/ru/npc.json
+++ b/website/common/locales/ru/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Обновление от Бэйли!",
     "tellMeLater": "Напомнить позже",
     "dismissAlert": "Скрыть эти вести",
-    "donateText3": "Habitica – это проект с открытым исходным кодом, зависящий от поддержки своих пользователей. Деньги, которые вы тратите на покупку самоцветов, помогают нам поддерживать сервера в рабочем состоянии, сохранять небольшой штат сотрудников, разрабатывать новые функции и давать стимул нашим программистам-добровольцам. Благодарим вас за щедрость!",
+    "donateText3": "Habitica – это проект с открытым исходным кодом, зависящий от поддержки своих пользователей. Деньги, которые вы тратите на покупку самоцветов, помогают нам поддерживать сервера в рабочем состоянии, сохранять небольшой штат сотрудников, разрабатывать новые функции и давать стимул нашим волонтерам.",
     "card": "Пластиковой карточкой",
     "paymentMethods": "Приобрести с использованием",
     "paymentSuccessful": "Платеж прошел успешно!",
diff --git a/website/common/locales/ru/questscontent.json b/website/common/locales/ru/questscontent.json
index 745d2cc895..7c2eec8d9e 100644
--- a/website/common/locales/ru/questscontent.json
+++ b/website/common/locales/ru/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Бегемот (яйцо)",
     "questHippoUnlockText": "Позволяет покупать на рынке бегемота в яйце",
     "farmFriendsText": "Набор квестов «Друзья фермера»",
-    "farmFriendsNotes": "Содержит квесты «Корова-муутант», «Прокатись на Лошмаре!» и «Грозовой баран». Доступен до 31 августа.",
+    "farmFriendsNotes": "Содержит квесты «Корова-муутант», «Прокатись на Лошмаре!» и «Грозовой баран». Доступен до 30 сентября.",
     "witchyFamiliarsText": "Набор квестов «Фамильяры колдуньи»",
     "witchyFamiliarsNotes": "Содержит квесты «Крысиный король», Ледяной Арахнид» и «Болото Лягушки Беспорядка». Доступен до 31 октября.",
     "questGroupLostMasterclasser": "Тайна ордена Мастеров",
diff --git a/website/common/locales/ru/subscriber.json b/website/common/locales/ru/subscriber.json
index 0346647337..e9f75d2fec 100644
--- a/website/common/locales/ru/subscriber.json
+++ b/website/common/locales/ru/subscriber.json
@@ -11,7 +11,7 @@
     "exclusiveJackalopePet": "Эксклюзивный питомец",
     "giftSubscription": "Хотите подарить преимущества подписки кому-то?",
     "giftSubscriptionText4": "Спасибо за поддержку Habitica!",
-    "groupPlans": "Групповые тарифы",
+    "groupPlans": "Групповые планы",
     "subscribe": "Подписка",
     "nowSubscribed": "Вы оформили подписку на Habitica!",
     "cancelSub": "Отмена подписки",
diff --git a/website/common/locales/uk/communityguidelines.json b/website/common/locales/uk/communityguidelines.json
index 4825968f33..91a4a59fe2 100644
--- a/website/common/locales/uk/communityguidelines.json
+++ b/website/common/locales/uk/communityguidelines.json
@@ -31,7 +31,7 @@
     "commGuidePara029": "<strong>Публічні ґільдії дуже схожі на таверну, за винятком того, що замість того, щоб бути спілкуватись на загальні теми, вони мають конкретну</strong>. Чат публічної ґільдії має зосередитися на цій темі. Наприклад, члени ґільдії \"Майстри слова\" можуть бути розчаровані, якщо розмова раптом зосередиться на садівництві, а не на письмі, а ґільдія \"Любителі драконів\" може не виявляти інтересу до розшифровки стародавніх рун. Деякі ґільдії ставляться до цього більш толерантно, ніж інші, але загалом <strong>намагайтеся залишатися в темі</strong>!",
     "commGuidePara031": "Деякі публічні ґільдії міститимуть делікатні теми, такі як депресія, релігія, політика тощо. Це нормально, якщо розмови в них не порушують жодних положень та умов чи Правил публічного простору, і якщо вони залишаються на темі.",
     "commGuidePara033": "<strong>Публічні ґільдії НЕ можуть містити вміст для аудиторії віком понад 18 років. Якщо вони планують регулярно обговорювати чутливу інформацію, вони повинні вказати це в описі ґільдії</strong>. Це робиться для того, щоб Habitica була безпечною та комфортною для всіх.",
-    "commGuidePara035": "<strong>Якщо у ґільдії, про яку йдеться, є різні чутливі питання, з повагою до ваших співвітчизників-габітян слід розмістити свій коментар за попередженням (наприклад, \"Попередження: посилання на самоушкодження\")</strong>. Вони можуть бути охарактеризовані як попередження про тригер та/або примітки щодо вмісту, і ґільдії можуть мати власні правила на додаток до наведених тут. Якщо можливо, скористайтеся <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a>, щоб приховати потенційно конфіденційний вміст під розривами рядків, щоб усі бажаючі щоб уникнути читання, можна прокрутити його, не побачивши вмісту. Співробітники та модератори Habitica можуть видаляти цей матеріал на свій розсуд.",
+    "commGuidePara035": "<strong>Якщо у ґільдії, про яку йдеться, є різні чутливі питання, з повагою до ваших співвітчизників-габітиканців слід розмістити свій коментар за попередженням (наприклад, \"Попередження: посилання на самоушкодження\")</strong>. Вони можуть бути охарактеризовані як попередження про тригер та/або примітки щодо вмісту, і ґільдії можуть мати власні правила на додаток до наведених тут. Якщо можливо, скористайтеся <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a>, щоб приховати потенційно конфіденційний вміст під розривами рядків, щоб усі бажаючі щоб уникнути читання, можна прокрутити його, не побачивши вмісту. Співробітники та модератори Habitica можуть видаляти цей матеріал на свій розсуд.",
     "commGuidePara036": "Крім того, делікатний матеріал має бути актуальним – згадування про самоушкодження в ґільдії, зосередженій на боротьбі з депресією, може мати сенс, але, мабуть, менш доречно в музичній ґільдії. Якщо ви бачите, що хтось неодноразово порушує ці правила, особливо після кількох запитів, повідомте про ці публікації.",
     "commGuidePara037": "<strong>Жодні ґільдії, публічні чи приватні, не повинні створюватися з метою нападу на будь-яку групу чи особу</strong>. Створення такої гільдії є підставою для миттєвого бану. Боріться зі шкідливими звичками, а не з іншими шукачами пригод!",
     "commGuidePara038": "<strong>Усі випробування таверни та публічних ґільдії також мають відповідати цим правилам</strong>.",
@@ -109,7 +109,7 @@
     "commGuidePara013": "У такій великій спільноті, як Habitica, користувачі приходять і йдуть, і іноді співробітнику чи модератору потрібно скласти свою благородну мантію та розслабитися. Нижче наведено почесних працівників і модераторів. Вони більше не мають повноважень співробітника чи модератора, але ми все одно хочемо вшанувати їхню роботу!",
     "commGuidePara014": "Почесні співробітники та модератори:",
     "commGuideHeadingFinal": "Завершальна секція",
-    "commGuidePara067": "Отже, відважний габітітиканцю, Правила спільноти! Витріть піт зі свого чола та отримайте досвід, прочитавши все це. Якщо у вас виникли запитання чи сумніви щодо Правил спільноти, зв’яжіться з нами за адресою <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, ми завжди раді допомогти прояснити речі.",
+    "commGuidePara067": "Отже, відважний габітиканцю, Правила спільноти! Витріть піт зі свого чола та отримайте досвід, прочитавши все це. Якщо у вас виникли запитання чи сумніви щодо Правил спільноти, зв’яжіться з нами за адресою <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, ми завжди раді допомогти прояснити речі.",
     "commGuidePara068": "А тепер іди вперед, відважний шукаче пригод, і впорайся з декількома щоденками!",
     "commGuideHeadingLinks": "Корисні посилання",
     "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>: Ґільдія, де користувачі можуть ставити запитання!",
diff --git a/website/common/locales/uk/contrib.json b/website/common/locales/uk/contrib.json
index 14eb8f2d72..68b2cd3dc6 100644
--- a/website/common/locales/uk/contrib.json
+++ b/website/common/locales/uk/contrib.json
@@ -1,5 +1,5 @@
 {
-    "playerTiersDesc": "Кольорові імена користувачів, які ви бачите в чаті, представляють рівень учасника. Чим вище рівень, тим більше людина внесла свій внесок у Хабітіка за допомогою мистецтва, коду, спільноти тощо!",
+    "playerTiersDesc": "Кольорові імена користувачів, які ви бачите в чаті, представляють рівень учасника. Чим вище рівень, тим більший людина зробила внесок в Habitica за допомогою мистецтва, коду чи допомоги спільноті тощо!",
     "tier1": "Рівень 1 (друг)",
     "tier2": "Рівень 2 (друг)",
     "tier3": "Рівень 3 (елітний)",
diff --git a/website/common/locales/uk/gear.json b/website/common/locales/uk/gear.json
index c729b05ddd..12e08f5a4e 100644
--- a/website/common/locales/uk/gear.json
+++ b/website/common/locales/uk/gear.json
@@ -1747,7 +1747,7 @@
     "eyewearArmoirePlagueDoctorMaskNotes": "",
     "eyewearArmoireGoofyGlassesText": "",
     "eyewearArmoireGoofyGlassesNotes": "",
-    "twoHandedItem": "",
+    "twoHandedItem": "Дворучна зброя.",
     "weaponSpecialKS2019Text": "Глефа міфічного грифона",
     "weaponSpecialKS2019Notes": "Зігнута, немов дзьоб та кігті грифона, ця пишна древкова зброя надає енергію, коли завдання здаються страшними. Збільшує силу на <%= str %>.",
     "weaponSpecialSpring2019RogueText": "Блискавка",
@@ -1923,7 +1923,7 @@
     "weaponArmoireJugglingBallsText": "Жонглювання м'ячами",
     "armorSpecialSummer2020HealerNotes": "Ви терплячі, як океан, сильні, як течії, такі ж надійні, як і припливи. Збільшує статуру на <%= con %>. Обмежена серія 2020 літнього спорядження.",
     "armorMystery202103Notes": "Ці м’які та вітряні халати ідеально підходять для чаювання під ефектними весняними деревами. Ніякої вигоди не приносить. Березень 2021 предмет підписки.",
-    "weaponArmoireJugglingBallsNotes": "Хабітікани-майстри багатозадачності, тому у вас не повинно виникнути проблем із утриманням усіх цих кульок у повітрі! Збільшує інтелект на <%= int %>. Зачарована шафа: незалежний предмет.",
+    "weaponArmoireJugglingBallsNotes": "Габітиканці - майстри багатозадачності, тому у вас не повинно виникнути проблем із утриманням усіх цих кульок у повітрі! Збільшує інтелект на <%= int %>. Зачарована шафа: незалежний предмет.",
     "armorArmoireBoxArmorText": "Броня коробка",
     "weaponArmoireHappyBannerText": "Щасливий банер",
     "armorSpecialWinter2020HealerText": "Сукня з апельсинової шкірки",
@@ -1961,7 +1961,7 @@
     "armorSpecialFall2019MageNotes": "Його тезку спіткала жахлива доля. Але вас не так просто обдурити! Одягніться в цю мантію легенд, і ніхто вас не перевершить. Збільшує інтелект на <%= int %>. Обмежена серія 2019 осіннього спорядження.",
     "armorMystery202103Text": "Халати для перегляду цвіту",
     "weaponArmoireClubOfClubsText": "Клуб... Клуби",
-    "armorSpecialBirthday2020Notes": "З днем народження, Хабітіка! Одягніть ці епатажні партійні халати, щоб відсвяткувати цей чудовий день. Ніякої вигоди не приносить.",
+    "armorSpecialBirthday2020Notes": "З днем народження, Habitica! Одягніть ці епатажні святкові халати, щоб весело провести цей чудовий день. Не дає жодних бонусів.",
     "armorMystery202007Notes": "Плавайте, перевертайтесь, пірнайте та бігайте з цим красивим і потужним хвостом! Ніякої вигоди не приносить. Предмет підписки за липень 2020 року.",
     "weaponArmoireJadeGlaiveNotes": "Діапазон цієї гліви убереже вас від ваших ворогів! Крім того, ви можете збити речі з високих полиць. Збільшує силу на <%= str %>. Зачарована шафа: набір воїнів з нефриту (предмет 3 із 3).",
     "armorArmoireDuffleCoatNotes": "Подорожуйте стильним морозним царством із цим затишним вовняним пальто. Збільшує статуру та сприйняття на <%= attrs %> кожен. Зачарована шафа: набір дамських пальто (предмет 1 з 2).",
@@ -1987,8 +1987,8 @@
     "weaponArmoireAlchemistsDistillerText": "Дистилятор алхіміка",
     "armorSpecialBirthday2020Text": "Епатажні халати для вечірок",
     "armorArmoireAlchemistsRobeText": "Халат алхіміка",
-    "armorArmoireShadowMastersRobeNotes": "Тканина цього стрункого халата виткана з найтемніших тіней у найглибших печерах Хабітіки. Збільшує статуру на <%= con %>. Зачарована шафа: набір майстрів тіней (предмет 1 з 4).",
-    "armorSpecialBirthday2021Notes": "З днем народження, Хабітіка! Одягніть ці екстравагантні халати для святкування цього чудового дня. Ніякої вигоди не приносить.",
+    "armorArmoireShadowMastersRobeNotes": "Тканина цього стрункого халата виткана з найтемніших тіней у найглибших печерах Habitica. Збільшує витривалість yf <%= con %>. Зачарована шафа: набір майстрів тіней (предмет 1 з 4).",
+    "armorSpecialBirthday2021Notes": "З днем народження, Habitica! Одягніть ці екстравагантні халати для святкування цього чудового дня. Ніякої вигоди не приносить.",
     "weaponArmoireFiddlersBowText": "Скрипальний лук",
     "armorMystery201910Notes": "Ця загадкова броня захистить вас від видимих і невидимих жахів. Ніякої вигоди не приносить. Предмет підписки за жовтень 2019.",
     "armorArmoireMatchMakersApronText": "Фартух сірника",
diff --git a/website/common/locales/uk/groups.json b/website/common/locales/uk/groups.json
index 89aff4426c..b93f79b6bb 100644
--- a/website/common/locales/uk/groups.json
+++ b/website/common/locales/uk/groups.json
@@ -41,7 +41,7 @@
     "sendChat": "Надіслати",
     "group": "Спільнота",
     "groupName": "Назва ватаги",
-    "groupLeader": "Лідер групи",
+    "groupLeader": "Лідер команди",
     "groupID": "ID групи",
     "members": "Учасники",
     "memberList": "Список учасників",
@@ -346,7 +346,7 @@
     "PMCanNotReply": "Ви не можете відповісти на цю розмову",
     "PMUserDoesNotReceiveMessages": "Цей користувач більше не отримує приватних повідомлень",
     "PMDisabled": "Вимкніть приватні повідомлення",
-    "editParty": "Редагувати вечірку",
+    "editParty": "Редагувати команду",
     "joinGuild": "Приєднатись до ґільдії",
     "editGuild": "Редагувати ґільдію",
     "viewDetails": "Переглянути деталі",
diff --git a/website/common/locales/uk/quests.json b/website/common/locales/uk/quests.json
index 811e22aa49..6c97c80732 100644
--- a/website/common/locales/uk/quests.json
+++ b/website/common/locales/uk/quests.json
@@ -58,7 +58,7 @@
     "noActiveQuestToAbort": "Немає активних квестів для їх переривання.",
     "onlyLeaderAbortQuest": "Тільки лідер групи або квесту може перервати його.",
     "questAlreadyRejected": "Ви вже відхилили запрошення на квест.",
-    "cantCancelActiveQuest": "Ви не можете відмінити активний квест, використайте функцію переривання.",
+    "cantCancelActiveQuest": "Ви не можете скасувати активний квест, використайте функцію переривання.",
     "onlyLeaderCancelQuest": "Тільки лідер групи або квесту може відміняти його.",
     "questNotPending": "Немає квесту, котрий можна було б розпочати.",
     "questOrGroupLeaderOnlyStartQuest": "Тільки лідер групи або квесту може почати його",
@@ -73,7 +73,7 @@
     "bossRage": "<%= currentRage %> / <%= maxRage %> Лють",
     "rageStrikes": "Удари люті",
     "questOwner": "Лідер квесту",
-    "cancelQuest": "Відмінити квест",
+    "cancelQuest": "Скасувати квест",
     "backToSelection": "Назад до вибору квесту",
     "yourQuests": "Ваші квести",
     "selectQuestModal": "Оберіть квест",
diff --git a/website/common/locales/uk/questscontent.json b/website/common/locales/uk/questscontent.json
index a15e9888c7..8fda3e008b 100644
--- a/website/common/locales/uk/questscontent.json
+++ b/website/common/locales/uk/questscontent.json
@@ -20,25 +20,25 @@
     "questHedgehogNotes": "Їжаки - веселі тваринки. Вони є одними з найбільш ласкавих домашніх улюбленців, які можуть бути у габітиканців. Але подейкують, якщо погодувати їх молоком після опівночі, вони стають досить дратівливими. І в п’ятдесят разів більшими. На жаль, <strong>InspectorCaracal</strong> зробив саме це. Ой-йой.",
     "questHedgehogCompletion": "Ваш гурт успішно заспокоїв Їжачиху! Вона зменшилася до нормального розміру та пошкутильгала до своїх яєць. Вона щось пищить та викочує деякі свої яйця до Вашого гурту. Будемо сподіватися, що ці їжачки полюблять молочко!",
     "questHedgehogBoss": "Тинозвір",
-    "questHedgehogDropHedgehogEgg": "Яйце їжака",
-    "questHedgehogUnlockText": "Розблоковує яйця їжака для придбання на ринку",
+    "questHedgehogDropHedgehogEgg": "Яйце з їжаком",
+    "questHedgehogUnlockText": "Розблоковує придбання на ринку яєць з їжаком",
     "questGhostStagText": "Дух весни",
     "questGhostStagNotes": "(глибокий вдих) Ах, весна. Пора року, коли колір знову починає наповнювати ландшафт. Зникли холодні засніжені горби зими. Там, де колись стояв мороз, місце займає яскраве життя рослин. Соковито зелене листя заливає дерева, трава повертається до колишнього яскравого відтінку, веселка квітів здіймається вздовж рівнини, а білий містичний туман вкриває землю! ... Зачекайте. Містичний туман? «Ні, — з побоюванням каже <strong>@InspectorCaracal</strong>, — здається, що причиною цього туману є якийсь дух. О, ні. Він мчить прямо на вас».",
-    "questGhostStagCompletion": "Дух, здається, був здоровий, потім він почав принюхуватися до землі. Спокійний голос огортає Ваш гурт. „Даруйте за мою неґречність. Я тільки-но прокинувся від свого сну, і ще не всі клепки повернулись на свої місця. Будь ласка, візьміть це на знак мого вибачення.“ Купка яєць з'являється на траві перед духом. Без жодного слова дух утікає далі до лісу, а у місцях, де він пробігає, оживають квіти.",
+    "questGhostStagCompletion": "Дух, здається, зовсім не ушкоджений, починає принюхуватися до землі. Спокійним голос він звертається до вашої команди. \"Даруйте за мою неґречність. Я тільки-но прокинувся від свого сну, і ще не всі клепки повернулись на свої місця. Будь ласка, візьміть це на знак мого вибачення\". Купка яєць з'являється на траві перед ним. Без жодного слова дух біжить до лісу, а у місцях, де він пробігає, проростають квіти.",
     "questGhostStagBoss": "Олень-Привид",
-    "questGhostStagDropDeerEgg": "Яйце оленя",
-    "questGhostStagUnlockText": "Розблоковує оленячі яйця для придбання на ринку",
+    "questGhostStagDropDeerEgg": "Яйце з оленем",
+    "questGhostStagUnlockText": "Розблоковує придбання на ринку яєць з оленем",
     "questRatText": "Щурячий король",
     "questRatNotes": "Сміття! Величезні купи невиконаних щоденок лежать по всій Габітиці. Проблема стала настільки серйозною, що натовпи пацюків тепер можна побачити повсюди. Ви помітили, як @Pandah ніжно гладить одного з них. Вона пояснює, що щури — це ніжні істоти, які харчуються невиконаними щоденками. Справжня проблема полягає в тому, що щоденки впали в каналізацію, утворивши небезпечний затор, який потрібно розчистити. Коли ви спускаєтесь у каналізацію, величезний щур із криваво-червоними очима та кривими жовтими зубами нападає на вас, захищаючи свою гору сміття. Чи вистачить вам сміливості, щоб зіткнутись з легендарним Щурячим королем?",
-    "questRatCompletion": "Ваш останній удар позбавив гігантського щура сили, його очі стали тьмяно-сірими. Звір розпадається на безліч крихітних мишенят, які злякано тікають геть. Ви помічаєте @Pandah, яка стоїть позаду вас і дивиться на колись могутню істоту. Вона пояснює, що жителі Habitica надихнулися вашою мужністю і швидко виконують усі свої щоденки. Вона попереджає вас, що ми повинні бути пильними, бо якщо ми ослабимо пильність, Щурячий король повернеться. В якості оплати @Pandah пропонує вам кілька щурячих яєць. Помітивши ваш неспокійний вираз обличчя, вона посміхається: «З них вилупляться чудові домашні тварини».",
+    "questRatCompletion": "Ваш останній удар позбавив гігантського щура сили, його очі стали тьмяно-сірими. Звір розпадається на безліч крихітних мишенят, які злякано тікають геть. Ви помічаєте @Pandah, яка стоїть позаду вас і дивиться на колись могутню істоту. Вона пояснює, що жителі Habitica надихнулися вашою мужністю і швидко виконують усі свої щоденки. Вона попереджає вас, що ми повинні бути пильними, бо якщо ми ослабимо пильність, Щурячий король повернеться. В якості оплати @Pandah пропонує вам кілька яєць зі щуром. Помітивши ваш неспокійний вираз обличчя, вона посміхається: «З них вилупляться чудові домашні улюбленці».",
     "questRatBoss": "Щурячий король",
-    "questRatDropRatEgg": "Яйце щура",
-    "questRatUnlockText": "Розблоковує щурячі яйця для придбання на ринку",
+    "questRatDropRatEgg": "Яйце зі щуром",
+    "questRatUnlockText": "Розблоковує придбання на ринку яєць зі щуром",
     "questOctopusText": "Поклик Октотулу",
     "questOctopusNotes": "@Urse, банькатий молодий писар, попрохав вас допомогти з оглядом таємничої печери на морському узбережжі. Серед напівтемних припливних озерцят стоїть величезна брама зі сталактитів та сталагмітів. Коли ви підходите ближче, унизу воріт починає кружляти темний вир. Ви з подивом дивитесь, як звідти вилазить спрутоподібний дракон. „Липке чадо зірок прокинулося“, — несамовито реве @Urse. „Через вігинтильйони років великий Октотулу знову вільний і спраглий до насолод!“",
-    "questOctopusCompletion": "З останнім ударом істота вислизає у вир, з якого вона прийшла. Ви не можете сказати, чи @Urse радий вашій перемозі чи засмучений тим, що звір йде. Ваш напарник без слів показує на три слизькі гігантські яйця в сусідній ямі, покладені в гніздо із золотими монетами. «Мабуть, це яйця восьминога», — нервово кажете ви. Коли ви повертаєтеся додому, @Urse несамовито строчить у щоденнику, і ви підозрюєте, що це не востаннє, коли ви чуєте про великого Октотулу.",
+    "questOctopusCompletion": "З останнім ударом істота вислизає у вир, з якого вона прийшла. Ви не можете сказати, чи @Urse радий вашій перемозі чи засмучений тим, що звір йде. Ваш напарник без слів показує на три слизькі гігантські яйця в сусідній ямі, покладені в гніздо із золотими монетами. «Мабуть, це яйця з восьминогами», — нервово кажете ви. Коли ви повертаєтеся додому, @Urse несамовито строчить щось у щоденнику, і ви підозрюєте, що це не востаннє, коли ви чуєте про великого Октотулу.",
     "questOctopusBoss": "Октотулу",
-    "questOctopusDropOctopusEgg": "Яйце спрута",
+    "questOctopusDropOctopusEgg": "Яйце зі спрутом",
     "questOctopusUnlockText": "Відкриває покупні яйця восьминогів на ринку",
     "questHarpyText": "Рятуйте! Гарпія!",
     "questHarpyNotes": "У лісі зник відважний шукач пригод @UncommonCriminal, який вистежував крилате чудовисько, бачене кілька днів тому. Ви вже налаштувалися на пошуки, аж на вашу руку присів зранений папуга, красиве пір'я якого зіпсував незугарний шрам. До його лапки була прикріплена поспіхом нашкрябана записка, у якій повідомлялося, що, захищаючи папуг, @UncommonCriminal був схоплений злою гарпією і дуже потребує вашої допомоги. Ви підете за птахом і здолаєте гарпію, щоб визволити @UncommonCriminal?",
@@ -53,7 +53,7 @@
     "questRoosterDropRoosterEgg": "Яйце півня",
     "questRoosterUnlockText": "Розблоковує купівлю півнячих яєць на ринку",
     "questSpiderText": "Льодяний Арахнід",
-    "questSpiderNotes": "Як тільки наступили холода, легенький іній почав з'являтись у хабітчанських вікнах у вигляді кружева павутинь... окрім Аркосінових, чиї вікна є повністю заморожені Морозяним Павуком, який зараз вирішує поселитись в його домі.",
+    "questSpiderNotes": "Помалу надворі холоднішає, легенький іній починає з'являтись у вікнах габітиканців, розписуючиї їх красивими візерунками... Окрім вікон @Arcosine, бо вони повністю заморожені Морозним павуком, який вирішив поселитись в його домі.",
     "questSpiderCompletion": "Морозний павук падає, залишаючи за собою невелику купу інею та кілька зачарованих яєць. @Arcosine пропонує їх вам як нагороду — можливо, ви можете виростити небезпечних павуків як домашніх тварин?",
     "questSpiderBoss": "Павук",
     "questSpiderDropSpiderEgg": "Яйце павука",
@@ -393,7 +393,7 @@
     "questTaskwoodsTerror3DropStrawberry": "Полуниця (їжа)",
     "questTaskwoodsTerror3DropWeapon": "",
     "questFerretText": "Підлий тхір",
-    "questFerretNotes": "",
+    "questFerretNotes": "Прогулюючись по Habit-сіті, ви бачите незадоволений натовп, який оточив тхора в червоній мантії.<br><br>\"Це зілля продуктивності, яке ви мені продали не працює!\" - скаржиться @Beffymaroo. «Минулої ночі я дивився три години телевізора замість того, щоб займатися своїми справами!»<br><br>«Так!» кричить @Pandah. «І сьогодні я витратив годину на те, щоб переставляти книжки, замість того, щоб їх читати!»<br><br>Нечестивий тхір невинно розводить руками. «Але це ж більше, ніж зазвичай, чи не так?»<br><br>Натовп вибухає гнівом.<br><br>«Жодних відшкодувань!» кричить тхір. Він пускає магічний постріл у натовп, готуючись втекти через дим.<br><br>\"Будь ласка, габітиканцю!\" каже @Faye, хапаючи вас за руку. «Здолайте тхора і змусьте його повернути нечесно отримані кошти!»",
     "questFerretCompletion": "",
     "questFerretBoss": "Підлий тхір",
     "questFerretDropFerretEgg": "Яйце тхора",
@@ -496,7 +496,7 @@
     "questMayhemMistiflying3DropPinkCottonCandy": "Рожева цукрова кулька(Food)",
     "questMayhemMistiflying3DropShield": "",
     "questMayhemMistiflying3DropWeapon": "",
-    "featheredFriendsText": "",
+    "featheredFriendsText": "Набір квестів \"Пернаті друзі\"",
     "featheredFriendsNotes": "",
     "questNudibranchText": "Зараження мотиваційними морськими молюсками",
     "questNudibranchNotes": "",
@@ -504,7 +504,7 @@
     "questNudibranchBoss": "",
     "questNudibranchDropNudibranchEgg": "",
     "questNudibranchUnlockText": "Розблоковує купівлю молюска в яйці на ринку",
-    "splashyPalsText": "",
+    "splashyPalsText": "Набір квестів \"Плескаючі друзі\"",
     "splashyPalsNotes": "",
     "questHippoText": "",
     "questHippoNotes": "",
@@ -512,9 +512,9 @@
     "questHippoBoss": "",
     "questHippoDropHippoEgg": "",
     "questHippoUnlockText": "Розблоковує купівлю бегемота в яйці на ринку",
-    "farmFriendsText": "",
-    "farmFriendsNotes": "",
-    "witchyFamiliarsText": "",
+    "farmFriendsText": "Набір квестів \"Друзі фермера\"",
+    "farmFriendsNotes": "Містить \"Корова-мууутант\", \"КІНецЬ світу\" та \"Грозовий баран\". Доступний до 30 вересня.",
+    "witchyFamiliarsText": "Набір квестів \"Відьмині друзі\"",
     "witchyFamiliarsNotes": "",
     "questGroupLostMasterclasser": "",
     "questUnlockLostMasterclasser": "",
@@ -558,7 +558,7 @@
     "questYarnBoss": "",
     "questYarnDropYarnEgg": "",
     "questYarnUnlockText": "Розблоковує купівлю пряжі в яйці на ринку",
-    "winterQuestsText": "",
+    "winterQuestsText": "Зимовий набір квестів",
     "winterQuestsNotes": "",
     "questPterodactylText": "",
     "questPterodactylNotes": "",
@@ -593,7 +593,7 @@
     "questDysheartenerDropHippogriffPet": "",
     "questDysheartenerDropHippogriffMount": "",
     "dysheartenerArtCredit": "Графічна робота @AnnDeLune",
-    "hugabugText": "",
+    "hugabugText": "Набір квестів \"Обійми жука\"",
     "hugabugNotes": "",
     "questSquirrelText": "",
     "questSquirrelNotes": "",
@@ -603,7 +603,7 @@
     "questSquirrelUnlockText": "Розблоковує купівлю білки в яйці на ринку",
     "cuddleBuddiesText": "Набір квестів \"Пухнасті друзі\"",
     "cuddleBuddiesNotes": "Містить «Кролик-вбивця», «Нечестивий тхір» і «Банда морських свинок». Доступний до 31 березня.",
-    "aquaticAmigosText": "",
+    "aquaticAmigosText": "Набір квестів \"Водні амігос\"",
     "aquaticAmigosNotes": "",
     "questSeaSerpentText": "Біда в глибинах: Напад морського змія!",
     "questSeaSerpentNotes": "",
@@ -617,7 +617,7 @@
     "questKangarooBoss": "Катастрофічний Кенгуру",
     "questKangarooDropKangarooEgg": "Яйце кенгуру",
     "questKangarooUnlockText": "Розблоковує купівлю кенгуру в яйці на ринку",
-    "forestFriendsText": "",
+    "forestFriendsText": "Набір квестів \"Лісові друзі\"",
     "forestFriendsNotes": "",
     "questAlligatorText": "Інста-гатор",
     "questAlligatorNotes": "",
@@ -625,9 +625,9 @@
     "questAlligatorBoss": "Інста-гатор",
     "questAlligatorDropAlligatorEgg": "Яйце алігатора",
     "questAlligatorUnlockText": "Розблоковує купівлю яєць алігатора на ринку",
-    "oddballsText": "",
+    "oddballsText": "Набір квестів \"Дивні кулі\"",
     "oddballsNotes": "",
-    "birdBuddiesText": "",
+    "birdBuddiesText": "Набір квестів \"Пташечки-співачки\"",
     "birdBuddiesNotes": "",
     "questVelociraptorText": "Велоци-репер",
     "questVelociraptorNotes": "",
@@ -645,5 +645,15 @@
     "questRobotDropRobotEgg": "Яйце робота",
     "questRobotText": "Загадкові механічні дива!",
     "mythicalMarvelsText": "Набір квестів \"Фантастичні звірі\"",
-    "mythicalMarvelsNotes": "Включає квести \"Переконати королеву єдинорогів\", \"Полум'яний ґрифон\" та \"Біда в глибинах: Напад морського змія\". Доступний до 28 лютого."
+    "mythicalMarvelsNotes": "Включає квести \"Переконати королеву єдинорогів\", \"Полум'яний ґрифон\" та \"Біда в глибинах: Напад морського змія\". Доступний до 28 лютого.",
+    "rockingReptilesText": "Набір квестів \"Кам'яні рептилії\"",
+    "delightfulDinosText": "Набір квестів \"Давні динозаври\"",
+    "jungleBuddiesText": "Набір квестів \"Товариші з джунглів\"",
+    "sandySidekicksText": "Набір квестів \"Пісочні помічники\"",
+    "questDolphinUnlockText": "Розблоковує придбання на ринку яєць з дельфіном",
+    "questDolphinCompletion": "Ваша битва волі з дельфіном залишила вас втомленими, але ви виходете з неї переможцем. З вашою рішучістю та заохоченням @mewrose, @khdarkwolf і @confusedcicada підхоплюються та позбавляються підступної телепатії дельфіна. Ви четверо захищаєте себе почуттям гордості відо виконаних щоденнок, сильних звичок та завершених справ, аж поки дельфін не заплющує свої сяючі очі, мовчазно визнаючи ваші успіхи. З цим він падає назад у води бухти. Коли ви \"даєте пять\" та вітаєте один одного, ви помічаєте три яйця, які вода винесла на берег.<br><br>«Хм, цікаво, що ми можемо з ними зробити?», — міркує @khdarkwolf.",
+    "questDolphinBoss": "Дельфін сумніву",
+    "questDolphinDropDolphinEgg": "Яйце з дельфіном",
+    "questDolphinNotes": "Ви гуляєте по пляжу бухти Незавершеності, розмірковуючи про складну роботу, яка вас чекає. Раптом вам впадає в очі плескіт у воді. Чудовий дельфін стрибає над хвилями. Сонячне світло відбивається від його плавників і хвоста. Але зачекайте... це не відблиски сонячниї променів, і дельфін не занурюється назад у море. Він фіксує свій погляд на @khdarkwolf.<br><br>«Я ніколи не закінчу всі ці щоденники», — сказав @khdarkwolf.<br><br>«Я недостатньо хороший, щоб досягти своїх цілей», — сказав @confusedcicada, коли дельфін спрямував на неї свій яскравий погляд.<br><br>«Навіщо я взагалі намагався?» запитала @mewrose, в’янучи під поглядом звіра.<br><br>Його погляд зустрічається з вашими, і ви відчуваєте, як ваш розум починає тонути під наростаючою хвилею сумнівів. Ви берете себе в руи; хтось повинен здолати цю істоту, і це будете ви!",
+    "questDolphinText": "Дельфін сумніву"
 }

From 8e9b469d8db93c7188c8f81ba3f07d1546c4dab9 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 20 Sep 2022 13:11:43 -0400
Subject: [PATCH 050/134] chore: merge develop

---
 .../assets/css/sprites/spritesmith-main.css   | 170 +++++++++++++++
 .../src/components/groups/groupPlan.vue       | 200 +++++++++++++-----
 .../client/src/components/static/privacy.vue  |   3 +-
 website/common/locales/be/questscontent.json  |   4 +-
 website/common/locales/cs/gear.json           |   6 +-
 website/common/locales/de/front.json          |  13 +-
 website/common/locales/de/groups.json         |   7 +-
 website/common/locales/de/npc.json            |   5 +-
 website/common/locales/de/questscontent.json  |   4 +-
 website/common/locales/de/subscriber.json     |   2 +-
 website/common/locales/en/gear.json           |  32 +++
 website/common/locales/en/limited.json        |   4 +
 website/common/locales/es/gear.json           |  16 +-
 website/common/locales/it/backgrounds.json    |   4 +-
 website/common/locales/it/front.json          |  13 +-
 website/common/locales/it/npc.json            |   5 +-
 website/common/locales/it/questscontent.json  |   2 +-
 website/common/locales/it/subscriber.json     |   2 +-
 website/common/locales/ja/front.json          |   2 +-
 website/common/locales/ja/gear.json           |   4 +-
 website/common/locales/ja/questscontent.json  |   2 +-
 website/common/locales/pt_BR/front.json       |  13 +-
 website/common/locales/pt_BR/gear.json        |  92 ++++----
 website/common/locales/pt_BR/limited.json     |   2 +-
 website/common/locales/pt_BR/npc.json         |   5 +-
 .../common/locales/pt_BR/questscontent.json   |   2 +-
 website/common/locales/pt_BR/subscriber.json  |   2 +-
 website/common/locales/ru/faq.json            |   2 +-
 website/common/locales/ru/front.json          |  11 +-
 website/common/locales/ru/gear.json           |  11 +-
 website/common/locales/ru/groups.json         |   9 +-
 website/common/locales/ru/npc.json            |   2 +-
 website/common/locales/ru/questscontent.json  |   2 +-
 website/common/locales/ru/subscriber.json     |   2 +-
 .../locales/uk/communityguidelines.json       |   4 +-
 website/common/locales/uk/contrib.json        |   2 +-
 website/common/locales/uk/gear.json           |  10 +-
 website/common/locales/uk/groups.json         |   4 +-
 website/common/locales/uk/quests.json         |   4 +-
 website/common/locales/uk/questscontent.json  |  58 ++---
 .../common/script/content/appearance/sets.js  |   4 +-
 .../common/script/content/constants/events.js |  19 +-
 .../script/content/constants/seasonalSets.js  |   5 +
 .../script/content/gear/sets/special/index.js |  60 ++++++
 .../common/script/content/hatching-potions.js |  18 +-
 .../script/content/shop-featuredItems.js      |  10 +-
 website/common/script/content/spells.js       |   2 +-
 .../script/libs/shops-seasonal.config.js      |  15 +-
 48 files changed, 642 insertions(+), 228 deletions(-)

diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 277ff3f148..f91dc5b14f 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -22875,6 +22875,26 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fallHealer.png');
   width: 90px;
@@ -23045,6 +23065,26 @@
   width: 114px;
   height: 90px;
 }
+.head_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .head_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fallHealer.png');
   width: 90px;
@@ -23170,6 +23210,21 @@
   width: 114px;
   height: 90px;
 }
+.shield_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fallHealer.png');
   width: 90px;
@@ -23325,6 +23380,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fallHealer.png');
   width: 68px;
@@ -23495,6 +23570,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_head_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fallHealer.png');
   width: 68px;
@@ -23620,6 +23715,21 @@
   width: 68px;
   height: 68px;
 }
+.shop_shield_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fallHealer.png');
   width: 68px;
@@ -23775,6 +23885,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_weapon_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fallHealer.png');
   width: 68px;
@@ -23935,6 +24065,26 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fallHealer.png');
   width: 90px;
@@ -24095,6 +24245,26 @@
   width: 114px;
   height: 90px;
 }
+.weapon_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fallHealer.png');
   width: 90px;
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index c628774d9e..ec5aee5442 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -1,7 +1,6 @@
 <template>
   <!-- @TODO: Move to group plans folder-->
   <div>
-    <group-plan-creation-modal />
     <div>
       <div class="header">
         <h1 class="text-center">
@@ -52,7 +51,6 @@
           </div>
         </div>
       </div>
-      <!-- Upgrading an existing group -->
       <div
         v-if="upgradingGroup._id"
         id="upgrading-group"
@@ -102,53 +100,153 @@
           </div>
         </div>
       </div>
-      <!-- Create a new group -->
       <div
         v-if="!upgradingGroup._id"
         class="container col-6 offset-3 create-option"
       >
         <div class="row">
           <h1 class="col-12 text-center purple-header">
-            Create Your Group Today!
+            Create your Group today!
           </h1>
         </div>
         <div class="row">
           <div class="col-12 text-center">
             <button
               class="btn btn-primary create-group"
-              @click="launchModal('create-page')"
+              @click="launchModal('create')"
             >
-              Create Your New Group!
+              Create Your New Group
             </button>
           </div>
         </div>
-        <div class="row pricing justify-content-center align-items-center">
-          <div class="dollar">
-            $
+        <div class="row pricing">
+          <div class="col-5">
+            <div class="dollar">
+              $
+            </div>
+            <div class="number">
+              9
+            </div>
+            <div class="name">
+              <div>Group Owner</div>
+              <div>Subscription</div>
+            </div>
           </div>
-          <div class="number">
-            9
+          <div class="col-1">
+            <div class="plus">
+              +
+            </div>
           </div>
-          <div class="name">
-            <div>Group Owner</div>
-            <div>Subscription</div>
-          </div>
-          <div class="plus">
-            +
-          </div>
-          <div class="dollar">
-            $
-          </div>
-          <div class="number">
-            3
-          </div>
-          <div class="name">
-            <div>Each Additional</div>
-            <div>Member</div>
+          <div class="col-6">
+            <div class="dollar">
+              $
+            </div>
+            <div class="number">
+              3
+            </div>
+            <div class="name">
+              <div>Each Additional</div>
+              <div>Member</div>
+            </div>
           </div>
         </div>
       </div>
     </div>
+    <b-modal
+      id="group-plan-modal"
+      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
+      size="md"
+      hide-footer="hide-footer"
+    >
+      <div
+        v-if="activePage === PAGES.CREATE_GROUP"
+        class="col-12"
+      >
+        <div class="form-group">
+          <label
+            class="control-label"
+            for="new-group-name"
+          >Name</label>
+          <input
+            id="new-group-name"
+            v-model="newGroup.name"
+            class="form-control input-medium option-content"
+            required="required"
+            type="text"
+            placeholder="Name"
+          >
+        </div>
+        <div class="form-group">
+          <label for="new-group-description">{{ $t('description') }}</label>
+          <textarea
+            id="new-group-description"
+            v-model="newGroup.description"
+            class="form-control option-content"
+            cols="3"
+            :placeholder="$t('description')"
+          ></textarea>
+        </div>
+        <div
+          v-if="type === 'guild'"
+          class="form-group"
+        >
+          <div class="custom-control custom-radio">
+            <input
+              v-model="newGroup.privacy"
+              class="custom-control-input"
+              type="radio"
+              name="new-group-privacy"
+              value="private"
+            >
+            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <input
+              id="create-group-leaderOnlyChallenges-checkbox"
+              v-model="newGroup.leaderOnly.challenges"
+              class="custom-control-input"
+              type="checkbox"
+            >
+            <label
+              class="custom-control-label"
+              for="create-group-leaderOnlyChallenges-checkbox"
+            >{{ $t('leaderOnlyChallenges') }}</label>
+          </div>
+        </div>
+        <div
+          v-if="type === 'party'"
+          class="form-group"
+        >
+          <button
+            class="btn btn-secondary form-control"
+            :value="$t('create')"
+            @click="createGroup()"
+          ></button>
+        </div>
+        <div class="form-group">
+          <button
+            class="btn btn-primary btn-lg btn-block"
+            :disabled="!newGroupIsReady"
+            @click="createGroup()"
+          >
+            {{ $t('create') }}
+          </button>
+        </div>
+      </div>
+      <div
+        v-if="activePage === PAGES.PAY"
+        class="col-12"
+      >
+        <div class="text-center">
+          <payments-buttons
+            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
+            :amazon-data="pay(PAYMENTS.AMAZON)"
+          />
+        </div>
+      </div>
+    </b-modal>
   </div>
 </template>
 
@@ -160,8 +258,8 @@
 
     .dollar {
       position: absolute;
-      left: -16px;
-      top: 16px;
+      left: -1em;
+      top: 1em;
     }
 
     .purple-box {
@@ -193,9 +291,9 @@
     background: #432874;
     background: linear-gradient(180deg, #4F2A93 0%, #432874 100%);
     color: #fff;
-    padding: 32px;
+    padding: 2em;
     height: 340px;
-    margin-bottom: 32px;
+    margin-bottom: 2em;
     margin-left: -12px;
     margin-right: -12px;
 
@@ -219,7 +317,6 @@
 
     .box {
       height: 416px;
-      border-radius: 8px;
     }
 
     h2 {
@@ -262,19 +359,17 @@
   button.create-group {
     width: 330px;
     height: 96px;
-    border-radius: 8px;
-    font-size: 1.5rem;
   }
 
   .purple-header {
     color: #6133b4;
     font-size: 48px;
-    margin-top: 16px;
+    margin-top: 1em;
   }
 
   .pricing {
-    margin-top: 32px;
-    margin-bottom: 64px;
+    margin-top: 2em;
+    margin-bottom: 4em;
 
     .dollar, .number, .name {
       display: inline-block;
@@ -283,32 +378,30 @@
     }
 
     .plus {
-      font-size: 2.125rem;
+      font-size: 34px;
       color: #a5a1ac;
-      margin-left: 16px;
-      margin-right: 16px;
     }
 
     .dollar {
-      margin-bottom: 24px;
-      font-size: 2rem;
+      margin-bottom: 1.5em;
+      font-size: 32px;
       font-weight: bold;
     }
 
     .name {
-      font-size: 1.5rem;
-      margin-left: 8px;
-      margin-right: 8px;
+      font-size: 24px;
+      margin-bottom: .8em;
+      margin-left: .5em;
     }
 
     .number {
-      font-size: 4.5rem;
+      font-size: 72px;
       font-weight: bolder;
     }
   }
 
   .payment-options {
-    margin-bottom: 64px;
+    margin-bottom: 4em;
 
     h4 {
       color: #34313a;
@@ -317,7 +410,7 @@
     .purple-box {
       background-color: #4f2a93;
       color: #fff;
-      padding: 8px;
+      padding: .5em;
       border-radius: 8px;
       width: 200px;
       height: 215px;
@@ -331,7 +424,7 @@
 
       .name {
         width: 100px;
-        margin-left: 4.8px;
+        margin-left: .3em;
       }
 
       .plus {
@@ -356,12 +449,10 @@ import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import positiveIcon from '@/assets/svg/positive.svg';
 import paymentsButtons from '@/components/payments/buttons/list';
-import groupPlanCreationModal from '../group-plans/groupPlanCreationModal';
 
 export default {
   components: {
     paymentsButtons,
-    groupPlanCreationModal,
   },
   mixins: [paymentsMixin],
   data () {
@@ -410,7 +501,12 @@ export default {
   },
   methods: {
     launchModal () {
-      this.$root.$emit('bv::show::modal', 'create-group');
+      this.changePage(this.PAGES.CREATE_GROUP);
+      this.$root.$emit('bv::show::modal', 'group-plan-modal');
+    },
+    changePage (page) {
+      this.activePage = page;
+      window.scrollTo(0, 0);
     },
     createGroup () {
       this.changePage(this.PAGES.PAY);
diff --git a/website/client/src/components/static/privacy.vue b/website/client/src/components/static/privacy.vue
index 8fbbfbe2ae..c2615ce69b 100644
--- a/website/client/src/components/static/privacy.vue
+++ b/website/client/src/components/static/privacy.vue
@@ -3,7 +3,7 @@
   <div class="container-fluid">
     <h1>Privacy Notice</h1>
     <p class="strong pagemeta">
-      Last Updated: September 15, 2022
+      Last Updated September 19, 2022: Removed reference to Facebook login, which is no longer supported.
     </p>
     <p>
       HabitRPG, Inc. (“HabitRPG,” “we,” “us,” or “our”) welcomes you. This privacy notice (the “Privacy
@@ -41,7 +41,6 @@
       verify your identity. We also use this information to manage your account, including your transactions. If
       you choose to log into your account through Google or Apple, we capture and store the User ID and email
       address connected to the respective account, so we can verify your identity when you log in.
-      (We no longer offer the ability to log in using Facebook's authentication procedure.)
     </p>
     <h3>User Content</h3>
     <p>
diff --git a/website/common/locales/be/questscontent.json b/website/common/locales/be/questscontent.json
index 8a6d9be006..945647680f 100755
--- a/website/common/locales/be/questscontent.json
+++ b/website/common/locales/be/questscontent.json
@@ -609,7 +609,7 @@
     "questSeaSerpentNotes": "Your streaks have you feeling lucky—it’s the perfect time for a trip to the seahorse racetrack. You board the submarine at Diligent Docks and settle in for the trip to Dilatory, but you’ve barely submerged when an impact rocks the sub, sending its occupants tumbling. “What’s going on?” @AriesFaries shouts.<br><br>You glance through a nearby porthole and are shocked by the wall of shimmering scales passing by it. “Sea serpent!” Captain @Witticaster calls through the intercom. “Brace yourselves, it’s coming ‘round again!” As you grip the arms of your seat, your unfinished tasks flash before your eyes. ‘Maybe if we work together and complete them,’ you think, ‘we can drive this monster away!’",
     "questSeaSerpentCompletion": "Battered by your commitment, the sea serpent flees, disappearing into the depths. When you arrive in Dilatory, you breathe a sigh of relief before noticing @*~Seraphina~ approaching with three translucent eggs cradled in her arms. “Here, you should have these,” she says. “You know how to handle a sea serpent!” As you accept the eggs, you vow anew to remain steadfast in completing your tasks to ensure that there’s not a repeat occurrence.",
     "questSeaSerpentBoss": "The Mighty Sea Serpent",
-    "questSeaSerpentDropSeaSerpentEgg": "Sea Serpent (Egg)",
+    "questSeaSerpentDropSeaSerpentEgg": "",
     "questSeaSerpentUnlockText": "Unlocks purchasable Sea Serpent eggs in the Market",
     "questKangarooText": "Kangaroo Catastrophe",
     "questKangarooNotes": "Maybe you should have finished that last task… you know, the one you keep avoiding, even though it always comes back around? But @Mewrose and @LilithofAlfheim invited you and @stefalupagus to see a rare kangaroo troop hopping through the Sloensteadi Savannah; how could you say no?! As the troop comes into view, something hits you on the back of the head with a mighty <em>whack!</em><br><br>Shaking the stars from your vision, you pick up the responsible object--a dark red boomerang, with the very task you continually push back etched into its surface. A quick glance around confirms the rest of your party met a similar fate. One larger kangaroo looks at you with a smug grin, like she’s daring you to face her and that dreaded task once and for all!",
@@ -635,4 +635,4 @@
     "questVelociraptorBoss": "Veloci-Rapper",
     "questVelociraptorDropVelociraptorEgg": "Velociraptor (Egg)",
     "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market"
-}
\ No newline at end of file
+}
diff --git a/website/common/locales/cs/gear.json b/website/common/locales/cs/gear.json
index 4706d78a71..b4f92eb661 100644
--- a/website/common/locales/cs/gear.json
+++ b/website/common/locales/cs/gear.json
@@ -2014,5 +2014,9 @@
     "weaponMystery202102Notes": "Zářivý růžový drahokem v této hůlce dokáže šířit radost a přátelství všude možně! Nepřináší žádné výhody. Předmět pro předplatitele, únor 2021.",
     "weaponMystery202104Notes": "Tvoji nepřátele by si měli dávat pozor - máš totiž mocnou a pichlavou obranu! Nepřináší žádné výhody. Předmět pro předplatitele duben 2021.",
     "weaponMystery202102Text": "Okouzlující hůlka",
-    "weaponMystery202104Text": "Hůl trnitého bodláku"
+    "weaponMystery202104Text": "Hůl trnitého bodláku",
+    "weaponMystery202201Notes": "O silvestrovské půlnoci vypusť oblak zlatého a stříbrného třpytu. Štastný nový rok! Kdo to teď uklidí? Nepřináší žádné výhody. Předmět pro předplatitele leden 2022.",
+    "weaponMystery202201Text": "Konfetové dělo půlnoci",
+    "weaponMystery202111Text": "Chronomancerova hůl",
+    "weaponMystery202111Notes": "Ohýbej tok času s touto tajemnou a mocnou holí. Nepřináší žádné výhody. Předmět pro předplatitele listopad 2021."
 }
diff --git a/website/common/locales/de/front.json b/website/common/locales/de/front.json
index df71b09c58..9aff6c04b6 100644
--- a/website/common/locales/de/front.json
+++ b/website/common/locales/de/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "zu, sowie der",
     "chores": "Hausarbeiten",
     "clearBrowserData": "Browserdaten löschen",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Erweiterungen</a>",
+    "communityExtensions": "Add-ons & Erweiterungen",
     "communityFacebook": "Facebook",
     "companyAbout": "So funktioniert es",
     "companyBlog": "Blog",
-    "companyContribute": "Mitwirken",
-    "companyDonate": "Spenden",
+    "companyContribute": "Bei Habitica mitwirken",
+    "companyDonate": "An Habitica spenden",
     "forgotPassword": "Passwort vergessen?",
     "emailNewPass": "Einen Link per E-Mail senden, um das Passwort zurückzusetzen",
     "forgotPasswordSteps": "Trage Deinen Benutzernamen oder die E-Mail-Adresse ein, mit der Du Deinen Habitica-Account aktiviert hast.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Willst Du Dein Leben einmal als Spiel betrachten?",
     "marketing4Lead3-2": "Willst Du eine Gruppe für Ausbildung, Wohlbefinden usw. leiten?",
     "marketing4Lead3Title": "Mache Alles zum Spiel",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Android App",
+    "mobileIOS": "iOS App",
     "oldNews": "Neuigkeiten",
     "newsArchive": "Neuigkeiten-Archiv auf Wikia (mehrsprachig)",
     "setNewPass": "Neues Passwort setzen",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Das Passwort muss mindestens 8 Zeichen haben.",
     "enterHabitica": "Tritt ein in Habitica",
     "socialAlreadyExists": "Diese Social-Media-Zugangsdaten sind bereits mit einem schon bestehenden Habitica-Konto verknüpft.",
-    "emailUsernamePlaceholder": "z.B., habitrabbit oder gryphon@beispiel.com"
+    "emailUsernamePlaceholder": "z.B., habitrabbit oder gryphon@beispiel.com",
+    "footerProduct": "Produkt"
 }
diff --git a/website/common/locales/de/groups.json b/website/common/locales/de/groups.json
index 73f5f6d95a..88cf4f0851 100644
--- a/website/common/locales/de/groups.json
+++ b/website/common/locales/de/groups.json
@@ -163,8 +163,8 @@
     "onlyGroupLeaderCanEditTasks": "Nicht berechtigt, Aufgaben zu bearbeiten!",
     "onlyGroupTasksCanBeAssigned": "Nur Team-Aufgaben können verteilt werden",
     "assignedTo": "Zugewiesen an",
-    "assignedToUser": "<strong><%- userName %></strong> zugewiesen",
-    "assignedToMembers": "<strong><%= userCount %></strong> Mitgliedern zugewiesen",
+    "assignedToUser": "Zugewiesen: <strong>@<%- userName %></strong>",
+    "assignedToMembers": "<%= userCount %> Mitgliedern",
     "assignedToYouAndMembers": "Dir und <strong><%= userCount %> Mitliedern</strong> zugewiesen",
     "youAreAssigned": "Dir zugewiesen",
     "taskIsUnassigned": "Diese Aufgabe ist niemandem zugewiesen",
@@ -380,5 +380,6 @@
     "viewDetails": "Details ansehen",
     "upgradeToGroup": "Auf Gruppenplan upgraden",
     "sendGiftTotal": "Insgesamt:",
-    "chatTemporarilyUnavailable": "Chat aktuell nicht verfügbar. Bitte versuche es später erneut."
+    "chatTemporarilyUnavailable": "Chat aktuell nicht verfügbar. Bitte versuche es später erneut.",
+    "assignTo": "Zugewiesen an"
 }
diff --git a/website/common/locales/de/npc.json b/website/common/locales/de/npc.json
index 343a58e5e2..46c25a0323 100644
--- a/website/common/locales/de/npc.json
+++ b/website/common/locales/de/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Neues Update von Bailey!",
     "tellMeLater": "Erzähl es mir später",
     "dismissAlert": "Als gelesen markieren",
-    "donateText3": "Als Open-Source-Projekt ist Habitica auf die Hilfe unserer Benutzer angewiesen. Das Geld, was Du für Edelsteine ausgibst, hilft uns dabei unsere Server am Laufen zu halten, ein paar Mitarbeiter zu bezahlen, neue Features zu entwickeln und unseren ehrenamtlichen Programmierern Anreize zu bieten. Vielen Dank für Deine Großzügigkeit!",
+    "donateText3": "Als Open-Source-Projekt ist Habitica auf die Hilfe unserer Benutzer angewiesen. Das Geld, was Du für Edelsteine ausgibst, hilft uns dabei unsere Server am Laufen zu halten, ein paar Mitarbeiter zu bezahlen, neue Features zu entwickeln und unseren ehrenamtlichen Helferlein Anreize zu bieten.",
     "card": "Kreditkarte",
     "paymentMethods": "Kauf mit",
     "paymentSuccessful": "Die Zahlung war erfolgreich!",
@@ -131,5 +131,6 @@
     "limitedAvailabilityHours": "Für <%= days %>t <%= hours %>std und <%= minutes %>min verfügbar",
     "limitedAvailabilityDays": "Für <%= days %>t <%= hours %>std und <%= minutes %>min verfügbar",
     "amountExp": "<%= amount %> Exp",
-    "newStuffPostedOn": "Veröffentlicht am <%= publishDate %> um <%= publishTime %>"
+    "newStuffPostedOn": "Veröffentlicht am <%= publishDate %> um <%= publishTime %>",
+    "helpSupportHabitica": "Hilf Habitica zu unterstützen"
 }
diff --git a/website/common/locales/de/questscontent.json b/website/common/locales/de/questscontent.json
index 3aeddfa3e8..1d0499bcb6 100644
--- a/website/common/locales/de/questscontent.json
+++ b/website/common/locales/de/questscontent.json
@@ -184,7 +184,7 @@
     "questTRexCompletion": "Der wilde Dinosaurier hört endlich zu toben und zu randalieren auf, setzt sich ruhig hin und fängt an sich mit den riesigen Hähnen anzufreunden. @Urse strahlt ihn an. \"Sie sind doch gar keine so schlimmen Haustiere! Sie brauchen einfach nur ein bisschen Disziplin. Hier, nimm Dir ein paar Tyrannosaurus-Eier mit!\"",
     "questTRexBoss": "Fleischerner Tyrannosaurus",
     "questTRexUndeadText": "Der Dinosaurier aus den Tiefen der Erde",
-    "questTRexUndeadNotes": "Während die uralten Dinosaurier der Stoïstillen Steppen durch HabitCity wandern, hört man auf ein mal einen angstvollen Schrei aus Richtung des Grand Museums. @Baconsaur ruft: \"Das Tyrannosaurus-Skelett im Museum fängt an sich zu bewegen! Es muss die Anwesenheit seiner Artgenossen gewittert haben!\" Das knöcherne Biest bleckt seine monströsen Zähne und klappert auf Dich zu. Wie wirst Du in der Lage sein eine Kreatur zu besiegen, die bereits tot ist? Du wirst schnell zuschlagen müssen, bevor sie sich selbst heilt!",
+    "questTRexUndeadNotes": "Während die uralten Dinosaurier der Stoïstillen Steppen durch Habit City wandern, hört man auf ein mal einen angstvollen Schrei aus Richtung des Grand Museums. @Baconsaur ruft: \"Das Tyrannosaurus-Skelett im Museum fängt an sich zu bewegen! Es muss die Anwesenheit seiner Artgenossen gewittert haben!\" Das knöcherne Biest bleckt seine monströsen Zähne und klappert auf Dich zu. Wie wirst Du in der Lage sein eine Kreatur zu besiegen, die bereits tot ist? Du wirst schnell zuschlagen müssen, bevor sie sich selbst heilt!",
     "questTRexUndeadCompletion": "Die glühenden Augen des Tyrannosaurus werden dunkel und trüb und er begibt sich zurück zu seinem Sockel. Alle atmen vor Erleichterung auf. \"Seht nur!\", sagt @Baconsaur, \"einige der versteinerten Eier sind plötzlich wie neu! Vielleicht werden sie ja für Dich ausschlüpfen.\"",
     "questTRexUndeadBoss": "Skelettierter Tyrannosaurus",
     "questTRexUndeadRageTitle": "Knöcherne Heilung",
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Nilpferd (Ei)",
     "questHippoUnlockText": "Schaltet den Kauf von Nilpferdeiern auf dem Marktplatz frei",
     "farmFriendsText": "\"Farmfreunde\" Quest-Paket",
-    "farmFriendsNotes": "Beinhaltet 'Die Muhtantische Kuh', 'Reite die Nacht-Mähre', und 'Der Donner-Bock'. Verfügbar bis zum 31. August.",
+    "farmFriendsNotes": "Beinhaltet 'Die Muhtantische Kuh', 'Reite die Nacht-Mähre', und 'Der Donner-Bock'. Verfügbar bis zum 30. September.",
     "witchyFamiliarsText": "\"Hexenhafte Haustiere\" Quest-Paket",
     "witchyFamiliarsNotes": "Beinhaltet 'Der Rattenkönig', 'Die eisige Arachnoide', und 'Sumpf des Chaos-Froschs'. Verfügbar bis zum 31. Oktober.",
     "questGroupLostMasterclasser": "Geheimnis der Klassenmeister",
diff --git a/website/common/locales/de/subscriber.json b/website/common/locales/de/subscriber.json
index b8a5f1986d..bfac46a618 100644
--- a/website/common/locales/de/subscriber.json
+++ b/website/common/locales/de/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Dein Abonnement wurde gekündigt",
     "choosePaymentMethod": "Wähle Deine Zahlungsmethode",
     "buyGemsSupportsDevs": "Der Kauf von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten",
-    "support": "HILFE",
+    "support": "Hilfe",
     "gemBenefitLeadin": "Was kann man mit Edelsteinen kaufen?",
     "gemBenefit1": "Einzigartige und modische Verkleidungen für Deinen Avatar.",
     "gemBenefit2": "Hintergründe, die Deinen Avatar in die Welt von Habitica eintauchen lassen!",
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 3c81c01acf..076c94c917 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -447,6 +447,15 @@
   "weaponSpecialSpring2022HealerText": "Peridot Wand",
   "weaponSpecialSpring2022HealerNotes": "Use this wand to tap into peridot’s healing properties, whether it be to bring calm, positivity, or kindheartedness. Increases Intelligence by <%= int %>. Limited Edition 2022 Spring Gear.",
 
+  "weaponSpecialFall2022RogueText": "Cucumber Blade",
+  "weaponSpecialFall2022RogueNotes": "Not only can you defend yourself with this cucumber, it also makes for a tasty meal. Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022WarriorText": "Orcish Ripsword",
+  "weaponSpecialFall2022WarriorNotes": "Maybe more suited for cutting logs or crusty loaves of bread than enemy armor, but RAWR! It sure looks fearsome! Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022MageText": "Wind Blasts",
+  "weaponSpecialFall2022MageNotes": "These mighty gusts remain in your wake as you take off toward the skies. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022HealerText": "Right Peeker Eye",
+  "weaponSpecialFall2022HealerNotes": "To claim victory, hold it forth and utter the words of command: 'Eye One!' Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+
   "weaponMystery201411Text": "Pitchfork of Feasting",
   "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
   "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -1083,6 +1092,15 @@
   "armorSpecialSummer2022HealerText": "Angelfish Tail",
   "armorSpecialSummer2022HealerNotes": "Use your colorful fins to scoot about the reef and help those in need of rest and healing. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.",
 
+  "armorSpecialFall2022RogueText": "Kappa Armor",
+  "armorSpecialFall2022RogueNotes": "Whether you’re swimming, sneaking, or wrestling, you will be safe in this armor. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022WarriorText": "Orcish Armor",
+  "armorSpecialFall2022WarriorNotes": "RAWR! BIG SHOULDERS mean you are BIG STRONG! Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022MageText": "Harpy Armor",
+  "armorSpecialFall2022MageNotes": "Fly as fast as the wind with these wonderful wings and hold what you care most about tight in these terrifying talons. Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022HealerText": "Profusion of Peeker Pods",
+  "armorSpecialFall2022HealerNotes": "How many peeps could a Peeker peep, if a Peeker could peep peeps? Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+
   "armorMystery201402Text": "Messenger Robes",
   "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
   "armorMystery201403Text": "Forest Walker Armor",
@@ -1793,6 +1811,15 @@
   "headSpecialSpring2022HealerText": "Peridot Helmet",
   "headSpecialSpring2022HealerNotes": "This mysterious helmet preserves your privacy as you tackle your tasks. Increases Intelligence by <%= int %>. Limited Edition 2022 Spring Gear.",
 
+  "headSpecialFall2022RogueText": "Kappa Mask",
+  "headSpecialFall2022RogueNotes": "With this metal cap upon your head, you will have extra protection when you venture onto land. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022WarriorText": "Orc Mask",
+  "headSpecialFall2022WarriorNotes": "Tusks tough and sharp enough to pierce pumpkins! RAWR! Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022MageText": "Harpy Mask",
+  "headSpecialFall2022MageNotes": "Entrance and lure others close with this magical maiden mask. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022HealerText": "Peeker Mask",
+  "headSpecialFall2022HealerNotes": "Beauty is in there. Somewhere! Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+
   "headSpecialGaymerxText": "Rainbow Warrior Helm",
   "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
 
@@ -2345,6 +2372,11 @@
   "shieldSpecialSummer2022HealerText": "Remedial Ripples",
   "shieldSpecialSummer2022HealerNotes": "Send out restorative magic in gentle ripples through the reef. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.",
 
+  "shieldSpecialFall2022WarriorText": "Orc Shield",
+  "shieldSpecialFall2022WarriorNotes": "RAWR or TREAT! Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+  "shieldSpecialFall2022HealerText": "Left Peeker Eye",
+  "shieldSpecialFall2022HealerNotes": "Eye Two, look upon this costume and tremble. Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+
   "shieldMystery201601Text": "Resolution Slayer",
   "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
   "shieldMystery201701Text": "Time-Freezer Shield",
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 121b414b54..106f1caf69 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -187,6 +187,10 @@
   "summer2022WaterspoutWarriorSet": "Waterspout (Warrior)",
   "summer2022MantaRayMageSet": "Manta Ray (Mage)",
   "summer2022AngelfishHealerSet": "Angelfish (Healer)",
+  "fall2022KappaRogueSet": "Kappa (Rogue)",
+  "fall2022OrcWarriorSet": "Orc (Warrior)",
+  "fall2022HarpyMageSet": "Harpy (Mage)",
+  "fall2022WatcherHealerSet": "Watcher (Healer)",
   "eventAvailability": "Available for purchase until <%= date(locale) %>.",
   "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
   "dateEndJanuary": "January 31",
diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index 2bc8616497..35f0061b27 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -1021,23 +1021,23 @@
     "headSpecialSummer2017RogueText": "Yelmo de Dragón Marino",
     "headSpecialSummer2017RogueNotes": "Este yelmo cambia de color ayudándote a camuflarte con el entorno. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017WarriorText": "Yelmo Castilloarena",
-    "headSpecialSummer2017WarriorNotes": "El más fino yelmo que podrías esperar vestir... al menos, hasta que suba la marea. Aumenta la Fuerza en <%= str %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017WarriorNotes": "El más fino yelmo que podrías esperar vestir... al menos, hasta que suba la marea. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017MageText": "Sombrero Torbellino",
-    "headSpecialSummer2017MageNotes": "Este sombre está compuesto enteramente por un giratorio torbellino invertido. Aumenta la Percepción en <%= per %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017MageNotes": "Este sombre está compuesto enteramente por un giratorio torbellino invertido. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017HealerText": "Corona de Criaturas Marinas",
-    "headSpecialSummer2017HealerNotes": "Este yelmo está hecho de amistosas criaturas marinas que estás descansando temporalmente sobre tu cabeza, dándote sabios consejos. Aumenta la Inteligencia en <%= int %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017HealerNotes": "Este yelmo está hecho de amistosas criaturas marinas que estás descansando temporalmente sobre tu cabeza, dándote sabios consejos. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialFall2017RogueText": "Casco de Calabaza",
-    "headSpecialFall2017RogueNotes": "¿Preparado para tratos? ¡Hora de ponerse este festivo y brillante casco! Aumenta la Percepción en <%= per %>. Edición Limitada 2017 del Equipamiento de Otoño.",
+    "headSpecialFall2017RogueNotes": "¿Preparado para tratos? ¡Hora de ponerse este festivo y brillante casco! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017WarriorText": "Casco de Golosinas de Maíz",
-    "headSpecialFall2017WarriorNotes": "Este casco puede parecer una delicia, ¡pero a las tareas pendientes obstinadas no les parecerá tan dulce! Aumenta la Fuerza en un <%= str %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017WarriorNotes": "Este casco puede parecer una delicia, ¡pero a las tareas pendientes obstinadas no les parecerá tan dulce! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017MageText": "Casco del Baile de Máscaras",
-    "headSpecialFall2017MageNotes": "¡Cuando aparezcas con este sombrero emplumado, todos se quedarán preguntándose la identidad del mágico extraño de la sala! Aumenta la Percepción en un <%= per %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017MageNotes": "¡Cuando aparezcas con este sombrero emplumado, todos se quedarán preguntándose la identidad del mágico extraño de la sala! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017HealerText": "Casco de Casa Encantada",
-    "headSpecialFall2017HealerNotes": "¡Invita a espíritus espeluznantes y a criaturas afables a buscar tus poderes curativos al llevar este casco! Aumenta la Inteligencia en un <%= int %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017HealerNotes": "¡Invita a espíritus espeluznantes y a criaturas afables a buscar tus poderes curativos al llevar este casco! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialNye2017Text": "Sombrero Festivo Rocambolesco",
     "headSpecialNye2017Notes": "¡Has recibido un Sombrero Festivo Rocambolesco! ¡Llévalo con orgullo mientras resuena en Año Nuevo! No otorga ningún beneficio.",
     "headSpecialWinter2018RogueText": "Casco de Reno",
-    "headSpecialWinter2018RogueNotes": "¡El disfraz festivo perfecto, con un foco delantero incorporado! Aumenta la Percepción en un <%= per %>. Equipamiento de Invierno de Edición Limitada del 2017-2018.",
+    "headSpecialWinter2018RogueNotes": "¡El disfraz festivo perfecto, con un foco delantero incorporado! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2017-2018.",
     "headSpecialWinter2018WarriorText": "Casco Caja de Regalo",
     "headSpecialWinter2018WarriorNotes": "La superficie y el lazo de esta desenfadada caja no solo son festivos, sino bastante robustos también. Aumenta la Fuerza en un <%= str %>. Armamento de Invierno de Edición Limitada del 2017-2018.",
     "headSpecialWinter2018MageText": "Sombrero de Copa Centelleante",
diff --git a/website/common/locales/it/backgrounds.json b/website/common/locales/it/backgrounds.json
index b33cb01299..68101e0850 100644
--- a/website/common/locales/it/backgrounds.json
+++ b/website/common/locales/it/backgrounds.json
@@ -661,8 +661,8 @@
     "backgroundFrozenPolarWatersNotes": "Esplora le ghiacciate acque polari.",
     "backgrounds122021": "SET 91: Rilasciato a dicembre 2021",
     "backgroundIcePalaceShopNotes": "Regna in un palazzo di ghiaccio.",
-    "backgroundWinterCanyonText": "Forra invernale",
-    "backgroundWinterCanyonNotes": "Avventurati in una forra invernale!",
+    "backgroundWinterCanyonText": "Canyon Invernale",
+    "backgroundWinterCanyonNotes": "Avventurati in un Canyon Invernale!",
     "backgroundIcePalaceText": "Palazzo di ghiaccio",
     "backgroundIcePalaceNotes": "Regna in un palazzo di ghiaccio.",
     "backgrounds012022": "SET 92: Rilasciato Gennaio 2022",
diff --git a/website/common/locales/it/front.json b/website/common/locales/it/front.json
index f6f661178c..fa8c79284f 100644
--- a/website/common/locales/it/front.json
+++ b/website/common/locales/it/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "e l'",
     "chores": "Faccende di casa",
     "clearBrowserData": "Pulizia dati del browser",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-on ed estensioni</a>",
+    "communityExtensions": "Add-on ed Estensioni",
     "communityFacebook": "Facebook",
     "companyAbout": "Come funziona",
     "companyBlog": "Blog",
-    "companyContribute": "Contribuisci",
-    "companyDonate": "Fai una donazione",
+    "companyContribute": "Contribuire ad Habitica",
+    "companyDonate": "Fai una donazione ad Habitica",
     "forgotPassword": "Password dimenticata?",
     "emailNewPass": "Ricevi per e-mail il link per reimpostare la password",
     "forgotPasswordSteps": "Inserisci il tuo nome utente o l'indirizzo e-mail che hai usato per registrare il tuo account Habitica.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Vuoi vivere la tua vita come in un gioco?",
     "marketing4Lead3-2": "Sei interessato a gestire un gruppo nel settore dell'educazione, del benessere e in altri settori?",
     "marketing4Lead3Title": "Trasforma tutto in gioco",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "App su Android",
+    "mobileIOS": "App su iOS",
     "oldNews": "Novità",
     "newsArchive": "Archivio delle notizie su Wikia (multilingua)",
     "setNewPass": "Imposta nuova password",
@@ -187,5 +187,6 @@
     "minPasswordLength": "La password deve essere di almeno 8 caratteri.",
     "enterHabitica": "Entra in Habitica",
     "socialAlreadyExists": "Questo social è già collegato ad un account di Habitica.",
-    "emailUsernamePlaceholder": "es. habitrabbit oppure grifone@example.com"
+    "emailUsernamePlaceholder": "es. habitrabbit oppure grifone@example.com",
+    "footerProduct": "Prodotto"
 }
diff --git a/website/common/locales/it/npc.json b/website/common/locales/it/npc.json
index cbf2ce303c..c1e152ab13 100644
--- a/website/common/locales/it/npc.json
+++ b/website/common/locales/it/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Nuovo aggiornamento da Bailey!",
     "tellMeLater": "Ricordamelo più tardi",
     "dismissAlert": "Nascondi questo annuncio",
-    "donateText3": "Habitica è un progetto open-source che dipende dal supporto degli utenti. I soldi che spendi in Gemme ci aiutano a tenere accesi i nostri server, mantenere un piccolo staff, sviluppare nuove funzionalità e dare degli incentivi ai volontari programmatori. Grazie per la tua generosità!",
+    "donateText3": "Habitica è un progetto open-source che dipende dal supporto degli utenti. I soldi che spendi in Gemme ci aiutano a tenere accesi i nostri server, mantenere un piccolo staff, sviluppare nuove funzionalità e dare degli incentivi ai nostri volontari",
     "card": "Carta di credito",
     "paymentMethods": "Paga utilizzando",
     "paymentSuccessful": "Il tuo pagamento ha avuto successo!",
@@ -130,5 +130,6 @@
     "limitedAvailabilityMinutes": "Disponibile per <%= minutes %> minuti e <%= seconds %> secondi",
     "limitedAvailabilityDays": "Disponibile per <%= days %> giorni, <%= hours %> ore e <%= minutes %> minuti",
     "limitedAvailabilityHours": "Disponibile per <%= hours %> ore e <%= minutes %> minuti",
-    "amountExp": "<%= amount %> Exp"
+    "amountExp": "<%= amount %> Exp",
+    "helpSupportHabitica": "Aiutare a Supportare Habitica"
 }
diff --git a/website/common/locales/it/questscontent.json b/website/common/locales/it/questscontent.json
index 66f856b81c..56d758b977 100644
--- a/website/common/locales/it/questscontent.json
+++ b/website/common/locales/it/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Ippopotamo (Uovo)",
     "questHippoUnlockText": "Sblocca le uova di Ippopotamo acquistabili nel Mercato",
     "farmFriendsText": "Pacchetto missioni Amici della Fattoria",
-    "farmFriendsNotes": "Contiente \"La Mucca Muutante\", \"Cavalca il Destriero dell'Incubo\", e \"L'Ariete Tuonante\". Disponibile fino al 31 agosto.",
+    "farmFriendsNotes": "Contiene \"La Mucca Muutante\", \"Cavalca il Destriero dell'Incubo\", e \"L'Ariete Tuonante\". Disponibile fino al 30 settembre.",
     "witchyFamiliarsText": "Pacchetto di Missioni dei Familiari Stregati",
     "witchyFamiliarsNotes": "Contiene 'Il Re dei Ratti', 'L'Aracnide Ghiacciato', 'Palude della Rana del Disordine'. Disponibile fino al 31 Ottobre.",
     "questGroupLostMasterclasser": "Mistero dei Masterclasser",
diff --git a/website/common/locales/it/subscriber.json b/website/common/locales/it/subscriber.json
index 1d3418e9a9..81d38b24bd 100644
--- a/website/common/locales/it/subscriber.json
+++ b/website/common/locales/it/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Il tuo abbonameno è stato disdetto",
     "choosePaymentMethod": "Scegli il metodo di pagamento",
     "buyGemsSupportsDevs": "Comprare Gemme supporta gli sviluppatori e aiuta Habitica a continuare a funzionare",
-    "support": "SUPPORTA",
+    "support": "Supporta",
     "gemBenefitLeadin": "Cosa puoi comprare con le Gemme?",
     "gemBenefit1": "Costumi unici e alla moda per il tuo avatar.",
     "gemBenefit2": "Sfondi per immergere il tuo avatar nel mondi di Habitica!",
diff --git a/website/common/locales/ja/front.json b/website/common/locales/ja/front.json
index 6a089706d3..b73f2bd4b7 100644
--- a/website/common/locales/ja/front.json
+++ b/website/common/locales/ja/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "そして",
     "chores": "雑用",
     "clearBrowserData": "ブラウザデータを削除する",
-    "communityExtensions": "<a href='https://habitica.fandom.com/ja/wiki/拡張機能・アドオン・カスタマイズ' target='_blank'>アドオンと拡張機能</a>",
+    "communityExtensions": "アドオンと拡張機能",
     "communityFacebook": "Facebook",
     "companyAbout": "機能説明",
     "companyBlog": "ブログ",
diff --git a/website/common/locales/ja/gear.json b/website/common/locales/ja/gear.json
index 9bcf0c4211..d6552bd7be 100644
--- a/website/common/locales/ja/gear.json
+++ b/website/common/locales/ja/gear.json
@@ -2696,7 +2696,7 @@
     "shieldMystery202209Notes": "魔術の知識を身につけるには多くの本を読まなければいけませんが、その過程はきっと楽しいはず。効果なし。2022年9月有料会員アイテム。",
     "shieldMystery202209Text": "山積みの魔法書",
     "eyewearArmoireComedyMaskText": "喜劇の仮面",
-    "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しよう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
+    "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しましょう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
     "eyewearArmoireTragedyMaskText": "悲劇の仮面",
-    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しよう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
+    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しましょう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
 }
diff --git a/website/common/locales/ja/questscontent.json b/website/common/locales/ja/questscontent.json
index af8d99c25c..215a921eeb 100644
--- a/website/common/locales/ja/questscontent.json
+++ b/website/common/locales/ja/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "カバ(たまご)",
     "questHippoUnlockText": "市場でカバのたまごを買えるようになります",
     "farmFriendsText": "「まきばの友達」クエストセット",
-    "farmFriendsNotes": "「モー変異した牛」「悪夢を乗りこなせ」「雷雄羊」のセット。8月31日まで購入できます。",
+    "farmFriendsNotes": "「モー変異した牛」「悪夢を乗りこなせ」「雷雄羊」のセット。9月30日まで購入できます。",
     "witchyFamiliarsText": "「魔女の使い魔」クエストセット",
     "witchyFamiliarsNotes": "「ネズミ王」「氷のクモ」「散らかしカエルの沼」のセット。10月31日まで購入できます。",
     "questGroupLostMasterclasser": "クラス・マスターの謎",
diff --git a/website/common/locales/pt_BR/front.json b/website/common/locales/pt_BR/front.json
index 00ec80fd2c..37322244b5 100644
--- a/website/common/locales/pt_BR/front.json
+++ b/website/common/locales/pt_BR/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "e com a",
     "chores": "Afazeres",
     "clearBrowserData": "Limpar Dados do Navegador",
-    "communityExtensions": "<a href='https://habitica.fandom.com/pt-br/wiki/Extens%C3%B5es,_Add-ons_e_Personaliza%C3%A7%C3%B5es' target='_blank'>Add-ons e Extensões</a>",
+    "communityExtensions": "Complementos e Extensões",
     "communityFacebook": "Facebook",
     "companyAbout": "Como funciona",
     "companyBlog": "Blog",
-    "companyContribute": "Contribuir",
-    "companyDonate": "Doar",
+    "companyContribute": "Contribuindo para o Habitica",
+    "companyDonate": "Doar para o Habitica",
     "forgotPassword": "Esqueceu a senha?",
     "emailNewPass": "Enviar por Email uma Nova Senha",
     "forgotPasswordSteps": "Digite seu nome de usuário ou o endereço de e-mail que você usou para registrar sua conta no Habitica.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Quer gamificar sua vida?",
     "marketing4Lead3-2": "Interessado em coordenar um grupo em educação, bem-estar e outros?",
     "marketing4Lead3Title": "Gamifique Tudo",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Aplicativo Android",
+    "mobileIOS": "Aplicativo iOS",
     "oldNews": "Notícias",
     "newsArchive": "Arquivo de notícias na Wikia (multilíngue)",
     "setNewPass": "Defina a Nova Senha",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Senhas devem possuir 8 caracteres ou mais.",
     "enterHabitica": "Entrar no Habitica",
     "emailUsernamePlaceholder": "Ex: habitilebre ou grifo@exemplo.com",
-    "socialAlreadyExists": "Este login já está vinculado a uma conta existente do Habitica."
+    "socialAlreadyExists": "Este login já está vinculado a uma conta existente do Habitica.",
+    "footerProduct": "Produto"
 }
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index 484b60a3e5..c021bccd96 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -125,9 +125,9 @@
     "weaponSpecialSpringRogueText": "Garras de Gancho",
     "weaponSpecialSpringRogueNotes": "Ótimo para escalar altos prédios, e também para rasgar carpetes. Aumenta Força em <%= str %>. Equipamento Edição Limitada de Primavera 2014.",
     "weaponSpecialSpringWarriorText": "Espada de Cenoura",
-    "weaponSpecialSpringWarriorNotes": "Essa poderosa espada pode cortar inimigos com facilidade! Também serve como um delicioso lanche no meio das batalhas. Aumenta Força em <%= str %>. Equipamento Edição Limitada de Primavera 2014.",
+    "weaponSpecialSpringWarriorNotes": "Essa poderosa espada pode cortar inimigos com facilidade! Também serve como um delicioso lanche no meio das batalhas. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "weaponSpecialSpringMageText": "Cajado de Queijo-Suíço",
-    "weaponSpecialSpringMageNotes": "Apenas os roedores mais poderosos podem confrontar sua fome para empunhar esse potente cajado. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento Edição Limitada de Primavera 2014.",
+    "weaponSpecialSpringMageNotes": "Apenas os roedores mais poderosos podem confrontar sua fome para empunhar esse potente cajado. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "weaponSpecialSpringHealerText": "Osso Encantador",
     "weaponSpecialSpringHealerNotes": "PEGA! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "weaponSpecialSummerRogueText": "Cutelo de Pirata",
@@ -159,9 +159,9 @@
     "weaponSpecialSpring2015WarriorText": "Clava de Osso",
     "weaponSpecialSpring2015WarriorNotes": "É uma legítima clava de osso para cachorrinhos super ferozes e definitivamente não um brinquedo de mastigar que a Feiticeira Sazonal te deu porque quem é um bom garoto? Queeem é um bom garoto?? Você!!! Você é um bom garoto!!! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "weaponSpecialSpring2015MageText": "Varinha de Mágico",
-    "weaponSpecialSpring2015MageNotes": "Invoque uma cenoura para si mesmo com essa elegante varinha. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "weaponSpecialSpring2015MageNotes": "Invoque uma cenoura para si mesmo com essa elegante varinha. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "weaponSpecialSpring2015HealerText": "Matraca de Gato",
-    "weaponSpecialSpring2015HealerNotes": "Quando você a sacode, faz um clique-claque fascinante que manteria QUALQUER UM entretido por horas. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "weaponSpecialSpring2015HealerNotes": "Quando você a sacode, faz um clique-claque fascinante que manteria QUALQUER UM entretido por horas. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "weaponSpecialSummer2015RogueText": "Coral Atirador",
     "weaponSpecialSummer2015RogueNotes": "Este parente do coral de fogo tem a habilidade de expelir seu veneno através da água. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2015.",
     "weaponSpecialSummer2015WarriorText": "Peixe-Espada Solar",
@@ -187,11 +187,11 @@
     "weaponSpecialWinter2016HealerText": "Canhão de Confetes",
     "weaponSpecialWinter2016HealerNotes": "ÊEEEEEEEEEEE!!!!!!! QUE COMECEM AS MARAVILHAS DE INVERNO!!!!!!!! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "weaponSpecialSpring2016RogueText": "Bolas de Fogo",
-    "weaponSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "weaponSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "weaponSpecialSpring2016WarriorText": "Marreta de Queijo",
     "weaponSpecialSpring2016WarriorNotes": "Ninguém tem tantos amigos quanto o rato com queijo mussarela. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "weaponSpecialSpring2016MageText": "Cajado de Sinos",
-    "weaponSpecialSpring2016MageNotes": "Abra-Ga-ta-Bra! Tão deslumbrante, você poderia se hipnotizar! Ooh... Ele brilha... Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "weaponSpecialSpring2016MageNotes": "Abra-Ga-ta-Bra! Tão deslumbrante, você poderia se hipnotizar! Ooh... Ele brilha... Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "weaponSpecialSpring2016HealerText": "Varinha de Flor da Primavera",
     "weaponSpecialSpring2016HealerNotes": "Com um aceno e uma piscada, você faz florestas e campos florescerem! Ou acerta ratos problemáticos na cabeça. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "weaponSpecialSummer2016RogueText": "Varinha Elétrica",
@@ -219,7 +219,7 @@
     "weaponSpecialWinter2017HealerText": "Varinha Açucarada",
     "weaponSpecialWinter2017HealerNotes": "Esta varinha pode atingir seus sonhos e te trazer visões de bombons dançantes. Aumenta a inteligência em <%= int %>. Equipamento de inverno da edição limitada 2016-2017.",
     "weaponSpecialSpring2017RogueText": "Cenouspada",
-    "weaponSpecialSpring2017RogueNotes": "Essas lâminas farão das tarefas algo fácil. E também servem para cortar vegetais! Yum! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "weaponSpecialSpring2017RogueNotes": "Essas lâminas farão das tarefas algo fácil. E também servem para cortar vegetais! Yum! Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "weaponSpecialSpring2017WarriorText": "Chicote Emplumado",
     "weaponSpecialSpring2017WarriorNotes": "Esse poderoso chicote servirá para dominar a tarefa mais difícil de todas. Mas... ela também é... muito DIVERTIDA E DISPERSANTE!! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "weaponSpecialSpring2017MageText": "Varinha Mágica Elegante",
@@ -477,11 +477,11 @@
     "armorSpecialGaymerxText": "Armadura do Guerreiro Arco-Íris",
     "armorSpecialGaymerxNotes": "Para celebrar a Conferência GaymerX, esta armadura especial foi decorada com uma colorida e radiante estampa arco-íris! A GaymerX é uma conferência de games que celebra a comunidade LGBT e jogos e é aberta para todos.",
     "armorSpecialSpringRogueText": "Traje Elegante de Gato",
-    "armorSpecialSpringRogueNotes": "Impecavelmente arrumado. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringRogueNotes": "Impecavelmente arrumado. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringWarriorText": "Armadura de Trevo Metálico",
-    "armorSpecialSpringWarriorNotes": "Suave como um trevo, forte como aço! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringWarriorNotes": "Suave como um trevo, forte como aço! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringMageText": "Túnica de Roedor",
-    "armorSpecialSpringMageNotes": "Ratos são um barato! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringMageNotes": "Ratos são um barato! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringHealerText": "Túnica de Filhote Felpudo",
     "armorSpecialSpringHealerNotes": "Quente e confortável, mas protege seu dono do perigo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "armorSpecialSummerRogueText": "Túnica de Pirata",
@@ -511,9 +511,9 @@
     "armorSpecialSpring2015RogueText": "Túnicas Guinchantes",
     "armorSpecialSpring2015RogueNotes": "Peludo, macio e definitivamente não inflamável. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "armorSpecialSpring2015WarriorText": "Cuidado: Armadura",
-    "armorSpecialSpring2015WarriorNotes": "Apenas o cachorinho mais feroz pode ser tão peludo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "armorSpecialSpring2015WarriorNotes": "Apenas o cachorinho mais feroz pode ser tão peludo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "armorSpecialSpring2015MageText": "Fantasia de Coelho do Mágico",
-    "armorSpecialSpring2015MageNotes": "O seu casaco combina com seu rabinho! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "armorSpecialSpring2015MageNotes": "O seu casaco combina com seu rabinho! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "armorSpecialSpring2015HealerText": "Fantasia Confortante de Gato",
     "armorSpecialSpring2015HealerNotes": "Essa macia fantasia de gato é confortável e reconfortante como chá de menta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "armorSpecialSummer2015RogueText": "Cauda de Rubi",
@@ -541,13 +541,13 @@
     "armorSpecialWinter2016HealerText": "Manto de Fada Festivo",
     "armorSpecialWinter2016HealerNotes": "Fadas Festivas enrolam suas asas do corpo em torno de si mesmas para proteção enquanto usam as asas da cabeça para pegar ventos contrários e voar por Habitica a velocidades de até 160 km/h, entregando presentes e pulverizando todos com confetes. Que divertido. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "armorSpecialSpring2016RogueText": "Traje Camuflado Canino",
-    "armorSpecialSpring2016RogueNotes": "Um pequeno filhote sabe escolher um disfarce colorido para se esconder quando tudo é verde e vibrante. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016RogueNotes": "Um pequeno filhote sabe escolher um disfarce colorido para se esconder quando tudo é verde e vibrante. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016WarriorText": "Armadura Poderosa",
-    "armorSpecialSpring2016WarriorNotes": "Embora pequeno, você é feroz! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016WarriorNotes": "Embora pequeno, você é feroz! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016MageText": "Túnica do Imponente Malkin",
-    "armorSpecialSpring2016MageNotes": "Brilhantemente colorido, para que você não seja confundido com um nec-ratomante. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016MageNotes": "Brilhantemente colorido, para que você não seja confundido com um nec-ratomante. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016HealerText": "Calções de Coelhinho Fofinho",
-    "armorSpecialSpring2016HealerNotes": "Saltando por ai! De colina a colina, curando aqueles que precisam. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016HealerNotes": "Saltando por ai! De colina a colina, curando aqueles que precisam. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSummer2016RogueText": "Cauda de Enguia",
     "armorSpecialSummer2016RogueNotes": "Essas eletrificantes vestes transformam seu usuário em um verdadeiro Gatuno Enguia! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão de 2016.",
     "armorSpecialSummer2016WarriorText": "Cauda de Tubarão",
@@ -577,9 +577,9 @@
     "armorSpecialSpring2017WarriorText": "Armadura Fofincrível",
     "armorSpecialSpring2017WarriorNotes": "Essa armadura extravagante é tão brilhante quanto seu melhor casaco, mas com resistência aumentada a ataques. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "armorSpecialSpring2017MageText": "Túnicas de Ilusionista Canino",
-    "armorSpecialSpring2017MageNotes": "Mágica pelo design, fofa por opção. Aumenta Inteligência em <%= int %>. Equipamento Edição Limitada 2017.",
+    "armorSpecialSpring2017MageNotes": "Mágica pelo design, fofa por opção. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "armorSpecialSpring2017HealerText": "Túnica do Descanso",
-    "armorSpecialSpring2017HealerNotes": "A suavidade dessa túnica conforta você assim como qualquer pessoa que precisa da sua ajuda de cura! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "armorSpecialSpring2017HealerNotes": "A suavidade dessa túnica conforta você assim como qualquer pessoa que precisa da sua ajuda de cura! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "armorSpecialSummer2017RogueText": "Cauda de Dragão do Mar",
     "armorSpecialSummer2017RogueNotes": "Esta capa colorida transforma o utilizador num Dragão do Mar de verdade! Aumenta Percepção em <%= per %>. Equipamento Edição Limitada, Verão de 2017.",
     "armorSpecialSummer2017WarriorText": "Armadura de Areia",
@@ -911,11 +911,11 @@
     "headSpecialSpringRogueText": "Máscara Furtiva de Gatinho",
     "headSpecialSpringRogueNotes": "Ninguém NUNCA adivinhará que você é um gatuno! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "headSpecialSpringWarriorText": "Capacete de Trevo Metálico",
-    "headSpecialSpringWarriorNotes": "Soldado a partir de belos trevos do campo, esse capacete resiste até mesmo aos mais poderosos golpes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringWarriorNotes": "Soldado a partir de belos trevos do campo, esse capacete resiste até mesmo aos mais poderosos golpes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSpringMageText": "Chapéu de Queijo-Suíço",
-    "headSpecialSpringMageNotes": "Esse chapéu possui muito poder mágico! Tente não mordê-lo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringMageNotes": "Esse chapéu possui muito poder mágico! Tente não mordê-lo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSpringHealerText": "Coroa da Amizade",
-    "headSpecialSpringHealerNotes": "Essa coroa simboliza lealdade e companheirismo. Afinal, um cachorro é o melhor amigo de um aventureiro! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringHealerNotes": "Essa coroa simboliza lealdade e companheirismo. Afinal, um cachorro é o melhor amigo de um aventureiro! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSummerRogueText": "Chapéu de Pirata",
     "headSpecialSummerRogueNotes": "Apenas os mais produtivos piratas podem usar este belo chapéu. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão de 2014.",
     "headSpecialSummerWarriorText": "Bandana de Marujo",
@@ -945,9 +945,9 @@
     "headSpecialSpring2015RogueText": "Elmo à Prova de Fogo",
     "headSpecialSpring2015RogueNotes": "Fogo? HA! Você guincha ferozmente na cara do fogo! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "headSpecialSpring2015WarriorText": "Cuidado: Elmo",
-    "headSpecialSpring2015WarriorNotes": "Cuidado com o Elmo! Só um cachorrinho feroz pode usá-lo. Pare de rir. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headSpecialSpring2015WarriorNotes": "Cuidado com o Elmo! Só um cachorrinho feroz pode usá-lo. Pare de rir. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "headSpecialSpring2015MageText": "Chapéu de Ilusionista",
-    "headSpecialSpring2015MageNotes": "O que veio primeiro, o coelhinho ou o chapéu? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headSpecialSpring2015MageNotes": "O que veio primeiro, o coelhinho ou o chapéu? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "headSpecialSpring2015HealerText": "Coroa Confortante",
     "headSpecialSpring2015HealerNotes": "A pérola no centro dessa coroa acalma e conforta aqueles ao seu redor. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "headSpecialSummer2015RogueText": "Chapéu dos Renegados",
@@ -977,13 +977,13 @@
     "headSpecialWinter2016HealerText": "Elmo Alado de Fada",
     "headSpecialWinter2016HealerNotes": "Essasasasbatemtãorápidoquenãodápraver! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "headSpecialSpring2016RogueText": "Máscara de Cachorrinho Bonitinho",
-    "headSpecialSpring2016RogueNotes": "Ooun, que cachorrinho fofo! Venha aqui e me deixe fazer carinho em você. ...Ei, onde todo meu Ouro foi parar? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headSpecialSpring2016RogueNotes": "Ooun, que cachorrinho fofo! Venha aqui e me deixe fazer carinho em você. ...Ei, onde todo meu Ouro foi parar? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "headSpecialSpring2016WarriorText": "Elmo de Rato Guarda",
     "headSpecialSpring2016WarriorNotes": "Nunca mais você será acertado na cabeça! Deixe-os tentarem! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "headSpecialSpring2016MageText": "Grande Chapéu de Malkin",
     "headSpecialSpring2016MageNotes": "Vestimenta para colocar você acima dos meros magos simples do mundo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "headSpecialSpring2016HealerText": "Diadema de Flores",
-    "headSpecialSpring2016HealerNotes": "Ele cintila com o potencial de uma nova vida pronta para florescer. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headSpecialSpring2016HealerNotes": "Ele cintila com o potencial de uma nova vida pronta para florescer. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "headSpecialSummer2016RogueText": "Capacete de Enguia",
     "headSpecialSummer2016RogueNotes": "Espie por frestas de rochas enquanto estiver usando esse elmo discreto. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão 2016.",
     "headSpecialSummer2016WarriorText": "Capacete de Tubarão",
@@ -1011,13 +1011,13 @@
     "headSpecialWinter2017HealerText": "Elmo Champagne",
     "headSpecialWinter2017HealerNotes": "Essas pétalas cintilantes concentram sua capacidade intelectual! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2016 e 2017.",
     "headSpecialSpring2017RogueText": "Elmo de Coelhinho Sorrateiro",
-    "headSpecialSpring2017RogueNotes": "Essa máscara vai evitar que a sua fofura te entregue quando você estiver se esgueirando para atacar Tarefas (ou trevos)! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headSpecialSpring2017RogueNotes": "Essa máscara vai evitar que a sua fofura te entregue quando você estiver se esgueirando para atacar Tarefas (ou trevos)! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSpring2017WarriorText": "Elmo Felino",
-    "headSpecialSpring2017WarriorNotes": "Proteja sua adorável e macia cabeça com este elmo finamente decorado. Aumenta Força em <%= str %>. Equipamento de Edição Limitada, Primavera de 2017.",
+    "headSpecialSpring2017WarriorNotes": "Proteja sua adorável e macia cabeça com este elmo finamente decorado. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSpring2017MageText": "Chapéu de Conjurador Canino",
     "headSpecialSpring2017MageNotes": "Este chapéu pode te ajudar a conjurar poderosos feitiços... Ou você pode usá-lo apenas para invocar bolas de tênis. Você escolhe. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "headSpecialSpring2017HealerText": "Tiara de Pétalas",
-    "headSpecialSpring2017HealerNotes": "Essa coroa delicada emite o confortante cheiro da Primavera. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada, Primavera de 2017.",
+    "headSpecialSpring2017HealerNotes": "Essa coroa delicada emite o confortante cheiro da Primavera. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSummer2017RogueText": "Elmo de Dragão do Mar",
     "headSpecialSummer2017RogueNotes": "Esse elmo muda de cor para te ajudar a se misturar com seus arredores. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada, Verão de 2017.",
     "headSpecialSummer2017WarriorText": "Elmo do Castelo de Areia",
@@ -1321,7 +1321,7 @@
     "shieldSpecialSpringRogueText": "Garras de Gancho",
     "shieldSpecialSpringRogueNotes": "Ótimo para escalar altos prédios e também para rasgar carpetes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "shieldSpecialSpringWarriorText": "Escudo de Ovo",
-    "shieldSpecialSpringWarriorNotes": "Esse escudo nunca racha, não importa o quão forte você bata nele! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "shieldSpecialSpringWarriorNotes": "Esse escudo nunca racha, não importa o quão forte você bata nele! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "shieldSpecialSpringHealerText": "Bola Barulhenta da Proteção Final",
     "shieldSpecialSpringHealerNotes": "Libera um barulho desagradável e contínuo quando mordida, afastando os inimigos para longe. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "shieldSpecialSummerRogueText": "Cutelo de Pirata",
@@ -1345,9 +1345,9 @@
     "shieldSpecialSpring2015RogueText": "Guinchado Explosivo",
     "shieldSpecialSpring2015RogueNotes": "Não deixe o som te enganar - esses explosivos são fortes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "shieldSpecialSpring2015WarriorText": "Disco de Prato",
-    "shieldSpecialSpring2015WarriorNotes": "Jogue nos seus inimigos... ou só segure, porque vai se encher de ração gostosa na hora da janta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "shieldSpecialSpring2015WarriorNotes": "Jogue nos seus inimigos... ou só segure, porque vai se encher de ração gostosa na hora da janta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "shieldSpecialSpring2015HealerText": "Travesseiro Estampado",
-    "shieldSpecialSpring2015HealerNotes": "Você pode descansar a cabeça neste travesseiro macio, ou você pode lutar contra ele com suas temíveis garras. Rawr! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "shieldSpecialSpring2015HealerNotes": "Você pode descansar a cabeça neste travesseiro macio, ou você pode lutar contra ele com suas temíveis garras. Rawr! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "shieldSpecialSummer2015RogueText": "Coral Atirador",
     "shieldSpecialSummer2015RogueNotes": "Este parente do coral de fogo tem a habilidade de expelir seu veneno através da água. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2015.",
     "shieldSpecialSummer2015WarriorText": "Escudo de Peixe Sol",
@@ -1369,9 +1369,9 @@
     "shieldSpecialSpring2016RogueText": "Bolas de Fogo",
     "shieldSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "shieldSpecialSpring2016WarriorText": "Roda de Queijo",
-    "shieldSpecialSpring2016WarriorNotes": "Você enfrentou diabólicas armadilhas para obter essa comida que aumenta defesa. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "shieldSpecialSpring2016WarriorNotes": "Você enfrentou diabólicas armadilhas para obter essa comida que aumenta defesa. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "shieldSpecialSpring2016HealerText": "Broquel Floral",
-    "shieldSpecialSpring2016HealerNotes": "O Primeiro de Abril diz que este pequeno escudo bloqueará Sementes Brilhantes. Não acredite nele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "shieldSpecialSpring2016HealerNotes": "O Primeiro de Abril diz que este pequeno escudo bloqueará Sementes Brilhantes. Não acredite nele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "shieldSpecialSummer2016RogueText": "Varinha Elétrica",
     "shieldSpecialSummer2016RogueNotes": "Qualquer um que batalhe com você terá uma surpresa chocante... Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2016.",
     "shieldSpecialSummer2016WarriorText": "Dente de Tubarão",
@@ -1393,7 +1393,7 @@
     "shieldSpecialSpring2017RogueText": "Karrotana",
     "shieldSpecialSpring2017RogueNotes": "Essas lâminas irão resolver rápido as tarefas, mas também são úteis para cortar vegetais! Uhmmm! Aumenta Força em <%= str %>. Equipamento de Edição Limitada, Primavera de 2017.",
     "shieldSpecialSpring2017WarriorText": "Escudo de Lã",
-    "shieldSpecialSpring2017WarriorNotes": "Toda fibra deste escudo é trançado com feitiços protetores! Tente não brincar (demais) com ele. Aumenta Constituição em <%= con %>. Equipamento de Primavera de 2017 Edição Limitada.",
+    "shieldSpecialSpring2017WarriorNotes": "Toda fibra deste escudo é trançado com feitiços protetores! Tente não brincar (demais) com ele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "shieldSpecialSpring2017HealerText": "Escudo de Cesta",
     "shieldSpecialSpring2017HealerNotes": "Protetor e também útil para guardar suas várias ervas de cura e acessórios. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "shieldSpecialSummer2017RogueText": "Nadadeiras de Dragão Marinho",
@@ -1618,37 +1618,37 @@
     "headAccessoryBase0Text": "Sem Acessório de Cabeça",
     "headAccessoryBase0Notes": "Sem Acessório de Cabeça.",
     "headAccessorySpecialSpringRogueText": "Orelhas Roxas de Gatinho",
-    "headAccessorySpecialSpringRogueNotes": "Essas orelhas felinas se contraem para detectar ameaças iminentes. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headAccessorySpecialSpringRogueNotes": "Essas orelhas felinas se contraem para detectar ameaças iminentes. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2014.",
     "headAccessorySpecialSpringWarriorText": "Orelhas Verdes de Coelhinho",
     "headAccessorySpecialSpringWarriorNotes": "Orelhas de coelho aguçadas, que detectam cada mordida em uma cenoura. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
     "headAccessorySpecialSpringMageText": "Orelhas Azuis de Ratinho",
     "headAccessorySpecialSpringMageNotes": "Essas orelhas de rato redondas são macias como seda. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
     "headAccessorySpecialSpringHealerText": "Orelhas Amarelas de Cachorrinho",
-    "headAccessorySpecialSpringHealerNotes": "De abano e fofas. Quer brincar? Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headAccessorySpecialSpringHealerNotes": "De abano e fofas. Quer brincar? Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2014.",
     "headAccessorySpecialSpring2015RogueText": "Orelhas Amarelas de Ratinho",
     "headAccessorySpecialSpring2015RogueNotes": "Essas orelhas se protegem do som de explosões. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
     "headAccessorySpecialSpring2015WarriorText": "Orelhas Roxas de Cachorrinho",
-    "headAccessorySpecialSpring2015WarriorNotes": "São roxas. São orelhas de cachorro. Não desperdice seu tempo com mais bobagens. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headAccessorySpecialSpring2015WarriorNotes": "São roxas. São orelhas de cachorro. Não desperdice seu tempo com mais bobagens. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2015.",
     "headAccessorySpecialSpring2015MageText": "Orelhas Azuis de Coelhinho",
     "headAccessorySpecialSpring2015MageNotes": "Essas orelhas escutam atentamente, caso em algum lugar um mágico esteja revelando segredos. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
     "headAccessorySpecialSpring2015HealerText": "Orelhas Verdes de Gatinho",
-    "headAccessorySpecialSpring2015HealerNotes": "Essas adoráveis orelhas de gatinho vão deixar os outro verdes de inveja. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headAccessorySpecialSpring2015HealerNotes": "Essas adoráveis orelhas de gatinho vão deixar os outro verdes de inveja. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2015.",
     "headAccessorySpecialSpring2016RogueText": "Orelhas Verdes de Cachorrinho",
-    "headAccessorySpecialSpring2016RogueNotes": "Com isto, você pode observar Magos astutos até mesmo quando estão invisíveis! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016RogueNotes": "Com isto, você pode observar Magos astutos até mesmo quando estão invisíveis! Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016WarriorText": "Orelhas Vermelhas de Ratinho",
-    "headAccessorySpecialSpring2016WarriorNotes": "Para melhor escutar sua canção tema pelos clamorosos campos de batalha. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016WarriorNotes": "Para melhor escutar sua canção tema pelos clamorosos campos de batalha. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016MageText": "Orelhas Amarelas de Gatinho",
-    "headAccessorySpecialSpring2016MageNotes": "Estas orelhas afiadas podem detectar o murmurar da Mana no ambiente, ou as passadas silenciosas de um Gatuno. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016MageNotes": "Estas orelhas afiadas podem detectar o murmurar da Mana no ambiente, ou as passadas silenciosas de um Gatuno. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016HealerText": "Orelhas Roxas de Coelhinho",
-    "headAccessorySpecialSpring2016HealerNotes": "Eles levantam como bandeiras sobre a briga, deixando os outros saberem onde correr por ajuda. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016HealerNotes": "Eles levantam como bandeiras sobre a briga, deixando os outros saberem onde correr por ajuda. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2017RogueText": "Orelhas Vermelhas de Coelhinho",
-    "headAccessorySpecialSpring2017RogueNotes": "Nenhum som irá escapá-lo graças a essas orelhas. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017RogueNotes": "Nenhum som irá escapá-lo graças a essas orelhas. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessorySpecialSpring2017WarriorText": "Orelhas Azuis de Gatinho",
-    "headAccessorySpecialSpring2017WarriorNotes": "Essas orelhas podem ouvir uma cesta de petiscos felinos ser aberta mesmo no momento mais estrépido de batalha! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017WarriorNotes": "Essas orelhas podem ouvir uma cesta de petiscos felinos ser aberta mesmo no momento mais estrépido de batalha! Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessorySpecialSpring2017MageText": "Orelhas Verde-Azuladas de Cachorrinho",
-    "headAccessorySpecialSpring2017MageNotes": "Você pode ouvir a mágica no ar! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017MageNotes": "Você pode ouvir a mágica no ar! Não confere benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
     "headAccessorySpecialSpring2017HealerText": "Orelhas Roxas de Ratinho",
-    "headAccessorySpecialSpring2017HealerNotes": "Essas orelhas irão ajudar você a ouvir segredos curadores. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017HealerNotes": "Essas orelhas irão ajudar você a ouvir segredos curadores. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessoryBearEarsText": "Orelhas de Urso",
     "headAccessoryBearEarsNotes": "Estas orelhas te fazem parecer com um corajoso urso! Não concede benefícios.",
     "headAccessoryCactusEarsText": "Orelhas de Cacto",
diff --git a/website/common/locales/pt_BR/limited.json b/website/common/locales/pt_BR/limited.json
index b00dd78f82..b4d0f55090 100644
--- a/website/common/locales/pt_BR/limited.json
+++ b/website/common/locales/pt_BR/limited.json
@@ -2,7 +2,7 @@
     "annoyingFriends": "Amigos(as) Irritantes",
     "annoyingFriendsText": "Foi atingido(a) por bolas de neve <%= count %> vezes por membros do grupo.",
     "alarmingFriends": "Amigos Alarmantes",
-    "alarmingFriendsText": "Foi atingido(a) por bolas de neve <%= count %> vezes pelos membros do grupo.",
+    "alarmingFriendsText": "Foi transformado(a) em fantasma <%= count %> vezes pelos membros do grupo.",
     "agriculturalFriends": "Amigos do Campo",
     "agriculturalFriendsText": "Foi transformado(a) em flor <%= count %> vezes pelos membros do grupo.",
     "aquaticFriends": "Amigos Aquáticos",
diff --git a/website/common/locales/pt_BR/npc.json b/website/common/locales/pt_BR/npc.json
index 9902245cbd..fb3ba3bfbd 100644
--- a/website/common/locales/pt_BR/npc.json
+++ b/website/common/locales/pt_BR/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Nova atualização da Bailey!",
     "tellMeLater": "Lembrar mais tarde",
     "dismissAlert": "Dispensar este alerta",
-    "donateText3": "Habitica é um projeto de código aberto que depende do suporte dos nossos usuários. O dinheiro que você gasta em gemas nos ajuda a manter os servidores funcionando, manter uma pequena equipe, desenvolver novas funcionalidades e oferecer incentivos para os nossos programadores voluntários. Obrigado pela sua generosidade!",
+    "donateText3": "Habitica é um projeto de código aberto que depende do suporte dos nossos usuários. O dinheiro que você gasta em gemas nos ajuda a manter os servidores funcionando, manter uma pequena equipe, desenvolver novas funcionalidades e oferecer incentivos para os nossos voluntários.",
     "card": "Cartão de crédito",
     "paymentMethods": "Comprar usando",
     "paymentSuccessful": "Seu pagamento foi efetuado com sucesso!",
@@ -130,5 +130,6 @@
     "limitedAvailabilityDays": "Disponível por <%= days %>d <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityHours": "Disponível por <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityMinutes": "Disponível por <%= minutes %>m <%= seconds %>s",
-    "amountExp": "<%= amount %> de EXP"
+    "amountExp": "<%= amount %> de EXP",
+    "helpSupportHabitica": "Ajude Apoiando o Habitica"
 }
diff --git a/website/common/locales/pt_BR/questscontent.json b/website/common/locales/pt_BR/questscontent.json
index 45a5d02eee..9c0ac2fb10 100644
--- a/website/common/locales/pt_BR/questscontent.json
+++ b/website/common/locales/pt_BR/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Hipopótamo (Ovo)",
     "questHippoUnlockText": "Desbloqueia Ovos de Hipopótamo para compra no mercado",
     "farmFriendsText": "Pacote de Missões Amigos da Fazenda",
-    "farmFriendsNotes": "Contém 'A Vaca Muutante', 'Cavalgue o Pesadelo' e 'O Carneiro do Trovão'. Disponível até 31 de Agosto.",
+    "farmFriendsNotes": "Contém 'A Vaca Muutante', 'Cavalgue o Pesadelo' e 'O Carneiro do Trovão'. Disponível até 30 de setembro.",
     "witchyFamiliarsText": "Pacote de Missões Familiares Bruxos",
     "witchyFamiliarsNotes": "Contém \"O Rei Rato\", \"O Aracnídeo de Gelo\" e \"Pântano do Sapo Bagunceiro\". Disponível até 31 de outubro.",
     "questGroupLostMasterclasser": "Mistério dos Mestres de Classe",
diff --git a/website/common/locales/pt_BR/subscriber.json b/website/common/locales/pt_BR/subscriber.json
index e53d31de20..05a2eaae08 100644
--- a/website/common/locales/pt_BR/subscriber.json
+++ b/website/common/locales/pt_BR/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Sua assinatura foi cancelada",
     "choosePaymentMethod": "Escolha seu método de pagamento",
     "buyGemsSupportsDevs": "A compra de Gemas dá o apoio necessário para os desenvolvedores continuarem movimentando o Habitica",
-    "support": "SUPORTE",
+    "support": "Suporte",
     "gemBenefitLeadin": "O que você pode comprar com Gemas?",
     "gemBenefit1": "Trajes únicos e elegantes para o seu avatar.",
     "gemBenefit2": "Cenários para a imersão do seu avatar no mundo do Habitica!",
diff --git a/website/common/locales/ru/faq.json b/website/common/locales/ru/faq.json
index 821dd55e4e..3abd34643b 100644
--- a/website/common/locales/ru/faq.json
+++ b/website/common/locales/ru/faq.json
@@ -55,5 +55,5 @@
     "iosFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВО), задайте его в чате Таверны через Меню > Таверна! Мы с радостью поможем вам.",
     "androidFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВо), задайте его в чате Таверны через Меню > Таверна! Мы с радостью поможем вам.",
     "webFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВО), задайте его в [Гильдии новичков](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Мы с радостью поможем вам.",
-    "faqQuestion13": "Что такое групповые тарифы?"
+    "faqQuestion13": "Что такое групповые планы?"
 }
diff --git a/website/common/locales/ru/front.json b/website/common/locales/ru/front.json
index dfc37e84c4..f946e8f47f 100644
--- a/website/common/locales/ru/front.json
+++ b/website/common/locales/ru/front.json
@@ -5,11 +5,11 @@
     "accept2Terms": "и",
     "chores": "Домашние дела",
     "clearBrowserData": "Очистить данные браузера",
-    "communityExtensions": "<a href='https://habitica.fandom.com/ru/wiki/Персонализация' target='_blank'>Персонализация</a>",
+    "communityExtensions": "Персонализация",
     "communityFacebook": "Facebook",
     "companyAbout": "Как это работает",
     "companyBlog": "Блог",
-    "companyContribute": "Сделать вклад",
+    "companyContribute": "Вклад в Habitica",
     "companyDonate": "Пожертвования",
     "forgotPassword": "Забыли пароль?",
     "emailNewPass": "Отправьте мне ссылку на сброс пароля",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Хотите жить играючи?",
     "marketing4Lead3-2": "Заинтересованы в создании группы в сферах образования, здоровья или других?",
     "marketing4Lead3Title": "Игра во всём",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Приложение для Android",
+    "mobileIOS": "Приложение для iOS",
     "oldNews": "Новости",
     "newsArchive": "Архив новостей на вики (мультиязычный)",
     "setNewPass": "Введите новый пароль",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Пароль должен состоять из 8 или более символов.",
     "enterHabitica": "Войти в Habitica",
     "emailUsernamePlaceholder": "Например, habitrabbit или gryphon@example.com",
-    "socialAlreadyExists": "Этот логин социальной сети уже привязан к существующему аккаунту Хабитики."
+    "socialAlreadyExists": "Этот логин социальной сети уже привязан к существующему аккаунту Хабитики.",
+    "footerProduct": "Продукт"
 }
diff --git a/website/common/locales/ru/gear.json b/website/common/locales/ru/gear.json
index eae64d779d..33c31d33b6 100644
--- a/website/common/locales/ru/gear.json
+++ b/website/common/locales/ru/gear.json
@@ -2688,5 +2688,14 @@
     "weaponMystery202209Text": "Руководство по магии",
     "weaponMystery202209Notes": "Эта книга станет вашим путеводителем на пути к созданию магии. Бонусов не дает. Подарок подписчикам сентября 2022.",
     "shieldMystery202209Notes": "Чтобы приобрести знания в области колдовства, нужно много читать, но вы непременно будете наслаждаться учёбой. Бонусов не дает. Подарок подписчикам сентября 2022.",
-    "shieldMystery202209Text": "Гора волшебных книг"
+    "shieldMystery202209Text": "Гора волшебных книг",
+    "headSpecialSpring2022RogueNotes": "Надев эту маску, вы станете умным, как сорока. Возможно вы даже сможете иммитировать ее стрекотание. Увеличивает восприятие на <%= per %>. Ограниченный выпуск весны 2022.",
+    "eyewearMystery202204BNotes": "Какое у вас сегодня настроение? Выражайте себя с помощью этих забавных экранов! Бонусов не дает. Подарок подписчикам апреля 2022.",
+    "eyewearArmoireComedyMaskText": "Комедийная Маска",
+    "eyewearArmoireComedyMaskNotes": "Весело! Вот причудливая маска для твоего счастливого сердца, возвещающая радость, выражающая веселье и счастье на сцене. Увеличивает телосложение на <%= con %>. Зачарованный сундук: Набор театральных масок (предмет 1 из 2).",
+    "eyewearArmoireTragedyMaskText": "Трагическая маска",
+    "eyewearMystery202204ANotes": "Какое у вас сегодня настроение? Выражайте себя с помощью этих забавных экранов! Бонусов не дает. Подарок подписчикам апреля 2022.",
+    "eyewearArmoireTragedyMaskNotes": "Увы! Здесь лежит грузная маска для твоего бедного актера, который мечется, выражая горе и печаль на сцене. Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор театральных масок (предмет 2 из 2).",
+    "headMystery202207Text": "Желейный шлем",
+    "armorMystery202207Text": "Желейная броня"
 }
diff --git a/website/common/locales/ru/groups.json b/website/common/locales/ru/groups.json
index 1189eb7352..9b262aeb70 100644
--- a/website/common/locales/ru/groups.json
+++ b/website/common/locales/ru/groups.json
@@ -394,5 +394,12 @@
     "lastCompleted": "Последнее выполненное",
     "newGroupsBullet06": "Просмотр статуса задания позволяет быстро увидеть, кто его выполнил",
     "newGroupsBullet07": "Включите функцию отображения общих задач на вашей персональной доске задач",
-    "newGroupsBullet08": "Лидер группы и менеджеры могут быстро добавлять задачи из верхней части столбцов задач"
+    "newGroupsBullet08": "Лидер группы и менеджеры могут быстро добавлять задачи из верхней части столбцов задач",
+    "newGroupsBullet09": "Общую задачу можно вернуть в работу, чтобы показать, что она еще нуждается в доработке",
+    "newGroupsBullet10": "Статус назначения определяет условие выполнения:",
+    "newGroupsBullet10a": "<strong>Оставьте задачу неназначенной</strong>, если любой из участников может ее выполнить",
+    "newGroupsBullet10b": "<strong>Назначьте задачу одному участнику</strong>, чтобы только он мог ее выполнить",
+    "newGroupsBullet10c": "<strong>Назначьте задачу нескольким участникам</strong>, если им всем нужно её выполнить",
+    "newGroupsVisitFAQ": "Посетите <a href='/static/faq#group-plans' target='_blank'>ЧаВо</a> из выпадающего меню \"Помощь\" для получения дополнительной информации.",
+    "newGroupsEnjoy": "Надеемся вам понравиться опыт работы с новыми групповым планами!"
 }
diff --git a/website/common/locales/ru/npc.json b/website/common/locales/ru/npc.json
index f83359a545..a46ef31a45 100644
--- a/website/common/locales/ru/npc.json
+++ b/website/common/locales/ru/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Обновление от Бэйли!",
     "tellMeLater": "Напомнить позже",
     "dismissAlert": "Скрыть эти вести",
-    "donateText3": "Habitica – это проект с открытым исходным кодом, зависящий от поддержки своих пользователей. Деньги, которые вы тратите на покупку самоцветов, помогают нам поддерживать сервера в рабочем состоянии, сохранять небольшой штат сотрудников, разрабатывать новые функции и давать стимул нашим программистам-добровольцам. Благодарим вас за щедрость!",
+    "donateText3": "Habitica – это проект с открытым исходным кодом, зависящий от поддержки своих пользователей. Деньги, которые вы тратите на покупку самоцветов, помогают нам поддерживать сервера в рабочем состоянии, сохранять небольшой штат сотрудников, разрабатывать новые функции и давать стимул нашим волонтерам.",
     "card": "Пластиковой карточкой",
     "paymentMethods": "Приобрести с использованием",
     "paymentSuccessful": "Платеж прошел успешно!",
diff --git a/website/common/locales/ru/questscontent.json b/website/common/locales/ru/questscontent.json
index 745d2cc895..7c2eec8d9e 100644
--- a/website/common/locales/ru/questscontent.json
+++ b/website/common/locales/ru/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Бегемот (яйцо)",
     "questHippoUnlockText": "Позволяет покупать на рынке бегемота в яйце",
     "farmFriendsText": "Набор квестов «Друзья фермера»",
-    "farmFriendsNotes": "Содержит квесты «Корова-муутант», «Прокатись на Лошмаре!» и «Грозовой баран». Доступен до 31 августа.",
+    "farmFriendsNotes": "Содержит квесты «Корова-муутант», «Прокатись на Лошмаре!» и «Грозовой баран». Доступен до 30 сентября.",
     "witchyFamiliarsText": "Набор квестов «Фамильяры колдуньи»",
     "witchyFamiliarsNotes": "Содержит квесты «Крысиный король», Ледяной Арахнид» и «Болото Лягушки Беспорядка». Доступен до 31 октября.",
     "questGroupLostMasterclasser": "Тайна ордена Мастеров",
diff --git a/website/common/locales/ru/subscriber.json b/website/common/locales/ru/subscriber.json
index 0346647337..e9f75d2fec 100644
--- a/website/common/locales/ru/subscriber.json
+++ b/website/common/locales/ru/subscriber.json
@@ -11,7 +11,7 @@
     "exclusiveJackalopePet": "Эксклюзивный питомец",
     "giftSubscription": "Хотите подарить преимущества подписки кому-то?",
     "giftSubscriptionText4": "Спасибо за поддержку Habitica!",
-    "groupPlans": "Групповые тарифы",
+    "groupPlans": "Групповые планы",
     "subscribe": "Подписка",
     "nowSubscribed": "Вы оформили подписку на Habitica!",
     "cancelSub": "Отмена подписки",
diff --git a/website/common/locales/uk/communityguidelines.json b/website/common/locales/uk/communityguidelines.json
index 4825968f33..91a4a59fe2 100644
--- a/website/common/locales/uk/communityguidelines.json
+++ b/website/common/locales/uk/communityguidelines.json
@@ -31,7 +31,7 @@
     "commGuidePara029": "<strong>Публічні ґільдії дуже схожі на таверну, за винятком того, що замість того, щоб бути спілкуватись на загальні теми, вони мають конкретну</strong>. Чат публічної ґільдії має зосередитися на цій темі. Наприклад, члени ґільдії \"Майстри слова\" можуть бути розчаровані, якщо розмова раптом зосередиться на садівництві, а не на письмі, а ґільдія \"Любителі драконів\" може не виявляти інтересу до розшифровки стародавніх рун. Деякі ґільдії ставляться до цього більш толерантно, ніж інші, але загалом <strong>намагайтеся залишатися в темі</strong>!",
     "commGuidePara031": "Деякі публічні ґільдії міститимуть делікатні теми, такі як депресія, релігія, політика тощо. Це нормально, якщо розмови в них не порушують жодних положень та умов чи Правил публічного простору, і якщо вони залишаються на темі.",
     "commGuidePara033": "<strong>Публічні ґільдії НЕ можуть містити вміст для аудиторії віком понад 18 років. Якщо вони планують регулярно обговорювати чутливу інформацію, вони повинні вказати це в описі ґільдії</strong>. Це робиться для того, щоб Habitica була безпечною та комфортною для всіх.",
-    "commGuidePara035": "<strong>Якщо у ґільдії, про яку йдеться, є різні чутливі питання, з повагою до ваших співвітчизників-габітян слід розмістити свій коментар за попередженням (наприклад, \"Попередження: посилання на самоушкодження\")</strong>. Вони можуть бути охарактеризовані як попередження про тригер та/або примітки щодо вмісту, і ґільдії можуть мати власні правила на додаток до наведених тут. Якщо можливо, скористайтеся <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a>, щоб приховати потенційно конфіденційний вміст під розривами рядків, щоб усі бажаючі щоб уникнути читання, можна прокрутити його, не побачивши вмісту. Співробітники та модератори Habitica можуть видаляти цей матеріал на свій розсуд.",
+    "commGuidePara035": "<strong>Якщо у ґільдії, про яку йдеться, є різні чутливі питання, з повагою до ваших співвітчизників-габітиканців слід розмістити свій коментар за попередженням (наприклад, \"Попередження: посилання на самоушкодження\")</strong>. Вони можуть бути охарактеризовані як попередження про тригер та/або примітки щодо вмісту, і ґільдії можуть мати власні правила на додаток до наведених тут. Якщо можливо, скористайтеся <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a>, щоб приховати потенційно конфіденційний вміст під розривами рядків, щоб усі бажаючі щоб уникнути читання, можна прокрутити його, не побачивши вмісту. Співробітники та модератори Habitica можуть видаляти цей матеріал на свій розсуд.",
     "commGuidePara036": "Крім того, делікатний матеріал має бути актуальним – згадування про самоушкодження в ґільдії, зосередженій на боротьбі з депресією, може мати сенс, але, мабуть, менш доречно в музичній ґільдії. Якщо ви бачите, що хтось неодноразово порушує ці правила, особливо після кількох запитів, повідомте про ці публікації.",
     "commGuidePara037": "<strong>Жодні ґільдії, публічні чи приватні, не повинні створюватися з метою нападу на будь-яку групу чи особу</strong>. Створення такої гільдії є підставою для миттєвого бану. Боріться зі шкідливими звичками, а не з іншими шукачами пригод!",
     "commGuidePara038": "<strong>Усі випробування таверни та публічних ґільдії також мають відповідати цим правилам</strong>.",
@@ -109,7 +109,7 @@
     "commGuidePara013": "У такій великій спільноті, як Habitica, користувачі приходять і йдуть, і іноді співробітнику чи модератору потрібно скласти свою благородну мантію та розслабитися. Нижче наведено почесних працівників і модераторів. Вони більше не мають повноважень співробітника чи модератора, але ми все одно хочемо вшанувати їхню роботу!",
     "commGuidePara014": "Почесні співробітники та модератори:",
     "commGuideHeadingFinal": "Завершальна секція",
-    "commGuidePara067": "Отже, відважний габітітиканцю, Правила спільноти! Витріть піт зі свого чола та отримайте досвід, прочитавши все це. Якщо у вас виникли запитання чи сумніви щодо Правил спільноти, зв’яжіться з нами за адресою <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, ми завжди раді допомогти прояснити речі.",
+    "commGuidePara067": "Отже, відважний габітиканцю, Правила спільноти! Витріть піт зі свого чола та отримайте досвід, прочитавши все це. Якщо у вас виникли запитання чи сумніви щодо Правил спільноти, зв’яжіться з нами за адресою <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, ми завжди раді допомогти прояснити речі.",
     "commGuidePara068": "А тепер іди вперед, відважний шукаче пригод, і впорайся з декількома щоденками!",
     "commGuideHeadingLinks": "Корисні посилання",
     "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>: Ґільдія, де користувачі можуть ставити запитання!",
diff --git a/website/common/locales/uk/contrib.json b/website/common/locales/uk/contrib.json
index 14eb8f2d72..68b2cd3dc6 100644
--- a/website/common/locales/uk/contrib.json
+++ b/website/common/locales/uk/contrib.json
@@ -1,5 +1,5 @@
 {
-    "playerTiersDesc": "Кольорові імена користувачів, які ви бачите в чаті, представляють рівень учасника. Чим вище рівень, тим більше людина внесла свій внесок у Хабітіка за допомогою мистецтва, коду, спільноти тощо!",
+    "playerTiersDesc": "Кольорові імена користувачів, які ви бачите в чаті, представляють рівень учасника. Чим вище рівень, тим більший людина зробила внесок в Habitica за допомогою мистецтва, коду чи допомоги спільноті тощо!",
     "tier1": "Рівень 1 (друг)",
     "tier2": "Рівень 2 (друг)",
     "tier3": "Рівень 3 (елітний)",
diff --git a/website/common/locales/uk/gear.json b/website/common/locales/uk/gear.json
index c729b05ddd..12e08f5a4e 100644
--- a/website/common/locales/uk/gear.json
+++ b/website/common/locales/uk/gear.json
@@ -1747,7 +1747,7 @@
     "eyewearArmoirePlagueDoctorMaskNotes": "",
     "eyewearArmoireGoofyGlassesText": "",
     "eyewearArmoireGoofyGlassesNotes": "",
-    "twoHandedItem": "",
+    "twoHandedItem": "Дворучна зброя.",
     "weaponSpecialKS2019Text": "Глефа міфічного грифона",
     "weaponSpecialKS2019Notes": "Зігнута, немов дзьоб та кігті грифона, ця пишна древкова зброя надає енергію, коли завдання здаються страшними. Збільшує силу на <%= str %>.",
     "weaponSpecialSpring2019RogueText": "Блискавка",
@@ -1923,7 +1923,7 @@
     "weaponArmoireJugglingBallsText": "Жонглювання м'ячами",
     "armorSpecialSummer2020HealerNotes": "Ви терплячі, як океан, сильні, як течії, такі ж надійні, як і припливи. Збільшує статуру на <%= con %>. Обмежена серія 2020 літнього спорядження.",
     "armorMystery202103Notes": "Ці м’які та вітряні халати ідеально підходять для чаювання під ефектними весняними деревами. Ніякої вигоди не приносить. Березень 2021 предмет підписки.",
-    "weaponArmoireJugglingBallsNotes": "Хабітікани-майстри багатозадачності, тому у вас не повинно виникнути проблем із утриманням усіх цих кульок у повітрі! Збільшує інтелект на <%= int %>. Зачарована шафа: незалежний предмет.",
+    "weaponArmoireJugglingBallsNotes": "Габітиканці - майстри багатозадачності, тому у вас не повинно виникнути проблем із утриманням усіх цих кульок у повітрі! Збільшує інтелект на <%= int %>. Зачарована шафа: незалежний предмет.",
     "armorArmoireBoxArmorText": "Броня коробка",
     "weaponArmoireHappyBannerText": "Щасливий банер",
     "armorSpecialWinter2020HealerText": "Сукня з апельсинової шкірки",
@@ -1961,7 +1961,7 @@
     "armorSpecialFall2019MageNotes": "Його тезку спіткала жахлива доля. Але вас не так просто обдурити! Одягніться в цю мантію легенд, і ніхто вас не перевершить. Збільшує інтелект на <%= int %>. Обмежена серія 2019 осіннього спорядження.",
     "armorMystery202103Text": "Халати для перегляду цвіту",
     "weaponArmoireClubOfClubsText": "Клуб... Клуби",
-    "armorSpecialBirthday2020Notes": "З днем народження, Хабітіка! Одягніть ці епатажні партійні халати, щоб відсвяткувати цей чудовий день. Ніякої вигоди не приносить.",
+    "armorSpecialBirthday2020Notes": "З днем народження, Habitica! Одягніть ці епатажні святкові халати, щоб весело провести цей чудовий день. Не дає жодних бонусів.",
     "armorMystery202007Notes": "Плавайте, перевертайтесь, пірнайте та бігайте з цим красивим і потужним хвостом! Ніякої вигоди не приносить. Предмет підписки за липень 2020 року.",
     "weaponArmoireJadeGlaiveNotes": "Діапазон цієї гліви убереже вас від ваших ворогів! Крім того, ви можете збити речі з високих полиць. Збільшує силу на <%= str %>. Зачарована шафа: набір воїнів з нефриту (предмет 3 із 3).",
     "armorArmoireDuffleCoatNotes": "Подорожуйте стильним морозним царством із цим затишним вовняним пальто. Збільшує статуру та сприйняття на <%= attrs %> кожен. Зачарована шафа: набір дамських пальто (предмет 1 з 2).",
@@ -1987,8 +1987,8 @@
     "weaponArmoireAlchemistsDistillerText": "Дистилятор алхіміка",
     "armorSpecialBirthday2020Text": "Епатажні халати для вечірок",
     "armorArmoireAlchemistsRobeText": "Халат алхіміка",
-    "armorArmoireShadowMastersRobeNotes": "Тканина цього стрункого халата виткана з найтемніших тіней у найглибших печерах Хабітіки. Збільшує статуру на <%= con %>. Зачарована шафа: набір майстрів тіней (предмет 1 з 4).",
-    "armorSpecialBirthday2021Notes": "З днем народження, Хабітіка! Одягніть ці екстравагантні халати для святкування цього чудового дня. Ніякої вигоди не приносить.",
+    "armorArmoireShadowMastersRobeNotes": "Тканина цього стрункого халата виткана з найтемніших тіней у найглибших печерах Habitica. Збільшує витривалість yf <%= con %>. Зачарована шафа: набір майстрів тіней (предмет 1 з 4).",
+    "armorSpecialBirthday2021Notes": "З днем народження, Habitica! Одягніть ці екстравагантні халати для святкування цього чудового дня. Ніякої вигоди не приносить.",
     "weaponArmoireFiddlersBowText": "Скрипальний лук",
     "armorMystery201910Notes": "Ця загадкова броня захистить вас від видимих і невидимих жахів. Ніякої вигоди не приносить. Предмет підписки за жовтень 2019.",
     "armorArmoireMatchMakersApronText": "Фартух сірника",
diff --git a/website/common/locales/uk/groups.json b/website/common/locales/uk/groups.json
index 89aff4426c..b93f79b6bb 100644
--- a/website/common/locales/uk/groups.json
+++ b/website/common/locales/uk/groups.json
@@ -41,7 +41,7 @@
     "sendChat": "Надіслати",
     "group": "Спільнота",
     "groupName": "Назва ватаги",
-    "groupLeader": "Лідер групи",
+    "groupLeader": "Лідер команди",
     "groupID": "ID групи",
     "members": "Учасники",
     "memberList": "Список учасників",
@@ -346,7 +346,7 @@
     "PMCanNotReply": "Ви не можете відповісти на цю розмову",
     "PMUserDoesNotReceiveMessages": "Цей користувач більше не отримує приватних повідомлень",
     "PMDisabled": "Вимкніть приватні повідомлення",
-    "editParty": "Редагувати вечірку",
+    "editParty": "Редагувати команду",
     "joinGuild": "Приєднатись до ґільдії",
     "editGuild": "Редагувати ґільдію",
     "viewDetails": "Переглянути деталі",
diff --git a/website/common/locales/uk/quests.json b/website/common/locales/uk/quests.json
index 811e22aa49..6c97c80732 100644
--- a/website/common/locales/uk/quests.json
+++ b/website/common/locales/uk/quests.json
@@ -58,7 +58,7 @@
     "noActiveQuestToAbort": "Немає активних квестів для їх переривання.",
     "onlyLeaderAbortQuest": "Тільки лідер групи або квесту може перервати його.",
     "questAlreadyRejected": "Ви вже відхилили запрошення на квест.",
-    "cantCancelActiveQuest": "Ви не можете відмінити активний квест, використайте функцію переривання.",
+    "cantCancelActiveQuest": "Ви не можете скасувати активний квест, використайте функцію переривання.",
     "onlyLeaderCancelQuest": "Тільки лідер групи або квесту може відміняти його.",
     "questNotPending": "Немає квесту, котрий можна було б розпочати.",
     "questOrGroupLeaderOnlyStartQuest": "Тільки лідер групи або квесту може почати його",
@@ -73,7 +73,7 @@
     "bossRage": "<%= currentRage %> / <%= maxRage %> Лють",
     "rageStrikes": "Удари люті",
     "questOwner": "Лідер квесту",
-    "cancelQuest": "Відмінити квест",
+    "cancelQuest": "Скасувати квест",
     "backToSelection": "Назад до вибору квесту",
     "yourQuests": "Ваші квести",
     "selectQuestModal": "Оберіть квест",
diff --git a/website/common/locales/uk/questscontent.json b/website/common/locales/uk/questscontent.json
index a15e9888c7..8fda3e008b 100644
--- a/website/common/locales/uk/questscontent.json
+++ b/website/common/locales/uk/questscontent.json
@@ -20,25 +20,25 @@
     "questHedgehogNotes": "Їжаки - веселі тваринки. Вони є одними з найбільш ласкавих домашніх улюбленців, які можуть бути у габітиканців. Але подейкують, якщо погодувати їх молоком після опівночі, вони стають досить дратівливими. І в п’ятдесят разів більшими. На жаль, <strong>InspectorCaracal</strong> зробив саме це. Ой-йой.",
     "questHedgehogCompletion": "Ваш гурт успішно заспокоїв Їжачиху! Вона зменшилася до нормального розміру та пошкутильгала до своїх яєць. Вона щось пищить та викочує деякі свої яйця до Вашого гурту. Будемо сподіватися, що ці їжачки полюблять молочко!",
     "questHedgehogBoss": "Тинозвір",
-    "questHedgehogDropHedgehogEgg": "Яйце їжака",
-    "questHedgehogUnlockText": "Розблоковує яйця їжака для придбання на ринку",
+    "questHedgehogDropHedgehogEgg": "Яйце з їжаком",
+    "questHedgehogUnlockText": "Розблоковує придбання на ринку яєць з їжаком",
     "questGhostStagText": "Дух весни",
     "questGhostStagNotes": "(глибокий вдих) Ах, весна. Пора року, коли колір знову починає наповнювати ландшафт. Зникли холодні засніжені горби зими. Там, де колись стояв мороз, місце займає яскраве життя рослин. Соковито зелене листя заливає дерева, трава повертається до колишнього яскравого відтінку, веселка квітів здіймається вздовж рівнини, а білий містичний туман вкриває землю! ... Зачекайте. Містичний туман? «Ні, — з побоюванням каже <strong>@InspectorCaracal</strong>, — здається, що причиною цього туману є якийсь дух. О, ні. Він мчить прямо на вас».",
-    "questGhostStagCompletion": "Дух, здається, був здоровий, потім він почав принюхуватися до землі. Спокійний голос огортає Ваш гурт. „Даруйте за мою неґречність. Я тільки-но прокинувся від свого сну, і ще не всі клепки повернулись на свої місця. Будь ласка, візьміть це на знак мого вибачення.“ Купка яєць з'являється на траві перед духом. Без жодного слова дух утікає далі до лісу, а у місцях, де він пробігає, оживають квіти.",
+    "questGhostStagCompletion": "Дух, здається, зовсім не ушкоджений, починає принюхуватися до землі. Спокійним голос він звертається до вашої команди. \"Даруйте за мою неґречність. Я тільки-но прокинувся від свого сну, і ще не всі клепки повернулись на свої місця. Будь ласка, візьміть це на знак мого вибачення\". Купка яєць з'являється на траві перед ним. Без жодного слова дух біжить до лісу, а у місцях, де він пробігає, проростають квіти.",
     "questGhostStagBoss": "Олень-Привид",
-    "questGhostStagDropDeerEgg": "Яйце оленя",
-    "questGhostStagUnlockText": "Розблоковує оленячі яйця для придбання на ринку",
+    "questGhostStagDropDeerEgg": "Яйце з оленем",
+    "questGhostStagUnlockText": "Розблоковує придбання на ринку яєць з оленем",
     "questRatText": "Щурячий король",
     "questRatNotes": "Сміття! Величезні купи невиконаних щоденок лежать по всій Габітиці. Проблема стала настільки серйозною, що натовпи пацюків тепер можна побачити повсюди. Ви помітили, як @Pandah ніжно гладить одного з них. Вона пояснює, що щури — це ніжні істоти, які харчуються невиконаними щоденками. Справжня проблема полягає в тому, що щоденки впали в каналізацію, утворивши небезпечний затор, який потрібно розчистити. Коли ви спускаєтесь у каналізацію, величезний щур із криваво-червоними очима та кривими жовтими зубами нападає на вас, захищаючи свою гору сміття. Чи вистачить вам сміливості, щоб зіткнутись з легендарним Щурячим королем?",
-    "questRatCompletion": "Ваш останній удар позбавив гігантського щура сили, його очі стали тьмяно-сірими. Звір розпадається на безліч крихітних мишенят, які злякано тікають геть. Ви помічаєте @Pandah, яка стоїть позаду вас і дивиться на колись могутню істоту. Вона пояснює, що жителі Habitica надихнулися вашою мужністю і швидко виконують усі свої щоденки. Вона попереджає вас, що ми повинні бути пильними, бо якщо ми ослабимо пильність, Щурячий король повернеться. В якості оплати @Pandah пропонує вам кілька щурячих яєць. Помітивши ваш неспокійний вираз обличчя, вона посміхається: «З них вилупляться чудові домашні тварини».",
+    "questRatCompletion": "Ваш останній удар позбавив гігантського щура сили, його очі стали тьмяно-сірими. Звір розпадається на безліч крихітних мишенят, які злякано тікають геть. Ви помічаєте @Pandah, яка стоїть позаду вас і дивиться на колись могутню істоту. Вона пояснює, що жителі Habitica надихнулися вашою мужністю і швидко виконують усі свої щоденки. Вона попереджає вас, що ми повинні бути пильними, бо якщо ми ослабимо пильність, Щурячий король повернеться. В якості оплати @Pandah пропонує вам кілька яєць зі щуром. Помітивши ваш неспокійний вираз обличчя, вона посміхається: «З них вилупляться чудові домашні улюбленці».",
     "questRatBoss": "Щурячий король",
-    "questRatDropRatEgg": "Яйце щура",
-    "questRatUnlockText": "Розблоковує щурячі яйця для придбання на ринку",
+    "questRatDropRatEgg": "Яйце зі щуром",
+    "questRatUnlockText": "Розблоковує придбання на ринку яєць зі щуром",
     "questOctopusText": "Поклик Октотулу",
     "questOctopusNotes": "@Urse, банькатий молодий писар, попрохав вас допомогти з оглядом таємничої печери на морському узбережжі. Серед напівтемних припливних озерцят стоїть величезна брама зі сталактитів та сталагмітів. Коли ви підходите ближче, унизу воріт починає кружляти темний вир. Ви з подивом дивитесь, як звідти вилазить спрутоподібний дракон. „Липке чадо зірок прокинулося“, — несамовито реве @Urse. „Через вігинтильйони років великий Октотулу знову вільний і спраглий до насолод!“",
-    "questOctopusCompletion": "З останнім ударом істота вислизає у вир, з якого вона прийшла. Ви не можете сказати, чи @Urse радий вашій перемозі чи засмучений тим, що звір йде. Ваш напарник без слів показує на три слизькі гігантські яйця в сусідній ямі, покладені в гніздо із золотими монетами. «Мабуть, це яйця восьминога», — нервово кажете ви. Коли ви повертаєтеся додому, @Urse несамовито строчить у щоденнику, і ви підозрюєте, що це не востаннє, коли ви чуєте про великого Октотулу.",
+    "questOctopusCompletion": "З останнім ударом істота вислизає у вир, з якого вона прийшла. Ви не можете сказати, чи @Urse радий вашій перемозі чи засмучений тим, що звір йде. Ваш напарник без слів показує на три слизькі гігантські яйця в сусідній ямі, покладені в гніздо із золотими монетами. «Мабуть, це яйця з восьминогами», — нервово кажете ви. Коли ви повертаєтеся додому, @Urse несамовито строчить щось у щоденнику, і ви підозрюєте, що це не востаннє, коли ви чуєте про великого Октотулу.",
     "questOctopusBoss": "Октотулу",
-    "questOctopusDropOctopusEgg": "Яйце спрута",
+    "questOctopusDropOctopusEgg": "Яйце зі спрутом",
     "questOctopusUnlockText": "Відкриває покупні яйця восьминогів на ринку",
     "questHarpyText": "Рятуйте! Гарпія!",
     "questHarpyNotes": "У лісі зник відважний шукач пригод @UncommonCriminal, який вистежував крилате чудовисько, бачене кілька днів тому. Ви вже налаштувалися на пошуки, аж на вашу руку присів зранений папуга, красиве пір'я якого зіпсував незугарний шрам. До його лапки була прикріплена поспіхом нашкрябана записка, у якій повідомлялося, що, захищаючи папуг, @UncommonCriminal був схоплений злою гарпією і дуже потребує вашої допомоги. Ви підете за птахом і здолаєте гарпію, щоб визволити @UncommonCriminal?",
@@ -53,7 +53,7 @@
     "questRoosterDropRoosterEgg": "Яйце півня",
     "questRoosterUnlockText": "Розблоковує купівлю півнячих яєць на ринку",
     "questSpiderText": "Льодяний Арахнід",
-    "questSpiderNotes": "Як тільки наступили холода, легенький іній почав з'являтись у хабітчанських вікнах у вигляді кружева павутинь... окрім Аркосінових, чиї вікна є повністю заморожені Морозяним Павуком, який зараз вирішує поселитись в його домі.",
+    "questSpiderNotes": "Помалу надворі холоднішає, легенький іній починає з'являтись у вікнах габітиканців, розписуючиї їх красивими візерунками... Окрім вікон @Arcosine, бо вони повністю заморожені Морозним павуком, який вирішив поселитись в його домі.",
     "questSpiderCompletion": "Морозний павук падає, залишаючи за собою невелику купу інею та кілька зачарованих яєць. @Arcosine пропонує їх вам як нагороду — можливо, ви можете виростити небезпечних павуків як домашніх тварин?",
     "questSpiderBoss": "Павук",
     "questSpiderDropSpiderEgg": "Яйце павука",
@@ -393,7 +393,7 @@
     "questTaskwoodsTerror3DropStrawberry": "Полуниця (їжа)",
     "questTaskwoodsTerror3DropWeapon": "",
     "questFerretText": "Підлий тхір",
-    "questFerretNotes": "",
+    "questFerretNotes": "Прогулюючись по Habit-сіті, ви бачите незадоволений натовп, який оточив тхора в червоній мантії.<br><br>\"Це зілля продуктивності, яке ви мені продали не працює!\" - скаржиться @Beffymaroo. «Минулої ночі я дивився три години телевізора замість того, щоб займатися своїми справами!»<br><br>«Так!» кричить @Pandah. «І сьогодні я витратив годину на те, щоб переставляти книжки, замість того, щоб їх читати!»<br><br>Нечестивий тхір невинно розводить руками. «Але це ж більше, ніж зазвичай, чи не так?»<br><br>Натовп вибухає гнівом.<br><br>«Жодних відшкодувань!» кричить тхір. Він пускає магічний постріл у натовп, готуючись втекти через дим.<br><br>\"Будь ласка, габітиканцю!\" каже @Faye, хапаючи вас за руку. «Здолайте тхора і змусьте його повернути нечесно отримані кошти!»",
     "questFerretCompletion": "",
     "questFerretBoss": "Підлий тхір",
     "questFerretDropFerretEgg": "Яйце тхора",
@@ -496,7 +496,7 @@
     "questMayhemMistiflying3DropPinkCottonCandy": "Рожева цукрова кулька(Food)",
     "questMayhemMistiflying3DropShield": "",
     "questMayhemMistiflying3DropWeapon": "",
-    "featheredFriendsText": "",
+    "featheredFriendsText": "Набір квестів \"Пернаті друзі\"",
     "featheredFriendsNotes": "",
     "questNudibranchText": "Зараження мотиваційними морськими молюсками",
     "questNudibranchNotes": "",
@@ -504,7 +504,7 @@
     "questNudibranchBoss": "",
     "questNudibranchDropNudibranchEgg": "",
     "questNudibranchUnlockText": "Розблоковує купівлю молюска в яйці на ринку",
-    "splashyPalsText": "",
+    "splashyPalsText": "Набір квестів \"Плескаючі друзі\"",
     "splashyPalsNotes": "",
     "questHippoText": "",
     "questHippoNotes": "",
@@ -512,9 +512,9 @@
     "questHippoBoss": "",
     "questHippoDropHippoEgg": "",
     "questHippoUnlockText": "Розблоковує купівлю бегемота в яйці на ринку",
-    "farmFriendsText": "",
-    "farmFriendsNotes": "",
-    "witchyFamiliarsText": "",
+    "farmFriendsText": "Набір квестів \"Друзі фермера\"",
+    "farmFriendsNotes": "Містить \"Корова-мууутант\", \"КІНецЬ світу\" та \"Грозовий баран\". Доступний до 30 вересня.",
+    "witchyFamiliarsText": "Набір квестів \"Відьмині друзі\"",
     "witchyFamiliarsNotes": "",
     "questGroupLostMasterclasser": "",
     "questUnlockLostMasterclasser": "",
@@ -558,7 +558,7 @@
     "questYarnBoss": "",
     "questYarnDropYarnEgg": "",
     "questYarnUnlockText": "Розблоковує купівлю пряжі в яйці на ринку",
-    "winterQuestsText": "",
+    "winterQuestsText": "Зимовий набір квестів",
     "winterQuestsNotes": "",
     "questPterodactylText": "",
     "questPterodactylNotes": "",
@@ -593,7 +593,7 @@
     "questDysheartenerDropHippogriffPet": "",
     "questDysheartenerDropHippogriffMount": "",
     "dysheartenerArtCredit": "Графічна робота @AnnDeLune",
-    "hugabugText": "",
+    "hugabugText": "Набір квестів \"Обійми жука\"",
     "hugabugNotes": "",
     "questSquirrelText": "",
     "questSquirrelNotes": "",
@@ -603,7 +603,7 @@
     "questSquirrelUnlockText": "Розблоковує купівлю білки в яйці на ринку",
     "cuddleBuddiesText": "Набір квестів \"Пухнасті друзі\"",
     "cuddleBuddiesNotes": "Містить «Кролик-вбивця», «Нечестивий тхір» і «Банда морських свинок». Доступний до 31 березня.",
-    "aquaticAmigosText": "",
+    "aquaticAmigosText": "Набір квестів \"Водні амігос\"",
     "aquaticAmigosNotes": "",
     "questSeaSerpentText": "Біда в глибинах: Напад морського змія!",
     "questSeaSerpentNotes": "",
@@ -617,7 +617,7 @@
     "questKangarooBoss": "Катастрофічний Кенгуру",
     "questKangarooDropKangarooEgg": "Яйце кенгуру",
     "questKangarooUnlockText": "Розблоковує купівлю кенгуру в яйці на ринку",
-    "forestFriendsText": "",
+    "forestFriendsText": "Набір квестів \"Лісові друзі\"",
     "forestFriendsNotes": "",
     "questAlligatorText": "Інста-гатор",
     "questAlligatorNotes": "",
@@ -625,9 +625,9 @@
     "questAlligatorBoss": "Інста-гатор",
     "questAlligatorDropAlligatorEgg": "Яйце алігатора",
     "questAlligatorUnlockText": "Розблоковує купівлю яєць алігатора на ринку",
-    "oddballsText": "",
+    "oddballsText": "Набір квестів \"Дивні кулі\"",
     "oddballsNotes": "",
-    "birdBuddiesText": "",
+    "birdBuddiesText": "Набір квестів \"Пташечки-співачки\"",
     "birdBuddiesNotes": "",
     "questVelociraptorText": "Велоци-репер",
     "questVelociraptorNotes": "",
@@ -645,5 +645,15 @@
     "questRobotDropRobotEgg": "Яйце робота",
     "questRobotText": "Загадкові механічні дива!",
     "mythicalMarvelsText": "Набір квестів \"Фантастичні звірі\"",
-    "mythicalMarvelsNotes": "Включає квести \"Переконати королеву єдинорогів\", \"Полум'яний ґрифон\" та \"Біда в глибинах: Напад морського змія\". Доступний до 28 лютого."
+    "mythicalMarvelsNotes": "Включає квести \"Переконати королеву єдинорогів\", \"Полум'яний ґрифон\" та \"Біда в глибинах: Напад морського змія\". Доступний до 28 лютого.",
+    "rockingReptilesText": "Набір квестів \"Кам'яні рептилії\"",
+    "delightfulDinosText": "Набір квестів \"Давні динозаври\"",
+    "jungleBuddiesText": "Набір квестів \"Товариші з джунглів\"",
+    "sandySidekicksText": "Набір квестів \"Пісочні помічники\"",
+    "questDolphinUnlockText": "Розблоковує придбання на ринку яєць з дельфіном",
+    "questDolphinCompletion": "Ваша битва волі з дельфіном залишила вас втомленими, але ви виходете з неї переможцем. З вашою рішучістю та заохоченням @mewrose, @khdarkwolf і @confusedcicada підхоплюються та позбавляються підступної телепатії дельфіна. Ви четверо захищаєте себе почуттям гордості відо виконаних щоденнок, сильних звичок та завершених справ, аж поки дельфін не заплющує свої сяючі очі, мовчазно визнаючи ваші успіхи. З цим він падає назад у води бухти. Коли ви \"даєте пять\" та вітаєте один одного, ви помічаєте три яйця, які вода винесла на берег.<br><br>«Хм, цікаво, що ми можемо з ними зробити?», — міркує @khdarkwolf.",
+    "questDolphinBoss": "Дельфін сумніву",
+    "questDolphinDropDolphinEgg": "Яйце з дельфіном",
+    "questDolphinNotes": "Ви гуляєте по пляжу бухти Незавершеності, розмірковуючи про складну роботу, яка вас чекає. Раптом вам впадає в очі плескіт у воді. Чудовий дельфін стрибає над хвилями. Сонячне світло відбивається від його плавників і хвоста. Але зачекайте... це не відблиски сонячниї променів, і дельфін не занурюється назад у море. Він фіксує свій погляд на @khdarkwolf.<br><br>«Я ніколи не закінчу всі ці щоденники», — сказав @khdarkwolf.<br><br>«Я недостатньо хороший, щоб досягти своїх цілей», — сказав @confusedcicada, коли дельфін спрямував на неї свій яскравий погляд.<br><br>«Навіщо я взагалі намагався?» запитала @mewrose, в’янучи під поглядом звіра.<br><br>Його погляд зустрічається з вашими, і ви відчуваєте, як ваш розум починає тонути під наростаючою хвилею сумнівів. Ви берете себе в руи; хтось повинен здолати цю істоту, і це будете ви!",
+    "questDolphinText": "Дельфін сумніву"
 }
diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js
index c69ca9d7a2..65152186c0 100644
--- a/website/common/script/content/appearance/sets.js
+++ b/website/common/script/content/appearance/sets.js
@@ -15,7 +15,7 @@ export default prefill({
     setPrice: 5, availableFrom: '2022-04-14T08:00-05:00', availableUntil: '2022-04-30T20:00-05:00', text: t('shimmerColors'),
   },
   hauntedHairColors: {
-    setPrice: 5, availableFrom: '2021-09-28T08:00-04:00', availableUntil: '2021-10-31T20:00-04:00', text: t('hauntedColors'),
+    setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('hauntedColors'),
   },
   winteryHairColors: {
     setPrice: 5, availableFrom: '2021-12-23T08:00-05:00', availableUntil: '2022-01-31T20:00-05:00', text: t('winteryColors'),
@@ -27,7 +27,7 @@ export default prefill({
   },
   spookySkins: { setPrice: 5, availableUntil: '2016-01-01', text: t('spookySkins') },
   supernaturalSkins: {
-    setPrice: 5, availableFrom: '2021-09-28T08:00-04:00', availableUntil: '2021-10-31T20:00-04:00', text: t('supernaturalSkins'),
+    setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('supernaturalSkins'),
   },
   splashySkins: {
     setPrice: 5, availableFrom: '2022-07-05T08:00-05:00', availableUntil: EVENTS.summer2022.end, text: t('splashySkins'),
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 49cb72cac6..3073f0991c 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -9,17 +9,28 @@ const gemsPromo = {
 };
 
 export const EVENTS = {
-  noCurrentEvent: {
-    start: '2022-09-30T20:00-04:00',
+  afterGala: {
+    start: '2022-10-31T20:00-04:00',
     end: '2022-12-21T08:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  fall2022: {
+    start: '2022-09-20T08:00-04:00',
+    end: '2022-10-31T20:00-04:00',
+    npcImageSuffix: '_fall',
+    season: 'fall',
+    gear: true,
+  },
+  beforeGala: {
+    start: '2022-07-31T20:00-04:00',
+    end: '2022-09-20T08:00-04:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
   bundle202209: {
     start: '2022-09-13T08:00-04:00',
     end: '2022-09-30T20:00-04:00',
-    season: 'normal',
-    npcImageSuffix: '',
   },
   potions202208: {
     start: '2022-08-16T08:00-04:00',
diff --git a/website/common/script/content/constants/seasonalSets.js b/website/common/script/content/constants/seasonalSets.js
index 95697b3c7f..009ee62321 100644
--- a/website/common/script/content/constants/seasonalSets.js
+++ b/website/common/script/content/constants/seasonalSets.js
@@ -188,6 +188,11 @@ const SEASONAL_SETS = {
     'fall2021HeadlessWarriorSet',
     'fall2021BrainEaterMageSet',
     'fall2021FlameSummonerHealerSet',
+
+    'fall2022KappaRogueSet',
+    'fall2022OrcWarriorSet',
+    'fall2022HarpyMageSet',
+    'fall2022WatcherHealerSet',
   ],
 };
 
diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js
index 90d3a7df2b..55f9c2d7a6 100644
--- a/website/common/script/content/gear/sets/special/index.js
+++ b/website/common/script/content/gear/sets/special/index.js
@@ -702,15 +702,19 @@ const armor = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -754,6 +758,18 @@ const armor = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const armorStats = {
@@ -1792,15 +1808,19 @@ const head = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -1844,6 +1864,18 @@ const head = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const headStats = {
@@ -2592,12 +2624,15 @@ const shield = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -2626,6 +2661,15 @@ const shield = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const shieldStats = {
@@ -3288,15 +3332,19 @@ const weapon = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -3334,6 +3382,18 @@ const weapon = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const weaponStats = {
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index e4d75817ef..23f26f370d 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -161,13 +161,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionGhost'),
     limited: true,
-    event: EVENTS.fall2020,
+    event: EVENTS.fall2022,
     canBuy () {
-      return moment().isBefore('2020-11-02');
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2018 }),
+      previousDate: t('novemberYYYY', { year: 2020 }),
     }),
   },
   Holly: {
@@ -337,13 +337,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionShadow'),
     limited: true,
-    event: EVENTS.fall2020,
+    event: EVENTS.fall2022,
     canBuy () {
-      return moment().isBefore('2020-11-02');
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2019 }),
+      previousDate: t('novemberYYYY', { year: 2020 }),
     }),
   },
   Amber: {
@@ -424,13 +424,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionVampire'),
     limited: true,
-    event: EVENTS.fall2021,
+    event: EVENTS.fall2022,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2020 }),
+      previousDate: t('octoberYYYY', { year: 2021 }),
     }),
     canBuy () {
-      return moment().isBefore(EVENTS.fall2021.end);
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
   },
   AutumnLeaf: {
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index f79f352b6e..3fe7c933a8 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market () {
-    if (moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end)) {
+    if (moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end)) {
       return [
         {
           type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Moonglow',
+          path: 'premiumHatchingPotions.Vampire',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Porcelain',
+          path: 'premiumHatchingPotions.Ghost',
         },
         {
-          type: 'food',
-          path: 'food.Milk',
+          type: 'premiumHatchingPotion',
+          path: 'premiumHatchingPotions.Shadow',
         },
       ];
     }
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index d6d330e651..9d9748e08d 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -325,7 +325,7 @@ spells.special = {
     target: 'user',
     notes: t('spellSpecialSpookySparklesNotes'),
     canOwn () {
-      return moment().isBetween('2021-10-12T08:00-04:00', EVENTS.fall2021.end);
+      return moment().isBetween('2021-10-11T08:00-04:00', EVENTS.fall2022.end);
     },
     cast (user, target, req) {
       if (!user.items.special.spookySparkles) throw new NotAuthorized(t('spellNotOwned')(req.language));
diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index 634c20525b..077a011288 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -30,16 +30,15 @@ export default {
 
   pinnedSets: SHOP_OPEN
     ? {
-      healer: 'summer2022AngelfishHealerSet',
-      rogue: 'summer2022CrabRogueSet',
-      warrior: 'summer2022WaterspoutWarriorSet',
-      wizard: 'summer2022MantaRayMageSet',
+      healer: 'fall2022WatcherHealerSet',
+      rogue: 'fall2022KappaRogueSet',
+      warrior: 'fall2022OrcWarriorSet',
+      wizard: 'fall2022HarpyMageSet',
     }
     : {},
-
-  availableSpells: SHOP_OPEN && moment().isBetween('2022-07-12T08:00-05:00', CURRENT_EVENT.end)
+  availableSpells: SHOP_OPEN && moment().isBetween('2022-10-04T08:00-05:00', CURRENT_EVENT.end)
     ? [
-      'seafoam',
+      'spookySparkles',
     ]
     : [],
 
@@ -49,5 +48,5 @@ export default {
     ]
     : [],
 
-  featuredSet: 'summer2021NautilusMageSet',
+  featuredSet: 'fall2021BrainEaterMageSet',
 };

From f75a6eb11d81070c347038f78a4257950709e1a9 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 20 Sep 2022 15:25:37 -0500
Subject: [PATCH 051/134] fix(hourglass): handle missing planId

---
 website/common/script/cron.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/common/script/cron.js b/website/common/script/cron.js
index 10f8c89195..bbe115a5c5 100644
--- a/website/common/script/cron.js
+++ b/website/common/script/cron.js
@@ -287,7 +287,7 @@ export function getPlanContext (user, now) {
   const dateUpdatedMoment = moment(plan.dateUpdated).startOf('month');
   const elapsedMonths = moment(subscriptionEndDate).diff(dateUpdatedMoment, 'months');
 
-  const planMonths = subscriptionBlocks[plan.planId].months || 1;
+  const planMonths = subscriptionBlocks[plan.planId] ? subscriptionBlocks[plan.planId].months : 1;
   let monthsTillNextHourglass;
   if (planMonths > 1) {
     monthsTillNextHourglass = plan.consecutive.offset + 1;

From 586897fbfc7eb4741dc316d3c7c64c2850fc44a4 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 20 Sep 2022 17:11:09 -0400
Subject: [PATCH 052/134] Revert "update: remove another duplicate key from
 groups.json"

This reverts commit 014a4b653ae99638dd527f7d2f9baca6ebf5da34.
---
 website/common/locales/en/groups.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 9d3aea4ff7..f9e1cdd157 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -352,6 +352,7 @@
   "groupManager": "Manager setting up tasks for employees",
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
+  "next": "Next",
   "nameStar": "Name*",
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",

From 1530ab44e99422b12b1b4e200b81886bac4a446a Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 20 Sep 2022 16:57:39 -0500
Subject: [PATCH 053/134] fix(gala): hide avatar customizations before start
 date

---
 .../src/components/avatarModal/hair-settings.vue   |  2 +-
 .../src/components/avatarModal/skin-settings.vue   |  2 +-
 website/client/src/mixins/avatarEditUtilities.js   | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/website/client/src/components/avatarModal/hair-settings.vue b/website/client/src/components/avatarModal/hair-settings.vue
index d2c7e723d8..d04b33cce6 100644
--- a/website/client/src/components/avatarModal/hair-settings.vue
+++ b/website/client/src/components/avatarModal/hair-settings.vue
@@ -27,7 +27,7 @@
         <customize-options
           :items="set.options"
           :current-value="user.preferences.hair.color"
-          :full-set="!hideSet(set) && !userOwnsSet('hair', set.keys, 'color')"
+          :full-set="!hideSet(set.key) && !userOwnsSet('hair', set.keys, 'color')"
           @unlock="unlock(`hair.color.${set.keys.join(',hair.color.')}`)"
         />
       </div>
diff --git a/website/client/src/components/avatarModal/skin-settings.vue b/website/client/src/components/avatarModal/skin-settings.vue
index d62a863d92..270c3a298b 100644
--- a/website/client/src/components/avatarModal/skin-settings.vue
+++ b/website/client/src/components/avatarModal/skin-settings.vue
@@ -23,7 +23,7 @@
       <customize-options
         :items="set.options"
         :current-value="user.preferences.skin"
-        :full-set="!hideSet(set) && !userOwnsSet('skin', set.keys)"
+        :full-set="!hideSet(set.key) && !userOwnsSet('skin', set.keys)"
         @unlock="unlock(`skin.${set.keys.join(',skin.')}`)"
       />
     </div>
diff --git a/website/client/src/mixins/avatarEditUtilities.js b/website/client/src/mixins/avatarEditUtilities.js
index 46c8e81e9e..207defffd6 100644
--- a/website/client/src/mixins/avatarEditUtilities.js
+++ b/website/client/src/mixins/avatarEditUtilities.js
@@ -17,8 +17,14 @@ export const avatarEditorUtilies = { // eslint-disable-line import/prefer-defaul
     };
   },
   methods: {
-    hideSet (set) {
-      return moment(appearanceSets[set.key].availableUntil).isBefore(moment());
+    hideSet (setKey) {
+      if (appearanceSets[setKey].availableFrom) {
+        return !moment().isBetween(
+          appearanceSets[setKey].availableFrom,
+          appearanceSets[setKey].availableUntil,
+        );
+      }
+      return moment(appearanceSets[setKey].availableUntil).isBefore(moment());
     },
     mapKeysToFreeOption (key, type, subType) {
       const userPreference = subType
@@ -43,8 +49,8 @@ export const avatarEditorUtilies = { // eslint-disable-line import/prefer-defaul
       const locked = !userPurchased || !userPurchased[key];
       let hide = false;
 
-      if (set && appearanceSets[set]) {
-        if (locked) hide = moment(appearanceSets[set].availableUntil).isBefore(moment());
+      if (set && appearanceSets[set] && locked) {
+        hide = this.hideSet(set);
       }
 
       option.gemLocked = locked;

From 9890e0079a0f90c7dd878b45332755c3a82ed0ec Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 21 Sep 2022 12:02:35 -0400
Subject: [PATCH 054/134] fix: correct groupPlan.vue file

---
 .../src/components/groups/groupPlan.vue       | 204 +++++-------------
 1 file changed, 52 insertions(+), 152 deletions(-)

diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index ff48782892..c628774d9e 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -1,6 +1,7 @@
 <template>
   <!-- @TODO: Move to group plans folder-->
   <div>
+    <group-plan-creation-modal />
     <div>
       <div class="header">
         <h1 class="text-center">
@@ -51,6 +52,7 @@
           </div>
         </div>
       </div>
+      <!-- Upgrading an existing group -->
       <div
         v-if="upgradingGroup._id"
         id="upgrading-group"
@@ -100,153 +102,53 @@
           </div>
         </div>
       </div>
+      <!-- Create a new group -->
       <div
         v-if="!upgradingGroup._id"
         class="container col-6 offset-3 create-option"
       >
         <div class="row">
           <h1 class="col-12 text-center purple-header">
-            Create your Group today!
+            Create Your Group Today!
           </h1>
         </div>
         <div class="row">
           <div class="col-12 text-center">
             <button
               class="btn btn-primary create-group"
-              @click="launchModal('create')"
+              @click="launchModal('create-page')"
             >
-              Create Your New Group
+              Create Your New Group!
             </button>
           </div>
         </div>
-        <div class="row pricing">
-          <div class="col-5">
-            <div class="dollar">
-              $
-            </div>
-            <div class="number">
-              9
-            </div>
-            <div class="name">
-              <div>Group Owner</div>
-              <div>Subscription</div>
-            </div>
+        <div class="row pricing justify-content-center align-items-center">
+          <div class="dollar">
+            $
           </div>
-          <div class="col-1">
-            <div class="plus">
-              +
-            </div>
+          <div class="number">
+            9
           </div>
-          <div class="col-6">
-            <div class="dollar">
-              $
-            </div>
-            <div class="number">
-              3
-            </div>
-            <div class="name">
-              <div>Each Additional</div>
-              <div>Member</div>
-            </div>
+          <div class="name">
+            <div>Group Owner</div>
+            <div>Subscription</div>
+          </div>
+          <div class="plus">
+            +
+          </div>
+          <div class="dollar">
+            $
+          </div>
+          <div class="number">
+            3
+          </div>
+          <div class="name">
+            <div>Each Additional</div>
+            <div>Member</div>
           </div>
         </div>
       </div>
     </div>
-    <b-modal
-      id="group-plan-modal"
-      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
-      size="md"
-      hide-footer="hide-footer"
-    >
-      <div
-        v-if="activePage === PAGES.CREATE_GROUP"
-        class="col-12"
-      >
-        <div class="form-group">
-          <label
-            class="control-label"
-            for="new-group-name"
-          >Name</label>
-          <input
-            id="new-group-name"
-            v-model="newGroup.name"
-            class="form-control input-medium option-content"
-            required="required"
-            type="text"
-            placeholder="Name"
-          >
-        </div>
-        <div class="form-group">
-          <label for="new-group-description">{{ $t('description') }}</label>
-          <textarea
-            id="new-group-description"
-            v-model="newGroup.description"
-            class="form-control option-content"
-            cols="3"
-            :placeholder="$t('description')"
-          ></textarea>
-        </div>
-        <div
-          v-if="type === 'guild'"
-          class="form-group"
-        >
-          <div class="custom-control custom-radio">
-            <input
-              v-model="newGroup.privacy"
-              class="custom-control-input"
-              type="radio"
-              name="new-group-privacy"
-              value="private"
-            >
-            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <input
-              id="create-group-leaderOnlyChallenges-checkbox"
-              v-model="newGroup.leaderOnly.challenges"
-              class="custom-control-input"
-              type="checkbox"
-            >
-            <label
-              class="custom-control-label"
-              for="create-group-leaderOnlyChallenges-checkbox"
-            >{{ $t('leaderOnlyChallenges') }}</label>
-          </div>
-        </div>
-        <div
-          v-if="type === 'party'"
-          class="form-group"
-        >
-          <button
-            class="btn btn-secondary form-control"
-            :value="$t('create')"
-            @click="createGroup()"
-          ></button>
-        </div>
-        <div class="form-group">
-          <button
-            class="btn btn-primary btn-lg btn-block"
-            :disabled="!newGroupIsReady"
-            @click="createGroup()"
-          >
-            {{ $t('create') }}
-          </button>
-        </div>
-      </div>
-      <div
-        v-if="activePage === PAGES.PAY"
-        class="col-12"
-      >
-        <div class="text-center">
-          <payments-buttons
-            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
-            :amazon-data="pay(PAYMENTS.AMAZON)"
-          />
-        </div>
-      </div>
-    </b-modal>
   </div>
 </template>
 
@@ -258,8 +160,8 @@
 
     .dollar {
       position: absolute;
-      left: -1em;
-      top: 1em;
+      left: -16px;
+      top: 16px;
     }
 
     .purple-box {
@@ -291,9 +193,9 @@
     background: #432874;
     background: linear-gradient(180deg, #4F2A93 0%, #432874 100%);
     color: #fff;
-    padding: 2em;
+    padding: 32px;
     height: 340px;
-    margin-bottom: 2em;
+    margin-bottom: 32px;
     margin-left: -12px;
     margin-right: -12px;
 
@@ -317,6 +219,7 @@
 
     .box {
       height: 416px;
+      border-radius: 8px;
     }
 
     h2 {
@@ -359,17 +262,19 @@
   button.create-group {
     width: 330px;
     height: 96px;
+    border-radius: 8px;
+    font-size: 1.5rem;
   }
 
   .purple-header {
     color: #6133b4;
     font-size: 48px;
-    margin-top: 1em;
+    margin-top: 16px;
   }
 
   .pricing {
-    margin-top: 2em;
-    margin-bottom: 4em;
+    margin-top: 32px;
+    margin-bottom: 64px;
 
     .dollar, .number, .name {
       display: inline-block;
@@ -378,34 +283,32 @@
     }
 
     .plus {
-      font-size: 34px;
+      font-size: 2.125rem;
       color: #a5a1ac;
+      margin-left: 16px;
+      margin-right: 16px;
     }
 
     .dollar {
-      margin-bottom: 1.5em;
-      font-size: 32px;
+      margin-bottom: 24px;
+      font-size: 2rem;
       font-weight: bold;
     }
 
     .name {
-      font-size: 24px;
-      margin-bottom: .8em;
-      margin-left: .5em;
+      font-size: 1.5rem;
+      margin-left: 8px;
+      margin-right: 8px;
     }
 
     .number {
-      font-size: 72px;
+      font-size: 4.5rem;
       font-weight: bolder;
     }
   }
 
   .payment-options {
-    margin-bottom: 4em;
-
-    h4 {
-      color: #34313a;
-    }
+    margin-bottom: 64px;
 
     h4 {
       color: #34313a;
@@ -414,7 +317,7 @@
     .purple-box {
       background-color: #4f2a93;
       color: #fff;
-      padding: .5em;
+      padding: 8px;
       border-radius: 8px;
       width: 200px;
       height: 215px;
@@ -428,7 +331,7 @@
 
       .name {
         width: 100px;
-        margin-left: .3em;
+        margin-left: 4.8px;
       }
 
       .plus {
@@ -453,10 +356,12 @@ import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import positiveIcon from '@/assets/svg/positive.svg';
 import paymentsButtons from '@/components/payments/buttons/list';
+import groupPlanCreationModal from '../group-plans/groupPlanCreationModal';
 
 export default {
   components: {
     paymentsButtons,
+    groupPlanCreationModal,
   },
   mixins: [paymentsMixin],
   data () {
@@ -505,12 +410,7 @@ export default {
   },
   methods: {
     launchModal () {
-      this.changePage(this.PAGES.CREATE_GROUP);
-      this.$root.$emit('bv::show::modal', 'group-plan-modal');
-    },
-    changePage (page) {
-      this.activePage = page;
-      window.scrollTo(0, 0);
+      this.$root.$emit('bv::show::modal', 'create-group');
     },
     createGroup () {
       this.changePage(this.PAGES.PAY);

From 3c8be16135ff861c52fed412b5420daf0496692d Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 21 Sep 2022 19:12:26 +0200
Subject: [PATCH 055/134] Translated using Weblate (Russian)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 99.8% (2686 of 2691 strings)

Translated using Weblate (Spanish)

Currently translated at 95.2% (2562 of 2691 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (214 of 214 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 96.6% (175 of 181 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (207 of 207 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (129 of 129 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (232 of 232 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.5% (2680 of 2691 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (186 of 186 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (232 of 232 strings)

Translated using Weblate (Russian)

Currently translated at 99.7% (2685 of 2691 strings)

Translated using Weblate (Spanish)

Currently translated at 95.2% (2562 of 2691 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (232 of 232 strings)

Translated using Weblate (Russian)

Currently translated at 99.1% (2667 of 2691 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (2691 of 2691 strings)

Translated using Weblate (Filipino)

Currently translated at 92.2% (167 of 181 strings)

Translated using Weblate (Filipino)

Currently translated at 94.5% (122 of 129 strings)

Translated using Weblate (Filipino)

Currently translated at 97.9% (96 of 98 strings)

Translated using Weblate (Filipino)

Currently translated at 40.9% (9 of 22 strings)

Translated using Weblate (Italian)

Currently translated at 98.9% (2664 of 2691 strings)

Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Ike Osenberg <ike.osenberg@gmail.com>
Co-authored-by: Nazar Paruna <nazarparuna@gmail.com>
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com>
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com>
Co-authored-by: Vince <vincemorel.vilan.889@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: weizhen lv <lvwzhen@gmail.com>
Co-authored-by: そら <comi4work@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/fil/
Translate-URL: https://translate.habitica.com/projects/habitica/character/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/front/fil/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/front/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/it/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/it/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/fil/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/fil/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/uk/
Translation: Habitica/Challenge
Translation: Habitica/Character
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Limited
Translation: Habitica/Loginincentives
Translation: Habitica/Npc
Translation: Habitica/Subscriber
---
 website/common/locales/es/gear.json           | 18 +++++------
 website/common/locales/fil/challenge.json     |  2 +-
 website/common/locales/fil/front.json         |  2 +-
 .../common/locales/fil/loginincentives.json   | 14 ++++-----
 website/common/locales/fil/npc.json           |  6 ++--
 website/common/locales/it/gear.json           | 30 ++++++++++++++++++-
 website/common/locales/it/limited.json        |  6 +++-
 website/common/locales/ja/generic.json        |  6 ++--
 website/common/locales/pt_BR/gear.json        | 19 +++++++++++-
 website/common/locales/ru/front.json          |  2 +-
 website/common/locales/ru/gear.json           | 26 +++++++++++++++-
 website/common/locales/ru/limited.json        |  6 +++-
 website/common/locales/uk/character.json      |  2 +-
 website/common/locales/uk/front.json          | 11 +++----
 website/common/locales/uk/limited.json        | 22 ++++++++------
 website/common/locales/uk/npc.json            |  7 +++--
 website/common/locales/uk/subscriber.json     |  2 +-
 website/common/locales/zh/front.json          |  2 +-
 18 files changed, 133 insertions(+), 50 deletions(-)

diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index 35f0061b27..e831724e2e 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -1039,21 +1039,21 @@
     "headSpecialWinter2018RogueText": "Casco de Reno",
     "headSpecialWinter2018RogueNotes": "¡El disfraz festivo perfecto, con un foco delantero incorporado! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2017-2018.",
     "headSpecialWinter2018WarriorText": "Casco Caja de Regalo",
-    "headSpecialWinter2018WarriorNotes": "La superficie y el lazo de esta desenfadada caja no solo son festivos, sino bastante robustos también. Aumenta la Fuerza en un <%= str %>. Armamento de Invierno de Edición Limitada del 2017-2018.",
+    "headSpecialWinter2018WarriorNotes": "La superficie y el lazo de esta desenfadada caja no solo son festivos, sino bastante robustos también. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de invierno 2017-2018.",
     "headSpecialWinter2018MageText": "Sombrero de Copa Centelleante",
-    "headSpecialWinter2018MageNotes": "¿Listo para algo de magia especial extra? ¡Este sombrero brillante impulsará infalible todos tus hechizos! Aumenta la Percepción en un <%= per %>. Equipamiento de Invierno de Edición Limitada del 2017-2018.",
+    "headSpecialWinter2018MageNotes": "¿Listo para algo de magia especial extra? ¡Este sombrero brillante impulsará infalible todos tus hechizos! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2017-2018.",
     "headSpecialWinter2018HealerText": "Capucha de Muérdago",
-    "headSpecialWinter2018HealerNotes": "¡Esta sofisticada capucha te mantendrá cálido con alegres sensaciones festivas! Aumenta la Inteligencia en <%= int %>. Equipo de Invierno de Edición Limitada del 2017-2018.",
+    "headSpecialWinter2018HealerNotes": "¡Esta sofisticada capucha te mantendrá cálido con alegres sensaciones festivas! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2017-2018.",
     "headSpecialSpring2018RogueText": "Casco de Pico de Pato",
-    "headSpecialSpring2018RogueNotes": "¡Cua cua! Tu ternura oculta tu naturaleza astuta y furtiva. Aumenta la Percepción en <%= per %>. Equipamiento de Primavera Edición Limitada del 2018.",
+    "headSpecialSpring2018RogueNotes": "¡Cua cua! Tu ternura oculta tu naturaleza astuta y furtiva. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2018.",
     "headSpecialSpring2018WarriorText": "Casco de Rayos",
-    "headSpecialSpring2018WarriorNotes": "¡El brillo de este casco deslumbrará a todos los enemigos cercanos! Aumenta la Fuerza en <%= str %>. Equipamiento de Primavera Edición Limitada del 2018.",
+    "headSpecialSpring2018WarriorNotes": "¡El brillo de este casco deslumbrará a todos los enemigos cercanos! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2018.",
     "headSpecialSpring2018MageText": "Casco Tulipán",
-    "headSpecialSpring2018MageNotes": "Los elegantes pétalos de este casco te otorgarán una magia primaveral especial. Aumenta la Percepción en <%= per %>. Equipamiento de Primavera Edición Limitada del 2018.",
+    "headSpecialSpring2018MageNotes": "Los elegantes pétalos de este casco te otorgarán una magia primaveral especial. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2018.",
     "headSpecialSpring2018HealerText": "Diadema Granate",
-    "headSpecialSpring2018HealerNotes": "Las gemas pulidas de este anillo mejorarán tu energía mental. Aumenta la Inteligencia en <%= int %>. Equipamiento de Primavera Edición Limitada del 2018.",
-    "headSpecialSummer2018RogueText": "Sombrero para el sol de pescador",
-    "headSpecialSummer2018RogueNotes": "Proporciona comodidad y protección contra el fuerte resplandor del sol de verano sobre el agua. ¡Especialmente importante si estás más acostumbrado a mantenerte sigiloso en las sombras! Aumenta la Percepción en <%= per %>. Equipo de Verano Edición Limitada del 2018.",
+    "headSpecialSpring2018HealerNotes": "Las gemas pulidas de este anillo mejorarán tu energía mental. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2018.",
+    "headSpecialSummer2018RogueText": "Sombrero de Pescador de Ala Ancha",
+    "headSpecialSummer2018RogueNotes": "Proporciona comodidad y protección contra el fuerte resplandor del sol de verano sobre el agua. ¡Especialmente importante si estás más acostumbrado a mantenerte sigiloso en las sombras! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2018.",
     "headSpecialSummer2018WarriorText": "Barbuta de pez beta",
     "headSpecialSummer2018WarriorNotes": "¡Demuestra a todos que eres el beta alfa con este extravagante casco! Aumenta la Fuerza en <%= str %>. Equipo de Verano Edición Limitada del 2018.",
     "headSpecialSummer2018MageText": "Cresta de pez león",
diff --git a/website/common/locales/fil/challenge.json b/website/common/locales/fil/challenge.json
index 3eb48db431..20028b345e 100755
--- a/website/common/locales/fil/challenge.json
+++ b/website/common/locales/fil/challenge.json
@@ -28,7 +28,7 @@
     "prize": "Premyo",
     "prizePopTavern": "If someone can 'win' your challenge, you can award that winner a Gem prize. Max = number of gems you own. Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
     "publicChallengesTitle": "Mga Pampublikong Hamon",
-    "officialChallenge": "Opisyal na Hamon ng Habitica",
+    "officialChallenge": "Mapananaligang Hamon ng Habitica",
     "by": "ni",
     "participants": "<%= membercount %> Mga Kalahok",
     "join": "Sumali",
diff --git a/website/common/locales/fil/front.json b/website/common/locales/fil/front.json
index 912447f2da..4ccd8424b0 100644
--- a/website/common/locales/fil/front.json
+++ b/website/common/locales/fil/front.json
@@ -59,7 +59,7 @@
     "playButton": "Play",
     "password": "Password",
     "setNewPass": "Baguhin ang Password",
-    "newsArchive": "Arkibo ng Balita sa Wikia (multilingual)",
+    "newsArchive": "Sinupan ng balità sa Wikia (maraming wikà)",
     "oldNews": "Balita",
     "mobileIOS": "iOS",
     "mobileAndroid": "Android",
diff --git a/website/common/locales/fil/loginincentives.json b/website/common/locales/fil/loginincentives.json
index f68eee1a83..5fcb019d1b 100755
--- a/website/common/locales/fil/loginincentives.json
+++ b/website/common/locales/fil/loginincentives.json
@@ -1,12 +1,12 @@
 {
     "unlockedReward": "Nakátanggáp ka ng <%= reward %>",
     "earnedRewardForDevotion": "Napágkaloóban ka ng <%= reward %> dahil tapát ka sa pagpapabuti ng iyóng buhay.",
-    "nextRewardUnlocksIn": "Bilang ng pagsadyâ mo rito hanggang sa mapagkaloobán ka ng gantimpalà: <%= numberOfCheckinsLeft %>",
-    "awesome": "Ang Galíng!",
+    "nextRewardUnlocksIn": "Bilang ng pagsadyá mo rito hanggáng sa mapágkaloobán ka ng gantimpalà: <%= numberOfCheckinsLeft %>",
+    "awesome": "Ayos!",
     "countLeft": "Check-ins until next reward: <%= count %>",
-    "incentivesDescription": "Tiyagá ang kailangan upang masanay. Sa bawat araw ng pagsadyâ mo rito, palapit na ng palapit na ang iyóng gantimpalà.",
-    "checkinEarned": "Tumaás ang bilang ng pagsadyâ mo rito!",
-    "unlockedCheckInReward": "You unlocked a Check-In Prize!",
+    "incentivesDescription": "Sa pag-uugalì ng isáng gawain, kailangang panáy lang sa pagtiyatiyagâ. Sa bawat araw ng pagsadyâ mo rito, palapít na ng palapít ang iyóng gantimpalà.",
+    "checkinEarned": "Tumaás ang Bilang ng Pagsadyâ mo rito!",
+    "unlockedCheckInReward": "Nakapágbunyág ka ng Gantimpalà sa Pagsadyâ mo rito!",
     "checkinProgressTitle": "Ang iyóng katayuan hanggáng sa susunód na",
     "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
     "oneOfAllPetEggs": "tig-íisá ng bawat pangkaraniwang Itlóg ng Alagà",
@@ -20,6 +20,6 @@
     "incentiveAchievement": "ang Kakaibang Kalakihan sa Katapatan na tagumpáy",
     "royallyLoyal": "Kakaibang Kalakihan sa Katapatan",
     "royallyLoyalText": "Limandaáng ulit ng nakapuntá ang tagagamit na itó dito, at napagkaloobán na ng bawat Gantimpalà ng maaaring matanggáp ukol sa dalás ng pagpuntá rito!",
-    "checkInRewards": "Gantimpalà sa Dalás ng Pagpuntá Mo Rito",
-    "backloggedCheckInRewards": "Nakátanggáp ka ng gantimpalà sa dalás ng pagpuntá mo rito! Dalawin mo ang iyóng Imbakan at Kagamitán upang makità kung anó ang bago."
+    "checkInRewards": "Gantimpalà sa Pagsadyâ",
+    "backloggedCheckInRewards": "Nakátanggáp ka ng Gantimpalà sa Pagsadyâ mo rito! Dalawin mo ang iyóng Imbakan at Kagamitán upang makità kung anó ang bago."
 }
diff --git a/website/common/locales/fil/npc.json b/website/common/locales/fil/npc.json
index cc0eb2099b..ba13fac9bd 100755
--- a/website/common/locales/fil/npc.json
+++ b/website/common/locales/fil/npc.json
@@ -77,10 +77,10 @@
     "alreadyUnlockedPart": "Nabuksan na ang buong set. Mas makakamura kung bibilhin ang mga natitirang gamit nang isa-isa.",
     "invalidQuantity": "Quantity to purchase must be a number.",
     "USD": "(USD)",
-    "newStuff": "New Stuff by Bailey",
+    "newStuff": "Mga Bago ni Bailey",
     "newBaileyUpdate": "New Bailey Update!",
-    "tellMeLater": "Tell Me Later",
-    "dismissAlert": "Dismiss This Alert",
+    "tellMeLater": "Mamayâ na Lang",
+    "dismissAlert": "Iwaglít ang Paalalang Itó",
     "donateText3": "Habitica is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
     "card": "Credit Card (using Stripe)",
     "paymentMethods": "Purchase using",
diff --git a/website/common/locales/it/gear.json b/website/common/locales/it/gear.json
index 5cf5dd3aec..2c59b2602a 100644
--- a/website/common/locales/it/gear.json
+++ b/website/common/locales/it/gear.json
@@ -2698,5 +2698,33 @@
     "eyewearArmoireComedyMaskText": "Maschera della Commedia",
     "eyewearArmoireTragedyMaskText": "Maschera della Tragedia",
     "eyewearArmoireComedyMaskNotes": "Urrà! Ecco una maschera pittoresca per il vostro cuor contento, ludico, che esprime gaiezza ed ilarità sul palco. Aumenta la Costituzione di <%= con %>. Scrigno Incantato: Set Maschere Teatrali (oggetto 1 di 2).",
-    "eyewearArmoireTragedyMaskNotes": "Ahimè! Ecco una maschera gravosa per il vostro povero attore, impettito, afflitto, che esprime affanno e rammarico sul palco. Aumenta l'Intelligenza di <%= int %>. Scrigno Incantato: Set Maschere Teatrali (oggetto 2 di 2)."
+    "eyewearArmoireTragedyMaskNotes": "Ahimè! Ecco una maschera gravosa per il vostro povero attore, impettito, afflitto, che esprime affanno e rammarico sul palco. Aumenta l'Intelligenza di <%= int %>. Scrigno Incantato: Set Maschere Teatrali (oggetto 2 di 2).",
+    "weaponSpecialFall2022RogueText": "Spada Cetriolo",
+    "weaponSpecialFall2022WarriorText": "Spadone degli Orchi",
+    "weaponSpecialFall2022MageText": "Raffiche di Vento",
+    "weaponSpecialFall2022MageNotes": "Queste potenti folate seguono la tua scia mentre prendi il volo verso il cielo. Aumenta l'Intelligenza di <%= int %> e la Percezione di <%= per %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "weaponSpecialFall2022HealerText": "Occhio Destro dello Sbircione",
+    "weaponSpecialFall2022HealerNotes": "Per dichiarare vittoria, tienilo di fronte e pronuncia le parole di comando: 'Addocchia!' Aumenta l'Intelligenza di <%= int %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "armorSpecialFall2022RogueText": "Armatura del Kappa",
+    "armorSpecialFall2022RogueNotes": "Che tu stia nuotando, svignandotela o lottando, sarai al sicuro in questa armatura. Aumenta la Percezione di <%= per %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "armorSpecialFall2022WarriorText": "Armatura Orchesca",
+    "armorSpecialFall2022MageText": "Armatura dell'Arpia",
+    "armorSpecialFall2022MageNotes": "Vola veloce come il vento con queste meravigliose ali e tieni stretto ciò a cui tieni di più con questi terrificanti artigli. Aumenta l'Intelligenza di <%= int %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "armorSpecialFall2022HealerText": "Massa di Bozzoli di Sbircioni",
+    "headSpecialFall2022RogueText": "Maschera del Kappa",
+    "headSpecialFall2022RogueNotes": "Con questo cappuccio di metallo in testa, avrai una protezione extra quando ti avventurerai sulla terraferma. Aumenta la Percezione di <%= per %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "headSpecialFall2022WarriorText": "Maschera Orchesca",
+    "headSpecialFall2022WarriorNotes": "Zanne abbastanza dure e affilate da perforare le zucche! ROAR! Aumenta la Forza di <%= str %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "headSpecialFall2022MageText": "Maschera dell'Arpia",
+    "headSpecialFall2022MageNotes": "Fai il tuo ingresso e adesca gli altri con questa magica maschera da fanciulla. Aumenta la Percezione di <%= per %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "headSpecialFall2022HealerText": "Maschera dello Sbircione",
+    "headSpecialFall2022HealerNotes": "La bellezza è lì dentro. Da qualche parte! Aumenta l'Intelligenza di <%= int %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "shieldSpecialFall2022WarriorText": "Scudo Orchesco",
+    "shieldSpecialFall2022WarriorNotes": "DOLCETTO o ROAR! Aumenta la Costituzione di <%= con %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "shieldSpecialFall2022HealerText": "Occhio Sinistro dello Sbircione",
+    "shieldSpecialFall2022HealerNotes": "Dai una Seconda Occhiata a questo costume e trema. Aumenta la Costituzione di <%= con %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "weaponSpecialFall2022WarriorNotes": "Forse è più adatta a tagliare tronchi o pagnotte croccanti che armature nemiche, ma ROAR! Sembra davvero terrificante! Aumenta la Forza di <%= str %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "armorSpecialFall2022WarriorNotes": "ROAR! GRANDI SPALLE significa tu essere GRANDE e FORTE! Aumenta la Costituzione di <%= con %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "armorSpecialFall2022HealerNotes": "Quante persone riuscirebbe a sbirciare uno Sbircione, se uno Sbircione potesse sbirciare le persone? Aumenta la Costituzione di <%= con %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "weaponSpecialFall2022RogueNotes": "Non solo puoi difenderti con questo cetriolo, ma all'occorrenza può essere anche un ottimo spuntino. Aumenta la Forza di <%= str %>. Equipaggiamento in edizione limitata, autunno 2022."
 }
diff --git a/website/common/locales/it/limited.json b/website/common/locales/it/limited.json
index 5d41867cb9..bfd0bb05b2 100644
--- a/website/common/locales/it/limited.json
+++ b/website/common/locales/it/limited.json
@@ -228,5 +228,9 @@
     "octoberYYYY": "ottobre <%= year %>",
     "summer2022CrabRogueSet": "Granchio (Ladro)",
     "summer2022WaterspoutWarriorSet": "Tromba d'Acqua (Guerriero)",
-    "julyYYYY": "luglio <%= year %>"
+    "julyYYYY": "luglio <%= year %>",
+    "fall2022HarpyMageSet": "Arpia (Mago)",
+    "fall2022WatcherHealerSet": "Osservatore (Guaritore)",
+    "fall2022KappaRogueSet": "Kappa (Ladro)",
+    "fall2022OrcWarriorSet": "Orco (Guerriero)"
 }
diff --git a/website/common/locales/ja/generic.json b/website/common/locales/ja/generic.json
index 1bbaf073c2..05229cb392 100644
--- a/website/common/locales/ja/generic.json
+++ b/website/common/locales/ja/generic.json
@@ -177,13 +177,13 @@
     "academics": "学術分野",
     "advocacy_causes": "主義主張",
     "entertainment": "エンターテイメント",
-    "finance": "ファイナンス",
+    "finance": "金融・経済",
     "health_fitness": "健康・フィットネス",
-    "hobbies_occupations": "ホビー・趣味",
+    "hobbies_occupations": "趣味・仕事",
     "location_based": "国・地域別",
     "mental_health": "メンタルヘルス・セルフケア",
     "getting_organized": "整理整頓",
-    "self_improvement": "自己啓発",
+    "self_improvement": "自己改善",
     "spirituality": "精神性",
     "time_management": "時間管理・アカウンタビリティ",
     "recovery_support_groups": "回復・支援のためのグループ",
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index c021bccd96..bbd1b66ae1 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -2698,5 +2698,22 @@
     "eyewearArmoireComedyMaskText": "Máscara da Comédia",
     "eyewearArmoireComedyMaskNotes": "Com alegria! Aqui está uma máscara pitoresca para seu coração feliz, tocando, anunciando e expressando alegria no palco. Aumenta Constituição em <%= con %>. Armário Encantado: Conjunto Máscaras de Teatro (Item 1 de 2).",
     "eyewearArmoireTragedyMaskText": "Máscara da Tragédia",
-    "eyewearArmoireTragedyMaskNotes": "Com lástima! Aqui está uma máscara pesada para seu pobre personagem, se escorando, se preocupando e expressando aflição e tristeza no palco. Aumenta Inteligência em <%= int %>. Armário Encantado: Conjunto Máscaras de Teatro (Item 2 de 2)."
+    "eyewearArmoireTragedyMaskNotes": "Com lástima! Aqui está uma máscara pesada para seu pobre personagem, se escorando, se preocupando e expressando aflição e tristeza no palco. Aumenta Inteligência em <%= int %>. Armário Encantado: Conjunto Máscaras de Teatro (Item 2 de 2).",
+    "weaponSpecialFall2022RogueText": "Lâmina Pepino",
+    "weaponSpecialFall2022WarriorText": "Espada Orc",
+    "weaponSpecialFall2022MageText": "Rajadas de Vento",
+    "weaponSpecialFall2022MageNotes": "Essas rajadas poderosas permanecem em seu rastro conforme decola pelos céus. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "weaponSpecialFall2022RogueNotes": "Esse pepino não pode apenas te defender, mas também é uma refeição deliciosa. Aumenta Força em <%= str %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "weaponSpecialFall2022HealerText": "Olho Direito Espreito",
+    "weaponSpecialFall2022HealerNotes": "Para reinvindicar vitória, segure e diga as palavras de comando: 'Olho Um!' Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "armorSpecialFall2022RogueText": "Armadura Kappa",
+    "armorSpecialFall2022WarriorText": "Armadura Orc",
+    "armorSpecialFall2022MageText": "Armadura Harpia",
+    "armorSpecialFall2022MageNotes": "Voe mais rápido que o vento com essas asas maravilhosas e segure firme o que você mais gosta com essas garras assustadoras. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "headSpecialFall2022RogueText": "Máscara Kappa",
+    "headSpecialFall2022WarriorText": "Máscara Orc",
+    "weaponSpecialFall2022WarriorNotes": "Talvez mais apropriado para cortar troncos ou fatias de pães crocantes do que armaduras de inimigos, mas RAWR! Parece assustador com certeza! Aumenta Força em <%= str %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "armorSpecialFall2022RogueNotes": "Se estiver nadando, fugindo ou lutando, você estará em segurança nesta armadura. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "armorSpecialFall2022WarriorNotes": "RAWR! GRANDES OMBROS significam que você tem MUITA FORÇA! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "headSpecialFall2022RogueNotes": "Com esta capa de metal em sua cabeça, você terá proteção extra quando aventurar-se na terra. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022."
 }
diff --git a/website/common/locales/ru/front.json b/website/common/locales/ru/front.json
index f946e8f47f..09a6abbc8d 100644
--- a/website/common/locales/ru/front.json
+++ b/website/common/locales/ru/front.json
@@ -10,7 +10,7 @@
     "companyAbout": "Как это работает",
     "companyBlog": "Блог",
     "companyContribute": "Вклад в Habitica",
-    "companyDonate": "Пожертвования",
+    "companyDonate": "Пожертвовать Habitica",
     "forgotPassword": "Забыли пароль?",
     "emailNewPass": "Отправьте мне ссылку на сброс пароля",
     "forgotPasswordSteps": "Введите ваше имя пользователя или адрес электронной почты, который вы использовали при регистрации.",
diff --git a/website/common/locales/ru/gear.json b/website/common/locales/ru/gear.json
index 33c31d33b6..349cbf9b48 100644
--- a/website/common/locales/ru/gear.json
+++ b/website/common/locales/ru/gear.json
@@ -2697,5 +2697,29 @@
     "eyewearMystery202204ANotes": "Какое у вас сегодня настроение? Выражайте себя с помощью этих забавных экранов! Бонусов не дает. Подарок подписчикам апреля 2022.",
     "eyewearArmoireTragedyMaskNotes": "Увы! Здесь лежит грузная маска для твоего бедного актера, который мечется, выражая горе и печаль на сцене. Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор театральных масок (предмет 2 из 2).",
     "headMystery202207Text": "Желейный шлем",
-    "armorMystery202207Text": "Желейная броня"
+    "armorMystery202207Text": "Желейная броня",
+    "weaponSpecialFall2022WarriorText": "Орочий меч",
+    "weaponSpecialFall2022MageText": "Порыв ветра",
+    "weaponSpecialFall2022RogueText": "Огуречный клинок",
+    "weaponSpecialFall2022RogueNotes": "Этим огуречным клинком можно не только защититься, но и вкусно подкрепиться. Увеличивает силу на <%= str %>. Ограниченный выпуск осени 2022.",
+    "weaponSpecialFall2022WarriorNotes": "Возможно, он больше подходит для рубки бревен или для разрезания хрустящей буханочки хлеба нежели для вражеской брони, но ГРРА! Он выглядит устрашающе! Увеличивает силу на <%= str %>. Ограниченный выпуск осени 2022",
+    "weaponSpecialFall2022MageNotes": "Эти могучие порывы будут сопровождать вас, когда вы устремитесь в небо. Увеличивает интеллект на <%= int %> и восприятие на <%= per %>. Ограниченный выпуск осени 2022.",
+    "weaponSpecialFall2022HealerText": "Правый подглядывающий глаз",
+    "armorSpecialFall2022RogueText": "Броня Каппы",
+    "armorSpecialFall2022WarriorText": "Орочий доспех",
+    "armorSpecialFall2022WarriorNotes": "ГРРА! ШИРОКИЕ ПЛЕЧИ означают, что вы ОЧЕНЬ СИЛЬНЫЙ! Увеличивает телосложение на <%= con %>. Ограниченный выпуск осени 2022.",
+    "armorSpecialFall2022MageText": "Броня Гарпии",
+    "headSpecialFall2022WarriorText": "Орочья маска",
+    "headSpecialFall2022WarriorNotes": "Клыки достаточно жесткие и острые, чтобы прокусить тыкву! ГРРА! Увеличивает силу на <%= str %>. Ограниченный выпуск осени 2022.",
+    "headSpecialFall2022MageText": "Маска Гарпии",
+    "headSpecialFall2022HealerText": "Маска наблюдателя",
+    "headSpecialFall2022HealerNotes": "Красота находится внутри. Где-то там! Увеличивает интеллект на <%= int %>. Ограниченный выпуск осени 2022.",
+    "armorSpecialFall2022RogueNotes": "Неважно, плаваете ли вы, крадетесь или сражаетесь, в этих доспехах вы всегда будете в безопасности. Увеличивает восприятие на <%= per %>. Ограниченный выпуск осени 2022.",
+    "armorSpecialFall2022MageNotes": "Летайте со скоростью ветра на этих чудесных крыльях и цепко держите то, что вам дороже всего, в этих страшных когтях. Увеличивает интеллект на <%= int %>. Ограниченный выпуск осени 2022.",
+    "headSpecialFall2022RogueText": "Маска Каппы",
+    "weaponSpecialFall2022HealerNotes": "Чтобы одержать победу, возьмите его в руки и произнесите командные слова: 'Глаза разуй!' Увеличивает интеллект на <%= int %>. Ограниченный выпуск осени 2022.",
+    "headSpecialFall2022RogueNotes": "С этим металлическим колпаком на голове у вас будет дополнительная защита, когда вы выйдете на сушу. Увеличивает восприятие на <%= per %>. Ограниченный выпуск осени 2022.",
+    "headSpecialFall2022MageNotes": "Завораживайте и завлекайте окружающих с помощью этой волшебной маски девы. Увеличивает восприятие на <%= per %>. Ограниченный выпуск осени 2022.",
+    "shieldSpecialFall2022WarriorText": "Орочий щит",
+    "shieldSpecialFall2022HealerText": "Левый подглядывающий глаз"
 }
diff --git a/website/common/locales/ru/limited.json b/website/common/locales/ru/limited.json
index 581bc85624..2a06bec325 100644
--- a/website/common/locales/ru/limited.json
+++ b/website/common/locales/ru/limited.json
@@ -229,5 +229,9 @@
     "dateEndDecember": "31 декабря",
     "februaryYYYY": "Февраль <%= year %>",
     "julyYYYY": "Июль <%= year %>",
-    "octoberYYYY": "Октябрь <%= year %>"
+    "octoberYYYY": "Октябрь <%= year %>",
+    "fall2022OrcWarriorSet": "Орк (Воин)",
+    "fall2022HarpyMageSet": "Гарпия (Маг)",
+    "fall2022WatcherHealerSet": "Наблюдатель (Целитель)",
+    "fall2022KappaRogueSet": "Каппа (Разбойник)"
 }
diff --git a/website/common/locales/uk/character.json b/website/common/locales/uk/character.json
index 55ce1a0e35..a4ad3c7674 100644
--- a/website/common/locales/uk/character.json
+++ b/website/common/locales/uk/character.json
@@ -112,7 +112,7 @@
     "changeClass": "Змінити клас, повернути очки статистики",
     "lvl10ChangeClass": "Ви маєте бути щонайменше 10-го рівня, щоб змінити клас.",
     "changeClassConfirmCost": "Ви впевнені, що хочете змінити свій клас за 3 самоцвіти?",
-    "invalidClass": "Недійсний клас. Будь ласка, оберіть: \"воїн\", \"розбійник\", \"чаклун\" або \"цілитель\".",
+    "invalidClass": "Недійсний клас. Будь ласка, оберіть: 'warrior', 'rogue', 'wizard' або 'healer'.",
     "levelPopover": "За кожен новий рівень Ви отримуєте одне очко, котре можете розподілити як побажаєте. Робіть це власноруч або дозвольте грі робити це за Вас, використавши опцію автоматичного розподілу.",
     "unallocated": "Нерозподілені очки",
     "autoAllocation": "Автоматичний розподіл",
diff --git a/website/common/locales/uk/front.json b/website/common/locales/uk/front.json
index d43300ea9e..8d1190ae20 100644
--- a/website/common/locales/uk/front.json
+++ b/website/common/locales/uk/front.json
@@ -5,11 +5,11 @@
     "accept2Terms": "та",
     "chores": "Робота по дому",
     "clearBrowserData": "Очистити історію браузера",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Доповнення та розширення</a>",
+    "communityExtensions": "Доповнення та розширення",
     "communityFacebook": "Facebook",
     "companyAbout": "Як це працює",
     "companyBlog": "Блоґ",
-    "companyContribute": "Зробити внесок",
+    "companyContribute": "Зробити внесок в Habitica",
     "companyDonate": "Пожертвувати",
     "forgotPassword": "Забули пароль?",
     "emailNewPass": "Email a Password Reset Link",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Хочеш перетворити своє життя у гру?",
     "marketing4Lead3-2": "Хочете вести групу з освіти, оздоровлення тощо?",
     "marketing4Lead3Title": "Перетвори у гру будь-що",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Android-застосунок",
+    "mobileIOS": "iOS-застосунок",
     "oldNews": "Новини",
     "newsArchive": "Архів новин на Вікі (багатомовний)",
     "setNewPass": "Встановити новий пароль",
@@ -187,5 +187,6 @@
     "communityInstagram": "Instagram",
     "enterHabitica": "Повернутись в Habitica",
     "emailUsernamePlaceholder": "наприклад, habitrabbit або gryphon@example.com",
-    "socialAlreadyExists": "Цей соціальний логін уже пов’язано з наявним обліковим записом Habitica."
+    "socialAlreadyExists": "Цей соціальний логін уже пов’язано з наявним обліковим записом Habitica.",
+    "footerProduct": "Продукт"
 }
diff --git a/website/common/locales/uk/limited.json b/website/common/locales/uk/limited.json
index 2eb9bfa893..b720d29256 100644
--- a/website/common/locales/uk/limited.json
+++ b/website/common/locales/uk/limited.json
@@ -163,34 +163,34 @@
     "septemberYYYY": "Вересень <%= year %>",
     "augustYYYY": "Серпень <%= year %>",
     "eventAvailabilityReturning": "Доступно для купівлі до <%= availableDate(locale) %>. Цей еліксир раніше був доступним <%= previousDate(locale) %>.",
-    "winter2021HollyIvyRogueSet": "Гостролист і плющ (Розбійник)",
+    "winter2021HollyIvyRogueSet": "Гостролист і плющ (розбійник)",
     "winter2021ArcticExplorerHealerSet": "Дослідник Арктики (Цілитель)",
     "winter2021WinterMoonMageSet": "Зимовий місяць (Маг)",
     "winter2021IceFishingWarriorSet": "Рибалку на льоду (Воїн)",
-    "fall2020TwoHeadedRogueSet": "Двоголовий (Розбійник)",
+    "fall2020TwoHeadedRogueSet": "Двоголовий (розбійник)",
     "fall2020ThirdEyeMageSet": "Третє око (Маг)",
     "fall2020DeathsHeadMothHealerSet": "Голова смерті (Цілитель)",
     "fall2020WraithWarriorSet": "Привид (Воїн)",
-    "summer2020CrocodileRogueSet": "Крокодил (Розбійник)",
+    "summer2020CrocodileRogueSet": "Крокодил (розбійник)",
     "summer2020SeaGlassHealerSet": "Морське скло (Цілитель)",
     "summer2020RainbowTroutWarriorSet": "Райдужна форель (Воїн)",
-    "spring2020LapisLazuliRogueSet": "Ляпіс-блакить (Розбійник)",
+    "spring2020LapisLazuliRogueSet": "Ляпіс-блакить (розбійник)",
     "spring2020IrisHealerSet": "Ірис (Цілитель)",
     "spring2020PuddleMageSet": "Калюжа (Маг)",
     "spring2020BeetleWarriorSet": "Жук-носоріг (Воїн)",
-    "winter2020LanternSet": "Ліхтар (Розбійник)",
+    "winter2020LanternSet": "Ліхтар (розбійник)",
     "winter2020WinterSpiceSet": "Зимові прянощі (Цілитель)",
     "winter2020CarolOfTheMageSet": "Різдвяний гімн мага (Маг)",
     "winter2020EvergreenSet": "Вічнозелений (Воїн)",
     "fall2019RavenSet": "Ворон (Воїн)",
     "fall2019LichSet": "Ліч (Цілитель)",
     "fall2019CyclopsSet": "Циклоп (Маг)",
-    "fall2019OperaticSpecterSet": "Привид опери (Розбійник)",
-    "summer2019HammerheadRogueSet": "Акула-молот (Розбійник)",
+    "fall2019OperaticSpecterSet": "Привид опери (розбійник)",
+    "summer2019HammerheadRogueSet": "Акула-молот (розбійник)",
     "summer2019ConchHealerSet": "Мушля (Цілитель)",
     "summer2019WaterLilyMageSet": "Кувшинка (Маг)",
     "summer2019SeaTurtleWarriorSet": "Морська черепаха (Воїн)",
-    "spring2019CloudRogueSet": "Хмара (Розбійник)",
+    "spring2019CloudRogueSet": "Хмара (розбійник)",
     "spring2019RobinHealerSet": "Вільшанка (Цілитель)",
     "spring2019AmberMageSet": "Бурштин (Маг)",
     "spring2019OrchidWarriorSet": "Орхідея (Воїн)",
@@ -226,5 +226,9 @@
     "dateEndDecember": "31 грудня",
     "februaryYYYY": "Лютий <%= year %>",
     "julyYYYY": "Липень <%= year %>",
-    "octoberYYYY": "Жовтень <%= year %>"
+    "octoberYYYY": "Жовтень <%= year %>",
+    "fall2022OrcWarriorSet": "Орк (воїн)",
+    "fall2022HarpyMageSet": "Гарпія (маг)",
+    "fall2022WatcherHealerSet": "Споглядач (цілитель)",
+    "fall2022KappaRogueSet": "Каппа (розбійник)"
 }
diff --git a/website/common/locales/uk/npc.json b/website/common/locales/uk/npc.json
index b2417a036e..a575434216 100644
--- a/website/common/locales/uk/npc.json
+++ b/website/common/locales/uk/npc.json
@@ -13,7 +13,7 @@
     "prev": "Попер",
     "next": "Next",
     "randomize": "Перемішати",
-    "mattBoch": "Митько Боч",
+    "mattBoch": "Матвей Боч",
     "mattBochText1": "Ласкаво просимо до хліва! Я Матвей, доглядач тварин. Кожного разу, коли Ви виконуєте завдання, Ви матимете шанс отримати яйце або інкубаційне зілля, щоб вилупити тваринку. Коли Ви вилупите вихованця, він з’явиться тут! Натисніть зображення тваринки, щоб додати її до свого аватара. Годуйте їх знайденим Вами кормом, і вони виростуть у скакуна.",
     "welcomeToTavern": "Ласкаво просимо до таверни!",
     "sleepDescription": "Потрібна перерва? Завітайте в готель до Данила, щоб призупинити деякі ігрові механіки Habitica:",
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Оновлення від Бейлі!",
     "tellMeLater": "Нагадати мені пізніше",
     "dismissAlert": "Заховати Бейлі",
-    "donateText3": "Habitica — це проєкт з відкритим кодом, який залежить від підтримки наших користувачів. Гроші, які Ви витрачаєте на самоцвіти, допомагають нам оплачувати роботу серверів, утримувати невеликий штат, розробляти нові функції та стимулювати наших програмістів-добровольців. Дякуємо за Вашу щедрість!",
+    "donateText3": "Habitica — це проєкт з відкритим кодом, який залежить від підтримки наших користувачів. Гроші, які ви витрачаєте на самоцвіти, допомагають нам оплачувати роботу серверів, утримувати невеликий штат, розробляти нові функції та стимулювати наших добровольців.",
     "card": "Платіжна карта",
     "paymentMethods": "Придбати за допомогою",
     "paymentSuccessful": "Ваш платіж пройшов успішно!",
@@ -130,5 +130,6 @@
     "limitedAvailabilityMinutes": "Доступно <%= minutes %>хв <%= seconds %>сек",
     "paymentSubBillingWithMethod": "За Вашу підписку стягуватиметься плата у розмірі <strong>$<%= amount %></strong> кожен(-ні) <strong><%= months %> місяць(ці) </strong> через <strong><%= paymentMethod %></strong>.",
     "paymentAutoRenew": "Ця підписка буде автоматично поновлюватися, доки її не буде скасовано. Якщо вам потрібно скасувати цю підписку, Ви можете зробити це у своїх налаштуваннях.",
-    "paymentCanceledDisputes": "Ми надіслали підтвердження скасування на Вашу електронну пошту. Якщо Ви не бачите електронного листа, зв’яжіться з нами, щоб запобігти майбутнім суперечкам щодо розрахунків."
+    "paymentCanceledDisputes": "Ми надіслали підтвердження скасування на Вашу електронну пошту. Якщо Ви не бачите електронного листа, зв’яжіться з нами, щоб запобігти майбутнім суперечкам щодо розрахунків.",
+    "helpSupportHabitica": "Підтримайте Habitica"
 }
diff --git a/website/common/locales/uk/subscriber.json b/website/common/locales/uk/subscriber.json
index 567e4d0f43..1fc30461fa 100644
--- a/website/common/locales/uk/subscriber.json
+++ b/website/common/locales/uk/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Your subscription has been canceled",
     "choosePaymentMethod": "Виберіть спосіб оплати",
     "buyGemsSupportsDevs": "Purchasing Gems supports the developers and helps keep Habitica running",
-    "support": "SUPPORT",
+    "support": "Підтримка",
     "gemBenefitLeadin": "Що можна купити за самоцвіти?",
     "gemBenefit1": "Унікальні та модні костюми для вашого аватара.",
     "gemBenefit2": "Фони, щоб занурити свій аватар у світ Habitica!",
diff --git a/website/common/locales/zh/front.json b/website/common/locales/zh/front.json
index 1052f68e10..a468897755 100644
--- a/website/common/locales/zh/front.json
+++ b/website/common/locales/zh/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "和",
     "chores": "杂务",
     "clearBrowserData": "清除浏览器数据",
-    "communityExtensions": "<a href='https://habitica.fandom.com/zh/wiki/扩展和插件' target='_blank'>扩展和插件</a>",
+    "communityExtensions": "扩展和插件",
     "communityFacebook": "Facebook",
     "companyAbout": "功能",
     "companyBlog": "博客",

From 4c988691cffaed57425be94f347030844cab4935 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 21 Sep 2022 14:39:46 -0500
Subject: [PATCH 056/134] fix(groups): show group task summary modal for site
 admins also change "Watcher" to "Peeker" in fall healer gear

---
 website/client/src/store/getters/tasks.js | 2 +-
 website/common/locales/en/limited.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/client/src/store/getters/tasks.js b/website/client/src/store/getters/tasks.js
index 859201de84..d7d8adb4bf 100644
--- a/website/client/src/store/getters/tasks.js
+++ b/website/client/src/store/getters/tasks.js
@@ -102,7 +102,7 @@ export function canEdit (store) {
         }
         break;
       case 'group':
-        isUserCanEditTask = isUserGroupLeader || isUserGroupManager || isUserAdmin;
+        isUserCanEditTask = isUserGroupLeader || isUserGroupManager;
         break;
       default:
         break;
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 106f1caf69..5d16659a7f 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -190,7 +190,7 @@
   "fall2022KappaRogueSet": "Kappa (Rogue)",
   "fall2022OrcWarriorSet": "Orc (Warrior)",
   "fall2022HarpyMageSet": "Harpy (Mage)",
-  "fall2022WatcherHealerSet": "Watcher (Healer)",
+  "fall2022WatcherHealerSet": "Peeker (Healer)",
   "eventAvailability": "Available for purchase until <%= date(locale) %>.",
   "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
   "dateEndJanuary": "January 31",

From e9ee2d3fdd5eb85e1a2067c235dcdf2aded3c858 Mon Sep 17 00:00:00 2001
From: negue <negue@users.noreply.github.com>
Date: Wed, 21 Sep 2022 21:42:39 +0200
Subject: [PATCH 057/134] Transaction username mongodb mutation (#14231)

* migrate newest usernames in transactions

* fix lint

* change the parameters
---
 .../2022/20220915_transactions_user_name.js   | 97 +++++++++++++++++++
 website/server/controllers/api-v4/members.js  |  2 +-
 website/server/controllers/api-v4/user.js     |  2 +-
 website/server/models/subscriptionPlan.js     |  2 +-
 website/server/models/transaction.js          |  4 +-
 website/server/models/user/methods.js         |  2 +-
 6 files changed, 104 insertions(+), 5 deletions(-)
 create mode 100644 migrations/archive/2022/20220915_transactions_user_name.js

diff --git a/migrations/archive/2022/20220915_transactions_user_name.js b/migrations/archive/2022/20220915_transactions_user_name.js
new file mode 100644
index 0000000000..d652126ea2
--- /dev/null
+++ b/migrations/archive/2022/20220915_transactions_user_name.js
@@ -0,0 +1,97 @@
+/* eslint-disable no-console */
+import { model as UserModel } from '../../../website/server/models/user';
+import { TransactionModel } from '../../../website/server/models/transaction';
+
+const MIGRATION_NAME = '20220915_transactions_user_name';
+
+/* transaction config */
+const transactionPerRun = 500;
+const progressCount = 1000;
+const transactionQuery = {
+  migration: { $ne: MIGRATION_NAME }, // skip already migrated entries
+  'transactionType': { $in: ['gift_send', 'gift_receive'] },
+};
+
+let count = 0;
+async function updateTransaction (transaction, userNameMap) {
+  count++;
+
+  const set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (userNameMap.has(transaction.reference)) {
+    set['referenceText'] = userNameMap.get(transaction.reference);
+  } else {
+    set['referenceText'] = 'Account not found';
+  }
+
+  if (count % progressCount === 0) {
+    console.warn(`${count} ${transaction._id}`);
+  }
+
+  return TransactionModel.updateOne({
+    _id: transaction._id
+  }, { $set: set }).exec();
+}
+
+export default async function processTransactions () {
+  const fields = {
+    _id: 1,
+    reference: 1,
+    referenceText: 1,
+  };
+
+  const userNameMap = new Map();
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const foundTransactions = await TransactionModel // eslint-disable-line no-await-in-loop
+      .find(transactionQuery)
+      .limit(transactionPerRun)
+      .sort({reference: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (foundTransactions.length === 0) {
+      console.warn('All appropriate transactions found and modified.');
+      console.warn(`\n${count} transactions processed\n`);
+      break;
+    }
+
+    // check for unknown users and load the names
+    const userIdsToLoad = [];
+    for (const foundTransaction of foundTransactions) {
+      const userId = foundTransaction.reference;
+      if (userNameMap.has(userId))  {
+        continue;
+      }
+
+      userIdsToLoad.push(userId);
+    }
+
+    const users = await UserModel // eslint-disable-line no-await-in-loop
+      .find({
+        _id: { $in: userIdsToLoad }
+      })
+      .select({
+        _id: 1,
+        'auth.local.username': 1,
+      })
+      .lean()
+      .exec();
+
+    for (const user of users) {
+      const localUserName = user.auth?.local?.username;
+
+      if (!localUserName) {
+        console.warn(`\nNo Username found for ID: ${user._id}\n`);
+        continue;
+      }
+
+      userNameMap.set(user._id, localUserName)
+    }
+
+    await Promise.all(foundTransactions.map(t => updateTransaction(t, userNameMap))); // eslint-disable-line no-await-in-loop
+  }
+};
diff --git a/website/server/controllers/api-v4/members.js b/website/server/controllers/api-v4/members.js
index c4a49c09d1..360f0e948e 100644
--- a/website/server/controllers/api-v4/members.js
+++ b/website/server/controllers/api-v4/members.js
@@ -1,7 +1,7 @@
 import { authWithHeaders } from '../../middlewares/auth';
 import { chatReporterFactory } from '../../libs/chatReporting/chatReporterFactory';
 import { ensurePermission } from '../../middlewares/ensureAccessRight';
-import { model as Transaction } from '../../models/transaction';
+import { TransactionModel as Transaction } from '../../models/transaction';
 
 const api = {};
 
diff --git a/website/server/controllers/api-v4/user.js b/website/server/controllers/api-v4/user.js
index 1bf32bd982..b0e6e59773 100644
--- a/website/server/controllers/api-v4/user.js
+++ b/website/server/controllers/api-v4/user.js
@@ -2,7 +2,7 @@ import { authWithHeaders } from '../../middlewares/auth';
 import * as userLib from '../../libs/user';
 import { verifyDisplayName } from '../../libs/user/validation';
 import common from '../../../common';
-import { model as Transaction } from '../../models/transaction';
+import { TransactionModel as Transaction } from '../../models/transaction';
 
 const api = {};
 
diff --git a/website/server/models/subscriptionPlan.js b/website/server/models/subscriptionPlan.js
index 71d92feea2..dc04661142 100644
--- a/website/server/models/subscriptionPlan.js
+++ b/website/server/models/subscriptionPlan.js
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 import validator from 'validator';
 import baseModel from '../libs/baseModel';
-import { model as Transaction } from './transaction';
+import { TransactionModel as Transaction } from './transaction';
 
 export const schema = new mongoose.Schema({
   planId: String,
diff --git a/website/server/models/transaction.js b/website/server/models/transaction.js
index 56687f86c9..1820234afd 100644
--- a/website/server/models/transaction.js
+++ b/website/server/models/transaction.js
@@ -17,6 +17,7 @@ export const schema = new Schema({
   userId: {
     $type: String, ref: 'User', required: true, validate: [v => validator.isUUID(v), 'Invalid uuid for Transaction.'],
   },
+  migration: String,
 }, {
   strict: true,
   minimize: false, // So empty objects are returned
@@ -34,9 +35,10 @@ schema.plugin(baseModel, {
     'referenceText',
     'amount',
     'currentAmount',
+    'migration',
   ], // Nothing can be set from the client
   timestamps: true,
   _id: false, // using custom _id
 });
 
-export const model = mongoose.model('Transaction', schema);
+export const TransactionModel = mongoose.model('Transaction', schema);
diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js
index f339cff896..8ecd8c8455 100644
--- a/website/server/models/user/methods.js
+++ b/website/server/models/user/methods.js
@@ -23,7 +23,7 @@ import amazonPayments from '../../libs/payments/amazon'; // eslint-disable-line
 import stripePayments from '../../libs/payments/stripe'; // eslint-disable-line import/no-cycle
 import paypalPayments from '../../libs/payments/paypal'; // eslint-disable-line import/no-cycle
 import { model as NewsPost } from '../newsPost';
-import { model as Transaction } from '../transaction';
+import { TransactionModel as Transaction } from '../transaction';
 
 const { daysSince } = common;
 

From 098f53bfa99cbfc1ddce2323288934a08aa04f17 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 21 Sep 2022 15:02:39 -0500
Subject: [PATCH 058/134] 4.244.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77b9dffc08..06b7c9d759 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.244.0",
+  "version": "4.244.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8ef00d01a0..24e025c9d2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.244.0",
+  "version": "4.244.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From 535fddf92d1ace2b01fdf02a5375c48d13717153 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 21 Sep 2022 16:28:15 -0500
Subject: [PATCH 059/134] feat(sale): add fine print

---
 .../src/components/payments/buyGemsModal.vue  | 29 +++++++++++++++++++
 website/common/locales/en/limited.json        |  4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue
index 02ebfe31ac..53647ebff8 100644
--- a/website/client/src/components/payments/buyGemsModal.vue
+++ b/website/client/src/components/payments/buyGemsModal.vue
@@ -161,6 +161,19 @@
           })"
           :amazon-data="{type: 'single', gemsBlock: selectedGemsBlock}"
         />
+        <div
+          v-if="eventName === 'fall_extra_gems' || eventName === 'spooky_extra_gems'"
+          class="d-flex flex-column justify-content-center"
+        >
+          <h4 class="mt-3 mx-auto"> {{ $t('howItWorks') }}</h4>
+          <small class="text-center">
+            {{ $t('gemSaleHow', { eventStartMonth, eventStartOrdinal, eventEndOrdinal }) }}
+          </small>
+          <h4 class="mt-3 mx-auto"> {{ $t('limitations') }}</h4>
+          <small class="text-center">
+            {{ $t('gemSaleLimitations', { eventStartMonth, eventStartOrdinal, eventEndOrdinal }) }}
+          </small>
+        </div>
       </div>
     </b-modal>
   </div>
@@ -170,6 +183,13 @@
   @import '~@/assets/scss/colors.scss';
 
   #buy-gems {
+    small {
+      color: $gray-100;
+      font-size: 12px;
+      margin-left: 20px;
+      margin-right: 20px;
+    }
+
     .close-icon svg path {
       stroke: $purple-400;
     }
@@ -415,6 +435,15 @@ export default {
       }
       return '';
     },
+    eventStartMonth () {
+      return moment(this.currentEvent.start).format('MMMM');
+    },
+    eventStartOrdinal () {
+      return moment(this.currentEvent.start).format('Do');
+    },
+    eventEndOrdinal () {
+      return moment(this.currentEvent.end).format('Do');
+    },
     isGemsPromoActive () {
       const currEvt = this.currentEvent;
       if (currEvt && currEvt.gemsPromo && moment().isBefore(currEvt.end)) {
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 5d16659a7f..658227ca49 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -230,5 +230,7 @@
   "g1g1HowItWorks": "Type in the username of the account you’d like to gift to. From there, pick the sub length you’d like to gift and check out. Your account will automatically be rewarded with the same level of subscription you just gifted.",
   "limitations": "Limitations",
   "g1g1Limitations": "This is a limited time event that starts on December 16th at 8:00 AM ET (13:00 UTC) and will end January 6th at 8:00 PM ET (1:00 UTC). This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is canceled or expires.",
-  "noLongerAvailable": "This item is no longer available."
+  "noLongerAvailable": "This item is no longer available.",
+  "gemSaleHow": "Between <%= eventStartMonth %> <%= eventStartOrdinal %> and <%= eventEndOrdinal %>, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!",
+  "gemSaleLimitations": "This promotion only applies during the limited time event. This event starts on <%= eventStartMonth %> <%= eventStartOrdinal %> at 8:00 AM EDT (12:00 UTC) and will end <%= eventStartMonth %> <%= eventEndOrdinal %> at 8:00 PM EDT (00:00 UTC). The promo offer is only available when buying Gems for yourself."
 }

From 6baf08d461e932985b27cfcde079b13e102fe359 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 23 Sep 2022 16:10:11 -0500
Subject: [PATCH 060/134] fix(test): update expectations for new logic

---
 test/common/libs/cron.test.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/common/libs/cron.test.js b/test/common/libs/cron.test.js
index bd84de1e80..d082e1e7b0 100644
--- a/test/common/libs/cron.test.js
+++ b/test/common/libs/cron.test.js
@@ -213,7 +213,7 @@ describe('cron utility functions', () => {
       };
     }
 
-    it('offset 0, next date in 3 months', () => {
+    it('monthly plan, next date in 3 months', () => {
       const user = baseUserData(60, 0, 'group_plan_auto');
 
       const planContext = getPlanContext(user, now);
@@ -222,8 +222,8 @@ describe('cron utility functions', () => {
         .to.be.sameMoment('2022-08-10T02:00:00.144Z');
     });
 
-    it('offset 1, next date in 1 months', () => {
-      const user = baseUserData(60, 1, 'group_plan_auto');
+    it('monthly plan, next date in 1 month', () => {
+      const user = baseUserData(62, 0, 'group_plan_auto');
 
       const planContext = getPlanContext(user, now);
 
@@ -231,8 +231,17 @@ describe('cron utility functions', () => {
         .to.be.sameMoment('2022-06-10T02:00:00.144Z');
     });
 
-    it('offset 2, next date in 2 months - with any plan', () => {
-      const user = baseUserData(60, 2, 'basic_3mo');
+    it('multi-month plan, no offset', () => {
+      const user = baseUserData(60, 0, 'basic_3mo');
+
+      const planContext = getPlanContext(user, now);
+
+      expect(planContext.nextHourglassDate)
+        .to.be.sameMoment('2022-06-10T02:00:00.144Z');
+    });
+
+    it('multi-month plan with offset', () => {
+      const user = baseUserData(60, 1, 'basic_3mo');
 
       const planContext = getPlanContext(user, now);
 

From e0eed8238e3356ef4dc538d5cc598035b3b15168 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 23 Sep 2022 16:42:15 -0500
Subject: [PATCH 061/134] fix(test): stub full event list

---
 test/api/unit/libs/payments/payments.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index fb9928d51d..a89618efdf 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -671,6 +671,7 @@ describe('payments/index', () => {
 
     context('No Active Promotion', () => {
       beforeEach(() => {
+        sinon.stub(worldState, 'getCurrentEventList').returns([]);
         sinon.stub(worldState, 'getCurrentEvent').returns(null);
       });
 

From f3771f486931a6b1ffe186d0d2f73ddc23f364c4 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Wed, 28 Sep 2022 16:03:56 -0400
Subject: [PATCH 062/134] chore(content): add October 2022 Mystery Items
 (#14254)

---
 habitica-images                               |  2 +-
 .../assets/css/sprites/spritesmith-main.css   | 30 +++++++++++++++++++
 website/common/locales/en/gear.json           |  4 +++
 website/common/locales/en/subscriber.json     |  1 +
 .../script/content/gear/sets/mystery.js       |  2 ++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/habitica-images b/habitica-images
index ce1e117dc9..c17cf70c40 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit ce1e117dc94ac4b1757f144e6897e332ccdaf119
+Subproject commit c17cf70c407e0b8d7e0b0cd84f7aecfea295d568
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index f91dc5b14f..9f65aa4c73 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -27260,6 +27260,36 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202210.png');
+  width: 117px;
+  height: 120px;
+}
+.head_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202210.png');
+  width: 117px;
+  height: 120px;
+}
+.shop_armor_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202210.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202210.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202210.png');
+  width: 68px;
+  height: 68px;
+}
+.slim_armor_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202210.png');
+  width: 117px;
+  height: 120px;
+}
 .broad_armor_mystery_301404 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
   width: 90px;
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 076c94c917..f1f95ffc08 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -1211,6 +1211,8 @@
   "armorMystery202204Notes": "Looks like doing your tasks now requires pushing these mysterious buttons! What could they do? Confers no benefit. April 2022 Subscriber Item.",
   "armorMystery202207Text": "Jammin' Jelly Armor",
   "armorMystery202207Notes": "This armor will have you looking glamorous and gelatinous. Confers no benefit. July 2022 Subscriber Item.",
+  "armorMystery202210Text": "Ominous Ophidian Armor",
+  "armorMystery202210Notes": "Try slithering for a change, you may find it's quite an efficient mode of transportation! Confers no benefit. October 2022 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1959,6 +1961,8 @@
   "headMystery202207Notes": "Need a hand with your tasks? Will several dozen bioluminescent tentacles do? Confers no benefit. July 2022 Subscriber Item.",
   "headMystery202208Text": "Perky Ponytail",
   "headMystery202208Notes": "Enjoy showing off this voluminous hair - it can double as a whip in a pinch! Confers no benefit. August 2022 Subscriber Item.",
+  "headMystery202210Text": "Ominous Ophidian Helm",
+  "headMystery202210Notes": "This scaly hood will surely terrify your To-Do list into submission! Confers no benefit. October 2022 Subscriber Item.",
 
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index b199612950..d2537e7855 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -142,6 +142,7 @@
     "mysterySet202207": "Jammin' Jelly Set",
     "mysterySet202208": "Perky Ponytail Set",
     "mysterySet202209": "Magical Scholar Set",
+    "mysterySet202210": "Ominous Ophidian Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",
diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js
index 716bdfdcb0..f3669e62e2 100644
--- a/website/common/script/content/gear/sets/mystery.js
+++ b/website/common/script/content/gear/sets/mystery.js
@@ -58,6 +58,7 @@ const armor = {
   202112: { },
   202204: { },
   202207: { },
+  202210: { },
   301404: { },
   301703: { },
   301704: { },
@@ -194,6 +195,7 @@ const head = {
   202206: { },
   202207: { },
   202208: { },
+  202210: { },
   301404: { },
   301405: { },
   301703: { },

From a08ecbe04466db477fd7121fb837aaa81d1d1418 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Wed, 28 Sep 2022 16:03:56 -0400
Subject: [PATCH 063/134] chore(content): add October 2022 Mystery Items
 (#14254)

---
 habitica-images                               |  2 +-
 .../assets/css/sprites/spritesmith-main.css   | 30 +++++++++++++++++++
 website/common/locales/en/gear.json           |  4 +++
 website/common/locales/en/subscriber.json     |  1 +
 .../script/content/gear/sets/mystery.js       |  2 ++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/habitica-images b/habitica-images
index ce1e117dc9..c17cf70c40 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit ce1e117dc94ac4b1757f144e6897e332ccdaf119
+Subproject commit c17cf70c407e0b8d7e0b0cd84f7aecfea295d568
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index f91dc5b14f..9f65aa4c73 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -27260,6 +27260,36 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202210.png');
+  width: 117px;
+  height: 120px;
+}
+.head_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202210.png');
+  width: 117px;
+  height: 120px;
+}
+.shop_armor_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202210.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202210.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202210.png');
+  width: 68px;
+  height: 68px;
+}
+.slim_armor_mystery_202210 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202210.png');
+  width: 117px;
+  height: 120px;
+}
 .broad_armor_mystery_301404 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
   width: 90px;
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 076c94c917..f1f95ffc08 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -1211,6 +1211,8 @@
   "armorMystery202204Notes": "Looks like doing your tasks now requires pushing these mysterious buttons! What could they do? Confers no benefit. April 2022 Subscriber Item.",
   "armorMystery202207Text": "Jammin' Jelly Armor",
   "armorMystery202207Notes": "This armor will have you looking glamorous and gelatinous. Confers no benefit. July 2022 Subscriber Item.",
+  "armorMystery202210Text": "Ominous Ophidian Armor",
+  "armorMystery202210Notes": "Try slithering for a change, you may find it's quite an efficient mode of transportation! Confers no benefit. October 2022 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1959,6 +1961,8 @@
   "headMystery202207Notes": "Need a hand with your tasks? Will several dozen bioluminescent tentacles do? Confers no benefit. July 2022 Subscriber Item.",
   "headMystery202208Text": "Perky Ponytail",
   "headMystery202208Notes": "Enjoy showing off this voluminous hair - it can double as a whip in a pinch! Confers no benefit. August 2022 Subscriber Item.",
+  "headMystery202210Text": "Ominous Ophidian Helm",
+  "headMystery202210Notes": "This scaly hood will surely terrify your To-Do list into submission! Confers no benefit. October 2022 Subscriber Item.",
 
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index b199612950..d2537e7855 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -142,6 +142,7 @@
     "mysterySet202207": "Jammin' Jelly Set",
     "mysterySet202208": "Perky Ponytail Set",
     "mysterySet202209": "Magical Scholar Set",
+    "mysterySet202210": "Ominous Ophidian Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",
diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js
index 716bdfdcb0..f3669e62e2 100644
--- a/website/common/script/content/gear/sets/mystery.js
+++ b/website/common/script/content/gear/sets/mystery.js
@@ -58,6 +58,7 @@ const armor = {
   202112: { },
   202204: { },
   202207: { },
+  202210: { },
   301404: { },
   301703: { },
   301704: { },
@@ -194,6 +195,7 @@ const head = {
   202206: { },
   202207: { },
   202208: { },
+  202210: { },
   301404: { },
   301405: { },
   301703: { },

From b8cf1b895f1486d48ca7ef9cac7397e078cb3cc9 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 28 Sep 2022 15:34:17 -0500
Subject: [PATCH 064/134] 4.245.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 06b7c9d759..43f9b29ae2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.244.1",
+  "version": "4.245.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 24e025c9d2..87e9df8f0b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.244.1",
+  "version": "4.245.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From 4c4d0be31f2ab308ab1489ff8058c3af6f574252 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 29 Sep 2022 15:07:21 -0500
Subject: [PATCH 065/134] fix(analytics): include client tracking parameter

---
 .../src/components/group-plans/groupPlanCreationModal.vue       | 2 +-
 website/client/src/components/payments/successModal.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index ff61a904b6..d7980031f9 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -324,7 +324,7 @@ export default {
         eventCategory: 'behavior',
         demographics: this.newGroup.demographics,
         type: this.newGroup.type,
-      });
+      }, { trackOnClient: true });
 
       if (this.upgradingGroup && this.upgradingGroup._id) {
         paymentData.groupId = this.upgradingGroup._id;
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index fb3abaf39e..59a2119557 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -365,7 +365,7 @@ export default {
           eventCategory: 'behavior',
           demographics: this.upgradedGroup.demographics,
           type: this.paymentData.group.type, // also tried this.upgradedGroup.type
-        });
+        }, { trackOnClient: true });
       }
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');

From 40997854dd45500ff50d649087d4881067aa81f2 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 30 Sep 2022 14:32:21 -0500
Subject: [PATCH 066/134] fix(test): restore event list function

---
 test/api/unit/libs/payments/payments.test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index a89618efdf..48d6325546 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -671,12 +671,13 @@ describe('payments/index', () => {
 
     context('No Active Promotion', () => {
       beforeEach(() => {
-        sinon.stub(worldState, 'getCurrentEventList').returns([]);
         sinon.stub(worldState, 'getCurrentEvent').returns(null);
+        sinon.stub(worldState, 'getCurrentEventList').returns([]);
       });
 
       afterEach(() => {
         worldState.getCurrentEvent.restore();
+        worldState.getCurrentEventList.restore();
       });
 
       it('does not apply a discount', async () => {

From 3974adcb651afbbd7b94564dc2fd37604d1d5e00 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 30 Sep 2022 14:57:15 -0500
Subject: [PATCH 067/134] chore(event): set Gem sale dates

---
 website/common/script/content/constants/events.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 3073f0991c..5b01144d48 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -22,6 +22,16 @@ export const EVENTS = {
     season: 'fall',
     gear: true,
   },
+  spooky_extra_gems: {
+    start: '2022-10-27T08:00-04:00',
+    end: '2022-10-31T20:00-04:00',
+    gemsPromo,
+  },
+  fall_extra_gems: {
+    start: '2022-10-06T08:00-04:00',
+    end: '2022-10-13T20:00-04:00',
+    gemsPromo,
+  },
   beforeGala: {
     start: '2022-07-31T20:00-04:00',
     end: '2022-09-20T08:00-04:00',

From 3582e233be21dfc2c8f1e49eea6e636f52253e45 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 30 Sep 2022 15:09:53 -0500
Subject: [PATCH 068/134] fix(strings): remove duplicate "next" key

---
 website/common/locales/en/groups.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index f9e1cdd157..9d3aea4ff7 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -352,7 +352,6 @@
   "groupManager": "Manager setting up tasks for employees",
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
-  "next": "Next",
   "nameStar": "Name*",
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",

From 08f0374b4623503688720f532dab620cd61914ad Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 30 Sep 2022 22:22:14 +0200
Subject: [PATCH 069/134] Translated using Weblate (Arabic)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (22 of 22 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (54 of 54 strings)

Translated using Weblate (Arabic)

Currently translated at 89.3% (334 of 374 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (Spanish)

Currently translated at 95.0% (2562 of 2695 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (389 of 389 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (58 of 58 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (135 of 135 strings)

Translated using Weblate (Spanish)

Currently translated at 99.0% (205 of 207 strings)

Translated using Weblate (Spanish)

Currently translated at 96.8% (125 of 129 strings)

Translated using Weblate (Spanish)

Currently translated at 99.1% (230 of 232 strings)

Translated using Weblate (Spanish)

Currently translated at 95.1% (370 of 389 strings)

Translated using Weblate (German)

Currently translated at 93.5% (364 of 389 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Spanish)

Currently translated at 99.6% (752 of 755 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Spanish)

Currently translated at 99.0% (213 of 215 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (135 of 135 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (374 of 374 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (135 of 135 strings)

Translated using Weblate (Polish)

Currently translated at 71.3% (517 of 725 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 70.4% (511 of 725 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 70.3% (510 of 725 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 69.7% (506 of 725 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Arabic)

Currently translated at 99.2% (139 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (214 of 214 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Arabic)

Currently translated at 31.4% (57 of 181 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (214 of 214 strings)

Translated using Weblate (Arabic)

Currently translated at 37.0% (20 of 54 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (389 of 389 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Spanish)

Currently translated at 95.2% (2562 of 2691 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (129 of 129 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (2691 of 2691 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (129 of 129 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2691 of 2691 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2691 of 2691 strings)

Translated using Weblate (French)

Currently translated at 100.0% (207 of 207 strings)

Translated using Weblate (French)

Currently translated at 100.0% (129 of 129 strings)

Translated using Weblate (Spanish (Latin America))

Currently translated at 92.8% (168 of 181 strings)

Translated using Weblate (French)

Currently translated at 100.0% (232 of 232 strings)

Translated using Weblate (French)

Currently translated at 99.1% (2669 of 2691 strings)

Translated using Weblate (Spanish)

Currently translated at 95.2% (2562 of 2691 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 94.4% (171 of 181 strings)

Translated using Weblate (Turkish)

Currently translated at 92.8% (168 of 181 strings)

Translated using Weblate (Swedish)

Currently translated at 91.7% (166 of 181 strings)

Translated using Weblate (Serbian)

Currently translated at 90.6% (164 of 181 strings)

Translated using Weblate (Slovak)

Currently translated at 88.9% (161 of 181 strings)

Translated using Weblate (Romanian)

Currently translated at 92.8% (168 of 181 strings)

Translated using Weblate (Portuguese)

Currently translated at 91.7% (166 of 181 strings)

Translated using Weblate (Polish)

Currently translated at 94.4% (171 of 181 strings)

Translated using Weblate (Dutch)

Currently translated at 97.2% (176 of 181 strings)

Translated using Weblate (Indonesian)

Currently translated at 88.9% (161 of 181 strings)

Translated using Weblate (Hungarian)

Currently translated at 89.5% (162 of 181 strings)

Translated using Weblate (Hebrew)

Currently translated at 73.4% (133 of 181 strings)

Translated using Weblate (French)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (French)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Spanish)

Currently translated at 97.2% (176 of 181 strings)

Translated using Weblate (English (United Kingdom))

Currently translated at 92.8% (168 of 181 strings)

Translated using Weblate (English (Pirate) (en@pirate))

Currently translated at 92.8% (168 of 181 strings)

Translated using Weblate (Danish)

Currently translated at 94.4% (171 of 181 strings)

Translated using Weblate (Czech)

Currently translated at 92.8% (168 of 181 strings)

Translated using Weblate (Bulgarian)

Currently translated at 91.7% (166 of 181 strings)

Translated using Weblate (French)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (French)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (German)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (215 of 215 strings)

Translated using Weblate (Spanish)

Currently translated at 95.2% (2562 of 2691 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (127 of 127 strings)

Translated using Weblate (Spanish (Latin America))

Currently translated at 92.2% (2482 of 2691 strings)

Translated using Weblate (Spanish (Latin America))

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (58 of 58 strings)

Translated using Weblate (Ukrainian)

Currently translated at 22.7% (613 of 2691 strings)

Translated using Weblate (Spanish)

Currently translated at 95.2% (2562 of 2691 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (2691 of 2691 strings)

Translated using Weblate (Japanese)

Currently translated at 99.2% (2672 of 2691 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (German)

Currently translated at 100.0% (13 of 13 strings)

Translated using Weblate (German)

Currently translated at 100.0% (94 of 94 strings)

Translated using Weblate (German)

Currently translated at 100.0% (94 of 94 strings)

Translated using Weblate (German)

Currently translated at 100.0% (94 of 94 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (129 of 129 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (232 of 232 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (22 of 22 strings)

Translated using Weblate (German)

Currently translated at 93.3% (363 of 389 strings)

Translated using Weblate (Japanese)

Currently translated at 99.0% (2665 of 2691 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (German)

Currently translated at 100.0% (98 of 98 strings)

Translated using Weblate (German)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (German)

Currently translated at 100.0% (13 of 13 strings)

Translated using Weblate (German)

Currently translated at 100.0% (94 of 94 strings)

Translated using Weblate (German)

Currently translated at 100.0% (94 of 94 strings)

Translated using Weblate (German)

Currently translated at 100.0% (94 of 94 strings)

Translated using Weblate (German)

Currently translated at 93.3% (363 of 389 strings)

Translated using Weblate (German)

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2691 of 2691 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (232 of 232 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.9% (2689 of 2691 strings)

Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net>
Co-authored-by: Céu <marcel.ufscar@gmail.com>
Co-authored-by: Faris Allahham <farislahham@gmail.com>
Co-authored-by: Felix Wittwer <spam@felixwittwer.de>
Co-authored-by: Hexe des Windes (she/her) <krausanna1@gmail.com>
Co-authored-by: Ike Osenberg <ike.osenberg@gmail.com>
Co-authored-by: Juan Esteban Marín <juanmarin690@gmail.com>
Co-authored-by: Khsmty <me@taigasaito.org>
Co-authored-by: Lena Kubisa <lenorek.05.poczta@gmail.com>
Co-authored-by: Lio Zam <zerofux@web.de>
Co-authored-by: LiziKnight <liziknight0316@outlook.com>
Co-authored-by: Mara S. (Dolichotis) <marascherzer@gmail.com>
Co-authored-by: Nakonana <nanaki1989@web.de>
Co-authored-by: Natalie Luhrs <eilatan@gmail.com>
Co-authored-by: Nazar Paruna <nazarparuna@gmail.com>
Co-authored-by: Nina Łapaj <ninapaj@gmail.com>
Co-authored-by: Raithe <RaitheOfDureya@gmail.com>
Co-authored-by: Remigiusz Haziak <haziakremigiusz@gmail.com>
Co-authored-by: Salman Mujeeb <kingleopard22@gmail.com>
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com>
Co-authored-by: Sara López <sarayupy@gmail.com>
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com>
Co-authored-by: Simon Fischer <simon.pascal.fischer@gmail.com>
Co-authored-by: UNI <nibi727171@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mattya 226 <worldworld1114@gmail.com>
Co-authored-by: そら <comi4work@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/de/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/es_419/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/de/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/es/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/de/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/content/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/content/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/front/bg/
Translate-URL: https://translate.habitica.com/projects/habitica/front/cs/
Translate-URL: https://translate.habitica.com/projects/habitica/front/da/
Translate-URL: https://translate.habitica.com/projects/habitica/front/en@pirate/
Translate-URL: https://translate.habitica.com/projects/habitica/front/en_GB/
Translate-URL: https://translate.habitica.com/projects/habitica/front/es/
Translate-URL: https://translate.habitica.com/projects/habitica/front/es_419/
Translate-URL: https://translate.habitica.com/projects/habitica/front/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/front/he/
Translate-URL: https://translate.habitica.com/projects/habitica/front/hu/
Translate-URL: https://translate.habitica.com/projects/habitica/front/id/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/front/nl/
Translate-URL: https://translate.habitica.com/projects/habitica/front/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/front/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ro/
Translate-URL: https://translate.habitica.com/projects/habitica/front/sk/
Translate-URL: https://translate.habitica.com/projects/habitica/front/sr/
Translate-URL: https://translate.habitica.com/projects/habitica/front/sv/
Translate-URL: https://translate.habitica.com/projects/habitica/front/tr/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es_419/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/it/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/es/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/es/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/es/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/quests/de/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/es/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/de/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/es/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/es/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/it/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/es/
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/pl/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Challenge
Translation: Habitica/Communityguidelines
Translation: Habitica/Content
Translation: Habitica/Defaulttasks
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Groups
Translation: Habitica/Inventory
Translation: Habitica/Limited
Translation: Habitica/Loginincentives
Translation: Habitica/Npc
Translation: Habitica/Quests
Translation: Habitica/Questscontent
Translation: Habitica/Rebirth
Translation: Habitica/Settings
Translation: Habitica/Subscriber
Translation: Habitica/Tasks
---
 website/common/locales/ar/achievements.json   |  39 +--
 website/common/locales/ar/content.json        |  28 ++-
 website/common/locales/ar/defaulttasks.json   |  47 +++-
 website/common/locales/ar/front.json          |  29 ++-
 website/common/locales/ar/generic.json        | 222 +++++++++---------
 website/common/locales/ar/inventory.json      |   8 +-
 .../common/locales/ar/loginincentives.json    |  42 ++--
 website/common/locales/bg/front.json          |   2 +-
 website/common/locales/cs/front.json          |   2 +-
 website/common/locales/da/front.json          |   2 +-
 website/common/locales/de/achievements.json   |   2 +-
 website/common/locales/de/backgrounds.json    |   9 +-
 website/common/locales/de/challenge.json      |   2 +-
 website/common/locales/de/groups.json         |   4 +-
 website/common/locales/de/quests.json         |  10 +-
 website/common/locales/de/rebirth.json        |   2 +-
 website/common/locales/en@pirate/front.json   |   2 +-
 website/common/locales/en_GB/front.json       |   2 +-
 website/common/locales/es/backgrounds.json    |  13 +-
 website/common/locales/es/front.json          |  13 +-
 website/common/locales/es/gear.json           |  58 ++---
 website/common/locales/es/groups.json         |  22 +-
 website/common/locales/es/limited.json        |   4 +-
 website/common/locales/es/npc.json            |   2 +-
 website/common/locales/es/questscontent.json  |   8 +-
 website/common/locales/es/settings.json       |   8 +-
 website/common/locales/es/subscriber.json     |   9 +-
 website/common/locales/es/tasks.json          |   3 +-
 .../common/locales/es_419/achievements.json   |   9 +-
 website/common/locales/es_419/front.json      |   2 +-
 website/common/locales/es_419/gear.json       |  18 +-
 website/common/locales/fr/backgrounds.json    |   9 +-
 website/common/locales/fr/front.json          |  13 +-
 website/common/locales/fr/gear.json           |  12 +-
 website/common/locales/fr/limited.json        |   6 +-
 website/common/locales/fr/npc.json            |   5 +-
 website/common/locales/fr/questscontent.json  |   2 +-
 website/common/locales/fr/subscriber.json     |   2 +-
 website/common/locales/he/front.json          |   2 +-
 website/common/locales/hu/front.json          |   2 +-
 website/common/locales/id/front.json          |   2 +-
 website/common/locales/it/gear.json           |   6 +-
 website/common/locales/it/subscriber.json     |   3 +-
 .../locales/ja/communityguidelines.json       |   2 +-
 website/common/locales/ja/front.json          |  13 +-
 website/common/locales/ja/gear.json           |  32 ++-
 website/common/locales/ja/limited.json        |   6 +-
 .../common/locales/ja/loginincentives.json    |   2 +-
 website/common/locales/ja/npc.json            |   5 +-
 website/common/locales/ja/settings.json       |   2 +-
 website/common/locales/ja/subscriber.json     |   3 +-
 website/common/locales/nl/front.json          |   2 +-
 website/common/locales/pl/achievements.json   | 136 ++++++-----
 website/common/locales/pl/backgrounds.json    |  12 +-
 website/common/locales/pl/content.json        |   6 +-
 website/common/locales/pl/front.json          |   2 +-
 website/common/locales/pl/tasks.json          |   5 +-
 website/common/locales/pt/front.json          |   2 +-
 website/common/locales/pt_BR/backgrounds.json |   2 +-
 website/common/locales/pt_BR/gear.json        |  27 ++-
 website/common/locales/pt_BR/limited.json     |   6 +-
 website/common/locales/pt_BR/npc.json         |   2 +-
 website/common/locales/ro/front.json          |   2 +-
 website/common/locales/ru/faq.json            |   3 +-
 website/common/locales/sk/front.json          |   2 +-
 website/common/locales/sr/front.json          |   2 +-
 website/common/locales/sv/front.json          |   2 +-
 website/common/locales/tr/front.json          |   2 +-
 website/common/locales/uk/gear.json           |   3 +-
 website/common/locales/zh/achievements.json   |   2 +-
 website/common/locales/zh/faq.json            |   3 +-
 website/common/locales/zh/front.json          |  11 +-
 website/common/locales/zh/gear.json           |  34 ++-
 website/common/locales/zh/groups.json         |  44 +++-
 website/common/locales/zh_TW/front.json       |   2 +-
 75 files changed, 681 insertions(+), 385 deletions(-)

diff --git a/website/common/locales/ar/achievements.json b/website/common/locales/ar/achievements.json
index 167271f253..3b843b0743 100755
--- a/website/common/locales/ar/achievements.json
+++ b/website/common/locales/ar/achievements.json
@@ -21,10 +21,10 @@
     "foundNewItemsExplanation": "القيام بمهامك يمنحك الفرصة للفوز بقطع جديدة مثل البيضات، جرعات التفقيس، وطعام الحيوانات الأليفة.",
     "onboardingProgress": "التقدم <%= percentage %>%",
     "achievementCreatedTask": "إصنع مهمتك الأولى",
-    "achievementJustAddWaterModalText": "لقد أكملت جميع مغامرات حيوانات الأخطبوط، فرس البحر، الحبار، عارية الخيشوم، حية البحر، و الدلفين الأليفة!",
-    "achievementJustAddWaterText": "قد أكمل جميع مغامرات حيوانات الأخطبوط، فرس البحر، الحبار، عارية الخيشوم، حية البحر، و الدلفين الأليفة.",
-    "achievementMindOverMatterModalText": "لقد أكملت جميع مغامرات حيوانات الصخر، اللزج، والغزل الأليفة!",
-    "achievementMindOverMatterText": "قد أكمل جميع مغامرات حيوانات الصخر، اللزج، والغزل الأليفة.",
+    "achievementJustAddWaterModalText": "أكملت جميع مغامرات حيوانات الأخطبوط، فرس البحر، الحبار، عارية الخيشوم، حية البحر، و الدلفين الأليفة!",
+    "achievementJustAddWaterText": "أكملت جميع مغامرات حيوانات: الأخطبوط، فرس البحر، الحبار، عارية الخيشوم، حية البحر، و الدلفين.",
+    "achievementMindOverMatterModalText": "أكملت جميع مغامرات حيوانات الصخر، اللزج، والغزل الأليفة!",
+    "achievementMindOverMatterText": "أكملت جميع مغامرات حيوانات الصخر، اللزج، والغزل الأليفة.",
     "achievementLostMasterclasserModalText": "لقد أكملت جميع المغامرات الستة عشرة في سلسلة مغامرات الخبير و حللت لغز الخبيرة المفقودة!",
     "achievementMonsterMagusModalText": "لقد جمعت جميع الحيوانات الأليفة من الأموات الأحياء!",
     "achievementMonsterMagusText": "قد جمع جميع الحيوانات الأليفة من الأموات الأحياء.",
@@ -37,7 +37,7 @@
     "achievementBackToBasicsModalText": "لقد جمعت جميع الحيوانات الأليفة الأساسية!",
     "achievementBackToBasicsText": "قد جمع جميع الحيوانات الأليفة الأساسية.",
     "achievementBackToBasics": "عودة إلى الأساسيات",
-    "achievementJustAddWater": "أضف الماء وحسب",
+    "achievementJustAddWater": "أضف الماء فقط",
     "achievementMindOverMatter": "العقل فوق المادة",
     "achievementFedPet": "أطعم/ي حيواناً أليفاً",
     "achievementHatchedPetModalText": "إذهب/ي إلى قائمة أغراضك وحاول/ي جمع بيضة وجرعة تفقيس معاً",
@@ -49,8 +49,8 @@
     "achievementAridAuthorityModalText": "لقد أكملت ترويض جميع حيوانات الركوب الصحراوية!",
     "achievementAridAuthorityText": "أكملوا ترويض جميع حيوانات الركوب الصحراوية.",
     "achievementPartyUp": "لقد كونت فريقاً مع عضو من مجموعتك!",
-    "achievementAllYourBaseModalText": "لقد أكملت ترويض جميع حيوانات الركوب الأساسية!",
-    "achievementAllYourBaseText": "أكمل(ت) ترويض جميع حيوانات الركوب الأساسية.",
+    "achievementAllYourBaseModalText": "أكملت ترويض جميع حيوانات الركوب الأساسية!",
+    "achievementAllYourBaseText": "أكملت ترويض جميع حيوانات الركوب الأساسية.",
     "achievementAllYourBase": "كل قاعدتك ملكنا الأن",
     "achievementFedPetText": "أطعموا حيوانهم الأليف الأول.",
     "achievementBugBonanza": "حفلة الحشرات",
@@ -118,22 +118,25 @@
     "achievementDomesticatedModalText": "لقد جمعت كل الحيوانات الأليفة المستأنسة!",
     "achievementDomesticatedText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة المستأنسة: النمس ، وخنزير غينيا ، والديك ، والخنزير الطائر ، والجرذ ، والأرنب ، والحصان ، والبقر!",
     "achievementDomesticated": "ا-يا-ا-يا-يو",
-    "achievementBirdsOfAFeatherModalText": "تقوم بجمع كل الحيوانات الأليفة الطائرة!",
+    "achievementBirdsOfAFeatherModalText": "لقد قمت بجمع كل الحيوانات الأليفة الطائرة!",
     "achievementZodiacZookeeperText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة في الأبراج: الجرذ ، البقرة ، الأرنب ، الأفعى ، الحصان ، الأغنام ، القرد ، الديك ، الذئب ، النمر ، الخنزير الطائر ، والتنين!",
     "achievementGroupsBeta2022ModalText": "لقد ساعدت أنت ومجموعاتك Habitica من خلال الاختبار وتقديم التعليقات!",
     "achievementGroupsBeta2022": "اختبار تجريبي تفاعلي",
     "achievementGroupsBeta2022Text": "قدمت أنت ومجموعتك تعليقات لا تقدر بثمن لمساعدة Habitica في الاختبار.",
     "achievementReptacularRumble": "الدمدمة الزاحفة",
     "achievementReptacularRumbleModalText": "لقد جمعت كل الزواحف الأليفة!",
-    "achievementReptacularRumbleText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة الزواحف: التمساح ، الزاحف المجنح ، الأفعى ، ترايسيراتوبس ، السلحفاة ، التيرانوصور ريكس ، وفيلوسيرابتور!",
-    "achievementBirdsOfAFeather": "متشابهون",
+    "achievementReptacularRumbleText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة الزواحف: التمساح، الزاحف المجنح، الأفعى، ترايسيراتوبس، السلحفاة، التيرانوصور ريكس وفيلوسيرابتور!",
+    "achievementBirdsOfAFeather": "أصدقاء الطيران",
     "achievementZodiacZookeeper": "حارس حديقة الحيوانات الفلكية",
-    "achievementShadyCustomerText": "لقد جمع كل حيوانات الظل الأليفة.",
-    "achievementShadyCustomerModalText": "لقد قمت بتجميع كل حيوانات الظل الأليفة!",
-    "achievementZodiacZookeeperModalText": "لقد قمت بتجميع كل الحيوانات الفلكية الأليفة!",
-    "achievementBirdsOfAFeatherText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة الطائرة: الخنزير الطائر ، البومة ، الببغاء ، الزاحف المجنح ، الجريفون ، فالكون ، الطاووس ، والديك!",
-    "achievementShadeOfItAllModalText": "لقد قمت بترويض كل حيوانات الظل للركوب!",
-    "achievementShadyCustomer": "زبون الظل",
-    "achievementShadeOfItAll": "ظل كل شيء",
-    "achievementShadeOfItAllText": "لقد ربي كل حيوانات الظل للترويض."
+    "achievementShadyCustomerText": "جمع كل حيوانات الظل الأليفة.",
+    "achievementShadyCustomerModalText": "لقد جمعت كل حيوانات الظل الأليفة!",
+    "achievementZodiacZookeeperModalText": "لقد جمعت كل الحيوانات الأليفة الفلكية!",
+    "achievementBirdsOfAFeatherText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة الطائرة: الخنزير الطائر، البومة، الببغاء، الزاحف المجنح، الجرايفون، فالكون، الطاووس والديك!",
+    "achievementShadeOfItAllModalText": "قمت بترويض كل الحيوانات السوداء",
+    "achievementShadyCustomer": "عميل الظل",
+    "achievementShadeOfItAll": "الظل فوق كل شيء",
+    "achievementShadeOfItAllText": "روض كل حيوانات الظل السوداء.",
+    "achievementWoodlandWizard": "ساحر الغابة",
+    "achievementWoodlandWizardText": "لقد فقس جميع الألوان القياسية لمخلوقات الغابة: الغرير، الدب، الغزال، الثعلب، الضفدع، القنفذ، البومة، الأفعى، السنجاب والشجيرة!",
+    "achievementWoodlandWizardModalText": "لقد جمعت كل حيوانات الغابة الأليفة!"
 }
diff --git a/website/common/locales/ar/content.json b/website/common/locales/ar/content.json
index c1e54cf524..4099805f57 100755
--- a/website/common/locales/ar/content.json
+++ b/website/common/locales/ar/content.json
@@ -306,5 +306,31 @@
     "foodSaddleText": "سرج",
     "foodSaddleNotes": "يحول حيوانًا أليفًا إلى مركب فورًا.",
     "foodSaddleSellWarningNote": "Hey! This is a pretty useful item! Are you familiar with how to use a Saddle with your Pets?",
-    "foodNotes": "إطعام أحد الحيوانات الأليفة بهذا يمكنه من النمو ليصبح مركبًا قويًا."
+    "foodNotes": "إطعام أحد الحيوانات الأليفة بهذا يمكنه من النمو ليصبح مركبًا قويًا.",
+    "hatchingPotionBronze": "البرونز",
+    "hatchingPotionWatery": "المائي",
+    "hatchingPotionPolkaDot": "نقاط البولكا",
+    "hatchingPotionBlackPearl": "اللؤلؤ الأسود",
+    "hatchingPotionAutumnLeaf": "ورقة الخريف",
+    "hatchingPotionVampire": "مصاص الدماء",
+    "hatchingPotionDessert": "الحلويات",
+    "hatchingPotionVeggie": "حديقة",
+    "questEggRobotAdjective": "مستقبلي",
+    "hatchingPotionFluorite": "الفلوريت",
+    "questEggRobotText": "حيوان الروبوت الأليف",
+    "questEggDolphinMountText": "حيوان الدولفين للركوب",
+    "hatchingPotionSolarSystem": "المجموعة الشمسية",
+    "hatchingPotionMoonglow": "لمعان القمر",
+    "questEggRobotMountText": "حيوان الروبوت للركوب",
+    "hatchingPotionAmber": "العنبر",
+    "hatchingPotionAurora": "الشفق القطبي",
+    "hatchingPotionSandSculpture": "تمثال رملي",
+    "hatchingPotionStainedGlass": "الزجاج الملون",
+    "questEggDolphinText": "حيوان الدولفين الأليف",
+    "hatchingPotionSunset": "غروب الشمس",
+    "hatchingPotionShadow": "الظل",
+    "hatchingPotionSilver": "الفضي",
+    "hatchingPotionTurquoise": "التريكواز",
+    "hatchingPotionSunshine": "شعاع الشمس",
+    "hatchingPotionVirtualPet": "حيوان افتراضي أليف"
 }
diff --git a/website/common/locales/ar/defaulttasks.json b/website/common/locales/ar/defaulttasks.json
index 4d99a40db0..03a2ac2671 100755
--- a/website/common/locales/ar/defaulttasks.json
+++ b/website/common/locales/ar/defaulttasks.json
@@ -2,8 +2,8 @@
     "defaultHabit1Text": "عمل منتج (اضغط على القلم للتحرير)",
     "defaultHabit2Text": "أكل طعام غير صحى (أنقر على القلم للتعديل)",
     "defaultHabit3Text": "صعود السلم/استخدام المصعد (اضغط على قلم الرصاص للتعديل)",
-    "defaultHabit4Text": "Add a task to Habitica",
-    "defaultHabit4Notes": "Either a Habit, a Daily, or a To-Do",
+    "defaultHabit4Text": "أضف مهمة إلى Habitica",
+    "defaultHabit4Notes": "إما عادة أو يومية أو مهمة",
     "defaultTodo1Text": "الانضمام إلى Habitica (عَلِّم عليَّ)",
     "defaultTodoNotes": "بإمكانك أن تكمل هذه المهمة، تعدلها، أو تحذفها.",
     "defaultReward1Text": "15 دقيقة استراحة",
@@ -11,9 +11,46 @@
     "defaultReward2Notes": "شاهد التلفاز، إلعب لعبة، كل حلوى، الأمر يعود لك!",
     "defaultTag1": "عمل",
     "defaultTag2": "تمرين",
-    "defaultTag3": "Health + Wellness",
+    "defaultTag3": "الصحة + الراحة",
     "defaultTag4": "مدرسة",
     "defaultTag5": "فرق",
-    "defaultTag6": "Chores",
-    "defaultTag7": "الإبداع"
+    "defaultTag6": "عمل منزلي",
+    "defaultTag7": "إبداع",
+    "workTodoProject": "مشروع العمل >> إكمال مشروع العمل",
+    "workDailyImportantTask": "أهم مهمة >> عملت على أهم مهمة اليوم",
+    "workHabitMail": "معالجة البريد الإلكتروني",
+    "workDailyImportantTaskNotes": "انقر لتحديد أهم مهمة لديك",
+    "workTodoProjectNotes": "انقر لتحديد اسم مشروعك الحالي + تعيين تاريخ الاستحقاق!",
+    "exerciseDailyText": "التمدد (ستريتش) >> روتين التمرين اليومي",
+    "healthDailyNotes": "انقر للتعديل!",
+    "exerciseTodoText": "إعداد جدول التمرين",
+    "healthTodoNotes": "انقر لإضافة قائمة مراجعة!",
+    "creativityDailyText": "العمل على مشروع إبداعي",
+    "schoolDailyNotes": "انقر لاختيار جدول الواجبات المنزلية!",
+    "creativityDailyNotes": "انقر لتسمية مشروعك الحالي + تحديد جدول المواعيد!",
+    "selfCareDailyText": "5 دقائق للتنفس بهدوء",
+    "creativityTodoText": "إنهاء مشروع إبداعي",
+    "selfCareDailyNotes": "انقر لاختيار الجدول!",
+    "selfCareTodoNotes": "انقر لتحديد خطة العمل!",
+    "defaultHabitText": "انقر هنا لتحديد أن هذه العادة سلبية، وتريد أن تقلع عنها",
+    "defaultHabitNotes": "أو قم بالحذف من نافذة التعديل",
+    "choresDailyNotes": "انقر لاختيار جدولك!",
+    "creativityHabit": "احترف المهارة >> + مارس تقنية إبداعية جديدة",
+    "exerciseHabit": "10 دقائق كارديو >> + 10 دقائق كارديو",
+    "healthTodoText": "حدد موعداً للمراجعة >> تفكر في تغيير صحي",
+    "schoolHabit": "دراسة / مماطلة",
+    "selfCareHabit": "خذ استراحة قصيرة",
+    "exerciseTodoNotes": "انقر لإضافة قائمة تدقيق!",
+    "choresHabit": "10 دقائق تنظيف",
+    "schoolTodoText": "إنهاء واجب دراسي",
+    "healthHabit": "غذاء صحي/ غذاء غير صحي",
+    "choresTodoText": "ترتيب الخزانة >> ترتيب الفوضى",
+    "choresTodoNotes": "انقر لتحديد منطقة الفوضى!",
+    "exerciseDailyNotes": "انقر لاختيار الجدول وتحديد التمارين!",
+    "schoolTodoNotes": "انقر لتسمية الواجب المنزلي وتحديد وقت الانتهاء!",
+    "creativityTodoNotes": "انقر لتسمية مشروعك",
+    "selfCareTodoText": "شارك في فعالية ممتعة",
+    "healthDailyText": "خيط الأسنان",
+    "schoolDailyText": "إنهاء واجبات منزلية",
+    "choresDailyText": "غسيل الصحون"
 }
diff --git a/website/common/locales/ar/front.json b/website/common/locales/ar/front.json
index d1ca336657..a3b3929e9e 100644
--- a/website/common/locales/ar/front.json
+++ b/website/common/locales/ar/front.json
@@ -20,12 +20,12 @@
     "emailNewPass": "إرسال رابط إعادة تعيين كلمة المرور الى البريد الإلكتروني",
     "footerSocial": "منصات التواصل الاجتماعي",
     "free": "الإنضمام مجاناً",
-    "marketing1Lead1": "Habitica هي لعبة تساعدك على تحسين عادات الحياة الواقعية.  إنها \"تحاكي\" حياتك عن طريق تحويل كل مهامك (العادات ، الأعمال اليومية ، المهام) إلى وحوش صغيرة عليك التغلب عليها.  كلما كنت أفضل في هذا ، كلما تقدمت في اللعبة.  إذا تعثرت في الحياة ، تبدأ شخصيتك بالتراجع في اللعبة.",
+    "marketing1Lead1": "Habitica هي لعبة تساعدك على تحسين عادات الحياة الواقعية. إنها \"تحاكي\" حياتك عن طريق تحويل كل مهامك (العادات، الأعمال اليومية، المهام) إلى وحوش صغيرة عليك التغلب عليها. كلما كنت أفضل في هذا، كلما تقدمت في اللعبة. إذا تعثرت في الحياة، تبدأ شخصيتك بالتراجع في اللعبة.",
     "termsAndAgreement": "بالنقر على الزر ادناه، فإنك تشير الى كونك قد قرأت ووافقت على <a href='/static/terms'>شروط الخدمة</a> و <a href='/static/privacy'>سياسة الخصوصية</a>.",
     "clearBrowserData": "حذف بيانات المتصفح",
     "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>الإضافات</a>",
     "forgotPasswordSteps": "أدخل عنوان البريد الإلكتروني الذي استخدمته لتسجيل حسابك في Habitica.",
-    "pkQuestion1": "ما الذي ألهم Habitica؟  كيف بدأ؟",
+    "pkQuestion1": "ما الذي ألهم Habitica؟ كيف بدأت؟",
     "mobileAndroid": "Android",
     "playButton": "العب",
     "playButtonFull": "دخول Habitica",
@@ -39,12 +39,29 @@
     "marketing1Lead1Title": "حياتك، لعبة تقمص الأدوار",
     "marketing3Header": "التطبيقات والإضافات",
     "marketing2Lead1Title": "الإنتاجية الاجتماعية",
-    "marketing4Lead2": "تكاليف الرعاية الصحية في إزدياد، ويجب فعل شيء ما.  تم إنشاء مئات البرامج لتقليل التكاليف وتحسين الصحة.  نعتقد أن Habitica قادر على تمهيد طريق حقيقي نحو أنماط حياة صحية.",
+    "marketing4Lead2": "تكاليف الرعاية الصحية في ازدياد، ويجب فعل شيء ما. تم إنشاء مئات البرامج لتقليل التكاليف وتحسين الصحة. نعتقد أن Habitica قادرة على تمهيد طريق حقيقي نحو أنماط حياة صحية.",
     "oldNews": "أخبار",
     "setNewPass": "تعيين كلمة مرور جديدة",
-    "presskitText": "شكراً لاهتمامك ب Habitica!  يمكن استخدام الصور التالية للمقالات أو مقاطع الفيديو حول Habitica.  لمزيد من المعلومات، يرجى التواصل معنا على <٪ = pressEnquiryEmail٪>.",
+    "presskitText": "شكراً لاهتمامك ب Habitica! يمكن استخدام الصور التالية للمقالات أو مقاطع الفيديو حول Habitica. لمزيد من المعلومات، يرجى التواصل معنا على <٪ = pressEnquiryEmail٪>.",
     "invalidEmail": "إجراء إعادة تعيين كلمة المرور يتطلب عنوان بريد الكتروني صالح.",
     "marketing1Lead2": "حسن عاداتك لبناء صورتك الرمزية، تباهى بالعتاد الذي كسبته!",
-    "marketing2Lead2": "ما هي لعبة تقمص الأدوار من دون معارك؟  حارب الوحوش مع فريقك.  الوحوش هي \"super accountability mode\" - اليوم الذي تتغيب فيه عن النادي الرياضي هو يوم يؤذي فيه الوحش * الجميع! *",
-    "marketing3Lead1": "تتيح لك تطبيقات ** الايفون و الاندرويد ** الاعتناء بالأعمال أثناء التنقل.  نحن ندرك أن تسجيل الدخول إلى موقع الويب للنقر على الأزرار يمكن أن يشكل عائق."
+    "marketing2Lead2": "ما هي لعبة تقمص الأدوار من دون معارك؟ حارب الوحوش مع فريقك. الوحوش هي \"super accountability mode\" - اليوم الذي تتغيب فيه عن النادي الرياضي هو يوم يؤذي فيه الوحش *الجميع!*",
+    "marketing3Lead1": "تتيح لك تطبيقات **الآيفون والآندرويد** الاعتناء بالأعمال أثناء التنقل. نحن ندرك أن تسجيل الدخول إلى موقع الويب والنقر على الأزرار يمكن أن يشكل عائقاً.",
+    "chores": "الواجبات المنزلية",
+    "footerProduct": "منتج",
+    "marketing2Header": "تنافس مع الأصدقاء، وانضم إلى مجموعات من اهتماماتك",
+    "presskit": "العدة الصحفية",
+    "pkAnswer1": "إذا كنت قد استثمرت وقتاً في تحسين مستوى شخصية ما في لعبة ما، فمن الصعب ألا تتساءل عن مدى روعة حياتك إذا بذلت كل هذا الجهد لتحسين نفسك في الحياة الواقعية بدلاً من الصورة الرمزية الخاصة بك. بدأنا في بناء Habitica لمعالجة هذا السؤال. <br /> تم إطلاق Habitica رسمياً مع Kickstarter في عام 2013، وبدأت الفكرة حقاً. منذ ذلك الحين، نمت لتصبح مشروعاً ضخماً، مدعوماً من قبل متطوعينا الرائعين في دعم المصدر المفتوح ومستخدمينا الكرماء.",
+    "pkAnswer3": "يعد الضغط الاجتماعي عاملاً محفزاً كبيراً لكثير من الناس، لذلك عرفنا أننا نريد أن يكون لدينا مجتمع قوي يحاسب بعضنا البعض على أهدافهم ويشجع نجاحاتهم. لحسن الحظ، فإن أحد الأشياء التي تقوم بها ألعاب الفيديو متعددة اللاعبين هو تعزيز الشعور بالانتماء للمجتمع بين مستخدميها! يستعير هيكل مجتمع Habitica من هذه الأنواع من الألعاب؛ يمكنك تكوين مجموعة صغيرة من الأصدقاء المقربين، ولكن يمكنك أيضاً الانضمام إلى مجموعات مصالح مشتركة أكبر تُعرف باسم النقابة. على الرغم من أن بعض المستخدمين يختارون اللعب منفردين، فإن معظمهم يقررون تشكيل شبكة دعم تشجع المساءلة الاجتماعية من خلال ميزات مثل المهام، حيث يقوم أعضاء الحزب بتجميع إنتاجيتهم لمحاربة الوحوش معاً.",
+    "pkQuestion2": "لماذا تعمل Habitica؟",
+    "marketing1Lead3Title": "ابحث عن جوائز عشوائية",
+    "marketing3Lead2Title": "الإدراجات",
+    "marketing2Lead3": "تتيح لك التحديات التنافس مع الأصدقاء والغرباء. كل من يفعل الأفضل في نهاية التحدي يفوز بجوائز خاصة.",
+    "pkQuestion3": "لماذا أضفت ميزات اجتماعية؟",
+    "marketing1Lead3": "بالنسبة للبعض، فإن المغامرة التي تحفزهم: نظام يسمى \"المكافآت العشوائية\". تستوعب Habitica جميع أنماط التشجيع والعقاب: الإيجابية والسلبية والمتوقعة والعشوائية.",
+    "marketing2Lead1": "بينما يمكنك لعب Habitica منفرداً، فإن الأضواء تضيء حقاً عندما تبدأ في التعاون والمنافسة وتحميل بعضكم المسؤولية. الجزء الأكثر فعالية في أي برنامج لتحسين الذات هو تحمل المسؤولية الاجتماعية، وهل هناك بيئة للمساءلة والمنافسة أفضل من لعبة فيديو؟",
+    "marketing3Lead2": "**أدوات الطرف الثالث الأخرى** تربط Habitica بجوانب مختلفة من حياتك. توفر واجهة برمجة التطبيقات الخاصة بنا تكاملاً سهلاً لأشياء مثل [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US)، التي تفقدك نقاطاً عند تصفح مواقع الويب غير المنتجة، وتكسبك نقاطاً عندما تكون المواقع منتجة. [شاهد المزيد هنا](https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
+    "pkAnswer2": "إن تكوين عادة جديدة أمر صعب لأن الناس يحتاجون حقاً إلى تلك المكافأة الفورية الواضحة. على سبيل المثال، من الصعب البدء في تنظيف الأسنان بالخيط، لأنه على الرغم من أن طبيب الأسنان لدينا يخبرنا أنه أكثر صحة على المدى الطويل، إلا أنه في الوقت الحالي يتسبب في إصابة لثتك. <br /> يضيف أسلوب اللعب في Habitica إحساساً بالإشباع الفوري للأهداف اليومية من خلال مكافأة مهمة صعبة وإعطائك الخبرة، والذهب ... وربما حتى جائزة عشوائية، مثل بيضة التنين! يساعد هذا في الحفاظ على تحفيز الأشخاص حتى عندما لا يكون للمهمة نفسها مكافأة جوهرية، وقد رأينا أشخاصاً يغيرون حياتهم نتيجة لذلك. يمكنك التحقق من قصص النجاح هنا: https://habitversary.tumblr.com",
+    "marketing1Lead2Title": "احصل على معدات رائعة",
+    "enterHabitica": "ادخل Habitica"
 }
diff --git a/website/common/locales/ar/generic.json b/website/common/locales/ar/generic.json
index 92cd97ee04..2ea467b8d3 100755
--- a/website/common/locales/ar/generic.json
+++ b/website/common/locales/ar/generic.json
@@ -1,39 +1,39 @@
 {
     "languageName": "العربية",
-    "stringNotFound": "سلسلة المحارف '<%= string %>' لم توجد.",
+    "stringNotFound": "سلسلة المحارف '<%= string %>' غير موجودة.",
     "habitica": "Habitica",
-    "onward": "إلي الأمام!",
-    "done": "Done",
-    "gotIt": "Got it!",
+    "onward": "إلى الأمام!",
+    "done": "انتهى",
+    "gotIt": "فهمت!",
     "titleTimeTravelers": "مسافرين عبر الزمن",
     "titleSeasonalShop": "المتجر الموسمي",
-    "saveEdits": "Save Edits",
-    "showMore": "Show More",
-    "showLess": "Show Less",
-    "markdownHelpLink": "Markdown formatting help",
-    "bold": "**Bold**",
+    "saveEdits": "حفظ التغييرات",
+    "showMore": "إظهار المزيد",
+    "showLess": "عرض أقل",
+    "markdownHelpLink": "تعليمات تنسيق لغة Markdown",
+    "bold": "**سميك**",
     "markdownImageEx": "![نص بديل إلزامي](https://habitica.com/cake.png \"ظهور عنوان اختياري عند المرور بالماوس\")",
     "code": "`code`",
     "achievements": "الإنجازات",
-    "basicAchievs": "Basic Achievements",
-    "seasonalAchievs": "Seasonal Achievements",
-    "specialAchievs": "Special Achievements",
+    "basicAchievs": "الإنجازات الأساسية",
+    "seasonalAchievs": "الإنجازات الموسمية",
+    "specialAchievs": "الإنجازات الخاصة",
     "modalAchievement": "إنجاز!",
     "special": "خاص",
     "site": "الموقع",
     "help": "مساعدة",
     "user": "المستخدم",
     "market": "المتجر",
-    "newSubscriberItem": "You have new <span class=\"notification-bold-blue\">Mystery Items</span>",
+    "newSubscriberItem": "لديك <span class=\"notification-bold-blue\"> عناصر غامضة جديدة </span>",
     "subscriberItemText": "كل شهر يحصل المشتركون على غرض غامض. عادةً يصبح متاحا في بداية الشهر. راجع صفحة الويكي \"الغرض الغامض\" للمزيد من المعلومات.",
     "all": "الجميع",
     "none": "لا شيء",
-    "more": "<%= count %> more",
+    "more": "<%= count %> أكثر",
     "and": "و",
     "submit": "إرسال",
     "close": "إغلاق",
     "saveAndClose": "حفظ وإغلاق",
-    "saveAndConfirm": "Save & Confirm",
+    "saveAndConfirm": "حفظ & تأكيد",
     "cancel": "إلغاء",
     "ok": "حسناً",
     "add": "إضافة",
@@ -47,29 +47,29 @@
     "delete": "حذف",
     "gemsPopoverTitle": "جواهر",
     "gems": "الجواهر",
-    "needMoreGems": "Need More Gems?",
-    "needMoreGemsInfo": "Purchase Gems now, or become a subscriber to buy Gems with Gold, get monthly mystery items, enjoy increased drop caps and more!",
+    "needMoreGems": "تحتاج المزيد من الأحجار الكريمة؟",
+    "needMoreGemsInfo": "قم بشراء الأحجار الكريمة الآن، أو اشترك لتكون قادراً على شراء الأحجار الكريمة بالذهب، واحصل على عناصر غامضة شهرياً، واستمتع بالتميز والجوائز المتزايدة والمزيد!",
     "veteran": "متمرس",
     "veteranText": "نجا من \"العادة الرمادية\" (موقعنا السابق)، وحصل على العديد من ندب المعارك من أخطائه.",
     "originalUser": "مستخدم أصلي!",
     "originalUserText": "واحد من المتبنين <em>الأوائل</em>. نتكلم عن مجرب منذ البداية!",
     "habitBirthday": "حفلة يوم ميلاد Habitica",
     "habitBirthdayText": "احتفل بيوم ميلاد Habitica!",
-    "habitBirthdayPluralText": "Celebrated <%= count %> Habitica Birthday Bashes!",
+    "habitBirthdayPluralText": "احتفل <%= count %> أيام ميلاد Habitica!",
     "habiticaDay": "يوم تسمية Habitica",
     "habiticaDaySingularText": "احتفل بيوم تسمية Habitica! شكراً لكونك مستخدماً رائعاً.",
-    "habiticaDayPluralText": "Celebrated <%= count %> Naming Days! Thanks for being a fantastic user.",
+    "habiticaDayPluralText": "احتفل <%= count %> بأيام تسمية Habitica! شكراً لكونك مستخدماً رائعاً.",
     "achievementDilatory": "المنقذ من المماطلة",
     "achievementDilatoryText": "ساعد على هزيمة تنين المماطلة المروع خلال احتفال صيف 2014!",
     "costumeContest": "متسابق الأزياء التنكرية",
-    "costumeContestText": "Participated in the Habitoween Costume Contest. See some of the awesome entries at blog.habitrpg.com!",
-    "costumeContestTextPlural": "Participated in <%= count %> Habitoween Costume Contests. See some of the awesome entries at blog.habitrpg.com!",
-    "newPassSent": "If we have your email on file, instructions for setting a new password have been sent to your email.",
+    "costumeContestText": "شارك في مسابقة أزياء الهالوين. شاهد بعض الأفكار الرائعة على blog.habitrpg.com!",
+    "costumeContestTextPlural": "شارك في <%= count %> مسابقات أزياء الهالوين. شاهد بعض الأفكار الرائعة على blog.habitrpg.com!",
+    "newPassSent": "إذا كان لدينا بريدك الإلكتروني في الملف، فقد تم إرسال تعليمات تعيين كلمة مرور جديدة إلى بريدك الإلكتروني.",
     "error": "خطأ",
     "menu": "القائمة",
     "notifications": "الإشعارات",
-    "noNotifications": "You're all caught up!",
-    "noNotificationsText": "The notification fairies give you a raucous round of applause! Well done!",
+    "noNotifications": "لديك آخر التحديثات!",
+    "noNotificationsText": "تمنحك جنيات الإشعارات جولة من التصفيق الصاخب! أحسنت!",
     "clear": "إزالة",
     "audioTheme": "سمة الصوت",
     "audioTheme_off": "تعطيل",
@@ -77,17 +77,17 @@
     "audioTheme_wattsTheme": "سمة واتس",
     "audioTheme_gokulTheme": "سمة غوكل",
     "audioTheme_luneFoxTheme": "سمة لونفوكس",
-    "audioTheme_rosstavoTheme": "Rosstavo's Theme",
-    "audioTheme_dewinTheme": "Dewin's Theme",
-    "audioTheme_airuTheme": "Airu's Theme",
-    "audioTheme_beatscribeNesTheme": "Beatscribe's NES Theme",
-    "audioTheme_arashiTheme": "Arashi's Theme",
-    "audioTheme_triumphTheme": "Triumph Theme",
-    "audioTheme_lunasolTheme": "Lunasol Theme",
-    "audioTheme_spacePenguinTheme": "SpacePenguin's Theme",
-    "audioTheme_maflTheme": "MAFL Theme",
-    "audioTheme_pizildenTheme": "Pizilden's Theme",
-    "audioTheme_farvoidTheme": "Farvoid Theme",
+    "audioTheme_rosstavoTheme": "سمة روسستافو",
+    "audioTheme_dewinTheme": "سمة ديوين",
+    "audioTheme_airuTheme": "سمة آيرو",
+    "audioTheme_beatscribeNesTheme": "سمة بيتسكرايب NES",
+    "audioTheme_arashiTheme": "سمة أراشي",
+    "audioTheme_triumphTheme": "سمة الانتصار الساحق",
+    "audioTheme_lunasolTheme": "سمة لوناسول",
+    "audioTheme_spacePenguinTheme": "سمة بطريق الفضاء",
+    "audioTheme_maflTheme": "سمة مافل",
+    "audioTheme_pizildenTheme": "سمة بيزيلدن",
+    "audioTheme_farvoidTheme": "سمة فارفويد",
     "reportBug": "بلّغ عن خطأ",
     "overview": "لمحة عامة للمستخدمين الجدد",
     "dateFormat": "صيغة التاريخ",
@@ -95,110 +95,110 @@
     "achievementStressbeastText": "ساعد على هزيمة وحش التوتر الفظيع خلال احتفال شتاء 2014!",
     "achievementBurnout": "المنقذ من الحقول المزدهرة",
     "achievementBurnoutText": "ساعد على هزيمة احتراقي واستعادة أشباح العادم خلال احتفال خريف 2015!",
-    "achievementBewilder": "Savior of Mistiflying",
-    "achievementBewilderText": "Helped defeat the Be-Wilder during the 2016 Spring Fling Event!",
-    "achievementDysheartener": "Savior of the Shattered",
-    "achievementDysheartenerText": "Helped defeat the Dysheartener during the 2018 Valentine's Event!",
-    "cards": "Cards",
-    "sentCardToUser": "You sent a card to <%= profileName %>",
-    "cardReceived": "You received a <span class=\"notification-bold-blue\"><%= card %></span>",
+    "achievementBewilder": "المنقذ من الخطأ",
+    "achievementBewilderText": "ساعد في هزيمة Be-Wilder خلال حدث Spring Fling لعام 2016!",
+    "achievementDysheartener": "منقذ المحطمين",
+    "achievementDysheartenerText": "ساعد في هزيمة Dysheartener خلال حدث عيد الحب 2018!",
+    "cards": "البطاقات",
+    "sentCardToUser": "لقد أرسلت بطاقة إلى <%= profileName %>",
+    "cardReceived": "لقد وصلتك <span class=\"notification-bold-blue\"><%= card %></span>",
     "greetingCard": "بطاقة معايدة",
     "greetingCardExplanation": "كلاكما ستحصلان على إنجاز الصاحب المبتهج!",
     "greetingCardNotes": "أرسل بطاقة تحية لعضو بالفريق.",
     "greeting0": "مرحباً!",
     "greeting1": "فقط أحببت أن أقول مرحباً :)",
-    "greeting2": "`waves frantically`",
+    "greeting2": "`موجات حميمية`",
     "greeting3": "مرحباً يا!",
     "greetingCardAchievementTitle": "الصاحب المبتهج",
-    "greetingCardAchievementText": "Hey! Hi! Hello! Sent or received <%= count %> greeting cards.",
+    "greetingCardAchievementText": "مرحباً! لقد أرسلت أو استلمت <%= count %> بطاقة تحية.",
     "thankyouCard": "بطاقة شكر",
     "thankyouCardExplanation": "كلاكما ستحصلان على إنجاز الممتن كثيراً!",
     "thankyouCardNotes": "أرسل بطاقة شكر لعضو فريق.",
     "thankyou0": "شكراً جزيلاً لك!",
-    "thankyou1": "شكراً، شكراً، شكراً!",
+    "thankyou1": "شكراً جزيلاً، شكراً!",
     "thankyou2": "أرسل لك ألف شكر.",
     "thankyou3": "أنا ممتن كثيراً، شكراً لك!",
     "thankyouCardAchievementTitle": "ممتن لك بشدة",
-    "thankyouCardAchievementText": "Thanks for being thankful! Sent or received <%= count %> Thank-You cards.",
+    "thankyouCardAchievementText": "شكراً لكونك ممتناً! لقد أرسلت أو استلمت <%= count %> رسالة شكر.",
     "birthdayCard": "بطاقة تهنئة بيوم الميلاد",
     "birthdayCardExplanation": "كلاكما تحصلان على إنجاز يوم الميلاد المليء بالحظ!",
     "birthdayCardNotes": "أرسل بطاقة تهنة يوم الميلاد لأحد أعضاء فريقك.",
     "birthday0": "يوم ميلاد سعيد!",
     "birthdayCardAchievementTitle": "يوم ميلاد مليء بالحظ",
-    "birthdayCardAchievementText": "Many happy returns! Sent or received <%= count %> birthday cards.",
-    "congratsCard": "Congratulations Card",
-    "congratsCardExplanation": "You both receive the Congratulatory Companion achievement!",
-    "congratsCardNotes": "Send a Congratulations card to a party member.",
-    "congrats0": "Congratulations on your success!",
-    "congrats1": "I'm so proud of you!",
-    "congrats2": "Well done!",
-    "congrats3": "A round of applause for you!",
-    "congrats4": "Bask in your well-deserved success!",
-    "congratsCardAchievementTitle": "Congratulatory Companion",
-    "congratsCardAchievementText": "It's great to celebrate your friends' achievements! Sent or received <%= count %> congratulations cards.",
-    "getwellCard": "Get Well Card",
-    "getwellCardExplanation": "You both receive the Caring Confidant achievement!",
-    "getwellCardNotes": "Send a Get Well card to a party member.",
-    "getwell0": "Hope you feel better soon!",
-    "getwell1": "Take care! <3",
-    "getwell2": "You're in my thoughts!",
-    "getwell3": "Sorry you're not feeling your best!",
-    "getwellCardAchievementTitle": "Caring Confidant",
-    "getwellCardAchievementText": "Well-wishes are always appreciated. Sent or received <%= count %> get well cards.",
-    "goodluckCard": "Good Luck Card",
-    "goodluckCardExplanation": "You both receive the Lucky Letter achievement!",
-    "goodluckCardNotes": "Send a good luck card to a party member.",
-    "goodluck0": "May luck always follow you!",
-    "goodluck1": "Wishing you lots of luck!",
-    "goodluck2": "I hope luck is on your side today and always!!",
-    "goodluckCardAchievementTitle": "Lucky Letter",
-    "goodluckCardAchievementText": "Wishes for good luck are great encouragement! Sent or received <%= count %> good luck cards.",
-    "streakAchievement": "You earned a streak achievement!",
-    "firstStreakAchievement": "21-Day Streak",
-    "streakAchievementCount": "<%= streaks %> 21-Day Streaks",
-    "twentyOneDays": "You've completed your Daily for 21 days in a row!",
-    "dontBreakStreak": "Amazing job. Don't break the streak!",
+    "birthdayCardAchievementText": "العديد من عوائد سعيدة! لقد أرسلت أو استلمت <%= count %> بطاقة عيد ميلاد سعيد.",
+    "congratsCard": "بطاقة تهنئة",
+    "congratsCardExplanation": "كلاكما تلقى إنجاز الرفيق المهنئ!",
+    "congratsCardNotes": "أرسل بطاقة تهنئة لعضو الفريق.",
+    "congrats0": "مبارك نجاحك!",
+    "congrats1": "أنا فخور جداً بك!",
+    "congrats2": "أحسنت!",
+    "congrats3": "جولة من التصفيق لك!",
+    "congrats4": "تشرق في نجاحك الذي تستحقه!",
+    "congratsCardAchievementTitle": "الرفيق المهنئ",
+    "congratsCardAchievementText": "إنه لأمر رائع أن تحتفل بإنجازات أصدقائك! لقد أرسلت أو استلمت <%= count %> بطاقة تهنئة.",
+    "getwellCard": "بطاقة التعافي والشفاء العاجل",
+    "getwellCardExplanation": "كلاكما حصل على إنجاز رعاية المقرب!",
+    "getwellCardNotes": "أرسل بطاقة تمنيات بالشفاء العاجل إلى أحد أعضاء الفريق.",
+    "getwell0": "أتمنى أن تشعر بتحسن عما قريب!",
+    "getwell1": "اعتن بنفسك! <3",
+    "getwell2": "أنت في أفكاري!",
+    "getwell3": "آسف لأنك لست في أفضل حالاتك!",
+    "getwellCardAchievementTitle": "رعاية المقرب",
+    "getwellCardAchievementText": "إنه لموضع تقدير، التمنيات الطيبة. لقد أرسلت أو استلمت <%= count %> بطاقة تمنيات طيبة.",
+    "goodluckCard": "بطاقة حظ سعيد",
+    "goodluckCardExplanation": "كلاكما تلقيت إنجاز البريد المحظوظ!",
+    "goodluckCardNotes": "أرسل بطاقة حظ سعيد إلى أحد أعضاء الفريق.",
+    "goodluck0": "فليتبعك الحظ دائماً!",
+    "goodluck1": "أتمنى لك الكثير من الحظ!",
+    "goodluck2": "أتمنى أن يكون الحظ بجانبك اليوم ودائماً !!",
+    "goodluckCardAchievementTitle": "البريد المحظوظ",
+    "goodluckCardAchievementText": "التمنيات بالتوفيق هي تشجيع كبير! لقد أرسلت أو استلمت <%= count %> بطاقة حظ سعيد.",
+    "streakAchievement": "لقد ربحت إنجازاً متتالياً!",
+    "firstStreakAchievement": "ضربة 21-يوماً",
+    "streakAchievementCount": "<%= streaks %> ضربة 21-يوماً",
+    "twentyOneDays": "لقد أكملت برنامجك اليومي لمدة 21 يوماً على التوالي!",
+    "dontBreakStreak": "عمل مبهر. لا تكسر الضربة المتتالية!",
     "dontStop": "لا تتوقف الآن!",
     "wonChallengeShare": "فزت بتحد في Habitica!",
-    "orderBy": "Order By <%= item %>",
-    "you": "(you)",
-    "loading": "Loading...",
-    "userIdRequired": "User ID is required",
-    "resetFilters": "Clear all filters",
-    "applyFilters": "Apply Filters",
-    "wantToWorkOn": "I want to work on:",
-    "categories": "Categories",
-    "animals": "Animals",
-    "exercise": "Exercise",
-    "creativity": "Creativity",
-    "health_wellness": "Health & Wellness",
-    "self_care": "Self-Care",
-    "habitica_official": "Habitica Official",
-    "academics": "Academics",
-    "advocacy_causes": "Advocacy + Causes",
-    "entertainment": "Entertainment",
-    "finance": "Finance",
+    "orderBy": "ترتيب حسب <%= item %>",
+    "you": "(أنت)",
+    "loading": "تحميل...",
+    "userIdRequired": "مطلوب ID المستخدم (User ID)",
+    "resetFilters": "امسح كل عوامل التصفية",
+    "applyFilters": "تطبيق عوامل التصفية",
+    "wantToWorkOn": "أريد العمل على:",
+    "categories": "الفئات",
+    "animals": "الحيوانات",
+    "exercise": "التمرين",
+    "creativity": "الإِبداع",
+    "health_wellness": "الصحة & الراحة",
+    "self_care": "العناية بالنفس",
+    "habitica_official": "Habitica رسمي",
+    "academics": "أكاديمي",
+    "advocacy_causes": "تطوع + مجتمعات الاهتمام",
+    "entertainment": "وسائل الترفيه",
+    "finance": "الموارد المالية",
     "health_fitness": "الصحة واللياقة البدنية",
     "hobbies_occupations": "الهوايات والمهن",
-    "location_based": "Location-based",
+    "location_based": "معتمد على الموقع",
     "mental_health": "الصحة العقلية + العناية الذاتية",
-    "getting_organized": "Getting Organized",
-    "self_improvement": "Self-Improvement",
-    "spirituality": "Spirituality",
-    "time_management": "Time-Management + Accountability",
-    "recovery_support_groups": "Recovery + Support Groups",
-    "dismissAll": "Dismiss All",
-    "messages": "Messages",
-    "emptyMessagesLine1": "You don't have any messages",
+    "getting_organized": "أن تصبح أكثر تنظيماً",
+    "self_improvement": "تطوير الذات",
+    "spirituality": "الروحانية",
+    "time_management": "إدارة الوقت + المسؤولية",
+    "recovery_support_groups": "مجموعات التجديد + الدعم",
+    "dismissAll": "امسح الكل",
+    "messages": "الرسائل",
+    "emptyMessagesLine1": "ليس لديك أية رسائل",
     "emptyMessagesLine2": "يمكنك إرسال رسالة جديدة إلى مستخدم من خلال زيارة ملفه الشخصي والنقر على زر \"رسالة\".",
-    "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> sent you a message",
+    "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> أرسل لك رسالة",
     "letsgo": "لنذهب!",
-    "selected": "Selected",
-    "howManyToBuy": "How many would you like to buy?",
-    "contactForm": "Contact the Moderation Team",
+    "selected": "محدد",
+    "howManyToBuy": "كم تريد أن تشتري؟",
+    "contactForm": "تواصل مع فريق الإشراف",
     "congratulations": "تهانينا!",
     "finish": "نهاية",
-    "onboardingAchievs": "إنجازات الإعداد",
+    "onboardingAchievs": "الإنجازات الترحيبية",
     "reportBugHeaderDescribe": "يُرجى وصف الخطأ الذي تواجهه وسيتواصل معك فريقنا.",
     "reportEmailText": "سيتم استخدام هذا فقط للاتصال بك بخصوص تقرير الخطأ.",
     "reportEmailPlaceholder": "عنوان بريدك الإلكتروني",
diff --git a/website/common/locales/ar/inventory.json b/website/common/locales/ar/inventory.json
index dc4c7420f2..7535876213 100755
--- a/website/common/locales/ar/inventory.json
+++ b/website/common/locales/ar/inventory.json
@@ -1,10 +1,10 @@
 {
-    "noItemsAvailableForType": "لا يوجد لديك <%= type %>",
+    "noItemsAvailableForType": "لا يوجد لديك <%= type %>.",
     "foodItemType": "طعام الحيوانات الأليفة",
     "eggsItemType": "بيض",
-    "hatchingPotionsItemType": "جرعات الفقس",
-    "specialItemType": "حاجات خاصة",
-    "lockedItem": "حاجة مقفلة",
+    "hatchingPotionsItemType": "جرعات التلقيح",
+    "specialItemType": "عناصر خاصة",
+    "lockedItem": "عنصر مقفل",
     "petAndMount": "حيوان أليف وحيوان للركوب",
     "allItems": "كل العناصر"
 }
diff --git a/website/common/locales/ar/loginincentives.json b/website/common/locales/ar/loginincentives.json
index 4ce93ba98d..86f043762e 100755
--- a/website/common/locales/ar/loginincentives.json
+++ b/website/common/locales/ar/loginincentives.json
@@ -1,25 +1,25 @@
 {
-    "unlockedReward": "You have received <%= reward %>",
-    "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
-    "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
-    "awesome": "Awesome!",
+    "unlockedReward": "لقد استلمت <%= reward %>",
+    "earnedRewardForDevotion": "لقد حصلت على <%= reward %> لكونك ملتزماً بتحسين حياتك.",
+    "nextRewardUnlocksIn": "تسجيلات دخول للحصول على جائزتك القادمة: <%= numberOfCheckinsLeft %>",
+    "awesome": "رائع!",
     "countLeft": "Check-ins until next reward: <%= count %>",
-    "incentivesDescription": "When it comes to building habits, consistency is key. Each day you check-in you get closer to a prize.",
-    "checkinEarned": "Your Check-In Counter went up!",
-    "unlockedCheckInReward": "You unlocked a Check-In Prize!",
-    "checkinProgressTitle": "Progress until next",
-    "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
-    "oneOfAllPetEggs": "one of each standard Pet Egg",
-    "twoOfAllPetEggs": "two of each standard Pet Egg",
-    "threeOfAllPetEggs": "three of each standard Pet Egg",
-    "oneOfAllHatchingPotions": "one of each standard Hatching Potion",
-    "threeOfEachFood": "three of each standard Pet Food",
-    "fourOfEachFood": "four of each standard Pet Food",
-    "twoSaddles": "two Saddles",
+    "incentivesDescription": "عندما يتعلق الأمر ببناء العادات ، فإن الاستمرار هو المفتاح. كل يوم تقوم بتسجيل الدخول تقترب من مكافأة.",
+    "checkinEarned": "ازداد عدد تسجيلات الدخول الخاص بك!",
+    "unlockedCheckInReward": "لقد حررت جائزة تسجيل دخول!",
+    "checkinProgressTitle": "عملية التقدم للتالي",
+    "incentiveBackgroundsUnlockedWithCheckins": "التقدم حتى يتم فتح الخلفيات العادية المقفلة التالية مع تسجيلات الدخول اليومية.",
+    "oneOfAllPetEggs": "واحدة من بيض كل الحيوانات الأليفة القياسية",
+    "twoOfAllPetEggs": "اثنين من بيض كل الحيوانات الأليفة القياسية",
+    "threeOfAllPetEggs": "ثلاثة من بيض كل الحيوانات الأليفة القياسية",
+    "oneOfAllHatchingPotions": "واحدة من كل جرعات التفقيس القياسية",
+    "threeOfEachFood": "ثلاثة من كل جرعات التفقيس القياسية",
+    "fourOfEachFood": "أربعة من غذاء كل الحيوانات الأليفة القياسية",
+    "twoSaddles": "اثنين من السروج",
     "threeSaddles": "ثلاثة سروج",
-    "incentiveAchievement": "the Royally Loyal achievement",
-    "royallyLoyal": "Royally Loyal",
-    "royallyLoyalText": "This user has checked in over 500 times, and has earned every Check-In Prize!",
-    "checkInRewards": "Check-In Rewards",
-    "backloggedCheckInRewards": "You received Check-In Prizes! Visit your Inventory and Equipment to see what's new."
+    "incentiveAchievement": "إنجاز الولاء الملكي",
+    "royallyLoyal": "الولاء الملكي",
+    "royallyLoyalText": "هذا المستخدم قد قام بتسجيل الدخول أكثر من 500 مرة، وحصل على كل مكافآت تسجيل الدخول!",
+    "checkInRewards": "مكافآت تسجيل الدخول",
+    "backloggedCheckInRewards": "لقد استلمت مكافآت تسجيل دخول! ادخل على مخزنك ومعداتك لترى ما هو جديد."
 }
diff --git a/website/common/locales/bg/front.json b/website/common/locales/bg/front.json
index 381495ac94..92cefc70a3 100644
--- a/website/common/locales/bg/front.json
+++ b/website/common/locales/bg/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "и",
     "chores": "Домакинска работа",
     "clearBrowserData": "Изчистване на данните на браузъра",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Добавки и разширения</a>",
+    "communityExtensions": "Добавки и разширения",
     "communityFacebook": "Фейсбук",
     "companyAbout": "Как работи",
     "companyBlog": "Блог",
diff --git a/website/common/locales/cs/front.json b/website/common/locales/cs/front.json
index 37f72008fd..23b03ea686 100644
--- a/website/common/locales/cs/front.json
+++ b/website/common/locales/cs/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "a",
     "chores": "Domácí práce",
     "clearBrowserData": "Vyčistit data v prohlížeči",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Doplňky & Rozšírení</a>",
+    "communityExtensions": "Doplňky & Rozšírení",
     "communityFacebook": "Facebook",
     "companyAbout": "Jak to funguje",
     "companyBlog": "Blog",
diff --git a/website/common/locales/da/front.json b/website/common/locales/da/front.json
index bdb8030db4..799de2cfc9 100644
--- a/website/common/locales/da/front.json
+++ b/website/common/locales/da/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "og",
     "chores": "Pligter",
     "clearBrowserData": "Ryd browserdata",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Tilføjelser og udvidelser</a>",
+    "communityExtensions": "Tilføjelser og udvidelser",
     "communityFacebook": "Facebook",
     "companyAbout": "Hvordan det virker",
     "companyBlog": "Blog",
diff --git a/website/common/locales/de/achievements.json b/website/common/locales/de/achievements.json
index 6cdb3460ea..d473c5dcf8 100644
--- a/website/common/locales/de/achievements.json
+++ b/website/common/locales/de/achievements.json
@@ -104,7 +104,7 @@
     "achievementSeeingRed": "Rot Sehen",
     "achievementRedLetterDay": "Roter Faden",
     "achievementLegendaryBestiaryModalText": "Du hast alle mystischen Haustiere gesammelt!",
-    "achievementLegendaryBestiaryText": "Hat alle mystischen Haustiere ausgebrütet: Drachen-Jungtier, Fliegendes Ferkel, Greifen-Jungtier, Seeschlangen-Haustier und Einhorn-Fohlen!",
+    "achievementLegendaryBestiaryText": "Hat alle mystischen Haustiere in den Standardfarben ausgebrütet: Drache, Fliegendes Ferkel, Greif, Seeschlange und Einhorn!",
     "achievementLegendaryBestiary": "Legendäres Bestiarium",
     "achievementSeasonalSpecialistModalText": "Du hast alle saisonalen Quests abgeschlossen!",
     "achievementSeasonalSpecialistText": "Hat alle Quests der Frühlings- und Winter-Saison abgeschlossen: Eierjagd, Wildernder Weihnachtswichtel, und Finde das Jungtier!",
diff --git a/website/common/locales/de/backgrounds.json b/website/common/locales/de/backgrounds.json
index 2385432b05..87a81d9492 100644
--- a/website/common/locales/de/backgrounds.json
+++ b/website/common/locales/de/backgrounds.json
@@ -721,5 +721,12 @@
     "backgrounds082022": "Set 99: Veröffentlicht im August 2022",
     "backgroundMessyRoomText": "Unordentlicher Raum",
     "backgroundMessyRoomNotes": "Reinige einen unordentlichen Raum.",
-    "backgroundRainbowEucalyptusNotes": "Bewundere einen Regenbogen-Eukalyptus-Hain."
+    "backgroundRainbowEucalyptusNotes": "Bewundere einen Regenbogen-Eukalyptus-Hain.",
+    "backgroundTheatreStageText": "Theaterbühne",
+    "backgroundTheatreStageNotes": "Tritt auf einer Theaterbühne auf.",
+    "backgroundAutumnPicnicText": "Herbstpicknick",
+    "backgroundAutumnPicnicNotes": "Genieße ein Herbstpicknick.",
+    "backgroundOldPhotoText": "Altes Foto",
+    "backgroundOldPhotoNotes": "Posiere auf einem alten Foto.",
+    "backgrounds092022": "Set 100: Veröffentlicht im September 2022"
 }
diff --git a/website/common/locales/de/challenge.json b/website/common/locales/de/challenge.json
index 8e0a6bb1f8..f98e29b685 100644
--- a/website/common/locales/de/challenge.json
+++ b/website/common/locales/de/challenge.json
@@ -102,7 +102,7 @@
     "confirmKeepChallengeTasks": "Möchtest Du die Herausforderungsaufgaben behalten?",
     "selectParticipant": "Wähle einen Teilnehmer aus",
     "filters": "Filter",
-    "wonChallengeDesc": "Du hast die Herausforderung <%= challengeName %> gewonnen! Dein Erfolg wird unter den Errungenschaften in Deinem Profil aufgezeichnet.",
+    "wonChallengeDesc": "<%= challengeName %> hat Dich als Gewinner ausgewählt! Dein Gewinn wurde in Deine Errungenschaften aufgenommen.",
     "yourReward": "Deine Belohnung",
     "removeTasks": "Aufgaben entfernen"
 }
diff --git a/website/common/locales/de/groups.json b/website/common/locales/de/groups.json
index 88cf4f0851..cb904ee574 100644
--- a/website/common/locales/de/groups.json
+++ b/website/common/locales/de/groups.json
@@ -165,7 +165,7 @@
     "assignedTo": "Zugewiesen an",
     "assignedToUser": "Zugewiesen: <strong>@<%- userName %></strong>",
     "assignedToMembers": "<%= userCount %> Mitgliedern",
-    "assignedToYouAndMembers": "Dir und <strong><%= userCount %> Mitliedern</strong> zugewiesen",
+    "assignedToYouAndMembers": "<strong>Dir</strong>, <%= userCount %> Mitgliedern",
     "youAreAssigned": "Dir zugewiesen",
     "taskIsUnassigned": "Diese Aufgabe ist niemandem zugewiesen",
     "confirmUnClaim": "Bist Du sicher, dass Du diese Aufgabe abgeben möchtest?",
@@ -190,7 +190,7 @@
     "needsWork": "Benötigt Arbeit",
     "viewRequests": "Anfragen anzeigen",
     "groupSubscriptionPrice": "$9 monatlich + $3 pro Monat für jedes weitere Gruppenmitglied",
-    "groupBenefitsDescription": "Wir haben gerade die Betaversion der Gruppenpläne gestartet! Das Upgrade auf den Gruppenplan schaltet einige einzigartige Funktionen frei, welche die soziale Seite von Habitica verbessern.",
+    "groupBenefitsDescription": "Wir haben gerade die Beta-Version unserer Gruppenpläne gestartet! Das Upgrade auf einen Gruppenplan schaltet einige einzigartige Funktionen frei, mit denen Du die sozialen Aspekte von Habitika optimal auszunutzen kannst.",
     "teamBasedTasks": "Gruppenorientierte Aufgaben",
     "cannotDeleteActiveGroup": "Du kannst keine Gruppe mit einem laufenden Abonnement löschen",
     "groupTasksTitle": "Gruppen-Aufgabenliste",
diff --git a/website/common/locales/de/quests.json b/website/common/locales/de/quests.json
index 79e8bf4e90..46601608c5 100644
--- a/website/common/locales/de/quests.json
+++ b/website/common/locales/de/quests.json
@@ -31,13 +31,13 @@
     "collected": "Gesammelt",
     "abort": "Abbrechen",
     "leaveQuest": "Quest verlassen",
-    "sureLeave": "Willst du die Quest wirklich abbrechen? Dein kompletter Questfortschritt wird verloren gehen.",
+    "sureLeave": "Willst Du die Quest wirklich abbrechen? Dein ganzer Fortschritt wird verloren gehen.",
     "mustComplete": "Du musst vorher die <%= quest %> Quest abschließen.",
     "mustLvlQuest": "Du musst Level <%= level %> sein um diese Quest zu erwerben!",
     "unlockByQuesting": "Um diese Quest freizuschalten, musst Du erst <%= title %> abschließen.",
-    "questConfirm": "Bist du sicher, dass du diese Quest starten willst? Nicht alle Mitspieler deiner Party haben die Einladung zu dieser Quest akzeptiert. Quests starten automatisch sobald alle Mitspieler die Einladung angenommen oder abgelehnt haben.",
+    "questConfirm": "Bist Du sicher, dass Du diese Quest starten willst? Nicht alle Mitglieder Deiner Party haben die Einladung zu dieser Quest akzeptiert. Quests starten automatisch sobald alle Mitspieler die Einladung beantwortet haben.",
     "sureCancel": "Bist Du sicher, dass Du diese Quest abbrechen willst? Wenn Du die Quest abbrichst werden alle bereits akzeptierten und noch unbeantworteten Einladungen zurückgenommen und die Questschriftrolle wird an ihren Besitzer zurückgegeben.",
-    "sureAbort": "Bist Du sicher, dass Du diese Mission abbrechen willst? Aller Questfortschritt wird verloren gehen. Die Questschriftrolle wird dem Besitzer zurückgegeben.",
+    "sureAbort": "Bist Du sicher, dass Du diese Quest abbrechen willst? Der ganze Fortschritt geht verloren und die Questschriftrolle wird dem Besitzer zurückgegeben.",
     "doubleSureAbort": "Bist Du wirklich, wirklich sicher? Sei ganz sicher, dass sie Dich nicht für immer hassen werden!",
     "bossRageTitle": "Raserei",
     "bossRageDescription": "Wenn sich dieser Balken füllt, wird der Boss eine Spezialattacke ausführen!",
@@ -90,7 +90,7 @@
     "selectQuest": "Wähle eine Quest aus",
     "noQuestToStartTitle": "Kannst Du keine Quest finden, die du beginnen möchtest?",
     "membersParticipating": "<%= accepted %> / <%= invited %> Mitglieder nehmen teil",
-    "yourPartyIsNotOnQuest": "Deine Gruppe befindet sich nicht auf einer Quest",
+    "yourPartyIsNotOnQuest": "Deine Party befindet sich nicht auf einer Quest",
     "questOwner": "Questbesitzer",
     "cancelQuest": "Quest abbrechen",
     "backToSelection": "Zurück zur Questauswahl",
@@ -98,5 +98,5 @@
     "newItem": "Neuer Gegenstand",
     "ownerOnly": "Nur der Besitzer",
     "questItemsPending": "<%= amount %> Gegenstände ausstehend",
-    "selectQuestModal": "Such dir eine Quest aus"
+    "selectQuestModal": "Such Dir eine Quest aus"
 }
diff --git a/website/common/locales/de/rebirth.json b/website/common/locales/de/rebirth.json
index 4226f6ecb2..9dc37cf6ef 100644
--- a/website/common/locales/de/rebirth.json
+++ b/website/common/locales/de/rebirth.json
@@ -8,7 +8,7 @@
     "rebirthOrb": "Hat eine Sphäre der Wiedergeburt verwendet um noch einmal von vorne zu beginnen, nachdem Level <%= level %> erreicht wurde.",
     "rebirthOrb100": "Hat eine Sphäre der Wiedergeburt verwendet um noch einmal von vorne zu beginnen, nachdem Level 100 oder höher erreicht wurde.",
     "rebirthOrbNoLevel": "Hat eine Sphäre der Wiedergeburt verwendet um noch einmal von vorne zu beginnen.",
-    "rebirthPop": "Beginne sofort von vorn mit einem Charakter auf Level 1, aber behalte Erfolge, Sammelgegenstände und Ausrüstung. Deine Aufgaben und ihre Verläufe bleiben erhalten, werden aber auf gelb zurückgesetzt. Deine Strähnen verfallen, ausser für Aufgaben, die von aktiven Herausforderungen oder Gruppenplänen stammen. Gold, Erfahrung, Mana und alle Effekte von Fähigkeiten werden entfernt. All das wird sofort in Kraft treten. Für mehr Informationen schau im Wiki auf der Seite <a href='https://habitica.fandom.com/de/wiki/Sph%C3%A4re_der_Wiedergeburt' target='_blank'>Sphäre der Wiedergeburt</a> nach.",
+    "rebirthPop": "Beginne sofort von vorn mit einem Charakter auf Level 1, aber behalte Erfolge, Sammelgegenstände und Ausrüstung. Deine Aufgaben und ihre Verläufe bleiben erhalten, werden aber auf gelb zurückgesetzt. Deine Strähnen verfallen, außer für Aufgaben, die von aktiven Herausforderungen oder Gruppenplänen stammen. Gold, Erfahrung, Mana und alle Effekte von Fähigkeiten werden entfernt. All das wird sofort in Kraft treten. Für mehr Informationen, schau im Wiki auf der Seite <a href='https://habitica.fandom.com/de/wiki/Sphäre_der_Wiedergeburt' target='_blank'>Sphäre der Wiedergeburt</a> nach.",
     "rebirthName": "Sphäre der Wiedergeburt",
     "rebirthComplete": "Du wurdest wiedergeboren!",
     "nextFreeRebirth": "<strong><%= days %> Tage</strong> bis zur <strong>KOSTENLOSEN</strong> Sphäre der Wiedergeburt"
diff --git a/website/common/locales/en@pirate/front.json b/website/common/locales/en@pirate/front.json
index e2d522643f..e26e1f49c4 100644
--- a/website/common/locales/en@pirate/front.json
+++ b/website/common/locales/en@pirate/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "an' th'",
     "chores": "Tasks fer ye chambers",
     "clearBrowserData": "Clear yer Browser Data",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons n' Extensions</a>",
+    "communityExtensions": "Add-ons n' Extensions",
     "communityFacebook": "Face-log",
     "companyAbout": "How It Be Workin'",
     "companyBlog": "Blog",
diff --git a/website/common/locales/en_GB/front.json b/website/common/locales/en_GB/front.json
index bc481f4c5d..e125404468 100644
--- a/website/common/locales/en_GB/front.json
+++ b/website/common/locales/en_GB/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "and the",
     "chores": "Chores",
     "clearBrowserData": "Clear Browser Data",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Extensions</a>",
+    "communityExtensions": "Add-ons & Extensions",
     "communityFacebook": "Facebook",
     "companyAbout": "How It Works",
     "companyBlog": "Blog",
diff --git a/website/common/locales/es/backgrounds.json b/website/common/locales/es/backgrounds.json
index 5d8318984b..38793edf54 100644
--- a/website/common/locales/es/backgrounds.json
+++ b/website/common/locales/es/backgrounds.json
@@ -635,7 +635,7 @@
     "backgroundRagingRiverText": "Río Furioso",
     "backgroundVineyardNotes": "Explora un fértil viñedo en toda su extensión.",
     "backgroundAutumnLakeshoreNotes": "Párate un momento en la orilla de un lago otoñal para apreciar el reflejo del bosque en sus aguas.",
-    "backgrounds092021": "CONJUNTO 88: Publicado en septiembre de 2021",
+    "backgrounds092021": "88.ª serie: publicada en septiembre de 2021",
     "backgroundAutumnPoplarsNotes": "Regocíjate en las brillantes sombras marrones y doradas de un bosque de álamos otoñales.",
     "backgroundVineyardText": "Viñedo",
     "backgroundAutumnLakeshoreText": "Orilla de lago otoñal",
@@ -699,7 +699,7 @@
     "backgroundOnACastleWallText": "En un Muro de Castillo",
     "backgroundEnchantedMusicRoomText": "Sala de Música Encantada",
     "backgroundEnchantedMusicRoomNotes": "Tocar en una Sala de Música Encantada.",
-    "backgrounds052022": "SET 96  : Publicado en Mayo de 2022",
+    "backgrounds052022": "96.ª serie: publicada en mayo de 2022",
     "backgroundUnderwaterStatuesText": "Jardín de Estatuas Subacuático",
     "backgroundOnACastleWallNotes": "Mira hacia fuera desde un Muro de Castillo.",
     "backgroundUnderwaterStatuesNotes": "Intenta no parpadear en un Jardín de Estatuas Subacuático.",
@@ -717,5 +717,12 @@
     "backgroundMountainWaterfallText": "Cascada de Montaña",
     "backgroundMountainWaterfallNotes": "Admira una cascada de montaña.",
     "backgroundSailboatAtSunsetText": "Velero en la Puesta de Sol",
-    "backgroundSailboatAtSunsetNotes": "Disfruta de la belleza de un velero en la puesta de sol."
+    "backgroundSailboatAtSunsetNotes": "Disfruta de la belleza de un velero en la puesta de sol.",
+    "backgrounds092022": "100.ª serie: publicada en septiembre 2022",
+    "backgroundTheatreStageText": "Escenario de teatro",
+    "backgroundTheatreStageNotes": "Actúa en un escenario de teatro.",
+    "backgroundAutumnPicnicText": "Picnic otoñal",
+    "backgroundAutumnPicnicNotes": "Disfruta un picnic otoñal.",
+    "backgroundOldPhotoText": "Foto antigua",
+    "backgroundOldPhotoNotes": "Posa en una foto antigua."
 }
diff --git a/website/common/locales/es/front.json b/website/common/locales/es/front.json
index 5394f5f2e5..4f89c625ba 100644
--- a/website/common/locales/es/front.json
+++ b/website/common/locales/es/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "y la",
     "chores": "Tareas del hogar",
     "clearBrowserData": "Borrar datos del navegador",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Complementos y Extensiones</a>",
+    "communityExtensions": "Complementos y Extensiones",
     "communityFacebook": "Facebook",
     "companyAbout": "Cómo funciona",
     "companyBlog": "Blog",
-    "companyContribute": "Contribuir",
-    "companyDonate": "Donar",
+    "companyContribute": "Contribuir a Habitica",
+    "companyDonate": "Donar a Habitica",
     "forgotPassword": "¿Has olvidado la contraseña?",
     "emailNewPass": "Enviar un link de cambio de contraseña",
     "forgotPasswordSteps": "Introduce tu nombre de usuario o la dirección de correo electrónico que utilizaste para registrarte en Habitica.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "¿Quieres convertir tu vida en un juego?",
     "marketing4Lead3-2": "¿Estás interesado en llevar un grupo de educación, bienestar y mucho más?",
     "marketing4Lead3Title": "Juega con Todo",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Aplicación de Android",
+    "mobileIOS": "Aplicación de iOS",
     "oldNews": "Noticias",
     "newsArchive": "Archivo de noticias en Wikia (multilingüe)",
     "setNewPass": "Establecer nueva contraseña",
@@ -187,5 +187,6 @@
     "minPasswordLength": "La contraseña debe contener 8 caracteres o más.",
     "enterHabitica": "Adéntrate en Habitica",
     "emailUsernamePlaceholder": "p.e., habitrabbit o gryphon@example.com",
-    "socialAlreadyExists": "Esta identificación social ya está vinculado a una cuenta Habitica existente."
+    "socialAlreadyExists": "Esta identificación social ya está vinculado a una cuenta Habitica existente.",
+    "footerProduct": "Producto"
 }
diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index e831724e2e..0776f4daa8 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -1054,30 +1054,30 @@
     "headSpecialSpring2018HealerNotes": "Las gemas pulidas de este anillo mejorarán tu energía mental. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2018.",
     "headSpecialSummer2018RogueText": "Sombrero de Pescador de Ala Ancha",
     "headSpecialSummer2018RogueNotes": "Proporciona comodidad y protección contra el fuerte resplandor del sol de verano sobre el agua. ¡Especialmente importante si estás más acostumbrado a mantenerte sigiloso en las sombras! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2018.",
-    "headSpecialSummer2018WarriorText": "Barbuta de pez beta",
-    "headSpecialSummer2018WarriorNotes": "¡Demuestra a todos que eres el beta alfa con este extravagante casco! Aumenta la Fuerza en <%= str %>. Equipo de Verano Edición Limitada del 2018.",
-    "headSpecialSummer2018MageText": "Cresta de pez león",
-    "headSpecialSummer2018MageNotes": "Deslumbra dolorosamente a cualquiera que se atreva a decir que te ves como un \"pez sabroso\". Aumenta la Percepción en <%= per %>. Equipo de Verano Edición Limitada del 2018.",
-    "headSpecialSummer2018HealerText": "Corona de monarca sirena",
-    "headSpecialSummer2018HealerNotes": "Adornado con aguamarina, esta aletuda diadema marca el liderazgo de la gente, los peces y aquellos que son un poco de ambos. Aumenta la Inteligencia en <%= int %>. Equipo de Verano Edición Limitada del 2018.",
+    "headSpecialSummer2018WarriorText": "Barbuta de Pez Beta",
+    "headSpecialSummer2018WarriorNotes": "¡Demuestra a todos que eres el beta alfa con este extravagante casco! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2018.",
+    "headSpecialSummer2018MageText": "Cresta de Pez León",
+    "headSpecialSummer2018MageNotes": "Deslumbra dolorosamente a cualquiera que se atreva a decir que te ves como un \"pez sabroso\". Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2018.",
+    "headSpecialSummer2018HealerText": "Corona de Monarca Sirena",
+    "headSpecialSummer2018HealerNotes": "Adornado con aguamarina, esta aletuda diadema marca el liderazgo de la gente, los peces y aquellos que son un poco de ambos. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2018.",
     "headSpecialFall2018RogueText": "Cara de Alter Ego",
-    "headSpecialFall2018RogueNotes": "La mayoría de nosotros nos escondemos de nuestras luchas internas. Esta máscara muestra que todos nosotros experimentamos la tensión entre nuestros buenos y malos impulsos. ¡Además, viene con un dulce sombrero! Aumenta la Percepción en <%= per %>. Edición Limitada de Equipamiento de Otoño 2018.",
+    "headSpecialFall2018RogueNotes": "La mayoría de nosotros nos escondemos de nuestras luchas internas. Esta máscara muestra que todos nosotros experimentamos la tensión entre nuestros buenos y malos impulsos. ¡Además, viene con un dulce sombrero! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2018.",
     "headSpecialFall2018WarriorText": "Careta de Minotauro",
-    "headSpecialFall2018WarriorNotes": "¡Esta terrorífica máscara muestra que realmente se puede coger el toro por los cuernos! Aumenta la Fuerza en <%= str %>. Edición Limitada de Equipamiento de Otoño 2018.",
+    "headSpecialFall2018WarriorNotes": "¡Esta terrorífica máscara muestra que realmente se puede coger el toro por los cuernos! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2018.",
     "headSpecialFall2018MageText": "Sombrero de Golomante",
-    "headSpecialFall2018MageNotes": "Este sombrero puntiagudo está imbuido de poderosos hechizos dulcificadores. ¡Cuidado, que si se moja se vuelve pegajoso! Aumenta la Percepción en <%= per %>. Edición Limitada de Equipamiento de Otoño 2018.",
+    "headSpecialFall2018MageNotes": "Este sombrero puntiagudo está imbuido de poderosos hechizos dulcificadores. ¡Cuidado, que si se moja se vuelve pegajoso! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2018.",
     "headSpecialFall2018HealerText": "Yelmo Hambriento",
-    "headSpecialFall2018HealerNotes": "Este yelmo ha sido creado a partir de una planta carnívora conocida por su habilidad de despachar zombies y otras inconveniencias. Tú solo vigila que no se ponga a mascar tu cabeza. Aumenta la Inteligencia en <%= int %>. Edición Limitada de Equipamiento de Otoño 2018.",
+    "headSpecialFall2018HealerNotes": "Este yelmo ha sido creado a partir de una planta carnívora conocida por su habilidad de despachar zombies y otras inconveniencias. Tú solo vigila que no se ponga a mascar tu cabeza. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2018.",
     "headSpecialNye2018Text": "Sombrero de Fiesta Extravagante",
     "headSpecialNye2018Notes": "¡Has recibido un Sombrero de Fiesta Extravagante! Llévalo con orgullo mientras celebras el Año Nuevo! No otorga ningún beneficio.",
     "headSpecialWinter2019RogueText": "Yelmo Flor de Navidad",
-    "headSpecialWinter2019RogueNotes": "Este frondoso yelmo alcanzará su rojo más brillante sobre los días más oscuros del invierno, ¡ayudándote a camuflarte con la decoración navideña! Aumenta la Percepción en <%= per %>. Equipamiento Invernal Edición Limitada 2018-2019.",
+    "headSpecialWinter2019RogueNotes": "Este frondoso yelmo alcanzará su rojo más brillante sobre los días más oscuros del invierno, ¡ayudándote a camuflarte con la decoración navideña! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2018-2019.",
     "headSpecialWinter2019WarriorText": "Yelmo Glacial",
-    "headSpecialWinter2019WarriorNotes": "¡Es importante mantener la cabeza fría! Este yelmo helado te protegerá de los golpes de tus enemigos. Aumenta la Fuerza en <%= str %>. Equipamiento Invernal Edición Limitada 2018-2019.",
+    "headSpecialWinter2019WarriorNotes": "¡Es importante mantener la cabeza fría! Este yelmo helado te protegerá de los golpes de tus enemigos. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de invierno 2018-2019.",
     "headSpecialWinter2019MageText": "Fuegos Artificiales Llameantes",
-    "headSpecialWinter2019MageNotes": "¡Retrocede y ve las chispas volar! ¡Tus tareas no tienen nada que hacer contra este poder! Aumenta la Percepción en <%= per %>. Equipamiento Invernal Edición Limitada 2018-2019.",
+    "headSpecialWinter2019MageNotes": "¡Retrocede y ve las chispas volar! ¡Tus tareas no tienen nada que hacer contra este poder! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2018-2019.",
     "headSpecialWinter2019HealerText": "Corona Estrellada",
-    "headSpecialWinter2019HealerNotes": "En la noche invernal mas oscura y fría hay una estrella en particular que es la más brillante. Esta corona está hecha del metal de esa estrella, ¡para ayudarte a brillar! Aumenta la Inteligencia en <%= int %>. Equipamiento de Invierno Edición Limitada de 2018-2019.",
+    "headSpecialWinter2019HealerNotes": "En la noche invernal mas oscura y fría hay una estrella en particular que es la más brillante. Esta corona está hecha del metal de esa estrella, ¡para ayudarte a brillar! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2018-2019.",
     "headSpecialGaymerxText": "Casco de Guerrero de Arco Iris",
     "headSpecialGaymerxNotes": "Con motivo de la celebración por la Conferencia GaymerX, ¡este casco especial está decorado con un radiante y colorido estampado arco iris! GaymerX es una convención de juegos que celebra a la gente LGBTQ y a los videojuegos, y está abierta a todo el público.",
     "headMystery201402Text": "Casco alado",
@@ -2038,8 +2038,8 @@
     "armorMystery202007Text": "Disfraz de orca portentosa",
     "armorMystery202006Notes": "¡Incluso entre los corales y anemonas más brillantes, esta cola destaca orgullosamente! No otorga ningún beneficio. Artículo de suscriptor de Junio 2020.",
     "armorMystery202006Text": "Cola de Tritón multicromo",
-    "headSpecialSpring2019WarriorNotes": "¡Este yelmo es irrompible y resistente! También atrae mariposas. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada primavera 2019.",
-    "headSpecialSpring2019RogueNotes": "Nadie va a percatarse de una nube flotando discretamente hacia su alijo de Oro, ¿Verdad? Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada primavera 2019.",
+    "headSpecialSpring2019WarriorNotes": "¡Este yelmo es irrompible y resistente! También atrae mariposas. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2019.",
+    "headSpecialSpring2019RogueNotes": "Nadie va a percatarse de una nube flotando discretamente hacia su alijo de Oro, ¿Verdad? Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2019.",
     "headSpecialKS2019Notes": "Adornado a semejanza de un Grifo y emplumado, este glorioso yelmo simboliza la forma en la que tus habilidades y porte sirven de ejemplo a otros. Aumenta la Inteligencia en <%= int %>.",
     "headSpecialPiDayNotes": "Intenta mantener este trozo de deliciosa tarta en equilibrio sobre tu cabeza mientras caminas en círculo. ¡O lanzaselo a una Tarea diaria roja! O podrías simplemente comertelo. ¡Tú eliges! No otorga ningún beneficio.",
     "armorArmoireBlueMoonShozokuNotes": "Una extraña serenidad rodea a quien porta esta armadura. Aumenta la Constitución en <%= con %>. Armario Encantado: Conjunto de Pícaro de la luna azul (artículo 4 de 4).",
@@ -2063,7 +2063,7 @@
     "armorSpecialBirthday2021Notes": "¡Feliz cumpleaños, Habitica! Viste estas Túnicas Extravagantes de Fiesta para celebrar este maravilloso día. No otorga ningún beneficio.",
     "armorSpecialBirthday2021Text": "Túnica Extravagante de Fiesta",
     "weaponMystery202102Notes": "¡La brillante gema rosa en esta varita tiene el poder de propagar la felicidad y la amistad por todas partes! No otorga ningún beneficio. Artículo de suscriptor de Febrero 2021.",
-    "headSpecialSpring2019MageNotes": "Una resplandeciente gema ámbar otorga a este sombrero el poder de fuerzas naturales arcanas. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada Primavera 2019.",
+    "headSpecialSpring2019MageNotes": "Una resplandeciente gema ámbar otorga a este sombrero el poder de fuerzas naturales arcanas. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2019.",
     "armorArmoireBoxArmorNotes": "Armadura de cajas: Si te encaja, te sientas dentro... ehm, la vistes para la batalla, ¡Cómo el valiente caballero que eres! Aumenta la Percepción y la Constitución en <%= attrs %>. Armario Encantado: Conjunto de caballero de papel (artículo 3 de 3).",
     "armorMystery202102Notes": "Navega a través del universo con estilo en este alegremente brillante vestido. No otorga ningún beneficio. Artículo de suscriptor de Febrero 2021.",
     "shieldArmoireBirthdayBannerText": "Banner de cumpleaños",
@@ -2073,19 +2073,19 @@
     "shieldSpecialKS2019Notes": "Brillando como la cáscara de un huevo de grifo, este magnífico escudo te muestra cómo estar listo para ayudar cuando tus propias cargas son ligeras. Aumenta la percepción en un <%= per %>.",
     "shieldSpecialKS2019Text": "Escudo de grifo mítico",
     "shieldSpecialPiDayNotes": "¡Te desafiamos a que calcules la relación entre la circunferencia de este escudo y su delicia! No otorga ningún beneficio.",
-    "headSpecialSummer2019RogueNotes": "Este yelmo le ofrece una vista de 360 grados de las aguas circundantes, lo que es perfecto para acercarse sigilosamente a los Dailies rojos desprevenidos. Aumenta la percepción en un <%= per %>. Equipo de verano de edición limitada 2019.",
-    "headSpecialSpring2019HealerNotes": "Prepárate para el primer día de primavera con este lindo yelmo con pico. Aumenta la inteligencia en <%= int %>. Spring Gear de edición limitada 2019.",
+    "headSpecialSummer2019RogueNotes": "Este yelmo le ofrece una vista de 360 grados de las aguas circundantes, lo que es perfecto para acercarse sigilosamente a los Dailies rojos desprevenidos. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2019.",
+    "headSpecialSpring2019HealerNotes": "Prepárate para el primer día de primavera con este lindo yelmo con pico. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2019.",
     "armorArmoireMatchMakersApronNotes": "Este delantal es por seguridad, pero por el bien del humor podemos tomarlo a la ligera. Aumenta la Constitución, la Fuerza y la Inteligencia en un <%= attrs %> cada uno. Armario encantado: Conjunto de Cerillero (artículo 1 de 4).",
-    "headSpecialWinter2020RogueText": "Gorra de calcetín mullido",
+    "headSpecialWinter2020RogueText": "Gorra de Calcetín Mullido",
     "headSpecialNye2019Notes": "¡Has recibido un gorro de fiesta escandaloso! ¡Llévalo con orgullo mientras das la bienvenida al año nuevo! No otorga ningún beneficio.",
-    "headSpecialNye2019Text": "Gorro de fiesta escandaloso",
-    "headSpecialFall2019HealerNotes": "Ponte esta oscura mitra para usar los poderes del temible Liche. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada Otoño 2019.",
-    "headSpecialFall2019WarriorNotes": "Las oscuras cuencas de este casco de calavera desalentarán al más bravo de tus enemigos. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada Otoño 2019.",
-    "headSpecialFall2019MageNotes": "Su único y funesto ojo inhibe la percepción de la profundidad, pero ese es un pequeño precio a pagar por la forma en la que afila tu atención, concentrandola inténsamente en un único punto. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada Otoño 2019.",
-    "headSpecialFall2019RogueNotes": "¿Encontraste este tocado en una subasta de prendas posiblemente malditas o en el ático de un abuelo excéntrico? Cualquiera que sea su origen, su edad y desgaste te aportan un aire de misterio. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada Otoño 2019.",
-    "headSpecialSummer2019HealerNotes": "La estructura en espiral de esta concha te ayudará a escuchar cualquier llamada de auxilio a lo ancho de los siete mares. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada Verano 2019.",
-    "headSpecialSummer2019MageNotes": "En contra de la creencia popular, tu cabeza no es un lugar apropiado para que se posen las ranas. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada Verano 2019.",
-    "headSpecialSummer2019WarriorNotes": "No te permitirá esconder la cabeza entre los hombros, pero te protegerá si te chocas contra el casco de un barco. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada Verano 2019.",
+    "headSpecialNye2019Text": "Gorro de Fiesta Escandaloso",
+    "headSpecialFall2019HealerNotes": "Ponte esta oscura mitra para usar los poderes del temible Liche. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2019.",
+    "headSpecialFall2019WarriorNotes": "Las oscuras cuencas de este casco de calavera desalentarán al más bravo de tus enemigos. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2019.",
+    "headSpecialFall2019MageNotes": "Su único y funesto ojo inhibe la percepción de la profundidad, pero ese es un pequeño precio a pagar por la forma en la que afila tu atención, concentrandola inténsamente en un único punto. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2019.",
+    "headSpecialFall2019RogueNotes": "¿Encontraste este tocado en una subasta de prendas posiblemente malditas o en el ático de un abuelo excéntrico? Cualquiera que sea su origen, su edad y desgaste te aportan un aire de misterio. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2019.",
+    "headSpecialSummer2019HealerNotes": "La estructura en espiral de esta concha te ayudará a escuchar cualquier llamada de auxilio a lo ancho de los siete mares. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2019.",
+    "headSpecialSummer2019MageNotes": "En contra de la creencia popular, tu cabeza no es un lugar apropiado para que se posen las ranas. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2019.",
+    "headSpecialSummer2019WarriorNotes": "No te permitirá esconder la cabeza entre los hombros, pero te protegerá si te chocas contra el casco de un barco. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2019.",
     "headArmoireBlueMoonHelmNotes": "Este yelmo ofrece una asombrosa cantidad de suerte a quien lo lleva, y su uso sigue a eventos excepcionales. Aumenta la inteligencia en <%= int%>. Armario encantado: Conjunto de Pícaro de la luna azul (artículo 3 de 4).",
     "headArmoireJadeHelmNotes": "Hay quien dice que el jade reduce el miedo y la ansiedad. ¡Con este hermoso yelmo, definitivamente no tendrás motivo para preocuparte! Aumenta la Constitución en <%= con %>.. Armario Encantado: Conjunto de guerrero de jade (artículo 1 de 3).",
     "weaponArmoireJadeGlaiveNotes": "¡El alcance de esta guja te mantendrá lejos de tus enemigos! Además, puedes alcanzar cosas de estantes altos. Aumenta la Fuerza en <%= str %>. Armario Encantado: Conjunto de guerrero de jade (artículo 3 de 3).",
@@ -2162,7 +2162,7 @@
     "armorSpecialSummer2021MageText": "Concha de Espiral",
     "armorArmoireHeraldsTunicText": "Túnica de heraldo",
     "armorArmoireBathtubNotes": "¿Hora de relajarse un poco? Aquí tienes tu bañera personal (¡y la garantía de que el agua estará siempre a la temperatura perfecta!) Aumenta la constitución en <%= con %>. Armario Encantado: Conjunto de baño de burbujas (artículo 3 de 4).",
-    "headSpecialWinter2020RogueNotes": "Cuando un pícaro camina entre callejones con este sombrero, todo el mundo sabe que no le tiene miedo a nada. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de invierno 2019-2020.",
+    "headSpecialWinter2020RogueNotes": "Cuando un pícaro camina entre callejones con este sombrero, todo el mundo sabe que no le tiene miedo a nada. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2019-2020.",
     "armorSpecialSpring2021WarriorNotes": "¡Ten cuidado de no deslumbrarte a ti mismo cuando la luz se refleje sobre esta armadura de piedra solar! Aumenta la Constitución en <%= con %>. Equipamiento de edición limitada de primavera 2021.",
     "armorSpecialSpring2021RogueText": "Tallo de Flores Gemelas",
     "armorSpecialFall2021RogueText": "Armadura Desgraciadamente No Impermeable",
diff --git a/website/common/locales/es/groups.json b/website/common/locales/es/groups.json
index fd8fb6cabd..4879c23373 100644
--- a/website/common/locales/es/groups.json
+++ b/website/common/locales/es/groups.json
@@ -162,11 +162,11 @@
     "onlyCreatorOrAdminCanDeleteChat": "¡No estás autorizado para borrar este mensaje!",
     "onlyGroupLeaderCanEditTasks": "¡No estás autorizado para manejar las tareas!",
     "onlyGroupTasksCanBeAssigned": "Sólo pueden ser asignadas tareas del grupo",
-    "assignedTo": "Asignar a",
-    "assignedToUser": "Asignado a <strong><%- userName %></strong>",
-    "assignedToMembers": "Asignado a <strong><%= userCount %> members</strong>",
-    "assignedToYouAndMembers": "Asignado a <strong><%= userCount %> members</strong> miembros y a ti",
-    "youAreAssigned": "Asignada a ti",
+    "assignedTo": "Asignado a",
+    "assignedToUser": "Asignado: <strong>@<%- userName %></strong>",
+    "assignedToMembers": "<%= userCount %> usuarios",
+    "assignedToYouAndMembers": "<strong>Tú</strong>, <%= userCount %> usuarios",
+    "youAreAssigned": "Asignado: <strong>tú</strong>",
     "taskIsUnassigned": "Esta tarea está sin asignar",
     "confirmUnClaim": "¿Estás seguro de querer cancelar esta tarea?",
     "confirmNeedsWork": "¿Estás seguro de querer marcar esta tarea como trabajo necesario?",
@@ -356,7 +356,7 @@
     "PMCanNotReply": "No puedes responder a esta conversación",
     "unassigned": "Sin asignar",
     "claimRewards": "Reclama recompensas",
-    "assignedDateAndUser": "Asignada por <strong>@<%- username %></strong> el <strong><%= date %></strong>",
+    "assignedDateAndUser": "Asignada por @<%- username %> en <%= date %>",
     "assignedDateOnly": "Asignada el <strong><%= date %></strong>",
     "managerNotes": "Notas del administrador",
     "bannedWordsAllowedDetail": "Con esta opción seleccionada, se permitirá el uso de palabras vetadas en este gremio.",
@@ -364,7 +364,7 @@
     "languageSettings": "Ajustes de idioma",
     "thisTaskApproved": "Esta tarea fue aprobada",
     "onlyPrivateGuildsCanUpgrade": "Sólo los Gremios privados pueden mejorarse a un plan de grupo.",
-    "chooseTeamMember": "Elije a un miembro del equipo",
+    "chooseTeamMember": "Busca a un miembro del equipo",
     "cannotRemoveQuestOwner": "No puedes eliminar el dueño delmisión activo. Abandonar el misión primero.",
     "features": "Características",
     "giftMessageTooLong": "La longitud máxima para los mensajes de regalo es <%= maxGiftMessageLength %>.",
@@ -378,5 +378,11 @@
     "joinParty": "Unirse al Equipo",
     "editGuild": "Editar Gremio",
     "editParty": "Editar Equipo",
-    "leaveGuild": "Dejar el Gremio"
+    "leaveGuild": "Dejar el Gremio",
+    "dayStart": "<strong>Día de inicio</strong>: <%= startTime %>",
+    "viewStatus": "Estado",
+    "youEmphasized": "<strong>Tú</strong>",
+    "sendGiftTotal": "Total:",
+    "newGroupsWhatsNew": "Comprueba qué hay de nuevo:",
+    "newGroupsBullet02": "Cualquiera puede completar una tarea sin asignar"
 }
diff --git a/website/common/locales/es/limited.json b/website/common/locales/es/limited.json
index 528dfacb02..be7ba1e5b9 100644
--- a/website/common/locales/es/limited.json
+++ b/website/common/locales/es/limited.json
@@ -229,5 +229,7 @@
     "summer2022WaterspoutWarriorSet": "Tromba marina (Guerrero)",
     "summer2022AngelfishHealerSet": "Pez ángel (Sanador)",
     "julyYYYY": "Julio de <%= year %>",
-    "octoberYYYY": "Octubre de <%= year %>"
+    "octoberYYYY": "Octubre de <%= year %>",
+    "fall2022HarpyMageSet": "Arpía (Mago)",
+    "fall2022OrcWarriorSet": "Orca (Guerrero)"
 }
diff --git a/website/common/locales/es/npc.json b/website/common/locales/es/npc.json
index 826a0dd017..49914c55db 100644
--- a/website/common/locales/es/npc.json
+++ b/website/common/locales/es/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "¡Nuevas Novedades de Bailey!",
     "tellMeLater": "Dímelo más tarde",
     "dismissAlert": "Descartar este aviso",
-    "donateText3": "Habitica es un proyecto de código abierto que depende del soporte de sus usuarios. El dinero que gastes en gemas nos ayuda a mantener activos los servidores, mantener al pequeño grupo de personal, desarrollar nuevas caracteristicas y proveer incentivos para nuestros programadores voluntarios. ¡Gracias por tu generosidad!",
+    "donateText3": "Habitica es un proyecto de código abierto que depende del soporte de sus usuarios. El dinero que gastes en gemas nos ayuda a mantener activos los servidores, mantener al pequeño grupo de personal, desarrollar nuevas características y proveer incentivos para nuestros voluntarios.",
     "card": "Tarjeta de crédito",
     "paymentMethods": "Comprar con",
     "paymentSuccessful": "¡El pago se llevó a cabo con éxito!",
diff --git a/website/common/locales/es/questscontent.json b/website/common/locales/es/questscontent.json
index f5b83e5156..cb7edc8a2a 100644
--- a/website/common/locales/es/questscontent.json
+++ b/website/common/locales/es/questscontent.json
@@ -60,7 +60,7 @@
     "questSpiderUnlockText": "Desbloquea la compra de huevos de araña en el Mercado",
     "questGroupVice": "Vicio, el Gusano de las Sombras",
     "questVice1Text": "Vicio, Parte 1: Libérate de la Influencia del Dragón",
-    "questVice1Notes": "<p>Se dice que un terrible diablo descansa en las cavernas del Monte Habitica. ¡Un monstruo cuya presencia retuerce la voluntad de los fuertes héroes de la tierra, volviéndolos hacia los malos hábitos y la pereza! La bestia es un gran dragón de inmenso poder y compuesto de las mismísimas sombras: Vicio, el traicionero Gusano de las Sombras. Los valientes Habitantes, levantaos y derrotad a esta repugnante bestia de una vez por todas, pero solo si crees que puedes soportar su inmenso poder.</p><h3>Vicio Parte 1: </h3><p>¿Cómo puedes pretender luchar contra la bestia si ya te controla? ¡No caigas víctima de la pereza y el vicio! ¡Trabaja duro para luchar contra la oscura influencia del dragón y desvanece su control sobre ti!</p>",
+    "questVice1Notes": "Se dice que un terrible diablo descansa en las cavernas del Monte Habitica. ¡Un monstruo cuya presencia retuerce la voluntad de los fuertes héroes de la tierra, volviéndolos hacia los malos hábitos y la pereza! La bestia es un gran dragón de inmenso poder y compuesto de las mismísimas sombras: Vicio, el traicionero Gusano de las Sombras. Los valientes Habitantes, levantaos y derrotad a esta repugnante bestia de una vez por todas, pero solo si crees que puedes soportar su inmenso poder.<br><br>¿Cómo puedes pretender luchar contra la bestia si ya te controla? ¡No caigas víctima de la pereza y el vicio! ¡Trabaja duro para luchar contra la oscura influencia del dragón y desvanece su control sobre ti!",
     "questVice1Boss": "Sombra de Vice",
     "questVice1Completion": "Con la influencia de Vicio sobre ti tras haber sido desencantado, sientes una oleada de fuerza que no sabías que había regresado a ti. ¡Felicidades! Sin embargo, un enemigo más aterrador te espera...",
     "questVice1DropVice2Quest": "Vicio Parte 2 (Pergamino)",
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Hipo (Huevo)",
     "questHippoUnlockText": "Desbloquea la compra de huevos de hipopótamo en el Mercado",
     "farmFriendsText": "Lote de Misiones de Amigos Granjeros",
-    "farmFriendsNotes": "Contiene 'La Vaca Muutante', 'Cabalga el Potro de Pesadilla', y 'El Carnero Trueno'. Disponible hasta el 31 de agosto.",
+    "farmFriendsNotes": "Contiene 'La Vaca Muutante', 'Cabalga el Potro de Pesadilla', y 'El Carnero Trueno'. Disponible hasta el 30 de septiembre.",
     "witchyFamiliarsText": "Lote de Misiones de Familiares Brujos",
     "witchyFamiliarsNotes": "Contiene 'El Rey Rata', 'El Arácnido Helado', y 'Pantano de la Rana Desastrosa'. Disponible hasta el 31 de octubre.",
     "questGroupLostMasterclasser": "Misterio de los Maestros de Clase",
@@ -604,7 +604,7 @@
     "cuddleBuddiesText": "Lote de Misiones Compañeros Abrazados",
     "cuddleBuddiesNotes": "Contiene \"El Conejito Asesino\", \"El Hurón Malvado\", y \"La Pandilla de Cobayas\". Disponible hasta el 31 de marzo.",
     "aquaticAmigosText": "Lote de Misiones de Amigos Acuáticos",
-    "aquaticAmigosNotes": "Contiene 'El ajolote mágico', 'El Kraken del Inkompleto' y 'La llamada de Octothulu'. Disponible hasta el 31 de agosto.",
+    "aquaticAmigosNotes": "Contiene 'El ajolote mágico', 'El Kraken del Inkompleto' y 'La llamada de Octothulu'. Disponible hasta el 30 de junio.",
     "questSeaSerpentText": "Peligro en las profundidades: ¡Ataque de la serpiente marina!",
     "questSeaSerpentNotes": "Tus manchas te hacen sentir afortunado: es el momento perfecto para un viaje a la pista de carreras de caballitos de mar. Abordas el submarino en Muelles Diligentes y te acomodas para el viaje a Dilatoria, pero apenas te has sumergido cuando un impacto sacude el submarino, haciendo que sus ocupantes caigan.\n– ¿Qué está pasando? –grita @AriesFaries. <br><br>Miras a través de un ojo de buey cercano y te sorprende la pared de escamas brillantes que pasan por allí.\n–¡Serpiente de mar! –aclama el capitán @Witticaster a través del intercomunicador–. ¡Preparaos, viene otra vez!\nMientras agarras los brazos de tu asiento, tus tareas inconclusas parpadean ante tus ojos. \"Quizás si trabajamos juntos y los completamos\", piensas, \"¡podemos alejar a este monstruo!\"",
     "questSeaSerpentCompletion": "Maltrecha por tu compromiso, la serpiente marina huye, desapareciendo en las profundidades. Cuando llegas a Dilatoria, sueltas un suspiro de alivio antes de ver que @*~Seraphina~ se acerca con tres huevos translúcidos acunados en sus brazos.\n– Aquí, debes quedarte con esto –dice ella–. ¡Sabes cómo manejar una serpiente marina!\nAl aceptar los huevos, prometes nuevamente mantenerte firme al completar tus tareas para asegurarte de que no vuelva a ocurrir.",
@@ -667,7 +667,7 @@
     "questSilverNotes": "El reciente descubrimiento de las pociones de eclosión de bronce se comenta por toda Habitica. ¿Podría haber pociones de metales aún más brillantes? Te diriges a la biblioteca pública central de Villahábito, acompañado de @QuartzFox y @starsystemic, y reúnes grandes cantidades de libros sobre alquimia para estudiar. <br><br> Después de horas de trabajo agotador, @QuartzFox deja escapar un grito de triunfo bastante poco apropiado para la biblioteca. \"¡Ajá! ¡Lo he encontrado! ”Te apresuras a ver. \"Se puede hacer una poción de incubación de plata con runas del signo del zodiaco Cáncer, disueltas en plata pura derretida sobre una llama infundida con el poder de las runas de la Luna\". <br><br> \"Necesitaremos muchos de esos ingredientes\", murmura @starsystemic. \"Por si algún intento sale mal\". <br><br> \"Solo hay un lugar para encontrar cantidades tan grandes de materiales de fabricación de todo tipo\", dice @Edge, de pie a la sombra de las estanterías con los brazos cruzados. ¿Habrá estado allí todo el tiempo? “Las mazmorras del trabajo pesado. Vámonos.\"",
     "questDolphinCompletion": "Tu batalla de voluntades con el delfín te ha dejado cansado pero victorioso. Con su determinación y aliento, @mewrose, @khdarkwolf y @confusedcicada se levantan y se sacuden la insidiosa telepatía del delfín. Los cuatro os refugiáis con una sensación de logro en vuestras consistentes tareas diarias, hábitos fuertes y tareas completadas hasta que cierra sus ojos brillantes, en un reconocimiento silencioso de vuestros éxitos. Con eso, vuelve a caer en la bahía. Al intercambiar saludos y felicitaciones, notas que tres huevos se asoman en la tierra. <br><br> “Hm, me pregunto qué podemos hacer con ellos”, reflexiona @khdarkwolf.",
     "questDolphinNotes": "Caminas por las orillas de la Bahía Inkompleta, reflexionando sobre el desalentador trabajo que tienes por delante. Un chapoteo en el agua llama tu atención. Un magnífico delfín se arquea sobre las olas. La luz del sol brilla sobre sus aletas y su cola. Pero, espera... Eso no es la luz del sol, y el delfín no vuelve a sumergirse en el mar. Fija su mirada en @khdarkwolf. <br><br> \"Nunca terminaré todas estas tareas diarias\", dijo @khdarkwolf. <br><br> \"No soy lo suficientemente bueno como para alcanzar mis metas\", dijo @confusedcicada cuando el delfín les dirigió su mirada. <br><br> \"¿Por qué me molesté en intentarlo?\", preguntó @mewrose, marchitándose bajo la mirada de la bestia. <br><br> Sus ojos se encuentran con los tuyos y sientes cómo tu mente comienza a hundirse bajo la creciente ola de dudas. Pero te plantas; ¡alguien tiene que derrotar a esta criatura, y serás tú!",
-    "delightfulDinosNotes": "Contiene \"El Terror-dáctilo\", \"El Aplastante Triceratops\" y \"El Dinosaurio Desenterrado\". Disponible hasta el 30 de noviembre.",
+    "delightfulDinosNotes": "Contiene \"El Terror-dáctilo\", \"El Aplastante Triceratops\" y \"El Dinosaurio Desenterrado\". Disponible hasta el 31 de mayo.",
     "delightfulDinosText": "Lote de Misiones de Dinos Encantadores",
     "questAmberText": "La Alianza Ámbar",
     "questAmberCompletion": "“¿Trerezina?” apeló @-Tyr- con calma . “¿Podrías soltar a @Vikte? No creo que lo esté pasando demasiado bien ahí arriba.”<br><br>La piel ámbar de Trerezina se sonrojó, soltando gentilmente a @Vikte sobre el suelo. “¡Mis disculpas!¡Hacía tanto que no tenía invitados que he olvidado mis modales!”. Se deslizó hacia a ti para saludarte adecuadamente antes de desaparecer en su casa del árbol, ¡volviendo cargada de pociones de eclosión ámbar como regalo de agradecimiento!<br><br>“¡Pociones mágicas!” exclamó @Vikte.<br><br>“¿Oh, estas viejas cosas?” La lengua de Trerezina siseó mientras pensaba. “¿Qué os parece esto? Os daré este montón de pociones si prometéis visitarme de vez en cuando...”<br><br>Y así, abandonamos el Bosquetarea, emocionados por contar a todo el mundo lo de las nuevas pociones, ¡y lo de tu nueva amiga!",
diff --git a/website/common/locales/es/settings.json b/website/common/locales/es/settings.json
index c7c18cbcf0..e059f89673 100644
--- a/website/common/locales/es/settings.json
+++ b/website/common/locales/es/settings.json
@@ -42,7 +42,7 @@
     "sureChangeCustomDayStartTime": "¿Estás seguro de que quieres cambiar tu inicio de día personalizado? Tus tareas se reiniciarán la primera vez que uses Habitica después de las <%= time %>. ¡Asegúrate de completar tu Tareas Diarias antes de entonces!",
     "customDayStartHasChanged": "Ha cambiado tu inicio de día personalizado.",
     "nextCron": "Tus tareas diarias se restablecerán la próxima vez que uses Habitica a partir del <%= time %>. ¡No te olvides de completar las tareas diarias antes de esa hora!",
-    "customDayStartInfo1": "De forma predeterminada, Habitica comprueba si has realizado las tareas diarias y las restablece todos los días a medianoche, de acuerdo con tu zona horaria. Aquí puedes cambiar la hora a la que lo hace.",
+    "customDayStartInfo1": "Habitica comprueba y restablece tus tareas diarias a medianoche, de acuerdo con tu zona horaria. Puedes ajustar cuándo ocurre más allá del momento por defecto aquí.",
     "misc": "Varios",
     "showHeader": "Mostrar encabezamiento",
     "changePass": "Cambiar contraseña",
@@ -159,7 +159,7 @@
     "amazonPayments": "Pagos con Amazon",
     "amazonPaymentsRecurring": "Marcar la siguiente casilla es necesario para crear tu suscripción. Permite usar tu cuenta de Amazon para pagos continuados para <strong>esta</strong> suscripción. No provocará que se use tu cuenta de Amazon automáticamente para ninguna compra futura.",
     "timezone": "Zona horaria",
-    "timezoneUTC": "Habitica usa la zona horaria de tu PC, que es: <strong><%= utc %></strong>",
+    "timezoneUTC": "Tu zona horaria está establecida por tu PC, que es: <strong><%= utc %></strong>",
     "timezoneInfo": "Si esa zona horaria es incorrecta, antes que nada, vuelve a cargar esta página con el botón de actualizar del navegador para asegurarte de que Habitica disponga de la información más reciente. Si sigue siendo errónea, configura la zona horaria en tu PC y, luego, vuelve a cargar esta página una vez más.<br><br> <strong>Si usas Habitica en otros ordenadores o dispositivos móviles, la zona horaria debe ser la misma en todos ellos.</strong> Si tus tareas diarias se restablecen a una hora incorrecta, vuelve a comprobar esto en todos los demás ordenadores y en un navegador de tus dispositivos móviles.",
     "push": "Push",
     "about": "Sobre Habitica",
@@ -215,5 +215,7 @@
     "nextHourglass": "Siguiente Reloj de Arena",
     "dayStartAdjustment": "Ajuste de inicio de día",
     "adjustment": "Ajuste",
-    "nextHourglassDescription": "Los suscriptores reciben gafas \"Mystic Hour\" dentro de\nlos tres primeros días del mes."
+    "nextHourglassDescription": "Los suscriptores reciben gafas \"Mystic Hour\" dentro de\nlos tres primeros días del mes.",
+    "passwordSuccess": "Contraseña cambiada con éxito",
+    "giftSubscriptionRateText": "<strong>$<%= price %> USD</strong> por <strong><%= months %> meses</strong>"
 }
diff --git a/website/common/locales/es/subscriber.json b/website/common/locales/es/subscriber.json
index b99890a6f5..79d18477e0 100644
--- a/website/common/locales/es/subscriber.json
+++ b/website/common/locales/es/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Tu suscripción ha sido cancelada",
     "choosePaymentMethod": "Elige tu método de pago",
     "buyGemsSupportsDevs": "Comprar Gemas ayuda a los desarrolladores y permite mantener Habitica en funcionamiento",
-    "support": "APOYO",
+    "support": "Apoyo",
     "gemBenefitLeadin": "¿Qué puedes comprar con Gemas?",
     "gemBenefit1": "Trajes únicos a la moda para tu avatar.",
     "gemBenefit2": "¡Fondos para sumergir a tu avatar en el mundo de Habitica!",
@@ -204,5 +204,10 @@
     "mysterySet202204": "Conjunto de Aventurero Virtual",
     "mysterySet202206": "Juego de duendecillos del mar",
     "mysterySet202205": "Juego del dragón de alas oscuras",
-    "mysterySet202207": "Juego de la gelatina de Jammin"
+    "mysterySet202207": "Juego de la gelatina de Jammin",
+    "howManyGemsSend": "¿Cuántas Gemas te gustaría enviar?",
+    "needToPurchaseGems": "¿Necesitas comprar Gemas como un regalo?",
+    "howManyGemsPurchase": "¿Cuántas Gemas te gustaría comprar?",
+    "wantToSendOwnGems": "¿Quieres enviar tus propias Gemas?",
+    "sendAGift": "Enviar Regalo"
 }
diff --git a/website/common/locales/es/tasks.json b/website/common/locales/es/tasks.json
index 4339a598eb..a7f6b9f796 100644
--- a/website/common/locales/es/tasks.json
+++ b/website/common/locales/es/tasks.json
@@ -139,5 +139,6 @@
     "counter": "Contador",
     "resetCounter": "Resetear contador",
     "adjustCounter": "Ajustar contador",
-    "editTagsText": "Editar Etiquetas"
+    "editTagsText": "Editar Etiquetas",
+    "taskSummary": "<%= type %> Resumen"
 }
diff --git a/website/common/locales/es_419/achievements.json b/website/common/locales/es_419/achievements.json
index 88f1ba3fd2..416a024e5a 100644
--- a/website/common/locales/es_419/achievements.json
+++ b/website/common/locales/es_419/achievements.json
@@ -133,7 +133,10 @@
     "achievementReptacularRumbleText": "¡Has eclosionado todos los colores estándar de las mascotas reptiles: Caimán, Pterodáctilo, Serpiente, Triceratops, Tortuga, Tiranosaurio, y Velociraptor!",
     "achievementReptacularRumble": "Retumbado Reptacular",
     "achievementReptacularRumbleModalText": "¡Coleccionaste todas las mascotas reptiles!",
-    "achievementGroupsBeta2022Text": "Tú y tu grupo brindaron un valioso aporte para ayudar a Habitica a realizar las pruebas de la versión Beta.",
-    "achievementGroupsBeta2022ModalText": "!Tú y tus grupos han ayudado a Habitica realizando pruebas y dando sugerencias!",
-    "achievementGroupsBeta2022": "Verificador Interactivo de la Versión Beta"
+    "achievementGroupsBeta2022Text": "Tu grupo y tú brindaron un valioso aporte para ayudar Habitica a realizar pruebas.",
+    "achievementGroupsBeta2022ModalText": "¡Tus grupos y tú han ayudado Habitica realizando pruebas y dando sugerencias!",
+    "achievementGroupsBeta2022": "Verificador interactivo de la versión beta",
+    "achievementWoodlandWizardText": "¡Ha eclosionado todos los colores estándar de las criaturas del bosque: tejón, oso, venado, zorro, rana, erizo, búho, caracol, ardilla y arbolito!",
+    "achievementWoodlandWizard": "Mago del bosque",
+    "achievementWoodlandWizardModalText": "¡Has coleccionado todas las mascotas del bosque!"
 }
diff --git a/website/common/locales/es_419/front.json b/website/common/locales/es_419/front.json
index 0e0ad5cc72..36f0665165 100644
--- a/website/common/locales/es_419/front.json
+++ b/website/common/locales/es_419/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "y la",
     "chores": "Quehaceres",
     "clearBrowserData": "Borrar Datos de Navegación",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Complementos y Extensiones</a>",
+    "communityExtensions": "Complementos y Extensiones",
     "communityFacebook": "Facebook",
     "companyAbout": "Cómo Funciona",
     "companyBlog": "Blog",
diff --git a/website/common/locales/es_419/gear.json b/website/common/locales/es_419/gear.json
index f040d565ab..83697af549 100644
--- a/website/common/locales/es_419/gear.json
+++ b/website/common/locales/es_419/gear.json
@@ -2503,5 +2503,21 @@
     "armorSpecialWinter2022RogueText": "Explosión deslumbrante",
     "armorSpecialFall2021HealerText": "Manto del Invocador",
     "armorSpecialWinter2022MageNotes": "¡Los enemigos deben cuidarse del jugo de frutas cuando se acerquen a ti! Incrementa la Inteligencia en <%= int %>. Edición Limitada del Equipamiento de Invierno 2021-2022.",
-    "armorSpecialSpring2022WarriorText": "Impermeable"
+    "armorSpecialSpring2022WarriorText": "Impermeable",
+    "weaponSpecialSummer2022RogueText": "Pinza de cangrejo",
+    "weaponSpecialSummer2022WarriorText": "Ciclón remolinante",
+    "weaponSpecialSummer2022WarriorNotes": "¡Da vueltas, desvía y trae la tormenta! Incrementa la fuerza en <%= str %>. Equipamiento de edición limitada del verano del 2022.",
+    "weaponSpecialSummer2022MageText": "Vara de mantarraya",
+    "weaponSpecialSummer2022HealerText": "Burbujas beneficiosas",
+    "weaponSpecialSummer2022HealerNotes": "¡Estas burbujas liberan magia curativa en el agua con un agradable pop! Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada del verano de 2022.",
+    "weaponSpecialFall2022RogueText": "Espada de pepino",
+    "weaponSpecialFall2022RogueNotes": "Además de poder defenderte con este pepino, también es una sabrosa comida. Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada del otoño de 2022.",
+    "weaponSpecialFall2022WarriorText": "Espada desgarradora orquil",
+    "weaponSpecialFall2022MageText": "Ráfagas de viento",
+    "weaponSpecialFall2022MageNotes": "Dejas estas poderosas ráfagas al despegar a los cielos. Aumenta la inteligencia en <%= int %> y la percepción en <%= per %>. Equipamiento de edición limitada del otoño de 2022.",
+    "weaponSpecialFall2022HealerNotes": "Al declarar victoria, álzalo y pronuncia: \"¡Ojo conmigo!\" Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada del otoño del 2022.",
+    "weaponSpecialFall2022HealerText": "Ojo observador derecho",
+    "weaponSpecialSummer2022RogueNotes": "Si estás en aprietos, ¡no dudes en mostrar estas aterradoras pinzas! Incrementa la fuerza en <%= str %>. Equipamiento de edición limitada del verano de 2022.",
+    "weaponSpecialSummer2022MageNotes": "Limpia mágicamente las aguas delante tuyo con un solo movimiento. Aumenta la inteligencia en <%= int %> y la percepción en <%= per %>. Equipamiento de edición limitada del verano del 2022.",
+    "weaponSpecialFall2022WarriorNotes": "Tal vez sea más adecuada para cortar troncos u hogazas que la armadura del enemigo... de cualquier forma: ¡GRR! ¡Se ve tan aterradora! Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada del otoño de 2022."
 }
diff --git a/website/common/locales/fr/backgrounds.json b/website/common/locales/fr/backgrounds.json
index 87c0138b4c..3eefd5e757 100644
--- a/website/common/locales/fr/backgrounds.json
+++ b/website/common/locales/fr/backgrounds.json
@@ -721,5 +721,12 @@
     "backgroundRainbowEucalyptusNotes": "Admirez une forêt d'eucalyptus arc-en-ciel.",
     "backgroundByACampfireNotes": "Prélassez-vous à la lueur d'un feu de camp.",
     "backgroundMessyRoomText": "Chambre en désordre",
-    "backgroundByACampfireText": "En bordure d'un feu de camp"
+    "backgroundByACampfireText": "En bordure d'un feu de camp",
+    "backgrounds092022": "Ensemble 100 : sorti en septembre 2022",
+    "backgroundTheatreStageText": "Scène de théâtre",
+    "backgroundTheatreStageNotes": "Jouez sur une scène de théâtre.",
+    "backgroundAutumnPicnicText": "Pique-nique automnal",
+    "backgroundOldPhotoText": "Vieille photo",
+    "backgroundAutumnPicnicNotes": "Appréciez un pique-nique automnal.",
+    "backgroundOldPhotoNotes": "Prenez la pose sur une vieille photo."
 }
diff --git a/website/common/locales/fr/front.json b/website/common/locales/fr/front.json
index 78ac548244..b8a648c346 100644
--- a/website/common/locales/fr/front.json
+++ b/website/common/locales/fr/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "et la",
     "chores": "Tâches ménagères",
     "clearBrowserData": "Effacer les données du navigateur",
-    "communityExtensions": "<a href='https://habitica.fandom.com/fr/wiki/Extensions,_modules_compl%C3%A9mentaires_et_personnalisations' target='_blank'>Modules complémentaires et extensions</a>",
+    "communityExtensions": "Modules complémentaires et extensions",
     "communityFacebook": "Facebook",
     "companyAbout": "Comment ça marche",
     "companyBlog": "Blog",
-    "companyContribute": "Contribuer",
-    "companyDonate": "Faire un don",
+    "companyContribute": "Contribuer à Habitica",
+    "companyDonate": "Faire un don à Habitica",
     "forgotPassword": "Mot de passe oublié ?",
     "emailNewPass": "Envoyer un lien de réinitialisation par courriel",
     "forgotPasswordSteps": "Entrez votre identifiant ou l'adresse courriel que vous avez utilisée pour créer votre compte Habitica.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Vous voulez faire de votre vie un jeu ?",
     "marketing4Lead3-2": "Intéressé par la gestion d'un groupe dans l'éducation, le bien-être, et davantage ?",
     "marketing4Lead3Title": "Transformez tout en jeu",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Application Android",
+    "mobileIOS": "Application iOS",
     "oldNews": "Nouvelles",
     "newsArchive": "Archives des nouvelles sur Wikia (multilingue)",
     "setNewPass": "Définir un nouveau mot de passe",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Le mot de passe doit faire au moins 8 caractères.",
     "enterHabitica": "Entrez dans Habitica",
     "socialAlreadyExists": "Cet identifiant social est déjà lié à un compte Habitica existant.",
-    "emailUsernamePlaceholder": "par exemple habitrabbit ou gryphon@example.com"
+    "emailUsernamePlaceholder": "par exemple habitrabbit ou gryphon@example.com",
+    "footerProduct": "Produit"
 }
diff --git a/website/common/locales/fr/gear.json b/website/common/locales/fr/gear.json
index 253c373a61..3c5ebbcd2e 100644
--- a/website/common/locales/fr/gear.json
+++ b/website/common/locales/fr/gear.json
@@ -2694,5 +2694,15 @@
     "weaponMystery202209Text": "Manuel de magie",
     "weaponMystery202209Notes": "Ce livre vous guidera à travers votre parcours en apprentissage magique. Ne confère aucun bonus. Équipement d'abonnement de septembre 2022.",
     "shieldMystery202209Text": "Pile de livre de magie",
-    "shieldMystery202209Notes": "Construire votre connaissance en magie nécessite beaucoup de lecture, mais vous avez la certitude d'apprécier votre apprentissage. Ne confère aucun bonus. Équipement d'abonnement de septembre 2022."
+    "shieldMystery202209Notes": "Construire votre connaissance en magie nécessite beaucoup de lecture, mais vous avez la certitude d'apprécier votre apprentissage. Ne confère aucun bonus. Équipement d'abonnement de septembre 2022.",
+    "weaponSpecialFall2022WarriorText": "Déchireuse orc",
+    "weaponSpecialFall2022MageText": "Souffles de vent",
+    "weaponSpecialFall2022MageNotes": "Ces puissants souffles restent autour de vous alors que vous vous envolez vers les cieux. Augmente la intelligence de <%= int %> et la perception de <%= per %>. Équipement en édition limitée de l'automne 2022.",
+    "weaponSpecialFall2022HealerText": "Œil droit voyeur",
+    "armorSpecialFall2022RogueText": "Armure de kappa",
+    "weaponSpecialFall2022HealerNotes": "Pour invoquer la colère divine, tenez le bien et prononcez les mots de commande : \"Oh monde yeux !\" Augmente l'intelligence de <%= int %>. Équipement en édition limitée de l'automne 2022.",
+    "weaponSpecialFall2022RogueNotes": "Non seulement vous pouvez vous défendre avec ce concombre, mais il servira aussi de casse-croûte savoureux. Augmente la force de <%= str %>. Équipement en édition limitée de l'automne 2022.",
+    "weaponSpecialFall2022WarriorNotes": "Elle est peut-être plus prévue pour couper les bûches Ou les tranches de pain croustillant que les armures ennemies, mais GRRR ! Ça a l'air terrifiant ! Augmente la force de <%= str %>. Équipement en édition limitée de l'automne 2022.",
+    "armorSpecialFall2022RogueNotes": "Que vous nagiez, que vous vous faufiliez, ou que vous luttiez, vous serez tranquille dans cette armure. Augmente la perception de <%= per %>. Équipement en édition limitée de l'automne 2022.",
+    "weaponSpecialFall2022RogueText": "Lame concombre"
 }
diff --git a/website/common/locales/fr/limited.json b/website/common/locales/fr/limited.json
index f650eada4b..4ab3ef7251 100644
--- a/website/common/locales/fr/limited.json
+++ b/website/common/locales/fr/limited.json
@@ -229,5 +229,9 @@
     "februaryYYYY": "Février <%= year %>",
     "octoberYYYY": "Octobre <%= year %>",
     "summer2022WaterspoutWarriorSet": "Trombe marine (Guerrier)",
-    "julyYYYY": "Juillet <%= year %>"
+    "julyYYYY": "Juillet <%= year %>",
+    "fall2022OrcWarriorSet": "Orc (Guerrier)",
+    "fall2022HarpyMageSet": "Harpie (Mage)",
+    "fall2022WatcherHealerSet": "Gardien (Guérisseur)",
+    "fall2022KappaRogueSet": "Kappa (Voleur)"
 }
diff --git a/website/common/locales/fr/npc.json b/website/common/locales/fr/npc.json
index 224000a2a1..77b4979e54 100644
--- a/website/common/locales/fr/npc.json
+++ b/website/common/locales/fr/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Nouvelles informations de Bailey !",
     "tellMeLater": "Rappelez-le-moi plus tard",
     "dismissAlert": "Renvoyer la messagère",
-    "donateText3": "En tant que projet à code source ouvert, Habitica est dépendant du soutien de ses utilisateurs. L'argent que vous dépensez en gemmes nous aide à continuer à faire fonctionner les serveurs, à maintenir un petit groupe d'employés, à développer de nouvelles fonctionnalités et à fournir des encouragements à nos programmeurs bénévoles. Merci de votre générosité !",
+    "donateText3": "En tant que projet à code source ouvert, Habitica est dépendant du soutien de ses utilisateurs. L'argent que vous dépensez en gemmes nous aide à continuer à faire fonctionner les serveurs, à maintenir un petit groupe d'employés, à développer de nouvelles fonctionnalités et à fournir des encouragements à nos bénévoles",
     "card": "Carte de crédit",
     "paymentMethods": "Moyens de paiement",
     "paymentSuccessful": "Le paiement a été réalisé !",
@@ -130,5 +130,6 @@
     "limitedAvailabilityMinutes": "Disponible pendant <%= minutes %>m <%= seconds %>s",
     "limitedAvailabilityHours": "Disponible pendant <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityDays": "Disponible pendant <%= days %>j <%= hours %>h <%= minutes %>m",
-    "amountExp": "<%= amount %> expérience"
+    "amountExp": "<%= amount %> expérience",
+    "helpSupportHabitica": "Contribuez à soutenir Habitica"
 }
diff --git a/website/common/locales/fr/questscontent.json b/website/common/locales/fr/questscontent.json
index 1767b35ab0..d8b92d0afd 100644
--- a/website/common/locales/fr/questscontent.json
+++ b/website/common/locales/fr/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Hippopotame (œuf)",
     "questHippoUnlockText": "Déverrouille l'achat d’œufs d'hippopotame au marché",
     "farmFriendsText": "Lot de quêtes des copains de campagne",
-    "farmFriendsNotes": "Contient \"La vache meuhtante\", \"La chevauchée cauchemardesque\" et \"Le bélier du tonnerre\". Disponible jusqu'au 31 Août.",
+    "farmFriendsNotes": "Contient \"La vache meuhtante\", \"La chevauchée cauchemardesque\" et \"Le bélier du tonnerre\". Disponible jusqu'au 30 Septembre.",
     "witchyFamiliarsText": "Lot de quêtes des compagnons ensorceleurs",
     "witchyFamiliarsNotes": "Contient \"Le roi des rats\", \"L'arachnide de glace\" et \"Marécage de la grenouille du désordre\". Disponible jusqu'au 31 octobre.",
     "questGroupLostMasterclasser": "Le mystère des maîtres des classes",
diff --git a/website/common/locales/fr/subscriber.json b/website/common/locales/fr/subscriber.json
index 3d5bf7102b..54bd85f081 100644
--- a/website/common/locales/fr/subscriber.json
+++ b/website/common/locales/fr/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Votre abonnement a été annulé",
     "choosePaymentMethod": "Choisissez votre moyen de paiement",
     "buyGemsSupportsDevs": "Acheter des gemmes soutient les développeurs et aide à maintenir Habitica en état de marche",
-    "support": "SUPPORT",
+    "support": "Support",
     "gemBenefitLeadin": "Que pouvez-vous acheter avec des gemmes ?",
     "gemBenefit1": "des costumes uniques et à la mode pour votre avatar.",
     "gemBenefit2": "des arrière-plans pour immerger votre avatar dans le monde d'Habitica !",
diff --git a/website/common/locales/he/front.json b/website/common/locales/he/front.json
index c6348afe33..df56922916 100644
--- a/website/common/locales/he/front.json
+++ b/website/common/locales/he/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "וגם עם",
     "chores": "מטלות",
     "clearBrowserData": "ניקוי הנתונים מהדפדפן",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>תוספים והרחבות</a>",
+    "communityExtensions": "תוספים והרחבות",
     "communityFacebook": "פייסבוק",
     "companyAbout": "איך זה עובד",
     "companyBlog": "בלוג",
diff --git a/website/common/locales/hu/front.json b/website/common/locales/hu/front.json
index 38e48d90da..0136e81f89 100644
--- a/website/common/locales/hu/front.json
+++ b/website/common/locales/hu/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "és az",
     "chores": "Házimunka",
     "clearBrowserData": "Böngésző előzmények törlése",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Kiegészítők és bővítmények</a>",
+    "communityExtensions": "Kiegészítők és bővítmények",
     "communityFacebook": "Facebook",
     "companyAbout": "Hogyan működik",
     "companyBlog": "Blog",
diff --git a/website/common/locales/id/front.json b/website/common/locales/id/front.json
index e6665ec398..87a831f7e5 100644
--- a/website/common/locales/id/front.json
+++ b/website/common/locales/id/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "dan",
     "chores": "Tugas Rumah",
     "clearBrowserData": "Hapus Data Peramban",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Ekstensi</a>",
+    "communityExtensions": "Add-ons & Ekstensi",
     "communityFacebook": "Facebook",
     "companyAbout": "Bagaimana Cara Kerjanya",
     "companyBlog": "Blog",
diff --git a/website/common/locales/it/gear.json b/website/common/locales/it/gear.json
index 2c59b2602a..001a60435d 100644
--- a/website/common/locales/it/gear.json
+++ b/website/common/locales/it/gear.json
@@ -2726,5 +2726,9 @@
     "weaponSpecialFall2022WarriorNotes": "Forse è più adatta a tagliare tronchi o pagnotte croccanti che armature nemiche, ma ROAR! Sembra davvero terrificante! Aumenta la Forza di <%= str %>. Equipaggiamento in edizione limitata, autunno 2022.",
     "armorSpecialFall2022WarriorNotes": "ROAR! GRANDI SPALLE significa tu essere GRANDE e FORTE! Aumenta la Costituzione di <%= con %>. Equipaggiamento in edizione limitata, autunno 2022.",
     "armorSpecialFall2022HealerNotes": "Quante persone riuscirebbe a sbirciare uno Sbircione, se uno Sbircione potesse sbirciare le persone? Aumenta la Costituzione di <%= con %>. Equipaggiamento in edizione limitata, autunno 2022.",
-    "weaponSpecialFall2022RogueNotes": "Non solo puoi difenderti con questo cetriolo, ma all'occorrenza può essere anche un ottimo spuntino. Aumenta la Forza di <%= str %>. Equipaggiamento in edizione limitata, autunno 2022."
+    "weaponSpecialFall2022RogueNotes": "Non solo puoi difenderti con questo cetriolo, ma all'occorrenza può essere anche un ottimo spuntino. Aumenta la Forza di <%= str %>. Equipaggiamento in edizione limitata, autunno 2022.",
+    "headMystery202210Text": "Inquietante Elmo Ofidiano",
+    "headMystery202210Notes": "Questo cappuccio squamoso sottometterà sicuramente la tua lista di Cose da Fare, terrorizzandola! Non conferisce alcun bonus. Oggetto abbonati ottobre 2022.",
+    "armorMystery202210Text": "Inquietante Armatura Ofidiana",
+    "armorMystery202210Notes": "Prova a strisciare, tanto per cambiare, e potresti scoprire che è un mezzo per spostarsi piuttosto efficiente! Non conferisce alcun bonus. Oggetto abbonati ottobre 2022."
 }
diff --git a/website/common/locales/it/subscriber.json b/website/common/locales/it/subscriber.json
index 81d38b24bd..06b5389c0e 100644
--- a/website/common/locales/it/subscriber.json
+++ b/website/common/locales/it/subscriber.json
@@ -211,5 +211,6 @@
     "mysterySet202206": "Set Spiriti del Mare",
     "mysterySet202207": "Set Medusa Improvvisante",
     "mysterySet202208": "Set Coda di Cavallo Pimpante",
-    "mysterySet202209": "Set dell'Erudito Magico"
+    "mysterySet202209": "Set dell'Erudito Magico",
+    "mysterySet202210": "Set dell'Inquietante Ofidiano"
 }
diff --git a/website/common/locales/ja/communityguidelines.json b/website/common/locales/ja/communityguidelines.json
index 11ccaced7c..91798c053a 100644
--- a/website/common/locales/ja/communityguidelines.json
+++ b/website/common/locales/ja/communityguidelines.json
@@ -122,7 +122,7 @@
     "commGuidePara069": "以下の優秀なアーティスト達がこれらのイラストに貢献しました：",
     "commGuidePara017": "以下は要約版です。できればさらに下にある詳細版をご覧下さい。",
     "commGuideList01A": "利用規約はプライベートギルド、パーティーチャット、メッセージになど全てのスペースに適用されます。",
-    "commGuideList01C": "全ての会話は、全ての年齢層に対して適切である必要があります。冒涜的な言葉は使ってはいけません。",
+    "commGuideList01C": "全ての会話は、全ての年齢層に対して適切である必要があります。下品な言葉を使ってはいけません。",
     "commGuideList01D": "モデレーターの要請には従っていただくようお願いいたします。",
     "commGuideList01B": "禁止：暴力的、脅迫的、差別の助長などにあたるコミュニケーション。これらはミーム、画像、ジョークにおいても禁止です。",
     "commGuideList01F": "有料アイテムの物乞い、スパム行為は禁止です。過度に大きく表示したテキスト、全て大文字にして強調した英文は投稿しないでください。",
diff --git a/website/common/locales/ja/front.json b/website/common/locales/ja/front.json
index b73f2bd4b7..1839161a39 100644
--- a/website/common/locales/ja/front.json
+++ b/website/common/locales/ja/front.json
@@ -9,8 +9,8 @@
     "communityFacebook": "Facebook",
     "companyAbout": "機能説明",
     "companyBlog": "ブログ",
-    "companyContribute": "貢献する",
-    "companyDonate": "寄付",
+    "companyContribute": "Habiticaに貢献する",
+    "companyDonate": "Habiticaに寄付",
     "forgotPassword": "パスワードを忘れましたか？",
     "emailNewPass": "パスワード再設定リンクをメールで受け取る",
     "forgotPasswordSteps": "Habiticaのアカウント登録に使ったユーザーネームかメールアドレスを入力してください。",
@@ -50,11 +50,11 @@
     "marketing4Lead1Title": "教育におけるゲーミフィケーション",
     "marketing4Lead2": "健康管理のコストは増大の一途をたどっており、その影響も大きくなっています。コストを削減し、健康を促進するために無数の計画が立てられています。Habitica も健康的なライフスタイルへの、しっかりとした道を築きあげるものであると私たちは信じています。",
     "marketing4Lead2Title": "健康維持・向上のゲーミフィケーション",
-    "marketing4Lead3-1": "あなたの人生をゲームにするのはどうですか?",
+    "marketing4Lead3-1": "あなたの人生をゲーム化したいですか？",
     "marketing4Lead3-2": "教育、健康管理、その他に Habitica でとりくんでいるグループのことに興味がありますか?",
     "marketing4Lead3Title": "すべてをゲーム化しましょう",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Androidアプリ",
+    "mobileIOS": "iOSアプリ",
     "oldNews": "ニュース",
     "newsArchive": "Wikiaに保存されたこれまでのお知らせ(多言語版)",
     "setNewPass": "新しいパスワードの設定",
@@ -187,5 +187,6 @@
     "minPasswordLength": "パスワードは8文字以上にする必要があります。",
     "enterHabitica": "Habiticaをはじめる",
     "socialAlreadyExists": "このソーシャルログインは、すでに存在しているHabiticaアカウントにリンクされています。",
-    "emailUsernamePlaceholder": "例：habitrabbitもしくはgryphon@example.com"
+    "emailUsernamePlaceholder": "例：habitrabbitもしくはgryphon@example.com",
+    "footerProduct": "プロダクト"
 }
diff --git a/website/common/locales/ja/gear.json b/website/common/locales/ja/gear.json
index d6552bd7be..079d3f5549 100644
--- a/website/common/locales/ja/gear.json
+++ b/website/common/locales/ja/gear.json
@@ -1838,7 +1838,7 @@
     "shieldSpecialSummer2019HealerNotes": "助けが必要な人々に、このほら貝の大きな一吹きであなたが来ていることを知らせてあげましょう。体質が<%= con %>上がります。2019年夏の限定装備。",
     "shieldSpecialSummer2019MageText": "純水のしずく",
     "shieldSpecialSummer2019MageNotes": "夏の日差しで汗をかいてるのかって？　いいえ、スイレン池を満たすためにちょっとした精霊魔法を使っているんです。知覚が<%= per %>上がります。2019年夏の限定装備。",
-    "weaponSpecialKS2019Text": "伝説のグリフォンのフレイブ",
+    "weaponSpecialKS2019Text": "伝説のグリフォンのグレイブ",
     "weaponSpecialFall2019RogueText": "譜面台",
     "weaponSpecialKS2019Notes": "このグリフォンの爪とくちばしのようなカーブの華麗なポールウエポンは、たいへんなタスクをやり通す精神力を思い出させます。力が<%= str %>上がります。",
     "weaponSpecialFall2019MageText": "一つ目のつえ",
@@ -2698,5 +2698,33 @@
     "eyewearArmoireComedyMaskText": "喜劇の仮面",
     "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しましょう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
     "eyewearArmoireTragedyMaskText": "悲劇の仮面",
-    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しましょう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
+    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しましょう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。",
+    "weaponSpecialFall2022RogueText": "きゅうりの刃",
+    "weaponSpecialFall2022RogueNotes": "このキュウリで自分を守れるだけでなく、おいしい食事もできるのです。力が<%= str %>上がります。2022年秋の限定装備。",
+    "weaponSpecialFall2022WarriorText": "オークの大鉈",
+    "weaponSpecialFall2022WarriorNotes": "敵の鎧よりも丸太や固いパンを切るのに適しているかもしれませんが、ガオーッ！見た目は間違いなく恐ろしいです！力が<%= str %>上がります。2022年秋の限定装備。",
+    "weaponSpecialFall2022MageText": "激しい烈風",
+    "weaponSpecialFall2022HealerText": "覗く魔の右眼",
+    "weaponSpecialFall2022HealerNotes": "それを掲げて声を上げ、勝利を知らしめましょう。「目にもの見せてやった！」と。知能が<%= int %>上がります。2022年秋の限定装備。",
+    "armorSpecialFall2022RogueText": "カッパのよろい",
+    "weaponSpecialFall2022MageNotes": "空に向かって飛び立てば、この強大な突風が巻き起こるでしょう。知能が<%= int %>、知覚が<%= per %>上がります。2022年秋の限定装備。",
+    "armorSpecialFall2022RogueNotes": "泳ぐのにも、忍び寄るのにも、スモウをとるのにも、このよろいがあれば安全です。知覚が<%= per %>上がります。2022年秋の限定装備。",
+    "armorSpecialFall2022WarriorText": "オークのよろい",
+    "armorSpecialFall2022WarriorNotes": "ガオオーッ！カタオオキイはあなたがチカラツヨイである証です。体質が<%= con %>上がります。2022年秋の限定装備。",
+    "armorSpecialFall2022MageText": "ハーピーのよろい",
+    "armorSpecialFall2022HealerText": "覗く魔の群れ",
+    "armorSpecialFall2022HealerNotes": "覗き魔が覗き魔たちを覗き見たなら、覗き魔は覗き魔たちにどれだけ覗き見られることになるでしょうか？体質が<%= con %>上がります。2022年秋の限定装備。",
+    "headSpecialFall2022RogueText": "カッパのマスク",
+    "headSpecialFall2022WarriorText": "オークのマスク",
+    "headSpecialFall2022RogueNotes": "頭にこの金属製の皿があれば、陸地に足を踏み入れても身を守ることができます。知覚が<%= per %>上がります。2022年秋の限定装備。",
+    "headSpecialFall2022WarriorNotes": "かぼちゃをも貫く丈夫で鋭い牙です！グオオーッ！！力が<%= str %>上がります。2022年秋の限定装備。",
+    "headSpecialFall2022MageText": "ハーピーのマスク",
+    "headSpecialFall2022MageNotes": "この魔法の乙女のマスクで、美しさを餌に誘き寄せましょう。知覚が<%= per %>上がります。2022年秋の限定装備。",
+    "headSpecialFall2022HealerText": "覗く魔のマスク",
+    "headSpecialFall2022HealerNotes": "美は見る人の目の中に……つまりどこにでもあります！知能が<%= int %>上がります。2022年秋の限定装備。",
+    "shieldSpecialFall2022WarriorText": "オークの盾",
+    "shieldSpecialFall2022WarriorNotes": "ガオーッ・オア・トリート！体質が<%= con %>上がります。2022年秋の限定装備。",
+    "shieldSpecialFall2022HealerText": "覗く魔の左目",
+    "shieldSpecialFall2022HealerNotes": "瞳がふたつ。この衣装を見上げて震え上がるがいいでしょう。体質が<%= con %>上がります。2022年秋の限定装備。",
+    "armorSpecialFall2022MageNotes": "この素晴らしい翼で風のように速く飛び、あなたの欲しいものを恐ろしい爪でがっしりと掴み取りましょう。知能が<%= int %>上がります。2022年秋の限定装備。"
 }
diff --git a/website/common/locales/ja/limited.json b/website/common/locales/ja/limited.json
index 912ee96a73..1470b65efb 100644
--- a/website/common/locales/ja/limited.json
+++ b/website/common/locales/ja/limited.json
@@ -229,5 +229,9 @@
     "dateEndDecember": "12月31日",
     "februaryYYYY": "<%= year %>年2月",
     "julyYYYY": "<%= year %>年7月",
-    "octoberYYYY": "<%= year %>年10月"
+    "octoberYYYY": "<%= year %>年10月",
+    "fall2022HarpyMageSet": "ハーピー（魔道士）",
+    "fall2022WatcherHealerSet": "ウォッチャー（治療師）",
+    "fall2022KappaRogueSet": "カッパ（盗賊）",
+    "fall2022OrcWarriorSet": "オーク（戦士）"
 }
diff --git a/website/common/locales/ja/loginincentives.json b/website/common/locales/ja/loginincentives.json
index 9c3479687e..8c7eb46dfb 100644
--- a/website/common/locales/ja/loginincentives.json
+++ b/website/common/locales/ja/loginincentives.json
@@ -20,6 +20,6 @@
     "incentiveAchievement": "気高き忠誠 の実績",
     "royallyLoyal": "気高き忠誠",
     "royallyLoyalText": "このユーザーは500回以上チェックインし、すべてのチェックインの賞品を手に入れました！",
-    "checkInRewards": "チェックインのごほうび",
+    "checkInRewards": "ログインのごほうび",
     "backloggedCheckInRewards": "チェックインの賞品を受け取りました！　新しく手に入れたものを見るには、所持品と装備を確認してください。"
 }
diff --git a/website/common/locales/ja/npc.json b/website/common/locales/ja/npc.json
index 29ed2cfabb..8d48560331 100644
--- a/website/common/locales/ja/npc.json
+++ b/website/common/locales/ja/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Baileyから新しいお知らせがあります！",
     "tellMeLater": "後で教えて",
     "dismissAlert": "この通知を閉じる",
-    "donateText3": "Habiticaは、ユーザーの協力の元に成り立っているオープンソース プロジェクトです。ジェムの購入に使われたお金は、サーバーの維持、少数スタッフの維持、新しい機能の開発、そしてボランティアのプログラマーたちにインセンティブを与える手助けになっています。あなたのご厚情に感謝いたします！",
+    "donateText3": "Habiticaは、ユーザーの協力の元に成り立っているオープンソース プロジェクトです。ジェムの購入に使われたお金は、サーバーの維持、少数スタッフの維持、新しい機能の開発、そしてボランティアの皆さんにインセンティブを与える手助けになっています",
     "card": "クレジットカード",
     "paymentMethods": "お支払い方法",
     "paymentSuccessful": "支払いは成功しました！",
@@ -131,5 +131,6 @@
     "limitedAvailabilityHours": "購入できる期間は残り<%= hours %>時間<%= minutes %>分です",
     "limitedAvailabilityMinutes": "購入できる期間は残り<%= minutes %>分<%= seconds %>秒です",
     "amountExp": "<%= amount %>経験値",
-    "newStuffPostedOn": "<%= publishDate %> <%= publishTime %>に投稿"
+    "newStuffPostedOn": "<%= publishDate %> <%= publishTime %>に投稿",
+    "helpSupportHabitica": "Habiticaを支援する"
 }
diff --git a/website/common/locales/ja/settings.json b/website/common/locales/ja/settings.json
index 2873890776..4f9d6ae695 100644
--- a/website/common/locales/ja/settings.json
+++ b/website/common/locales/ja/settings.json
@@ -160,7 +160,7 @@
     "amazonPaymentsRecurring": "有料プランに加入するには、以下のチェックボックスをチェックする必要があります。これをチェックするとあなたのAmazonアカウントを<strong>有料プランのため</strong>の継続した支払いに利用することを承認します。あなたのAmazonアカウントが今後何らかの購入のために自動的に使われてしまうことはありません。",
     "timezone": "タイム ゾーン",
     "timezoneUTC": "コンピューターに設定されたあなたのタイムゾーン : <strong><%= utc %></strong>",
-    "timezoneInfo": "タイムゾーンの設定が間違っているなら、このページをブラウザのリロード ( 再読み込み ) またはリフレッシュ ( 更新 ) ボタンで、Habitica を最新の状態にしてください。それでもまだ間違っているなら、PC のタイムゾーンを調整し、再度このページをリロード ( 再読み込み ) してください<br><br><strong>もし、別のPCやモバイル機器でも Habitica を使っているなら、すべてを同じタイムゾーンに設定しなくてはなりません。</strong> もし日課がも違った時間にリセットされたら、これまでのチェックを別のすべてのPCとモバイル機器の Web ブラウザでくり返してください。",
+    "timezoneInfo": "タイムゾーンの設定が間違っている場合は、まずこのページをブラウザのリロード ( 再読み込み ) またはリフレッシュ ( 更新 ) ボタンを使って、Habitica を最新の状態にしてください。それでもまだ間違っているなら、PC のタイムゾーンを調整し、再度このページをリロード ( 再読み込み ) してください。<br><br><strong>もし別のPCやモバイル端末でも Habitica を使っている場合は、すべてを同じタイムゾーンに設定する必要があります。</strong> 日課が間違った時間にリセットされている場合は、これまでのチェックを別のすべてのPCとモバイル端末の Web ブラウザでくり返してください。",
     "push": "プッシュ",
     "about": "プロフィール",
     "setUsernameNotificationTitle": "あなたのユーザー名を承認してください！",
diff --git a/website/common/locales/ja/subscriber.json b/website/common/locales/ja/subscriber.json
index d73fe322f6..639e5cabc7 100644
--- a/website/common/locales/ja/subscriber.json
+++ b/website/common/locales/ja/subscriber.json
@@ -211,5 +211,6 @@
     "mysterySet202207": "ローヤルゼリーフィッシュセット",
     "wantToSendOwnGems": "持っているジェムを贈りたいですか？",
     "mysterySet202208": "はつらつポニーテールセット",
-    "mysterySet202209": "魔法学者セット"
+    "mysterySet202209": "魔法学者セット",
+    "mysterySet202210": "不吉な蛇セット"
 }
diff --git a/website/common/locales/nl/front.json b/website/common/locales/nl/front.json
index e8b652476e..3bfd50e7f2 100644
--- a/website/common/locales/nl/front.json
+++ b/website/common/locales/nl/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "en het",
     "chores": "Karweitjes",
     "clearBrowserData": "Verwijder browsergegevens",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Toevoegingen & extensies</a>",
+    "communityExtensions": "Toevoegingen & extensies",
     "communityFacebook": "Facebook",
     "companyAbout": "Hoe het werkt",
     "companyBlog": "Blog",
diff --git a/website/common/locales/pl/achievements.json b/website/common/locales/pl/achievements.json
index d3300d28ad..5f4af3cf17 100644
--- a/website/common/locales/pl/achievements.json
+++ b/website/common/locales/pl/achievements.json
@@ -3,8 +3,8 @@
     "onwards": "Naprzód!",
     "levelup": "Realizując życiowe cele, osiągnąłeś wyższy poziom i jesteś teraz w pełni wyleczony!",
     "reachedLevel": "Osiągnąłeś poziom <%= level %>",
-    "achievementLostMasterclasser": "Realizator misji: Mistrzowie Klas",
-    "achievementLostMasterclasserText": "Wykonano wszystkie szesnaście misji w cyklu Mistrzów Klas i rozwiązano zagadkę Zaginionego Mistrza!",
+    "achievementLostMasterclasser": "Realizator misji: Mistrz Klas",
+    "achievementLostMasterclasserText": "Ukończono wszystkie szesnaście misji w serii Mistrza Klas i rozwiązano zagadkę Zaginionego Mistrza!",
     "achievementAridAuthorityModalText": "Oswoiłeś wszystkie Pustynne Wierzchowce!",
     "achievementLostMasterclasserModalText": "Wykonałeś wszystkie szesnaście misji z serii Mistrzowie Klas i rozwiązałeś zagadkę Zaginionego Mistrza!",
     "achievementPurchasedEquipment": "Kup ekwipunek",
@@ -13,83 +13,83 @@
     "achievementCompletedTaskText": "Wykonano pierwsze zadanie.",
     "achievementCompletedTask": "Wykonaj zadanie",
     "achievementCreatedTaskModalText": "Dodaj zadanie, które chciałbyś wykonać w tym tygodniu",
-    "achievementMonsterMagusModalText": "Oswoiłeś wszystkie Potworne Zwierzaki!",
-    "achievementMonsterMagusText": "Oswoił wszystkie Potworne Zwierzaki.",
+    "achievementMonsterMagusModalText": "Oswoiłeś wszystkie Zwierzęta Zombie!",
+    "achievementMonsterMagusText": "Oswoił wszystkie Zwierzęta Zombie.",
     "achievementPartyOn": "Ilość osób w twojej drużynie wzrosła do 4!",
-    "achievementKickstarter2019Text": "Wsparł(a) projekt 2019 Pin na Kickstarterze",
+    "achievementKickstarter2019Text": "Wsparł projekt 2019 Pin na Kickstarterze",
     "achievementKickstarter2019": "Odznaka Sponsora w Kickstarterze",
     "achievementPartyUp": "Połączyłeś siły z członkiem drużyny!",
-    "achievementBackToBasicsModalText": "Zebrałeś wszystkie Podstawowe Zwierzaki!",
-    "achievementBackToBasicsText": "Zebrano wszystkie podstawowe zwierzaki.",
-    "achievementBackToBasics": "Powrót do podstaw",
+    "achievementBackToBasicsModalText": "Zebrałeś wszystkie Podstawowe Zwierzęta!",
+    "achievementBackToBasicsText": "Zebrano wszystkie Podstawowe Zwierzęta.",
+    "achievementBackToBasics": "Powrót do Podstaw",
     "hideAchievements": "Ukryj <%= category %>",
-    "showAllAchievements": "Pokaż Wszystkie <%= category %>",
+    "showAllAchievements": "Pokaż wszystko <%= category %>",
     "earnedAchievement": "Zdobyłeś osiągnięcie!",
     "viewAchievements": "Zobacz Osiągnięcia",
     "letsGetStarted": "Zaczynajmy!",
     "foundNewItems": "Znalazłeś nowe przedmioty!",
     "foundNewItemsCTA": "Udaj się do swojego Ekwipunku i spróbuj połączyć nowy Eliksir Wykluwania i Jajko!",
-    "achievementJustAddWaterText": "Ukończył wyzwanie Ośmiornica, Konik Morski, Mątwa, Wieloryb, Żółw, Nudibranch, Wąż Morski i Delfin.",
+    "achievementJustAddWaterText": "Ukończył misje ze zwierzętami: Ośmiornica, Konik Morski, Mątwa, Wieloryb, Żółw, Ślimak Morski, Wąż Morski i Delfin.",
     "achievementPearlyProText": "Oswoił wszystkie Białe Wierzchowce.",
-    "achievementPearlyPro": "Perłowy Opiekun",
-    "achievementPrimedForPaintingModalText": "Zebrałeś wszystkie Białe Zwierzaki!",
-    "achievementPrimedForPaintingText": "Zebrał wszystkie Białe Zwierzaki.",
+    "achievementPearlyPro": "Perłowy Profesjonalista",
+    "achievementPrimedForPaintingModalText": "Zebrałeś wszystkie Białe Zwierzęta!",
+    "achievementPrimedForPaintingText": "Zebrał wszystkie Białe Zwierzęta.",
     "achievementPurchasedEquipmentModalText": "Ekwipunek to sposób na spersonalizowanie postaci oraz poprawę Statystyk",
     "achievementPearlyProModalText": "Oswoiłeś wszystkie Białe Wierzchowce!",
-    "achievementRosyOutlook": "Różowe Perspektywy",
-    "achievementBugBonanza": "Pogromca Insektów",
-    "achievementBugBonanzaModalText": "Ukończyłeś misje związane ze zwierzakami Żuk, Motyl, Ślimak i Pająk!",
-    "achievementBugBonanzaText": "Ukończył misje związane ze zwierzętami Żuk, Motyl, Ślimak i Pająk.",
+    "achievementRosyOutlook": "Różowe Okulary",
+    "achievementBugBonanza": "Pogromca Robali",
+    "achievementBugBonanzaModalText": "Ukończyłeś misje ze zwierzętami: Żuk, Motyl, Ślimak i Pająk!",
+    "achievementBugBonanzaText": "Ukończył misje ze zwierzętami: Żuk, Motyl, Ślimak i Pająk.",
     "onboardingCompleteDescSmall": "Jeśli chcesz jeszcze więcej, sprawdź Osiągnięcia i zacznij je zdobywać!",
     "onboardingCompleteDesc": "Zdobyłeś <strong> 5 osiągnięć </strong> i <strong class=\"gold-amount\">100 Dukatów</strong> za ukończenie swoich zadań.",
-    "achievementJustAddWaterModalText": "Ukończyłeś misje dla zwierząt domowych Ośmiornica, Konik Morski, Mątwa, Wieloryb, Żółw, Nudibranch, Wąż Morski i Delfin!",
+    "achievementJustAddWaterModalText": "Ukończyłeś misje ze zwierzętami: Ośmiornica, Konik Morski, Mątwa, Wieloryb, Żółw, Ślimak Morski, Wąż Morski i Delfin!",
     "achievementPrimedForPainting": "Biały Kieł",
-    "achievementPurchasedEquipmentText": "Kupił swój pierwszy element wyposażenia.",
-    "achievementHatchedPetText": "Oswoił swojego pierwszego Zwierzaka.",
-    "achievementHatchedPet": "Oswojono Zwierzaka",
-    "achievementCompletedTaskModalText": "Odznaczaj swoje zadania, aby zdobywać nagrody",
+    "achievementPurchasedEquipmentText": "Kupił swój pierwszy element ekwipunku.",
+    "achievementHatchedPetText": "Wykluł swojego pierwszego Zwierzaka.",
+    "achievementHatchedPet": "Wykluj Zwierzaka",
+    "achievementCompletedTaskModalText": "Odznacz swoje zadania, aby zdobywać nagrody",
     "achievementCreatedTaskText": "Stworzyłeś swoje pierwsze zadanie.",
     "achievementCreatedTask": "Stwórz swoje pierwsze zadanie",
-    "achievementUndeadUndertakerModalText": "Oswoiłeś wszystkie Potworne Wierzchowce!",
-    "achievementUndeadUndertakerText": "Oswoił wszystkie Potworne Wierzchowce.",
-    "achievementUndeadUndertaker": "Jeździec bez głowy",
-    "achievementMonsterMagus": "Potworny Opiekun",
+    "achievementUndeadUndertakerModalText": "Oswoiłeś wszystkie Wierzchowce Zombie!",
+    "achievementUndeadUndertakerText": "Oswoił wszystkie Wierzchowce Zombie.",
+    "achievementUndeadUndertaker": "Ponury Kosiarz",
+    "achievementMonsterMagus": "Protektor Poczwar",
     "achievementAridAuthorityText": "Oswoił wszystkie Pustynne Wierzchowce.",
-    "achievementAridAuthority": "Pustynny Opiekun",
-    "achievementDustDevilModalText": "Oswoiłeś wszyskie Pustynne Zwierzaki!",
-    "achievementDustDevilText": "Oswoił wszystkie Pustynne Zwierzaki.",
+    "achievementAridAuthority": "Pustynny Przywódca",
+    "achievementDustDevilModalText": "Zebrałeś wszystkie Pustynne Zwierzęta!",
+    "achievementDustDevilText": "Zebrał wszystkie Pustynne Zwierzęta.",
     "achievementDustDevil": "Prochy Pustyni",
     "achievementAllYourBaseModalText": "Oswoiłeś wszystkie Podstawowe Wierzchowce!",
     "achievementAllYourBaseText": "Oswoił wszystkie Podstawowe Wierzchowce.",
     "achievementJustAddWater": "H2O – Wystarczy Kropla",
-    "foundNewItemsExplanation": "Wykonywanie zadań daje Ci szansę na znalezienie przedmiotów, takich jak Jaja, Eliksiry Wyklucia, oraz Jedzonko dla Zwierzaków.",
+    "foundNewItemsExplanation": "Wykonanie zadań daje szansę na znalezienie przedmiotów, takich jak Jaja, Eliksiry Wykluwania i Jedzenie dla Zwierząt.",
     "gettingStartedDesc": "Ukończ swoje aktualne zadania, aby otrzymać <strong> 5 Osiągnięć </strong> oraz <strong class=\"gold-amount\">100 Dukatów</strong>!",
     "onboardingProgress": "<%= percentage %>% postępu",
-    "achievementRosyOutlookModalText": "Oswoiłeś wszystkie Różowe Wierzchowce!",
-    "achievementRosyOutlookText": "Oswoił wszystkie Różowe Wierzchowce.",
-    "achievementTickledPinkModalText": "Oswoiłeś wszystkie Różowe Zwierzaki!",
-    "achievementTickledPinkText": "Oswoił wszystkie Różowe Zwierzaki.",
-    "achievementFedPetModalText": "Mamy wiele rodzajów jedzenia. Sprawdź, które z nich najbardziej odpowiadają twojemu Zwierzakowi",
+    "achievementRosyOutlookModalText": "Oswoiłeś wszystkie Landrynkowo Różowe Wierzchowce!",
+    "achievementRosyOutlookText": "Oswoił wszystkie Landrynkowo Różowe Wierzchowce.",
+    "achievementTickledPinkModalText": "Zebrałeś wszystkie Landrynkowo Różowe Zwierzęta!",
+    "achievementTickledPinkText": "Zebrał wszystkie Landrynkowo Różowe Zwierzęta.",
+    "achievementFedPetModalText": "Istnieje wiele rodzajów jedzenia, ale Zwierzaki potrafią być wybredne",
     "achievementHatchedPetModalText": "Udaj się do ekwipunku, aby połączyć Eliksir Wyklucia z Jajkiem",
     "achievementMindOverMatter": "Twój Umysł - Twoja Siła",
-    "onboardingComplete": "Wykonałeś wszystkie twoje aktualne zadania!",
+    "onboardingComplete": "Wykonałeś wszystkie swoje aktualne zadania!",
     "yourProgress": "Twój Postęp",
-    "achievementBareNecessitiesModalText": "Ukończyłeś(-aś) misje z chowańcami: Małpką, Leniwcem i Drzewkiem!",
-    "achievementBareNecessitiesText": "Zakończono misję z chowańcami: Małpą, Leniwcem i Drzewkiem.",
-    "achievementBareNecessities": "Pierwotne instynkty",
-    "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ą.",
-    "achievementFreshwaterFriendsModalText": "Ukończyłeś(-aś) misje z chowańcami: Aksolotlem, Żabą i Hipopotamem!",
-    "achievementFreshwaterFriendsText": "Ukończono misje z chowańcami: Aksolotlem, Żabą i Hipciem.",
+    "achievementBareNecessitiesModalText": "Ukończyłeś misje ze zwierzętami: Małpka, Leniwiec i Sadzonka!",
+    "achievementBareNecessitiesText": "Ukończył misję ze zwierzętami: Małpa, Leniwiec i Sadzonka.",
+    "achievementBareNecessities": "Podstawowe Potrzeby",
+    "achievementTickledPink": "Landrynkowy Róż",
+    "achievementAllYourBase": "Twoje Podstawy",
+    "achievementMindOverMatterModalText": "Wypełniłeś misje ze zwierzętami: Skała, Śluz i Przędza!",
+    "achievementMindOverMatterText": "Ukończono misje ze zwierzętami: Skała, Śluz i Przędza.",
+    "achievementFreshwaterFriendsModalText": "Ukończyłeś misje ze zwierzętami: Aksolotl, Żaba i Hipopotam!",
+    "achievementFreshwaterFriendsText": "Ukończono misje ze zwierzętami: Aksolotl, Żaba i Hipopotam.",
     "achievementFreshwaterFriends": "Słodkowodni Przyjaciele",
-    "achievementAllThatGlittersModalText": "Okiełznałeś(-aś) wszystkie złote wierzchowce!",
-    "achievementAllThatGlittersText": "Okiełznano wszystkie złote wierzchowce.",
-    "achievementAllThatGlitters": "Wszystko co błyszczy",
-    "achievementGoodAsGoldModalText": "Zebrałeś(-aś) wszystkie złote chowańce!",
-    "achievementGoodAsGoldText": "Zebrane wszystkie Złote Chowańce.",
-    "achievementGoodAsGold": "Na wagę złota",
+    "achievementAllThatGlittersModalText": "Oswoiłeś wszystkie Złote Wierzchowce!",
+    "achievementAllThatGlittersText": "Oswoił wszystkie Złote Wierzchowce.",
+    "achievementAllThatGlitters": "Wszystko co Błyszczy",
+    "achievementGoodAsGoldModalText": "Zebrałeś wszystkie Złote Zwierzęta!",
+    "achievementGoodAsGoldText": "Zebrał wszystkie Złote Zwierzęta.",
+    "achievementGoodAsGold": "Na Wagę Złota",
     "yourRewards": "Twoje Nagrody",
     "achievementBoneCollector": "Kolekcjoner Kości",
     "achievementRedLetterDay": "Pamiętny Dzień Czerwieni",
@@ -99,24 +99,24 @@
     "achievementSeeingRedText": "Zebrał wszystkie Czerwone Chowańce.",
     "achievementSeeingRed": "Czerwono widzę",
     "achievementSkeletonCrewText": "Oswoił wszystkie Szkieletowe Wierzchowce.",
-    "achievementSkeletonCrew": "Szkieletowa Ekipa",
-    "achievementBoneCollectorModalText": "Zebrałeś wszystkie Szkieletowe Chowańce!",
-    "achievementBoneCollectorText": "Okiełznał wszystkie Szkieletowe Chowańce.",
+    "achievementSkeletonCrew": "Szkieletowa Załoga",
+    "achievementBoneCollectorModalText": "Zebrałeś wszystkie Szkieletowe Zwierzęta!",
+    "achievementBoneCollectorText": "Zebrał wszystkie Szkieletowe Zwierzęta.",
     "achievementSkeletonCrewModalText": "Oswoiłeś wszystkie Szkieletowe Wierzchowce!",
     "achievementLegendaryBestiary": "Legendarny Bestiariusz",
     "achievementSeasonalSpecialistModalText": "Ukończyłeś wszystkie sezonowe misje!",
-    "achievementSeasonalSpecialistText": "Ukończył wszystkie wiosenne i zimowe zadania: Poszukiwanie jajek, Święty Mikołaj- traper i Znajdź młode!",
+    "achievementSeasonalSpecialistText": "Ukończył wszystkie wiosenne i zimowe misje: Poszukiwanie jajek, Święty Mikołaj- traper i Znajdź młode!",
     "achievementSeasonalSpecialist": "Sezonowy Ekspert",
     "achievementLegendaryBestiaryModalText": "Zebrałeś wszystkie mityczne chowańce!",
-    "achievementLegendaryBestiaryText": "Wykluł/a wszystkie podstawowe kolory mitycznych chowańców: Smoka, Latającą Świnię, Gryfa, Węża Morskiego i Jednorożca!",
-    "achievementWildBlueYonderText": "Oswojono wszystkie Wierzchowce Niebieskiej Waty Cukrowej.",
+    "achievementLegendaryBestiaryText": "Wykluł wszystkie standardowe kolory mitycznych zwierząt: Smok, Latająca Świnia, Gryf, Wąż Morski i Jednorożec!",
+    "achievementWildBlueYonderText": "Oswojono wszystkie Błękitne Wierzchowce.",
     "achievementVioletsAreBlue": "Fiołki są niebieskie",
     "achievementVioletsAreBlueText": "Zebrano wszystkie Chowańce Niebieskiej Waty Cukrowej.",
     "achievementDomesticated": "Dziadek farmę miał",
-    "achievementVioletsAreBlueModalText": "Zebrałeś wszystkie Chowańce Niebieskiej Waty Cukrowej!",
-    "achievementWildBlueYonder": "W siną dal",
+    "achievementVioletsAreBlueModalText": "Zebrałeś wszystkie Błękitne Zwierzęta!",
+    "achievementWildBlueYonder": "W Siną Dal",
     "achievementDomesticatedModalText": "Oswoiłeś wszystkie domowe chowańce!",
-    "achievementWildBlueYonderModalText": "Oswoiłeś wszystkie Wierzchowce Niebieskiej Waty Cukrowej!",
+    "achievementWildBlueYonderModalText": "Oswoiłeś wszystkie Błękitne Wierzchowce!",
     "achievementDomesticatedText": "Wykluł/a wszystkie podstawowe kolory domowych chowańców: fretkę, świnkę morską, koguta, latającą świnię, szczura, królika, konia i krowę!",
     "achievementShadyCustomer": "Klient spod ciemnej gwiazdy",
     "achievementShadyCustomerText": "Oswojono wszystkie cieniste chowańce.",
@@ -124,5 +124,19 @@
     "achievementShadeOfItAllText": "Oswojono wszystkie cieniste wierzchowce.",
     "achievementShadeOfItAllModalText": "Oswoiłeś wszystkie cieniste wierzchowce!",
     "achievementShadeOfItAll": "Cień nad Cieniami",
-    "achievementZodiacZookeeper": "Zodiakalny Dozorca Zoo"
+    "achievementZodiacZookeeper": "Zodiakalny Dozorca Zoo",
+    "achievementGroupsBeta2022Text": "Ty i twoja drużyna ofiarowaliście bezcenną informację zwrotną do testu pomocy Habitice.",
+    "achievementGroupsBeta2022": "Interaktywny Beta Tester",
+    "achievementGroupsBeta2022ModalText": "Ty i twoja drużyna pomogliście Habitice testując i dając informacje zwrotne!",
+    "achievementWoodlandWizard": "Leśny Czarodziej",
+    "achievementWoodlandWizardText": "Wykluł wszystkie standardowe kolory leśnych zwierząt: Borsuk, Niedźwiedź, Jeleń, Lis, Żaba, Jeż, Sowa, Ślimak, Wiewiórka i Sadzonka!",
+    "achievementWoodlandWizardModalText": "Zebrałeś wszystkie leśne zwierzęta!",
+    "achievementReptacularRumble": "Spektakularny Huk",
+    "achievementReptacularRumbleText": "Wykluł wszystkie standardowe kolory gadów: Aligator, Pterodaktyl, Wąż, Triceratops, Żółw, Tyranozaur i Welociraptor!",
+    "achievementReptacularRumbleModalText": "Zebrałeś wszystkie gady!",
+    "achievementBirdsOfAFeatherModalText": "Zebrałeś wszystkie latające zwierzęta!",
+    "achievementBirdsOfAFeather": "Papużki Nierozłączki",
+    "achievementBirdsOfAFeatherText": "Wykluł wszystkie standardowe kolory latających zwierząt: Latająca Świnia, Sowa, Papuga, Pterodaktyl, Gryf, Sokół, Paw i Kogut!",
+    "achievementZodiacZookeeperText": "Wykluł wszystkie standardowe kolory zwierząt zodiaku: Szczur, Krowa, Królik, Wąż, Koń, Owca, Małpa, Kogut, Wilk, Tygrys, Latająca Świnia i Smok!",
+    "achievementZodiacZookeeperModalText": "Zebrałeś wszystkie zwierzęta zodiakalne!"
 }
diff --git a/website/common/locales/pl/backgrounds.json b/website/common/locales/pl/backgrounds.json
index a8aa070de6..07932bbd1a 100644
--- a/website/common/locales/pl/backgrounds.json
+++ b/website/common/locales/pl/backgrounds.json
@@ -506,5 +506,15 @@
     "backgroundElegantBallroomText": "Wytworna Sala Balowa",
     "backgroundTeaPartyNotes": "Weź udział w Herbacianej Domówce.",
     "backgroundTeaPartyText": "Herbaciana Domówka",
-    "backgrounds022020": "ZESTAW 69: Wydany w lutym 2020"
+    "backgrounds022020": "ZESTAW 69: Wydany w lutym 2020",
+    "hideLockedBackgrounds": "Ukryj zablokowane tła",
+    "backgrounds032020": "ZESTAW 70: Wydany w marcu 2020",
+    "backgroundAmongGiantFlowersText": "Pośród Gigantycznych Kwiatów",
+    "backgroundAmongGiantFlowersNotes": "Tułaczka Pośród Gigantycznych Kwiatów.",
+    "backgroundButterflyGardenText": "Ogród Motyli",
+    "backgrounds042020": "ZESTAW 71: Wydany w kwietniu 2020",
+    "backgroundButterflyGardenNotes": "Impreza z zapylaczami w Ogrodzie Motyli.",
+    "backgroundSucculentGardenText": "Ogród Sukulentów",
+    "backgroundSucculentGardenNotes": "Napawaj się pustynnym pięknem Ogrodu Sukulentów.",
+    "backgroundAnimalCloudsText": "Zwierzęce Chmury"
 }
diff --git a/website/common/locales/pl/content.json b/website/common/locales/pl/content.json
index 2d57439326..94bdbd3a2b 100644
--- a/website/common/locales/pl/content.json
+++ b/website/common/locales/pl/content.json
@@ -212,7 +212,7 @@
     "hatchingPotionFrost": "Mroźny",
     "hatchingPotionIcySnow": "Lodowaty Śnieg",
     "hatchingPotionNotes": "Wylej eliksir na jajko, a wykluje się z niego <%= potText(locale) %>.",
-    "premiumPotionAddlNotes": "Nie nadaje się do użytku na jajach otrzymanych za misje. Dostępny w sprzedaży do  <%= date(locale) %>.",
+    "premiumPotionAddlNotes": "Nie nadaje się do użytku na jajach otrzymanych za misje. Dostępny w sprzedaży do <%= date(locale) %>.",
     "foodMeat": "Mięso",
     "foodMeatThe": "Mięso",
     "foodMeatA": "Mięso",
@@ -370,5 +370,7 @@
     "hatchingPotionSolarSystem": "Układ Słoneczny",
     "hatchingPotionMoonglow": "Blask Księżyca",
     "hatchingPotionMossyStone": "Omszony Głaz",
-    "hatchingPotionOnyx": "Onyks"
+    "hatchingPotionOnyx": "Onyks",
+    "hatchingPotionPorcelain": "Porcelana",
+    "hatchingPotionVirtualPet": "Wirtualny Zwierzak"
 }
diff --git a/website/common/locales/pl/front.json b/website/common/locales/pl/front.json
index 7a2bbc6605..682f6ef3e8 100644
--- a/website/common/locales/pl/front.json
+++ b/website/common/locales/pl/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "oraz",
     "chores": "Obowiązkami",
     "clearBrowserData": "Wyczyść dane wyszukiwarki",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Dodatki i rozszerzenia</a>",
+    "communityExtensions": "Dodatki i rozszerzenia",
     "communityFacebook": "Facebook",
     "companyAbout": "Jak to działa",
     "companyBlog": "Blog",
diff --git a/website/common/locales/pl/tasks.json b/website/common/locales/pl/tasks.json
index e510c55cdb..7f86e0949d 100644
--- a/website/common/locales/pl/tasks.json
+++ b/website/common/locales/pl/tasks.json
@@ -2,7 +2,7 @@
     "clearCompleted": "Usuń zakończone",
     "clearCompletedDescription": "Zakończone Do Zrobienia zostają usunięte po 30 dniach dla osób bez subskrypcji i po 90 dniach dla subskrybentów.",
     "clearCompletedConfirm": "Jesteś pewien, że chcesz usunąć zakończone Do Zrobienia?",
-    "addMultipleTip": "<strong>Porada:</strong> W celu dodania wielu <%= taskType %>, oddziel każde z nich wstawiając znak końca linii (Shift + Enter), a następnie wciśnij \"Enter.\"",
+    "addMultipleTip": "<strong>Wskazówka:</strong> W celu dodania wielu <%= taskType %>, oddziel każde z nich wstawiając znak końca linii (Shift + Enter), a następnie wciśnij \"Enter.\"",
     "addATask": "Dodaj <%= type %>",
     "editATask": "Edytuj <%= type %>",
     "createTask": "Stwórz <%= type %>",
@@ -139,5 +139,6 @@
     "adjustCounter": "Dostosuj Licznik",
     "editTagsText": "Edytuj Tagi",
     "counter": "Licznik",
-    "resetCounter": "Zresetuj Licznik"
+    "resetCounter": "Zresetuj Licznik",
+    "taskSummary": "Podsumowanie <%= type %>"
 }
diff --git a/website/common/locales/pt/front.json b/website/common/locales/pt/front.json
index e108d397b0..13d0a6beb2 100644
--- a/website/common/locales/pt/front.json
+++ b/website/common/locales/pt/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "e com a",
     "chores": "Afazeres",
     "clearBrowserData": "Limpar dados do navegador",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Módulos Adicionais & Extensões</a>",
+    "communityExtensions": "Módulos Adicionais & Extensões",
     "communityFacebook": "Facebook",
     "companyAbout": "Como Funciona",
     "companyBlog": "Blogue",
diff --git a/website/common/locales/pt_BR/backgrounds.json b/website/common/locales/pt_BR/backgrounds.json
index 0975219d32..b6f9f594fe 100644
--- a/website/common/locales/pt_BR/backgrounds.json
+++ b/website/common/locales/pt_BR/backgrounds.json
@@ -718,7 +718,7 @@
     "backgrounds082022": "Conjunto 99: Lançado em Agosto de 2022",
     "backgroundRainbowEucalyptusText": "Eucalipto Arco-íris",
     "backgroundRainbowEucalyptusNotes": "Admire um bosque de Eucalipto Arco-íris.",
-    "backgrounds092022": "CONJUNTO 100: Lançado em setembro de 2022",
+    "backgrounds092022": "Conjunto 100: Lançado em Setembro de 2022",
     "backgroundOldPhotoNotes": "Faça uma pose em um Retrato Antigo.",
     "backgroundOldPhotoText": "Retrato Antigo",
     "backgroundAutumnPicnicNotes": "Aproveite um Piquenique de Outono.",
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index bbd1b66ae1..d884cbc8f3 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -157,7 +157,7 @@
     "weaponSpecialSpring2015RogueText": "Guinchado Explosivo",
     "weaponSpecialSpring2015RogueNotes": "Não deixe o som te enganar - esses explosivos são poderosos. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "weaponSpecialSpring2015WarriorText": "Clava de Osso",
-    "weaponSpecialSpring2015WarriorNotes": "É uma legítima clava de osso para cachorrinhos super ferozes e definitivamente não um brinquedo de mastigar que a Feiticeira Sazonal te deu porque quem é um bom garoto? Queeem é um bom garoto?? Você!!! Você é um bom garoto!!! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "weaponSpecialSpring2015WarriorNotes": "É uma legítima clava de osso para cachorrinhos super ferozes e definitivamente não um brinquedo de mastigar que a Feiticeira Sazonal te deu porque quem é um bom garoto? Queeem é um bom garoto?? Você!!! Você é um bom garoto!!! Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "weaponSpecialSpring2015MageText": "Varinha de Mágico",
     "weaponSpecialSpring2015MageNotes": "Invoque uma cenoura para si mesmo com essa elegante varinha. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "weaponSpecialSpring2015HealerText": "Matraca de Gato",
@@ -573,7 +573,7 @@
     "armorSpecialWinter2017HealerText": "Armadura de Pétala Brilhante",
     "armorSpecialWinter2017HealerNotes": "Embora suave, esta armadura de pétalas tem poder de proteção fantástico. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Inverno de 2016 e 2017.",
     "armorSpecialSpring2017RogueText": "Traje de Coelhinho Sorrateiro",
-    "armorSpecialSpring2017RogueNotes": "Suave mas forte, esse traje te ajuda a andar pelos jardins com invisibilidade extra. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "armorSpecialSpring2017RogueNotes": "Suave mas forte, esse traje te ajuda a andar pelos jardins com invisibilidade extra. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "armorSpecialSpring2017WarriorText": "Armadura Fofincrível",
     "armorSpecialSpring2017WarriorNotes": "Essa armadura extravagante é tão brilhante quanto seu melhor casaco, mas com resistência aumentada a ataques. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "armorSpecialSpring2017MageText": "Túnicas de Ilusionista Canino",
@@ -2110,7 +2110,7 @@
     "bodyArmoireLifeguardWhistleText": "Apito de Salva-Vidas",
     "shieldArmoireLifeBuoyNotes": "Oh bóia! Isso será útil se você encontrar alguém lutando em um mar de tarefas e responsabilidades. Aumenta a Constituição em <%= con %>. Armário Encantado: Conjunto de salva-vidas (Item 2 de 3).",
     "shieldArmoireLifeBuoyText": "Bóia salva-vidas",
-    "weaponArmoireBeachFlagNotes": "Reúna as tropas em torno do seu castelo de areia e que todos saibam onde procurar ajuda! Aumenta a Percepção em <%= per %>. Armário Encantado: Conjunto de salva-vidas (Item 1 de 3).",
+    "weaponArmoireBeachFlagNotes": "Reúna as tropas em torno do seu castelo de areia e que todos saibam onde procurar ajuda! Aumenta a Percepção em <%= per %>. Armário Encantado: Conjunto de Salva-vidas (Item 1 de 3).",
     "weaponArmoireBeachFlagText": "Bandeira de Praia",
     "weaponSpecialSummer2020WarriorText": "Anzol",
     "weaponSpecialSummer2020RogueNotes": "Seus inimigos não te veem chegar, mas suas Presas são inescapáveis! Aumenta Força em <%= str %>. Edição Limitada de Equipamento de Verão 2020.",
@@ -2592,8 +2592,8 @@
     "weaponArmoireYellowKiteNotes": "Mergulhando e desviando, veja sua alegre pipa voando. Aumenta todos os atributos em <%= attrs %> cada. Armário Encantado: Conjunto de pipas (Item 5 de 5)",
     "weaponArmoireOrangeKiteNotes": "Com cores do nascer e pôr do sol, vamos ver quão alto sua pipa pode chegar! Aumenta todos os atributos em <%= attrs %> cada. Armário Encantado: Conjunto de pipas (Item 3 de 5)",
     "armorSpecialSummer2022HealerNotes": "Use suas barbatanas coloridas para correr pelo recife e ajudar os que precisam de cura e descanso. Aumenta Constituição em <%= con %>. Edição limitada Equipamento de Verão 2022.",
-    "weaponArmoireBlueKiteNotes": "Navegando pelo horizonte azul, que truques você pode fazer com sua pipa? Aumenta todos os atributos em <%= attrs %> cada. Armário Encantado: Conjunto de pipas (Item 1 de 5)",
-    "weaponArmoireGreenKiteNotes": "Uma pipa esplêndida que você nunca viu, com seus tons de amarelo e verde. Aumenta todos os atributos em <%= attrs %> cada. Armário Encantado: Conjunto de pipas (Item 2 de 5)",
+    "weaponArmoireBlueKiteNotes": "Navegando pelo horizonte azul, que truques você pode fazer com sua pipa? Aumenta todos os atributos em <%= attrs %> cada. Armário Encantado: Conjunto de Pipas (Item 1 de 5)",
+    "weaponArmoireGreenKiteNotes": "Uma pipa esplêndida que você nunca viu, com seus tons de amarelo e verde. Aumenta todos os atributos em <%= attrs %> cada. Armário Encantado: Conjunto de Pipas (Item 2 de 5)",
     "armorMystery202207Text": "Armadura Água Viva",
     "headSpecialSummer2022WarriorNotes": "Centralize o poder da água conforme entra neste redemoinho intenso. Aumenta Força em <%= str %>. Edição limitada Equipamento de Verão 2022.",
     "headSpecialSummer2022RogueNotes": "Sem mau humor por aqui, estamos celebrando os trocadilhos casca grossa sobre crustáceos. Aumenta Percepção em <%= per %>. Edição limitada Equipamento de Verão 2022.",
@@ -2691,7 +2691,7 @@
     "headMystery202208Notes": "Revele este cabelo volumoso - pode se dobrar como um chicote! Não confere benefícios! Não confere benefícios. Item de Assinante de agosto de 2022.",
     "eyewearMystery202208Text": "Olhos Reluzentes",
     "eyewearMystery202208Notes": "Iluda seus inimigos com uma falsa sensação de segurança com esses olhos terrivelmente fofos. Não confere benefícios. Item de Assinante de agosto de 2022.",
-    "weaponMystery202209Notes": "Este livro irá te guiar durante sua jornada de mágicas. Não confere benefícios. Item de Assinante de setembro de 2022",
+    "weaponMystery202209Notes": "Este livro irá te guiar durante sua jornada de mágicas. Não confere benefícios. Item de Assinante de setembro de 2022.",
     "shieldMystery202209Text": "Monte dos Livros Mágicos",
     "shieldMystery202209Notes": "Construir seu conhecimento sobre feitiçaria precisa de muita leitura, mas com certeza irá aproveitar sua educação. Não confere benefícios. Item de Assinante de setembro de 2022.",
     "weaponMystery202209Text": "Manual Mágico",
@@ -2704,7 +2704,7 @@
     "weaponSpecialFall2022MageText": "Rajadas de Vento",
     "weaponSpecialFall2022MageNotes": "Essas rajadas poderosas permanecem em seu rastro conforme decola pelos céus. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022.",
     "weaponSpecialFall2022RogueNotes": "Esse pepino não pode apenas te defender, mas também é uma refeição deliciosa. Aumenta Força em <%= str %>. Equipamento de Edição Limitada do Outono de 2022.",
-    "weaponSpecialFall2022HealerText": "Olho Direito Espreito",
+    "weaponSpecialFall2022HealerText": "Olho Direito Observador",
     "weaponSpecialFall2022HealerNotes": "Para reinvindicar vitória, segure e diga as palavras de comando: 'Olho Um!' Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada do Outono de 2022.",
     "armorSpecialFall2022RogueText": "Armadura Kappa",
     "armorSpecialFall2022WarriorText": "Armadura Orc",
@@ -2715,5 +2715,16 @@
     "weaponSpecialFall2022WarriorNotes": "Talvez mais apropriado para cortar troncos ou fatias de pães crocantes do que armaduras de inimigos, mas RAWR! Parece assustador com certeza! Aumenta Força em <%= str %>. Equipamento de Edição Limitada do Outono de 2022.",
     "armorSpecialFall2022RogueNotes": "Se estiver nadando, fugindo ou lutando, você estará em segurança nesta armadura. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022.",
     "armorSpecialFall2022WarriorNotes": "RAWR! GRANDES OMBROS significam que você tem MUITA FORÇA! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada do Outono de 2022.",
-    "headSpecialFall2022RogueNotes": "Com esta capa de metal em sua cabeça, você terá proteção extra quando aventurar-se na terra. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022."
+    "headSpecialFall2022RogueNotes": "Com esta capa de metal em sua cabeça, você terá proteção extra quando aventurar-se na terra. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "headSpecialFall2022MageText": "Máscara Harpia",
+    "headSpecialFall2022HealerText": "Máscara Observador",
+    "headSpecialFall2022HealerNotes": "A beleza está aqui. Em algum lugar! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "shieldSpecialFall2022WarriorText": "Escudo Orc",
+    "shieldSpecialFall2022HealerText": "Olho Esquerdo Observador",
+    "shieldSpecialFall2022HealerNotes": "Olho Dois, olhe este traje e trema. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "headSpecialFall2022WarriorNotes": "Presas fortes e afiadas o suficiente para perfurar abóboras! RAWR! Aumenta Força em <%= str %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "headSpecialFall2022MageNotes": "Encante e atraia outros para perto com esta máscara mágica de donzela. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "shieldSpecialFall2022WarriorNotes": "RAWR ou TRAVESSURAS! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "armorSpecialFall2022HealerText": "Extravagância da Casca do Observador",
+    "armorSpecialFall2022HealerNotes": "Quantas observações pode um Observador observar? Se um Observador pudesse observar o observável? Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada do Outono de 2022."
 }
diff --git a/website/common/locales/pt_BR/limited.json b/website/common/locales/pt_BR/limited.json
index b4d0f55090..26cc646fe9 100644
--- a/website/common/locales/pt_BR/limited.json
+++ b/website/common/locales/pt_BR/limited.json
@@ -229,5 +229,9 @@
     "summer2022AngelfishHealerSet": "Peixe-anjo (Curandeiro)",
     "dateEndDecember": "31 de dezembro",
     "februaryYYYY": "Fevereiro de <%= year %>",
-    "julyYYYY": "Julho de <%= year %>"
+    "julyYYYY": "Julho de <%= year %>",
+    "fall2022OrcWarriorSet": "Orc (Guerreiro)",
+    "fall2022HarpyMageSet": "Harpia (Mago)",
+    "fall2022KappaRogueSet": "Kappa (Gatuno)",
+    "fall2022WatcherHealerSet": "Observador (Curandeiro)"
 }
diff --git a/website/common/locales/pt_BR/npc.json b/website/common/locales/pt_BR/npc.json
index fb3ba3bfbd..203079b5b7 100644
--- a/website/common/locales/pt_BR/npc.json
+++ b/website/common/locales/pt_BR/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Nova atualização da Bailey!",
     "tellMeLater": "Lembrar mais tarde",
     "dismissAlert": "Dispensar este alerta",
-    "donateText3": "Habitica é um projeto de código aberto que depende do suporte dos nossos usuários. O dinheiro que você gasta em gemas nos ajuda a manter os servidores funcionando, manter uma pequena equipe, desenvolver novas funcionalidades e oferecer incentivos para os nossos voluntários.",
+    "donateText3": "Habitica é um projeto de código aberto que depende do suporte dos nossos usuários. O dinheiro que você gasta em gemas nos ajuda a manter os servidores funcionando, manter uma pequena equipe, desenvolver novas funcionalidades e oferecer incentivos para os nossos voluntários",
     "card": "Cartão de crédito",
     "paymentMethods": "Comprar usando",
     "paymentSuccessful": "Seu pagamento foi efetuado com sucesso!",
diff --git a/website/common/locales/ro/front.json b/website/common/locales/ro/front.json
index d51ae257fa..4a54761539 100644
--- a/website/common/locales/ro/front.json
+++ b/website/common/locales/ro/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "și cu",
     "chores": "Chores",
     "clearBrowserData": "Curăță Datele de Navigare",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Extensii</a>",
+    "communityExtensions": "Add-ons & Extensii",
     "communityFacebook": "Facebook",
     "companyAbout": "Cum funcționează",
     "companyBlog": "Blog",
diff --git a/website/common/locales/ru/faq.json b/website/common/locales/ru/faq.json
index 3abd34643b..122f27b4f5 100644
--- a/website/common/locales/ru/faq.json
+++ b/website/common/locales/ru/faq.json
@@ -55,5 +55,6 @@
     "iosFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВО), задайте его в чате Таверны через Меню > Таверна! Мы с радостью поможем вам.",
     "androidFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВо), задайте его в чате Таверны через Меню > Таверна! Мы с радостью поможем вам.",
     "webFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВО), задайте его в [Гильдии новичков](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Мы с радостью поможем вам.",
-    "faqQuestion13": "Что такое групповые планы?"
+    "faqQuestion13": "Что такое групповые планы?",
+    "webFaqAnswer13": "## Как работают групповые планы?\n\n[Групповой план](/group-plans) дает вашей команде или гильдии доступ к общему списку задач, который похож на ваш персональный список задач! Это совместный опыт использования Habitica, где задачи могут быть созданы и выполнены любым членом группы.\n\nТакже доступны такие функции, как роли участников группы, просмотр статуса заданий и назначение заданий участникам группы, которые обеспечивают больший контроль при выполнении общих задач. [Посетите нашу вики](https://habitica.fandom.com/wiki/Group_Plans), чтобы узнать больше о особенностях групповых планов!\n\n## Кому выгоден групповой план?\n\nГрупповые планы наиболее эффективны, когда у вас есть небольшая команда людей, желающих сотрудничать вместе. Мы рекомендуем группу состоящую из 2-5 человек.\n\nГрупповые планы отлично подходят для семей, будь то родители с детьми или вы с вашим партнером. Общие цели, домашние дела или обязанности легко отслеживать с помощью общего списка задач.\n\nГрупповые планы также могут быть полезны для команд коллег, имеющих общие цели, или менеджеров, которые хотят познакомить своих сотрудников с геймификацией.\n\n## Краткие советы по работе в группе\n\nВот несколько кратких советов, которые помогут вам начать использовать групповые планы. Более подробную информацию мы предоставим в следующих разделах:\n\n* Сделайте участника менеджером, чтобы дать ему возможность создавать и редактировать задания.\n* Оставьте задание не назначенным, если любой может его выполнить, и оно должно быть выполнено только один раз.\n* Назначьте задание одному человеку, чтобы убедиться, что никто другой не сможет выполнить его задание.\n* Назначьте задачу нескольким людям, если все они должны ее выполнить.\n* Включите функцию отображения общих задач в вашем персональном списке задач, чтобы ничего не пропустить.\n* Вы получите вознаграждение за выполненные задания, даже если они назначены нескольким участникам группы.\n* Награды за выполнение заданий не делятся и не распределяются между членами команды\n* По цвету заданий в общем списке задач, можно определить среднее время выполнения данных заданий.\n* Регулярно просматривайте задания в вашем общем списке задач, чтобы убедиться, что они все еще актуальны.\n* Пропуск ежедневного задания не нанесет урона ни вам, ни вашей команде, но цвет задания ухудшится.\n\n## Как другие члены группы могут создавать задания?\n\nТолько лидер группы и менеджеры могут создавать задания. Если вы хотите, чтобы член группы мог создавать задания, то вам следует повысить его статус до менеджера, перейдя на вкладку Информация о группе, просмотрев список членов группы и нажав на значок точек напротив его имени.\n\n## Как работает назначение задачи?\n\nГрупповые планы дают вам уникальную возможность назначать задания другим членам группы. Назначение задачи отлично подходит для делегирования. Если вы назначаете задание кому-то одному, то другие члены группы лишаются возможности выполнить его.\n\nВы также можете назначить задачу нескольким людям, если она должна быть выполнена несколькими членами группы. Например, если все должны почистить зубы, создайте задачу и назначьте ее каждому члену группы. Все они смогут ее выполнить и получить за это индивидуальное вознаграждение. Основное задание будет считаться выполненным, как только все его выполнят.\n\n## Как работают неназначенные задания?\n\nНеназначенные задания могут быть выполнены любым членом группы, поэтому оставьте задание неназначенным, чтобы любой член группы мог его выполнить. Например, вынести мусор. Тот, кто выносит мусор, может выполнить неназначенное задание, и оно будет отображаться как выполненное для всех.\n\n## Как работает синхронизированный сброс дня?\n\nОбщие задачи будут сбрасываться в одно и то же время для всех, чтобы общих список задач был синхронизирован. Это время отображается в общем списке задач и определяется временем начала дня лидера группы. Поскольку общие задания сбрасываются автоматически, у вас не будет возможности завершить вчерашние незавершенные общие ежедневные задания, когда вы зайдете на следующее утро.\n\nОбщие ежедневные задания не наносят ущерба, если они пропущены, однако их цвет будет ухудшаться, чтобы помочь визуализировать прогресс. Мы не хотим, чтобы совместный опыт работы был негативным!\n\n## Как пользоваться групповыми планами в мобильных приложениях?\n\nХотя мобильные приложения еще не полностью поддерживают все функции групповых планов, вы все равно можете выполнять общие задачи из приложения для iOS и Android. В браузерной версии Habitica перейдите на доску общих задач вашей группы и нажмите на кнопку копирования задач. Теперь все открытые и назначенные общие задачи будут отображаться в вашем личном списке задач на всех платформах.\n\n## В чем разница между общими заданиями в группе и испытаниями?\n\nОбщие списки задач группового плана более динамичны, чем испытания, поскольку их можно постоянно обновлять и взаимодействовать с ними. Испытания отлично подходят, если у вас есть один набор задач, который нужно будет выполнить большому количеству людей.\n\nГрупповые планы также являются платной функцией, в то время как испытания доступны бесплатно для всех.\n\nВ испытаниях нельзя назначать конкретные задачи, и в испытаниях нет общего сброса суток. В целом, испытания предоставляют меньше возможностей для контроля и прямого взаимодействия."
 }
diff --git a/website/common/locales/sk/front.json b/website/common/locales/sk/front.json
index b17e9b936f..73b21cb2db 100644
--- a/website/common/locales/sk/front.json
+++ b/website/common/locales/sk/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "a",
     "chores": "Každodenná práca okolo domu",
     "clearBrowserData": "Prečisti si prehliadač",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Doplnky a Rozšírenia</a>",
+    "communityExtensions": "Doplnky a Rozšírenia",
     "communityFacebook": "Facebook",
     "companyAbout": "Ako to funguje",
     "companyBlog": "Blog",
diff --git a/website/common/locales/sr/front.json b/website/common/locales/sr/front.json
index 0f5be1dec9..d68ad56b12 100644
--- a/website/common/locales/sr/front.json
+++ b/website/common/locales/sr/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "i",
     "chores": "Kućni poslovi",
     "clearBrowserData": "Clear Browser Data",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Extensions</a>",
+    "communityExtensions": "",
     "communityFacebook": "Fejsbuk",
     "companyAbout": "How It Works",
     "companyBlog": "blog",
diff --git a/website/common/locales/sv/front.json b/website/common/locales/sv/front.json
index 0f9b9854f6..eb2eb5d160 100644
--- a/website/common/locales/sv/front.json
+++ b/website/common/locales/sv/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "och",
     "chores": "Sysslor",
     "clearBrowserData": "Rensa webbläsardata",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Tillägg</a>",
+    "communityExtensions": "Tillägg",
     "communityFacebook": "Facebook",
     "companyAbout": "Hur Det Funkar",
     "companyBlog": "Blogg",
diff --git a/website/common/locales/tr/front.json b/website/common/locales/tr/front.json
index c4fe022f70..43f5731d3e 100644
--- a/website/common/locales/tr/front.json
+++ b/website/common/locales/tr/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "ve",
     "chores": "Gündelik İşler",
     "clearBrowserData": "Tarayıcı Verilerini Temizle",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Uygulamalar & Uzantılar</a>",
+    "communityExtensions": "Uygulamalar & Uzantılar",
     "communityFacebook": "Facebook",
     "companyAbout": "Nasıl Çalışır",
     "companyBlog": "Blog",
diff --git a/website/common/locales/uk/gear.json b/website/common/locales/uk/gear.json
index 12e08f5a4e..43a910b47c 100644
--- a/website/common/locales/uk/gear.json
+++ b/website/common/locales/uk/gear.json
@@ -2083,5 +2083,6 @@
     "weaponSpecialFall2021RogueText": "Липка стікаюча куля",
     "weaponSpecialFall2021RogueNotes": "Чорт забирай, у що ти вляпався? Коли люди кажуть, що у розбійників липкі пальці, вони мають на увазі не це! Збільшує силу на <%= str %>. Обмежений випуск осені 2021.",
     "weaponSpecialFall2021WarriorNotes": "Ця стилізована одностороння сокира ідеально підходить для того, щоб розсікати ... гарбузи! Збільшує силу на <%= str %>. Обмежений випуск осені 2021.",
-    "weaponSpecialFall2021MageNotes": "Знання шукає знання. Сформована зі спогадів і бажань, ця страшна рука хапається за більше. Збільшує інтелект на <%= int %> і спритність на <%= per %>. Обмежений випуск осені 2021."
+    "weaponSpecialFall2021MageNotes": "Знання шукає знання. Сформована зі спогадів і бажань, ця страшна рука хапається за більше. Збільшує інтелект на <%= int %> і спритність на <%= per %>. Обмежений випуск осені 2021.",
+    "weaponSpecialFall2022WarriorText": "Розривний меч орка"
 }
diff --git a/website/common/locales/zh/achievements.json b/website/common/locales/zh/achievements.json
index 97a0670336..f97c571239 100644
--- a/website/common/locales/zh/achievements.json
+++ b/website/common/locales/zh/achievements.json
@@ -134,7 +134,7 @@
     "achievementGroupsBeta2022": "互动的测试者",
     "achievementGroupsBeta2022ModalText": "你和你的队通过测试和给反馈帮助Habitica！",
     "achievementGroupsBeta2022Text": "你和你的队通过给了无价的反馈帮助Habitica测试。",
-    "achievementReptacularRumble": "爬虫壮的轰",
+    "achievementReptacularRumble": "爬宠街斗",
     "achievementReptacularRumbleText": "已孵化所有基础颜色的爬虫宠物：鳄鱼、翼龙、蛇、三角龙、海龟、霸王龙、和迅猛龙！",
     "achievementWoodlandWizard": "林地巫师",
     "achievementWoodlandWizardModalText": "你集齐了所有森林宠物！",
diff --git a/website/common/locales/zh/faq.json b/website/common/locales/zh/faq.json
index d0085ede89..279ee0768c 100644
--- a/website/common/locales/zh/faq.json
+++ b/website/common/locales/zh/faq.json
@@ -55,5 +55,6 @@
     "iosFaqStillNeedHelp": "如果[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在酒馆聊天中咨询。进入方式：菜单 > 酒馆！我们很乐意为你提供帮助。",
     "androidFaqStillNeedHelp": "如果[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在酒馆聊天中咨询。进入方式：菜单 > 酒馆！我们很乐意为你提供帮助。",
     "webFaqStillNeedHelp": "如果问题列表和[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在[Habitica 帮助公会](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)中咨询。我们很乐意为你提供帮助。",
-    "faqQuestion13": "什么是团体计划？"
+    "faqQuestion13": "什么是团体计划？",
+    "webFaqAnswer13": "## 团体计划是如何运作的？\n\n[团队计划](/group-plans)让您的队伍或公会可以访问类似于您的个人任务板的共享任务板！ 这是一种共享的 Habitica 体验，团队中的任何成员都可以创建和检查任务。\n\n还增加一些新功能，如成员角色，状态视图和任务分配，为您提供更加可控的体验。想了解团队计划的更多信息请[访问我们的wiki](https://habitica.fandom.com/wiki/Group_Plans) ！\n\n## 哪些人可以从团体计划中受益？\n\n团队计划最适合那些想要进行协作的小团队。我们建议保持在2-5名成员。\n\n对于家庭来说，不管是父母、孩子还是你和伴侣，都能从团队计划中受益。共同的目标、家务或责任很适合在一块任务板上记录下来。\n\n团队计划对于那些拥有共同目标的工作团队或希望向员工介绍游戏化的管理者也很有帮助。\n\n## 快速入门团队计划\n\n以下是一些使用技巧，可以帮助您的新团队快速起步。同时我们将在下一部分提供更多详细信息：\n\n* 让团队成员成为管理者，使他们能够创建和编辑任务\n* 如果任务是一次性且可完成的，则保留未分配的任务\n* 为确保其他成员不会误领任务，请将任务指派给一位成员\n* 如果多位成员都需要完成同一任务，请将任务进行分配\n* 在个人任务板上开启显示共享任务这一功能，避免错过任何内容\n* 即使是多人任务，在任务完成后你也能获得奖励\n* 任务完成奖励并不会在团队成员之间共享或平分\n* 您可以通过任务颜色在团队任务板上来判断平均完成率\n* 定期查看团队任务板上的任务，以确保它们是否需要保留\n* 错过一个每日任务不会对你或你的团队造成伤害，但任务颜色会下降\n\n## 团队中的其他成员如何创建任务？\n\n只有团队队长和管理者可以创建任务。如果您希望成员也能进行创建，那么您需要打开团队信息选项卡、查看成员列表并单击其名称旁的圆点图标将他们提升为管理者。\n\n## 任务分配该如何进行？\n\n团队计划赋予您将任务分配给其他小组成员的独特能力。任务分配功能非常适合委派。如果您已将任务分配给某位成员，那么其他成员将无法完成它。\n\n如果一个任务需要多位成员完成，那么您也可以将其分配给多人。例如，如果每个人都必须刷牙，请创建一个任务并将其分配给每位成员。这让他们都能勾选完成并获得个人奖励。当每个人勾选完成时，团队主任务才会显示为完成。\n\n## 未分配的任务如何处理？\n\n团队里的任何成员都可以完成未分配的任务，因此请保留那些未分配的任务，以便任何成员都能完成它。例如，倒垃圾。无论谁倒了垃圾，都可以将其勾选，并提示每个人任务已完成。\n\n## 在同步日如何重置工作？\n\n共享任务会同一时间重置，方便大家同步任务共享板。同步时间由团队队长设置后展示在任务共享板上。由于共享任务自动重置，第二天早上签到时，将没有机会勾选昨天未完成的每日共享任务。\n\n错过每日共享任务不会造成伤害，但是它们会降低颜色方便团队成员直观地了解进度。我们不希望任务共享给您带来负面的体验！\n\n## 如何在APP上使用团队？\n\n虽然APP尚未完全支持团队计划的所有功能，但您仍然可以从iOS和安卓的APP上完成共享任务。在Habitica的网站上，前往团队的任务共享板并打开任务复制按钮。这将会使所有打开和分配的共享任务跨平台显示在您的个人任务板上。\n\n## 团队的共同任务与挑战有何区别？\n\n团队计划的共享任务板比挑战更具动态性，因为它可以不断更新交互。如果您有一组任务想要发给许多人，这一操作在挑战上执行会非常繁琐，但在团队计划里可以快速实现。\n\n其中团体计划是付费功能，而挑战对每个人都是免费的。\n\n你无法在挑战中分配特定的任务，挑战也没有共享日重置。总的来说，挑战提供的控制功能和直接交互功能较少。"
 }
diff --git a/website/common/locales/zh/front.json b/website/common/locales/zh/front.json
index a468897755..61057f9fc6 100644
--- a/website/common/locales/zh/front.json
+++ b/website/common/locales/zh/front.json
@@ -9,8 +9,8 @@
     "communityFacebook": "Facebook",
     "companyAbout": "功能",
     "companyBlog": "博客",
-    "companyContribute": "贡献",
-    "companyDonate": "捐款",
+    "companyContribute": "为Habitica做贡献",
+    "companyDonate": "捐款给Habitica",
     "forgotPassword": "找回密码？",
     "emailNewPass": "向您发送一封密码重设邮件",
     "forgotPasswordSteps": "输入你的邮箱地址来注册你的Habitica账户。",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "想游戏化你的生活？",
     "marketing4Lead3-2": "希望组织一个教育，健康，或其他类型的小组？",
     "marketing4Lead3Title": "游戏化任何事情",
-    "mobileAndroid": "安卓",
-    "mobileIOS": "IOS",
+    "mobileAndroid": "安卓App",
+    "mobileIOS": "iOS应用",
     "oldNews": "新闻",
     "newsArchive": "Wikia上的新闻档案（多语言）",
     "setNewPass": "设置新密码",
@@ -187,5 +187,6 @@
     "minPasswordLength": "密码至少需要8个字符。",
     "enterHabitica": "进入Habitica",
     "socialAlreadyExists": "该社交账号已与现存的Habitica账户连接。",
-    "emailUsernamePlaceholder": "例如 habitrabbit 或者 gryphon@example.com"
+    "emailUsernamePlaceholder": "例如 habitrabbit 或者 gryphon@example.com",
+    "footerProduct": "产品"
 }
diff --git a/website/common/locales/zh/gear.json b/website/common/locales/zh/gear.json
index 6db98d4f82..350a7f27df 100644
--- a/website/common/locales/zh/gear.json
+++ b/website/common/locales/zh/gear.json
@@ -2698,5 +2698,37 @@
     "eyewearArmoireTragedyMaskText": "悲剧面具",
     "eyewearArmoireTragedyMaskNotes": "呜啊！为可怜的表演者戴上沉重的面具，在舞台上昂首阔步，痛苦，悲伤，表达出所有的难过吧。增加<%= int %>点智力。魔法衣橱：剧院面具套装（2/2）。",
     "shieldMystery202209Text": "山脉魔法书",
-    "eyewearArmoireComedyMaskText": "喜剧面具"
+    "eyewearArmoireComedyMaskText": "喜剧面具",
+    "weaponSpecialFall2022HealerNotes": "高举它宣告胜利，同时喊出命令：“一号眼！”增加<%= int %>点智力。2022年秋季限定版装备。",
+    "weaponSpecialFall2022RogueNotes": "这根黄瓜不仅可以用来防身，饿了还能靠它饱餐一顿。增加<%= str %>点力量。2022年秋季限定版装备。",
+    "weaponSpecialFall2022MageNotes": "当你飞向高空时，这阵阵强风会一直伴随你。增加<%= int %>点智力和<%= per %>点感知。2022年秋季限定版装备。",
+    "armorMystery202210Text": "不祥蛇铠",
+    "armorMystery202210Notes": "要不试试滑行，可能你会发现这是一种相当高效的交通方式！没有属性加成。2022年10月订阅者物品。",
+    "headSpecialFall2022MageText": "鹰身女妖面具",
+    "headMystery202210Text": "不祥蛇盔",
+    "headMystery202210Notes": "这个鳞甲兜帽必定会吓坏你的待办清单！没有属性加成。2022年10月订阅者物品。",
+    "weaponSpecialFall2022HealerText": "窥视者右眼",
+    "headSpecialFall2022WarriorNotes": "獠牙锋利坚韧，足以刺穿南瓜！RAWR！增加<%= str %>点力量。2022年秋季限定版装备。",
+    "headSpecialFall2022RogueNotes": "戴上这顶金属帽，当你冒险上岸时，将会多一道保险。增加<%= per %>点感知。2022年秋季限定版装备。",
+    "weaponSpecialFall2022RogueText": "黄瓜刀",
+    "weaponSpecialFall2022WarriorText": "兽人利剑",
+    "weaponSpecialFall2022MageText": "爆裂之风",
+    "weaponSpecialFall2022WarriorNotes": "比起敌人的盔甲来说也许更适合用来劈木头或切硬皮面包，但是RAWR！它看起来确实很可怕！增加<%= str %>点力量。2022年秋季限定版装备。",
+    "armorSpecialFall2022RogueText": "卡帕盔甲",
+    "armorSpecialFall2022RogueNotes": "无论你是游泳、潜行还是摔跤，穿上这件盔甲就能保障你的安全。增加<%= per %>感知。2022年秋季限定版装备。",
+    "armorSpecialFall2022WarriorText": "兽人盔甲",
+    "armorSpecialFall2022WarriorNotes": "RAWR！宽大的肩膀彰显着你的强壮！增加<%= con %>点体质。2022年秋季限定版装备。",
+    "armorSpecialFall2022MageText": "鹰身女妖之甲",
+    "armorSpecialFall2022MageNotes": "这双奇妙翅膀让你飞得像风一样快，这对可怕利爪让你攥紧最在意的事物。增加<%= int %>点智力。2022年秋季限定版装备。",
+    "armorSpecialFall2022HealerNotes": "若一个偷窥者窥视了另一个偷窥者？那么一个偷窥者可以偷窥多少人？增加<%= con %>点体质。2022年秋季限定版装备。",
+    "armorSpecialFall2022HealerText": "群魔环伺",
+    "headSpecialFall2022RogueText": "卡帕面甲",
+    "headSpecialFall2022WarriorText": "兽人面具",
+    "headSpecialFall2022MageNotes": "带上魔女面具，诱惑他人靠近。增加<%= per %>点感知。2022年秋季限定版装备。",
+    "headSpecialFall2022HealerText": "窥视之面",
+    "headSpecialFall2022HealerNotes": "你看那有个美女。在哪里！增加<%= int %>点智力。2022年秋季限定版装备。",
+    "shieldSpecialFall2022WarriorText": "兽人之盾",
+    "shieldSpecialFall2022WarriorNotes": "要么招待要么RAWR！增加<%= con %>点体质。2022年秋季限定版装备。",
+    "shieldSpecialFall2022HealerText": "窥视者左眼",
+    "shieldSpecialFall2022HealerNotes": "二号眼，盯着这套服饰颤抖吧。增加<%= con %>点体质。2022年秋季限定版装备。"
 }
diff --git a/website/common/locales/zh/groups.json b/website/common/locales/zh/groups.json
index cd8e25df2b..8f0068bb3d 100644
--- a/website/common/locales/zh/groups.json
+++ b/website/common/locales/zh/groups.json
@@ -35,7 +35,7 @@
     "invitationAcceptedHeader": "你的邀请已经被接受",
     "invitationAcceptedBody": "<%= username %>接受了你的邀请加入<%= groupName %>！",
     "systemMessage": "系统消息",
-    "newMsgGuild": "<span class=\"notification-bold-blue\"><%- name %></span>  有新消息",
+    "newMsgGuild": "<span class=\"notification-bold-blue\"><%- name %></span>有新消息",
     "newMsgParty": "您的队伍 <span class=\"notification-bold-blue\"><%- name %></span> 有新消息",
     "chat": "聊天",
     "sendChat": "发送",
@@ -163,11 +163,11 @@
     "onlyGroupLeaderCanEditTasks": "你没有管理任务的权限！",
     "onlyGroupTasksCanBeAssigned": "只有小组任务可以被分配",
     "assignedTo": "分配给",
-    "assignedToUser": "已被分配给<strong><%- userName %></strong>",
-    "assignedToMembers": "已被分配给<strong><%= userCount %> members</strong>个会员",
-    "assignedToYouAndMembers": "已被分配给你和<strong><%= userCount %></strong>个会员",
-    "youAreAssigned": "分配予<strong>你</strong>",
-    "taskIsUnassigned": "這個任务還沒有被分配",
+    "assignedToUser": "已被分配给：<strong>@<%- userName %></strong>",
+    "assignedToMembers": "<%= userCount %>用户",
+    "assignedToYouAndMembers": "<strong>你</strong>， <%= userCount %>用户",
+    "youAreAssigned": "分配给：<strong>你</strong>",
+    "taskIsUnassigned": "这个任务还未被分配",
     "confirmUnClaim": "你肯定你要放棄這個任务？",
     "confirmNeedsWork": "您确定要将此任务标记为需要处理吗？",
     "userRequestsApproval": "<strong><%- userName %></strong>的请求被肯定了",
@@ -183,7 +183,7 @@
     "removeClaim": "移除公告",
     "onlyGroupLeaderCanManageSubscription": "只有组长可以修改小组的订购方式",
     "yourTaskHasBeenApproved": "您的任务<span class=\"notification-green notification-bold\"><%- taskText %></span>已经被批准。",
-    "taskNeedsWork": "<span class=\"notification-bold\"><%- managerName %></span> 标记 <span class=\"notification-bold\"><%- taskText %></span> 为需要额外工作。",
+    "taskNeedsWork": "<span class=\"notification-bold\"><%- taskText %></span>未被<span class=\"notification-bold\">@<%- managerName %>选中</span>。完成任务的奖励已被收回。",
     "userHasRequestedTaskApproval": "<span class=\"notification-bold\"><%- user %></span> 请求 <span class=\"notification-bold\"><%- taskName %></span> 的批准",
     "approve": "许可",
     "approveTask": "许可任务",
@@ -258,7 +258,7 @@
     "groupDescription": "详细描述",
     "guildDescriptionPlaceholder": "在这里输入公会会员应该了解公会的所有内容。有用的提示，有帮助的链接和激励人心的标语都在这里！",
     "markdownFormattingHelp": "[Markdown格式帮助](https://habitica.fandom.com/zh/wiki/Markdown格式帮助)",
-    "partyDescriptionPlaceholder": "这是我们队伍的描述。它描述了我们在这个队伍里做什么。如果你想了解更多关于我们在这个队伍所做的事，请阅读说明。一起组队吧！",
+    "partyDescriptionPlaceholder": "这是我们队伍的简介。介绍了我们是一个怎样的队伍。阅读简介后如果你想更加深入的了解我们，那就一起组队吧。",
     "guildGemCostInfo": "花费宝石促进高质量的公会，宝石会转移到您的公会的银行。",
     "noGuildsTitle": "你不是任何公会的成员。",
     "noGuildsParagraph1": "公会是由其他玩家创建的社会团体，可以为您提供支持，加强自身的责任和激励人心的聊天。",
@@ -354,12 +354,12 @@
     "PMUserDoesNotReceiveMessages": "这个用户不再接收私人消息",
     "PMCanNotReply": "你不能回复此谈话",
     "newPartyPlaceholder": "输入你的队伍名称。",
-    "assignedDateAndUser": "<strong><%= date %></strong>由<strong>@<%- username %></strong>分配",
+    "assignedDateAndUser": "由@<%- username %>在<%= date %>分配",
     "assignedDateOnly": "<strong><%= date %></strong>分配",
     "claimRewards": "领取奖励",
     "thisTaskApproved": "这任务已批准",
     "managerNotes": "经理的须知",
-    "chooseTeamMember": "选择一个团队成员",
+    "chooseTeamMember": "查找一位团队成员",
     "unassigned": "未分配",
     "onlyPrivateGuildsCanUpgrade": "只有私人公会可以升级为团队计划。",
     "bannedWordsAllowedDetail": "选择该选项后，在该公会中将允许使用违禁词语。",
@@ -380,5 +380,27 @@
     "editParty": "编辑队伍",
     "leaveGuild": "离开公会",
     "chatTemporarilyUnavailable": "现在聊天室是暂时不能用的。请稍后再试。",
-    "sendGiftTotal": "总计："
+    "sendGiftTotal": "总计：",
+    "assignTo": "分配给",
+    "dayStart": "<strong>起始日</strong>: <%= startTime %>",
+    "viewStatus": "状态",
+    "lastCompleted": "最后完成",
+    "youEmphasized": "<strong>你</strong>",
+    "newGroupsWhatsNew": "看看最新消息：",
+    "newGroupsBullet01": "从任务共享板直接与任务交互",
+    "newGroupsWelcome": "欢迎来到新的任务共享板！",
+    "newGroupsBullet02": "任何人都可以完成未分配的任务",
+    "newGroupsBullet03": "为方便全体成员协作，共享任务会在同一时间重置",
+    "newGroupsBullet04": "当错过任务或出现勾选昨天完成情况的提示时，共享的每日任务将不会造成伤害",
+    "newGroupsBullet05": "如果未完成共享任务以提升进度，那么任务的颜色将会下降",
+    "newGroupsBullet06": "任务状态视图允许您快速查看受指派成员的完成情况",
+    "newGroupsBullet07": "切换功能可以将共享任务展现你的个人任务板上",
+    "newGroupsBullet08": "团队队长及管理者可以从任务列表的顶部快速添加任务",
+    "newGroupsBullet09": "可以取消对共享任务的显示，但它仍需要完成",
+    "newGroupsBullet10": "分配状况决定完成状况：",
+    "newGroupsBullet10a": "如果每位成员都能完成任务<strong>就无需分配任务</strong>",
+    "newGroupsBullet10b": "<strong>将任务分配给一位成员，</strong>这样可以督促他们完成",
+    "newGroupsBullet10c": "如果多位成员都需要完成任务，<strong>则将任务分配给他们</strong>",
+    "newGroupsVisitFAQ": "想了解更多资讯请浏览帮助菜单下的<a href='/static/faq#group-plans' target='_blank'>常见问题</a>。",
+    "newGroupsEnjoy": "希望新的团队订阅体验能让你满意！"
 }
diff --git a/website/common/locales/zh_TW/front.json b/website/common/locales/zh_TW/front.json
index 871352da07..6302bf9731 100644
--- a/website/common/locales/zh_TW/front.json
+++ b/website/common/locales/zh_TW/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "以及",
     "chores": "家務事",
     "clearBrowserData": "清除瀏覽器資料",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>附加元件 & 擴充套件</a>",
+    "communityExtensions": "附加元件 & 擴充套件",
     "communityFacebook": "Facebook",
     "companyAbout": "瞭解如何使用Habitica",
     "companyBlog": "部落格",

From 12b045093a433ea9a3207a6a90111297407129a4 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 30 Sep 2022 15:25:31 -0500
Subject: [PATCH 070/134] 4.245.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 43f9b29ae2..31b756e359 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.245.0",
+  "version": "4.245.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 87e9df8f0b..cca58a8f4e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.245.0",
+  "version": "4.245.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From ace964f2b3cf590086daa5a38cea2d87a86b0104 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 6 Oct 2022 15:53:19 -0500
Subject: [PATCH 071/134] fix(subs): escape group demographics without group

---
 .../src/components/payments/successModal.vue  | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 59a2119557..a4901051af 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -326,21 +326,6 @@ export default {
     isFromBalance () {
       return this.paymentData.paymentType === 'gift-gems-balance';
     },
-    // upgradedGroup () {
-    //   const upgradedGroup = (this.paymentData.paymentType === 'groupPlan'
-    // && !this.paymentData.newGroup);
-    //   const demographicsKey = upgradedGroup.demographics;
-    //   const upgradedGroupName = upgradedGroup.name;
-    //   const upgradedGroupType = upgradedGroup.type;
-    //   const groupPlanUpgraded = {
-    //     demographics: demographicsKey,
-    //     name: upgradedGroupName,
-    //     type: upgradedGroupType,
-    //   };
-    //   console.log(groupPlanUpgraded.demographics,
-    //     groupPlanUpgraded.name, groupPlanUpgraded.type);
-    //   return groupPlanUpgraded;
-    // },
   },
   mounted () {
     this.$root.$on('habitica:payment-success', data => {
@@ -357,14 +342,14 @@ export default {
   },
   methods: {
     submit () {
-      if (!this.paymentData.newGroup) {
+      if (this.paymentData.group && !this.paymentData.newGroup) {
         Analytics.track({
           hitType: 'event',
           eventName: 'group plan upgrade',
           eventAction: 'group plan upgrade',
           eventCategory: 'behavior',
           demographics: this.upgradedGroup.demographics,
-          type: this.paymentData.group.type, // also tried this.upgradedGroup.type
+          type: this.paymentData.group.type,
         }, { trackOnClient: true });
       }
       this.paymentData = {};

From a5575b3593245885dde20c005366f05a7dc18d92 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 6 Oct 2022 15:53:25 -0500
Subject: [PATCH 072/134] 4.245.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 31b756e359..a0851d98c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.245.1",
+  "version": "4.245.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cca58a8f4e..4529e59755 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.245.1",
+  "version": "4.245.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From b60a76d7dd416676653bf541c41e90549bf0838b Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 7 Oct 2022 15:48:38 -0500
Subject: [PATCH 073/134] chore(subproject): update images

---
 habitica-images | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/habitica-images b/habitica-images
index c17cf70c40..bb5f371ec4 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit c17cf70c407e0b8d7e0b0cd84f7aecfea295d568
+Subproject commit bb5f371ec4b5963b9476944f7d7785b2cd83ca39

From 3f9d55254e9b891269ad8dc381e358c64583d888 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Fri, 7 Oct 2022 17:10:29 -0400
Subject: [PATCH 074/134] fix(style): update to scoped colors & set footer
 background image to pointer-events:none (#14265)

* first pass

* second pass

* third pass

* fourth pass, not a lot of progress

* fifth pass, slowly gettin there

* breakpoint nonsense

* flexbox and breakpoint nonsense

* svg updates, css updates

* whitespace

* chore: merge upstream/develop

* style(breakpoints): added responsive breakpoints, social column alignment tweaks

* style(breakpoints): add xs-specific selectors and classes

* style: mobile footer

* style: mobile footer

* style: static landing page footer

* style: small tweaks to social layout

* fix(translations): update website/common/locales/de/gear.json to develop

* update(style): small updates

* update(style): cleaning up code

* update(style): cleaning up code

* update(style): mobile footer updates

* update(style): complete mobile footer & clean up code

* update(style): add tablet breakpoint and remove rogue terms link

* fix(style): update to scoped colors & set footer background image to pointer-events:none

* fix(style): removed redundant logo class definition
---
 website/client/src/components/static/home.vue | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/website/client/src/components/static/home.vue b/website/client/src/components/static/home.vue
index d9c7782d3a..3e4215b652 100644
--- a/website/client/src/components/static/home.vue
+++ b/website/client/src/components/static/home.vue
@@ -363,7 +363,7 @@
 
   #front {
     .form-text a {
-      color: #fff !important;
+      color: $white !important;
     }
 
     .container-fluid {
@@ -375,30 +375,24 @@
       padding-bottom: 5em;
     }
 
-    .logo {
-      width: 128px;
-      height: 28px;
-      color: purple;
-    }
-
     .purple-1, .purple-2, .purple-3, .purple-4, h1, h2, h3, h4, h5 {
-      color: #fff;
+      color: $white;
     }
 
     .purple-1 {
-      background-color: #6133b4;
+      background-color: $purple-300;
     }
 
     .purple-2 {
-      background-color: #432874;
+      background-color: $purple-100;
     }
 
     .purple-3 {
-      background-color: #36205d;
+      background-color: $purple-50;
     }
 
     .purple-4 {
-      background-color: #271b3d;
+      background-color: $header-dark-background;
     }
 
     p.section-main {
@@ -419,15 +413,15 @@
     }
 
     .pixel-horizontal {
-      color: #6133b4;
+      color: $purple-300;
     }
 
     .pixel-horizontal-2 {
-      color: #432874;
+      color: $purple-100;
     }
 
     .pixel-horizontal-3 {
-      color: #271b3d;
+      color: $header-dark-background;
     }
 
     h1, h2, h3, h4, h5, h6, button, .strike > span, input {
@@ -455,13 +449,13 @@
 
     .social-button {
       border-radius: 2px;
-      border: solid 2px #bda8ff;
+      border: solid 2px $purple-500;
       width: 100%;
       min-height: 40px;
       padding: .5em;
       background: transparent;
       margin-bottom: .5em;
-      color: #bda8ff;
+      color: $purple-500;
       transition: .5s;
 
       span {
@@ -471,8 +465,8 @@
 
     .social-button:hover {
       cursor: pointer;
-      border-color: #fff;
-      color: #fff;
+      border-color: $white;
+      color: $white;
     }
 
     .social-icon {
@@ -531,8 +525,8 @@
     input {
       margin-bottom: 1em;
       border-radius: 2px;
-      background-color: #432874;
-      border-color: #432874;
+      background-color: $purple-100;
+      border-color: $purple-100;
       color: $purple-400;
       border: solid 2px transparent;
       transition-timing-function: ease;
@@ -544,17 +538,17 @@
     }
 
     .input-valid {
-      color: #fff;
+      color: $white;
     }
 
     input:focus {
-      border: solid 2px #9a62ff;
+      border: solid 2px $purple-400;
       color: #fff;
-      background-color: #36205d;
+      background-color: $purple-50;
     }
 
     input:hover {
-      background-color: #36205d;
+      background-color: $purple-50;
     }
 
     .sign-up {
@@ -657,7 +651,7 @@
       width: 411px;
       height: 48px;
       border-radius: 2px;
-      background-color: #9a62ff;
+      background-color: $purple-400;
       box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.24), 0 1px 4px 0 rgba(26, 24, 29, 0.16);
       margin-bottom: 5em;
     }
@@ -674,7 +668,7 @@
       cursor: pointer;
 
       &:hover {
-        background-color: #5d3b9c;
+        background-color: $purple-50;
         box-shadow: 0 4px 4px 0 rgba(26, 24, 29, 0.16), 0 1px 8px 0 rgba(26, 24, 29, 0.12);
       }
     }
@@ -693,7 +687,7 @@
 
       .svg-icon {
         vertical-align: bottom;
-        color: #d5c8ff;
+        color: $purple-600;
         display: inline-block;
         margin-right: 1em;
       }
@@ -760,6 +754,7 @@
       height: 500px;
       width: 100%;
       opacity: .5;
+      pointer-events: none;
     }
   }
 
@@ -776,7 +771,7 @@
   }
 
   .input-error {
-    color: #fff;
+    color: $white;
     font-size: 90%;
     width: 100%;
     margin-bottom: 1em;

From 137f7d53dc83848c050700ed5b30c033bc19b2bb Mon Sep 17 00:00:00 2001
From: Adam Tommasi <4682372+ATommasi@users.noreply.github.com>
Date: Fri, 7 Oct 2022 17:33:38 -0400
Subject: [PATCH 075/134] add qty param for gem/gem-purchasable item apidoc
 (#14219)

* add qty param for gem/gem-purchasable item

* fix(lint): remove extra whitespace

Co-authored-by: SabreCat <sabe@habitica.com>
---
 website/server/controllers/api-v3/user.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/website/server/controllers/api-v3/user.js b/website/server/controllers/api-v3/user.js
index bfd0f68c52..e81b171f5c 100644
--- a/website/server/controllers/api-v3/user.js
+++ b/website/server/controllers/api-v3/user.js
@@ -978,6 +978,10 @@ api.disableClasses = {
                     ,"food","quests","gear"} type Type of item to purchase.
  * @apiParam (Path) {String} key Item's key (use "gem" for purchasing gems)
  *
+ * @apiParam (Body) {Integer} [quantity=1] Count of items to buy.
+ *                                         Defaults to 1 and is ignored
+ *                                         for items where quantity is irrelevant.
+ *
  * @apiSuccess {Object} data.items user.items
  * @apiSuccess {Number} data.balance user.balance
  * @apiSuccess {String} message Success message

From d1928c9181d509f06466bc500e13a718defeb925 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Tue, 11 Oct 2022 12:53:46 -0400
Subject: [PATCH 076/134] chore(content): add October Pet Quest Bundle (#14268)

* chore(content): add October Pet Quest Bundle

* update: change event start date to the correct one
---
 website/common/script/content/bundles.js           |  3 ++-
 website/common/script/content/constants/events.js  |  4 ++++
 .../common/script/content/shop-featuredItems.js    | 14 +++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 6f9e97ac26..bcbe083860 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -68,8 +68,9 @@ const bundles = {
       'spider',
       'frog',
     ],
+    event: EVENTS.bundle202210,
     canBuy () {
-      return moment().isBetween('2019-10-15', '2019-11-02');
+      return moment().isBetween(EVENTS.bundle202210.start, EVENTS.bundle202210.end);
     },
     type: 'quests',
     value: 7,
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 5b01144d48..e87b52fb7d 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -32,6 +32,10 @@ export const EVENTS = {
     end: '2022-10-13T20:00-04:00',
     gemsPromo,
   },
+  bundle202210: {
+    start: '2022-10-13T08:00-04:00',
+    end: '2022-10-31T20:00-04:00',
+  },
   beforeGala: {
     start: '2022-07-31T20:00-04:00',
     end: '2022-09-20T08:00-04:00',
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 3fe7c933a8..ea7e7da54f 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -45,19 +45,19 @@ const featuredItems = {
     ];
   },
   quests () {
-    if (moment().isBetween(EVENTS.bundle202208.start, EVENTS.bundle202209.end)) {
+    if (moment().isBetween(EVENTS.bundle202210.start, EVENTS.bundle202210.end)) {
       return [
         {
           type: 'bundles',
-          path: 'bundles.forestFriends',
-        },
-        {
-          type: 'bundles',
-          path: 'bundles.farmFriends',
+          path: 'bundles.witchyFamiliars',
         },
         {
           type: 'quests',
-          path: 'quests.ferret',
+          path: 'quests.snake',
+        },
+        {
+          type: 'quests',
+          path: 'quests.owl',
         },
       ];
     }

From 4d1bbdd8d03ca41a27282497c777465544d2440b Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Tue, 11 Oct 2022 12:54:24 -0400
Subject: [PATCH 077/134] chore(content): add October Backgrounds and Enchanted
 Armoire Items (#14266)

* chore(content): add October Backgrounds and Enchanted Armoire Items

* fix(typo): fix a couple of descriptions

* chore(subproject): update images

* fix(typo): keepin our caps consistent

* fix(typo): whitespace, caps

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
---
 habitica-images                               |  2 +-
 .../assets/css/sprites/spritesmith-main.css   | 45 +++++++++++++++++++
 website/common/locales/en/backgrounds.json    |  8 ++++
 website/common/locales/en/gear.json           |  2 +
 .../script/content/appearance/backgrounds.js  |  5 +++
 .../script/content/gear/sets/armoire.js       |  3 ++
 6 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/habitica-images b/habitica-images
index c17cf70c40..bb5f371ec4 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit c17cf70c407e0b8d7e0b0cd84f7aecfea295d568
+Subproject commit bb5f371ec4b5963b9476944f7d7785b2cd83ca39
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 9f65aa4c73..f94855687a 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -715,6 +715,11 @@
   width: 141px;
   height: 147px;
 }
+.background_cemetery_gate {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_cemetery_gate.png');
+  width: 141px;
+  height: 147px;
+}
 .background_champions_colosseum {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_champions_colosseum.png');
   width: 141px;
@@ -1359,6 +1364,11 @@
   width: 141px;
   height: 147px;
 }
+.background_mask_makers_workshop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_mask_makers_workshop.png');
+  width: 141px;
+  height: 147px;
+}
 .background_meandering_cave {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_meandering_cave.png');
   width: 141px;
@@ -1714,6 +1724,11 @@
   width: 141px;
   height: 147px;
 }
+.background_spooky_ruins {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_spooky_ruins.png');
+  width: 141px;
+  height: 147px;
+}
 .background_spooky_scarecrow_field {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_spooky_scarecrow_field.png');
   width: 141px;
@@ -2286,6 +2301,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_cemetery_gate {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_cemetery_gate.png');
+  width: 60px;
+  height: 60px;
+}
 .icon_background_champions_colosseum {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_champions_colosseum.png');
   width: 68px;
@@ -2935,6 +2955,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_mask_makers_workshop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_mask_makers_workshop.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_meandering_cave {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_meandering_cave.png');
   width: 68px;
@@ -3290,6 +3315,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_spooky_ruins {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_spooky_ruins.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_spooky_scarecrow_field {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_spooky_scarecrow_field.png');
   width: 68px;
@@ -18450,6 +18480,11 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_armoire_sheetGhostCostume {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_sheetGhostCostume.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_shepherdRobes {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_shepherdRobes.png');
   width: 90px;
@@ -19660,6 +19695,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_armoire_sheetGhostCostume {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_sheetGhostCostume.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_shepherdRobes {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_shepherdRobes.png');
   width: 68px;
@@ -21335,6 +21375,11 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_armoire_sheetGhostCostume {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_sheetGhostCostume.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_shepherdRobes {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_shepherdRobes.png');
   width: 90px;
diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
index bf0dd191e6..f8f6ab0fcc 100644
--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -819,6 +819,14 @@
   "backgroundOldPhotoText": "Old Photo",
   "backgroundOldPhotoNotes": "Strike a pose in an Old Photo.",
 
+  "backgrounds102022": "SET 101: Released October 2022",
+  "backgroundSpookyRuinsText": "Spooky Ruins",
+  "backgroundSpookyRuinsNotes": "Explore some Spooky Ruins.",
+  "backgroundMaskMakersWorkshopText": "Mask Maker's Workshop",
+  "backgroundMaskMakersWorkshopNotes": "Try on a new face at the Mask Maker's Workshop.",
+  "backgroundCemeteryGateText": "Cemetery Gate",
+  "backgroundCemeteryGateNotes": "Haunt a Cemetery Gate.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index f1f95ffc08..7a1d3226e3 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -1390,6 +1390,8 @@
   "armorArmoireStrawRaincoatNotes": "This woven straw cape will keep you dry and your armor from rusting while on your quest. Just don’t venture too near a candle! Increases Constitution by <%= con %>. Enchanted Armoire: Straw Raincoat Set (Item 1 of 2).",
   "armorArmoireFancyPirateSuitText": "Fancy Pirate Jacket",
   "armorArmoireFancyPirateSuitNotes": "Wear this fine jacket well as you organize your ship’s library or talk it through as a crew. Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Fancy Pirate Set (Item 1 of 3).",
+  "armorArmoireSheetGhostCostumeText": "Sheet Ghost Costume",
+  "armorArmoireSheetGhostCostumeNotes": "Boo! This is the scariest costume in all of Habitica, so wear it wisely... and watch your step so you don’t trip. Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js
index d19d007e72..da811e7ea9 100644
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -520,6 +520,11 @@ const backgrounds = {
     autumn_picnic: { },
     old_photo: { },
   },
+  backgrounds102022: {
+    spooky_ruins: { },
+    mask_makers_workshop: { },
+    cemetery_gate: { },
+  },
   timeTravelBackgrounds: {
     airship: {
       price: 1,
diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js
index 326b2efa13..1f5eccefa6 100644
--- a/website/common/script/content/gear/sets/armoire.js
+++ b/website/common/script/content/gear/sets/armoire.js
@@ -401,6 +401,9 @@ const armor = {
     int: 4,
     set: 'fancyPirate',
   },
+  sheetGhostCostume: {
+    con: 10,
+  },
 };
 
 const body = {

From e50f240366c77cf8bb6c82cfbf3b6e29670e91a6 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 11 Oct 2022 18:57:30 +0200
Subject: [PATCH 078/134] Translated using Weblate (Polish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (127 of 127 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.0% (2319 of 2695 strings)

Translated using Weblate (German)

Currently translated at 99.5% (215 of 216 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (234 of 234 strings)

Translated using Weblate (Spanish)

Currently translated at 95.0% (2562 of 2695 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (Polish)

Currently translated at 94.6% (686 of 725 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (403 of 403 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (58 of 58 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (58 of 58 strings)

Translated using Weblate (German)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (47 of 47 strings)

Translated using Weblate (Spanish)

Currently translated at 95.0% (2562 of 2695 strings)

Translated using Weblate (French)

Currently translated at 97.2% (392 of 403 strings)

Translated using Weblate (German)

Currently translated at 91.3% (368 of 403 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (German)

Currently translated at 98.2% (57 of 58 strings)

Translated using Weblate (German)

Currently translated at 100.0% (127 of 127 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Arabic)

Currently translated at 90.3% (338 of 374 strings)

Translated using Weblate (Japanese)

Currently translated at 99.2% (130 of 131 strings)

Translated using Weblate (Japanese)

Currently translated at 99.5% (233 of 234 strings)

Translated using Weblate (Japanese)

Currently translated at 96.5% (389 of 403 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (French)

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (German)

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.2% (130 of 131 strings)

Translated using Weblate (French)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (German)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (234 of 234 strings)

Translated using Weblate (French)

Currently translated at 100.0% (234 of 234 strings)

Translated using Weblate (Polish)

Currently translated at 83.5% (606 of 725 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (French)

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (234 of 234 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (403 of 403 strings)

Translated using Weblate (Russian)

Currently translated at 99.5% (215 of 216 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 92.3% (192 of 208 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 96.9% (127 of 131 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 89.7% (210 of 234 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 94.0% (379 of 403 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 95.0% (172 of 181 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (Japanese)

Currently translated at 99.1% (232 of 234 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (58 of 58 strings)

Translated using Weblate (Polish)

Currently translated at 80.4% (583 of 725 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (56 of 56 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (234 of 234 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (234 of 234 strings)

Translated using Weblate (Japanese)

Currently translated at 99.1% (232 of 234 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (234 of 234 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (403 of 403 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (403 of 403 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (403 of 403 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (2692 of 2695 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (German)

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (German)

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (127 of 127 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (127 of 127 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (374 of 374 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (374 of 374 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (186 of 186 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Polish)

Currently translated at 78.8% (572 of 725 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (140 of 140 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (127 of 127 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (127 of 127 strings)

Translated using Weblate (German)

Currently translated at 99.9% (2694 of 2695 strings)

Translated using Weblate (German)

Currently translated at 99.9% (2694 of 2695 strings)

Translated using Weblate (German)

Currently translated at 99.8% (2692 of 2695 strings)

Translated using Weblate (German)

Currently translated at 99.8% (2692 of 2695 strings)

Translated using Weblate (German)

Currently translated at 99.8% (2691 of 2695 strings)

Translated using Weblate (Arabic)

Currently translated at 89.8% (336 of 374 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2695 of 2695 strings)

Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net>
Co-authored-by: Céu <marcel.ufscar@gmail.com>
Co-authored-by: Faris Allahham <farislahham@gmail.com>
Co-authored-by: Hexe des Windes (she/her) <krausanna1@gmail.com>
Co-authored-by: Ike Osenberg <ike.osenberg@gmail.com>
Co-authored-by: Lena Kubisa <lenorek.05.poczta@gmail.com>
Co-authored-by: LiziKnight <liziknight0316@outlook.com>
Co-authored-by: Mara S. (Dolichotis) <marascherzer@gmail.com>
Co-authored-by: Nazar Paruna <nazarparuna@gmail.com>
Co-authored-by: RedBug312 <redbug312@gmail.com>
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com>
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com>
Co-authored-by: UNI <nibi727171@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mattya 226 <worldworld1114@gmail.com>
Co-authored-by: そら <comi4work@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/character/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/de/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/content/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/content/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/content/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/de/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/it/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/it/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/de/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/it/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/de/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/de/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/it/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/spells/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/de/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hant/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Character
Translation: Habitica/Communityguidelines
Translation: Habitica/Content
Translation: Habitica/Contrib
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Npc
Translation: Habitica/Questscontent
Translation: Habitica/Settings
Translation: Habitica/Spells
Translation: Habitica/Subscriber
---
 website/common/locales/ar/content.json        |  10 +-
 website/common/locales/ar/front.json          | 133 ++++++++++-
 .../locales/de/communityguidelines.json       |   2 +-
 website/common/locales/de/faq.json            |   2 +-
 website/common/locales/de/gear.json           |  38 +++-
 website/common/locales/de/groups.json         |   3 +-
 website/common/locales/de/npc.json            |   4 +-
 website/common/locales/de/questscontent.json  |   2 +-
 website/common/locales/de/settings.json       |   3 +-
 website/common/locales/de/subscriber.json     |   3 +-
 website/common/locales/es/gear.json           |  20 +-
 website/common/locales/fr/groups.json         |   7 +-
 website/common/locales/fr/limited.json        |   6 +-
 website/common/locales/fr/npc.json            |   4 +-
 website/common/locales/fr/settings.json       |   3 +-
 website/common/locales/fr/subscriber.json     |   3 +-
 website/common/locales/it/groups.json         |  18 +-
 website/common/locales/it/limited.json        |   6 +-
 website/common/locales/it/npc.json            |   4 +-
 website/common/locales/it/settings.json       |   3 +-
 website/common/locales/ja/character.json      |   4 +-
 website/common/locales/ja/content.json        |   2 +-
 website/common/locales/ja/faq.json            |   6 +-
 website/common/locales/ja/gear.json           |   6 +-
 website/common/locales/ja/groups.json         |   2 +-
 website/common/locales/ja/limited.json        |   8 +-
 website/common/locales/ja/npc.json            |   3 +-
 website/common/locales/ja/questscontent.json  |   2 +-
 website/common/locales/ja/spells.json         |   2 +-
 website/common/locales/pl/backgrounds.json    | 210 +++++++++++++++++-
 .../locales/pl/communityguidelines.json       |  67 +++---
 website/common/locales/pt_BR/gear.json        |   8 +-
 website/common/locales/pt_BR/groups.json      |  18 +-
 website/common/locales/pt_BR/limited.json     |   4 +-
 website/common/locales/pt_BR/npc.json         |   4 +-
 .../common/locales/pt_BR/questscontent.json   |   2 +-
 website/common/locales/pt_BR/settings.json    |   3 +-
 website/common/locales/pt_BR/subscriber.json  |   3 +-
 website/common/locales/ru/gear.json           |   8 +-
 website/common/locales/ru/groups.json         |  19 +-
 website/common/locales/ru/limited.json        |   6 +-
 website/common/locales/ru/npc.json            |   5 +-
 website/common/locales/ru/questscontent.json  |   2 +-
 website/common/locales/ru/settings.json       |   4 +-
 website/common/locales/ru/subscriber.json     |   3 +-
 website/common/locales/uk/limited.json        |   6 +-
 website/common/locales/uk/npc.json            |   3 +-
 website/common/locales/uk/settings.json       |   3 +-
 website/common/locales/uk/subscriber.json     |   3 +-
 website/common/locales/zh/achievements.json   |   8 +-
 website/common/locales/zh/backgrounds.json    |  60 ++---
 website/common/locales/zh/faq.json            |   4 +-
 website/common/locales/zh/front.json          |   4 +-
 website/common/locales/zh/gear.json           |  10 +-
 website/common/locales/zh/groups.json         |  18 +-
 website/common/locales/zh/limited.json        |   8 +-
 website/common/locales/zh/npc.json            |   9 +-
 website/common/locales/zh/questscontent.json  |   2 +-
 website/common/locales/zh/settings.json       |   5 +-
 website/common/locales/zh/subscriber.json     |   3 +-
 .../common/locales/zh_TW/achievements.json    |  11 +-
 website/common/locales/zh_TW/backgrounds.json |  63 +++++-
 .../locales/zh_TW/communityguidelines.json    |  16 +-
 website/common/locales/zh_TW/content.json     |   4 +-
 website/common/locales/zh_TW/contrib.json     |   3 +-
 website/common/locales/zh_TW/faq.json         |   4 +-
 website/common/locales/zh_TW/front.json       |  21 +-
 website/common/locales/zh_TW/gear.json        |  12 +-
 website/common/locales/zh_TW/groups.json      |  25 ++-
 website/common/locales/zh_TW/limited.json     |   8 +-
 website/common/locales/zh_TW/npc.json         |   5 +-
 website/common/locales/zh_TW/subscriber.json  |   3 +-
 72 files changed, 807 insertions(+), 189 deletions(-)

diff --git a/website/common/locales/ar/content.json b/website/common/locales/ar/content.json
index 4099805f57..f8f0606b2d 100755
--- a/website/common/locales/ar/content.json
+++ b/website/common/locales/ar/content.json
@@ -313,7 +313,7 @@
     "hatchingPotionBlackPearl": "اللؤلؤ الأسود",
     "hatchingPotionAutumnLeaf": "ورقة الخريف",
     "hatchingPotionVampire": "مصاص الدماء",
-    "hatchingPotionDessert": "الحلويات",
+    "hatchingPotionDessert": "حلويات",
     "hatchingPotionVeggie": "حديقة",
     "questEggRobotAdjective": "مستقبلي",
     "hatchingPotionFluorite": "الفلوريت",
@@ -330,7 +330,11 @@
     "hatchingPotionSunset": "غروب الشمس",
     "hatchingPotionShadow": "الظل",
     "hatchingPotionSilver": "الفضي",
-    "hatchingPotionTurquoise": "التريكواز",
+    "hatchingPotionTurquoise": "التيركواز",
     "hatchingPotionSunshine": "شعاع الشمس",
-    "hatchingPotionVirtualPet": "حيوان افتراضي أليف"
+    "hatchingPotionVirtualPet": "حيوان افتراضي أليف",
+    "hatchingPotionWindup": "الزنبرك",
+    "hatchingPotionPorcelain": "الخزف الملون",
+    "hatchingPotionBirchBark": "لحاء الشجر",
+    "hatchingPotionRuby": "الياقوت"
 }
diff --git a/website/common/locales/ar/front.json b/website/common/locales/ar/front.json
index a3b3929e9e..88e06d9a3a 100644
--- a/website/common/locales/ar/front.json
+++ b/website/common/locales/ar/front.json
@@ -4,12 +4,12 @@
     "forgotPassword": "هل نسيت كلمة المرور؟",
     "logout": "تسجيل الخروج",
     "footerMobile": "هاتف",
-    "companyDonate": "تبرع",
+    "companyDonate": "تبرع لصالح Habitica",
     "login": "تسجيل الدخول",
     "companyBlog": "مقالات",
     "communityInstagram": "Instagram",
     "guidanceForBlacksmiths": "إرشادات للحدادين (المبرمجين)",
-    "companyContribute": "ساهم",
+    "companyContribute": "ساهم في تطوير Habitica",
     "marketing1Header": "حسن عاداتك من خلال اللعب",
     "footerCompany": "الشركة",
     "companyAbout": "كيف يعمل",
@@ -23,19 +23,19 @@
     "marketing1Lead1": "Habitica هي لعبة تساعدك على تحسين عادات الحياة الواقعية. إنها \"تحاكي\" حياتك عن طريق تحويل كل مهامك (العادات، الأعمال اليومية، المهام) إلى وحوش صغيرة عليك التغلب عليها. كلما كنت أفضل في هذا، كلما تقدمت في اللعبة. إذا تعثرت في الحياة، تبدأ شخصيتك بالتراجع في اللعبة.",
     "termsAndAgreement": "بالنقر على الزر ادناه، فإنك تشير الى كونك قد قرأت ووافقت على <a href='/static/terms'>شروط الخدمة</a> و <a href='/static/privacy'>سياسة الخصوصية</a>.",
     "clearBrowserData": "حذف بيانات المتصفح",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>الإضافات</a>",
-    "forgotPasswordSteps": "أدخل عنوان البريد الإلكتروني الذي استخدمته لتسجيل حسابك في Habitica.",
+    "communityExtensions": "الإضافات والتطويرات",
+    "forgotPasswordSteps": "أدخل اسم المستخدم أو عنوان البريد الإلكتروني الخاص بك لتسجيل حسابك في Habitica.",
     "pkQuestion1": "ما الذي ألهم Habitica؟ كيف بدأت؟",
-    "mobileAndroid": "Android",
+    "mobileAndroid": "تطبيق آندرويد",
     "playButton": "العب",
     "playButtonFull": "دخول Habitica",
     "password": "كلمة المرور",
     "newsArchive": "أرشيف الأخبار في ويكيا (متعدد اللغات)",
-    "marketing4Lead3-1": "تريد تحويل حياتك الى لعبة؟",
+    "marketing4Lead3-1": "هل تريد إدخال نظام اللعب لتطوير حياتك؟",
     "marketing2Lead3Title": "تحدوا بعضكم",
     "marketing2Lead2Title": "حارب الوحوش",
     "marketing4Lead3-2": "مهتم بإدارة مجموعة في التعليم، الصحة، وغير ذلك؟",
-    "mobileIOS": "iOS",
+    "mobileIOS": "تطبيق آيفون",
     "marketing1Lead1Title": "حياتك، لعبة تقمص الأدوار",
     "marketing3Header": "التطبيقات والإضافات",
     "marketing2Lead1Title": "الإنتاجية الاجتماعية",
@@ -63,5 +63,122 @@
     "marketing3Lead2": "**أدوات الطرف الثالث الأخرى** تربط Habitica بجوانب مختلفة من حياتك. توفر واجهة برمجة التطبيقات الخاصة بنا تكاملاً سهلاً لأشياء مثل [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US)، التي تفقدك نقاطاً عند تصفح مواقع الويب غير المنتجة، وتكسبك نقاطاً عندما تكون المواقع منتجة. [شاهد المزيد هنا](https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
     "pkAnswer2": "إن تكوين عادة جديدة أمر صعب لأن الناس يحتاجون حقاً إلى تلك المكافأة الفورية الواضحة. على سبيل المثال، من الصعب البدء في تنظيف الأسنان بالخيط، لأنه على الرغم من أن طبيب الأسنان لدينا يخبرنا أنه أكثر صحة على المدى الطويل، إلا أنه في الوقت الحالي يتسبب في إصابة لثتك. <br /> يضيف أسلوب اللعب في Habitica إحساساً بالإشباع الفوري للأهداف اليومية من خلال مكافأة مهمة صعبة وإعطائك الخبرة، والذهب ... وربما حتى جائزة عشوائية، مثل بيضة التنين! يساعد هذا في الحفاظ على تحفيز الأشخاص حتى عندما لا يكون للمهمة نفسها مكافأة جوهرية، وقد رأينا أشخاصاً يغيرون حياتهم نتيجة لذلك. يمكنك التحقق من قصص النجاح هنا: https://habitversary.tumblr.com",
     "marketing1Lead2Title": "احصل على معدات رائعة",
-    "enterHabitica": "ادخل Habitica"
+    "enterHabitica": "ادخل Habitica",
+    "pkQuestion6": "من هو مستخدم Habitica التقليدي؟",
+    "pkQuestion8": "كيف أثرت Habitica على حياة الناس الحقيقية؟",
+    "pkLogo": "شعارات",
+    "register": "تسجيل",
+    "teams": "مجموعات",
+    "terms": "الأحكام والشروط",
+    "reportAccountProblems": "الإبلاغ عن مشاكل الحساب",
+    "subscriptionPaymentIssues": "قضايا الاشتراك والدفع",
+    "generalQuestionsSite": "أسئلة عامة حول الموقع",
+    "businessInquiries": "استفسارات الأعمال / التسويق",
+    "merchandiseInquiries": "استفسارات عن البضائع المادية (قمصان، ملصقات)",
+    "socialAlreadyExists": "تسجيل الدخول الاجتماعي هذا مرتبط بالفعل بحساب Habitica موجود.",
+    "invalidReqParams": "معلمات الطلب غير صالحة.",
+    "confirmPassword": "تأكيد كلمة المرور",
+    "emailPlaceholder": "على سبيل المثال، gryphon@example.com",
+    "emailUsernamePlaceholder": "على سبيل المثال، HabitRabbit أو gryphon@example.com",
+    "passwordPlaceholder": "على سبيل المثال، ******************",
+    "confirmPasswordPlaceholder": "تأكد من أنها نفس كلمة المرور!",
+    "joinHabitica": "انضم إلى Habitica",
+    "or": "أو",
+    "gamifyYourLife": "حول حياتك إلى لعبة",
+    "aboutHabitica": "Habitica هو تطبيق مجاني لبناء العادات والإنتاجية يتعامل مع حياتك الواقعية وكأنها لعبة. من خلال المكافآت والعقوبات داخل اللعبة لتحفيزك وشبكة اجتماعية قوية لإلهامك، يمكن أن تساعدك Habitica في تحقيق أهدافك لتصبح صحياً وتعمل بجد وسعادة.",
+    "trackYourGoalsDesc": "كن مسؤولاً عن طريق تتبع وإدارة عاداتك وأهدافك اليومية وقائمة المهام مع تطبيقات الجوال سهلة الاستخدام وواجهة الويب من Habitica.",
+    "battleMonstersDesc": "حارب الوحوش مع مستخدمي Habitica الآخرين! استخدم الذهب الذي تربحه لشراء مكافآت داخل اللعبة أو المكافآت الخاصة، مثل مشاهدة حلقة من برنامجك التلفزيوني المفضل.",
+    "healthAndFitnessDesc": "ليس لديك الحافز لاستعمال خيط الأسنان؟ لا يبدو أنك تريد الذهاب إلى النادي الرياضي؟ Habitica تجعل أخيراً الحصول على صحة جيدة تحدياً ممتعاً.",
+    "schoolAndWorkDesc": "سواء كنت تقوم بإعداد تقرير لمعلمك أو لرئيسك في العمل، فمن السهل تتبع تقدمك وأنت تتعامل مع أصعب مهامك.",
+    "muchmuchMoreDesc": "تعني قائمة مهامنا القابلة للتخصيص بالكامل أنه يمكنك تشكيل Habitica لتناسب أهدافك الشخصية. اعمل على مشاريع إبداعية، أو ركز على الرعاية الذاتية، أو اسعى وراء حلم مختلف - الأمر كله متروك لك.",
+    "levelUpAnywhereDesc": "تجعل تطبيقات الأجهزة المحمولة الخاصة بنا من السهل تتبع مهامك أثناء التنقل. حقق أهدافك بنقرة واحدة، بغض النظر عن مكانك.",
+    "getStarted": "انطلق!",
+    "marketing4Lead2Title": "نظام الصحة والراحة عن طريق اللعب",
+    "marketing4Lead3Title": "أدخل نظام اللعب إلى كل شيء",
+    "pkQuestion4": "لماذا تنقص الصحة الشخصية عند عدم إتمام المهام؟",
+    "pkAnswer4": "إذا لم تؤدي أحد أهدافك اليومية، فستفقد بعضاً من صحة شخصيتك الرمزية. يعد هذا العامل التحفيزي مهماً جداً لتشجيع الناس على متابعة أهدافهم اليومية، لأن الناس يكرهون حقاً إيذاء صورتهم الرمزية الصغيرة! بالإضافة إلى ذلك، تعد المساءلة الاجتماعية أمراً بالغ الأهمية لكثير من الأشخاص: أي إذا كنت تقاتل وحشاً مع أصدقائك، فإن تخطي مهامك يضر بصحتهم الرمزية أيضاً.",
+    "pkAnswer5": "إحدى الطرق التي نجحت بها Habitica في استخدام التحفيز هي أننا بذلنا الكثير من الجهد في التفكير في جوانب اللعبة للتأكد من أنها ممتعة بالفعل. لقد قمنا أيضاً بتضمين العديد من المكونات الاجتماعية، لأننا نشعر أن بعض الألعاب الأكثر تحفيزاً تتيح لك اللعب مع الأصدقاء، ولأن الأبحاث أظهرت أنه من الأسهل تكوين عادات عندما تكون لديك مسؤولية تجاه الآخرين.",
+    "pkAnswer6": "يستخدم الكثير من الأشخاص المختلفين Habitica! أكثر من نصف مستخدمينا تتراوح أعمارهم بين 18 و 34 عاماً، لكن لدينا أجداد يستخدمون الموقع مع أحفادهم الصغار وفي كل الأعمار. غالباً ما تنضم العائلات إلى الحفلة وتقاتل الوحوش معاً. <br /> يتمتع العديد من مستخدمينا بمعرفة في الألعاب، ولكن من المدهش أنه عندما أجرينا استطلاعاً منذ فترة، تم تحديد 40٪ من مستخدمينا على أنهم ليسوا لاعبين! لذلك يبدو أن طريقتنا يمكن أن تكون فعالة لأي شخص يريد أن يشعر بالإنتاجية والعافية ليشعر بمزيد من المرح.",
+    "pkAnswer7": "تستخدم Habitica فن البكسل لعدة أسباب، بالإضافة إلى عامل الحنين الممتع، فإن فن البكسل سهل للغاية بالنسبة لفنانينا المتطوعين الذين يرغبون في المشاركة. من الأسهل كثيراً الحفاظ على اتساق فن البكسل حتى عندما يساهم الكثير من الفنانين المختلفين، ويتيح لنا إنشاء الكثير من الأعمال الجديدة بسرعة وزيادة المحتوى!",
+    "localStorageTryFirst": "إذا كنت تواجه مشكلات في Habitica ، فانقر فوق الزر أدناه لمسح التخزين المحلي ومعظم ملفات تعريف الارتباط لهذا الموقع (لن تتأثر مواقع الويب الأخرى). ستحتاج إلى تسجيل الدخول مرة أخرى بعد ذلك، لذا تأكد أولاً من أنك تعرف معلومات تسجيل الدخول الخاصة بك من اسم مستخدم وكلمة سر. يمكن العثور عليها في الإعدادات -> <%= linkStart %>Site<%= linkEnd %>.",
+    "missingUsernameEmail": "اسم المستخدم أو البريد الإلكتروني مفقود.",
+    "emailTaken": "عنوان البريد الإلكتروني مستخدم بالفعل في الحساب.",
+    "usernameInfo": "أصبحت الآن أسماء تسجيل دخول المستخدمين فريدة ستظهر بجانب اسم العرض الخاص بك وتستخدم للدعوات وإشارات @ للدردشة والمراسلة.<br> <br> إذا كنت ترغب في معرفة المزيد حول هذا التغيير، <a href='https://habitica.fandom.com/wiki/Player_Names' target='_blank'>قم بزيارة موقع wiki الخاص بنا</a>.",
+    "passwordConfirmationMatch": "تأكيد كلمة المرور لا يتطابق مع كلمة المرور.",
+    "invalidLoginCredentialsLong": "عذراً، عنوان بريدك الإلكتروني / اسم المستخدم أو كلمة المرور غير صحيحين.\n- تأكد من كتابتها بشكل صحيح. اسم المستخدم وكلمة المرور حساسان لحالة الأحرف الكبيرة والصغيرة.\n- ربما تكون قد اشتركت في حساب Facebook أو Google، وليس عبر البريد الإلكتروني، لذا تحقق جيداً من خلال تجربتها.\n- إذا نسيت كلمة المرور الخاصة بك، انقر فوق \"نسيت كلمة المرور\".",
+    "alreadyHaveAccountLogin": "لديك بالفعل حساب Habitica؟ <strong> تسجيل الدخول </strong>",
+    "earnRewardsDesc": "أنجز المهام لترفع مستوى شخصيتك الرمزية الخاصة بك وفتح الميزات داخل اللعبة مثل درع المعركة والحيوانات الأليفة الغامضة والمهارات السحرية وحتى المهام!",
+    "featuredIn": "أعلن عنها في",
+    "usernameTOSRequirements": "يجب أن تتوافق أسماء المستخدمين مع <a href='/static/terms' target='_blank'> شروط الخدمة </a> و <a href='/static/community-guidelines' target='_blank'> إرشادات المجتمع < / أ>. إذا لم تكن قد قمت بتعيين اسم تسجيل دخول من قبل، فسيتم إنشاء اسم المستخدم تلقائياً.",
+    "accountSuspended": "تم حظر هذا الحساب، للمستخدم \"<%= userId %>\"، لخرقه إرشادات المجتمع (https://habitica.com/static/community-guidelines) أو شروط الخدمة (https://habitica.com/static/community-guidelines). للحصول على تفاصيل أو لطلب إلغاء الحظر، يرجى إرسال بريد إلكتروني إلى مدير المجتمع لدينا على <%= communityManagerEmail %> أو اطلب من والديك أو الوصي عليك إرسال بريد إلكتروني إليهم. الرجاء تضمين اسم المستخدم @ في البريد الإلكتروني.",
+    "cannotFulfillReq": "لا يمكن تلبية طلبك. أرسل بريداً إلكترونياً إلى admin@habitica.com إذا استمر هذا الخطأ.",
+    "pkAnswer8": "يمكنك العثور على الكثير من الشهادات حول كيفية مساعدة Habitica للأشخاص هنا: https://habitversary.tumblr.com",
+    "sync": "تحديث",
+    "tumblr": "تمبلر Tumblr",
+    "emailOrUsername": "البريد الإلكتروني أو اسم المستخدم (مع الانتباه للأحرف الكبيرة والصغيرة)",
+    "missingUsername": "اسم المستخدم مفقود.",
+    "wrongPassword": "كلمة مرور خاطئة.",
+    "incorrectDeletePhrase": "يرجى كتابة <%= magicWord %> بأحرف كبيرة لحذف حسابك.",
+    "newEmailRequired": "عنوان البريد الإلكتروني الجديد مفقود.",
+    "accountSuspendedTitle": "تم تعليق حسابك",
+    "unsupportedNetwork": "هذه الشبكة غير مدعومة حالياً.",
+    "onlySocialAttachLocal": "يمكن إضافة المصادقة المحلية إلى تسجيل دخول حساب اجتماعي فقط.",
+    "loginWithSocial": "قم بالدخول عن طريق <%= social %>",
+    "usernamePlaceholder": "على سبيل المثال، HabitRabbit",
+    "motivateYourself": "حفز نفسك لتحقيق أهدافك.",
+    "timeToGetThingsDone": "حان الوقت للاستمتاع عندما تنجز الأشياء! انضم إلى أكثر من <%= userCountInMillions %> مليون مواطن وحسن حياتك مهمة واحدة في كل مرة.",
+    "earnRewards": "اكسب مكافآت مقابل تحقيق أهدافك",
+    "playersUseToImprove": "يستخدم اللاعبون Habitica للترقي",
+    "healthAndFitness": "الصحة واللياقة",
+    "muchmuchMore": "والكثير الكثير!",
+    "joinMany": "انضم إلى أكثر من <%= userCountInMillions %> مليون شخص يستمتعون خلال تحقيق أهدافهم!",
+    "work": "العمل",
+    "levelUpAnywhere": "تقدم في المستوى من أي مكان",
+    "learnMore": "تعلم أكثر",
+    "usernameTaken": "اسم المستخدم غير متاح.",
+    "pkBoss": "وحوش",
+    "username": "اسم المستخدم",
+    "trackYourGoals": "تتبع عاداتك وأهدافك",
+    "notAnEmail": "عنوان البريد الإلكتروني غير صالح.",
+    "missingEmail": "البريد الإلكتروني مفقود.",
+    "dontHaveAccountSignup": "ليس لديك حساب Habitica؟ <strong> إنشاء حساب </strong>",
+    "pkQuestion7": "لماذا تستخدم Habitica فن البكسل؟",
+    "tasks": "المهام",
+    "localStorageTryNext": "إذا استمرت المشكلة، يرجى <%= linkStart %>الإبلاغ عن الخطأ<%= linkEnd %> إذا لم تكن قد قمت ذلك.",
+    "pkMoreQuestions": "هل لديك سؤال غير موجود في هذه القائمة؟ أرسل بريد إلكتروني إلى admin@habitica.com!",
+    "mobileApps": "تطبيقات الموبايل",
+    "localStorageClearExplanation": "سيؤدي هذا الزر إلى مسح التخزين المحلي ومعظم ملفات تعريف الارتباط وتسجيل خروجك.",
+    "marketing4Header": "لاستخدام المنظمات",
+    "pkQuestion5": "ما الذي يميز Habitica عن برامج التلعيب (إضافة نظام اللعب) الأخرى؟",
+    "marketing4Lead1": "التعليم هو أحد أفضل القطاعات لتطبيق نظام اللعب. نعلم جميعاً مدى تعلق الطلاب بالهواتف والألعاب هذه الأيام؛ نعم لتسخير تلك القوة! إن كنت معلماً؛ حرض طلابك ضد بعضهم البعض في منافسة ودية، وكافئ السلوك الجيد بجوائز نادرة، تشاهد درجاتهم وسلوكهم يرتفع.",
+    "usernameTime": "حان الوقت لتعيين اسم المستخدم الخاص بك!",
+    "missingPassword": "كلمة المرور مفقودة.",
+    "joinToday": "انضم إلى Habitica اليوم",
+    "marketing4Lead1Title": "نظام التعليم عن طريق اللعب",
+    "memberIdRequired": "\"member\" يجب أن يكون معرف UUID صالحاً.",
+    "modelNotFound": "هذا النموذج غير موجود.",
+    "signUpWithSocial": "قم بالتسجيل عن طريق <%= social %>",
+    "pkSamples": "عينات لقطات شاشة",
+    "pkWebsite": "موقع",
+    "schoolAndWork": "الدراسة والعمل",
+    "invalidEmailDomain": "لا يمكنك تسجيل البريد الإلكتروني من المخدمات التالية: <%= domains %>",
+    "missingNewPassword": "كلمة المرور الجديدة مفقودة.",
+    "heroIdRequired": "\"heroId\" يجب أن يكون معرف UUID صالحاً.",
+    "signup": "اشتراك",
+    "minPasswordLength": "يجب أن تتكون كلمة المرور من 8 أحرف أو أكثر.",
+    "singUpForFree": "سجل مجاناً",
+    "localStorageClear": "مسح البيانات المحلية",
+    "pkPromo": "إجراءات",
+    "tweet": "تغريد",
+    "privacy": "سياسة الخصوصية",
+    "reportCommunityIssues": "الإبلاغ عن مشاكل المجتمع",
+    "checkOutMobileApps": "جرب تطبيقات الجوال!",
+    "school": "المدرسة",
+    "missingAuthHeaders": "سلاسل المصادقة مفقودة.",
+    "passwordReset": "إذا كان لدينا بريدك الإلكتروني أو اسم المستخدم الخاصين بك في الملف، فقد تم إرسال تعليمات تعيين كلمة مرور جديدة إلى بريدك الإلكتروني.",
+    "invalidCredentials": "لا يوجد حساب يستخدم بيانات الاعتماد هذه.",
+    "cantDetachSocial": "يفتقر الحساب إلى طريقة مصادقة أخرى؛ لا يمكن فصل طريقة المصادقة هذه.",
+    "usernameLimitations": "يجب أن يكون اسم المستخدم من 1 إلى 20 حرفاً، ويحتوي فقط على الأحرف، والأرقام من 0 إلى 9، والواصلات، أو الشرطات السفلية، ولا يمكن أن يتضمن أي مصطلحات غير ملائمة.",
+    "battleMonsters": "حارب الوحوش مع الأصدقاء",
+    "passwordResetPage": "إعادة تعيين كلمة المرور"
 }
diff --git a/website/common/locales/de/communityguidelines.json b/website/common/locales/de/communityguidelines.json
index 62544b4b93..ffd45181bd 100644
--- a/website/common/locales/de/communityguidelines.json
+++ b/website/common/locales/de/communityguidelines.json
@@ -127,7 +127,7 @@
     "commGuideList01E": "Fange in der Taverne keine Streitgespräche an und lass Dich nicht auf solche ein.",
     "commGuideList01F": "Kein Betteln um bezahlte Artikel, kein Spamming oder große Überschriften/Großbuchstaben.",
     "commGuidePara017": "Hier ist die Kurzfassung, aber wir möchten Dich ermutigen, weiter unten mehr Details zu erfahren:",
-    "commGuideList02M": "Frage nicht nach Edelsteinen, Abonnements oder der Mitgliedschaft in Gruppenabonnements. Nachfragen dieser Art sind weder in der Taverne, noch in öffentlichen oder privaten Chaträumen und auch nicht in Privatnachrichten erlaubt. Wiederholte oder extreme Betteleien, vor allem nachdem bereits eine Warnung ausgesprochen wurde, können zu einer Sperrung des Accounts führen.",
+    "commGuideList02M": "Frage nicht nach oder bettle nicht um Edelsteine, Abonnements oder die Mitgliedschaft in Gruppenplänen. Nachrichten dieser Art sind weder in der Taverne, noch in öffentlichen oder privaten Chaträumen, und auch nicht in Privatnachrichten erlaubt. Wenn Du Nachrichten erhältst, in denen man Dich um bezahlte Artikel fragt, melde sie bitte über das Fähnchen. Wiederholte oder extreme Betteleien nach Edelsteinen oder Abonnements, vor allem nachdem bereits eine Warnung ausgesprochen wurde, können zu einer Kontosperre führen.",
     "commGuideList09D": "Entfernung oder Herabstufung des Mitwirkenden-Ranges",
     "commGuideList05H": "Schwerwiegende oder wiederholte Versuche, andere Spielende zu betrügen oder zu bedrängen, um an Gegenstände zu kommen, die echtes Geld kosten"
 }
diff --git a/website/common/locales/de/faq.json b/website/common/locales/de/faq.json
index 4b580c8ee9..e758135825 100644
--- a/website/common/locales/de/faq.json
+++ b/website/common/locales/de/faq.json
@@ -55,5 +55,5 @@
     "iosFaqStillNeedHelp": "Wenn Du eine Frage hast, die hier oder im [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ) nicht beantwortet wurde, stelle sie in der Taverne unter Menü > Tavernen-Chat! Wir helfen Dir gerne.",
     "androidFaqStillNeedHelp": "Wenn Du eine Frage hast, die hier oder im [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ) nicht beantwortet wurde, stelle sie in der Taverne unter Menü > Tavernen-Chat! Wir helfen Dir gerne.",
     "webFaqStillNeedHelp": "Wenn Du eine Frage hast, die hier oder im [Wiki-FAQ](https://habitica.fandom.com/wiki/FAQ) nicht beantwortet wurde, stelle sie in der [Habitica-Hilfe-Gilde](https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Wir helfen Dir gerne.",
-    "faqQuestion13": "Was ist ein Gruppen-Plan?"
+    "faqQuestion13": "Was ist ein Gruppenplan?"
 }
diff --git a/website/common/locales/de/gear.json b/website/common/locales/de/gear.json
index 1838b0b75d..408c2d05b7 100644
--- a/website/common/locales/de/gear.json
+++ b/website/common/locales/de/gear.json
@@ -2694,5 +2694,41 @@
     "weaponMystery202209Text": "Magie-Anleitung",
     "weaponMystery202209Notes": "Dieses Buch wird Dich auf Deiner Reise durch die Welt der Magie verzaubern. Gewährt keinen Attributbonus. September 2022 Abonnentengegenstand.",
     "shieldMystery202209Text": "Berg magischer Bücher",
-    "shieldMystery202209Notes": "Bücherberge durchzulesen ist ein guter Weg um viel Zauberei-Wissen anzusammeln – diese Ausbildung wird einfach magisch! Gewährt keinen Attributbonus. September 2022 Abonnentengegenstand."
+    "shieldMystery202209Notes": "Bücherberge durchzulesen ist ein guter Weg um viel Zauberei-Wissen anzusammeln – diese Ausbildung wird einfach magisch! Gewährt keinen Attributbonus. September 2022 Abonnentengegenstand.",
+    "weaponSpecialFall2022MageNotes": "Diese mächtigen Böen bleiben zurück, wenn Du Dich gen Himmel schwingst. Erhöht Intelligenz um <%= int %> und Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "armorMystery202210Text": "Bedrohliche Schlange Rüstung",
+    "armorMystery202210Notes": "Probiere einmal das Schlängeln aus, Du könntest feststellen, dass es eine sehr effiziente Art der Fortbewegung ist. Gewährt keinen Attributbonus. Oktober 2022 Abonnentengegenstand.",
+    "shieldSpecialFall2022WarriorText": "Orkschild",
+    "shieldSpecialFall2022WarriorNotes": "Süßes oder GRAAA! Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "weaponSpecialFall2022RogueText": "Gurkenklinge",
+    "weaponSpecialFall2022RogueNotes": "Du kannst Dich mit dieser Gurke nicht nur verteidigen, sie gibt auch eine leckere Zwischenmahlzeit ab. Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "weaponSpecialFall2022WarriorText": "Orkschwert",
+    "weaponSpecialFall2022WarriorNotes": "Womöglich besser dafür geeignet, Baumstämme oder knusprige Brotlaibe zu zerschneiden als die Rüstung der Feinde, aber GRAAA! Es sieht in jedem Fall furchterregend aus! Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "weaponSpecialFall2022MageText": "Windböen",
+    "weaponSpecialFall2022HealerText": "Rechtes Beobachterauge",
+    "weaponSpecialFall2022HealerNotes": "Um Deine Chancen zu verbessern, halte es hoch und sprich die Machtworte: \"Den Sieg fest im Blick!\" Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "armorSpecialFall2022RogueText": "Kappa Rüstung",
+    "armorSpecialFall2022RogueNotes": "Ob Du schwimmst, umherschleichst oder ringst, in dieser Rüstung bist Du sicher. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "armorSpecialFall2022WarriorText": "Orkrüstung",
+    "armorSpecialFall2022WarriorNotes": "GRAAA! MASSIGE SCHULTERN zeigen Du hast MASSIG KRAFT! Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "armorSpecialFall2022MageText": "Harpyienrüstung",
+    "armorSpecialFall2022MageNotes": "Fliege schnell wie der Wind mit diesen wundervollen Flügeln und halte was Dir am wichtigsten ist fest in den furchterregenden Krallen. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "armorSpecialFall2022HealerText": "Wuchernde Augenstiele",
+    "headSpecialFall2022RogueText": "Kappa Maske",
+    "headSpecialFall2022RogueNotes": "Mit dieser Metallkappe auf dem Kopf hast Du zusätzlichen Schutz für Deine Ausflüge an Land. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "headSpecialFall2022WarriorText": "Orkmaske",
+    "shieldSpecialFall2022HealerNotes": "Wirf ein Auge auf dieses Kostüm und erzittere. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "headSpecialFall2022WarriorNotes": "Diese Hauer sind hart und scharf genug, um Kürbisse zu durchbohren. GRAAA! Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "headSpecialFall2022MageText": "Harpyienmaske",
+    "headSpecialFall2022HealerText": "Beobachtermaske",
+    "headSpecialFall2022HealerNotes": "Irgendwo im Innern liegt Schönheit verborgen. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "headMystery202210Text": "Bedrohliche Schlange Helm",
+    "headMystery202210Notes": "Diese schuppige Kapuze wird sicherlich Deine To-Do Liste in die Unterwerfung ängstigen! Gewährt keinen Attributbonus. Oktober 2022 Abonnentengegenstand.",
+    "shieldSpecialFall2022HealerText": "Linkes Beobachterauge",
+    "eyewearArmoireComedyMaskText": "Komödienmaske",
+    "eyewearArmoireTragedyMaskText": "Tragödienmaske",
+    "armorSpecialFall2022HealerNotes": "Wie viele Beobachter könnte ein Beobachter beobachten, wenn ein Beobachter Beobachter beobachten könnte? Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "headSpecialFall2022MageNotes": "Zieh andere in Deinen Bann und locke sie zu Dir hin mit dieser magischen Maidenmaske. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
+    "eyewearArmoireComedyMaskNotes": "Heiter! Eine malerische Maske für Dein fröhlich' Herz, spielend, Freude verkündend, Heiterkeit und Frohsinn auf der Bühne ausstrahlend. Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Theatermaskenset (Gegenstand 1 von 2).",
+    "eyewearArmoireTragedyMaskNotes": "Ach! Eine schwere Maske für Deinen armen Darsteller, stolzierend, sich grämend, und auf der Bühne Leid und Kummer ausdrückend. Erhöht Intelligenz um <%= int %>. Verzauberter Schrank: Theatermaskenset (Gegenstand 2 von 2)."
 }
diff --git a/website/common/locales/de/groups.json b/website/common/locales/de/groups.json
index cb904ee574..11bfc25903 100644
--- a/website/common/locales/de/groups.json
+++ b/website/common/locales/de/groups.json
@@ -381,5 +381,6 @@
     "upgradeToGroup": "Auf Gruppenplan upgraden",
     "sendGiftTotal": "Insgesamt:",
     "chatTemporarilyUnavailable": "Chat aktuell nicht verfügbar. Bitte versuche es später erneut.",
-    "assignTo": "Zugewiesen an"
+    "assignTo": "Zugewiesen an",
+    "newGroupsEnjoy": "Wir hoffen, Dir gefallen die neuen Gruppenpläne!"
 }
diff --git a/website/common/locales/de/npc.json b/website/common/locales/de/npc.json
index 46c25a0323..fa820f9ef8 100644
--- a/website/common/locales/de/npc.json
+++ b/website/common/locales/de/npc.json
@@ -132,5 +132,7 @@
     "limitedAvailabilityDays": "Für <%= days %>t <%= hours %>std und <%= minutes %>min verfügbar",
     "amountExp": "<%= amount %> Exp",
     "newStuffPostedOn": "Veröffentlicht am <%= publishDate %> um <%= publishTime %>",
-    "helpSupportHabitica": "Hilf Habitica zu unterstützen"
+    "helpSupportHabitica": "Hilf Habitica zu unterstützen",
+    "groupsPaymentSubBilling": "Dein nächstes Rechnungsdatum ist <strong><%= renewalDate %></strong>.",
+    "groupsPaymentAutoRenew": "Dieses Abonnement läuft automatisch weiter, bis es gekündigt wird. Du kannst es im Gruppen-Abrechnungs-Tab kündigen."
 }
diff --git a/website/common/locales/de/questscontent.json b/website/common/locales/de/questscontent.json
index 1d0499bcb6..d743ea0cb3 100644
--- a/website/common/locales/de/questscontent.json
+++ b/website/common/locales/de/questscontent.json
@@ -700,7 +700,7 @@
     "questFluoriteBoss": "Fluorit-Elementar",
     "questFluoriteText": "Ein leuchtender, furchteinflößender Fluorit",
     "questFluoriteCompletion": "Während dem Kampf scheint die kristallene Kreatur mehr und mehr durch eure Lichter abgelenkt. “Das glitzert…” murmelt sie.<br><br>“Natürlich!” ruft @nirbhao. “Das muss ein Fluorit-Elemental sein. Die wollen nur ein wenig Licht, damit sie glimmen können. Lasst uns ihm helfen, so richtig hell zu scheinen.”<br><br>Das Elemental kichert glücklich und glimmt immer heller unter euren Fackeln und den magischen Glanzlichtern. Es scheint glücklich zu sein, wieder scheinen zu können, so dass es euch zu einem reichen Lager von Fluoritkristallen führt.<br><br>“Das ist die perfekte Zutat für ein neues Schlüpfelixier” findet @nirbhao. “Eines, das unsere Haustiere gerade so hell wie unseren neuen fluoreszierenden Freund hier scheinen lassen wird.”",
-    "questFluoriteNotes": "Ungewöhnliche Mineralien sind sehr gefragt dieser Tage, deshalb bist Du mit einigen Freunden auf der Suche nach aufregenden Erzen tief in die Minen der Mäander-Berge gewandert. Es ist eine lange, langweilige Expedition, bis @-Tyr- über einen grossen Stein stolpert, der genau in der Mitte des Tunnels liegt.<br><br>“Das hier sollte etwas Licht in die Sache bringen” sagt @nirbhao und zaubert eine Lichtkugel hervor.<br><br>Ein warmes Leuchten erfüllt den Tunnel, doch nun passiert etwas seltsames mit dem Stein. Vom magischen Licht zehrend, fängt er in fluoreszierendem Blau, Grün und Violett zu leuchten an. Dann richtet er sich in einer halbwegs humanoiden Form auf, inklusive glühend roten Augen, mit denen er Dich fixiert! Sofort beginnt ihr, blitzende Zaubersprüche zu sprechen und glänzende Waffen zu schwingen.",
+    "questFluoriteNotes": "Ungewöhnliche Mineralien sind sehr gefragt dieser Tage, deshalb bist Du mit einigen Freunden auf der Suche nach aufregenden Erzen tief in die Minen des Mäandergebirges gewandert. Es ist eine lange, langweilige Expedition, bis @-Tyr- über einen grossen Stein stolpert, der genau in der Mitte des Tunnels liegt.<br><br>“Das hier sollte etwas Licht in die Sache bringen” sagt @nirbhao und zaubert eine Lichtkugel hervor.<br><br>Ein warmes Leuchten erfüllt den Tunnel, doch nun passiert etwas seltsames mit dem Stein. Vom magischen Licht zehrend, fängt er in fluoreszierendem Blau, Grün und Violett zu leuchten an. Dann richtet er sich in einer halbwegs humanoiden Form auf, inklusive glühend roten Augen, mit denen er Dich fixiert! Sofort beginnt ihr, blitzende Zaubersprüche zu sprechen und glänzende Waffen zu schwingen.",
     "questWindupUnlockText": "Schaltet den Kauf von Aufziehbaren Schlüpfelixieren auf dem Marktplatz frei",
     "questWindupDropWindupPotion": "Aufziehbares Schlüpfelixier",
     "questWindupText": "Zähme die zankenden Zahnräder",
diff --git a/website/common/locales/de/settings.json b/website/common/locales/de/settings.json
index f9655f31a8..c5bbeef68c 100644
--- a/website/common/locales/de/settings.json
+++ b/website/common/locales/de/settings.json
@@ -218,5 +218,6 @@
     "dayStartAdjustment": "Änderung des Tageswechsel",
     "passwordSuccess": "Passwort erfolgreich geändert",
     "giftSubscriptionRateText": "<strong>$<%= price %> $(USD)</strong> für <strong><%= months %> Monate</strong>",
-    "transaction_admin_update_balance": "Admin gegeben"
+    "transaction_admin_update_balance": "Admin gegeben",
+    "transaction_admin_update_hourglasses": "Admin aktualisiert"
 }
diff --git a/website/common/locales/de/subscriber.json b/website/common/locales/de/subscriber.json
index bfac46a618..bcb1fd5f8e 100644
--- a/website/common/locales/de/subscriber.json
+++ b/website/common/locales/de/subscriber.json
@@ -213,5 +213,6 @@
     "wantToSendOwnGems": "Willst Du von deinen eigenen Edelsteinen senden?",
     "needToPurchaseGems": "Willst Du Edelsteine als Geschenk kaufen?",
     "mysterySet202208": "Frecher Pferdeschwanz-Set",
-    "mysterySet202209": "Magisches Gelehrten-Set"
+    "mysterySet202209": "Magisches Gelehrten-Set",
+    "mysterySet202210": "Bedrohliche Schlange Set"
 }
diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index 0776f4daa8..415d38ea1c 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -2114,7 +2114,7 @@
     "armorMystery202106Text": "Cola del Atardecer",
     "weaponArmoireMedievalWashboardNotes": "¡Rasca que te rasca! Es hora de esforzarse y dejar la ropa limpia. Aumenta la Fuerza en <%= str %>. Armario Encantado: Colección de Lavanderas Medievales (Artículo 5 de 6).",
     "weaponArmoireMedievalWashboardText": "Tabla de lavar",
-    "headSpecialWinter2020MageNotes": "¡Oh, cómo las campanas!/ Dulces campanas doradas / Parecen decir al unísono / “Lanza una ‘Estallido de llamas’” Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada Invierno 2019-2020.",
+    "headSpecialWinter2020MageNotes": "¡Oh, cómo las campanas!/ Dulces campanas doradas / Parecen decir al unísono / “Lanza una ‘Estallido de llamas’” Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2019-2020.",
     "weaponSpecialSummer2021WarriorText": "Cuchilla Acuática",
     "weaponSpecialSummer2021MageText": "Caña Nautiloide",
     "weaponArmoireBuoyantBubblesText": "Burbujas flotantes",
@@ -2181,28 +2181,28 @@
     "armorArmoireMedievalLaundryDressNotes": "Ponte tu ropa de trabajo y remángate: ¡es hora de hacer la colada! Aumenta la constitución en <%= con %>. Armario Encantado: Conjunto de lavanderos medievales (artículo 2 de 6).",
     "headSpecialSpring2020HealerText": "Fascinador Iris",
     "headSpecialWinter2020WarriorText": "Tocado Polvonevado",
-    "headSpecialSpring2020HealerNotes": "¡Engaña a tus enemigos con este tocado de flores! Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2020.",
+    "headSpecialSpring2020HealerNotes": "¡Engaña a tus enemigos con este tocado de flores! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2020.",
     "headSpecialSummer2020HealerText": "Yelmo tachonado de cristal",
     "headSpecialFall2020RogueNotes": "Mira dos veces, actúa una: esta máscara te lo hace fácil. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de otoño 2020.",
-    "headSpecialSpring2020MageText": "Gorra con tapa de goteo",
-    "headSpecialSpring2020MageNotes": "¿Está el cielo despejado?¿hay poca humedad? No te preocupes, te ayudamos. ¡Humedece tu magia sin humillar tu espíritu! Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de primavera 2020.",
+    "headSpecialSpring2020MageText": "Gorra con Tapa de Goteo",
+    "headSpecialSpring2020MageNotes": "¿Está el cielo despejado?¿hay poca humedad? No te preocupes, te ayudamos. ¡Humedece tu magia sin humillar tu espíritu! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2020.",
     "headSpecialSummer2020WarriorNotes": "Multiplica tu fuerza y habilidad con esta prenda de cabeza altamente visible. Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de verano 2020.",
     "headSpecialFall2020RogueText": "Máscara de piedra de dos cabezas",
     "headSpecialFall2020WarriorNotes": "¡El guerrero que en su día la usaba, jamás se inmutó ante las tareas más duras! Pero puede que otros retrocedan ante ti cuando lo uses... Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2020.",
     "headSpecialFall2020MageText": "Clarividencia Despertada",
-    "headSpecialSummer2020RogueNotes": "¡Completa tu estilo picaresco camuflándote con este yelmo! Quizás puedas engañar a tus enemigos con tus lágrima de cocodrilo... Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de verano 2020.",
+    "headSpecialSummer2020RogueNotes": "¡Completa tu estilo picaresco camuflándote con este yelmo! Quizás puedas engañar a tus enemigos con tus lágrima de cocodrilo... Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2020.",
     "headSpecialSummer2020WarriorText": "Gorra de pescado llamativo",
     "headSpecialWinter2020HealerNotes": "Por favor, quíteselo de la cabeza antes de tratar de hacer café o té con él. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2019-2020.",
     "headSpecialSummer2020HealerNotes": "Estate tranquilo, puede que los recogeconchas mantengan sus manos lejos de tu pelo. Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2020.",
     "headSpecialSummer2020MageText": "Cresta de pez sable",
-    "headSpecialSummer2020RogueText": "Yelmo de cocodrilo",
+    "headSpecialSummer2020RogueText": "Yelmo de Cocodrilo",
     "headSpecialSummer2020MageNotes": "¿Quién necesita una corona teniendo esta cresta? Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de verano 2020.",
     "headSpecialFall2020MageNotes": "Con esta gorra asentada a la perfección sobre tu frente, tu tercer ojo se abre, lo que te permite concentrarte en lo que de otro modo sería invisible: flujos de maná, espíritus inquietos y tareas pendientes olvidadas. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de otoño 2020.",
     "headSpecialFall2020WarriorText": "Capucha siniestra",
-    "headSpecialWinter2020WarriorNotes": "Una sensación de picazón en el cuero cabelludo es un pequeño precio a pagar por la magnificencia estacional. Aumenta la fuerza en <%= str%>. Equipamiento de edición limitada de invierno 2019-2020.",
-    "headSpecialSpring2020WarriorNotes": "¡Los golpes de tus enemigos rebotarán en este yelmo inspirado en los escarabajos!. Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2020.",
-    "headSpecialSpring2020RogueNotes": "Tan vibrante y valioso que sufrirás la tentación de robárselo a tu propia cabeza. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de primavera 2020.",
-    "headSpecialSpring2020WarriorText": "Yelmo de escarabajo",
+    "headSpecialWinter2020WarriorNotes": "Una sensación de picazón en el cuero cabelludo es un pequeño precio a pagar por la magnificencia estacional. Aumenta la Fuerza en <%= str%>. Equipamiento de edición limitada de invierno 2019-2020.",
+    "headSpecialSpring2020WarriorNotes": "¡Los golpes de tus enemigos rebotarán en este yelmo inspirado en los escarabajos!. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2020.",
+    "headSpecialSpring2020RogueNotes": "Tan vibrante y valioso que sufrirás la tentación de robárselo a tu propia cabeza. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2020.",
+    "headSpecialSpring2020WarriorText": "Yelmo de Escarabajo",
     "headSpecialSpring2020RogueText": "Kabuto de Lapis",
     "headSpecialWinter2021WarriorText": "Capucha aislante",
     "headSpecialSpring2021RogueNotes": "Dejémonos de florituras lingüísticas: ¡este sombrero te permitirá camuflarte a la perfección entre las flores de primavera! Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de primavera 2021.",
diff --git a/website/common/locales/fr/groups.json b/website/common/locales/fr/groups.json
index de4693d3ac..9e59322683 100644
--- a/website/common/locales/fr/groups.json
+++ b/website/common/locales/fr/groups.json
@@ -197,7 +197,7 @@
     "userIsClamingTask": "`<%= username %> a revendiqué : `<%= task %>",
     "approvalRequested": "Approbation demandée",
     "cantDeleteAssignedGroupTasks": "Vous ne pouvez pas supprimer les tâches de groupe qui vous ont été attribuées.",
-    "groupPlanUpgraded": "<strong><%- groupName %></strong> a été amélioré en plan de groupe !",
+    "groupPlanUpgraded": "<strong><%- groupName %></strong> a été correctement amélioré en plan de groupe !",
     "groupPlanCreated": "<strong><%- groupName %></strong> a été créé !",
     "onlyGroupLeaderCanInviteToGroupPlan": "Seul le chef de groupe peut inviter des utilisateurs dans un groupe avec abonnement.",
     "paymentDetails": "Détails du paiement",
@@ -402,5 +402,8 @@
     "newGroupsBullet09": "Une tâche partagée peut être décochée pour montrer qu'elle nécessite encore du travail",
     "newGroupsBullet10b": "<strong>Attribuez la tâche à un membre</strong> si seulement cette personne peut la réaliser",
     "newGroupsEnjoy": "Nous espérons que vous apprécierez la nouvelle expérience des plans de groupe !",
-    "newGroupsBullet01": "Interagissez avec les tâches directement depuis la console des tâches partagées"
+    "newGroupsBullet01": "Interagissez avec les tâches directement depuis la console des tâches partagées",
+    "groupUse": "Qu'est ce qui décrit mieux l'usage de votre groupe ?*",
+    "groupUseDefault": "Choisissez une réponse",
+    "createGroup": "Créer un groupe"
 }
diff --git a/website/common/locales/fr/limited.json b/website/common/locales/fr/limited.json
index 4ab3ef7251..b4676a0067 100644
--- a/website/common/locales/fr/limited.json
+++ b/website/common/locales/fr/limited.json
@@ -232,6 +232,8 @@
     "julyYYYY": "Juillet <%= year %>",
     "fall2022OrcWarriorSet": "Orc (Guerrier)",
     "fall2022HarpyMageSet": "Harpie (Mage)",
-    "fall2022WatcherHealerSet": "Gardien (Guérisseur)",
-    "fall2022KappaRogueSet": "Kappa (Voleur)"
+    "fall2022WatcherHealerSet": "Voyeur (Guérisseur)",
+    "fall2022KappaRogueSet": "Kappa (Voleur)",
+    "gemSaleHow": "Entre le <%= eventStartOrdinal %> et le <%= eventEndOrdinal %> <%= eventStartMonth %>, achetez simplement n'importe quel ensemble de gemmes comme d'habitude et votre compte sera crédité avec le montant promotionnel de gemmes. Plus de gemmes à dépenser, à partager ou à conserver pour de nouveaux objets !",
+    "gemSaleLimitations": "Cette promotion s'applique uniquement pendant la durée de l'événement. L'événement démarre le <%= eventStartOrdinal %> <%= eventStartMonth %> à 8:00 EDT (12:00 UTC) et se terminera le <%= eventEndOrdinal %> <%= eventStartMonth %> à 20:00 EDT (00:00 UTC). Cette promotion n'est disponible que pour les gemmes que vous achetez pour vous."
 }
diff --git a/website/common/locales/fr/npc.json b/website/common/locales/fr/npc.json
index 77b4979e54..62930bb69d 100644
--- a/website/common/locales/fr/npc.json
+++ b/website/common/locales/fr/npc.json
@@ -131,5 +131,7 @@
     "limitedAvailabilityHours": "Disponible pendant <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityDays": "Disponible pendant <%= days %>j <%= hours %>h <%= minutes %>m",
     "amountExp": "<%= amount %> expérience",
-    "helpSupportHabitica": "Contribuez à soutenir Habitica"
+    "helpSupportHabitica": "Contribuez à soutenir Habitica",
+    "groupsPaymentSubBilling": "Votre prochaine date de facturation est <strong><%= renewalDate %></strong>.",
+    "groupsPaymentAutoRenew": "Cet abonnement se renouvellera automatiquement jusqu'à son annulation. Si vous devez l'annuler, vous pouvez le faire depuis l'onglet de facturation de groupe."
 }
diff --git a/website/common/locales/fr/settings.json b/website/common/locales/fr/settings.json
index d8e1fa2dbd..64a2618203 100644
--- a/website/common/locales/fr/settings.json
+++ b/website/common/locales/fr/settings.json
@@ -219,5 +219,6 @@
     "passwordSuccess": "Mot de passe changé avec succès",
     "giftSubscriptionRateText": "<strong>$<%= price %> USD</strong> pour <strong><%= months %> mois</strong>",
     "transaction_admin_update_balance": "Administration donnée",
-    "transaction_create_bank_challenge": "Banque de défi créée"
+    "transaction_create_bank_challenge": "Banque de défi créée",
+    "transaction_admin_update_hourglasses": "Admin mis à jour"
 }
diff --git a/website/common/locales/fr/subscriber.json b/website/common/locales/fr/subscriber.json
index 54bd85f081..17b9882240 100644
--- a/website/common/locales/fr/subscriber.json
+++ b/website/common/locales/fr/subscriber.json
@@ -213,5 +213,6 @@
     "mysterySet202206": "Ensemble de lutine maritime",
     "mysterySet202207": "Ensemble de méduse mélomane",
     "mysterySet202208": "Ensemble de queue de cheval audacieuse",
-    "mysterySet202209": "Ensemble d'étude de magie"
+    "mysterySet202209": "Ensemble d'étude de magie",
+    "mysterySet202210": "Ensemble ophidien inquiétant"
 }
diff --git a/website/common/locales/it/groups.json b/website/common/locales/it/groups.json
index e5f1b7632d..a0b6f32311 100644
--- a/website/common/locales/it/groups.json
+++ b/website/common/locales/it/groups.json
@@ -197,7 +197,7 @@
     "userIsClamingTask": "`<%= username %> ha reclamato:` <%= task %>",
     "approvalRequested": "Approvazione richiesta",
     "cantDeleteAssignedGroupTasks": "Non puoi eliminare le attività di gruppo assegnate a te.",
-    "groupPlanUpgraded": "<strong><%- groupName %></strong> è stato promosso a Piano per Gruppi!",
+    "groupPlanUpgraded": "<strong><%- groupName %></strong> è stato aggiornato con successo a Piano di Gruppo!",
     "groupPlanCreated": "<strong><%- groupName %></strong> è stato creato!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Solo il leader del gruppo può inviatare utenti in un gruppo con un abbonamento.",
     "paymentDetails": "Dettagli di pagamento",
@@ -402,5 +402,19 @@
     "viewStatus": "Stato",
     "newGroupsBullet09": "Un'attività condivisa può essere deselezionata per mostrare che necessita ancora di lavoro",
     "newGroupsBullet10": "Lo stato delle assegnazioni determina le condizioni di completamento:",
-    "newGroupsBullet10b": "<strong>Assegna un'attività ad un membro</strong> cosicché solamente quel membro possa completarla"
+    "newGroupsBullet10b": "<strong>Assegna un'attività ad un membro</strong> cosicché solamente quel membro possa completarla",
+    "groupUseDefault": "Scegli una risposta",
+    "groupParentChildren": "Genitore/i che organizza/organizzano attività per i figli",
+    "groupCouple": "Attività condivise da coppie",
+    "groupFriends": "Attività condivise fra amici",
+    "groupCoworkers": "Attività condivise fra colleghi di lavoro",
+    "groupManager": "Manager che imposta le attività per i dipendenti",
+    "nameStar": "Nome*",
+    "nameStarText": "Aggiungi un titolo",
+    "descriptionOptional": "Descrizione",
+    "descriptionOptionalText": "Aggiungi una descrizione",
+    "nextPaymentMethod": "Prossimo: Metodo di Pagamento",
+    "createGroup": "Crea un Gruppo",
+    "groupUse": "Quale tra questi descrive meglio l'utilizzo del tuo Gruppo?*",
+    "groupTeacher": "Insegnante che imposta le attività per gli studenti"
 }
diff --git a/website/common/locales/it/limited.json b/website/common/locales/it/limited.json
index bfd0bb05b2..27bbc4d346 100644
--- a/website/common/locales/it/limited.json
+++ b/website/common/locales/it/limited.json
@@ -230,7 +230,9 @@
     "summer2022WaterspoutWarriorSet": "Tromba d'Acqua (Guerriero)",
     "julyYYYY": "luglio <%= year %>",
     "fall2022HarpyMageSet": "Arpia (Mago)",
-    "fall2022WatcherHealerSet": "Osservatore (Guaritore)",
+    "fall2022WatcherHealerSet": "Sbircione (Guaritore)",
     "fall2022KappaRogueSet": "Kappa (Ladro)",
-    "fall2022OrcWarriorSet": "Orco (Guerriero)"
+    "fall2022OrcWarriorSet": "Orco (Guerriero)",
+    "gemSaleLimitations": "Questa promozione è applicabile solo durante l'evento a tempo limitato. Questo evento inizia il <%= eventStartMonth %> <%= eventStartOrdinal %> alle 8:00 EDT (12:00 UTC) e terminerà <%= eventStartMonth %> <%= eventEndOrdinal %> alle 20:00 EDT ( 00:00 UTC). L'offerta promozionale è disponibile solo quando acquisti Gemme per te stesso/a.",
+    "gemSaleHow": "Tra <%= eventStartMonth %> <%= eventStartOrdinal %> e <%= eventEndOrdinal %>, acquista semplicemente qualsiasi pacchetto di gemme come al solito e sul tuo account verrà accreditato l'importo promozionale di Gemme. Più Gemme da spendere, condividere o risparmiare per le prossime uscite!"
 }
diff --git a/website/common/locales/it/npc.json b/website/common/locales/it/npc.json
index c1e152ab13..7a6d68c8ca 100644
--- a/website/common/locales/it/npc.json
+++ b/website/common/locales/it/npc.json
@@ -131,5 +131,7 @@
     "limitedAvailabilityDays": "Disponibile per <%= days %> giorni, <%= hours %> ore e <%= minutes %> minuti",
     "limitedAvailabilityHours": "Disponibile per <%= hours %> ore e <%= minutes %> minuti",
     "amountExp": "<%= amount %> Exp",
-    "helpSupportHabitica": "Aiutare a Supportare Habitica"
+    "helpSupportHabitica": "Aiutare a Supportare Habitica",
+    "groupsPaymentAutoRenew": "Questo abbonamento si rinnoverà automaticamente fino a quando non verrà annullato. Se hai bisogno di annullarlo, puoi farlo dal pannello Fatturazione di Gruppo.",
+    "groupsPaymentSubBilling": "La tua prossima data di fatturazione è <strong><%= renewalDate %></strong>."
 }
diff --git a/website/common/locales/it/settings.json b/website/common/locales/it/settings.json
index bf6a3d8f52..55b47b9acf 100644
--- a/website/common/locales/it/settings.json
+++ b/website/common/locales/it/settings.json
@@ -219,5 +219,6 @@
     "passwordSuccess": "Password cambiata con successo",
     "giftSubscriptionRateText": "<strong>$<%= price %> USD</strong> per <strong><%= months %> months</strong>",
     "transaction_create_bank_challenge": "Sfida della banca creata",
-    "transaction_admin_update_balance": "Dato dall'amministratore"
+    "transaction_admin_update_balance": "Dato dall'amministratore",
+    "transaction_admin_update_hourglasses": "Aggiornato dall'amministratore"
 }
diff --git a/website/common/locales/ja/character.json b/website/common/locales/ja/character.json
index 8905521815..a978425a62 100644
--- a/website/common/locales/ja/character.json
+++ b/website/common/locales/ja/character.json
@@ -43,12 +43,12 @@
     "rainbowSkins": "虹色の肌",
     "pastelSkins": "パステル調の肌",
     "spookySkins": "不気味な肌",
-    "supernaturalSkins": "お化けの肌",
+    "supernaturalSkins": "おばけの肌",
     "splashySkins": "派手な肌",
     "winterySkins": "冬の肌",
     "rainbowColors": "虹色",
     "shimmerColors": "きらきら色",
-    "hauntedColors": "お化け色",
+    "hauntedColors": "おばけ色",
     "winteryColors": "冬の色",
     "equipment": "装備",
     "equipmentBonus": "装備",
diff --git a/website/common/locales/ja/content.json b/website/common/locales/ja/content.json
index 0914879051..5cbe66d1e7 100644
--- a/website/common/locales/ja/content.json
+++ b/website/common/locales/ja/content.json
@@ -199,7 +199,7 @@
     "hatchingPotionAquatic": "水中の",
     "hatchingPotionEmber": "熾火の",
     "hatchingPotionThunderstorm": "雷雨の",
-    "hatchingPotionGhost": "お化けの",
+    "hatchingPotionGhost": "おばけの",
     "hatchingPotionRoyalPurple": "ロイヤルパープルの",
     "hatchingPotionHolly": "ヒイラギの",
     "hatchingPotionCupid": "キューピッドの",
diff --git a/website/common/locales/ja/faq.json b/website/common/locales/ja/faq.json
index b8b506e3af..987ef7c0b8 100644
--- a/website/common/locales/ja/faq.json
+++ b/website/common/locales/ja/faq.json
@@ -5,9 +5,9 @@
     "androidFaqAnswer0": "まず、あなたの毎日の生活の中で行いたいタスクを設定します。現実でそのタスクを完了しチェックを入れると、ゴールドと経験値が得られます。ゴールドはアバターの装備やいくつかのアイテム、そしてカスタマイズした「ごほうび」を買うのに使えます。経験値によってあなたのキャラクターがレベルアップし、ペット・スキル・クエストといった新しいコンテンツをアンロックしていきます！メニュー>所持品>アバターでキャラクターをカスタマイズできます。\n\n基本操作:右下の(+)をクリックすると、新しいタスクの作成。作成済みのタスクをタップすると編集、左にスワイプすると削除。タスクにタグをつけると、右上で絞り込みができます。チェックリストの数字をクリックすることで、表示をたたんだり展開したりできます。",
     "webFaqAnswer0": "まず、あなたの毎日の生活の中でやりたいタスクを設定します。そして現実でそのタスクを完了したらチェックを入れます。すると、ゴールドと経験値が手に入ります。ゴールドはアバターの装備やいくつかのアイテム、そしてカスタマイズした「ごほうび」を買うのに使えます。経験値によってあなたのキャラクターがレベルアップし、ペット・スキル・クエストといった新しいコンテンツをアンロックしていきます！ くわしくは [ヘルプ -> 新ユーザーのためのツアー](https://habitica.com/static/overview) でゲームの流れを少しずつ学びましょう。",
     "faqQuestion1": "どのようにタスクをセットすればいいのですか？",
-    "iosFaqAnswer1": "いい習慣 ( + がついている習慣) は、「野菜を食べる」というように毎日何度でも行えるものです。悪い習慣( - がついている習慣) は、「つめをかむ」といったやるべきでないくせ・習慣です。+ と - の両方がついている習慣は、「階段で上るか、エレベーターを使うか」といった、いい選択と悪い選択の両方があるものです。いい習慣で経験値とゴールドが得られます。悪い習慣は体力を奪います。\n\n日課は、「歯をみがく」とか「メールをチェックする」といった毎日やるべきことです。日課をやるべき日・曜日を「編集」で調整します。やるべき日に日課を行わないと、アバターは夜中にダメージを受けます。あまりに多くの日課を一度に背負わないように注意が必要です。\n\nTo Doは「やるべきこと」リストです。To Doを完了すると、ゴールドと経験値を獲得できます。To Doでは体力が減ることはありません。「編集」をタップすることで、To Doのしめきりを設定できます。",
-    "androidFaqAnswer1": "いい習慣 ( + がついているもの) は、「野菜を食べる」というように 1 日のうちに何度でも行えるものです。悪い習慣( - がついているもの) は、「つめをかむ」といったやるべきでないくせ・習慣です。+ と - がついている習慣は、「階段 VS エレベーター」といった、いい選択と悪い選択の両方があるものです。いい習慣で経験値とゴールドが得られます。悪い習慣は体力を奪います。\n\n日課は、「歯をみがく」とか「メールをチェックする」といった毎日やるべきことです。日課をやるべき日を「編集」で調整します。やるべき日課を行わないと、アバターは夜中にダメージを受けます。あまりに多くの日課を一度に追加しすぎないように注意が必要です。\n\nTo Doは「やるべきこと」リストです。To Doを完了すると、ゴールドと経験値を獲得できます。To Doでは体力が減ることはありません。「編集」をタップすることで、To Doのしめきりを設定できます。",
-    "webFaqAnswer1": "* いい習慣（:heavy_plus_sign: がついている習慣）は、「野菜を食べる」のように毎日何度でも行えるものです。悪い習慣（:heavy_minus_sign:がついている習慣）は、「爪を噛む」といったやるべきでないくせ・習慣です。:heavy_plus_sign:と:heavy_minus_sign:の両方がついている習慣は、「階段で上るか、エレベーターを使うか」といった、いい選択と悪い選択の両方があるものです。いい習慣で経験値とゴールドが得られます。悪い習慣で体力が奪われます。\n* 日課は、「歯をみがく」とか「メールをチェックする」といった毎日やるべきことです。タイトルをクリックして、日課をやるべき日を調整します。やるべき日に日課を行わないと、アバターは夜中にダメージを受けます。あまりに多くの日課を一度に設定しないように気をつけましょう！\n* To Doは「やるべきこと」リストです。To Doを完了すると、ゴールドと経験値を獲得できます。To Doでは体力が減ることはありません。タイトルをタップすることで、To Doのしめきりを設定できます。",
+    "iosFaqAnswer1": "良い習慣 ( + がついている習慣) は、「野菜を食べる」というように毎日何度でも行えるものです。悪い習慣( - がついている習慣) は、「つめをかむ」などのやめるべき習慣です。+ と - の両方がついている習慣は、「階段で上るか、エレベーターを使うか」といった、良い選択と悪い選択の両方があるものです。良い習慣で経験値とゴールドが得られます。悪い習慣は体力を奪います。\n\n日課は、「歯をみがく」とか「メールをチェックする」といった毎日やるべきことです。日課をやるべき日・曜日を「編集」で調整します。やるべき日に日課を行わないと、アバターは１日の終わりにダメージを受けます。あまりに多くの日課を一度に背負わないように注意が必要です。\n\nTo Doは「やること」リストです。To Doを完了すると、ゴールドと経験値を獲得できます。To Doでは体力が減ることはありません。「編集」をタップすることで、To Doの期限を設定できます。",
+    "androidFaqAnswer1": "良い習慣 ( + がついている習慣) は、「野菜を食べる」というように毎日何度でも行えるものです。悪い習慣( - がついている習慣) は、「つめをかむ」などのやめるべき習慣です。+ と - の両方がついている習慣は、「階段で上るか、エレベーターを使うか」といった、良い選択と悪い選択の両方があるものです。良い習慣で経験値とゴールドが得られます。悪い習慣は体力を奪います。\n\n日課は、「歯をみがく」とか「メールをチェックする」といった毎日やるべきことです。日課をやるべき日を「編集」で調整します。やるべき日課を行わないと、アバターは１日の終わりにダメージを受けます。あまりに多くの日課を一度に追加しすぎないように注意が必要です。\n\nTo Doは「やること」リストです。To Doを完了すると、ゴールドと経験値を獲得できます。To Doでは体力が減ることはありません。「編集」をタップすることで、To Doの期限を設定できます。",
+    "webFaqAnswer1": "* 良い習慣（:heavy_plus_sign: がついている習慣）は、「野菜を食べる」のように毎日何度でも行えるものです。悪い習慣（:heavy_minus_sign:がついている習慣）は、「爪を噛む」などのやめるべき習慣です。:heavy_plus_sign:と:heavy_minus_sign:の両方がついている習慣は、「階段で上るか、エレベーターを使うか」といった、良い選択と悪い選択の両方がある習慣です。良い習慣で経験値とゴールドが得られます。悪い習慣で体力が奪われます。\n* 日課は、「歯をみがく」とか「メールをチェックする」といった毎日やるべきことです。タイトルをクリックして、日課をやるべき日を調整します。やるべき日に日課を行わないと、アバターは１日の終わりにダメージを受けます。あまりに多くの日課を一度に設定しないように気をつけましょう！\n* To Doは「やること」リストです。To Doを完了すると、ゴールドと経験値を獲得できます。To Doでは体力が減ることはありません。タイトルをタップすることで、To Doの期限を設定できます。",
     "faqQuestion2": "タスクのサンプルはありますか?",
     "iosFaqAnswer2": "参考のため、Wiki では4種類のタスクの例を用意しています :\n\n* [習慣の例](https://habitica.fandom.com/ja/wiki/習慣の例)\n* [日課の例](https://habitica.fandom.com/ja/wiki/日課の例)\n* [To Doの例](https://habitica.fandom.com/ja/wiki/To_Doの例)\n* [自分好みのごほうびの例](https://habitica.fandom.com/ja/wiki/自分好みのごほうびの例)",
     "androidFaqAnswer2": "参考のため、Wiki では4種類のタスクの例を用意しています :\n\n* [習慣の例](https://habitica.fandom.com/ja/wiki/習慣の例)\n* [日課の例](https://habitica.fandom.com/ja/wiki/日課の例)\n* [To Doの例](https://habitica.fandom.com/ja/wiki/To_Doの例)\n* [自分好みのごほうびの例](https://habitica.fandom.com/ja/wiki/自分好みのごほうびの例)",
diff --git a/website/common/locales/ja/gear.json b/website/common/locales/ja/gear.json
index 079d3f5549..efaf019a1c 100644
--- a/website/common/locales/ja/gear.json
+++ b/website/common/locales/ja/gear.json
@@ -2726,5 +2726,9 @@
     "shieldSpecialFall2022WarriorNotes": "ガオーッ・オア・トリート！体質が<%= con %>上がります。2022年秋の限定装備。",
     "shieldSpecialFall2022HealerText": "覗く魔の左目",
     "shieldSpecialFall2022HealerNotes": "瞳がふたつ。この衣装を見上げて震え上がるがいいでしょう。体質が<%= con %>上がります。2022年秋の限定装備。",
-    "armorSpecialFall2022MageNotes": "この素晴らしい翼で風のように速く飛び、あなたの欲しいものを恐ろしい爪でがっしりと掴み取りましょう。知能が<%= int %>上がります。2022年秋の限定装備。"
+    "armorSpecialFall2022MageNotes": "この素晴らしい翼で風のように速く飛び、あなたの欲しいものを恐ろしい爪でがっしりと掴み取りましょう。知能が<%= int %>上がります。2022年秋の限定装備。",
+    "armorMystery202210Notes": "気分転換に地面を這ってみれば、かなり効率的な移動手段だと思えるかもしれません！効果なし。2022年10月の有料会員アイテム。",
+    "armorMystery202210Text": "くちなわのよろい",
+    "headMystery202210Text": "くちなわのかぶと",
+    "headMystery202210Notes": "このうろこのフードをかぶり、怯えるToDoリストを従えましょう！効果なし。2022年10月の有料会員アイテム。"
 }
diff --git a/website/common/locales/ja/groups.json b/website/common/locales/ja/groups.json
index ee482b5d33..c13a8098eb 100644
--- a/website/common/locales/ja/groups.json
+++ b/website/common/locales/ja/groups.json
@@ -197,7 +197,7 @@
     "userIsClamingTask": "`<%= username %>が担当しています：`<%= task %>",
     "approvalRequested": "承認が申請されました",
     "cantDeleteAssignedGroupTasks": "あなたへと割り当てられたタスクを削除することはできません。",
-    "groupPlanUpgraded": "<strong><%- groupName %></strong> がグループプランにアップグレードされました！",
+    "groupPlanUpgraded": "<strong><%- groupName %></strong> は正常にグループプランへアップグレードされました！",
     "groupPlanCreated": "<strong><%- groupName %></strong> が作成されました！",
     "onlyGroupLeaderCanInviteToGroupPlan": "有料プランが有効化されているグループには、グループのリーダーだけがユーザーを招待できます。",
     "paymentDetails": "支払いについての詳細",
diff --git a/website/common/locales/ja/limited.json b/website/common/locales/ja/limited.json
index 1470b65efb..b97138feeb 100644
--- a/website/common/locales/ja/limited.json
+++ b/website/common/locales/ja/limited.json
@@ -31,7 +31,7 @@
     "seasonalShopFallText": "秋の収穫祭おめでとう！！今しか手に入らないレアなアイテムはいかがですか？大祭が終わるまでの限定品です！",
     "seasonalShopWinterText": "冬のワンダーランドおめでとう！！今しか手に入らないレアなアイテムはいかがですか？大祭が終わるまでの限定品です！",
     "seasonalShopSpringText": "春の元気なダンスおめでとう！！今しか手に入らないレアなアイテムはいかがですか？大祭が終わるまでの限定品です！",
-    "seasonalShopFallTextBroken": "ああ......季節の店へよくぞお越しを...いまは秋の期間限定版グッズやなんかをとりそろえ...こちらはどれも、毎年の秋まつりイベント期間のみの商品で、当店は10月31日までの限定オープン...今すぐ買っておかないと、ずっと...ずっと...ずっと待つことになる...<strong>（ため息）</strong>",
+    "seasonalShopFallTextBroken": "ああ......季節の店へよくぞお越しを...いまは秋の季節限定グッズなんかをとりそろえていますよ...こちらはどれも、毎年の秋の収穫祭イベント期間のみの商品で、当店は10月31日までの限定オープン...今すぐ買っておかないと、ずっと...ずっと...ずっと待つことになるでしょうね...<strong>（ため息）</strong>",
     "seasonalShopBrokenText": "私の大切なあずまやが！！ 私のすてきな飾りつけが！　ああ、ディスハートナーに何もかも壊されてしまいました……。(T_T)　私が季節の店を建て直せるように、キャンプ場であの怪物を仕留めるのを手伝ってください！",
     "seasonalShopRebirth": "この中の装備で、以前に買ったけれど、現在もっていないものは、「ごほうび」列でもう一度買うことができます。初期状態では、その時点でのクラス ( 標準では戦士 ) のアイテムしか買えませんが、ご心配なく。クラスを変更すれば、そのクラス用のアイテムを買えるようになります。",
     "candycaneSet": "キャンディー棒（魔道士）",
@@ -231,7 +231,9 @@
     "julyYYYY": "<%= year %>年7月",
     "octoberYYYY": "<%= year %>年10月",
     "fall2022HarpyMageSet": "ハーピー（魔道士）",
-    "fall2022WatcherHealerSet": "ウォッチャー（治療師）",
+    "fall2022WatcherHealerSet": "覗く魔（治療師）",
     "fall2022KappaRogueSet": "カッパ（盗賊）",
-    "fall2022OrcWarriorSet": "オーク（戦士）"
+    "fall2022OrcWarriorSet": "オーク（戦士）",
+    "gemSaleHow": "<%= eventStartMonth %> <%= eventStartOrdinal %> から<%= eventEndOrdinal %>の間、通常どおりジェムを購入するだけで、あなたのアカウントはプロモーション分のジェムを受け取れます。買い物したり、分け合ったり、将来のため貯めておけるジェムが増えました！",
+    "gemSaleLimitations": "このプロモーションは期間限定のイベント中にのみ適用されます。イベントは米国東部標準時 <%= eventStartMonth %> <%= eventStartOrdinal %> の午前 8:00(12:00 UTC) に開始し、米国東部標準時 <%= eventStartMonth %> <%= eventEndOrdinal %> の午後 8:00 ( 00:00 UTC)に終了します。 割引はジェムを自分で購入する場合にのみ利用できます。"
 }
diff --git a/website/common/locales/ja/npc.json b/website/common/locales/ja/npc.json
index 8d48560331..1965c309ea 100644
--- a/website/common/locales/ja/npc.json
+++ b/website/common/locales/ja/npc.json
@@ -132,5 +132,6 @@
     "limitedAvailabilityMinutes": "購入できる期間は残り<%= minutes %>分<%= seconds %>秒です",
     "amountExp": "<%= amount %>経験値",
     "newStuffPostedOn": "<%= publishDate %> <%= publishTime %>に投稿",
-    "helpSupportHabitica": "Habiticaを支援する"
+    "helpSupportHabitica": "Habiticaを支援する",
+    "groupsPaymentSubBilling": "次回の請求日は <strong><%= renewalDate %></strong> です。"
 }
diff --git a/website/common/locales/ja/questscontent.json b/website/common/locales/ja/questscontent.json
index 215a921eeb..f5f018a39f 100644
--- a/website/common/locales/ja/questscontent.json
+++ b/website/common/locales/ja/questscontent.json
@@ -698,7 +698,7 @@
     "questWaffleRageTitle": "べとべとメープルシロップ",
     "questWaffleBoss": "荒ぶるワッフル",
     "questWaffleCompletion": "小麦とバターまみれになりながら戦いに勝ち、あなたは――ネバネバする甘い汁漬けの荒ぶるワッフルのように――甘い勝利の余韻に浸ります。<br><br>「おお！　怪獣を見事に料理したな」レディ・グラシエイトは感動したように言いました。<br><br>「朝飯前でございましたね」エイプリル・フールも笑顔です。<br><br>「残念なことだけれど」@beffymarooはワッフルの残骸を見て言います。「食べきれそうもないわね」<br><br>すると、エイプリル・フールは上着のどこかからか魔法薬のビンを取り出し、それをシロップまみれのワッフルの残骸でみたします。さらにそこにひとつまみのきらきらした粉末を入れて混ぜました。その液体は、色彩が渦巻く――新しいたまごがえしの薬となったのです！彼はできあがった薬をあなたに投げてよこします。「今日の冒険でワタクシはとても空腹でございますよ。どなたか、朝食をご一緒しませんか？」",
-    "questWaffleNotes": "「エイプリル・フールよ！」レディ・グラシエイトは慌てた様子で怒鳴りました。「お菓子のいたずらはおしまいにして、きれいに片付けたと言っていたはずだな！」<br><br>「えぇ、そう申し上げましたとも」エイプリル・フールが困惑ぎみに応えました。「フール一族の中で最も正直者のワタクシが保証いたしますよ。――何かお困りで？」<br><br>「ハビットシティにどでかい砂糖まみれの怪獣が近づいているんだ！」<br><br>「さてはて……」エイプリル・フールはしばらく考えてから言いました。「実は昨年のエイプリルフール・デイの神秘の試薬のために、いくつか怪獣の巣穴を襲ったのでございますよ。望まぬモノの注意を引いてしまったようですねえ。サッカリンヘビですか？　タルト亀？　ティラミスレックス？」<br><br>「違う！　強いて言うなら……荒ぶるワッフルだ！」<br><br>「おやおや。新しい怪獣ですねえ。おそらく、この世の大気中に存在するいたずらのエネルギーから生まれたのでしょう」彼は振り向き、あなたと@beffymarooにいびつな笑顔を見せます。「英雄になるチャンスではございませんか？」",
+    "questWaffleNotes": "「エイプリル・フールよ！」レディ・グラシエイトは慌てた様子で怒鳴りました。「お菓子のいたずらはおしまいにして、きれいに片付けたと言っていたはずだな！」<br><br>「えぇ、そう申し上げましたとも」エイプリル・フールが困惑ぎみに応えました。「フール一族の中で最も正直者のワタクシが保証いたしますよ。――何かお困りで？」<br><br>「ハビットシティにどでかい砂糖まみれの怪獣が近づいているんだ！」<br><br>「さてはて……」エイプリル・フールはしばらく考えてから言いました。「実は昨年のエイプリルフールデーの神秘の試薬のために、いくつか怪獣の巣穴を襲ったのでございますよ。望まぬモノの注意を引いてしまったようですねえ。サッカリンヘビですか？　タルト亀？　ティラミスレックス？」<br><br>「違う！　強いて言うなら……荒ぶるワッフルだ！」<br><br>「おやおや。新しい怪獣ですねえ。おそらく、この世の大気中に存在するいたずらのエネルギーから生まれたのでしょう」彼は振り向き、あなたと@beffymarooにいびつな笑顔を見せます。「英雄になるチャンスではございませんか？」",
     "questWaffleText": "ワッフルとフール：朝食の惨劇！",
     "questRubyText": "ルビーな関係",
     "questRubyCompletion": "新しい薬の生成に必要なアイテムを丁寧にバッグに詰めると、3人はハビットシティに急いで戻り、@beffymarooの研究所を訪ねました。「素晴らしいわ！」@beffymarooは感嘆の声を上げます。「あなたたちは魔法の薬の素材を集めきったのね！」<br><br>@beffymarooはルーンとルビーを融合させ、輝く赤い魔法の薬を作ると、2つのペットのたまごに注ぎました。3人は変化を見守りますが、孵った2匹のペットはお互いに興味がないようなのです！<br><br>「愛と友情の薬作りは、失敗だったの？」@gullyが聞きます。その質問の答えを誰かが口にするより早く、あなたはひらめきます。この魔法の薬は、素材集めの冒険の過程で、愛と友情の心がこめられたというより、むしろ共通の目標に向けて一緒に働く経験が込められたのではないかと。それならば、今はお互いに興味がなくても仕方ありません。でも、次の冒険の時には活躍してくれるでしょう。今回のクエストはこれで終わりです。一緒に旅をした冒険者と、派手な色のペットが新しく仲間になりました！",
diff --git a/website/common/locales/ja/spells.json b/website/common/locales/ja/spells.json
index 53299289e4..38ac1c6442 100644
--- a/website/common/locales/ja/spells.json
+++ b/website/common/locales/ja/spells.json
@@ -29,7 +29,7 @@
     "spellHealerHealText": "ヒール",
     "spellHealerHealNotes": "まばゆい光が体力を回復します！ (基準 : 体質と知能)",
     "spellHealerBrightnessText": "焼けるような輝き",
-    "spellHealerBrightnessNotes": "炸裂する光が、あなたのタスクの色を青に近づけます。(基準 : 知能 )",
+    "spellHealerBrightnessNotes": "炸裂する光が、タスクの色の赤さを軽減して青に近づけます。(基準 : 知能 )",
     "spellHealerProtectAuraText": "守りのオーラ",
     "spellHealerProtectAuraNotes": "ダメージからパーティーを守ります。パーティーの全員の体質に勢いボーナスがつきます！（ 基準：勢いなしの体質値）",
     "spellHealerHealAllText": "おまじない",
diff --git a/website/common/locales/pl/backgrounds.json b/website/common/locales/pl/backgrounds.json
index 07932bbd1a..ba165a900a 100644
--- a/website/common/locales/pl/backgrounds.json
+++ b/website/common/locales/pl/backgrounds.json
@@ -516,5 +516,213 @@
     "backgroundButterflyGardenNotes": "Impreza z zapylaczami w Ogrodzie Motyli.",
     "backgroundSucculentGardenText": "Ogród Sukulentów",
     "backgroundSucculentGardenNotes": "Napawaj się pustynnym pięknem Ogrodu Sukulentów.",
-    "backgroundAnimalCloudsText": "Zwierzęce Chmury"
+    "backgroundAnimalCloudsText": "Zwierzęce Chmury",
+    "backgroundRainyBarnyardNotes": "Idź na wilgotno-rozmokłą przechadzkę po Deszczowym Podwórzu.",
+    "backgroundStrawberryPatchNotes": "Zbieraj świeże owoce z Pola Truskawek.",
+    "backgroundVikingShipNotes": "Wyrusz w poszukiwaniu przygody na pokładzie Statku Wikingów.",
+    "backgroundSwimmingAmongJellyfishNotes": "Poczuj dreszczyk wskutek piękna i niebezpieczeństwa Pływając między Meduzami.",
+    "backgrounds082020": "SET 75: Opublikowany w sierpniu 2020",
+    "backgroundProductivityPlazaNotes": "Idź na inspirującą przechadzkę po Placu Produktywności w mieście Habit.",
+    "backgroundCrescentMoonNotes": "Śnij słodkie sny siedząc na Księżycu Rogaliku.",
+    "backgroundMysticalObservatoryNotes": "Poznaj swoje przeznaczenie zapisane w gwiazdach dzięki Mistycznemu Obserwatorium.",
+    "backgroundJungleCanopyText": "Głębia Dżungli",
+    "backgroundRiverOfLavaText": "Rzeka Lawy",
+    "backgroundCampingOutNotes": "Ciesz się przyrodą Na Kempingu.",
+    "backgroundBeachCabanaText": "Plaża Cabana",
+    "backgroundSpookyScarecrowFieldNotes": "Udowodnij odwagę większą od wróbla stawiając czoła Polu Straszliwego Stracha na Wróble.",
+    "backgroundAnimalCloudsNotes": "Poćwicz swoją wyobraźnię znajdując kształty zwierząt w chmurach.",
+    "backgroundHerdingSheepInAutumnNotes": "Wmieszaj się w Stado Owiec.",
+    "backgroundCrescentMoonText": "Księżyc Rogalik",
+    "backgroundHeatherFieldText": "Wrzosowisko",
+    "backgroundHeatherFieldNotes": "Ciesz się zapachem wrzosowiska.",
+    "backgroundRainyBarnyardText": "Deszczowe Podwórze",
+    "backgrounds052020": "SET 72: Opublikowany w maju 2020",
+    "backgroundHabitCityRooftopsText": "Dachy Miasta Habit",
+    "backgroundHabitCityRooftopsNotes": "Skacz śmiało między dachami miasta Habit.",
+    "backgroundHotAirBalloonText": "Latający Balon",
+    "backgroundHotAirBalloonNotes": "Lataj w przestworzach nad krajobrazem w latającym balonie.",
+    "backgroundStrawberryPatchText": "Pole Truskawek",
+    "backgrounds062020": "SET 73: Opublikowany w czerwcu 2020",
+    "backgroundRelaxationRiverText": "Rzeka Relaksacji",
+    "backgroundRelaxationRiverNotes": "Dryfuj sennie w dół Rzeki Relaksacji.",
+    "backgroundSaltLakeText": "Jezioro Słone",
+    "backgroundSaltLakeNotes": "Podziwiaj szkarłatne zmarszczki na powierzchni Jeziora Słonego.",
+    "backgroundVikingShipText": "Statek Wikingów",
+    "backgrounds072020": "SET 74: Opublikowany w lipcu 2020",
+    "backgroundBeachCabanaNotes": "Odpręż się w cieniu Plaży Cabana.",
+    "backgroundSwimmingAmongJellyfishText": "Pływając między Meduzami",
+    "backgroundUnderwaterRuinsText": "Podwodne Ruiny",
+    "backgroundUnderwaterRuinsNotes": "Zwiedź Podwodne Ruiny zatopione wieki temu.",
+    "backgroundCampingOutText": "Na Kempingu",
+    "backgroundJungleCanopyNotes": "Rozkoszuj się parnym przepychem Głębi Dżungli.",
+    "backgroundProductivityPlazaText": "Plac Produktywności",
+    "backgrounds092020": "SET 76: Opublikowany we wrześniu 2020",
+    "backgroundFlyingOverAnAutumnForestText": "Lot nad Jesiennym Lasem",
+    "backgroundFlyingOverAnAutumnForestNotes": "Rozkoszuj się intensywnymi kolorami poniżej w trakcie Lotu nad Jesiennym Lasem.",
+    "backgroundGiantAutumnLeafText": "Gigantyczny Liść",
+    "backgroundGiantAutumnLeafNotes": "Przysiądź na Gigantycznym Liściu nim opadnie.",
+    "backgroundHerdingSheepInAutumnText": "Stado Owiec",
+    "backgrounds102020": "SET 77: Opublikowany w październiku 2020",
+    "backgroundHauntedForestText": "Nawiedzony Las",
+    "backgroundHauntedForestNotes": "Nie zgub się w Nawiedzonym Lesie.",
+    "backgroundSpookyScarecrowFieldText": "Pole Straszliwego Stracha na Wróble",
+    "backgrounds112020": "SET 78: Opublikowany w listopadzie 2020",
+    "backgroundMysticalObservatoryText": "Mistyczne Obserwatorium",
+    "backgroundRestingInTheInnText": "Odpoczywając w Gospodzie",
+    "backgroundRestingInTheInnNotes": "Pracuj w komfortowym, bezpiecznym pokoju Odpoczywając w Gospodzie.",
+    "backgroundRiverOfLavaNotes": "Złam konwencję idąc na przechadzkę wzdłuż Rzeki Lawy.",
+    "backgrounds122020": "SET 79: Opublikowany w grudniu 2020",
+    "backgroundGingerbreadHouseText": "Chatka z Piernika",
+    "backgroundGingerbreadHouseNotes": "Napawaj się widokiem, zapachem i (jeśli się odważysz) smakiem Chatki z Piernika.",
+    "backgroundHolidayHearthText": "Świąteczne Palenisko",
+    "backgroundHolidayHearthNotes": "Odpocznij, ogrzej się i wyschnij w cieple Świątecznego Paleniska.",
+    "backgroundInsideAnOrnamentText": "Wnętrze Bombki",
+    "backgroundInsideAnOrnamentNotes": "Niech twój świąteczny nastrój świeci z Wnętrza Bombki.",
+    "backgrounds012021": "SET 80: Opublikowany w styczniu 2021",
+    "backgroundHotSpringText": "Gorące Źródło",
+    "backgroundHotSpringNotes": "Niech twoje zmartwienia rozpłyną się w Gorącym Źródle.",
+    "backgroundIcicleBridgeText": "Most Sopli",
+    "backgroundIcicleBridgeNotes": "Przejdź ostrożnie przez Most Sopli.",
+    "backgroundCottageConstructionNotes": "Pomóż lub przynajmniej nadzoruj Budowę Chatki.",
+    "backgroundFlyingOverGlacierNotes": "Zobacz zamarznięty majestat Lecąc nad Lodowcem.",
+    "backgrounds022021": "SET 81: Opublikowany w lutym 2021",
+    "backgroundSpringThawText": "Wiosenna Odwilż",
+    "backgroundInTheArmoryText": "W Zbrojowni",
+    "backgrounds032021": "SET 82: Opublikowany w marcu 2021",
+    "backgroundWintryCastleText": "Zimowy Zamek",
+    "backgrounds042021": "SET 83: Opublikowany w kwietniu 2021",
+    "backgroundWintryCastleNotes": "Dostrzeż Zimowy Zamek przez zasłonę lodowatej mgły.",
+    "backgroundFlyingOverGlacierText": "Lecąc nad Lodowcem",
+    "backgroundHeartShapedBubblesText": "Bańki w Kształcie Serca",
+    "backgroundHeartShapedBubblesNotes": "Unoś się radośnie pośród Baniek w Kształcie Serca.",
+    "backgroundThroneRoomText": "Sala Tronowa",
+    "backgroundThroneRoomNotes": "Udziel audiencji w luksusowej Sali Tronowej.",
+    "backgroundInTheArmoryNotes": "Wyposaż się w Zbrojowni.",
+    "backgroundSplashInAPuddleText": "Taplając się w Kałuży",
+    "backgroundSplashInAPuddleNotes": "Ciesz się następstwem burzy, Taplając się w Kałuży.",
+    "backgroundSpringThawNotes": "Obserwuj odejście zimy wraz z nadejściem Wiosennej Odwilży.",
+    "backgroundAmongCattailsText": "W Gętym Sitowiu",
+    "backgroundAmongCattailsNotes": "Obserwuj życie na mokradłach w Gęstym Sitowiu.",
+    "backgroundCottageConstructionText": "Budowa Chatki",
+    "backgroundElegantGardenText": "Elegancki Ogród",
+    "backgroundElegantGardenNotes": "Przejdź się zadbanymi ścieżkami Eleganckiego Ogrodu.",
+    "backgroundWindmillsText": "Wiatraki",
+    "backgroundDragonsLairNotes": "Spróbuj nie przeszkadzać mieszkańcowi Smoczego Legowiska.",
+    "backgroundGhostShipNotes": "Udowodnij historie i legendy, okrętując się na pokładzie Statku Widmo.",
+    "backgroundRopeBridgeNotes": "Zademonstruj niedowiarkom, że ten Most Linowy jest całkowicie bezpieczny.",
+    "backgroundCrypticCandlesNotes": "Wezwij tajemne moce wśród Skrytych Świec.",
+    "backgroundWinterCanyonNotes": "Znajdź przuugosę w Zimowym Kanionie!",
+    "backgroundSnowyFarmNotes": "Sprawdź, czy wszyscy są zdrowi i rozgrzani na twojej Ośnieżonej Farmie.",
+    "backgroundMeteorShowerText": "Deszcz Spadających Gwiazd",
+    "backgroundUnderwaterAmongKoiNotes": "Zachwycaj innych i siebie błyszczącymi karpiami, Pod Wodą Wśród Koi.",
+    "backgroundWaterMillNotes": "Obserwuj jak kręci się koło Młyna Wodnego.",
+    "backgroundWindmillsNotes": "Wsiądź na wierzchowca i walcz z Wiatrakami.",
+    "backgroundAutumnPoplarsNotes": "Rozkoszuj się mocnymi odcieniami brązu i złota w Jesiennym Lesie Topól.",
+    "backgrounds022022": "SET 93: Opublikowano w lutym 2022",
+    "backgroundWinterWaterfallText": "Zimowy Wodospad",
+    "backgroundWinterWaterfallNotes": "Zachwyć się Zimowym Wodospadem.",
+    "backgroundOrangeGroveText": "Pomarańczowy Gaj",
+    "backgroundOrangeGroveNotes": "Przejdź sie przez pachnący Pomarańczowy Gaj.",
+    "backgroundIridescentCloudsNotes": "Szybuj w Opalizujących Chmurach.",
+    "backgrounds032022": "SET 94: Opublikowano w marcu 2022",
+    "backgroundAnimalsDenText": "Nora Leśnego Zwierzęcia",
+    "backgroundBrickWallWithIvyText": "Ceglany Mur Porośnięty Bluszczem",
+    "backgroundBrickWallWithIvyNotes": "Podziwiaj Ceglany Mur Porośnięty Bluszczem.",
+    "backgroundFloweringPrairieText": "Kwitnąca Preria",
+    "backgroundFloweringPrairieNotes": "Brykaj po Kwitnącej Prerii.",
+    "backgrounds122021": "SET 91: Opublikowany w grudniu 2021",
+    "backgroundFrozenPolarWatersText": "Zamrożone Wody Polarne",
+    "backgroundFrozenPolarWatersNotes": "Zbadaj Zamrożone Wody Polarne.",
+    "backgroundAutumnLakeshoreText": "Jesienny Brzeg Jeziora",
+    "backgroundAutumnLakeshoreNotes": "Zatrzymaj się na Jesiennym Brzegu Jeziora by podziwiać odbicie lasu w wodzie.",
+    "backgroundUnderwaterAmongKoiText": "Pod Wodą Wśród Koi",
+    "backgroundAfternoonPicnicText": "Popołudniowy Piknik",
+    "backgroundFortuneTellersShopText": "Sklep Jasnowidza",
+    "backgroundFortuneTellersShopNotes": "Szukaj zwodliwych wskazówek co do twojej przyszłości w Sklepie Jasnowidza.",
+    "backgroundInsideAPotionBottleText": "Wewnątrz Butelki Eliksiru",
+    "backgroundInsideAPotionBottleNotes": "Spoglądaj przez szkło mając nadzieję na ratunek z Wnętrza Butelki Eliksiru.",
+    "backgroundSpiralStaircaseText": "Spiralna Klatka Schodowa",
+    "backgroundSpiralStaircaseNotes": "Wspinaj się i schodź, wkoło i wkoło Spiralną Klatką Schodową.",
+    "backgroundUndeadHandsNotes": "Spróbuj uciec od uchwytu Nieumarłych Dłoni.",
+    "backgrounds052021": "SET 84: Opublikowany w maju 2021",
+    "backgroundAfternoonPicnicNotes": "Ciesz się Popołudniowym Piknikiem samemu lub ze zwierzakiem.",
+    "backgroundDragonsLairText": "Smocze Legowisko",
+    "backgrounds062021": "SET 85: Opublikowany w czerwcu 2021",
+    "backgroundClotheslineText": "Sznur z Praniem",
+    "backgroundClotheslineNotes": "Spędź trochę czasu z ubraniami schnącymi na Sznurze z Praniem.",
+    "backgroundForestedLakeshoreText": "Zalesiony Brzeg",
+    "backgroundForestedLakeshoreNotes": "Wzbudź zazdrość wśród swojej drużyny swoim miejscem na Zalesionym Brzegu.",
+    "backgroundWaterMillText": "Młyn Wodny",
+    "backgrounds072021": "SET 86: Opublikowany w lipcu 2021",
+    "backgroundGhostShipText": "Statek Widmo",
+    "backgroundRagingRiverText": "Rwąca Rzeka",
+    "backgroundRagingRiverNotes": "Stań w gwałtownym nurcie Rwącej Rzeki.",
+    "backgrounds082021": "SET 87: Opublikowany w sierpniu 2021",
+    "backgroundStoneTowerText": "Kamienna Wieża",
+    "backgroundStoneTowerNotes": "Spoglądaj z parapetów jednej Kamiennnej Wieży na drugą.",
+    "backgroundRopeBridgeText": "Most Linowy",
+    "backgroundDaytimeMistyForestText": "Parna Puszcza",
+    "backgroundDaytimeMistyForestNotes": "Skąp się w świetle dnia padającym z góry w Parnej Puszczy.",
+    "backgrounds092021": "SET 88: Opublikowany we wrześniu 2021",
+    "backgroundVineyardText": "Winnica",
+    "backgroundVineyardNotes": "Zbadaj rozległe pola owocnej Winnicy.",
+    "backgroundAutumnPoplarsText": "Jesienny Las Topól",
+    "backgrounds102021": "SET 89: Opublikowany w październiku 2021",
+    "backgroundCrypticCandlesText": "Skryte Świece",
+    "backgroundHauntedPhotoText": "Nawiedzone zdjęcie",
+    "backgroundHauntedPhotoNotes": "Uwięźnij w monochromatycznym świecie Nawiedzonego Zdjęcia.",
+    "backgroundUndeadHandsText": "Nieumarłe Dłonie",
+    "backgrounds112021": "SET 90: Opublikowano w listopadzie 2021",
+    "backgroundWinterCanyonText": "Zimowy Kanion",
+    "backgroundIcePalaceText": "Lodowy Pałac",
+    "backgroundIcePalaceNotes": "Rządź w Zimowym Pałacu.",
+    "backgrounds012022": "SET 92: Opublikowano w styczniu 2022",
+    "backgroundMeteorShowerNotes": "Obserwuj oślepiające nocne zjawsiko, jakim jest Deszcz Spadających Gwiazd.",
+    "backgroundPalmTreeWithFairyLightsText": "Palma z Lampkami",
+    "backgroundPalmTreeWithFairyLightsNotes": "Zapozuj w pobliżu Palmy udekorowanej Lampkami.",
+    "backgroundSnowyFarmText": "Ośnieżona Farma",
+    "backgroundIridescentCloudsText": "Opalizujące Chmury",
+    "backgroundAnimalsDenNotes": "Zwiń się wygodnie w Norze Leśnego Zwierzęcia.",
+    "backgrounds042022": "SET 95: Opublikowany w kwietniu 2022",
+    "backgroundBlossomingTreesText": "Kwitnące Drzewa",
+    "backgroundBlossomingTreesNotes": "Zabaw dłużej pod Kwitnącymi Drzewami.",
+    "backgroundBioluminescentWavesText": "Bioluminescencyjne Fale",
+    "backgrounds072022": "SET 98: Opulikowany w sierpniu 2022",
+    "backgroundBioluminescentWavesNotes": "Podziwiaj blask Bioluminescencyjnych Fal.",
+    "backgroundUnderwaterCaveText": "Podwodna Jaskinia",
+    "backgroundUnderwaterCaveNotes": "Zbadaj Podwodną Jaskinię.",
+    "backgroundUnderwaterStatuesText": "Podwodny Ogród Rzeźb",
+    "backgroundUnderwaterStatuesNotes": "Spróbuj nie mrugać w Podwodnym Ogrodzie Rzeźb.",
+    "backgrounds082022": "SET 99: Opublikowany w październiku 2022",
+    "backgroundRainbowEucalyptusText": "Tęczowy Eukaliptus",
+    "backgroundRainbowEucalyptusNotes": "Podziwiaj gaj Tęczowych Eukaliptusów.",
+    "backgroundMessyRoomText": "Bałagan w Pokoju",
+    "backgroundMessyRoomNotes": "Posprzątaj Bałagan w Pokoju.",
+    "backgroundByACampfireText": "Wokół Ogniska",
+    "backgroundByACampfireNotes": "Ogrzej się w blasku siedząc Wokół Ogniska.",
+    "backgrounds052022": "SET 96: Opublikowany w maju 2022",
+    "backgroundOnACastleWallText": "Na Murach Zamku",
+    "backgroundOnACastleWallNotes": "Obserwuj widoki z Murów Zamku.",
+    "backgroundCastleGateText": "Brama Zamkowa",
+    "backgroundCastleGateNotes": "Stań na straży w Bramie Zamkowej.",
+    "backgroundEnchantedMusicRoomText": "Zaklęty Pokój Muzyczny",
+    "backgroundEnchantedMusicRoomNotes": "Zagraj w Zaklętym Pokoju Muzycznym.",
+    "backgrounds092022": "SET 100: Opublikowany we wrześniu 2022",
+    "backgroundTheatreStageText": "Scena Teatralna",
+    "backgroundTheatreStageNotes": "Wystąp na Teatralnej Scenie.",
+    "backgroundAutumnPicnicText": "Jesienny Piknik",
+    "backgroundAutumnPicnicNotes": "Ciesz się Jesiennym Piknikiem.",
+    "backgroundOldPhotoText": "Stare Zdjęcie",
+    "backgroundOldPhotoNotes": "Zapozuj do Starego Zdjęcia.",
+    "backgrounds062022": "SET 97: Opublikowany w czerwcu 2022",
+    "backgroundBeachWithDunesText": "Plaża z Wydmami",
+    "backgroundBeachWithDunesNotes": "Odkryj sekrety Plaży z Wydmami.",
+    "backgroundMountainWaterfallText": "Górski Wodospad",
+    "backgroundMountainWaterfallNotes": "Podziwiaj Górski Wodospad.",
+    "backgroundSailboatAtSunsetText": "Żaglowiec o Zachodzie Słońca",
+    "backgroundSailboatAtSunsetNotes": "Ciesz się pięknem Żaglowca o Zachodzie Słońca.",
+    "backgroundFlowerShopText": "Kwiaciarnia",
+    "backgroundFlowerShopNotes": "Ciesz się słodkim zapachem Kwiaciarni.",
+    "backgroundSpringtimeLakeText": "Wiosenne Jezioro",
+    "backgroundSpringtimeLakeNotes": "Napawaj się widokami z brzegów Wiosennego Jeziora."
 }
diff --git a/website/common/locales/pl/communityguidelines.json b/website/common/locales/pl/communityguidelines.json
index 505cecb56f..b2c7ecd877 100644
--- a/website/common/locales/pl/communityguidelines.json
+++ b/website/common/locales/pl/communityguidelines.json
@@ -1,27 +1,26 @@
 {
-
     "tavernCommunityGuidelinesPlaceholder": "Życzliwe przypomnienie: to czat dla ludzi w każdym wieku, więc uważaj na język oraz treść swoich wypowiedzi! Jeśli masz jakieś pytania, zajrzyj do Regulaminu społeczności dostępnego na pasku bocznym.",
     "lastUpdated": "Ostatnio zaktualizowano:",
     "commGuideHeadingWelcome": "Witamy w Habitice!",
     "commGuidePara001": "Czołem, łowco przygód! Witamy w Habitice, krainie produktywności i zdrowego życia (a także pewnego rozbrykanego gryfa). Mamy tu radosną społeczność pełną pomocnych ludzi, którzy wspierają się nawzajem na drodze do rozwoju osobistego. Chcesz do nas dołączyć i nie wiesz jak się dopasować? Wystarczy, że będziesz mieć pozytywne nastawienie, szacunek do innych, oraz będziesz pamiętać, że każdy z nas ma inne umiejętności, ale też ograniczenia – także Ty! Członkowie Habitiki są cierpliwi dla siebie nawzajem oraz starają się sobie pomagać jak tylko mogą.",
     "commGuidePara002": "By utrzymać społeczność w atmosferze bezpieczeństwa, radości i produktywności, mamy kilka wskazówek. Sporządziliśmy je z rozwagą, by były tak przyjazne i łatwe w rozumieniu, jak to tylko możliwe. Prosimy o poświęcenie czasu na ich przeczytanie przed rozpoczęciem pogawędek.",
-    "commGuidePara003": "Te zasady stosuje się do wszystkich przestrzeni społecznych, których używamy, łącznie z (ale nie tylko) Trello, GitHubem, Weblatem i Wikią (inaczej wiki). Czasem zdarzają się nieprzewidziane sytuacje, na przykład konflikt uknuty przez złośliwego nekromantę. Kiedy tak się dzieje, moderatorzy mogą zareagować przez modyfikację zasad, by ochronić społeczność przed nowymi zagrożeniami. Nie martwcie się: jeśli coś się w nich zmieni, powiadomi was o tym Bailey.",
+    "commGuidePara003": "Te zasady stosuje się do wszystkich przestrzeni społecznych, których używamy, łącznie z (ale nie tylko) Trello, GitHubem, Weblatem i Habitica Wikią na Fandom. Ponieważ społeczności rosną i zmieniają się, ich reguły ulegają czasem zmianie. Kiedy pojawiają się istotne zmiany w tych zasadach, powiadomi was o tym Bailey i/lub zobaczycie to na naszych kontach społecznościowych!",
     "commGuideHeadingInteractions": "Interakcje w Habitice",
-    "commGuidePara015": "Habitica ma dwa rodzaje przestrzeni społecznych: publiczne i prywatne. Publicznymi są: Karczma, gildie publiczne, GitHub, Trello i Wiki. Prywatnymi natomiast są: gildie prywatne, czat drużyny i skrzynki prywatnych wiadomości. Wszystkie nazwy graczy muszą spełniać zasady przestrzeni publicznej. Aby zmienić swoją nazwę gracza, przejdź do Użytkownik → Profil i wybierz opcję „Edytuj”.",
-    "commGuidePara016": "Odwiedzając strefy publiczne na Habitice, należy pamiętać o ogólnych zasadach, które pomagają w utrzymaniu bezpieczeństwa i zadowolenia. Zachowanie ich powinno być łatwe dla takiego poszukiwacza przygód jak ty!",
-    "commGuideList02A": "<strong>Szanujcie się nawzajem.</strong> Bądźcie uprzejmi, mili, przyjaźni i pomocni. Pamiętajcie: Habitanie pochodzą z różnorodnych środowisk i mają bardzo odmienne doświadczenia. To część tego, co czyni Habitikę tak wspaniałą! Tworzenie społeczności oznacza respektowanie i celebrowanie tak różnic jak i podobieństw. Oto kilka prostych sposobów na okazywanie szacunku wobec innych:",
-    "commGuideList02B": "<strong>Przestrzegaj wszystkich <a href='/static/terms' target='_blank'>Zasad Użytkowania</a></strong>.",
-    "commGuideList02C": "<strong>Nie zamieszczajcie obrazków ani tekstów pełnych przemocy, przerażających, pornograficznych lub o podtekście seksualnym, promujących dyskryminację, nietolerancję, rasizm, seksizm, nienawiść, dręczenie czy krzywdzenie osoby lub grupy</strong>. Nawet w formie żartu. Powyższe dotyczy także wulgaryzmów i wszelkich obraźliwych wypowiedzi. Nie wszyscy mają takie samo poczucie humoru, więc coś, co Wy uznajecie za dowcip, kogoś innego może urazić. Atakujcie swoje Codzienne zadania, nie siebie nawzajem.",
-    "commGuideList02D": "<strong>Utrzymujcie dyskusję na poziomie przyzwoitym dla osób w każdym wieku</strong>. Wielu młodych Habitanów korzysta z tej strony! Nie demoralizujcie niewinnych i nie utrudniajcie wypełniania postanowień innym Habitanom.",
-    "commGuideList02E": "<strong>Unikajcie przekleństw. Ta zasada dotyczy również zwrotów o konotacjach religijnych, które gdzie indziej mogłyby być akceptowalne</strong> - mamy wśród nas ludzi różnego wyznania i pochodzenia, a chcemy mieć pewność, że wszyscy czują się komfortowo w strefach publicznych. <strong>Jeśli moderator lub członek zespołu mówi ci, że jakieś wyrażenie jest zabronione na Habitice, to nawet jeśli nie uważasz, że było ono problematyczne, decyzja jest ostateczna.</strong> Ponadto wulgaryzmy będą surowo piętnowane, ponieważ naruszają też Zasady Użytkowania.",
-    "commGuideList02F": "<strong>Unikajcie rozległych dyskusji na tematy prowokujące do niezgody i podziałów, zarówno w Karczmie, jak i innych miejscach, gdzie byłoby to niezgodne z tematem</strong>. Jeśli zobaczysz, że ktoś powiedział coś wulgarnego lub krzywdzącego, nie zaczynaj z nim sporu. Kiedy ktoś powiedział coś krzywdzącego wobec Ciebie, ale zgodnego z zasadami społeczności, możesz uprzejmie uświadomić tę osobę, że Cię to uraziło. Jeśli zaś zobaczysz, że ktoś pisze rzeczy zabronione w zasadach społeczności i Zasadach Użytkowania, możesz to oflagować, by zareagował moderator. Jeśli nie masz pewności, co zrobić, oflaguj dany post.",
-    "commGuideList02G": "<strong>Stosujcie się do zaleceń Moderatorów</strong>. Mogą to być prośby o: ograniczenie postowania w danym miejscu, edycję profilu w celu usunięcia niepożądanej zawartości, przeniesienie dyskusji do miejsca, w którym będzie ona bardziej adekwatna itd.",
-    "commGuideList02J": "<strong>Nie spamuj</strong> Spamowanie może obejmować między innymi: publikowanie tego samego komentarza lub pytania w wielu miejscach, publikowanie linków bez wyjaśnienia lub kontekstu, publikowanie bezsensownych wpisów, publikowanie wielu wiadomości o Gildii, Drużynie lub Wyzwaniu, publikowanie wielu wiadomości z rzędu. Prośby o klejnoty czy subskrypcje gdziekolwiek na czatach czy w prywatnych wiadomościach są również traktowane jako spamowanie. Jeżeli kliknięcie w publikowany link przynosi Ci jakąkolwiek korzyść, musisz ujawnić to w wiadomości, inaczej zostanie to uznane za spam.<br/><br/>To od moderatorów zależy, czy coś zostanie uznane za spam lub może prowadzić do spamu, nawet wtedy, jeżeli nie odczuwasz, że to może być spam. Przykładowo, reklamowanie gildii jest akceptowalne raz czy dwa, ale wielokrotne takie wpisy w jednym dniu prawdopodobnie byłyby uznane za spam, bez względu na to, jak użyteczna jest reklamowana gildia!",
+    "commGuidePara015": "Habitica ma dwa rodzaje przestrzeni społecznych: publiczne i prywatne. Publicznymi są: Karczma, gildie publiczne, GitHub, Trello i Wiki. Prywatnymi natomiast są: gildie prywatne, czat drużyny i skrzynki prywatnych wiadomości. Wszystkie nazwy graczy i @nazwyużytkowników muszą spełniać zasady przestrzeni publicznej. Aby zmienić swoją nazwę gracza i/lub @nazwęużytkownika, na urządzeniu mobilnym przejdź do Menu > Ustawienia > Profil. W przeglądarce przejdź do Użytkownik > Ustawienia.",
+    "commGuidePara016": "Odwiedzając strefy publiczne na Habitica, należy pamiętać o ogólnych zasadach, które pomagają w utrzymaniu bezpieczeństwa i zadowolenia.",
+    "commGuideList02A": "<strong>Szanujcie się nawzajem.</strong> Bądźcie uprzejmi, mili, przyjaźni i pomocni. Pamiętajcie: Habitanie pochodzą z różnorodnych środowisk i mają bardzo odmienne doświadczenia. To część tego, co czyni Habitikę tak wspaniałą! Tworzenie społeczności oznacza respektowanie i celebrowanie tak różnic jak i podobieństw.",
+    "commGuideList02B": "<strong>Przestrzegaj wszystkich <a href='/static/terms' target='_blank'>Zasad Użytkowania</a></strong> zarówno w publicznych jak i w prywatnych przestrzeniach.",
+    "commGuideList02C": "<strong>Nie zamieszczajcie obrazków ani tekstów pełnych przemocy, przerażających, pornograficznych lub o podtekście seksualnym, promujących dyskryminację, nietolerancję, rasizm, seksizm, nienawiść, dręczenie czy krzywdzenie osoby lub grupy</strong>. Nawet w formie żartu albo memu. Powyższe dotyczy także wulgaryzmów i wszelkich obraźliwych wypowiedzi. Nie wszyscy mają takie samo poczucie humoru, więc coś, co Wy uznajecie za dowcip, kogoś innego może urazić.",
+    "commGuideList02D": "<strong>Utrzymujcie dyskusję na poziomie przyzwoitym dla osób w każdym wieku</strong>. To oznacza unikanie tematów dla dorosłych w przestrzeniach publicznych. Mamy wielu młodych Habitanów, którzy korzystają z tej strony, a ludzie pochodzą z różnych środowisk. Chcemy, aby nasza społeczność była tak komfortowa i inkluzywna jak to możliwe.",
+    "commGuideList02E": "<strong>Unikajcie przekleństw. Ta zasada dotyczy również zwrotów o konotacjach religijnych, które gdzie indziej mogłyby być akceptowalne oraz skrócone lub częściowo ocenzurowane wulgaryzmy.</strong> Mamy wśród nas ludzi różnego wyznania i pochodzenia, a chcemy mieć pewność, że wszyscy czują się komfortowo w strefach publicznych. <strong>Jeśli moderator lub członek zespołu mówi ci, że jakieś wyrażenie jest zabronione na Habitica, to nawet jeśli nie uważasz, że było ono problematyczne, decyzja jest ostateczna. </strong> Ponadto wulgaryzmy będą surowo piętnowane, ponieważ naruszają też Zasady Użytkowania.",
+    "commGuideList02F": "Unikajcie rozległych dyskusji na tematy prowokujące do niezgody i podziałów, zarówno w Karczmie, jak i innych miejscach, gdzie byłoby to niezgodne z tematem. Jeżeli ktoś powiedział coś krzywdzącego wobec Ciebie, ale zgodnego z zasadami społeczności, możesz uprzejmie uświadomić tę osobę, że Cię to uraziło. Jeśli ktoś powie Ci, że poczuł się przez Twoje słowa niekomfortowo, zastanów się nad tym zamiast odpowiadać pod wpływem emocji. Ale jeśli zauważysz, że rozmowa zaczyna zmieniać się w kłótnię, staje się zbyt emocjonalna lub krzywdząca, <strong>przestań się w nią angażować. Zamiast tego, zawiadom moderatorów o tym co się dzieje. </strong> Moderatorzy odpowiedzą tak szybko, jak to możliwe. Możesz także wysłać maila na <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> wraz ze zdjęciami czatu, jeśli uważasz, że będą one pomocne.",
+    "commGuideList02G": "<strong>Stosujcie się do zaleceń Moderatorów.</strong> Mogą to być prośby o: ograniczenie postowania w danym miejscu, edycję profilu w celu usunięcia niepożądanej zawartości, przeniesienie dyskusji do miejsca, w którym będzie ona bardziej adekwatna itd. Nie kłóć się z moderatorami. Jeśli masz obawy lub uwagi co do moderacji, wyślij maila<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> aby skontaktować się z osobą odpowiedzialną za naszą społeczność.",
+    "commGuideList02J": "<strong>Nie spamuj</strong> Spamowanie może obejmować między innymi: publikowanie tego samego komentarza lub pytania w wielu miejscach, <strong>publikowanie linków bez wyjaśnienia lub kontekstu,</strong> publikowanie bezsensownych wpisów, publikowanie wielu wiadomości o Gildii, Drużynie lub Wyzwaniu, publikowanie wielu wiadomości z rzędu. Jeżeli kliknięcie w publikowany link przynosi Ci jakąkolwiek korzyść, musisz ujawnić to w wiadomości, inaczej zostanie to uznane za spam. To od moderatorów zależy, co zostanie uznane za spam.",
     "commGuideList02K": "<strong>Unikaj używania dużych nagłówków w tekście na publicznych czatach, w szczególności w Karczmie</strong>. Podobnie jak WIELKIE LITERY, wygląda to jakbyś krzyczał i zakłóca przyjazną atmosferę.",
-    "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.",
+    "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, lub 2) wysyłając maila na <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</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 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.",
+    "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ę płatną zawartością portalu.",
+    "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 przez wysłanie maila na“<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</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 …",
@@ -32,8 +31,8 @@
     "commGuidePara029": "<strong>Gildie publiczne są bardzo podobne do Tawerny, z tym wyjątkiem, że są ukierunkowane na konkretne tematy, zamiast skupiać się na ogólnych rozmowach</strong>. Czast gildii publicznej powinien się koncentrować na tym temacie. Przykładowo, członkowie gildii Słowotwórców mogą się zdenerwować, jeśli nagle rozmowa skoncentruje się na ogrodnictwie zamiast pisaniu, a gildia Hodowców Smoków może nie być zainteresowana rozszyfrowywaniem starożytnych run. Niektóre gildie są bardziej luźne niż inne, ale generalnie <strong>lepiej skupiać się na głównym temacie</strong>!",
     "commGuidePara031": "Niektóre publiczne gildie będą zawierały drażliwe tematy jak depresja, religia, polityka, itd. Jest to oczywiście w porządku, o ile prowadzone tam rozmowy nie naruszają żadnego Regulaminu lub Reguł Przestrzeni Publicznej i dopóki skupiają się na głównym temacie.",
     "commGuidePara033": "<strong>Gildie publiczne NIE mogą zawierać treści dla dorosłych (18+). Jeśli planują regularnie omawiać wrażliwe treści, powinni wyraźnie określić to w opisie gildii</strong>. Dzięki temu Habitica będzie bezpieczna i wygodna dla wszystkich.",
-    "commGuidePara035": "<strong>Jeśli gildia omawia różne delikatne kwestie, dla poszanowania społeczności należy rozważyć umieszczenie ostrzeżenia przed treścią komentarza (np. \"Uwaga: dyskusja na temat autoagresji\")</strong>. Można to opisać jako ostrzeżenia wyzwalające i/lub uwagi do treści, a gildie mogą również mieć własne zasady oprócz wskazanych tutaj. Jeśli to możliwe, używaj <a href='http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>formatowania</a> żeby ukrywać potencjalnie wrażliwą treść w kolejnych liniach, tak, aby ci, którzy nie mają ochoty na czytanie takich treści mogli przewijać wpisy bez oglądania ukrywanej treści. Personel Habitica i moderatorzy mogą równocześnie usuwać takie materiały według swojego uznania.",
-    "commGuidePara036": "Ponadto, wrażliwe materiały powinny być tematyczne -- wspominanie o autoagresji w Gildii skupiającej się na walce z depresją może mieć sens, ale prawdopodobnie jest mniej odpowiednie w gildii muzycznej. Jeśli zauważysz osobę wielokrotnie naruszającą niniejsze wytyczne, zwłaszcza po kilku zgłoszeniach, zgłoś wpis i powiadom moderatorów poprzez <a href='https://contact.habitica.com/' target='_blank'>Formularz Kontaktu z Moderatorem</a>.",
+    "commGuidePara035": "<strong>Jeśli gildia omawia różne delikatne kwestie, dla poszanowania społeczności należy rozważyć umieszczenie ostrzeżenia przed treścią komentarza (np. \"Uwaga: dyskusja na temat autoagresji\")</strong>. Można to opisać jako ostrzeżenia wyzwalające i/lub uwagi do treści, a gildie mogą również mieć własne zasady oprócz wskazanych tutaj. Jeśli to możliwe, używaj <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>formatowania</a> żeby ukrywać potencjalnie wrażliwą treść w kolejnych liniach, tak, aby ci, którzy nie mają ochoty na czytanie takich treści mogli przewijać wpisy bez oglądania ukrywanej treści. Personel Habitica i moderatorzy mogą równocześnie usuwać takie materiały według swojego uznania.",
+    "commGuidePara036": "Ponadto, wrażliwe materiały powinny być tematyczne -- wspominanie o autoagresji w Gildii skupiającej się na walce z depresją może mieć sens, ale prawdopodobnie jest mniej odpowiednie w gildii muzycznej. Jeśli zauważysz osobę wielokrotnie naruszającą niniejsze wytyczne, zwłaszcza po kilku zgłoszeniach, zgłoś wpisy.",
     "commGuidePara037": "<strong>Nie powinno się tworzyć jakichkolwiek gildii, czy to Publicznych, czy Prywatnych, w celu atakowania jakiejkolwiek grupy lub osoby!</strong>. Utworzenie takiej gildii jest podstawą do natychmiastowego zablokowania. Walcz ze złymi nawykami, a nie poszukiwaczami przygód!",
     "commGuidePara038": "<strong>Wszystkie wyzwania Tawerny i gildii publicznych także muszą być zgodne z tymi zasadami</strong>.",
     "commGuideHeadingInfractionsEtc": "Naruszenie zasad, Konsekwencje i Powrót do łask",
@@ -46,7 +45,7 @@
     "commGuideList05A": "Naruszenie Zasad Użytkowania",
     "commGuideList05B": "Mowa/obrazy nienawiści, napastowanie/nękanie, cyber-przemoc, kłótnie i trolling",
     "commGuideList05C": "Naruszenie Okresu Próbnego",
-    "commGuideList05D": "Podszywanie się pod personel lub moderatorów",
+    "commGuideList05D": "Podszywanie się pod personel lub moderatorów - również mówienie, że przestrzenie stworzone przez użytkowników, nie stowarzyszone z Habitica są oficjalne i/lub moderwoane przez Habitica lub jej Moderatorów/personel",
     "commGuideList05E": "Powtarzające się średnie wykroczenia",
     "commGuideList05F": "Tworzenie duplikatu konta, aby uniknąć konsekwencji (dla przykładu, tworzenie nowego konta, aby pisać na czacie po otrzymaniu nań blokady)",
     "commGuideList05G": "Celowe wprowadzanie w błąd załogi i moderatorów w celu uniknięcia konsekwencji lub sprawienia kłopotu innym graczom",
@@ -62,23 +61,23 @@
     "commGuidePara056": "Drobne naruszenia zasad pociągają za sobą drobne sankcje. Jednak jeśli niewielkie kary w przypadku danej osoby nie skutkują, konsekwencje mogą się dla niej z czasem zaostrzyć.",
     "commGuidePara057": "Oto przykłady drobnych wykroczeń. To nie jest kompletna lista.",
     "commGuideList07A": "Pierwsze złamanie Zasad Przestrzeni Publicznej",
-    "commGuideList07B": "Wszelkie oświadczenia lub działania, które wywołują \"Proszę, Nie...\". W sytuacji, gdy moderator musi powiedzieć do użytkownika \"Proszę nie rób tego\", jest to zaliczane jako bardzo niewielkie wykroczenie tego użytkownika. Jako przykład może posłużyć wypowiedź: \"Proszę, nie kłóć się o ten pomysł na funkcjonalność, skoro tyle razy tłumaczyliśmy Ci, że to jest niemożliwe.\" W wielu przypadkach \"Proszę, Nie\" ma niewielkie konsekwencje, ale jeśli moderatorzy będą zmuszeni do wielokrotnego zwracania uwagi temu samemu użytkownikowi, spowoduje to, że wszystkie te drobne naruszenia zaczną liczyć się jako umiarkowane naruszenia.",
+    "commGuideList07B": "Wszelkie oświadczenia lub działania, które wywołują \"Proszę, Nie...\" ze strony Moderatorów. W sytuacji, gdy jesteś proszony o zaprzestanie jakiegoś działania w przestrzeniach publicznych, może to być jedyna konsekwencja. Jeśli Moderatorzy będą zmuszeni do wielokrotnego zwracania uwagi temu samemu użytkownikowi, może to być zaliczane jako większe naruszenie",
     "commGuidePara057A": "Niektóre wpisy mogą być ukryte, ze względu na wrażliwe treści lub mogące nasuwać ludziom złe pomysły. Zazwyczaj nie jest to zaliczane jako naruszenie, zwłaszcza za pierwszym razem!",
     "commGuideHeadingConsequences": "Konsekwencje",
-    "commGuidePara058": "W Habitice -- jak w prawdziwym życiu życiu -- każda akcja ma swoje konsekwencje, czy to nabranie kondycji poprzez bieganie, dostanie próchnicy przez nadmiar cukru, czy przejście do następnej klasy, bo się uczyło.",
+    "commGuidePara058": "W Habitica -- jak w prawdziwym życiu -- każda akcja ma swoje konsekwencje, czy to nabranie kondycji poprzez bieganie, dostanie próchnicy przez nadmiar cukru, czy przejście do następnej klasy, bo się uczyło.",
     "commGuidePara059": "<strong>Podobnie, za wykroczenia ponosi się konsekwencje.</strong> Przykładowe znajdują się poniżej.",
     "commGuidePara060": "<strong>Jeśli twoje wykroczenie ma średnie lub poważne konsekwencje, otrzymasz od zespołu lub moderatora forum, w którym wystąpiło naruszenie wiadomość wyjaśniającą</strong>:",
     "commGuideList08A": "co było twoim wykroczeniem",
     "commGuideList08B": "co jest konsekwencją",
     "commGuideList08C": "co zrobić, by naprawić sytuację i odzyskać swój status, jeśli to możliwe.",
     "commGuidePara060A": "Jeśli będzie taka potrzeba, otrzymasz Prywatną Wiadomość lub e-mail, jak również wpis na forum, w którym wystąpiło naruszenie. W niektórych przypadkach, możesz nie zostać skarcony publicznie.",
-    "commGuidePara060B": "Jeśli Twoje konto zostaje zbanowane (za ciężkie wykroczenie), nie będziesz mógł się zalogować do Habitica, a podczas próby logowania otrzymasz otrzymasz wiadomość o błędzie. <strong>Jeśli chcesz przeprosić lub poprosić o przywrócenie, napisz wiadomość e-mail na adres <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> wraz ze swoim UUID</strong> (będzie podany w wiadomości o błędzie). To w <strong>twojej</strong> gestii jest wyciągnięcie ręki, kiedy chcesz pogodzenia lub przywrócenia.",
+    "commGuidePara060B": "Jeśli Twoje konto zostaje zbanowane (za ciężkie wykroczenie), nie będziesz mógł się zalogować do Habitica, a podczas próby logowania otrzymasz wiadomość o błędzie. <strong>Jeśli chcesz przeprosić lub poprosić o przywrócenie, napisz wiadomość e-mail na adres <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> wraz ze swoim ID Użytkownika</strong> (będzie onpodany w wiadomości o błędzie). To w <strong>twojej</strong> gestii jest wyciągnięcie ręki, kiedy chcesz pogodzenia lub przywrócenia.",
     "commGuideHeadingSevereConsequences": "Przykłady Poważnych Konsekwencji",
     "commGuideList09A": "Zablokowanie konta (spójrz powyżej)",
     "commGuideList09C": "Permanentne uniemożliwienie zwiększenia (\"zamrożenie\") Rangi Pomocnika",
     "commGuideHeadingModerateConsequences": "Przykłady Średnich Konsekwencji",
     "commGuideList10A": "Ograniczenie przywilejów w chatach prywatnych i/lub publicznych",
-    "commGuideList10A1": "Jeśli twoje działania spowodują unieważnienie twojego dostępu do czatu Moderator lub członek personelu wyśle do Ciebie wiadomość i / lub opublikuje na forum, na którym zostałeś wyciszony, aby powiadomić Cię o przyczynie twojego wyciszenia i czasie, przez który będziesz wyciszony. Po upływie tego czasu otrzymasz zwrot dostępu do czatu, pod warunkiem, że wyrazisz chęć poprawy zachowania, z powodu którego zostałeś wyciszony i będziesz przestrzegać Wytycznych dla Społeczności.",
+    "commGuideList10A1": "Jeśli twoje działania spowodują unieważnienie twojego dostępu do czatu Moderator lub członek personelu wyśle do Ciebie wiadomość i / lub opublikuje na forum, na którym zostałeś wyciszony, aby powiadomić Cię o przyczynie twojego wyciszenia i czasie, przez który będziesz wyciszony i/lub co musisz zrobić, aby dostać zwrot dostępu. Otrzymasz zwrot dostępu do czatu, pod warunkiem, że uprzejmie zastosujesz się do zaleceń i będziesz przestrzegać Wytycznych dla Społeczności oraz Warunków Użytkowania",
     "commGuideList10C": "Ograniczenie przywilejów tworzenia Gildii/Wyzwań",
     "commGuideList10D": "Tymczasowe uniemożliwienie zwiększenia (\"zamrożenie\") Rangi Pomocnika",
     "commGuideList10E": "Zmniejszenie Rangi Użytkownika",
@@ -96,29 +95,39 @@
     "commGuideHeadingMeet": "Poznaj Zespół i Modów!",
     "commGuidePara006": "Habitica ma w swoich szeregach niezmordowanych rycerzy-pomocników, którzy łączą siły z personelem, by utrzymać społeczność w spokoju, zadowoleniu i wolności od trolli. Każdy z nich ma swój sektor, ale czasem mogą zostać wezwani, by służyć w innych obszarach społeczności.",
     "commGuidePara007": "Personel ma fioletowe tagi z koroną. Ich tytuł to \"Heroiczny\".",
-    "commGuidePara008": "Moderatorzy mają granatowe tagi z gwiazdkami. Ich tytułem jest \"Strażnik\". Jedynym wyjątkiem jest Bailey, która, jako NPC, ma czarno-zielony tag z gwiazdką.",
+    "commGuidePara008": "Moderatorzy mają granatowe tagi z gwiazdkami. Ich tytułem jest \"Strażnik\".",
     "commGuidePara009": "Obecni członkowie Personelu to (od lewej do prawej):",
     "commGuideAKA": "<%= habitName %> czyli <%= realName %>",
     "commGuideOnTrello": "<%= trelloName %> na Trello",
     "commGuideOnGitHub": "<%= gitHubName %> na GitHubie",
     "commGuidePara010": "Jest też kilku Moderatorów, którzy pomagają personelowi. Zostali starannie wybrani, więc prosimy, szanuj ich i słuchaj tego, co mówią.",
     "commGuidePara011": "Obecnie Moderatorami są (od lewej do prawej):",
-    "commGuidePara011b": "na GitHub/Wikia",
-    "commGuidePara011c": "na Wikia",
+    "commGuidePara011b": "na GitHub/Fandom",
+    "commGuidePara011c": "na Wiki",
     "commGuidePara011d": "na GitHub",
     "commGuidePara012": "Jeśli masz wątpliwość lub zastrzeżenie wobec któregoś Moda, wyślij maila do obsługi (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
     "commGuidePara013": "W społeczności tak dużej jak Habitica, użytkownicy przychodzą i odchodzą, a czasem nawet członek załogi czy moderator musi odwiesić swój szlachecki płaszcz i odpocząć. Tych drugich nazywamy Załogą i Moderatoratorami Na Emeryturze. Nie mają już uprawnień Moderatorów, ale wciąż doceniamy ich ciężką pracę!",
     "commGuidePara014": "Emerytowany Personel i Emerytowani Moderatorzy:",
     "commGuideHeadingFinal": "Ostatni Rozdział",
-    "commGuidePara067": "To by było na tyle, odważni Habitanie, jeśli chodzi o regulamin społeczności! Otrzyj pot ze swego czoła i przyznaj sobie nieco PD za przeczytanie tego w całości. Jeśli masz jakieś wątpliwości czy zastrzeżenia na temat tego regulaminu społeczności, skontaktuj się z nami poprzez <a href='https://contact.habitica.com/' target='_blank'>Formularz kontaktu z moderatorami</a>, chętnie wyjaśnimy wątpliwości.",
+    "commGuidePara067": "To by było na tyle, odważni Habitanie, jeśli chodzi o regulamin społeczności! Otrzyj pot ze swego czoła i przyznaj sobie nieco PD za przeczytanie tego w całości. Jeśli masz jakieś wątpliwości czy zastrzeżenia na temat tego regulaminu społeczności, skontaktuj się z nami poprzez <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, chętnie wyjaśnimy wątpliwości.",
     "commGuidePara068": "A teraz naprzód, dzielni poszukiwacze przygód, zgładźcie kilka Codziennych!",
     "commGuideHeadingLinks": "Użyteczne linki",
     "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Pomoc Habitiki: Zadaj pytanie</a>: Gildia, w której możesz zadawać pytania!",
-    "commGuideLink02": "<a href='http://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>The Wiki</a>: największy zbiór informacji na temat Habitiki.",
-    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: zgłoś błędy lub pomóż z kodem!",
+    "commGuideLink02": "<a href='https://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>The Wiki</a>: największy zbiór informacji na temat Habitiki.",
+    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: pomóż z kodem!",
     "commGuideLink04": "<a href='https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link' target='_blank'>Formularz Zwrotny</a>: do zgłaszania propozycji funkcjonalności dla strony i aplikacji.",
     "commGuideLink05": "<a href='https://trello.com/b/mXK3Eavg/' target='_blank'>Mobilne Trello</a>: zapotrzebowanie na elementy aplikacji mobilnych.",
     "commGuideLink06": "<a href='https://trello.com/b/vwuE9fbO/' target='_blank'>Artystyczne Trello</a>: do przesyłania pixel artów.",
     "commGuideLink07": "<a href='https://trello.com/b/nnv4QIRX/' target='_blank'>Quest Trello</a>: do przesyłania opisów misji.",
-    "commGuidePara069": "Poniżsi utalentowani artyści przyczynili się do tych ilustracji:"
+    "commGuidePara069": "Poniżsi utalentowani artyści przyczynili się do tych ilustracji:",
+    "commGuideList01A": "Zasady i warunki obowiązują we wszystkich przestrzeniach, między innymi prywatnych gildiach, czacie drużyny i wiadomościach.",
+    "commGuidePara017": "Tutaj jest krótka wersja, ale zachęcamy cię do przeczytania bardziej szczegółowej wersji poniżej:",
+    "commGuideList01C": "Wszystkie dyskusje muszą być dostosowane do osób w każdym wieku i wolne od wulgaryzmów.",
+    "commGuideList01E": "Nie rozpoczynaj ani nie angażuj się w spory i kontrowersyjne dyskusje w Tawernie.",
+    "commGuideList02M": "Nie proś ani nie żebraj o kryształy, subskrypcje ani członkostwo w planach grupowych. Jest to zabronione w Karczmie, publicznych i prywatnych czatach i prywatnych wiadomościach. Jeśli otrzymasz wiadomości z prośbą o płatne przedmioty, proszę oflaguj je, aby zgłosić je moderatorom. Powtarzające się lub silne żebranie o kryształy lub subskrypcje, zwłaszcza po ostrzeżeniu, mogą spowodować zbanowanie konta.",
+    "commGuideList09D": "Odebranie lub zdegradowanie Stopnia Współpracy",
+    "commGuideList01F": "Żebranie o płatne przedmioty, spamowanie oraz pisanie dużą czcionką/wielkimi literami jest zabronione.",
+    "commGuideList01D": "Prosimy o stosowanie się do zaleceń moderatorów.",
+    "commGuideList01B": "Zabronione: Komunikacjaw agresywna, groźby, dyskryminacja itp., między innymi memy, obrazy i żarty.",
+    "commGuideList05H": "Silne lub powtarzające się próby oszustwa lub nacisku na innych graczy, w celu zdobycia płatnych przedmiotów"
 }
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index d884cbc8f3..67359bebd5 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -1764,7 +1764,7 @@
     "shieldMystery201902Notes": "Este papel brilhante forma corações mágicos que vagueiam lentamente e dançam no ar. Não confere nenhum benefício. Item de Assinantes, Fevereiro de 2019.",
     "shieldArmoireMightyPizzaText": "Pizza Poderosa",
     "shieldArmoireMightyPizzaNotes": "Claro, é um escudo muito bom, mas nós sugerimos fortemente que você coma essa ótima, ótima pizza. Aumenta a Percepção em <%= per %>. Armário Encantado: Conjunto do Chef (Item 4 de 4).",
-    "eyewearMystery201902Text": "Macara enigmática do crush",
+    "eyewearMystery201902Text": "Máscara Crush Enigmático",
     "eyewearMystery201902Notes": "Esta máscara misteriosa esconde a sua identidade, mas não o seu sorriso vencedor. Não confere nenhum benefício. Fevereiro de 2019 Item de Assinante.",
     "weaponSpecialSpring2019RogueText": "Relâmpago",
     "weaponSpecialSpring2019RogueNotes": "Essas armas contém o poder do céu e da chuva. Nós recomendamos que você não use-as quando estiver imerso na água. Aumente a Força em <%= str %>. Equipamento de Edição Limitada Primavera de 2019.",
@@ -2726,5 +2726,9 @@
     "headSpecialFall2022MageNotes": "Encante e atraia outros para perto com esta máscara mágica de donzela. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada do Outono de 2022.",
     "shieldSpecialFall2022WarriorNotes": "RAWR ou TRAVESSURAS! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada do Outono de 2022.",
     "armorSpecialFall2022HealerText": "Extravagância da Casca do Observador",
-    "armorSpecialFall2022HealerNotes": "Quantas observações pode um Observador observar? Se um Observador pudesse observar o observável? Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada do Outono de 2022."
+    "armorSpecialFall2022HealerNotes": "Quantas observações pode um Observador observar? Se um Observador pudesse observar o observável? Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada do Outono de 2022.",
+    "armorMystery202210Text": "Armadura Serpente Sinistra",
+    "armorMystery202210Notes": "Tente deslizar pra variar, talvez você encontre um novo modo de transporte! Não confere benefícios. Item de Assinante de Outubro de 2022.",
+    "headMystery202210Text": "Capacete Serpente Sinistra",
+    "headMystery202210Notes": "Esse capuz escamoso certamente irá aterrorizar sua lista de afazeres! Não confere benefícios. Item de Assinante de Outubro de 2022."
 }
diff --git a/website/common/locales/pt_BR/groups.json b/website/common/locales/pt_BR/groups.json
index 4b2a29170f..6ae26fc69b 100644
--- a/website/common/locales/pt_BR/groups.json
+++ b/website/common/locales/pt_BR/groups.json
@@ -197,7 +197,7 @@
     "userIsClamingTask": "`<%= username %> assumiu:` <%= task %>",
     "approvalRequested": "Aprovação Solicitada",
     "cantDeleteAssignedGroupTasks": "Não pode apagar tarefas de grupo que estão atribuídas a você.",
-    "groupPlanUpgraded": "<strong><%- groupName %></strong>foi atualizado para um Plano de Time!",
+    "groupPlanUpgraded": "<strong><%- groupName %></strong>foi atualizado para um Plano de Time com sucesso!",
     "groupPlanCreated": "<strong><%- groupName %></strong> foi criado!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Apenas o líder do grupo pode convidar usuários para um grupo com assinatura.",
     "paymentDetails": "Detalhes do Pagamento",
@@ -402,5 +402,19 @@
     "newGroupsBullet05": "Tarefas compartilhadas irão escurecer na cor se deixadas incompletas para ajudar no monitoramento do progresso",
     "newGroupsBullet08": "O líder do grupo e administradores podem adicionar tarefas rapidamente a partir do topo das colunas",
     "newGroupsBullet10a": "<strong>Não atribua uma tarefa para ninguém</strong> se qualquer membro pode completa-la",
-    "newGroupsBullet10b": "<strong>Atribua a tarefa para uma pessoa</strong> para que apenas ela possa completa-la"
+    "newGroupsBullet10b": "<strong>Atribua a tarefa para uma pessoa</strong> para que apenas ela possa completa-la",
+    "groupUse": "Qual mais descreve o uso do seu Time? *",
+    "groupCouple": "Casais compartilhando tarefas",
+    "groupFriends": "Amigos compartilhando tarefas",
+    "groupCoworkers": "Colegas de trabalho compartilhando tarefas",
+    "groupManager": "Gerente configurando tarefas para funcionários",
+    "nameStar": "Nome*",
+    "nameStarText": "Adicione um título",
+    "descriptionOptional": "Descrição",
+    "descriptionOptionalText": "Adicione uma descrição",
+    "nextPaymentMethod": "Próximo: Método de pagamento",
+    "createGroup": "Crie um Time",
+    "groupUseDefault": "Escolha uma resposta",
+    "groupParentChildren": "Pais configurando tarefas para crianças",
+    "groupTeacher": "Professor configurando tarefas para estudantes"
 }
diff --git a/website/common/locales/pt_BR/limited.json b/website/common/locales/pt_BR/limited.json
index 26cc646fe9..6ec8ffd9f5 100644
--- a/website/common/locales/pt_BR/limited.json
+++ b/website/common/locales/pt_BR/limited.json
@@ -233,5 +233,7 @@
     "fall2022OrcWarriorSet": "Orc (Guerreiro)",
     "fall2022HarpyMageSet": "Harpia (Mago)",
     "fall2022KappaRogueSet": "Kappa (Gatuno)",
-    "fall2022WatcherHealerSet": "Observador (Curandeiro)"
+    "fall2022WatcherHealerSet": "Observador (Curandeiro)",
+    "gemSaleHow": "Entre <%= eventStartMonth %> <%= eventStartOrdinal %> e <%= eventEndOrdinal %>, compre qualquer pacote de Gemas e sua conta irá receber a quantidade de Gemas promocional. Mais Gemas para gastar, compartilhar ou guardar para futuras novidades!",
+    "gemSaleLimitations": "Esta promoção apenas se aplica durante o tempo limitado do evento. Este evento começa em <%= eventStartMonth %> <%= eventStartOrdinal %> às 9:00 pelo horário de Brasília e irá terminar em <%= eventStartMonth %> <%= eventEndOrdinal %> às 21:00 pelo horário de Brasília. A promoção apenas está disponível ao comprar Gemas para você mesmo."
 }
diff --git a/website/common/locales/pt_BR/npc.json b/website/common/locales/pt_BR/npc.json
index 203079b5b7..d6e45aa073 100644
--- a/website/common/locales/pt_BR/npc.json
+++ b/website/common/locales/pt_BR/npc.json
@@ -131,5 +131,7 @@
     "limitedAvailabilityHours": "Disponível por <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityMinutes": "Disponível por <%= minutes %>m <%= seconds %>s",
     "amountExp": "<%= amount %> de EXP",
-    "helpSupportHabitica": "Ajude Apoiando o Habitica"
+    "helpSupportHabitica": "Ajude Apoiando o Habitica",
+    "groupsPaymentSubBilling": "Sua próxima cobrança será em <strong><%= renewalDate %></strong>.",
+    "groupsPaymentAutoRenew": "Esta inscrição irá renovar automaticamente até ser cancelada. Se você precisar cancelar, você pode fazer isso na aba Fatura do Time."
 }
diff --git a/website/common/locales/pt_BR/questscontent.json b/website/common/locales/pt_BR/questscontent.json
index 9c0ac2fb10..8a7444a140 100644
--- a/website/common/locales/pt_BR/questscontent.json
+++ b/website/common/locales/pt_BR/questscontent.json
@@ -45,7 +45,7 @@
     "questHarpyCompletion": "Um golpe fatal derrubou a Harpia, com penas voando em todas as direções. Após uma rápida escalada em seu ninho você encontra o @UncommonCriminal cercado de ovos de arara. Como um time, vocês rapidamente colocam os ovos de volta em seus ninhos próximos. A arara assustada que lhe encontrou grasna alto, soltando diversos ovos em seus braços. \"O ataque da Harpia deixou alguns ovos precisando de proteção\", explica @UncommonCriminal. \"Parece que você se tornou uma arara honorária.\"",
     "questHarpyBoss": "Harpia",
     "questHarpyDropParrotEgg": "Arara (Ovo)",
-    "questHarpyUnlockText": "Desbloqueia Ovos de Arara para compra no Mercado",
+    "questHarpyUnlockText": "Desbloqueia Ovos de Papagaio para compra no Mercado",
     "questRoosterText": "O Galo Raivoso",
     "questRoosterNotes": "Por anos, o fazendeiro @extrajordanary usou Galos como despertadores. Mas agora um Galo gigante apareceu, cantando mais alto do que nunca - e acordando todo mundo no Habitica! Os Habiticanos com privação de sono lutam por suas Diárias. @Pandoro decide que a hora de dar um basta nisso chegou. \"Por favor, tem alguém que possa ensinar esse Galo a cantar baixo?\" Você se voluntaria, aproximando-se do Galo cedo da manhã - mas ele se vira, batendo suas asas gigantes e mostrando suas garras afiadas e soltando um grito de guerra.",
     "questRoosterCompletion": "Com força e sutileza, você domou a besta selvagem. Suas orelhas, antes cheias de penas e de tarefas meio esquecidas, agora estão limpas como o dia. Ele canta agora silenciosamente, encostando o bico no seu ombro. No dia seguinte você está pronto para ir embora, mas @EmeraldOx corre atrás de você com uma cesta coberta. \"Espere! Eu fui até a casa do fazendeiro esta manhã, o Galo colocou isto na porta de onde você dormiu. Acho que ele quer que você fique com eles.\" Você abre a cesta e vê três delicados ovos.",
diff --git a/website/common/locales/pt_BR/settings.json b/website/common/locales/pt_BR/settings.json
index 5e84999380..c0e3581136 100644
--- a/website/common/locales/pt_BR/settings.json
+++ b/website/common/locales/pt_BR/settings.json
@@ -219,5 +219,6 @@
     "passwordSuccess": "Senha alterada com sucesso",
     "giftSubscriptionRateText": "<strong>$<%= price %> BRL</strong> por <strong><%= months %> meses</strong>",
     "transaction_create_bank_challenge": "Desafio bancário criado",
-    "transaction_admin_update_balance": "Administração concedida"
+    "transaction_admin_update_balance": "Administração concedida",
+    "transaction_admin_update_hourglasses": "Administração atualizada"
 }
diff --git a/website/common/locales/pt_BR/subscriber.json b/website/common/locales/pt_BR/subscriber.json
index 05a2eaae08..83f08b41b6 100644
--- a/website/common/locales/pt_BR/subscriber.json
+++ b/website/common/locales/pt_BR/subscriber.json
@@ -213,5 +213,6 @@
     "howManyGemsSend": "Quantas Gemas você gostaria de enviar?",
     "sendAGift": "Enviar presente",
     "mysterySet202208": "Conjunto Rabo de Cavalo Radiante",
-    "mysterySet202209": "Conjunto Mágico Escolar"
+    "mysterySet202209": "Conjunto Mágico Escolar",
+    "mysterySet202210": "Conjunto Serpente Sinistra"
 }
diff --git a/website/common/locales/ru/gear.json b/website/common/locales/ru/gear.json
index 349cbf9b48..b28eb3d0c0 100644
--- a/website/common/locales/ru/gear.json
+++ b/website/common/locales/ru/gear.json
@@ -2721,5 +2721,11 @@
     "headSpecialFall2022RogueNotes": "С этим металлическим колпаком на голове у вас будет дополнительная защита, когда вы выйдете на сушу. Увеличивает восприятие на <%= per %>. Ограниченный выпуск осени 2022.",
     "headSpecialFall2022MageNotes": "Завораживайте и завлекайте окружающих с помощью этой волшебной маски девы. Увеличивает восприятие на <%= per %>. Ограниченный выпуск осени 2022.",
     "shieldSpecialFall2022WarriorText": "Орочий щит",
-    "shieldSpecialFall2022HealerText": "Левый подглядывающий глаз"
+    "shieldSpecialFall2022HealerText": "Левый подглядывающий глаз",
+    "armorMystery202210Notes": "Попробуйте для разнообразия, вместо того чтобы передвигаться обычным способом, скользить, возможно вы обнаружите, что это довольно эффективный способ передвижения! Бонусов не дает. Подарок подписчикам октября 2022.",
+    "headMystery202210Notes": "Этот чешуйчатый капюшон наведет ужас на ваш список дел! Бонусов не дает. Подарок подписчикам октября 2022.",
+    "armorSpecialFall2022HealerText": "Множество наблюдающих щупалец",
+    "shieldSpecialFall2022HealerNotes": "Взгляните на этот костюм и трепещите. Увеличивает телосложение на <%= con %>. Ограниченный выпуск осени 2022.",
+    "armorMystery202210Text": "Доспех Зловещей змеи",
+    "headMystery202210Text": "Шлем Зловещей змеи"
 }
diff --git a/website/common/locales/ru/groups.json b/website/common/locales/ru/groups.json
index 9b262aeb70..67e82f4e3f 100644
--- a/website/common/locales/ru/groups.json
+++ b/website/common/locales/ru/groups.json
@@ -197,7 +197,7 @@
     "userIsClamingTask": "`<%= username %>взял на исполнение задачу:` <%= task %>",
     "approvalRequested": "Запрошено подтверждение",
     "cantDeleteAssignedGroupTasks": "Нельзя удалить групповые задачи, назначенные вам.",
-    "groupPlanUpgraded": "<strong><%- groupName %></strong> обновилась до группового тарифа!",
+    "groupPlanUpgraded": "<strong><%- groupName %></strong> успешно обновилась до группового тарифа!",
     "groupPlanCreated": "<strong><%- groupName %></strong> создана!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Только предводитель группы может приглашать пользователей в группу с общей подпиской.",
     "paymentDetails": "Детали платежа",
@@ -401,5 +401,20 @@
     "newGroupsBullet10b": "<strong>Назначьте задачу одному участнику</strong>, чтобы только он мог ее выполнить",
     "newGroupsBullet10c": "<strong>Назначьте задачу нескольким участникам</strong>, если им всем нужно её выполнить",
     "newGroupsVisitFAQ": "Посетите <a href='/static/faq#group-plans' target='_blank'>ЧаВо</a> из выпадающего меню \"Помощь\" для получения дополнительной информации.",
-    "newGroupsEnjoy": "Надеемся вам понравиться опыт работы с новыми групповым планами!"
+    "newGroupsEnjoy": "Надеемся вам понравиться опыт работы с новыми групповым планами!",
+    "groupUseDefault": "Выберите ответ",
+    "groupParentChildren": "Родитель(-и) распределяет(-ют) обязанности между детьми",
+    "groupFriends": "Друзья совместно выполняют задания",
+    "groupTeacher": "Учитель организует занятия для учеников",
+    "nameStar": "Имя*",
+    "nameStarText": "Добавить название",
+    "descriptionOptional": "Описание",
+    "descriptionOptionalText": "Добавить описание",
+    "groupCoworkers": "Коллеги совместно выполняют задания",
+    "createGroup": "Создать группу",
+    "groupUse": "Что лучше всего характеризует то, как вы используете вашу группу?*",
+    "groupCouple": "Совместное выполнение заданий парой",
+    "nextPaymentMethod": "Следующий шаг: Способ оплаты",
+    "groupManager": "Менеджер назначает задачи сотрудникам",
+    "newGroupsBullet04": "Общие ежедневные задания не нанесут урон если их пропустить или отметить в окне «Записать вчерашнюю активность»"
 }
diff --git a/website/common/locales/ru/limited.json b/website/common/locales/ru/limited.json
index 2a06bec325..fe4db506e8 100644
--- a/website/common/locales/ru/limited.json
+++ b/website/common/locales/ru/limited.json
@@ -232,6 +232,8 @@
     "octoberYYYY": "Октябрь <%= year %>",
     "fall2022OrcWarriorSet": "Орк (Воин)",
     "fall2022HarpyMageSet": "Гарпия (Маг)",
-    "fall2022WatcherHealerSet": "Наблюдатель (Целитель)",
-    "fall2022KappaRogueSet": "Каппа (Разбойник)"
+    "fall2022WatcherHealerSet": "Подглядывающий (Целитель)",
+    "fall2022KappaRogueSet": "Каппа (Разбойник)",
+    "gemSaleHow": "В период между <%= eventStartMonth %> <%= eventStartOrdinal %> и <%= eventEndOrdinal %>, просто купите любой набор самоцветов, как обычно, и на ваш счет будет зачислено акционное количество самоцветов. Больше самоцветов, которыми можно поделиться, потратить их или сохранить для будущих релизов!",
+    "gemSaleLimitations": "Данная акция действует только в течение ограниченного по времени события. Это событие начинается <%= eventStartMonth %> <%= eventStartOrdinal %> в 15:00 (12:00 UTC) и заканчивается <%= eventStartMonth %> <%= eventEndOrdinal %> в 03:00 (00:00 UTC). Промо-предложение доступно только при покупке драгоценных камней для себя."
 }
diff --git a/website/common/locales/ru/npc.json b/website/common/locales/ru/npc.json
index a46ef31a45..9a1d3081a0 100644
--- a/website/common/locales/ru/npc.json
+++ b/website/common/locales/ru/npc.json
@@ -131,5 +131,8 @@
     "limitedAvailabilityHours": "Доступно <%= hours %>ч <%= minutes %>м",
     "amountExp": "<%= amount %> опыта",
     "limitedAvailabilityDays": "Доступно <%= days %>д <%= hours %>ч <%= minutes %>м",
-    "newStuffPostedOn": "Опубликовано <%= publishDate %>, <%= publishTime %>"
+    "newStuffPostedOn": "Опубликовано <%= publishDate %>, <%= publishTime %>",
+    "helpSupportHabitica": "Поддержите Habitica",
+    "groupsPaymentAutoRenew": "Эта подписка будет автоматически продлеваться до тех пор, пока она не будет отменена. Если вам нужно отменить подписку, вы можете сделать это на вкладке \"групповой счет\".",
+    "groupsPaymentSubBilling": "Ваша следующая дата выставления счета <strong><%= renewalDate %></strong>."
 }
diff --git a/website/common/locales/ru/questscontent.json b/website/common/locales/ru/questscontent.json
index 7c2eec8d9e..919c5910ef 100644
--- a/website/common/locales/ru/questscontent.json
+++ b/website/common/locales/ru/questscontent.json
@@ -748,7 +748,7 @@
     "questVirtualPetText": "Виртуальный хаос в День дурака: Пиликанье",
     "questVirtualPetBoss": "Тамагочимон",
     "questVirtualPetRageTitle": "Пиликанье",
-    "questVirtualPetRageEffect": "",
+    "questVirtualPetRageEffect": "`Тамагочимон использует раздражающие звуковые сигналы!`Тамагочимон издает раздражающий звуковой сигнал, и его шкала счастья внезапно исчезает! Уменьшен ожидаемый урон.",
     "questVirtualPetDropVirtualPetPotion": "Виртуальный инкубационный эликсир",
     "questVirtualPetRageDescription": "Эта шкала заполняется, когда вы не выполняете свои ежедневные дела. Когда она заполнится, Вотчимон заблокирует часть наносимого вашей командой урона!",
     "questVirtualPetNotes": "Тихим и уютным весенним утром в Хабитике, за неделю до памятного Дня Апрельского Шута. Вы и @Beffymaroo находились в стойле, ухаживая за вашими питомцами (которые все еще пребывали в некотором замешательстве от времени, проведенного виртуально!).<br><br>Вдалеке вы услышали гул и пищащий звук, сначала тихий, но постепенно звучащий все громче, как будто он приближается. На горизонте появляется яйцеобразная фигура, и когда она приближается, пища все громче, вы видите, что это гигантский виртуальный питомец!<br><br>“О нет,” - воскликнул @Beffymaroo, - “кажется, Апрельский шут не успел закончить дела с этим здоровяком, похоже, он жаждет внимания!”<br><br>Виртуальный питомец сердито пискнул, закатил виртуальную истерику и стал приближаться.",
diff --git a/website/common/locales/ru/settings.json b/website/common/locales/ru/settings.json
index 1d9bc9585c..01dc10b933 100644
--- a/website/common/locales/ru/settings.json
+++ b/website/common/locales/ru/settings.json
@@ -217,5 +217,7 @@
     "noHourglassTransactions": "У вас пока что нет переводов песочных часов.",
     "transaction_debug": "Действие по отладке",
     "passwordSuccess": "Пароль успешно изменен",
-    "giftSubscriptionRateText": "<strong>$<%= price %> долларов США</strong> за <strong><%= months %> месяц(-а/-ев)</strong>"
+    "giftSubscriptionRateText": "<strong>$<%= price %> долларов США</strong> за <strong><%= months %> месяц(-а/-ев)</strong>",
+    "transaction_admin_update_hourglasses": "Права администратора обновлены",
+    "transaction_admin_update_balance": "Предоставлены права администратора"
 }
diff --git a/website/common/locales/ru/subscriber.json b/website/common/locales/ru/subscriber.json
index e9f75d2fec..c6650431c5 100644
--- a/website/common/locales/ru/subscriber.json
+++ b/website/common/locales/ru/subscriber.json
@@ -213,5 +213,6 @@
     "mysterySet202206": "Набор Морской Феи",
     "mysterySet202208": "Набор Задорный хвостик",
     "mysterySet202209": "Набор магического учёного",
-    "mysterySet202207": "Набор желейной медузы"
+    "mysterySet202207": "Набор желейной медузы",
+    "mysterySet202210": "Набор Зловещей змеи"
 }
diff --git a/website/common/locales/uk/limited.json b/website/common/locales/uk/limited.json
index b720d29256..ad9065732d 100644
--- a/website/common/locales/uk/limited.json
+++ b/website/common/locales/uk/limited.json
@@ -229,6 +229,8 @@
     "octoberYYYY": "Жовтень <%= year %>",
     "fall2022OrcWarriorSet": "Орк (воїн)",
     "fall2022HarpyMageSet": "Гарпія (маг)",
-    "fall2022WatcherHealerSet": "Споглядач (цілитель)",
-    "fall2022KappaRogueSet": "Каппа (розбійник)"
+    "fall2022WatcherHealerSet": "Підглядач (цілитель)",
+    "fall2022KappaRogueSet": "Каппа (розбійник)",
+    "gemSaleHow": "У період від <%= eventStartOrdinal %> <%= eventStartMonth %> до <%= eventEndOrdinal %> просто придбайте будь-який набір самоцвітів, як зазвичай, і на ваш рахунок буде також зараховано їх акційну кількість. Більше дорогоцінних каменів, які можна витратити, поділитися чи зберегти для будь-яких майбутніх покупок!",
+    "gemSaleLimitations": "Ця акція діє лише протягом обмеженого часу. Ця подія починається <%= eventStartOrdinal %> <%= eventStartMonth %> о 15:00 за Києвом (12:00 UTC) і закінчиться <%= eventEndOrdinal %> <%= eventStartMonth %> о 03:00 за Києвом ( 00:00 UTC). Промо-акція діє тільки при покупці самоцвітів для себе."
 }
diff --git a/website/common/locales/uk/npc.json b/website/common/locales/uk/npc.json
index a575434216..520d693f02 100644
--- a/website/common/locales/uk/npc.json
+++ b/website/common/locales/uk/npc.json
@@ -131,5 +131,6 @@
     "paymentSubBillingWithMethod": "За Вашу підписку стягуватиметься плата у розмірі <strong>$<%= amount %></strong> кожен(-ні) <strong><%= months %> місяць(ці) </strong> через <strong><%= paymentMethod %></strong>.",
     "paymentAutoRenew": "Ця підписка буде автоматично поновлюватися, доки її не буде скасовано. Якщо вам потрібно скасувати цю підписку, Ви можете зробити це у своїх налаштуваннях.",
     "paymentCanceledDisputes": "Ми надіслали підтвердження скасування на Вашу електронну пошту. Якщо Ви не бачите електронного листа, зв’яжіться з нами, щоб запобігти майбутнім суперечкам щодо розрахунків.",
-    "helpSupportHabitica": "Підтримайте Habitica"
+    "helpSupportHabitica": "Підтримайте Habitica",
+    "groupsPaymentSubBilling": "Дата вашого наступного платежу <strong><%= renewalDate %></strong>."
 }
diff --git a/website/common/locales/uk/settings.json b/website/common/locales/uk/settings.json
index 4f9190068a..3b1f300d87 100644
--- a/website/common/locales/uk/settings.json
+++ b/website/common/locales/uk/settings.json
@@ -219,5 +219,6 @@
     "passwordSuccess": "Пароль успішно змінено",
     "giftSubscriptionRateText": "<strong>$<%= price %> доларів США</strong> за <strong><%= months %> місяць(-і/ів)</strong>",
     "transaction_create_bank_challenge": "Створено банк для випробування",
-    "transaction_admin_update_balance": "Адміна надано"
+    "transaction_admin_update_balance": "Адміна надано",
+    "transaction_admin_update_hourglasses": "Права адміна оновлено"
 }
diff --git a/website/common/locales/uk/subscriber.json b/website/common/locales/uk/subscriber.json
index 1fc30461fa..6f1cccdf0e 100644
--- a/website/common/locales/uk/subscriber.json
+++ b/website/common/locales/uk/subscriber.json
@@ -211,5 +211,6 @@
     "readyToResubscribe": "Ви готові повторно підписатися?",
     "mysterySet202208": "Набір з веселим хвостиком",
     "backgroundAlreadyOwned": "У вас вже є цей фон.",
-    "mysterySet202204": "Набір віртуального мандрівника"
+    "mysterySet202204": "Набір віртуального мандрівника",
+    "mysterySet202210": "Набір зловісного змієносця"
 }
diff --git a/website/common/locales/zh/achievements.json b/website/common/locales/zh/achievements.json
index f97c571239..a58b1b3014 100644
--- a/website/common/locales/zh/achievements.json
+++ b/website/common/locales/zh/achievements.json
@@ -131,12 +131,12 @@
     "achievementBirdsOfAFeatherText": "已孵化所有基础颜色的飞行宠物：飞猪、猫头鹰、鹦鹉、翼龙、狮鹫和猎鹰！",
     "achievementBirdsOfAFeatherModalText": "你集齐了所有飞行宠物！",
     "achievementReptacularRumbleModalText": "你集齐了所有爬行宠物！",
-    "achievementGroupsBeta2022": "互动的测试者",
-    "achievementGroupsBeta2022ModalText": "你和你的队通过测试和给反馈帮助Habitica！",
-    "achievementGroupsBeta2022Text": "你和你的队通过给了无价的反馈帮助Habitica测试。",
+    "achievementGroupsBeta2022": "交互测试者",
+    "achievementGroupsBeta2022ModalText": "你和团队通过测试和反馈来帮助Habitica发展壮大！",
+    "achievementGroupsBeta2022Text": "你和团队为Habitica测试提供了宝贵的反馈意见。",
     "achievementReptacularRumble": "爬宠街斗",
     "achievementReptacularRumbleText": "已孵化所有基础颜色的爬虫宠物：鳄鱼、翼龙、蛇、三角龙、海龟、霸王龙、和迅猛龙！",
     "achievementWoodlandWizard": "林地巫师",
     "achievementWoodlandWizardModalText": "你集齐了所有森林宠物！",
-    "achievementWoodlandWizardText": "已孵化所有基础颜色的森林宠物：獾、熊、鹿、狐狸、青蛙、刺猬、猫头鹰、蜗牛、松鼠、和树芽！"
+    "achievementWoodlandWizardText": "已孵化所有基础颜色的森林宠物：獾、熊、鹿、狐狸、青蛙、刺猬、猫头鹰、蜗牛、松鼠和树芽！"
 }
diff --git a/website/common/locales/zh/backgrounds.json b/website/common/locales/zh/backgrounds.json
index b2d57c860c..30d39c2123 100644
--- a/website/common/locales/zh/backgrounds.json
+++ b/website/common/locales/zh/backgrounds.json
@@ -666,7 +666,7 @@
     "backgroundMeteorShowerNotes": "观看一场令人目眩神迷的夜间流星雨。",
     "backgroundPalmTreeWithFairyLightsText": "挂着仙女灯的棕榈树",
     "backgroundPalmTreeWithFairyLightsNotes": "在挂着仙女灯的棕榈树旁摆好pose。",
-    "backgroundSnowyFarmNotes": "检查一下你冰雪农场里的每个人是否都还健康、温暖。",
+    "backgroundSnowyFarmNotes": "检查一下冰雪农场里的每个人是否都还健康、温暖。",
     "backgroundSnowyFarmText": "冰雪农场",
     "backgroundOrangeGroveText": "橘园",
     "backgroundWinterWaterfallNotes": "惊叹于冬季瀑布。",
@@ -681,48 +681,48 @@
     "backgroundFloweringPrairieText": "布满鲜花的草原",
     "backgroundFloweringPrairieNotes": "在布满鲜花的草原中嬉戏。",
     "backgroundFlowerShopText": "鲜花小店",
-    "backgroundFlowerShopNotes": "在鲜花小店中享受甜蜜的气息。",
+    "backgroundFlowerShopNotes": "在花店里享受甜蜜气息。",
     "backgroundSpringtimeLakeText": "春季的湖",
     "backgroundSpringtimeLakeNotes": "在春季的湖边享受这一份美景。",
     "backgrounds042022": "第95组：2022年4月推出",
-    "backgroundBlossomingTreesText": "开着鲜花的大树",
-    "backgroundBlossomingTreesNotes": "在开着鲜花的大树下嬉戏玩闹。",
+    "backgroundBlossomingTreesText": "绽放鲜花的大树",
+    "backgroundBlossomingTreesNotes": "在绽放鲜花的大树下嬉戏玩闹。",
     "backgroundIridescentCloudsText": "彩虹之云",
     "backgroundIridescentCloudsNotes": "漂浮在彩虹之云中。",
     "hideLockedBackgrounds": "隐藏未解锁的背景",
     "backgrounds052022": "第96组：2022年5月推出",
-    "backgroundCastleGateText": "城堡的大门",
+    "backgroundCastleGateText": "城堡大门",
     "backgroundOnACastleWallText": "在城堡的墙上",
-    "backgroundOnACastleWallNotes": "在城堡的墙上看外。",
-    "backgroundCastleGateNotes": "在城堡的大门做警卫。",
-    "backgroundEnchantedMusicRoomText": "着魔的音乐房",
-    "backgroundEnchantedMusicRoomNotes": "在一间着魔的音乐房拉音乐。",
+    "backgroundOnACastleWallNotes": "站在城堡的高墙上眺望。",
+    "backgroundCastleGateNotes": "在城堡门口做警卫。",
+    "backgroundEnchantedMusicRoomText": "魔法音乐室",
+    "backgroundEnchantedMusicRoomNotes": "在魔法音乐室里演奏。",
     "backgrounds062022": "第97组：2022年6月推出",
-    "backgroundBeachWithDunesText": "有沙丘的海滩",
-    "backgroundBeachWithDunesNotes": "探索一片有沙丘的海滩。",
-    "backgroundMountainWaterfallText": "有瀑布的山",
-    "backgroundMountainWaterfallNotes": "欣赏一座有瀑布的山。",
-    "backgroundSailboatAtSunsetText": "在夕阳下的帆船",
-    "backgroundSailboatAtSunsetNotes": "欣赏在夕阳下的帆船的美丽。",
+    "backgroundBeachWithDunesText": "海浪沙滩",
+    "backgroundBeachWithDunesNotes": "探索海浪沙滩。",
+    "backgroundMountainWaterfallText": "高山瀑布",
+    "backgroundMountainWaterfallNotes": "欣赏高山上的瀑布。",
+    "backgroundSailboatAtSunsetText": "夕阳下的帆船",
+    "backgroundSailboatAtSunsetNotes": "在夕阳下欣赏帆船之美。",
     "backgrounds072022": "第98组：2022年7月推出",
-    "backgroundBioluminescentWavesNotes": "欣赏发光波浪的光。",
-    "backgroundBioluminescentWavesText": "发光波浪",
-    "backgroundUnderwaterCaveText": "在水下的洞穴",
-    "backgroundUnderwaterCaveNotes": "探索一个在水下的洞穴。",
-    "backgroundUnderwaterStatuesText": "在水下的雕像园",
-    "backgroundUnderwaterStatuesNotes": "在水下的雕像园试别眨眼。",
+    "backgroundBioluminescentWavesNotes": "欣赏荧光海浪。",
+    "backgroundBioluminescentWavesText": "荧光海浪",
+    "backgroundUnderwaterCaveText": "水下洞穴",
+    "backgroundUnderwaterCaveNotes": "探索水下洞穴。",
+    "backgroundUnderwaterStatuesText": "沉没的雕像公园",
+    "backgroundUnderwaterStatuesNotes": "千万别在遗失的雕像公园里眨眼。",
     "backgroundRainbowEucalyptusText": "彩虹桉树",
-    "backgroundRainbowEucalyptusNotes": "欣赏一片彩虹桉树林。",
-    "backgroundMessyRoomText": "散乱房间",
-    "backgroundMessyRoomNotes": "收拾一间散乱房间。",
-    "backgroundByACampfireText": "在硬货旁边",
+    "backgroundRainbowEucalyptusNotes": "观赏彩虹桉树林。",
+    "backgroundMessyRoomText": "凌乱的房间",
+    "backgroundMessyRoomNotes": "收拾好凌乱的房间。",
+    "backgroundByACampfireText": "燃起篝火",
     "backgrounds082022": "第99组：2022年8月推出",
-    "backgroundByACampfireNotes": "晒营火旁边的光。",
+    "backgroundByACampfireNotes": "篝火旁的微光。",
     "backgrounds092022": "第100组：2022年9月推出",
     "backgroundTheatreStageText": "剧场舞台",
-    "backgroundTheatreStageNotes": "在剧场舞台上表演。",
-    "backgroundAutumnPicnicText": "秋季野餐",
-    "backgroundAutumnPicnicNotes": "享受秋季野餐。",
+    "backgroundTheatreStageNotes": "粉墨登场。",
+    "backgroundAutumnPicnicText": "秋日野炊",
+    "backgroundAutumnPicnicNotes": "享受秋日野炊。",
     "backgroundOldPhotoText": "老照片",
-    "backgroundOldPhotoNotes": "在老照片里摆好姿势。"
+    "backgroundOldPhotoNotes": "在老照片里抢占C位。"
 }
diff --git a/website/common/locales/zh/faq.json b/website/common/locales/zh/faq.json
index 279ee0768c..00c6fe03ef 100644
--- a/website/common/locales/zh/faq.json
+++ b/website/common/locales/zh/faq.json
@@ -55,6 +55,6 @@
     "iosFaqStillNeedHelp": "如果[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在酒馆聊天中咨询。进入方式：菜单 > 酒馆！我们很乐意为你提供帮助。",
     "androidFaqStillNeedHelp": "如果[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在酒馆聊天中咨询。进入方式：菜单 > 酒馆！我们很乐意为你提供帮助。",
     "webFaqStillNeedHelp": "如果问题列表和[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在[Habitica 帮助公会](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)中咨询。我们很乐意为你提供帮助。",
-    "faqQuestion13": "什么是团体计划？",
-    "webFaqAnswer13": "## 团体计划是如何运作的？\n\n[团队计划](/group-plans)让您的队伍或公会可以访问类似于您的个人任务板的共享任务板！ 这是一种共享的 Habitica 体验，团队中的任何成员都可以创建和检查任务。\n\n还增加一些新功能，如成员角色，状态视图和任务分配，为您提供更加可控的体验。想了解团队计划的更多信息请[访问我们的wiki](https://habitica.fandom.com/wiki/Group_Plans) ！\n\n## 哪些人可以从团体计划中受益？\n\n团队计划最适合那些想要进行协作的小团队。我们建议保持在2-5名成员。\n\n对于家庭来说，不管是父母、孩子还是你和伴侣，都能从团队计划中受益。共同的目标、家务或责任很适合在一块任务板上记录下来。\n\n团队计划对于那些拥有共同目标的工作团队或希望向员工介绍游戏化的管理者也很有帮助。\n\n## 快速入门团队计划\n\n以下是一些使用技巧，可以帮助您的新团队快速起步。同时我们将在下一部分提供更多详细信息：\n\n* 让团队成员成为管理者，使他们能够创建和编辑任务\n* 如果任务是一次性且可完成的，则保留未分配的任务\n* 为确保其他成员不会误领任务，请将任务指派给一位成员\n* 如果多位成员都需要完成同一任务，请将任务进行分配\n* 在个人任务板上开启显示共享任务这一功能，避免错过任何内容\n* 即使是多人任务，在任务完成后你也能获得奖励\n* 任务完成奖励并不会在团队成员之间共享或平分\n* 您可以通过任务颜色在团队任务板上来判断平均完成率\n* 定期查看团队任务板上的任务，以确保它们是否需要保留\n* 错过一个每日任务不会对你或你的团队造成伤害，但任务颜色会下降\n\n## 团队中的其他成员如何创建任务？\n\n只有团队队长和管理者可以创建任务。如果您希望成员也能进行创建，那么您需要打开团队信息选项卡、查看成员列表并单击其名称旁的圆点图标将他们提升为管理者。\n\n## 任务分配该如何进行？\n\n团队计划赋予您将任务分配给其他小组成员的独特能力。任务分配功能非常适合委派。如果您已将任务分配给某位成员，那么其他成员将无法完成它。\n\n如果一个任务需要多位成员完成，那么您也可以将其分配给多人。例如，如果每个人都必须刷牙，请创建一个任务并将其分配给每位成员。这让他们都能勾选完成并获得个人奖励。当每个人勾选完成时，团队主任务才会显示为完成。\n\n## 未分配的任务如何处理？\n\n团队里的任何成员都可以完成未分配的任务，因此请保留那些未分配的任务，以便任何成员都能完成它。例如，倒垃圾。无论谁倒了垃圾，都可以将其勾选，并提示每个人任务已完成。\n\n## 在同步日如何重置工作？\n\n共享任务会同一时间重置，方便大家同步任务共享板。同步时间由团队队长设置后展示在任务共享板上。由于共享任务自动重置，第二天早上签到时，将没有机会勾选昨天未完成的每日共享任务。\n\n错过每日共享任务不会造成伤害，但是它们会降低颜色方便团队成员直观地了解进度。我们不希望任务共享给您带来负面的体验！\n\n## 如何在APP上使用团队？\n\n虽然APP尚未完全支持团队计划的所有功能，但您仍然可以从iOS和安卓的APP上完成共享任务。在Habitica的网站上，前往团队的任务共享板并打开任务复制按钮。这将会使所有打开和分配的共享任务跨平台显示在您的个人任务板上。\n\n## 团队的共同任务与挑战有何区别？\n\n团队计划的共享任务板比挑战更具动态性，因为它可以不断更新交互。如果您有一组任务想要发给许多人，这一操作在挑战上执行会非常繁琐，但在团队计划里可以快速实现。\n\n其中团体计划是付费功能，而挑战对每个人都是免费的。\n\n你无法在挑战中分配特定的任务，挑战也没有共享日重置。总的来说，挑战提供的控制功能和直接交互功能较少。"
+    "faqQuestion13": "什么是团队计划？",
+    "webFaqAnswer13": "## 团队计划是如何运作的？\n\n[团队计划](/group-plans)让您的队伍或公会可以访问类似于您的个人任务板的共享任务板！ 这是一种共享的 Habitica 体验，团队中的任何成员都可以创建和检查任务。\n\n还增加一些新功能，如成员角色，状态视图和任务分配，为您提供更加可控的体验。想了解团队计划的更多信息请[访问我们的wiki](https://habitica.fandom.com/wiki/Group_Plans) ！\n\n## 哪些人可以从团队计划中受益？\n\n团队计划最适合那些想要进行协作的小团队。我们建议保持在2-5名成员。\n\n对于家庭来说，不管是父母、孩子还是你和伴侣，都能从团队计划中受益。共同的目标、家务或责任很适合在一块任务板上记录下来。\n\n团队计划对于那些拥有共同目标的工作团队或希望向员工介绍游戏化的管理者也很有帮助。\n\n## 快速入门团队计划\n\n以下是一些使用技巧，可以帮助您的新团队快速起步。同时我们将在下一部分提供更多详细信息：\n\n* 让团队成员成为管理者，使他们能够创建和编辑任务\n* 如果任务是一次性且可完成的，则保留未分配的任务\n* 为确保其他成员不会误领任务，请将任务指派给一位成员\n* 如果多位成员都需要完成同一任务，请将任务进行分配\n* 在个人任务板上开启显示共享任务这一功能，避免错过任何内容\n* 即使是多人任务，在任务完成后你也能获得奖励\n* 任务完成奖励并不会在团队成员之间共享或平分\n* 您可以通过任务颜色在团队任务板上来判断平均完成率\n* 定期查看团队任务板上的任务，以确保它们是否需要保留\n* 错过一个每日任务不会对你或你的团队造成伤害，但任务颜色会下降\n\n## 团队中的其他成员如何创建任务？\n\n只有团队队长和管理者可以创建任务。如果您希望成员也能进行创建，那么您需要打开团队信息选项卡、查看成员列表并单击其名称旁的圆点图标将他们提升为管理者。\n\n## 任务分配该如何进行？\n\n团队计划赋予您将任务分配给其他小组成员的独特能力。任务分配功能非常适合委派。如果您已将任务分配给某位成员，那么其他成员将无法完成它。\n\n如果一个任务需要多位成员完成，那么您也可以将其分配给多人。例如，如果每个人都必须刷牙，请创建一个任务并将其分配给每位成员。这让他们都能勾选完成并获得个人奖励。当每个人勾选完成时，团队主任务才会显示为完成。\n\n## 未分配的任务如何处理？\n\n团队里的任何成员都可以完成未分配的任务，因此请保留那些未分配的任务，以便任何成员都能完成它。例如，倒垃圾。无论谁倒了垃圾，都可以将其勾选，并提示每个人任务已完成。\n\n## 在同步日如何重置工作？\n\n共享任务会同一时间重置，方便大家同步任务共享板。同步时间由团队队长设置后展示在任务共享板上。由于共享任务自动重置，第二天早上签到时，将没有机会勾选昨天未完成的每日共享任务。\n\n错过每日共享任务不会造成伤害，但是它们会降低颜色方便团队成员直观地了解进度。我们不希望任务共享给您带来负面的体验！\n\n## 如何在APP上使用团队？\n\n虽然APP尚未完全支持团队计划的所有功能，但您仍然可以从iOS和安卓的APP上完成共享任务。在Habitica的网站上，前往团队的任务共享板并打开任务复制按钮。这将会使所有打开和分配的共享任务跨平台显示在您的个人任务板上。\n\n## 团队的共同任务与挑战有何区别？\n\n团队计划的共享任务板比挑战更具动态性，因为它可以不断更新交互。如果您有一组任务想要发给许多人，这一操作在挑战上执行会非常繁琐，但在团队计划里可以快速实现。\n\n其中团队计划是付费功能，而挑战对每个人都是免费的。\n\n你无法在挑战中分配特定的任务，挑战也没有共享日重置。总的来说，挑战提供的控制功能和直接交互功能较少。"
 }
diff --git a/website/common/locales/zh/front.json b/website/common/locales/zh/front.json
index 61057f9fc6..8b958e6a95 100644
--- a/website/common/locales/zh/front.json
+++ b/website/common/locales/zh/front.json
@@ -13,7 +13,7 @@
     "companyDonate": "捐款给Habitica",
     "forgotPassword": "找回密码？",
     "emailNewPass": "向您发送一封密码重设邮件",
-    "forgotPasswordSteps": "输入你的邮箱地址来注册你的Habitica账户。",
+    "forgotPasswordSteps": "请输入用户名或邮箱地址来注册你的Habitica帐户。",
     "sendLink": "发送链接",
     "featuredIn": "特别提供",
     "footerDevs": "开发者",
@@ -94,7 +94,7 @@
     "tasks": "任务",
     "teams": "团队",
     "terms": "使用条款",
-    "tumblr": "Tumblr",
+    "tumblr": "汤不热（Tumblr）",
     "localStorageTryFirst": "如果你在使用Habitica中遇到了问题，点击下方的按钮清除这个网站的本地存储和cookies（不影响其他网站）。在这之后你需要重新登录，所以在此之前你需要知道你的登录信息，可以在设置-> <%= linkStart %>网站<%= linkEnd %>中找到。",
     "localStorageTryNext": "如果问题持续发生，如果你还没上报这个错误，请使用<%= linkStart %>报告一个错误<%= linkEnd %>。",
     "localStorageClear": "清除数据",
diff --git a/website/common/locales/zh/gear.json b/website/common/locales/zh/gear.json
index 350a7f27df..42a827af09 100644
--- a/website/common/locales/zh/gear.json
+++ b/website/common/locales/zh/gear.json
@@ -2707,14 +2707,14 @@
     "headSpecialFall2022MageText": "鹰身女妖面具",
     "headMystery202210Text": "不祥蛇盔",
     "headMystery202210Notes": "这个鳞甲兜帽必定会吓坏你的待办清单！没有属性加成。2022年10月订阅者物品。",
-    "weaponSpecialFall2022HealerText": "窥视者右眼",
+    "weaponSpecialFall2022HealerText": "窥视右眼",
     "headSpecialFall2022WarriorNotes": "獠牙锋利坚韧，足以刺穿南瓜！RAWR！增加<%= str %>点力量。2022年秋季限定版装备。",
     "headSpecialFall2022RogueNotes": "戴上这顶金属帽，当你冒险上岸时，将会多一道保险。增加<%= per %>点感知。2022年秋季限定版装备。",
     "weaponSpecialFall2022RogueText": "黄瓜刀",
     "weaponSpecialFall2022WarriorText": "兽人利剑",
     "weaponSpecialFall2022MageText": "爆裂之风",
     "weaponSpecialFall2022WarriorNotes": "比起敌人的盔甲来说也许更适合用来劈木头或切硬皮面包，但是RAWR！它看起来确实很可怕！增加<%= str %>点力量。2022年秋季限定版装备。",
-    "armorSpecialFall2022RogueText": "卡帕盔甲",
+    "armorSpecialFall2022RogueText": "河童背甲",
     "armorSpecialFall2022RogueNotes": "无论你是游泳、潜行还是摔跤，穿上这件盔甲就能保障你的安全。增加<%= per %>感知。2022年秋季限定版装备。",
     "armorSpecialFall2022WarriorText": "兽人盔甲",
     "armorSpecialFall2022WarriorNotes": "RAWR！宽大的肩膀彰显着你的强壮！增加<%= con %>点体质。2022年秋季限定版装备。",
@@ -2722,13 +2722,13 @@
     "armorSpecialFall2022MageNotes": "这双奇妙翅膀让你飞得像风一样快，这对可怕利爪让你攥紧最在意的事物。增加<%= int %>点智力。2022年秋季限定版装备。",
     "armorSpecialFall2022HealerNotes": "若一个偷窥者窥视了另一个偷窥者？那么一个偷窥者可以偷窥多少人？增加<%= con %>点体质。2022年秋季限定版装备。",
     "armorSpecialFall2022HealerText": "群魔环伺",
-    "headSpecialFall2022RogueText": "卡帕面甲",
+    "headSpecialFall2022RogueText": "河童头颅",
     "headSpecialFall2022WarriorText": "兽人面具",
     "headSpecialFall2022MageNotes": "带上魔女面具，诱惑他人靠近。增加<%= per %>点感知。2022年秋季限定版装备。",
-    "headSpecialFall2022HealerText": "窥视之面",
+    "headSpecialFall2022HealerText": "眼魔头颅",
     "headSpecialFall2022HealerNotes": "你看那有个美女。在哪里！增加<%= int %>点智力。2022年秋季限定版装备。",
     "shieldSpecialFall2022WarriorText": "兽人之盾",
     "shieldSpecialFall2022WarriorNotes": "要么招待要么RAWR！增加<%= con %>点体质。2022年秋季限定版装备。",
-    "shieldSpecialFall2022HealerText": "窥视者左眼",
+    "shieldSpecialFall2022HealerText": "窥视左目",
     "shieldSpecialFall2022HealerNotes": "二号眼，盯着这套服饰颤抖吧。增加<%= con %>点体质。2022年秋季限定版装备。"
 }
diff --git a/website/common/locales/zh/groups.json b/website/common/locales/zh/groups.json
index 8f0068bb3d..cb64cdd03e 100644
--- a/website/common/locales/zh/groups.json
+++ b/website/common/locales/zh/groups.json
@@ -197,7 +197,7 @@
     "userIsClamingTask": "`<%= username %>发布了：`<%= task %>",
     "approvalRequested": "同意请求",
     "cantDeleteAssignedGroupTasks": "不能删除被分配的小组任务。",
-    "groupPlanUpgraded": "<strong><%- groupName %></strong>成功升级到团队计划！",
+    "groupPlanUpgraded": "<strong><%- groupName %></strong>已成功升级为团队计划！",
     "groupPlanCreated": "<strong><%- groupName %></strong>已创建！",
     "onlyGroupLeaderCanInviteToGroupPlan": "只有组长可以邀请用户加入有订购计划的小组。",
     "paymentDetails": "付款细节",
@@ -402,5 +402,19 @@
     "newGroupsBullet10b": "<strong>将任务分配给一位成员，</strong>这样可以督促他们完成",
     "newGroupsBullet10c": "如果多位成员都需要完成任务，<strong>则将任务分配给他们</strong>",
     "newGroupsVisitFAQ": "想了解更多资讯请浏览帮助菜单下的<a href='/static/faq#group-plans' target='_blank'>常见问题</a>。",
-    "newGroupsEnjoy": "希望新的团队订阅体验能让你满意！"
+    "newGroupsEnjoy": "希望新的团队订阅体验能让你满意！",
+    "groupUseDefault": "选择一个答案",
+    "groupParentChildren": "家长为孩子设置任务",
+    "groupCouple": "情侣共享任务",
+    "groupFriends": "好友共享任务",
+    "groupCoworkers": "同事共享任务",
+    "groupManager": "管理者为员工设置任务",
+    "groupTeacher": "老师为学生设置任务",
+    "nameStar": "姓名*",
+    "nameStarText": "添加标题",
+    "descriptionOptional": "描述",
+    "descriptionOptionalText": "添加描述",
+    "createGroup": "创建团队",
+    "groupUse": "哪一点最适合用来描述您的团队用途？*",
+    "nextPaymentMethod": "下一步：付款方式"
 }
diff --git a/website/common/locales/zh/limited.json b/website/common/locales/zh/limited.json
index 37870b24b4..58f6645a9d 100644
--- a/website/common/locales/zh/limited.json
+++ b/website/common/locales/zh/limited.json
@@ -229,5 +229,11 @@
     "dateEndDecember": "12月31号",
     "februaryYYYY": "2月 <%= year %>",
     "octoberYYYY": "10月 <%= year %>",
-    "julyYYYY": "7月 <%= year %>"
+    "julyYYYY": "7月 <%= year %>",
+    "gemSaleHow": "在<%= eventStartMonth %> <%= eventStartOrdinal %>和<%= eventEndOrdinal %>之间，像往常一样购买任何宝石捆绑包，您的帐户将获得促销返利。这些多出来的宝石可用于购买、赠送或攒下来等之后的新品！",
+    "gemSaleLimitations": "此促销活动为限时活动。从<%= eventStartMonth %> <%= eventStartOrdinal %>美国东部时间上午8:00（12:00 UTC）开始至<%= eventStartMonth %> <%= eventStartOrdinal %>美国东部时间晚上8:00（00:00 UTC）结束。该优惠只能在为自己购买宝石时使用。",
+    "fall2022KappaRogueSet": "河童（盗贼）",
+    "fall2022OrcWarriorSet": "兽人（战士）",
+    "fall2022HarpyMageSet": "鹰身女妖（法师）",
+    "fall2022WatcherHealerSet": "眼魔（医者）"
 }
diff --git a/website/common/locales/zh/npc.json b/website/common/locales/zh/npc.json
index aa248fc071..addefcaea0 100644
--- a/website/common/locales/zh/npc.json
+++ b/website/common/locales/zh/npc.json
@@ -19,7 +19,7 @@
     "sleepDescription": "需要休息吗？来逛逛Daniel的客栈，当你遇到困难时，能暂停Habitica的游戏机制：",
     "sleepBullet1": "错过每日任务不会对你造成伤害",
     "sleepBullet2": "您的任务连胜和习惯计数器不会重置",
-    "sleepBullet3": "在您退出客栈之前，您对副本boss的伤害和找到的手机项目将会一直保持等待状态",
+    "sleepBullet3": "在离开客栈前，您对副本boss的伤害或找到的收集物将会一直保留",
     "sleepBullet4": "结算前这里会预测你对boss造成的伤害以及收集到的物品数量",
     "pauseDailies": "暂停伤害",
     "unpauseDailies": "解除暂停",
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "新的Bailey更新！",
     "tellMeLater": "稍后通知我",
     "dismissAlert": "不再显示",
-    "donateText3": "Habitica是一个基于用户支持的开源项目。你使用在宝石上的金钱帮助我们维持服务、雇佣员工、开发新功能，以及奖励我们的志愿程序员。感谢您的慷慨！",
+    "donateText3": "Habitica是一个基于用户支持的开源项目。你使用在宝石上的金钱帮助我们维持服务、雇佣员工、开发新功能，以及奖励我们的志愿者程序员。感谢您的慷慨",
     "card": "信用卡",
     "paymentMethods": "支付通过",
     "paymentSuccessful": "支付成功！",
@@ -130,5 +130,8 @@
     "limitedAvailabilityMinutes": "购买时间剩余<%= minutes %>分钟<%= seconds %>秒",
     "limitedAvailabilityHours": "购买时间剩余<%= hours %>小时 <%= minutes %>分钟",
     "limitedAvailabilityDays": "购买时间剩余<%= days %>天 <%= hours %>小时 <%= minutes %>分钟",
-    "amountExp": "<%= amount %>经验值"
+    "amountExp": "<%= amount %>经验值",
+    "helpSupportHabitica": "支持Habitica",
+    "groupsPaymentSubBilling": "您的下一个续签日期是<strong><%= renewalDate %></strong>。",
+    "groupsPaymentAutoRenew": "该订阅将自动续订，直到您取消。如有需要，您可以在团队计费选项卡中取消它。"
 }
diff --git a/website/common/locales/zh/questscontent.json b/website/common/locales/zh/questscontent.json
index 6b0783f65e..2c804da252 100644
--- a/website/common/locales/zh/questscontent.json
+++ b/website/common/locales/zh/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "河马（宠物蛋）",
     "questHippoUnlockText": "在市场中解锁河马蛋以购买",
     "farmFriendsText": "“农场好友”副本集",
-    "farmFriendsNotes": "包括“变异奶牛”，“驾驭噩梦”，“雷霆公羊”。8月31日前可购买。",
+    "farmFriendsNotes": "包括“变异奶牛”，“驾驭噩梦”，“雷霆公羊”。9月30日前可购买。",
     "witchyFamiliarsText": "“巫师亲信”副本集",
     "witchyFamiliarsNotes": "包括“鼠王”，“寒霜蜘蛛”，“蛙泽”。10月31日前可购买。",
     "questGroupLostMasterclasser": "大师鉴别者的秘密",
diff --git a/website/common/locales/zh/settings.json b/website/common/locales/zh/settings.json
index 722e500988..6fcaaa37ff 100644
--- a/website/common/locales/zh/settings.json
+++ b/website/common/locales/zh/settings.json
@@ -1,5 +1,5 @@
 {
-    "settings": "设定",
+    "settings": "设置",
     "language": "语言",
     "americanEnglishGovern": "不同语言描述不符时，以英语（American English）为准。",
     "helpWithTranslation": "你愿意协助Habitica的翻译工作吗？太好了！来加入<a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">the Aspiring Linguists Guild</a>一起翻译吧!",
@@ -219,5 +219,6 @@
     "passwordSuccess": "密码更改成功",
     "transaction_create_bank_challenge": "银行的挑战创建成功",
     "transaction_admin_update_balance": "给了管理员",
-    "giftSubscriptionRateText": "<strong>$<%=price %> 美元</strong> 是 <strong><%= months %> 月</strong>"
+    "giftSubscriptionRateText": "<strong>$<%=price %> 美元</strong> 是 <strong><%= months %> 月</strong>",
+    "transaction_admin_update_hourglasses": "管理员更新"
 }
diff --git a/website/common/locales/zh/subscriber.json b/website/common/locales/zh/subscriber.json
index 312d6fefdd..c775b44b7c 100644
--- a/website/common/locales/zh/subscriber.json
+++ b/website/common/locales/zh/subscriber.json
@@ -213,5 +213,6 @@
     "howManyGemsPurchase": "你想要购买几颗宝石？",
     "mysterySet202207": "果冻水母套装",
     "mysterySet202208": "活泼马尾套装",
-    "mysterySet202209": "魔法学者套装"
+    "mysterySet202209": "魔法学者套装",
+    "mysterySet202210": "不祥之蛇套装"
 }
diff --git a/website/common/locales/zh_TW/achievements.json b/website/common/locales/zh_TW/achievements.json
index e9901f921b..ca1f1201b5 100644
--- a/website/common/locales/zh_TW/achievements.json
+++ b/website/common/locales/zh_TW/achievements.json
@@ -129,5 +129,14 @@
     "achievementBirdsOfAFeatherModalText": "你集齊了所有飛行寵物！",
     "achievementZodiacZookeeper": "十二生肖飼養員",
     "achievementZodiacZookeeperText": "已孵化所有基礎顏色的十二生肖寵物。鼠、牛、兔、蛇、馬、羊、猴、雞、狼、虎、飛豬和龍！",
-    "achievementZodiacZookeeperModalText": "你集齊了所有十二生肖寵物！"
+    "achievementZodiacZookeeperModalText": "你集齊了所有十二生肖寵物！",
+    "achievementReptacularRumbleText": "已孵化所有基礎顏色的爬蟲寵物：鱷魚、翼龍、蛇、三角龍、海龜、霸王龍、和迅猛龍！",
+    "achievementGroupsBeta2022": "交互測試者",
+    "achievementGroupsBeta2022Text": "你和團隊爲Habitica測試提供了寶貴的反饋意見。",
+    "achievementGroupsBeta2022ModalText": "你和團隊通過測試和反饋來幫助Habitica發展壯大！",
+    "achievementWoodlandWizard": "林地巫師",
+    "achievementWoodlandWizardText": "已孵化所有基礎顏色的森林寵物：獾、熊、鹿、狐狸、青蛙、刺蝟、貓頭鷹、蝸牛、松鼠和樹芽！",
+    "achievementWoodlandWizardModalText": "你集齊了所有森林寵物！",
+    "achievementReptacularRumble": "爬寵街鬥",
+    "achievementReptacularRumbleModalText": "你集齊了所有爬行寵物！"
 }
diff --git a/website/common/locales/zh_TW/backgrounds.json b/website/common/locales/zh_TW/backgrounds.json
index 67da33fc3f..461c9698f6 100644
--- a/website/common/locales/zh_TW/backgrounds.json
+++ b/website/common/locales/zh_TW/backgrounds.json
@@ -663,5 +663,66 @@
     "backgroundIcePalaceNotes": "於寒冰宮殿當政為王。",
     "backgrounds012022": "第92組：2022年1月推出",
     "hideLockedBackgrounds": "隱藏所有封鎖背景",
-    "backgroundSnowyFarmText": "雪白農場"
+    "backgroundSnowyFarmText": "雪白農場",
+    "backgroundEnchantedMusicRoomText": "魔法音樂室",
+    "backgroundEnchantedMusicRoomNotes": "在魔法音樂室裏演奏。",
+    "backgrounds072022": "第98組：2022年7月推出",
+    "backgroundBioluminescentWavesText": "熒光海浪",
+    "backgroundBioluminescentWavesNotes": "欣賞熒光海浪。",
+    "backgroundUnderwaterCaveText": "水下洞穴",
+    "backgroundUnderwaterCaveNotes": "探索水下洞穴。",
+    "backgroundUnderwaterStatuesText": "沉沒的雕像公園",
+    "backgroundUnderwaterStatuesNotes": "千萬別在遺失的雕像公園裏眨眼。",
+    "backgrounds022022": "第93組：2022年2月推出",
+    "backgroundIridescentCloudsText": "彩虹之雲",
+    "backgrounds082022": "第99組：2022年8月推出",
+    "backgroundRainbowEucalyptusText": "彩虹桉樹",
+    "backgroundRainbowEucalyptusNotes": "觀賞彩虹桉樹林。",
+    "backgroundMessyRoomText": "凌亂的房間",
+    "backgroundMessyRoomNotes": "收拾好凌亂的房間。",
+    "backgroundByACampfireText": "燃起篝火",
+    "backgroundByACampfireNotes": "篝火旁的微光。",
+    "backgrounds052022": "第96組：2022年5月推出",
+    "backgroundOnACastleWallText": "在城堡的牆上",
+    "backgroundOnACastleWallNotes": "站在城堡的高牆上眺望。",
+    "backgroundCastleGateText": "城堡大門",
+    "backgroundCastleGateNotes": "在城堡門口做警衛。",
+    "backgrounds032022": "第94組：2022年3月推出",
+    "backgroundAnimalsDenText": "林地的動物巢穴",
+    "backgroundAnimalsDenNotes": "舒適的蜷縮在林地的動物巢穴中。",
+    "backgroundBrickWallWithIvyText": "佈滿常春藤的磚牆",
+    "backgroundBrickWallWithIvyNotes": "欣賞着一面佈滿常春藤的磚牆。",
+    "backgroundFloweringPrairieText": "佈滿鮮花的草原",
+    "backgroundFloweringPrairieNotes": "在佈滿鮮花的草原中嬉戲。",
+    "backgrounds092022": "第100組：2022年9月推出",
+    "backgroundTheatreStageText": "劇場舞臺",
+    "backgroundTheatreStageNotes": "粉墨登場。",
+    "backgroundAutumnPicnicNotes": "享受秋日野炊。",
+    "backgroundAutumnPicnicText": "秋日野炊",
+    "backgroundOldPhotoText": "老照片",
+    "backgroundOldPhotoNotes": "在老照片裏擺好姿勢。",
+    "backgroundMeteorShowerText": "流星雨",
+    "backgroundMeteorShowerNotes": "觀看一場令人目眩神迷的夜間流星雨。",
+    "backgrounds062022": "第97組：2022年6月推出",
+    "backgroundBeachWithDunesText": "海浪沙灘",
+    "backgroundBeachWithDunesNotes": "探索海浪沙灘。",
+    "backgroundMountainWaterfallText": "高山瀑布",
+    "backgroundMountainWaterfallNotes": "欣賞高山上的瀑布。",
+    "backgroundSailboatAtSunsetText": "夕陽下的帆船",
+    "backgroundSailboatAtSunsetNotes": "在夕陽下欣賞帆船之美。",
+    "backgroundPalmTreeWithFairyLightsText": "掛着仙女燈的棕櫚樹",
+    "backgroundPalmTreeWithFairyLightsNotes": "在掛着仙女燈的棕櫚樹旁擺好pose。",
+    "backgroundSnowyFarmNotes": "檢查一下冰雪農場裏的每個人是否都還健康、溫暖。",
+    "backgroundWinterWaterfallText": "冬季瀑布",
+    "backgroundWinterWaterfallNotes": "驚歎於冬季瀑布。",
+    "backgroundOrangeGroveText": "橘園",
+    "backgroundOrangeGroveNotes": "漫步在芬芳的橙樹林中。",
+    "backgroundIridescentCloudsNotes": "漂浮在彩虹雲朵中。",
+    "backgrounds042022": "第95組：2022年4月推出",
+    "backgroundBlossomingTreesText": "綻放鮮花的大樹",
+    "backgroundBlossomingTreesNotes": "在綻放鮮花的大樹下嬉戲玩鬧。",
+    "backgroundFlowerShopNotes": "在花店裏享受甜蜜氣息。",
+    "backgroundFlowerShopText": "鮮花小店",
+    "backgroundSpringtimeLakeText": "春季的湖",
+    "backgroundSpringtimeLakeNotes": "在春季的湖邊享受這一份美景。"
 }
diff --git a/website/common/locales/zh_TW/communityguidelines.json b/website/common/locales/zh_TW/communityguidelines.json
index bd6d0f6ede..7d7c4c62cf 100644
--- a/website/common/locales/zh_TW/communityguidelines.json
+++ b/website/common/locales/zh_TW/communityguidelines.json
@@ -13,14 +13,14 @@
     "commGuideList02C": "<strong>請不要上傳含有暴力、恐嚇、色情/性暗示的內容。也請不要提倡歧視、偏見、種族主義、仇恨、騷擾、或傷害到他人的圖片或文字</strong>。甚至開玩笑都不合宜。這包括含糊說話和措辭表達以及表情包。並非每一個人都有相同的幽默感，所以某些您認為只是玩笑的事可能對他人會造成傷害。",
     "commGuideList02D": "<strong>讓討論內容是老少皆宜的</strong>。請避免在公共區域談論成人話題。Habitica居民來自於各行各業，有很多年輕的朋友在使用這個網站。我們希望我們的社區能盡可能地舒適和包容。",
     "commGuideList02E": "<strong>請避免褻瀆的語言。這包括那些較輕微而帶有宗教性的咒罵，即使它們在其它場合下可能會被接受</strong> 。我們有來自各種宗教和文化背景的人，而我們想確保每個人在公共空間中都能感到自在。<strong>如果有管理員或是工作人員警告你已違背了某項Habitica的規範，就算你之前不清楚，這仍將是最終的警告。</strong>此外，誹謗的言語也將因違背了服務條款，遭受到嚴厲的處份。",
-    "commGuideList02F": "<strong>請避免在酒館中對有爭議且離題的話題繼續討論</strong>。如果您覺得有人說了些粗魯或傷人的話，請不要理他們。如果有人說這話題在準則裡是允許的但對您而言是有傷害性的，您可以禮貌地讓別人知道這點。如果該篇文章違反準則或是服務條款，您應將其標記並讓管理員出面回應。若有任何疑問，請檢舉該篇文章。管理員會盡快回應，你也可以發電子郵件給<a herf='mailto:admin@habitica.com' target=_blank'>admin@habitica.com</a>並且包括截屏，如果它們有用。",
+    "commGuideList02F": "請避免在酒館中對有爭議且離題的話題繼續討論。如果您覺得有人說了些粗魯或傷人的話，請不要理他們。如果這話題在準則裏是允許的但對您而言是有傷害性的，您可以禮貌地讓別人知道這點。當你覺得談話變得激烈、過於情緒化或有害時，<strong>請停止參與。同時報告帖子讓我們知道。版主會盡快回復。</strong> 你也可以通過電子郵件發送<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>如有需要請包含屏幕截圖。",
     "commGuideList02G": "<strong>遵守任何管理員的要求</strong>。這可能包含但不限於：在特定地方要求限制您的貼文、編輯您的個人檔案並刪除不合適的內容、要求您將該討論移至更合適的空間等等。不要與管理員爭論。如果你對管理員審核的結果存在疑慮或意見，請發送電子郵箱<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> 來聯繫我們的社區管理員。",
-    "commGuideList02J": "請勿發送垃圾訊息</strong>。垃圾訊息包含但不限於：在多個地方發布相同的評論或問題、<strong>發布沒有附帶任何解釋與說明的連結、<strong>發布無意義的消息、大量發布推廣公會、隊伍或挑戰的貼文、或者一次發送多則訊息。若其他使用者點擊某個連結會給您帶來任何好處，您必須在消息中告知大家，否則這些消息也將被視為垃圾消息。<br/><br/>是否已構成垃圾訊息的條件或是可能會成為垃圾訊息全由管理員自行判斷。",
+    "commGuideList02J": "<strong>請勿發送垃圾訊息</strong>。垃圾訊息包含但不限於：在多個地方發布相同的評論或問題，<strong>發布沒有附帶任何解釋與說明的連結</strong>，大量發布推廣公會、隊伍或挑戰的貼文、或者一次發送多則訊息。若其他使用者點擊某個連結會給您帶來任何好處，您必須在消息中告知大家，否則這些消息也將被視為垃圾消息。是否已構成垃圾訊息的條件或是可能會成為垃圾訊息全由管理員自行判斷。",
     "commGuideList02K": "<strong>請避免在公共的交談空間張貼標題語法，特別是在酒館</strong>。比如全大寫的英文字母，因為這會看起來像是您正在大聲咆哮。這樣會干擾到大家舒適的氣氛。",
     "commGuideList02L": "<strong>我們非常不鼓勵在公共場合交換個人資訊，尤其是那些能夠分辨出您的個人身分的訊息</strong>。這些訊息包括但不限於：您的住址、電子信箱、API token或密碼。這是為了您的安全著想！工作人員或管理員將根據他們的判斷移除那些訊息。若有人在私人公會、隊伍或私訊中要求您提供個人訊息，我們強烈建議您禮貌地回絕他，並告知工作人員或管理員。方法1，若是在隊伍或是私人公會裡，請點擊檢舉。方法2，發送郵件至<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>並附帶截圖。",
     "commGuidePara019": "<strong>在個人空間中</strong>，使用者能夠更自由的討論任何喜歡的話題。但是，他們仍不能違反服務條款，這包括發布任何歧視性、暴力、或恐嚇性的內容。請記住，由於挑戰名稱將出現在勝利者的個人檔案中，所以所有的挑戰名稱也必須遵守公共空間守則，即使它們只出現在私人空間中。",
     "commGuidePara020": "<strong>私密訊息 (私訊)</strong>也有一些附加的規範。如果有使用者封鎖您，請不要在任何別的地方與他們聯繫，並要求他們解除封鎖您。此外，您不應該向別人發送私人訊息請求協助 (因為公開回答別人的疑問，對社群是有正面幫助的)。最後，不要發送任何私人訊息要求其他人送您寶石或訂閱當禮物。",
-    "commGuidePara020A": "<strong>如果您看到一條您認為是違反公共空間指南的消息或私人信息，或者您看到一條困擾您或讓您不舒服的消息，您可以通過點擊舉報標誌將其報告給管理員和工作人員</strong>。工作人員或者管理員會盡快對情況作出回應。請注意，故意舉報無辜的消息也是對社區準則的一種違反哦（具體見下方的“違規”）！如果您需要舉報一條私信，請通過“聯繫我們”頁面上的表格與我們的管理員聯繫，您也可以點擊“<a href='https://contact.habitica.com/' target='_blank' >聯繫管理團隊</a>”，可以通過幫助菜單訪問該頁面。當您遇到如下情況，您也可以這樣舉報，比如同一人在不同公會中有多個有問題的帖子，或者需要一些情況說明。您可以用您的母語與我們聯繫如果這對您很方便：我們可能需要使用Google翻譯，但如果您遇到問題，我們希望您能夠輕鬆的與我們交流。",
+    "commGuidePara020A": "<strong>如果您看到一條您認為是違反公共空間指南的消息或私人信息，或者您看到一條困擾您或讓您不舒服的消息，您可以通過點擊舉報標誌將其報告給管理員和工作人員</strong>。工作人員或者管理員會盡快對情況作出回應。請注意，故意舉報無辜的消息也是對社區準則的一種違反哦（具體見下方的“違規”）！您可以通過“聯繫我們”頁面上的表格聯繫模組，也可以通過電子郵件<a href='mailto:admin@habitica.com' target='_blank' >admin@habitica.com</a>，在幫助菜單訪問該頁面。當您遇到如下情況，您也可以這樣舉報，比如同一人在不同公會中有多個有問題的帖子，或者需要一些情況說明。您可以用您的母語與我們聯繫如果這對您很方便：我們可能需要使用Google翻譯，但如果您遇到問題，我們希望您能夠輕鬆的與我們交流。",
     "commGuidePara021": "此外，在Habitica裡的某些公共區域還有額外的規範。",
     "commGuideHeadingTavern": "酒館",
     "commGuidePara022": "酒館是一個Habitica鄉民的主要交流地點。酒館主人Daniel將店裡打掃得一塵不染。而Lemoness將非常樂意地在您坐下聊天時變出幾杯檸檬水。只是您要記住…",
@@ -31,8 +31,8 @@
     "commGuidePara029": "<strong>公開的公會就像酒館一樣，只是除了一般討論外，他們都有一個聚焦的主題。</strong>在公開公會聊天時，內容應該聚焦在這個主題上。例如，語言藝術家公會（Wordsmiths Guild）如果突然專注於園藝的議題而非寫作上，那這個公會可能會被取消；或是龍之愛好者公會（Dragon-Fanciers Guild）就從來不對解密古老符文感到任何的興趣。一些公會可能會要求得較為寬鬆，但一般而言，<strong>盡量不要偏離主題</strong>！",
     "commGuidePara031": "一些公開的公會可能提到較為敏感的話題，比如說關於抑鬱、宗教或政治的話題。只要不違反服務條款或公共空間守則，並且將討論限制在話題範圍內，這些討論是不會被受限制的。",
     "commGuidePara033": "<strong>公開的公會不該含有18禁成人內容。若打算定期討論此敏感話題，他們必須在公會介紹欄位裡註明</strong>。這是為了確保每個人在Habitica是安全且舒適的。",
-    "commGuidePara035": "<strong>如果一個公會討論到包含各種不同類型的敏感議題，您應尊重您的Habitica夥伴，在您的言論前面加註警語（例如「警告：內容涉及自我傷害」）</strong>。這些關鍵字將成為觸發警告或是備註內容的特徵。此時，公會可能會針對這些內容有自己的規定。如果可以的話，請使用<a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>Markdown</a>語法來隱藏這些在換行符號後的潛在敏感內容，以便那些希望能避開閱讀這些內容的人不會在閱讀時看見該內容。不過Habitica的工作人員與管理員仍有可能在慎重考慮後移除這些內容。",
-    "commGuidePara036": "此外，敏感話題必須貼切主題。例如，在對抗憂鬱症的公會裡談及自我傷害是可被理解的，但在音樂公會裡可能就沒那麼適當了。如果您看見有人一直在違反規範，且屢勸不聽的話，請檢舉該內容並透過<a href='https://contact.habitica.com/' target='_blank'>管理員聯絡表單</a>通知管理員。",
+    "commGuidePara035": "<strong>如果一個公會討論到包含各種不同類型的敏感議題，您應尊重您的 Habitica 夥伴，在您的言論前面加註警語 (例如「警告：內容涉及自殘行為」)</strong>。這些關鍵字將成為觸發警告或是備註內容的特徵。此時，公會可能會針對這些內容有自己的規定。如果可以的話，請使用 <a href='http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>Markdown</a> 語法來隱藏這些在換行符號後的潛在敏感內容，以便那些希望能避開閱讀這些內容的人不會在閱讀時看見該內容。不過 Habitica 的工作人員與管理員仍有可能在慎重考慮後移除這些內容。",
+    "commGuidePara036": "此外，敏感話題必須貼切主題。例如，在對抗憂鬱症的公會裡談及自殘行為是可被理解的，但在音樂公會裡可能就沒那麼適當了。如果您看見有人一直在違反規範，且屢勸不聽的話，請檢舉該內容並透過<a href='http://contact.habitica.com/' target='_blank'>管理員聯絡表單</a>通知管理員。",
     "commGuidePara037": "<strong>不允許建立任何用於攻擊某團體或個人的公會，不論是公開或是私人的</strong>。建立這樣的公會會被立刻封禁。請對抗您的壞習慣，而非您的冒險者小夥伴！",
     "commGuidePara038": "<strong>所有的酒館挑戰和公開的公會挑戰也都必須遵守這些規則</strong>。",
     "commGuideHeadingInfractionsEtc": "違規、後果和恢復",
@@ -43,7 +43,7 @@
     "commGuidePara052": "嚴重違規對於Habitica的社群與用戶的安全將造成很大的損害，因此會有嚴厲的後續處置。",
     "commGuidePara053": "以下是一些嚴重違規的例子。這並非是個完整的列表。",
     "commGuideList05A": "違反服務條款",
-    "commGuideList05B": "仇恨性言論/圖片、騷擾/跟踪、網路霸凌、網路論戰以及白目行為",
+    "commGuideList05B": "仇恨性言論/圖片、騷擾/跟踪、網路霸凌、網路論戰以及小白行為",
     "commGuideList05C": "緩刑期間再度累犯",
     "commGuideList05D": "假冒工作人員或是管理員身份——包括聲稱用戶個人創建的頁面是屬於Habitica官方的，或聲稱該頁面內容有Habitica或其管理員、工作人員參與",
     "commGuideList05E": "中度違規並累犯",
@@ -53,7 +53,7 @@
     "commGuidePara054": "中度違規不會讓我們的社群不安全，但是會讓使用者有不愉快的體驗。這些違規將會有中等的處置。若多次違規，處置可能會變得愈加嚴重。",
     "commGuidePara055": "以下是一些中度違規的例子。這並非是個完整的列表。",
     "commGuideList06A": "忽視或不尊重管理員。這包括公開抱怨管理員或其他使用者、公開讚揚被封鎖的用戶或為其辯護、爭論管理員的作為是否合適。如果您對某條規範或某管理員的行為感到顧慮，請寫信與工作人員聯繫 (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>)。",
-    "commGuideList06B": "不要越俎代庖。為了快速闡明相關問題，友好地提及規則是個很好的做法。越俎代庖的行為包括告知、要求、或是強烈暗示某人必須採取您所想到的措施來糾正錯誤。您可以警告某人已經違規了，但是請不要要求他們去做某事。例如，對違規的人說：「正如你所知道的，髒話在酒館裡是非常忌諱的，所以你可能會想要刪掉它們！」這會比說「我命令你必須刪掉那些貼文！」要好得多。",
+    "commGuideList06B": "不要越俎代庖。為了快速闡明相關問題，友好地提及規則是個很好的做法。越俎代庖的行為包括告知、要求、或是強烈暗示某人必須採取您所想到的措施來糾正錯誤。您可以警告某人已經違規了，但是請不要要求他們去做某事。例如，對違規的人說：「正如你所知道的，髒話在酒館裡是非常忌諱的，所以你可能會想要刪掉它們！」更應該說「我命令你必須刪掉那些貼文！」",
     "commGuideList06C": "無故惡意檢舉無辜的文章。",
     "commGuideList06D": "多次違反公共空間守則",
     "commGuideList06E": "輕度違規並累犯",
@@ -109,7 +109,7 @@
     "commGuidePara013": "像Habitica這麼大的社群裡，鄉民來來去去，有時管理員也需要卸下他們尊貴的外袍，讓自己放鬆一下。下面列舉的是榮譽退休的工作人員與管理員們。雖然他們不再有管理員的權限，但我們仍然想要表彰他們的貢獻！",
     "commGuidePara014": "榮譽退休的工作人員與管理員：",
     "commGuideHeadingFinal": "最後一節",
-    "commGuidePara067": "勇敢的Habitica鄉民們，以上就是我們的社群守則！已經累了嗎？擦乾額頭上的汗水，並給您自己一些經驗值作為讀完所有準則的獎勵吧！如果有任何關於社群守則的問題，請透過<a href='https://contact.habitica.com/' target='_blank'>管理員聯絡表單</a>與我們聯繫，我們會很樂意地幫助並回答任何問題。",
+    "commGuidePara067": "勇敢的Habitica鄉民們，以上就是我們的社群守則！已經累了嗎？擦乾額頭上的汗水，並給您自己一些經驗值作為讀完所有準則的獎勵吧！如果有任何關於社群守則的問題，請透過<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>與我們聯繫，我們會很樂意地幫助並回答任何問題。",
     "commGuidePara068": "現在讓我們一同向前進吧，勇敢的冒險家，並擊殺掉一些每日任務吧！",
     "commGuideHeadingLinks": "實用連結",
     "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica諮詢台</a>：一個讓使用者提問的友善公會！",
diff --git a/website/common/locales/zh_TW/content.json b/website/common/locales/zh_TW/content.json
index f8ea5bf8b3..e8d616bdc9 100644
--- a/website/common/locales/zh_TW/content.json
+++ b/website/common/locales/zh_TW/content.json
@@ -370,5 +370,7 @@
     "hatchingPotionMoonglow": "月光",
     "hatchingPotionSunset": "日落",
     "hatchingPotionSolarSystem": "太陽系",
-    "hatchingPotionOnyx": "縞瑪瑙"
+    "hatchingPotionOnyx": "縞瑪瑙",
+    "hatchingPotionPorcelain": "瓷器",
+    "hatchingPotionVirtualPet": "電子寵物"
 }
diff --git a/website/common/locales/zh_TW/contrib.json b/website/common/locales/zh_TW/contrib.json
index 44f6ab314e..70d7ff4527 100644
--- a/website/common/locales/zh_TW/contrib.json
+++ b/website/common/locales/zh_TW/contrib.json
@@ -53,5 +53,6 @@
     "surveysSingle": "可藉由填寫調查問卷或是進行大型測試來幫助Habitica變得更好。我們由衷地感謝您！",
     "surveysMultiple": "已在<%= count %>次場合下幫助Habitica成長。例如透過填寫調查問卷、或在一次大型測試中提供幫助。我們由衷地感謝您！",
     "blurbHallPatrons": "這裡是贊助名人堂。我們在這裡紀念從草創時期就開始在Kickstarter上贊助Habitica的偉大冒險家們。我們由衷地感謝他們幫助讓Habitica能正式推出！",
-    "blurbHallContributors": "這裡是貢獻者殿堂。我們在這裡推崇對開放原始碼項目有所貢獻的人們。無論程式、美術、音樂、寫作方面，或僅是熱衷於到處幫忙的人都列於其中。他們獲得了<a href='http://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'>寶石、特殊裝備</a>與<a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>尊貴頭銜</a>。您也可以為Habitica做出貢獻！<a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'>點此來查看詳細資訊</a>"
+    "blurbHallContributors": "這裡是貢獻者殿堂。我們在這裡推崇對開放原始碼項目有所貢獻的人們。無論程式、美術、音樂、寫作方面，或僅是熱衷於到處幫忙的人都列於其中。他們獲得了<a href='http://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'>寶石、特殊裝備</a>與<a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>尊貴頭銜</a>。您也可以為Habitica做出貢獻！<a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'>點此來查看詳細資訊</a>",
+    "noPrivAccess": "你沒有必要的權限。"
 }
diff --git a/website/common/locales/zh_TW/faq.json b/website/common/locales/zh_TW/faq.json
index 117e8e0787..1356e2fd57 100644
--- a/website/common/locales/zh_TW/faq.json
+++ b/website/common/locales/zh_TW/faq.json
@@ -54,5 +54,7 @@
     "webFaqAnswer12": "世界Boss是出現在酒館的特別怪獸。所有在線的使用者都將自動跟世界Boss作戰。完成您的任務和使用技能都將自動對boss造成傷害。您可以同時遊玩一般的副本。您完成的任務與使用的技能都將同時對世界Boss以及隊伍的副本boss造成傷害。世界Boss永遠無法攻擊您。取而代之的是，它擁有一個憤怒值，當使用者沒有完成每日任務時就會自動增加。如果憤怒值滿了，它就會隨機攻擊一位NPC，而它們的角色圖像也將被改變。您可以到wiki中獲得更多[已出現過的世界Boss](https://habitica.fandom.com/wiki/World_Bosses)之相關資訊。",
     "iosFaqStillNeedHelp": "如果您有任何疑問，但沒出現在以上列表中或是 [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ)中，請至「選單 > 酒館」的酒館聊天室裡詢問，我們相當樂意協助。",
     "androidFaqStillNeedHelp": "如果您有任何疑問，但沒出現在以上列表中或是 [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ)中，請至「選單 > 酒館」的酒館聊天室裡詢問，我們相當樂意協助。",
-    "webFaqStillNeedHelp": "如果您有任何疑問，但沒出現在以上列表中或是 [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ)中，請至 [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)裡詢問，我們相當樂意協助。"
+    "webFaqStillNeedHelp": "如果您有任何疑問，但沒出現在以上列表中或是 [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ)中，請至 [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)裡詢問，我們相當樂意協助。",
+    "faqQuestion13": "什麼是團隊計劃？",
+    "webFaqAnswer13": "## 團隊計劃是如何運作的？\n\n[團隊計劃](/group-plans)讓您的隊伍或公會可以訪問類似於您的個人任務板的共享任務板！ 這是一種共享的 Habitica 體驗，團隊中的任何成員都可以創建和檢查任務。\n\n還增加一些新功能，如成員角色，狀態視圖和任務分配，爲您提供更加可控的體驗。想了解團隊計劃的更多信息請[訪問我們的wiki](https://habitica.fandom.com/wiki/Group_Plans) ！\n\n## 哪些人可以從團隊計劃中受益？\n\n團隊計劃最適合那些想要進行協作的小團隊。我們建議保持在2-5名成員。\n\n對於家庭來說，不管是父母、孩子還是你和伴侶，都能從團隊計劃中受益。共同的目標、家務或責任很適合在一塊任務板上記錄下來。\n\n團隊計劃對於那些擁有共同目標的工作團隊或希望向員工介紹遊戲化的管理者也很有幫助。\n\n## 快速入門團隊計劃\n\n以下是一些使用技巧，可以幫助您的新團隊快速起步。同時我們將在下一部分提供更多詳細信息：\n\n* 讓團隊成員成爲管理者，使他們能夠創建和編輯任務\n* 如果任務是一次性且可完成的，則保留未分配的任務\n* 爲確保其他成員不會誤領任務，請將任務指派給一位成員\n* 如果多位成員都需要完成同一任務，請將任務進行分配\n* 在個人任務板上開啓顯示共享任務這一功能，避免錯過任何內容\n* 即使是多人任務，在任務完成後你也能獲得獎勵\n* 任務完成獎勵並不會在團隊成員之間共享或平分\n* 您可以通過任務顏色在團隊任務板上來判斷平均完成率\n* 定期查看團隊任務板上的任務，以確保它們是否需要保留\n* 錯過一個每日任務不會對你或你的團隊造成傷害，但任務顏色會下降\n\n## 團隊中的其他成員如何創建任務？\n\n只有團隊隊長和管理者可以創建任務。如果您希望成員也能進行創建，那麼您需要打開團隊信息選項卡、查看成員列表並單擊其名稱旁的圓點圖標將他們提升爲管理者。\n\n## 任務分配該如何進行？\n\n團隊計劃賦予您將任務分配給其他小組成員的獨特能力。任務分配功能非常適合委派。如果您已將任務分配給某位成員，那麼其他成員將無法完成它。\n\n如果一個任務需要多位成員完成，那麼您也可以將其分配給多人。例如，如果每個人都必須刷牙，請創建一個任務並將其分配給每位成員。這讓他們都能勾選完成並獲得個人獎勵。當每個人勾選完成時，團隊主任務纔會顯示爲完成。\n\n## 未分配的任務如何處理？\n\n團隊裏的任何成員都可以完成未分配的任務，因此請保留那些未分配的任務，以便任何成員都能完成它。例如，倒垃圾。無論誰倒了垃圾，都可以將其勾選，並提示每個人任務已完成。\n\n## 在同步日如何重置工作？\n\n共享任務會同一時間重置，方便大家同步任務共享板。同步時間由團隊隊長設置後展示在任務共享板上。由於共享任務自動重置，第二天早上籤到時，將沒有機會勾選昨天未完成的每日共享任務。\n\n錯過每日共享任務不會造成傷害，但是它們會降低顏色方便團隊成員直觀地瞭解進度。我們不希望任務共享給您帶來負面的體驗！\n\n## 如何在APP上使用團隊？\n\n雖然APP尚未完全支持團隊計劃的所有功能，但您仍然可以從iOS和安卓的APP上完成共享任務。在Habitica的網站上，前往團隊的任務共享板並打開任務複製按鈕。這將會使所有打開和分配的共享任務跨平臺顯示在您的個人任務板上。\n\n## 團隊的共同任務與挑戰有何區別？\n\n團隊計劃的共享任務板比挑戰更具動態性，因爲它可以不斷更新交互。如果您有一組任務想要發給許多人，這一操作在挑戰上執行會非常繁瑣，但在團隊計劃裏可以快速實現。\n\n其中團隊計劃是付費功能，而挑戰對每個人都是免費的。\n\n你無法在挑戰中分配特定的任務，挑戰也沒有共享日重置。總的來說，挑戰提供的控制功能和直接交互功能較少。"
 }
diff --git a/website/common/locales/zh_TW/front.json b/website/common/locales/zh_TW/front.json
index 6302bf9731..a2a86b534a 100644
--- a/website/common/locales/zh_TW/front.json
+++ b/website/common/locales/zh_TW/front.json
@@ -9,11 +9,11 @@
     "communityFacebook": "Facebook",
     "companyAbout": "瞭解如何使用Habitica",
     "companyBlog": "部落格",
-    "companyContribute": "貢獻",
-    "companyDonate": "贊助",
+    "companyContribute": "為Habitica做貢獻",
+    "companyDonate": "捐款給Habitica",
     "forgotPassword": "忘記密碼？",
     "emailNewPass": "發送重設密碼的連結到您的信箱",
-    "forgotPasswordSteps": "輸入您註冊Habitica帳號時使用的電子郵件地址。",
+    "forgotPasswordSteps": "輸入您用於注册Habitica帳戶的用戶名或電子郵寄地址。",
     "sendLink": "發送連結",
     "featuredIn": "大受好評於",
     "footerDevs": "開發者",
@@ -53,9 +53,9 @@
     "marketing4Lead3-1": "想要將生活變成遊戲嗎？",
     "marketing4Lead3-2": "想要引入遊戲到教育、醫療或其他領域嗎？",
     "marketing4Lead3Title": "遊戲可以融入任何領域",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
-    "oldNews": "新消息",
+    "mobileAndroid": "安卓App",
+    "mobileIOS": "iOS應用",
+    "oldNews": "新聞",
     "newsArchive": "Wikia上的新聞存檔庫（支援多國語言）",
     "setNewPass": "設立新密碼",
     "password": "密碼",
@@ -129,7 +129,7 @@
     "passwordConfirmationMatch": "密碼不匹配。",
     "invalidLoginCredentials": "錯誤的使用者名稱 和(或) 電子郵件 和(或) 密碼。",
     "passwordResetPage": "重設密碼",
-    "passwordReset": "若我們已經有您的電子郵件紀錄，設置新密碼之說明信已發送到您的電子郵件。",
+    "passwordReset": "若我們已經有您的電子郵件紀錄，設置新密碼的說明信已發送到您的電子郵件。",
     "passwordResetEmailSubject": "重設 Habitica 的密碼",
     "passwordResetEmailText": "如果您已在Habitica上申請重設<%= username %>的密碼，請到<%= passwordResetLink %>設置一個新的密碼。此連結將於24小時後到期。如果您未提出重設密碼的申請，請忽略此封郵件。",
     "passwordResetEmailHtml": "如果您已在Habitica上申請重設<strong><%= username %></strong>的密碼，<a href=\"<%= passwordResetLink %>\"點擊這裡</a>以設置一個新的密碼。此連結將於24小時後到期。<br/><br>如果您未提出重設密碼的申請，請忽略此封郵件。",
@@ -150,7 +150,7 @@
     "confirmPassword": "確認密碼",
     "usernameLimitations": "使用者名稱字數必須介於1至20個字元。並且只能包含a至z、0至9、連字號（\"-\"）、或下底線（\"_\"）。且不得包含任何不適當的字詞。",
     "usernamePlaceholder": "例如，HabitRabbit",
-    "emailPlaceholder": "例如，rabbit@example.com",
+    "emailPlaceholder": "例如，gryphon@example.com",
     "passwordPlaceholder": "例如，******************",
     "confirmPasswordPlaceholder": "必須與密碼一致！",
     "joinHabitica": "加入Habitica",
@@ -185,5 +185,8 @@
     "learnMore": "了解更多",
     "communityInstagram": "Instagram",
     "minPasswordLength": "密碼至少需要8個字符。",
-    "enterHabitica": "登入Habitica"
+    "enterHabitica": "登入Habitica",
+    "footerProduct": "產品",
+    "socialAlreadyExists": "此社交帳號已連結到現有的Habitica帳戶。",
+    "emailUsernamePlaceholder": "例如 habitrabbit 或者 gryphon@example.com"
 }
diff --git a/website/common/locales/zh_TW/gear.json b/website/common/locales/zh_TW/gear.json
index f3a803d458..8eb3fbc4de 100644
--- a/website/common/locales/zh_TW/gear.json
+++ b/website/common/locales/zh_TW/gear.json
@@ -2345,5 +2345,15 @@
     "shieldArmoireSoftBlackPillowText": "柔黑色的枕頭",
     "headSpecialNye2020Notes": "你收到了一頂奢華派對帽！在迎接新年的時候，你可以驕傲地戴上它！沒有屬性加成。",
     "weaponSpecialWinter2021HealerNotes": "進行戰鬥，一鼓作氣，一氣呵成！增加<%= int %>點智力。2020-2021年冬季限定版裝備。",
-    "weaponSpecialWinter2021MageNotes": "這個強大的武器能幫你掌控各個階段。引導你的能量，感受每個月的流動，在學習的時空保持專注。增加<%= int %>點智力，<%= per %>點感知。2020-2021年冬季限定版裝備。"
+    "weaponSpecialWinter2021MageNotes": "這個強大的武器能幫你掌控各個階段。引導你的能量，感受每個月的流動，在學習的時空保持專注。增加<%= int %>點智力，<%= per %>點感知。2020-2021年冬季限定版裝備。",
+    "weaponSpecialSpring2021WarriorNotes": "利用太陽的力量來對付你的敵人，讓太陽石給你帶來好運！ 新增<%= str %>力量。 2021年春季限定版裝備。",
+    "weaponSpecialSpring2021HealerNotes": "鮮切的樹皮和葉子都有止痛的作用。 當然你也可以將它種下，看著它長大！ 新增<%= int %>點智力。 2021年春季限定版裝備。",
+    "weaponSpecialSpring2021RogueNotes": "你知道什麼比雙持花更好嗎？ 四重揮花！ 新增<%= str %>點力量。 2021年春季限定版裝備。",
+    "weaponSpecialSummer2021MageNotes": "無論是深達兩萬裏的雄心，還是淺嘗即止的試探，這個閃亮的工具都會竭誠為你提供良好的服務。 新增<%= int %>點智力和<%= per %>點感知。 2021年夏季限定版裝備。",
+    "weaponSpecialSummer2021HealerNotes": "玉米梗：熟玉米，屬於me。 新增<%= int %>點智力。 2021年夏季限量版裝備。",
+    "weaponSpecialSpring2021MageNotes": "扔，打，踩，停！ 揮動這根華麗的羽毛，來指揮你魔法的音樂。 新增<%= int %>點智力和<%= per %>點感知。 2021年春季限定版裝備。",
+    "weaponSpecialFall2021RogueNotes": "你到底遇到了什麼？ 人們總是說盜賊的手是黏糊糊的，但這不代表什麼！ 新增<%= str %>點力量。 2021年秋季限定版裝備。",
+    "weaponSpecialFall2021WarriorNotes": "這種經典的單刃斧頭非常適合用來砍…南瓜！ 新增<%= str %>點力量。 2021秋季限定版裝備。",
+    "weaponSpecialFall2021MageNotes": "知識渴求知識。 由記憶和欲望構成，這只可怕的手抓住了更多。 新增<%= int %>點智力，<%= per %>點感知。 2021年秋季限定版裝備。",
+    "weaponSpecialFall2021HealerNotes": "使用這根魔杖召喚治療火焰和一個幽靈來幫助你。 新增<%= int %>點智力。 2021年秋季限定版裝備。"
 }
diff --git a/website/common/locales/zh_TW/groups.json b/website/common/locales/zh_TW/groups.json
index 826ddacaba..5c788bc00f 100644
--- a/website/common/locales/zh_TW/groups.json
+++ b/website/common/locales/zh_TW/groups.json
@@ -378,5 +378,28 @@
     "bannedWordsAllowedDetail": "勾選此選項後，這個公會將允許使用已被禁用之言語。",
     "bannedWordsAllowed": "允許使用禁用言語",
     "messagePartyLeader": "訊息隊伍領導者",
-    "onlyPrivateGuildsCanUpgrade": "僅有私人公會能升級至群組計畫。"
+    "onlyPrivateGuildsCanUpgrade": "僅有私人公會能升級至群組計畫。",
+    "lastCompleted": "最後完成",
+    "youEmphasized": "<strong>你</strong>",
+    "newGroupsBullet02": "任何人都可以完成未分配的任務",
+    "newGroupsBullet04": "當錯過任務或出現勾選昨天完成情況的提示時，共享的每日任務將不會造成傷害",
+    "newGroupsBullet08": "團隊隊長及管理員可以從任務列表的頂部快速添加任務",
+    "newGroupsBullet09": "可以取消對共享任務的顯示，但它仍需要完成",
+    "newGroupsBullet10": "分配狀況決定完成狀況：",
+    "newGroupsBullet10a": "如果每位成員都能完成任務<strong>就無需分配任務</strong>",
+    "newGroupsBullet10b": "<strong>將任務分配給一位成員，</strong>這樣可以督促他們完成",
+    "newGroupsBullet10c": "如果多位成員都需要完成任務，<strong>則將任務分配給他們</strong>",
+    "newGroupsVisitFAQ": "想了解更多資訊請瀏覽幫助菜單下的<a href='/static/faq#group-plans' target='_blank'>常見問題</a>。",
+    "newGroupsEnjoy": "希望新的團隊訂閱體驗能讓你滿意！",
+    "viewStatus": "狀態",
+    "newGroupsBullet03": "爲方便全體成員協作，共享任務會在同一時間重置",
+    "newGroupsBullet05": "如果未完成共享任務以提升進度，那麼任務的顏色將會下降",
+    "assignTo": "指派給",
+    "dayStart": "<strong>起始日</strong>: <%= startTime %>",
+    "newGroupsWelcome": "歡迎來到新的任務共享板！",
+    "newGroupsWhatsNew": "查看最新消息：",
+    "newGroupsBullet01": "從任務共享板直接與任務交互",
+    "newGroupsBullet06": "任務狀態視圖允許您快速查看受指派成員的完成情況",
+    "newGroupsBullet07": "切換功能可以將共享任務展現你的個人任務板上",
+    "chatTemporarilyUnavailable": "聊天室暫未開放。請稍後再試。"
 }
diff --git a/website/common/locales/zh_TW/limited.json b/website/common/locales/zh_TW/limited.json
index 15fa7eb341..29a3cb2682 100644
--- a/website/common/locales/zh_TW/limited.json
+++ b/website/common/locales/zh_TW/limited.json
@@ -211,5 +211,11 @@
     "fall2021OozeRogueSet": "滴漏者（盜賊）",
     "fall2021HeadlessWarriorSet": "無頭（戰士）",
     "fall2021BrainEaterMageSet": "食腦者（法師）",
-    "fall2021FlameSummonerHealerSet": "火炎召喚師（補師）"
+    "fall2021FlameSummonerHealerSet": "火炎召喚師（補師）",
+    "gemSaleHow": "在<%= eventStartMonth %> <%= eventStartOrdinal %>和<%= eventEndOrdinal %>之間，像往常一樣購買任何寶石捆綁包，您的帳號將獲得促銷返利。這些多出來的寶石可用於購買、贈送或攢下來等之後的新品！",
+    "gemSaleLimitations": "此促銷活動爲限時活動。從<%= eventStartMonth %> <%= eventStartOrdinal %>美國東部時間上午8:00（12:00 UTC）開始至<%= eventStartMonth %> <%= eventStartOrdinal %>美國東部時間晚上8:00（00:00 UTC）結束。該優惠只能在爲自己購買寶石時使用。",
+    "fall2022KappaRogueSet": "河童（盜賊）",
+    "fall2022OrcWarriorSet": "獸人（戰士）",
+    "fall2022HarpyMageSet": "鷹身女妖（法師）",
+    "fall2022WatcherHealerSet": "眼魔（補師）"
 }
diff --git a/website/common/locales/zh_TW/npc.json b/website/common/locales/zh_TW/npc.json
index c7c47f757a..6509b4f121 100644
--- a/website/common/locales/zh_TW/npc.json
+++ b/website/common/locales/zh_TW/npc.json
@@ -130,5 +130,8 @@
     "amountExp": "<%= amount %> 經驗",
     "limitedAvailabilityHours": "購買時間剩餘<%= hours %>小時 <%= minutes %>分鐘",
     "limitedAvailabilityDays": "購買時間剩餘<%= days %>天 <%= hours %>小時 <%= minutes %>分鐘",
-    "limitedAvailabilityMinutes": "購買時間剩餘<%= minutes %>分鐘<%= seconds %>秒"
+    "limitedAvailabilityMinutes": "購買時間剩餘<%= minutes %>分鐘<%= seconds %>秒",
+    "groupsPaymentSubBilling": "您的下一個續簽日期是<strong><%= renewalDate %></strong>。",
+    "groupsPaymentAutoRenew": "該訂閱將自動續訂，直到您取消。如有需要，您可以在團隊計費選項卡中取消它。",
+    "helpSupportHabitica": "支持Habitica"
 }
diff --git a/website/common/locales/zh_TW/subscriber.json b/website/common/locales/zh_TW/subscriber.json
index 5c32e74ab3..e2af2be1cf 100644
--- a/website/common/locales/zh_TW/subscriber.json
+++ b/website/common/locales/zh_TW/subscriber.json
@@ -196,5 +196,6 @@
     "mysterySet202107": "海濱熱血套裝",
     "mysterySet202109": "月下蝴蝶套裝",
     "mysterySet202111": "宇宙計時器套裝",
-    "mysterySet202110": "苔蘚石像鬼套裝"
+    "mysterySet202110": "苔蘚石像鬼套裝",
+    "mysterySet202210": "不祥之蛇套裝"
 }

From 57a090eea1ff3bb0afcec3cae3f209a2e14566ba Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 11 Oct 2022 11:59:08 -0500
Subject: [PATCH 079/134] 4.246.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a0851d98c4..6544cab095 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.245.2",
+  "version": "4.246.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4529e59755..3866f9e802 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.245.2",
+  "version": "4.246.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From 9d4f70371df91f95a1643ccb464ab5e44ed0047f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:42:22 -0500
Subject: [PATCH 080/134] build(deps): bump core-js from 3.24.1 to 3.25.5 in
 /website/client (#14282)

Bumps [core-js](https://github.com/zloirock/core-js) from 3.24.1 to 3.25.5.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.24.1...v3.25.5)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 949372df0d..839bfa361a 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -15887,9 +15887,9 @@
       }
     },
     "core-js": {
-      "version": "3.24.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
-      "integrity": "sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="
+      "version": "3.25.5",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz",
+      "integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="
     },
     "core-js-compat": {
       "version": "3.11.0",
diff --git a/website/client/package.json b/website/client/package.json
index 640a0b4d41..f5f7507afa 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -32,7 +32,7 @@
     "bootstrap": "^4.6.0",
     "bootstrap-vue": "^2.22.0",
     "chai": "^4.3.6",
-    "core-js": "^3.24.1",
+    "core-js": "^3.25.5",
     "dompurify": "^2.4.0",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",

From 8c0d41d084339bd7e927aee27f27a491843d95d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:42:41 -0500
Subject: [PATCH 081/134] build(deps): bump express from 4.18.1 to 4.18.2
 (#14280)

Bumps [express](https://github.com/expressjs/express) from 4.18.1 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.1...4.18.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 65 +++++++++++++++++++++++++++++++++--------------
 package.json      |  2 +-
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a0851d98c4..49f3a59b8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3189,7 +3189,7 @@
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "array-includes": {
       "version": "3.1.1",
@@ -5168,7 +5168,7 @@
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "cookiejar": {
       "version": "2.1.3",
@@ -6039,7 +6039,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "end-of-stream": {
       "version": "1.4.4",
@@ -6335,7 +6335,7 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
@@ -6710,7 +6710,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "event-stream": {
       "version": "3.3.4",
@@ -6960,13 +6960,13 @@
       "integrity": "sha512-2RExSo0yJiqP+xiUue13jQa2IHE8kLDzTI7b6kn+vUlBVvlzNSiLDzo4e5Pp5J039usvTUnxZ8sUOhv0Kg15NA=="
     },
     "express": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.1",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.5.0",
@@ -6985,7 +6985,7 @@
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
         "send": "0.18.0",
@@ -6997,6 +6997,25 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "body-parser": {
+          "version": "1.20.1",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+          "requires": {
+            "bytes": "3.1.2",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "on-finished": "2.4.1",
+            "qs": "6.11.0",
+            "raw-body": "2.5.1",
+            "type-is": "~1.6.18",
+            "unpipe": "1.0.0"
+          }
+        },
         "content-disposition": {
           "version": "0.5.4",
           "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -7013,10 +7032,18 @@
             "ms": "2.0.0"
           }
         },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "on-finished": {
           "version": "2.4.1",
@@ -7027,9 +7054,9 @@
           }
         },
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
           "requires": {
             "side-channel": "^1.0.4"
           }
@@ -7402,7 +7429,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "on-finished": {
           "version": "2.4.1",
@@ -7619,7 +7646,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "from": {
       "version": "0.1.7",
@@ -10746,7 +10773,7 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "merge-stream": {
       "version": "2.0.0",
@@ -12361,7 +12388,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "path-type": {
       "version": "2.0.0",
@@ -13597,7 +13624,7 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
             }
           }
         },
diff --git a/package.json b/package.json
index 4529e59755..9b435d0700 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",
     "eslint-plugin-mocha": "^5.0.0",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "express-basic-auth": "^1.2.1",
     "express-validator": "^5.2.0",
     "glob": "^8.0.3",

From 02e33853b1303e5c46e53abf6dc20cf547023ea4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:43:40 -0500
Subject: [PATCH 082/134] build(deps-dev): bump chalk from 4.1.2 to 5.1.0
 (#14277)

Bumps [chalk](https://github.com/chalk/chalk) from 4.1.2 to 5.1.0.
- [Release notes](https://github.com/chalk/chalk/releases)
- [Commits](https://github.com/chalk/chalk/compare/v4.1.2...v5.1.0)

---
updated-dependencies:
- dependency-name: chalk
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 90 +++++++++++++++++++++++++----------------------
 package.json      |  2 +-
 2 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 49f3a59b8d..2462c23a62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4559,49 +4559,10 @@
       }
     },
     "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
+      "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
+      "dev": true
     },
     "chardet": {
       "version": "0.7.0",
@@ -9315,6 +9276,41 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
           "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
         "strip-ansi": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -9322,6 +9318,14 @@
           "requires": {
             "ansi-regex": "^5.0.0"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index 9b435d0700..d5a85a9e4c 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "chai-moment": "^0.1.0",
-    "chalk": "^4.1.2",
+    "chalk": "^5.1.0",
     "cross-spawn": "^7.0.3",
     "expect.js": "^0.3.1",
     "istanbul": "^1.1.0-alpha.1",

From 144baa98b156b1600b920607e88bb40191c6a9c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:44:22 -0500
Subject: [PATCH 083/134] build(deps-dev): bump sinon from 13.0.2 to 14.0.1
 (#14276)

Bumps [sinon](https://github.com/sinonjs/sinon) from 13.0.2 to 14.0.1.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v13.0.2...v14.0.1)

---
updated-dependencies:
- dependency-name: sinon
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 2462c23a62..705e60da5b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2276,9 +2276,9 @@
       }
     },
     "@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
       "dev": true
     },
     "@slack/types": {
@@ -10370,7 +10370,7 @@
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
       "dev": true
     },
     "lodash.includes": {
@@ -11652,7 +11652,7 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
           "dev": true
         },
         "path-to-regexp": {
@@ -13822,9 +13822,9 @@
       }
     },
     "sinon": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-13.0.2.tgz",
-      "integrity": "sha512-KvOrztAVqzSJWMDoxM4vM+GPys1df2VBoXm+YciyB/OLMamfS3VXh3oGh5WtrAGSzrgczNWFFY22oKb7Fi5eeA==",
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.1.tgz",
+      "integrity": "sha512-JhJ0jCiyBWVAHDS+YSjgEbDn7Wgz9iIjA1/RK+eseJN0vAAWIWiXBdrnb92ELPyjsfreCYntD1ORtLSfIrlvSQ==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.8.3",
@@ -13836,9 +13836,9 @@
       },
       "dependencies": {
         "diff": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+          "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
           "dev": true
         },
         "has-flag": {
diff --git a/package.json b/package.json
index d5a85a9e4c..2f5b1d65ae 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "monk": "^7.3.4",
     "require-again": "^2.0.0",
     "run-rs": "^0.7.7",
-    "sinon": "^13.0.2",
+    "sinon": "^14.0.1",
     "sinon-chai": "^3.7.0",
     "sinon-stub-promise": "^4.0.0"
   },

From e97454e0e7f169c4263a75548a51ccb32c8bb1d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:45:14 -0500
Subject: [PATCH 084/134] build(deps): bump async from 2.6.3 to 3.2.3 (#14275)

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 3.2.3.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v3.2.3)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 705e60da5b..9afeee2316 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3313,9 +3313,9 @@
       "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
     },
     "async": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
     },
     "async-done": {
       "version": "1.3.2",
@@ -9730,7 +9730,7 @@
         "async": {
           "version": "1.5.2",
           "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
           "dev": true
         },
         "nopt": {
@@ -9764,9 +9764,9 @@
       },
       "dependencies": {
         "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "version": "2.6.4",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+          "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
           "dev": true,
           "requires": {
             "lodash": "^4.17.14"

From 104ec60adbbc8e82d85ce66ce02c96f3f52b632e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:46:15 -0500
Subject: [PATCH 085/134] build(deps): bump bcrypt from 5.0.1 to 5.1.0 (#14274)

Bumps [bcrypt](https://github.com/kelektiv/node.bcrypt.js) from 5.0.1 to 5.1.0.
- [Release notes](https://github.com/kelektiv/node.bcrypt.js/releases)
- [Changelog](https://github.com/kelektiv/node.bcrypt.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kelektiv/node.bcrypt.js/compare/v5.0.1...v5.1.0)

---
updated-dependencies:
- dependency-name: bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 132 +++++++++++++++++++++++++++++++++++++---------
 package.json      |   2 +-
 2 files changed, 109 insertions(+), 25 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9afeee2316..6829bf640a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2097,21 +2097,66 @@
       }
     },
     "@mapbox/node-pre-gyp": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.3.tgz",
-      "integrity": "sha512-9dTIfQW8HVCxLku5QrJ/ysS/b2MdYngs9+/oPrOTLvp3TrggdANYVW2h8FGJGDf0J7MYfp44W+c90cVJx+ASuA==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
+      "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==",
       "requires": {
-        "detect-libc": "^1.0.3",
+        "detect-libc": "^2.0.0",
         "https-proxy-agent": "^5.0.0",
         "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.7",
         "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
+        "npmlog": "^5.0.1",
         "rimraf": "^3.0.2",
-        "semver": "^7.3.4",
-        "tar": "^6.1.0"
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "are-we-there-yet": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+          "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^3.6.0"
+          }
+        },
+        "detect-libc": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+          "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "gauge": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+          "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+          "requires": {
+            "aproba": "^1.0.3 || ^2.0.0",
+            "color-support": "^1.1.2",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.1",
+            "object-assign": "^4.1.1",
+            "signal-exit": "^3.0.0",
+            "string-width": "^4.2.3",
+            "strip-ansi": "^6.0.1",
+            "wide-align": "^1.1.2"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
         "make-dir": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -2135,13 +2180,42 @@
             "abbrev": "1"
           }
         },
+        "npmlog": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+          "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+          "requires": {
+            "are-we-there-yet": "^2.0.0",
+            "console-control-strings": "^1.1.0",
+            "gauge": "^3.0.0",
+            "set-blocking": "^2.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
         }
       }
     },
@@ -3107,6 +3181,7 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "dev": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -3116,6 +3191,7 @@
           "version": "2.3.7",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
           "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3130,6 +3206,7 @@
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3709,12 +3786,12 @@
       }
     },
     "bcrypt": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
-      "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.0.tgz",
+      "integrity": "sha512-RHBS7HI5N5tEnGTmtR/pppX0mmDSBpQ4aCBsj7CEQfYXDcO74A8sIBYcJMuCsis2E81zDxeENYhv66oZwLiA+Q==",
       "requires": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "node-addon-api": "^3.1.0"
+        "@mapbox/node-pre-gyp": "^1.0.10",
+        "node-addon-api": "^5.0.0"
       }
     },
     "bcrypt-pbkdf": {
@@ -5728,7 +5805,8 @@
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "dev": true
     },
     "dezalgo": {
       "version": "1.0.3",
@@ -7740,6 +7818,7 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -7754,12 +7833,14 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7768,6 +7849,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7778,6 +7860,7 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -10964,9 +11047,9 @@
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
+      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -11676,9 +11759,9 @@
       }
     },
     "node-addon-api": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz",
-      "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz",
+      "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA=="
     },
     "node-bitmap": {
       "version": "0.0.1",
@@ -11834,6 +11917,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
diff --git a/package.json b/package.json
index 2f5b1d65ae..7e36185d6b 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "amplitude": "^6.0.0",
     "apidoc": "^0.53.0",
     "apple-auth": "^1.0.7",
-    "bcrypt": "^5.0.1",
+    "bcrypt": "^5.1.0",
     "body-parser": "^1.20.0",
     "bootstrap": "^4.6.0",
     "compression": "^1.7.4",

From 70e88d601ce8e963fb3ece8c36c9a1fae77564cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:46:33 -0500
Subject: [PATCH 086/134] build(deps): bump superagent from 7.1.6 to 8.0.2
 (#14272)

Bumps [superagent](https://github.com/visionmedia/superagent) from 7.1.6 to 8.0.2.
- [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/v7.1.6...v8.0.2)

---
updated-dependencies:
- dependency-name: superagent
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 21 ++++++++++-----------
 package.json      |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6829bf640a..a9772a3f63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14594,9 +14594,9 @@
       "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ=="
     },
     "superagent": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.6.tgz",
-      "integrity": "sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.2.tgz",
+      "integrity": "sha512-QtYZ9uaNAMexI7XWl2vAXAh0j4q9H7T0WVEI/y5qaUB3QLwxo+voUgCQ217AokJzUTIVOp0RTo7fhZrwhD7A2Q==",
       "requires": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.3",
@@ -14606,8 +14606,7 @@
         "formidable": "^2.0.1",
         "methods": "^1.1.2",
         "mime": "2.6.0",
-        "qs": "^6.10.3",
-        "readable-stream": "^3.6.0",
+        "qs": "^6.11.0",
         "semver": "^7.3.7"
       },
       "dependencies": {
@@ -14620,17 +14619,17 @@
           }
         },
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
           "requires": {
             "side-channel": "^1.0.4"
           }
         },
         "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
diff --git a/package.json b/package.json
index 7e36185d6b..7bbfa5a9a1 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.0",
     "stripe": "^8.222.0",
-    "superagent": "^7.1.6",
+    "superagent": "^8.0.2",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",
     "uuid": "^8.3.2",

From baf60dc95153de19e578d209a711579b9d07aa15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:50:14 -0500
Subject: [PATCH 087/134] build(deps): bump @google-cloud/trace-agent from
 5.1.6 to 7.1.2 (#14259)

Bumps [@google-cloud/trace-agent](https://github.com/googleapis/cloud-trace-nodejs) from 5.1.6 to 7.1.2.
- [Release notes](https://github.com/googleapis/cloud-trace-nodejs/releases)
- [Changelog](https://github.com/googleapis/cloud-trace-nodejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/cloud-trace-nodejs/compare/v5.1.6...v7.1.2)

---
updated-dependencies:
- dependency-name: "@google-cloud/trace-agent"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 203 ++++++++++++++++++++++++++--------------------
 package.json      |   2 +-
 2 files changed, 114 insertions(+), 91 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a9772a3f63..1fdfb1cd86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1984,44 +1984,44 @@
       "optional": true
     },
     "@google-cloud/common": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.8.1.tgz",
-      "integrity": "sha512-FOs3NFU6bDt5mXE7IFpwIeqzLwRZNu9lJYl+bHVNkwmxX/w4VyDZAiGjQHhpV1Ek+muNKlX8HPchxaIxNTuOhw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-4.0.3.tgz",
+      "integrity": "sha512-fUoMo5b8iAKbrYpneIRV3z95AlxVJPrjpevxs4SKoclngWZvTXBSGpNisF5+x5m+oNGve7jfB1e6vNBZBUs7Fw==",
       "requires": {
-        "@google-cloud/projectify": "^2.0.0",
-        "@google-cloud/promisify": "^2.0.0",
+        "@google-cloud/projectify": "^3.0.0",
+        "@google-cloud/promisify": "^3.0.0",
         "arrify": "^2.0.1",
         "duplexify": "^4.1.1",
         "ent": "^2.2.0",
         "extend": "^3.0.2",
-        "google-auth-library": "^7.9.2",
-        "retry-request": "^4.2.2",
-        "teeny-request": "^7.0.0"
+        "google-auth-library": "^8.0.2",
+        "retry-request": "^5.0.0",
+        "teeny-request": "^8.0.0"
       }
     },
     "@google-cloud/projectify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz",
-      "integrity": "sha512-+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz",
+      "integrity": "sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA=="
     },
     "@google-cloud/promisify": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz",
-      "integrity": "sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz",
+      "integrity": "sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA=="
     },
     "@google-cloud/trace-agent": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-5.1.6.tgz",
-      "integrity": "sha512-TLZwbR9WYx/wNhJv6PcbKEuHZpArUG1WtaPLwjxRJeTVNDV2gOsDVDihbezCyyOcHxU3kXCewB5y2BA1pP0mIg==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-7.1.2.tgz",
+      "integrity": "sha512-LcPKMM80bBvaUG3Nb1R4FPYlGZQX/tDMmwN9bx3ML954W61Pj8D3bjwIleSWO36lIdo0tl+Cz6UHJEOKLSNcvw==",
       "requires": {
-        "@google-cloud/common": "^3.0.0",
+        "@google-cloud/common": "^4.0.0",
         "@opencensus/propagation-stackdriver": "0.1.0",
         "builtin-modules": "^3.0.0",
         "console-log-level": "^1.4.0",
         "continuation-local-storage": "^3.2.1",
         "extend": "^3.0.2",
-        "gcp-metadata": "^4.0.0",
-        "google-auth-library": "^7.0.0",
+        "gcp-metadata": "^5.0.0",
+        "google-auth-library": "^8.0.2",
         "hex2dec": "^1.0.1",
         "is": "^3.2.0",
         "methods": "^1.1.1",
@@ -2029,16 +2029,21 @@
         "semver": "^7.0.0",
         "shimmer": "^1.2.0",
         "source-map-support": "^0.5.16",
-        "uuid": "^8.0.0"
+        "uuid": "^9.0.0"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "uuid": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
         }
       }
     },
@@ -2255,9 +2260,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -2739,14 +2744,6 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
-    "abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "requires": {
-        "event-target-shim": "^5.0.0"
-      }
-    },
     "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -3808,9 +3805,9 @@
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
     "bignumber.js": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
-      "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
+      "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="
     },
     "bin-build": {
       "version": "3.0.0",
@@ -4479,9 +4476,9 @@
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
     "builtin-modules": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="
     },
     "bytes": {
       "version": "3.1.2",
@@ -6100,7 +6097,7 @@
     "ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="
     },
     "entities": {
       "version": "2.0.3",
@@ -6765,11 +6762,6 @@
         "through": "~2.3.1"
       }
     },
-    "event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-    },
     "events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -7329,9 +7321,9 @@
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
     },
     "fast-text-encoding": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz",
-      "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz",
+      "integrity": "sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="
     },
     "fast-xml-parser": {
       "version": "3.19.0",
@@ -7868,23 +7860,22 @@
       }
     },
     "gaxios": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.2.tgz",
-      "integrity": "sha512-T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.0.2.tgz",
+      "integrity": "sha512-TjtV2AJOZoMQqRYoy5eM8cCQogYwazWNYLQ72QB0kwa6vHHruYkGmhhyrlzbmgNHK1dNnuP2WSH81urfzyN2Og==",
       "requires": {
-        "abort-controller": "^3.0.0",
         "extend": "^3.0.2",
         "https-proxy-agent": "^5.0.0",
         "is-stream": "^2.0.0",
-        "node-fetch": "^2.6.1"
+        "node-fetch": "^2.6.7"
       }
     },
     "gcp-metadata": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz",
-      "integrity": "sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.0.1.tgz",
+      "integrity": "sha512-jiRJ+Fk7e8FH68Z6TLaqwea307OktJpDjmYnU7/li6ziwvVvU2RlrCyQo5vkdeP94chm0kcSCOOszvmuaioq3g==",
       "requires": {
-        "gaxios": "^4.0.0",
+        "gaxios": "^5.0.0",
         "json-bigint": "^1.0.0"
       }
     },
@@ -8451,27 +8442,27 @@
       }
     },
     "google-auth-library": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.2.tgz",
-      "integrity": "sha512-M37o9Kxa/TLvOLgF71SXvLeVEP5sbSTmKl1zlIgl72SFy5PtsU3pOdu8G8MIHHpQ3/NZabDI8rQkA9DvQVKkPA==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.5.2.tgz",
+      "integrity": "sha512-FPfOSaI8n2TVXFHTP8/vAVFCXhyALj7w9/Rgefux3oeKZ/nQDNmfNTJ+lIKcoYT1cKkvMllp1Eood7Y5L+TP+A==",
       "requires": {
         "arrify": "^2.0.0",
         "base64-js": "^1.3.0",
         "ecdsa-sig-formatter": "^1.0.11",
         "fast-text-encoding": "^1.0.0",
-        "gaxios": "^4.0.0",
-        "gcp-metadata": "^4.2.0",
-        "gtoken": "^5.0.4",
+        "gaxios": "^5.0.0",
+        "gcp-metadata": "^5.0.0",
+        "gtoken": "^6.1.0",
         "jws": "^4.0.0",
         "lru-cache": "^6.0.0"
       }
     },
     "google-p12-pem": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz",
-      "integrity": "sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz",
+      "integrity": "sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==",
       "requires": {
-        "node-forge": "^0.10.0"
+        "node-forge": "^1.3.1"
       }
     },
     "got": {
@@ -8596,12 +8587,12 @@
       "dev": true
     },
     "gtoken": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.1.tgz",
-      "integrity": "sha512-yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz",
+      "integrity": "sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==",
       "requires": {
-        "gaxios": "^4.0.0",
-        "google-p12-pem": "^3.0.3",
+        "gaxios": "^5.0.1",
+        "google-p12-pem": "^4.0.0",
         "jws": "^4.0.0"
       }
     },
@@ -9524,6 +9515,14 @@
         "ci-info": "^2.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -11179,7 +11178,7 @@
     "module-details-from-path": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz",
-      "integrity": "sha1-EUyUlnPiqKNenTV4hSeqN7Z52is="
+      "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A=="
     },
     "moment": {
       "version": "2.29.4",
@@ -11777,9 +11776,9 @@
       }
     },
     "node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
     },
     "node-gcm": {
       "version": "1.0.5",
@@ -13341,13 +13340,25 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-in-the-middle": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.1.0.tgz",
-      "integrity": "sha512-M2rLKVupQfJ5lf9OvqFGIT+9iVLnTmjgbOmpil12hiSQNn5zJTKGPoIisETNjfK+09vP3rpm1zJajmErpr2sEQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz",
+      "integrity": "sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==",
       "requires": {
         "debug": "^4.1.1",
         "module-details-from-path": "^1.0.3",
-        "resolve": "^1.12.0"
+        "resolve": "^1.22.1"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.22.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+          "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+          "requires": {
+            "is-core-module": "^2.9.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
       }
     },
     "require-main-filename": {
@@ -13451,9 +13462,9 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
     "retry-request": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz",
-      "integrity": "sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz",
+      "integrity": "sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==",
       "requires": {
         "debug": "^4.1.1",
         "extend": "^3.0.2"
@@ -14586,7 +14597,7 @@
     "stubs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-      "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
+      "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="
     },
     "style-loader": {
       "version": "3.3.1",
@@ -14644,6 +14655,11 @@
         "has-flag": "^3.0.0"
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
     "sver-compat": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
@@ -14826,15 +14842,22 @@
       }
     },
     "teeny-request": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.3.tgz",
-      "integrity": "sha512-Ew3aoFzgQEatLA5OBIjdr1DWJUaC1xardG+qbPPo5k/y/3fMwXLxpjh5UB5dVfElktLaQbbMs80chkz53ByvSg==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.2.tgz",
+      "integrity": "sha512-34pe0a4zASseXZCKdeTiIZqSKA8ETHb1EwItZr01PAR3CLPojeAKgSjzeNS4373gi59hNulyDrPKEbh2zO9sCg==",
       "requires": {
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "node-fetch": "^2.6.1",
         "stream-events": "^1.0.5",
-        "uuid": "^8.0.0"
+        "uuid": "^9.0.0"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
+        }
       }
     },
     "temp-dir": {
diff --git a/package.json b/package.json
index 7bbfa5a9a1..ca5f6d26d1 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "@babel/core": "^7.18.13",
     "@babel/preset-env": "^7.19.1",
     "@babel/register": "^7.18.9",
-    "@google-cloud/trace-agent": "^5.1.6",
+    "@google-cloud/trace-agent": "^7.1.2",
     "@parse/node-apn": "^5.1.3",
     "@slack/webhook": "^6.1.0",
     "accepts": "^1.3.8",

From bd4c65cd3e91fdd85f6b2293df6c5a3c2b759c7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:50:39 -0500
Subject: [PATCH 088/134] build(deps): bump @babel/core from 7.18.13 to 7.19.3
 (#14256)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.18.13 to 7.19.3.
- [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.19.3/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 242 +++++++++++++++++++++++++++++++++++++---------
 package.json      |   2 +-
 2 files changed, 199 insertions(+), 45 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1fdfb1cd86..f882be0784 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,20 +27,20 @@
       "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="
     },
     "@babel/core": {
-      "version": "7.18.13",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.13.tgz",
-      "integrity": "sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==",
+      "version": "7.19.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz",
+      "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==",
       "requires": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.18.13",
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-module-transforms": "^7.18.9",
-        "@babel/helpers": "^7.18.9",
-        "@babel/parser": "^7.18.13",
+        "@babel/generator": "^7.19.3",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helpers": "^7.19.0",
+        "@babel/parser": "^7.19.3",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.18.13",
-        "@babel/types": "^7.18.13",
+        "@babel/traverse": "^7.19.3",
+        "@babel/types": "^7.19.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -56,20 +56,60 @@
             "@babel/highlight": "^7.18.6"
           }
         },
+        "@babel/compat-data": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.3.tgz",
+          "integrity": "sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw=="
+        },
         "@babel/generator": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz",
-          "integrity": "sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==",
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz",
+          "integrity": "sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==",
           "requires": {
-            "@babel/types": "^7.18.13",
+            "@babel/types": "^7.19.3",
             "@jridgewell/gen-mapping": "^0.3.2",
             "jsesc": "^2.5.1"
           }
         },
+        "@babel/helper-compilation-targets": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz",
+          "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==",
+          "requires": {
+            "@babel/compat-data": "^7.19.3",
+            "@babel/helper-validator-option": "^7.18.6",
+            "browserslist": "^4.21.3",
+            "semver": "^6.3.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+          "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-module-imports": "^7.18.6",
+            "@babel/helper-simple-access": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/template": "^7.18.10",
+            "@babel/traverse": "^7.19.0",
+            "@babel/types": "^7.19.0"
+          }
+        },
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/highlight": {
           "version": "7.18.6",
@@ -82,9 +122,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz",
-          "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz",
+          "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="
         },
         "@babel/template": {
           "version": "7.18.10",
@@ -97,29 +137,29 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz",
-          "integrity": "sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==",
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz",
+          "integrity": "sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==",
           "requires": {
             "@babel/code-frame": "^7.18.6",
-            "@babel/generator": "^7.18.13",
+            "@babel/generator": "^7.19.3",
             "@babel/helper-environment-visitor": "^7.18.9",
-            "@babel/helper-function-name": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
             "@babel/helper-hoist-variables": "^7.18.6",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/parser": "^7.18.13",
-            "@babel/types": "^7.18.13",
+            "@babel/parser": "^7.19.3",
+            "@babel/types": "^7.19.3",
             "debug": "^4.1.0",
             "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz",
-          "integrity": "sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==",
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz",
+          "integrity": "sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
-            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
         },
@@ -133,6 +173,22 @@
             "@jridgewell/trace-mapping": "^0.3.9"
           }
         },
+        "browserslist": {
+          "version": "4.21.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+          "requires": {
+            "caniuse-lite": "^1.0.30001400",
+            "electron-to-chromium": "^1.4.251",
+            "node-releases": "^2.0.6",
+            "update-browserslist-db": "^1.0.9"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001418",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz",
+          "integrity": "sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg=="
+        },
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -147,6 +203,15 @@
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "update-browserslist-db": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+          "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+          "requires": {
+            "escalade": "^3.1.1",
+            "picocolors": "^1.0.0"
+          }
         }
       }
     },
@@ -796,29 +861,118 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
-      "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
+      "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
       "requires": {
-        "@babel/template": "^7.18.6",
-        "@babel/traverse": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
+        "@babel/code-frame": {
           "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz",
+          "integrity": "sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==",
+          "requires": {
+            "@babel/types": "^7.19.3",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz",
+          "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz",
+          "integrity": "sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.19.3",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.19.3",
+            "@babel/types": "^7.19.3",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
         },
         "@babel/types": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz",
-          "integrity": "sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==",
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz",
+          "integrity": "sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
-            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
+        },
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index ca5f6d26d1..a254cce4f4 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "4.245.2",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@babel/core": "^7.18.13",
+    "@babel/core": "^7.19.3",
     "@babel/preset-env": "^7.19.1",
     "@babel/register": "^7.18.9",
     "@google-cloud/trace-agent": "^7.1.2",

From e75610447f62eab340cde97e95d9d213a7b4dfa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:51:37 -0500
Subject: [PATCH 089/134] build(deps): bump @hapi/hoek from 8.3.1 to 8.5.1 in
 /website/client (#14255)

Bumps [@hapi/hoek](https://github.com/hapijs/hoek) from 8.3.1 to 8.5.1.
- [Release notes](https://github.com/hapijs/hoek/releases)
- [Commits](https://github.com/hapijs/hoek/compare/v8.3.1...v8.5.1)

---
updated-dependencies:
- dependency-name: "@hapi/hoek"
  dependency-type: indirect
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 839bfa361a..84d3f0eb00 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -4356,9 +4356,9 @@
       "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
     },
     "@hapi/hoek": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.3.1.tgz",
-      "integrity": "sha512-75ocgnI7HG/I01iGA3/rs0y6PXydUA/kxhFZM0HoT8NLSTnt/J8Gq03iKl4a4B/2A3iMG0ctXtxr5Hg9SGr1gw=="
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="
     },
     "@hapi/joi": {
       "version": "15.1.1",

From de9f1be7b9ff41d06896ba642159e789f3038c32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:51:58 -0500
Subject: [PATCH 090/134] build(deps): bump js2xmlparser from 4.0.2 to 5.0.0
 (#14251)

Bumps [js2xmlparser](https://github.com/michaelkourlas/node-js2xmlparser) from 4.0.2 to 5.0.0.
- [Release notes](https://github.com/michaelkourlas/node-js2xmlparser/releases)
- [Changelog](https://github.com/michaelkourlas/node-js2xmlparser/blob/master/CHANGES.md)
- [Commits](https://github.com/michaelkourlas/node-js2xmlparser/compare/v4.0.2...v5.0.0)

---
updated-dependencies:
- dependency-name: js2xmlparser
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 f882be0784..5408f938cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10200,9 +10200,9 @@
       }
     },
     "js2xmlparser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
-      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-5.0.0.tgz",
+      "integrity": "sha512-ckXs0Fzd6icWurbeAXuqo+3Mhq2m8pOPygsQjTPh8K5UWgKaUgDSHrdDxAfexmT11xvBKOQ6sgYwPkYc5RW/bg==",
       "requires": {
         "xmlcreate": "^2.0.4"
       }
diff --git a/package.json b/package.json
index a254cce4f4..255188b407 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "helmet": "^4.6.0",
     "image-size": "^1.0.2",
     "in-app-purchase": "^1.11.3",
-    "js2xmlparser": "^4.0.2",
+    "js2xmlparser": "^5.0.0",
     "jsonwebtoken": "^8.5.1",
     "jwks-rsa": "^2.1.4",
     "lodash": "^4.17.21",

From 235eae32b04cc5f67ad4a385ff71ba4c405799a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:52:59 -0500
Subject: [PATCH 091/134] build(deps): bump rate-limiter-flexible from 2.3.10
 to 2.3.11 (#14249)

Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 2.3.10 to 2.3.11.
- [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases)
- [Commits](https://github.com/animir/node-rate-limiter-flexible/commits)

---
updated-dependencies:
- dependency-name: rate-limiter-flexible
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 5408f938cf..39ca889b27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13053,9 +13053,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "rate-limiter-flexible": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.10.tgz",
-      "integrity": "sha512-bXqRBBb85WmnJemw9+xLdA7ezLXwZ+hXcOD8ZzfGMhbus4jHRrjTMXZ1kJqpKnpGu34scZc6f0qYNSxBwO7yrg=="
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.11.tgz",
+      "integrity": "sha512-MFLtfs1llUNBkJxeTkSZD7oAxVg1nZ79bevE2TmqQMbmKGoi8DBua3VAZFz5bsjEr0A6Mbr9AJuf5lvYSCok2Q=="
     },
     "raw-body": {
       "version": "2.5.1",
diff --git a/package.json b/package.json
index 255188b407..0a13a44335 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "paypal-rest-sdk": "^1.8.1",
     "pp-ipn": "^1.1.0",
     "ps-tree": "^1.0.0",
-    "rate-limiter-flexible": "^2.3.10",
+    "rate-limiter-flexible": "^2.3.11",
     "redis": "^3.1.2",
     "regenerator-runtime": "^0.13.9",
     "remove-markdown": "^0.5.0",

From 452b516c6715c8757bc22c6996c81f8705363170 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:53:17 -0500
Subject: [PATCH 092/134] build(deps): bump amplitude-js from 8.21.0 to 8.21.1
 in /website/client (#14248)

Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 8.21.0 to 8.21.1.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases)
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.21.0...v8.21.1)

---
updated-dependencies:
- dependency-name: amplitude-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 14 +++++++-------
 website/client/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 84d3f0eb00..d2585bbcaa 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -22,9 +22,9 @@
       }
     },
     "@amplitude/analytics-connector": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.4.tgz",
-      "integrity": "sha512-6JcE1nxrprJt6pHqqDQb7FXRqJmFHG7KJPe0jNZaAvfll4mWKVqZu8W9IV3XiN1P+xgHIV1NN+i3PLOAZWEhXg==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.5.tgz",
+      "integrity": "sha512-ELAP6ivg+13uSk+TOirGZE/92M+tTbeiQ/i7eXgDO4Hiy00Abf/UxO/rp9WovtxCyeFYTILrujEYxPv5cRQmFw==",
       "requires": {
         "@amplitude/ua-parser-js": "0.7.31"
       }
@@ -13134,11 +13134,11 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
     },
     "amplitude-js": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.0.tgz",
-      "integrity": "sha512-kC01TmmCdDrtms8LhvC/r65FtbmCbNHZ1/jiezXmTH82TsWI/SkN47jKs8CCwjZNakqTBN/hmficiZBUKv4myw==",
+      "version": "8.21.1",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.1.tgz",
+      "integrity": "sha512-02S0EWLTkCYurpKx6o6K7+BbtVHzhCTHDM+jgvCAV5VbbsXdhLqVY7Q6NtAF+Wb8phb9K0GSW1SuDKPy4TY9OA==",
       "requires": {
-        "@amplitude/analytics-connector": "1.4.4",
+        "@amplitude/analytics-connector": "^1.4.5",
         "@amplitude/ua-parser-js": "0.7.31",
         "@amplitude/utils": "^1.10.1",
         "@babel/runtime": "^7.3.4",
diff --git a/website/client/package.json b/website/client/package.json
index f5f7507afa..83058268ae 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -25,7 +25,7 @@
     "@vue/cli-plugin-unit-mocha": "^4.5.15",
     "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^8.21.0",
+    "amplitude-js": "^8.21.1",
     "axios": "^0.25.0",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",

From cc39f6e4e9a90b76cbb5e45066530081be2c18cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:55:11 -0500
Subject: [PATCH 093/134] build(deps): bump vue-router from 3.5.4 to 3.6.5 in
 /website/client (#14228)

Bumps [vue-router](https://github.com/vuejs/router) from 3.5.4 to 3.6.5.
- [Release notes](https://github.com/vuejs/router/releases)
- [Commits](https://github.com/vuejs/router/commits)

---
updated-dependencies:
- dependency-name: vue-router
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 d2585bbcaa..f797e61e84 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -28662,9 +28662,9 @@
       }
     },
     "vue-router": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.4.tgz",
-      "integrity": "sha512-x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ=="
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
+      "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
     },
     "vue-style-loader": {
       "version": "4.1.3",
diff --git a/website/client/package.json b/website/client/package.json
index 83058268ae..d4a8f0e5d4 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -58,7 +58,7 @@
     "vue": "^2.7.10",
     "vue-cli-plugin-storybook": "2.1.0",
     "vue-mugen-scroll": "^0.2.6",
-    "vue-router": "^3.5.4",
+    "vue-router": "^3.6.5",
     "vue-template-compiler": "^2.7.10",
     "vuedraggable": "^2.24.3",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",

From 0322b657b8ce89e520ef2d12528234a62ad0796d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:55:34 -0500
Subject: [PATCH 094/134] build(deps): bump winston from 3.8.1 to 3.8.2
 (#14221)

Bumps [winston](https://github.com/winstonjs/winston) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/winstonjs/winston/releases)
- [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md)
- [Commits](https://github.com/winstonjs/winston/compare/v3.8.1...v3.8.2)

---
updated-dependencies:
- dependency-name: winston
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 13 +++++++------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 39ca889b27..f2911ba1a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10672,9 +10672,9 @@
       }
     },
     "logform": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.1.tgz",
-      "integrity": "sha512-7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz",
+      "integrity": "sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw==",
       "requires": {
         "@colors/colors": "1.5.0",
         "fecha": "^4.2.0",
@@ -16409,10 +16409,11 @@
       "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
     },
     "winston": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.1.tgz",
-      "integrity": "sha512-r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
+      "integrity": "sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==",
       "requires": {
+        "@colors/colors": "1.5.0",
         "@dabh/diagnostics": "^2.0.2",
         "async": "^3.2.3",
         "is-stream": "^2.0.0",
diff --git a/package.json b/package.json
index 0a13a44335..524e8d7452 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "uuid": "^8.3.2",
     "validator": "^13.7.0",
     "vinyl-buffer": "^1.0.1",
-    "winston": "^3.8.1",
+    "winston": "^3.8.2",
     "winston-loggly-bulk": "^3.2.1",
     "xml2js": "^0.4.23"
   },

From 37791dfe8d7c5345da54ac8365ba536b8ad8e4ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:56:22 -0500
Subject: [PATCH 095/134] build(deps): bump intro.js from 5.1.0 to 6.0.0 in
 /website/client (#14122)

Bumps [intro.js](https://github.com/usablica/intro.js) from 5.1.0 to 6.0.0.
- [Release notes](https://github.com/usablica/intro.js/releases)
- [Commits](https://github.com/usablica/intro.js/compare/v5.1.0...v6.0.0)

---
updated-dependencies:
- dependency-name: intro.js
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 f797e61e84..dfb8001b88 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -20154,9 +20154,9 @@
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
     "intro.js": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-5.1.0.tgz",
-      "integrity": "sha512-zwWl/duTh00eeNcZRU4o4/xxloNYPFKs4n4lMRDNx59jZr+qRI0jSOnzqYMOuVftD4beGrmxBHz4k8qp9/dCMA=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-6.0.0.tgz",
+      "integrity": "sha512-ZUiR6BoLSvPSlLG0boewnWVgji1fE1gBvP/pyw5pgCKXEDQz1mMeUxarggClPNs71UTq364LwSk9zxz17A9gaQ=="
     },
     "invariant": {
       "version": "2.2.4",
diff --git a/website/client/package.json b/website/client/package.json
index d4a8f0e5d4..9bdb34142e 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -41,7 +41,7 @@
     "habitica-markdown": "^3.0.0",
     "hellojs": "^1.19.5",
     "inspectpack": "^4.7.1",
-    "intro.js": "^5.1.0",
+    "intro.js": "^6.0.0",
     "jquery": "^3.6.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",

From 9ddd0f29d085cc33ef907ea3598ba21ff42fae39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:57:26 -0500
Subject: [PATCH 096/134] build(deps): bump passport from 0.5.0 to 0.6.0
 (#14043)

Bumps [passport](https://github.com/jaredhanson/passport) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/jaredhanson/passport/releases)
- [Changelog](https://github.com/jaredhanson/passport/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jaredhanson/passport/compare/v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: passport
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f2911ba1a1..4710a9803b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12539,12 +12539,13 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "passport": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.5.0.tgz",
-      "integrity": "sha512-ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
+      "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
       "requires": {
         "passport-strategy": "1.x.x",
-        "pause": "0.0.1"
+        "pause": "0.0.1",
+        "utils-merge": "^1.0.1"
       }
     },
     "passport-facebook": {
@@ -12655,7 +12656,7 @@
     "pause": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
-      "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10="
+      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
     },
     "pause-stream": {
       "version": "0.0.11",
diff --git a/package.json b/package.json
index 524e8d7452..8792d44ff8 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "nconf": "^0.12.0",
     "node-gcm": "^1.0.5",
     "on-headers": "^1.0.2",
-    "passport": "^0.5.0",
+    "passport": "^0.6.0",
     "passport-facebook": "^3.0.0",
     "passport-google-oauth2": "^0.2.0",
     "passport-google-oauth20": "2.0.0",

From 0ec7784fb128f0ce0addecc9980c2fff080417ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:59:32 -0500
Subject: [PATCH 097/134] build(deps): bump @vue/cli-plugin-router in
 /website/client (#14121)

Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router) from 4.5.15 to 5.0.8.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli-plugin-router)

---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-router"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 320 +++++++++++++++++++++++++++++--
 website/client/package.json      |   2 +-
 2 files changed, 302 insertions(+), 20 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index dfb8001b88..7e78b8eb64 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -4818,6 +4818,31 @@
         "warning": "^3.0.0"
       }
     },
+    "@sideway/address": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
+      "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
+      "requires": {
+        "@hapi/hoek": "^9.0.0"
+      },
+      "dependencies": {
+        "@hapi/hoek": {
+          "version": "9.3.0",
+          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+          "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
+        }
+      }
+    },
+    "@sideway/formula": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
+      "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg=="
+    },
+    "@sideway/pinpoint": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz",
@@ -12364,29 +12389,39 @@
       }
     },
     "@vue/cli-plugin-router": {
-      "version": "4.5.15",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.15.tgz",
-      "integrity": "sha512-q7Y6kP9b3k55Ca2j59xJ7XPA6x+iSRB+N4ac0ZbcL1TbInVQ4j5wCzyE+uqid40hLy4fUdlpl4X9fHJEwuVxPA==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz",
+      "integrity": "sha512-Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg==",
       "requires": {
-        "@vue/cli-shared-utils": "^4.5.15"
+        "@vue/cli-shared-utils": "^5.0.8"
       },
       "dependencies": {
-        "@vue/cli-shared-utils": {
-          "version": "4.5.15",
-          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.15.tgz",
-          "integrity": "sha512-SKaej9hHzzjKSOw1NlFmc6BSE0vcqUQMQiv1cxQ2DhVyy4QxZXBmzmiLBUBe+hYZZs1neXW7n//udeN9bCAY+Q==",
+        "@achrinza/node-ipc": {
+          "version": "9.2.5",
+          "resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz",
+          "integrity": "sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ==",
           "requires": {
-            "@hapi/joi": "^15.0.1",
-            "chalk": "^2.4.2",
+            "@node-ipc/js-queue": "2.0.3",
+            "event-pubsub": "4.3.0",
+            "js-message": "1.0.7"
+          }
+        },
+        "@vue/cli-shared-utils": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz",
+          "integrity": "sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ==",
+          "requires": {
+            "@achrinza/node-ipc": "^9.2.5",
+            "chalk": "^4.1.2",
             "execa": "^1.0.0",
+            "joi": "^17.4.0",
             "launch-editor": "^2.2.1",
-            "lru-cache": "^5.1.1",
-            "node-ipc": "^9.1.1",
-            "open": "^6.3.0",
-            "ora": "^3.4.0",
+            "lru-cache": "^6.0.0",
+            "node-fetch": "^2.6.7",
+            "open": "^8.0.2",
+            "ora": "^5.3.0",
             "read-pkg": "^5.1.1",
-            "request": "^2.88.2",
-            "semver": "^6.1.0",
+            "semver": "^7.3.4",
             "strip-ansi": "^6.0.0"
           }
         },
@@ -12395,10 +12430,152 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
           "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "cli-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+          "requires": {
+            "restore-cursor": "^3.1.0"
+          }
+        },
+        "cli-spinners": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
+          "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "is-docker": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+          "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
+        },
+        "is-wsl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+          "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+          "requires": {
+            "is-docker": "^2.0.0"
+          }
+        },
+        "js-message": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz",
+          "integrity": "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="
+        },
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+          "requires": {
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+        },
+        "node-fetch": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "open": {
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+          "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+          "requires": {
+            "define-lazy-prop": "^2.0.0",
+            "is-docker": "^2.1.1",
+            "is-wsl": "^2.2.0"
+          }
+        },
+        "ora": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+          "requires": {
+            "bl": "^4.1.0",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-spinners": "^2.5.0",
+            "is-interactive": "^1.0.0",
+            "is-unicode-supported": "^0.1.0",
+            "log-symbols": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "wcwidth": "^1.0.1"
+          }
+        },
+        "restore-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         },
         "strip-ansi": {
           "version": "6.0.1",
@@ -12407,6 +12584,38 @@
           "requires": {
             "ansi-regex": "^5.0.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -14484,6 +14693,37 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
     },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "bluebird": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
@@ -16507,6 +16747,11 @@
         "clone": "^1.0.2"
       }
     },
+    "define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -20418,6 +20663,11 @@
       "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz",
       "integrity": "sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA=="
     },
+    "is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
+    },
     "is-map": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
@@ -20557,6 +20807,11 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
+    },
     "is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -20674,6 +20929,33 @@
         }
       }
     },
+    "joi": {
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz",
+      "integrity": "sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==",
+      "requires": {
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/topo": "^5.0.0",
+        "@sideway/address": "^4.1.3",
+        "@sideway/formula": "^3.0.0",
+        "@sideway/pinpoint": "^2.0.0"
+      },
+      "dependencies": {
+        "@hapi/hoek": {
+          "version": "9.3.0",
+          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+          "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
+        },
+        "@hapi/topo": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+          "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+          "requires": {
+            "@hapi/hoek": "^9.0.0"
+          }
+        }
+      }
+    },
     "jquery": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
diff --git a/website/client/package.json b/website/client/package.json
index 9bdb34142e..524b1f7adb 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -21,7 +21,7 @@
     "@storybook/vue": "6.3.13",
     "@vue/cli-plugin-babel": "^4.5.15",
     "@vue/cli-plugin-eslint": "^4.5.19",
-    "@vue/cli-plugin-router": "^4.5.15",
+    "@vue/cli-plugin-router": "^5.0.8",
     "@vue/cli-plugin-unit-mocha": "^4.5.15",
     "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",

From 21a1b9449b44c40356cfddea835f7e8505df5d39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 15:22:57 -0500
Subject: [PATCH 098/134] build(deps): bump body-parser from 1.20.0 to 1.20.1
 (#14271)

Bumps [body-parser](https://github.com/expressjs/body-parser) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.20.0...1.20.1)

---
updated-dependencies:
- dependency-name: body-parser
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 43 ++++++++-----------------------------------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4710a9803b..24d7eda25a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4376,9 +4376,9 @@
       "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
     },
     "body-parser": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "requires": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
@@ -4388,7 +4388,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.10.3",
+        "qs": "6.11.0",
         "raw-body": "2.5.1",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -4402,28 +4402,6 @@
             "ms": "2.0.0"
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
-        "destroy": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-          "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-        },
-        "http-errors": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-          "requires": {
-            "depd": "2.0.0",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.2.0",
-            "statuses": "2.0.1",
-            "toidentifier": "1.0.1"
-          }
-        },
         "iconv-lite": {
           "version": "0.4.24",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -4435,7 +4413,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "on-finished": {
           "version": "2.4.1",
@@ -4446,17 +4424,12 @@
           }
         },
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
           "requires": {
             "side-channel": "^1.0.4"
           }
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
         }
       }
     },
diff --git a/package.json b/package.json
index 8792d44ff8..15cfa6de54 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "apidoc": "^0.53.0",
     "apple-auth": "^1.0.7",
     "bcrypt": "^5.1.0",
-    "body-parser": "^1.20.0",
+    "body-parser": "^1.20.1",
     "bootstrap": "^4.6.0",
     "compression": "^1.7.4",
     "cookie-session": "^2.0.0",

From 15c68abafaf2c38f494ad656265f015ed1dc911e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 15:24:55 -0500
Subject: [PATCH 099/134] build(deps): bump stripe from 8.222.0 to 10.13.0
 (#14273)

Bumps [stripe](https://github.com/stripe/stripe-node) from 8.222.0 to 10.13.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v8.222.0...v10.13.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 24d7eda25a..e31474a695 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14704,18 +14704,18 @@
       }
     },
     "stripe": {
-      "version": "8.222.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.222.0.tgz",
-      "integrity": "sha512-hrA79fjmN2Eb6K3kxkDzU4ODeVGGjXQsuVaAPSUro6I9MM3X+BvIsVqdphm3BXWfimAGFvUqWtPtHy25mICY1w==",
+      "version": "10.13.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-10.13.0.tgz",
+      "integrity": "sha512-Uq+hToFOXHU+BHgzUmop2Monc0dM8pluXcoCOrgz9oY8XBDnSPOuXAJdKa04x5DCEgKWrFMHncQfAgwqzSgaTQ==",
       "requires": {
         "@types/node": ">=8.1.0",
-        "qs": "^6.10.3"
+        "qs": "^6.11.0"
       },
       "dependencies": {
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
           "requires": {
             "side-channel": "^1.0.4"
           }
diff --git a/package.json b/package.json
index 15cfa6de54..b8098fd39e 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.0",
-    "stripe": "^8.222.0",
+    "stripe": "^10.13.0",
     "superagent": "^8.0.2",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",

From 97be341ff668731323b4b7dc33eeef3f97b868de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 15:40:30 -0500
Subject: [PATCH 100/134] build(deps): bump jwks-rsa from 2.1.4 to 2.1.5
 (#14284)

Bumps [jwks-rsa](https://github.com/auth0/node-jwks-rsa) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/auth0/node-jwks-rsa/releases)
- [Changelog](https://github.com/auth0/node-jwks-rsa/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jwks-rsa/compare/v2.1.4...v2.1.5)

---
updated-dependencies:
- dependency-name: jwks-rsa
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 44 ++++++++++++++++++++++----------------------
 package.json      |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e31474a695..d5a0a3275d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2617,9 +2617,9 @@
       "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "@types/express": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-      "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
+      "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
       "requires": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.18",
@@ -2628,9 +2628,9 @@
       }
     },
     "@types/express-serve-static-core": {
-      "version": "4.17.28",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
-      "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
+      "version": "4.17.31",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
+      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
       "requires": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -2662,9 +2662,9 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
     },
     "@types/jsonwebtoken": {
-      "version": "8.5.8",
-      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz",
-      "integrity": "sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==",
+      "version": "8.5.9",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz",
+      "integrity": "sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==",
       "requires": {
         "@types/node": "*"
       }
@@ -2678,9 +2678,9 @@
       }
     },
     "@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
     },
     "@types/minimatch": {
       "version": "3.0.3",
@@ -2726,11 +2726,11 @@
       }
     },
     "@types/serve-static": {
-      "version": "1.13.10",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-      "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
       "requires": {
-        "@types/mime": "^1",
+        "@types/mime": "*",
         "@types/node": "*"
       }
     },
@@ -10323,14 +10323,14 @@
       }
     },
     "jwks-rsa": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.1.4.tgz",
-      "integrity": "sha512-mpArfgPkUpX11lNtGxsF/szkasUcbWHGplZl/uFvFO2NuMHmt0dQXIihh0rkPU2yQd5niQtuUHbXnG/WKiXF6Q==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.1.5.tgz",
+      "integrity": "sha512-IODtn1SwEm7n6GQZnQLY0oxKDrMh7n/jRH1MzE8mlxWMrh2NnMyOsXTebu8vJ1qCpmuTJcL4DdiE0E4h8jnwsA==",
       "requires": {
-        "@types/express": "^4.17.13",
-        "@types/jsonwebtoken": "^8.5.8",
+        "@types/express": "^4.17.14",
+        "@types/jsonwebtoken": "^8.5.9",
         "debug": "^4.3.4",
-        "jose": "^2.0.5",
+        "jose": "^2.0.6",
         "limiter": "^1.1.5",
         "lru-memoizer": "^2.1.4"
       },
diff --git a/package.json b/package.json
index b8098fd39e..6b39083638 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "in-app-purchase": "^1.11.3",
     "js2xmlparser": "^5.0.0",
     "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^2.1.4",
+    "jwks-rsa": "^2.1.5",
     "lodash": "^4.17.21",
     "merge-stream": "^2.0.0",
     "method-override": "^3.0.0",

From cf834f57d7588f19d2fc1385503911a78810463f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 15:40:45 -0500
Subject: [PATCH 101/134] build(deps): bump ansi-html and webpack-dev-server in
 /website/client (#14285)

Removes [ansi-html](https://github.com/Tjatse/ansi-html). It's no longer used after updating ancestor dependency [webpack-dev-server](https://github.com/webpack/webpack-dev-server). These dependencies need to be updated together.


Removes `ansi-html`

Updates `webpack-dev-server` from 3.11.2 to 3.11.3
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.11.3/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.2...v3.11.3)

---
updated-dependencies:
- dependency-name: ansi-html
  dependency-type: indirect
- dependency-name: webpack-dev-server
  dependency-type: indirect
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 7e78b8eb64..0e8cc08b12 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -13430,11 +13430,6 @@
         }
       }
     },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
-    },
     "ansi-html-community": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
@@ -29298,11 +29293,11 @@
       }
     },
     "webpack-dev-server": {
-      "version": "3.11.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
-      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
+      "version": "3.11.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
+      "integrity": "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==",
       "requires": {
-        "ansi-html": "0.0.7",
+        "ansi-html-community": "0.0.8",
         "bonjour": "^3.5.0",
         "chokidar": "^2.1.8",
         "compression": "^1.7.4",
@@ -29340,7 +29335,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
         },
         "http-proxy-middleware": {
           "version": "0.19.1",
@@ -29366,7 +29361,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "requires": {
             "ansi-regex": "^2.0.0"
           }

From 84c4b3536cacecc62d5a4c179fd04e3a8a9d6f79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 15:53:10 -0500
Subject: [PATCH 102/134] build(deps): bump minimist, minimist and mkdirp in
 /website/client (#14286)

Bumps [minimist](https://github.com/minimistjs/minimist), [minimist](https://github.com/minimistjs/minimist) and [mkdirp](https://github.com/isaacs/node-mkdirp). These dependencies needed to be updated together.

Updates `minimist` from 1.2.5 to 1.2.7
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7)

Updates `minimist` from 1.2.0 to 1.2.7
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7)

Updates `mkdirp` from 0.5.1 to 0.5.6
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/compare/0.5.1...v0.5.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
- dependency-name: minimist
  dependency-type: indirect
- dependency-name: mkdirp
  dependency-type: indirect
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 84 +++-----------------------------
 1 file changed, 7 insertions(+), 77 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 0e8cc08b12..18b918acef 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -12821,11 +12821,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -18702,11 +18697,6 @@
             "brace-expansion": "^1.1.7"
           }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "optional": true
-        },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
@@ -18724,14 +18714,6 @@
             "minipass": "^2.2.1"
           }
         },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
         "ms": {
           "version": "2.1.1",
           "bundled": true,
@@ -18854,13 +18836,6 @@
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "optional": true
-            }
           }
         },
         "readable-stream": {
@@ -21144,13 +21119,6 @@
       "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "requires": {
         "minimist": "^1.2.5"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        }
       }
     },
     "jsonfile": {
@@ -21813,9 +21781,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
     },
     "minipass": {
       "version": "3.1.1",
@@ -21909,18 +21877,11 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
+        "minimist": "^1.2.6"
       }
     },
     "mocha": {
@@ -21991,11 +21952,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
         "mkdirp": {
           "version": "0.5.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
@@ -23459,19 +23415,6 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
         }
       }
     },
@@ -29187,19 +29130,6 @@
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
         "serialize-javascript": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",

From 39be8db4f9e8f901c0ed58a79582647d3ef801c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 17:34:16 -0500
Subject: [PATCH 103/134] build(deps): bump axios from 0.25.0 to 0.27.2 in
 /website/client (#14007)

Bumps [axios](https://github.com/axios/axios) from 0.25.0 to 0.27.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.25.0...v0.27.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 26 ++++++++++++++++++++++----
 website/client/package.json      |  2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 18b918acef..84268c960f 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -14037,11 +14037,29 @@
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "axios": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
       "requires": {
-        "follow-redirects": "^1.14.7"
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
+      },
+      "dependencies": {
+        "follow-redirects": {
+          "version": "1.15.2",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+          "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+        },
+        "form-data": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
       }
     },
     "axios-progress-bar": {
diff --git a/website/client/package.json b/website/client/package.json
index 524b1f7adb..21cad38b2b 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -26,7 +26,7 @@
     "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",
     "amplitude-js": "^8.21.1",
-    "axios": "^0.25.0",
+    "axios": "^0.27.2",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
     "bootstrap": "^4.6.0",

From f43a0d82892850e1acede733b2da4526b0ca5b04 Mon Sep 17 00:00:00 2001
From: Sky Chrastina <mirrorcoloured@gmail.com>
Date: Wed, 12 Oct 2022 14:44:22 -0600
Subject: [PATCH 104/134] Add checkmark to completed quests in shop (#14269)

* add 'completed' property to quest items

* show checkmark on completed quests in the shop

* add 'completed' property to quest items

* show checkmark on completed quests in the shop
---
 .../client/src/components/shops/shopItem.vue   | 18 ++++++++++++++++++
 website/common/script/libs/getItemInfo.js      |  1 +
 2 files changed, 19 insertions(+)

diff --git a/website/client/src/components/shops/shopItem.vue b/website/client/src/components/shops/shopItem.vue
index cd673cdc2c..2fdfd6cba4 100644
--- a/website/client/src/components/shops/shopItem.vue
+++ b/website/client/src/components/shops/shopItem.vue
@@ -31,6 +31,11 @@
           class="svg-icon inline lock"
           v-html="icons.lock"
         ></span>
+        <span
+          v-if="item.completed"
+          class="svg-icon inline check"
+          v-html="icons.check"
+        ></span>
         <span
           v-if="item.isSuggested"
           class="suggestedDot"
@@ -200,6 +205,16 @@
     color: $gray-200;
   }
 
+  span.svg-icon.inline.check {
+    height: 12px;
+    width: 10px;
+    position: absolute;
+    left: 8px;
+    top: 8px;
+    margin-top: 0;
+    color: $gray-200;
+  }
+
   span.badge.badge-round.badge-item.badge-clock {
     height: 24px;
     width: 24px;
@@ -246,6 +261,7 @@ import svgGem from '@/assets/svg/gem.svg';
 import svgGold from '@/assets/svg/gold.svg';
 import svgHourglasses from '@/assets/svg/hourglass.svg';
 import svgLock from '@/assets/svg/lock.svg';
+import svgCheck from '@/assets/svg/check.svg';
 import svgClock from '@/assets/svg/clock.svg';
 
 import EquipmentAttributesPopover from '@/components/inventory/equipment/attributesPopover';
@@ -297,6 +313,7 @@ export default {
         gems: svgGem,
         gold: svgGold,
         lock: svgLock,
+        check: svgCheck,
         hourglasses: svgHourglasses,
         clock: svgClock,
       }),
@@ -350,6 +367,7 @@ export default {
         'highlight-border': this.highlightBorder,
         suggested: this.item.isSuggested,
         locked: this.item.locked,
+        completed: this.item.completed,
       };
     },
     countdownString () {
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index 1d63c53ce1..39ad956163 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -152,6 +152,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
           ? content.quests[item.previous].text(language)
           : null,
         unlockCondition: item.unlockCondition,
+        completed: user.achievements.quests[item.key] !== undefined,
         drop: item.drop,
         boss: item.boss,
         collect: item.collect ? _mapValues(item.collect, o => ({

From 0b2cf5bceb11bdf14174340e2e6d5da60090e218 Mon Sep 17 00:00:00 2001
From: Antonio Sansotta <Tundrian@users.noreply.github.com>
Date: Wed, 12 Oct 2022 16:46:36 -0400
Subject: [PATCH 105/134] Fixes issue #14175 - Consolidate Challenge category
 options list to common file (#14201)

* Issue #14175 - Created a categoryOptions.js file in website/common/script/content to store list of category Options. Imported and added the list to website/client/src/components : challenges/challengeModal, challenges/sidebar, groups/groupFormModal, and groups/groupSidebar. This replaced the statically typed lists that previously existed. Tested the challengeModal and sidebar but unable to test the groups files due to credit card requirements. -@Tundrian

* Issue #14175 - Created a categoryOptions.js file in website/common/script/content to store list of category Options. Imported and added the list to website/client/src/components : challenges/challengeModal, challenges/sidebar, groups/groupFormModal, and groups/groupSidebar. This replaced the statically typed lists that previously existed. Tested the challengeModal and sidebar but unable to test the groups files due to credit card requirements. -@Tundrian

Co-authored-by: SabreCat <sabe@habitica.com>
---
 .../components/challenges/challengeModal.vue  | 60 +------------------
 .../src/components/challenges/sidebar.vue     | 60 +------------------
 .../src/components/groups/groupFormModal.vue  | 60 +------------------
 .../src/components/groups/groupSidebar.vue    | 60 +------------------
 .../common/script/content/categoryOptions.js  | 60 +++++++++++++++++++
 5 files changed, 68 insertions(+), 232 deletions(-)
 create mode 100644 website/common/script/content/categoryOptions.js

diff --git a/website/client/src/components/challenges/challengeModal.vue b/website/client/src/components/challenges/challengeModal.vue
index 35de6ff8b8..863cdcb1d8 100644
--- a/website/client/src/components/challenges/challengeModal.vue
+++ b/website/client/src/components/challenges/challengeModal.vue
@@ -280,6 +280,7 @@ import markdownDirective from '@/directives/markdown';
 import { userStateMixin } from '../../mixins/userState';
 
 import { TAVERN_ID, MIN_SHORTNAME_SIZE_FOR_CHALLENGES, MAX_SUMMARY_SIZE_FOR_CHALLENGES } from '@/../../common/script/constants';
+import CategoryOptions from '@/../../common/script/content/categoryOptions';
 
 export default {
   directives: {
@@ -288,64 +289,7 @@ export default {
   mixins: [userStateMixin],
   props: ['groupId'],
   data () {
-    const categoryOptions = [
-      {
-        label: 'habitica_official',
-        key: 'habitica_official',
-      },
-      {
-        label: 'academics',
-        key: 'academics',
-      },
-      {
-        label: 'advocacy_causes',
-        key: 'advocacy_causes',
-      },
-      {
-        label: 'creativity',
-        key: 'creativity',
-      },
-      {
-        label: 'entertainment',
-        key: 'entertainment',
-      },
-      {
-        label: 'finance',
-        key: 'finance',
-      },
-      {
-        label: 'health_fitness',
-        key: 'health_fitness',
-      },
-      {
-        label: 'hobbies_occupations',
-        key: 'hobbies_occupations',
-      },
-      {
-        label: 'location_based',
-        key: 'location_based',
-      },
-      {
-        label: 'mental_health',
-        key: 'mental_health',
-      },
-      {
-        label: 'getting_organized',
-        key: 'getting_organized',
-      },
-      {
-        label: 'self_improvement',
-        key: 'self_improvement',
-      },
-      {
-        label: 'spirituality',
-        key: 'spirituality',
-      },
-      {
-        label: 'time_management',
-        key: 'time_management',
-      },
-    ];
+    const categoryOptions = CategoryOptions;
     const hashedCategories = {};
     categoryOptions.forEach(category => {
       hashedCategories[category.key] = category.label;
diff --git a/website/client/src/components/challenges/sidebar.vue b/website/client/src/components/challenges/sidebar.vue
index 827d07dcac..540460fbe9 100644
--- a/website/client/src/components/challenges/sidebar.vue
+++ b/website/client/src/components/challenges/sidebar.vue
@@ -89,70 +89,14 @@
 import throttle from 'lodash/throttle';
 import FilterSidebar from '@/components/ui/filterSidebar';
 import FilterGroup from '@/components/ui/filterGroup';
+import CategoryOptions from '@/../../common/script/content/categoryOptions';
 
 export default {
   components: { FilterGroup, FilterSidebar },
   data () {
     return {
       categoryFilters: [],
-      categoryOptions: [
-        {
-          label: 'habitica_official',
-          key: 'habitica_official',
-        },
-        {
-          label: 'academics',
-          key: 'academics',
-        },
-        {
-          label: 'advocacy_causes',
-          key: 'advocacy_causes',
-        },
-        {
-          label: 'creativity',
-          key: 'creativity',
-        },
-        {
-          label: 'entertainment',
-          key: 'entertainment',
-        },
-        {
-          label: 'finance',
-          key: 'finance',
-        },
-        {
-          label: 'health_fitness',
-          key: 'health_fitness',
-        },
-        {
-          label: 'hobbies_occupations',
-          key: 'hobbies_occupations',
-        },
-        {
-          label: 'location_based',
-          key: 'location_based',
-        },
-        {
-          label: 'mental_health',
-          key: 'mental_health',
-        },
-        {
-          label: 'getting_organized',
-          key: 'getting_organized',
-        },
-        {
-          label: 'self_improvement',
-          key: 'self_improvement',
-        },
-        {
-          label: 'spirituality',
-          key: 'spirituality',
-        },
-        {
-          label: 'time_management',
-          key: 'time_management',
-        },
-      ],
+      categoryOptions: CategoryOptions,
       membershipFilters: [],
       membershipOptions: [
         {
diff --git a/website/client/src/components/groups/groupFormModal.vue b/website/client/src/components/groups/groupFormModal.vue
index e2b60561de..550c7ac292 100644
--- a/website/client/src/components/groups/groupFormModal.vue
+++ b/website/client/src/components/groups/groupFormModal.vue
@@ -379,6 +379,7 @@ import informationIcon from '@/assets/svg/information.svg';
 
 import { MAX_SUMMARY_SIZE_FOR_GUILDS } from '@/../../common/script/constants';
 import { userStateMixin } from '../../mixins/userState';
+import CategoryOptions from '@/../../common/script/content/categoryOptions';
 
 // @TODO: Not sure the best way to pass party creating status
 // Since we need the modal in the header, passing props doesn't work
@@ -410,64 +411,7 @@ export default {
         allowGuildInvitationsFromNonMembers: true,
         bannedWordsAllowed: null,
       },
-      categoryOptions: [
-        {
-          label: 'habitica_official',
-          key: 'habitica_official',
-        },
-        {
-          label: 'academics',
-          key: 'academics',
-        },
-        {
-          label: 'advocacy_causes',
-          key: 'advocacy_causes',
-        },
-        {
-          label: 'creativity',
-          key: 'creativity',
-        },
-        {
-          label: 'entertainment',
-          key: 'entertainment',
-        },
-        {
-          label: 'finance',
-          key: 'finance',
-        },
-        {
-          label: 'health_fitness',
-          key: 'health_fitness',
-        },
-        {
-          label: 'hobbies_occupations',
-          key: 'hobbies_occupations',
-        },
-        {
-          label: 'location_based',
-          key: 'location_based',
-        },
-        {
-          label: 'mental_health',
-          key: 'mental_health',
-        },
-        {
-          label: 'getting_organized',
-          key: 'getting_organized',
-        },
-        {
-          label: 'recovery_support_groups',
-          key: 'recovery_support_groups',
-        },
-        {
-          label: 'spirituality',
-          key: 'spirituality',
-        },
-        {
-          label: 'time_management',
-          key: 'time_management',
-        },
-      ],
+      categoryOptions: CategoryOptions,
       showCategorySelect: false,
       members: [],
       inviteMembers: false,
diff --git a/website/client/src/components/groups/groupSidebar.vue b/website/client/src/components/groups/groupSidebar.vue
index 6b43a42249..5bd3cd5f4d 100644
--- a/website/client/src/components/groups/groupSidebar.vue
+++ b/website/client/src/components/groups/groupSidebar.vue
@@ -86,6 +86,7 @@
 import throttle from 'lodash/throttle';
 import FilterSidebar from '@/components/ui/filterSidebar';
 import FilterGroup from '@/components/ui/filterGroup';
+import CategoryOptions from '@/../../common/script/content/categoryOptions';
 
 // TODO use checkbox-component to add/remove entries to *Filters, but without the v-model binding
 
@@ -94,64 +95,7 @@ export default {
   data () {
     return {
       categoryFilters: [],
-      categoryOptions: [
-        {
-          label: 'habitica_official',
-          key: 'habitica_official',
-        },
-        {
-          label: 'academics',
-          key: 'academics',
-        },
-        {
-          label: 'advocacy_causes',
-          key: 'advocacy_causes',
-        },
-        {
-          label: 'creativity',
-          key: 'creativity',
-        },
-        {
-          label: 'entertainment',
-          key: 'entertainment',
-        },
-        {
-          label: 'finance',
-          key: 'finance',
-        },
-        {
-          label: 'health_fitness',
-          key: 'health_fitness',
-        },
-        {
-          label: 'hobbies_occupations',
-          key: 'hobbies_occupations',
-        },
-        {
-          label: 'location_based',
-          key: 'location_based',
-        },
-        {
-          label: 'mental_health',
-          key: 'mental_health',
-        },
-        {
-          label: 'getting_organized',
-          key: 'getting_organized',
-        },
-        {
-          label: 'recovery_support_groups',
-          key: 'recovery_support_groups',
-        },
-        {
-          label: 'spirituality',
-          key: 'spirituality',
-        },
-        {
-          label: 'time_management',
-          key: 'time_management',
-        },
-      ],
+      categoryOptions: CategoryOptions,
       roleFilters: [],
       roleOptions: [
         {
diff --git a/website/common/script/content/categoryOptions.js b/website/common/script/content/categoryOptions.js
new file mode 100644
index 0000000000..d71ecc5a37
--- /dev/null
+++ b/website/common/script/content/categoryOptions.js
@@ -0,0 +1,60 @@
+const categoryOptions = [
+  {
+    label: 'habitica_official',
+    key: 'habitica_official',
+  },
+  {
+    label: 'academics',
+    key: 'academics',
+  },
+  {
+    label: 'advocacy_causes',
+    key: 'advocacy_causes',
+  },
+  {
+    label: 'creativity',
+    key: 'creativity',
+  },
+  {
+    label: 'entertainment',
+    key: 'entertainment',
+  },
+  {
+    label: 'finance',
+    key: 'finance',
+  },
+  {
+    label: 'health_fitness',
+    key: 'health_fitness',
+  },
+  {
+    label: 'hobbies_occupations',
+    key: 'hobbies_occupations',
+  },
+  {
+    label: 'location_based',
+    key: 'location_based',
+  },
+  {
+    label: 'mental_health',
+    key: 'mental_health',
+  },
+  {
+    label: 'getting_organized',
+    key: 'getting_organized',
+  },
+  {
+    label: 'self_improvement',
+    key: 'self_improvement',
+  },
+  {
+    label: 'spirituality',
+    key: 'spirituality',
+  },
+  {
+    label: 'time_management',
+    key: 'time_management',
+  },
+];
+
+export default categoryOptions;

From 8f26a22bd400df7cdadfbe7f47cab02e2fe9f06a Mon Sep 17 00:00:00 2001
From: Alex <aleksandrosansan@gmail.com>
Date: Wed, 12 Oct 2022 23:47:46 +0300
Subject: [PATCH 106/134] Update test.yml (#14187)

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index daf46a0930..a91df5e54a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,6 +2,9 @@ name: Test
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest

From a4326498d12327f2473cd977c058866dece2a236 Mon Sep 17 00:00:00 2001
From: Anton de Regt <antonderegt@pm.me>
Date: Wed, 12 Oct 2022 22:51:56 +0200
Subject: [PATCH 107/134] Group category update issue (#14186)

* Overwrite arrays instead of merging

* Test removing a category

* Fix previous duplicated categories on group edit
---
 .../v3/integration/groups/PUT-groups.test.js  | 36 +++++++++++++++++++
 website/server/controllers/api-v3/groups.js   | 12 ++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/test/api/v3/integration/groups/PUT-groups.test.js b/test/api/v3/integration/groups/PUT-groups.test.js
index 36bdfdd7d4..77d4ad6487 100644
--- a/test/api/v3/integration/groups/PUT-groups.test.js
+++ b/test/api/v3/integration/groups/PUT-groups.test.js
@@ -11,6 +11,12 @@ describe('PUT /group', () => {
   const groupName = 'Test Public Guild';
   const groupType = 'guild';
   const groupUpdatedName = 'Test Public Guild Updated';
+  const groupCategories = [
+    {
+      slug: 'initialCat',
+      name: 'Initial Category',
+    },
+  ];
 
   beforeEach(async () => {
     const { group, groupLeader, members } = await createAndPopulateGroup({
@@ -18,6 +24,7 @@ describe('PUT /group', () => {
         name: groupName,
         type: groupType,
         privacy: 'public',
+        categories: groupCategories,
       },
       members: 1,
     });
@@ -61,6 +68,35 @@ describe('PUT /group', () => {
     expect(updatedGroup.categories[0].name).to.eql(categories[0].name);
   });
 
+  it('removes the initial group category', async () => {
+    const categories = [];
+
+    const updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, {
+      categories,
+    });
+
+    expect(updatedGroup.categories.length).to.equal(0);
+  });
+
+  it('removes duplicate group categories', async () => {
+    const categories = [
+      {
+        slug: 'newCat',
+        name: 'New Category',
+      },
+      {
+        slug: 'newCat',
+        name: 'New Category',
+      },
+    ];
+
+    const updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, {
+      categories,
+    });
+
+    expect(updatedGroup.categories.length).to.equal(1);
+  });
+
   it('allows an admin to update a guild', async () => {
     const updatedGroup = await adminUser.put(`/groups/${groupToUpdate._id}`, {
       name: groupUpdatedName,
diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js
index cfa582ecd9..c16ba61c7e 100644
--- a/website/server/controllers/api-v3/groups.js
+++ b/website/server/controllers/api-v3/groups.js
@@ -492,7 +492,17 @@ api.updateGroup = {
 
     if (req.body.leader !== user._id && group.hasNotCancelled()) throw new NotAuthorized(res.t('cannotChangeLeaderWithActiveGroupPlan'));
 
-    _.assign(group, _.merge(group.toObject(), Group.sanitizeUpdate(req.body)));
+    const handleArrays = (currentValue, updatedValue) => {
+      if (!_.isArray(currentValue)) {
+        return undefined;
+      }
+
+      // Previously, categories could get duplicated. By making the updated category list unique,
+      // the duplication issue is fixed on every group edit
+      return _.uniqBy(updatedValue, 'slug');
+    };
+
+    _.assign(group, _.mergeWith(group.toObject(), Group.sanitizeUpdate(req.body), handleArrays));
 
     const savedGroup = await group.save();
     const response = await Group.toJSONCleanChat(savedGroup, user);

From 22a0c72f6e84a1e7492ec00d1d8ab3245ef5f36d Mon Sep 17 00:00:00 2001
From: Gabriel Araujo <gabrielg.araujo@hotmail.com>
Date: Wed, 12 Oct 2022 22:53:05 +0200
Subject: [PATCH 108/134] Update docker-compose.dev.yml to prevent error
 message on first build (#14178)

* Remove deprecated version element from top-level

* Remove unncessary image for client and server services

Co-authored-by: Gabriel Araujo <gabriel.goncalves@solarisbank.de>
---
 docker-compose.dev.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 6a20e74b68..79f806a5e6 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   client:
     build:
@@ -9,7 +8,6 @@ services:
       - server
     environment:
       - BASE_URL=http://server:3000
-    image: habitica
     networks:
       - habitica
     ports:
@@ -27,7 +25,6 @@ services:
       - mongo
     environment:
       - NODE_DB_URI=mongodb://mongo/habitrpg
-    image: habitica
     networks:
       - habitica
     ports:

From 90250d1a25986b74a9816aa2276b9061bfac8cc9 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Tue, 25 Oct 2022 16:44:33 -0500
Subject: [PATCH 109/134] Establish lock to avoid race scenario in
 subscriptions (#14267)

* fix(subscription): establish lock to avoid race scenario

* fix(lint): import syntax

* fix(lint): whitespace, dependency cycle

* fix(subs): skip locking on gifts and groups

* fix(subs): correctly reset _subSignature

* fix(sub): use findOneAndUpdate for unlock

* fix(test): save newly created user for some reason

Co-authored-by: SabreCat <sabe@habitica.com>
---
 test/api/unit/libs/payments/apple.test.js     |  1 +
 website/server/libs/payments/subscriptions.js | 39 +++++++++++++++++--
 website/server/models/user/schema.js          |  2 +
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/test/api/unit/libs/payments/apple.test.js b/test/api/unit/libs/payments/apple.test.js
index 08cb34607e..1aefe2cb51 100644
--- a/test/api/unit/libs/payments/apple.test.js
+++ b/test/api/unit/libs/payments/apple.test.js
@@ -326,6 +326,7 @@ describe('Apple Payments', () => {
     it('errors when a user is already subscribed', async () => {
       payments.createSubscription.restore();
       user = new User();
+      await user.save();
 
       await applePayments.subscribe(sku, user, receipt, headers, nextPaymentProcessing);
 
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index 2052dc4c9a..80401f21de 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -11,6 +11,7 @@ import { // eslint-disable-line import/no-cycle
   model as Group,
   basicFields as basicGroupFields,
 } from '../../models/group';
+import { model as User } from '../../models/user'; // eslint-disable-line import/no-cycle
 import {
   NotAuthorized,
   NotFound,
@@ -79,6 +80,22 @@ async function createSubscription (data) {
   let emailType = 'subscription-begins';
   let recipientIsSubscribed = recipient.isSubscribed();
 
+  if (data.user && !data.gift && !data.groupId) {
+    const unlockedUser = await User.findOneAndUpdate(
+      {
+        _id: data.user._id,
+        $or: [
+          { _subSignature: 'NOT_RUNNING' },
+          { _subSignature: { $exists: false } },
+        ],
+      },
+      { $set: { _subSignature: 'SUB_IN_PROGRESS' } },
+    );
+    if (!unlockedUser) {
+      throw new NotFound('User not found or subscription already processing.');
+    }
+  }
+
   //  If we are buying a group subscription
   if (data.groupId) {
     const groupFields = basicGroupFields.concat(' purchased');
@@ -282,10 +299,6 @@ async function createSubscription (data) {
     }
   }
 
-  if (group) await group.save();
-  if (data.user && data.user.isModified()) await data.user.save();
-  if (data.gift) await data.gift.member.save();
-
   slack.sendSubscriptionNotification({
     buyer: {
       id: data.user._id,
@@ -302,6 +315,24 @@ async function createSubscription (data) {
     groupId,
     autoRenews,
   });
+
+  if (group) {
+    await group.save();
+  }
+  if (data.user) {
+    if (data.user.isModified()) {
+      await data.user.save();
+    }
+    if (!data.gift && !data.groupId) {
+      await User.findOneAndUpdate(
+        { _id: data.user._id },
+        { $set: { _subSignature: 'NOT_RUNNING' } },
+      );
+    }
+  }
+  if (data.gift) {
+    await data.gift.member.save();
+  }
 }
 
 // Cancels a subscription or group plan, setting termination to happen later
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 3e0b4b84c0..79e58328a4 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -430,6 +430,8 @@ export default new Schema({
 
   lastCron: { $type: Date, default: Date.now },
   _cronSignature: { $type: String, default: 'NOT_RUNNING' }, // Private property used to avoid double cron
+  // Lock property to avoid double subscription. Not strictly private because we query on it
+  _subSignature: { $type: String, default: 'NOT_RUNNING' },
 
   // {GROUP_ID: Boolean}, represents whether they have unseen chat messages
   newMessages: {

From f7a03d2eb50e070a1b5a339796771b533417141b Mon Sep 17 00:00:00 2001
From: negue <negue@users.noreply.github.com>
Date: Thu, 27 Oct 2022 08:39:06 +0200
Subject: [PATCH 110/134] improve transactions logs + split createSubscription
 (#14289)

* improve transactions logs + split createSubscription
---
 test/api/unit/libs/payments/payments.test.js  | 24 +++++-
 website/server/controllers/api-v3/hall.js     | 15 ++--
 website/server/libs/payments/constants.js     |  7 ++
 website/server/libs/payments/groupPayments.js | 34 ++++----
 website/server/libs/payments/payments.js      |  9 +-
 website/server/libs/payments/subscriptions.js | 83 +++++++++++++++----
 6 files changed, 128 insertions(+), 44 deletions(-)
 create mode 100644 website/server/libs/payments/constants.js

diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index 48d6325546..65b42b42f3 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -11,10 +11,13 @@ import {
   generateGroup,
 } from '../../../../helpers/api-unit.helper';
 import * as worldState from '../../../../../website/server/libs/worldState';
+import { TransactionModel } from '../../../../../website/server/models/transaction';
 
 describe('payments/index', () => {
-  let user; let group; let data; let
-    plan;
+  let user;
+  let group;
+  let data;
+  let plan;
 
   beforeEach(async () => {
     user = new User();
@@ -104,6 +107,23 @@ describe('payments/index', () => {
         expect(recipient.purchased.plan.extraMonths).to.eql(3);
       });
 
+      it('add a transaction entry to the recipient', async () => {
+        recipient.purchased.plan = plan;
+
+        expect(recipient.purchased.plan.extraMonths).to.eql(0);
+
+        await api.createSubscription(data);
+
+        expect(recipient.purchased.plan.extraMonths).to.eql(3);
+
+        const transactions = await TransactionModel
+          .find({ userId: recipient._id })
+          .sort({ createdAt: -1 })
+          .exec();
+
+        expect(transactions).to.have.lengthOf(1);
+      });
+
       it('does not set negative extraMonths if plan has past dateTerminated date', async () => {
         const dateTerminated = moment().subtract(2, 'months').toDate();
         recipient.purchased.plan.dateTerminated = dateTerminated;
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index 456c62a396..73f2e37f6a 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -279,11 +279,16 @@ api.updateHero = {
       }
       if (updateData.purchased.plan.consecutive) {
         if (updateData.purchased.plan.consecutive.trinkets) {
-          await hero.updateHourglasses(
-            updateData.purchased.plan.consecutive.trinkets
-              - hero.purchased.plan.consecutive.trinkets,
-            'admin_update_hourglasses', '', 'Updated by Habitica staff',
-          );
+          const changedHourglassTrinkets = updateData.purchased.plan.consecutive.trinkets
+              - hero.purchased.plan.consecutive.trinkets;
+
+          if (changedHourglassTrinkets !== 0) {
+            await hero.updateHourglasses(
+              changedHourglassTrinkets,
+              'admin_update_hourglasses', '', 'Updated by Habitica staff',
+            );
+          }
+
           hero.purchased.plan.consecutive.trinkets = updateData.purchased.plan.consecutive.trinkets;
         }
         if (updateData.purchased.plan.consecutive.gemCapExtra) {
diff --git a/website/server/libs/payments/constants.js b/website/server/libs/payments/constants.js
new file mode 100644
index 0000000000..a251a9099c
--- /dev/null
+++ b/website/server/libs/payments/constants.js
@@ -0,0 +1,7 @@
+export const paymentConstants = {
+  UNLIMITED_CUSTOMER_ID: 'habitrpg', // Users with the customerId have an unlimted free subscription
+  GROUP_PLAN_CUSTOMER_ID: 'group-plan',
+  GROUP_PLAN_PAYMENT_METHOD: 'Group Plan',
+  GOOGLE_PAYMENT_METHOD: 'Google',
+  IOS_PAYMENT_METHOD: 'Apple',
+};
diff --git a/website/server/libs/payments/groupPayments.js b/website/server/libs/payments/groupPayments.js
index 3587c7585e..b59566c2fb 100644
--- a/website/server/libs/payments/groupPayments.js
+++ b/website/server/libs/payments/groupPayments.js
@@ -1,3 +1,5 @@
+// TODO these files need to refactored.
+
 import nconf from 'nconf';
 import _ from 'lodash';
 import moment from 'moment';
@@ -12,6 +14,8 @@ import { // eslint-disable-line import/no-cycle
   getUserInfo,
   sendTxn as txnEmail,
 } from '../email';
+import { paymentConstants } from './constants';
+import { cancelSubscription, createSubscription } from './subscriptions'; // eslint-disable-line import/no-cycle
 
 const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS_TECH_ASSISTANCE_EMAIL');
 const JOINED_GROUP_PLAN = 'joined group plan';
@@ -37,7 +41,8 @@ async function addSubscriptionToGroupUsers (group) {
     members = await User.find({ 'party._id': group._id }).select('_id purchased items auth profile.name notifications').exec();
   }
 
-  const promises = members.map(member => this.addSubToGroupUser(member, group));
+  // eslint-disable-next-line no-use-before-define
+  const promises = members.map(member => addSubToGroupUser(member, group));
 
   await Promise.all(promises);
 }
@@ -63,12 +68,12 @@ async function addSubToGroupUser (member, group) {
   // When changing customerIdsToIgnore or paymentMethodsToIgnore, the code blocks below for
   // the `group-member-join` email template will probably need to be changed.
   const customerIdsToIgnore = [
-    this.constants.GROUP_PLAN_CUSTOMER_ID,
-    this.constants.UNLIMITED_CUSTOMER_ID,
+    paymentConstants.GROUP_PLAN_CUSTOMER_ID,
+    paymentConstants.UNLIMITED_CUSTOMER_ID,
   ];
   const paymentMethodsToIgnore = [
-    this.constants.GOOGLE_PAYMENT_METHOD,
-    this.constants.IOS_PAYMENT_METHOD,
+    paymentConstants.GOOGLE_PAYMENT_METHOD,
+    paymentConstants.IOS_PAYMENT_METHOD,
   ];
   let previousSubscriptionType = EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_NONE;
   const leader = await User.findById(group.leader).exec();
@@ -104,7 +109,7 @@ async function addSubToGroupUser (member, group) {
   const memberPlan = member.purchased.plan;
   if (member.isSubscribed()) {
     const customerHasCancelledGroupPlan = (
-      memberPlan.customerId === this.constants.GROUP_PLAN_CUSTOMER_ID
+      memberPlan.customerId === paymentConstants.GROUP_PLAN_CUSTOMER_ID
       && !member.hasNotCancelled()
     );
     const ignorePaymentPlan = paymentMethodsToIgnore.indexOf(memberPlan.paymentMethod) !== -1;
@@ -127,13 +132,13 @@ async function addSubToGroupUser (member, group) {
     if ((ignorePaymentPlan || ignoreCustomerId) && !customerHasCancelledGroupPlan) {
       // member has been added to group plan but their subscription will not be changed
       // automatically so they need a special message in the email
-      if (memberPlan.paymentMethod === this.constants.GOOGLE_PAYMENT_METHOD) {
+      if (memberPlan.paymentMethod === paymentConstants.GOOGLE_PAYMENT_METHOD) {
         previousSubscriptionType = EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_GOOGLE;
-      } else if (memberPlan.paymentMethod === this.constants.IOS_PAYMENT_METHOD) {
+      } else if (memberPlan.paymentMethod === paymentConstants.IOS_PAYMENT_METHOD) {
         previousSubscriptionType = EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_IOS;
-      } else if (memberPlan.customerId === this.constants.UNLIMITED_CUSTOMER_ID) {
+      } else if (memberPlan.customerId === paymentConstants.UNLIMITED_CUSTOMER_ID) {
         previousSubscriptionType = EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_LIFETIME_FREE;
-      } else if (memberPlan.customerId === this.constants.GROUP_PLAN_CUSTOMER_ID) {
+      } else if (memberPlan.customerId === paymentConstants.GROUP_PLAN_CUSTOMER_ID) {
         previousSubscriptionType = EMAIL_TEMPLATE_SUBSCRIPTION_TYPE_GROUP_PLAN;
       } else {
         // this triggers a generic message in the email template in case we forget
@@ -183,7 +188,7 @@ async function addSubToGroupUser (member, group) {
   member.markModified('items.mounts');
 
   data.user = member;
-  await this.createSubscription(data);
+  await createSubscription(data);
 
   txnEmail(data.user, 'group-member-join', [
     { name: 'LEADER', content: leader.profile.name },
@@ -207,13 +212,14 @@ async function cancelGroupUsersSubscription (group) {
     members = await User.find({ 'party._id': group._id }).select('_id guilds purchased').exec();
   }
 
-  const promises = members.map(member => this.cancelGroupSubscriptionForUser(member, group));
+  // eslint-disable-next-line no-use-before-define
+  const promises = members.map(member => cancelGroupSubscriptionForUser(member, group));
 
   await Promise.all(promises);
 }
 
 async function cancelGroupSubscriptionForUser (user, group, userWasRemoved = false) {
-  if (user.purchased.plan.customerId !== this.constants.GROUP_PLAN_CUSTOMER_ID) return;
+  if (user.purchased.plan.customerId !== paymentConstants.GROUP_PLAN_CUSTOMER_ID) return;
 
   const userGroups = user.guilds.toObject();
   if (user.party._id) userGroups.push(user.party._id);
@@ -241,7 +247,7 @@ async function cancelGroupSubscriptionForUser (user, group, userWasRemoved = fal
       { name: 'LEADER', content: leader.profile.name },
       { name: 'GROUP_NAME', content: group.name },
     ]);
-    await this.cancelSubscription({ user });
+    await cancelSubscription({ user });
   }
 }
 
diff --git a/website/server/libs/payments/payments.js b/website/server/libs/payments/payments.js
index 5d6b1bb9de..3e93bdb8d4 100644
--- a/website/server/libs/payments/payments.js
+++ b/website/server/libs/payments/payments.js
@@ -11,16 +11,11 @@ import { // eslint-disable-line import/no-cycle
 import { // eslint-disable-line import/no-cycle
   buyGems,
 } from './gems';
+import { paymentConstants } from './constants';
 
 const api = {};
 
-api.constants = {
-  UNLIMITED_CUSTOMER_ID: 'habitrpg', // Users with the customerId have an unlimted free subscription
-  GROUP_PLAN_CUSTOMER_ID: 'group-plan',
-  GROUP_PLAN_PAYMENT_METHOD: 'Group Plan',
-  GOOGLE_PAYMENT_METHOD: 'Google',
-  IOS_PAYMENT_METHOD: 'Apple',
-};
+api.constants = paymentConstants;
 
 api.addSubscriptionToGroupUsers = addSubscriptionToGroupUsers;
 
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index 80401f21de..e88cf30937 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -1,3 +1,5 @@
+// TODO these files need to refactored.
+
 import _ from 'lodash';
 import moment from 'moment';
 
@@ -20,6 +22,8 @@ import shared from '../../../common';
 import { sendNotification as sendPushNotification } from '../pushNotifications'; // eslint-disable-line import/no-cycle
 import calculateSubscriptionTerminationDate from './calculateSubscriptionTerminationDate';
 import { getCurrentEventList } from '../worldState'; // eslint-disable-line import/no-cycle
+import { paymentConstants } from './constants';
+import { addSubscriptionToGroupUsers, cancelGroupUsersSubscription } from './groupPayments'; // eslint-disable-line import/no-cycle
 
 // @TODO: Abstract to shared/constant
 const JOINED_GROUP_PLAN = 'joined group plan';
@@ -65,7 +69,7 @@ function _dateDiff (earlyDate, lateDate) {
   return moment(lateDate).diff(earlyDate, 'months', true);
 }
 
-async function createSubscription (data) {
+async function prepareSubscriptionValues (data) {
   let recipient = data.gift ? data.gift.member : data.user;
   const block = shared.content.subscriptionBlocks[data.gift
     ? data.gift.subscription.key
@@ -105,7 +109,7 @@ async function createSubscription (data) {
 
     if (group) {
       analytics.track(
-        this.groupID,
+        data.groupID,
         data.demographics,
       );
     }
@@ -130,7 +134,7 @@ async function createSubscription (data) {
     groupId = group._id;
     recipient.purchased.plan.quantity = data.sub.quantity;
 
-    await this.addSubscriptionToGroupUsers(group);
+    await addSubscriptionToGroupUsers(group);
   }
 
   const { plan } = recipient.purchased;
@@ -139,7 +143,10 @@ async function createSubscription (data) {
     if (plan.customerId && !plan.dateTerminated) { // User has active plan
       plan.extraMonths += months;
     } else {
-      if (!recipientIsSubscribed || !plan.dateUpdated) plan.dateUpdated = today;
+      if (!recipientIsSubscribed || !plan.dateUpdated) {
+        plan.dateUpdated = today;
+      }
+
       if (moment(plan.dateTerminated).isAfter()) {
         plan.dateTerminated = moment(plan.dateTerminated).add({ months }).toDate();
       } else {
@@ -148,9 +155,15 @@ async function createSubscription (data) {
       }
     }
 
-    if (!plan.customerId) plan.customerId = 'Gift'; // don't override existing customer, but all sub need a customerId
+    if (!plan.customerId) {
+      plan.customerId = 'Gift';
+    }
+
+    // don't override existing customer, but all sub need a customerId
   } else {
-    if (!plan.dateTerminated) plan.dateTerminated = today;
+    if (!plan.dateTerminated) {
+      plan.dateTerminated = today;
+    }
 
     Object.assign(plan, { // override plan with new values
       planId: block.key,
@@ -170,22 +183,58 @@ async function createSubscription (data) {
     });
 
     // allow non-override if a plan was previously used
-    if (!plan.gemsBought) plan.gemsBought = 0;
-    if (!plan.dateCreated) plan.dateCreated = today;
-    if (!plan.mysteryItems) plan.mysteryItems = [];
+    if (!plan.gemsBought) {
+      plan.gemsBought = 0;
+    }
+
+    if (!plan.dateCreated) {
+      plan.dateCreated = today;
+    }
+
+    if (!plan.mysteryItems) {
+      plan.mysteryItems = [];
+    }
 
     if (data.subscriptionId) {
       plan.subscriptionId = data.subscriptionId;
     }
   }
 
+  return {
+    block,
+    months,
+    plan,
+    recipient,
+    autoRenews,
+    group,
+    groupId,
+    itemPurchased,
+    purchaseType,
+    emailType,
+  };
+}
+
+async function createSubscription (data) {
+  const {
+    block,
+    months,
+    plan,
+    recipient,
+    autoRenews,
+    group,
+    groupId,
+    itemPurchased,
+    purchaseType,
+    emailType,
+  } = await prepareSubscriptionValues(data);
+
   // Block sub perks
   const perks = Math.floor(months / 3);
   if (perks) {
     plan.consecutive.offset += months;
     plan.consecutive.gemCapExtra += perks * 5;
     if (plan.consecutive.gemCapExtra > 25) plan.consecutive.gemCapExtra = 25;
-    await plan.updateHourglasses(data.user._id, perks, 'subscription_perks'); // one Hourglass every 3 months
+    await plan.updateHourglasses(recipient._id, perks, 'subscription_perks'); // one Hourglass every 3 months
   }
 
   if (recipient !== group) {
@@ -195,7 +244,7 @@ async function createSubscription (data) {
   }
 
   // @TODO: Create a factory pattern for use cases
-  if (!data.gift && data.customerId !== this.constants.GROUP_PLAN_CUSTOMER_ID) {
+  if (!data.gift && data.customerId !== paymentConstants.GROUP_PLAN_CUSTOMER_ID) {
     txnEmail(data.user, emailType);
   }
 
@@ -284,7 +333,7 @@ async function createSubscription (data) {
           promo: 'Winter',
           promoUsername: data.gift.member.auth.local.username,
         };
-        await this.createSubscription(promoData);
+        await createSubscription(promoData);
       }
 
       if (data.gift.member.preferences.pushNotifications.giftedSubscription !== false) {
@@ -365,7 +414,7 @@ async function cancelSubscription (data) {
     emailType = 'group-cancel-subscription';
     emailMergeData.push({ name: 'GROUP_NAME', content: group.name });
 
-    await this.cancelGroupUsersSubscription(group);
+    await cancelGroupUsersSubscription(group);
   } else {
     // cancelling a user subscription
     plan = data.user.purchased.plan;
@@ -375,12 +424,12 @@ async function cancelSubscription (data) {
     if (data.cancellationReason && data.cancellationReason === JOINED_GROUP_PLAN) sendEmail = false;
   }
 
-  if (plan.customerId === this.constants.GROUP_PLAN_CUSTOMER_ID) {
+  if (plan.customerId === paymentConstants.GROUP_PLAN_CUSTOMER_ID) {
     sendEmail = false; // because group-member-cancel email has already been sent
   }
 
   plan.dateTerminated = calculateSubscriptionTerminationDate(
-    data.nextBill, plan, this.constants.GROUP_PLAN_CUSTOMER_ID,
+    data.nextBill, plan, paymentConstants.GROUP_PLAN_CUSTOMER_ID,
   );
 
   // clear extra time. If they subscribe again, it'll be recalculated from p.dateTerminated
@@ -392,7 +441,9 @@ async function cancelSubscription (data) {
     await data.user.save();
   }
 
-  if (sendEmail) txnEmail(data.user, emailType, emailMergeData);
+  if (sendEmail) {
+    txnEmail(data.user, emailType, emailMergeData);
+  }
 
   if (group) {
     cancelType = 'group-unsubscribe';

From 7f87120d34c9f99d60304a271e433dd6dacd3e70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:22:19 -0400
Subject: [PATCH 111/134] build(deps): bump core-js from 3.25.5 to 3.26.0 in
 /website/client (#14314)

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.25.5 to 3.26.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.26.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 12 ++++++------
 website/client/package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 84268c960f..1a4dda661a 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -16135,9 +16135,9 @@
       }
     },
     "core-js": {
-      "version": "3.25.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz",
-      "integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
+      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="
     },
     "core-js-compat": {
       "version": "3.11.0",
@@ -28871,9 +28871,9 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+          "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
           "requires": {
             "big.js": "^5.2.2",
             "emojis-list": "^3.0.0",
diff --git a/website/client/package.json b/website/client/package.json
index 21cad38b2b..eb9ee99f35 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -32,7 +32,7 @@
     "bootstrap": "^4.6.0",
     "bootstrap-vue": "^2.22.0",
     "chai": "^4.3.6",
-    "core-js": "^3.25.5",
+    "core-js": "^3.26.0",
     "dompurify": "^2.4.0",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",

From 0f3bc980d917a44234c454791a0efc42b7412a4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:22:40 -0400
Subject: [PATCH 112/134] build(deps): bump smartbanner.js in /website/client
 (#14313)

Bumps [smartbanner.js](https://github.com/ain/smartbanner.js) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/ain/smartbanner.js/releases)
- [Commits](https://github.com/ain/smartbanner.js/compare/v1.19.0...v1.19.1)

---
updated-dependencies:
- dependency-name: smartbanner.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 1a4dda661a..534e7a90d2 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -26365,9 +26365,9 @@
       }
     },
     "smartbanner.js": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/smartbanner.js/-/smartbanner.js-1.19.0.tgz",
-      "integrity": "sha512-F9vR7AIbyg2myhP9DrNYsKlKNqLuen+FFAu5R7SAF9IyCxNQkjpGUmiHbEaEVFTLw8J9hPmVC2lyGEJlOXTXKQ=="
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/smartbanner.js/-/smartbanner.js-1.19.1.tgz",
+      "integrity": "sha512-x3alFTlk6pLuqrm9PrYQv1E+86CrEIgPf/KJ+nP5342BmOWstbdR8OwD3TPmM56zHQm4MEr/eoqbEcfTKdvdKw=="
     },
     "snapdragon": {
       "version": "0.8.2",
diff --git a/website/client/package.json b/website/client/package.json
index eb9ee99f35..512d23fa0d 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -48,7 +48,7 @@
     "nconf": "^0.12.0",
     "sass": "^1.34.0",
     "sass-loader": "^8.0.2",
-    "smartbanner.js": "^1.19.0",
+    "smartbanner.js": "^1.19.1",
     "svg-inline-loader": "^0.8.2",
     "svg-url-loader": "^7.1.1",
     "svgo": "^1.3.2",

From 19c26c01e36c9ea85a58d5734029faca42ad9bbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:23:09 -0400
Subject: [PATCH 113/134] build(deps): bump @babel/core from 7.19.3 to 7.19.6
 (#14312)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.19.3 to 7.19.6.
- [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.19.6/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 140 ++++++++++++++++++++++++++--------------------
 package.json      |   2 +-
 2 files changed, 80 insertions(+), 62 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1b32be3489..785ec09237 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,20 +27,20 @@
       "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="
     },
     "@babel/core": {
-      "version": "7.19.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz",
-      "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
+      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
       "requires": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.3",
+        "@babel/generator": "^7.19.6",
         "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-module-transforms": "^7.19.0",
-        "@babel/helpers": "^7.19.0",
-        "@babel/parser": "^7.19.3",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helpers": "^7.19.4",
+        "@babel/parser": "^7.19.6",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.3",
-        "@babel/types": "^7.19.3",
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -57,16 +57,16 @@
           }
         },
         "@babel/compat-data": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.3.tgz",
-          "integrity": "sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw=="
+          "version": "7.19.4",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz",
+          "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw=="
         },
         "@babel/generator": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz",
-          "integrity": "sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==",
+          "version": "7.19.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.6.tgz",
+          "integrity": "sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==",
           "requires": {
-            "@babel/types": "^7.19.3",
+            "@babel/types": "^7.19.4",
             "@jridgewell/gen-mapping": "^0.3.2",
             "jsesc": "^2.5.1"
           }
@@ -92,20 +92,33 @@
           }
         },
         "@babel/helper-module-transforms": {
-          "version": "7.19.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-          "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+          "version": "7.19.6",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
+          "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
           "requires": {
             "@babel/helper-environment-visitor": "^7.18.9",
             "@babel/helper-module-imports": "^7.18.6",
-            "@babel/helper-simple-access": "^7.18.6",
+            "@babel/helper-simple-access": "^7.19.4",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.19.1",
             "@babel/template": "^7.18.10",
-            "@babel/traverse": "^7.19.0",
-            "@babel/types": "^7.19.0"
+            "@babel/traverse": "^7.19.6",
+            "@babel/types": "^7.19.4"
           }
         },
+        "@babel/helper-simple-access": {
+          "version": "7.19.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
+          "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+          "requires": {
+            "@babel/types": "^7.19.4"
+          }
+        },
+        "@babel/helper-string-parser": {
+          "version": "7.19.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+          "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
+        },
         "@babel/helper-validator-identifier": {
           "version": "7.19.1",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
@@ -122,9 +135,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz",
-          "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="
+          "version": "7.19.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz",
+          "integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA=="
         },
         "@babel/template": {
           "version": "7.18.10",
@@ -137,28 +150,28 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz",
-          "integrity": "sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==",
+          "version": "7.19.6",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.6.tgz",
+          "integrity": "sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==",
           "requires": {
             "@babel/code-frame": "^7.18.6",
-            "@babel/generator": "^7.19.3",
+            "@babel/generator": "^7.19.6",
             "@babel/helper-environment-visitor": "^7.18.9",
             "@babel/helper-function-name": "^7.19.0",
             "@babel/helper-hoist-variables": "^7.18.6",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/parser": "^7.19.3",
-            "@babel/types": "^7.19.3",
+            "@babel/parser": "^7.19.6",
+            "@babel/types": "^7.19.4",
             "debug": "^4.1.0",
             "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz",
-          "integrity": "sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==",
+          "version": "7.19.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz",
+          "integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==",
           "requires": {
-            "@babel/helper-string-parser": "^7.18.10",
+            "@babel/helper-string-parser": "^7.19.4",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -185,9 +198,9 @@
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001418",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz",
-          "integrity": "sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg=="
+          "version": "1.0.30001423",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001423.tgz",
+          "integrity": "sha512-09iwWGOlifvE1XuHokFMP7eR38a0JnajoyL3/i87c8ZjRWRrdKo1fqjNfugfBD0UDBIOz0U+jtNhJ0EPm1VleQ=="
         },
         "chalk": {
           "version": "2.4.2",
@@ -861,13 +874,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
-      "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz",
+      "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==",
       "requires": {
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/traverse": "^7.19.4",
+        "@babel/types": "^7.19.4"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -879,11 +892,11 @@
           }
         },
         "@babel/generator": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz",
-          "integrity": "sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==",
+          "version": "7.19.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.6.tgz",
+          "integrity": "sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==",
           "requires": {
-            "@babel/types": "^7.19.3",
+            "@babel/types": "^7.19.4",
             "@jridgewell/gen-mapping": "^0.3.2",
             "jsesc": "^2.5.1"
           }
@@ -897,6 +910,11 @@
             "@babel/types": "^7.19.0"
           }
         },
+        "@babel/helper-string-parser": {
+          "version": "7.19.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+          "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
+        },
         "@babel/helper-validator-identifier": {
           "version": "7.19.1",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
@@ -913,9 +931,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz",
-          "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="
+          "version": "7.19.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz",
+          "integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA=="
         },
         "@babel/template": {
           "version": "7.18.10",
@@ -928,28 +946,28 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz",
-          "integrity": "sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==",
+          "version": "7.19.6",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.6.tgz",
+          "integrity": "sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==",
           "requires": {
             "@babel/code-frame": "^7.18.6",
-            "@babel/generator": "^7.19.3",
+            "@babel/generator": "^7.19.6",
             "@babel/helper-environment-visitor": "^7.18.9",
             "@babel/helper-function-name": "^7.19.0",
             "@babel/helper-hoist-variables": "^7.18.6",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/parser": "^7.19.3",
-            "@babel/types": "^7.19.3",
+            "@babel/parser": "^7.19.6",
+            "@babel/types": "^7.19.4",
             "debug": "^4.1.0",
             "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.19.3",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz",
-          "integrity": "sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==",
+          "version": "7.19.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz",
+          "integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==",
           "requires": {
-            "@babel/helper-string-parser": "^7.18.10",
+            "@babel/helper-string-parser": "^7.19.4",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
diff --git a/package.json b/package.json
index ccec34c6da..30c0ba8969 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "4.246.0",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@babel/core": "^7.19.3",
+    "@babel/core": "^7.19.6",
     "@babel/preset-env": "^7.19.1",
     "@babel/register": "^7.18.9",
     "@google-cloud/trace-agent": "^7.1.2",

From 0c6070dd9adb346226598534653a5206f5258e6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:23:30 -0400
Subject: [PATCH 114/134] build(deps): bump short-uuid from 4.2.0 to 4.2.2
 (#14311)

Bumps [short-uuid](https://github.com/oculus42/short-uuid) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/oculus42/short-uuid/releases)
- [Changelog](https://github.com/oculus42/short-uuid/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/oculus42/short-uuid/commits)

---
updated-dependencies:
- dependency-name: short-uuid
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 785ec09237..0a832cd7ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13970,9 +13970,9 @@
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
     "short-uuid": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/short-uuid/-/short-uuid-4.2.0.tgz",
-      "integrity": "sha512-r3cxuPPZSuF0QkKsK9bBR7u+7cwuCRzWzgjPh07F5N2iIUNgblnMHepBY16xgj5t1lG9iOP9k/TEafY1qhRzaw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/short-uuid/-/short-uuid-4.2.2.tgz",
+      "integrity": "sha512-IE7hDSGV2U/VZoCsjctKX6l5t5ak2jE0+aeGJi3KtvjIUNuZVmHVYUjNBhmo369FIWGDtaieRaO8A83Lvwfpqw==",
       "requires": {
         "any-base": "^1.1.0",
         "uuid": "^8.3.2"
diff --git a/package.json b/package.json
index 30c0ba8969..e6e53afcd2 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "regenerator-runtime": "^0.13.9",
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
-    "short-uuid": "^4.2.0",
+    "short-uuid": "^4.2.2",
     "stripe": "^10.13.0",
     "superagent": "^8.0.2",
     "universal-analytics": "^0.5.3",

From 56805e6c900686d47c4ef87e705c8e58d5902efb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:23:56 -0400
Subject: [PATCH 115/134] build(deps): bump rate-limiter-flexible from 2.3.11
 to 2.4.0 (#14309)

Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 2.3.11 to 2.4.0.
- [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases)
- [Commits](https://github.com/animir/node-rate-limiter-flexible/compare/v2.3.11...v2.4.0)

---
updated-dependencies:
- dependency-name: rate-limiter-flexible
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[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 0a832cd7ce..c4df892d98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13045,9 +13045,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "rate-limiter-flexible": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.11.tgz",
-      "integrity": "sha512-MFLtfs1llUNBkJxeTkSZD7oAxVg1nZ79bevE2TmqQMbmKGoi8DBua3VAZFz5bsjEr0A6Mbr9AJuf5lvYSCok2Q=="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.4.0.tgz",
+      "integrity": "sha512-NDRxvXvm+KAjD8wUacJNPxomuu0CpD58DBTDIa8+JaPkMTDbI+DzGdg6vlMRqYySp8A8WsmXY7Qt8h9kYxN5qQ=="
     },
     "raw-body": {
       "version": "2.5.1",
diff --git a/package.json b/package.json
index e6e53afcd2..64de3822fc 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "paypal-rest-sdk": "^1.8.1",
     "pp-ipn": "^1.1.0",
     "ps-tree": "^1.0.0",
-    "rate-limiter-flexible": "^2.3.11",
+    "rate-limiter-flexible": "^2.4.0",
     "redis": "^3.1.2",
     "regenerator-runtime": "^0.13.9",
     "remove-markdown": "^0.5.0",

From 62b4315b3d22602c30b3b52ba5ce83c599d86407 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:24:26 -0400
Subject: [PATCH 116/134] build(deps): bump apidoc from 0.53.0 to 0.53.1
 (#14307)

Bumps [apidoc](https://github.com/apidoc/apidoc) from 0.53.0 to 0.53.1.
- [Release notes](https://github.com/apidoc/apidoc/releases)
- [Changelog](https://github.com/apidoc/apidoc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apidoc/apidoc/compare/0.53.0...0.53.1)

---
updated-dependencies:
- dependency-name: apidoc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 239 +++++++++++++++++++++++++---------------------
 package.json      |   2 +-
 2 files changed, 129 insertions(+), 112 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c4df892d98..a73c499dfb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2149,10 +2149,16 @@
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
     },
+    "@esbuild/android-arm": {
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.12.tgz",
+      "integrity": "sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==",
+      "optional": true
+    },
     "@esbuild/linux-loong64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.7.tgz",
-      "integrity": "sha512-IKznSJOsVUuyt7cDzzSZyqBEcZe+7WlBqTVXiF1OXP/4Nm387ToaXZ0fyLwI1iBlI/bzpxVq411QE2/Bt2XWWw==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.12.tgz",
+      "integrity": "sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==",
       "optional": true
     },
     "@google-cloud/common": {
@@ -2612,9 +2618,9 @@
       }
     },
     "@types/eslint": {
-      "version": "8.4.6",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
-      "integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.7.tgz",
+      "integrity": "sha512-ehM7cCt2RSFs42mb+lcmhFT9ouIlV92PuaeRGn8N8c98oMjG4Z5pJHA9b1QiCcuqnbPSHcyfiD3mlhqMaHsQIw==",
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -3101,9 +3107,9 @@
       }
     },
     "apidoc": {
-      "version": "0.53.0",
-      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.53.0.tgz",
-      "integrity": "sha512-H4hYToCrI6TgSksdVHxS7h5/Xoqr/rR9m9/IOQaYqXbX07cPVbg0O3RM4+bR4tJKG1aqBWKKm+xojQ8+4i7O5A==",
+      "version": "0.53.1",
+      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.53.1.tgz",
+      "integrity": "sha512-ijiLtIVEzTMdF29B/QzkvR4weMatgcElMsYKP1asszrImWYwzlZ9x0ZMLTXZrCe7GVMtkGSwQdugdLTZMZ+lww==",
       "requires": {
         "bootstrap": "3.4.1",
         "commander": "^8.3.0",
@@ -3230,14 +3236,14 @@
           }
         },
         "nodemon": {
-          "version": "2.0.19",
-          "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.19.tgz",
-          "integrity": "sha512-4pv1f2bMDj0Eeg/MhGqxrtveeQ5/G/UVe9iO6uTZzjnRluSA4PVWf8CW99LUPwGB3eNIA7zUFoP77YuI7hOc0A==",
+          "version": "2.0.20",
+          "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
+          "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
           "requires": {
             "chokidar": "^3.5.2",
             "debug": "^3.2.7",
             "ignore-by-default": "^1.0.1",
-            "minimatch": "^3.0.4",
+            "minimatch": "^3.1.2",
             "pstree.remy": "^1.1.8",
             "semver": "^5.7.1",
             "simple-update-notifier": "^1.0.7",
@@ -3262,9 +3268,9 @@
           }
         },
         "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -6343,115 +6349,116 @@
       }
     },
     "esbuild": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.7.tgz",
-      "integrity": "sha512-7V8tzllIbAQV1M4QoE52ImKu8hT/NLGlGXkiDsbEU5PS6K8Mn09ZnYoS+dcmHxOS9CRsV4IRAMdT3I67IyUNXw==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.12.tgz",
+      "integrity": "sha512-PcT+/wyDqJQsRVhaE9uX/Oq4XLrFh0ce/bs2TJh4CSaw9xuvI+xFrH2nAYOADbhQjUgAhNWC5LKoUsakm4dxng==",
       "requires": {
-        "@esbuild/linux-loong64": "0.15.7",
-        "esbuild-android-64": "0.15.7",
-        "esbuild-android-arm64": "0.15.7",
-        "esbuild-darwin-64": "0.15.7",
-        "esbuild-darwin-arm64": "0.15.7",
-        "esbuild-freebsd-64": "0.15.7",
-        "esbuild-freebsd-arm64": "0.15.7",
-        "esbuild-linux-32": "0.15.7",
-        "esbuild-linux-64": "0.15.7",
-        "esbuild-linux-arm": "0.15.7",
-        "esbuild-linux-arm64": "0.15.7",
-        "esbuild-linux-mips64le": "0.15.7",
-        "esbuild-linux-ppc64le": "0.15.7",
-        "esbuild-linux-riscv64": "0.15.7",
-        "esbuild-linux-s390x": "0.15.7",
-        "esbuild-netbsd-64": "0.15.7",
-        "esbuild-openbsd-64": "0.15.7",
-        "esbuild-sunos-64": "0.15.7",
-        "esbuild-windows-32": "0.15.7",
-        "esbuild-windows-64": "0.15.7",
-        "esbuild-windows-arm64": "0.15.7"
+        "@esbuild/android-arm": "0.15.12",
+        "@esbuild/linux-loong64": "0.15.12",
+        "esbuild-android-64": "0.15.12",
+        "esbuild-android-arm64": "0.15.12",
+        "esbuild-darwin-64": "0.15.12",
+        "esbuild-darwin-arm64": "0.15.12",
+        "esbuild-freebsd-64": "0.15.12",
+        "esbuild-freebsd-arm64": "0.15.12",
+        "esbuild-linux-32": "0.15.12",
+        "esbuild-linux-64": "0.15.12",
+        "esbuild-linux-arm": "0.15.12",
+        "esbuild-linux-arm64": "0.15.12",
+        "esbuild-linux-mips64le": "0.15.12",
+        "esbuild-linux-ppc64le": "0.15.12",
+        "esbuild-linux-riscv64": "0.15.12",
+        "esbuild-linux-s390x": "0.15.12",
+        "esbuild-netbsd-64": "0.15.12",
+        "esbuild-openbsd-64": "0.15.12",
+        "esbuild-sunos-64": "0.15.12",
+        "esbuild-windows-32": "0.15.12",
+        "esbuild-windows-64": "0.15.12",
+        "esbuild-windows-arm64": "0.15.12"
       }
     },
     "esbuild-android-64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.7.tgz",
-      "integrity": "sha512-p7rCvdsldhxQr3YHxptf1Jcd86dlhvc3EQmQJaZzzuAxefO9PvcI0GLOa5nCWem1AJ8iMRu9w0r5TG8pHmbi9w==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.12.tgz",
+      "integrity": "sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==",
       "optional": true
     },
     "esbuild-android-arm64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.7.tgz",
-      "integrity": "sha512-L775l9ynJT7rVqRM5vo+9w5g2ysbOCfsdLV4CWanTZ1k/9Jb3IYlQ06VCI1edhcosTYJRECQFJa3eAvkx72eyQ==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.12.tgz",
+      "integrity": "sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==",
       "optional": true
     },
     "esbuild-darwin-64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.7.tgz",
-      "integrity": "sha512-KGPt3r1c9ww009t2xLB6Vk0YyNOXh7hbjZ3EecHoVDxgtbUlYstMPDaReimKe6eOEfyY4hBEEeTvKwPsiH5WZg==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.12.tgz",
+      "integrity": "sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==",
       "optional": true
     },
     "esbuild-darwin-arm64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.7.tgz",
-      "integrity": "sha512-kBIHvtVqbSGajN88lYMnR3aIleH3ABZLLFLxwL2stiuIGAjGlQW741NxVTpUHQXUmPzxi6POqc9npkXa8AcSZQ==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.12.tgz",
+      "integrity": "sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==",
       "optional": true
     },
     "esbuild-freebsd-64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.7.tgz",
-      "integrity": "sha512-hESZB91qDLV5MEwNxzMxPfbjAhOmtfsr9Wnuci7pY6TtEh4UDuevmGmkUIjX/b+e/k4tcNBMf7SRQ2mdNuK/HQ==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.12.tgz",
+      "integrity": "sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==",
       "optional": true
     },
     "esbuild-freebsd-arm64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.7.tgz",
-      "integrity": "sha512-dLFR0ChH5t+b3J8w0fVKGvtwSLWCv7GYT2Y2jFGulF1L5HftQLzVGN+6pi1SivuiVSmTh28FwUhi9PwQicXI6Q==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.12.tgz",
+      "integrity": "sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==",
       "optional": true
     },
     "esbuild-linux-32": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.7.tgz",
-      "integrity": "sha512-v3gT/LsONGUZcjbt2swrMjwxo32NJzk+7sAgtxhGx1+ZmOFaTRXBAi1PPfgpeo/J//Un2jIKm/I+qqeo4caJvg==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.12.tgz",
+      "integrity": "sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==",
       "optional": true
     },
     "esbuild-linux-64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.7.tgz",
-      "integrity": "sha512-LxXEfLAKwOVmm1yecpMmWERBshl+Kv5YJ/1KnyAr6HRHFW8cxOEsEfisD3sVl/RvHyW//lhYUVSuy9jGEfIRAQ==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.12.tgz",
+      "integrity": "sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==",
       "optional": true
     },
     "esbuild-linux-arm": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.7.tgz",
-      "integrity": "sha512-JKgAHtMR5f75wJTeuNQbyznZZa+pjiUHV7sRZp42UNdyXC6TiUYMW/8z8yIBAr2Fpad8hM1royZKQisqPABPvQ==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.12.tgz",
+      "integrity": "sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==",
       "optional": true
     },
     "esbuild-linux-arm64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.7.tgz",
-      "integrity": "sha512-P3cfhudpzWDkglutWgXcT2S7Ft7o2e3YDMrP1n0z2dlbUZghUkKCyaWw0zhp4KxEEzt/E7lmrtRu/pGWnwb9vw==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.12.tgz",
+      "integrity": "sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==",
       "optional": true
     },
     "esbuild-linux-mips64le": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.7.tgz",
-      "integrity": "sha512-T7XKuxl0VpeFLCJXub6U+iybiqh0kM/bWOTb4qcPyDDwNVhLUiPcGdG2/0S7F93czUZOKP57YiLV8YQewgLHKw==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.12.tgz",
+      "integrity": "sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==",
       "optional": true
     },
     "esbuild-linux-ppc64le": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.7.tgz",
-      "integrity": "sha512-6mGuC19WpFN7NYbecMIJjeQgvDb5aMuvyk0PDYBJrqAEMkTwg3Z98kEKuCm6THHRnrgsdr7bp4SruSAxEM4eJw==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.12.tgz",
+      "integrity": "sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==",
       "optional": true
     },
     "esbuild-linux-riscv64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.7.tgz",
-      "integrity": "sha512-uUJsezbswAYo/X7OU/P+PuL/EI9WzxsEQXDekfwpQ23uGiooxqoLFAPmXPcRAt941vjlY9jtITEEikWMBr+F/g==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.12.tgz",
+      "integrity": "sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==",
       "optional": true
     },
     "esbuild-linux-s390x": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.7.tgz",
-      "integrity": "sha512-+tO+xOyTNMc34rXlSxK7aCwJgvQyffqEM5MMdNDEeMU3ss0S6wKvbBOQfgd5jRPblfwJ6b+bKiz0g5nABpY0QQ==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.12.tgz",
+      "integrity": "sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==",
       "optional": true
     },
     "esbuild-loader": {
@@ -6468,39 +6475,39 @@
       }
     },
     "esbuild-netbsd-64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.7.tgz",
-      "integrity": "sha512-yVc4Wz+Pu3cP5hzm5kIygNPrjar/v5WCSoRmIjCPWfBVJkZNb5brEGKUlf+0Y759D48BCWa0WHrWXaNy0DULTQ==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.12.tgz",
+      "integrity": "sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==",
       "optional": true
     },
     "esbuild-openbsd-64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.7.tgz",
-      "integrity": "sha512-GsimbwC4FSR4lN3wf8XmTQ+r8/0YSQo21rWDL0XFFhLHKlzEA4SsT1Tl8bPYu00IU6UWSJ+b3fG/8SB69rcuEQ==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.12.tgz",
+      "integrity": "sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==",
       "optional": true
     },
     "esbuild-sunos-64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.7.tgz",
-      "integrity": "sha512-8CDI1aL/ts0mDGbWzjEOGKXnU7p3rDzggHSBtVryQzkSOsjCHRVe0iFYUuhczlxU1R3LN/E7HgUO4NXzGGP/Ag==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.12.tgz",
+      "integrity": "sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==",
       "optional": true
     },
     "esbuild-windows-32": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.7.tgz",
-      "integrity": "sha512-cOnKXUEPS8EGCzRSFa1x6NQjGhGsFlVgjhqGEbLTPsA7x4RRYiy2RKoArNUU4iR2vHmzqS5Gr84MEumO/wxYKA==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.12.tgz",
+      "integrity": "sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==",
       "optional": true
     },
     "esbuild-windows-64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.7.tgz",
-      "integrity": "sha512-7MI08Ec2sTIDv+zH6StNBKO+2hGUYIT42GmFyW6MBBWWtJhTcQLinKS6ldIN1d52MXIbiJ6nXyCJ+LpL4jBm3Q==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.12.tgz",
+      "integrity": "sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==",
       "optional": true
     },
     "esbuild-windows-arm64": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.7.tgz",
-      "integrity": "sha512-R06nmqBlWjKHddhRJYlqDd3Fabx9LFdKcjoOy08YLimwmsswlFBJV4rXzZCxz/b7ZJXvrZgj8DDv1ewE9+StMw==",
+      "version": "0.15.12",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.12.tgz",
+      "integrity": "sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==",
       "optional": true
     },
     "escalade": {
@@ -10561,9 +10568,9 @@
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
     },
     "loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+      "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
       "requires": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -15036,9 +15043,9 @@
       "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="
     },
     "terser": {
-      "version": "5.15.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
-      "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
+      "version": "5.15.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
+      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
       "requires": {
         "@jridgewell/source-map": "^0.3.2",
         "acorn": "^8.5.0",
@@ -15084,13 +15091,23 @@
         "terser": "^5.14.1"
       },
       "dependencies": {
+        "@jridgewell/resolve-uri": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+          "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+        },
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.14",
+          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+        },
         "@jridgewell/trace-mapping": {
-          "version": "0.3.15",
-          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
-          "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
+          "version": "0.3.17",
+          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+          "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
           "requires": {
-            "@jridgewell/resolve-uri": "^3.0.3",
-            "@jridgewell/sourcemap-codec": "^1.4.10"
+            "@jridgewell/resolve-uri": "3.1.0",
+            "@jridgewell/sourcemap-codec": "1.4.14"
           }
         }
       }
diff --git a/package.json b/package.json
index 64de3822fc..a8b643e692 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "accepts": "^1.3.8",
     "amazon-payments": "^0.2.9",
     "amplitude": "^6.0.0",
-    "apidoc": "^0.53.0",
+    "apidoc": "^0.53.1",
     "apple-auth": "^1.0.7",
     "bcrypt": "^5.1.0",
     "body-parser": "^1.20.1",

From 18ec3eb3554d156a88f7c4f6e43396f0b659fba1 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 28 Oct 2022 18:35:58 +0200
Subject: [PATCH 117/134] Translated using Weblate (Spanish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 95.7% (2581 of 2695 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 87.1% (2350 of 2695 strings)

Translated using Weblate (Spanish)

Currently translated at 95.7% (2581 of 2695 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (208 of 208 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 87.0% (2347 of 2695 strings)

Translated using Weblate (Spanish)

Currently translated at 95.7% (2580 of 2695 strings)

Translated using Weblate (Spanish)

Currently translated at 95.7% (2580 of 2695 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 87.0% (2345 of 2695 strings)

Translated using Weblate (Ukrainian)

Currently translated at 24.0% (647 of 2695 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (403 of 403 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (Ukrainian)

Currently translated at 23.4% (632 of 2695 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.9% (2343 of 2695 strings)

Translated using Weblate (German)

Currently translated at 95.5% (385 of 403 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.8% (2341 of 2695 strings)

Translated using Weblate (German)

Currently translated at 94.7% (382 of 403 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.7% (2339 of 2695 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (214 of 214 strings)

Translated using Weblate (Polish)

Currently translated at 74.1% (43 of 58 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (47 of 47 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.7% (2337 of 2695 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.5% (401 of 403 strings)

Translated using Weblate (Ukrainian)

Currently translated at 22.9% (619 of 2695 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (2692 of 2695 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.6% (2335 of 2695 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.6% (2334 of 2695 strings)

Translated using Weblate (Spanish)

Currently translated at 95.7% (2580 of 2695 strings)

Translated using Weblate (German)

Currently translated at 100.0% (234 of 234 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2695 of 2695 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (403 of 403 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (214 of 214 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Spanish)

Currently translated at 99.5% (233 of 234 strings)

Translated using Weblate (Spanish)

Currently translated at 95.7% (2580 of 2695 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.5% (2332 of 2695 strings)

Translated using Weblate (German)

Currently translated at 91.5% (369 of 403 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 86.1% (2322 of 2695 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (214 of 214 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (216 of 216 strings)

Translated using Weblate (German)

Currently translated at 99.1% (232 of 234 strings)

Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Ike Osenberg <ike.osenberg@gmail.com>
Co-authored-by: IvorTheBoneless <bohdanfiloenko657@gmail.com>
Co-authored-by: Lena Kubisa <lenorek.05.poczta@gmail.com>
Co-authored-by: LiziKnight <liziknight0316@outlook.com>
Co-authored-by: Mara S. (Dolichotis) <marascherzer@gmail.com>
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com>
Co-authored-by: Sara López <sarayupy@gmail.com>
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com>
Co-authored-by: UNI <nibi727171@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/pl/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/de/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/es/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/es/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/es/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/it/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translation: Habitica/Contrib
Translation: Habitica/Faq
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Npc
Translation: Habitica/Questscontent
Translation: Habitica/Settings
Translation: Habitica/Subscriber
---
 website/common/locales/de/groups.json        |  20 +++-
 website/common/locales/de/limited.json       |   8 +-
 website/common/locales/es/gear.json          | 111 +++++++++++--------
 website/common/locales/es/limited.json       |   6 +-
 website/common/locales/es/npc.json           |  19 ++--
 website/common/locales/es/questscontent.json |   9 +-
 website/common/locales/it/questscontent.json |   2 +-
 website/common/locales/ja/groups.json        |  16 ++-
 website/common/locales/ja/npc.json           |   3 +-
 website/common/locales/ja/settings.json      |   3 +-
 website/common/locales/ja/subscriber.json    |   2 +-
 website/common/locales/pl/contrib.json       |   5 +-
 website/common/locales/pl/faq.json           |  10 +-
 website/common/locales/pt_BR/generic.json    |   2 +-
 website/common/locales/pt_BR/settings.json   |   4 +-
 website/common/locales/ru/gear.json          |   2 +-
 website/common/locales/ru/npc.json           |   2 +-
 website/common/locales/ru/settings.json      |   3 +-
 website/common/locales/uk/gear.json          |  70 ++++++------
 website/common/locales/uk/groups.json        |  18 ++-
 website/common/locales/uk/npc.json           |   7 +-
 website/common/locales/zh/gear.json          |   6 +-
 website/common/locales/zh/generic.json       |   4 +-
 website/common/locales/zh_TW/gear.json       |  33 +++++-
 website/common/locales/zh_TW/generic.json    |   3 +-
 25 files changed, 242 insertions(+), 126 deletions(-)

diff --git a/website/common/locales/de/groups.json b/website/common/locales/de/groups.json
index 11bfc25903..088abb76b9 100644
--- a/website/common/locales/de/groups.json
+++ b/website/common/locales/de/groups.json
@@ -197,7 +197,7 @@
     "userIsClamingTask": "`<%= username %> beansprucht:` <%= task %>",
     "approvalRequested": "Zustimmung erbeten",
     "cantDeleteAssignedGroupTasks": "Du kannst Gruppen-Aufgaben, die Dir zugewiesen wurden, nicht löschen.",
-    "groupPlanUpgraded": "<strong><%- groupName %></strong> wurde auf einen Gruppenplan hochgestuft!",
+    "groupPlanUpgraded": "<strong><%- groupName %></strong> wurde erfolgreich auf einen Gruppenplan hochgestuft!",
     "groupPlanCreated": "<strong><%- groupName %></strong> wurde erstellt!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Nur der Gruppenleiter kann Nutzer zu einer Gruppe mit einem Abonnement hinzufügen.",
     "paymentDetails": "Zahlungsinformationen",
@@ -382,5 +382,21 @@
     "sendGiftTotal": "Insgesamt:",
     "chatTemporarilyUnavailable": "Chat aktuell nicht verfügbar. Bitte versuche es später erneut.",
     "assignTo": "Zugewiesen an",
-    "newGroupsEnjoy": "Wir hoffen, Dir gefallen die neuen Gruppenpläne!"
+    "newGroupsEnjoy": "Wir hoffen, Dir gefallen die neuen Gruppenpläne!",
+    "groupUseDefault": "Wähle eine Antwort",
+    "createGroup": "Erstelle eine Gruppe",
+    "groupUse": "Was beschreibt den Zweck Deiner Gruppe am Besten?*",
+    "groupParentChildren": "Eltern(teile), die Aufgaben für ihre Kinder erstellen",
+    "groupCouple": "Ein Paar, das sich Aufgaben teilt",
+    "groupFriends": "Freunde, die sich Aufgaben teilen",
+    "groupCoworkers": "Arbeitskollegen, die sich Aufgaben teilen",
+    "groupManager": "Ein Manager, der Aufgaben für seine Mitarbeiter erstellt",
+    "groupTeacher": "Ein Lehrer, der Aufgaben für seine Schüler oder Studierenden erstellt",
+    "nameStar": "Name*",
+    "descriptionOptional": "Beschreibung",
+    "descriptionOptionalText": "Füge eine Beschreibung hinzu",
+    "nameStarText": "Füge einen Titel hinzu",
+    "nextPaymentMethod": "Weiter: Zahlungsmethode",
+    "dayStart": "<strong>Tageswechsel</strong>: <%= startTime %>",
+    "viewStatus": "Status"
 }
diff --git a/website/common/locales/de/limited.json b/website/common/locales/de/limited.json
index 22b163aa90..8e1861afa0 100644
--- a/website/common/locales/de/limited.json
+++ b/website/common/locales/de/limited.json
@@ -229,5 +229,11 @@
     "summer2022MantaRayMageSet": "Mantarochen (Magier)",
     "julyYYYY": "Juli <%= year %>",
     "octoberYYYY": "Oktober <%= year %>",
-    "februaryYYYY": "Februar <%= year %>"
+    "februaryYYYY": "Februar <%= year %>",
+    "fall2022KappaRogueSet": "Kappa (Schurke)",
+    "fall2022OrcWarriorSet": "Ork (Krieger)",
+    "fall2022HarpyMageSet": "Harpyie (Magier)",
+    "fall2022WatcherHealerSet": "Beobachter (Heiler)",
+    "gemSaleHow": "Kauf einfach zwischen <%= eventStartMonth %> <%= eventStartOrdinal %>und <%= eventEndOrdinal %> eines der Edelstein-Pakete wie normal und Deinem Konto werden automatisch die zusätzlichen Edelsteine gutgeschrieben. Das heißt insgesamt mehr Edelsteine zum ausgeben, teilen oder ansparen für zukünftige Veröffentlichungen!",
+    "gemSaleLimitations": "Dieses Sonderangebot gilt nur während der zeitlich beschränkten Aktion. Die Aktion startet am <%= eventStartOrdinal %>. <%= eventStartMonth %> um 8:00 EDT (12:00 UTC) und endet am <%= eventEndOrdinal %>. <%= eventStartMonth %> um 20:00 PM EDT (00:00 UTC). Das Sonderangebot ist nur verfügbar, wenn Du Edelsteine für Dich selbst kaufst."
 }
diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index 415d38ea1c..31974453c6 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -2182,70 +2182,70 @@
     "headSpecialSpring2020HealerText": "Fascinador Iris",
     "headSpecialWinter2020WarriorText": "Tocado Polvonevado",
     "headSpecialSpring2020HealerNotes": "¡Engaña a tus enemigos con este tocado de flores! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2020.",
-    "headSpecialSummer2020HealerText": "Yelmo tachonado de cristal",
-    "headSpecialFall2020RogueNotes": "Mira dos veces, actúa una: esta máscara te lo hace fácil. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de otoño 2020.",
+    "headSpecialSummer2020HealerText": "Yelmo Tachonado de Cristal",
+    "headSpecialFall2020RogueNotes": "Mira dos veces, actúa una: esta máscara te lo hace fácil. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2020.",
     "headSpecialSpring2020MageText": "Gorra con Tapa de Goteo",
     "headSpecialSpring2020MageNotes": "¿Está el cielo despejado?¿hay poca humedad? No te preocupes, te ayudamos. ¡Humedece tu magia sin humillar tu espíritu! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2020.",
-    "headSpecialSummer2020WarriorNotes": "Multiplica tu fuerza y habilidad con esta prenda de cabeza altamente visible. Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de verano 2020.",
-    "headSpecialFall2020RogueText": "Máscara de piedra de dos cabezas",
-    "headSpecialFall2020WarriorNotes": "¡El guerrero que en su día la usaba, jamás se inmutó ante las tareas más duras! Pero puede que otros retrocedan ante ti cuando lo uses... Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2020.",
+    "headSpecialSummer2020WarriorNotes": "Multiplica tu fuerza y habilidad con esta prenda de cabeza altamente visible. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2020.",
+    "headSpecialFall2020RogueText": "Máscara de Piedra de Dos Cabezas",
+    "headSpecialFall2020WarriorNotes": "¡El guerrero que en su día la usaba, jamás se inmutó ante las tareas más duras! Pero puede que otros retrocedan ante ti cuando lo uses... Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2020.",
     "headSpecialFall2020MageText": "Clarividencia Despertada",
     "headSpecialSummer2020RogueNotes": "¡Completa tu estilo picaresco camuflándote con este yelmo! Quizás puedas engañar a tus enemigos con tus lágrima de cocodrilo... Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2020.",
-    "headSpecialSummer2020WarriorText": "Gorra de pescado llamativo",
+    "headSpecialSummer2020WarriorText": "Gorra de Pescado Llamativo",
     "headSpecialWinter2020HealerNotes": "Por favor, quíteselo de la cabeza antes de tratar de hacer café o té con él. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2019-2020.",
-    "headSpecialSummer2020HealerNotes": "Estate tranquilo, puede que los recogeconchas mantengan sus manos lejos de tu pelo. Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2020.",
-    "headSpecialSummer2020MageText": "Cresta de pez sable",
+    "headSpecialSummer2020HealerNotes": "Estate tranquilo, puede que los recogeconchas mantengan sus manos lejos de tu pelo. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2020.",
+    "headSpecialSummer2020MageText": "Cresta de Pez Sable",
     "headSpecialSummer2020RogueText": "Yelmo de Cocodrilo",
-    "headSpecialSummer2020MageNotes": "¿Quién necesita una corona teniendo esta cresta? Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de verano 2020.",
-    "headSpecialFall2020MageNotes": "Con esta gorra asentada a la perfección sobre tu frente, tu tercer ojo se abre, lo que te permite concentrarte en lo que de otro modo sería invisible: flujos de maná, espíritus inquietos y tareas pendientes olvidadas. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de otoño 2020.",
-    "headSpecialFall2020WarriorText": "Capucha siniestra",
+    "headSpecialSummer2020MageNotes": "¿Quién necesita una corona teniendo esta cresta? Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2020.",
+    "headSpecialFall2020MageNotes": "Con esta gorra asentada a la perfección sobre tu frente, tu tercer ojo se abre, lo que te permite concentrarte en lo que de otro modo sería invisible: flujos de maná, espíritus inquietos y tareas pendientes olvidadas. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2020.",
+    "headSpecialFall2020WarriorText": "Capucha Siniestra",
     "headSpecialWinter2020WarriorNotes": "Una sensación de picazón en el cuero cabelludo es un pequeño precio a pagar por la magnificencia estacional. Aumenta la Fuerza en <%= str%>. Equipamiento de edición limitada de invierno 2019-2020.",
     "headSpecialSpring2020WarriorNotes": "¡Los golpes de tus enemigos rebotarán en este yelmo inspirado en los escarabajos!. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2020.",
     "headSpecialSpring2020RogueNotes": "Tan vibrante y valioso que sufrirás la tentación de robárselo a tu propia cabeza. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2020.",
     "headSpecialSpring2020WarriorText": "Yelmo de Escarabajo",
     "headSpecialSpring2020RogueText": "Kabuto de Lapis",
-    "headSpecialWinter2021WarriorText": "Capucha aislante",
-    "headSpecialSpring2021RogueNotes": "Dejémonos de florituras lingüísticas: ¡este sombrero te permitirá camuflarte a la perfección entre las flores de primavera! Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de primavera 2021.",
-    "headSpecialSpring2021MageNotes": "Coloca esta ligera corona sobre tu frente y los pájaros de las aguas acudirán en tu ayuda. ¿Qué misión les darás? Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de primavera 2021.",
-    "headSpecialSummer2021MageText": "Cresta nautiloide",
+    "headSpecialWinter2021WarriorText": "Capucha Aislante",
+    "headSpecialSpring2021RogueNotes": "Dejémonos de florituras lingüísticas: ¡este sombrero te permitirá camuflarte a la perfección entre las flores de primavera! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2021.",
+    "headSpecialSpring2021MageNotes": "Coloca esta ligera corona sobre tu frente y los pájaros de las aguas acudirán en tu ayuda. ¿Qué misión les darás? Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2021.",
+    "headSpecialSummer2021MageText": "Cresta Nautiloide",
     "headMystery202007Notes": "Este yelmo te permitirá entonar complejas y hermosas canciones para tus compañeros cetáceos. No otorga ningún beneficio. Artículo del suscriptor de julio 2020.",
     "headMystery201912Notes": "¡Este reluciente copo de nieve te otorga resistencia al frío sin importar lo alto que vueles! No otorga ningún beneficio. Artículo de suscriptor de diciembre 2019.",
-    "headSpecialFall2020HealerNotes": "La espantosa palidez de este rostro con forma de calavera brilla como una advertencia para todos los mortales: ¡El tiempo es fugaz! ¡Cumple con tus plazos antes de que sea demasiado tarde! Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2020.",
+    "headSpecialFall2020HealerNotes": "La espantosa palidez de este rostro con forma de calavera brilla como una advertencia para todos los mortales: ¡El tiempo es fugaz! ¡Cumple con tus plazos antes de que sea demasiado tarde! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2020.",
     "headMystery202006Text": "Tiara de sugilita",
-    "headSpecialWinter2021MageNotes": "Deja volar tu imaginación, mientras sientes la hogareña seguridad que proporciona esta capucha. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de invierno 2020-2021.",
+    "headSpecialWinter2021MageNotes": "Deja volar tu imaginación, mientras sientes la hogareña seguridad que proporciona esta capucha. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2020-2021.",
     "headMystery201911Notes": "Cada uno de los cristales tachonados sobre este sombrero te otorga un poder especial: Clarividencia Mística, Sabiduría Arcana, y ... Placa de Sortilegio Giratorio. Nada mal, la verdad. No otorga ningún beneficio. Artículo de suscriptor de noviembre 2019.",
-    "headSpecialSpring2021WarriorText": "Yelmo solar",
-    "headSpecialFall2020HealerText": "Máscara de cabeza de la Muerte",
-    "headSpecialSpring2021WarriorNotes": "¡No temas! La piedra solar de este yelmo te ayudará a sacar a la luz esas tareas pendientes que tengas en color rojo oscuro profundo. Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2021.",
-    "headSpecialSummer2021MageNotes": "Puede que los ojos en forma de agujeros colocados sobre esta gorra moteada no mejoren mucho tu visión submarina, pero de lo que sí puedes estar seguro es de que desconcertarán a tus oponentes. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de verano 2021.",
-    "headSpecialWinter2021RogueText": "Máscara de hiedra",
-    "headSpecialWinter2021HealerNotes": "¡Una sorprendente cantidad de calor se escapa por la cabeza! Sin embargo, eso no ocurrirá mientras uses esta gruesa capucha y sus respectivas gafas. ¡No habrá ni un solo carámbano en tus pestañas! Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2020-2021.",
-    "headSpecialSummer2021WarriorText": "Yelmo pescadero",
-    "headSpecialSpring2021RogueText": "Sombrero de flores gemelas",
+    "headSpecialSpring2021WarriorText": "Yelmo Solar",
+    "headSpecialFall2020HealerText": "Máscara de Cabeza de la Muerte",
+    "headSpecialSpring2021WarriorNotes": "¡No temas! La piedra solar de este yelmo te ayudará a sacar a la luz esas tareas pendientes que tengas en color rojo oscuro profundo. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2021.",
+    "headSpecialSummer2021MageNotes": "Puede que los ojos en forma de agujeros colocados sobre esta gorra moteada no mejoren mucho tu visión submarina, pero de lo que sí puedes estar seguro es de que desconcertarán a tus oponentes. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2021.",
+    "headSpecialWinter2021RogueText": "Máscara de Hiedra",
+    "headSpecialWinter2021HealerNotes": "¡Una sorprendente cantidad de calor se escapa por la cabeza! Sin embargo, eso no ocurrirá mientras uses esta gruesa capucha y sus respectivas gafas. ¡No habrá ni un solo carámbano en tus pestañas! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2020-2021.",
+    "headSpecialSummer2021WarriorText": "Yelmo Pescadero",
+    "headSpecialSpring2021RogueText": "Sombrero de Flores Gemelas",
     "headMystery202006Notes": "La energía positiva de estas radiantes piedras púrpuras atraerá a tu lado a las criaturas más amigables del mar. No otorga ningún beneficio. Artículo de suscriptor de junio 2020.",
-    "headSpecialWinter2021WarriorNotes": "Envuélvete con esta confortable capucha para superar el frío invernal. Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de invierno 2020-2021.",
+    "headSpecialWinter2021WarriorNotes": "Envuélvete con esta confortable capucha para superar el frío invernal. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de invierno 2020-2021.",
     "headMystery202007Text": "Espectacular yelmo de orca",
-    "headSpecialWinter2021MageText": "Capucha de sombra lunar",
+    "headSpecialWinter2021MageText": "Capucha de Sombra Lunar",
     "headMystery202003Text": "Yelmo de espino",
-    "headSpecialWinter2021HealerText": "Equipo de cabeza para la exploración ártica",
-    "headSpecialSummer2021RogueNotes": "Es gruesa, brillante y divertida. ¡Como tú! Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de verano 2021.",
-    "headSpecialSummer2021HealerText": "Máscara de loro",
-    "headSpecialSummer2021HealerNotes": "¡Toma prestado el plumaje de un loro para ayudarte con tus batallas diarias! Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2021.",
-    "headSpecialWinter2021RogueNotes": "Un pícaro puede pasar desapercibido en el bosque con una máscara como esta. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de invierno 2020-2021.",
-    "headSpecialSummer2021RogueText": "Capucha de pez payaso",
-    "headSpecialSpring2021MageText": "Tiara de cría de cisne",
-    "headSpecialSpring2021HealerText": "Guirnalda de salix",
+    "headSpecialWinter2021HealerText": "Equipo de Cabeza para la Exploración Ártica",
+    "headSpecialSummer2021RogueNotes": "Es gruesa, brillante y divertida. ¡Como tú! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2021.",
+    "headSpecialSummer2021HealerText": "Máscara de Loro",
+    "headSpecialSummer2021HealerNotes": "¡Toma prestado el plumaje de un loro para ayudarte con tus batallas diarias! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2021.",
+    "headSpecialWinter2021RogueNotes": "Un pícaro puede pasar desapercibido en el bosque con una máscara como esta. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2020-2021.",
+    "headSpecialSummer2021RogueText": "Capucha de Pez Payaso",
+    "headSpecialSpring2021MageText": "Tiara de Cría de Cisne",
+    "headSpecialSpring2021HealerText": "Guirnalda de Salix",
     "headSpecialFall2021RogueText": "Has sido engullido",
-    "headSpecialFall2021WarriorText": "Corbata sin cabeza",
-    "headSpecialFall2021WarriorNotes": "Pierde la cabeza por este formal conjunto de cuello y corbata que completan tu traje. Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2021.",
-    "headSpecialFall2021MageText": "Máscara comecerebros",
-    "headSpecialFall2021HealerText": "Máscara de invocador",
-    "headSpecialFall2021HealerNotes": "Tu propia mágica transforma tu pelo en brillantes e impactantes llamas cuando llevas esta máscara. Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2021.",
+    "headSpecialFall2021WarriorText": "Corbata sin Cabeza",
+    "headSpecialFall2021WarriorNotes": "Pierde la cabeza por este formal conjunto de cuello y corbata que completan tu traje. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2021.",
+    "headSpecialFall2021MageText": "Máscara Comecerebros",
+    "headSpecialFall2021HealerText": "Máscara de Invocador",
+    "headSpecialFall2021HealerNotes": "Tu propia mágica transforma tu pelo en brillantes e impactantes llamas cuando llevas esta máscara. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2021.",
     "headMystery202003Notes": "¡Ten cuidado, este yelmo es afilado por todas partes! No otorga ningún beneficio. Artículo de suscriptor de marzo 2020.",
-    "headSpecialSpring2021HealerNotes": "¡No lloréis, compañeros!¡Ya está aquí el sanador para acabar con vuestro sufrimiento! Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2021.",
-    "headSpecialSummer2021WarriorNotes": "¡Este yelmo puede mantenerte seguro y además su magia te permitirá a respirar bajo el agua! Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de verano 2021.",
-    "headSpecialFall2021RogueNotes": "Ugh, estás atascado. Ahora estás condenado a vagar por los corredores de la mazmorra, coleccionando escombros. ¡CONDENADÍSIMOOOO! Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de otoño 2021.",
-    "headSpecialFall2021MageNotes": "Los tentáculos que rodean la boca agarran la presa y mantienen sus deliciosos pensamientos cerca de ella para que puedas saborearlos. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de otoño 2021.",
+    "headSpecialSpring2021HealerNotes": "¡No lloréis, compañeros!¡Ya está aquí el sanador para acabar con vuestro sufrimiento! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2021.",
+    "headSpecialSummer2021WarriorNotes": "¡Este yelmo puede mantenerte seguro y además su magia te permitirá a respirar bajo el agua! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2021.",
+    "headSpecialFall2021RogueNotes": "Ugh, estás atascado. Ahora estás condenado a vagar por los corredores de la mazmorra, coleccionando escombros. ¡CONDENADÍSIMOOOO! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2021.",
+    "headSpecialFall2021MageNotes": "Los tentáculos que rodean la boca agarran la presa y mantienen sus deliciosos pensamientos cerca de ella para que puedas saborearlos. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2021.",
     "headMystery202001Notes": "Tu capacidad auditiva será tan aguda, que escucharás brillar a las estrellas y girar a la luna. No otorga ningún beneficio. Artículo de suscriptor de enero 2020.",
     "headMystery202101Text": "Yelmo molón de leopardo de las nieves",
     "headArmoireTricornHatNotes": "¡Transfórmate en un bromista profesional! Aumenta la percepción en <%= per %>. Armario Encantado: Artículo independiente.",
@@ -2529,7 +2529,7 @@
     "armorSpecialWinter2022WarriorText": "Calcetín Calentito",
     "headSpecialWinter2022MageText": "Yelmo de Granada",
     "headSpecialWinter2022MageNotes": "Gracias a su piel dura, este casco festivo y frutal es exgranadamente fuerte. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2020-2021.",
-    "headSpecialWinter2022RogueNotes": "¿Qué? ¿Eh? ¿Que hay un Pícaro dónde? ¡Lo siento, con estos fuegos artificiales no oigo nada! Aumenta la Percepción en <%= per %>. Equipamiento de Edición Limitada de Invierno 2020-2021.",
+    "headSpecialWinter2022RogueNotes": "¿Qué? ¿Eh? ¿Que hay un Pícaro dónde? ¡Lo siento, con estos fuegos artificiales no oigo nada! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2021-2022.",
     "headSpecialWinter2022WarriorText": "Gorro de Calcetín Calentito",
     "headSpecialWinter2022WarriorNotes": "Con su color verde festivo y su ribete rojo, seguro que este sombrero te mantendrá caliente todo el invierno. Aumenta la Fuerza en <%= str %>. Equipamiento de Edición Limitada de Invierno 2020-2021.",
     "headSpecialWinter2022HealerText": "Corona de Hielo Cristalino",
@@ -2597,5 +2597,24 @@
     "weaponArmoireHuntingHornText": "Cuerno de Caza",
     "weaponSpecialSpring2022HealerText": "Vara de Peridoto",
     "weaponSpecialSpring2022HealerNotes": "Utiliza esta vara para acceder a las propiedades curativas del peridoto, ya sea para llevar la calma, la positividad, o la bondad. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2022.",
-    "weaponSpecialSpring2022RogueNotes": "¡Qué brillante! Es tan brillante y resplandeciente y bonito y lindo y todo tuyo. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2022."
+    "weaponSpecialSpring2022RogueNotes": "¡Qué brillante! Es tan brillante y resplandeciente y bonito y lindo y todo tuyo. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2022.",
+    "weaponArmoireOrangeKiteNotes": "Con colores como el amanecer y el anochecer, ¡veamos cómo de alto puede llegar tu cometa! Aumenta todas las estadisticas en <%= attrs %>. Armario Encantado: Colección de Cometas (Artículo 3 de 5)",
+    "weaponSpecialSummer2022RogueText": "Pinza de cangrejo",
+    "weaponSpecialSummer2022RogueNotes": "Si estás en un apuro, ¡no dudes enseñar estas temibles pinzas! Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de verano 2022.",
+    "weaponSpecialFall2022RogueText": "Cuchilla de pepino",
+    "weaponSpecialFall2022RogueNotes": "No solo te puedes defender con este pepino, también es una comida sabrosa. Aumenta la Fuerza en <%= str %>.Equipamiento de edición limitada de otoño 2022.",
+    "weaponSpecialFall2022MageText": "Ráfagas de viento",
+    "weaponMystery202209Text": "Manual de magia",
+    "weaponMystery202209Notes": "Este libro te guiará a través de tu viaje en la creación de magia. No otorga ningún beneficio. Artículo de suscriptor de septiembre de 2022.",
+    "weaponArmoireGreenKiteNotes": "Una cometa más impresionante que nunca, con sus sombras de amarillo y verde. Aumenta todas las estadisticas en <%= attrs %>. Armario Encantado: Colección de Cometas (Artículo 2 de 5)",
+    "weaponArmoireBlueKiteText": "Cometa azul",
+    "weaponArmoireOrangeKiteText": "Cometa naranja",
+    "weaponArmoireBlueKiteNotes": "Navegando en lo alto del azul, ¿qué trucos puedes conseguir que haga tu cometa? Aumenta todas las estadisticas en <%= attrs %>. Armario Encantado: Colección de Cometas (Artículo 1 de 5)",
+    "weaponArmoireGreenKiteText": "Cometa verde",
+    "weaponArmoirePinkKiteNotes": "Navegando, girando, volando alto, tu cometa destaca contra el cielo. Aumenta todas las estadisticas en <%= attrs %>. Armario Encantado: Colección de Cometas (Artículo 4 de 5)",
+    "weaponArmoireYellowKiteText": "Cometa amarilla",
+    "weaponArmoireYellowKiteNotes": "Cayendo en picado y girando de un lado a otro, mira cómo va tu alegre cometa. Aumenta todas las estadisticas en <%= attrs %>. Armario Encantado: Colección de Cometas (Artículo 5 de 5)",
+    "weaponArmoirePinkKiteText": "Cometa rosa",
+    "weaponArmoirePushBroomText": "Escoba de empuje",
+    "headSpecialSummer2022RogueText": "Casco de Cangrejo"
 }
diff --git a/website/common/locales/es/limited.json b/website/common/locales/es/limited.json
index be7ba1e5b9..e8eb709888 100644
--- a/website/common/locales/es/limited.json
+++ b/website/common/locales/es/limited.json
@@ -231,5 +231,9 @@
     "julyYYYY": "Julio de <%= year %>",
     "octoberYYYY": "Octubre de <%= year %>",
     "fall2022HarpyMageSet": "Arpía (Mago)",
-    "fall2022OrcWarriorSet": "Orca (Guerrero)"
+    "fall2022OrcWarriorSet": "Orca (Guerrero)",
+    "gemSaleLimitations": "Esta promoción solo aplica durante el tiempo limitado del evento. Este evento empieza el <%= eventStartOrdinal %> de <%= eventStartMonth %> a las 8:00 AM EDT (12:00 UTC) y acabará el <%= eventEndOrdinal %> de <%= eventStartMonth %> a las 8:00 PM EDT (00:00 UTC). Esta promoción solo está disponible cuando se compran Gemas para uno mismo.",
+    "gemSaleHow": "Entre el <%= eventStartOrdinal %> y <%= eventEndOrdinal %> de <%= eventStartMonth %>, simplemente compra cualquier paquete de Gemas como normalmente, y se abonará en tu cuenta el número promocional de Gemas. ¡Más Gemas para gastar, compartir o guardar para futuras entregas!",
+    "fall2022KappaRogueSet": "Kapa (Pícaro)",
+    "fall2022WatcherHealerSet": "Mirador (Sanador)"
 }
diff --git a/website/common/locales/es/npc.json b/website/common/locales/es/npc.json
index 49914c55db..3de775b4f1 100644
--- a/website/common/locales/es/npc.json
+++ b/website/common/locales/es/npc.json
@@ -14,12 +14,12 @@
     "next": "Siguiente",
     "randomize": "Aleatorizar",
     "mattBoch": "Matt Boch",
-    "mattBochText1": "¡Bienvenido al Establo! Soy Matt, el señor de las bestias. Cada vez que completas una tarea, tienes una chance aleatoria de conseguir un Huevo o una Poción de eclosión con los cuales puedes eclosionar una Mascota. ¡Cuando nazca tu Mascota, aparecerá aquí! Haz clic en la imagen de una Mascota para añadirla a tu personaje. Aliméntalas con el alimento para mascotas que encuentres y se convertirán en vigorosas Monturas.",
+    "mattBochText1": "¡Bienvenido al Establo! Soy Matt, el señor de las bestias. Cada vez que completas una tarea, tienes una posibilidad aleatoria de conseguir un Huevo o una Poción de eclosión con los cuales puedes eclosionar una Mascota. ¡Cuando nazca tu Mascota, aparecerá aquí! Haz clic en la imagen de una Mascota para añadirla a tu personaje. Aliméntalas con el alimento para mascotas que encuentres y se convertirán en vigorosas Monturas.",
     "welcomeToTavern": "¡Bienvenido a la taberna!",
     "sleepDescription": "¿Necesitas un descanso? Pásate por la Posada de Daniel para pausar algunas de las mecánicas de juego más dificiles de Habitica:",
-    "sleepBullet1": "Las Tareas Diarias incumplidas no te dañarán",
-    "sleepBullet2": "Las tareas no perderán sus rachas",
-    "sleepBullet3": "Los Jefes no te dañarán por tus propias Tareas Diarias incompletas",
+    "sleepBullet1": "Tus Tareas Diarias incumplidas no te dañarán (aunque los jefes te harán daño causado por las Tareas Diarias incumplidas por otro miembro del Equipo)",
+    "sleepBullet2": "Las rachas de tus Tareas y Hábitos no se reiniciarán",
+    "sleepBullet3": "El daño que produzcas a los Jefes de misión o los objetos de colección encontrados permanecerán pendientes hasta que salgas de la Taverna",
     "sleepBullet4": "El daño que hagas a tu jefe o los objetos de Misiones de recolección permanecerán pendientes hasta que termine el día",
     "pauseDailies": "Pausar daño",
     "unpauseDailies": "Volver a sufrir daño",
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "¡Nuevas Novedades de Bailey!",
     "tellMeLater": "Dímelo más tarde",
     "dismissAlert": "Descartar este aviso",
-    "donateText3": "Habitica es un proyecto de código abierto que depende del soporte de sus usuarios. El dinero que gastes en gemas nos ayuda a mantener activos los servidores, mantener al pequeño grupo de personal, desarrollar nuevas características y proveer incentivos para nuestros voluntarios.",
+    "donateText3": "Habitica es un proyecto de código abierto que depende del soporte de sus usuarios. El dinero que gastes en gemas nos ayuda a mantener activos los servidores, mantener al pequeño grupo de personal, desarrollar nuevas características y proveer incentivos para nuestros voluntarios",
     "card": "Tarjeta de crédito",
     "paymentMethods": "Comprar con",
     "paymentSuccessful": "¡El pago se llevó a cabo con éxito!",
@@ -101,9 +101,9 @@
     "tourPartyPage": "Tu Equipo te ayudará a mantenerte responsable. ¡Invita a amigos para desbloquear un Pergamino de Misión!",
     "tourGuildsPage": "Los Gremios son grupos de conversación de intereses comunes creados por los jugadores, para los jugadores. Ojea la lista y únete a los Gremios que te interesen. ¡Asegúrate de echar un vistazo al popular Gremio de Ayuda de Habitica: Haz una Pregunta, donde cualquiera puede hacer preguntas sobre Habitica!",
     "tourChallengesPage": "¡Los desafios son listas de tareas tematicas creadas por usuarios! Unirte a un Desafio añadira sus tareas a tu cuenta. ¡Compite contra otros usuarios para ganar premios en Gemas!",
-    "tourMarketPage": "Cada vez que completes una tarea, tendrás una chance aleatoria de recibir un Huevo, una Poción eclosionadora o un trozo de Alimento para mascotas. También puedes comprar estos objetos aquí.",
+    "tourMarketPage": "Cada vez que completes una tarea, tendrás una posibilidad aleatoria de recibir un Huevo, una Poción eclosionadora o un trozo de Alimento para mascotas. También puedes comprar estos objetos aquí.",
     "tourHallPage": "Bienvenido al Salón de los Héroes, donde los contribuidores del código abierto de Habitica son honrados. Ya sea mediante código, arte, música, escritura o incluso por simple buena voluntad, ellos han ganado Gemas, equipamiento exclusivo, y prestigiosos títulos. ¡Tú puedes contribuir con Habitica también!",
-    "tourPetsPage": "¡Bienvenido al Establo! Cada vez que completes una tarea, tendrás una chance aleatoria de recibir un Huevo o una Poción eclosionadora para eclosionar Mascotas. Cuando eclosiones una Mascota, ¡aparecerá aquí! Haz click en la imagen de una mascota para añadirla a tu avatar. Aliméntalas con el Alimento para mascotas que encuentres y se convertirán en poderosas monturas.",
+    "tourPetsPage": "¡Bienvenido al Establo! Cada vez que completes una tarea, tendrás una posibilidad aleatoria de recibir un Huevo o una Poción eclosionadora para eclosionar Mascotas. Cuando eclosiones una Mascota, ¡aparecerá aquí! Haz click en la imagen de una mascota para añadirla a tu avatar. Aliméntalas con el Alimento para mascotas que encuentres y se convertirán en poderosas monturas.",
     "tourMountsPage": "Una vez que has alimentado a tu mascota lo suficiente como para que se convierta en una montura, aparecerá aquí. ¡Haz click en una montura para ensillar!",
     "tourEquipmentPage": "¡Aquí es donde tu Equipamiento se almacena! Tu Equipo de Batalla afecta a tus Atributos. Si quieres enseñar Equipamiento distinto en tu avatar sin cambiar tus Atributos, haz click en \"Llevar disfraz.\"",
     "equipmentAlreadyOwned": "Tú ya tienes esa parte del conjunto",
@@ -131,5 +131,8 @@
     "limitedAvailabilityMinutes": "Disponible por <%= minutes %>m <%= seconds %>s",
     "limitedAvailabilityHours": "Disponible por <%= hours %>h <%= minutes %>m",
     "amountExp": "<%= amount %> Exp",
-    "newStuffPostedOn": "Publicado el <%= publishDate %>, <%= publishTime %>"
+    "newStuffPostedOn": "Publicado el <%= publishDate %>, <%= publishTime %>",
+    "groupsPaymentSubBilling": "Tu próxima fecha de facturación es <strong><%= renewalDate %></strong>.",
+    "groupsPaymentAutoRenew": "Esta suscripción se auto-renovará hasta que sea cancelada. Si quieres cancelarla, puedes hacerlo desde la pestaña de Cobro de grupos.",
+    "helpSupportHabitica": "Ayuda a apoyar a Habitica"
 }
diff --git a/website/common/locales/es/questscontent.json b/website/common/locales/es/questscontent.json
index cb7edc8a2a..5942d0c6f8 100644
--- a/website/common/locales/es/questscontent.json
+++ b/website/common/locales/es/questscontent.json
@@ -745,10 +745,13 @@
     "questOnyxCollectOnyxStones": "Piedras de Ónice",
     "questOnyxDropOnyxPotion": "Poción de Eclosión de Ónice",
     "questOnyxUnlockText": "Desbloquea la compra de Pociones de Eclosión de Ónice en el Mercado",
-    "questVirtualPetCompletion": "Al presionar cuidadosamente un botón, parece haber satisfecho las misteriosas necesidades de la mascota virtual, y finalmente se ha calmado y parece contento. llena de pociones emitiendo pitidos.<br><br>“El momento, April Fool”, dice @Beffymaroo con una sonrisa irónica. “Sospecho que este tipo grande que emite un pitido es un conocido tuyo.”<br><br>“Uh, sí,” dice el Loco, tímidamente. “¡Lo siento mucho y gracias a ambos por cuidar de Wotchimon! Toma estas pociones a modo de agradecimiento, pueden recuperar tus mascotas virtuales cuando quieras” asi que vale la pena intentarlo!",
-    "questVirtualPetNotes": "Es una tranquila y agradable mañana de primavera en Habitica, una semana después de un memorable Día de los Inocentes. Tú y @Beffymaroo están en los establos atendiendo a sus mascotas (aun que todavía están un poco confundidas por el tiempo que pasaron virtualmente!.<br><br>A lo lejos escuchas un estruendo y un pitido, suave al principio pero aumentando en volumen como si estuviera cada vez más cerca. Aparece una forma de huevo en el horizonte y, a medida que se acerca, con un pitido cada vez más fuerte, ¡ves que es una mascota virtual gigantesca!<br><br>“Oh, no”, exclama @Beffymaroo, “Creo que April Fool dejó asuntos pendientes con este tipo grande aquí, ¡parece querer atención!”<br><br>La mascota virtual emite un pitido enfadado, lanzando una rabieta virtual y gritando cada vez más cerca.",
+    "questVirtualPetCompletion": "Al presionar cuidadosamente un botón, parece haber satisfecho las misteriosas necesidades de la mascota virtual, y finalmente se ha calmado y parece contento.<br><br> De repente en una explosión de confeti, Santo Inocente aparece con una cesta llena de pociones emitiendo pitidos suaves.<br><br>“Qué oportuno, Santo Inocente”, dice @Beffymaroo con una sonrisa irónica. “Sospecho que este tipo grande que emite un pitido es un conocido tuyo.”<br><br>“Uh, sí,” dice Inocente, tímidamente. “¡Lo siento mucho y gracias a ambos por cuidar de Wotchimon! Toma estas pociones a modo de agradecimiento, pueden recuperar tus mascotas virtuales cuando quieras”<br><br>No estás 100% seguro de estar de acuerdo con todos esos pitidos, ¡pero son muy monos, así que vale la pena intentarlo!",
+    "questVirtualPetNotes": "Es una tranquila y agradable mañana de primavera en Habitica, una semana después de un memorable Día de los Inocentes. Tú y @Beffymaroo estáis en los establos atendiendo a vuestras mascotas (¡quienes todavía están un poco confundidas por el tiempo que pasaron virtualmente!).<br><br>A lo lejos escuchas un estruendo y un pitido, suave al principio pero aumentando en volumen como si estuviera cada vez más cerca. Aparece una forma de huevo en el horizonte y, a medida que se acerca, con un pitido cada vez más fuerte, ¡ves que es una mascota virtual gigantesca!<br><br>“Oh, no”, exclama @Beffymaroo, “Creo que Santo Inocente dejó asuntos pendientes con este tipo grande aquí, ¡parece querer atención!”<br><br>La mascota virtual emite un pitido enfadado, lanzando una rabieta virtual y gritando cada vez más cerca.",
     "questVirtualPetBoss": "Wotchimon",
     "questVirtualPetRageTitle": "El pitido",
     "questVirtualPetRageEffect": "\"¡Wotchimon usa un pitido molesto!\" ¡Wotchimon emite un pitido molesto y su barra de felicidad desaparece repentinamente! Daño pendiente reducido.",
-    "questVirtualPetRageDescription": "Esta barra se llena cuando no completas tus Diarios. ¡Cuando esté lleno, Wotchimon eliminará algunos de los daños causados de tu grupo!"
+    "questVirtualPetRageDescription": "Esta barra se llena cuando no completas tus Diarios. ¡Cuando esté lleno, Wotchimon eliminará algunos de los daños causados de tu grupo!",
+    "questVirtualPetDropVirtualPetPotion": "Poción de eclosión de Mascotas Virtuales",
+    "questVirtualPetText": "El Caos Virtual con Santo Inocente: El Pitido",
+    "questVirtualPetUnlockText": "Desbloquea la poción de eclosión de mascotas virtuales para comprar en el Mercado"
 }
diff --git a/website/common/locales/it/questscontent.json b/website/common/locales/it/questscontent.json
index 56d758b977..995c0cc9b2 100644
--- a/website/common/locales/it/questscontent.json
+++ b/website/common/locales/it/questscontent.json
@@ -514,7 +514,7 @@
     "questHippoUnlockText": "Sblocca le uova di Ippopotamo acquistabili nel Mercato",
     "farmFriendsText": "Pacchetto missioni Amici della Fattoria",
     "farmFriendsNotes": "Contiene \"La Mucca Muutante\", \"Cavalca il Destriero dell'Incubo\", e \"L'Ariete Tuonante\". Disponibile fino al 30 settembre.",
-    "witchyFamiliarsText": "Pacchetto di Missioni dei Familiari Stregati",
+    "witchyFamiliarsText": "Pacchetto di Missioni dei Famigli Stregati",
     "witchyFamiliarsNotes": "Contiene 'Il Re dei Ratti', 'L'Aracnide Ghiacciato', 'Palude della Rana del Disordine'. Disponibile fino al 31 Ottobre.",
     "questGroupLostMasterclasser": "Mistero dei Masterclasser",
     "questUnlockLostMasterclasser": "Per sbloccare questa missione, completa le missioni finali di queste serie: 'Dilatoria sotto Attacco', 'Caos a Fantalata', La calamità di Stoikalm', e 'Terrore a Boscompito'.",
diff --git a/website/common/locales/ja/groups.json b/website/common/locales/ja/groups.json
index c13a8098eb..319dfe9e49 100644
--- a/website/common/locales/ja/groups.json
+++ b/website/common/locales/ja/groups.json
@@ -402,5 +402,19 @@
     "newGroupsBullet10b": "<strong>タスクを1人のメンバーに割り当て</strong>ると、そのメンバーだけが完了できるようになります",
     "newGroupsBullet10c": "メンバー全員がタスクを完了する必要がある場合は、<strong>複数のメンバーにタスクを割り当て</strong>ましょう",
     "newGroupsVisitFAQ": "詳細なガイダンスについては、[ヘルプ] ドロップダウンから <a href='/static/faq#group-plans' target='_blank'>FAQ</a> にアクセスしてください。",
-    "newGroupsEnjoy": "新しくなったグループプランをお楽しみください！"
+    "newGroupsEnjoy": "新しくなったグループプランをお楽しみください！",
+    "groupUse": "このグループに最も合う目的はどれですか？*",
+    "groupUseDefault": "回答を選択",
+    "groupCouple": "パートナーとタスクを共有する",
+    "groupFriends": "友達とタスクを共有する",
+    "groupCoworkers": "仕事仲間とタスクを共有する",
+    "nameStar": "名前*",
+    "nameStarText": "タイトルを追加",
+    "groupManager": "マネージャーとして従業員のタスクを設定する",
+    "groupTeacher": "教師として生徒のタスクを設定する",
+    "descriptionOptional": "説明",
+    "descriptionOptionalText": "説明を追加",
+    "nextPaymentMethod": "次のステップ：支払方法",
+    "createGroup": "グループを作る",
+    "groupParentChildren": "保護者として子どものタスクを設定する"
 }
diff --git a/website/common/locales/ja/npc.json b/website/common/locales/ja/npc.json
index 1965c309ea..f90def2069 100644
--- a/website/common/locales/ja/npc.json
+++ b/website/common/locales/ja/npc.json
@@ -133,5 +133,6 @@
     "amountExp": "<%= amount %>経験値",
     "newStuffPostedOn": "<%= publishDate %> <%= publishTime %>に投稿",
     "helpSupportHabitica": "Habiticaを支援する",
-    "groupsPaymentSubBilling": "次回の請求日は <strong><%= renewalDate %></strong> です。"
+    "groupsPaymentSubBilling": "次回の請求日は <strong><%= renewalDate %></strong> です。",
+    "groupsPaymentAutoRenew": "この有料プランは解約するまで自動更新されます。解約する必要がある場合は、グループの請求タブから解約できます。"
 }
diff --git a/website/common/locales/ja/settings.json b/website/common/locales/ja/settings.json
index 4f9d6ae695..7bce8941e7 100644
--- a/website/common/locales/ja/settings.json
+++ b/website/common/locales/ja/settings.json
@@ -219,5 +219,6 @@
     "passwordSuccess": "パスワードは正常に変更されました",
     "giftSubscriptionRateText": "<strong><%= months %> か月</strong>ごとに<strong>$<%= price %> USD（米ドル）</strong>",
     "transaction_create_bank_challenge": "作成された口座チャレンジ",
-    "transaction_admin_update_balance": "管理者より付与"
+    "transaction_admin_update_balance": "管理者より付与",
+    "transaction_admin_update_hourglasses": "管理者の更新"
 }
diff --git a/website/common/locales/ja/subscriber.json b/website/common/locales/ja/subscriber.json
index 639e5cabc7..635b80bf93 100644
--- a/website/common/locales/ja/subscriber.json
+++ b/website/common/locales/ja/subscriber.json
@@ -212,5 +212,5 @@
     "wantToSendOwnGems": "持っているジェムを贈りたいですか？",
     "mysterySet202208": "はつらつポニーテールセット",
     "mysterySet202209": "魔法学者セット",
-    "mysterySet202210": "不吉な蛇セット"
+    "mysterySet202210": "くちなわセット"
 }
diff --git a/website/common/locales/pl/contrib.json b/website/common/locales/pl/contrib.json
index 13e8911dc6..4e0b1a40b7 100644
--- a/website/common/locales/pl/contrib.json
+++ b/website/common/locales/pl/contrib.json
@@ -49,9 +49,10 @@
     "balance": "Suma",
     "playerTiers": "Rangi graczy",
     "tier": "Ranga",
-    "conRewardsURL": "http://habitica.fandom.com/wiki/Contributor_Rewards",
+    "conRewardsURL": "https://habitica.fandom.com/wiki/Contributor_Rewards",
     "surveysSingle": "Pomógł rozwinąć Habitica poprzez wypełnienie ankiet lub testowanie. Dziękujemy!",
     "surveysMultiple": "Pomagał w rozwoju Habitiki przy <%= count %> okazjach, czy to wypełniając ankiety, czy też wkładając dużo wysiłku w testowanie. Dziękujemy!",
     "blurbHallPatrons": "To jest Sala patronów, gdzie oddajemy cześć szlachetnym poszukiwaczom przygód, którzy wsparli Habitica w pierwszej zbiórce na Kickstarterze. Dziękujemy im za pomoc w powołaniu Habitiki do życia!",
-    "blurbHallContributors": "To jest Sala Współtwórców, gdzie uhonorowani zostali open-source'owi współtwórcy Habitiki. Czy to za pomocą kodu, sztuki, muzyki, pisania, czy jedynie uczynności, zdobyli oni <a href='http://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> klejnoty, ekskluzywne wyposażenie</a> oraz <a href='http://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>prestiżowe tytuły</a>. Ty również możesz współtworzyć Habitikę! <a href='http://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Tutaj dowiesz się więcej. </a>"
+    "blurbHallContributors": "To jest Sala Współtwórców, gdzie uhonorowani zostali open-source'owi współtwórcy Habitica. Czy to za pomocą kodu, sztuki, muzyki, pisania, czy jedynie uczynności, zdobyli oni <a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> klejnoty, ekskluzywne wyposażenie</a> oraz <a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>prestiżowe tytuły</a>. Ty również możesz współtworzyć Habitica! <a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Tutaj dowiesz się więcej. </a>",
+    "noPrivAccess": "Nie masz wymaganych przywilejów."
 }
diff --git a/website/common/locales/pl/faq.json b/website/common/locales/pl/faq.json
index 79c7fccd6e..434df80196 100644
--- a/website/common/locales/pl/faq.json
+++ b/website/common/locales/pl/faq.json
@@ -9,9 +9,9 @@
     "androidFaqAnswer1": "Dobre Nawyki (oznaczone +) to zadania, które możesz wykonać kilka razy dziennie, np. jedzenie warzyw. Złe Nawyki (oznaczone -) to czynności, których powinieneś unikać, takie jak obgryzanie paznokci. Nawyki z plusem oraz minusem symbolizują dobry lub zły wybór, np. wyjście do góry po schodach w przeciwieństwie do wyjechania windą. Dobre Nawyki nagrodzą cię Doświadczeniem i Złotem. Złe Nawyki zmniejszą twoje zdrowie.\n\nCodzienne to zadania, które musisz wykonać każdego dnia, takie jak umycie zębów lub sprawdzenie poczty elektronicznej. Możesz zmienić w jakie dni powinieneś ukończyć Codzienny klikając na dane zadanie. Jeśli pominiesz Codziennie zadanie zaplanowane na dzisiaj twoja postać w nocy otrzyma obrażenia. Uważaj by nie dodać zbyt wielu Codziennych naraz!\n\nDo Zrobienia stanowią twoją listę zadań do wykonania. Za ukończenie Do Zrobienia zyskujesz Złoto oraz Doświadczenie. Nigdy nie stracisz punktów zdrowia z powodu zadań Do Zrobienia. Możesz ustalić termin wykonania tego zadania klikając na nie w celu edycji.",
     "webFaqAnswer1": "* Dobre Nawyki (oznaczone :heavy_plus_sign:) to zadania, które możesz wykonać kilka razy dziennie, np. jedzenie warzyw. Złe Nawyki (oznaczone :heavy_minus_sign:) to czynności, których powinieneś unikać, takie jak obgryzanie paznokci. Nawyki z :heavy_plus_sign: oraz :heavy_minus_sign: symbolizują dobry lub zły wybór, np. wejście po schodach w przeciwieństwie do wjechania windą. Dobre Nawyki nagrodzą cię Doświadczeniem i Złotem. Złe Nawyki zmniejszą twoje zdrowie.\n* Codzienne to zadania, które musisz wykonać każdego dnia, takie jak umycie zębów lub sprawdzenie poczty elektronicznej. Możesz zmienić w jakie dni powinieneś ukończyć Codzienne klikając na dane zadanie. Jeśli pominiesz Codziennie zadanie zaplanowane na dzisiaj, twój awatar w nocy otrzyma obrażenia. Uważaj by nie dodać zbyt wielu Codziennych naraz!\n* Do Zrobienia stanowią twoją listę zadań do wykonania. Za ukończenie Do Zrobienia zyskujesz Złoto oraz Doświadczenie. Nigdy nie stracisz punktów zdrowia z powodu zadań Do Zrobienia. Możesz ustawić termin wykonania zadania klikając na ikonę ołówka aby wejść w tryb edycji.",
     "faqQuestion2": "Jakie są przykładowe zadania?",
-    "iosFaqAnswer2": "Na wiki są cztery listy przykładowych zadań jako inspiracja:\n\n*[Przykładowe Nawyki](http://habitica.fandom.com/wiki/Sample_Habits)\n*[Przykładowe Codzienne](http://habitica.fandom.com/wiki/Sample_Dailies)\n*[Przykładowe Do Zrobienia](http://habitica.fandom.com/wiki/Sample_To-Dos)\n*[Przykładowe losowe nagrody](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-    "androidFaqAnswer2": "Na wiki są cztery listy przykładowych zadań jako inspiracja:\n\n*[Przykładowe Nawyki](http://habitica.fandom.com/wiki/Sample_Habits)\n*[Przykładowe Codzienne](http://habitica.fandom.com/wiki/Sample_Dailies)\n*[Przykładowe Do Zrobienia](http://habitica.fandom.com/wiki/Sample_To-Dos)\n*[Przykładowe losowe nagrody](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-    "webFaqAnswer2": "Wiki ma cztery listy przykładowych zadań, które możesz wykorzystać jako inspirację\n* [Przykładowe Nawyki](http://habitica.fandom.com/wiki/Sample_Habits)\n* [Przykładowe Codzienne](http://habitica.fandom.com/wiki/Sample_Dailies)\n* [Przykładowe Do Zrobienia](http://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Przykładowe Nagrody](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "iosFaqAnswer2": "Na wiki są cztery listy przykładowych zadań jako inspiracja:\n\n*[Przykładowe Nawyki](https://habitica.fandom.com/wiki/Sample_Habits)\n*[Przykładowe Codzienne](https://habitica.fandom.com/wiki/Sample_Dailies)\n*[Przykładowe Do Zrobienia](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n*[Przykładowe losowe nagrody](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "androidFaqAnswer2": "Na wiki są cztery listy przykładowych zadań jako inspiracja:\n\n*[Przykładowe Nawyki](https://habitica.fandom.com/wiki/Sample_Habits)\n*[Przykładowe Codzienne](https://habitica.fandom.com/wiki/Sample_Dailies)\n*[Przykładowe Do Zrobienia](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n*[Przykładowe losowe nagrody](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "webFaqAnswer2": "Wiki ma cztery listy przykładowych zadań, które możesz wykorzystać jako inspirację\n* [Przykładowe Nawyki](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Przykładowe Codzienne](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Przykładowe Do Zrobienia](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Przykładowe Nagrody](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
     "faqQuestion3": "Dlaczego moje zadania zmieniają kolory?",
     "iosFaqAnswer3": "Twoje zadania zmieniają kolor w zależności od tego, jak dobrze idzie ci ich wypełnianie! Każde nowe zadanie ma na początku kolor żółty. Wypełniaj Codzienne albo dobre Nawyki częściej, a będą coraz bardziej niebieskie. Opuść Codzienne lub poddaj się złemu Nawykowi, a zadanie będzie coraz bardziej czerwone. Im więcej czerwieni, tym większą nagrodę zdobędziesz za to zadanie, ale jeśli to Codzienne albo zły Nawyk, tym bardziej cię zrani! To pomaga motywować cię do wypełniania zadań, które sprawiają ci kłopot.",
     "androidFaqAnswer3": "Twoje zadania zmieniają kolor w zależności od tego, jak dobrze idzie ci ich wypełnianie! Każde nowe zadanie ma na początku kolor żółty. Wypełniaj Codzienne albo dobre Nawyki częściej, a będą coraz bardziej niebieskie. Opuść Codzienne lub poddaj się złemu Nawykowi, a zadanie będzie coraz bardziej czerwone. Im więcej czerwieni, tym większą nagrodę zdobędziesz za to zadanie, ale jeśli to Codzienne albo zły Nawyk, tym bardziej cię zrani! To pomaga motywować cię do wypełniania zadań, które sprawiają ci kłopot.",
@@ -22,8 +22,8 @@
     "webFaqAnswer4": "Istnieje kilka rzeczy, które mogą powodować obrażenia. Po pierwsze, jeśli zostawisz na noc niewykonane Codzienne i nie zaznaczysz wykonania na okienku, które pojawi się rano, wtedy te niewykonane zadania zadadzą Tobie obrażenia. Po drugie, jeśli klikniesz zły nawyk, to dostaniesz obrażenia. Na koniec, podczas drużynowej bijatyki z Bossem, jeśli Ty lub ktokolwiek z drużyny nie wykonacie Codziennych, Boss zaatakuje was. Głównym sposobem leczenia jest zdobycie kolejnego poziomu, które przywraca całe zdrowie. Można również kupić za złoto Eliksir Zdrowia, z kolumny z Nagrodami. Dodatkowo, od poziomu 10 włącznie możesz wybrać klasę Uzdrowiciela, a wtedy nauczysz się umiejętności leczenia. Inni Uzdrowiciele mogą Cię wyleczyć jeśli znajdujesz się z nimi razem w drużynie. Więcej dowiesz się klikając w pasku nawigacyjnym pozycję \"Drużyna\".",
     "faqQuestion5": "Jak grać w Habitica z przyjaciółmi?",
     "iosFaqAnswer5": "Najlepszy sposób to zaproszenie ich do twojej drużyny! W drużynie można wypełniać Misje, walczyć z potworami i używać umiejętności, aby wzajemnie się wspierać. \n\nJeśli chcesz założyć swoją własną Drużynę, wejdź w Menu > [Drużyna](https://habitica.com/party) i kliknij \"Załóż Drużynę\". Następnie kliknij \"Zaproś\", aby zaprosić swoich przyjaciół, wpisując ich @nazwę. Jeśli chcesz dołączyć do czyjejś Drużyny , po prostu przekaż mu swoją @nazwę użytkownika a on wyśle Ci zaproszenie!\n\nWraz z przyjaciółmi możesz dołączyć do gildii, które są publicznymi pokojami rozmów skupiających ludzi o podobnych zainteresowaniach! Istnieje wiele społeczności poświęconych wzajemnemu wsparciu i rozrywce, zajrzyj do nich koniecznie.\n\nJeśli lubisz współzawodnictwo, możesz stworzyć Wyzwanie wraz z przyjaciółmi, lub dołączyć do istniejącego, podejmując się realizacji kilku zadań. Znajdziesz tu szeroki wybór Wyzwań ukierunkowanych na rozległy zakres zainteresowań i celów. Niektóre publiczne wyzwania przyznają nawet Klejnoty, jeśli zostaniesz zwycięzcą Wyzwania.",
-    "androidFaqAnswer5": "Najlepszym sposobem jest zaprosić ich do Drużyny! Drużyny mogą iść razem na misje, walczyć z potworami, rzucać umiejętności by wzajemnie się wspierać. Wejdź na [website](https://habitica.com/) by stworzyć jedną, jeśli nie masz jeszcze Drużyny. Możecie także dołączyć razem do gildii (Społeczność > Gildie). Gildie są czatami, skupionymi na wspólnych zainteresowaniach lub osiągnięciem wspólnego celu, mogą być publiczne bądź prywatne. Możesz dołączyć do tak wielu gildii jak tylko chcesz, lecz tylko do jednej drużyny\n\nPo więcej informacji, sprawdź strony wiki o [Drużynach](http://habitica.fandom.com/wiki/Party) i [Gildiach](http://habitica.fandom.com/wiki/Guilds).",
-    "webFaqAnswer5": "Najlepszym sposobem jest zaprosić ich do Drużyny klikając na \"Drużyna\" na pasku nawigacyjnym! Drużyny mogą iść razem na misje, walczyć z potworami, rzucać umiejętności by wzajemnie się wspierać. Możecie także dołączyć razem do gildii (wybierając z menu \"Gildie\"). Gildie są czatami, skupionymi na wspólnych zainteresowaniach lub osiągnięciem wspólnego celu, mogą być publiczne bądź prywatne. Możesz dołączyć do tak wielu gildii jak tylko chcesz, lecz tylko do jednej drużyny. Więcej szczegółów uzyskasz na stronach wiki [Drużyna](http://habitica.fandom.com/pl/wiki/Drużyna) oraz [Gildie](http://habitica.fandom.com/pl/wiki/Gildie).",
+    "androidFaqAnswer5": "Najlepszym sposobem jest zaprosić ich do Drużyny! Drużyny mogą iść razem na misje, walczyć z potworami, rzucać umiejętności by wzajemnie się wspierać. Wejdź na [website](https://habitica.com/) by stworzyć jedną, jeśli nie masz jeszcze Drużyny. Możecie także dołączyć razem do gildii (Społeczność > Gildie). Gildie są czatami, skupionymi na wspólnych zainteresowaniach lub osiągnięciem wspólnego celu, mogą być publiczne bądź prywatne. Możesz dołączyć do tak wielu gildii jak tylko chcesz, lecz tylko do jednej drużyny\n\nPo więcej informacji, sprawdź strony wiki o [Drużynach](https://habitica.fandom.com/wiki/Party) i [Gildiach](https://habitica.fandom.com/wiki/Guilds).",
+    "webFaqAnswer5": "Najlepszym sposobem jest zaprosić ich do Drużyny klikając na \"Drużyna\" na pasku nawigacyjnym! Drużyny mogą iść razem na misje, walczyć z potworami, rzucać umiejętności by wzajemnie się wspierać. Możecie także dołączyć razem do gildii (wybierając z menu \"Gildie\"). Gildie są czatami, skupionymi na wspólnych zainteresowaniach lub osiągnięciem wspólnego celu, mogą być publiczne bądź prywatne. Możesz dołączyć do tak wielu gildii jak tylko chcesz, lecz tylko do jednej drużyny. Więcej szczegółów uzyskasz na stronach wiki [Drużyna](https://habitica.fandom.com/pl/wiki/Drużyna) oraz [Gildie](https://habitica.fandom.com/pl/wiki/Gildie).",
     "faqQuestion6": "Jak zdobyć chowańca albo wierzchowca?",
     "iosFaqAnswer6": "Za każdym razem, gdy ukończysz zadanie, dostaniesz szansę na zdobycie Jaja, Eliksiru Wyklucia lub Jedzenia. Znajdziesz je w Menu > Przedmioty.\n\nAby wykluć Zwierzaka, potrzebujesz jaja oraz eliksiru wyklucia. Kliknij na jajo aby wybrać gatunek, jaki chcesz wykluć, a potem na \"Wykluj Jajo\". Następnie wybierz Eliksir Wyklucia, aby wybrać jego kolor! Idź do Menu > aby dodać swojego nowego Zwierzaka do swojej postaci, klikając na niego.\n\nMożesz też sprawić, że twój Zwierzak wyrośnie na Wierzchowca, karmiąc go w Menu > Zwierzaki. Kliknij na Chowańca, a potem na \"Nakarm Zwierzaka\"! Musisz nakarmić Zwierzaka dużo razy, zanim stanie się Wierzchowcem, ale jeśli odnajdziesz jego ulubione jedzenie, będzie rósł szybciej. Możesz to zrobić metodą prób i błędów albo [skorzystać z podpowiedzi](https://habitica.fandom.com/wiki/Food#Food_Preferences). Gdy już masz Wierzchowca, idź do Menu > Wierzchowce i kliknij na niego, aby twoja postać go dosiadła.\n\nMożesz też otrzymać jaja Zwierzaków z Misji, kończąc niektóre Misje. (aby dowiedzieć się więcej o Misjach zobacz: [Jak walczyć z potworami i wykonywać Misje?](https://habitica.com/static/faq/#monsters-quests)).",
     "androidFaqAnswer6": "Za każdym razem, gdy ukończysz zadanie, dostaniesz szansę na zdobycie Jaja, Eliksiru Wyklucia lub Jedzenia. Znajdziesz je w Menu > Przedmioty.\n\nAby wykluć Zwierzaka, potrzebujesz Jaja oraz Eliksiru Wyklucia. Kliknij na jajo aby wybrać gatunek, jaki chcesz wykluć, a potem na \"Wykluj Jajo\". Następnie wybierz eliksir wyklucia, aby wybrać jego kolor! Idź do Menu > Zwierzaki, aby dodać swojego nowego Zwierzaka do swojej postaci, klikając na niego.\n\nMożesz też sprawić, że twój Zwierzak wyrośnie na Wierzchowca, karmiąc go w Menu > Zwierzaki. Kliknij na Zwierzaka, a potem na \"Nakarm Chowańca\"! Musisz nakarmić Zwierzaka dużo razy, zanim stanie się Wierzchowcem, ale jeśli odnajdziesz jego ulubione jedzenie, będzie szybciej rósł. Możesz to zrobić metodą prób i błędów albo [skorzystać z podpowiedzi](https://habitica.fandom.com/wiki/Food#Food_Preferences). Gdy już masz Wierzchowca, idź do Menu > Wierzchowce i kliknij na niego, aby twój awatar go dosiadł.\n\nMożesz też otrzymać jaja Chowańców z Misji, kończąc niektóre Misje. (Patrz niżej, aby dowiedzieć się więcej o Misjach.)",
diff --git a/website/common/locales/pt_BR/generic.json b/website/common/locales/pt_BR/generic.json
index 918168e9d5..308c9b9033 100644
--- a/website/common/locales/pt_BR/generic.json
+++ b/website/common/locales/pt_BR/generic.json
@@ -143,7 +143,7 @@
     "getwell1": "Se cuida! <3",
     "getwell2": "Estou pensando em você!",
     "getwell3": "Sinto muito você não estar se sentindo bem!",
-    "getwellCardAchievementTitle": "Cuidador da Confiança",
+    "getwellCardAchievementTitle": "Cuidador de Confiança",
     "getwellCardAchievementText": "Desejos de melhoras são sempre bem-vindos. Enviou ou recebeu <%= count %> cartões de melhoras.",
     "goodluckCard": "Cartão de Boa Sorte",
     "goodluckCardExplanation": "Vocês dois recebem a conquista da Carta Sortuda!",
diff --git a/website/common/locales/pt_BR/settings.json b/website/common/locales/pt_BR/settings.json
index c0e3581136..a8387b4f4c 100644
--- a/website/common/locales/pt_BR/settings.json
+++ b/website/common/locales/pt_BR/settings.json
@@ -86,7 +86,7 @@
     "displayNameSuccess": "Nome de exibição alterado com sucesso",
     "emailSuccess": "Email alterado com sucesso",
     "detachSocial": "Desconectar <%= network %>",
-    "detachedSocial": "Removido <%= network %> com sucesso como modo de autenticação.",
+    "detachedSocial": "Removido <%= network %> com sucesso como modo de autenticação",
     "addedLocalAuth": "Autenticação local adicionada com sucesso",
     "data": "Dados",
     "email": "E-mail",
@@ -144,7 +144,7 @@
     "webhookIdAlreadyTaken": "Um webhook com o id <%= id %> já existe.",
     "noWebhookWithId": "Não existe webhook com o id <%= id %>.",
     "regIdRequired": "RegId é necessário",
-    "pushDeviceAdded": "Dispositivo Push adicionado com sucesso.",
+    "pushDeviceAdded": "Dispositivo Push adicionado com sucesso",
     "pushDeviceNotFound": "O usuário não tem dispositivo push nesse id.",
     "pushDeviceRemoved": "Dispositivo push removido com sucesso.",
     "buyGemsGoldCap": "Capacidade máxima de Gemas aumentada para <%= amount %>",
diff --git a/website/common/locales/ru/gear.json b/website/common/locales/ru/gear.json
index b28eb3d0c0..6bde3b94c6 100644
--- a/website/common/locales/ru/gear.json
+++ b/website/common/locales/ru/gear.json
@@ -2702,7 +2702,7 @@
     "weaponSpecialFall2022MageText": "Порыв ветра",
     "weaponSpecialFall2022RogueText": "Огуречный клинок",
     "weaponSpecialFall2022RogueNotes": "Этим огуречным клинком можно не только защититься, но и вкусно подкрепиться. Увеличивает силу на <%= str %>. Ограниченный выпуск осени 2022.",
-    "weaponSpecialFall2022WarriorNotes": "Возможно, он больше подходит для рубки бревен или для разрезания хрустящей буханочки хлеба нежели для вражеской брони, но ГРРА! Он выглядит устрашающе! Увеличивает силу на <%= str %>. Ограниченный выпуск осени 2022",
+    "weaponSpecialFall2022WarriorNotes": "Возможно, он больше подходит для рубки бревен или для разрезания хрустящей буханочки хлеба нежели для вражеской брони, но ГРРА! Он выглядит устрашающе! Увеличивает силу на <%= str %>. Ограниченный выпуск осени 2022.",
     "weaponSpecialFall2022MageNotes": "Эти могучие порывы будут сопровождать вас, когда вы устремитесь в небо. Увеличивает интеллект на <%= int %> и восприятие на <%= per %>. Ограниченный выпуск осени 2022.",
     "weaponSpecialFall2022HealerText": "Правый подглядывающий глаз",
     "armorSpecialFall2022RogueText": "Броня Каппы",
diff --git a/website/common/locales/ru/npc.json b/website/common/locales/ru/npc.json
index 9a1d3081a0..545838de5c 100644
--- a/website/common/locales/ru/npc.json
+++ b/website/common/locales/ru/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Обновление от Бэйли!",
     "tellMeLater": "Напомнить позже",
     "dismissAlert": "Скрыть эти вести",
-    "donateText3": "Habitica – это проект с открытым исходным кодом, зависящий от поддержки своих пользователей. Деньги, которые вы тратите на покупку самоцветов, помогают нам поддерживать сервера в рабочем состоянии, сохранять небольшой штат сотрудников, разрабатывать новые функции и давать стимул нашим волонтерам.",
+    "donateText3": "Habitica – это проект с открытым исходным кодом, зависящий от поддержки своих пользователей. Деньги, которые вы тратите на покупку самоцветов, помогают нам поддерживать сервера в рабочем состоянии, сохранять небольшой штат сотрудников, разрабатывать новые функции и давать стимул нашим волонтерам",
     "card": "Пластиковой карточкой",
     "paymentMethods": "Приобрести с использованием",
     "paymentSuccessful": "Платеж прошел успешно!",
diff --git a/website/common/locales/ru/settings.json b/website/common/locales/ru/settings.json
index 01dc10b933..813044e8d2 100644
--- a/website/common/locales/ru/settings.json
+++ b/website/common/locales/ru/settings.json
@@ -219,5 +219,6 @@
     "passwordSuccess": "Пароль успешно изменен",
     "giftSubscriptionRateText": "<strong>$<%= price %> долларов США</strong> за <strong><%= months %> месяц(-а/-ев)</strong>",
     "transaction_admin_update_hourglasses": "Права администратора обновлены",
-    "transaction_admin_update_balance": "Предоставлены права администратора"
+    "transaction_admin_update_balance": "Предоставлены права администратора",
+    "transaction_create_bank_challenge": "Создан банк испытания"
 }
diff --git a/website/common/locales/uk/gear.json b/website/common/locales/uk/gear.json
index 43a910b47c..b7dae9595b 100644
--- a/website/common/locales/uk/gear.json
+++ b/website/common/locales/uk/gear.json
@@ -92,61 +92,61 @@
     "weaponSpecialTakeThisNotes": "Цей меч було отримано за участь у випробуванні, спонсорованому кампанією Take This. Щиро вітаємо! Збільшує всі характеристики на <%= attrs %>.",
     "weaponSpecialTridentOfCrashingTidesText": "Тризуб руйнівних приливів",
     "weaponSpecialTridentOfCrashingTidesNotes": "Дає вам можливість керувати рибами, а також наносити кілька могутніх ударів під час ваших завдань. Збільшує інтелект на <%= int %>.",
-    "weaponSpecialTaskwoodsLanternText": "",
-    "weaponSpecialTaskwoodsLanternNotes": "",
+    "weaponSpecialTaskwoodsLanternText": "Ліхтар Трудобора",
+    "weaponSpecialTaskwoodsLanternNotes": "З давніх часів цей ліхтар оберігає Сади Трудобора, його світло може осяяти найтемнішу пітьму і розвіяти могутні заклинання. Збільшує сприйняття і інтелект на <%= attrs %>.",
     "weaponSpecialBardInstrumentText": "Лютня Барда",
-    "weaponSpecialBardInstrumentNotes": "",
+    "weaponSpecialBardInstrumentNotes": "Зіграй веселу мелодію на цій магічній лютні! Збільшує інтелект і сприйняття на <%= attrs %>.",
     "weaponSpecialLunarScytheText": "Місячна коса",
     "weaponSpecialLunarScytheNotes": "Регулярно заточуйте цю косу, інакше її сила зменшиться. Збільшує силу та спритність на <%= attrs %>.",
     "weaponSpecialMammothRiderSpearText": "Спис Наїздника Мамонта",
-    "weaponSpecialMammothRiderSpearNotes": "",
+    "weaponSpecialMammothRiderSpearNotes": "Цей спис із наконечником з рожевого кварцу придасть вам стародавню силу заклинань. Збільшує інтелект на <%= int %>.",
     "weaponSpecialPageBannerText": "Стяг пажа",
     "weaponSpecialPageBannerNotes": "Високо розмахуйте своїм стягом, щоб вселяти впевненість! Збільшує силу на <%= str %>.",
-    "weaponSpecialRoguishRainbowMessageText": "",
-    "weaponSpecialRoguishRainbowMessageNotes": "",
+    "weaponSpecialRoguishRainbowMessageText": "Жартівливе веселкове повідомлення",
+    "weaponSpecialRoguishRainbowMessageNotes": "Цей сяючий конверт містить у собі заохочення від жителів Habitica та трохи чарів, щоб пришвидшити доставку! Збільшує сприйняття на <%= per %>.",
     "weaponSpecialSkeletonKeyText": "Ключ скелета",
-    "weaponSpecialSkeletonKeyNotes": "",
-    "weaponSpecialNomadsScimitarText": "",
-    "weaponSpecialNomadsScimitarNotes": "",
-    "weaponSpecialFencingFoilText": "",
-    "weaponSpecialFencingFoilNotes": "",
+    "weaponSpecialSkeletonKeyNotes": "Усі найкращі крадії мають при собі ключ, що відчиняє будь-які двері! Збільшує комплекцію на <%= con %>.",
+    "weaponSpecialNomadsScimitarText": "Ятаган Номада",
+    "weaponSpecialNomadsScimitarNotes": "Вигнуте лезо цього ятагана прекрасно підходить для атаки задач, сидячи на скакуні! Збільшує інтелект на <%= int %>.",
+    "weaponSpecialFencingFoilText": "Рапіра",
+    "weaponSpecialFencingFoilNotes": "Якщо хтось посміє оспорити вашу честь, ви будете готові з цією чудовою рапірою! Збільшує силу на <%= str %>.",
     "weaponSpecialTachiText": "Тачі (японський меч)",
     "weaponSpecialTachiNotes": "Цей легкий і вигнутий меч поріже Ваші завдання на шматочки! Збільшує силу на <%= str %>.",
     "weaponSpecialAetherCrystalsText": "Кристали ефіру",
-    "weaponSpecialAetherCrystalsNotes": "",
+    "weaponSpecialAetherCrystalsNotes": "Ці браслети та кристали колись належали останній з ордену Майстрів. Збільшує всі характеристики на <%= attrs %>.",
     "weaponSpecialYetiText": "Спис приборкувача Єті",
-    "weaponSpecialYetiNotes": "",
+    "weaponSpecialYetiNotes": "Цей спис дозволяє власнику керувати будь-яким єті. Збільшує силу на <%= str %>. Лімітований випуск зими 2013-2014.",
     "weaponSpecialSkiText": "Палка лижника-вбивці",
-    "weaponSpecialSkiNotes": "",
+    "weaponSpecialSkiNotes": "Зброя, що здатна знищувати орди ворогів! Воно також допомагає власнику робити гарні паралельні повороти. Збільшує силу на <%= str %>. Лімітований випуск зими 2013-2014.",
     "weaponSpecialCandycaneText": "Карамельна патериця",
-    "weaponSpecialCandycaneNotes": "",
+    "weaponSpecialCandycaneNotes": "Неймовірний магічний посох. Тобто, неймовірно СМАЧНИЙ, звичайно! Збільшує інтелект на <%= int %> і сприйняття на <%= per %>. Лімітований випуск зими 2013-2014.",
     "weaponSpecialSnowflakeText": "Паличка \"Сніжинка\"",
-    "weaponSpecialSnowflakeNotes": "",
+    "weaponSpecialSnowflakeNotes": "Ця палиця сяє від безмежної цілющої сили. Збільшує інтелект на <%= int %>. Лімітований випуск зими 2013-2014.",
     "weaponSpecialSpringRogueText": "Бойові кігті",
-    "weaponSpecialSpringRogueNotes": "",
+    "weaponSpecialSpringRogueNotes": "Чудово підходить, щоб збиратися на високі будівлі та шматувати килими. Збільшує силу на <%= str %>. Лімітований випуск весни 2014.",
     "weaponSpecialSpringWarriorText": "Морквяний меч",
-    "weaponSpecialSpringWarriorNotes": "",
+    "weaponSpecialSpringWarriorNotes": "Цей могутній меч може з легкістю шматувати ворогів! Він також може стати смачним перекусом в пилу битви. Збільшує силу на <%= str %>. Лімітований випуск весни 2014.",
     "weaponSpecialSpringMageText": "Сирна патериця",
-    "weaponSpecialSpringMageNotes": "",
+    "weaponSpecialSpringMageNotes": "Тільки найсильніші гризуни можуть кинути виклик своєму голоду, щоб заволодіти цим могутнім посохом. Збільшує інтелект на <%= int %> і сприйняття на <%= per %>. Лімітований випуск весни 2014.",
     "weaponSpecialSpringHealerText": "Улюблена кісточка",
-    "weaponSpecialSpringHealerNotes": "",
+    "weaponSpecialSpringHealerNotes": "ПРИНЕСТИ! Збільшує інтелект на <%= int %>. Лімітований випуск весни 2014.",
     "weaponSpecialSummerRogueText": "Піратське Мачете",
-    "weaponSpecialSummerRogueNotes": "",
+    "weaponSpecialSummerRogueNotes": "Тисяча чортів! Принудьте свої завдання прогулятися по дошці! Збільшує силу на <%= str %>. Лімітований випуск літа 2014.",
     "weaponSpecialSummerWarriorText": "Ніж Мореплавця",
     "weaponSpecialSummerWarriorNotes": "Жодне завдання не посміє тягатися з цим зазубреним ножем! Збільшує силу на <%= str %>. Лімітований випуск літа 2014.",
     "weaponSpecialSummerMageText": "Ловець Водоростей",
-    "weaponSpecialSummerMageNotes": "",
+    "weaponSpecialSummerMageNotes": "Цей тризуб чудово пронизує водорості та дозволяє збирати врожай із подвійною ефективністю! Збільшує інтелект на <%= int %> і сприйняття на <%= per %>. Лімітований випуск літа 2014.",
     "weaponSpecialSummerHealerText": "Жезл Мілководдя",
-    "weaponSpecialSummerHealerNotes": "",
-    "weaponSpecialFallRogueText": "",
-    "weaponSpecialFallRogueNotes": "",
-    "weaponSpecialFallWarriorText": "",
-    "weaponSpecialFallWarriorNotes": "",
-    "weaponSpecialFallMageText": "Магічний віник",
-    "weaponSpecialFallMageNotes": "",
-    "weaponSpecialFallHealerText": "",
-    "weaponSpecialFallHealerNotes": "",
-    "weaponSpecialWinter2015RogueText": "",
+    "weaponSpecialSummerHealerNotes": "Ця палиця із аквамарину та живих коралів чудово приваблює косяки риб. Збільшує інтелект на <%= int %>. Лімітований випуск літа 2014.",
+    "weaponSpecialFallRogueText": "Срібний кілок",
+    "weaponSpecialFallRogueNotes": "Заспокоює нежить. Також дає перевагу над перевертнями, тому що обережність ніколи не завадить. Збільшує силу на <%= str %>. Лімітований випуск осені 2014.",
+    "weaponSpecialFallWarriorText": "Чіпкий кіготь науки",
+    "weaponSpecialFallWarriorNotes": "Цей чіпкий кіготь є передовою технологією. Збільшує силу на <%= str %>. Лімітований випуск осені 2014.",
+    "weaponSpecialFallMageText": "Магічна мітла",
+    "weaponSpecialFallMageNotes": "Ця зачарована мітла літає швидше за дракона! Збільшує інтелект на <%= int %> та сприйняття на <%= per %>. Лімітований випуск осені 2014.",
+    "weaponSpecialFallHealerText": "Палиця із скарабеєм",
+    "weaponSpecialFallHealerNotes": "Скарабей на цій палиці захищає та зцілює свого власника. Збільшує інтелект на <%= int %>. Лімітований випуск осені 2014.",
+    "weaponSpecialWinter2015RogueText": "Крижаний шип",
     "weaponSpecialWinter2015RogueNotes": "",
     "weaponSpecialWinter2015WarriorText": "Гумко-Меч",
     "weaponSpecialWinter2015WarriorNotes": "",
@@ -1335,7 +1335,7 @@
     "shieldSpecialFallWarriorText": "",
     "shieldSpecialFallWarriorNotes": "",
     "shieldSpecialFallHealerText": "Інкрустований щит",
-    "shieldSpecialFallHealerNotes": "",
+    "shieldSpecialFallHealerNotes": "Цей блискучий щит був знайдений у стародавній гробниці. Збільшує комплекцію на <%= con %>. Лімітований випуск осені 2014.",
     "shieldSpecialWinter2015RogueText": "Ice Spike",
     "shieldSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.",
     "shieldSpecialWinter2015WarriorText": "",
@@ -1399,7 +1399,7 @@
     "shieldSpecialSummer2017RogueText": "Sea Dragon Fins",
     "shieldSpecialSummer2017RogueNotes": "The edges of these fins are razor-sharp. Increases Strength by <%= str %>. Limited Edition 2017 Summer Gear.",
     "shieldSpecialSummer2017WarriorText": "",
-    "shieldSpecialSummer2017WarriorNotes": "",
+    "shieldSpecialSummer2017WarriorNotes": "Ця мушля, яку ви знайшли, може бути як і прикрасою, так і захистом! Збільшує комплекцію на <%= con %>. Лімітований випуск літа 2016.",
     "shieldSpecialSummer2017HealerText": "",
     "shieldSpecialSummer2017HealerNotes": "",
     "shieldSpecialFall2017RogueText": "Candied Apple Mace",
@@ -1411,7 +1411,7 @@
     "shieldSpecialWinter2018RogueText": "Peppermint Hook",
     "shieldSpecialWinter2018RogueNotes": "Perfect for climbing walls or distracting your foes with sweet, sweet candy. Increases Strength by <%= str %>. Limited Edition 2017-2018 Winter Gear.",
     "shieldSpecialWinter2018WarriorText": "",
-    "shieldSpecialWinter2018WarriorNotes": "",
+    "shieldSpecialWinter2018WarriorNotes": "Майже будь-яка корисна річ, яка вам потрібна може бути знайдена у цій сумці, якщо ви прошепочете потрібні магічні слова. Збільшує комплекцію на <%= con %>. Лімітований випуск зими 2017-2018.",
     "shieldSpecialWinter2018HealerText": "",
     "shieldSpecialWinter2018HealerNotes": "",
     "shieldSpecialSpring2018WarriorText": "",
diff --git a/website/common/locales/uk/groups.json b/website/common/locales/uk/groups.json
index b93f79b6bb..8435ad975d 100644
--- a/website/common/locales/uk/groups.json
+++ b/website/common/locales/uk/groups.json
@@ -197,7 +197,7 @@
     "userIsClamingTask": "<%= username %> привласнив: <%= task %>",
     "approvalRequested": "Запит на схвалення надіслано",
     "cantDeleteAssignedGroupTasks": "Не можна видалити групові завдання, які призначені Вам.",
-    "groupPlanUpgraded": "<strong><%- groupName %></strong> оновлено до групового плану!",
+    "groupPlanUpgraded": "<strong><%- groupName %></strong> успішно оновлено до групового плану!",
     "groupPlanCreated": "<strong><%- groupName %></strong> створено!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Тільки лідер групи може запрошувати користувачів до групи з підпискою.",
     "paymentDetails": "Деталі оплати",
@@ -402,5 +402,19 @@
     "newGroupsBullet10b": "<strong>Призначте завдання одному учаснику</strong>, щоб лише він міг його виконати",
     "newGroupsBullet10c": "<strong>Призначте завдання кільком учасникам</strong>, якщо їм усім потрібно його виконати",
     "newGroupsVisitFAQ": "Відвідайте <a href='/static/faq#group-plans' target='_blank'>ЧаПи</a> зі спадного меню «Допомога», щоб отримати додаткові вказівки.",
-    "newGroupsEnjoy": "Сподіваємося, вам сподобаються нові групові плани!"
+    "newGroupsEnjoy": "Сподіваємося, вам сподобаються нові групові плани!",
+    "createGroup": "Створити групу",
+    "groupUseDefault": "Оберіть відповідь",
+    "groupUse": "Що краще описує те, як ви використовуєте вашу групу?*",
+    "nameStar": "Ім'я*",
+    "nameStarText": "Додати назву",
+    "descriptionOptional": "Опис",
+    "descriptionOptionalText": "Додати опис",
+    "groupFriends": "Друзі спільно виконують завдання",
+    "groupCoworkers": "Колеги спільно виконують завдання",
+    "nextPaymentMethod": "Наступний крок: Спосіб оплати",
+    "groupTeacher": "Вчитель організує заняття для учнів",
+    "groupCouple": "Спільне виконання завдань",
+    "groupManager": "Менеджер назначає завдання працівникам",
+    "groupParentChildren": "Батьки або один з батьків розподіляють задачі між дітьми"
 }
diff --git a/website/common/locales/uk/npc.json b/website/common/locales/uk/npc.json
index 520d693f02..c5faeeb9df 100644
--- a/website/common/locales/uk/npc.json
+++ b/website/common/locales/uk/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Оновлення від Бейлі!",
     "tellMeLater": "Нагадати мені пізніше",
     "dismissAlert": "Заховати Бейлі",
-    "donateText3": "Habitica — це проєкт з відкритим кодом, який залежить від підтримки наших користувачів. Гроші, які ви витрачаєте на самоцвіти, допомагають нам оплачувати роботу серверів, утримувати невеликий штат, розробляти нові функції та стимулювати наших добровольців.",
+    "donateText3": "Habitica — це проєкт з відкритим кодом, який залежить від підтримки наших користувачів. Гроші, які ви витрачаєте на самоцвіти, допомагають нам оплачувати роботу серверів, утримувати невеликий штат, розробляти нові функції та стимулювати наших добровольців",
     "card": "Платіжна карта",
     "paymentMethods": "Придбати за допомогою",
     "paymentSuccessful": "Ваш платіж пройшов успішно!",
@@ -105,7 +105,7 @@
     "tourHallPage": "Ласкаво просимо до Залу Героїв, де прославляються контриб'ютори до відкритого проєкту Habitica. Чи то за допомогою коду, мистецтва, музики, письма чи навіть просто корисністю, вони здобули дорогоцінні камені, ексклюзивне обладнання та престижні звання. Ви також можете зробити свій внесок у Habitica!",
     "tourPetsPage": "Ласкаво просимо до хліва! Кожного разу, коли Ви виконуєте завдання, Ви матимете шанс отримати яйце або інкубаційне зілля, щоб вилупити тваринку. Коли Ви вилупите вихованця, він з’явиться тут! Натисніть зображення домашнього улюбленця, щоб додати його до свого аватара. Годуйте їх знайденим кормом, і вони виростуть у верхових тварин.",
     "tourMountsPage": "Після того, як Ви нагодуєте вихованця достатньою кількістю їжі, щоб перетворити його на скакуна, він з’явиться тут. Натисніть на сідло, щоб осідлати його!",
-    "tourEquipmentPage": "Тут зберігається ваше обладнання! Ваше бойове спорядження впливає на Вашу статистику. Якщо Ви хочете показати відмінне спорядження на своєму аватарі, не змінюючи статистику, натисніть «Одягти костюм».",
+    "tourEquipmentPage": "Тут зберігається ваше спорядження! Ваше бойове спорядження впливає на Вашу статистику. Якщо Ви хочете показати відмінне спорядження на своєму аватарі, не змінюючи статистику, натисніть «Одягти костюм».",
     "equipmentAlreadyOwned": "Ви вже володієте цим спорядженням",
     "tourOkay": "Гаразд!",
     "tourAwesome": "Круто!",
@@ -132,5 +132,6 @@
     "paymentAutoRenew": "Ця підписка буде автоматично поновлюватися, доки її не буде скасовано. Якщо вам потрібно скасувати цю підписку, Ви можете зробити це у своїх налаштуваннях.",
     "paymentCanceledDisputes": "Ми надіслали підтвердження скасування на Вашу електронну пошту. Якщо Ви не бачите електронного листа, зв’яжіться з нами, щоб запобігти майбутнім суперечкам щодо розрахунків.",
     "helpSupportHabitica": "Підтримайте Habitica",
-    "groupsPaymentSubBilling": "Дата вашого наступного платежу <strong><%= renewalDate %></strong>."
+    "groupsPaymentSubBilling": "Дата вашого наступного платежу <strong><%= renewalDate %></strong>.",
+    "groupsPaymentAutoRenew": "Ця підписка буде продовжуватись автоматично до тих пір, поки не буде відмінена. Якщо вам потрібно відмінити підписку, ви можете зробити це у вкладці \"груповий рахунок\"."
 }
diff --git a/website/common/locales/zh/gear.json b/website/common/locales/zh/gear.json
index 42a827af09..b427468e12 100644
--- a/website/common/locales/zh/gear.json
+++ b/website/common/locales/zh/gear.json
@@ -306,9 +306,9 @@
     "weaponArmoireMythmakerSwordNotes": "重剑无锋大巧不工，这把宝剑成就了许多神话中的英雄人物。增加感知、力量各<%= attrs %>点。魔法衣橱：黄金战袍套装（3/3）。",
     "weaponArmoireIronCrookText": "钢铁手杖",
     "weaponArmoireIronCrookNotes": "纯钢打造，力透杖柄。这柄曲柄杖用来放牧效果极好。增加感知、力量各<%= attrs %>点。魔法衣橱：铁角套装（3/3）。",
-    "weaponArmoireGoldWingStaffText": "金翅法仗",
+    "weaponArmoireGoldWingStaffText": "金翅法杖",
     "weaponArmoireGoldWingStaffNotes": "法杖上的翅膀持续颤动旋转。增加全属性<%= attrs %>点。魔法衣橱：独立装备。",
-    "weaponArmoireBatWandText": "蝙蝠法仗",
+    "weaponArmoireBatWandText": "蝙蝠法杖",
     "weaponArmoireBatWandNotes": "这根法杖可以把任何任务都变成一只蝙蝠！挥一挥，让它们飞的远远的。增加<%= int %>点智力和<%= per %>点感知。魔法衣橱：独立装备。",
     "weaponArmoireShepherdsCrookText": "牧羊人之杖",
     "weaponArmoireShepherdsCrookNotes": "对放牧狮鹫很有用。增加<%= con %>点体质。魔法衣橱：牧羊人套装（1/3）。",
@@ -2587,7 +2587,7 @@
     "weaponSpecialSummer2022RogueNotes": "如果你在处境窘迫，不要犹豫显示这些强悍的爪！增加<%= str %>点力量。2022年夏季限定版装备。",
     "weaponSpecialSummer2022WarriorNotes": "它旋转！它重定向！它带来风暴！增加<%= str %>点力量。2022年夏季限定版装备。",
     "weaponSpecialSummer2022MageText": "蝠鲼法杖",
-    "weaponSpecialSummer2022HealerText": "有益的泡",
+    "weaponSpecialSummer2022HealerText": "增益泡泡",
     "weaponSpecialSummer2022MageNotes": "用这个法杖旋一下就会神奇的清前面的水。增加<%= int %>点智力和<%= per %>点感知。2022年夏季限定版装备。",
     "weaponSpecialSummer2022HealerNotes": "这些泡以满意的啪释放/治愈术！增加<%= int %>点智力。2022年夏季限定版装备。",
     "weaponSpecialSpring2022WarriorText": "反转的伞",
diff --git a/website/common/locales/zh/generic.json b/website/common/locales/zh/generic.json
index 9c7048dfb2..652ed6bca3 100644
--- a/website/common/locales/zh/generic.json
+++ b/website/common/locales/zh/generic.json
@@ -88,7 +88,7 @@
     "audioTheme_maflTheme": "MAFL主题",
     "audioTheme_pizildenTheme": "Pizilden的主题",
     "audioTheme_farvoidTheme": "Farvoid的主题",
-    "reportBug": "报告问题",
+    "reportBug": "报告漏洞",
     "overview": "新手教学",
     "dateFormat": "日期格式",
     "achievementStressbeast": "Stoïkalm的救星",
@@ -202,7 +202,7 @@
     "finish": "完成",
     "congratulations": "恭喜你！",
     "onboardingAchievs": "到职成就",
-    "askQuestion": "问个问题",
+    "askQuestion": "提出问题",
     "reportBugHeaderDescribe": "请详述您所面临的问题，我们的团队将会尽快处理并给予回复。",
     "reportEmailText": "这将仅用于答复你关于该问题有关的信息。",
     "reportEmailPlaceholder": "您的电子邮件",
diff --git a/website/common/locales/zh_TW/gear.json b/website/common/locales/zh_TW/gear.json
index 8eb3fbc4de..8c0fe4f494 100644
--- a/website/common/locales/zh_TW/gear.json
+++ b/website/common/locales/zh_TW/gear.json
@@ -2355,5 +2355,36 @@
     "weaponSpecialFall2021RogueNotes": "你到底遇到了什麼？ 人們總是說盜賊的手是黏糊糊的，但這不代表什麼！ 新增<%= str %>點力量。 2021年秋季限定版裝備。",
     "weaponSpecialFall2021WarriorNotes": "這種經典的單刃斧頭非常適合用來砍…南瓜！ 新增<%= str %>點力量。 2021秋季限定版裝備。",
     "weaponSpecialFall2021MageNotes": "知識渴求知識。 由記憶和欲望構成，這只可怕的手抓住了更多。 新增<%= int %>點智力，<%= per %>點感知。 2021年秋季限定版裝備。",
-    "weaponSpecialFall2021HealerNotes": "使用這根魔杖召喚治療火焰和一個幽靈來幫助你。 新增<%= int %>點智力。 2021年秋季限定版裝備。"
+    "weaponSpecialFall2021HealerNotes": "使用這根魔杖召喚治療火焰和一個幽靈來幫助你。 新增<%= int %>點智力。 2021年秋季限定版裝備。",
+    "weaponSpecialWinter2022RogueText": "仙女棒",
+    "weaponSpecialWinter2022RogueNotes": "金銀是盜賊的最愛，對嗎？ 這些都是應季主題。 新增<%= str %>點力量。 2021-2022年冬季限定版裝備。",
+    "weaponSpecialWinter2022WarriorText": "手杖糖劍",
+    "weaponSpecialWinter2022HealerNotes": "用這個固態水工具去碰朋友的脖子，他們就會從椅子上跳下來！ 過會兒他們就會感覺好多了。 但願吧。 新增<%= int %>點智力。 2021-2022年冬季限定版裝備。",
+    "weaponSpecialSummer2022RogueText": "螃蟹鉗",
+    "weaponSpecialSummer2022RogueNotes": "如果你在處境窘迫，不要猶豫顯示這些強悍的爪！ 新增<%= str %>點力量。 2022年夏季限定版裝備。",
+    "weaponSpecialSummer2022WarriorText": "水龍捲風",
+    "weaponSpecialSummer2022WarriorNotes": "它旋轉！ 它重定向！ 它帶來風暴！ 新增<%= str %>點力量。 2022年夏季限定版裝備。",
+    "weaponSpecialSummer2022MageText": "蝠鱝法杖",
+    "weaponSpecialWinter2022WarriorNotes": "要把這根糖果手杖打磨成一把完美的劍，需要舔幾下？ 新增<%= str %>點力量。 2021-2022年冬季限定版裝備。",
+    "weaponSpecialWinter2022MageText": "石榴法杖",
+    "weaponSpecialWinter2022MageNotes": "這根法杖上的漿果蘊含著一種可以在冬天使用的古老魔法。 新增<%= int %>點智力。 2021-2022年冬季限定版裝備。",
+    "weaponSpecialWinter2022HealerText": "冰晶魔杖",
+    "weaponSpecialSummer2022MageNotes": "用這根神奇法杖製造漩渦來清理你面前的水域。 新增<%= int %>點智力和<%= per %>點感知。 2022年夏季限定版裝備。",
+    "weaponSpecialSummer2022HealerText": "增益泡泡",
+    "weaponSpecialSummer2022HealerNotes": "這些泡泡在令人滿意的爆裂聲中對清水施加治療魔法！ 新增<%= int %>點智力。 2022年夏季限定版裝備。",
+    "headSpecialNye2021Text": "怪誕的派對帽子",
+    "headSpecialNye2021Notes": "你收到了一頂怪誕的派對帽子！ 當新年鐘聲響起時，自豪地戴上它吧！ 沒有属性加成。",
+    "weaponSpecialSpring2022RogueText": "巨型耳釘",
+    "weaponSpecialSpring2022RogueNotes": "亮晶晶！ 你收集到如此閃亮、美麗又完美的物件！ 新增<%= str %>點力量。 2022年春季限定版裝備。",
+    "weaponSpecialSpring2022WarriorText": "反轉雨傘",
+    "weaponSpecialSpring2022WarriorNotes": "呀！ 我想那風比你想像的要大一些，是吧？ 新增<%= str %>點力量。 2022年春季限定版裝備。",
+    "weaponSpecialSpring2022MageText": "連翹法杖",
+    "weaponSpecialSpring2022MageNotes": "這些明黃花朵做好準備去引導你的强力春之魔法。 新增<%= int %>點智力和<%= per %>點感知。 2022年春季限定版裝備。",
+    "weaponSpecialSpring2022HealerText": "橄榄石魔杖",
+    "weaponSpecialSpring2022HealerNotes": "使用這根魔杖來挖掘橄欖石的治療特性，無論是帶來平靜、積極還是善良。 增加<%= int %>点智力。 2022年春季限定版装备。",
+    "weaponSpecialFall2022RogueText": "黃瓜刀",
+    "weaponSpecialFall2022RogueNotes": "這根黃瓜不僅可以用來防身，餓了還能靠它飽餐一頓。 新增<%= str %>點力量。 2022年秋季限定版裝備。",
+    "weaponSpecialFall2022WarriorNotes": "比起敵人的盔甲來說也許更適合用來劈木頭或切硬皮麵包，但是RAWR！ 它看起來確實很可怕！ 新增<%= str %>點力量。 2022年秋季限定版裝備。",
+    "weaponSpecialFall2022WarriorText": "獸人利劍",
+    "weaponSpecialFall2022MageText": "爆裂之風"
 }
diff --git a/website/common/locales/zh_TW/generic.json b/website/common/locales/zh_TW/generic.json
index b5a28e4333..cd328433b5 100644
--- a/website/common/locales/zh_TW/generic.json
+++ b/website/common/locales/zh_TW/generic.json
@@ -212,5 +212,6 @@
     "reportDescriptionText": "請附上截圖或 Javascript 控制台錯誤碼，以便問題處理。",
     "submitBugReport": "提交問題回報",
     "reportSent": "問題回報已傳送！",
-    "reportSentDescription": "我們會盡早給予回覆一旦我們的團隊有機會去找尋問題來源。感謝您回報錯誤及問題。"
+    "reportSentDescription": "我們會盡早給予回覆一旦我們的團隊有機會去找尋問題來源。感謝您回報錯誤及問題。",
+    "emptyReportBugMessage": "錯誤報告已遺失"
 }

From b5c950ac9609ed707ff4f637162d55ab80a08086 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Sun, 30 Oct 2022 20:52:55 -0400
Subject: [PATCH 118/134] chore(content): add November 2022 Mystery Items
 (#14317)

* chore(content): add November Mystery Items

* chore: merge release into 2022-11-mystery-items

* Revert "chore: merge release into 2022-11-mystery-items"

This reverts commit e12b61d73fb42cad79bbd69af2584c7bb9a96254.

Co-authored-by: SabreCat <sabe@habitica.com>
---
 habitica-images                               |   2 +-
 .../assets/css/sprites/spritesmith-main.css   | 426 ++++++++++--------
 website/common/locales/en/gear.json           |   6 +-
 website/common/locales/en/subscriber.json     |   1 +
 .../script/content/gear/sets/mystery.js       |   2 +
 5 files changed, 237 insertions(+), 200 deletions(-)

diff --git a/habitica-images b/habitica-images
index bb5f371ec4..03fd45756b 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit bb5f371ec4b5963b9476944f7d7785b2cd83ca39
+Subproject commit 03fd45756b21970e758a2b9c6fec43fc1b5ff038
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index f94855687a..6ac842053b 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -63,6 +63,11 @@
   width: 48px;
   height: 56px;
 }
+.achievement-boneToPick2x {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-boneToPick2x.png');
+  width: 68px;
+  height: 68px;
+}
 .achievement-boot2x {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-boot2x.png');
   width: 48px;
@@ -27335,6 +27340,31 @@
   width: 117px;
   height: 120px;
 }
+.head_mystery_202211 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202211.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_head_mystery_202211 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202211.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202211 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202211.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_mystery_202211 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_mystery_202211.png');
+  width: 68px;
+  height: 68px;
+}
+.weapon_mystery_202211 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202211.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_mystery_301404 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
   width: 90px;
@@ -32829,6 +32859,204 @@
   width: 68px;
   height: 68px;
 }
+.headAccessory_special_bearEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_bearEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_blackHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blackHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_blueHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blueHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_cactusEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_cactusEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_foxEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_foxEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_greenHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_greenHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_lionEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_lionEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pandaEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_pandaEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pigEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_pigEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pinkHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pinkHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_redHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_redHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_tigerEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_tigerEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_whiteHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_whiteHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_wolfEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_wolfEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_yellowHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_yellowHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_headAccessory_special_bearEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_bearEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_blackHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blackHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_blueHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blueHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_cactusEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_cactusEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_foxEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_foxEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_greenHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_greenHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_lionEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_lionEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_pandaEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pandaEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_pigEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pigEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_pinkHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pinkHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_redHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_redHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_tigerEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_tigerEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_whiteHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_whiteHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_wolfEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_wolfEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_yellowHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_yellowHeadband.png');
+  width: 68px;
+  height: 68px;
+}
 .head_0 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_0.png');
   width: 90px;
@@ -33210,204 +33438,6 @@
   width: 68px;
   height: 68px;
 }
-.headAccessory_special_bearEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_bearEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_blackHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blackHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_blueHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blueHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_cactusEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_cactusEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_foxEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_foxEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_greenHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_greenHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_lionEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_lionEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pandaEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_pandaEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pigEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_pigEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pinkHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pinkHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_redHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_redHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_tigerEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_tigerEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_whiteHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_whiteHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_wolfEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_wolfEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_yellowHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_yellowHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.shop_headAccessory_special_bearEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_bearEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_blackHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blackHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_blueHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blueHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_cactusEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_cactusEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_foxEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_foxEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_greenHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_greenHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_lionEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_lionEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_pandaEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pandaEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_pigEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pigEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_pinkHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pinkHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_redHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_redHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_tigerEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_tigerEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_whiteHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_whiteHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_wolfEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_wolfEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_yellowHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_yellowHeadband.png');
-  width: 68px;
-  height: 68px;
-}
 .shield_healer_1 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_healer_1.png');
   width: 90px;
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 7a1d3226e3..05f0c78206 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -482,6 +482,8 @@
   "weaponMystery202201Notes": "Unleash a cloud of gold and silver glitter when the clock strikes midnight. Happy New Year! Now who's cleaning this up? Confers no benefit. January 2022 Subscriber Item.",
   "weaponMystery202209Text": "Magic Manual",
   "weaponMystery202209Notes": "This book will guide you through your journey into magic-making. Confers no benefit. September 2022 Subscriber Item.",
+  "weaponMystery202211Text": "Electromancer Staff",
+  "weaponMystery202211Notes": "Harness the awesome power of a lightning storm with this staff. Confers no benefit. November 2022 Subscriber Item.",
   "weaponMystery301404Text": "Steampunk Cane",
   "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
 
@@ -1965,7 +1967,9 @@
   "headMystery202208Notes": "Enjoy showing off this voluminous hair - it can double as a whip in a pinch! Confers no benefit. August 2022 Subscriber Item.",
   "headMystery202210Text": "Ominous Ophidian Helm",
   "headMystery202210Notes": "This scaly hood will surely terrify your To-Do list into submission! Confers no benefit. October 2022 Subscriber Item.",
-
+  "headMystery202211Text": "Electromancer Hat",
+  "headMystery202211Notes": "Be careful with this powerful hat, its effect on admirers can be quite shocking! Confers no benefit. November 2022 Subscriber Item.",
+  
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index d2537e7855..51d6f2d7da 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -143,6 +143,7 @@
     "mysterySet202208": "Perky Ponytail Set",
     "mysterySet202209": "Magical Scholar Set",
     "mysterySet202210": "Ominous Ophidian Set",
+    "mysteryset202211": "Electromancer Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",
diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js
index f3669e62e2..ae3b532e76 100644
--- a/website/common/script/content/gear/sets/mystery.js
+++ b/website/common/script/content/gear/sets/mystery.js
@@ -196,6 +196,7 @@ const head = {
   202207: { },
   202208: { },
   202210: { },
+  202211: { },
   301404: { },
   301405: { },
   301703: { },
@@ -250,6 +251,7 @@ const weapon = {
   202102: { },
   202104: { twoHanded: true },
   202111: { twoHanded: true },
+  202211: { twoHanded: true },
   202201: { },
   202209: { },
   301404: { },

From 575aea2605438346a4a4f3024715087db2f21f8c Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Sun, 30 Oct 2022 19:56:10 -0500
Subject: [PATCH 119/134] 4.247.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6544cab095..10d170e669 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.246.0",
+  "version": "4.247.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3866f9e802..16670119f2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.246.0",
+  "version": "4.247.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From e39a5a0628c0bac01d2273c94c6da70d935751a4 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Sun, 30 Oct 2022 20:15:37 -0500
Subject: [PATCH 120/134] fix(strings): set token typo

---
 website/common/locales/en/subscriber.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index 51d6f2d7da..c48ffd7dc1 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -143,7 +143,7 @@
     "mysterySet202208": "Perky Ponytail Set",
     "mysterySet202209": "Magical Scholar Set",
     "mysterySet202210": "Ominous Ophidian Set",
-    "mysteryset202211": "Electromancer Set",
+    "mysterySet202211": "Electromancer Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

From 1b52529822738f2b970463d1efc6247289217c2c Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 31 Oct 2022 10:46:51 -0400
Subject: [PATCH 121/134] chore(ladder update): 2022 Habitoween Ladder

---
 .../2022/20221031_habitoween_ladder.js        | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 migrations/archive/2022/20221031_habitoween_ladder.js

diff --git a/migrations/archive/2022/20221031_habitoween_ladder.js b/migrations/archive/2022/20221031_habitoween_ladder.js
new file mode 100644
index 0000000000..0af6bf3a9e
--- /dev/null
+++ b/migrations/archive/2022/20221031_habitoween_ladder.js
@@ -0,0 +1,86 @@
+/*
+ * Award Habitoween ladder items to participants in this month's Habitoween festivities
+ */
+/* eslint-disable no-console */
+
+const MIGRATION_NAME = '20211028_habitoween_ladder'; // Update when running in future years
+
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {};
+  const inc = {
+    'items.food.Candy_Skeleton': 1,
+    'items.food.Candy_Base': 1,
+    'items.food.Candy_CottonCandyBlue': 1,
+    'items.food.Candy_CottonCandyPink': 1,
+    'items.food.Candy_Shade': 1,
+    'items.food.Candy_White': 1,
+    'items.food.Candy_Golden': 1,
+    'items.food.Candy_Zombie': 1,
+    'items.food.Candy_Desert': 1,
+    'items.food.Candy_Red': 1,
+  };
+
+  set.migration = MIGRATION_NAME;
+
+  if (user && user.items && user.items.pets && user.items.pets['JackOLantern-RoyalPurple']) {
+    set['items.mounts.JackOLantern-RoyalPurple'] = true;
+  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Glow']) {
+    set['items.pets.JackOLantern-RoyalPurple'] = 5;
+  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Glow']) {
+    set['items.mounts.JackOLantern-Glow'] = true;
+  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Ghost']) {
+    set['items.pets.JackOLantern-Glow'] = 5;
+  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Ghost']) {
+    set['items.mounts.JackOLantern-Ghost'] = true;
+  } else if (user && user.items && user.items.mounts && user.items.mounts['JackOLantern-Base']) {
+    set['items.pets.JackOLantern-Ghost'] = 5;
+  } else if (user && user.items && user.items.pets && user.items.pets['JackOLantern-Base']) {
+    set['items.mounts.JackOLantern-Base'] = true;
+  } else {
+    set['items.pets.JackOLantern-Base'] = 5;
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+  return await User.update({_id: user._id}, {$inc: inc, $set: set}).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    migration: {$ne: MIGRATION_NAME},
+    'auth.timestamps.loggedin': {$gt: new Date('2022-10-01')},
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1],
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};

From 2add227b97669c34585505acff53971b1dff1662 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 31 Oct 2022 17:53:38 +0100
Subject: [PATCH 122/134] Translated using Weblate (Russian)

Currently translated at 100.0% (209 of 209 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (209 of 209 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (209 of 209 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (2698 of 2701 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2701 of 2701 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (2701 of 2701 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (732 of 732 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (732 of 732 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (732 of 732 strings)

Translated using Weblate (German)

Currently translated at 100.0% (209 of 209 strings)

Translated using Weblate (German)

Currently translated at 100.0% (2701 of 2701 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (209 of 209 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2701 of 2701 strings)

Translated using Weblate (German)

Currently translated at 99.8% (2696 of 2701 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (732 of 732 strings)

Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: LiziKnight <liziknight0316@outlook.com>
Co-authored-by: Mara S. (Dolichotis) <marascherzer@gmail.com>
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com>
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/it/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/it/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/de/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/it/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hans/
Translation: Habitica/Backgrounds
Translation: Habitica/Gear
Translation: Habitica/Subscriber
---
 website/common/locales/de/gear.json           | 8 +++++++-
 website/common/locales/de/subscriber.json     | 3 ++-
 website/common/locales/it/backgrounds.json    | 9 ++++++++-
 website/common/locales/it/gear.json           | 8 +++++++-
 website/common/locales/it/subscriber.json     | 3 ++-
 website/common/locales/pt_BR/backgrounds.json | 9 ++++++++-
 website/common/locales/pt_BR/gear.json        | 8 +++++++-
 website/common/locales/pt_BR/subscriber.json  | 3 ++-
 website/common/locales/ru/backgrounds.json    | 9 ++++++++-
 website/common/locales/ru/gear.json           | 8 +++++++-
 website/common/locales/ru/subscriber.json     | 3 ++-
 website/common/locales/zh/backgrounds.json    | 9 ++++++++-
 website/common/locales/zh/gear.json           | 8 +++++++-
 website/common/locales/zh/subscriber.json     | 3 ++-
 14 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/website/common/locales/de/gear.json b/website/common/locales/de/gear.json
index 408c2d05b7..17a776504f 100644
--- a/website/common/locales/de/gear.json
+++ b/website/common/locales/de/gear.json
@@ -2730,5 +2730,11 @@
     "armorSpecialFall2022HealerNotes": "Wie viele Beobachter könnte ein Beobachter beobachten, wenn ein Beobachter Beobachter beobachten könnte? Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
     "headSpecialFall2022MageNotes": "Zieh andere in Deinen Bann und locke sie zu Dir hin mit dieser magischen Maidenmaske. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Herbstausrüstung.",
     "eyewearArmoireComedyMaskNotes": "Heiter! Eine malerische Maske für Dein fröhlich' Herz, spielend, Freude verkündend, Heiterkeit und Frohsinn auf der Bühne ausstrahlend. Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Theatermaskenset (Gegenstand 1 von 2).",
-    "eyewearArmoireTragedyMaskNotes": "Ach! Eine schwere Maske für Deinen armen Darsteller, stolzierend, sich grämend, und auf der Bühne Leid und Kummer ausdrückend. Erhöht Intelligenz um <%= int %>. Verzauberter Schrank: Theatermaskenset (Gegenstand 2 von 2)."
+    "eyewearArmoireTragedyMaskNotes": "Ach! Eine schwere Maske für Deinen armen Darsteller, stolzierend, sich grämend, und auf der Bühne Leid und Kummer ausdrückend. Erhöht Intelligenz um <%= int %>. Verzauberter Schrank: Theatermaskenset (Gegenstand 2 von 2).",
+    "armorArmoireSheetGhostCostumeText": "Bettuch-Geist-Kostüm",
+    "weaponMystery202211Text": "Blitzbeschwörer Stab",
+    "weaponMystery202211Notes": "Bündle die massive Macht eines Blitzgewitters mit diesem Stab. Gewährt keinen Attributbonus. November 2022 Abonnentengegenstand.",
+    "armorArmoireSheetGhostCostumeNotes": "Boo! Das ist das gruseligste Kostüm in Habitica, also geh vernünftig damit um … und gib Acht, dass Du nicht stolperst. Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Unabhängiger Gegenstand.",
+    "headMystery202211Text": "Blitzbeschwörer Hut",
+    "headMystery202211Notes": "Sei vorsichtig mit diesem blitzenden Hut, er kann einen sehr schockierenden Eindruck bei Deinen Bewunderern hinteralssen! Gewährt keinen Attributbonus. November 2022 Abonnentengegenstand."
 }
diff --git a/website/common/locales/de/subscriber.json b/website/common/locales/de/subscriber.json
index bcb1fd5f8e..53dabf74e6 100644
--- a/website/common/locales/de/subscriber.json
+++ b/website/common/locales/de/subscriber.json
@@ -214,5 +214,6 @@
     "needToPurchaseGems": "Willst Du Edelsteine als Geschenk kaufen?",
     "mysterySet202208": "Frecher Pferdeschwanz-Set",
     "mysterySet202209": "Magisches Gelehrten-Set",
-    "mysterySet202210": "Bedrohliche Schlange Set"
+    "mysterySet202210": "Bedrohliche Schlange Set",
+    "mysteryset202211": "Blitzbeschwörer Set"
 }
diff --git a/website/common/locales/it/backgrounds.json b/website/common/locales/it/backgrounds.json
index 68101e0850..9762a7456f 100644
--- a/website/common/locales/it/backgrounds.json
+++ b/website/common/locales/it/backgrounds.json
@@ -728,5 +728,12 @@
     "backgroundAutumnPicnicText": "Picnic Autunnale",
     "backgroundAutumnPicnicNotes": "Goditi un Picnic Autunnale.",
     "backgroundOldPhotoText": "Vecchia Foto",
-    "backgroundOldPhotoNotes": "Mettiti in posa in una Vecchia Foto."
+    "backgroundOldPhotoNotes": "Mettiti in posa in una Vecchia Foto.",
+    "backgroundSpookyRuinsText": "Rovine Spettrali",
+    "backgroundSpookyRuinsNotes": "Esplora delle Rovine Spettrali.",
+    "backgroundMaskMakersWorkshopText": "Bottega del Mascheraio",
+    "backgroundMaskMakersWorkshopNotes": "Prova un nuovo volto nella Bottega del Mascheraio.",
+    "backgroundCemeteryGateText": "Cancello di un Cimitero",
+    "backgrounds102022": "SET 101: Rilasciato a ottobre 2022",
+    "backgroundCemeteryGateNotes": "Infesta il Cancello di un Cimitero."
 }
diff --git a/website/common/locales/it/gear.json b/website/common/locales/it/gear.json
index 001a60435d..a342332f94 100644
--- a/website/common/locales/it/gear.json
+++ b/website/common/locales/it/gear.json
@@ -2730,5 +2730,11 @@
     "headMystery202210Text": "Inquietante Elmo Ofidiano",
     "headMystery202210Notes": "Questo cappuccio squamoso sottometterà sicuramente la tua lista di Cose da Fare, terrorizzandola! Non conferisce alcun bonus. Oggetto abbonati ottobre 2022.",
     "armorMystery202210Text": "Inquietante Armatura Ofidiana",
-    "armorMystery202210Notes": "Prova a strisciare, tanto per cambiare, e potresti scoprire che è un mezzo per spostarsi piuttosto efficiente! Non conferisce alcun bonus. Oggetto abbonati ottobre 2022."
+    "armorMystery202210Notes": "Prova a strisciare, tanto per cambiare, e potresti scoprire che è un mezzo per spostarsi piuttosto efficiente! Non conferisce alcun bonus. Oggetto abbonati ottobre 2022.",
+    "weaponMystery202211Text": "Bastone dell'Elettromante",
+    "weaponMystery202211Notes": "Sfrutta l'incredibile potenza di un temporale con questo bastone. Non conferisce alcun bonus. Oggetto abbonati novembre 2022.",
+    "armorArmoireSheetGhostCostumeText": "Costume da Fantasma con le Lenzuola",
+    "armorArmoireSheetGhostCostumeNotes": "Bu! Questo è il costume più spaventoso in tutta Habitica, quindi indossalo con saggezza... e stai attento a non inciampare sui tuoi passi. Aumenta la Costituzione di <%= con %>. Scrigno incantato: Oggetto Indipendente.",
+    "headMystery202211Text": "Cappello dell'Elettromante",
+    "headMystery202211Notes": "Stai attento con questo potente cappello, l'effetto che ha sugli ammiratori può essere piuttosto scioccante! Non conferisce alcun bonus. Oggetto abbonati novembre 2022."
 }
diff --git a/website/common/locales/it/subscriber.json b/website/common/locales/it/subscriber.json
index 06b5389c0e..a5f724f98e 100644
--- a/website/common/locales/it/subscriber.json
+++ b/website/common/locales/it/subscriber.json
@@ -212,5 +212,6 @@
     "mysterySet202207": "Set Medusa Improvvisante",
     "mysterySet202208": "Set Coda di Cavallo Pimpante",
     "mysterySet202209": "Set dell'Erudito Magico",
-    "mysterySet202210": "Set dell'Inquietante Ofidiano"
+    "mysterySet202210": "Set dell'Inquietante Ofidiano",
+    "mysteryset202211": "Set dell'Elettromante"
 }
diff --git a/website/common/locales/pt_BR/backgrounds.json b/website/common/locales/pt_BR/backgrounds.json
index b6f9f594fe..2a62606009 100644
--- a/website/common/locales/pt_BR/backgrounds.json
+++ b/website/common/locales/pt_BR/backgrounds.json
@@ -724,5 +724,12 @@
     "backgroundAutumnPicnicNotes": "Aproveite um Piquenique de Outono.",
     "backgroundAutumnPicnicText": "Piquenique de Outono",
     "backgroundTheatreStageText": "Palco de Teatro",
-    "backgroundTheatreStageNotes": "Performe em um Palco de Teatro."
+    "backgroundTheatreStageNotes": "Performe em um Palco de Teatro.",
+    "backgroundSpookyRuinsText": "Ruínas Assustadoras",
+    "backgroundSpookyRuinsNotes": "Explore algumas Ruínas Assustadoras.",
+    "backgroundMaskMakersWorkshopText": "Seminário de Criação de Máscaras",
+    "backgroundMaskMakersWorkshopNotes": "Prove um novo rosto no Seminário de Criação de Máscaras.",
+    "backgroundCemeteryGateText": "Portão de Cemitério",
+    "backgroundCemeteryGateNotes": "Assombre um Portão de Cemitério.",
+    "backgrounds102022": "Conjunto 101: Lançado em outubro de 2022"
 }
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index 67359bebd5..59a62db9d3 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -2730,5 +2730,11 @@
     "armorMystery202210Text": "Armadura Serpente Sinistra",
     "armorMystery202210Notes": "Tente deslizar pra variar, talvez você encontre um novo modo de transporte! Não confere benefícios. Item de Assinante de Outubro de 2022.",
     "headMystery202210Text": "Capacete Serpente Sinistra",
-    "headMystery202210Notes": "Esse capuz escamoso certamente irá aterrorizar sua lista de afazeres! Não confere benefícios. Item de Assinante de Outubro de 2022."
+    "headMystery202210Notes": "Esse capuz escamoso certamente irá aterrorizar sua lista de afazeres! Não confere benefícios. Item de Assinante de Outubro de 2022.",
+    "weaponMystery202211Text": "Cajado Eletromante",
+    "weaponMystery202211Notes": "Aproveite o incrível poder de uma tempestade de raios com este cajado. Não confere benefícios. Item de Assinante de novembro de 2022.",
+    "armorArmoireSheetGhostCostumeText": "Fantasia Fantasma do Lençol",
+    "armorArmoireSheetGhostCostumeNotes": "Buu! Esta é a fantasia mais assustadora de todo o Habitica, então use-a com sabedoria... e tome cuidado para não tropeçar. Aumenta Constituição em <%= con %>. Armário Encantado: Item Independente.",
+    "headMystery202211Text": "Chapéu Eletromante",
+    "headMystery202211Notes": "Tome cuidado com este chapéu poderoso, seu efeito em quem o encara pode ser chocante! Não confere benefícios. Item de Assinante de novembro de 2022."
 }
diff --git a/website/common/locales/pt_BR/subscriber.json b/website/common/locales/pt_BR/subscriber.json
index 83f08b41b6..98b13c5f53 100644
--- a/website/common/locales/pt_BR/subscriber.json
+++ b/website/common/locales/pt_BR/subscriber.json
@@ -214,5 +214,6 @@
     "sendAGift": "Enviar presente",
     "mysterySet202208": "Conjunto Rabo de Cavalo Radiante",
     "mysterySet202209": "Conjunto Mágico Escolar",
-    "mysterySet202210": "Conjunto Serpente Sinistra"
+    "mysterySet202210": "Conjunto Serpente Sinistra",
+    "mysteryset202211": "Conjunto Eletromante"
 }
diff --git a/website/common/locales/ru/backgrounds.json b/website/common/locales/ru/backgrounds.json
index cef11441a8..30248944e9 100644
--- a/website/common/locales/ru/backgrounds.json
+++ b/website/common/locales/ru/backgrounds.json
@@ -728,5 +728,12 @@
     "backgroundAutumnPicnicText": "Осенний пикник",
     "backgroundAutumnPicnicNotes": "Насладитесь осенним пикником.",
     "backgroundOldPhotoText": "Старая фотография",
-    "backgroundOldPhotoNotes": "Примите таинственную позу на старом фото."
+    "backgroundOldPhotoNotes": "Примите таинственную позу на старом фото.",
+    "backgroundSpookyRuinsText": "Зловещие руины",
+    "backgroundSpookyRuinsNotes": "Исследуйте зловещие руины.",
+    "backgroundMaskMakersWorkshopNotes": "Примерьте новое лицо в мастерской по изготовлению масок.",
+    "backgroundCemeteryGateText": "Кладбищенские врата",
+    "backgroundCemeteryGateNotes": "Привидения обитают у этих зловещих кладбищенских врат.",
+    "backgrounds102022": "Набор 101: Выпущен в октябре 2022",
+    "backgroundMaskMakersWorkshopText": "Мастерская по изготовлению масок"
 }
diff --git a/website/common/locales/ru/gear.json b/website/common/locales/ru/gear.json
index 6bde3b94c6..eaac373ab7 100644
--- a/website/common/locales/ru/gear.json
+++ b/website/common/locales/ru/gear.json
@@ -2727,5 +2727,11 @@
     "armorSpecialFall2022HealerText": "Множество наблюдающих щупалец",
     "shieldSpecialFall2022HealerNotes": "Взгляните на этот костюм и трепещите. Увеличивает телосложение на <%= con %>. Ограниченный выпуск осени 2022.",
     "armorMystery202210Text": "Доспех Зловещей змеи",
-    "headMystery202210Text": "Шлем Зловещей змеи"
+    "headMystery202210Text": "Шлем Зловещей змеи",
+    "weaponMystery202211Text": "Посох электроманта",
+    "headMystery202211Text": "Шляпа электроманта",
+    "headMystery202211Notes": "Будьте осторожны с этим могущественным головным убором, его эффект на поклонников может быть весьма шокирующим! Бонусов не дает. Подарок подписчикам ноября 2022.",
+    "armorArmoireSheetGhostCostumeText": "Костюм привидения",
+    "armorArmoireSheetGhostCostumeNotes": "Буу! Это самый страшный костюм во всей Habitica, поэтому надевайте его с умом... и смотрите под ноги, чтобы не споткнуться. Увеличивает телосложение на <%= con %>. Зачарованный сундук: Независимый предмет.",
+    "weaponMystery202211Notes": "С помощью этого посоха вы сможете использовать чудовищную силу грозы. Бонусов не дает. Подарок подписчикам ноября 2022."
 }
diff --git a/website/common/locales/ru/subscriber.json b/website/common/locales/ru/subscriber.json
index c6650431c5..a9618cf9c4 100644
--- a/website/common/locales/ru/subscriber.json
+++ b/website/common/locales/ru/subscriber.json
@@ -214,5 +214,6 @@
     "mysterySet202208": "Набор Задорный хвостик",
     "mysterySet202209": "Набор магического учёного",
     "mysterySet202207": "Набор желейной медузы",
-    "mysterySet202210": "Набор Зловещей змеи"
+    "mysterySet202210": "Набор Зловещей змеи",
+    "mysteryset202211": "Набор электроманта"
 }
diff --git a/website/common/locales/zh/backgrounds.json b/website/common/locales/zh/backgrounds.json
index 30d39c2123..bfe23e1f9a 100644
--- a/website/common/locales/zh/backgrounds.json
+++ b/website/common/locales/zh/backgrounds.json
@@ -724,5 +724,12 @@
     "backgroundAutumnPicnicText": "秋日野炊",
     "backgroundAutumnPicnicNotes": "享受秋日野炊。",
     "backgroundOldPhotoText": "老照片",
-    "backgroundOldPhotoNotes": "在老照片里抢占C位。"
+    "backgroundOldPhotoNotes": "在老照片里抢占C位。",
+    "backgrounds102022": "第101组：2022年10月推出",
+    "backgroundSpookyRuinsText": "幽灵废墟",
+    "backgroundSpookyRuinsNotes": "探索某些幽灵废墟。",
+    "backgroundMaskMakersWorkshopNotes": "尝试在面具工坊换一张新面孔。",
+    "backgroundMaskMakersWorkshopText": "面具工坊",
+    "backgroundCemeteryGateText": "墓地大门",
+    "backgroundCemeteryGateNotes": "厉鬼出没的墓地大门。"
 }
diff --git a/website/common/locales/zh/gear.json b/website/common/locales/zh/gear.json
index b427468e12..f870199cd6 100644
--- a/website/common/locales/zh/gear.json
+++ b/website/common/locales/zh/gear.json
@@ -2730,5 +2730,11 @@
     "shieldSpecialFall2022WarriorText": "兽人之盾",
     "shieldSpecialFall2022WarriorNotes": "要么招待要么RAWR！增加<%= con %>点体质。2022年秋季限定版装备。",
     "shieldSpecialFall2022HealerText": "窥视左目",
-    "shieldSpecialFall2022HealerNotes": "二号眼，盯着这套服饰颤抖吧。增加<%= con %>点体质。2022年秋季限定版装备。"
+    "shieldSpecialFall2022HealerNotes": "二号眼，盯着这套服饰颤抖吧。增加<%= con %>点体质。2022年秋季限定版装备。",
+    "weaponMystery202211Text": "电磁法杖",
+    "weaponMystery202211Notes": "用这根法杖来驾驭闪电风暴的强大威力。没有属性加成。2022年11月订阅者物品。",
+    "armorArmoireSheetGhostCostumeText": "床单幽灵服装",
+    "armorArmoireSheetGhostCostumeNotes": "嘿！这是Habitica最恐怖的服装，所以请分场合穿它……注意脚下，以免绊倒。增加<%= con %>点体质。魔法衣橱：独立装备。",
+    "headMystery202211Text": "电磁帽",
+    "headMystery202211Notes": "小心这顶威力强大的帽子，它对崇拜者的影响可能相当惊人！没有属性加成。2022年11月订阅者物品。"
 }
diff --git a/website/common/locales/zh/subscriber.json b/website/common/locales/zh/subscriber.json
index c775b44b7c..b2745237da 100644
--- a/website/common/locales/zh/subscriber.json
+++ b/website/common/locales/zh/subscriber.json
@@ -214,5 +214,6 @@
     "mysterySet202207": "果冻水母套装",
     "mysterySet202208": "活泼马尾套装",
     "mysterySet202209": "魔法学者套装",
-    "mysterySet202210": "不祥之蛇套装"
+    "mysterySet202210": "不祥之蛇套装",
+    "mysteryset202211": "电磁套装"
 }

From 3bc82a669242b3d19b851c212d78247bc0d328de Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Mon, 31 Oct 2022 15:19:56 -0400
Subject: [PATCH 123/134] chore(content): add Bone to Pick achievement (#14318)

* chore(content): add Bone to Pick achievement

* chore(content): update spritesmith-main.css

* chore(content): add more bone picking

* chore(content): more bone picking

* chore(content): bone picking

* chore(content): i gotta bone to pick here

* chore(content): final bone picking

* chore: add migration script

* chore: update habitica-images

Co-authored-by: SabreCat <sabe@habitica.com>
---
 .../20221031_pet_set_group_achievements.js    | 119 ++++++++++++++++++
 .../client/src/components/notifications.vue   |  18 +++
 website/common/locales/en/achievements.json   |   5 +-
 website/common/script/content/achievements.js |   9 ++
 .../common/script/content/constants/index.js  |   1 +
 .../constants/petCompleteSetAchievements.js   |  11 ++
 website/common/script/content/index.js        |   2 +
 website/common/script/libs/achievements.js    |   1 +
 website/common/script/ops/hatch.js            |  28 +++++
 website/server/models/user/schema.js          |   1 +
 website/server/models/userNotification.js     |   1 +
 11 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 migrations/archive/2022/20221031_pet_set_group_achievements.js
 create mode 100644 website/common/script/content/constants/petCompleteSetAchievements.js

diff --git a/migrations/archive/2022/20221031_pet_set_group_achievements.js b/migrations/archive/2022/20221031_pet_set_group_achievements.js
new file mode 100644
index 0000000000..9591df1493
--- /dev/null
+++ b/migrations/archive/2022/20221031_pet_set_group_achievements.js
@@ -0,0 +1,119 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20221031_pet_set_group_achievements';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (user && user.items && user.items.pets) {
+    const pets = user.items.pets;
+    if (pets['Wolf-Skeleton']
+      && pets['TigerCub-Skeleton']
+      && pets['PandaCub-Skeleton']
+      && pets['LionCub-Skeleton']
+      && pets['Fox-Skeleton']
+      && pets['FlyingPig-Skeleton']
+      && pets['Dragon-Skeleton']
+      && pets['Cactus-Skeleton']
+      && pets['BearCub-Skeleton']
+      && pets['Gryphon-Skeleton']
+      && pets['Hedgehog-Skeleton']
+      && pets['Deer-Skeleton']
+      && pets['Egg-Skeleton']
+      && pets['Rat-Skeleton']
+      && pets['Octopus-Skeleton']
+      && pets['Seahorse-Skeleton']
+      && pets['Parrot-Skeleton']
+      && pets['Rooster-Skeleton']
+      && pets['Spider-Skeleton']
+      && pets['Owl-Skeleton']
+      && pets['Penguin-Skeleton']
+      && pets['TRex-Skeleton']
+      && pets['Rock-Skeleton']
+      && pets['Bunny-Skeleton']
+      && pets['Slime-Skeleton']
+      && pets['Sheep-Skeleton']
+      && pets['Cuttlefish-Skeleton']
+      && pets['Whale-Skeleton']
+      && pets['Cheetah-Skeleton']
+      && pets['Horse-Skeleton']
+      && pets['Frog-Skeleton']
+      && pets['Snake-Skeleton']
+      && pets['Unicorn-Skeleton']
+      && pets['Sabretooth-Skeleton']
+      && pets['Monkey-Skeleton']
+      && pets['Snail-Skeleton']
+      && pets['Falcon-Skeleton']
+      && pets['Treeling-Skeleton']
+      && pets['Axolotl-Skeleton']
+      && pets['Turtle-Skeleton']
+      && pets['Armadillo-Skeleton']
+      && pets['Cow-Skeleton']
+      && pets['Beetle-Skeleton']
+      && pets['Ferret-Skeleton']
+      && pets['Sloth-Skeleton']
+      && pets['Triceratops-Skeleton']
+      && pets['GuineaPig-Skeleton']
+      && pets['Peacock-Skeleton']
+      && pets['Butterfly-Skeleton']
+      && pets['Nudibranch-Skeleton']
+      && pets['Hippo-Skeleton']
+      && pets['Yarn-Skeleton']
+      && pets['Pterodactyl-Skeleton']
+      && pets['Badger-Skeleton']
+      && pets['Squirrel-Skeleton']
+      && pets['SeaSerpent-Skeleton']
+      && pets['Kangaroo-Skeleton']
+      && pets['Alligator-Skeleton']
+      && pets['Velociraptor-Skeleton']
+      && pets['Dolphin-Skeleton']
+      && pets['Robot-Skeleton']) {
+        set['achievements.boneToPick'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    // migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2022-01-01') },
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1]._id,
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};
diff --git a/website/client/src/components/notifications.vue b/website/client/src/components/notifications.vue
index 4a0f937ebc..071a2e85e3 100644
--- a/website/client/src/components/notifications.vue
+++ b/website/client/src/components/notifications.vue
@@ -241,6 +241,14 @@ const NOTIFICATIONS = {
       achievement: 'mountColorAchievs',
     },
   },
+  ACHIEVEMENT_PET_SET_COMPLETE: {
+    achievement: true,
+    label: $t => `${$t('achievement')}: ${$t('achievementPetSetComplete')}`,
+    modalId: 'generic-achievement',
+    data: {
+      achievement: 'petSetCompleteAchievs',
+    },
+  },
 };
 
 export default {
@@ -313,6 +321,7 @@ export default {
       'ACHIEVEMENT_ANIMAL_SET',
       'ACHIEVEMENT_PET_COLOR',
       'ACHIEVEMENT_MOUNT_COLOR',
+      'ACHIEVEMENT_PET_SET_COMPLETE',
     ].forEach(type => {
       handledNotifications[type] = true;
     });
@@ -772,6 +781,15 @@ export default {
             Vue.set(this.user.achievements, achievement, true);
             break;
           }
+          case 'ACHIEVEMENT_PET_SET_COMPLETE': {
+            const { achievement } = notification.data;
+            const upperCaseAchievement = achievement.charAt(0).toUpperCase() + achievement.slice(1);
+            const achievementTitleKey = `achievement${upperCaseAchievement}`;
+            NOTIFICATIONS.ACHIEVEMENT_PET_SET_COMPLETE.label = $t => `${$t('achievement')}: ${$t(achievementTitleKey)}`;
+            this.showNotificationWithModal(notification);
+            Vue.set(this.user.achievements, achievement, true);
+            break;
+          }
           case 'ACHIEVEMENT': { // generic achievement
             const { achievement } = notification.data;
             const upperCaseAchievement = achievement.charAt(0).toUpperCase() + achievement.slice(1);
diff --git a/website/common/locales/en/achievements.json b/website/common/locales/en/achievements.json
index 2c063088e0..b4b577280b 100644
--- a/website/common/locales/en/achievements.json
+++ b/website/common/locales/en/achievements.json
@@ -138,5 +138,8 @@
   "achievementGroupsBeta2022ModalText":"You and your groups helped Habitica by testing and providing feedback!",
   "achievementWoodlandWizard": "Woodland Wizard",
   "achievementWoodlandWizardText": "Has hatched all standard colors of forest creatures: Badger, Bear, Deer, Fox, Frog, Hedgehog, Owl, Snail, Squirrel, and Treeling!",
-  "achievementWoodlandWizardModalText": "You collected all the forest pets!"
+  "achievementWoodlandWizardModalText": "You collected all the forest pets!",
+  "achievementBoneToPick": "Bone to Pick",
+  "achievementBoneToPickText": "Has hatched all the Classic and Quest Skeleton Pets!",
+  "achievementBoneToPickModalText": "You collected all the Classic and Quest Skeleton Pets!"
 }
diff --git a/website/common/script/content/achievements.js b/website/common/script/content/achievements.js
index dd0de4b14b..12849bf637 100644
--- a/website/common/script/content/achievements.js
+++ b/website/common/script/content/achievements.js
@@ -310,6 +310,15 @@ const mountColorAchievs = {
 };
 Object.assign(achievementsData, mountColorAchievs);
 
+const petSetCompleteAchievs = {
+  boneToPick: {
+    icon: 'achievement-boneToPick',
+    titleKey: 'achievementBoneToPick',
+    textKey: 'achievementBoneToPickText',
+  },
+};
+Object.assign(achievementsData, petSetCompleteAchievs);
+
 const onboardingAchievs = {
   createdTask: {
     icon: 'achievement-createdTask',
diff --git a/website/common/script/content/constants/index.js b/website/common/script/content/constants/index.js
index b9200cac6b..64c86f22a3 100644
--- a/website/common/script/content/constants/index.js
+++ b/website/common/script/content/constants/index.js
@@ -32,6 +32,7 @@ export { default as SEASONAL_SETS } from './seasonalSets';
 export { default as ANIMAL_COLOR_ACHIEVEMENTS } from './animalColorAchievements';
 export { default as ANIMAL_SET_ACHIEVEMENTS } from './animalSetAchievements';
 export { default as QUEST_SERIES_ACHIEVEMENTS } from './questSeriesAchievements';
+export { default as PET_SET_COMPLETE_ACHIEVEMENTS } from './petCompleteSetAchievements'; // eslint-disable-line import/no-cycle
 export { default as STABLE_ACHIEVEMENTS } from './stableAchievements';
 export { default as ITEM_LIST } from './itemList';
 export { default as QUEST_SERIES } from '../quests/series';
diff --git a/website/common/script/content/constants/petCompleteSetAchievements.js b/website/common/script/content/constants/petCompleteSetAchievements.js
new file mode 100644
index 0000000000..773908c879
--- /dev/null
+++ b/website/common/script/content/constants/petCompleteSetAchievements.js
@@ -0,0 +1,11 @@
+// this achievement covers all pets of a specific type--classic & quest
+
+const PET_SET_COMPLETE_ACHIEVEMENTS = [
+  {
+    color: 'Skeleton',
+    petAchievement: 'boneToPick',
+    petNotificationType: 'ACHIEVEMENT_PET_SET_COMPLETE',
+  },
+];
+
+export default PET_SET_COMPLETE_ACHIEVEMENTS;
diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js
index 474a9f64db..e4be48f1d7 100644
--- a/website/common/script/content/index.js
+++ b/website/common/script/content/index.js
@@ -13,6 +13,7 @@ import {
   ANIMAL_COLOR_ACHIEVEMENTS,
   ANIMAL_SET_ACHIEVEMENTS,
   STABLE_ACHIEVEMENTS,
+  PET_SET_COMPLETE_ACHIEVEMENTS,
 } from './constants';
 
 import achievements from './achievements';
@@ -43,6 +44,7 @@ api.questSeriesAchievements = QUEST_SERIES_ACHIEVEMENTS;
 api.animalColorAchievements = ANIMAL_COLOR_ACHIEVEMENTS;
 api.animalSetAchievements = ANIMAL_SET_ACHIEVEMENTS;
 api.stableAchievements = STABLE_ACHIEVEMENTS;
+api.petSetCompleteAchievs = PET_SET_COMPLETE_ACHIEVEMENTS;
 
 api.quests = quests;
 api.questsByLevel = questsByLevel;
diff --git a/website/common/script/libs/achievements.js b/website/common/script/libs/achievements.js
index cbde3305ae..52af6e2ce7 100644
--- a/website/common/script/libs/achievements.js
+++ b/website/common/script/libs/achievements.js
@@ -219,6 +219,7 @@ function _getBasicAchievements (user, language) {
   _addSimple(result, user, { path: 'birdsOfAFeather', language });
   _addSimple(result, user, { path: 'reptacularRumble', language });
   _addSimple(result, user, { path: 'woodlandWizard', language });
+  _addSimple(result, user, { path: 'boneToPick', language });
 
   _addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
   _addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });
diff --git a/website/common/script/ops/hatch.js b/website/common/script/ops/hatch.js
index 0fec8d3833..ae425ab8cc 100644
--- a/website/common/script/ops/hatch.js
+++ b/website/common/script/ops/hatch.js
@@ -113,6 +113,34 @@ export default function hatch (user, req = {}, analytics) {
     });
   }
 
+  if (content.dropEggs[egg] || content.questEggs[egg]) {
+    forEach(content.petSetCompleteAchievs, achievement => {
+      if (hatchingPotion !== achievement.color) return;
+      if (!user.achievements[achievement.petAchievement]) {
+        const dropPetIndex = findIndex(
+          keys(content.dropEggs),
+          animal => !user.items.pets[`${animal}-${achievement.color}`] || user.items.pets[`${animal}-${achievement.color}`] <= 0,
+        );
+        const questPetIndex = findIndex(
+          keys(content.questEggs),
+          animal => !user.items.pets[`${animal}-${achievement.color}`] || user.items.pets[`${animal}-${achievement.color}`] <= 0,
+        );
+        if (dropPetIndex === -1 && questPetIndex === -1) {
+          user.achievements[achievement.petAchievement] = true;
+          if (user.addNotification) {
+            const achievementString = `achievement${upperFirst(achievement.petAchievement)}`;
+            user.addNotification(achievement.petNotificationType, {
+              label: `${'achievement'}: ${achievementString}`,
+              achievement: achievement.petAchievement,
+              message: `${i18n.t('modalAchievement')} ${i18n.t(achievementString)}`,
+              modalText: i18n.t(`${achievementString}ModalText`),
+            });
+          }
+        }
+      }
+    });
+  }
+
   if (analytics && moment().diff(user.auth.timestamps.created, 'days') < 7) {
     analytics.track('pet hatch', {
       uuid: user._id,
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 3e0b4b84c0..52bc884ef8 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -151,6 +151,7 @@ export default new Schema({
     birdsOfAFeather: Boolean,
     reptacularRumble: Boolean,
     woodlandWizard: Boolean,
+    boneToPick: Boolean,
     // Onboarding Guide
     createdTask: Boolean,
     completedTask: Boolean,
diff --git a/website/server/models/userNotification.js b/website/server/models/userNotification.js
index 325fc672f5..ea9636a1b1 100644
--- a/website/server/models/userNotification.js
+++ b/website/server/models/userNotification.js
@@ -46,6 +46,7 @@ const NOTIFICATION_TYPES = [
   'ACHIEVEMENT_ANIMAL_SET',
   'ACHIEVEMENT_PET_COLOR',
   'ACHIEVEMENT_MOUNT_COLOR',
+  'ACHIEVEMENT_PET_SET_COMPLETE',
   // Deprecated notification types. Can be removed once old data is cleaned out
   'BOSS_DAMAGE', // deprecated
   'ACHIEVEMENT_ALL_YOUR_BASE', // deprecated

From a2d5211b00a0058ad5cc7596696c5a9ef3e63ca9 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 31 Oct 2022 14:28:24 -0500
Subject: [PATCH 124/134] 4.248.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 10d170e669..785a9002e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.247.0",
+  "version": "4.248.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 16670119f2..f322f030f1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.247.0",
+  "version": "4.248.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",

From aea0be3245e50c583e8e96993f9cef3786b55912 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 1 Nov 2022 20:47:21 -0500
Subject: [PATCH 125/134] fix(subs): establish lock to prevent race condition

---
 .github/workflows/test.yml                    |   3 +
 docker-compose.dev.yml                        |   3 -
 package-lock.json                             | 926 +++++++++++-------
 package.json                                  |  28 +-
 test/api/unit/libs/payments/apple.test.js     |   1 +
 .../v3/integration/groups/PUT-groups.test.js  |  36 +
 website/client/package-lock.json              | 485 ++++++---
 website/client/package.json                   |  12 +-
 .../components/challenges/challengeModal.vue  |  60 +-
 .../src/components/challenges/sidebar.vue     |  60 +-
 .../src/components/groups/groupFormModal.vue  |  60 +-
 .../src/components/groups/groupSidebar.vue    |  60 +-
 .../client/src/components/shops/shopItem.vue  |  18 +
 .../common/script/content/categoryOptions.js  |  60 ++
 website/common/script/libs/getItemInfo.js     |   1 +
 website/server/controllers/api-v3/groups.js   |  12 +-
 website/server/libs/payments/subscriptions.js |  39 +-
 website/server/models/user/schema.js          |   2 +
 18 files changed, 1146 insertions(+), 720 deletions(-)
 create mode 100644 website/common/script/content/categoryOptions.js

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index daf46a0930..a91df5e54a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,6 +2,9 @@ name: Test
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 6a20e74b68..79f806a5e6 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   client:
     build:
@@ -9,7 +8,6 @@ services:
       - server
     environment:
       - BASE_URL=http://server:3000
-    image: habitica
     networks:
       - habitica
     ports:
@@ -27,7 +25,6 @@ services:
       - mongo
     environment:
       - NODE_DB_URI=mongodb://mongo/habitrpg
-    image: habitica
     networks:
       - habitica
     ports:
diff --git a/package-lock.json b/package-lock.json
index 785a9002e4..167c230096 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,20 +27,20 @@
       "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="
     },
     "@babel/core": {
-      "version": "7.18.13",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.13.tgz",
-      "integrity": "sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==",
+      "version": "7.19.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz",
+      "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==",
       "requires": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.18.13",
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-module-transforms": "^7.18.9",
-        "@babel/helpers": "^7.18.9",
-        "@babel/parser": "^7.18.13",
+        "@babel/generator": "^7.19.3",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helpers": "^7.19.0",
+        "@babel/parser": "^7.19.3",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.18.13",
-        "@babel/types": "^7.18.13",
+        "@babel/traverse": "^7.19.3",
+        "@babel/types": "^7.19.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -56,20 +56,60 @@
             "@babel/highlight": "^7.18.6"
           }
         },
+        "@babel/compat-data": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.3.tgz",
+          "integrity": "sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw=="
+        },
         "@babel/generator": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz",
-          "integrity": "sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==",
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz",
+          "integrity": "sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==",
           "requires": {
-            "@babel/types": "^7.18.13",
+            "@babel/types": "^7.19.3",
             "@jridgewell/gen-mapping": "^0.3.2",
             "jsesc": "^2.5.1"
           }
         },
+        "@babel/helper-compilation-targets": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz",
+          "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==",
+          "requires": {
+            "@babel/compat-data": "^7.19.3",
+            "@babel/helper-validator-option": "^7.18.6",
+            "browserslist": "^4.21.3",
+            "semver": "^6.3.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+          "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-module-imports": "^7.18.6",
+            "@babel/helper-simple-access": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/template": "^7.18.10",
+            "@babel/traverse": "^7.19.0",
+            "@babel/types": "^7.19.0"
+          }
+        },
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/highlight": {
           "version": "7.18.6",
@@ -82,9 +122,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz",
-          "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz",
+          "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="
         },
         "@babel/template": {
           "version": "7.18.10",
@@ -97,29 +137,29 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz",
-          "integrity": "sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==",
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz",
+          "integrity": "sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==",
           "requires": {
             "@babel/code-frame": "^7.18.6",
-            "@babel/generator": "^7.18.13",
+            "@babel/generator": "^7.19.3",
             "@babel/helper-environment-visitor": "^7.18.9",
-            "@babel/helper-function-name": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
             "@babel/helper-hoist-variables": "^7.18.6",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/parser": "^7.18.13",
-            "@babel/types": "^7.18.13",
+            "@babel/parser": "^7.19.3",
+            "@babel/types": "^7.19.3",
             "debug": "^4.1.0",
             "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz",
-          "integrity": "sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==",
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz",
+          "integrity": "sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
-            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
         },
@@ -133,6 +173,22 @@
             "@jridgewell/trace-mapping": "^0.3.9"
           }
         },
+        "browserslist": {
+          "version": "4.21.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+          "requires": {
+            "caniuse-lite": "^1.0.30001400",
+            "electron-to-chromium": "^1.4.251",
+            "node-releases": "^2.0.6",
+            "update-browserslist-db": "^1.0.9"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001418",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz",
+          "integrity": "sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg=="
+        },
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -147,6 +203,15 @@
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "update-browserslist-db": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+          "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+          "requires": {
+            "escalade": "^3.1.1",
+            "picocolors": "^1.0.0"
+          }
         }
       }
     },
@@ -796,29 +861,118 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
-      "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
+      "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
       "requires": {
-        "@babel/template": "^7.18.6",
-        "@babel/traverse": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
+        "@babel/code-frame": {
           "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz",
+          "integrity": "sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==",
+          "requires": {
+            "@babel/types": "^7.19.3",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz",
+          "integrity": "sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz",
+          "integrity": "sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.19.3",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.19.3",
+            "@babel/types": "^7.19.3",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
         },
         "@babel/types": {
-          "version": "7.18.13",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz",
-          "integrity": "sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==",
+          "version": "7.19.3",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz",
+          "integrity": "sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
-            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
+        },
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
         }
       }
     },
@@ -1984,44 +2138,44 @@
       "optional": true
     },
     "@google-cloud/common": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.8.1.tgz",
-      "integrity": "sha512-FOs3NFU6bDt5mXE7IFpwIeqzLwRZNu9lJYl+bHVNkwmxX/w4VyDZAiGjQHhpV1Ek+muNKlX8HPchxaIxNTuOhw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-4.0.3.tgz",
+      "integrity": "sha512-fUoMo5b8iAKbrYpneIRV3z95AlxVJPrjpevxs4SKoclngWZvTXBSGpNisF5+x5m+oNGve7jfB1e6vNBZBUs7Fw==",
       "requires": {
-        "@google-cloud/projectify": "^2.0.0",
-        "@google-cloud/promisify": "^2.0.0",
+        "@google-cloud/projectify": "^3.0.0",
+        "@google-cloud/promisify": "^3.0.0",
         "arrify": "^2.0.1",
         "duplexify": "^4.1.1",
         "ent": "^2.2.0",
         "extend": "^3.0.2",
-        "google-auth-library": "^7.9.2",
-        "retry-request": "^4.2.2",
-        "teeny-request": "^7.0.0"
+        "google-auth-library": "^8.0.2",
+        "retry-request": "^5.0.0",
+        "teeny-request": "^8.0.0"
       }
     },
     "@google-cloud/projectify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz",
-      "integrity": "sha512-+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz",
+      "integrity": "sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA=="
     },
     "@google-cloud/promisify": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz",
-      "integrity": "sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz",
+      "integrity": "sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA=="
     },
     "@google-cloud/trace-agent": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-5.1.6.tgz",
-      "integrity": "sha512-TLZwbR9WYx/wNhJv6PcbKEuHZpArUG1WtaPLwjxRJeTVNDV2gOsDVDihbezCyyOcHxU3kXCewB5y2BA1pP0mIg==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-7.1.2.tgz",
+      "integrity": "sha512-LcPKMM80bBvaUG3Nb1R4FPYlGZQX/tDMmwN9bx3ML954W61Pj8D3bjwIleSWO36lIdo0tl+Cz6UHJEOKLSNcvw==",
       "requires": {
-        "@google-cloud/common": "^3.0.0",
+        "@google-cloud/common": "^4.0.0",
         "@opencensus/propagation-stackdriver": "0.1.0",
         "builtin-modules": "^3.0.0",
         "console-log-level": "^1.4.0",
         "continuation-local-storage": "^3.2.1",
         "extend": "^3.0.2",
-        "gcp-metadata": "^4.0.0",
-        "google-auth-library": "^7.0.0",
+        "gcp-metadata": "^5.0.0",
+        "google-auth-library": "^8.0.2",
         "hex2dec": "^1.0.1",
         "is": "^3.2.0",
         "methods": "^1.1.1",
@@ -2029,16 +2183,21 @@
         "semver": "^7.0.0",
         "shimmer": "^1.2.0",
         "source-map-support": "^0.5.16",
-        "uuid": "^8.0.0"
+        "uuid": "^9.0.0"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "uuid": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
         }
       }
     },
@@ -2097,21 +2256,66 @@
       }
     },
     "@mapbox/node-pre-gyp": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.3.tgz",
-      "integrity": "sha512-9dTIfQW8HVCxLku5QrJ/ysS/b2MdYngs9+/oPrOTLvp3TrggdANYVW2h8FGJGDf0J7MYfp44W+c90cVJx+ASuA==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
+      "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==",
       "requires": {
-        "detect-libc": "^1.0.3",
+        "detect-libc": "^2.0.0",
         "https-proxy-agent": "^5.0.0",
         "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.7",
         "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
+        "npmlog": "^5.0.1",
         "rimraf": "^3.0.2",
-        "semver": "^7.3.4",
-        "tar": "^6.1.0"
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "are-we-there-yet": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+          "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^3.6.0"
+          }
+        },
+        "detect-libc": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+          "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "gauge": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+          "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+          "requires": {
+            "aproba": "^1.0.3 || ^2.0.0",
+            "color-support": "^1.1.2",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.1",
+            "object-assign": "^4.1.1",
+            "signal-exit": "^3.0.0",
+            "string-width": "^4.2.3",
+            "strip-ansi": "^6.0.1",
+            "wide-align": "^1.1.2"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
         "make-dir": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -2135,13 +2339,42 @@
             "abbrev": "1"
           }
         },
+        "npmlog": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+          "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+          "requires": {
+            "are-we-there-yet": "^2.0.0",
+            "console-control-strings": "^1.1.0",
+            "gauge": "^3.0.0",
+            "set-blocking": "^2.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
         }
       }
     },
@@ -2181,9 +2414,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -2276,9 +2509,9 @@
       }
     },
     "@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
       "dev": true
     },
     "@slack/types": {
@@ -2384,9 +2617,9 @@
       "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "@types/express": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-      "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
+      "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
       "requires": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.18",
@@ -2395,9 +2628,9 @@
       }
     },
     "@types/express-serve-static-core": {
-      "version": "4.17.28",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
-      "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
+      "version": "4.17.31",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
+      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
       "requires": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -2429,9 +2662,9 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
     },
     "@types/jsonwebtoken": {
-      "version": "8.5.8",
-      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz",
-      "integrity": "sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==",
+      "version": "8.5.9",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz",
+      "integrity": "sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==",
       "requires": {
         "@types/node": "*"
       }
@@ -2445,9 +2678,9 @@
       }
     },
     "@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
     },
     "@types/minimatch": {
       "version": "3.0.3",
@@ -2493,11 +2726,11 @@
       }
     },
     "@types/serve-static": {
-      "version": "1.13.10",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-      "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
       "requires": {
-        "@types/mime": "^1",
+        "@types/mime": "*",
         "@types/node": "*"
       }
     },
@@ -2665,14 +2898,6 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
-    "abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "requires": {
-        "event-target-shim": "^5.0.0"
-      }
-    },
     "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -3107,6 +3332,7 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "dev": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -3116,6 +3342,7 @@
           "version": "2.3.7",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
           "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -3130,6 +3357,7 @@
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -3189,7 +3417,7 @@
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "array-includes": {
       "version": "3.1.1",
@@ -3313,9 +3541,9 @@
       "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
     },
     "async": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
     },
     "async-done": {
       "version": "1.3.2",
@@ -3709,12 +3937,12 @@
       }
     },
     "bcrypt": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
-      "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.0.tgz",
+      "integrity": "sha512-RHBS7HI5N5tEnGTmtR/pppX0mmDSBpQ4aCBsj7CEQfYXDcO74A8sIBYcJMuCsis2E81zDxeENYhv66oZwLiA+Q==",
       "requires": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "node-addon-api": "^3.1.0"
+        "@mapbox/node-pre-gyp": "^1.0.10",
+        "node-addon-api": "^5.0.0"
       }
     },
     "bcrypt-pbkdf": {
@@ -3731,9 +3959,9 @@
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
     "bignumber.js": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
-      "integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
+      "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="
     },
     "bin-build": {
       "version": "3.0.0",
@@ -4148,9 +4376,9 @@
       "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
     },
     "body-parser": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "requires": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
@@ -4160,7 +4388,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.10.3",
+        "qs": "6.11.0",
         "raw-body": "2.5.1",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -4174,28 +4402,6 @@
             "ms": "2.0.0"
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
-        "destroy": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-          "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-        },
-        "http-errors": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-          "requires": {
-            "depd": "2.0.0",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.2.0",
-            "statuses": "2.0.1",
-            "toidentifier": "1.0.1"
-          }
-        },
         "iconv-lite": {
           "version": "0.4.24",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -4207,7 +4413,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "on-finished": {
           "version": "2.4.1",
@@ -4218,17 +4424,12 @@
           }
         },
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
           "requires": {
             "side-channel": "^1.0.4"
           }
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
         }
       }
     },
@@ -4402,9 +4603,9 @@
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
     "builtin-modules": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="
     },
     "bytes": {
       "version": "3.1.2",
@@ -4559,49 +4760,10 @@
       }
     },
     "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
+      "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
+      "dev": true
     },
     "chardet": {
       "version": "0.7.0",
@@ -5168,7 +5330,7 @@
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "cookiejar": {
       "version": "2.1.3",
@@ -5767,7 +5929,8 @@
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "dev": true
     },
     "dezalgo": {
       "version": "1.0.3",
@@ -6039,7 +6202,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "end-of-stream": {
       "version": "1.4.4",
@@ -6061,7 +6224,7 @@
     "ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="
     },
     "entities": {
       "version": "2.0.3",
@@ -6335,7 +6498,7 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
@@ -6710,7 +6873,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "event-stream": {
       "version": "3.3.4",
@@ -6726,11 +6889,6 @@
         "through": "~2.3.1"
       }
     },
-    "event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-    },
     "events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -6960,13 +7118,13 @@
       "integrity": "sha512-2RExSo0yJiqP+xiUue13jQa2IHE8kLDzTI7b6kn+vUlBVvlzNSiLDzo4e5Pp5J039usvTUnxZ8sUOhv0Kg15NA=="
     },
     "express": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.1",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.5.0",
@@ -6985,7 +7143,7 @@
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
         "send": "0.18.0",
@@ -6997,6 +7155,25 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "body-parser": {
+          "version": "1.20.1",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+          "requires": {
+            "bytes": "3.1.2",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "on-finished": "2.4.1",
+            "qs": "6.11.0",
+            "raw-body": "2.5.1",
+            "type-is": "~1.6.18",
+            "unpipe": "1.0.0"
+          }
+        },
         "content-disposition": {
           "version": "0.5.4",
           "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -7013,10 +7190,18 @@
             "ms": "2.0.0"
           }
         },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "on-finished": {
           "version": "2.4.1",
@@ -7027,9 +7212,9 @@
           }
         },
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
           "requires": {
             "side-channel": "^1.0.4"
           }
@@ -7263,9 +7448,9 @@
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
     },
     "fast-text-encoding": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz",
-      "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz",
+      "integrity": "sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="
     },
     "fast-xml-parser": {
       "version": "3.19.0",
@@ -7402,7 +7587,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "on-finished": {
           "version": "2.4.1",
@@ -7619,7 +7804,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "from": {
       "version": "0.1.7",
@@ -7752,6 +7937,7 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -7766,12 +7952,14 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7780,6 +7968,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7790,6 +7979,7 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7797,23 +7987,22 @@
       }
     },
     "gaxios": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.3.2.tgz",
-      "integrity": "sha512-T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.0.2.tgz",
+      "integrity": "sha512-TjtV2AJOZoMQqRYoy5eM8cCQogYwazWNYLQ72QB0kwa6vHHruYkGmhhyrlzbmgNHK1dNnuP2WSH81urfzyN2Og==",
       "requires": {
-        "abort-controller": "^3.0.0",
         "extend": "^3.0.2",
         "https-proxy-agent": "^5.0.0",
         "is-stream": "^2.0.0",
-        "node-fetch": "^2.6.1"
+        "node-fetch": "^2.6.7"
       }
     },
     "gcp-metadata": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz",
-      "integrity": "sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.0.1.tgz",
+      "integrity": "sha512-jiRJ+Fk7e8FH68Z6TLaqwea307OktJpDjmYnU7/li6ziwvVvU2RlrCyQo5vkdeP94chm0kcSCOOszvmuaioq3g==",
       "requires": {
-        "gaxios": "^4.0.0",
+        "gaxios": "^5.0.0",
         "json-bigint": "^1.0.0"
       }
     },
@@ -8380,27 +8569,27 @@
       }
     },
     "google-auth-library": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.2.tgz",
-      "integrity": "sha512-M37o9Kxa/TLvOLgF71SXvLeVEP5sbSTmKl1zlIgl72SFy5PtsU3pOdu8G8MIHHpQ3/NZabDI8rQkA9DvQVKkPA==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.5.2.tgz",
+      "integrity": "sha512-FPfOSaI8n2TVXFHTP8/vAVFCXhyALj7w9/Rgefux3oeKZ/nQDNmfNTJ+lIKcoYT1cKkvMllp1Eood7Y5L+TP+A==",
       "requires": {
         "arrify": "^2.0.0",
         "base64-js": "^1.3.0",
         "ecdsa-sig-formatter": "^1.0.11",
         "fast-text-encoding": "^1.0.0",
-        "gaxios": "^4.0.0",
-        "gcp-metadata": "^4.2.0",
-        "gtoken": "^5.0.4",
+        "gaxios": "^5.0.0",
+        "gcp-metadata": "^5.0.0",
+        "gtoken": "^6.1.0",
         "jws": "^4.0.0",
         "lru-cache": "^6.0.0"
       }
     },
     "google-p12-pem": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz",
-      "integrity": "sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz",
+      "integrity": "sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==",
       "requires": {
-        "node-forge": "^0.10.0"
+        "node-forge": "^1.3.1"
       }
     },
     "got": {
@@ -8525,12 +8714,12 @@
       "dev": true
     },
     "gtoken": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.3.1.tgz",
-      "integrity": "sha512-yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz",
+      "integrity": "sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==",
       "requires": {
-        "gaxios": "^4.0.0",
-        "google-p12-pem": "^3.0.3",
+        "gaxios": "^5.0.1",
+        "google-p12-pem": "^4.0.0",
         "jws": "^4.0.0"
       }
     },
@@ -9288,6 +9477,41 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
           "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
         "strip-ansi": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -9295,6 +9519,14 @@
           "requires": {
             "ansi-regex": "^5.0.0"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
@@ -9410,6 +9642,14 @@
         "ci-info": "^2.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -9699,7 +9939,7 @@
         "async": {
           "version": "1.5.2",
           "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
           "dev": true
         },
         "nopt": {
@@ -9733,9 +9973,9 @@
       },
       "dependencies": {
         "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "version": "2.6.4",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+          "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
           "dev": true,
           "requires": {
             "lodash": "^4.17.14"
@@ -9933,9 +10173,9 @@
       }
     },
     "js2xmlparser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
-      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-5.0.0.tgz",
+      "integrity": "sha512-ckXs0Fzd6icWurbeAXuqo+3Mhq2m8pOPygsQjTPh8K5UWgKaUgDSHrdDxAfexmT11xvBKOQ6sgYwPkYc5RW/bg==",
       "requires": {
         "xmlcreate": "^2.0.4"
       }
@@ -10083,14 +10323,14 @@
       }
     },
     "jwks-rsa": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.1.4.tgz",
-      "integrity": "sha512-mpArfgPkUpX11lNtGxsF/szkasUcbWHGplZl/uFvFO2NuMHmt0dQXIihh0rkPU2yQd5niQtuUHbXnG/WKiXF6Q==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-2.1.5.tgz",
+      "integrity": "sha512-IODtn1SwEm7n6GQZnQLY0oxKDrMh7n/jRH1MzE8mlxWMrh2NnMyOsXTebu8vJ1qCpmuTJcL4DdiE0E4h8jnwsA==",
       "requires": {
-        "@types/express": "^4.17.13",
-        "@types/jsonwebtoken": "^8.5.8",
+        "@types/express": "^4.17.14",
+        "@types/jsonwebtoken": "^8.5.9",
         "debug": "^4.3.4",
-        "jose": "^2.0.5",
+        "jose": "^2.0.6",
         "limiter": "^1.1.5",
         "lru-memoizer": "^2.1.4"
       },
@@ -10339,7 +10579,7 @@
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
       "dev": true
     },
     "lodash.includes": {
@@ -10405,9 +10645,9 @@
       }
     },
     "logform": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.1.tgz",
-      "integrity": "sha512-7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz",
+      "integrity": "sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw==",
       "requires": {
         "@colors/colors": "1.5.0",
         "fecha": "^4.2.0",
@@ -10746,7 +10986,7 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "merge-stream": {
       "version": "2.0.0",
@@ -10933,9 +11173,9 @@
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
+      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -11065,7 +11305,7 @@
     "module-details-from-path": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz",
-      "integrity": "sha1-EUyUlnPiqKNenTV4hSeqN7Z52is="
+      "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A=="
     },
     "moment": {
       "version": "2.29.4",
@@ -11621,7 +11861,7 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
           "dev": true
         },
         "path-to-regexp": {
@@ -11645,9 +11885,9 @@
       }
     },
     "node-addon-api": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz",
-      "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz",
+      "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA=="
     },
     "node-bitmap": {
       "version": "0.0.1",
@@ -11663,9 +11903,9 @@
       }
     },
     "node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
     },
     "node-gcm": {
       "version": "1.0.5",
@@ -11803,6 +12043,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -12271,12 +12512,13 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "passport": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.5.0.tgz",
-      "integrity": "sha512-ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
+      "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
       "requires": {
         "passport-strategy": "1.x.x",
-        "pause": "0.0.1"
+        "pause": "0.0.1",
+        "utils-merge": "^1.0.1"
       }
     },
     "passport-facebook": {
@@ -12361,7 +12603,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "path-type": {
       "version": "2.0.0",
@@ -12387,7 +12629,7 @@
     "pause": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
-      "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10="
+      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
     },
     "pause-stream": {
       "version": "0.0.11",
@@ -12785,9 +13027,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "rate-limiter-flexible": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.10.tgz",
-      "integrity": "sha512-bXqRBBb85WmnJemw9+xLdA7ezLXwZ+hXcOD8ZzfGMhbus4jHRrjTMXZ1kJqpKnpGu34scZc6f0qYNSxBwO7yrg=="
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.11.tgz",
+      "integrity": "sha512-MFLtfs1llUNBkJxeTkSZD7oAxVg1nZ79bevE2TmqQMbmKGoi8DBua3VAZFz5bsjEr0A6Mbr9AJuf5lvYSCok2Q=="
     },
     "raw-body": {
       "version": "2.5.1",
@@ -13226,13 +13468,25 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-in-the-middle": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.1.0.tgz",
-      "integrity": "sha512-M2rLKVupQfJ5lf9OvqFGIT+9iVLnTmjgbOmpil12hiSQNn5zJTKGPoIisETNjfK+09vP3rpm1zJajmErpr2sEQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz",
+      "integrity": "sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==",
       "requires": {
         "debug": "^4.1.1",
         "module-details-from-path": "^1.0.3",
-        "resolve": "^1.12.0"
+        "resolve": "^1.22.1"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.22.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+          "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+          "requires": {
+            "is-core-module": "^2.9.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
       }
     },
     "require-main-filename": {
@@ -13336,9 +13590,9 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
     "retry-request": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz",
-      "integrity": "sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz",
+      "integrity": "sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==",
       "requires": {
         "debug": "^4.1.1",
         "extend": "^3.0.2"
@@ -13597,7 +13851,7 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
             }
           }
         },
@@ -13791,9 +14045,9 @@
       }
     },
     "sinon": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-13.0.2.tgz",
-      "integrity": "sha512-KvOrztAVqzSJWMDoxM4vM+GPys1df2VBoXm+YciyB/OLMamfS3VXh3oGh5WtrAGSzrgczNWFFY22oKb7Fi5eeA==",
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.1.tgz",
+      "integrity": "sha512-JhJ0jCiyBWVAHDS+YSjgEbDn7Wgz9iIjA1/RK+eseJN0vAAWIWiXBdrnb92ELPyjsfreCYntD1ORtLSfIrlvSQ==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.8.3",
@@ -13805,9 +14059,9 @@
       },
       "dependencies": {
         "diff": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+          "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
           "dev": true
         },
         "has-flag": {
@@ -14450,18 +14704,18 @@
       }
     },
     "stripe": {
-      "version": "8.222.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.222.0.tgz",
-      "integrity": "sha512-hrA79fjmN2Eb6K3kxkDzU4ODeVGGjXQsuVaAPSUro6I9MM3X+BvIsVqdphm3BXWfimAGFvUqWtPtHy25mICY1w==",
+      "version": "10.13.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-10.13.0.tgz",
+      "integrity": "sha512-Uq+hToFOXHU+BHgzUmop2Monc0dM8pluXcoCOrgz9oY8XBDnSPOuXAJdKa04x5DCEgKWrFMHncQfAgwqzSgaTQ==",
       "requires": {
         "@types/node": ">=8.1.0",
-        "qs": "^6.10.3"
+        "qs": "^6.11.0"
       },
       "dependencies": {
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
           "requires": {
             "side-channel": "^1.0.4"
           }
@@ -14471,7 +14725,7 @@
     "stubs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-      "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
+      "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="
     },
     "style-loader": {
       "version": "3.3.1",
@@ -14479,9 +14733,9 @@
       "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ=="
     },
     "superagent": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.6.tgz",
-      "integrity": "sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.2.tgz",
+      "integrity": "sha512-QtYZ9uaNAMexI7XWl2vAXAh0j4q9H7T0WVEI/y5qaUB3QLwxo+voUgCQ217AokJzUTIVOp0RTo7fhZrwhD7A2Q==",
       "requires": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.3",
@@ -14491,8 +14745,7 @@
         "formidable": "^2.0.1",
         "methods": "^1.1.2",
         "mime": "2.6.0",
-        "qs": "^6.10.3",
-        "readable-stream": "^3.6.0",
+        "qs": "^6.11.0",
         "semver": "^7.3.7"
       },
       "dependencies": {
@@ -14505,17 +14758,17 @@
           }
         },
         "qs": {
-          "version": "6.10.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
           "requires": {
             "side-channel": "^1.0.4"
           }
         },
         "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -14530,6 +14783,11 @@
         "has-flag": "^3.0.0"
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
     "sver-compat": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
@@ -14712,15 +14970,22 @@
       }
     },
     "teeny-request": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.3.tgz",
-      "integrity": "sha512-Ew3aoFzgQEatLA5OBIjdr1DWJUaC1xardG+qbPPo5k/y/3fMwXLxpjh5UB5dVfElktLaQbbMs80chkz53ByvSg==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.2.tgz",
+      "integrity": "sha512-34pe0a4zASseXZCKdeTiIZqSKA8ETHb1EwItZr01PAR3CLPojeAKgSjzeNS4373gi59hNulyDrPKEbh2zO9sCg==",
       "requires": {
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "node-fetch": "^2.6.1",
         "stream-events": "^1.0.5",
-        "uuid": "^8.0.0"
+        "uuid": "^9.0.0"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
+        }
       }
     },
     "temp-dir": {
@@ -16118,10 +16383,11 @@
       "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
     },
     "winston": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.1.tgz",
-      "integrity": "sha512-r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
+      "integrity": "sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==",
       "requires": {
+        "@colors/colors": "1.5.0",
         "@dabh/diagnostics": "^2.0.2",
         "async": "^3.2.3",
         "is-stream": "^2.0.0",
diff --git a/package.json b/package.json
index f322f030f1..4a652831f4 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,10 @@
   "version": "4.248.0",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@babel/core": "^7.18.13",
+    "@babel/core": "^7.19.3",
     "@babel/preset-env": "^7.19.1",
     "@babel/register": "^7.18.9",
-    "@google-cloud/trace-agent": "^5.1.6",
+    "@google-cloud/trace-agent": "^7.1.2",
     "@parse/node-apn": "^5.1.3",
     "@slack/webhook": "^6.1.0",
     "accepts": "^1.3.8",
@@ -15,8 +15,8 @@
     "amplitude": "^6.0.0",
     "apidoc": "^0.53.0",
     "apple-auth": "^1.0.7",
-    "bcrypt": "^5.0.1",
-    "body-parser": "^1.20.0",
+    "bcrypt": "^5.1.0",
+    "body-parser": "^1.20.1",
     "bootstrap": "^4.6.0",
     "compression": "^1.7.4",
     "cookie-session": "^2.0.0",
@@ -27,7 +27,7 @@
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",
     "eslint-plugin-mocha": "^5.0.0",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "express-basic-auth": "^1.2.1",
     "express-validator": "^5.2.0",
     "glob": "^8.0.3",
@@ -41,9 +41,9 @@
     "helmet": "^4.6.0",
     "image-size": "^1.0.2",
     "in-app-purchase": "^1.11.3",
-    "js2xmlparser": "^4.0.2",
+    "js2xmlparser": "^5.0.0",
     "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^2.1.4",
+    "jwks-rsa": "^2.1.5",
     "lodash": "^4.17.21",
     "merge-stream": "^2.0.0",
     "method-override": "^3.0.0",
@@ -54,27 +54,27 @@
     "nconf": "^0.12.0",
     "node-gcm": "^1.0.5",
     "on-headers": "^1.0.2",
-    "passport": "^0.5.0",
+    "passport": "^0.6.0",
     "passport-facebook": "^3.0.0",
     "passport-google-oauth2": "^0.2.0",
     "passport-google-oauth20": "2.0.0",
     "paypal-rest-sdk": "^1.8.1",
     "pp-ipn": "^1.1.0",
     "ps-tree": "^1.0.0",
-    "rate-limiter-flexible": "^2.3.10",
+    "rate-limiter-flexible": "^2.3.11",
     "redis": "^3.1.2",
     "regenerator-runtime": "^0.13.9",
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.0",
-    "stripe": "^8.222.0",
-    "superagent": "^7.1.6",
+    "stripe": "^10.13.0",
+    "superagent": "^8.0.2",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",
     "uuid": "^8.3.2",
     "validator": "^13.7.0",
     "vinyl-buffer": "^1.0.1",
-    "winston": "^3.8.1",
+    "winston": "^3.8.2",
     "winston-loggly-bulk": "^3.2.1",
     "xml2js": "^0.4.23"
   },
@@ -114,7 +114,7 @@
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "chai-moment": "^0.1.0",
-    "chalk": "^4.1.2",
+    "chalk": "^5.1.0",
     "cross-spawn": "^7.0.3",
     "expect.js": "^0.3.1",
     "istanbul": "^1.1.0-alpha.1",
@@ -122,7 +122,7 @@
     "monk": "^7.3.4",
     "require-again": "^2.0.0",
     "run-rs": "^0.7.7",
-    "sinon": "^13.0.2",
+    "sinon": "^14.0.1",
     "sinon-chai": "^3.7.0",
     "sinon-stub-promise": "^4.0.0"
   },
diff --git a/test/api/unit/libs/payments/apple.test.js b/test/api/unit/libs/payments/apple.test.js
index 08cb34607e..1aefe2cb51 100644
--- a/test/api/unit/libs/payments/apple.test.js
+++ b/test/api/unit/libs/payments/apple.test.js
@@ -326,6 +326,7 @@ describe('Apple Payments', () => {
     it('errors when a user is already subscribed', async () => {
       payments.createSubscription.restore();
       user = new User();
+      await user.save();
 
       await applePayments.subscribe(sku, user, receipt, headers, nextPaymentProcessing);
 
diff --git a/test/api/v3/integration/groups/PUT-groups.test.js b/test/api/v3/integration/groups/PUT-groups.test.js
index 36bdfdd7d4..77d4ad6487 100644
--- a/test/api/v3/integration/groups/PUT-groups.test.js
+++ b/test/api/v3/integration/groups/PUT-groups.test.js
@@ -11,6 +11,12 @@ describe('PUT /group', () => {
   const groupName = 'Test Public Guild';
   const groupType = 'guild';
   const groupUpdatedName = 'Test Public Guild Updated';
+  const groupCategories = [
+    {
+      slug: 'initialCat',
+      name: 'Initial Category',
+    },
+  ];
 
   beforeEach(async () => {
     const { group, groupLeader, members } = await createAndPopulateGroup({
@@ -18,6 +24,7 @@ describe('PUT /group', () => {
         name: groupName,
         type: groupType,
         privacy: 'public',
+        categories: groupCategories,
       },
       members: 1,
     });
@@ -61,6 +68,35 @@ describe('PUT /group', () => {
     expect(updatedGroup.categories[0].name).to.eql(categories[0].name);
   });
 
+  it('removes the initial group category', async () => {
+    const categories = [];
+
+    const updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, {
+      categories,
+    });
+
+    expect(updatedGroup.categories.length).to.equal(0);
+  });
+
+  it('removes duplicate group categories', async () => {
+    const categories = [
+      {
+        slug: 'newCat',
+        name: 'New Category',
+      },
+      {
+        slug: 'newCat',
+        name: 'New Category',
+      },
+    ];
+
+    const updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, {
+      categories,
+    });
+
+    expect(updatedGroup.categories.length).to.equal(1);
+  });
+
   it('allows an admin to update a guild', async () => {
     const updatedGroup = await adminUser.put(`/groups/${groupToUpdate._id}`, {
       name: groupUpdatedName,
diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 949372df0d..84268c960f 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -22,9 +22,9 @@
       }
     },
     "@amplitude/analytics-connector": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.4.tgz",
-      "integrity": "sha512-6JcE1nxrprJt6pHqqDQb7FXRqJmFHG7KJPe0jNZaAvfll4mWKVqZu8W9IV3XiN1P+xgHIV1NN+i3PLOAZWEhXg==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.4.5.tgz",
+      "integrity": "sha512-ELAP6ivg+13uSk+TOirGZE/92M+tTbeiQ/i7eXgDO4Hiy00Abf/UxO/rp9WovtxCyeFYTILrujEYxPv5cRQmFw==",
       "requires": {
         "@amplitude/ua-parser-js": "0.7.31"
       }
@@ -4356,9 +4356,9 @@
       "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
     },
     "@hapi/hoek": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.3.1.tgz",
-      "integrity": "sha512-75ocgnI7HG/I01iGA3/rs0y6PXydUA/kxhFZM0HoT8NLSTnt/J8Gq03iKl4a4B/2A3iMG0ctXtxr5Hg9SGr1gw=="
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="
     },
     "@hapi/joi": {
       "version": "15.1.1",
@@ -4818,6 +4818,31 @@
         "warning": "^3.0.0"
       }
     },
+    "@sideway/address": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
+      "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
+      "requires": {
+        "@hapi/hoek": "^9.0.0"
+      },
+      "dependencies": {
+        "@hapi/hoek": {
+          "version": "9.3.0",
+          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+          "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
+        }
+      }
+    },
+    "@sideway/formula": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
+      "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg=="
+    },
+    "@sideway/pinpoint": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz",
@@ -12364,29 +12389,39 @@
       }
     },
     "@vue/cli-plugin-router": {
-      "version": "4.5.15",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.15.tgz",
-      "integrity": "sha512-q7Y6kP9b3k55Ca2j59xJ7XPA6x+iSRB+N4ac0ZbcL1TbInVQ4j5wCzyE+uqid40hLy4fUdlpl4X9fHJEwuVxPA==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz",
+      "integrity": "sha512-Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg==",
       "requires": {
-        "@vue/cli-shared-utils": "^4.5.15"
+        "@vue/cli-shared-utils": "^5.0.8"
       },
       "dependencies": {
-        "@vue/cli-shared-utils": {
-          "version": "4.5.15",
-          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.15.tgz",
-          "integrity": "sha512-SKaej9hHzzjKSOw1NlFmc6BSE0vcqUQMQiv1cxQ2DhVyy4QxZXBmzmiLBUBe+hYZZs1neXW7n//udeN9bCAY+Q==",
+        "@achrinza/node-ipc": {
+          "version": "9.2.5",
+          "resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz",
+          "integrity": "sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ==",
           "requires": {
-            "@hapi/joi": "^15.0.1",
-            "chalk": "^2.4.2",
+            "@node-ipc/js-queue": "2.0.3",
+            "event-pubsub": "4.3.0",
+            "js-message": "1.0.7"
+          }
+        },
+        "@vue/cli-shared-utils": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz",
+          "integrity": "sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ==",
+          "requires": {
+            "@achrinza/node-ipc": "^9.2.5",
+            "chalk": "^4.1.2",
             "execa": "^1.0.0",
+            "joi": "^17.4.0",
             "launch-editor": "^2.2.1",
-            "lru-cache": "^5.1.1",
-            "node-ipc": "^9.1.1",
-            "open": "^6.3.0",
-            "ora": "^3.4.0",
+            "lru-cache": "^6.0.0",
+            "node-fetch": "^2.6.7",
+            "open": "^8.0.2",
+            "ora": "^5.3.0",
             "read-pkg": "^5.1.1",
-            "request": "^2.88.2",
-            "semver": "^6.1.0",
+            "semver": "^7.3.4",
             "strip-ansi": "^6.0.0"
           }
         },
@@ -12395,10 +12430,152 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
           "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "cli-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+          "requires": {
+            "restore-cursor": "^3.1.0"
+          }
+        },
+        "cli-spinners": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
+          "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "is-docker": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+          "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
+        },
+        "is-wsl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+          "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+          "requires": {
+            "is-docker": "^2.0.0"
+          }
+        },
+        "js-message": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz",
+          "integrity": "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="
+        },
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+          "requires": {
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+        },
+        "node-fetch": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "open": {
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+          "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+          "requires": {
+            "define-lazy-prop": "^2.0.0",
+            "is-docker": "^2.1.1",
+            "is-wsl": "^2.2.0"
+          }
+        },
+        "ora": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+          "requires": {
+            "bl": "^4.1.0",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-spinners": "^2.5.0",
+            "is-interactive": "^1.0.0",
+            "is-unicode-supported": "^0.1.0",
+            "log-symbols": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "wcwidth": "^1.0.1"
+          }
+        },
+        "restore-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         },
         "strip-ansi": {
           "version": "6.0.1",
@@ -12407,6 +12584,38 @@
           "requires": {
             "ansi-regex": "^5.0.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -12612,11 +12821,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -13134,11 +13338,11 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
     },
     "amplitude-js": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.0.tgz",
-      "integrity": "sha512-kC01TmmCdDrtms8LhvC/r65FtbmCbNHZ1/jiezXmTH82TsWI/SkN47jKs8CCwjZNakqTBN/hmficiZBUKv4myw==",
+      "version": "8.21.1",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.1.tgz",
+      "integrity": "sha512-02S0EWLTkCYurpKx6o6K7+BbtVHzhCTHDM+jgvCAV5VbbsXdhLqVY7Q6NtAF+Wb8phb9K0GSW1SuDKPy4TY9OA==",
       "requires": {
-        "@amplitude/analytics-connector": "1.4.4",
+        "@amplitude/analytics-connector": "^1.4.5",
         "@amplitude/ua-parser-js": "0.7.31",
         "@amplitude/utils": "^1.10.1",
         "@babel/runtime": "^7.3.4",
@@ -13221,11 +13425,6 @@
         }
       }
     },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
-    },
     "ansi-html-community": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
@@ -13838,11 +14037,29 @@
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "axios": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
       "requires": {
-        "follow-redirects": "^1.14.7"
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
+      },
+      "dependencies": {
+        "follow-redirects": {
+          "version": "1.15.2",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+          "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+        },
+        "form-data": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
       }
     },
     "axios-progress-bar": {
@@ -14484,6 +14701,37 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
     },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "bluebird": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
@@ -15887,9 +16135,9 @@
       }
     },
     "core-js": {
-      "version": "3.24.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
-      "integrity": "sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="
+      "version": "3.25.5",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz",
+      "integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="
     },
     "core-js-compat": {
       "version": "3.11.0",
@@ -16507,6 +16755,11 @@
         "clone": "^1.0.2"
       }
     },
+    "define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -18462,11 +18715,6 @@
             "brace-expansion": "^1.1.7"
           }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "optional": true
-        },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
@@ -18484,14 +18732,6 @@
             "minipass": "^2.2.1"
           }
         },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
         "ms": {
           "version": "2.1.1",
           "bundled": true,
@@ -18614,13 +18854,6 @@
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "optional": true
-            }
           }
         },
         "readable-stream": {
@@ -20154,9 +20387,9 @@
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
     "intro.js": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-5.1.0.tgz",
-      "integrity": "sha512-zwWl/duTh00eeNcZRU4o4/xxloNYPFKs4n4lMRDNx59jZr+qRI0jSOnzqYMOuVftD4beGrmxBHz4k8qp9/dCMA=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-6.0.0.tgz",
+      "integrity": "sha512-ZUiR6BoLSvPSlLG0boewnWVgji1fE1gBvP/pyw5pgCKXEDQz1mMeUxarggClPNs71UTq364LwSk9zxz17A9gaQ=="
     },
     "invariant": {
       "version": "2.2.4",
@@ -20418,6 +20651,11 @@
       "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz",
       "integrity": "sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA=="
     },
+    "is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
+    },
     "is-map": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
@@ -20557,6 +20795,11 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
+    },
     "is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -20674,6 +20917,33 @@
         }
       }
     },
+    "joi": {
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz",
+      "integrity": "sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==",
+      "requires": {
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/topo": "^5.0.0",
+        "@sideway/address": "^4.1.3",
+        "@sideway/formula": "^3.0.0",
+        "@sideway/pinpoint": "^2.0.0"
+      },
+      "dependencies": {
+        "@hapi/hoek": {
+          "version": "9.3.0",
+          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+          "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
+        },
+        "@hapi/topo": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+          "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+          "requires": {
+            "@hapi/hoek": "^9.0.0"
+          }
+        }
+      }
+    },
     "jquery": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
@@ -20867,13 +21137,6 @@
       "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "requires": {
         "minimist": "^1.2.5"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        }
       }
     },
     "jsonfile": {
@@ -21536,9 +21799,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
     },
     "minipass": {
       "version": "3.1.1",
@@ -21632,18 +21895,11 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
+        "minimist": "^1.2.6"
       }
     },
     "mocha": {
@@ -21714,11 +21970,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
         "mkdirp": {
           "version": "0.5.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
@@ -23182,19 +23433,6 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
         }
       }
     },
@@ -28662,9 +28900,9 @@
       }
     },
     "vue-router": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.4.tgz",
-      "integrity": "sha512-x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ=="
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
+      "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
     },
     "vue-style-loader": {
       "version": "4.1.3",
@@ -28910,19 +29148,6 @@
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
         "serialize-javascript": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
@@ -29016,11 +29241,11 @@
       }
     },
     "webpack-dev-server": {
-      "version": "3.11.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
-      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
+      "version": "3.11.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
+      "integrity": "sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==",
       "requires": {
-        "ansi-html": "0.0.7",
+        "ansi-html-community": "0.0.8",
         "bonjour": "^3.5.0",
         "chokidar": "^2.1.8",
         "compression": "^1.7.4",
@@ -29058,7 +29283,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
         },
         "http-proxy-middleware": {
           "version": "0.19.1",
@@ -29084,7 +29309,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "requires": {
             "ansi-regex": "^2.0.0"
           }
diff --git a/website/client/package.json b/website/client/package.json
index 640a0b4d41..21cad38b2b 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -21,18 +21,18 @@
     "@storybook/vue": "6.3.13",
     "@vue/cli-plugin-babel": "^4.5.15",
     "@vue/cli-plugin-eslint": "^4.5.19",
-    "@vue/cli-plugin-router": "^4.5.15",
+    "@vue/cli-plugin-router": "^5.0.8",
     "@vue/cli-plugin-unit-mocha": "^4.5.15",
     "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^8.21.0",
-    "axios": "^0.25.0",
+    "amplitude-js": "^8.21.1",
+    "axios": "^0.27.2",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
     "bootstrap": "^4.6.0",
     "bootstrap-vue": "^2.22.0",
     "chai": "^4.3.6",
-    "core-js": "^3.24.1",
+    "core-js": "^3.25.5",
     "dompurify": "^2.4.0",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",
@@ -41,7 +41,7 @@
     "habitica-markdown": "^3.0.0",
     "hellojs": "^1.19.5",
     "inspectpack": "^4.7.1",
-    "intro.js": "^5.1.0",
+    "intro.js": "^6.0.0",
     "jquery": "^3.6.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
@@ -58,7 +58,7 @@
     "vue": "^2.7.10",
     "vue-cli-plugin-storybook": "2.1.0",
     "vue-mugen-scroll": "^0.2.6",
-    "vue-router": "^3.5.4",
+    "vue-router": "^3.6.5",
     "vue-template-compiler": "^2.7.10",
     "vuedraggable": "^2.24.3",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
diff --git a/website/client/src/components/challenges/challengeModal.vue b/website/client/src/components/challenges/challengeModal.vue
index 35de6ff8b8..863cdcb1d8 100644
--- a/website/client/src/components/challenges/challengeModal.vue
+++ b/website/client/src/components/challenges/challengeModal.vue
@@ -280,6 +280,7 @@ import markdownDirective from '@/directives/markdown';
 import { userStateMixin } from '../../mixins/userState';
 
 import { TAVERN_ID, MIN_SHORTNAME_SIZE_FOR_CHALLENGES, MAX_SUMMARY_SIZE_FOR_CHALLENGES } from '@/../../common/script/constants';
+import CategoryOptions from '@/../../common/script/content/categoryOptions';
 
 export default {
   directives: {
@@ -288,64 +289,7 @@ export default {
   mixins: [userStateMixin],
   props: ['groupId'],
   data () {
-    const categoryOptions = [
-      {
-        label: 'habitica_official',
-        key: 'habitica_official',
-      },
-      {
-        label: 'academics',
-        key: 'academics',
-      },
-      {
-        label: 'advocacy_causes',
-        key: 'advocacy_causes',
-      },
-      {
-        label: 'creativity',
-        key: 'creativity',
-      },
-      {
-        label: 'entertainment',
-        key: 'entertainment',
-      },
-      {
-        label: 'finance',
-        key: 'finance',
-      },
-      {
-        label: 'health_fitness',
-        key: 'health_fitness',
-      },
-      {
-        label: 'hobbies_occupations',
-        key: 'hobbies_occupations',
-      },
-      {
-        label: 'location_based',
-        key: 'location_based',
-      },
-      {
-        label: 'mental_health',
-        key: 'mental_health',
-      },
-      {
-        label: 'getting_organized',
-        key: 'getting_organized',
-      },
-      {
-        label: 'self_improvement',
-        key: 'self_improvement',
-      },
-      {
-        label: 'spirituality',
-        key: 'spirituality',
-      },
-      {
-        label: 'time_management',
-        key: 'time_management',
-      },
-    ];
+    const categoryOptions = CategoryOptions;
     const hashedCategories = {};
     categoryOptions.forEach(category => {
       hashedCategories[category.key] = category.label;
diff --git a/website/client/src/components/challenges/sidebar.vue b/website/client/src/components/challenges/sidebar.vue
index 827d07dcac..540460fbe9 100644
--- a/website/client/src/components/challenges/sidebar.vue
+++ b/website/client/src/components/challenges/sidebar.vue
@@ -89,70 +89,14 @@
 import throttle from 'lodash/throttle';
 import FilterSidebar from '@/components/ui/filterSidebar';
 import FilterGroup from '@/components/ui/filterGroup';
+import CategoryOptions from '@/../../common/script/content/categoryOptions';
 
 export default {
   components: { FilterGroup, FilterSidebar },
   data () {
     return {
       categoryFilters: [],
-      categoryOptions: [
-        {
-          label: 'habitica_official',
-          key: 'habitica_official',
-        },
-        {
-          label: 'academics',
-          key: 'academics',
-        },
-        {
-          label: 'advocacy_causes',
-          key: 'advocacy_causes',
-        },
-        {
-          label: 'creativity',
-          key: 'creativity',
-        },
-        {
-          label: 'entertainment',
-          key: 'entertainment',
-        },
-        {
-          label: 'finance',
-          key: 'finance',
-        },
-        {
-          label: 'health_fitness',
-          key: 'health_fitness',
-        },
-        {
-          label: 'hobbies_occupations',
-          key: 'hobbies_occupations',
-        },
-        {
-          label: 'location_based',
-          key: 'location_based',
-        },
-        {
-          label: 'mental_health',
-          key: 'mental_health',
-        },
-        {
-          label: 'getting_organized',
-          key: 'getting_organized',
-        },
-        {
-          label: 'self_improvement',
-          key: 'self_improvement',
-        },
-        {
-          label: 'spirituality',
-          key: 'spirituality',
-        },
-        {
-          label: 'time_management',
-          key: 'time_management',
-        },
-      ],
+      categoryOptions: CategoryOptions,
       membershipFilters: [],
       membershipOptions: [
         {
diff --git a/website/client/src/components/groups/groupFormModal.vue b/website/client/src/components/groups/groupFormModal.vue
index e2b60561de..550c7ac292 100644
--- a/website/client/src/components/groups/groupFormModal.vue
+++ b/website/client/src/components/groups/groupFormModal.vue
@@ -379,6 +379,7 @@ import informationIcon from '@/assets/svg/information.svg';
 
 import { MAX_SUMMARY_SIZE_FOR_GUILDS } from '@/../../common/script/constants';
 import { userStateMixin } from '../../mixins/userState';
+import CategoryOptions from '@/../../common/script/content/categoryOptions';
 
 // @TODO: Not sure the best way to pass party creating status
 // Since we need the modal in the header, passing props doesn't work
@@ -410,64 +411,7 @@ export default {
         allowGuildInvitationsFromNonMembers: true,
         bannedWordsAllowed: null,
       },
-      categoryOptions: [
-        {
-          label: 'habitica_official',
-          key: 'habitica_official',
-        },
-        {
-          label: 'academics',
-          key: 'academics',
-        },
-        {
-          label: 'advocacy_causes',
-          key: 'advocacy_causes',
-        },
-        {
-          label: 'creativity',
-          key: 'creativity',
-        },
-        {
-          label: 'entertainment',
-          key: 'entertainment',
-        },
-        {
-          label: 'finance',
-          key: 'finance',
-        },
-        {
-          label: 'health_fitness',
-          key: 'health_fitness',
-        },
-        {
-          label: 'hobbies_occupations',
-          key: 'hobbies_occupations',
-        },
-        {
-          label: 'location_based',
-          key: 'location_based',
-        },
-        {
-          label: 'mental_health',
-          key: 'mental_health',
-        },
-        {
-          label: 'getting_organized',
-          key: 'getting_organized',
-        },
-        {
-          label: 'recovery_support_groups',
-          key: 'recovery_support_groups',
-        },
-        {
-          label: 'spirituality',
-          key: 'spirituality',
-        },
-        {
-          label: 'time_management',
-          key: 'time_management',
-        },
-      ],
+      categoryOptions: CategoryOptions,
       showCategorySelect: false,
       members: [],
       inviteMembers: false,
diff --git a/website/client/src/components/groups/groupSidebar.vue b/website/client/src/components/groups/groupSidebar.vue
index 6b43a42249..5bd3cd5f4d 100644
--- a/website/client/src/components/groups/groupSidebar.vue
+++ b/website/client/src/components/groups/groupSidebar.vue
@@ -86,6 +86,7 @@
 import throttle from 'lodash/throttle';
 import FilterSidebar from '@/components/ui/filterSidebar';
 import FilterGroup from '@/components/ui/filterGroup';
+import CategoryOptions from '@/../../common/script/content/categoryOptions';
 
 // TODO use checkbox-component to add/remove entries to *Filters, but without the v-model binding
 
@@ -94,64 +95,7 @@ export default {
   data () {
     return {
       categoryFilters: [],
-      categoryOptions: [
-        {
-          label: 'habitica_official',
-          key: 'habitica_official',
-        },
-        {
-          label: 'academics',
-          key: 'academics',
-        },
-        {
-          label: 'advocacy_causes',
-          key: 'advocacy_causes',
-        },
-        {
-          label: 'creativity',
-          key: 'creativity',
-        },
-        {
-          label: 'entertainment',
-          key: 'entertainment',
-        },
-        {
-          label: 'finance',
-          key: 'finance',
-        },
-        {
-          label: 'health_fitness',
-          key: 'health_fitness',
-        },
-        {
-          label: 'hobbies_occupations',
-          key: 'hobbies_occupations',
-        },
-        {
-          label: 'location_based',
-          key: 'location_based',
-        },
-        {
-          label: 'mental_health',
-          key: 'mental_health',
-        },
-        {
-          label: 'getting_organized',
-          key: 'getting_organized',
-        },
-        {
-          label: 'recovery_support_groups',
-          key: 'recovery_support_groups',
-        },
-        {
-          label: 'spirituality',
-          key: 'spirituality',
-        },
-        {
-          label: 'time_management',
-          key: 'time_management',
-        },
-      ],
+      categoryOptions: CategoryOptions,
       roleFilters: [],
       roleOptions: [
         {
diff --git a/website/client/src/components/shops/shopItem.vue b/website/client/src/components/shops/shopItem.vue
index cd673cdc2c..2fdfd6cba4 100644
--- a/website/client/src/components/shops/shopItem.vue
+++ b/website/client/src/components/shops/shopItem.vue
@@ -31,6 +31,11 @@
           class="svg-icon inline lock"
           v-html="icons.lock"
         ></span>
+        <span
+          v-if="item.completed"
+          class="svg-icon inline check"
+          v-html="icons.check"
+        ></span>
         <span
           v-if="item.isSuggested"
           class="suggestedDot"
@@ -200,6 +205,16 @@
     color: $gray-200;
   }
 
+  span.svg-icon.inline.check {
+    height: 12px;
+    width: 10px;
+    position: absolute;
+    left: 8px;
+    top: 8px;
+    margin-top: 0;
+    color: $gray-200;
+  }
+
   span.badge.badge-round.badge-item.badge-clock {
     height: 24px;
     width: 24px;
@@ -246,6 +261,7 @@ import svgGem from '@/assets/svg/gem.svg';
 import svgGold from '@/assets/svg/gold.svg';
 import svgHourglasses from '@/assets/svg/hourglass.svg';
 import svgLock from '@/assets/svg/lock.svg';
+import svgCheck from '@/assets/svg/check.svg';
 import svgClock from '@/assets/svg/clock.svg';
 
 import EquipmentAttributesPopover from '@/components/inventory/equipment/attributesPopover';
@@ -297,6 +313,7 @@ export default {
         gems: svgGem,
         gold: svgGold,
         lock: svgLock,
+        check: svgCheck,
         hourglasses: svgHourglasses,
         clock: svgClock,
       }),
@@ -350,6 +367,7 @@ export default {
         'highlight-border': this.highlightBorder,
         suggested: this.item.isSuggested,
         locked: this.item.locked,
+        completed: this.item.completed,
       };
     },
     countdownString () {
diff --git a/website/common/script/content/categoryOptions.js b/website/common/script/content/categoryOptions.js
new file mode 100644
index 0000000000..d71ecc5a37
--- /dev/null
+++ b/website/common/script/content/categoryOptions.js
@@ -0,0 +1,60 @@
+const categoryOptions = [
+  {
+    label: 'habitica_official',
+    key: 'habitica_official',
+  },
+  {
+    label: 'academics',
+    key: 'academics',
+  },
+  {
+    label: 'advocacy_causes',
+    key: 'advocacy_causes',
+  },
+  {
+    label: 'creativity',
+    key: 'creativity',
+  },
+  {
+    label: 'entertainment',
+    key: 'entertainment',
+  },
+  {
+    label: 'finance',
+    key: 'finance',
+  },
+  {
+    label: 'health_fitness',
+    key: 'health_fitness',
+  },
+  {
+    label: 'hobbies_occupations',
+    key: 'hobbies_occupations',
+  },
+  {
+    label: 'location_based',
+    key: 'location_based',
+  },
+  {
+    label: 'mental_health',
+    key: 'mental_health',
+  },
+  {
+    label: 'getting_organized',
+    key: 'getting_organized',
+  },
+  {
+    label: 'self_improvement',
+    key: 'self_improvement',
+  },
+  {
+    label: 'spirituality',
+    key: 'spirituality',
+  },
+  {
+    label: 'time_management',
+    key: 'time_management',
+  },
+];
+
+export default categoryOptions;
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index 1d63c53ce1..39ad956163 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -152,6 +152,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
           ? content.quests[item.previous].text(language)
           : null,
         unlockCondition: item.unlockCondition,
+        completed: user.achievements.quests[item.key] !== undefined,
         drop: item.drop,
         boss: item.boss,
         collect: item.collect ? _mapValues(item.collect, o => ({
diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js
index cfa582ecd9..c16ba61c7e 100644
--- a/website/server/controllers/api-v3/groups.js
+++ b/website/server/controllers/api-v3/groups.js
@@ -492,7 +492,17 @@ api.updateGroup = {
 
     if (req.body.leader !== user._id && group.hasNotCancelled()) throw new NotAuthorized(res.t('cannotChangeLeaderWithActiveGroupPlan'));
 
-    _.assign(group, _.merge(group.toObject(), Group.sanitizeUpdate(req.body)));
+    const handleArrays = (currentValue, updatedValue) => {
+      if (!_.isArray(currentValue)) {
+        return undefined;
+      }
+
+      // Previously, categories could get duplicated. By making the updated category list unique,
+      // the duplication issue is fixed on every group edit
+      return _.uniqBy(updatedValue, 'slug');
+    };
+
+    _.assign(group, _.mergeWith(group.toObject(), Group.sanitizeUpdate(req.body), handleArrays));
 
     const savedGroup = await group.save();
     const response = await Group.toJSONCleanChat(savedGroup, user);
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index 2052dc4c9a..80401f21de 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -11,6 +11,7 @@ import { // eslint-disable-line import/no-cycle
   model as Group,
   basicFields as basicGroupFields,
 } from '../../models/group';
+import { model as User } from '../../models/user'; // eslint-disable-line import/no-cycle
 import {
   NotAuthorized,
   NotFound,
@@ -79,6 +80,22 @@ async function createSubscription (data) {
   let emailType = 'subscription-begins';
   let recipientIsSubscribed = recipient.isSubscribed();
 
+  if (data.user && !data.gift && !data.groupId) {
+    const unlockedUser = await User.findOneAndUpdate(
+      {
+        _id: data.user._id,
+        $or: [
+          { _subSignature: 'NOT_RUNNING' },
+          { _subSignature: { $exists: false } },
+        ],
+      },
+      { $set: { _subSignature: 'SUB_IN_PROGRESS' } },
+    );
+    if (!unlockedUser) {
+      throw new NotFound('User not found or subscription already processing.');
+    }
+  }
+
   //  If we are buying a group subscription
   if (data.groupId) {
     const groupFields = basicGroupFields.concat(' purchased');
@@ -282,10 +299,6 @@ async function createSubscription (data) {
     }
   }
 
-  if (group) await group.save();
-  if (data.user && data.user.isModified()) await data.user.save();
-  if (data.gift) await data.gift.member.save();
-
   slack.sendSubscriptionNotification({
     buyer: {
       id: data.user._id,
@@ -302,6 +315,24 @@ async function createSubscription (data) {
     groupId,
     autoRenews,
   });
+
+  if (group) {
+    await group.save();
+  }
+  if (data.user) {
+    if (data.user.isModified()) {
+      await data.user.save();
+    }
+    if (!data.gift && !data.groupId) {
+      await User.findOneAndUpdate(
+        { _id: data.user._id },
+        { $set: { _subSignature: 'NOT_RUNNING' } },
+      );
+    }
+  }
+  if (data.gift) {
+    await data.gift.member.save();
+  }
 }
 
 // Cancels a subscription or group plan, setting termination to happen later
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 52bc884ef8..4afe7a1ae8 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -431,6 +431,8 @@ export default new Schema({
 
   lastCron: { $type: Date, default: Date.now },
   _cronSignature: { $type: String, default: 'NOT_RUNNING' }, // Private property used to avoid double cron
+  // Lock property to avoid double subscription. Not strictly private because we query on it
+  _subSignature: { $type: String, default: 'NOT_RUNNING' },
 
   // {GROUP_ID: Boolean}, represents whether they have unseen chat messages
   newMessages: {

From 27440772f0541e0db97cdb83c21b46815ff37f5a Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 1 Nov 2022 20:53:04 -0500
Subject: [PATCH 126/134] feat(subs): allow upgrade/downgrade on iOS by
 @phillipthelen

---
 test/api/unit/libs/payments/apple.test.js     | 103 ++++++++-
 test/api/unit/libs/payments/payments.test.js  | 213 +++++++++++++++++-
 website/server/libs/payments/apple.js         |  36 ++-
 website/server/libs/payments/subscriptions.js |  10 +-
 4 files changed, 346 insertions(+), 16 deletions(-)

diff --git a/test/api/unit/libs/payments/apple.test.js b/test/api/unit/libs/payments/apple.test.js
index 1aefe2cb51..1c6c112b7a 100644
--- a/test/api/unit/libs/payments/apple.test.js
+++ b/test/api/unit/libs/payments/apple.test.js
@@ -218,6 +218,7 @@ describe('Apple Payments', () => {
       headers = {};
       receipt = `{"token": "${token}"}`;
       nextPaymentProcessing = moment.utc().add({ days: 2 });
+      user = new User();
 
       iapSetupStub = sinon.stub(iap, 'setup')
         .resolves();
@@ -298,6 +299,7 @@ describe('Apple Payments', () => {
             expirationDate: moment.utc().add({ day: 1 }).toDate(),
             productId: option.sku,
             transactionId: token,
+            originalTransactionId: token,
           }]);
         sub = common.content.subscriptionBlocks[option.subKey];
 
@@ -321,12 +323,111 @@ describe('Apple Payments', () => {
           nextPaymentProcessing,
         });
       });
+      if (option !== subOptions[3]) {
+        const newOption = subOptions[3];
+        it(`upgrades a subscription from ${option.sku} to ${newOption.sku}`, async () => {
+          const oldSub = common.content.subscriptionBlocks[option.subKey];
+          user.profile.name = 'sender';
+          user.purchased.plan.paymentMethod = applePayments.constants.PAYMENT_METHOD_APPLE;
+          user.purchased.plan.customerId = token;
+          user.purchased.plan.planId = option.subKey;
+          user.purchased.plan.additionalData = receipt;
+          iap.getPurchaseData.restore();
+          iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+            .returns([{
+              expirationDate: moment.utc().add({ day: 2 }).toDate(),
+              productId: newOption.sku,
+              transactionId: `${token}new`,
+              originalTransactionId: token,
+            }]);
+          sub = common.content.subscriptionBlocks[newOption.subKey];
+
+          await applePayments.subscribe(newOption.sku,
+            user,
+            receipt,
+            headers,
+            nextPaymentProcessing);
+
+          expect(iapSetupStub).to.be.calledOnce;
+          expect(iapValidateStub).to.be.calledOnce;
+          expect(iapValidateStub).to.be.calledWith(iap.APPLE, receipt);
+          expect(iapIsValidatedStub).to.be.calledOnce;
+          expect(iapIsValidatedStub).to.be.calledWith({});
+          expect(iapGetPurchaseDataStub).to.be.calledOnce;
+
+          expect(paymentsCreateSubscritionStub).to.be.calledOnce;
+          expect(paymentsCreateSubscritionStub).to.be.calledWith({
+            user,
+            customerId: token,
+            paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
+            sub,
+            headers,
+            additionalData: receipt,
+            nextPaymentProcessing,
+            updatedFrom: oldSub,
+          });
+        });
+      }
+      if (option !== subOptions[0]) {
+        const newOption = subOptions[0];
+        it(`downgrades a subscription from ${option.sku} to ${newOption.sku}`, async () => {
+          const oldSub = common.content.subscriptionBlocks[option.subKey];
+          user.profile.name = 'sender';
+          user.purchased.plan.paymentMethod = applePayments.constants.PAYMENT_METHOD_APPLE;
+          user.purchased.plan.customerId = token;
+          user.purchased.plan.planId = option.subKey;
+          user.purchased.plan.additionalData = receipt;
+          iap.getPurchaseData.restore();
+          iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+            .returns([{
+              expirationDate: moment.utc().add({ day: 2 }).toDate(),
+              productId: newOption.sku,
+              transactionId: `${token}new`,
+              originalTransactionId: token,
+            }]);
+          sub = common.content.subscriptionBlocks[newOption.subKey];
+
+          await applePayments.subscribe(newOption.sku,
+            user,
+            receipt,
+            headers,
+            nextPaymentProcessing);
+
+          expect(iapSetupStub).to.be.calledOnce;
+          expect(iapValidateStub).to.be.calledOnce;
+          expect(iapValidateStub).to.be.calledWith(iap.APPLE, receipt);
+          expect(iapIsValidatedStub).to.be.calledOnce;
+          expect(iapIsValidatedStub).to.be.calledWith({});
+          expect(iapGetPurchaseDataStub).to.be.calledOnce;
+
+          expect(paymentsCreateSubscritionStub).to.be.calledOnce;
+          expect(paymentsCreateSubscritionStub).to.be.calledWith({
+            user,
+            customerId: token,
+            paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
+            sub,
+            headers,
+            additionalData: receipt,
+            nextPaymentProcessing,
+            updatedFrom: oldSub,
+          });
+        });
+      }
     });
 
-    it('errors when a user is already subscribed', async () => {
+    it('errors when a user is using the same subscription', async () => {
       payments.createSubscription.restore();
       user = new User();
       await user.save();
+      iap.getPurchaseData.restore();
+
+      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+        .returns([{
+          expirationDate: moment.utc().add({ day: 1 }).toDate(),
+          productId: sku,
+          transactionId: token,
+          originalTransactionId: token,
+        }]);
 
       await applePayments.subscribe(sku, user, receipt, headers, nextPaymentProcessing);
 
diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index 48d6325546..75500e28f5 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -445,6 +445,89 @@ describe('payments/index', () => {
           },
         });
       });
+
+      context('Upgrades subscription', () => {
+        it('from basic_earned to basic_6mo', async () => {
+          data.sub.key = 'basic_earned';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+          const created = user.purchased.plan.dateCreated;
+          const updated = user.purchased.plan.dateUpdated;
+
+          data.sub.key = 'basic_6mo';
+          data.updatedFrom = { key: 'basic_earned' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.dateCreated).to.eql(created);
+          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+        });
+
+        it('from basic_3mo to basic_12mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_3mo');
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+          const created = user.purchased.plan.dateCreated;
+          const updated = user.purchased.plan.dateUpdated;
+
+          data.sub.key = 'basic_12mo';
+          data.updatedFrom = { key: 'basic_3mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.dateCreated).to.eql(created);
+          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+        });
+      });
+
+      context('Downgrades subscription', () => {
+        it('from basic_6mo to basic_earned', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+          const created = user.purchased.plan.dateCreated;
+          const updated = user.purchased.plan.dateUpdated;
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.dateCreated).to.eql(created);
+          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+        });
+
+        it('from basic_12mo to basic_3mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          data.sub.key = 'basic_12mo';
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+          const created = user.purchased.plan.dateCreated;
+          const updated = user.purchased.plan.dateUpdated;
+
+          data.sub.key = 'basic_3mo';
+          data.updatedFrom = { key: 'basic_12mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_3mo');
+          expect(user.purchased.plan.dateCreated).to.eql(created);
+          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+        });
+      });
     });
 
     context('Block subscription perks', () => {
@@ -468,7 +551,6 @@ describe('payments/index', () => {
 
       it('adds 10 to plan.consecutive.gemCapExtra for 6 month block', async () => {
         data.sub.key = 'basic_6mo';
-
         await api.createSubscription(data);
 
         expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
@@ -476,7 +558,6 @@ describe('payments/index', () => {
 
       it('adds 20 to plan.consecutive.gemCapExtra for 12 month block', async () => {
         data.sub.key = 'basic_12mo';
-
         await api.createSubscription(data);
 
         expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
@@ -512,6 +593,134 @@ describe('payments/index', () => {
 
         expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
       });
+
+      context('Upgrades subscription', () => {
+        it('Adds 10 to plan.consecutive.gemCapExtra from basic_earned to basic_6mo', async () => {
+          data.sub.key = 'basic_earned';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+
+          data.sub.key = 'basic_6mo';
+          data.updatedFrom = { key: 'basic_earned' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+        });
+
+        it('Adds 15 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_3mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(5);
+
+          data.sub.key = 'basic_12mo';
+          data.updatedFrom = { key: 'basic_3mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
+        });
+
+        it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo', async () => {
+          data.sub.key = 'basic_earned';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
+
+          data.sub.key = 'basic_6mo';
+          data.updatedFrom = { key: 'basic_earned' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+        });
+
+        it('Adds 3 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_3mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+
+          data.sub.key = 'basic_12mo';
+          data.updatedFrom = { key: 'basic_3mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
+        });
+      });
+
+      context('Downgrades subscription', () => {
+        it('does not remove from plan.consecutive.gemCapExtra from basic_6mo to basic_earned', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+        });
+
+        it('does not remove from plan.consecutive.gemCapExtra from basic_12mo to basic_3mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          data.sub.key = 'basic_12mo';
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
+
+          data.sub.key = 'basic_3mo';
+          data.updatedFrom = { key: 'basic_12mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
+        });
+
+        it('does not remove from plan.consecutive.trinkets from basic_6mo to basic_earned', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+        });
+
+        it('does not remove from plan.consecutive.trinkets from basic_12mo to basic_3mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          data.sub.key = 'basic_12mo';
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
+
+          data.sub.key = 'basic_3mo';
+          data.updatedFrom = { key: 'basic_12mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
+        });
+      });
     });
 
     context('Mystery Items', () => {
diff --git a/website/server/libs/payments/apple.js b/website/server/libs/payments/apple.js
index 8c0fd44184..e91729a7e0 100644
--- a/website/server/libs/payments/apple.js
+++ b/website/server/libs/payments/apple.js
@@ -106,10 +106,6 @@ api.verifyGemPurchase = async function verifyGemPurchase (options) {
 };
 
 api.subscribe = async function subscribe (sku, user, receipt, headers, nextPaymentProcessing) {
-  if (user && user.isSubscribed()) {
-    throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
-  }
-
   if (!sku) throw new BadRequest(shared.i18n.t('missingSubscriptionCode'));
 
   let subCode;
@@ -140,33 +136,49 @@ api.subscribe = async function subscribe (sku, user, receipt, headers, nextPayme
     throw new NotAuthorized(api.constants.RESPONSE_NO_ITEM_PURCHASED);
   }
 
-  let transactionId;
+  let originalTransactionId;
+  let newTransactionId;
 
   for (const purchaseData of purchaseDataList) {
     const dateTerminated = new Date(Number(purchaseData.expirationDate));
     if (purchaseData.productId === sku && dateTerminated > new Date()) {
-      transactionId = purchaseData.transactionId;
+      originalTransactionId = purchaseData.originalTransactionId;
+      newTransactionId = purchaseData.transactionId;
       break;
     }
   }
 
-  if (transactionId) {
+  if (originalTransactionId) {
+    let existingSub;
+    if (user && user.isSubscribed()) {
+      if (user.purchased.plan.customerId !== originalTransactionId) {
+        throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
+      }
+      existingSub = shared.content.subscriptionBlocks[user.purchased.plan.planId];
+    }
     const existingUser = await User.findOne({
-      'purchased.plan.customerId': transactionId,
+      'purchased.plan.customerId': originalTransactionId,
     }).exec();
-    if (existingUser) throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
+    if (existingUser
+      && (originalTransactionId === newTransactionId || existingUser._id !== user._id)) {
+      throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
+    }
 
     nextPaymentProcessing = nextPaymentProcessing || moment.utc().add({ days: 2 }); // eslint-disable-line max-len, no-param-reassign
 
-    await payments.createSubscription({
+    const data = {
       user,
-      customerId: transactionId,
+      customerId: originalTransactionId,
       paymentMethod: this.constants.PAYMENT_METHOD_APPLE,
       sub,
       headers,
       nextPaymentProcessing,
       additionalData: receipt,
-    });
+    };
+    if (existingSub) {
+      data.updatedFrom = existingSub;
+    }
+    await payments.createSubscription(data);
   } else {
     throw new NotAuthorized(api.constants.RESPONSE_INVALID_RECEIPT);
   }
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index 80401f21de..068197b839 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -71,7 +71,15 @@ async function createSubscription (data) {
     ? data.gift.subscription.key
     : data.sub.key];
   const autoRenews = data.autoRenews !== undefined ? data.autoRenews : true;
-  const months = Number(block.months);
+  const updatedFrom = data.updatedFrom
+    ? shared.content.subscriptionBlocks[data.updatedFrom.key]
+    : undefined;
+  let months;
+  if (updatedFrom && Number(updatedFrom.months) !== 1) {
+    months = Math.max(0, Number(block.months) - Number(updatedFrom.months));
+  } else {
+    months = Number(block.months);
+  }
   const today = new Date();
   let group;
   let groupId;

From c16207c9ba4b14614c739f2b42271718bbe8939e Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Tue, 1 Nov 2022 21:55:40 -0400
Subject: [PATCH 127/134] Add Gift Messaging to Success Modal (#14270)

* initial commit: based on group-tracking-modal branch

* chore: merge group-tracking-modal

* update: create functions for each success condition

* chore: merge develop

* chore: work on successModal.vue & remove redundant code on groupPlan.vue

* update: remove `giftSubscriptionText4` from footer

* fix: correct groupPlan.vue file

* update: add messaging placeholder, clean up logic in a few places, update/add strings

* update: rearrange modal in order of display & test existence of 'gift-subscription' paymentType

* update: added props for receiverName so 'gift-subscription' works

* update: add close.svg & function
style: refactor CSS

* update: work on gift messaging

* update: work on gift messaging

* update: work on gift messaging

* update: let's make messages GO

* update: messages are a GO, we have LIFT OFF!

* fix: remove console log (oops)

Co-authored-by: SabreCat <sabe@habitica.com>
---
 .../src/components/payments/sendGiftModal.vue |   2 +
 .../src/components/payments/successModal.vue  | 525 +++++++++++-------
 .../settings/subscriptionOptions.vue          |   5 +-
 website/common/locales/en/groups.json         |   3 +-
 website/common/locales/en/npc.json            |   2 +-
 5 files changed, 330 insertions(+), 207 deletions(-)

diff --git a/website/client/src/components/payments/sendGiftModal.vue b/website/client/src/components/payments/sendGiftModal.vue
index 838015fe6a..f266fd3273 100644
--- a/website/client/src/components/payments/sendGiftModal.vue
+++ b/website/client/src/components/payments/sendGiftModal.vue
@@ -75,6 +75,7 @@
         v-show="selectedPage === 'subscription'"
         class="subscribe-option"
         :userReceivingGift="userReceivingGift"
+        :receiverName="receiverName"
       />
 
       <!-- gem block -->
@@ -648,6 +649,7 @@ export default {
             },
           },
           giftReceiver: this.receiverName,
+          toUserId: this.userReceivingGift._id,
         });
       }, 500);
     },
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index a4901051af..4ac16233bc 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -1,11 +1,22 @@
 <template>
   <b-modal
     id="payments-success-modal"
-    :title="$t('accountSuspendedTitle')"
-    :hide-footer="isFromBalance || paymentData.newGroup"
-    :modal-class="isFromBalance || paymentData.newGroup ? ['modal-hidden-footer'] : []"
+    :hide-footer="isNewGroup || isGems || isSubscription"
+    :modal-class="isNewGroup || isGems || isSubscription
+      ? ['modal-hidden-footer'] : []"
   >
+    <!-- HEADER -->
     <div slot="modal-header">
+      <div
+        class="modal-close"
+        @click="close()"
+      >
+        <div
+          class="icon-close"
+          v-html="icons.close"
+        >
+        </div>
+      </div>
       <div class="check-container d-flex align-items-center justify-content-center">
         <div
           v-once
@@ -13,19 +24,127 @@
           v-html="icons.check"
         ></div>
       </div>
-      <h2>{{ $t(isFromBalance ? 'success' : 'paymentSuccessful') }}</h2>
+      <h2>{{ $t(isGemsBalance ? 'success' : 'paymentSuccessful') }}</h2>
     </div>
+    <!-- BODY -->
+    <div class="row">
+      <div class="col-12 modal-body-col">
+        <!-- buy gems for self -->
+        <template v-if="isGems">
+          <strong v-once>{{ $t('paymentYouReceived') }}</strong>
+          <div class="details-block gems">
+            <div
+              v-once
+              class="svg-icon"
+              v-html="icons.gem"
+            ></div>
+            <span>{{ paymentData.gemsBlock.gems }}</span>
+          </div>
+        </template>
+        <!-- buy gems to someone else OR send gems from balance-->
+        <template
+          v-if="isGiftGems || isGemsBalance"
+        >
+          <span v-html="$t('paymentYouSentGems', {name: paymentData.giftReceiver})"></span>
+          <div class="details-block gems">
+            <div
+              v-once
+              class="svg-icon"
+              v-html="icons.gem"
+            ></div>
+            <span>{{ paymentData.gift.gems.amount }}</span>
+          </div>
+        </template>
+        <!-- give gift subscription (non-recurring)-->
+        <template v-if="paymentData.paymentType === 'gift-subscription'">
+          <div>
+            <span
+              v-html="$t('paymentYouSentSubscription', {
+                name: paymentData.giftReceiver, months: paymentData.subscription.months})"
+            ></span>
+          </div>
+        </template>
+        <!-- buy self subscription (recurring) -->
+        <template v-if="isSubscription">
+          <strong v-once>{{ $t('nowSubscribed') }}</strong>
+          <div class="details-block">
+            <span
+              v-html="$t('paymentSubBilling', {
+                amount: paymentData.subscription.price, months: paymentData.subscription.months})"
+            ></span>
+          </div>
+        </template>
+        <!-- group plan new or upgraded -->
+        <template v-if="isGroupPlan">
+          <span
+            v-html="$t(isNewGroup
+              ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
+          ></span>
+          <div
+            v-if="isGroupPlan"
+            class=""
+          >
+            <div class="details-block group-billing-date">
+              <span
+                v-html="$t('groupsPaymentSubBilling', { renewalDate })"
+              >
+              </span>
+            </div>
+            <div class="small-text group-auto-renew">
+              <span
+                v-once
+              >{{ $t('groupsPaymentAutoRenew') }}
+              </span>
+            </div>
+          </div>
+        </template>
+        <!-- buy self subscription auto renew -->
+        <template
+          v-if="isSubscription"
+        >
+          <span
+            v-once
+            class="small-text auto-renew"
+          >{{ $t('paymentAutoRenew') }}</span>
+        </template>
+        <!-- buttons for subscriptions / new Group / buy Gems for self -->
+        <button
+          v-if="isNewGroup || isGems || isSubscription"
+          v-once
+          class="btn btn-primary"
+          @click="submit()"
+        >
+          {{ $t('onwards') }}
+        </button>
+      </div>
+    </div>
+    <!-- FOOTER -->
     <div slot="modal-footer">
-      <!-- everyone else -->
+      <!-- gift gems balance & buy, gift subscription -->
       <div
-        v-if="paymentData.paymentType !== 'groupPlan' || paymentData.newGroup"
-        class="small-text"
+        v-if="isGemsBalance || isGiftGems || isGiftSubscription"
+        class="message mx-auto"
       >
-        {{ $t('giftSubscriptionText4') }}
+        <lockable-label
+          :text="$t('sendGiftLabel')"
+          class="mx-auto label-text"
+        />
+        <textarea
+          v-model="gift.message"
+          class="form-control mx-auto"
+          :placeholder="$t('sendGiftMessagePlaceholder')"
+        ></textarea>
+        <button
+          :disabled="!gift.message || sendingInProgress"
+          class="btn btn-primary mx-auto"
+          @click="sendMessage()"
+        >
+          {{ $t('sendMessage') }}
+        </button>
       </div>
       <!-- upgradedGroup -->
       <div
-        v-else
+        v-else-if="isUpgradedGroup"
         class="demographics d-flex flex-column justify-content-center"
       >
         <lockable-label
@@ -56,108 +175,137 @@
         </button>
       </div>
     </div>
-    <div class="row">
-      <div class="col-12 modal-body-col">
-        <!-- buy gems for self -->
-        <template v-if="paymentData.paymentType === 'gems'">
-          <strong v-once>{{ $t('paymentYouReceived') }}</strong>
-          <div class="details-block gems">
-            <div
-              v-once
-              class="svg-icon"
-              v-html="icons.gem"
-            ></div>
-            <span>{{ paymentData.gemsBlock.gems }}</span>
-          </div>
-        </template>
-        <!-- buy or gift gems to someone else -->
-        <template
-          v-if="paymentData.paymentType === 'gift-gems'
-            || paymentData.paymentType === 'gift-gems-balance'"
-        >
-          <span v-html="$t('paymentYouSentGems', {name: paymentData.giftReceiver})"></span>
-          <div class="details-block gems">
-            <div
-              v-once
-              class="svg-icon"
-              v-html="icons.gem"
-            ></div>
-            <span>{{ paymentData.gift.gems.amount }}</span>
-          </div>
-        </template>
-        <!-- give gift subscription (non-recurring)-->
-        <template v-if="paymentData.paymentType === 'gift-subscription'">
-          <span
-            v-html="$t('paymentYouSentSubscription', {
-              name: paymentData.giftReceiver, months: paymentData.subscription.months})"
-          ></span>
-        </template>
-        <!-- buy self subscription (recurring) -->
-        <template v-if="paymentData.paymentType === 'subscription'">
-          <strong v-once>{{ $t('nowSubscribed') }}</strong>
-          <div class="details-block">
-            <span
-              v-html="$t('paymentSubBilling', {
-                amount: paymentData.subscription.price, months: paymentData.subscription.months})"
-            ></span>
-          </div>
-        </template>
-        <!-- group plan new or upgraded -->
-        <template v-if="paymentData.paymentType === 'groupPlan'">
-          <span
-            v-html="$t(paymentData.newGroup
-              ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
-          ></span>
-          <div
-            v-if="!paymentData.newGroup || paymentData.newGroup"
-            class=""
-          >
-            <div class="details-block group-billing-date">
-              <span
-                v-html="$t('groupsPaymentSubBilling', { renewalDate })"
-              >
-              </span>
-            </div>
-            <div class="small-text group-auto-renew">
-              <span
-                v-once
-              >{{ $t('groupsPaymentAutoRenew') }}
-              </span>
-            </div>
-          </div>
-        </template>
-        <!-- buy self subscription auto renew -->
-        <template
-          v-if="paymentData.paymentType === 'subscription'"
-        >
-          <span
-            v-once
-            class="small-text auto-renew"
-          >{{ $t('paymentAutoRenew') }}</span>
-        </template>
-        <!-- buttons for subscriptions -->
-        <button
-          v-if="paymentData.paymentType !== 'groupPlan'"
-          v-once
-          class="btn btn-primary"
-          @click="submit()"
-        >
-          {{ $t('onwards') }}
-        </button>
-      </div>
-    </div>
   </b-modal>
 </template>
 
 <style lang="scss">
 @import '~@/assets/scss/colors.scss';
 
-#payments-success-modal .modal-md {
-  max-width: 448px;
-}
+#payments-success-modal {
+  .modal-md {
+    max-width: 448px;
+    min-width: 330px;
 
-#payments-success-modal .modal-content {
-  background: transparent;
+  .modal-close {
+    position: absolute;
+    right: 16px;
+    top: 16px;
+    cursor: pointer;
+
+    .icon-close {
+      width: 18px;
+      height: 18px;
+      vertical-align: middle;
+
+      & svg path {
+        fill: $green-1;
+      }
+       & :hover {
+        fill: $green-1;
+      }
+    }
+  }
+
+  .modal-content {
+    background: transparent;
+  }
+
+  .modal-header {
+    justify-content: center;
+    padding-top: 24px;
+    padding-bottom: 0px;
+    background: $green-100;
+    border-top-right-radius: 8px;
+    border-top-left-radius: 8px;
+    border-bottom: none;
+
+    h2 {
+      color: $green-1;
+    }
+
+    .check-container {
+      width: 64px;
+      height: 64px;
+      border-radius: 50%;
+      background: $green-1;
+      margin: 0 auto;
+      margin-bottom: 16px;
+    }
+
+    .check {
+      width: 35.1px;
+      height: 28px;
+      color: $white;
+    }
+  }
+
+  .modal-body {
+    padding: 16px 32px 24px 32px;
+    background: $white;
+
+    .modal-body-col {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      text-align: center;
+
+      .btn.btn-primary {
+        margin-top: 24px;
+      }
+    }
+
+    .details-block {
+      background: $gray-700;
+      border-radius: 4px;
+      padding: 8px 16px;
+      margin-top: 16px;
+      display: inline-flex;
+      flex-direction: row;
+      text-align: center;
+
+      &.gems {
+        padding: 12px 16px 12px 20px;
+        color: $green-10;
+        font-size: 24px;
+        font-weight: bold;
+        line-height: 1.33;
+
+        .svg-icon {
+          margin-right: 8px;
+          width: 32px;
+          height: 32px;
+        }
+      }
+    }
+
+    .auto-renew {
+      margin-top: 16px;
+      color: $orange-10;
+      font-style: normal;
+    }
+
+    .group-auto-renew {
+      margin: 12px 20px -8px 20px;
+      color: $yellow-5;
+      font-style: normal;
+    }
+
+    .group-billing-date {
+      width: 269px;
+    }
+  }
+    .modal-footer {
+      background: $gray-700;
+      border-bottom-right-radius: 8px;
+      border-bottom-left-radius: 8px;
+      justify-content: center;
+      border-top: none;
+
+      .small-text {
+        font-style: normal;
+      }
+    }
+  }
 }
 
 #payments-success-modal.modal-hidden-footer .modal-body {
@@ -165,102 +313,6 @@
   border-bottom-left-radius: 8px;
 }
 
-
-#payments-success-modal .modal-header {
-  justify-content: center;
-  padding-top: 24px;
-  padding-bottom: 0px;
-  background: $green-100;
-  border-top-right-radius: 8px;
-  border-top-left-radius: 8px;
-  border-bottom: none;
-
-  h2 {
-    color: $green-1;
-  }
-
-  .check-container {
-    width: 64px;
-    height: 64px;
-    border-radius: 50%;
-    background: $green-1;
-    margin: 0 auto;
-    margin-bottom: 16px;
-  }
-
-  .check {
-    width: 35.1px;
-    height: 28px;
-    color: $white;
-  }
-}
-
-#payments-success-modal .modal-body {
-  padding: 16px 32px 24px 32px;
-  background: $white;
-
-  .modal-body-col {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-
-    .btn.btn-primary {
-      margin-top: 24px;
-    }
-  }
-
-  .details-block {
-    background: $gray-700;
-    border-radius: 4px;
-    padding: 8px 16px;
-    margin-top: 16px;
-    display: inline-flex;
-    flex-direction: row;
-    text-align: center;
-
-    &.gems {
-      padding: 12px 16px 12px 20px;
-      color: $green-10;
-      font-size: 24px;
-      font-weight: bold;
-      line-height: 1.33;
-
-      .svg-icon {
-        margin-right: 8px;
-        width: 32px;
-        height: 32px;
-      }
-    }
-  }
-
-  .auto-renew {
-    margin-top: 16px;
-    color: $orange-10;
-    font-style: normal;
-  }
-  .group-auto-renew {
-    margin: 12px 20px -8px 20px;
-    color: $yellow-5;
-    font-style: normal;
-  }
-  .group-billing-date {
-    width: 269px;
-  }
-}
-
-#payments-success-modal .modal-footer {
-  background: $gray-700;
-  border-bottom-right-radius: 8px;
-  border-bottom-left-radius: 8px;
-  justify-content: center;
-  border-top: none;
-
-  .small-text {
-    font-style: normal;
-  }
-}
-
 .demographics {
   background-color: $gray-700;
 
@@ -278,23 +330,42 @@
     margin-bottom: 20px;
   }
 }
+.message {
+  margin-bottom: 8px;
+  width: 378px;
+  display: flex;
+  flex-direction: column;
+
+  textarea.form-control {
+    height: 56px;
+    margin: 0 24px 24px 24px;
+    font-size: 0.875rem;
+  }
+}
 </style>
 
 <style lang="scss">
   @import '~@/assets/scss/mixins.scss';
 
-
 </style>
 
-
 <script>
+// icons
 import checkIcon from '@/assets/svg/check.svg';
 import gemIcon from '@/assets/svg/gem.svg';
+import closeIcon from '@/assets/svg/close.svg';
+
+// components
 import { mapState } from '@/libs/store';
 import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
+
+// mixins
+import notificationsMixin from '@/mixins/notifications';
 import paymentsMixin from '@/mixins/payments';
+
+// analytics
 import * as Analytics from '@/libs/analytics';
 
 export default {
@@ -302,18 +373,30 @@ export default {
     selectTranslatedArray,
     lockableLabel,
   },
-  mixins: [paymentsMixin],
+  mixins: [
+    paymentsMixin,
+    notificationsMixin,
+  ],
   data () {
     return {
       icons: Object.freeze({
         check: checkIcon,
         gem: gemIcon,
+        close: closeIcon,
       }),
       paymentData: {},
       upgradedGroup: {
         name: '',
         demographics: null,
       },
+      sendingInProgress: false,
+      gift: {
+        message: '',
+      },
+      receiverName: {
+        name: null,
+        uuid: null,
+      },
     };
   },
   computed: {
@@ -323,9 +406,30 @@ export default {
       const memberCount = this.paymentData.group.memberCount || 1;
       return sub.price + 3 * (memberCount - 1);
     },
-    isFromBalance () {
+    isGemsBalance () {
       return this.paymentData.paymentType === 'gift-gems-balance';
     },
+    isGems () {
+      return this.paymentData.paymentType === 'gems';
+    },
+    isGiftGems () {
+      return this.paymentData.paymentType === 'gift-gems';
+    },
+    isGiftSubscription () {
+      return this.paymentData.paymentType === 'gift-subscription';
+    },
+    isSubscription () {
+      return this.paymentData.paymentType === 'subscription';
+    },
+    isGroupPlan () {
+      return this.paymentData.paymentType === 'groupPlan';
+    },
+    isUpgradedGroup () {
+      return this.paymentData.paymentType === 'groupPlan' && !this.paymentData.newGroup;
+    },
+    isNewGroup () {
+      return this.paymentData.paymentType === 'groupPlan' && this.paymentData.newGroup;
+    },
   },
   mounted () {
     this.$root.$on('habitica:payment-success', data => {
@@ -341,6 +445,19 @@ export default {
     this.$root.$off('habitica:payments-success');
   },
   methods: {
+    async sendMessage () {
+      this.sendingInProgress = true;
+      await this.$store.dispatch('members:sendPrivateMessage', {
+        message: this.gift.message,
+        toUserId: this.paymentData.gift.uuid || this.paymentData.toUserId,
+      });
+      this.close();
+    },
+    close () {
+      this.gift.message = '';
+      this.sendingInProgress = false;
+      this.$root.$emit('bv::hide::modal', 'payments-success-modal');
+    },
     submit () {
       if (this.paymentData.group && !this.paymentData.newGroup) {
         Analytics.track({
diff --git a/website/client/src/components/settings/subscriptionOptions.vue b/website/client/src/components/settings/subscriptionOptions.vue
index 13fa363ae3..650e908c67 100644
--- a/website/client/src/components/settings/subscriptionOptions.vue
+++ b/website/client/src/components/settings/subscriptionOptions.vue
@@ -125,6 +125,10 @@ export default {
       type: Object,
       default () {},
     },
+    receiverName: {
+      type: String,
+      default: '',
+    },
   },
   data () {
     return {
@@ -135,7 +139,6 @@ export default {
         type: 'subscription',
         subscription: { key: 'basic_earned' },
       },
-      receiverName: '',
     };
   },
   computed: {
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 9d3aea4ff7..4fa86cecf9 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -132,7 +132,8 @@
   "sendGiftTotal": "Total:",
   "sendGiftFromBalance": "From Balance",
   "sendGiftPurchase": "Purchase",
-  "sendGiftMessagePlaceholder": "Personal message (optional)",
+  "sendGiftLabel": "Would you like to send a gift message?",
+  "sendGiftMessagePlaceholder": "Add a gift message",
   "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD",
   "gemGiftsAreOptional": "Please note that Habitica will never require you to gift gems to other players. Begging people for gems is a <strong>violation of the Community Guidelines</strong>, and all such instances should be reported to <%= hrefTechAssistanceEmail %>.",
   "giftMessageTooLong": "The maximum length for gift messages is <%= maxGiftMessageLength %>.",
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 443b4eb8e9..0ebe1a9b7f 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -92,7 +92,7 @@
   "paymentSuccessful": "Your payment was successful!",
   "paymentYouReceived": "You received:",
   "paymentYouSentGems": "You sent <strong><%- name %></strong>:",
-  "paymentYouSentSubscription": "You sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
+  "paymentYouSentSubscription": "You sent <strong><%- name %></strong><br> a <%= months %> month(s) Habitica subscription.",
   "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
   "groupsPaymentSubBilling": "Your next billing date is <strong><%= renewalDate %></strong>.",
   "paymentSubBillingWithMethod": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong> via <strong><%= paymentMethod %></strong>.",

From 7c553e535c1252860cd31845340536b8ed07edc8 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 1 Nov 2022 20:56:21 -0500
Subject: [PATCH 128/134] feat(gifting): restore ability to send gift messages
 by @CuriousMagpie

---
 .../src/components/payments/sendGiftModal.vue |   2 +
 .../src/components/payments/successModal.vue  | 525 +++++++++++-------
 .../settings/subscriptionOptions.vue          |   5 +-
 website/common/locales/en/groups.json         |   3 +-
 website/common/locales/en/npc.json            |   2 +-
 5 files changed, 330 insertions(+), 207 deletions(-)

diff --git a/website/client/src/components/payments/sendGiftModal.vue b/website/client/src/components/payments/sendGiftModal.vue
index 838015fe6a..f266fd3273 100644
--- a/website/client/src/components/payments/sendGiftModal.vue
+++ b/website/client/src/components/payments/sendGiftModal.vue
@@ -75,6 +75,7 @@
         v-show="selectedPage === 'subscription'"
         class="subscribe-option"
         :userReceivingGift="userReceivingGift"
+        :receiverName="receiverName"
       />
 
       <!-- gem block -->
@@ -648,6 +649,7 @@ export default {
             },
           },
           giftReceiver: this.receiverName,
+          toUserId: this.userReceivingGift._id,
         });
       }, 500);
     },
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index a4901051af..4ac16233bc 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -1,11 +1,22 @@
 <template>
   <b-modal
     id="payments-success-modal"
-    :title="$t('accountSuspendedTitle')"
-    :hide-footer="isFromBalance || paymentData.newGroup"
-    :modal-class="isFromBalance || paymentData.newGroup ? ['modal-hidden-footer'] : []"
+    :hide-footer="isNewGroup || isGems || isSubscription"
+    :modal-class="isNewGroup || isGems || isSubscription
+      ? ['modal-hidden-footer'] : []"
   >
+    <!-- HEADER -->
     <div slot="modal-header">
+      <div
+        class="modal-close"
+        @click="close()"
+      >
+        <div
+          class="icon-close"
+          v-html="icons.close"
+        >
+        </div>
+      </div>
       <div class="check-container d-flex align-items-center justify-content-center">
         <div
           v-once
@@ -13,19 +24,127 @@
           v-html="icons.check"
         ></div>
       </div>
-      <h2>{{ $t(isFromBalance ? 'success' : 'paymentSuccessful') }}</h2>
+      <h2>{{ $t(isGemsBalance ? 'success' : 'paymentSuccessful') }}</h2>
     </div>
+    <!-- BODY -->
+    <div class="row">
+      <div class="col-12 modal-body-col">
+        <!-- buy gems for self -->
+        <template v-if="isGems">
+          <strong v-once>{{ $t('paymentYouReceived') }}</strong>
+          <div class="details-block gems">
+            <div
+              v-once
+              class="svg-icon"
+              v-html="icons.gem"
+            ></div>
+            <span>{{ paymentData.gemsBlock.gems }}</span>
+          </div>
+        </template>
+        <!-- buy gems to someone else OR send gems from balance-->
+        <template
+          v-if="isGiftGems || isGemsBalance"
+        >
+          <span v-html="$t('paymentYouSentGems', {name: paymentData.giftReceiver})"></span>
+          <div class="details-block gems">
+            <div
+              v-once
+              class="svg-icon"
+              v-html="icons.gem"
+            ></div>
+            <span>{{ paymentData.gift.gems.amount }}</span>
+          </div>
+        </template>
+        <!-- give gift subscription (non-recurring)-->
+        <template v-if="paymentData.paymentType === 'gift-subscription'">
+          <div>
+            <span
+              v-html="$t('paymentYouSentSubscription', {
+                name: paymentData.giftReceiver, months: paymentData.subscription.months})"
+            ></span>
+          </div>
+        </template>
+        <!-- buy self subscription (recurring) -->
+        <template v-if="isSubscription">
+          <strong v-once>{{ $t('nowSubscribed') }}</strong>
+          <div class="details-block">
+            <span
+              v-html="$t('paymentSubBilling', {
+                amount: paymentData.subscription.price, months: paymentData.subscription.months})"
+            ></span>
+          </div>
+        </template>
+        <!-- group plan new or upgraded -->
+        <template v-if="isGroupPlan">
+          <span
+            v-html="$t(isNewGroup
+              ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
+          ></span>
+          <div
+            v-if="isGroupPlan"
+            class=""
+          >
+            <div class="details-block group-billing-date">
+              <span
+                v-html="$t('groupsPaymentSubBilling', { renewalDate })"
+              >
+              </span>
+            </div>
+            <div class="small-text group-auto-renew">
+              <span
+                v-once
+              >{{ $t('groupsPaymentAutoRenew') }}
+              </span>
+            </div>
+          </div>
+        </template>
+        <!-- buy self subscription auto renew -->
+        <template
+          v-if="isSubscription"
+        >
+          <span
+            v-once
+            class="small-text auto-renew"
+          >{{ $t('paymentAutoRenew') }}</span>
+        </template>
+        <!-- buttons for subscriptions / new Group / buy Gems for self -->
+        <button
+          v-if="isNewGroup || isGems || isSubscription"
+          v-once
+          class="btn btn-primary"
+          @click="submit()"
+        >
+          {{ $t('onwards') }}
+        </button>
+      </div>
+    </div>
+    <!-- FOOTER -->
     <div slot="modal-footer">
-      <!-- everyone else -->
+      <!-- gift gems balance & buy, gift subscription -->
       <div
-        v-if="paymentData.paymentType !== 'groupPlan' || paymentData.newGroup"
-        class="small-text"
+        v-if="isGemsBalance || isGiftGems || isGiftSubscription"
+        class="message mx-auto"
       >
-        {{ $t('giftSubscriptionText4') }}
+        <lockable-label
+          :text="$t('sendGiftLabel')"
+          class="mx-auto label-text"
+        />
+        <textarea
+          v-model="gift.message"
+          class="form-control mx-auto"
+          :placeholder="$t('sendGiftMessagePlaceholder')"
+        ></textarea>
+        <button
+          :disabled="!gift.message || sendingInProgress"
+          class="btn btn-primary mx-auto"
+          @click="sendMessage()"
+        >
+          {{ $t('sendMessage') }}
+        </button>
       </div>
       <!-- upgradedGroup -->
       <div
-        v-else
+        v-else-if="isUpgradedGroup"
         class="demographics d-flex flex-column justify-content-center"
       >
         <lockable-label
@@ -56,108 +175,137 @@
         </button>
       </div>
     </div>
-    <div class="row">
-      <div class="col-12 modal-body-col">
-        <!-- buy gems for self -->
-        <template v-if="paymentData.paymentType === 'gems'">
-          <strong v-once>{{ $t('paymentYouReceived') }}</strong>
-          <div class="details-block gems">
-            <div
-              v-once
-              class="svg-icon"
-              v-html="icons.gem"
-            ></div>
-            <span>{{ paymentData.gemsBlock.gems }}</span>
-          </div>
-        </template>
-        <!-- buy or gift gems to someone else -->
-        <template
-          v-if="paymentData.paymentType === 'gift-gems'
-            || paymentData.paymentType === 'gift-gems-balance'"
-        >
-          <span v-html="$t('paymentYouSentGems', {name: paymentData.giftReceiver})"></span>
-          <div class="details-block gems">
-            <div
-              v-once
-              class="svg-icon"
-              v-html="icons.gem"
-            ></div>
-            <span>{{ paymentData.gift.gems.amount }}</span>
-          </div>
-        </template>
-        <!-- give gift subscription (non-recurring)-->
-        <template v-if="paymentData.paymentType === 'gift-subscription'">
-          <span
-            v-html="$t('paymentYouSentSubscription', {
-              name: paymentData.giftReceiver, months: paymentData.subscription.months})"
-          ></span>
-        </template>
-        <!-- buy self subscription (recurring) -->
-        <template v-if="paymentData.paymentType === 'subscription'">
-          <strong v-once>{{ $t('nowSubscribed') }}</strong>
-          <div class="details-block">
-            <span
-              v-html="$t('paymentSubBilling', {
-                amount: paymentData.subscription.price, months: paymentData.subscription.months})"
-            ></span>
-          </div>
-        </template>
-        <!-- group plan new or upgraded -->
-        <template v-if="paymentData.paymentType === 'groupPlan'">
-          <span
-            v-html="$t(paymentData.newGroup
-              ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
-          ></span>
-          <div
-            v-if="!paymentData.newGroup || paymentData.newGroup"
-            class=""
-          >
-            <div class="details-block group-billing-date">
-              <span
-                v-html="$t('groupsPaymentSubBilling', { renewalDate })"
-              >
-              </span>
-            </div>
-            <div class="small-text group-auto-renew">
-              <span
-                v-once
-              >{{ $t('groupsPaymentAutoRenew') }}
-              </span>
-            </div>
-          </div>
-        </template>
-        <!-- buy self subscription auto renew -->
-        <template
-          v-if="paymentData.paymentType === 'subscription'"
-        >
-          <span
-            v-once
-            class="small-text auto-renew"
-          >{{ $t('paymentAutoRenew') }}</span>
-        </template>
-        <!-- buttons for subscriptions -->
-        <button
-          v-if="paymentData.paymentType !== 'groupPlan'"
-          v-once
-          class="btn btn-primary"
-          @click="submit()"
-        >
-          {{ $t('onwards') }}
-        </button>
-      </div>
-    </div>
   </b-modal>
 </template>
 
 <style lang="scss">
 @import '~@/assets/scss/colors.scss';
 
-#payments-success-modal .modal-md {
-  max-width: 448px;
-}
+#payments-success-modal {
+  .modal-md {
+    max-width: 448px;
+    min-width: 330px;
 
-#payments-success-modal .modal-content {
-  background: transparent;
+  .modal-close {
+    position: absolute;
+    right: 16px;
+    top: 16px;
+    cursor: pointer;
+
+    .icon-close {
+      width: 18px;
+      height: 18px;
+      vertical-align: middle;
+
+      & svg path {
+        fill: $green-1;
+      }
+       & :hover {
+        fill: $green-1;
+      }
+    }
+  }
+
+  .modal-content {
+    background: transparent;
+  }
+
+  .modal-header {
+    justify-content: center;
+    padding-top: 24px;
+    padding-bottom: 0px;
+    background: $green-100;
+    border-top-right-radius: 8px;
+    border-top-left-radius: 8px;
+    border-bottom: none;
+
+    h2 {
+      color: $green-1;
+    }
+
+    .check-container {
+      width: 64px;
+      height: 64px;
+      border-radius: 50%;
+      background: $green-1;
+      margin: 0 auto;
+      margin-bottom: 16px;
+    }
+
+    .check {
+      width: 35.1px;
+      height: 28px;
+      color: $white;
+    }
+  }
+
+  .modal-body {
+    padding: 16px 32px 24px 32px;
+    background: $white;
+
+    .modal-body-col {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      text-align: center;
+
+      .btn.btn-primary {
+        margin-top: 24px;
+      }
+    }
+
+    .details-block {
+      background: $gray-700;
+      border-radius: 4px;
+      padding: 8px 16px;
+      margin-top: 16px;
+      display: inline-flex;
+      flex-direction: row;
+      text-align: center;
+
+      &.gems {
+        padding: 12px 16px 12px 20px;
+        color: $green-10;
+        font-size: 24px;
+        font-weight: bold;
+        line-height: 1.33;
+
+        .svg-icon {
+          margin-right: 8px;
+          width: 32px;
+          height: 32px;
+        }
+      }
+    }
+
+    .auto-renew {
+      margin-top: 16px;
+      color: $orange-10;
+      font-style: normal;
+    }
+
+    .group-auto-renew {
+      margin: 12px 20px -8px 20px;
+      color: $yellow-5;
+      font-style: normal;
+    }
+
+    .group-billing-date {
+      width: 269px;
+    }
+  }
+    .modal-footer {
+      background: $gray-700;
+      border-bottom-right-radius: 8px;
+      border-bottom-left-radius: 8px;
+      justify-content: center;
+      border-top: none;
+
+      .small-text {
+        font-style: normal;
+      }
+    }
+  }
 }
 
 #payments-success-modal.modal-hidden-footer .modal-body {
@@ -165,102 +313,6 @@
   border-bottom-left-radius: 8px;
 }
 
-
-#payments-success-modal .modal-header {
-  justify-content: center;
-  padding-top: 24px;
-  padding-bottom: 0px;
-  background: $green-100;
-  border-top-right-radius: 8px;
-  border-top-left-radius: 8px;
-  border-bottom: none;
-
-  h2 {
-    color: $green-1;
-  }
-
-  .check-container {
-    width: 64px;
-    height: 64px;
-    border-radius: 50%;
-    background: $green-1;
-    margin: 0 auto;
-    margin-bottom: 16px;
-  }
-
-  .check {
-    width: 35.1px;
-    height: 28px;
-    color: $white;
-  }
-}
-
-#payments-success-modal .modal-body {
-  padding: 16px 32px 24px 32px;
-  background: $white;
-
-  .modal-body-col {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-
-    .btn.btn-primary {
-      margin-top: 24px;
-    }
-  }
-
-  .details-block {
-    background: $gray-700;
-    border-radius: 4px;
-    padding: 8px 16px;
-    margin-top: 16px;
-    display: inline-flex;
-    flex-direction: row;
-    text-align: center;
-
-    &.gems {
-      padding: 12px 16px 12px 20px;
-      color: $green-10;
-      font-size: 24px;
-      font-weight: bold;
-      line-height: 1.33;
-
-      .svg-icon {
-        margin-right: 8px;
-        width: 32px;
-        height: 32px;
-      }
-    }
-  }
-
-  .auto-renew {
-    margin-top: 16px;
-    color: $orange-10;
-    font-style: normal;
-  }
-  .group-auto-renew {
-    margin: 12px 20px -8px 20px;
-    color: $yellow-5;
-    font-style: normal;
-  }
-  .group-billing-date {
-    width: 269px;
-  }
-}
-
-#payments-success-modal .modal-footer {
-  background: $gray-700;
-  border-bottom-right-radius: 8px;
-  border-bottom-left-radius: 8px;
-  justify-content: center;
-  border-top: none;
-
-  .small-text {
-    font-style: normal;
-  }
-}
-
 .demographics {
   background-color: $gray-700;
 
@@ -278,23 +330,42 @@
     margin-bottom: 20px;
   }
 }
+.message {
+  margin-bottom: 8px;
+  width: 378px;
+  display: flex;
+  flex-direction: column;
+
+  textarea.form-control {
+    height: 56px;
+    margin: 0 24px 24px 24px;
+    font-size: 0.875rem;
+  }
+}
 </style>
 
 <style lang="scss">
   @import '~@/assets/scss/mixins.scss';
 
-
 </style>
 
-
 <script>
+// icons
 import checkIcon from '@/assets/svg/check.svg';
 import gemIcon from '@/assets/svg/gem.svg';
+import closeIcon from '@/assets/svg/close.svg';
+
+// components
 import { mapState } from '@/libs/store';
 import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
+
+// mixins
+import notificationsMixin from '@/mixins/notifications';
 import paymentsMixin from '@/mixins/payments';
+
+// analytics
 import * as Analytics from '@/libs/analytics';
 
 export default {
@@ -302,18 +373,30 @@ export default {
     selectTranslatedArray,
     lockableLabel,
   },
-  mixins: [paymentsMixin],
+  mixins: [
+    paymentsMixin,
+    notificationsMixin,
+  ],
   data () {
     return {
       icons: Object.freeze({
         check: checkIcon,
         gem: gemIcon,
+        close: closeIcon,
       }),
       paymentData: {},
       upgradedGroup: {
         name: '',
         demographics: null,
       },
+      sendingInProgress: false,
+      gift: {
+        message: '',
+      },
+      receiverName: {
+        name: null,
+        uuid: null,
+      },
     };
   },
   computed: {
@@ -323,9 +406,30 @@ export default {
       const memberCount = this.paymentData.group.memberCount || 1;
       return sub.price + 3 * (memberCount - 1);
     },
-    isFromBalance () {
+    isGemsBalance () {
       return this.paymentData.paymentType === 'gift-gems-balance';
     },
+    isGems () {
+      return this.paymentData.paymentType === 'gems';
+    },
+    isGiftGems () {
+      return this.paymentData.paymentType === 'gift-gems';
+    },
+    isGiftSubscription () {
+      return this.paymentData.paymentType === 'gift-subscription';
+    },
+    isSubscription () {
+      return this.paymentData.paymentType === 'subscription';
+    },
+    isGroupPlan () {
+      return this.paymentData.paymentType === 'groupPlan';
+    },
+    isUpgradedGroup () {
+      return this.paymentData.paymentType === 'groupPlan' && !this.paymentData.newGroup;
+    },
+    isNewGroup () {
+      return this.paymentData.paymentType === 'groupPlan' && this.paymentData.newGroup;
+    },
   },
   mounted () {
     this.$root.$on('habitica:payment-success', data => {
@@ -341,6 +445,19 @@ export default {
     this.$root.$off('habitica:payments-success');
   },
   methods: {
+    async sendMessage () {
+      this.sendingInProgress = true;
+      await this.$store.dispatch('members:sendPrivateMessage', {
+        message: this.gift.message,
+        toUserId: this.paymentData.gift.uuid || this.paymentData.toUserId,
+      });
+      this.close();
+    },
+    close () {
+      this.gift.message = '';
+      this.sendingInProgress = false;
+      this.$root.$emit('bv::hide::modal', 'payments-success-modal');
+    },
     submit () {
       if (this.paymentData.group && !this.paymentData.newGroup) {
         Analytics.track({
diff --git a/website/client/src/components/settings/subscriptionOptions.vue b/website/client/src/components/settings/subscriptionOptions.vue
index 13fa363ae3..650e908c67 100644
--- a/website/client/src/components/settings/subscriptionOptions.vue
+++ b/website/client/src/components/settings/subscriptionOptions.vue
@@ -125,6 +125,10 @@ export default {
       type: Object,
       default () {},
     },
+    receiverName: {
+      type: String,
+      default: '',
+    },
   },
   data () {
     return {
@@ -135,7 +139,6 @@ export default {
         type: 'subscription',
         subscription: { key: 'basic_earned' },
       },
-      receiverName: '',
     };
   },
   computed: {
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 9d3aea4ff7..4fa86cecf9 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -132,7 +132,8 @@
   "sendGiftTotal": "Total:",
   "sendGiftFromBalance": "From Balance",
   "sendGiftPurchase": "Purchase",
-  "sendGiftMessagePlaceholder": "Personal message (optional)",
+  "sendGiftLabel": "Would you like to send a gift message?",
+  "sendGiftMessagePlaceholder": "Add a gift message",
   "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD",
   "gemGiftsAreOptional": "Please note that Habitica will never require you to gift gems to other players. Begging people for gems is a <strong>violation of the Community Guidelines</strong>, and all such instances should be reported to <%= hrefTechAssistanceEmail %>.",
   "giftMessageTooLong": "The maximum length for gift messages is <%= maxGiftMessageLength %>.",
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 443b4eb8e9..0ebe1a9b7f 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -92,7 +92,7 @@
   "paymentSuccessful": "Your payment was successful!",
   "paymentYouReceived": "You received:",
   "paymentYouSentGems": "You sent <strong><%- name %></strong>:",
-  "paymentYouSentSubscription": "You sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
+  "paymentYouSentSubscription": "You sent <strong><%- name %></strong><br> a <%= months %> month(s) Habitica subscription.",
   "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
   "groupsPaymentSubBilling": "Your next billing date is <strong><%= renewalDate %></strong>.",
   "paymentSubBillingWithMethod": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong> via <strong><%= paymentMethod %></strong>.",

From 6c85b1e047b6cf7a9017c01944e65b36556e6e9a Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 1 Nov 2022 20:59:32 -0500
Subject: [PATCH 129/134] chore(faq): update note on mobile Group Plans

---
 website/common/locales/en/faq.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/common/locales/en/faq.json b/website/common/locales/en/faq.json
index 0008f060b6..08ce04e1a0 100644
--- a/website/common/locales/en/faq.json
+++ b/website/common/locales/en/faq.json
@@ -71,5 +71,5 @@
   "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://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.",
 
   "faqQuestion13": "What is a Group Plan?",
-  "webFaqAnswer13": "## How do Group Plans work?\n\nA [Group Plan](/group-plans) gives your Party or Guild access to a shared task board that’s similar to your personal task board! It’s a shared Habitica experience where tasks can be created and checked off by anyone in the group.\n\nThere are also features available like member roles, status view, and task assigning that give you a more controlled experience. [Visit our wiki](https://habitica.fandom.com/wiki/Group_Plans) to learn more about our Group Plans’ features!\n\n## Who benefits from a Group Plan?\n\nGroup Plans work best when you have a small team of people who want to collaborate together. We recommend 2-5 members.\n\nGroup Plans are great for families, whether it’s a parent and child or you and a partner. Shared goals, chores, or responsibilities are easy to keep track of on one board.\n\nGroup Plans can also be useful for teams of colleagues that have shared goals, or managers that want to introduce their employees to gamification.\n\n## Quick tips for using Groups\n\nHere are some quick tips to get you started with your new Group. We’ll provide more details in the following sections:\n\n* Make a member a manager to give them the ability to create and edit tasks\n* Leave tasks unassigned if anyone can complete it and it only needs done once\n* Assign a task to one person to make sure no one else can complete their task\n* Assign a task to multiple people if they all need to complete it\n* Toggle the ability to display shared tasks on your personal board to not miss anything\n* You get rewarded for the tasks you complete, even multi-assigned\n* Task completion rewards aren’t shared or split between Team members\n* Use task color on the team board to judge the average completion rate of tasks\n* Regularly review the tasks on your Team Board to make sure they are still relevant\n* Missing a Daily won’t damage you or your team, but the task will degrade in color\n\n## How can others in the group create tasks?\n\nOnly the group leader and managers can create tasks. If you’d like a group member to be able to create tasks, then you should promote them to be a manager by going to the Group Information tab, viewing the member list, and clicking the dot icon by their name.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## How do unassigned tasks work?\n\nUnassigned tasks can be completed by anyone in the group, so leave a task unassigned to allow any member to complete it. For example, taking out the trash. Whoever takes out the trash can check off the unassigned task and it will show as completed for everyone.\n\n## How does the synchronized day reset work?\n\nShared tasks will reset at the same time for everyone to keep the shared task board in sync. This time is visible on the shared task board and is determined by the group leader’s day start time. Because shared tasks reset automatically, you will not get a chance to complete yesterday’s uncompleted shared Dailies when you check in the next morning.\n\nShared Dailies will not do damage if they are missed, however they will degrade in color to help visualize progress. We don’t want the shared experience to be a negative one!\n\n## How do I use my Group on the mobile apps?\n\nWhile the mobile apps don’t fully support all Group Plans functionality yet, you can still complete shared tasks from the iOS and Android app. On the browser version of Habitica, go to your group’s shared task board and turn on the copy tasks toggle. Now all open and assigned shared tasks will display on your personal task board across all platforms.\n\n## What’s the difference between a Group’s shared tasks and Challenges?\n\nGroup Plan shared task boards are more dynamic than Challenges, in that they can constantly be updated and interacted with. Challenges are great if you have one set of tasks to send out to many people.\n\nGroup Plans are also a paid feature, while Challenges are available free to everyone.\n\nYou cannot assign specific tasks in Challenges, and Challenges do not have a shared day reset. In general, Challenges offer less control and direct interaction."
+  "webFaqAnswer13": "## How do Group Plans work?\n\nA [Group Plan](/group-plans) gives your Party or Guild access to a shared task board that’s similar to your personal task board! It’s a shared Habitica experience where tasks can be created and checked off by anyone in the group.\n\nThere are also features available like member roles, status view, and task assigning that give you a more controlled experience. [Visit our wiki](https://habitica.fandom.com/wiki/Group_Plans) to learn more about our Group Plans’ features!\n\n## Who benefits from a Group Plan?\n\nGroup Plans work best when you have a small team of people who want to collaborate together. We recommend 2-5 members.\n\nGroup Plans are great for families, whether it’s a parent and child or you and a partner. Shared goals, chores, or responsibilities are easy to keep track of on one board.\n\nGroup Plans can also be useful for teams of colleagues that have shared goals, or managers that want to introduce their employees to gamification.\n\n## Quick tips for using Groups\n\nHere are some quick tips to get you started with your new Group. We’ll provide more details in the following sections:\n\n* Make a member a manager to give them the ability to create and edit tasks\n* Leave tasks unassigned if anyone can complete it and it only needs done once\n* Assign a task to one person to make sure no one else can complete their task\n* Assign a task to multiple people if they all need to complete it\n* Toggle the ability to display shared tasks on your personal board to not miss anything\n* You get rewarded for the tasks you complete, even multi-assigned\n* Task completion rewards aren’t shared or split between Team members\n* Use task color on the team board to judge the average completion rate of tasks\n* Regularly review the tasks on your Team Board to make sure they are still relevant\n* Missing a Daily won’t damage you or your team, but the task will degrade in color\n\n## How can others in the group create tasks?\n\nOnly the group leader and managers can create tasks. If you’d like a group member to be able to create tasks, then you should promote them to be a manager by going to the Group Information tab, viewing the member list, and clicking the dot icon by their name.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## How do unassigned tasks work?\n\nUnassigned tasks can be completed by anyone in the group, so leave a task unassigned to allow any member to complete it. For example, taking out the trash. Whoever takes out the trash can check off the unassigned task and it will show as completed for everyone.\n\n## How does the synchronized day reset work?\n\nShared tasks will reset at the same time for everyone to keep the shared task board in sync. This time is visible on the shared task board and is determined by the group leader’s day start time. Because shared tasks reset automatically, you will not get a chance to complete yesterday’s uncompleted shared Dailies when you check in the next morning.\n\nShared Dailies will not do damage if they are missed, however they will degrade in color to help visualize progress. We don’t want the shared experience to be a negative one!\n\n## How do I use my Group on the mobile apps?\n\nWhile the mobile apps don’t fully support all Group Plans functionality yet, you can still complete shared tasks from the iOS and Android app by copying the tasks onto your personal task board. You can switch this preference on from Settings in the mobile apps or from the group task board on the browser version. Now open and assigned shared tasks will display on your personal task board across all platforms.\n\n## What’s the difference between a Group’s shared tasks and Challenges?\n\nGroup Plan shared task boards are more dynamic than Challenges, in that they can constantly be updated and interacted with. Challenges are great if you have one set of tasks to send out to many people.\n\nGroup Plans are also a paid feature, while Challenges are available free to everyone.\n\nYou cannot assign specific tasks in Challenges, and Challenges do not have a shared day reset. In general, Challenges offer less control and direct interaction."
 }

From 9e98e56e9be1f7462bfedc1226f209cd97f93cd2 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 2 Nov 2022 03:07:23 +0100
Subject: [PATCH 130/134] Allow sub upgrades/downgrades on iOS (#14303)

* Allow sub upgrades/downgrades on iOS

* fix check

* fix(lint): line length

* fix(typo): customER

* fix tests

* Implement correct handling for when subs are up/downgraded

* fix lint errors

* fix test

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
---
 test/api/unit/libs/payments/apple.test.js     | 105 ++++++++-
 test/api/unit/libs/payments/payments.test.js  | 213 +++++++++++++++++-
 website/server/libs/payments/apple.js         |  36 ++-
 website/server/libs/payments/subscriptions.js |  10 +-
 4 files changed, 347 insertions(+), 17 deletions(-)

diff --git a/test/api/unit/libs/payments/apple.test.js b/test/api/unit/libs/payments/apple.test.js
index 1aefe2cb51..32f662d22d 100644
--- a/test/api/unit/libs/payments/apple.test.js
+++ b/test/api/unit/libs/payments/apple.test.js
@@ -218,6 +218,7 @@ describe('Apple Payments', () => {
       headers = {};
       receipt = `{"token": "${token}"}`;
       nextPaymentProcessing = moment.utc().add({ days: 2 });
+      user = new User();
 
       iapSetupStub = sinon.stub(iap, 'setup')
         .resolves();
@@ -298,6 +299,7 @@ describe('Apple Payments', () => {
             expirationDate: moment.utc().add({ day: 1 }).toDate(),
             productId: option.sku,
             transactionId: token,
+            originalTransactionId: token,
           }]);
         sub = common.content.subscriptionBlocks[option.subKey];
 
@@ -321,12 +323,111 @@ describe('Apple Payments', () => {
           nextPaymentProcessing,
         });
       });
+      if (option !== subOptions[3]) {
+        const newOption = subOptions[3];
+        it(`upgrades a subscription from ${option.sku} to ${newOption.sku}`, async () => {
+          const oldSub = common.content.subscriptionBlocks[option.subKey];
+          user.profile.name = 'sender';
+          user.purchased.plan.paymentMethod = applePayments.constants.PAYMENT_METHOD_APPLE;
+          user.purchased.plan.customerId = token;
+          user.purchased.plan.planId = option.subKey;
+          user.purchased.plan.additionalData = receipt;
+          iap.getPurchaseData.restore();
+          iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+            .returns([{
+              expirationDate: moment.utc().add({ day: 2 }).toDate(),
+              productId: newOption.sku,
+              transactionId: `${token}new`,
+              originalTransactionId: token,
+            }]);
+          sub = common.content.subscriptionBlocks[newOption.subKey];
+
+          await applePayments.subscribe(newOption.sku,
+            user,
+            receipt,
+            headers,
+            nextPaymentProcessing);
+
+          expect(iapSetupStub).to.be.calledOnce;
+          expect(iapValidateStub).to.be.calledOnce;
+          expect(iapValidateStub).to.be.calledWith(iap.APPLE, receipt);
+          expect(iapIsValidatedStub).to.be.calledOnce;
+          expect(iapIsValidatedStub).to.be.calledWith({});
+          expect(iapGetPurchaseDataStub).to.be.calledOnce;
+
+          expect(paymentsCreateSubscritionStub).to.be.calledOnce;
+          expect(paymentsCreateSubscritionStub).to.be.calledWith({
+            user,
+            customerId: token,
+            paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
+            sub,
+            headers,
+            additionalData: receipt,
+            nextPaymentProcessing,
+            updatedFrom: oldSub,
+          });
+        });
+      }
+      if (option !== subOptions[0]) {
+        const newOption = subOptions[0];
+        it(`downgrades a subscription from ${option.sku} to ${newOption.sku}`, async () => {
+          const oldSub = common.content.subscriptionBlocks[option.subKey];
+          user.profile.name = 'sender';
+          user.purchased.plan.paymentMethod = applePayments.constants.PAYMENT_METHOD_APPLE;
+          user.purchased.plan.customerId = token;
+          user.purchased.plan.planId = option.subKey;
+          user.purchased.plan.additionalData = receipt;
+          iap.getPurchaseData.restore();
+          iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+            .returns([{
+              expirationDate: moment.utc().add({ day: 2 }).toDate(),
+              productId: newOption.sku,
+              transactionId: `${token}new`,
+              originalTransactionId: token,
+            }]);
+          sub = common.content.subscriptionBlocks[newOption.subKey];
+
+          await applePayments.subscribe(newOption.sku,
+            user,
+            receipt,
+            headers,
+            nextPaymentProcessing);
+
+          expect(iapSetupStub).to.be.calledOnce;
+          expect(iapValidateStub).to.be.calledOnce;
+          expect(iapValidateStub).to.be.calledWith(iap.APPLE, receipt);
+          expect(iapIsValidatedStub).to.be.calledOnce;
+          expect(iapIsValidatedStub).to.be.calledWith({});
+          expect(iapGetPurchaseDataStub).to.be.calledOnce;
+
+          expect(paymentsCreateSubscritionStub).to.be.calledOnce;
+          expect(paymentsCreateSubscritionStub).to.be.calledWith({
+            user,
+            customerId: token,
+            paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
+            sub,
+            headers,
+            additionalData: receipt,
+            nextPaymentProcessing,
+            updatedFrom: oldSub,
+          });
+        });
+      }
     });
 
-    it('errors when a user is already subscribed', async () => {
-      payments.createSubscription.restore();
+    it('errors when a user is using the same subscription', async () => {
       user = new User();
       await user.save();
+      payments.createSubscription.restore();
+
+      iap.getPurchaseData.restore();
+      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+        .returns([{
+          expirationDate: moment.utc().add({ day: 1 }).toDate(),
+          productId: sku,
+          transactionId: token,
+          originalTransactionId: token,
+        }]);
 
       await applePayments.subscribe(sku, user, receipt, headers, nextPaymentProcessing);
 
diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index 65b42b42f3..84475e4b0e 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -465,6 +465,89 @@ describe('payments/index', () => {
           },
         });
       });
+
+      context('Upgrades subscription', () => {
+        it('from basic_earned to basic_6mo', async () => {
+          data.sub.key = 'basic_earned';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+          const created = user.purchased.plan.dateCreated;
+          const updated = user.purchased.plan.dateUpdated;
+
+          data.sub.key = 'basic_6mo';
+          data.updatedFrom = { key: 'basic_earned' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.dateCreated).to.eql(created);
+          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+        });
+
+        it('from basic_3mo to basic_12mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_3mo');
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+          const created = user.purchased.plan.dateCreated;
+          const updated = user.purchased.plan.dateUpdated;
+
+          data.sub.key = 'basic_12mo';
+          data.updatedFrom = { key: 'basic_3mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.dateCreated).to.eql(created);
+          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+        });
+      });
+
+      context('Downgrades subscription', () => {
+        it('from basic_6mo to basic_earned', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+          const created = user.purchased.plan.dateCreated;
+          const updated = user.purchased.plan.dateUpdated;
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.dateCreated).to.eql(created);
+          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+        });
+
+        it('from basic_12mo to basic_3mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          data.sub.key = 'basic_12mo';
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+          const created = user.purchased.plan.dateCreated;
+          const updated = user.purchased.plan.dateUpdated;
+
+          data.sub.key = 'basic_3mo';
+          data.updatedFrom = { key: 'basic_12mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_3mo');
+          expect(user.purchased.plan.dateCreated).to.eql(created);
+          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
+          expect(user.purchased.plan.customerId).to.eql('customer-id');
+        });
+      });
     });
 
     context('Block subscription perks', () => {
@@ -488,7 +571,6 @@ describe('payments/index', () => {
 
       it('adds 10 to plan.consecutive.gemCapExtra for 6 month block', async () => {
         data.sub.key = 'basic_6mo';
-
         await api.createSubscription(data);
 
         expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
@@ -496,7 +578,6 @@ describe('payments/index', () => {
 
       it('adds 20 to plan.consecutive.gemCapExtra for 12 month block', async () => {
         data.sub.key = 'basic_12mo';
-
         await api.createSubscription(data);
 
         expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
@@ -532,6 +613,134 @@ describe('payments/index', () => {
 
         expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
       });
+
+      context('Upgrades subscription', () => {
+        it('Adds 10 to plan.consecutive.gemCapExtra from basic_earned to basic_6mo', async () => {
+          data.sub.key = 'basic_earned';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
+
+          data.sub.key = 'basic_6mo';
+          data.updatedFrom = { key: 'basic_earned' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+        });
+
+        it('Adds 15 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_3mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(5);
+
+          data.sub.key = 'basic_12mo';
+          data.updatedFrom = { key: 'basic_3mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
+        });
+
+        it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo', async () => {
+          data.sub.key = 'basic_earned';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
+
+          data.sub.key = 'basic_6mo';
+          data.updatedFrom = { key: 'basic_earned' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+        });
+
+        it('Adds 3 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_3mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
+
+          data.sub.key = 'basic_12mo';
+          data.updatedFrom = { key: 'basic_3mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
+        });
+      });
+
+      context('Downgrades subscription', () => {
+        it('does not remove from plan.consecutive.gemCapExtra from basic_6mo to basic_earned', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
+        });
+
+        it('does not remove from plan.consecutive.gemCapExtra from basic_12mo to basic_3mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          data.sub.key = 'basic_12mo';
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
+
+          data.sub.key = 'basic_3mo';
+          data.updatedFrom = { key: 'basic_12mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
+        });
+
+        it('does not remove from plan.consecutive.trinkets from basic_6mo to basic_earned', async () => {
+          data.sub.key = 'basic_6mo';
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_6mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+
+          data.sub.key = 'basic_earned';
+          data.updatedFrom = { key: 'basic_6mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.planId).to.eql('basic_earned');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
+        });
+
+        it('does not remove from plan.consecutive.trinkets from basic_12mo to basic_3mo', async () => {
+          expect(user.purchased.plan.planId).to.not.exist;
+
+          data.sub.key = 'basic_12mo';
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.planId).to.eql('basic_12mo');
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
+
+          data.sub.key = 'basic_3mo';
+          data.updatedFrom = { key: 'basic_12mo' };
+          await api.createSubscription(data);
+          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
+        });
+      });
     });
 
     context('Mystery Items', () => {
diff --git a/website/server/libs/payments/apple.js b/website/server/libs/payments/apple.js
index 8c0fd44184..e91729a7e0 100644
--- a/website/server/libs/payments/apple.js
+++ b/website/server/libs/payments/apple.js
@@ -106,10 +106,6 @@ api.verifyGemPurchase = async function verifyGemPurchase (options) {
 };
 
 api.subscribe = async function subscribe (sku, user, receipt, headers, nextPaymentProcessing) {
-  if (user && user.isSubscribed()) {
-    throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
-  }
-
   if (!sku) throw new BadRequest(shared.i18n.t('missingSubscriptionCode'));
 
   let subCode;
@@ -140,33 +136,49 @@ api.subscribe = async function subscribe (sku, user, receipt, headers, nextPayme
     throw new NotAuthorized(api.constants.RESPONSE_NO_ITEM_PURCHASED);
   }
 
-  let transactionId;
+  let originalTransactionId;
+  let newTransactionId;
 
   for (const purchaseData of purchaseDataList) {
     const dateTerminated = new Date(Number(purchaseData.expirationDate));
     if (purchaseData.productId === sku && dateTerminated > new Date()) {
-      transactionId = purchaseData.transactionId;
+      originalTransactionId = purchaseData.originalTransactionId;
+      newTransactionId = purchaseData.transactionId;
       break;
     }
   }
 
-  if (transactionId) {
+  if (originalTransactionId) {
+    let existingSub;
+    if (user && user.isSubscribed()) {
+      if (user.purchased.plan.customerId !== originalTransactionId) {
+        throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
+      }
+      existingSub = shared.content.subscriptionBlocks[user.purchased.plan.planId];
+    }
     const existingUser = await User.findOne({
-      'purchased.plan.customerId': transactionId,
+      'purchased.plan.customerId': originalTransactionId,
     }).exec();
-    if (existingUser) throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
+    if (existingUser
+      && (originalTransactionId === newTransactionId || existingUser._id !== user._id)) {
+      throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
+    }
 
     nextPaymentProcessing = nextPaymentProcessing || moment.utc().add({ days: 2 }); // eslint-disable-line max-len, no-param-reassign
 
-    await payments.createSubscription({
+    const data = {
       user,
-      customerId: transactionId,
+      customerId: originalTransactionId,
       paymentMethod: this.constants.PAYMENT_METHOD_APPLE,
       sub,
       headers,
       nextPaymentProcessing,
       additionalData: receipt,
-    });
+    };
+    if (existingSub) {
+      data.updatedFrom = existingSub;
+    }
+    await payments.createSubscription(data);
   } else {
     throw new NotAuthorized(api.constants.RESPONSE_INVALID_RECEIPT);
   }
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index e88cf30937..bb5411e9f7 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -75,7 +75,15 @@ async function prepareSubscriptionValues (data) {
     ? data.gift.subscription.key
     : data.sub.key];
   const autoRenews = data.autoRenews !== undefined ? data.autoRenews : true;
-  const months = Number(block.months);
+  const updatedFrom = data.updatedFrom
+    ? shared.content.subscriptionBlocks[data.updatedFrom.key]
+    : undefined;
+  let months;
+  if (updatedFrom && Number(updatedFrom.months) !== 1) {
+    months = Math.max(0, Number(block.months) - Number(updatedFrom.months));
+  } else {
+    months = Number(block.months);
+  }
   const today = new Date();
   let group;
   let groupId;

From accf7e2897e375dbfa3571341c81883c75d39cfe Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 1 Nov 2022 21:10:41 -0500
Subject: [PATCH 131/134] 4.248.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 167c230096..5b0fa86803 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.248.0",
+  "version": "4.248.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4a652831f4..0cd89e5ab9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.248.0",
+  "version": "4.248.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.19.3",

From 9b1a7268753f5536749632e771c005b3474bb6ff Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 2 Nov 2022 09:00:29 -0500
Subject: [PATCH 132/134] Revert "feat(subs): allow upgrade/downgrade on iOS"

This reverts commit 27440772f0541e0db97cdb83c21b46815ff37f5a.
---
 test/api/unit/libs/payments/apple.test.js     | 103 +--------
 test/api/unit/libs/payments/payments.test.js  | 213 +-----------------
 website/server/libs/payments/apple.js         |  36 +--
 website/server/libs/payments/subscriptions.js |  10 +-
 4 files changed, 16 insertions(+), 346 deletions(-)

diff --git a/test/api/unit/libs/payments/apple.test.js b/test/api/unit/libs/payments/apple.test.js
index 1c6c112b7a..1aefe2cb51 100644
--- a/test/api/unit/libs/payments/apple.test.js
+++ b/test/api/unit/libs/payments/apple.test.js
@@ -218,7 +218,6 @@ describe('Apple Payments', () => {
       headers = {};
       receipt = `{"token": "${token}"}`;
       nextPaymentProcessing = moment.utc().add({ days: 2 });
-      user = new User();
 
       iapSetupStub = sinon.stub(iap, 'setup')
         .resolves();
@@ -299,7 +298,6 @@ describe('Apple Payments', () => {
             expirationDate: moment.utc().add({ day: 1 }).toDate(),
             productId: option.sku,
             transactionId: token,
-            originalTransactionId: token,
           }]);
         sub = common.content.subscriptionBlocks[option.subKey];
 
@@ -323,111 +321,12 @@ describe('Apple Payments', () => {
           nextPaymentProcessing,
         });
       });
-      if (option !== subOptions[3]) {
-        const newOption = subOptions[3];
-        it(`upgrades a subscription from ${option.sku} to ${newOption.sku}`, async () => {
-          const oldSub = common.content.subscriptionBlocks[option.subKey];
-          user.profile.name = 'sender';
-          user.purchased.plan.paymentMethod = applePayments.constants.PAYMENT_METHOD_APPLE;
-          user.purchased.plan.customerId = token;
-          user.purchased.plan.planId = option.subKey;
-          user.purchased.plan.additionalData = receipt;
-          iap.getPurchaseData.restore();
-          iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
-            .returns([{
-              expirationDate: moment.utc().add({ day: 2 }).toDate(),
-              productId: newOption.sku,
-              transactionId: `${token}new`,
-              originalTransactionId: token,
-            }]);
-          sub = common.content.subscriptionBlocks[newOption.subKey];
-
-          await applePayments.subscribe(newOption.sku,
-            user,
-            receipt,
-            headers,
-            nextPaymentProcessing);
-
-          expect(iapSetupStub).to.be.calledOnce;
-          expect(iapValidateStub).to.be.calledOnce;
-          expect(iapValidateStub).to.be.calledWith(iap.APPLE, receipt);
-          expect(iapIsValidatedStub).to.be.calledOnce;
-          expect(iapIsValidatedStub).to.be.calledWith({});
-          expect(iapGetPurchaseDataStub).to.be.calledOnce;
-
-          expect(paymentsCreateSubscritionStub).to.be.calledOnce;
-          expect(paymentsCreateSubscritionStub).to.be.calledWith({
-            user,
-            customerId: token,
-            paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
-            sub,
-            headers,
-            additionalData: receipt,
-            nextPaymentProcessing,
-            updatedFrom: oldSub,
-          });
-        });
-      }
-      if (option !== subOptions[0]) {
-        const newOption = subOptions[0];
-        it(`downgrades a subscription from ${option.sku} to ${newOption.sku}`, async () => {
-          const oldSub = common.content.subscriptionBlocks[option.subKey];
-          user.profile.name = 'sender';
-          user.purchased.plan.paymentMethod = applePayments.constants.PAYMENT_METHOD_APPLE;
-          user.purchased.plan.customerId = token;
-          user.purchased.plan.planId = option.subKey;
-          user.purchased.plan.additionalData = receipt;
-          iap.getPurchaseData.restore();
-          iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
-            .returns([{
-              expirationDate: moment.utc().add({ day: 2 }).toDate(),
-              productId: newOption.sku,
-              transactionId: `${token}new`,
-              originalTransactionId: token,
-            }]);
-          sub = common.content.subscriptionBlocks[newOption.subKey];
-
-          await applePayments.subscribe(newOption.sku,
-            user,
-            receipt,
-            headers,
-            nextPaymentProcessing);
-
-          expect(iapSetupStub).to.be.calledOnce;
-          expect(iapValidateStub).to.be.calledOnce;
-          expect(iapValidateStub).to.be.calledWith(iap.APPLE, receipt);
-          expect(iapIsValidatedStub).to.be.calledOnce;
-          expect(iapIsValidatedStub).to.be.calledWith({});
-          expect(iapGetPurchaseDataStub).to.be.calledOnce;
-
-          expect(paymentsCreateSubscritionStub).to.be.calledOnce;
-          expect(paymentsCreateSubscritionStub).to.be.calledWith({
-            user,
-            customerId: token,
-            paymentMethod: applePayments.constants.PAYMENT_METHOD_APPLE,
-            sub,
-            headers,
-            additionalData: receipt,
-            nextPaymentProcessing,
-            updatedFrom: oldSub,
-          });
-        });
-      }
     });
 
-    it('errors when a user is using the same subscription', async () => {
+    it('errors when a user is already subscribed', async () => {
       payments.createSubscription.restore();
       user = new User();
       await user.save();
-      iap.getPurchaseData.restore();
-
-      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
-        .returns([{
-          expirationDate: moment.utc().add({ day: 1 }).toDate(),
-          productId: sku,
-          transactionId: token,
-          originalTransactionId: token,
-        }]);
 
       await applePayments.subscribe(sku, user, receipt, headers, nextPaymentProcessing);
 
diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index 75500e28f5..48d6325546 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -445,89 +445,6 @@ describe('payments/index', () => {
           },
         });
       });
-
-      context('Upgrades subscription', () => {
-        it('from basic_earned to basic_6mo', async () => {
-          data.sub.key = 'basic_earned';
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_earned');
-          expect(user.purchased.plan.customerId).to.eql('customer-id');
-          const created = user.purchased.plan.dateCreated;
-          const updated = user.purchased.plan.dateUpdated;
-
-          data.sub.key = 'basic_6mo';
-          data.updatedFrom = { key: 'basic_earned' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_6mo');
-          expect(user.purchased.plan.dateCreated).to.eql(created);
-          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
-          expect(user.purchased.plan.customerId).to.eql('customer-id');
-        });
-
-        it('from basic_3mo to basic_12mo', async () => {
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_3mo');
-          expect(user.purchased.plan.customerId).to.eql('customer-id');
-          const created = user.purchased.plan.dateCreated;
-          const updated = user.purchased.plan.dateUpdated;
-
-          data.sub.key = 'basic_12mo';
-          data.updatedFrom = { key: 'basic_3mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_12mo');
-          expect(user.purchased.plan.dateCreated).to.eql(created);
-          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
-          expect(user.purchased.plan.customerId).to.eql('customer-id');
-        });
-      });
-
-      context('Downgrades subscription', () => {
-        it('from basic_6mo to basic_earned', async () => {
-          data.sub.key = 'basic_6mo';
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_6mo');
-          expect(user.purchased.plan.customerId).to.eql('customer-id');
-          const created = user.purchased.plan.dateCreated;
-          const updated = user.purchased.plan.dateUpdated;
-
-          data.sub.key = 'basic_earned';
-          data.updatedFrom = { key: 'basic_6mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_earned');
-          expect(user.purchased.plan.dateCreated).to.eql(created);
-          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
-          expect(user.purchased.plan.customerId).to.eql('customer-id');
-        });
-
-        it('from basic_12mo to basic_3mo', async () => {
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          data.sub.key = 'basic_12mo';
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_12mo');
-          expect(user.purchased.plan.customerId).to.eql('customer-id');
-          const created = user.purchased.plan.dateCreated;
-          const updated = user.purchased.plan.dateUpdated;
-
-          data.sub.key = 'basic_3mo';
-          data.updatedFrom = { key: 'basic_12mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_3mo');
-          expect(user.purchased.plan.dateCreated).to.eql(created);
-          expect(user.purchased.plan.dateUpdated).to.not.eql(updated);
-          expect(user.purchased.plan.customerId).to.eql('customer-id');
-        });
-      });
     });
 
     context('Block subscription perks', () => {
@@ -551,6 +468,7 @@ describe('payments/index', () => {
 
       it('adds 10 to plan.consecutive.gemCapExtra for 6 month block', async () => {
         data.sub.key = 'basic_6mo';
+
         await api.createSubscription(data);
 
         expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
@@ -558,6 +476,7 @@ describe('payments/index', () => {
 
       it('adds 20 to plan.consecutive.gemCapExtra for 12 month block', async () => {
         data.sub.key = 'basic_12mo';
+
         await api.createSubscription(data);
 
         expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
@@ -593,134 +512,6 @@ describe('payments/index', () => {
 
         expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
       });
-
-      context('Upgrades subscription', () => {
-        it('Adds 10 to plan.consecutive.gemCapExtra from basic_earned to basic_6mo', async () => {
-          data.sub.key = 'basic_earned';
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_earned');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(0);
-
-          data.sub.key = 'basic_6mo';
-          data.updatedFrom = { key: 'basic_earned' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_6mo');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
-        });
-
-        it('Adds 15 to plan.consecutive.gemCapExtra when upgrading from basic_3mo to basic_12mo', async () => {
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_3mo');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(5);
-
-          data.sub.key = 'basic_12mo';
-          data.updatedFrom = { key: 'basic_3mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_12mo');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
-        });
-
-        it('Adds 2 to plan.consecutive.trinkets from basic_earned to basic_6mo', async () => {
-          data.sub.key = 'basic_earned';
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_earned');
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(0);
-
-          data.sub.key = 'basic_6mo';
-          data.updatedFrom = { key: 'basic_earned' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_6mo');
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
-        });
-
-        it('Adds 3 to plan.consecutive.trinkets when upgrading from basic_3mo to basic_12mo', async () => {
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_3mo');
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(1);
-
-          data.sub.key = 'basic_12mo';
-          data.updatedFrom = { key: 'basic_3mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_12mo');
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
-        });
-      });
-
-      context('Downgrades subscription', () => {
-        it('does not remove from plan.consecutive.gemCapExtra from basic_6mo to basic_earned', async () => {
-          data.sub.key = 'basic_6mo';
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_6mo');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
-
-          data.sub.key = 'basic_earned';
-          data.updatedFrom = { key: 'basic_6mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_earned');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(10);
-        });
-
-        it('does not remove from plan.consecutive.gemCapExtra from basic_12mo to basic_3mo', async () => {
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          data.sub.key = 'basic_12mo';
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_12mo');
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
-
-          data.sub.key = 'basic_3mo';
-          data.updatedFrom = { key: 'basic_12mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.consecutive.gemCapExtra).to.eql(20);
-        });
-
-        it('does not remove from plan.consecutive.trinkets from basic_6mo to basic_earned', async () => {
-          data.sub.key = 'basic_6mo';
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_6mo');
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
-
-          data.sub.key = 'basic_earned';
-          data.updatedFrom = { key: 'basic_6mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.planId).to.eql('basic_earned');
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(2);
-        });
-
-        it('does not remove from plan.consecutive.trinkets from basic_12mo to basic_3mo', async () => {
-          expect(user.purchased.plan.planId).to.not.exist;
-
-          data.sub.key = 'basic_12mo';
-          await api.createSubscription(data);
-
-          expect(user.purchased.plan.planId).to.eql('basic_12mo');
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
-
-          data.sub.key = 'basic_3mo';
-          data.updatedFrom = { key: 'basic_12mo' };
-          await api.createSubscription(data);
-          expect(user.purchased.plan.consecutive.trinkets).to.eql(4);
-        });
-      });
     });
 
     context('Mystery Items', () => {
diff --git a/website/server/libs/payments/apple.js b/website/server/libs/payments/apple.js
index e91729a7e0..8c0fd44184 100644
--- a/website/server/libs/payments/apple.js
+++ b/website/server/libs/payments/apple.js
@@ -106,6 +106,10 @@ api.verifyGemPurchase = async function verifyGemPurchase (options) {
 };
 
 api.subscribe = async function subscribe (sku, user, receipt, headers, nextPaymentProcessing) {
+  if (user && user.isSubscribed()) {
+    throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
+  }
+
   if (!sku) throw new BadRequest(shared.i18n.t('missingSubscriptionCode'));
 
   let subCode;
@@ -136,49 +140,33 @@ api.subscribe = async function subscribe (sku, user, receipt, headers, nextPayme
     throw new NotAuthorized(api.constants.RESPONSE_NO_ITEM_PURCHASED);
   }
 
-  let originalTransactionId;
-  let newTransactionId;
+  let transactionId;
 
   for (const purchaseData of purchaseDataList) {
     const dateTerminated = new Date(Number(purchaseData.expirationDate));
     if (purchaseData.productId === sku && dateTerminated > new Date()) {
-      originalTransactionId = purchaseData.originalTransactionId;
-      newTransactionId = purchaseData.transactionId;
+      transactionId = purchaseData.transactionId;
       break;
     }
   }
 
-  if (originalTransactionId) {
-    let existingSub;
-    if (user && user.isSubscribed()) {
-      if (user.purchased.plan.customerId !== originalTransactionId) {
-        throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
-      }
-      existingSub = shared.content.subscriptionBlocks[user.purchased.plan.planId];
-    }
+  if (transactionId) {
     const existingUser = await User.findOne({
-      'purchased.plan.customerId': originalTransactionId,
+      'purchased.plan.customerId': transactionId,
     }).exec();
-    if (existingUser
-      && (originalTransactionId === newTransactionId || existingUser._id !== user._id)) {
-      throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
-    }
+    if (existingUser) throw new NotAuthorized(this.constants.RESPONSE_ALREADY_USED);
 
     nextPaymentProcessing = nextPaymentProcessing || moment.utc().add({ days: 2 }); // eslint-disable-line max-len, no-param-reassign
 
-    const data = {
+    await payments.createSubscription({
       user,
-      customerId: originalTransactionId,
+      customerId: transactionId,
       paymentMethod: this.constants.PAYMENT_METHOD_APPLE,
       sub,
       headers,
       nextPaymentProcessing,
       additionalData: receipt,
-    };
-    if (existingSub) {
-      data.updatedFrom = existingSub;
-    }
-    await payments.createSubscription(data);
+    });
   } else {
     throw new NotAuthorized(api.constants.RESPONSE_INVALID_RECEIPT);
   }
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index 068197b839..80401f21de 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -71,15 +71,7 @@ async function createSubscription (data) {
     ? data.gift.subscription.key
     : data.sub.key];
   const autoRenews = data.autoRenews !== undefined ? data.autoRenews : true;
-  const updatedFrom = data.updatedFrom
-    ? shared.content.subscriptionBlocks[data.updatedFrom.key]
-    : undefined;
-  let months;
-  if (updatedFrom && Number(updatedFrom.months) !== 1) {
-    months = Math.max(0, Number(block.months) - Number(updatedFrom.months));
-  } else {
-    months = Number(block.months);
-  }
+  const months = Number(block.months);
   const today = new Date();
   let group;
   let groupId;

From c7e73f9b852f736ce655238d16d04c4bec6ba769 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 2 Nov 2022 09:04:03 -0500
Subject: [PATCH 133/134] 4.248.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5b0fa86803..3ecf11767f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.248.1",
+  "version": "4.248.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0cd89e5ab9..ff94d61000 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.248.1",
+  "version": "4.248.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.19.3",

From eee8ad202985e7025ef430685ee35bd0f13baaae Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 1 Nov 2022 22:23:00 -0500
Subject: [PATCH 134/134] fix(css): correct broken task creation dropdown on
 groups

---
 .../src/components/group-plans/taskInformation.vue     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/website/client/src/components/group-plans/taskInformation.vue b/website/client/src/components/group-plans/taskInformation.vue
index eec37e17aa..a77b09f5d0 100644
--- a/website/client/src/components/group-plans/taskInformation.vue
+++ b/website/client/src/components/group-plans/taskInformation.vue
@@ -45,7 +45,7 @@
           v-html="$t('dayStart', { startTime: groupStartTime } )"
         >
         </div>
-        <div class="ml-2">
+        <div class="create-task-area ml-2">
           <button
             id="create-task-btn"
             v-if="canCreateTasks"
@@ -132,6 +132,14 @@
     margin-bottom: 0px;
   }
 
+  .create-task-area {
+    position: inherit;
+
+    .dropdown {
+      right: 24px;
+    }
+  }
+
   .day-start {
     height: 2rem;
     padding: 0.25rem 0.75rem;