Merge branch 'develop' into quest-refactors

migrations/archive/2022/20220309_pet_group_achievements.js

@@ -0,0 +1,138 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20220309_pet_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['FlyingPig-Base']
+      && pets['FlyingPig-CottonCandyBlue']
+      && pets['FlyingPig-CottonCandyPink']
+      && pets['FlyingPig-Desert']
+      && pets['FlyingPig-Golden']
+      && pets['FlyingPig-Red']
+      && pets['FlyingPig-Shade']
+      && pets['FlyingPig-Skeleton']
+      && pets['FlyingPig-White']
+      && pets['FlyingPig-Zombie']
+      && pets['Owl-Base']
+      && pets['Owl-CottonCandyBlue']
+      && pets['Owl-CottonCandyPink']
+      && pets['Owl-Desert']
+      && pets['Owl-Golden']
+      && pets['Owl-Red']
+      && pets['Owl-Shade']
+      && pets['Owl-Skeleton']
+      && pets['Owl-White']
+      && pets['Owl-Zombie']
+      && pets['Parrot-Base']
+      && pets['Parrot-CottonCandyBlue']
+      && pets['Parrot-CottonCandyPink']
+      && pets['Parrot-Desert']
+      && pets['Parrot-Golden']
+      && pets['Parrot-Red']
+      && pets['Parrot-Shade']
+      && pets['Parrot-Skeleton']
+      && pets['Parrot-White']
+      && pets['Parrot-Zombie']
+      && pets['Rooster-Base']
+      && pets['Rooster-CottonCandyBlue']
+      && pets['Rooster-CottonCandyPink']
+      && pets['Rooster-Desert']
+      && pets['Rooster-Golden']
+      && pets['Rooster-Red']
+      && pets['Rooster-Shade']
+      && pets['Rooster-Skeleton']
+      && pets['Rooster-White']
+      && pets['Rooster-Zombie']
+      && pets['Pterodactyl-Base']
+      && pets['Pterodactyl-CottonCandyBlue']
+      && pets['Pterodactyl-CottonCandyPink']
+      && pets['Pterodactyl-Desert']
+      && pets['Pterodactyl-Golden']
+      && pets['Pterodactyl-Red']
+      && pets['Pterodactyl-Shade']
+      && pets['Pterodactyl-Skeleton']
+      && pets['Pterodactyl-White']
+      && pets['Pterodactyl-Zombie']
+      && pets['Gryphon-Base']
+      && pets['Gryphon-CottonCandyBlue']
+      && pets['Gryphon-CottonCandyPink']
+      && pets['Gryphon-Desert']
+      && pets['Gryphon-Golden']
+      && pets['Gryphon-Red']
+      && pets['Gryphon-Shade']
+      && pets['Gryphon-Skeleton']
+      && pets['Gryphon-White']
+      && pets['Gryphon-Zombie']
+      && pets['Falcon-Base']
+      && pets['Falcon-CottonCandyBlue']
+      && pets['Falcon-CottonCandyPink']
+      && pets['Falcon-Desert']
+      && pets['Falcon-Golden']
+      && pets['Falcon-Red']
+      && pets['Falcon-Shade']
+      && pets['Falcon-Skeleton']
+      && pets['Falcon-White']
+      && pets['Falcon-Zombie']
+      && pets['Peacock-Base']
+      && pets['Peacock-CottonCandyBlue']
+      && pets['Peacock-CottonCandyPink']
+      && pets['Peacock-Desert']
+      && pets['Peacock-Golden']
+      && pets['Peacock-Red']
+      && pets['Peacock-Shade']
+      && pets['Peacock-Skeleton']
+      && pets['Peacock-White']
+      && pets['Peacock-Zombie']) {
+        set['achievements.birdsOfAFeather'] = 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('2021-08-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
+  }
+};

migrations/users/pi-day.js

@@ -3,13 +3,13 @@ import { v4 as uuid } from 'uuid';
 
 import { model as User } from '../../website/server/models/user';
 
-const MIGRATION_NAME = '20210314_pi_day';
+const MIGRATION_NAME = '20220314_pi_day';
 
 const progressCount = 1000;
 let count = 0;
 
 async function updateUser (user) {
-  count *= 1;
+  count += 1;
 
   const inc = {
     'items.food.Pie_Skeleton': 1,
@@ -54,7 +54,7 @@ async function updateUser (user) {
 export default async function processUsers () {
   const query = {
     migration: { $ne: MIGRATION_NAME },
-    'auth.timestamps.loggedin': { $gt: new Date('2021-02-15') },
+    'auth.timestamps.loggedin': { $gt: new Date('2022-02-15') },
   };
 
   const fields = {

package.json

@@ -1,22 +1,22 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.221.0",
+  "version": "4.226.1",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@babel/core": "^7.17.2",
+    "@babel/core": "^7.17.8",
     "@babel/preset-env": "^7.16.11",
-    "@babel/register": "^7.17.0",
+    "@babel/register": "^7.17.7",
     "@google-cloud/trace-agent": "^5.1.6",
-    "@parse/node-apn": "^5.1.0",
+    "@parse/node-apn": "^5.1.3",
     "@slack/webhook": "^6.1.0",
     "accepts": "^1.3.8",
     "amazon-payments": "^0.2.9",
-    "amplitude": "^5.2.0",
+    "amplitude": "^6.0.0",
-    "apidoc": "^0.50.4",
+    "apidoc": "^0.51.0",
     "apple-auth": "^1.0.7",
     "bcrypt": "^5.0.1",
-    "body-parser": "^1.19.1",
+    "body-parser": "^1.20.0",
     "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.17.2",
+    "express": "^4.17.3",
     "express-basic-auth": "^1.2.1",
     "express-validator": "^5.2.0",
     "glob": "^7.2.0",
@@ -47,7 +47,7 @@
     "lodash": "^4.17.21",
     "merge-stream": "^2.0.0",
     "method-override": "^3.0.0",
-    "moment": "^2.29.1",
+    "moment": "^2.29.2",
     "moment-recur": "^1.0.7",
     "mongoose": "^5.13.7",
     "morgan": "^1.10.0",
@@ -67,14 +67,14 @@
     "remove-markdown": "^0.3.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.0",
-    "stripe": "^8.202.0",
+    "stripe": "^8.215.0",
-    "superagent": "^7.1.1",
+    "superagent": "^7.1.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.5.1",
+    "winston": "^3.6.0",
     "winston-loggly-bulk": "^3.2.1",
     "xml2js": "^0.4.23"
   },
@@ -106,11 +106,11 @@
     "start": "gulp nodemon",
     "debug": "gulp nodemon --inspect",
     "mongo:dev": "run-rs -v 4.2.8 -l ubuntu1804 --keep --dbpath mongodb-data --number 1 --quiet",
-    "postinstall": "gulp build && cd website/client && npm install",
+    "postinstall": "git config --global url.\"https://\".insteadOf git:// && gulp build && cd website/client && npm install",
     "apidoc": "gulp apidoc"
   },
   "devDependencies": {
-    "axios": "^0.25.0",
+    "axios": "^0.26.1",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "chai-moment": "^0.1.0",
@@ -122,7 +122,7 @@
     "monk": "^7.3.4",
     "require-again": "^2.0.0",
     "run-rs": "^0.7.6",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "sinon-stub-promise": "^4.0.0"
   },

test/api/unit/libs/payments/google.test.js

@@ -256,7 +256,7 @@ describe('Google Payments', () => {
           expirationDate,
         });
       iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
-        .returns([{ expirationDate: expirationDate.toDate() }]);
+        .returns([{ expirationDate: expirationDate.toDate(), autoRenewing: false }]);
       iapIsValidatedStub = sinon.stub(iap, 'isValidated')
         .returns(true);
 
@@ -325,5 +325,26 @@ describe('Google Payments', () => {
         headers,
       });
     });
+
+    it('should not cancel a user subscription with autorenew', async () => {
+      iap.getPurchaseData.restore();
+      iapGetPurchaseDataStub = sinon.stub(iap, 'getPurchaseData')
+        .returns([{ autoRenewing: true }]);
+      await googlePayments.cancelSubscribe(user, headers);
+
+      expect(iapSetupStub).to.be.calledOnce;
+      expect(iapValidateStub).to.be.calledOnce;
+      expect(iapValidateStub).to.be.calledWith(iap.GOOGLE, {
+        data: receipt,
+        signature,
+      });
+      expect(iapIsValidatedStub).to.be.calledOnce;
+      expect(iapIsValidatedStub).to.be.calledWith({
+        expirationDate,
+      });
+      expect(iapGetPurchaseDataStub).to.be.calledOnce;
+
+      expect(paymentCancelSubscriptionSpy).to.not.be.called;
+    });
   });
 });

test/api/unit/middlewares/cronMiddleware.js

@@ -128,6 +128,22 @@ describe('cron middleware', () => {
     });
   });
 
+  it('runs cron if previous cron was incomplete', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 1 });
+    user.auth.timestamps.loggedin = moment(new Date()).subtract({ days: 4 });
+    const now = new Date();
+    await user.save();
+
+    await new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        expect(moment(now).isSame(user.lastCron, 'day'));
+        expect(moment(now).isSame(user.auth.timestamps.loggedin, 'day'));
+        return resolve();
+      });
+    });
+  });
+
   it('updates user.auth.timestamps.loggedin and lastCron', async () => {
     user.lastCron = moment(new Date()).subtract({ days: 2 });
     const now = new Date();
@@ -293,4 +309,33 @@ describe('cron middleware', () => {
       });
     });
   });
+
+  it('cron should not run more than once', async () => {
+    user.lastCron = moment(new Date()).subtract({ days: 2 });
+    await user.save();
+
+    sandbox.spy(cronLib, 'cron');
+
+    await Promise.all([new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        return resolve();
+      });
+    }), new Promise((resolve, reject) => {
+      cronMiddleware(req, res, err => {
+        if (err) return reject(err);
+        return resolve();
+      });
+    }), new Promise((resolve, reject) => {
+      setTimeout(() => {
+        cronMiddleware(req, res, err => {
+          if (err) return reject(err);
+          return resolve();
+        });
+      }, 400);
+    }),
+    ]);
+
+    expect(cronLib.cron).to.be.calledOnce;
+  });
 });

test/api/unit/models/user.test.js

@@ -811,6 +811,16 @@ describe('User Model', () => {
       expect(daysMissed).to.eql(5);
     });
 
+    it('correctly handles a cron that did not complete', () => {
+      const now = moment();
+      user.lastCron = moment(now).subtract(2, 'days');
+      user.auth.timestamps.loggedIn = moment(now).subtract(5, 'days');
+
+      const { daysMissed } = user.daysUserHasMissed(now);
+
+      expect(daysMissed).to.eql(5);
+    });
+
     it('uses timezone from preferences to calculate days missed', () => {
       const now = moment('2017-07-08 01:00:00Z');
       user.lastCron = moment('2017-07-04 13:00:00Z');

test/common/libs/cron.test.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-import { startOfDay, daysSince } from '../../../website/common/script/cron';
+import { startOfDay, daysSince, getPlanContext } from '../../../website/common/script/cron';
 
 function localMoment (timeString, utcOffset) {
   return moment(timeString).utcOffset(utcOffset, true);
@@ -181,4 +181,63 @@ describe('cron utility functions', () => {
       expect(result).to.equal(0);
     });
   });
+
+  describe('getPlanContext', () => {
+    const now = new Date(2022, 5, 1);
+
+    function baseUserData (count, offset, planId) {
+      return {
+        purchased: {
+          plan: {
+            consecutive: {
+              count,
+              offset,
+              gemCapExtra: 25,
+              trinkets: 19,
+            },
+            quantity: 1,
+            extraMonths: 0,
+            gemsBought: 0,
+            owner: '116b4133-8fb7-43f2-b0de-706621a8c9d8',
+            nextBillingDate: null,
+            nextPaymentProcessing: null,
+            planId,
+            customerId: 'group-plan',
+            dateUpdated: '2022-05-10T03:00:00.144+01:00',
+            paymentMethod: 'Group Plan',
+            dateTerminated: null,
+            lastBillingDate: null,
+            dateCreated: '2017-02-10T19:00:00.355+01:00',
+          },
+        },
+      };
+    }
+
+    it('offset 0, next date in 3 months', () => {
+      const user = baseUserData(60, 0, 'group_plan_auto');
+
+      const planContext = getPlanContext(user, now);
+
+      expect(planContext.nextHourglassDate)
+        .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');
+
+      const planContext = getPlanContext(user, now);
+
+      expect(planContext.nextHourglassDate)
+        .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');
+
+      const planContext = getPlanContext(user, now);
+
+      expect(planContext.nextHourglassDate)
+        .to.be.sameMoment('2022-07-10T02:00:00.144Z');
+    });
+  });
 });

website/client/config/storybook/mock.data.js

@@ -1,4 +1,5 @@
 import { v4 as generateUUID } from 'uuid';
+import getters from '@/store/getters';
 
 export const userStyles = {
   contributor: {
@@ -82,3 +83,25 @@ export const userStyles = {
     classSelected: true,
   },
 };
+
+
+export function mockStore ({
+  userData,
+  ...state
+}) {
+  return {
+    getters,
+    dispatch: () => {
+    },
+    watch: () => {
+    },
+    state: {
+      user: {
+        data: {
+          ...userData,
+        },
+      },
+      ...state,
+    },
+  };
+}

website/client/package.json

@@ -13,11 +13,11 @@
     "storybook:serve": "vue-cli-service storybook:serve -p 6006 -c config/storybook"
   },
   "dependencies": {
-    "@storybook/addon-actions": "6.4.18",
+    "@storybook/addon-actions": "6.4.19",
     "@storybook/addon-knobs": "6.2.9",
     "@storybook/addon-links": "6.4.18",
     "@storybook/addon-notes": "5.3.21",
-    "@storybook/addons": "6.4.18",
+    "@storybook/addons": "6.4.19",
     "@storybook/vue": "6.3.13",
     "@vue/cli-plugin-babel": "^4.5.15",
     "@vue/cli-plugin-eslint": "^4.5.15",
@@ -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.16.1",
+    "amplitude-js": "^8.17.0",
     "axios": "^0.25.0",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
@@ -40,11 +40,10 @@
     "habitica-markdown": "^3.0.0",
     "hellojs": "^1.19.5",
     "inspectpack": "^4.7.1",
-    "intro.js": "^4.3.0",
+    "intro.js": "^5.0.0",
     "jquery": "^3.6.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
-    "moment-timezone": "^0.5.34",
     "nconf": "^0.11.3",
     "sass": "^1.34.0",
     "sass-loader": "^8.0.2",

website/client/src/assets/css/sprites/spritesmith-main.css

@@ -48,6 +48,11 @@
   width: 48px;
   height: 52px;
 }
+.achievement-birdsOfAFeather2x {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-birdsOfAFeather2x.png');
+  width: 60px;
+  height: 64px;
+}
 .achievement-birthday2x {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-birthday2x.png');
   width: 48px;
@@ -493,6 +498,11 @@
   width: 141px;
   height: 147px;
 }
+.background_animals_den {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_animals_den.png');
+  width: 141px;
+  height: 147px;
+}
 .background_apple_picking {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_apple_picking.png');
   width: 141px;
@@ -623,11 +633,21 @@
   width: 141px;
   height: 147px;
 }
+.background_blossoming_trees {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_blossoming_trees.png');
+  width: 141px;
+  height: 147px;
+}
 .background_blue {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_blue.png');
   width: 141px;
   height: 147px;
 }
+.background_brick_wall_with_ivy {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_brick_wall_with_ivy.png');
+  width: 141px;
+  height: 147px;
+}
 .background_bridge {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_bridge.png');
   width: 141px;
@@ -888,6 +908,26 @@
   width: 60px;
   height: 60px;
 }
+.background_flower_shop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flower_shop.png');
+  width: 141px;
+  height: 147px;
+}
+.customize-option.background_flower_shop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flower_shop.png');
+  width: 60px;
+  height: 60px;
+}
+.background_flowering_prairie {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flowering_prairie.png');
+  width: 141px;
+  height: 147px;
+}
+.customize-option.background_flowering_prairie {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flowering_prairie.png');
+  width: 60px;
+  height: 60px;
+}
 .background_flying_in_a_thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flying_in_a_thunderstorm.png');
   width: 141px;
@@ -1608,6 +1648,11 @@
   width: 141px;
   height: 147px;
 }
+.background_springtime_lake {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_springtime_lake.png');
+  width: 141px;
+  height: 147px;
+}
 .background_stable {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_stable.png');
   width: 141px;
@@ -1943,6 +1988,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_animals_den {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_animals_den.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_apple_picking {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_apple_picking.png');
   width: 68px;
@@ -2073,11 +2123,21 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_blossoming_trees {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_blossoming_trees.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_blue {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_blue.png');
   width: 68px;
   height: 68px;
 }
+.icon_background_brick_wall_with_ivy {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_brick_wall_with_ivy.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_bridge {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_bridge.png');
   width: 68px;
@@ -2343,6 +2403,26 @@
   width: 60px;
   height: 60px;
 }
+.icon_background_flower_shop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flower_shop.png');
+  width: 68px;
+  height: 68px;
+}
+.customize-option.icon_background_flower_shop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flower_shop.png');
+  width: 60px;
+  height: 60px;
+}
+.icon_background_flowering_prairie {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flowering_prairie.png');
+  width: 68px;
+  height: 68px;
+}
+.customize-option.icon_background_flowering_prairie {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flowering_prairie.png');
+  width: 60px;
+  height: 60px;
+}
 .icon_background_flying_in_a_thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flying_in_a_thunderstorm.png');
   width: 68px;
@@ -3063,6 +3143,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_springtime_lake {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_springtime_lake.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_stable {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_stable.png');
   width: 68px;
@@ -16688,6 +16773,11 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_armoire_gardenersOveralls {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_gardenersOveralls.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_gladiatorArmor {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_gladiatorArmor.png');
   width: 90px;
@@ -16913,6 +17003,11 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_armoire_strawRaincoat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_strawRaincoat.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_stripedSwimsuit {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_stripedSwimsuit.png');
   width: 90px;
@@ -17123,6 +17218,11 @@
   width: 114px;
   height: 90px;
 }
+.head_armoire_gardenersSunHat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_gardenersSunHat.png');
+  width: 114px;
+  height: 90px;
+}
 .head_armoire_gladiatorHelm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_gladiatorHelm.png');
   width: 90px;
@@ -17328,6 +17428,11 @@
   width: 117px;
   height: 120px;
 }
+.head_armoire_strawRainHat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_strawRainHat.png');
+  width: 114px;
+  height: 90px;
+}
 .head_armoire_swanFeatherCrown {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_swanFeatherCrown.png');
   width: 90px;
@@ -17473,6 +17578,11 @@
   width: 114px;
   height: 90px;
 }
+.shield_armoire_gardenersSpade {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_gardenersSpade.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_armoire_gladiatorShield {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_gladiatorShield.png');
   width: 90px;
@@ -17833,6 +17943,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_armoire_gardenersOveralls {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_gardenersOveralls.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_gladiatorArmor {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_gladiatorArmor.png');
   width: 68px;
@@ -18058,6 +18173,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_armoire_strawRaincoat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_strawRaincoat.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_stripedSwimsuit {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_stripedSwimsuit.png');
   width: 68px;
@@ -18283,6 +18403,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_head_armoire_gardenersSunHat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_gardenersSunHat.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_armoire_gladiatorHelm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_gladiatorHelm.png');
   width: 68px;
@@ -18488,6 +18613,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_head_armoire_strawRainHat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_strawRainHat.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_armoire_swanFeatherCrown {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_swanFeatherCrown.png');
   width: 68px;
@@ -18633,6 +18763,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_shield_armoire_gardenersSpade {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_gardenersSpade.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_armoire_gladiatorShield {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_gladiatorShield.png');
   width: 68px;
@@ -18983,6 +19118,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_weapon_armoire_gardenersWateringCan {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_gardenersWateringCan.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_armoire_glassblowersBlowpipe {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_glassblowersBlowpipe.png');
   width: 68px;
@@ -19398,6 +19538,11 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_armoire_gardenersOveralls {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_gardenersOveralls.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_gladiatorArmor {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_gladiatorArmor.png');
   width: 90px;
@@ -19623,6 +19768,11 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_armoire_strawRaincoat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_strawRaincoat.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_stripedSwimsuit {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_stripedSwimsuit.png');
   width: 90px;
@@ -19798,6 +19948,11 @@
   width: 90px;
   height: 90px;
 }
+.weapon_armoire_gardenersWateringCan {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_gardenersWateringCan.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_armoire_glassblowersBlowpipe {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_glassblowersBlowpipe.png');
   width: 114px;
@@ -25093,6 +25248,71 @@
   width: 68px;
   height: 68px;
 }
+.back_mystery_202203 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202203.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_mystery_202203 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_mystery_202203.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_back_mystery_202203 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_back_mystery_202203.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_mystery_202203 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_mystery_202203.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202203 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202203.png');
+  width: 68px;
+  height: 68px;
+}
+.broad_armor_mystery_202204 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202204.png');
+  width: 114px;
+  height: 90px;
+}
+.eyewear_mystery_202204A {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202204A.png');
+  width: 114px;
+  height: 90px;
+}
+.eyewear_mystery_202204B {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202204B.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_armor_mystery_202204 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202204.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_eyewear_mystery_202204A {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202204A.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_eyewear_mystery_202204B {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202204B.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202204 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202204.png');
+  width: 68px;
+  height: 68px;
+}
+.slim_armor_mystery_202204 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202204.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;
@@ -25428,6 +25648,26 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_spring2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2022Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.broad_armor_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_springHealer.png');
   width: 90px;
@@ -25668,6 +25908,26 @@
   width: 114px;
   height: 90px;
 }
+.head_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_spring2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2022Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.head_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .head_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_springHealer.png');
   width: 90px;
@@ -25793,6 +26053,21 @@
   width: 114px;
   height: 90px;
 }
+.shield_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2022Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.shield_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_springHealer.png');
   width: 90px;
@@ -25948,6 +26223,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_spring2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_spring2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_spring2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_spring2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_spring2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_springHealer.png');
   width: 68px;
@@ -26188,6 +26483,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_head_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_spring2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_spring2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_spring2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_spring2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_spring2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_springHealer.png');
   width: 68px;
@@ -26313,6 +26628,21 @@
   width: 68px;
   height: 68px;
 }
+.shop_shield_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_spring2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_spring2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_spring2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_springHealer.png');
   width: 68px;
@@ -26468,6 +26798,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_weapon_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_spring2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_spring2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_spring2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_spring2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_spring2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_springHealer.png');
   width: 68px;
@@ -26628,6 +26978,26 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_spring2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2022Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.slim_armor_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_springHealer.png');
   width: 90px;
@@ -26788,6 +27158,26 @@
   width: 114px;
   height: 90px;
 }
+.weapon_special_spring2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_spring2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_spring2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2022Rogue.png');
+  width: 114px;
+  height: 117px;
+}
+.weapon_special_spring2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_special_springHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_springHealer.png');
   width: 90px;
@@ -49723,6 +50113,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-BearCub-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-BearCub-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Watery.png');
   width: 81px;
@@ -50148,6 +50543,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Cactus-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Cactus-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Watery.png');
   width: 81px;
@@ -50678,6 +51078,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Dragon-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Dragon-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Watery.png');
   width: 81px;
@@ -51103,6 +51508,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-FlyingPig-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-FlyingPig-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Watery.png');
   width: 81px;
@@ -51383,6 +51793,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Fox-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Fox-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Watery.png');
   width: 81px;
@@ -52048,6 +52463,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-LionCub-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-LionCub-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Watery.png');
   width: 81px;
@@ -52543,6 +52963,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-PandaCub-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-PandaCub-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Watery.png');
   width: 81px;
@@ -53783,6 +54208,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-TigerCub-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-TigerCub-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Watery.png');
   width: 81px;
@@ -54378,6 +54808,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Wolf-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Watery.png');
   width: 81px;

website/client/src/assets/scss/animals.scss

@@ -19,6 +19,11 @@
   top: -16px !important;
 }
 
-.Pet.Pet-FlyingPig-Veggie, .Pet.Pet-FlyingPig-Dessert {
+.Pet.Pet-FlyingPig-Veggie, .Pet.Pet-FlyingPig-Dessert, .Pet.Pet-FlyingPig-Virtual {
   top: -28px !important;
 }
+
+.Pet[class*="Virtual"] {
+  left: 1.25rem;
+  bottom: 0.5rem;
+}

website/client/src/components/appFooter.vue

@@ -84,8 +84,8 @@
             </li>
             <li v-if="user">
               <a
-                @click.prevent="openBugReportModal()"
                 target="_blank"
+                @click.prevent="openBugReportModal()"
               >
                 {{ $t('reportBug') }}
               </a>
@@ -224,7 +224,7 @@
       </div>
       <div class="row">
         <div class="col-12 col-md-5 text-center text-md-left">
-          © 2022 Habitica. All rights reserved.
+          © {{ currentYear }} Habitica. All rights reserved.
           <div
             v-if="!IS_PRODUCTION && isUserLoaded"
             class="debug float-left"
@@ -512,6 +512,10 @@ export default {
       if (!this.user) return null;
       return `${base}?uuid=${this.user._id}`;
     },
+    currentYear () {
+      const currentDate = new Date();
+      return currentDate.getFullYear();
+    },
   },
   methods: {
     plusTenHealth () {

website/client/src/components/auth/registerLoginReset.vue

@@ -20,8 +20,8 @@
         </div>
       </div>
       <div
-        class="form-group row text-center"
         v-if="!registering"
+        class="form-group row text-center"
       >
         <div class="col-12 col-md-12">
           <div
@@ -269,13 +269,13 @@
         <label
           v-once
           for="usernameInput"
-        >{{ $t('email') }}</label>
+        >{{ $t('emailOrUsername') }}</label>
         <input
           id="usernameInput"
           v-model="username"
           class="form-control"
           type="text"
-          :placeholder="$t('emailPlaceholder')"
+          :placeholder="$t('emailUsernamePlaceholder')"
         >
       </div>
       <div class="text-center">

website/client/src/components/avatar.vue

@@ -79,7 +79,6 @@
         ></span>
         <!-- Pet-->
         <span
-          v-if="member.items.currentPet"
           class="current-pet"
           :class="petClass"
         ></span>
@@ -131,10 +130,12 @@
 import some from 'lodash/some';
 import moment from 'moment';
 import { mapState } from '@/libs/store';
+import foolPet from '../mixins/foolPet';
 
 import ClassBadge from '@/components/members/classBadge';
 
 export default {
+  mixins: [foolPet],
   components: {
     ClassBadge,
   },
@@ -243,11 +244,12 @@ export default {
     petClass () {
       if (some(
         this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'invert',
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'virtual',
       )) {
-        return `Pet-${this.member.items.currentPet} invert`;
+        return this.foolPet(this.member.items.currentPet);
       }
-      return `Pet-${this.member.items.currentPet}`;
+      if (this.member.items.currentPet) return `Pet-${this.member.items.currentPet}`;
+      return '';
     },
   },
   methods: {

website/client/src/components/bugReportModal.vue

@@ -12,12 +12,18 @@
         {{ $t('reportBug') }}
       </h2>
 
-      <div v-once class="report-bug-header-describe">
+      <div
+        v-once
+        class="report-bug-header-describe"
+      >
         {{ $t('reportBugHeaderDescribe') }}
       </div>
 
       <div class="dialog-close">
-        <close-icon @click="close()" :purple="true"/>
+        <close-icon
+          :purple="true"
+          @click="close()"
+        />
       </div>
     </div>
     <div>
@@ -34,7 +40,10 @@
           >
             {{ $t('email') }}
           </label>
-          <div class="mb-2 description-label" v-once>
+          <div
+            v-once
+            class="mb-2 description-label"
+          >
             {{ $t('reportEmailText') }}
           </div>
           <input
@@ -47,7 +56,10 @@
             :class="{'input-invalid': emailInvalid, 'input-valid': emailValid}"
           >
 
-          <div class="error-label mt-2" v-if="emailInvalid">
+          <div
+            v-if="emailInvalid"
+            class="error-label mt-2"
+          >
             {{ $t('reportEmailError') }}
           </div>
         </div>
@@ -55,7 +67,10 @@
         <label v-once>
           {{ $t('reportDescription') }}
         </label>
-        <div class="mb-2 description-label" v-once>
+        <div
+          v-once
+          class="mb-2 description-label"
+        >
           {{ $t('reportDescriptionText') }}
         </div>
         <textarea

website/client/src/components/bugReportSuccessModal.vue

@@ -17,15 +17,22 @@
       </div>
     </div>
     <div>
-      <span class="svg-icon check-icon"
+      <span
+        class="svg-icon check-icon"
         v-html="icons.checkCircleIcon"
       ></span>
 
-      <div class="title" v-once>
+      <div
+        v-once
+        class="title"
+      >
         {{ $t('reportSent') }}
       </div>
 
-      <div class="text mt-3 mb-4" v-once>
+      <div
+        v-once
+        class="text mt-3 mb-4"
+      >
         {{ $t('reportSentDescription') }}
       </div>
     </div>
@@ -143,12 +150,12 @@ export default {
       modalId: MODALS.BUG_REPORT_SUCCESS,
     };
   },
+  computed: {},
+  mounted () {},
   methods: {
     close () {
       this.$root.$emit('bv::hide::modal', MODALS.BUG_REPORT_SUCCESS);
     },
   },
-  computed: {},
-  mounted () {},
 };
 </script>

website/client/src/components/faceAvatar.vue

@@ -112,7 +112,7 @@ export default {
     },
     visualBuffs () {
       return {
-        snowball: 'snowman',
+        snowball: `avatar_snowball_${this.member.stats.class}`,
         spookySparkles: 'ghost',
         shinySeed: `avatar_floral_${this.member.stats.class}`,
         seafoam: 'seafoam_star',

website/client/src/components/groups/tavern.vue

@@ -361,8 +361,8 @@
             </li>
             <li>
               <a
-                @click.prevent="openBugReportModal()"
                 target="_blank"
+                @click.prevent="openBugReportModal()"
               >
                 {{ $t('reportBug') }}
               </a>

website/client/src/components/header/menu.vue

@@ -311,8 +311,8 @@
               </router-link>
               <a
                 class="topbar-dropdown-item dropdown-item"
-                @click.prevent="openBugReportModal()"
                 target="_blank"
+                @click.prevent="openBugReportModal()"
               >
                 {{ $t('reportBug') }}
               </a>

website/client/src/components/inventory/stable/petItem.vue

@@ -114,11 +114,13 @@ import some from 'lodash/some';
 import moment from 'moment';
 import { v4 as uuid } from 'uuid';
 import { mapState } from '@/libs/store';
+import foolPet from '@/mixins/foolPet';
 import {
   isAllowedToFeed, isHatchable, isOwned, isSpecial,
 } from '../../../libs/createAnimal';
 
 export default {
+  mixins: [foolPet],
   props: {
     item: {
       type: Object,
@@ -169,9 +171,10 @@ export default {
     getPetItemClass () {
       if (this.isOwned() && some(
         this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'invert',
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'virtual',
       )) {
-        return `Pet Pet-${this.item.key} ${this.item.eggKey} invert`;
+        const petString = `${this.item.eggKey}-${this.item.key}`;
+        return `Pet ${this.foolPet(petString)}`;
       }
 
       if (this.isOwned() || (this.mountOwned() && this.isHatchable())) {

website/client/src/components/news/newsContent.vue

@@ -20,11 +20,9 @@
         class="draft"
       >DRAFT</small>
       <h2 class="title">
-        {{ post.title.toUpperCase() }}
+        {{ getPostDate(post) }} - {{ post.title.toUpperCase() }}
       </h2>
-      <small>
+
-        {{ getPostedOn(post) }}
-      </small>
       <hr>
 
       <div v-html="renderMarkdown(post.text)"></div>
@@ -53,8 +51,7 @@ h1 {
   }
 
   .title {
-    text-align: left;
+    display: inline;
-    margin-bottom: 4px;
   }
 
   .draft {
@@ -68,7 +65,7 @@ h1 {
 </style>
 
 <script>
-import moment from 'moment-timezone';
+import moment from 'moment';
 import habiticaMarkdown from 'habitica-markdown';
 import { mapState } from '@/libs/store';
 import seasonalNPC from '@/mixins/seasonalNPC';
@@ -108,12 +105,9 @@ export default {
     renderMarkdown (text) {
       return habiticaMarkdown.unsafeHTMLRender(text);
     },
-    getPostedOn (post) {
+    getPostDate (post) {
-      const publishDate = moment(post.publishDate)
+      const format = this.user ? this.user.preferences.dateFormat.toUpperCase() : 'MM/DD/yyyy';
-        .utcOffset(-300)
+      return moment(post.publishDate).format(format);
-        .format(this.user.preferences.dateFormat.toUpperCase());
-      const publishTime = moment(post.publishDate).tz('America/New_York').format('LT z');
-      return this.$t('newStuffPostedOn', { publishDate, publishTime });
     },
   },
 };

website/client/src/components/payments/buttons/list.stories.js

@@ -7,7 +7,7 @@ import { setup as setupPayments } from '@/libs/payments';
 
 setupPayments();
 
-storiesOf('Payments Buttons', module)
+storiesOf('Subscriptions/Payments Buttons', module)
   .add('simple', () => ({
     components: { PaymentsButtonsList },
     template: `

website/client/src/components/settings/dayStartAdjustment.vue

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <div>
+      <h5>{{ $t('dayStartAdjustment') }}</h5>
+      <div class="mb-4">
+        {{ $t('customDayStartInfo1') }}
+      </div>
+      <h3 v-once>{{ $t('adjustment') }}</h3>
+      <div class="form-horizontal">
+        <div class="form-group">
+          <div class="">
+            <select
+              v-model="newDayStart"
+              class="form-control"
+            >
+              <option
+                v-for="option in dayStartOptions"
+                :key="option.value"
+                :value="option.value"
+              >
+                {{ option.name }}
+              </option>
+            </select>
+          </div>
+          <div>
+            <button
+              class="btn btn-primary full-width mt-3"
+              :disabled="newDayStart === user.preferences.dayStart"
+              @click="openDayStartModal()"
+            >
+              {{ $t('save') }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-horizontal">
+      <div class="form-group">
+        <small>
+          <p v-html="$t('timezoneUTC', {utc: timezoneOffsetToUtc})"></p>
+          <p v-html="$t('timezoneInfo')"></p>
+        </small>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios';
+import moment from 'moment';
+import getUtcOffset from '../../../../common/script/fns/getUtcOffset';
+import { mapState } from '@/libs/store';
+
+export default {
+  name: 'dayStartAdjustment',
+  data () {
+    const dayStartOptions = [];
+    for (let number = 0; number <= 12; number += 1) {
+      const meridian = number < 12 ? 'AM' : 'PM';
+      const hour = number % 12;
+      const timeWithMeridian = `(${hour || 12}:00 ${meridian})`;
+      const option = {
+        value: number,
+        name: `+${number} hours ${timeWithMeridian}`,
+      };
+
+      if (number === 0) {
+        option.name = `Default ${timeWithMeridian}`;
+      }
+
+      dayStartOptions.push(option);
+    }
+
+    return {
+      newDayStart: 0,
+      dayStartOptions,
+    };
+  },
+  mounted () {
+    this.newDayStart = this.user.preferences.dayStart;
+  },
+  computed: {
+    ...mapState({
+      user: 'user.data',
+    }),
+    timezoneOffsetToUtc () {
+      const offsetString = moment().utcOffset(getUtcOffset(this.user)).format('Z');
+      return `UTC${offsetString}`;
+    },
+    dayStart () {
+      return this.user.preferences.dayStart;
+    },
+  },
+  methods: {
+    async saveDayStart () {
+      this.user.preferences.dayStart = this.newDayStart;
+      await axios.post('/api/v4/user/custom-day-start', {
+        dayStart: this.newDayStart,
+      });
+      // @TODO
+      // Notification.text(response.data.data.message);
+    },
+    openDayStartModal () {
+      const nextCron = this.calculateNextCron();
+      // @TODO: Add generic modal
+      if (!window.confirm(this.$t('sureChangeCustomDayStartTime', { time: nextCron }))) return; // eslint-disable-line no-alert
+      this.saveDayStart();
+      // $rootScope.openModal('change-day-start', { scope: $scope });
+    },
+    calculateNextCron () {
+      let nextCron = moment()
+        .hours(this.newDayStart)
+        .minutes(0)
+        .seconds(0)
+        .milliseconds(0);
+
+      const currentHour = moment().format('H');
+      if (currentHour >= this.newDayStart) {
+        nextCron = nextCron.add(1, 'day');
+      }
+
+      return nextCron.format(`${this.user.preferences.dateFormat.toUpperCase()} @ h:mm a`);
+    },
+  },
+};
+</script>
+
+<style scoped>
+  .full-width {
+    width: 100%;
+  }
+</style>

website/client/src/components/settings/deleteModal.vue

@@ -7,9 +7,9 @@
   >
     <div class="modal-body">
       <br>
-      <strong v-if="user.auth.local.email">{{ $t('deleteLocalAccountText') }}</strong>
+      <strong v-if="user.auth.local.has_password">{{ $t('deleteLocalAccountText') }}</strong>
       <strong
-        v-if="!user.auth.local.email"
+        v-if="!user.auth.local.has_password"
       >{{ $t('deleteSocialAccountText', {magicWord: 'DELETE'}) }}</strong>
       <div class="row mt-3">
         <div class="col-6">

website/client/src/components/settings/site.vue

@@ -213,49 +213,7 @@
           {{ $t('enableClass') }}
         </button>
         <hr>
-        <div>
+        <day-start-adjustment />
-          <h5>{{ $t('customDayStart') }}</h5>
-          <div class="alert alert-warning">
-            {{ $t('customDayStartInfo1') }}
-          </div>
-          <div class="form-horizontal">
-            <div class="form-group">
-              <div class="col-7">
-                <select
-                  v-model="newDayStart"
-                  class="form-control"
-                >
-                  <option
-                    v-for="option in dayStartOptions"
-                    :key="option.value"
-                    :value="option.value"
-                  >
-                    {{ option.name }}
-                  </option>
-                </select>
-              </div>
-              <div class="col-5">
-                <button
-                  class="btn btn-block btn-primary mt-1"
-                  :disabled="newDayStart === user.preferences.dayStart"
-                  @click="openDayStartModal()"
-                >
-                  {{ $t('saveCustomDayStart') }}
-                </button>
-              </div>
-            </div>
-          </div>
-          <hr>
-        </div>
-        <h5>{{ $t('timezone') }}</h5>
-        <div class="form-horizontal">
-          <div class="form-group">
-            <div class="col-12">
-              <p v-html="$t('timezoneUTC', {utc: timezoneOffsetToUtc})"></p>
-              <p v-html="$t('timezoneInfo')"></p>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
     <div class="col-sm-6">
@@ -291,14 +249,22 @@
             </li>
           </ul>
           <hr>
-          <div v-if="!user.auth.local.email">
+          <div v-if="!user.auth.local.has_password">
-            <p>{{ $t('addLocalAuth') }}</p>
+            <h5 v-if="!user.auth.local.email">
+              {{ $t('addLocalAuth') }}
+            </h5>
+            <h5 v-if="user.auth.local.email">
+              {{ $t('addPasswordAuth') }}
+            </h5>
             <div
               class="form"
               name="localAuth"
               novalidate="novalidate"
             >
-              <div class="form-group">
+              <div
+                v-if="!user.auth.local.email"
+                class="form-group"
+              >
                 <input
                   v-model="localAuth.email"
                   class="form-control"
@@ -421,7 +387,7 @@
               {{ $t('saveAndConfirm') }}
             </button>
           </div>
-          <h5 v-if="user.auth.local.email">
+          <h5>
             {{ $t('changeEmail') }}
           </h5>
           <div
@@ -439,7 +405,10 @@
                 :placeholder="$t('newEmail')"
               >
             </div>
-            <div class="form-group">
+            <div
+              v-if="user.auth.local.has_password"
+              class="form-group"
+            >
               <input
                 v-model="emailUpdates.password"
                 class="form-control"
@@ -455,11 +424,11 @@
               {{ $t('submit') }}
             </button>
           </div>
-          <h5 v-if="user.auth.local.email">
+          <h5 v-if="user.auth.local.has_password">
             {{ $t('changePass') }}
           </h5>
           <div
-            v-if="user.auth.local.email"
+            v-if="user.auth.local.has_password"
             class="form"
             name="changePassword"
             novalidate="novalidate"
@@ -557,16 +526,15 @@
 
 <script>
 import hello from 'hellojs';
-import moment from 'moment';
 import axios from 'axios';
 import debounce from 'lodash/debounce';
 import { mapState } from '@/libs/store';
 import restoreModal from './restoreModal';
 import resetModal from './resetModal';
 import deleteModal from './deleteModal';
+import dayStartAdjustment from './dayStartAdjustment';
 import { SUPPORTED_SOCIAL_NETWORKS } from '@/../../common/script/constants';
 import changeClass from '@/../../common/script/ops/changeClass';
-import getUtcOffset from '@/../../common/script/fns/getUtcOffset';
 import notificationsMixin from '../../mixins/notifications';
 import sounds from '../../libs/sounds';
 import { buildAppleAuthUrl } from '../../libs/auth';
@@ -579,27 +547,15 @@ export default {
     restoreModal,
     resetModal,
     deleteModal,
+    dayStartAdjustment,
   },
   mixins: [notificationsMixin],
   data () {
-    const dayStartOptions = [];
-    for (let number = 0; number < 24; number += 1) {
-      const meridian = number < 12 ? 'AM' : 'PM';
-      const hour = number % 12;
-      const option = {
-        value: number,
-        name: `${hour || 12}:00 ${meridian}`,
-      };
-      dayStartOptions.push(option);
-    }
-
     return {
       SOCIAL_AUTH_NETWORKS: [],
       party: {},
       // Made available by the server as a script
       availableFormats: ['MM/dd/yyyy', 'dd/MM/yyyy', 'yyyy/MM/dd'],
-      dayStartOptions,
-      newDayStart: 0,
       temporaryDisplayName: '',
       usernameUpdates: { username: '' },
       emailUpdates: {},
@@ -623,13 +579,6 @@ export default {
     availableAudioThemes () {
       return ['off', ...this.content.audioThemes];
     },
-    timezoneOffsetToUtc () {
-      const offsetString = moment().utcOffset(getUtcOffset(this.user)).format('Z');
-      return `UTC${offsetString}`;
-    },
-    dayStart () {
-      return this.user.preferences.dayStart;
-    },
     hasClass () {
       return this.$store.getters['members:hasClass'](this.user);
     },
@@ -679,7 +628,6 @@ export default {
     this.SOCIAL_AUTH_NETWORKS = SUPPORTED_SOCIAL_NETWORKS;
     // @TODO: We may need to request the party here
     this.party = this.$store.state.party;
-    this.newDayStart = this.user.preferences.dayStart;
     this.usernameUpdates.username = this.user.auth.local.username || null;
     this.temporaryDisplayName = this.user.profile.name;
     this.emailUpdates.newEmail = this.user.auth.local.email || null;
@@ -779,32 +727,6 @@ export default {
         return false;
       });
     },
-    calculateNextCron () {
-      let nextCron = moment().hours(this.newDayStart).minutes(0).seconds(0)
-        .milliseconds(0);
-
-      const currentHour = moment().format('H');
-      if (currentHour >= this.newDayStart) {
-        nextCron = nextCron.add(1, 'day');
-      }
-
-      return nextCron.format(`${this.user.preferences.dateFormat.toUpperCase()} @ h:mm a`);
-    },
-    openDayStartModal () {
-      const nextCron = this.calculateNextCron();
-      // @TODO: Add generic modal
-      if (!window.confirm(this.$t('sureChangeCustomDayStartTime', { time: nextCron }))) return; // eslint-disable-line no-alert
-      this.saveDayStart();
-      // $rootScope.openModal('change-day-start', { scope: $scope });
-    },
-    async saveDayStart () {
-      this.user.preferences.dayStart = this.newDayStart;
-      await axios.post('/api/v4/user/custom-day-start', {
-        dayStart: this.newDayStart,
-      });
-      // @TODO
-      // Notification.text(response.data.data.message);
-    },
     async changeLanguage (e) {
       const newLang = e.target.value;
       this.user.preferences.language = newLang;
@@ -846,7 +768,7 @@ export default {
       if (network === 'apple') {
         window.location.href = buildAppleAuthUrl();
       } else {
-        const auth = await hello(network).login({ scope: 'email' });
+        const auth = await hello(network).login({ scope: 'email', options: { force: true } });
 
         await this.$store.dispatch('auth:socialAuth', {
           auth,
@@ -865,8 +787,12 @@ export default {
       }
     },
     async addLocalAuth () {
+      if (this.localAuth.email === '') {
+        this.localAuth.email = this.user.auth.local.email;
+      }
       await axios.post('/api/v4/user/auth/local/register', this.localAuth);
       window.alert(this.$t('addedLocalAuth')); // eslint-disable-line no-alert
+      window.location.href = '/';
     },
     restoreEmptyUsername () {
       if (this.usernameUpdates.username.length < 1) {

website/client/src/components/settings/subscription.stories.js

@@ -0,0 +1,37 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { storiesOf } from '@storybook/vue';
+
+import Subscription from './subscription.vue';
+import { mockStore } from '../../../config/storybook/mock.data';
+
+storiesOf('Subscriptions/Detail Page', module)
+  .add('subscribed', () => ({
+    components: { Subscription },
+    template: `
+      <div style="position: absolute; margin: 20px">
+        <subscription ></subscription>
+      </div>
+    `,
+    data () {
+      return {
+      };
+    },
+    store: mockStore({
+      userData: {
+        purchased: {
+          plan: {
+            customerId: 'customer-id',
+            planId: 'plan-id',
+            subscriptionId: 'sub-id',
+            gemsBought: 22,
+            dateUpdated: new Date(2021, 0, 15),
+            consecutive: {
+              count: 2,
+              gemCapExtra: 4,
+              offset: 2,
+            },
+          },
+        },
+      },
+    }),
+  }));

website/client/src/components/settings/subscription.vue

@@ -93,7 +93,7 @@
       <div class="subscribe-card mx-auto">
         <div
           v-if="hasSubscription && !hasCanceledSubscription"
-          class="d-flex flex-column align-items-center my-4"
+          class="d-flex flex-column align-items-center"
         >
           <div class="round-container bg-green-10 d-flex align-items-center justify-content-center">
             <div
@@ -102,7 +102,7 @@
               v-html="icons.checkmarkIcon"
             ></div>
           </div>
-          <h2 class="green-10 mx-auto">
+          <h2 class="green-10 mx-auto mb-75">
             {{ $t('youAreSubscribed') }}
           </h2>
           <div
@@ -180,17 +180,17 @@
         </div>
         <div
           v-if="hasSubscription"
-          class="bg-gray-700 p-2 text-center"
+          class="bg-gray-700 py-3 mt-4 mb-3 text-center"
         >
           <div class="header-mini mb-3">
             {{ $t('subscriptionStats') }}
           </div>
-          <div class="d-flex justify-content-around">
+          <div class="d-flex">
-            <div class="ml-4 mr-3">
+            <div class="stat-column">
               <div class="d-flex justify-content-center align-items-center">
                 <div
                   v-once
-                  class="svg-icon svg-calendar mr-2"
+                  class="svg-icon svg-calendar mr-1"
                   v-html="icons.calendarIcon"
                 >
                 </div>
@@ -204,49 +204,53 @@
               </div>
             </div>
             <div class="stats-spacer"></div>
-            <div>
+            <div class="stat-column">
               <div class="d-flex justify-content-center align-items-center">
                 <div
                   v-once
-                  class="svg-icon svg-gem mr-2"
+                  class="svg-icon svg-gem mr-1"
                   v-html="icons.gemIcon"
                 >
                 </div>
                 <div class="number-heavy">
-                  {{ user.purchased.plan.consecutive.gemCapExtra }}
+                  {{ gemCap }}
                 </div>
               </div>
               <div class="stats-label">
-                {{ $t('gemCapExtra') }}
+                {{ $t('gemCap') }}
               </div>
             </div>
             <div class="stats-spacer"></div>
-            <div>
+            <div class="stat-column">
               <div class="d-flex justify-content-center align-items-center">
                 <div
                   v-once
-                  class="svg-icon svg-hourglass mt-1 mr-2"
+                  class="svg-icon svg-hourglass mt-1 mr-1"
                   v-html="icons.hourglassIcon"
                 >
                 </div>
                 <div class="number-heavy">
-                  {{ user.purchased.plan.consecutive.trinkets }}
+                  {{ nextHourGlass }}
                 </div>
               </div>
               <div class="stats-label">
-                {{ $t('mysticHourglassesTooltip') }}
+                {{ $t('nextHourglass') }}*
               </div>
             </div>
           </div>
+
+          <div class="mt-4 nextHourglassDescription" v-once>
+            *{{ $t('nextHourglassDescription') }}
           </div>
-        <div class="d-flex flex-column justify-content-center align-items-center mt-4 mb-3">
+        </div>
+        <div class="d-flex flex-column justify-content-center align-items-center mb-3">
           <div
             v-once
-            class="svg-icon svg-heart mb-1"
+            class="svg-icon svg-heart mb-2"
             v-html="icons.heartIcon"
           >
           </div>
-          <div class="stats-label">
+          <div class="thanks-for-support">
             {{ $t('giftSubscriptionText4') }}
           </div>
         </div>
@@ -350,7 +354,7 @@
   .cancel-card {
     width: 28rem;
     border: 2px solid $gray-500;
-    border-radius: 4px;
+    border-radius: 8px;
   }
 
   .disabled {
@@ -405,7 +409,10 @@
   }
 
   .number-heavy {
-    font-size: 24px;
+    font-size: 20px;
+    font-weight: bold;
+    line-height: 1.4;
+    color: $gray-50;
   }
 
   .Pet-Jackalope-RoyalPurple {
@@ -423,7 +430,10 @@
 
   .stats-label {
     font-size: 12px;
-    color: $gray-200;
+    color: $gray-100;
+    margin-top: 6px;
+    font-weight: bold;
+    line-height: 1.33;
   }
 
   .stats-spacer {
@@ -433,8 +443,9 @@
   }
 
   .subscribe-card {
+    padding-top: 2rem;
     width: 28rem;
-    border-radius: 4px;
+    border-radius: 8px;
     box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
     background-color: $white;
   }
@@ -452,7 +463,14 @@
     height: 40px;
   }
 
-  .svg-calendar, .svg-heart {
+  .svg-calendar {
+    width: 24px;
+    height: 24px;
+
+    margin-right: 2px;
+  }
+
+  .svg-heart {
     width: 24px;
     height: 24px;
   }
@@ -479,8 +497,10 @@
   }
 
   .svg-gem {
-    width: 32px;
+    width: 24px;
-    height: 28px;
+    height: 24px;
+
+    margin-right: 2px;
   }
 
   .svg-gems {
@@ -494,8 +514,10 @@
   }
 
   .svg-hourglass {
-    width: 28px;
+    width: 24px;
-    height: 28px;
+    height: 24px;
+
+    margin-right: 2px;
   }
 
   .svg-gift-box {
@@ -521,11 +543,34 @@
   .w-55 {
     width: 55%;
   }
+
+  .nextHourglassDescription {
+    font-size: 12px;
+    font-style: italic;
+    line-height: 1.33;
+    color: $gray-100;
+    margin-left: 100px;
+    margin-right: 100px;
+  }
+
+  .justify-content-evenly {
+    justify-content: space-evenly;
+  }
+
+  .thanks-for-support {
+    font-size: 12px;
+    line-height: 1.33;
+    text-align: center;
+    color: $gray-100;
+  }
+
+  .stat-column {
+    width: 33%;
+  }
 </style>
 
 <script>
 import axios from 'axios';
-import min from 'lodash/min';
 import moment from 'moment';
 import { mapState } from '@/libs/store';
 
@@ -551,6 +596,7 @@ import logo from '@/assets/svg/habitica-logo-purple.svg';
 import paypalLogo from '@/assets/svg/paypal-logo.svg';
 import subscriberGems from '@/assets/svg/subscriber-gems.svg';
 import subscriberHourglasses from '@/assets/svg/subscriber-hourglasses.svg';
+import { getPlanContext } from '@/../../common/script/cron';
 
 export default {
   components: {
@@ -649,23 +695,9 @@ export default {
         months: parseFloat(this.user.purchased.plan.extraMonths).toFixed(2),
       };
     },
-    buyGemsGoldCap () {
+    gemCap () {
-      return {
+      return planGemLimits.convCap
-        amount: min(this.gemGoldCap),
+          + this.user.purchased.plan.consecutive.gemCapExtra;
-      };
-    },
-    gemGoldCap () {
-      const baseCap = 25;
-      const gemCapIncrement = 5;
-      const capIncrementThreshold = 3;
-      const { gemCapExtra } = this.user.purchased.plan.consecutive;
-      const blocks = subscriptionBlocks[this.subscription.key].months / capIncrementThreshold;
-      const flooredBlocks = Math.floor(blocks);
-
-      const userTotalDropCap = baseCap + gemCapExtra + flooredBlocks * gemCapIncrement;
-      const maxDropCap = 50;
-
-      return [userTotalDropCap, maxDropCap];
     },
     numberOfMysticHourglasses () {
       const numberOfHourglasses = subscriptionBlocks[this.subscription.key].months / 3;
@@ -719,6 +751,16 @@ export default {
     subscriptionEndDate () {
       return moment(this.user.purchased.plan.dateTerminated).format('MM/DD/YYYY');
     },
+    nextHourGlassDate () {
+      const currentPlanContext = getPlanContext(this.user, new Date());
+
+      return currentPlanContext.nextHourglassDate;
+    },
+    nextHourGlass () {
+      const nextHourglassMonth = this.nextHourGlassDate.format('MMM');
+
+      return nextHourglassMonth;
+    },
   },
   mounted () {
     this.$store.dispatch('common:setTitle', {

website/client/src/components/shared/closeIcon.vue

@@ -1,12 +1,12 @@
 <template>
   <button
     title="close dialog"
-    @click="$emit('click', $event)"
     :style="{
       '--icon-color': iconColor,
       '--icon-color-hover': iconColorHover,
     }"
     :class="{'purple': purple}"
+    @click="$emit('click', $event)"
   >
     <div
       v-once

website/client/src/components/static/contact.vue

@@ -10,8 +10,8 @@
           <span v-if="user">
             <br>
             <a
-              @click.prevent="openBugReportModal()"
               target="_blank"
+              @click.prevent="openBugReportModal()"
             >
               {{ $t('reportBug') }}
             </a>

website/client/src/components/static/privacy.vue

@@ -8,7 +8,7 @@
     <p>
       HabitRPG, Inc. (“HabitRPG,” “we,” “us,” or “our”) welcomes you. This privacy notice (the “Privacy
       Notice”) describes how we process the information we collect about or from you through our Website
-      located at <a href='https://habitica.com/static/home'>https://habitica.com/static/home</a> and/or our Apps
+      located at <a href="https://habitica.com/static/home">https://habitica.com/static/home</a> and/or our Apps
       (our “Digital Platforms”), from our users, subscribers, visitors and other users of our technology and
       platforms (together with our Digital Platforms, the “Habitica Service” or the “Service”), and when you
       otherwise interact with us. This Privacy Notice may be updated by us from time to time without notice to
@@ -65,11 +65,36 @@
       policies linked to below:
     </p>
     <ul>
-      <li>For Stripe, visit: <a href='https://stripe.com/privacy' target='_blank'>https://stripe.com/privacy</a></li>
+      <li>
-      <li>For Amazon Pay, visit: <a href='https://pay.amazon.com/help/201751600' target='_blank'>https://pay.amazon.com/help/201751600</a></li>
+        For Stripe, visit: <a
-      <li>For PayPal, visit: <a href='https://www.paypal.com/us/webapps/mpp/ua/privacy-full' target='_blank'>https://www.paypal.com/us/webapps/mpp/ua/privacy-full</a></li>
+          href="https://stripe.com/privacy"
-      <li>For Apple Pay, visit: <a href='https://www.apple.com/legal/privacy/data/en/apple-pay/' target='_blank'>https://www.apple.com/legal/privacy/data/en/apple-pay/</a></li>
+          target="_blank"
-      <li>For Google Pay, visit: <a href='https://support.google.com/googlepay/answer/10223752?hl=en&co=GENIE.Platform%3DAndroid' target='_blank'>https://support.google.com/googlepay/answer/10223752?hl=en&co=GENIE.Platform%3DAndroid</a></li>
+        >https://stripe.com/privacy</a>
+      </li>
+      <li>
+        For Amazon Pay, visit: <a
+          href="https://pay.amazon.com/help/201751600"
+          target="_blank"
+        >https://pay.amazon.com/help/201751600</a>
+      </li>
+      <li>
+        For PayPal, visit: <a
+          href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full"
+          target="_blank"
+        >https://www.paypal.com/us/webapps/mpp/ua/privacy-full</a>
+      </li>
+      <li>
+        For Apple Pay, visit: <a
+          href="https://www.apple.com/legal/privacy/data/en/apple-pay/"
+          target="_blank"
+        >https://www.apple.com/legal/privacy/data/en/apple-pay/</a>
+      </li>
+      <li>
+        For Google Pay, visit: <a
+          href="https://support.google.com/googlepay/answer/10223752?hl=en&co=GENIE.Platform%3DAndroid"
+          target="_blank"
+        >https://support.google.com/googlepay/answer/10223752?hl=en&co=GENIE.Platform%3DAndroid</a>
+      </li>
     </ul>
     <p>
       We reserve the right to change our payment vendors at any time, or to use additional payment vendors, at
@@ -95,22 +120,32 @@
       see the information regarding analytics providers discussed further below.
     </p>
     <ul>
-      <li><strong>Session Cookies</strong>: We use session cookies to make it easier for you to navigate our Service. A
+      <li>
-        session ID cookie expires when you close the Service.</li>
+        <strong>Session Cookies</strong>: We use session cookies to make it easier for you to navigate our Service. A
-      <li><strong>Persistent Cookies</strong>: A persistent cookie remains on your device for an extended period of time or
+        session ID cookie expires when you close the Service.
+      </li>
+      <li>
+        <strong>Persistent Cookies</strong>: A persistent cookie remains on your device for an extended period of time or
         until you delete it. Persistent cookies enable us to better understand how you interact with the Service and to
         provide visitors with a better and more personalized experience by retaining information about their identity and
-        preferences, including but not limited to keeping them logged in even if the browser is closed.</li>
+        preferences, including but not limited to keeping them logged in even if the browser is closed.
+      </li>
     </ul>
     <p>
       If you do not want us to place a cookie on your device, you may be able to turn that feature off on your
       device. You may refuse to accept cookies from the Service at any time by activating the setting on your
       browser which allows you to refuse cookies. Further information about the procedure to follow in order to
       disable cookies can be found on your Internet browser provider’s website via your help screen. You may
-      wish to refer to <a href='http://www.allaboutcookies.org/manage-cookies/index.html' target='_blank'>
+      wish to refer to <a
+        href="http://www.allaboutcookies.org/manage-cookies/index.html"
+        target="_blank"
+      >
         http://www.allaboutcookies.org/manage-cookies/index.html</a> for information on commonly used browsers.
       For more information about targeting and advertising cookies and how you can opt out, you can also visit
-      <a href='http://optout.aboutads.info' target='_blank'>http://optout.aboutads.info</a>. Please be aware
+      <a
+        href="http://optout.aboutads.info"
+        target="_blank"
+      >http://optout.aboutads.info</a>. Please be aware
       that if cookies are disabled, not all features of the Service may operate properly or as intended.
     </p>
     <h3>Third-Party Analytics Providers</h3>
@@ -129,8 +164,18 @@
       advised that if you opt out of any service, you may not be able to use the full functionality of the Service.
     </p>
     <ul>
-      <li>For Google Analytics, visit: <a href='https://marketingplatform.google.com/about/analytics/' target='_blank'>https://marketingplatform.google.com/about/analytics/</a></li>
+      <li>
-      <li>For Amplitude, visit: <a href='https://amplitude.com/privacy' target='_blank'>https://amplitude.com/privacy</a></li>
+        For Google Analytics, visit: <a
+          href="https://marketingplatform.google.com/about/analytics/"
+          target="_blank"
+        >https://marketingplatform.google.com/about/analytics/</a>
+      </li>
+      <li>
+        For Amplitude, visit: <a
+          href="https://amplitude.com/privacy"
+          target="_blank"
+        >https://amplitude.com/privacy</a>
+      </li>
     </ul>
     <h3>Third-Party Advertisers/Remarketers</h3>
     <p>
@@ -150,7 +195,9 @@
     </p>
     <p>
       For more information on our advertising partner Google AdMob, please visit <a
-      href='https://policies.google.com/privacy?hl=en' target='_blank'>https://policies.google.com/privacy?hl=en</a>.
+        href="https://policies.google.com/privacy?hl=en"
+        target="_blank"
+      >https://policies.google.com/privacy?hl=en</a>.
     </p>
     <h3>Geolocation Information</h3>
     <p>
@@ -229,7 +276,7 @@
     </p>
     <p>
       You may opt out at any time from the use of your personal information for direct marketing purposes by
-      emailing the instructions to <a href='mailto:admin@habitica.com'>admin@habitica.com</a> or by clicking
+      emailing the instructions to <a href="mailto:admin@habitica.com">admin@habitica.com</a> or by clicking
       on the “Unsubscribe” link located on the bottom of any HabitRPG marketing email and following the
       instructions found on the page to which the link takes you. Please allow us a reasonable time to process
       your request. You cannot opt out of receiving transactional e-mails related to the Service.
@@ -274,7 +321,7 @@
       direct marketing purposes during the preceding calendar year, including the names and addresses of those
       third parties, and examples of the types of Service or products marketed by those third parties. If you wish
       to submit a request pursuant to Section 1798.83, please contact HabitRPG via email at
-      <a href='mailto:admin@habitica.com'>admin@habitica.com</a>.
+      <a href="mailto:admin@habitica.com">admin@habitica.com</a>.
     </p>
     <h2>NEVADA PRIVACY RIGHTS</h2>
     <p>
@@ -306,7 +353,7 @@
     </p>
     <h2>HOW TO CONTACT US</h2>
     <p>
-      If you have questions about this Privacy Notice, please e-mail us at <a href='mailto:admin@habitica.com'>
+      If you have questions about this Privacy Notice, please e-mail us at <a href="mailto:admin@habitica.com">
         admin@habitica.com</a> with “Privacy Notice” in the subject line.
     </p>
     <address>

website/client/src/components/static/terms.vue

@@ -2,11 +2,20 @@
   <!-- eslint-disable max-len -->
   <div class="container-fluid">
     <h1>Terms of Service</h1>
-    <p class="strong pagemeta">Last Updated: December 14, 2021</p>
+    <p class="strong pagemeta">
+      Last Updated: December 14, 2021
+    </p>
     <p>Thanks for choosing Habitica!</p>
-    <p>Our Service is provided by HabitRPG, Inc. ("HabitRPG"). By accepting these Terms of Service and our Privacy Policy located at: <a href="https://habitica.com/static/privacy" target="_blank">https://habitica.com/static/privacy</a> (collectively, the "Agreement"), registering for the Service (as defined below), accessing or using any part of the Service, or otherwise manifesting your assent to the Agreement, you acknowledge that you have read, understood, and agree to be legally bound by the Agreement. If you do not agree to (or cannot comply with) the Agreement, you are not permitted to access or use the Service.</p>
+    <p>
+      Our Service is provided by HabitRPG, Inc. ("HabitRPG"). By accepting these Terms of Service and our Privacy Policy located at: <a
+        href="https://habitica.com/static/privacy"
+        target="_blank"
+      >https://habitica.com/static/privacy</a> (collectively, the "Agreement"), registering for the Service (as defined below), accessing or using any part of the Service, or otherwise manifesting your assent to the Agreement, you acknowledge that you have read, understood, and agree to be legally bound by the Agreement. If you do not agree to (or cannot comply with) the Agreement, you are not permitted to access or use the Service.
+    </p>
     <p>By accepting or agreeing to this Agreement on behalf of a company or other legal entity, you represent and warrant that you have the authority to bind that company or other legal entity to the Agreement and, in such event, "you" and "your" will refer and apply to that company or other legal entity.</p>
-    <p class="strong">THE SECTIONS BELOW TITLED "BINDING ARBITRATION," AND "CLASS ACTION WAIVER" CONTAIN A BINDING ARBITRATION AGREEMENT AND CLASS ACTION WAIVER. THEY AFFECT YOUR LEGAL RIGHTS. PLEASE READ THEM.</p>
+    <p class="strong">
+      THE SECTIONS BELOW TITLED "BINDING ARBITRATION," AND "CLASS ACTION WAIVER" CONTAIN A BINDING ARBITRATION AGREEMENT AND CLASS ACTION WAIVER. THEY AFFECT YOUR LEGAL RIGHTS. PLEASE READ THEM.
+    </p>
     <h2>Changes to the Terms of Service</h2>
     <p>These Terms of Service are effective as of the last updated date stated at the top of this page. We may change these Terms of Service from time to time with or without notice to you. By accessing the Service after we make any such changes to this Terms of Service, you are deemed to have accepted such changes. Please be aware that, to the extent permitted by applicable law, our use of the information collected is governed by the Terms of Service in effect at the time we collect the information. Please refer back to this Terms of Service on a regular basis.</p>
     <p>Our Service allows you to upload, store, send, download, or receive content, including but not limited to information, text, graphics, artwork, or other material ("Content"). You retain ownership of any intellectual property rights that you have in your Content. You hereby grant HabitRPG a worldwide, perpetual, irrevocable, sublicenseable, transferable, assignable, non-exclusive, and royalty-free right and license to use, reproduce, distribute, adapt, modify, translate, create derivative works of, publicly perform, publicly display, digitally perform, make, have made, sell, offer for sale, and import your Content, including all intellectual property rights therein. You represent, warrant, and agree that your Content does not and will not violate any third-party intellectual property, privacy, or other rights, and that you have all right, title and interest in and to your Content required to grant us the license above. We reserve the right at all times, but have no obligation, to delete or refuse to use or distribute any Content on or through the Service, including your Content.</p>
@@ -59,7 +68,12 @@
     <p>You will be charged the amount shown on Pricing before you can access Premium Service. All prices shown on Pricing are inclusive of any applicable sales taxes, levies, value-added taxes, or duties imposed by taxing authorities, and you are responsible for payment of all such taxes, levies, or duties. We may revise the Pricing at any time and may, from time to time, modify, amend, or supplement our fees and fee-billing methods. Such changes shall be effective upon posting on the Pricing page or elsewhere in the Service. If there is a dispute regarding payment of fees to us, we reserve the right to terminate or suspend your account at our sole discretion.</p>
     <p>BY PURCHASING PREMIUM YOU EXPRESSLY UNDERSTAND AND AGREE TO OUR REFUND POLICY:</p>
     <p>WITHIN THIRTY (30) DAYS OF YOUR PREMIUM PAYMENT DATE AS SHOWN ON YOUR PAYMENT BILL, YOU CAN REQUEST A FULL REFUND BY CONTACTING US AT ADMIN@HABITICA.COM. AFTER THIRTY (30) DAYS OF YOUR PREMIUM PAYMENT DATE, ANY PAYMENT REFUND IS SOLELY SUBJECT TO OUR DISCRETION. THE REFUND SHALL BE YOUR SOLE AND EXCLUSIVE REMEDY.</p>
-    <p>FOR ANY CUSTOMER WHO PURCHASED PREMIUM IN APPLE INC.'s APP STORE ("APP STORE"), PLEASE CONTACT APPLE INC.'s SUPPORT TEAM: <a href="http://reportaproblem.apple.com" target="_blank">http://reportaproblem.apple.com</a>. APPLE'S APP STORE DOES NOT ALLOW DEVELOPERS TO ISSUE REFUND FOR APP STORE PURCHASES MADE BY CUSTOMERS.</p>
+    <p>
+      FOR ANY CUSTOMER WHO PURCHASED PREMIUM IN APPLE INC.'s APP STORE ("APP STORE"), PLEASE CONTACT APPLE INC.'s SUPPORT TEAM: <a
+        href="http://reportaproblem.apple.com"
+        target="_blank"
+      >http://reportaproblem.apple.com</a>. APPLE'S APP STORE DOES NOT ALLOW DEVELOPERS TO ISSUE REFUND FOR APP STORE PURCHASES MADE BY CUSTOMERS.
+    </p>
     <h2>Warranty Disclaimer</h2>
     <p>THE SERVICE AND ANY CONTENT MADE AVAILABLE BY HABITRPG VIA THE SERVICE IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT ANY WARRANTIES OF ANY KIND, INCLUDING, WITHOUT LIMITATION, THAT THE SERVICE OR CONTENT WILL OPERATE ERROR-FREE OR THAT THE SERVICE OR CONTENT OR ITS SERVERS ARE FREE OF COMPUTER VIRUSES OR SIMILAR CONTAMINATION OR DESTRUCTIVE FEATURES.</p>
     <p>WE DISCLAIM ALL WARRANTIES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF TITLE, MERCHANTABILITY, NON-INFRINGEMENT OF THIRD PARTIES' RIGHTS, AND FITNESS FOR PARTICULAR PURPOSE AND ANY WARRANTIES ARISING FROM A COURSE OF DEALING, COURSE OF PERFORMANCE, OR USAGE OF TRADE.</p>
@@ -71,7 +85,12 @@
     <h2>Compliance with Applicable Laws</h2>
     <p>The Service is based in the United States. We make no claims concerning whether the Service or posted content may be downloaded, viewed, or be appropriate for use outside of the United States. If you access the Service or such content from outside of the United States, you do so at your own risk. Whether inside or outside of the United States, you are solely responsible for ensuring compliance with the laws of your specific jurisdiction.</p>
     <h2>Binding Arbitration</h2>
-    <p>In the event of a dispute arising under or relating to this Agreement or the Service (each, a "<u>Dispute</u>"), such dispute will be finally and exclusively resolved by binding arbitration governed by the Federal Arbitration Act ("<u>FAA</u>"). Any election to arbitrate, at any time, shall be final and binding on the other party. NEITHER PARTY SHALL HAVE THE RIGHT TO LITIGATE SUCH CLAIM IN COURT OR TO HAVE A JURY TRIAL, EXCEPT EITHER PARTY MAY BRING ITS CLAIM IN ITS LOCAL SMALL CLAIMS COURT, IF PERMITTED BY THAT SMALL CLAIMS COURT RULES AND IF WITHIN SUCH COURT'S JURISDICTION. ARBITRATION IS DIFFERENT FROM COURT, AND DISCOVERY AND APPEAL RIGHTS MAY ALSO BE LIMITED IN ARBITRATION. All disputes will be resolved before a neutral arbitrator selected jointly by the parties, whose decision will be final, except for a limited right of appeal under the FAA. The arbitration shall be commenced and conducted by JAMS pursuant to its then current Comprehensive Arbitration Rules and Procedures and in accordance with the Expedited Procedures in those rules, or, where appropriate, pursuant to JAMS' Streamlined Arbitration Rules and Procedures. All applicable JAMS' rules and procedures are available at the JAMS website <a href="https://www.jamsadr.com" target="_blank">www.jamsadr.com</a>. Each party will be responsible for paying any JAMS filing, administrative, and arbitrator fees in accordance with JAMS rules. Judgment on the arbitrator's award may be entered in any court having jurisdiction. This clause shall not preclude parties from seeking provisional remedies in aid of arbitration from a court of appropriate jurisdiction. The arbitration may be conducted in person, through the submission of documents, by phone, or online. If conducted in person, the arbitration shall take place in the United States county where you reside. The parties may litigate in court to compel arbitration, to stay a proceeding pending arbitration, or to confirm, modify, vacate, or enter judgment on the award entered by the arbitrator. The parties shall cooperate in good faith in the voluntary and informal exchange of all non-privileged documents and other information (including electronically stored information) relevant to the Dispute immediately after commencement of the arbitration. As set forth below, nothing in this Agreement will prevent us from seeking injunctive relief in any court of competent jurisdiction as necessary to protect our proprietary interests.</p>
+    <p>
+      In the event of a dispute arising under or relating to this Agreement or the Service (each, a "<u>Dispute</u>"), such dispute will be finally and exclusively resolved by binding arbitration governed by the Federal Arbitration Act ("<u>FAA</u>"). Any election to arbitrate, at any time, shall be final and binding on the other party. NEITHER PARTY SHALL HAVE THE RIGHT TO LITIGATE SUCH CLAIM IN COURT OR TO HAVE A JURY TRIAL, EXCEPT EITHER PARTY MAY BRING ITS CLAIM IN ITS LOCAL SMALL CLAIMS COURT, IF PERMITTED BY THAT SMALL CLAIMS COURT RULES AND IF WITHIN SUCH COURT'S JURISDICTION. ARBITRATION IS DIFFERENT FROM COURT, AND DISCOVERY AND APPEAL RIGHTS MAY ALSO BE LIMITED IN ARBITRATION. All disputes will be resolved before a neutral arbitrator selected jointly by the parties, whose decision will be final, except for a limited right of appeal under the FAA. The arbitration shall be commenced and conducted by JAMS pursuant to its then current Comprehensive Arbitration Rules and Procedures and in accordance with the Expedited Procedures in those rules, or, where appropriate, pursuant to JAMS' Streamlined Arbitration Rules and Procedures. All applicable JAMS' rules and procedures are available at the JAMS website <a
+        href="https://www.jamsadr.com"
+        target="_blank"
+      >www.jamsadr.com</a>. Each party will be responsible for paying any JAMS filing, administrative, and arbitrator fees in accordance with JAMS rules. Judgment on the arbitrator's award may be entered in any court having jurisdiction. This clause shall not preclude parties from seeking provisional remedies in aid of arbitration from a court of appropriate jurisdiction. The arbitration may be conducted in person, through the submission of documents, by phone, or online. If conducted in person, the arbitration shall take place in the United States county where you reside. The parties may litigate in court to compel arbitration, to stay a proceeding pending arbitration, or to confirm, modify, vacate, or enter judgment on the award entered by the arbitrator. The parties shall cooperate in good faith in the voluntary and informal exchange of all non-privileged documents and other information (including electronically stored information) relevant to the Dispute immediately after commencement of the arbitration. As set forth below, nothing in this Agreement will prevent us from seeking injunctive relief in any court of competent jurisdiction as necessary to protect our proprietary interests.
+    </p>
     <p>ANY CLAIMS, ACTIONS OR PROCEEDINGS BY YOU MUST BE COMMENCED WITHIN ONE YEAR AFTER THE EVENT THAT GAVE RISE TO YOUR CLAIM OCCURS. ALL OTHER CLAIMS YOU MAY HAVE ARE PERMANENTLY BARRED.</p>
     <h2>Class Action Waiver</h2>
     <p>You agree that any arbitration or proceeding shall be limited to the Dispute between us and you individually. To the full extent permitted by law, (i) no arbitration or proceeding shall be joined with any other; (ii) there is no right or authority for any Dispute to be arbitrated or resolved on a class action-basis or to utilize class action procedures; and (iii) there is no right or authority for any Dispute to be brought in a purported representative capacity on behalf of the general public or any other persons. YOU AGREE THAT YOU MAY BRING CLAIMS AGAINST US ONLY IN YOUR INDIVIDUAL CAPACITY AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY PURPORTED CLASS OR REPRESENTATIVE PROCEEDING.</p>

website/client/src/mixins/foolPet.js

@@ -0,0 +1,53 @@
+import includes from 'lodash/includes';
+
+export default {
+  methods: {
+    foolPet (pet) {
+      const SPECIAL_PETS = [
+        'Wolf-Veteran',
+        'Wolf-Cerberus',
+        'Dragon-Hydra',
+        'Turkey-Base',
+        'BearCub-Polar',
+        'MantisShrimp-Base',
+        'JackOLantern-Base',
+        'Mammoth-Base',
+        'Tiger-Veteran',
+        'Phoenix-Base',
+        'Turkey-Gilded',
+        'MagicalBee-Base',
+        'Lion-Veteran',
+        'Gryphon-RoyalPurple',
+        'JackOLantern-Ghost',
+        'Jackalope-RoyalPurple',
+        'Orca-Base',
+        'Bear-Veteran',
+        'Hippogriff-Hopeful',
+        'Fox-Veteran',
+        'JackOLantern-Glow',
+        'Gryphon-Gryphatrice',
+        'JackOLantern-RoyalPurple',
+      ];
+      const BASE_PETS = [
+        'Wolf',
+        'TigerCub',
+        'PandaCub',
+        'LionCub',
+        'Fox',
+        'FlyingPig',
+        'BearCub',
+        'Dragon',
+        'Cactus',
+      ];
+      if (!pet) return 'Pet-Cactus-Virtual';
+      if (SPECIAL_PETS.indexOf(pet) !== -1) {
+        return 'Pet-Wolf-Virtual';
+      }
+      const species = pet.slice(0, pet.indexOf('-'));
+      if (includes(BASE_PETS, species)) {
+        return `Pet-${species}-Virtual`;
+      }
+      return 'Pet-Fox-Virtual';
+    },
+  },
+};

website/common/locales/bs/character.json

@@ -1,5 +1,5 @@
 {
-    "communityGuidelinesWarning": "Imajte na umu da vaše ime za prikaz, fotografija profila i prikaz moraju biti u skladu s <a href='https://habitica.com/static/community-guidelines' target='_blank'> Smjernicama zajednice </a> ( npr. bez psovki, bez tema za odrasle, bez vrijeđanja itd.). Ako imate bilo kakvih pitanja o tome je li nešto prikladno ili ne, slobodno pišite na <% = hrefBlankCommunityManagerEmail%>!",
+    "communityGuidelinesWarning": "Imajte na umu da vaše ime za prikaz, fotografija profila i prikaz moraju biti u skladu s <a href='https://habitica.com/static/community-guidelines' target='_blank'> Smjernicama zajednice </a> ( npr. bez psovki, bez tema za odrasle, bez vrijeđanja itd.). Ako imate bilo kakvih pitanja o tome je li nešto prikladno ili ne, slobodno pišite na <%= hrefBlankCommunityManagerEmail %>!",
     "profile": "Profil",
     "avatar": "Prilagodi avatar",
     "editAvatar": "Uredi avatar",

website/common/locales/bs/contrib.json

@@ -51,7 +51,7 @@
     "tier": "Nivo",
     "conRewardsURL": "http://habitica.fandom.com/wiki/Contributor_Rewards",
     "surveysSingle": "Pomogli ste da Habitica raste, bilo popunjavanjem ankete ili pomaganjem tokom testiranja. Hvala vam!",
-    "surveysMultiple": "Pomogli ste Habitici da raste u <% = count%> prilika, bilo popunjavanjem ankete ili pomaganjem tokom testiranja. Hvala vam!",
+    "surveysMultiple": "Pomogli ste Habitici da raste u <%= count %> prilika, bilo popunjavanjem ankete ili pomaganjem tokom testiranja. Hvala vam!",
     "blurbHallPatrons": "Ovo je dvorana pokrovitelja, u kojoj odajemo počast plemenitim avanturistima koji su podržali Habiticu na Kickstarter-u. Zahvaljujemo im što su nam pomogli da oživimo Habiticu!",
     "blurbHallContributors": "Ovo je dvorana saradnika, u kojoj se odaje počast saradnicima kroz princip otvorenog koda za Habiticu. Bilo kôdom, umjetnošću, muzikom, pisanjem ili čak samo uslužnošću, zaradili su <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> dragulje, ekskluzivnu opremu </a> i <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestižne titule</a>. I vi možete doprinijeti Habitici! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'>Ovjde saznajte više.</a>"
 }

website/common/locales/bs/generic.json

@@ -63,7 +63,7 @@
     "achievementDilatoryText": "Pomogao je poraziti Stravičnog zmaja odgađanja tokom Ljetnjeg festivala 2014!",
     "costumeContest": "Kostimirani takmičar",
     "costumeContestText": "Učestvovao u takmičenju kostima za Noć vještica. Pogledajte neke od sjajnih objava na blog.habitrpg.com!",
-    "costumeContestTextPlural": "Učestvovalo u <% = count%> takmičenjima kostima za Noć vještica. Pogledajte neke od sjajnih objava na blog.habitrpg.com!",
+    "costumeContestTextPlural": "Učestvovalo u <%= count %> takmičenjima kostima za Noć vještica. Pogledajte neke od sjajnih objava na blog.habitrpg.com!",
     "newPassSent": "Ako imamo vašu e-poštu u evidenciji, poslana su vam uputstva za postavljanje nove šifre.",
     "error": "Greška",
     "menu": "Izbornik",

website/common/locales/bs/overview.json

@@ -6,5 +6,5 @@
     "webStep2Text": "Sada počnite rješavati svoje ciljeve sa liste! Dok dovršavate zadatke i potvrđujete ih na Habitici, steći ćete [Iskustvo](http://habitica.wikia.com/wiki/Experience_Points), koje vam pomaže da pređete na viši nivo, i [Zlatnike](http: // habitica. wikia.com/wiki/Gold_Points), koji vam omogućavaju da kupite nagrade. Ako padnete u loše navike ili propustite svoje dnevne zadatke, izgubit ćete [Zdravlje](http://habitica.wikia.com/wiki/Health_Points). Na taj način, Habitica iskustvo i zdravlje trake služe kao zabavni pokazatelj vašeg napretka prema zadatim ciljevima. Počet ćete viđati kako se vaš stvarni život poboljšava kako vaš lik napreduje u igri.",
     "step3": "Korak 3: Prilagodite i istražite Habitiku",
     "webStep3Text": "Nakon što se upoznate s osnovama, možete još više iskoristiti Habiticu pomoću ovih sjajnih karakteristika:\n * Organizirajte svoje zadatke pomoću [Oznaka](http://habitica.wikia.com/wiki/Tags) (uredite zadatak da biste ih dodali).\n * Prilagodite svoj [Avatar](http://habitica.wikia.com/wiki/Avatar) klikom na ikonu korisnika u gornjem desnom uglu.\n * Kupite svoju [Opremu](http://habitica.wikia.com/wiki/Equipment) u okviru Nagrade ili u [Prodavnici](<% = shopUrl%>) i promijenite je u [Inventar > Oprema] (<% = equipUrl%>).\n * Povežite se s drugim korisnicima putem [Aščinice](http://habitica.wikia.com/wiki/Tavern).\n * Počevši od 3. nivoa, izlegnite [Ljubimce](http://habitica.wikia.com/wiki/Pets) sakupljanjem [Jaja](http://habitica.wikia.com/wiki/Eggs) i [Napitaka za izlijeganje] (http://habitica.wikia.com/wiki/Hatching_Potions). [Hranite](http://habitica.wikia.com/wiki/Food) ih da postanu [Jahalice](http://habitica.wikia.com/wiki/Mounts).\n * Na nivou 10: odaberite određeni [Razred](http://habitica.wikia.com/wiki/Class_System), a zatim koristite [Vještine](http://habitica.wikia.com/wiki/Skills) specifične za razred (nivoi 11 do 14).\n * Napravite partiju sa svojim prijateljima (klikom na [Partija](<% = partyUrl%>) na navigacijskoj traci) kako biste ostali odgovorni i zaradite ponešto iz potrage.\n * Porazite čudovišta i sakupljajte predmete na [Potragama](http://habitica.wikia.com/wiki/Quests) (zadatak će vam biti postavljen na nivou 15).",
-    "overviewQuestions": "Imate pitanja? Pogledajte [ČPP](<% = faqUrl%>)! Ako se vaše pitanje tamo ne spominje, možete zatražiti dodatnu pomoć u [Esnafu za pomoć na Habitica](<% = helpGuildUrl%>).\n\nSretno sa zadacima!"
+    "overviewQuestions": "Imate pitanja? Pogledajte [ČPP](<%= faqUrl %>)! Ako se vaše pitanje tamo ne spominje, možete zatražiti dodatnu pomoć u [Esnafu za pomoć na Habitica](<%= helpGuildUrl %>).\n\nSretno sa zadacima!"
 }

website/common/locales/bs/pets.json

@@ -72,7 +72,7 @@
     "notEnoughPetsMounts": "Niste prikupili dovoljno ljubimaca i jahalica",
     "notEnoughMounts": "Niste prikupili dovoljno jahalica",
     "notEnoughPets": "Niste prikupili dovoljno ljubimaca",
-    "clickOnPotionToHatch": "Kliknite napitak za izlijeganje da biste ga iskoristili na <% = eggName%> i izlegnite novog ljubimca!",
+    "clickOnPotionToHatch": "Kliknite napitak za izlijeganje da biste ga iskoristili na <%= eggName %> i izlegnite novog ljubimca!",
     "hatchDialogText": "Izlijte svoj napitak za izlijeganje <%= potionName %> na jaje <%= eggName %> i ono će se izleći u <%= petName %>.",
     "clickOnEggToHatch": "Kliknite na jaje da koristite vaš <%= potionName %> napitak za izlijeganje i izlegnite novog ljubimca!",
     "dragThisPotion": "Povucite <%= potionName %> do jajeta i izlegnite novog ljubimca!",

website/common/locales/bs/rebirth.json

@@ -1,8 +1,8 @@
 {
     "rebirthNew": "Preporod: Nova avantura dostupna!",
     "rebirthUnlock": "Otključali ste preporod! Ova posebna stavka na pijaci omogućava vam da započnete novu igru sa 1. nivoa, zadržavajući zadatke, dostignuća, kućne ljubimce i još mnogo toga, kao da ste ponovo rođeni. Koristite ga da udahnete novi život Habitici ako smatrate da ste sve postigli ili da iskusite nove karakteristike svježim očima početnika!",
-    "rebirthAchievement": "Započeli ste novu avanturu! Ovo vam je <% = number%> preporod, a najviši nivo koji ste postigli je <% = level%>. Da biste nizali ova dostignuća, započnite svoju sljedeću novu avanturu kada dosegnete još viši nivo!",
+    "rebirthAchievement": "Započeli ste novu avanturu! Ovo vam je <%= number %> preporod, a najviši nivo koji ste postigli je <%= level %>. Da biste nizali ova dostignuća, započnite svoju sljedeću novu avanturu kada dosegnete još viši nivo!",
-    "rebirthAchievement100": "Započeli ste novu avanturu! Ovo je vaš <% = number%> preporod, a najviši nivo koji ste postigli je 100 ili veći. Da biste nizali ova dostignuća, započnite svoju sljedeću novu avanturu kada dostignete najmanje 100!",
+    "rebirthAchievement100": "Započeli ste novu avanturu! Ovo je vaš <%= number %> preporod, a najviši nivo koji ste postigli je 100 ili veći. Da biste nizali ova dostignuća, započnite svoju sljedeću novu avanturu kada dostignete najmanje 100!",
     "rebirthBegan": "Nova avantura je počela",
     "rebirthText": "Nova avantura je početa <%= rebirths %> put",
     "rebirthOrb": "Korištena je Kugla preporoda da se krene ispočetka nakon dostizanja <%= level %> nivoa.",

website/common/locales/bs/tasks.json

@@ -77,7 +77,7 @@
     "streakSingular": "Ponavljač",
     "streakSingularText": "Obavljeno je 21-dnevni niz svakodnevnih zadataka",
     "perfectName": "<%= count %> potpunih dana",
-    "perfectText": "Završili sve svakodnevne zadatke za <% = count%> dana. Ovim postignućem dobijate +nivo/2 poda ojačanja za sve statuse za sljedeći dan. Oni iznad nivoa 100 ne dobijaju nikakve dodatne efekte ojačanja.",
+    "perfectText": "Završili sve svakodnevne zadatke za <%= count %> dana. Ovim postignućem dobijate +nivo/2 poda ojačanja za sve statuse za sljedeći dan. Oni iznad nivoa 100 ne dobijaju nikakve dodatne efekte ojačanja.",
     "perfectSingular": "Potpun dan",
     "perfectSingularText": "Završili sve aktivne svakodnevne zadatke u jednom danu. Ovim postignućem dobijate +nivo/2 boda za ojačanje za sve statuse za sljedeći dan. Oni iznad nivoa 100 ne dobijaju nikakve dodatne efekte ojačanja.",
     "fortifyName": "Napitak okrepljenja",

website/common/locales/de/achievements.json

@@ -14,13 +14,13 @@
     "achievementAridAuthorityModalText": "Du hast alle wüstenfarbenen Reittiere gezähmt!",
     "achievementAridAuthorityText": "Hat alle wüstenfarbenen Reittiere gezähmt.",
     "achievementAridAuthority": "Sandige Sachverständige",
-    "achievementDustDevilModalText": "Du hast alle wüstenfarbenen Haustiere eingesammelt!",
+    "achievementDustDevilModalText": "Du hast alle wüstenfarbenen Haustiere gesammelt!",
-    "achievementDustDevilText": "Hat alle wüstenfarbenen Haustiere eingesammelt.",
+    "achievementDustDevilText": "Hat alle wüstenfarbenen Haustiere gesammelt.",
     "achievementDustDevil": "Staubteufel",
     "achievementAllYourBaseModalText": "Du hast alle Standard-Reittiere gezähmt!",
     "achievementAllYourBaseText": "Hat alle Standard-Reittiere gezähmt.",
-    "achievementBackToBasicsModalText": "Du hast alle Standard-Haustiere eingesammelt!",
+    "achievementBackToBasicsModalText": "Du hast alle Standard-Haustiere gesammelt!",
-    "achievementBackToBasicsText": "Hat alle Standard-Haustiere eingesammelt.",
+    "achievementBackToBasicsText": "Hat alle Standard-Haustiere gesammelt.",
     "achievementBackToBasics": "Zurück zu den Anfängen",
     "achievementJustAddWaterModalText": "Du hast die Oktopus-, Seepferdchen-, Tintenfisch-, Wal-, Meeresschildkröten-, Nacktkiemerschnecken-, Seeschlagen- und Delfinhaustier-Quests erfüllt!",
     "achievementJustAddWaterText": "Hat die Oktopus-, Seepferdchen-, Tintenfisch-, Wal-, Meeresschildkröten-, Nacktkiemerschnecken-, Seeschlangen- und Delfinhaustier-Quests erfüllt.",
@@ -86,7 +86,7 @@
     "achievementFreshwaterFriends": "Süßwasser-Freunde",
     "achievementAllThatGlittersModalText": "Du hast alle goldenen Reittiere gezähmt!",
     "achievementGoodAsGoldText": "Hat alle goldenen Haustiere gesammelt.",
-    "achievementGoodAsGoldModalText": "Du hast alle goldenen Haustiere eingesammelt!",
+    "achievementGoodAsGoldModalText": "Du hast alle goldenen Haustiere gesammelt!",
     "achievementAllThatGlittersText": "Hat alle goldenen Reittiere gezähmt.",
     "achievementAllThatGlitters": "Alles, was glänzt",
     "achievementGoodAsGold": "So gut wie Gold",
@@ -99,24 +99,24 @@
     "achievementBoneCollector": "Knochensammler",
     "achievementRedLetterDayModalText": "Du hast alle roten Reittiere gezähmt!",
     "achievementRedLetterDayText": "Hat alle roten Reittiere gezähmt.",
-    "achievementSeeingRedModalText": "Du hast alle rote Haustiere gesammelt!",
+    "achievementSeeingRedModalText": "Du hast alle roten Haustiere gesammelt!",
     "achievementSeeingRedText": "Hat alle roten Haustiere gesammelt.",
     "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-Junges!",
+    "achievementLegendaryBestiaryText": "Hat alle mystischen Haustiere ausgebrütet: Drachen-Jungtier, Fliegendes Ferkel, Greifen-Jungtier, Seeschlangen-Haustier und Einhorn-Fohlen!",
     "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!",
-    "achievementSeasonalSpecialist": "Saisonal Spezial",
+    "achievementSeasonalSpecialist": "Saisonaler Spezialist",
     "achievementWildBlueYonderModalText": "Du hast alle blauen Zuckerwatte-Reittiere gezähmt!",
     "achievementWildBlueYonderText": "Hat alle blauen Zuckerwatte-Reittiere gezähmt.",
-    "achievementWildBlueYonder": "Weite Ferne",
+    "achievementWildBlueYonder": "Das wilde weite Blau",
-    "achievementVioletsAreBlueModalText": "Du hast alle blauen Zuckerwattehaustiere gesammelt!",
+    "achievementVioletsAreBlueModalText": "Du hast alle blauen Zuckerwatte-Haustiere gesammelt!",
-    "achievementVioletsAreBlueText": "Hat alle blauen Zuckerwattehaustiere gesammelt.",
+    "achievementVioletsAreBlueText": "Hat alle blauen Zuckerwatte-Haustiere gesammelt.",
     "achievementVioletsAreBlue": "Veilchen sind blau",
     "achievementDomesticated": "E-I-E-I-O",
-    "achievementDomesticatedModalText": "Du hast alle zähmbaren Tiere gesammelt!",
+    "achievementDomesticatedModalText": "Du hast alle gezähmten Tiere gesammelt!",
     "achievementDomesticatedText": "Hat alle Standardfarben für gezähmte Tiere ausgebrütet: Frettchen, Meerschweinchen, Hahn, Fliegendes Schwein, Ratte, Häschen, Pferd und Kuh!",
     "achievementShadeOfItAll": "Der Schatten über allen",
     "achievementShadeOfItAllModalText": "Du hast alle Schatten-Reittiere gezähmt!",
@@ -126,5 +126,8 @@
     "achievementShadyCustomer": "Der Schatten in Dir",
     "achievementZodiacZookeeper": "Tierkreiszeichen-Pfleger",
     "achievementZodiacZookeeperText": "Hat alle Tierkreiszeichen-Tiere ausgebrütet: Ratte, Kalb, Kaninchen, Schlange, Fohlen, Schaf, Affe, Hahn, Wolf, Tiger, Fliegendes Ferkel, und Drache!",
-    "achievementZodiacZookeeperModalText": "Du hast alle Tierkreiszeichen-Tiere eingesammelt!"
+    "achievementZodiacZookeeperModalText": "Du hast alle Tierkreiszeichen-Tiere gesammelt!",
+    "achievementBirdsOfAFeather": "Fliegende Freunde",
+    "achievementBirdsOfAFeatherText": "Hat alle fliegenden Haustiere ausgebrütet: Fliegendes Ferkel, Eule, Papagei, Pterodactylus, Greif, Falke, Pfau, und Hahn.",
+    "achievementBirdsOfAFeatherModalText": "Du hast alle fliegenden Haustiere gesammelt!"
 }

website/common/locales/de/backgrounds.json

@@ -671,5 +671,19 @@
     "backgroundPalmTreeWithFairyLightsText": "Palme mit Lichterkette",
     "backgroundPalmTreeWithFairyLightsNotes": "Posiere bei einer mit Lichterkette geschmückten Palme.",
     "backgroundSnowyFarmText": "Verschneiter Bauernhof",
-    "backgroundSnowyFarmNotes": "Stelle sicher, dass alle auf Deinem verschneiten Bauernhof wohlauf und warm sind."
+    "backgroundSnowyFarmNotes": "Stelle sicher, dass alle auf Deinem verschneiten Bauernhof wohlauf und warm sind.",
+    "backgroundWinterWaterfallNotes": "Bewundere einen winterlichen Wasserfall.",
+    "backgrounds022022": "Set 93: Veröffentlicht im Februar 2022",
+    "backgroundWinterWaterfallText": "Winterlicher Wasserfall",
+    "backgroundOrangeGroveText": "Orangenhain",
+    "backgroundOrangeGroveNotes": "Streife durch einen duftenden Orangenhain.",
+    "backgroundIridescentCloudsText": "Schillernde Wolken",
+    "backgroundIridescentCloudsNotes": "Schwebe durch schillernde Wolken.",
+    "backgrounds032022": "Set 94: Veröffentlicht im März 2022",
+    "backgroundAnimalsDenText": "Bau eines Waldtieres",
+    "backgroundBrickWallWithIvyText": "Efeubewachsene Ziegelmauer",
+    "backgroundFloweringPrairieText": "Blühende Prärie",
+    "backgroundFloweringPrairieNotes": "Tolle durch eine blühende Prärie.",
+    "backgroundAnimalsDenNotes": "Mach es Dir im Bau eines Waldtieres gemütlich.",
+    "backgroundBrickWallWithIvyNotes": "Bewundere eine efeubewachsene Ziegelmauer."
 }

website/common/locales/de/communityguidelines.json

@@ -4,18 +4,18 @@
     "commGuideHeadingWelcome": "Willkommen in Habitica!",
     "commGuidePara001": "Sei gegrüßt, Abenteurer! Willkommen in Habitica, dem Land der Produktivität, des gesunden Lebens und des gelegentlich randalierenden Greifs. Wir sind eine fröhliche Gemeinschaft voller hilfreicher Menschen, die sich auf ihrem Weg der persönlichen Entwicklung gegenseitig unterstützen. Alles was dazu gehört, ist eine positive Einstellung, ein respektvoller Umgang miteinander und etwas Verständnis dafür, dass jeder unterschiedliche Fähigkeiten und Grenzen hat - auch Du! Habiticaner gehen geduldig miteinander um und versuchen zu helfen, wo immer sie können.",
     "commGuidePara002": "Damit sich hier jeder sicher fühlen, glücklich und produktiv sein kann, gibt es ein paar Richtlinien. Wir haben uns große Mühe gegeben, sie möglichst nett und leicht verständlich zu formulieren. Bitte nimm Dir die Zeit, sie durchzulesen, bevor Du anfängst zu chatten.",
-    "commGuidePara003": "Diese Regeln gelten an allen sozialen Orten die wir verwenden, unter anderem (aber nicht nur) bei Trello, GitHub, Weblate und dem Wiki. Manchmal werden unvorhergesehene Situationen auftreten, z.B. ein neuer Krisenherd oder ein bösartiger Totenbeschwörer. Wenn das passiert, werden die Moderatoren reagieren, indem sie diese Richtlinien überarbeiten, um die Gemeinschaft vor neuen Gefahren zu schützen. Hab keine Angst: Du wirst von Bailey informiert werden, wenn sich die Richtlinien ändern!",
+    "commGuidePara003": "Diese Regeln gelten an allen sozialen Orten, die wir verwenden, bezogen (aber nicht unbedingt eingeschränkt) auf Trello, GitHub, Weblate und dem Habitica Wiki auf Fandom. Wenn Gemeinschaften wachsen und sich verändern, passen sich manchmal ihre Regeln von Zeit zu Zeit an. Wenn es wesentliche Änderungen dieser Richtlinien gibt, wirst Du dies durch eine Bailey-Ankündigung und/oder in unseren sozialen Medien hören!",
     "commGuideHeadingInteractions": "Interaktionen in Habitica",
     "commGuidePara015": "Habitica hat zwei Arten sozialer Orte: öffentliche und private. Öffentliche Orte sind das Gasthaus, öffentliche Gilden, GitHub, Trello und das Wiki. Private Orte sind private Gilden, der Gruppenchat und private Nachrichten. Alle Anzeigenamen und @Usernamen müssen den Community-Richtlinien für öffentliche Orte entsprechen. Um Deinen Anzeigenamen oder @Usernamen zu ändern, wähle in der mobilen App Menü > Einstellungen > Profil. Und wähle auf der Webseite Benutzer Icon > Profil und klicke auf den \"Bearbeiten\"-Knopf.",
     "commGuidePara016": "Wenn Du Dich durch die öffentlichen Orte in Habitica bewegst, gibt es ein paar allgemeine Regeln, damit jeder sicher und glücklich ist.",
     "commGuideList02A": "<strong>Respektiert einander</strong>. Sei höflich, freundlich und hilfsbereit. Vergiss nicht: Habiticaner kommen aus den verschiedensten Hintergründen und haben sehr unterschiedliche Erfahrungen gemacht. Das macht Habitica so eigenartig! Es ist wichtig, dass man beim Aufbauen einer Community seine Unterschiede und Ähnlichkeiten respektieren, aber natürlich auch feiern kann.",
     "commGuideList02B": "<strong>Halte Dich an die <a href='/static/terms' target='_blank'>allgemeinen Geschäftsbedingungen</a></strong>, sowohl in öffentlichen als auch in privaten Umgebungen.",
     "commGuideList02C": "<strong>Poste keine Bilder oder Texte, die Gewalt darstellen, andere einschüchtern, oder eindeutig/indirekt sexuell sind, die Diskriminierung, Fanatismus, Rassismus, Sexismus, Hass, Belästigungen oder Hetze gegen jedwede Individuen oder Gruppen beinhalten.</strong> Auch nicht als Scherz oder Meme. Das bezieht sowohl Sprüche als auch Stellungnahmen mit ein. Nicht jeder hat den gleichen Humor, etwas, was Du als Witz wahrnimmst, kann für jemand anderen verletzend sein.",
-    "commGuideList02D": "<strong>Halte die Diskussionen für alle Altersgruppen angemessen</strong>. Wir haben viele junge Habiticaner, die die Seite nutzen! Wir wollen, dass die Habitica-Community so angenehm und inklusiv ist, wie möglich.",
+    "commGuideList02D": "<strong>Halte die Diskussionen für alle Altersgruppen angemessen</strong>. Das heißt, Erwachsenenthemen in öffentlichen Bereichen zu vermeiden. Viele junge Habiticaner und Menschen mit verschiedenen Hintergründen nutzen diese Seite. Wir wollen unsere Gemeinschaft so angenehm und inklusiv wie möglich gestalten.",
-    "commGuideList02E": "<strong>Vermeide vulgäre Ausdrücke. Dazu gehören auch mildere, religiöse Ausdrücke, die anderswo möglicherweise akzeptiert werden</strong>. Unter uns sind Menschen aus allen religiösen und kulturellen Hintergründen und wir wünschen uns, dass sich alle im öffentlichen Raum wohl fühlen. <strong>Wenn Dir ein Moderator oder Mitarbeiter mitteilt, dass ein bestimmter Ausdruck, der dir selbst vielleicht nicht problematisch vorkommt, in Habitica nicht erlaubt ist, ist diese Entscheidung endgültig</strong>. Zusätzlich werden verbale Angriffe jeder Art strenge Konsequenzen haben, insbesondere auch, da sie unsere Nutzungsbedingungen verletzen.",
+    "commGuideList02E": "<strong>Vermeide vulgäre Ausdrücke. Dazu gehören auch mildere, religiöse Ausdrücke, die anderswo möglicherweise akzeptiert werden, oder verschleierte Schimpfwörter</strong>. Unter uns sind Menschen aus allen religiösen und kulturellen Hintergründen und wir wollen, dass sich alle im öffentlichen Raum wohl fühlen. <strong>Wenn Dir ein Moderator oder Mitarbeiter mitteilt, dass ein bestimmter Ausdruck in Habitica nicht erlaubt ist, selbst wenn er Dir vielleicht nicht problematisch vorkommt, ist diese Entscheidung endgültig</strong>. Zusätzlich werden verbale Angriffe jeder Art strenge Konsequenzen haben, da sie auch unsere Nutzungsbedingungen verletzen.",
-    "commGuideList02F": "<strong>Vermeide längere Diskussionen über spaltende Themen in der Taverne und wo sie außerhalb des Themenbereichs liegen</strong>. Wenn du das Gefühl hast, dass jemand etwas Unhöfliches oder Verletzendes gesagt hat, dann lass dich nicht mit ihm ein. Wenn jemand etwas erwähnt, das von den Richtlinien erlaubt ist, das aber für dich verletzend ist, ist es in Ordnung, das höflich jemandem mitzuteilen. Wenn es gegen die Richtlinien oder die Nutzungsbedingungen verstößt, solltest du es melden und einen Moderator antworten lassen. Im Zweifelsfall melde den Beitrag.",
+    "commGuideList02F": "Vermeide längere Diskussionen über spaltende Themen in der Taverne und wenn sie außerhalb des Themenbereichs liegen. Wenn jemand etwas sagt, das zwar von den Richtlinien her erlaubt ist, das Dich aber verletzt, dann ist es in Ordnung, diese Person höflich darauf hinzuweisen. Wenn Dir eine Person sagt, dass ihr Dein Verhalten unangenehm ist, nimm Dir Zeit, darüber zu reflektieren, anstatt im Zorn zu antworten. Aber wenn Du das Gefühl hast, dass ein Gespräch hitzig, übermäßig emotional, oder verletzend wird, dann <strong>lass dich nicht darauf ein. Melde stattdessen die Beiträge, um uns darüber in Kenntnis zu setzen.</strong> Moderatoren werden so schnell wie möglich antworten. Du kannst auch eine E-Mail an <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> senden und gegebenenfalls Screenshots anhängen.",
     "commGuideList02G": "<strong>Erfülle alle Moderator-Anfragen sofort</strong>. Diese könnten Folgendes beinhalten, ist aber nicht darauf beschränkt: Dich aufzufordern, deine Beiträge in einem bestimmten Bereich zu begrenzen, dein Profil zu bearbeiten, um ungeeignete Inhalte zu entfernen, dich zu bitten, deine Diskussion in einen geeigneteren Bereich zu verschieben, etc. Diskutiere nicht mit Moderatoren. Solltest du mit einer Entscheidung unzufrieden sein, oder anderes Feedback zur Moderation haben, sende eine E-mail an <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> um unseren Community Manager zu kontaktieren.",
-    "commGuideList02J": "<strong>Poste keinen Spam</strong>. Spamming kann Folgendes beinhalten, ist aber nicht beschränkt auf: das Posten desselben Kommentars oder einer Anfrage an mehreren Stellen, das Posten von Links ohne Erklärung oder Kontext, das Posten unsinniger Nachrichten, das Posten mehrerer Werbebotschaften über eine Gilde, Party oder eine Herausforderung oder das Posten vieler Nachrichten in Serie. Wenn Personen, die auf einen Link klicken, Dir einen Nutzen bringen, musst Du dies im Text Deiner Nachricht offenlegen, sonst wird das auch als Spam betrachtet.<br/><br/>Es liegt an den Mods zu entscheiden, ob etwas Spam darstellt.",
+    "commGuideList02J": "<strong>Poste keinen Spam</strong>. Spamming kann Folgendes beinhalten, ist aber nicht beschränkt auf: das Posten desselben Kommentars oder derselben Frage an mehreren Stellen, <strong>das Posten von Links ohne Erklärung oder Kontext</strong>, das Posten unsinniger Nachrichten, das Posten mehrerer Werbebotschaften für eine Gilde, Party, oder Herausforderung, oder das Posten vieler Nachrichten hintereinander. Wenn Du irgendeinen Nutzen daraus ziehst, wenn jemand auf einen Link klickt, musst Du das im Text Deiner Nachricht offenlegen, sonst wird sie auch als Spam betrachtet. Mods können gegebenenfalls nach ihrem Ermessen entscheiden, was Spam ausmacht.",
     "commGuideList02K": "<strong>Bitte vermeide große Überschriften in öffentlichen Chats, vor allem in der Taverne.</strong> Ähnlich wie bei GROSSBUCHSTABEN liest sich der Text, als ob Du schreien würdest, und beeinträchtigt die gemütliche Atmosphäre.",
     "commGuideList02L": "<strong>Wir raten Dir dringend davon ab, persönliche Informationen - besonders solche, mit denen Du identifiziert werden könntest - in öffentlichen Chats zu teilen.</strong> Zu den identifizierenden Informationen gehören unter anderem: Deine Adresse, Deine E-Mail-Adresse und Dein API-Token/Passwort. Dies dient nur Deiner Sicherheit! Mitarbeiter oder Moderatoren werden solche Beiträge nach eigenem Ermessen entfernen. Wenn Du nach persönlichen Informationen in einer privaten Gilde, Party oder per PN gefragt wirst, empfehlen wir dringend, dass Du höflich ablehnst und Mitarbeiter und Moderatoren informierst, indem Du entweder 1) den Beitrag über das Fähnchen meldest, oder 2) eine E-Mail an <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> schreibst und Screenshots anhängst.",
     "commGuidePara019": "<strong>An privaten Orten</strong> haben Benutzer die Freiheit, alle möglichen Themen zu besprechen, solange diese nicht den AGB widersprechen. Dies umfasst das Posten von diskriminierenden, gewalttätigen oder einschüchternden Inhalten. Beachte, dass Herausforderungsnamen im öffentlichen Profil des Gewinners angezeigt werden, daher müssen ALLE Herausforderungsnamen den Community-Richtlinien für öffentliche Orte entsprechen, auch wenn sie an privaten Orten genutzt werden.",
@@ -28,7 +28,7 @@
     "commGuidePara024": "<strong>Sprecht nicht über etwas suchterregendes in der Taverne</strong>. Viele Menschen verwenden Habitica, um Ihre schlechten Gewohnheiten loszuwerden. Wenn sie andere Leute über suchterregende/illegale Substanzen reden hören, würde das dies deutlich erschweren! Respektiert eure Tavernenkameraden und berücksichtigt diesen Umstand. Dies gilt auch, aber nicht abschließend, für: Rauchen, Alkohol, Pornografie, Glückspiel und Drogen.",
     "commGuidePara027": "<strong>Wenn ein Moderator Dich anweist, ein Gespräch an anderer Stelle zu führen und wenn es keine relevante Gilde gibt, kann er Dir vorschlagen, die Hinterzimmer-Gilde zu benutzen</strong>. Die Hinterzimmer-Gilde ist ein freier öffentlicher Raum, um potenziell sensible Themen zu diskutieren. Sie sollte nur verwendet werden, wenn sie von einem Moderator geleitet wird. Sie wird vom Moderatorenteam sorgfältig überwacht. Sie ist kein Ort für allgemeine Diskussionen oder Gespräche, und Du wirst nur dann von einem Mod dorthin geleitet, wenn es angebracht ist.",
     "commGuideHeadingPublicGuilds": "Öffentliche Gilden",
-    "commGuidePara029": "<strong>Öffentliche Gilden sind der Taverne ziemlich ähnlich, außer dass die Gespräche dort nicht so allgemein sind, sondern sich um ein bestimmtes Thema drehen.</strong> Der öffentliche Gildenchat sollte sich auf dieses Thema konzentrieren. Zum Beispiel könnte es sein, dass Mitglieder der Wordsmith-Gilde genervt sind, wenn sich das Gespräch plötzlich um Gärtnern statt um Schreiben dreht, und eine Drachenliebhaber-Gilde interessiert sich wahrscheinlich nicht dafür, antike Runen zu entziffern. Manche Gilden sind dabei lockerer als andere, aber <strong>versuche generell beim Thema zu bleiben!</strong>",
+    "commGuidePara029": "<strong>Öffentliche Gilden sind der Taverne ziemlich ähnlich, außer dass die Gespräche dort nicht so allgemein sind, sondern sich um ein bestimmtes Thema drehen.</strong> Der öffentliche Gildenchat sollte sich auf dieses Thema konzentrieren. Zum Beispiel könnte es sein, dass Mitglieder der Wordsmith-Gilde genervt sind, wenn sich das Gespräch plötzlich um Gärtnern statt um Schreiben dreht, und eine Drachenliebhaber-Gilde interessiert sich wahrscheinlich nicht dafür, antike Runen zu entziffern. Manche Gilden sind dabei lockerer als andere, aber <strong>versuche beim Thema zu bleiben!</strong>",
     "commGuidePara031": "Einige öffentlichen Gilden werden sensible Themen wie Depressionen, Religion, Politik usw. enthalten. Dies ist in Ordnung, solange die Gespräche darin nicht gegen die Allgemeinen Geschäftsbedingungen oder die Regeln des öffentlichen Raums verstoßen und solange sie beim Thema bleiben.",
     "commGuidePara033": "<strong>Öffentliche Gilden dürfen KEINE Inhalte \"ab 18\" enthalten. Wenn geplant ist, regelmäßig über sensible Inhalte zu diskutieren, sollte dies in der Gildenbeschreibung angegeben werden</strong>. Auf diese Weise soll Habitica sicher und angenehm für alle sein.",
     "commGuidePara035": "<strong>Wenn die betreffende Gilde verschiedene Arten von heiklen Themen hat, ist es respektvoll gegenüber Deinen Habiticanern, eine Warnung vor Deinen Kommentar zu stellen (z.B. \"Warnung: erwähnt Selbstverletzung\")</strong>. Diese können als Triggerwarnungen und/oder Inhaltshinweise bezeichnet werden, und Gilden können zusätzlich zu den hier angegebenen Regeln eigene Regeln haben. Wenn möglich, verwende bitte <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>Markdown</a> um die potenziell heiklen Inhalte unterhalb von Zeilenumbrüchen auszublenden, damit diejenigen, die sie nicht lesen möchten, darüber hinweg scrollen können, ohne den Inhalt zu sehen. Mitarbeiter und Moderatoren von Habitica können dieses Material nach eigenem Ermessen trotzdem entfernen.",
@@ -77,7 +77,7 @@
     "commGuideList09C": "Der Aufstieg in höhere Mitwirkendenstufen kann dauerhaft verwehrt (\"eingefroren\") werden",
     "commGuideHeadingModerateConsequences": "Beispiele für mittlere Konsequenzen",
     "commGuideList10A": "Beschränkte öffentliche und/oder private Chat-Berechtigungen",
-    "commGuideList10A1": "Führen Deine Handlungen zur Aufhebung Deiner Chatrechte, wird Dich ein Moderator oder Mitarbeiter per PN und/oder in dem Forum, in dem Du stummgeschaltet wurdest, über die Dauer und Gründe für das Stummschalten und/oder die Handlung, die für die Wiederherstellung Deiner Chatrechte notwendig ist, informieren. Deine Chatrechte werden wieder hergestellt, wenn Du höflich mit den erforderlichen Handlungen übereinstimmst und zustimmst, Dich fortan an die Community-Richtlinien und ToS zu halten.",
+    "commGuideList10A1": "Führen Deine Handlungen zur Aufhebung Deiner Chatrechte, wird Dich ein Moderator oder Mitarbeiter per PN und/oder in dem Forum, in dem Du stummgeschaltet wurdest, über die Dauer und Gründe für das Stummschalten und/oder die Handlung, die für die Wiederherstellung Deiner Chatrechte notwendig ist, informieren. Deine Chatrechte werden wieder hergestellt, wenn Du höflich mit den erforderlichen Handlungen übereinstimmst und zustimmst, Dich fortan an die Community-Richtlinien und Nutzungsbediengungen zu halten.",
     "commGuideList10C": "Beschränkte Berechtigung, Gilden/Herausforderungen zu gründen",
     "commGuideList10D": "Der Aufstieg in höhere Mitwirkendenstufen kann temporär verwehrt (\"eingefroren\") werden",
     "commGuideList10E": "Herabstufung von Mitwirkenden",

website/common/locales/de/gear.json

@@ -1175,7 +1175,7 @@
     "headArmoireRedHairbowText": "Rote Haarschleife",
     "headArmoireRedHairbowNotes": "Werde stark, taff und schlau, während Du diese hübsche rote Haarschleife trägst! Erhöht Stärke um <%= str %>, Ausdauer um <%= con %> und Intelligenz um <%= int %>. Verzauberter Schrank: Rotes Haarschleifen-Set (Gegenstand 1 von 2).",
     "headArmoireVioletFloppyHatText": "Lila Schlapphut",
-    "headArmoireVioletFloppyHatNotes": "Viele Zaubersprüche wurden in diesen einfachen Hut gewirkt, um ihm eine angenehme violette Farbe zu geben. Erhöht Wahrnehmung um <%= per %>, Intelligenz um <%= int %> und Ausdauer um <%= con %>. Verzauberter Schrank: Unabhängiger Gegenstand.",
+    "headArmoireVioletFloppyHatNotes": "Viele Zaubersprüche wurden in diesen einfachen Hut gewirkt, um ihm eine angenehme violette Farbe zu geben. Erhöht Wahrnehmung um <%= per %>, Intelligenz um <%= int %> und Ausdauer um <%= con %>. Verzauberter Schrank: Violettes Loungewear-Set (Gegenstand 1 von 3).",
     "headArmoireGladiatorHelmText": "Gladiatorenhelm",
     "headArmoireGladiatorHelmNotes": "Um ein Gladiator zu sein, musst Du nicht nur stark sein… sondern auch gerissen. Erhöht Intelligenz um <%= int %> und Wahrnehmung um <%= per %>. Verzauberter Schrank: Gladiatorset (Gegenstand 1 von 3).",
     "headArmoireRancherHatText": "Farmerhut",
@@ -2260,7 +2260,7 @@
     "weaponSpecialWinter2021RogueNotes": "Tarnung und Waffe in einem, die giftigen Früchte der Stechpalme helfen dir mit den schwierigsten Aufgaben umzugehen. Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2020-2021 Winterausrüstung.",
     "weaponSpecialWinter2021RogueText": "Ilex-Beeren Morgenstern",
     "headSpecialWinter2021HealerNotes": "Ein überraschend großer Teil unserer Körperwärme wird über den Kopf abgegeben! Nicht jedoch, wenn du diese dicke Mütze mit Wind-schützender Sturmbrille trägst. Auf DEINEN Wimpern werden sicher keine Eiszapfen entstehen! Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2020-2021 Winterausrüstung.",
-    "headSpecialWinter2021HealerText": "Arktischer Entdecker Kopfschutz",
+    "headSpecialWinter2021HealerText": "Arktischer Entdecker Kopfbedeckung",
     "headSpecialWinter2021MageNotes": "Lass Deine Gedanken frei wandern, während Deine physische Gestalt sicher und warm unter dieser kolossalen Kapuze jedem Winterwind standhält. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2020-2021 Winterausrüstung.",
     "weaponArmoireBlueMoonSaiText": "Mondschatten Sai",
     "headSpecialNye2020Notes": "Du hast einen Extravaganten Partyhut erhalten! Trage ihn mit Stolz während du das neue Jahr einläutest! Gewährt keinen Attributbonus.",
@@ -2427,7 +2427,7 @@
     "headSpecialFall2021HealerText": "Die Maske des Beschwörers",
     "headSpecialFall2021WarriorText": "Kopfloses Halstuch",
     "shieldSpecialFall2021HealerText": "Beschworene Kreatur",
-    "backMystery202109Text": "Mondflügel der Lepidoptera",
+    "backMystery202109Text": "Mondschmetterlings-Flügel",
     "weaponSpecialFall2021RogueNotes": "Wo zum Teufel bist Du nur hineingeraten? Wenn Leute sagen, Schurken haben klebrige Finger, meinen sie nicht das hier! Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2021 Herbstausrüstung.",
     "weaponSpecialFall2021WarriorText": "Reiter-Axt",
     "headMystery202110Text": "Moosbewachsener Wasserspeierhelm",
@@ -2451,7 +2451,7 @@
     "armorSpecialFall2021WarriorText": "Formaler Wollanzug",
     "armorSpecialFall2021WarriorNotes": "Ein atemberaubender Anzug, perfekt für die Überquerung von Brücken in stockdunkler Nacht. Erhöht Ausdauer um <%= con %>. Limiterte Ausgabe 2021, Herbstausrüstung.",
     "armorSpecialFall2021MageText": "Robe der abgrundtiefen Finsternis",
-    "armorArmoireBagpipersKiltText": "Sackpfeifers Kilt",
+    "armorArmoireBagpipersKiltText": "Dudelsackpfeifers Kilt",
     "headMystery202108Text": "Feuriges Shounen Haar",
     "headMystery202108Notes": "Du siehst top aus, wollt' ich nur sagen. Gewährt keinen Attributbonus. August 2021 Abonnentengegenstand.",
     "weaponArmoirePotionBaseNotes": "Die Haustiere die durch dieses Elixier schlüpfen sind alles andere als langweilig! Erhöht Stärke, Intelligenz, Konstitution und Wahrnehmung um jeweils <%= attrs %>. Verzauberter Schrank: Elixier Set (Gegenstand 1 von 10)",
@@ -2532,7 +2532,7 @@
     "headSpecialWinter2022MageText": "Granatapfelhelm",
     "headSpecialWinter2022HealerText": "Kristallklare Krone aus Eis",
     "weaponSpecialWinter2022RogueText": "Sternschnuppenfeuerwerk",
-    "armorSpecialWinter2022RogueNotes": "Sagen wir es einmal so: Wenn sie Sterne sehen, sehen sie Dich nicht! Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2021–2022 Winterausrüstung.",
+    "armorSpecialWinter2022RogueNotes": "Wenn sie Sterne sehen, sehen sie Dich nicht! Ja, lass uns das so sagen. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2021–2022 Winterausrüstung.",
     "armorSpecialWinter2022WarriorNotes": "Wer sagt, dass Du es nicht geborgen und gemütlich haben kannst, während Du mit alltäglichen Aufgaben kämpfst? Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2021–2022 Winterausrüstung.",
     "armorSpecialWinter2022MageNotes": "Wenn Du Dich näherst, müssen sich Deine Feinde sich vor Fruchtsaft-Flecken in Acht nehmen! Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2021–2022 Winterausrüstung.",
     "headSpecialWinter2022RogueText": "Donnerndes Finale",
@@ -2558,5 +2558,55 @@
     "armorArmoireShootingStarCostumeNotes": "Es wird gemunkelt, dass diese Robe, deren Stoff wie das Licht des Mondes fällt, aus dem Nachthimmel selbst gesponnen wurde. Sie wird Dir helfen, alle Hindernisse in Deinem Weg zu überwinden. Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Meteoritenstaub-Set (Gegenstand 2 von 3).",
     "headArmoireShootingStarCrownNotes": "Mit diesem hell strahlenden Kopfschmuck wirst du buchstäblich zum Star Deines eigenen Abenteuers! Erhöht Wahrnehmung um <%= per %>. Verzauberter Schrank: Meteoritenstaub-Set (Gegenstand 1 von 3).",
     "armorSpecialBirthday2022Text": "Verkehrte Partyroben",
-    "armorSpecialBirthday2022Notes": "Happy Birthday, Habitica! Trage diese verkehrten Partyroben, um diesen wunderbaren Tag zu feiern. Gewährt keinen Attributbonus."
+    "armorSpecialBirthday2022Notes": "Happy Birthday, Habitica! Trage diese verkehrten Partyroben, um diesen wunderbaren Tag zu feiern. Gewährt keinen Attributbonus.",
+    "headMystery202202Notes": "Du brauchst einfach blaue Haare! Gewährt keinen Attributbonus. Februar 2022 Abonnentengegenstand.",
+    "headMystery202202Text": "Türkise Rattenschwänzchen",
+    "weaponArmoirePinkLongbowText": "Pinker Langbogen",
+    "weaponArmoirePinkLongbowNotes": "Sei ein Kuppler im Training, der sowohl Bogenschießen als auch Herzensangelegenheiten mit seinem wunderschönen Bogen meistert. Erhöht Wahrnehmung um <%= per %> und Stärke um <%= str %>. Verzauberter Schrank: Unabhängiger Gegenstand.",
+    "armorArmoireSoftVioletSuitText": "Weicher violetter Anzug",
+    "armorArmoireSoftVioletSuitNotes": "Lila ist eine luxuriöse Farbe. Entspanne dich mit Stil nachdem du alle Tagesaufgaben erfüllt hast. Erhöht Ausdauer und Stärke um je <%= attrs %>. Verzauberter Schrank: Violettes Loungewear-Set (Gegenstand 2 von 3).",
+    "shieldArmoireSoftVioletPillowText": "Weiches violettes Kissen",
+    "eyewearMystery202202Text": "Türkise Augen mit Gesichtsröte",
+    "eyewearMystery202202Notes": "Fröhliches Singen bringt Farbe auf Deine Backen. Gewährt keinen Attributbonus. Februar 2022 Abonnentengegenstand",
+    "shieldArmoireSoftVioletPillowNotes": "Der clevere Krieger packt ein Kissen für jede Expedition ein. Beschütze Dich selbst vor durch Prokrastination ausgelöste Panik … selbst während du ein Nickerchen machst. Erhöht Intelligenz um <%= int %>. Verzauberter Schrank: Violettes Loungewear-Set (Gegenstand 3 von 3).",
+    "backMystery202203Text": "Furchtlose Libellenflügel",
+    "headAccessoryMystery202203Text": "Furchtloses Libellendiadem",
+    "headAccessoryMystery202203Notes": "Muss es mal besonders schnell gehen? Keine Sorge, die kleinen, ornamentalen Flügel auf diesem Diadem sind kräftiger als sie ausschauen! Gewährt keinen Attributbonus. März 2022 Abonnentengegenstand.",
+    "backMystery202203Notes": "Mit diesen schimmernden Flügeln fliegst Du allen anderen Himmelsgeschöpfen davon. Gewährt keinen Attributbonus. März 2022 Abonnentengegenstand.",
+    "weaponArmoireGardenersWateringCanText": "Gießkanne",
+    "weaponArmoireGardenersWateringCanNotes": "Ohne Wasser kommst Du nicht weit! Aber mit dieser magischen, sich selbst auffüllende Gießkanne hast Du stets einen unendlichen Vorrat zur Hand. Erhöht Intelligenz um <%= int %>. Verzauberter Schrank: Gärtnerei-Set (Gegenstand 4 von 4).",
+    "armorArmoireGardenersOverallsText": "Garten-Gewand",
+    "armorArmoireGardenersOverallsNotes": "Mit diesem beständigen Garten-Gewand brauchst Du keine Angst haben, Dich schmutzig zu machen. Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Gärtnerei-Set (Gegenstand 1 von 4).",
+    "headArmoireGardenersSunHatText": "Garten-Sonnenhut",
+    "headArmoireGardenersSunHatNotes": "Wenn Du diesen breitkrempigen Hut trägst, kann das grelle Licht der Sonne nicht in Deine Augen scheinen. Erhöht Wahrnehmung um <%= per %>. Verzauberter Schrank: Gärtnerei-Set (Gegenstand 2 von 4).",
+    "shieldArmoireGardenersSpadeText": "Garten-Spaten",
+    "shieldArmoireGardenersSpadeNotes": "Ob Du im Garten herumwühlst, nach einem vergrabenen Schatz suchst, oder einen geheimen Tunnel aushebst, dieser Spaten steht Dir treu zur Seite. Erhöht Stärke um <%= str %>. Verzauberter Schrank: Gärtnerei-Set (Gegenstand 3 von 4).",
+    "weaponSpecialSpring2022RogueText": "Riesiger Ohrstecker",
+    "weaponSpecialSpring2022RogueNotes": "Ein Glanzstück! Es ist so leuchtend und schimmernd und schön und hübsch und es gehört ganz allein Dir! Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "armorSpecialSpring2022RogueText": "Elster-Kostüm",
+    "armorSpecialSpring2022RogueNotes": "Mit metallisch blaugrau schillernden und hell leuchtenden Stellen auf Deinen Federn wirst Du der feinste fliegende Freund der Frühlingsfeier sein! Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "headSpecialSpring2022RogueText": "Elster-Maske",
+    "headSpecialSpring2022RogueNotes": "Wenn Du diese Maske trägst wirst Du so einfallsreich wie eine Elster erscheinen. Vielleicht kannst Du dann sogar ähnlich gut pfeifen, tirilieren, und imitieren. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "weaponSpecialSpring2022WarriorText": "Umgestülpter Regenschirm",
+    "weaponSpecialSpring2022WarriorNotes": "Uff! Es sieht so aus als wäre der Wind doch stärker als gedacht. Erhöht Stärke um <%= str %>, Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "armorSpecialSpring2022WarriorText": "Regenmantel",
+    "armorSpecialSpring2022WarriorNotes": "Diese Regenausrüstung ist so beeindruckend, Du kannst im Regen singen und in jede Pfütze springen, und bleibst trotzdem warm und trocken! Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "headSpecialSpring2022WarriorText": "Regenmantelkapuze",
+    "headSpecialSpring2022WarriorNotes": "Huch, es sieht nach Regen aus! Steh auf und zieh Dir die Kapuze über, um trocken zu bleiben. Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "shieldSpecialSpring2022WarriorText": "Regenwolke",
+    "shieldSpecialSpring2022WarriorNotes": "Kennst Du diese Tage, an denen es sich anfühlt, als würde Dir eine Regenwolke auf Schritt und Tritt folgen? Tja, Du kannst Dich glücklich schätzen, denn schon bald werden die schönsten Blumen zu Deinen Füßen blühen! Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "weaponSpecialSpring2022MageText": "Forsythienstab",
+    "weaponSpecialSpring2022MageNotes": "Diese strahlend gelben Glocken sind bereit, Deine mächtige Frühlingsmagie zu lenken. Erhöht Intelligenz um <%= int %> und Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "armorSpecialSpring2022MageText": "Forsythienrobe",
+    "headSpecialSpring2022MageText": "Forsythienhelm",
+    "headSpecialSpring2022MageNotes": "Mithilfe dieses Helms aus umgedrehten Blüten bleibst Du bei jedem Frühlingsgewitter trocken. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "armorSpecialSpring2022MageNotes": "Diese mit Forsythienblüten geschmückte Robe zeigt allen, dass Du bereit bist, flink und federleicht in den Frühling zu fliegen. Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "weaponSpecialSpring2022HealerText": "Abendsmaragd-Zauberstab",
+    "weaponSpecialSpring2022HealerNotes": "Benutze diesen Zauberstab, um die Heilkräfte des Abendsmaragds zu entfalten – mögen sie Dir Ruhe, Zufriedenheit und Güte bringen. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "armorSpecialSpring2022HealerText": "Abendsmaragd-Rüstung",
+    "armorSpecialSpring2022HealerNotes": " Vertreibe Angst und Alpträume mit diesem grünen Edelstein-Gewand. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "headSpecialSpring2022HealerText": "Abendsmaragd-Helm",
+    "headSpecialSpring2022HealerNotes": "Dieser geheimnisvolle Helm bewahrt Deine Privatsphäre während Du diverse Aufgaben anpackst. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "shieldSpecialSpring2022HealerText": "Abendsmaragd-Schild",
+    "shieldSpecialSpring2022HealerNotes": "Aus geschmolzenem Stein aus der Erdkruste geformt, kann dieses Schild jedem noch so harten Schlag widerstehen, der ihm in den Weg kommt. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung."
 }

website/common/locales/de/limited.json

@@ -141,7 +141,7 @@
     "dateEndOctober": "31. Oktober",
     "dateEndNovember": "30. November",
     "dateEndJanuary": "31. Januar",
-    "dateEndFebruary": "29. Februar",
+    "dateEndFebruary": "28. Februar",
     "winterPromoGiftHeader": "VERSCHENK EIN ABO, BEKOMME EINS UMSONST!",
     "winterPromoGiftDetails1": "Nur bis zum 6. Januar: wenn Du jemandem ein Abonnement schenkst, erhältst Du das gleiche Abonnement gratis für Dich!",
     "winterPromoGiftDetails2": "Bitte bedenke, dass das geschenkte Abonnement, falls Du oder Deine beschenkte Person bereits über ein sich wiederholendes Abonnement verfügen, erst dann startet, wenn das alte Abonnement gekündigt wird oder ausläuft. Herzlichen Dank für Deine Unterstützung! <3",
@@ -216,5 +216,9 @@
     "winter2022StockingWarriorSet": "Strumpf (Krieger)",
     "winter2022IceCrystalHealerSet": "Eiskristall (Heiler)",
     "winter2022PomegranateMageSet": "Granatapfel (Magier)",
-    "januaryYYYY": "Januar <%= year %>"
+    "januaryYYYY": "Januar <%= year %>",
+    "spring2022MagpieRogueSet": "Elster (Schurke)",
+    "spring2022RainstormWarriorSet": "Gewitterregen (Krieger)",
+    "spring2022ForsythiaMageSet": "Forsythie (Magier)",
+    "spring2022PeridotHealerSet": "Abendsmaragd (Heiler)"
 }

website/common/locales/de/pets.json

@@ -44,8 +44,8 @@
     "noFoodAvailable": "Du hast kein Futter.",
     "noSaddlesAvailable": "Du hast keinen Sattel.",
     "noFood": "Du hast im Moment weder Futter noch magische Sättel.",
-    "dropsExplanation": "Erhalte diese Gegenstände schneller mit Edelsteinen, wenn Du nicht warten möchtest, bis Du sie als Beute für erfüllte Aufgaben erhältst.\n<a href=\"https://habitica.fandom.com/de/wiki/Beute\">Erfahre mehr über das Beutesystem.</a>",
+    "dropsExplanation": "Erhalte diese Gegenstände schneller mit Edelsteinen, wenn Du nicht warten möchtest, bis Du sie als Beute für erfüllte Aufgaben erhältst. <a href=\"https://habitica.fandom.com/de/wiki/Beute\">Erfahre mehr über das Beutesystem.</a>",
-    "dropsExplanationEggs": "Du kannst Edelsteine für Eier ausgeben, wenn Du nicht warten willst, bis Du ein Standard-Ei als Beute erhältst, oder wenn Du eine Haustier-Quest nicht wiederholen willst, um weitere Quest-Eier zu erhalten.\n<a href=\"https://habitica.fandom.com/de/wiki/Beute\">Erfahre mehr über das Beute-System.</a>",
+    "dropsExplanationEggs": "Du kannst Edelsteine für Eier ausgeben, wenn Du nicht warten willst, bis Du ein Standard-Ei als Beute erhältst, oder wenn Du eine Haustier-Quest nicht wiederholen willst, um weitere Quest-Eier zu erhalten. <a href=\"https://habitica.fandom.com/de/wiki/Beute\">Erfahre mehr über das Beute-System.</a>",
     "premiumPotionNoDropExplanation": "Magische Schlüpftränke können nicht auf Eier, die Du durch Quests erhalten hast, angewendet werden. Magische Schlüpftränke können nur gekauft und nicht durch zufällige Beute erworben werden.",
     "beastMasterProgress": "\"Meister aller Bestien\" Fortschritt",
     "beastAchievement": "Du hast den Erfolg \"Meister aller Bestien\" dafür erhalten, dass Du alle Haustiere gesammelt hast!",

website/common/locales/de/questscontent.json

@@ -195,7 +195,7 @@
     "questRockText": "Entkomme dem Höhlenungetüm",
     "questRockNotes": "Beim Durchqueren des Habitica Mäandergebirges schlagen Deine Freunde und Du Euer Lager in einer Höhle auf, welche mit funkelnden Kristallen übersät ist. Als Du jedoch am nächsten Morgen aufwachst, ist der Eingang verschwunden und der Höhlenboden unter Dir beginnt sich zu bewegen.<br><br>\"Der Berg lebt!\" schreit Dein Kamerad @pfeffernusse. \"Das sind keine Kristalle – das sind Zähne!\"<br><br>@Painter de Cluster ergreift Deine Hand. \"Wir müssen einen anderen Weg nach draußen finden. Bleib bei mir und lasse Dich nicht ablenken, sonst sind wir vielleicht für immer hier drinnen gefangen!\"",
     "questRockBoss": "Kristallkoloss",
-    "questRockCompletion": "Dank Deiner harten Arbeit konntest Du zu guter Letzt einen sicheren Weg durch den lebenden Berg finden. \nNach der langen Dunkelheit genießt Du die wärmenden Sonnenstrahlen, als Dich Dein Freund @intune auf ein Funkeln am Boden nahe der Höhle aufmerksam macht.\nDas Funkeln kommt von einem kleinen Stein, der von einer Goldader durchzogen ist. \nWährend Du ihn aufhebst siehst Du, dass um ihn herum weitere merkwürdig geformte Steine liegen. Sind das ... Eier?",
+    "questRockCompletion": "Dank Deiner harten Arbeit konntest Du zu guter Letzt einen sicheren Weg durch den lebenden Berg finden. Nach der langen Dunkelheit genießt Du die wärmenden Sonnenstrahlen, als Dich Dein Freund @intune auf ein Funkeln am Boden nahe der Höhle aufmerksam macht. Das Funkeln kommt von einem kleinen Stein, der von einer Goldader durchzogen ist. Während Du ihn aufhebst siehst Du, dass um ihn herum weitere merkwürdig geformte Steine liegen. Sind das … Eier?",
     "questRockDropRockEgg": "Fels (Ei)",
     "questRockUnlockText": "Schaltet den Kauf von Felseneiern auf dem Marktplatz frei",
     "questBunnyText": "Das Killerkaninchen",
@@ -602,7 +602,7 @@
     "questSquirrelDropSquirrelEgg": "Eichhörnchen (Ei)",
     "questSquirrelUnlockText": "Schaltet den Kauf von Eichhörncheneiern auf dem Marktplatz frei",
     "cuddleBuddiesText": "\"Kuschelkumpel\" Quest-Paket",
-    "cuddleBuddiesNotes": "Beinhaltet 'Das Killerkaninchen', 'Das Ruchlose Frettchen' und 'Die Meerschweinchen Gang'. Verfügbar bis zum 31. Mai.",
+    "cuddleBuddiesNotes": "Beinhaltet 'Das Killerkaninchen', 'Das Ruchlose Frettchen' und 'Die Meerschweinchen Gang'. Verfügbar bis zum 31. März.",
     "aquaticAmigosText": "\"Feuchte Freunde\" Quest-Paket",
     "aquaticAmigosNotes": "Beinhaltet 'Der magische Axolotl', 'Der Kraken von Unfertik' und 'Der Ruf des Octothulu'. Verfügbar bis zum 31. August.",
     "questSeaSerpentText": "Gefahr in der Tiefe: Seeschlangen-Angriff!",

website/common/locales/de/settings.json

@@ -55,7 +55,7 @@
     "newUsername": "Neuer Benutzername",
     "dangerZone": "Gefahrenzone",
     "resetText1": "WARNUNG! Es werden große Teile Deines Accounts zurückgesetzt. Wir raten dringend davon ab. Jedoch finden einige Spieler diese Funktion sinnvoll, um nach einem anfänglichen Testen der Seite neu beginnen zu können.",
-    "resetText2": "Du verlierst alle Deine Level, Gold- und Erfahrungspunkte. Alle Deine Aufgaben (außer Wettbewerbsaufgaben) werden permanent gelöscht, inklusive ihrer historischen Daten. Du verlierst Deine gesamte Ausrüstung, kannst sie aber wieder kaufen, inklusive der limitierten Ausgaben oder der mysteriösen Abonnenten-Gegenstände, die Du bereits besitzt (allerdings musst Du für klassenspezifische Ausrüstung der richtigen Klasse angehören, um sie zurückzukaufen). Du behältst Deine aktuelle Klasse und Deine Haus- und Reittiere. Möglicherweise möchtest Du lieber eine Sphäre der Wiedergeburt nutzen, die eine weit sicherere Option darstellt und Deine Aufgaben und Ausrüstung beibehält.",
+    "resetText2": "Du verlierst alle Deine Level, Dein Gold und Deine Erfahrungspunkte. Alle Deine Aufgaben (außer Aufgaben aus Herausforderungen) werden permanent gelöscht, und Du verlierst alle ihre historischen Daten. Du verlierst Deine gesamte Ausrüstung außer Abonnement-Überraschungsgegenstände und gratis Erinnerungsgegenstände. Du wirst die Möglichkeit haben, alle gelöschten Gegenstände zurückzukaufen, inklusive allen Gegenständen limitierter Ausgabe (Du musst für klassenspezifische Ausrüstung der richtigen Klasse angehören, um sie zurückzukaufen). Du behältst Deine aktuelle Klasse, Deine Erfolge, und Deine Haus- und Reittiere. Möglicherweise möchtest Du lieber die Sphäre der Wiedergeburt nutzen, die eine weit sicherere Option darstellt und Deine Aufgaben und Ausrüstung beibehält.",
     "deleteLocalAccountText": "Bist Du sicher? Dies wird Dein Konto für immer löschen und es kann nicht wiederhergestellt werden! Wenn Du Habitica wieder verwenden möchtest, musst Du ein neues Konto registrieren. Gesparte oder verbrauchte Edelsteine werden nicht ersetzt. Wenn Du absolut sicher bist, dann tippe Dein Passwort in das Textfeld unten ein.",
     "deleteSocialAccountText": "Bist Du sicher? Dies wird Dein Konto für immer löschen und es kann nicht wiederhergestellt werden! Wenn Du Habitica wieder verwenden möchtest, musst Du ein neues Konto registrieren. Gesparte oder verbrauchte Edelsteine werden nicht ersetzt. Wenn Du absolut sicher bist, dann tippe \"<%= magicWord %>\" in das Textfeld unten ein.",
     "API": "API",
@@ -134,15 +134,15 @@
     "generateCodes": "Erstelle Codes",
     "generate": "Erstelle",
     "getCodes": "Codes erhalten",
-    "webhooks": "Webhooks",
+    "webhooks": "WebHooks",
-    "webhooksInfo": "Habitica stellt Webhooks zur Verfügung, damit bei bestimmten Aktionen in Deinem Konto Informationen an ein Skript auf einer anderen Website gesendet werden können. Du kannst diese Skripte hier angeben. Sei vorsichtig mit dieser Funktion, denn die Angabe einer falschen URL kann in Habitica zu Fehlern oder Verzögerungen führen. Weitere Informationen findest Du auf der <a target=\"_blank\" href=\"https://habitica.fandom.com/wiki/Webhooks\">Webhooks-Seite</a> des Wikis.",
+    "webhooksInfo": "Habitica stellt WebHooks zur Verfügung, damit bei bestimmten Aktionen in Deinem Konto Informationen an ein Skript auf einer anderen Website gesendet werden können. Du kannst diese Skripte hier anführen. Sei vorsichtig mit dieser Funktion, denn die Angabe einer falschen URL kann in Habitica zu Fehlern oder Verzögerungen führen. Weitere Informationen findest Du auf der <a target=\"_blank\" href=\"https://habitica.fandom.com/wiki/Webhooks\">WebHooks-Seite</a> des Wikis.",
     "enabled": "Aktiviert",
-    "webhookURL": "Webhook-URL",
+    "webhookURL": "WebHook-URL",
     "invalidUrl": "Ungültige URL",
     "invalidWebhookId": "der Parameter \"id\" sollte eine gültige UUID darstellen.",
     "webhookBooleanOption": "\"<%= option %>\" muss ein Boolean Wert sein.",
-    "webhookIdAlreadyTaken": "Ein Webhook mit der ID <%= id %> existiert bereits.",
+    "webhookIdAlreadyTaken": "Ein WebHook mit der ID <%= id %> existiert bereits.",
-    "noWebhookWithId": "Es existiert kein Webhook mit der ID <%= id %>.",
+    "noWebhookWithId": "Es existiert kein WebHook mit der ID <%= id %>.",
     "regIdRequired": "RegId erforderlich",
     "pushDeviceAdded": "Push-Gerät erfolgreich hinzugefügt",
     "pushDeviceNotFound": "Der Benutzer hat kein Push-Gerät mit dieser ID.",
@@ -189,5 +189,25 @@
     "suggestMyUsername": "Schlage meinen Benutzernamen vor",
     "onlyPrivateSpaces": "Nur in privaten Bereichen",
     "everywhere": "Überall",
-    "bannedSlurUsedInProfile": "Dein Anzeigename oder Über-Text beinhaltete eine Verunglimpfung, daher wurden Dir Deine Chat-Privilegien entzogen."
+    "bannedSlurUsedInProfile": "Dein Anzeigename oder Über-Text beinhaltete eine Verunglimpfung, daher wurden Dir Deine Chat-Privilegien entzogen.",
+    "transaction_subscription_perks": "Aus der Abonnement-Vergünstigung",
+    "transaction_reroll": "Verstärkungstrank benutzt",
+    "noGemTransactions": "Du hast noch keine Edelstein-Transaktionen.",
+    "transactions": "Transaktionen",
+    "gemTransactions": "Edelstein-Transaktionen",
+    "hourglassTransactions": "Sanduhr-Transaktionen",
+    "noHourglassTransactions": "Du hast noch keine Sanduhr-Transaktionen.",
+    "transaction_buy_money": "Mit Geld erworben",
+    "transaction_buy_gold": "Mit Gold erworben",
+    "transaction_spend": "Ausgegeben für",
+    "transaction_gift_send": "Verschenkt an",
+    "transaction_gift_receive": "Erhalten von",
+    "transaction_create_challenge": "Herausforderung erstellt",
+    "transaction_create_guild": "Gilde erstellt",
+    "transaction_change_class": "Klasse geändert",
+    "transaction_rebirth": "Sphäre der Wiedergeburt verwendet",
+    "transaction_debug": "Debug-Aktion",
+    "transaction_contribution": "Durch Beiträge",
+    "transaction_release_pets": "Haustiere freigelassen",
+    "transaction_release_mounts": "Reittiere freigelassen"
 }

website/common/locales/de/subscriber.json

@@ -200,5 +200,7 @@
     "mysterySet202110": "Moosbewachsenes Wasserspeier Set",
     "mysterySet202111": "Kosmisches Zeitzauberei Set",
     "mysterySet202112": "Antarktisches Undinen Set",
-    "mysterySet202201": "Mitternächtliches Spaßvogel Set"
+    "mysterySet202201": "Mitternächtliches Spaßvogel Set",
+    "mysterySet202202": "Türkises Rattenschwänzchen Set",
+    "mysterySet202203": "Furchtlose Libelle-Set"
 }

website/common/locales/el/settings.json

@@ -90,6 +90,7 @@
     "addedLocalAuth": "Successfully added local authentication",
     "data": "Δεδομένα",
     "email": "Email",
+    "emailOrUsername": "Username or Email",
     "registerWithSocial": "Register with <%= network %>",
     "registeredWithSocial": "Registered with <%= network %>",
     "emailNotifications": "Ειδοποιήσεις email",

website/common/locales/en/achievements.json

@@ -125,9 +125,9 @@
   "achievementShadeOfItAllText": "Has tamed all Shade Mounts.",
   "achievementShadeOfItAllModalText": "You tamed all the Shade Mounts!",
   "achievementZodiacZookeeper": "Zodiac Zookeeper",
-  "achievementZodiacZookeeperText": "Has hatched all the zodiac pets: Rat, Cow, Bunny, Snake, Horse, Sheep, Monkey, Rooster, Wolf, Tiger, Flying Pig, and Dragon!",
+  "achievementZodiacZookeeperText": "Has hatched all standard colors of zodiac pets: Rat, Cow, Bunny, Snake, Horse, Sheep, Monkey, Rooster, Wolf, Tiger, Flying Pig, and Dragon!",
   "achievementZodiacZookeeperModalText": "You collected all the zodiac pets!",
   "achievementBirdsOfAFeather": "Birds of a Feather",
-  "achievementBirdsOfAFeatherText": "Has hatched all the flying pets: Flying Pig, Owl, Parrot, Pterodactyl, Gryphon, and Falcon.",
+  "achievementBirdsOfAFeatherText": "Has hatched all standard colors of flying pets: Flying Pig, Owl, Parrot, Pterodactyl, Gryphon, Falcon, Peacock, and Rooster.",
   "achievementBirdsOfAFeatherModalText":"You collected all the flying pets!"
 }

website/common/locales/en/backgrounds.json

@@ -762,6 +762,22 @@
   "backgroundIridescentCloudsText": "Iridescent Clouds",
   "backgroundIridescentCloudsNotes": "Float in Iridescent Clouds.",
 
+  "backgrounds032022": "SET 94: Released March 2022",
+  "backgroundAnimalsDenText": "Woodland Critter's Den",
+  "backgroundAnimalsDenNotes": "Cozy up in a Woodland Critter's Den.",
+  "backgroundBrickWallWithIvyText": "Brick Wall with Ivy",
+  "backgroundBrickWallWithIvyNotes": "Admire a Brick Wall with Ivy.",
+  "backgroundFloweringPrairieText": "Flowering Prairie",
+  "backgroundFloweringPrairieNotes": "Frolic through a Flowering Prairie.",
+
+  "backgrounds042022": "SET 95: Released April 2022",
+  "backgroundBlossomingTreesText": "Blossoming Trees",
+  "backgroundBlossomingTreesNotes": "Dally beneath Blossoming Trees.",
+  "backgroundFlowerShopText": "Flower Shop",
+  "backgroundFlowerShopNotes": "Enjoy the sweet scent of a Flower Shop.",
+  "backgroundSpringtimeLakeText": "Springtime Lake",
+  "backgroundSpringtimeLakeNotes": "Take in the sights along the shores of a Springtime Lake.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",

website/common/locales/en/front.json

@@ -12,7 +12,7 @@
   "companyDonate": "Donate",
   "forgotPassword": "Forgot Password?",
   "emailNewPass": "Email a Password Reset Link",
-  "forgotPasswordSteps": "Enter the email address you used to register your Habitica account.",
+  "forgotPasswordSteps": "Enter your username or the email address you used to register your Habitica account.",
   "sendLink": "Send Link",
   "footerDevs": "Developers",
   "footerCommunity": "Community",
@@ -125,7 +125,7 @@
   "passwordConfirmationMatch": "Password confirmation doesn't match password.",
   "minPasswordLength": "Password must be 8 characters or more.",
   "passwordResetPage": "Reset Password",
-  "passwordReset": "If we have your email on file, instructions for setting a new password have been sent to your email.",
+  "passwordReset": "If we have your email or username on file, instructions for setting a new password have been sent to your email.",
   "invalidLoginCredentialsLong": "Uh-oh - your email address / username or password is incorrect.\n- Make sure they are typed correctly. Your username and password are case-sensitive.\n- You may have signed up with Facebook or Google-sign-in, not email so double-check by trying them.\n- If you forgot your password, click \"Forgot Password\".",
   "invalidCredentials": "There is no account that uses those credentials.",
   "accountSuspended": "This account, User ID \"<%= userId %>\", has been blocked for breaking the Community Guidelines (https://habitica.com/static/community-guidelines) or Terms of Service (https://habitica.com/static/terms). For details or to ask to be unblocked, please email our Community Manager at <%= communityManagerEmail %> or ask your parent or guardian to email them. Please include your @Username in the email.",
@@ -143,7 +143,8 @@
   "confirmPassword": "Confirm Password",
   "usernameLimitations": "Username must be 1 to 20 characters, containing only letters a to z, numbers 0 to 9, hyphens, or underscores, and cannot include any inappropriate terms.",
   "usernamePlaceholder": "e.g., HabitRabbit",
-  "emailPlaceholder": "e.g., rabbit@example.com",
+  "emailPlaceholder": "e.g., gryphon@example.com",
+  "emailUsernamePlaceholder": "e.g., habitrabbit or gryphon@example.com",
   "passwordPlaceholder": "e.g., ******************",
   "confirmPasswordPlaceholder": "Make sure it's the same password!",
   "joinHabitica": "Join Habitica",

website/common/locales/en/gear.json

@@ -428,6 +428,15 @@
   "headSpecialNye2021Text": "Preposterous Party Hat",
   "headSpecialNye2021Notes": "You've received a Preposterous Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",
 
+  "weaponSpecialSpring2022RogueText": "Giant Earring Stud",
+  "weaponSpecialSpring2022RogueNotes": "A shiny! It’s so shiny and gleaming and pretty and nice and all yours! Increases Strength by <%= str %>. Limited Edition 2022 Spring Gear.",
+  "weaponSpecialSpring2022WarriorText": "Inside-Out Umbrella",
+  "weaponSpecialSpring2022WarriorNotes": "Yikes! Guess that wind was a little stronger than you thought, huh? Increases Strength by <%= str %>. Limited Edition 2022 Spring Gear.",
+  "weaponSpecialSpring2022MageText": "Forsythia Staff",
+  "weaponSpecialSpring2022MageNotes": "These bright yellow bells are ready to channel your powerful springtime magic. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2022 Spring Gear.",
+  "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.",
+
   "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",
@@ -617,6 +626,8 @@
   "weaponArmoireShootingStarSpellNotes": "Surround yourself in a spell of stardust magic to help you make all your wishes come true. Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Stardust Set (Item 3 of 3).",
   "weaponArmoirePinkLongbowText": "Pink Longbow",
   "weaponArmoirePinkLongbowNotes": "Be a cupid-in-training, mastering both archery and matters of the heart with this beautiful bow. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Independent Item.",
+  "weaponArmoireGardenersWateringCanText": "Watering Can",
+  "weaponArmoireGardenersWateringCanNotes": "You can’t get far without water! Have an infinite supply on hand with this magic, refilling watering can. Increases Intelligence by <%= int %>. Enchanted Armoire: Gardener Set (Item 4 of 4).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -1026,6 +1037,15 @@
   "armorSpecialWinter2022HealerText": "Crystalline Ice Armor",
   "armorSpecialWinter2022HealerNotes": "Glide as if skating, just above the ground, a glittering ethereal figure come to bring cool and calm. Increases Constitution by <%= con %>. Limited Edition 2021-2022 Winter Gear.",
 
+  "armorSpecialSpring2022RogueText": "Magpie Costume",
+  "armorSpecialSpring2022RogueNotes": "With iridescent metallic blue-gray and lighter patches on your feathers, you will be the finest flying friend at the spring fling! Increases Perception by <%= per %>. Limited Edition 2022 Spring Gear.",
+  "armorSpecialSpring2022WarriorText": "Rain Slicker",
+  "armorSpecialSpring2022WarriorNotes": "This slicker and boots are so formidable you could sing in the rain or jump in every puddle but still be warm and dry! Increases Constitution by <%= con %>. Limited Edition 2022 Spring Gear.",
+  "armorSpecialSpring2022MageText": "Forsythia Robe",
+  "armorSpecialSpring2022MageNotes": "Show you’re ready to spring forward into the season with this robe adorned with forsythia flower petals. Increases Intelligence by <%= int %>. Limited Edition 2022 Spring Gear.",
+  "armorSpecialSpring2022HealerText": "Peridot Armor",
+  "armorSpecialSpring2022HealerNotes": "Drive away fears and nightmares simply by wearing this green gem garment. Increases Constitution by <%= con %>. Limited Edition 2022 Spring 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",
@@ -1132,6 +1152,8 @@
   "armorMystery202110Notes": "Velvety moss makes you seem soft on the outside, but you're protected by solid stone. Confers no benefit. October 2021 Subscriber Item.",
   "armorMystery202112Text": "Antarctic Undine Tail",
   "armorMystery202112Notes": "Glide through icy seas and never get cold with this glimmering tail. Confers no benefit. December 2021 Subscriber Item.",
+  "armorMystery202204Text":"Virtual Adventurer Capsule",
+  "armorMystery202204Notes":"Looks like doing your tasks now requires pushing these mysterious buttons! What could they do? Confers no benefit. April 2022 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1303,6 +1325,10 @@
   "armorArmoireShootingStarCostumeNotes": "Rumored to have been spun out of the night sky itself, this flowy gown lets you rise above all obstacles in your path. Increases Constitution by <%= con %>. Enchanted Armoire: Stardust Set (Item 2 of 3).",
   "armorArmoireSoftVioletSuitText": "Soft Violet Suit",
   "armorArmoireSoftVioletSuitNotes": "Purple is a luxurious color. Relax in style after you’ve accomplished all your daily tasks. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Violet Loungewear Set (Item 2 of 3).",
+  "armorArmoireGardenersOverallsText": "Gardener's Overalls",
+  "armorArmoireGardenersOverallsNotes": "Don’t be afraid to work down in the dirt when you’re wearing these durable overalls. Increases Constitution by <%= con %>. Enchanted Armoire: Gardener Set (Item 1 of 4).",
+  "armorArmoireStrawRaincoatText": "Straw Raincoat",
+  "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).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -1708,6 +1734,15 @@
   "headSpecialWinter2022HealerText": "Crystalline Ice Crown",
   "headSpecialWinter2022HealerNotes": "Minute imperfections and impurities send the arms of this headdress branching out in unpredictable directions. It's symbolic! And also very, very pretty. Increases Intelligence by <%= int %>. Limited Edition 2021-2022 Winter Gear.",
 
+  "headSpecialSpring2022RogueText": "Magpie Mask",
+  "headSpecialSpring2022RogueNotes": "Be as clever as a magpie when wearing this mask. Maybe you’ll even be able to whistle, trill, and mimic as well as one, too. Increases Perception by <%= per %>. Limited Edition 2022 Spring Gear.",
+  "headSpecialSpring2022WarriorText": "Rain Slicker Hood",
+  "headSpecialSpring2022WarriorNotes": "Tut tut, it looks like rain! Stand tall and pull up your hood to stay dry. Increases Strength by <%= str %>. Limited Edition 2022 Spring Gear.",
+  "headSpecialSpring2022MageText": "Forsythia Helmet",
+  "headSpecialSpring2022MageNotes": "Stay dry during a rainstorm with this protective helmet of downturned petals. Increases Perception by <%= per %>. Limited Edition 2022 Spring Gear.",
+  "headSpecialSpring2022HealerText": "Peridot Helmet",
+  "headSpecialSpring2022HealerNotes": "This mysterious helmet preserves your privacy as you tackle your tasks. Increases Intelligence by <%= int %>. Limited Edition 2022 Spring 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.",
 
@@ -2010,6 +2045,10 @@
   "headArmoireRegalCrownNotes": "Any monarch would be lucky to have such a majestic, smart-looking crown. Increases Intelligence by <%= int %>. Enchanted Armoire: Regal Set (Item 1 of 2).",
   "headArmoireShootingStarCrownText": "Star Crown",
   "headArmoireShootingStarCrownNotes": "With this brightly shining headpiece, you will literally be the star of your own adventure! Increases Perception by <%= per %>. Enchanted Armoire: Stardust Set (Item 1 of 3).",
+  "headArmoireGardenersSunHatText": "Gardener's Sun Hat",
+  "headArmoireGardenersSunHatNotes": "The bright light of the day star won’t shine in your eyes when you wear this wide-brimmed hat. Increases Perception by <%= per %>. Enchanted Armoire: Gardener Set (Item 2 of 4).",
+  "headArmoireStrawRainHatText": "Straw Rain Hat",
+  "headArmoireStrawRainHatNotes": "You’ll be able to spot every obstacle in your path when you wear this water-resistant, conical hat. Increases Perception by <%= per %>. Enchanted Armoire: Straw Raincoat Set (Item 2 of 2).",
 
   "offhand": "off-hand item",
   "offHandCapitalized": "Off-Hand Item",
@@ -2237,6 +2276,11 @@
   "shieldSpecialWinter2022HealerText": "Enduring Ice Crystal",
   "shieldSpecialWinter2022HealerNotes": "Though it melts in your hand, the power of elemental ice replenishes it from within. Increases Constitution by <%= con %>. Limited Edition 2021-2022 Winter Gear.",
 
+  "shieldSpecialSpring2022WarriorText": "Raincloud",
+  "shieldSpecialSpring2022WarriorNotes": "Ever had one of those days when it seems like a raincloud is following you around? Well, consider yourself lucky, because the prettiest flowers will soon be growing at your feet! Increases Constitution by <%= con %>. Limited Edition 2022 Spring Gear.",
+  "shieldSpecialSpring2022HealerText": "Peridot Shield",
+  "shieldSpecialSpring2022HealerNotes": "Formed by molten rock of the upper mantle, this shield can withstand any hit that comes its way. Increases Constitution by <%= con %>. Limited Edition 2022 Spring 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",
@@ -2380,6 +2424,8 @@
   "shieldArmoireSoftBlackPillowNotes": "The brave warrior packs a pillow for any expedition. Guard yourself from tiresome tasks... even while you nap. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Black Loungewear Set (Item 3 of 3).",
   "shieldArmoireSoftVioletPillowText": "Soft Violet Pillow",
   "shieldArmoireSoftVioletPillowNotes": "The clever warrior packs a pillow for any expedition. Protect yourself from procrastination-induced panic... even while you nap. Increases Intelligence by <%= int %>. Enchanted Armoire: Violet Loungewear Set (Item 3 of 3).",
+  "shieldArmoireGardenersSpadeText": "Gardener's Spade",
+  "shieldArmoireGardenersSpadeNotes": "Whether you’re digging in the garden, searching for buried treasure, or creating a secret tunnel, this trusty spade is at your side. Increases Strength by <%= str %>. Enchanted Armoire: Gardener Set (Item 3 of 4).",
 
   "back": "Back Accessory",
   "backBase0Text": "No Back Accessory",
@@ -2440,6 +2486,8 @@
   "backMystery202105Notes": "Glide through the starry sky and place yourself among the constellations! Confers no benefit. May 2021 Subscriber Item.",
   "backMystery202109Text": "Lunar Lepidopteran Wings",
   "backMystery202109Notes": "Glide softly through the twilight air without a sound. Confers no benefit. September 2021 Subscriber Item.",
+  "backMystery202203Text": "Dauntless Dragonfly Wings",
+  "backMystery202203Notes": "Outrace all the other creatures of the sky with these shimmering wings. Confers no benefit. March 2022 Subscriber Item.",
 
   "backSpecialWonderconRedText": "Mighty Cape",
   "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
@@ -2638,6 +2686,8 @@
   "headAccessoryMystery202105Notes": "Don these iridescent horns and summon the magic of starlight. Confers no benefit. May 2021 Subscriber Item.",
   "headAccessoryMystery202109Text": "Lunar Lepidopteran Antennae",
   "headAccessoryMystery202109Notes": "Catch the scent of flowers on the breeze or the scent of change on the wind. Confers no benefit. September 2021 Subscriber Item.",
+  "headAccessoryMystery202203Text": "Dauntless Dragonfly Circlet",
+  "headAccessoryMystery202203Notes": "Need an extra boost of speed? The tiny decorative wings on this circlet are more powerful than they look! Confers no benefit. March 2022 Subscriber Item.",
   "headAccessoryMystery301405Text": "Headwear Goggles",
   "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
 
@@ -2718,6 +2768,10 @@
   "eyewearMystery202201Notes": "Ring in the new year with an air of mystery in this stylish feathered mask. Confers no benefit. January 2022 Subscriber Item.",
   "eyewearMystery202202Text":"Turquoise Eyes with Blush",
   "eyewearMystery202202Notes":"Cheerful singing brings color to your cheeks. Confers no benefit. February 2022 Subscriber Item",
+  "eyewearMystery202204AText":"Virtual Face",
+  "eyewearMystery202204ANotes":"What's your mood today? Express yourself with these fun screens. Confers no benefit. April 2022 Subscriber Item.",
+  "eyewearMystery202204BText":"Virtual Face",
+  "eyewearMystery202204BNotes":"What's your mood today? Express yourself with these fun screens. Confers no benefit. April 2022 Subscriber Item.",
   "eyewearMystery301404Text": "Eyewear Goggles",
   "eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.",
   "eyewearMystery301405Text": "Monocle",

website/common/locales/en/limited.json

@@ -179,6 +179,10 @@
   "winter2022StockingWarriorSet": "Stocking (Warrior)",
   "winter2022PomegranateMageSet": "Pomegranate (Mage)",
   "winter2022IceCrystalHealerSet": "Ice Crystal (Healer)",
+  "spring2022MagpieRogueSet": "Magpie (Rogue)",
+  "spring2022RainstormWarriorSet": "Rainstorm (Warrior)",
+  "spring2022ForsythiaMageSet": "Forsythia (Mage)",
+  "spring2022PeridotHealerSet": "Peridot (Healer)",
   "eventAvailability": "Available for purchase until <%= date(locale) %>.",
   "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
   "dateEndMarch": "April 30",
@@ -199,7 +203,7 @@
   "dateEndOctober": "October 31",
   "dateEndNovember": "November 30",
   "dateEndJanuary": "January 31",
-    "dateEndFebruary": "February 29",
+  "dateEndFebruary": "February 28",
   "winterPromoGiftHeader": "GIFT A SUBSCRIPTION, GET ONE FREE!",
   "winterPromoGiftDetails1": "Until January 6th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
   "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",

website/common/locales/en/npc.json

@@ -83,7 +83,6 @@
   "invalidQuantity": "Quantity to purchase must be a positive whole number.",
   "USD": "(USD)",
   "newStuff": "New Stuff by Bailey",
-  "newStuffPostedOn": "Posted on <%= publishDate %>, <%= publishTime %>",
   "newBaileyUpdate": "New Bailey Update!",
   "tellMeLater": "Tell Me Later",
   "dismissAlert": "Dismiss This Alert",

website/common/locales/en/questsContent.json

@@ -699,7 +699,7 @@
   "questSquirrelUnlockText": "Unlocks Squirrel Eggs for purchase in the Market",
 
   "cuddleBuddiesText": "Cuddle Buddies Quest Bundle",
-  "cuddleBuddiesNotes": "Contains 'The Killer Bunny', 'The Nefarious Ferret', and 'The Guinea Pig Gang'. Available until May 31.",
+  "cuddleBuddiesNotes": "Contains 'The Killer Bunny', 'The Nefarious Ferret', and 'The Guinea Pig Gang'. Available until March 31.",
 
   "aquaticAmigosText": "Aquatic Amigos Quest Bundle",
   "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'. Available until August 31.",

website/common/locales/en/settings.json

@@ -40,10 +40,12 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Custom Day Start",
+    "adjustment": "Adjustment",
+    "dayStartAdjustment": "Day Start Adjustment",
     "sureChangeCustomDayStartTime": "Are you sure you want to change your Custom Day Start time? Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before then!",
     "customDayStartHasChanged": "Your custom day start has changed.",
     "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
+    "customDayStartInfo1": "Habitica checks and resets your Dailies at midnight in your own time zone each day. You can adjust when that happens past the default time here.",
     "misc": "Misc",
     "showHeader": "Show Header",
     "changePass": "Change Password",
@@ -134,6 +136,7 @@
     "saveCustomDayStart": "Save Custom Day Start",
     "registration": "Registration",
     "addLocalAuth": "Add Email and Password Login",
+    "addPasswordAuth": "Add Password",
     "generateCodes": "Generate Codes",
     "generate": "Generate",
     "getCodes": "Get Codes",
@@ -155,14 +158,17 @@
     "purchasedPlanExtraMonths": "You have <strong><%= months %> months</strong> of extra subscription credit.",
     "consecutiveSubscription": "Consecutive Subscription",
     "consecutiveMonths": "Consecutive Months:",
+    "gemCap": "Gem Cap",
     "gemCapExtra": "Gem Cap Bonus",
     "mysticHourglasses": "Mystic Hourglasses:",
     "mysticHourglassesTooltip": "Mystic Hourglasses",
+    "nextHourglass": "Next Hourglass",
+    "nextHourglassDescription": "Subscribers receive Mystic Hourglasses within\nthe first three days of the month.",
     "paypal": "PayPal",
     "amazonPayments": "Amazon Payments",
     "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Time Zone",
-    "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <strong><%= utc %></strong>",
+    "timezoneUTC": "Your time zone is set by your computer, which is: <strong><%= utc %></strong>",
     "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.<br><br> <strong>If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all.</strong> If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices.",
     "push": "Push",
     "about": "About",
@@ -200,9 +206,9 @@
     "transaction_create_challenge": "Created challenge",
     "transaction_create_guild": "Created guild",
     "transaction_change_class": "Changed class",
-    "transaction_rebirth": "Used orb of rebirth",
+    "transaction_rebirth": "Used Orb of Rebirth",
     "transaction_release_pets": "Released pets",
     "transaction_release_mounts": "Released mounts",
-    "transaction_reroll": "Used fortify potion",
+    "transaction_reroll": "Used Fortify Potion",
     "transaction_subscription_perks": "From subscription perk"
 }

website/common/locales/en/subscriber.json

@@ -131,6 +131,8 @@
     "mysterySet202112": "Antarctic Undine Set",
     "mysterySet202201": "Midnight Merrymaker Set",
     "mysterySet202202": "Turquoise Twintails Set",
+    "mysterySet202203": "Dauntless Dragonfly Set",
+    "mysterySet202204": "Virtual Adventurer Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

website/common/locales/en_GB/content.json

@@ -291,7 +291,7 @@
     "foodCandyWhite": "Vanilla Candy",
     "foodCandyWhiteThe": "the Vanilla Candy",
     "foodCandyWhiteA": "Vanilla Candy",
-    "foodCandyGolden": "Honey Candy",
+    "foodCandyGolden": "Honey Sweety",
     "foodCandyGoldenThe": "the Honey Candy",
     "foodCandyGoldenA": "Honey Candy",
     "foodCandyZombie": "Rotten Candy",
@@ -365,5 +365,10 @@
     "hatchingPotionAutumnLeaf": "Autumn Leaf",
     "hatchingPotionStainedGlass": "Stained Glass",
     "hatchingPotionBlackPearl": "Black Pearl",
-    "hatchingPotionPolkaDot": "Polka Dot"
+    "hatchingPotionPolkaDot": "Polka Dot",
+    "hatchingPotionSunset": "Sunset",
+    "hatchingPotionMossyStone": "Mossy Stone",
+    "hatchingPotionSolarSystem": "Solar System",
+    "hatchingPotionMoonglow": "Moonglow",
+    "hatchingPotionOnyx": "Onyx"
 }

website/common/locales/es/achievements.json

@@ -124,7 +124,10 @@
     "achievementShadeOfItAllModalText": "¡Has domado todas las monturas sombrías!",
     "achievementShadyCustomerText": "Ha conseguido todas las mascotas sombrías.",
     "achievementShadyCustomer": "Cliente sombrío",
-    "achievementZodiacZookeeper": "Cuidador del Zodíaco",
+    "achievementZodiacZookeeper": "Cuidador del Zodiaco",
     "achievementZodiacZookeeperText": "¡Has eclosionado todas las mascotas del zodíaco: Rata, Vaca, Conejo, Serpiente, Caballo, Oveja, Mono, Gallo, Lobo, Tigre, Cerdo Volador y Dragón!",
-    "achievementZodiacZookeeperModalText": "¡Has conseguido todas las mascotas del zodíaco!"
+    "achievementZodiacZookeeperModalText": "¡Has conseguido todas las mascotas del zodíaco!",
+    "achievementBirdsOfAFeatherText": "Has eclosionado todas las mascotas voladoras: Cerdo Volador, Búho, Loro, Pterodáctilo, Grifo, Halcón, Pavo Real y Gallo.",
+    "achievementBirdsOfAFeatherModalText": "¡Has conseguido todas las mascotas voladoras!",
+    "achievementBirdsOfAFeather": "Aves de Pluma"
 }

website/common/locales/es/backgrounds.json

@@ -667,5 +667,15 @@
     "backgroundFortuneTellersShopNotes": "Podrás encontrar tentadoras pistas sobre tu futuro en una Tienda de Vidente.",
     "backgroundInsideAPotionBottleText": "Dentro del Frasco de una Poción",
     "backgrounds112021": "90.ª serie: publicada en noviembre de 2021",
-    "backgroundSpiralStaircaseNotes": "Sube, baja y da vueltas y vueltas en esta Escalera de Caracol."
+    "backgroundSpiralStaircaseNotes": "Sube, baja y da vueltas y vueltas en esta Escalera de Caracol.",
+    "backgroundWinterWaterfallText": "Catarata invernal",
+    "backgroundWinterWaterfallNotes": "Maravíllate en la catarata invernal.",
+    "backgroundIridescentCloudsText": "Nubes iridiscentes",
+    "backgroundIridescentCloudsNotes": "Flota entre nubes iridiscentes.",
+    "backgroundOrangeGroveText": "Campo de naranjos",
+    "backgroundOrangeGroveNotes": "Pasea por un fragante campo de naranjos.",
+    "backgrounds022022": "93.ª serie: publicada en febrero de 2022",
+    "backgrounds032022": "94.ª serie: publiccada en marzo de 2022",
+    "backgroundBrickWallWithIvyText": "Pared de Ladrillo con Hiedra",
+    "backgroundBrickWallWithIvyNotes": "Admira una Pared de Ladrillo con Hiedra."
 }

website/common/locales/es/death.json

@@ -3,7 +3,7 @@
     "dontDespair": "¡No necesitas estar triste!",
     "deathPenaltyDetails": "Has perdido un Nivel, tu Oro y un Articulo, ¡pero puedes recuperarlos todos con trabajo duro! Buena suerte--lo harás genial.",
     "refillHealthTryAgain": "Rellenar salud y volver a intentarlo",
-    "dyingOftenTips": "¿Pasa esto a menudo? <a href='http://habitica.fandom.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>¡Aqui tienes ayuda!</a>",
+    "dyingOftenTips": "¿Pasa esto a menudo? <a href='https://habitica.fandom.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>¡Aqui tienes ayuda!</a>",
     "losingHealthWarning": "¡Cuidado, estás perdiendo salud rapidamente!",
     "losingHealthWarning2": "¡No dejes que tu salud baje a cero! Si lo haces, perderás un nivel, tu oro y un Articulo.",
     "toRegainHealth": "Para recuperar tu salud:",

website/common/locales/es/gear.json

@@ -1175,7 +1175,7 @@
     "headArmoireRedHairbowText": "Lazo rojo",
     "headArmoireRedHairbowNotes": "¡Hazte fuerte, duro y listo mientras llevas este hermoso Lazo Rojo! Incrementa Fuerza por <%= str %>, Constitución por <%= con %>, e Inteligencia por <%= int %>. Armario Encantado: Set de Lazo Rojo (Artículo 1 de 2).",
     "headArmoireVioletFloppyHatText": "Gorro caído violeta",
-    "headArmoireVioletFloppyHatNotes": "Este sencillo gorro lleva cosidos numerosos hechizos: de ahí su agradable color violeta. Suma <%= per %> de percepción, <%= int %> de inteligencia y <%= con %> de constitución. Armario encantado: artículo independiente.",
+    "headArmoireVioletFloppyHatNotes": "Este sencillo gorro lleva cosidos numerosos hechizos: de ahí su agradable color violeta. Suma <%= per %> de percepción, <%= int %> de inteligencia y <%= con %> de constitución. Armario encantado: Conjunto Ropa de casa violeta (Artículo 1 de 3).",
     "headArmoireGladiatorHelmText": "Casco de gladiador",
     "headArmoireGladiatorHelmNotes": "Para ser gladiador, además de fuerza, necesitas astucia. Suma <%= int %> de inteligencia y <%= per %> de percepción. Armario encantado: conjunto de gladiador (artículo 1 de 3).",
     "headArmoireRancherHatText": "Sombrero de ranchero",
@@ -1959,7 +1959,7 @@
     "weaponArmoireClubOfClubsText": "Garrote de... Tréboles",
     "weaponArmoireEnchantersStaffNotes": "Las piedras verdes de este bastón están colmadas del poder del cambio que fluye con fuerza en el viento del otoño. Incrementa la Percepción en <%= per %>. Armario Encantado: Conjunto de Hechicero Otoñal (Artículo 3 de 4).",
     "weaponArmoireEnchantersStaffText": "Bastón de Hechicero",
-    "armorSpecialSpring2019RogueNotes": "Una pelusa muy dura. Aumenta la Percepción en <% = per%>. Equipamiento de edición limitada Primavera 2019.",
+    "armorSpecialSpring2019RogueNotes": "Una pelusa muy dura. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada Primavera 2019.",
     "armorSpecialFall2019WarriorNotes": "Estos atuendos otorgan el poder de volar, permitiendote elevarte sobre cualquier batalla. Aumenta la Constitución en <%= con %>. Equipamiento de edición limitada Otoño 2019.",
     "armorSpecialWinter2020WarriorNotes": "Oh poderoso pino, Oh imponente abeto, presta tu fuerza. ¡O más bién tu Constitución! Aumenta la Constitución en <%= con %>. Equipamiento de edición limitada Invierno 2019-2020.",
     "armorSpecialWinter2020RogueNotes": "Aunque es indudable que puedes capear tormentas con el calor de tu empuje y tu devoción, no hace daño abrigarse. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada Invierno 2019-2020.",
@@ -2070,11 +2070,11 @@
     "shieldArmoireMasteredShadowText": "Sombra dominada",
     "shieldMystery202011Text": "Bastón foliado",
     "shieldSpecialWinter2021HealerText": "Guardabrazos árticos",
-    "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%>.",
+    "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.",
+    "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.",
+    "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.",
     "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",
     "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.",
@@ -2086,7 +2086,7 @@
     "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.",
-    "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).",
+    "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).",
     "armorArmoireJadeArmorNotes": "Esta armadura de jade es tanto hermosa como funcional. ¡Protégete sabiendo que tienes un aspecto fabuloso! Aumenta la Percepción en <%= per %>. Armario Encantado: Conjunto de guerrero de jade (artículo 2 de 3).",
@@ -2127,7 +2127,7 @@
     "weaponSpecialFall2021WarriorNotes": "Este estilizado hacha de hoja simple es ideal para reventar... ¡calabazas! Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2021.",
     "weaponSpecialFall2021HealerText": "Varita de invocación",
     "weaponSpecialSummer2021RogueNotes": "¡Cualquier depredador que se atreva a acercarse, sufrirá el aguijón de tus protectores compañeros! Aumenta la fuerza en <%= str %>. Edición limitada de equipamiento de verano 2021.",
-    "weaponSpecialSummer2021MageNotes": "Bien tengas la ambición de navegar a veinte mil leguas de profundidad, o únicamente pretendas remojarte grácilmente en aguas poco profundas, ¡este brillante implemento te será de gran ayuda! Aumenta la inteligencia en <% = int%> y la percepción en <% = per%>. Equipamiento de edición limitada de verano 2021.",
+    "weaponSpecialSummer2021MageNotes": "Bien tengas la ambición de navegar a veinte mil leguas de profundidad, o únicamente pretendas remojarte grácilmente en aguas poco profundas, ¡este brillante implemento te será de gran ayuda! Aumenta la inteligencia en <%= int %> y la percepción en <%= per %>. Equipamiento de edición limitada de verano 2021.",
     "weaponSpecialFall2021RogueNotes": "¿En qué narices te has metido? Cuando la gente dice que los pícaros tienen dedos pegajosos, ¡no era esto a lo que se referían! Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2021.",
     "weaponSpecialFall2021RogueText": "Moquillo pegajoso",
     "weaponSpecialFall2021MageText": "Bastón de Puropensar",
@@ -2145,17 +2145,17 @@
     "armorSpecialSummer2021RogueText": "Aletas de pez payaso",
     "armorSpecialSummer2021HealerText": "Plumaje de loro",
     "armorArmoireMedievalLaundryOutfitText": "Conjunto lavandero",
-    "armorSpecialSummer2021WarriorNotes": "Elegante y veloz, este disfraz de pez volador te ayudará a nadar en las aguas más turbulentas. Aumenta la constitución en <% = con%>. Equipamiento de edición limitada de verano 2021.",
+    "armorSpecialSummer2021WarriorNotes": "Elegante y veloz, este disfraz de pez volador te ayudará a nadar en las aguas más turbulentas. Aumenta la constitución en <%= con %>. Equipamiento de edición limitada de verano 2021.",
     "armorMystery202103Notes": "Estas túnicas suaves y ventosas son perfectas para una fiesta de té bajo los vistosos árboles primaverales. No confiere ningún tipo de beneficio. Artículo de suscriptor de marzo 2021.",
-    "armorArmoireSoftPinkSuitNotes": "El rosa es un color relajante. ¡Ponte este conjunto de ropa de dormir para disfrutar de un poco de paz en tu rutina diaria! Aumenta la percepción en un <% = per%>. Armario encantado: conjunto de ropa interior rosa (artículo 2 de 3).",
+    "armorArmoireSoftPinkSuitNotes": "El rosa es un color relajante. ¡Ponte este conjunto de ropa de dormir para disfrutar de un poco de paz en tu rutina diaria! Aumenta la percepción en un <%= per %>. Armario encantado: conjunto de ropa interior rosa (artículo 2 de 3).",
-    "armorSpecialSummer2021HealerNotes": "Tus enemigos pueden sospechar que eres un peso pluma, pero esta armadura te mantendrá a salvo mientras ayudas a tu grupo. Aumenta la constitución en <% = con%>. Equipo de edición limitada de verano 2021.",
+    "armorSpecialSummer2021HealerNotes": "Tus enemigos pueden sospechar que eres un peso pluma, pero esta armadura te mantendrá a salvo mientras ayudas a tu grupo. Aumenta la constitución en <%= con %>. Equipo de edición limitada de verano 2021.",
     "armorArmoireClownsMotleyNotes": "Estas prendas se ajustan maravillosamente, pero llenar estos zapatos no es tarea fácil. Aumenta la fuerza en <%= str %>. Armario Encantado: Conjunto de payaso (artículo 1 de 5).",
     "armorArmoireSoftPinkSuitText": "Traje rosa claro",
     "armorSpecialSpring2021MageText": "Esplendor de cisne blanco",
     "armorArmoireBathtubText": "Bañera",
     "armorSpecialSummer2021RogueNotes": "¿Quieres que te encuentren?¡Esto llama mucho la atención!¿Preferirías que no fuese así? ¡También pueden ser de ayuda para huir a las profundidades! Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de verano 2021.",
     "armorSpecialSpring2021HealerNotes": "Esta armadura te ayuda a doblarte sin romperte al ser abofeteado por el viento o por un arma. Aumenta la constitución en <%= con %>. Equipamiento de edición limitada de primavera 2021.",
-    "armorSpecialSummer2021MageNotes": "Los remolinos de nácar cada vez más estrechos proporcionan una geometría arcana que concentra un poderoso hechizo protector. Aumenta la inteligencia en <% = int%>. Equipamiento de edición limitada de verano 2021.",
+    "armorSpecialSummer2021MageNotes": "Los remolinos de nácar cada vez más estrechos proporcionan una geometría arcana que concentra un poderoso hechizo protector. Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2021.",
     "armorSpecialSpring2021MageNotes": "¡Has completado tu transformación!¡Toca el cielo, regocíjate en el lago y canta de alegría! Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2021.",
     "armorSpecialSpring2021HealerText": "Chaquetón de corteza de sauce",
     "armorMystery202104Text": "Armadura de cardo suave",
@@ -2170,11 +2170,11 @@
     "armorSpecialFall2021WarriorNotes": "Un espectacular traje perfecto para cruzar puentes en mitad de la noche. Aumenta la constitución en <%= con %>. Equipamiento de edición limitada de otoño 2021.",
     "armorSpecialFall2021MageText": "Toga de la oscuridad profunda",
     "armorSpecialFall2021HealerText": "Hábitos de invocador",
-    "armorSpecialFall2021HealerNotes": "Hechas de tela duradera y resistente a las llamas, estos hábitos son perfectos para conjurar llamas curativas. Aumenta la constitución en <% = con%>. Equipamiento de edición limitada de otoño 2021.",
+    "armorSpecialFall2021HealerNotes": "Hechas de tela duradera y resistente a las llamas, estos hábitos son perfectos para conjurar llamas curativas. Aumenta la constitución en <%= con %>. Equipamiento de edición limitada de otoño 2021.",
     "armorMystery202103Text": "Toga de observación floral",
     "armorMystery202110Text": "Armadura de gárgola musgosa",
-    "armorSpecialFall2021RogueNotes": "¡Tiene un gorrito, una túnica de cuero y remaches de metal! ¡Es chulísima! ¡Pero no ofrece impermeabilidad contra bichos pegajosos! Aumenta la percepción en un <% = per%>. Equipamiento de edición limitada de otoño 2021.",
+    "armorSpecialFall2021RogueNotes": "¡Tiene un gorrito, una túnica de cuero y remaches de metal! ¡Es chulísima! ¡Pero no ofrece impermeabilidad contra bichos pegajosos! Aumenta la percepción en un <%= per %>. Equipamiento de edición limitada de otoño 2021.",
-    "armorSpecialFall2021MageNotes": "Los cuellos con muchas protuberancias puntiagudas están de moda entre los villanos de baja categoría. Aumenta la inteligencia en <% = int%>. Equipamiento de edición limitada de otoño 2021.",
+    "armorSpecialFall2021MageNotes": "Los cuellos con muchas protuberancias puntiagudas están de moda entre los villanos de baja categoría. Aumenta la inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2021.",
     "armorSpecialSpring2021RogueNotes": "Nadie te verá esperando entre los arbustos con esta astuta armadura; ahora pareces una planta visto desde cualquier ángulo. Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de primavera 2021.",
     "armorSpecialSummer2021WarriorText": "Armadura de aletas",
     "armorMystery202110Notes": "El musgo aterciopelado te hace parecer blandito por fuera, pero en realidad estás protegido por una capa de poderosa roca. No otorga ningún beneficio. Artículo de suscriptor de octubre 2021 .",
@@ -2562,5 +2562,15 @@
     "armorSpecialBirthday2022Text": "Túnicas Disparatadas de Fiesta",
     "armorSpecialBirthday2022Notes": "¡Feliz cumpleaños, Habitica! Use estas Túnicas Disparatadas de Fiesta para celebrar este maravilloso día. No confiere ningún beneficio.",
     "headMystery202202Text": "Coletas Turquesas",
-    "eyewearMystery202202Notes": "Cantar alegremente le da color a tus mejillas. No otorga ningún beneficio. Artículo de Suscriptor de Febrero 2022"
+    "eyewearMystery202202Notes": "Cantar alegremente le da color a tus mejillas. No otorga ningún beneficio. Artículo de Suscriptor de Febrero 2022",
+    "weaponArmoirePinkLongbowText": "Arco largo rosa",
+    "weaponArmoirePinkLongbowNotes": "Entrénate para ser cupido y domina tanto la arquería como los asuntos sentimentales gracias a este hermoso arco. Aumenta la percepción en <%= per %> y la Fuerza en <%= str %>. Armario Encantado: Artículo independiente.",
+    "armorArmoireSoftVioletSuitText": "Traje suave violeta",
+    "shieldArmoireSoftVioletPillowText": "Almohada violeta suave",
+    "shieldArmoireSoftVioletPillowNotes": "Un guerrero inteligente siempre se lleva una almohada a sus expediciones. Protégete del pánico que provoca la procrastinación... hasta cuando te echas la siesta. Aumenta la inteligencia en <%= int %>. Armario Encantado: Conjunto Ropa de casa violeta (Artículo 3 de 3).",
+    "backMystery202203Text": "Alas de Libélula Intrépida",
+    "backMystery202203Notes": "Gana la carrera a todas las demás criaturas del cielo gracias a estas alas brillantes. No otorga ningún beneficio. Artículo de suscriptor de marzo 2022.",
+    "headAccessoryMystery202203Text": "Diadema de Libélula Intrépida",
+    "armorArmoireSoftVioletSuitNotes": "El morado es un color de lujo. Relájate con clase después de terminar tus tareas diarias. Aumenta la Constitución y la Fuerza en <%= attrs %> . Armario encantado: Conjunto Ropa de casa violeta (Artículo 2 de 3).",
+    "headAccessoryMystery202203Notes": "¿Necesitas un impulso de velocidad?¡Las alitas decorativas de esta diadema son más poderosas de lo que parecen! No otorga ningún beneficio. Artículo de suscriptor de marzo 2022."
 }

website/common/locales/es/limited.json

@@ -141,7 +141,7 @@
     "dateEndOctober": "31 de octubre",
     "dateEndNovember": "30 de noviembre",
     "dateEndJanuary": "31 de enero",
-    "dateEndFebruary": "29 de febrero",
+    "dateEndFebruary": "28 de febrero",
     "winterPromoGiftHeader": "¡REGALA UNA SUSCRIPCIÓN, RECIBE OTRA GRATIS!",
     "winterPromoGiftDetails1": "Solo hasta el 6 de enero, cuando regales una suscripción a alguien, ¡obtienes la misma suscripción gratis!",
     "winterPromoGiftDetails2": "Por favor, ten en cuenta que si tú o la persona que recibe el regalo ya tenéis una suscripción recurrente, la suscripción regalada solo empezará después de que esa suscripción sea cancelada o haya expirado. ¡Muchas gracias por tu apoyo! <3",
@@ -216,5 +216,9 @@
     "winter2022FireworksRogueSet": "Fuegos Artificiales (Pícaro)",
     "winter2022StockingWarriorSet": "Calcetín (Guerrero)",
     "winter2022PomegranateMageSet": "Granada (Mago)",
-    "winter2022IceCrystalHealerSet": "Cristal de Hielo (Sanador)"
+    "winter2022IceCrystalHealerSet": "Cristal de Hielo (Sanador)",
+    "spring2022MagpieRogueSet": "Urraca (Pícaro)",
+    "spring2022RainstormWarriorSet": "Tempestad (Guerrero)",
+    "spring2022ForsythiaMageSet": "Forsitia (Mago)",
+    "spring2022PeridotHealerSet": "Peridoto (Sanador)"
 }

website/common/locales/es/loginincentives.json

@@ -1,6 +1,6 @@
 {
     "unlockedReward": "Has recibido <%= reward %>",
-    "earnedRewardForDevotion": "Has ganado <%= reward %> por siendo committed por mejorado su vida.",
+    "earnedRewardForDevotion": "Has ganado <%= reward %> por haberte comprometido a mejorar tu vida.",
     "nextRewardUnlocksIn": "Registros hasta tu próximo premio: <%= numberOfCheckinsLeft %>",
     "awesome": "¡Genial!",
     "countLeft": "Registros hasta la próxima recompensa: <%= count %>",

website/common/locales/es/rebirth.json

@@ -8,7 +8,7 @@
     "rebirthOrb": "Usó un Orbe de Renacimiento para comenzar de nuevo después de alcanzar el Nivel <%= level %>.",
     "rebirthOrb100": "Usó un Orbe de Renacimiento para comenzar de nuevo después de alcanzar el Nivel 100 o superior.",
     "rebirthOrbNoLevel": "Usó un Orbe de Renacimiento para comenzar de nuevo.",
-    "rebirthPop": "Reinicia instantáneamente tu personaje como un Guerrero de Nivel 1, manteniendo logros, colecciones y equipamiento. Tus tareas y su historial se mantendrán, pero volverán a ser amarillas. Tus rachas desaparecerán excepto por tareas pertenecientes a Desafíos y Planes Grupales activos. Tu Oro, Experiencia, Maná y los efectos de todas tus habilidades desaparecerán. Todo esto tendrá efecto inmediato. Para más información, mirar la página de <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orbe de Renacimiento</a> de la wiki.",
+    "rebirthPop": "Reinicia instantáneamente tu personaje como un Guerrero de Nivel 1, manteniendo logros, colecciones y equipamiento. Tus tareas y su historial se mantendrán, pero volverán a ser amarillas. Tus rachas desaparecerán excepto por tareas pertenecientes a Desafíos y Planes Grupales activos. Tu Oro, Experiencia, Maná y los efectos de todas tus habilidades desaparecerán. Todo esto tendrá efecto inmediato. Para más información, mirar la página de <a href='https://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orbe de Renacimiento</a> de la wiki.",
     "rebirthName": "Esfera de Renacimiento",
     "rebirthComplete": "¡Has vuelto a nacer!",
     "nextFreeRebirth": "<strong><%= days %> días</strong> hasta la Orbe de Renacimiento <strong>GRATIS</strong>"

website/common/locales/es/settings.json

@@ -2,7 +2,7 @@
     "settings": "Ajustes",
     "language": "Idioma",
     "americanEnglishGovern": "En caso de que hubiese alguna discrepancia en las traducciones, prima la versión en inglés estadounidense.",
-    "helpWithTranslation": "¿Te gustaría ayudar con la traducción de Habitica? ¡Genial! ¡Entonces visita <a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">la Aspiring Linguists Guild</a>!",
+    "helpWithTranslation": "¿Te gustaría ayudar con la traducción de Habitica? ¡Genial! ¡Entonces visita <a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">el Aspiring Linguists Guild</a>!",
     "stickyHeader": "Cabecera fija",
     "newTaskEdit": "Abrir nuevas tareas en el modo de edición",
     "dailyDueDefaultView": "Marcar Tareas Diarias como 'Por hacer' por defecto",
@@ -60,7 +60,7 @@
     "deleteSocialAccountText": "¿Estás seguro? ¡Esto eliminará tu cuenta para siempre, y nunca podrá ser restaurada! Necesitarás crear una nueva cuenta para usar Habitica de nuevo. Las Gemas depositadas o gastadas no serán reembolsadas. Si estás absolutamente seguro, escriba \"<%= magicWord %>\" en el cuadro de texto de abajo.",
     "API": "API",
     "APIv3": "API v. 3",
-    "APIText": "Copie esto para usarlo en aplicaciones de terceros. Sin embargo, pensá en tu API Token como una contraseña, no la compartas en público. En ocasiones se te solicitará tu ID de Usuario, pero nunca publiques tu API Token donde otros puedan verla, incluyendo Github.",
+    "APIText": "Copie esto para usarlo en aplicaciones de terceros. Sin embargo, pensa en tu API Token como una contraseña, no la compartas en público. En ocasiones se te solicitará tu ID de Usuario, pero nunca publiques tu API Token donde otros puedan verla, incluyendo Github.",
     "APIToken": "API Token (esto es una contraseña - mira la advertencia de arriba!)",
     "showAPIToken": "Enseñar la ficha API",
     "hideAPIToken": "Esconder la ficha API",
@@ -200,13 +200,14 @@
     "transaction_create_challenge": "Desafío creado",
     "transaction_create_guild": "Gremio creado",
     "transaction_change_class": "Clase cambiada",
-    "transaction_rebirth": "Orbe de renacimiento usado",
+    "transaction_rebirth": "Orbe de Renacimiento usado",
     "transaction_release_pets": "Mascotas soltadas",
-    "transaction_reroll": "Poción de fortalecimiento usada",
+    "transaction_reroll": "Poción de Fortalecimiento usada",
     "hourglassTransactions": "Transacciones de Relojes de Arena",
     "transaction_gift_receive": "Recibido de",
     "transaction_debug": "Depuración",
     "transaction_contribution": "A través de contribuciones",
     "transaction_spend": "Gastado en",
-    "transaction_release_mounts": "Monturas sueltas"
+    "transaction_release_mounts": "Monturas sueltas",
+    "transaction_subscription_perks": "Beneficio de la suscripción"
 }

website/common/locales/es/subscriber.json

@@ -199,5 +199,6 @@
     "mysterySet202111": "Conjunto de Cronomante Cósmico",
     "mysterySet202112": "Conjunto de Ondina Antártica",
     "mysterySet202201": "Conjunto de Juerguista de Medianoche",
-    "mysterySet202202": "Conjunto de Coletas Turquesas"
+    "mysterySet202202": "Conjunto de Coletas Turquesas",
+    "mysterySet202203": "Conjunto de Libélula Intrépida"
 }

website/common/locales/es_419/achievements.json

@@ -30,7 +30,7 @@
     "earnedAchievement": "¡Has conseguido un logro!",
     "viewAchievements": "Ver los Logros",
     "letsGetStarted": "¡Comencemos!",
-    "onboardingProgress": "<%= Porcentaje%>% de progreso",
+    "onboardingProgress": "<%= percentage %>% de progreso",
     "gettingStartedDesc": "¡Completa estas tareas de integración y conseguirás <strong>5 logros</strong> y <strong class=\"gold-amount\">100 Oro</strong> en cuanto acabes!",
     "achievementCompletedTaskText": "Completó su primera tarea.",
     "achievementCompletedTask": "Completa una tarea",

website/common/locales/fi/gear.json

@@ -133,7 +133,7 @@
     "weaponSpecialSummerRogueText": "Merirosvohukari",
     "weaponSpecialSummerRogueNotes": "Avast! You'll make those Dailies walk the plank! Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.",
     "weaponSpecialSummerWarriorText": "Merenkulkijan veitsi",
-    "weaponSpecialSummerWarriorNotes": "Yhdessäkään tehtäväluettelossa ei ole tehtävää, joka olisi halukas taistelemaan tätä veistä vastaan! Lisää voimaa <% = str%>. Rajoitettu erä 2014 Kesävarusteet.",
+    "weaponSpecialSummerWarriorNotes": "Yhdessäkään tehtäväluettelossa ei ole tehtävää, joka olisi halukas taistelemaan tätä veistä vastaan! Lisää voimaa <%= str %>. Rajoitettu erä 2014 Kesävarusteet.",
     "weaponSpecialSummerMageText": "Merileväpyydys",
     "weaponSpecialSummerMageNotes": "This trident is used to spear seaweed effectively, for extra-productive kelp harvesting! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014 Summer Gear.",
     "weaponSpecialSummerHealerText": "Matalikon sauva",
@@ -237,7 +237,7 @@
     "weaponSpecialFall2017RogueText": "Candied Apple Mace",
     "weaponSpecialFall2017RogueNotes": "Defeat your foes with sweetness! Increases Strength by <%= str %>. Limited Edition 2017 Autumn Gear.",
     "weaponSpecialFall2017WarriorText": "Candy Corn Lance",
-    "weaponSpecialFall2017WarriorNotes": "Kaikki vihollisesi kukistuvat tämän herkullisen näköisen veitsen alla, riippumatta siitä, ovatko he haamuja, hirviöitä vai punaisia tehtäviä. Lisää voimaa <% = str%>. Rajoitettu erä 2017 Kevätvarusteet.",
+    "weaponSpecialFall2017WarriorNotes": "Kaikki vihollisesi kukistuvat tämän herkullisen näköisen veitsen alla, riippumatta siitä, ovatko he haamuja, hirviöitä vai punaisia tehtäviä. Lisää voimaa <%= str %>. Rajoitettu erä 2017 Kevätvarusteet.",
     "weaponSpecialFall2017MageText": "Spooky Staff",
     "weaponSpecialFall2017MageNotes": "The eyes of the glowing skull on this staff radiate magic and mystery. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2017 Autumn Gear.",
     "weaponSpecialFall2017HealerText": "Creepy Candelabra",
@@ -279,7 +279,7 @@
     "weaponSpecialWinter2019WarriorText": "Snowflake Halberd",
     "weaponSpecialWinter2019WarriorNotes": "This snowflake was grown, ice crystal by ice crystal, into a diamond-hard blade! Increases Strength by <%= str %>. Limited Edition 2018-2019 Winter Gear.",
     "weaponSpecialWinter2019MageText": "Fiery Dragon Staff",
-    "weaponSpecialWinter2019MageNotes": "Varovasti! Tämä räjähtävä sauva on valmis auttamaan sinua selviämään kaikesta, mitä vastaan tulee. Lisää älykkyyttä <% = int%> ja havainnointia <% = per%>. Rajoitettu erä 2018-2019 Talvivarusteet.",
+    "weaponSpecialWinter2019MageNotes": "Varovasti! Tämä räjähtävä sauva on valmis auttamaan sinua selviämään kaikesta, mitä vastaan tulee. Lisää älykkyyttä <%= int %> ja havainnointia <%= per %>. Rajoitettu erä 2018-2019 Talvivarusteet.",
     "weaponSpecialWinter2019HealerText": "Wand of Winter",
     "weaponSpecialWinter2019HealerNotes": "Winter can be a time of rest and healing, and so this wand of winter magic can help to soothe the most grievous hurts. Increases Intelligence by <%= int %>. Limited Edition 2018-2019 Winter Gear.",
     "weaponMystery201411Text": "Pitchfork of Feasting",
@@ -1745,17 +1745,17 @@
     "weaponSpecialKS2019Text": "Myyttinen Griippiglaive",
     "weaponSpecialKS2019Notes": "Käyränä kuin griipin nokka ja kynnet, tämä koristeltu salkoase muistuttaa sinua puskemaan eteenpäin kun urakka edessäsi tuntuu musertavalta. Kasvattaa voimaa <%= str %> pisteellä.",
     "weaponSpecialSummer2019MageText": "Loistava Kukinta",
-    "weaponSpecialSummer2019WarriorNotes": "Nyt taistelet fraktaalien kanssa! Lisää voimaa <% = str%>. Rajoitettu erä 2019 Kesävarusteet.",
+    "weaponSpecialSummer2019WarriorNotes": "Nyt taistelet fraktaalien kanssa! Lisää voimaa <%= str %>. Rajoitettu erä 2019 Kesävarusteet.",
     "weaponSpecialSummer2019WarriorText": "Punainen Koralli",
-    "weaponSpecialSummer2019RogueNotes": "Tämä ikivanha ja hirmuinen ase auttaa sinua voittamaan minkä tahansa vedenalaisen taistelun. Lisää voimaa <% = str%>. Rajoitettu erä 2019 Kesävarusteet.",
+    "weaponSpecialSummer2019RogueNotes": "Tämä ikivanha ja hirmuinen ase auttaa sinua voittamaan minkä tahansa vedenalaisen taistelun. Lisää voimaa <%= str %>. Rajoitettu erä 2019 Kesävarusteet.",
     "weaponSpecialSummer2019RogueText": "Ikivanha Ankkuri",
-    "weaponSpecialSpring2019HealerNotes": "Laulusi kukista ja sateesta rauhoittavat kaikkien kuulijoiden mieltä. Lisää älykkyyttä <% = int%>. Rajoitettu erä 2019 Kevätvaruste.",
+    "weaponSpecialSpring2019HealerNotes": "Laulusi kukista ja sateesta rauhoittavat kaikkien kuulijoiden mieltä. Lisää älykkyyttä <%= int %>. Rajoitettu erä 2019 Kevätvaruste.",
     "weaponSpecialSpring2019HealerText": "Kevätlaulu",
-    "weaponSpecialSpring2019MageNotes": "Tämän sauvan päässä on kiveen upotettu hyttynen! Saattaa tai ei saata sisältää dinosauruksen DNA:ta. Lisää älykkyyttä <% = int%> ja havainnointia <% = per%>. Rajoitettu erä 2019 Kevätvarusteet.",
+    "weaponSpecialSpring2019MageNotes": "Tämän sauvan päässä on kiveen upotettu hyttynen! Saattaa tai ei saata sisältää dinosauruksen DNA:ta. Lisää älykkyyttä <%= int %> ja havainnointia <%= per %>. Rajoitettu erä 2019 Kevätvarusteet.",
     "weaponSpecialSpring2019MageText": "Meripihkasauva",
-    "weaponSpecialSpring2019WarriorNotes": "Huonot tavat vapisevat tämän vehreän terän nähdessään. Lisää voimaa <% = str%>. Rajoitettu erä 2019 Kevätvarusteet.",
+    "weaponSpecialSpring2019WarriorNotes": "Huonot tavat vapisevat tämän vehreän terän nähdessään. Lisää voimaa <%= str %>. Rajoitettu erä 2019 Kevätvarusteet.",
     "weaponSpecialSpring2019WarriorText": "Varsimiekka",
-    "weaponSpecialSpring2019RogueNotes": "Nämä aseet sisältävät taivaan ja sateen voiman. Emme suosittele niiden käyttöä vedessä. Lisää voimaa <% = str%>. Rajoitettu erä 2019 Kevätvarusteet.",
+    "weaponSpecialSpring2019RogueNotes": "Nämä aseet sisältävät taivaan ja sateen voiman. Emme suosittele niiden käyttöä vedessä. Lisää voimaa <%= str %>. Rajoitettu erä 2019 Kevätvarusteet.",
     "weaponSpecialSpring2019RogueText": "Salama",
     "weaponSpecialSummer2019HealerText": "Kuplasauva"
 }

website/common/locales/fr/achievements.json

@@ -1,7 +1,7 @@
 {
     "achievement": "Succès",
     "onwards": "En avant !",
-    "levelup": "Pour avoir accompli vos objectifs dans la vraie vie, vous avez gagné un niveau et vous vous retrouvez complètement guéri !",
+    "levelup": "Pour avoir accompli vos objectifs dans la vraie vie, vous avez gagné un niveau et vous vous êtes complètement rétabli !",
     "reachedLevel": "Vous avez atteint le niveau <%= level %>",
     "achievementLostMasterclasser": "Achèvement de quêtes : série de la maîtresse des classes",
     "achievementLostMasterclasserText": "A achevé les 16 quêtes de la série de quêtes de la maîtresse des classes, et a résolu le mystère de la maîtresse des classes oubliée !",
@@ -123,5 +123,11 @@
     "achievementShadyCustomerText": "A collecté tous les familiers d'ombre.",
     "achievementShadeOfItAllModalText": "Vous avez dompté tous les familiers d'ombre !",
     "achievementShadeOfItAll": "Dans l'ombre des géants",
-    "achievementShadeOfItAllText": "A dompté tous les familiers d'ombre."
+    "achievementShadeOfItAllText": "A dompté tous les familiers d'ombre.",
+    "achievementZodiacZookeeper": "Le Zoo-diaque",
+    "achievementZodiacZookeeperModalText": "Vous avez collecté tous les familiers du zodiaque !",
+    "achievementZodiacZookeeperText": "A collecté tous les familiers du zodiaque de couleur basique : Rat, Vache, Lapin, Serpent, Cheval, Mouton, Singe, Coq, Loup, Tigre, Cochon volant et Dragon !",
+    "achievementBirdsOfAFeatherText": "A collecté tous les familiers volants de couleur basique : Cochon volant, Hibou, Perroquet, Pterodactyle, Griffon, Faucon, Paon et Coq.",
+    "achievementBirdsOfAFeather": "Oiseaux à une Plume",
+    "achievementBirdsOfAFeatherModalText": "Vous avez collecté tous les familiers volants !"
 }

website/common/locales/fr/backgrounds.json

@@ -671,5 +671,19 @@
     "backgroundMeteorShowerNotes": "Observez l'éblouissant spectacle nocturne d'une pluie de météores.",
     "backgroundPalmTreeWithFairyLightsNotes": "Posez près d'un palmier orné de lumières féeriques.",
     "backgroundSnowyFarmText": "Ferme enneigée",
-    "backgroundSnowyFarmNotes": "Vérifiez que tout le monde est bien au chaud dans votre ferme enneigée."
+    "backgroundSnowyFarmNotes": "Vérifiez que tout le monde est bien au chaud dans votre ferme enneigée.",
+    "backgroundWinterWaterfallNotes": "Émerveillez-vous devant des chutes d'eau hivernales.",
+    "backgrounds022022": "Ensemble 93 : sorti en février 2022",
+    "backgroundWinterWaterfallText": "Chutes d'eau hivernales",
+    "backgroundOrangeGroveText": "Orangeraie",
+    "backgroundOrangeGroveNotes": "Baladez-vous dans une orangeraie parfumée.",
+    "backgroundIridescentCloudsText": "Nuages iridescents",
+    "backgroundIridescentCloudsNotes": "Flottez sur des nuages iridescents.",
+    "backgrounds032022": "Ensemble 94 : sorti en mars 2022",
+    "backgroundAnimalsDenNotes": "Installez-vous confortablement dans une tanière de créature des bois.",
+    "backgroundBrickWallWithIvyNotes": "Admirez un mur de brique avec du lierre.",
+    "backgroundFloweringPrairieText": "Prairie fleurie",
+    "backgroundFloweringPrairieNotes": "Gambadez dans une prairie fleurie.",
+    "backgroundBrickWallWithIvyText": "Mur de brique avec Lierre",
+    "backgroundAnimalsDenText": "Tanière de créature des bois"
 }

website/common/locales/fr/front.json

@@ -13,7 +13,7 @@
     "companyDonate": "Faire un don",
     "forgotPassword": "Mot de passe oublié ?",
     "emailNewPass": "Envoyer un lien de réinitialisation par courriel",
-    "forgotPasswordSteps": "Entrez l'adresse courriel que vous avez utilisée pour créer votre compte Habitica.",
+    "forgotPasswordSteps": "Entrez votre identifiant ou l'adresse courriel que vous avez utilisée pour créer votre compte Habitica.",
     "sendLink": "Envoyer le lien",
     "featuredIn": "Présenté dans",
     "footerDevs": "Développeurs",
@@ -129,7 +129,7 @@
     "passwordConfirmationMatch": "La confirmation du mot de passe ne correspond pas au mot de passe.",
     "invalidLoginCredentials": "Identifiant, courriel ou mot de passe incorrect.",
     "passwordResetPage": "Réinitialiser le mot de passe",
-    "passwordReset": "Si nous avons votre courriel dans nos fichiers, un nouveau mot de passe vous a été envoyé.",
+    "passwordReset": "Si nous avons votre courriel ou votre identifiant dans nos fichiers, un nouveau mot de passe vous a été envoyé.",
     "passwordResetEmailSubject": "Mot de passe réinitialisé pour Habitica",
     "passwordResetEmailText": "Si vous avez demandé une réinitialisation de mot de passe pour <%= username %> sur Habitica, rendez-vous sur <%= passwordResetLink %> pour en définir un nouveau. Le lien expirera après 24 heures. Si vous n'avez pas demandé de réinitialisation, vous pouvez ignorer ce courriel.",
     "passwordResetEmailHtml": "Si vous avez demandé une réinitialisation de mot de passe pour <strong><%= username %></strong> sur Habitica, rendez-vous sur <a href=\"<%= passwordResetLink %>\"> ce lien</a> pour en définir un nouveau. Le lien expirera après 24 heures.<br/><br>Si vous n'avez pas demandé de réinitialisation, vous pouvez ignorer ce courriel.",
@@ -150,7 +150,7 @@
     "confirmPassword": "Confirmer le mot de passe",
     "usernameLimitations": "L'identifiant doit faire de 1 à 20 caractères, contenir des lettres de a à z, des chiffres de 0 à 9, des traits d'union et/ou des tirets bas, et ne peut contenir de mot grossier.",
     "usernamePlaceholder": "par exemple Wasabitica",
-    "emailPlaceholder": "par exemple wasabi@exemple.com",
+    "emailPlaceholder": "par exemple gryphon@exemple.com",
     "passwordPlaceholder": "par exemple ******************",
     "confirmPasswordPlaceholder": "Assurez-vous qu'il s'agit du même mot de passe !",
     "joinHabitica": "Rejoindre Habitica",
@@ -186,5 +186,6 @@
     "communityInstagram": "Instagram",
     "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."
+    "socialAlreadyExists": "Cet identifiant social est déjà lié à un compte Habitica existant.",
+    "emailUsernamePlaceholder": "par exemple habitrabbit ou gryphon@example.com"
 }

website/common/locales/fr/gear.json

@@ -1175,7 +1175,7 @@
     "headArmoireRedHairbowText": "Serre-tête rouge",
     "headArmoireRedHairbowNotes": "Devenez fort, tenace et brillant en portant ce magnifique serre-tête rouge ! Augmente la force de <%= str %>, la constitution de <%= con %>, et l'intelligence de <%= int %>. Armoire enchantée : ensemble du serre-tête rouge (objet 1 sur 2).",
     "headArmoireVioletFloppyHatText": "Chapeau négligé violet",
-    "headArmoireVioletFloppyHatNotes": "De nombreux sorts furent tissés dans la trame même de ce simple chapeau, lui donnant une agréable couleur violette. Augmente la perception de <%= per %>, l'intelligence de <%= int %> et la constitution de <%= con %>. Armoire enchantée : objet indépendant.",
+    "headArmoireVioletFloppyHatNotes": "De nombreux sorts furent tissés dans la trame même de ce simple chapeau, lui donnant une agréable couleur violette. Augmente la perception de <%= per %>, l'intelligence de <%= int %> et la constitution de <%= con %>. Ensemble de vêtements de détente violet (objet 1 de 3).",
     "headArmoireGladiatorHelmText": "Heaume de gladiateur",
     "headArmoireGladiatorHelmNotes": "Pour être un gladiateur, vous devez non seulement être fort... mais rusé. Augmente l'intelligence de <%= int %> et la perception de <%= per %>. Armoire enchantée : ensemble de gladiature (objet 1 sur 3).",
     "headArmoireRancherHatText": "Chapeau d'éleveur",
@@ -2556,5 +2556,63 @@
     "armorArmoireShootingStarCostumeNotes": "Prétendument tissée à partir du ciel nocturne lui-même, cette robe flottante vous permet de vous élever au-dessus de tous les obstacles. Augmente la constitution de <%= con %>. Armoire enchantée : ensemble de poussière d'étoile (objet 2 de 3).",
     "headArmoireShootingStarCrownNotes": "Avec ce couvre-chef éblouissant, vous serez littéralement la star de votre aventure ! Augmente la perception de <%= per %>. Armoire enchantée : ensemble de poussière d'étoile (objet 1 de 3).",
     "headArmoireShootingStarCrownText": "Couronne Étoilée",
-    "weaponArmoireShootingStarSpellNotes": "Entourez-vous d'un tourbillon magique de poussière d'étoile pour vous aider à réaliser tous vos souhaits. Augmente la force et l'intelligence de <%= attrs %>. Armoire enchantée : ensemble de poussière d'étoile (objet 3 de 3)."
+    "weaponArmoireShootingStarSpellNotes": "Entourez-vous d'un tourbillon magique de poussière d'étoile pour vous aider à réaliser tous vos souhaits. Augmente la force et l'intelligence de <%= attrs %>. Armoire enchantée : ensemble de poussière d'étoile (objet 3 de 3).",
+    "armorSpecialBirthday2022Text": "Robes de fête grotesques",
+    "shieldArmoireSoftVioletPillowText": "Coussin doux violet",
+    "eyewearMystery202202Text": "Yeux turquoise avec du blushs",
+    "eyewearMystery202202Notes": "Un chant joyeux donne de la couleur à vos joues. Ne confère aucun bonus. Équipement d'abonnement de février 2022",
+    "armorSpecialBirthday2022Notes": "Joyeux anniversaire, Habitica ! Portez ces robes de fêtes scandaleuses pour célébrer ce jour merveilleux. Ne confère aucun bonus.",
+    "headMystery202202Notes": "Il vous faut des cheveux bleus ! Ne confère aucun bonus. Équipement d'abonnement de février 2022.",
+    "headMystery202202Text": "Queues jumelles turquoises",
+    "weaponArmoirePinkLongbowText": "Arc long rose",
+    "armorArmoireSoftVioletSuitText": "Costume doux violet",
+    "shieldArmoireSoftVioletPillowNotes": "Un guerrier intelligent emportera un oreiller pour n'importe quelle expédition. Protégez-vous de toute panique induite par la procrastination... même pendant votre sieste. Augmente l'intelligence de <%= int %>. Armoire enchantée : Ensemble de vêtements de détente violet (objet 3 de 3).",
+    "weaponArmoirePinkLongbowNotes": "Comportez-vous comme un apprenti-cupidon, en apprenant la maîtrise de l'archerie et des choses du cœur avec ce magnifique arc. Augmente la perception de <%= per %> et la force de <%= str %>. Armoire enchantée : Objet indépendant.",
+    "armorArmoireSoftVioletSuitNotes": "Le pourpre est une couleur luxueuse. Relaxez-vous avec style après avoir accompli vos tâches quotidiennes. Augmente la constitution et la force de <%= attrs %> chacune. Armoire enchantée : ensemble de vêtements de détente violet (objet 2 de 3).",
+    "weaponArmoireGardenersWateringCanNotes": "Vous n'irez pas loin sans eau ! Vous en aurez une infinité sous la main avec cet arrosoir magique qui se remplit tout seul. Augmente l'intelligence de <%= int %>. Armoire enchantée : Ensemble de jardinage (objet 4 de 4).",
+    "headAccessoryMystery202203Notes": "Vous avez besoin d'un peu plus de vitesse ? Les petites ailes décoratives sur ce diadème sont plus puissantes qu'elles n'en ont l'air ! Ne confère aucun bonus. Équipement d'abonnement de mars 2022.",
+    "weaponArmoireGardenersWateringCanText": "Arrosoir",
+    "armorArmoireGardenersOverallsText": "Salopette de jardinage",
+    "armorArmoireGardenersOverallsNotes": "N'ayez pas peur de travailler dans la terre lorsque vous portez cette salopette résistante. Augmente la constitution de <%= con %>. Armoire enchantée : ensemble de jardinage (objet 1 de 4).",
+    "headArmoireGardenersSunHatText": "Chapeau de jardinage",
+    "headArmoireGardenersSunHatNotes": "La lumière aveuglante de l'astre solaire ne vous éblouira pas lorsque vous porterez ce chapeau à large bord. Augmente la perception de (objet 2 de 4). Armoire enchantée : ensemble de jardinage (objet 2 de 4).",
+    "shieldArmoireGardenersSpadeText": "Bêche de jardinage",
+    "shieldArmoireGardenersSpadeNotes": "Que vous creusiez dans le jardin, cherchant un trésor enfoui, ou fabriquant un tunnel secret, cette bêche fiable est à vos côtés. Augmente la force de <%= str %>. Armoire enchantée : ensemble de jardinage (objet 3 de 4).",
+    "headAccessoryMystery202203Text": "Diadème de libellule intrépide",
+    "backMystery202203Text": "Ailes de libellule intrépide",
+    "backMystery202203Notes": "Volez plus vite que toutes les autres créatures du ciel avec ces ailes scintillantes. Ne confère aucun bonus. Équipement d'abonnement de mars 2022.",
+    "weaponSpecialSpring2022WarriorText": "Parapluie retourné",
+    "weaponSpecialSpring2022WarriorNotes": "Oups ! On dirait que ce vent était un peu plus fort que vous l'auriez cru ! Augmente la force de <%= str %>. Équipement en édition limitée du printemps 2022.",
+    "weaponSpecialSpring2022MageText": "Bâton de forsythia",
+    "weaponSpecialSpring2022HealerText": "Baguette de péridot",
+    "armorSpecialSpring2022WarriorText": "Imperméable",
+    "armorSpecialSpring2022WarriorNotes": "Cet imperméable avec ses bottes est tellement formidable que vous pourriez chanter sous la pluie ou sauter dans toutes les flaques en restant au chaud et au sec ! Augmente la constitution de <%= con %>. Équipement en édition limitée du printemps 2022.",
+    "armorSpecialSpring2022MageText": "Robe forsythia",
+    "armorSpecialSpring2022HealerText": "Armure de péridot",
+    "headSpecialSpring2022RogueText": "Masque de pie",
+    "headSpecialSpring2022WarriorText": "Capuche d'imperméable",
+    "headSpecialSpring2022WarriorNotes": "Ouhla, on dirait qu'il pleut. Gardez le dos droit et rabaissez votre capuche pour rester au sec. Augmente la force de <%= str %>. Équipement en édition limitée du printemps 2022.",
+    "headSpecialSpring2022MageText": "Casque forsythia",
+    "headSpecialSpring2022HealerText": "Casque de péridot",
+    "headSpecialSpring2022HealerNotes": "Ce casque mystérieux préserve votre vie privée pendant que vous attaquez vos tâches. Augmente l'intelligence de <%= int %>. Équipement en édition limitée du printemps 2022.",
+    "shieldSpecialSpring2022HealerText": "Bouclier de péridot",
+    "shieldSpecialSpring2022HealerNotes": "Fabriqué à partir de pierre liquéfiée dans le manteau supérieur, ce bouclier peut supporter n'importe quel coup qu'il rencontre. Augmente la constitution de <%= con %>. Équipement en édition limitée du printemps 2022.",
+    "weaponSpecialSpring2022RogueText": "Clou d'oreille géant",
+    "weaponSpecialSpring2022RogueNotes": "Qu'il est brillant ! Il est si brillant et luisant et joli et agréable et tout à vous ! Augmente la force de <%= str %>. Équipement en édition limitée du printemps 2022.",
+    "weaponSpecialSpring2022MageNotes": "Ces cloches jaune vif sont prêtes à canaliser votre puissante magie printanière. Augmente l'intelligence de <%= int %> et la perception de <%= per %>. Équipement en édition limitée du printemps 2022.",
+    "weaponSpecialSpring2022HealerNotes": "Utilisez cette baguette pour profiter des propriétés régénérantes du péridot, que ce soit pour apporter du calme, de la positivité ou de la gaieté de cœur. Augmente l'intelligence de <%= int %>. Équipement en édition limitée du printemps 2022.",
+    "armorSpecialSpring2022RogueNotes": "Avec des taches iridescentes bleu-gris métallique et des taches plus claires sur vos plumes, vous serez le meilleur ami volant à la fête du printemps ! Augmente la perception de <%= per %>. Équipement en édition limitée du printemps 2022.",
+    "armorSpecialSpring2022MageNotes": "Montrez que vous vous apprêtez à sauter dans cette nouvelle saison avec cette robe ornée de pétales de forsythia. Augmente l'intelligence de <%= int %>. Équipement en édition limitée du printemps 2022.",
+    "armorSpecialSpring2022HealerNotes": "Faites fuir les peurs et les cauchemars en portant ces vêtement de gemme verte. Augmente la constitution de <%= con %>. Équipement en édition limitée du printemps 2022.",
+    "armorSpecialSpring2022RogueText": "Costume de pie",
+    "headSpecialSpring2022RogueNotes": "Faites preuve d'autant d'intelligence qu'une pie en portant ce masque. Peut-être serez vous également capable de siffler, de triller et d'imitée comme l'une d'elles, aussi. Augmente la perception de <%= per %>. Équipement en édition limitée du printemps 2022.",
+    "headSpecialSpring2022MageNotes": "Restez au sec pendant les pluies diluviennes avec ce casque protecteur avec des rebords à pétales. Augmente la perception de <%= per %>. Équipement en édition limitée du printemps 2022.",
+    "shieldSpecialSpring2022WarriorNotes": "Vous avez déjà eu l'impression qu'un nuage pluvieux vous suivait où que vous alliez ? Réjouissez-vous, parce que bientôt les plus jolies fleurs pousseront à vos pieds ! Augmente la constitution de <%= con %>. Équipement en édition limitée du printemps 2022.",
+    "shieldSpecialSpring2022WarriorText": "Nuage pluvieux",
+    "armorMystery202204Text": "Capsule d'aventure virtuelle",
+    "armorMystery202204Notes": "On dirait que vos tâches requièrent maintenant d'appuyer sur ces mystérieux boutons ! Que peuvent-ils bien faire ? Ne confère aucun bonus. Équipement d'abonnement d'avril 2022.",
+    "eyewearMystery202204BText": "Visage virtuel",
+    "eyewearMystery202204BNotes": "Quelle est votre humeur du jour ? Exprimez vous avec ces écrans amusants. Ne confère aucun bonus. Équipement d'abonnement d'avril 2022.",
+    "eyewearMystery202204AText": "Visage virtuel",
+    "eyewearMystery202204ANotes": "Quelle est votre humeur du jour ? Exprimez vous avec ces écrans amusants. Ne confère aucun bonus. Équipement d'abonnement d'avril 2022."
 }

website/common/locales/fr/limited.json

@@ -141,7 +141,7 @@
     "dateEndOctober": "31 octobre",
     "dateEndNovember": "30 novembre",
     "dateEndJanuary": "31 janvier",
-    "dateEndFebruary": "29 février",
+    "dateEndFebruary": "28 février",
     "winterPromoGiftHeader": "OFFREZ UN ABONNEMENT, OBTENEZ-EN UN GRATUIT !",
     "winterPromoGiftDetails1": "Jusqu'au 6 janvier seulement, lorsque vous offrez un abonnement, vous recevez le même abonnement pour vous gratuitement !",
     "winterPromoGiftDetails2": "Merci de noter que si vous, ou la personne à qui vous faites ce cadeau, détenez un abonnement récurrent, l'abonnement offert ne commencera qu'après que cet abonnement sera annulé ou expirera. Merci infiniment pour votre soutien <3",
@@ -216,5 +216,9 @@
     "winter2022StockingWarriorSet": "Chaussette (Guerrier)",
     "winter2022PomegranateMageSet": "Grenade (Mage)",
     "winter2022IceCrystalHealerSet": "Cristal de glace (Guérisseur)",
-    "januaryYYYY": "Janvier <%= year %>"
+    "januaryYYYY": "Janvier <%= year %>",
+    "spring2022MagpieRogueSet": "Pie (Voleur)",
+    "spring2022RainstormWarriorSet": "Flot diluvien (Guerrier)",
+    "spring2022ForsythiaMageSet": "Forsythia (Mage)",
+    "spring2022PeridotHealerSet": "Péridot (Guérisseur)"
 }

website/common/locales/fr/questscontent.json

@@ -174,7 +174,7 @@
     "questStressbeastDropMammothPet": "Mammouth (Familier)",
     "questStressbeastDropMammothMount": "Mammouth (Monture)",
     "questStressbeastBossRageStables": "`L'Abominable monstressé lance Coup de stress !`\n\nLa soudaine poussée de stress guérit l'abominable bête de stress !\n\nOh non ! Malgré tous nos efforts, nous avons laissé des Quotidiennes nous échapper, et leur couleur rouge sombre a rendu furieux l'Abominable monstressé, lui permettant de recouvrer une partie de sa force ! L'horrible créature se précipite vers l'écurie, mais Matt le Maître des bêtes s'interpose héroïquement pour protéger les familiers et les montures. Le monstressé saisit Matt de sa terrible poigne, mais cela l'a temporairement distrait. Dépêchez-vous ! Reprenez le contrôle de vos Quotidiennes et terrassez ce monstre avant qu'il attaque à nouveau !",
-    "questStressbeastBossRageBailey": "`L'Abominable monstressé lance Coup de stress !`\n\nLa soudaine poussée de stress guérit l'Abominable monstressé !\n\nAhh ! !! Nos Quotidiennes incomplètes ont rendu l'Abominable monstressé plus fou que jamais et lui font regagner une partie de sa force. Bailey la crieuse publique était en train de crier aux citoyens de s'abriter, et maintenant, le monstre la tient dans son autre main ! Regardez-la, continuant à nous donner les informations, alors que la bête de stress la secoue sauvagement ... Soyons dignes de son courage en étant aussi productifs que possible pour sauver nos PNJ !",
+    "questStressbeastBossRageBailey": "`L'Abominable monstressé lance Coup de stress !`\n\nLa soudaine poussée de stress guérit l'Abominable monstressé !\n\nAhh ! ! ! Nos Quotidiennes incomplètes ont rendu l'Abominable monstressé plus fou que jamais et lui font regagner une partie de sa force. Bailey la crieuse publique était en train de crier aux citoyens de s'abriter, et maintenant, le monstre la tient dans son autre main ! Regardez-la, continuant à nous donner les informations, alors que la bête de stress la secoue sauvagement ... Soyons dignes de son courage en étant aussi productifs que possible pour sauver nos PNJ !",
     "questStressbeastBossRageGuide": "`L'Abominable monstressé lance Coup de stress !`\n\nLa soudaine poussée de stress guérit l'Abominable monstressé !\n\nFaites attention ! Justin le Guide essaye de distraire le monstressé en courant entre ses chevilles et en criant des astuces de productivité ! L'Abominable monstressé essaye violemment de le piétiner, mais il semble que nous l'ayons réellement épuisé. Je doute qu'il ait assez d'énergie pour une nouvelle attaque. N'abandonnez pas ... Nous sommes sur le point de le mettre à bas !",
     "questStressbeastDesperation": "`L'Abominable monstressé est maintenant à 500K de santé ! L'Abominable monstressé lance Défense désespérée !`\n\nNous y sommes presque, Habiticiennes et Habiticiens ! Avec de l'assiduité et nos Quotidiennes, nous avons réduit la santé du Monstressé à seulement 500K ! La créature rugit et s'agite, pleine de désespoir, sa colère grandissant plus vite que jamais. Bailey et Matt crient de terreur lorsqu'elle commence à secouer les bras à un rythme effréné, faisant apparaître une aveuglante tempête de neige qui la rend plus difficile à toucher.\n\nNous devrons redoubler d'efforts, mais réjouissez-vous, car c'est un signe que le monstressé sait qu'il est sur le point d'être battu. N'abandonnez pas maintenant !",
     "questStressbeastCompletion": "<strong>L'Abominable monstressé est VAINCU !</strong><br><br>Nous avons réussi ! D'un dernier coup, l'Abominable monstressé se dissipe en un nuage de neige. Les flocons scintillent dans l'air alors que les Habiticiens réjouis étreignent leurs familiers et leurs montures. Nos animaux et nos PNJ sont sains et saufs encore une fois !<br><br><strong>Stoïcalme est sauvé !</strong><br><br>SabreCat dit doucement à un petit tigre à dents de sabre : \"S'il te plait, trouve les citoyens des steppes stoïcalmes et amène-les nous\". Plusieurs heures plus tard, le tigre à dents de sabre revient, avec une meute de chevaucheurs de mammouth à sa suite. Vous reconnaissez le chevaucheur de tête comme étant Dame Givre, dirigeante de Stoïcalme.<br><br>\"Puissants Habiticiens,\" dit-elle, \"Mes citoyens et moi-même vous devons nos plus profonds remerciements, et nos plus sincères excuses. Dans un effort pour protéger nos steppes de la tourmente, nous avons commencé à bannir secrètement tout notre stress dans les montagnes glacées. Nous ne pouvions imaginer qu'il s'accumulerait pendant des générations pour donner naissance au monstressé que vous avez combattu ! Quand il s'est libéré, il nous a enfermé dans les montagnes à sa place, et s'est déchaîné contre nos animaux bien-aimés.\" Son regard triste tombe comme la neige. \"Notre folie a mis tout le monde en danger. Soyez assurés qu'à partir d'aujourd'hui, nous viendrons vous présenter nos problèmes avant que nos problèmes ne vous trouvent.\"<br><br>Elle se tourne vers @Baconsaur qui se pelotonne contre les jeunes mammouths. \"Nous avons apporté à vos animaux une offrande de nourriture, en guise d'excuse pour les avoir effrayés, et comme symbole de confiance, nous vous donnons la garde de certains de nos familiers et de nos montures. Nous savons que vous en prendrez grand soin.\"",
@@ -602,7 +602,7 @@
     "questSquirrelDropSquirrelEgg": "Écureuil (œuf)",
     "questSquirrelUnlockText": "Déverrouille l'achat d'œufs d’écureuils au marché",
     "cuddleBuddiesText": "Lot de quêtes des acolytes à câlins",
-    "cuddleBuddiesNotes": "Contient \"Le lapin tueur\", \"L'abominable furet\", et \"Le gang des cochons d'Inde\". Disponible jusqu'au 31 mai.",
+    "cuddleBuddiesNotes": "Contient \"Le lapin tueur\", \"L'abominable furet\", et \"Le gang des cochons d'Inde\". Disponible jusqu'au 31 mars.",
     "aquaticAmigosText": "Lot de quêtes des amis aquatiques",
     "aquaticAmigosNotes": "Contient “L’axototl magique”, “Le kraken d’Inkomplet”, et “L’appel d’Octothulu”. Disponible jusqu’au 31 août.",
     "questSeaSerpentText": "Danger dans les profondeurs : L’attaque du serpent de mer !",

website/common/locales/fr/settings.json

@@ -189,5 +189,26 @@
     "everywhere": "Partout",
     "suggestMyUsername": "Suggérer mon identifiant",
     "mentioning": "Mentions",
-    "bannedWordUsedInProfile": "Votre pseudo ou votre texte de présentation contenait un langage inapproprié."
+    "bannedWordUsedInProfile": "Votre pseudo ou votre texte de présentation contenait un langage inapproprié.",
+    "transaction_create_guild": "Créé une guilde",
+    "transaction_subscription_perks": "De bonus d'abonnement",
+    "noHourglassTransactions": "Vous n'avez aucune transaction de sablier mystique pour l'instant.",
+    "transaction_debug": "Action de debug",
+    "transaction_buy_money": "Acheté avec de l'argent",
+    "transaction_buy_gold": "Acheté avec de l'or",
+    "transaction_contribution": "Via une contribution",
+    "transaction_spend": "Dépensé pour",
+    "transaction_release_mounts": "Libéré les montures",
+    "transaction_reroll": "Utilisé une potion de fortification",
+    "transactions": "Transactions",
+    "gemTransactions": "Transactions de gemmes",
+    "hourglassTransactions": "Transactions de sabliers mystiques",
+    "noGemTransactions": "Vous n'avez aucune transaction de gemmes pour l'instant.",
+    "transaction_gift_send": "Offert à",
+    "transaction_gift_receive": "Reçu de",
+    "transaction_create_challenge": "Créé un défi",
+    "transaction_change_class": "Changé de classe",
+    "transaction_rebirth": "Utilisé l'orbe de résurrection",
+    "transaction_release_pets": "Libéré les familiers",
+    "addPasswordAuth": "Ajouter le mot de passe"
 }

website/common/locales/fr/subscriber.json

@@ -200,5 +200,8 @@
     "mysterySet202110": "Ensemble de la gargouille moussue",
     "mysterySet202111": "Ensemble de chronomancien cosmique",
     "mysterySet202112": "Ensemble d'ondine antarctique",
-    "mysterySet202201": "Ensemble de gaieté de cœur de minuit"
+    "mysterySet202201": "Ensemble de gaieté de cœur de minuit",
+    "mysterySet202202": "Ensemble de queues jumelles turquoise",
+    "mysterySet202203": "Ensemble de libellule intrépide",
+    "mysterySet202204": "Ensemble d'aventure virtuelle"
 }

website/common/locales/gl/achievements.json

@@ -1,6 +1,6 @@
 {
-    "achievement": "Achievement",
+    "achievement": "Logro",
-    "onwards": "Onwards!",
+    "onwards": "Adiante!",
     "levelup": "By accomplishing your real life goals, you leveled up and are now fully healed!",
     "reachedLevel": "You Reached Level <%= level %>",
     "achievementLostMasterclasser": "Quest Completionist: Masterclasser Series",

website/common/locales/he/achievements.json

@@ -3,8 +3,8 @@
     "onwards": "הלאה!",
     "levelup": "על ידי ביצוע משימות מחייך האמיתיים, עלית רמה והחיים שלך עכשיו מלאים!",
     "reachedLevel": "הגעת לשלב <%= level %>",
-    "achievementLostMasterclasser": "Quest Completionist: Masterclasser Series",
+    "achievementLostMasterclasser": "",
-    "achievementLostMasterclasserText": "Completed all sixteen quests in the Masterclasser Quest Series and solved the mystery of the Lost Masterclasser!",
+    "achievementLostMasterclasserText": "",
     "viewAchievements": "הצגת ההישגים",
     "letsGetStarted": "בואו נתחיל!",
     "yourProgress": "ההתקדמות שלך",
@@ -78,5 +78,16 @@
     "achievementGoodAsGoldText": "אסף את כל החיות הזהב",
     "achievementSeasonalSpecialistModalText": "השלמת את כל המשימות העונתיות!",
     "achievementShadyCustomer": "לקוח חשוד",
-    "achievementShadeOfItAll": "הצל של הכל"
+    "achievementShadeOfItAll": "הצל של הכל",
+    "achievementSeeingRedModalText": "אספת את כל חיות המחמד האדומות!",
+    "achievementGoodAsGoldModalText": "אספת את כל חיות המחמד המוזהבות!",
+    "achievementRedLetterDayText": "אולפו כל חיות הרכיבה האדומות.",
+    "achievementAllThatGlittersText": "אולפו כל חיות הרכיבה המוזהבות.",
+    "achievementBoneCollectorModalText": "אספת את כל חיות המחמד מסוג שלד!",
+    "achievementSeeingRedText": "נאספו כל חיות המחמד האדומות.",
+    "achievementAllThatGlittersModalText": "אילפת את כל חיות הרכיבה המוזהבות!",
+    "achievementSkeletonCrewModalText": "אילפת את כל חיות הרכיבה מסוג שלד!",
+    "achievementBoneCollectorText": "נאספו כל חיות המחמד מסוג שלד.",
+    "achievementRedLetterDayModalText": "אילפת את כל חיות הרכיבה האדומות!",
+    "achievementSkeletonCrewText": "אולפו כל חיות הרכיבה מסוג שלד."
 }

website/common/locales/he/backgrounds.json

@@ -202,145 +202,145 @@
     "backgroundOrchardNotes": "קטפו פירות טריים בפרדס.",
     "backgrounds102016": "סט 29: פורסם באוקטובר 2016",
     "backgroundSpiderWebText": "קורי עכביש",
-    "backgroundSpiderWebNotes": "Get snagged in a Spider Web.",
+    "backgroundSpiderWebNotes": "",
     "backgroundStrangeSewersText": "ביובים משונים",
     "backgroundStrangeSewersNotes": "זחול דרך ביובים משונים",
     "backgroundRainyCityText": "עיר גשומה",
-    "backgroundRainyCityNotes": "Splash through a Rainy City.",
+    "backgroundRainyCityNotes": "",
-    "backgrounds112016": "SET 30: Released November 2016",
+    "backgrounds112016": "",
     "backgroundMidnightCloudsText": "ענני חצות הלילה",
     "backgroundMidnightCloudsNotes": "עוף דרך ענני חצות הלילה",
     "backgroundStormyRooftopsText": "גגות סוערות",
-    "backgroundStormyRooftopsNotes": "Creep across Stormy Rooftops.",
+    "backgroundStormyRooftopsNotes": "",
-    "backgroundWindyAutumnText": "Windy Autumn",
+    "backgroundWindyAutumnText": "",
-    "backgroundWindyAutumnNotes": "Chase leaves during a Windy Autumn.",
+    "backgroundWindyAutumnNotes": "",
-    "incentiveBackgrounds": "Plain Background Set",
+    "incentiveBackgrounds": "",
     "backgroundVioletText": "סגול בהיר",
-    "backgroundVioletNotes": "A vibrant violet backdrop.",
+    "backgroundVioletNotes": "",
     "backgroundBlueText": "כחול",
     "backgroundBlueNotes": "רקע כחול בסיסי.",
     "backgroundGreenText": "ירוק",
-    "backgroundGreenNotes": "A great green backdrop.",
+    "backgroundGreenNotes": "",
     "backgroundPurpleText": "סגול",
-    "backgroundPurpleNotes": "A pleasant purple backdrop.",
+    "backgroundPurpleNotes": "",
     "backgroundRedText": "אדום",
-    "backgroundRedNotes": "A rad red backdrop.",
+    "backgroundRedNotes": "",
     "backgroundYellowText": "צהוב",
     "backgroundYellowNotes": "A yummy yellow backdrop.",
     "backgrounds122016": "סט 31: פורסם בדצמבר 2016",
-    "backgroundShimmeringIcePrismText": "Shimmering Ice Prisms",
+    "backgroundShimmeringIcePrismText": "",
-    "backgroundShimmeringIcePrismNotes": "Dance through the Shimmering Ice Prisms.",
+    "backgroundShimmeringIcePrismNotes": "",
     "backgroundWinterFireworksText": "זיקוקי חורף",
-    "backgroundWinterFireworksNotes": "Set off Winter Fireworks.",
+    "backgroundWinterFireworksNotes": "",
     "backgroundWinterStorefrontText": "חנות חורף",
-    "backgroundWinterStorefrontNotes": "Purchase presents from a Winter Shop.",
+    "backgroundWinterStorefrontNotes": "",
-    "backgrounds012017": "SET 32: Released January 2017",
+    "backgrounds012017": "",
     "backgroundBlizzardText": "סופה",
-    "backgroundBlizzardNotes": "Brave a fierce Blizzard.",
+    "backgroundBlizzardNotes": "",
-    "backgroundSparklingSnowflakeText": "Sparkling Snowflake",
+    "backgroundSparklingSnowflakeText": "",
-    "backgroundSparklingSnowflakeNotes": "Glide on a Sparkling Snowflake.",
+    "backgroundSparklingSnowflakeNotes": "",
-    "backgroundStoikalmVolcanoesText": "Stoïkalm Volcanoes",
+    "backgroundStoikalmVolcanoesText": "",
-    "backgroundStoikalmVolcanoesNotes": "Explore the Stoïkalm Volcanoes.",
+    "backgroundStoikalmVolcanoesNotes": "",
-    "backgrounds022017": "SET 33: Released February 2017",
+    "backgrounds022017": "",
-    "backgroundBellTowerText": "Bell Tower",
+    "backgroundBellTowerText": "",
-    "backgroundBellTowerNotes": "Climb to the Bell Tower.",
+    "backgroundBellTowerNotes": "",
     "backgroundTreasureRoomText": "חדר האוצרות",
-    "backgroundTreasureRoomNotes": "Bask in the wealth of a Treasure Room.",
+    "backgroundTreasureRoomNotes": "",
-    "backgroundWeddingArchText": "Wedding Arch",
+    "backgroundWeddingArchText": "",
-    "backgroundWeddingArchNotes": "Pose under the Wedding Arch.",
+    "backgroundWeddingArchNotes": "",
-    "backgrounds032017": "SET 34: Released March 2017",
+    "backgrounds032017": "",
-    "backgroundMagicBeanstalkText": "Magic Beanstalk",
+    "backgroundMagicBeanstalkText": "",
-    "backgroundMagicBeanstalkNotes": "Ascend a Magic Beanstalk.",
+    "backgroundMagicBeanstalkNotes": "",
-    "backgroundMeanderingCaveText": "Meandering Cave",
+    "backgroundMeanderingCaveText": "",
-    "backgroundMeanderingCaveNotes": "Explore the Meandering Cave.",
+    "backgroundMeanderingCaveNotes": "",
-    "backgroundMistiflyingCircusText": "Mistiflying Circus",
+    "backgroundMistiflyingCircusText": "",
-    "backgroundMistiflyingCircusNotes": "Carouse in the Mistiflying Circus.",
+    "backgroundMistiflyingCircusNotes": "",
-    "backgrounds042017": "SET 35: Released April 2017",
+    "backgrounds042017": "",
-    "backgroundBugCoveredLogText": "Bug-Covered Log",
+    "backgroundBugCoveredLogText": "",
-    "backgroundBugCoveredLogNotes": "Investigate a Bug-Covered Log.",
+    "backgroundBugCoveredLogNotes": "",
-    "backgroundGiantBirdhouseText": "Giant Birdhouse",
+    "backgroundGiantBirdhouseText": "",
-    "backgroundGiantBirdhouseNotes": "Perch in a Giant Birdhouse.",
+    "backgroundGiantBirdhouseNotes": "",
-    "backgroundMistShroudedMountainText": "Mist-Shrouded Mountain",
+    "backgroundMistShroudedMountainText": "",
-    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain.",
+    "backgroundMistShroudedMountainNotes": "",
-    "backgrounds052017": "SET 36: Released May 2017",
+    "backgrounds052017": "",
-    "backgroundGuardianStatuesText": "Guardian Statues",
+    "backgroundGuardianStatuesText": "",
-    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
+    "backgroundGuardianStatuesNotes": "",
-    "backgroundHabitCityStreetsText": "Habit City Streets",
+    "backgroundHabitCityStreetsText": "",
-    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
+    "backgroundHabitCityStreetsNotes": "",
-    "backgroundOnATreeBranchText": "On a Tree Branch",
+    "backgroundOnATreeBranchText": "",
-    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch.",
+    "backgroundOnATreeBranchNotes": "",
-    "backgrounds062017": "SET 37: Released June 2017",
+    "backgrounds062017": "",
     "backgroundBuriedTreasureText": "אוצר קבור",
-    "backgroundBuriedTreasureNotes": "Unearth Buried Treasure.",
+    "backgroundBuriedTreasureNotes": "",
-    "backgroundOceanSunriseText": "Ocean Sunrise",
+    "backgroundOceanSunriseText": "",
-    "backgroundOceanSunriseNotes": "Admire an Ocean Sunrise.",
+    "backgroundOceanSunriseNotes": "",
     "backgroundSandcastleText": "ארמון חול",
-    "backgroundSandcastleNotes": "Rule over a Sandcastle.",
+    "backgroundSandcastleNotes": "",
     "backgrounds072017": "SET 38: Released July 2017",
-    "backgroundGiantSeashellText": "Giant Seashell",
+    "backgroundGiantSeashellText": "",
-    "backgroundGiantSeashellNotes": "Lounge in a Giant Seashell.",
+    "backgroundGiantSeashellNotes": "",
-    "backgroundKelpForestText": "Kelp Forest",
+    "backgroundKelpForestText": "יער האצות",
-    "backgroundKelpForestNotes": "Swim through a Kelp Forest.",
+    "backgroundKelpForestNotes": "שחייה ביער האצות.",
-    "backgroundMidnightLakeText": "Midnight Lake",
+    "backgroundMidnightLakeText": "",
-    "backgroundMidnightLakeNotes": "Rest by a Midnight Lake.",
+    "backgroundMidnightLakeNotes": "",
-    "backgrounds082017": "SET 39: Released August 2017",
+    "backgrounds082017": "",
-    "backgroundBackOfGiantBeastText": "Back of a Giant Beast",
+    "backgroundBackOfGiantBeastText": "",
-    "backgroundBackOfGiantBeastNotes": "Ride on the Back of a Giant Beast.",
+    "backgroundBackOfGiantBeastNotes": "",
     "backgroundDesertDunesText": "דיונות מדבר",
-    "backgroundDesertDunesNotes": "Boldly explore the Desert Dunes.",
+    "backgroundDesertDunesNotes": "",
     "backgroundSummerFireworksText": "זיקוקי קיץ",
-    "backgroundSummerFireworksNotes": "Celebrate Habitica's Naming Day with Summer Fireworks!",
+    "backgroundSummerFireworksNotes": "",
-    "backgrounds092017": "SET 40: Released September 2017",
+    "backgrounds092017": "",
-    "backgroundBesideWellText": "Beside a Well",
+    "backgroundBesideWellText": "",
-    "backgroundBesideWellNotes": "Stroll Beside a Well.",
+    "backgroundBesideWellNotes": "",
-    "backgroundGardenShedText": "Garden Shed",
+    "backgroundGardenShedText": "",
-    "backgroundGardenShedNotes": "Work in a Garden Shed.",
+    "backgroundGardenShedNotes": "",
-    "backgroundPixelistsWorkshopText": "Pixelist's Workshop",
+    "backgroundPixelistsWorkshopText": "",
-    "backgroundPixelistsWorkshopNotes": "Create masterpieces in the Pixelist's Workshop.",
+    "backgroundPixelistsWorkshopNotes": "",
-    "backgrounds102017": "SET 41: Released October 2017",
+    "backgrounds102017": "",
-    "backgroundMagicalCandlesText": "Magical Candles",
+    "backgroundMagicalCandlesText": "נרות קסומים",
     "backgroundMagicalCandlesNotes": "Bask in the glow of Magical Candles.",
-    "backgroundSpookyHotelText": "Spooky Hotel",
+    "backgroundSpookyHotelText": "מלון מפחיד",
     "backgroundSpookyHotelNotes": "Sneak down the hall of a Spooky Hotel.",
-    "backgroundTarPitsText": "Tar Pits",
+    "backgroundTarPitsText": "",
-    "backgroundTarPitsNotes": "Tiptoe through the Tar Pits.",
+    "backgroundTarPitsNotes": "",
-    "backgrounds112017": "SET 42: Released November 2017",
+    "backgrounds112017": "",
-    "backgroundFiberArtsRoomText": "Fiber Arts Room",
+    "backgroundFiberArtsRoomText": "",
-    "backgroundFiberArtsRoomNotes": "Spin thread in a Fiber Arts Room.",
+    "backgroundFiberArtsRoomNotes": "",
-    "backgroundMidnightCastleText": "Midnight Castle",
+    "backgroundMidnightCastleText": "",
-    "backgroundMidnightCastleNotes": "Stroll by the Midnight Castle.",
+    "backgroundMidnightCastleNotes": "",
     "backgroundTornadoText": "טורנדו",
     "backgroundTornadoNotes": "עוף דרך טורנדו.",
     "backgrounds122017": "סט 43: שוחרר בדצמבר 2017",
-    "backgroundCrosscountrySkiTrailText": "Cross-Country Ski Trail",
+    "backgroundCrosscountrySkiTrailText": "",
-    "backgroundCrosscountrySkiTrailNotes": "Glide along a Cross-Country Ski Trail.",
+    "backgroundCrosscountrySkiTrailNotes": "",
-    "backgroundStarryWinterNightText": "Starry Winter Night",
+    "backgroundStarryWinterNightText": "",
-    "backgroundStarryWinterNightNotes": "Admire a Starry Winter Night.",
+    "backgroundStarryWinterNightNotes": "",
-    "backgroundToymakersWorkshopText": "Toymaker's Workshop",
+    "backgroundToymakersWorkshopText": "",
-    "backgroundToymakersWorkshopNotes": "Bask in the wonder of a Toymaker's Workshop.",
+    "backgroundToymakersWorkshopNotes": "",
     "backgrounds012018": "סט 44: שוחרר בינואר 2018",
     "backgroundAuroraText": "Aurora",
-    "backgroundAuroraNotes": "Bask in the wintry glow of an Aurora.",
+    "backgroundAuroraNotes": "",
-    "backgroundDrivingASleighText": "Sleigh",
+    "backgroundDrivingASleighText": "",
-    "backgroundDrivingASleighNotes": "Drive a Sleigh over snow-covered fields.",
+    "backgroundDrivingASleighNotes": "",
-    "backgroundFlyingOverIcySteppesText": "Icy Steppes",
+    "backgroundFlyingOverIcySteppesText": "",
-    "backgroundFlyingOverIcySteppesNotes": "Fly over Icy Steppes.",
+    "backgroundFlyingOverIcySteppesNotes": "",
     "backgrounds022018": "סט 45: שוחרר בפברואר 2018",
-    "backgroundChessboardLandText": "Chessboard Land",
+    "backgroundChessboardLandText": "",
-    "backgroundChessboardLandNotes": "Play a game in Chessboard Land.",
+    "backgroundChessboardLandNotes": "",
     "backgroundMagicalMuseumText": "מוזיאן קסום",
-    "backgroundMagicalMuseumNotes": "Tour a Magical Museum.",
+    "backgroundMagicalMuseumNotes": "",
-    "backgroundRoseGardenText": "Rose Garden",
+    "backgroundRoseGardenText": "גן הוורדים",
-    "backgroundRoseGardenNotes": "Dally in a fragrant Rose Garden.",
+    "backgroundRoseGardenNotes": "",
-    "backgrounds032018": "SET 46: Released March 2018",
+    "backgrounds032018": "",
-    "backgroundGorgeousGreenhouseText": "Gorgeous Greenhouse",
+    "backgroundGorgeousGreenhouseText": "",
     "backgroundGorgeousGreenhouseNotes": "Walk among the flora kept in a Gorgeous Greenhouse.",
-    "backgroundElegantBalconyText": "Elegant Balcony",
+    "backgroundElegantBalconyText": "",
-    "backgroundElegantBalconyNotes": "Look out over the landscape from an Elegant Balcony.",
+    "backgroundElegantBalconyNotes": "",
     "backgroundDrivingACoachText": "Driving a Coach",
-    "backgroundDrivingACoachNotes": "Enjoy Driving a Coach past fields of flowers.",
+    "backgroundDrivingACoachNotes": "",
-    "backgrounds042018": "SET 47: Released April 2018",
+    "backgrounds042018": "",
-    "backgroundTulipGardenText": "Tulip Garden",
+    "backgroundTulipGardenText": "גן הצבעונים",
     "backgroundTulipGardenNotes": "Tiptoe through a Tulip Garden.",
     "backgroundFlyingOverWildflowerFieldText": "Field of Wildflowers",
     "backgroundFlyingOverWildflowerFieldNotes": "Soar above a Field of Wildflowers.",
@@ -349,66 +349,66 @@
     "backgrounds052018": "SET 48: Released May 2018",
     "backgroundTerracedRiceFieldText": "Terraced Rice Field",
     "backgroundTerracedRiceFieldNotes": "Enjoy a Terraced Rice Field in the growing season.",
-    "backgroundFantasticalShoeStoreText": "Fantastical Shoe Store",
+    "backgroundFantasticalShoeStoreText": "",
-    "backgroundFantasticalShoeStoreNotes": "Look for fun new footwear in the Fantastical Shoe Store.",
+    "backgroundFantasticalShoeStoreNotes": "",
-    "backgroundChampionsColosseumText": "Champions' Colosseum",
+    "backgroundChampionsColosseumText": "",
-    "backgroundChampionsColosseumNotes": "Bask in the glory of the Champions' Colosseum.",
+    "backgroundChampionsColosseumNotes": "",
-    "backgrounds062018": "SET 49: Released June 2018",
+    "backgrounds062018": "",
-    "backgroundDocksText": "Docks",
+    "backgroundDocksText": "",
-    "backgroundDocksNotes": "Fish from atop the Docks.",
+    "backgroundDocksNotes": "",
-    "backgroundRowboatText": "Rowboat",
+    "backgroundRowboatText": "",
-    "backgroundRowboatNotes": "Sing rounds in a Rowboat.",
+    "backgroundRowboatNotes": "",
     "backgroundPirateFlagText": "דגל שודדי ים",
-    "backgroundPirateFlagNotes": "Fly a fearsome Pirate Flag.",
+    "backgroundPirateFlagNotes": "",
-    "backgrounds072018": "SET 50: Released July 2018",
+    "backgrounds072018": "",
-    "backgroundDarkDeepText": "Dark Deep",
+    "backgroundDarkDeepText": "עמוק בחשכה",
-    "backgroundDarkDeepNotes": "Swim in the Dark Deep among bioluminescent critters.",
+    "backgroundDarkDeepNotes": "",
-    "backgroundDilatoryCityText": "City of Dilatory",
+    "backgroundDilatoryCityText": "",
-    "backgroundDilatoryCityNotes": "Meander through the undersea City of Dilatory.",
+    "backgroundDilatoryCityNotes": "",
-    "backgroundTidePoolText": "Tide Pool",
+    "backgroundTidePoolText": "",
     "backgroundTidePoolNotes": "Observe the ocean life near a Tide Pool.",
     "backgrounds082018": "SET 51: Released August 2018",
-    "backgroundTrainingGroundsText": "Training Grounds",
+    "backgroundTrainingGroundsText": "",
-    "backgroundTrainingGroundsNotes": "Spar on the Training Grounds.",
+    "backgroundTrainingGroundsNotes": "",
     "backgroundFlyingOverRockyCanyonText": "Rocky Canyon",
-    "backgroundFlyingOverRockyCanyonNotes": "Look down into a breathtaking scene as you fly over a Rocky Canyon.",
+    "backgroundFlyingOverRockyCanyonNotes": "",
-    "backgroundBridgeText": "Bridge",
+    "backgroundBridgeText": "גשר",
-    "backgroundBridgeNotes": "Cross a charming Bridge.",
+    "backgroundBridgeNotes": "",
-    "backgrounds092018": "SET 52: Released September 2018",
+    "backgrounds092018": "",
     "backgroundApplePickingText": "Apple Picking",
-    "backgroundApplePickingNotes": "Go Apple Picking and bring home a bushel.",
+    "backgroundApplePickingNotes": "",
-    "backgroundGiantBookText": "Giant Book",
+    "backgroundGiantBookText": "",
-    "backgroundGiantBookNotes": "Read as you walk through the pages of a Giant Book.",
+    "backgroundGiantBookNotes": "",
-    "backgroundCozyBarnText": "Cozy Barn",
+    "backgroundCozyBarnText": "",
     "backgroundCozyBarnNotes": "Relax with your pets and mounts in their Cozy Barn.",
     "backgrounds102018": "SET 53: Released October 2018",
     "backgroundBayouText": "Bayou",
     "backgroundBayouNotes": "Bask in the fireflies' glow on the misty Bayou.",
     "backgroundCreepyCastleText": "Creepy Castle",
     "backgroundCreepyCastleNotes": "Dare to approach a Creepy Castle.",
-    "backgroundDungeonText": "Dungeon",
+    "backgroundDungeonText": "מבוך",
     "backgroundDungeonNotes": "Rescue the prisoners of a spooky Dungeon.",
     "backgrounds112018": "SET 54: Released November 2018",
-    "backgroundBackAlleyText": "Back Alley",
+    "backgroundBackAlleyText": "",
-    "backgroundBackAlleyNotes": "Look shady loitering in a Back Alley.",
+    "backgroundBackAlleyNotes": "",
     "backgroundGlowingMushroomCaveText": "Glowing Mushroom Cave",
-    "backgroundGlowingMushroomCaveNotes": "Stare in awe at a Glowing Mushroom Cave.",
+    "backgroundGlowingMushroomCaveNotes": "",
-    "backgroundCozyBedroomText": "Cozy Bedroom",
+    "backgroundCozyBedroomText": "",
-    "backgroundCozyBedroomNotes": "Curl up in a Cozy Bedroom.",
+    "backgroundCozyBedroomNotes": "",
     "backgrounds122018": "SET 55: Released December 2018",
-    "backgroundFlyingOverSnowyMountainsText": "Snowy Mountains",
+    "backgroundFlyingOverSnowyMountainsText": "הרים מושלגים",
-    "backgroundFlyingOverSnowyMountainsNotes": "Soar over Snowy Mountains at night.",
+    "backgroundFlyingOverSnowyMountainsNotes": "",
-    "backgroundFrostyForestText": "Frosty Forest",
+    "backgroundFrostyForestText": "",
-    "backgroundFrostyForestNotes": "Bundle up to hike through a Frosty Forest.",
+    "backgroundFrostyForestNotes": "",
-    "backgroundSnowyDayFireplaceText": "Snowy Day Fireplace",
+    "backgroundSnowyDayFireplaceText": "",
-    "backgroundSnowyDayFireplaceNotes": "Snuggle up next to a Fireplace on a Snowy Day.",
+    "backgroundSnowyDayFireplaceNotes": "",
-    "backgrounds012019": "SET 56: Released January 2019",
+    "backgrounds012019": "",
-    "backgroundAvalancheText": "Avalanche",
+    "backgroundAvalancheText": "",
-    "backgroundAvalancheNotes": "Flee the thundering might of an Avalanche.",
+    "backgroundAvalancheNotes": "",
-    "backgroundArchaeologicalDigText": "Archaeological Dig",
+    "backgroundArchaeologicalDigText": "",
-    "backgroundArchaeologicalDigNotes": "Unearth secrets of the ancient past at an Archaeological Dig.",
+    "backgroundArchaeologicalDigNotes": "",
-    "backgroundScribesWorkshopText": "Scribe's Workshop",
+    "backgroundScribesWorkshopText": "",
-    "backgroundScribesWorkshopNotes": "Write your next great scroll in a Scribe's Workshop.",
+    "backgroundScribesWorkshopNotes": "",
     "backgrounds022019": "סט 57: שוחרר בפבואר 2019",
     "backgroundMedievalKitchenText": "מטבח ימי הבניים",
     "backgroundMedievalKitchenNotes": "מבשלים סערה במטבח מימי הביניים.",

website/common/locales/he/challenge.json

@@ -64,12 +64,12 @@
     "noChallengeTitle": "אין לך שום אתגרים.",
     "challengeDescription1": "אתגרים הם אירועים של הקהילה בהם שחקנים מתחרים וזוכים בפרסים על ידי השלמת קבוצה של מטלות הקשורות זו לזו.",
     "challengeDescription2": "מצא אתגרים מומלצים לך לפי תחומי העניין שלך, חפש אתגרים פומביים של הביטיקה, או תיצור אתגרים משלך.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "",
     "createdBy": "נוצר על ידי",
     "joinChallenge": "הצטרף לאתגר",
-    "leaveChallenge": "עזוב את האתגר",
+    "leaveChallenge": "עזיבת האתגר",
     "addTask": "הוסף משימה",
-    "editChallenge": "ערוך אתגר",
+    "editChallenge": "עריכת אתגר",
     "challengeDescription": "תיאור האתגר",
     "selectChallengeWinnersDescription": "בחר מנצח ממשתתפי האתגר",
     "awardWinners": "זוכה הפרס",
@@ -88,7 +88,7 @@
     "haveNoChallenges": "לקבוצה זו אין אתגרים",
     "loadMore": "טען עוד",
     "exportChallengeCsv": "ייצא אתגר",
-    "editingChallenge": "Editing Challenge",
+    "editingChallenge": "עריכת האתגר",
     "nameRequired": "שם דרוש",
     "tagTooShort": "תג השם קצר מדי",
     "summaryRequired": "סיכום דרוש",
@@ -100,5 +100,9 @@
     "viewProgress": "ראה התקדמות",
     "selectMember": "בחר משתתף",
     "confirmKeepChallengeTasks": "לשמור את מטלות האתגר?",
-    "selectParticipant": "בחר משתתף"
+    "selectParticipant": "בחר משתתף",
+    "yourReward": "הפרס שלך",
+    "filters": "סינון",
+    "wonChallengeDesc": "ניצחת באתגר \"<%= challengeName %>\"! הניצחון שלך נרשם בהישגים שלך.",
+    "removeTasks": "הסרת המשימות"
 }

website/common/locales/he/character.json

@@ -1,5 +1,5 @@
 {
-    "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the <a href='https://habitica.com/static/community-guidelines' target='_blank'>Community Guidelines</a> (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email <%= hrefBlankCommunityManagerEmail %>!",
+    "communityGuidelinesWarning": "",
     "profile": "פרופיל",
     "avatar": "התאמת הדמות",
     "editAvatar": "עריכת הדמות",
@@ -31,13 +31,13 @@
     "glasses": "משקפיים",
     "hairSet1": "סדרת תסרוקות 1",
     "hairSet2": "סדרת תסרוקות 2",
-    "hairSet3": "Hairstyle Set 3",
+    "hairSet3": "",
     "bodyFacialHair": "שיער פנים",
     "beard": "זקן",
     "mustache": "שפם",
     "flower": "פרח",
-    "accent": "Accent",
+    "accent": "",
-    "headband": "Headband",
+    "headband": "",
     "wheelchair": "כיסא גלגלים",
     "extra": "אקסטרה",
     "rainbowSkins": "עורות בצבעי הקשת",
@@ -45,7 +45,7 @@
     "spookySkins": "עורות מפחידים",
     "supernaturalSkins": "צבעי עור על-טבעיים",
     "splashySkins": "עורות ימיים",
-    "winterySkins": "Wintery Skins",
+    "winterySkins": "",
     "rainbowColors": "צבעי הקשת",
     "shimmerColors": "צבעים מנצנצים",
     "hauntedColors": "צבעים רדופי-רוחות",
@@ -58,7 +58,7 @@
     "autoEquipBattleGear": "הצטייד בציוד חדש אוטומטית",
     "costume": "תחפושת",
     "useCostume": "שימוש בתחפושת",
-    "costumePopoverText": "Select \"Use Costume\" to equip items to your avatar without affecting the Stats from your Battle Gear! This means that you can dress up your avatar in whatever outfit you like while still having your best Battle Gear equipped.",
+    "costumePopoverText": "",
     "autoEquipPopoverText": "בחרו באופציה זו על מנת ללבוש באופן אוטומטי ציוד ברגע שאתם קונים אותו.",
     "costumeDisabled": "הסרת את התחפושת שלך.",
     "gearAchievement": "הרווחת את תג ״הציוד המקסימלי״ על השגת הציוד הטוב ביותר למקצועות הבאים:",
@@ -89,7 +89,7 @@
     "stats": "נתונים",
     "achievs": "הישגים",
     "strength": "כוח",
-    "strText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",
+    "strText": "",
     "constitution": "חוסן",
     "conText": "חוסן מקטין את כמות הנזק שאתה חוטף מהרגלים רעים או מטלות יומיות שהזנחת.",
     "perception": "תפיסה",
@@ -107,79 +107,81 @@
     "healer": "מרפא",
     "rogue": "נוכל",
     "mage": "מכשף",
-    "wizard": "Mage",
+    "wizard": "",
     "mystery": "מסתורין",
-    "changeClass": "Change Class, Refund Stat Points",
+    "changeClass": "",
     "lvl10ChangeClass": "כדי לשנות מקצוע עליכם להיות לפחות בדרגה 10.",
-    "changeClassConfirmCost": "Are you sure you want to change your class for 3 Gems?",
+    "changeClassConfirmCost": "",
-    "invalidClass": "Invalid class. Please specify 'warrior', 'rogue', 'wizard', or 'healer'.",
+    "invalidClass": "",
-    "levelPopover": "Each level earns you one Point to assign to a Stat of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options.",
+    "levelPopover": "",
-    "unallocated": "Unallocated Stat Points",
+    "unallocated": "",
     "autoAllocation": "הקצאה אוטומטית",
-    "autoAllocationPop": "Places Points into Stats according to your preferences, when you level up.",
+    "autoAllocationPop": "",
-    "evenAllocation": "Distribute Stat Points evenly",
+    "evenAllocation": "",
-    "evenAllocationPop": "Assigns the same number of Points to each Stat.",
+    "evenAllocationPop": "",
-    "classAllocation": "Distribute Points based on Class",
+    "classAllocation": "",
-    "classAllocationPop": "Assigns more Points to the Stats important to your Class.",
+    "classAllocationPop": "",
-    "taskAllocation": "Distribute Points based on task activity",
+    "taskAllocation": "",
-    "taskAllocationPop": "Assigns Points based on the Strength, Intelligence, Constitution, and Perception categories associated with the tasks you complete.",
+    "taskAllocationPop": "",
     "distributePoints": "הקצה נקודות שעדיין לא נוצלו",
-    "distributePointsPop": "Assigns all unallocated Stat Points according to the selected allocation scheme.",
+    "distributePointsPop": "",
     "warriorText": "לוחמים גורמים ליותר \"פגיעות חמורות\", שנותנות בונוס אקראי של מטבעות זהב, ניסיון או סיכוי למציאת פריט כשמשלימים משימה. הם גם גורמים נזק רב למפלצות האויב. שחק כלוחם אם אתה אוהב למצוא פרסים גדולים ומפתיעים, או אם אתה רוצה לקרוע את אויביך לגזרים ולנגב את הרצפה עם הגופות המרוטשות שלהם!",
-    "wizardText": "Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habitica, or if you are strongly motivated by leveling up and unlocking advanced features!",
+    "wizardText": "",
-    "mageText": "Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habitica, or if you are strongly motivated by leveling up and unlocking advanced features!",
+    "mageText": "",
     "rogueText": "נוכלים אוהבים לצבור עושר, הם משיגים יותר מטבעות זהב מכל אחד אחר והם מוכשרים במציאת פריטים אקראיים. יכולת החשאיות המפורסמת שלהם מאפשרת להם להתחמק מהתוצאות של מטלות יומיות שפוספסו. כשרוצים להשיג פרסים, הישגים, שלל ותגים - כל מה שצריך זה לשחק אותה נוכלים!",
     "healerText": "מרפאים הם חסינים לכל פגע, והם מציעים את ההגנה הזו גם לחבריהם. מטלות יומיות והרגלים רעים לא ממש מזיזים להם, ויש להם דרכים לרפא את הבריאות שלהם לאחר כישלון. שחק מרפא אם אתה נהנה לעזור לחברים שלך במשחק, או אם הרעיון לרמות את המוות דרך עבודה קשה קוסם לך!",
     "optOutOfClasses": "וותר",
-    "chooseClass": "Choose your Class",
+    "chooseClass": "",
     "chooseClassLearnMarkdown": "[Learn more about Habitica's class system](http://habitica.fandom.com/wiki/Class_System)",
-    "optOutOfClassesText": "Can't be bothered with classes? Want to choose later? Opt out - you'll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time under User Icon > Settings.",
+    "optOutOfClassesText": "",
-    "selectClass": "Select <%= heroClass %>",
+    "selectClass": "",
     "select": "בחר",
     "stealth": "חשאיות",
     "stealthNewDay": "בתחילתו של יום חדש, הימנע מלחטוף נזק ממטלות יומיות שלא ביצעת.",
     "streaksFrozen": "רצפים קפואים",
     "streaksFrozenText": "הרצפים של המטלות היומיות שלא ביצעת לא יתאפסו בסוף היום",
     "purchaseFor": "לרכוש בתמורה ל־<%= cost %> יהלומים?",
-    "purchaseForHourglasses": "Purchase for <%= cost %> Hourglasses?",
+    "purchaseForHourglasses": "",
     "notEnoughMana": "אין לך מספיק מאנה.",
-    "invalidTarget": "You can't cast a skill on that.",
+    "invalidTarget": "",
     "youCast": "הטלת <%= spell %>.",
     "youCastTarget": "הטלת <%= spell %> על <%= target %>.",
     "youCastParty": "הטלת <%= spell %> בשביל החבר'ה שלך. כל הכבוד!",
     "critBonus": "פגיעה חמורה! בונוס:",
-    "gainedGold": "You gained some Gold",
+    "gainedGold": "",
-    "gainedMana": "You gained some Mana",
+    "gainedMana": "",
-    "gainedHealth": "You gained some Health",
+    "gainedHealth": "",
-    "gainedExperience": "You gained some Experience",
+    "gainedExperience": "",
-    "lostGold": "You spent some Gold",
+    "lostGold": "",
     "lostMana": "You used some Mana",
-    "lostHealth": "You lost some Health",
+    "lostHealth": "",
-    "lostExperience": "You lost some Experience",
+    "lostExperience": "",
-    "equip": "Equip",
+    "equip": "",
-    "unequip": "Unequip",
+    "unequip": "",
     "animalSkins": "עורות דמוי בע״ח",
     "str": "כוח",
     "con": "חוסן",
     "per": "תפיסה",
     "int": "תבונה",
-    "notEnoughAttrPoints": "You don't have enough Stat Points.",
+    "notEnoughAttrPoints": "",
-    "classNotSelected": "You must select Class before you can assign Stat Points.",
+    "classNotSelected": "",
     "style": "Style",
-    "facialhair": "Facial",
+    "facialhair": "",
-    "photo": "Photo",
+    "photo": "תמונה",
     "info": "Info",
-    "joined": "Joined",
+    "joined": "הצטרפות",
-    "totalLogins": "Total Check Ins",
+    "totalLogins": "",
-    "latestCheckin": "Latest Check In",
+    "latestCheckin": "",
-    "editProfile": "Edit Profile",
+    "editProfile": "עריכת הפרופיל",
-    "challengesWon": "Challenges Won",
+    "challengesWon": "אתגרים שנוצחו",
-    "questsCompleted": "Quests Completed",
+    "questsCompleted": "הרפתקאות שהושלמו",
-    "headAccess": "Head Access.",
+    "headAccess": "",
-    "backAccess": "Back Access.",
+    "backAccess": "",
-    "bodyAccess": "Body Access.",
+    "bodyAccess": "",
-    "mainHand": "Main-Hand",
+    "mainHand": "",
-    "offHand": "Off-Hand",
+    "offHand": "",
     "statPoints": "Stat Points",
-    "pts": "pts"
+    "pts": "נק׳",
+    "notEnoughGold": "אין מספיק זהב.",
+    "purchaseForGold": "לרכוש בתמורת <%= cost %> מטבעות זהב?"
 }

website/common/locales/he/communityguidelines.json

@@ -16,29 +16,29 @@
     "commGuideList02F": "<strong>Avoid extended discussions of divisive topics in the Tavern and where it would be off-topic</strong>. If you feel that someone has said something rude or hurtful, do not engage them. If someone mentions something that is allowed by the guidelines but which is hurtful to you, it’s okay to politely let someone know that. If it is against the guidelines or the Terms of Service, you should flag it and let a mod respond. When in doubt, flag the post.",
     "commGuideList02G": "<strong>Comply immediately with any Mod request</strong>. This could include, but is not limited to, requesting you limit your posts in a particular space, editing your profile to remove unsuitable content, asking you to move your discussion to a more suitable space, etc.",
     "commGuideList02J": "<strong>Do not spam</strong>. Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, posting multiple promotional messages about a Guild, Party or Challenge, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming. If people clicking on a link will result in any benefit to you, you need to disclose that in the text of your message or that will also be considered spam.<br/><br/>It is up to the mods to decide if something constitutes spam or might lead to spam, even if you don’t feel that you have been spamming. For example, advertising a Guild is acceptable once or twice, but multiple posts in one day would probably constitute spam, no matter how useful the Guild is!",
-    "commGuideList02K": "<strong>Avoid posting large header text in the public chat spaces, particularly the Tavern</strong>. Much like ALL CAPS, it reads as if you were yelling, and interferes with the comfortable atmosphere.",
+    "commGuideList02K": "",
     "commGuideList02L": "<strong>We highly discourage the exchange of personal information -- particularly information that can be used to identify you -- in public chat spaces</strong>. Identifying information can include but is not limited to: your address, your email address, and your API token/password. This is for your safety! Staff or moderators may remove such posts at their discretion. If you are asked for personal information in a private Guild, Party, or PM, we highly recommend that you politely refuse and alert the staff and moderators by either 1) flagging the message if it is in a Party or private Guild, or 2) filling out the <a href='http://contact.habitica.com/' target='_blank'>Moderator Contact Form</a> and including screenshots.",
-    "commGuidePara019": "<strong>In private spaces</strong>, users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting slurs or any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
+    "commGuidePara019": "",
     "commGuidePara020": "<strong>Private Messages (PMs)</strong> have some additional guidelines. If someone has blocked you, do not contact them elsewhere to ask them to unblock you. Additionally, you should not send PMs to someone asking for support (since public answers to support questions are helpful to the community). Finally, do not send anyone PMs begging for a gift of gems or a subscription, as this can be considered spamming.",
     "commGuidePara020A": "<strong>If you see a post that you believe is in violation of the public space guidelines outlined above, or if you see a post that concerns you or makes you uncomfortable, you can bring it to the attention of Moderators and Staff by clicking the flag icon to report it</strong>. A Staff member or Moderator will respond to the situation as soon as possible. Please note that intentionally reporting innocent posts is an infraction of these Guidelines (see below in “Infractions”). PMs cannot be flagged at this time, so if you need to report a PM, please contact the Mods via the form on the “Contact Us” page, which you can also access via the help menu by clicking “<a href='http://contact.habitica.com/' target='_blank'>Contact the Moderation Team</a>.” You may want to do this if there are multiple problematic posts by the same person in different Guilds, or if the situation requires some explanation. You may contact us in your native language if that is easier for you: we may have to use Google Translate, but we want you to feel comfortable about contacting us if you have a problem.",
     "commGuidePara021": "בנוסף לכך, לאזורים פרטיים מסוימים בהביטיקה יש כללים נוספים.",
     "commGuideHeadingTavern": "הפונדק",
-    "commGuidePara022": "The Tavern is the main spot for Habiticans to mingle. Daniel the Innkeeper keeps the place spic-and-span, and Lemoness will happily conjure up some lemonade while you sit and chat. Just keep in mind…",
+    "commGuidePara022": "",
-    "commGuidePara023": "<strong>Conversation tends to revolve around casual chatting and productivity or life improvement tips</strong>. Because the Tavern chat can only hold 200 messages, <strong>it isn't a good place for prolonged conversations on topics, especially sensitive ones</strong> (ex. politics, religion, depression, whether or not goblin-hunting should be banned, etc.). These conversations should be taken to an applicable Guild.  A Mod may direct you to a suitable Guild, but it is ultimately your responsibility to find and post in the appropriate place.",
+    "commGuidePara023": "",
-    "commGuidePara024": "<strong>Don't discuss anything addictive in the Tavern</strong>. Many people use Habitica to try to quit their bad Habits. Hearing people talk about addictive/illegal substances may make this much harder for them! Respect your fellow Tavern-goers and take this into consideration. This includes, but is not exclusive to: smoking, alcohol, pornography, gambling, and drug use/abuse.",
+    "commGuidePara024": "",
     "commGuidePara027": "<strong>When a moderator directs you to take a conversation elsewhere, if there is no relevant Guild, they may suggest you use the Back Corner</strong>. The Back Corner Guild is a free public space to discuss potentially sensitive subjects that should only be used when directed there by a moderator. It is carefully monitored by the moderation team. It is not a place for general discussions or conversations, and you will be directed there by a mod only when it is appropriate.",
     "commGuideHeadingPublicGuilds": "גילדות ציבוריות",
-    "commGuidePara029": "<strong>Public Guilds are much like the Tavern, except that instead of being centered around general conversation, they have a focused theme</strong>. Public Guild chat should focus on this theme. For example, members of the Wordsmiths Guild might be cross if the conversation is suddenly focusing on gardening instead of writing, and a Dragon-Fanciers Guild might not have any interest in deciphering ancient runes. Some Guilds are more lax about this than others, but in general, <strong>try to stay on topic</strong>!",
+    "commGuidePara029": "",
-    "commGuidePara031": "Some public Guilds will contain sensitive topics such as depression, religion, politics, etc. This is fine as long as the conversations therein do not violate any of the Terms and Conditions or Public Space Rules, and as long as they stay on topic.",
+    "commGuidePara031": "",
-    "commGuidePara033": "<strong>Public Guilds may NOT contain 18+ content. If they plan to regularly discuss sensitive content, they should say so in the Guild description</strong>. This is to keep Habitica safe and comfortable for everyone.",
+    "commGuidePara033": "",
     "commGuidePara035": "<strong>If the Guild in question has different kinds of sensitive issues, it is respectful to your fellow Habiticans to place your comment behind a warning (ex. \"Warning: references self-harm\")</strong>. These may be characterized as trigger warnings and/or content notes, and Guilds may have their own rules in addition to those given here. If possible, please use <a href='http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a> to hide the potentially sensitive content below line breaks so that those who may wish to avoid reading it can scroll past it without seeing the content. Habitica staff and moderators may still remove this material at their discretion.",
     "commGuidePara036": "Additionally, the sensitive material should be topical -- bringing up self-harm in a Guild focused on fighting depression may make sense, but is probably less appropriate in a music Guild. If you see someone who is repeatedly violating this guideline, especially after several requests, please flag the posts and notify the moderators via the <a href='http://contact.habitica.com/' target='_blank'>Moderator Contact Form</a>.",
-    "commGuidePara037": "<strong>No Guilds, Public or Private, should be created for the purpose of attacking any group or individual</strong>. Creating such a Guild is grounds for an instant ban. Fight bad habits, not your fellow adventurers!",
+    "commGuidePara037": "",
-    "commGuidePara038": "<strong>All Tavern Challenges and Public Guild Challenges must comply with these rules as well</strong>.",
+    "commGuidePara038": "",
     "commGuideHeadingInfractionsEtc": "עבירות, השלכות ותיקונן",
     "commGuideHeadingInfractions": "עבירות",
     "commGuidePara050": "באופן כללי, ההביטיקנים עוזרים זה לזה, מכבדים אחד את השני, ופועלים יחד כדי להפוך את הקהילה כולה לנעימה וחברותית. אולם, לעיתים רחוקות מאוד, מעשהו של הביטיקן עשוי להפר את אחד מהחוקים הנ\"ל. כאשר זה קורה, המנהלים ינקטו בכל פעולה שנראית להם הכרחית כדי להשאיר את הביטיקה בטוחה ונוחה עבור כולם.",
-    "commGuidePara051": "<strong>There are a variety of infractions, and they are dealt with depending on their severity</strong>. These are not comprehensive lists, and the Mods can make decisions on topics not covered here at their own discretion. The Mods will take context into account when evaluating infractions.",
+    "commGuidePara051": "",
     "commGuideHeadingSevereInfractions": "עבירות חמורות",
     "commGuidePara052": "עבירות חמורות הן אלו שפוגעות פגיעה אנושה בביטחון קהילת הביטיקה ומשתמשיה, וכתוצאה מכך יש להן גם השלכות חמורות.",
     "commGuidePara053": "להלן רשימת דוגמאות לעבירות חמורות, זו איננה רשימה כוללת.",
@@ -47,38 +47,38 @@
     "commGuideList05C": "הפרה של תנאי תקופת מבחן",
     "commGuideList05D": "Impersonation of Staff or Moderators",
     "commGuideList05E": "ביצוע עבירות בינוניות בצורה חוזרת ונשנית",
-    "commGuideList05F": "Creation of a duplicate account to avoid consequences (for example, making a new account to chat after having chat privileges revoked)",
+    "commGuideList05F": "",
-    "commGuideList05G": "Intentional deception of Staff or Moderators in order to avoid consequences or to get another user in trouble",
+    "commGuideList05G": "",
     "commGuideHeadingModerateInfractions": "עבירות בדרגת חומרה בינונית",
     "commGuidePara054": "עבירות בינוניות אינן פוגעות בביטחון הקהילה, אך הן יוצרות חוויה לא נעימה. לעבירות כאלו יהיו השלכות מתונות. אם ייעשו עבירות נוספות, ייתכן ויהיו לכך השלכות חמורות יותר.",
     "commGuidePara055": "להלן רשימת דוגמאות לעבירות בינוניות. זו איננה רשימה כוללת.",
-    "commGuideList06A": "Ignoring, disrespecting or arguing with a Mod. This includes publicly complaining about moderators or other users, publicly glorifying or defending banned users, or debating whether or not a moderator action was appropriate. If you are concerned about one of the rules or the behaviour of the Mods, please contact the staff via email (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
+    "commGuideList06A": "",
-    "commGuideList06B": "Backseat Modding. To quickly clarify a relevant point: A friendly mention of the rules is fine. Backseat modding consists of telling, demanding, and/or strongly implying that someone must take an action that you describe to correct a mistake. You can alert someone to the fact that they have committed a transgression, but please do not demand an action -- for example, saying, \"Just so you know, profanity is discouraged in the Tavern, so you may want to delete that,\" would be better than saying, \"I'm going to have to ask you to delete that post.\"",
+    "commGuideList06B": "",
-    "commGuideList06C": "Intentionally flagging innocent posts.",
+    "commGuideList06C": "",
-    "commGuideList06D": "Repeatedly Violating Public Space Guidelines",
+    "commGuideList06D": "",
-    "commGuideList06E": "Repeatedly Committing Minor Infractions",
+    "commGuideList06E": "",
     "commGuideHeadingMinorInfractions": "עבירות משניות",
     "commGuidePara056": "עבירות משניות, למרות שאינן רצויות, מובילות רק להשלכות משניות. אם ביצוע העבירות ממשיך לחזור, הן עשויות להוביל להשלכות חמורות יותר.",
     "commGuidePara057": "להלן רשימת דוגמאות לעבירות משניות. זו איננה רשימה כוללת.",
     "commGuideList07A": "הפרה ראשונה של חוקי המרחבים הציבוריים",
     "commGuideList07B": "Any statements or actions that trigger a \"Please Don't\". When a Mod has to say \"Please don't do this\" to a user, it can count as a very minor infraction for that user. An example might be \"Please don't keep arguing in favor of this feature idea after we've told you several times that it isn't feasible.\" In many cases, the Please Don't will be the minor consequence as well, but if Mods have to say \"Please Don't\" to the same user enough times, the triggering Minor Infractions will start to count as Moderate Infractions.",
-    "commGuidePara057A": "Some posts may be hidden because they contain sensitive information or might give people the wrong idea. Typically this does not count as an infraction, particularly not the first time it happens!",
+    "commGuidePara057A": "",
     "commGuideHeadingConsequences": "השלכות",
     "commGuidePara058": "במשחק, כמו בחיים האמיתיים, לכל פעולה יש תוצאה. בין אם זה להיכנס לכושר כתוצאה מאימונים וריצה, הופעת חורים בשיניים כתוצאה מאכילה מרובה מידי של מתוקים, או הצלחה בקורס כתוצאה מהשקעה בלימודים.",
     "commGuidePara059": "<strong> בדומה לכך, לכל עבירה יש השלכה ישירה. </strong> דוגמאות להשלכות אפשריות רשומות מטה.",
-    "commGuidePara060": "<strong>If your infraction has a moderate or severe consequence, there will be a post from a staff member or moderator in the forum in which the infraction occurred explaining</strong>:",
+    "commGuidePara060": "",
     "commGuideList08A": "מה הייתה העבירה שלך",
     "commGuideList08B": "מהן ההשלכות",
     "commGuideList08C": "מה לעשות כדי לתקן ולשחזר את המצב לקדמותו, אם ניתן.",
-    "commGuidePara060A": "If the situation calls for it, you may receive a PM or email as well as a post in the forum in which the infraction occurred. In some cases you may not be reprimanded in public at all.",
+    "commGuidePara060A": "",
     "commGuidePara060B": "If your account is banned (a severe consequence), you will not be able to log into Habitica and will receive an error message upon attempting to log in. <strong>If you wish to apologize or make a plea for reinstatement, please email the staff at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> with your UUID</strong> (which will be given in the error message). It is <strong>your</strong> responsibility to reach out if you desire reconsideration or reinstatement.",
     "commGuideHeadingSevereConsequences": "דוגמאות להשלכות חמורות",
-    "commGuideList09A": "Account bans (see above)",
+    "commGuideList09A": "",
     "commGuideList09C": "מניעת (״הקפאת״) ההתקדמות ברמות תורם לצמיתות",
     "commGuideHeadingModerateConsequences": "דוגמאות להשלכות מתונות",
-    "commGuideList10A": "Restricted public and/or private chat privileges",
+    "commGuideList10A": "",
     "commGuideList10A1": "If your actions result in revocation of your chat privileges, a Moderator or Staff member will PM you and/or post in the forum in which you were muted to notify you of the reason for your muting and the length of time for which you will be muted. At the end of that period, you will receive your chat privileges back, provided you are willing to correct the behavior for which you were muted and comply with the Community Guidelines.",
-    "commGuideList10C": "Restricted Guild/Challenge creation privileges",
+    "commGuideList10C": "",
     "commGuideList10D": "מניעת (״הקפאת״) ההתקדמות ברמות תורם באופן זמני",
     "commGuideList10E": "הורדה בדרגות תורם",
     "commGuideList10F": "המשך שימוש ״על תנאי״",
@@ -89,35 +89,38 @@
     "commGuideList11D": "מחיקה (עורכים / חברי הצוות יכולים למחוק תוכן בעייתי)",
     "commGuideList11E": "עריכה (עורכים / חברי הצוות יכולים לערוך תוכן בעייתי)",
     "commGuideHeadingRestoration": "שחזור",
-    "commGuidePara061": "Habitica is a land devoted to self-improvement, and we believe in second chances. <strong>If you commit an infraction and receive a consequence, view it as a chance to evaluate your actions and strive to be a better member of the community</strong>.",
+    "commGuidePara061": "",
-    "commGuidePara062": "The announcement, message, and/or email that you receive explaining the consequences of your actions is a good source of information. Cooperate with any restrictions which have been imposed, and endeavor to meet the requirements to have any penalties lifted.",
+    "commGuidePara062": "",
-    "commGuidePara063": "If you do not understand your consequences, or the nature of your infraction, ask the Staff/Moderators for help so you can avoid committing infractions in the future. If you feel a particular decision was unfair, you can contact the staff to discuss it at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
+    "commGuidePara063": "",
-    "commGuideHeadingMeet": "Meet the Staff and Mods!",
+    "commGuideHeadingMeet": "",
-    "commGuidePara006": "Habitica has some tireless knights-errant who join forces with the staff members to keep the community calm, contented, and free of trolls. Each has a specific domain, but will sometimes be called to serve in other social spheres.",
+    "commGuidePara006": "",
     "commGuidePara007": "לצוות יש תגיות סגולות המסומנות בכתרים. התואר שלהם הוא \"הירואי\".",
     "commGuidePara008": "לעורכים יש תגיות כחולות כהות המסומנות בכוכב. התואר שלהם הוא \"שומר\". יוצאת מן הכלל היא באיילי. בתור דב\"שית, באיילי בעלת תגית שחורה וירוקה המסומנת בכוכב.",
     "commGuidePara009": "חברי הצוות הנוכחיים הם (משמאל לימין):",
-    "commGuideAKA": "<%= habitName %> aka <%= realName %>",
+    "commGuideAKA": "",
     "commGuideOnTrello": "<%= trelloName %> on Trello",
-    "commGuideOnGitHub": "<%= gitHubName %> on GitHub",
+    "commGuideOnGitHub": "‏<%= gitHubName %> ב־GitHub",
     "commGuidePara010": "ישנם גם מספר עורכים המסייעים לחברי הצוות. הם נבחרו בקפידה, לכן אנא כבדו אותם ושמעו בעצתם.",
     "commGuidePara011": "העורכים הנוכחיים הם (משמאל לימין):",
-    "commGuidePara011b": "בתוך Github/ויקיא",
+    "commGuidePara011b": "בתוך Github‏/Fandom",
-    "commGuidePara011c": "בוויקיא",
+    "commGuidePara011c": "בוויקי",
     "commGuidePara011d": "ב־GitHub",
-    "commGuidePara012": "If you have an issue or concern about a particular Mod, please send an email to our Staff (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
+    "commGuidePara012": "",
-    "commGuidePara013": "In a community as big as Habitica, users come and go, and sometimes a staff member or moderator needs to lay down their noble mantle and relax. The following are Staff and Moderators Emeritus. They no longer act with the power of a Staff member or Moderator, but we would still like to honor their work!",
+    "commGuidePara013": "",
-    "commGuidePara014": "Staff and Moderators Emeritus:",
+    "commGuidePara014": "",
     "commGuideHeadingFinal": "הפסקה האחרונה",
     "commGuidePara067": "So there you have it, brave Habitican -- the Community Guidelines! Wipe that sweat off of your brow and give yourself some XP for reading it all. If you have any questions or concerns about these Community Guidelines, please reach out to us via the <a href='http://contact.habitica.com/' target='_blank'>Moderator Contact Form</a> and we will be happy to help clarify things.",
     "commGuidePara068": "עכשיו התקדמו לכם, הרפתקנים אמיצים, והרגו כמה מטלות יומיומיות!",
     "commGuideHeadingLinks": "קישורים שימושיים",
-    "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>: a Guild for users to ask questions!",
+    "commGuideLink01": "",
     "commGuideLink02": "<a href='http://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>The Wiki</a>: the biggest collection of information about Habitica.",
     "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: for bug reports or helping with code!",
     "commGuideLink04": "<a href='https://trello.com/b/EpoYEYod/' target='_blank'>The Main Trello</a>: for site feature requests.",
     "commGuideLink05": "<a href='https://trello.com/b/mXK3Eavg/' target='_blank'>The Mobile Trello</a>: for mobile feature requests.",
-    "commGuideLink06": "<a href='https://trello.com/b/vwuE9fbO/' target='_blank'>The Art Trello</a>: for submitting pixel art.",
+    "commGuideLink06": "",
-    "commGuideLink07": "<a href='https://trello.com/b/nnv4QIRX/' target='_blank'>The Quest Trello</a>: for submitting quest writing.",
+    "commGuideLink07": "",
-    "commGuidePara069": "האמנים המוכשרים הבאים תרמו ליצירת איורים אלו:"
+    "commGuidePara069": "האמנים המוכשרים הבאים תרמו ליצירת איורים אלו:",
+    "commGuideList01A": "התנאים וההתניות חלים על כל המרחבים, לרבות גילדות פרטיות, צ׳אט חבורה, והודעות.",
+    "commGuidePara017": "הינה הגרסה המקוצרת, אבל היינו ממליצים לך לקרוא גם את הפרטים הקטנים שלמטה:",
+    "commGuideList01C": "על כל הדיונים להיות הולמים לכל הגילאים ובשפה הולמת."
 }

website/common/locales/he/content.json

@@ -2,7 +2,7 @@
     "potionText": "שיקוי ריפוי",
     "potionNotes": "מרפא 15 נק\"פ (שימוש מיידי)",
     "armoireText": "ציוד קסום",
-    "armoireNotesFull": "פתח את תיבת הציוד הקסום ע״מ לקבל ציוד מיוחד, ניסיון או מזון! יחידות ציוד שנותרו:",
+    "armoireNotesFull": "אפשר לפתוח את תיבת הציוד הקסום ולקבל ציוד מיוחד, ניסיון או מזון! יחידות ציוד שנותרו:",
     "armoireLastItem": "מצאת את פריט הציוד הקסום האחרון",
     "armoireNotesEmpty": "״הציוד הקסום״ יציע ציוד חדש בשבוע הראשון של כל חודש. עד אז, ניתן להמשיך לקבל ניסיון ומזון!",
     "dropEggWolfText": "זאב",
@@ -61,7 +61,7 @@
     "questEggRoosterAdjective": "מתגנדר",
     "questEggSpiderText": "עכביש",
     "questEggSpiderMountText": "עכביש",
-    "questEggSpiderAdjective": "an artistic",
+    "questEggSpiderAdjective": "",
     "questEggOwlText": "ינשוף",
     "questEggOwlMountText": "ינשוף",
     "questEggOwlAdjective": "חכם",
@@ -130,58 +130,58 @@
     "questEggArmadilloAdjective": "משוריינת",
     "questEggCowText": "פרה",
     "questEggCowMountText": "פרה",
-    "questEggCowAdjective": "a mooing",
+    "questEggCowAdjective": "",
-    "questEggBeetleText": "Beetle",
+    "questEggBeetleText": "",
-    "questEggBeetleMountText": "Beetle",
+    "questEggBeetleMountText": "",
-    "questEggBeetleAdjective": "an unbeatable",
+    "questEggBeetleAdjective": "",
-    "questEggFerretText": "Ferret",
+    "questEggFerretText": "",
-    "questEggFerretMountText": "Ferret",
+    "questEggFerretMountText": "",
-    "questEggFerretAdjective": "a furry",
+    "questEggFerretAdjective": "",
-    "questEggSlothText": "Sloth",
+    "questEggSlothText": "",
-    "questEggSlothMountText": "Sloth",
+    "questEggSlothMountText": "",
-    "questEggSlothAdjective": "a speedy",
+    "questEggSlothAdjective": "",
-    "questEggTriceratopsText": "Triceratops",
+    "questEggTriceratopsText": "",
-    "questEggTriceratopsMountText": "Triceratops",
+    "questEggTriceratopsMountText": "",
-    "questEggTriceratopsAdjective": "a tricky",
+    "questEggTriceratopsAdjective": "",
-    "questEggGuineaPigText": "Guinea Pig",
+    "questEggGuineaPigText": "",
-    "questEggGuineaPigMountText": "Guinea Pig",
+    "questEggGuineaPigMountText": "",
-    "questEggGuineaPigAdjective": "a giddy",
+    "questEggGuineaPigAdjective": "",
-    "questEggPeacockText": "Peacock",
+    "questEggPeacockText": "",
-    "questEggPeacockMountText": "Peacock",
+    "questEggPeacockMountText": "",
-    "questEggPeacockAdjective": "a prancing",
+    "questEggPeacockAdjective": "",
-    "questEggButterflyText": "Caterpillar",
+    "questEggButterflyText": "",
-    "questEggButterflyMountText": "Butterfly",
+    "questEggButterflyMountText": "פרפר",
-    "questEggButterflyAdjective": "a cute",
+    "questEggButterflyAdjective": "",
-    "questEggNudibranchText": "Nudibranch",
+    "questEggNudibranchText": "",
-    "questEggNudibranchMountText": "Nudibranch",
+    "questEggNudibranchMountText": "",
-    "questEggNudibranchAdjective": "a nifty",
+    "questEggNudibranchAdjective": "",
-    "questEggHippoText": "Hippo",
+    "questEggHippoText": "היפופוטם",
-    "questEggHippoMountText": "Hippo",
+    "questEggHippoMountText": "היפופוטם",
-    "questEggHippoAdjective": "a happy",
+    "questEggHippoAdjective": "",
-    "questEggYarnText": "Yarn",
+    "questEggYarnText": "",
-    "questEggYarnMountText": "Flying Carpet",
+    "questEggYarnMountText": "שטיח מעופף",
-    "questEggYarnAdjective": "woolen",
+    "questEggYarnAdjective": "",
-    "questEggPterodactylText": "Pterodactyl",
+    "questEggPterodactylText": "",
-    "questEggPterodactylMountText": "Pterodactyl",
+    "questEggPterodactylMountText": "",
-    "questEggPterodactylAdjective": "a trusting",
+    "questEggPterodactylAdjective": "",
-    "questEggBadgerText": "Badger",
+    "questEggBadgerText": "",
-    "questEggBadgerMountText": "Badger",
+    "questEggBadgerMountText": "",
-    "questEggBadgerAdjective": "a bustling",
+    "questEggBadgerAdjective": "",
-    "questEggSquirrelText": "Squirrel",
+    "questEggSquirrelText": "",
-    "questEggSquirrelMountText": "Squirrel",
+    "questEggSquirrelMountText": "סנאי",
-    "questEggSquirrelAdjective": "a bushy-tailed",
+    "questEggSquirrelAdjective": "",
-    "questEggSeaSerpentText": "Sea Serpent",
+    "questEggSeaSerpentText": "",
-    "questEggSeaSerpentMountText": "Sea Serpent",
+    "questEggSeaSerpentMountText": "",
-    "questEggSeaSerpentAdjective": "a shimmering",
+    "questEggSeaSerpentAdjective": "",
-    "questEggKangarooText": "Kangaroo",
+    "questEggKangarooText": "קנגרו",
-    "questEggKangarooMountText": "Kangaroo",
+    "questEggKangarooMountText": "קנגרו",
-    "questEggKangarooAdjective": "a keen",
+    "questEggKangarooAdjective": "",
-    "questEggAlligatorText": "Alligator",
+    "questEggAlligatorText": "תנין",
-    "questEggAlligatorMountText": "Alligator",
+    "questEggAlligatorMountText": "תנין",
-    "questEggAlligatorAdjective": "a cunning",
+    "questEggAlligatorAdjective": "",
-    "questEggVelociraptorText": "Velociraptor",
+    "questEggVelociraptorText": "",
-    "questEggVelociraptorMountText": "Velociraptor",
+    "questEggVelociraptorMountText": "",
-    "questEggVelociraptorAdjective": "a clever",
+    "questEggVelociraptorAdjective": "",
     "eggNotes": "מצא שיקוי הבקעה לשפוך על ביצה זו, והיא תהפוך ל<%= eggText(locale) %> <%= eggAdjective(locale) %>.",
     "hatchingPotionBase": "רגיל",
     "hatchingPotionWhite": "לבן",
@@ -196,83 +196,83 @@
     "hatchingPotionSpooky": "מפחיד",
     "hatchingPotionPeppermint": "מנטה",
     "hatchingPotionFloral": "פרחוני",
-    "hatchingPotionAquatic": "Aquatic",
+    "hatchingPotionAquatic": "",
-    "hatchingPotionEmber": "Ember",
+    "hatchingPotionEmber": "",
     "hatchingPotionThunderstorm": "סופת ברקים",
     "hatchingPotionGhost": "רוח רפאים",
-    "hatchingPotionRoyalPurple": "Royal Purple",
+    "hatchingPotionRoyalPurple": "",
-    "hatchingPotionHolly": "Holly",
+    "hatchingPotionHolly": "",
-    "hatchingPotionCupid": "Cupid",
+    "hatchingPotionCupid": "",
-    "hatchingPotionShimmer": "Shimmer",
+    "hatchingPotionShimmer": "",
-    "hatchingPotionFairy": "Fairy",
+    "hatchingPotionFairy": "",
-    "hatchingPotionStarryNight": "Starry Night",
+    "hatchingPotionStarryNight": "",
-    "hatchingPotionRainbow": "Rainbow",
+    "hatchingPotionRainbow": "קשת",
-    "hatchingPotionGlass": "Glass",
+    "hatchingPotionGlass": "",
-    "hatchingPotionGlow": "Glow-in-the-Dark",
+    "hatchingPotionGlow": "",
-    "hatchingPotionFrost": "Frost",
+    "hatchingPotionFrost": "",
-    "hatchingPotionIcySnow": "Icy Snow",
+    "hatchingPotionIcySnow": "",
     "hatchingPotionNotes": "מזוג שיקוי זה על ביצה, והיא תבקע כ: <%= potText(locale) %>.",
     "premiumPotionAddlNotes": "לא ניתן לשימוש על ביצי הרפתקאות.",
     "foodMeat": "בשר",
-    "foodMeatThe": "the Meat",
+    "foodMeatThe": "",
-    "foodMeatA": "Meat",
+    "foodMeatA": "בשר",
     "foodMilk": "חלב",
-    "foodMilkThe": "the Milk",
+    "foodMilkThe": "החלב",
-    "foodMilkA": "Milk",
+    "foodMilkA": "חלב",
     "foodPotatoe": "תפוח אדמה",
-    "foodPotatoeThe": "the Potato",
+    "foodPotatoeThe": "תפוח האדמה",
-    "foodPotatoeA": "a Potato",
+    "foodPotatoeA": "תפוח אדמה",
     "foodStrawberry": "תות",
-    "foodStrawberryThe": "the Strawberry",
+    "foodStrawberryThe": "התות",
-    "foodStrawberryA": "a Strawberry",
+    "foodStrawberryA": "תות",
     "foodChocolate": "שוקולד",
-    "foodChocolateThe": "the Chocolate",
+    "foodChocolateThe": "השוקולד",
-    "foodChocolateA": "Chocolate",
+    "foodChocolateA": "שוקולד",
     "foodFish": "דג",
-    "foodFishThe": "the Fish",
+    "foodFishThe": "הדג",
-    "foodFishA": "a Fish",
+    "foodFishA": "דג",
     "foodRottenMeat": "בשר רקוב",
-    "foodRottenMeatThe": "the Rotten Meat",
+    "foodRottenMeatThe": "הבשר הרקוב",
-    "foodRottenMeatA": "Rotten Meat",
+    "foodRottenMeatA": "בשר רקוב",
     "foodCottonCandyPink": "סוכר שמבלולו ורוד",
-    "foodCottonCandyPinkThe": "the Pink Cotton Candy",
+    "foodCottonCandyPinkThe": "",
-    "foodCottonCandyPinkA": "Pink Cotton Candy",
+    "foodCottonCandyPinkA": "",
     "foodCottonCandyBlue": "סוכר שמבלולו כחול",
-    "foodCottonCandyBlueThe": "the Blue Cotton Candy",
+    "foodCottonCandyBlueThe": "",
-    "foodCottonCandyBlueA": "Blue Cotton Candy",
+    "foodCottonCandyBlueA": "",
     "foodHoney": "דבש",
-    "foodHoneyThe": "the Honey",
+    "foodHoneyThe": "הדבש",
-    "foodHoneyA": "Honey",
+    "foodHoneyA": "דבש",
     "foodCakeSkeleton": "עוגת עצמות",
-    "foodCakeSkeletonThe": "the Bare Bones Cake",
+    "foodCakeSkeletonThe": "",
-    "foodCakeSkeletonA": "a Bare Bones Cake",
+    "foodCakeSkeletonA": "",
     "foodCakeBase": "עוגה רגילה",
-    "foodCakeBaseThe": "the Basic Cake",
+    "foodCakeBaseThe": "העוגה הפשוטה",
-    "foodCakeBaseA": "a Basic Cake",
+    "foodCakeBaseA": "עוגה פשוטה",
     "foodCakeCottonCandyBlue": "עוגת ממתקים כחולה",
-    "foodCakeCottonCandyBlueThe": "the Candy Blue Cake",
+    "foodCakeCottonCandyBlueThe": "עוגת הממתקים הכחולה",
-    "foodCakeCottonCandyBlueA": "a Candy Blue Cake",
+    "foodCakeCottonCandyBlueA": "עוגת ממתקים כחולה",
     "foodCakeCottonCandyPink": "עוגת ממתקים ורודה",
-    "foodCakeCottonCandyPinkThe": "the Candy Pink Cake",
+    "foodCakeCottonCandyPinkThe": "עוגת הממתקים הוורודה",
-    "foodCakeCottonCandyPinkA": "a Candy Pink Cake",
+    "foodCakeCottonCandyPinkA": "עוגת ממתקים ורודה",
     "foodCakeShade": "עוגת שוקולד",
-    "foodCakeShadeThe": "the Chocolate Cake",
+    "foodCakeShadeThe": "עוגת השוקולד",
-    "foodCakeShadeA": "a Chocolate Cake",
+    "foodCakeShadeA": "עוגת שוקולד",
     "foodCakeWhite": "עוגת קצפת",
-    "foodCakeWhiteThe": "the Cream Cake",
+    "foodCakeWhiteThe": "עוגת הקרם",
-    "foodCakeWhiteA": "a Cream Cake",
+    "foodCakeWhiteA": "עוגת קרם",
     "foodCakeGolden": "עוגת דבש",
-    "foodCakeGoldenThe": "the Honey Cake",
+    "foodCakeGoldenThe": "עוגת הדבש",
-    "foodCakeGoldenA": "a Honey Cake",
+    "foodCakeGoldenA": "עוגת דבש",
     "foodCakeZombie": "עוגה רקובה",
-    "foodCakeZombieThe": "the Rotten Cake",
+    "foodCakeZombieThe": "העוגה הרקובה",
-    "foodCakeZombieA": "a Rotten Cake",
+    "foodCakeZombieA": "עוגה רקובה",
     "foodCakeDesert": "עוגת חול",
-    "foodCakeDesertThe": "the Sand Cake",
+    "foodCakeDesertThe": "עוגת החול",
-    "foodCakeDesertA": "a Sand Cake",
+    "foodCakeDesertA": "עוגת חול",
     "foodCakeRed": "עוגת תותים",
-    "foodCakeRedThe": "the Strawberry Cake",
+    "foodCakeRedThe": "עוגת התות",
-    "foodCakeRedA": "a Strawberry Cake",
+    "foodCakeRedA": "עוגת תות",
     "foodCandySkeleton": "סוכריית עצמות חשופות",
     "foodCandySkeletonThe": "the Bare Bones Candy",
     "foodCandySkeletonA": "Bare Bones Candy",
@@ -286,26 +286,26 @@
     "foodCandyCottonCandyPinkThe": "the Sour Pink Candy",
     "foodCandyCottonCandyPinkA": "Sour Pink Candy",
     "foodCandyShade": "סוכריית שוקולד",
-    "foodCandyShadeThe": "the Chocolate Candy",
+    "foodCandyShadeThe": "ממתק השוקולד",
-    "foodCandyShadeA": "Chocolate Candy",
+    "foodCandyShadeA": "ממתק שוקולד",
     "foodCandyWhite": "סוכריית וניל",
-    "foodCandyWhiteThe": "the Vanilla Candy",
+    "foodCandyWhiteThe": "ממתק הווניל",
-    "foodCandyWhiteA": "Vanilla Candy",
+    "foodCandyWhiteA": "ממתק וניל",
     "foodCandyGolden": "סוכריית דבש",
-    "foodCandyGoldenThe": "the Honey Candy",
+    "foodCandyGoldenThe": "ממתק הדבש",
-    "foodCandyGoldenA": "Honey Candy",
+    "foodCandyGoldenA": "ממתק דבש",
     "foodCandyZombie": "סוכריה רקובה",
-    "foodCandyZombieThe": "the Rotten Candy",
+    "foodCandyZombieThe": "הממתק הרקוב",
-    "foodCandyZombieA": "Rotten Candy",
+    "foodCandyZombieA": "ממתק רקוב",
     "foodCandyDesert": "סוכריית חול",
-    "foodCandyDesertThe": "the Sand Candy",
+    "foodCandyDesertThe": "ממתק החול",
-    "foodCandyDesertA": "Sand Candy",
+    "foodCandyDesertA": "ממתק חול",
     "foodCandyRed": "סוכריית קינמון",
-    "foodCandyRedThe": "the Cinnamon Candy",
+    "foodCandyRedThe": "ממתק הקינמון",
-    "foodCandyRedA": "Cinnamon Candy",
+    "foodCandyRedA": "ממתק קינמון",
     "foodSaddleText": "אוכף",
     "foodSaddleNotes": "הופך חיית מחמד לחיית רכיבה בין רגע!",
-    "foodSaddleSellWarningNote": "Hey! This is a pretty useful item! Are you familiar with how to use a Saddle with your Pets?",
+    "foodSaddleSellWarningNote": "אהלן! איזה פריט שימושי! האם יש לך מושג כיצד להשתמש באוכפים עם חיות המחמד שלך?",
     "foodNotes": "האכל בזה את חיות המחמד שלך והן יגדלו לחיות רכיבה חסונות.",
     "hatchingPotionRoseQuartz": "קוורץ ורדרד",
     "hatchingPotionCelestial": "",

website/common/locales/he/defaulttasks.json

@@ -38,5 +38,9 @@
     "healthDailyNotes": "יש ללחוץ כדי לעשות שינויים כלשהם!",
     "exerciseTodoNotes": "יש ללחוץ כדי להוסיף רשימה!",
     "exerciseTodoText": "קביעת זמני אימון",
-    "selfCareDailyNotes": "יש ללחוץ כדי לשנות את לוח הזמנים!"
+    "selfCareDailyNotes": "יש ללחוץ כדי לשנות את לוח הזמנים!",
+    "defaultHabitText": "לחיצה כאן תהפוך את סוג ההרגל להרגל רע שהיית רוצה להפסיק",
+    "creativityTodoNotes": "אפשר ללחוץ כאן כדי לציין את שם המיזם שלך",
+    "schoolDailyNotes": "אפשר ללחוץ כאן ולשנות את שעת שיעורי הבית שלך!",
+    "creativityTodoText": "השלמת מיזם יצירתי"
 }

website/common/locales/he/front.json

@@ -13,7 +13,7 @@
     "companyDonate": "תרומה",
     "forgotPassword": "שכחת את הסיסמה?",
     "emailNewPass": "שליחת דוא״ל עם קישור לאיפוס הסיסמה",
-    "forgotPasswordSteps": "נא למלא את כתובת הדוא״ל בה השתמשת כדי להירשם לחשבון הביטיקה שלך.",
+    "forgotPasswordSteps": "נא לציין את שם המשתמש שלך או את כתובת הדוא״ל איתה נרשמת לחשבון הביטיקה שלך.",
     "sendLink": "שליחת קישור",
     "featuredIn": "מוצגים נוספים",
     "footerDevs": "מפתחים",
@@ -58,7 +58,7 @@
     "oldNews": "חדשות",
     "newsArchive": "News archive on Wikia (multilingual)",
     "setNewPass": "Set New Password",
-    "password": "סיסמא",
+    "password": "סיסמה",
     "playButton": "שחק",
     "playButtonFull": "כניסה להביטיקה",
     "presskit": "ערכה לתקשורת",

website/common/locales/he/generic.json

@@ -24,7 +24,7 @@
     "help": "עזרה",
     "user": "משתמש",
     "market": "שוק",
-    "newSubscriberItem": "You have new <span class=\"notification-bold-blue\">Mystery Items</span>",
+    "newSubscriberItem": "",
     "subscriberItemText": "בכל חודש, מנויים יקבלו פריט מסתורי. הוא הופך לזמין בתחילת החודש. ראו בוויקי את הדף 'Mystery Item' למידע נוסף.",
     "all": "הכול",
     "none": "כלום",
@@ -48,28 +48,28 @@
     "gemsPopoverTitle": "אבני חן",
     "gems": "יהלומים",
     "needMoreGems": "יש לך צורך בעוד יהלומים?",
-    "needMoreGemsInfo": "Purchase Gems now, or become a subscriber to buy Gems with Gold, get monthly mystery items, enjoy increased drop caps and more!",
+    "needMoreGemsInfo": "",
     "veteran": "ותיקים",
-    "veteranText": "סבל את ההאביט האפור (האתר הישן שלנו), וצבר אינספור צלקות קרב מהבאגים שלו",
+    "veteranText": "",
     "originalUser": "משתמש מקורי!",
-    "originalUserText": "אחד מהנרשמים <em>הממש</em> מוקדמים. מישהו אמר בודק אלפא?",
+    "originalUserText": "",
     "habitBirthday": "מסיבת יום ההולדת של Habitica",
     "habitBirthdayText": "חגגו את יום ההולדת של הביטיקה!",
-    "habitBirthdayPluralText": "Celebrated <%= count %> Habitica Birthday Bashes!",
+    "habitBirthdayPluralText": "",
     "habiticaDay": "יום קריאת Habitica בשמה",
-    "habiticaDaySingularText": "חגג את יום קריאת Habitica בשמה! תודה על היותך שחקן נהדר!",
+    "habiticaDaySingularText": "",
-    "habiticaDayPluralText": "Celebrated <%= count %> Naming Days! Thanks for being a fantastic user.",
+    "habiticaDayPluralText": "",
     "achievementDilatory": "המושיעים של עצלניה",
     "achievementDilatoryText": "סייעו להביס את הדרעקון האיום של עצלניה באירוע \"שפריץ הקיץ\" של 2014!",
     "costumeContest": "מתחרה מחופש",
-    "costumeContestText": "Participated in the Habitoween Costume Contest. See some of the awesome entries at blog.habitrpg.com!",
+    "costumeContestText": "",
-    "costumeContestTextPlural": "Participated in <%= count %> Habitoween Costume Contests. See some of the awesome entries at blog.habitrpg.com!",
+    "costumeContestTextPlural": "",
-    "newPassSent": "If we have your email on file, instructions for setting a new password have been sent to your email.",
+    "newPassSent": "",
     "error": "שגיאה",
     "menu": "תפריט",
     "notifications": "התראות",
-    "noNotifications": "You're all caught up!",
+    "noNotifications": "",
-    "noNotificationsText": "The notification fairies give you a raucous round of applause! Well done!",
+    "noNotificationsText": "",
     "clear": "ניקוי",
     "audioTheme": "ערכת מנגינות",
     "audioTheme_off": "כבויה",
@@ -80,14 +80,14 @@
     "audioTheme_rosstavoTheme": "ערכת הנושא של Russtavo",
     "audioTheme_dewinTheme": "ערכת הנושא של Dewin",
     "audioTheme_airuTheme": "ערכת הנושא של Airu",
-    "audioTheme_beatscribeNesTheme": "Beatscribe's NES Theme",
+    "audioTheme_beatscribeNesTheme": "",
-    "audioTheme_arashiTheme": "Arashi's Theme",
+    "audioTheme_arashiTheme": "",
-    "audioTheme_triumphTheme": "Triumph Theme",
+    "audioTheme_triumphTheme": "",
-    "audioTheme_lunasolTheme": "Lunasol Theme",
+    "audioTheme_lunasolTheme": "",
-    "audioTheme_spacePenguinTheme": "SpacePenguin's Theme",
+    "audioTheme_spacePenguinTheme": "",
-    "audioTheme_maflTheme": "MAFL Theme",
+    "audioTheme_maflTheme": "",
-    "audioTheme_pizildenTheme": "Pizilden's Theme",
+    "audioTheme_pizildenTheme": "",
-    "audioTheme_farvoidTheme": "Farvoid Theme",
+    "audioTheme_farvoidTheme": "",
     "reportBug": "דיווח על תקלה",
     "overview": "סיור למשתמשים חדשים",
     "dateFormat": "פורמט תאריך",
@@ -97,11 +97,11 @@
     "achievementBurnoutText": "סייע להביס ״שחיקה״ ולהשיב את ״הרוחות המותשות״ במהלך אירוע פסטיבל השלכת 2015!",
     "achievementBewilder": "מציל של מיסטי",
     "achievementBewilderText": "עזרת להביס את המתפרע במהלך אירוע הפלינג האביבי 2016!",
-    "achievementDysheartener": "Savior of the Shattered",
+    "achievementDysheartener": "",
-    "achievementDysheartenerText": "Helped defeat the Dysheartener during the 2018 Valentine's Event!",
+    "achievementDysheartenerText": "",
     "cards": "כרטיסים",
     "sentCardToUser": "שלחת כרטיס אל <%= profileName %>",
-    "cardReceived": "You received a <span class=\"notification-bold-blue\"><%= card %></span>",
+    "cardReceived": "",
     "greetingCard": "כרטיס ברכה",
     "greetingCardExplanation": "שניכם קיבלתם את הישג החבר העליז!",
     "greetingCardNotes": "שלחו כרטיס ברכה לחבר חבורה.",
@@ -110,7 +110,7 @@
     "greeting2": "׳מנפנף בטירוף׳",
     "greeting3": "הי את/ה!",
     "greetingCardAchievementTitle": "חבר עליז",
-    "greetingCardAchievementText": "Hey! Hi! Hello! Sent or received <%= count %> greeting cards.",
+    "greetingCardAchievementText": "",
     "thankyouCard": "כרטיס תודה",
     "thankyouCardExplanation": "שניכם מקבלים הישג של מודה מאוד!",
     "thankyouCardNotes": "שלח כרטיס תודה לחבר חבורה.",
@@ -119,40 +119,40 @@
     "thankyou2": "שולחים לכם אלפי תודות.",
     "thankyou3": "אני מודה לך מאוד - תודה!",
     "thankyouCardAchievementTitle": "מודה מאוד",
-    "thankyouCardAchievementText": "Thanks for being thankful! Sent or received <%= count %> Thank-You cards.",
+    "thankyouCardAchievementText": "",
     "birthdayCard": "כרטיס יום הולדת",
     "birthdayCardExplanation": "שניכם קיבלתם את הישג בוננזת יום ההולדת!",
     "birthdayCardNotes": "שילחו כרטיס יום הולדת לחבר חבורה.",
     "birthday0": "יום הולדת שמח!",
     "birthdayCardAchievementTitle": "בוננזת יום ההולדת",
-    "birthdayCardAchievementText": "Many happy returns! Sent or received <%= count %> birthday cards.",
+    "birthdayCardAchievementText": "",
     "congratsCard": "כרטיס ברכה",
-    "congratsCardExplanation": "You both receive the Congratulatory Companion achievement!",
+    "congratsCardExplanation": "",
-    "congratsCardNotes": "Send a Congratulations card to a party member.",
+    "congratsCardNotes": "",
-    "congrats0": "Congratulations on your success!",
+    "congrats0": "",
-    "congrats1": "I'm so proud of you!",
+    "congrats1": "אני כל כך גאה בך!",
-    "congrats2": "Well done!",
+    "congrats2": "כל הכבוד!",
-    "congrats3": "A round of applause for you!",
+    "congrats3": "",
-    "congrats4": "Bask in your well-deserved success!",
+    "congrats4": "",
-    "congratsCardAchievementTitle": "Congratulatory Companion",
+    "congratsCardAchievementTitle": "",
-    "congratsCardAchievementText": "It's great to celebrate your friends' achievements! Sent or received <%= count %> congratulations cards.",
+    "congratsCardAchievementText": "",
-    "getwellCard": "Get Well Card",
+    "getwellCard": "",
-    "getwellCardExplanation": "You both receive the Caring Confidant achievement!",
+    "getwellCardExplanation": "",
-    "getwellCardNotes": "Send a Get Well card to a party member.",
+    "getwellCardNotes": "",
-    "getwell0": "Hope you feel better soon!",
+    "getwell0": "",
-    "getwell1": "Take care! <3",
+    "getwell1": "",
-    "getwell2": "You're in my thoughts!",
+    "getwell2": "",
-    "getwell3": "Sorry you're not feeling your best!",
+    "getwell3": "",
-    "getwellCardAchievementTitle": "Caring Confidant",
+    "getwellCardAchievementTitle": "",
-    "getwellCardAchievementText": "Well-wishes are always appreciated. Sent or received <%= count %> get well cards.",
+    "getwellCardAchievementText": "",
-    "goodluckCard": "Good Luck Card",
+    "goodluckCard": "",
-    "goodluckCardExplanation": "You both receive the Lucky Letter achievement!",
+    "goodluckCardExplanation": "",
-    "goodluckCardNotes": "Send a good luck card to a party member.",
+    "goodluckCardNotes": "",
-    "goodluck0": "May luck always follow you!",
+    "goodluck0": "",
-    "goodluck1": "Wishing you lots of luck!",
+    "goodluck1": "",
-    "goodluck2": "I hope luck is on your side today and always!!",
+    "goodluck2": "",
-    "goodluckCardAchievementTitle": "Lucky Letter",
+    "goodluckCardAchievementTitle": "",
-    "goodluckCardAchievementText": "Wishes for good luck are great encouragement! Sent or received <%= count %> good luck cards.",
+    "goodluckCardAchievementText": "",
     "streakAchievement": "הרווחת הישג רצף!",
     "firstStreakAchievement": "רצף של 21 יום",
     "streakAchievementCount": "<%= streaks %> 21-ימי רצף",
@@ -162,25 +162,25 @@
     "wonChallengeShare": "סיימתי אתגר בהביטיקה!",
     "orderBy": "סדר לפי <%= item %>",
     "you": "(אתם)",
-    "loading": "Loading...",
+    "loading": "מתבצעת טעינה...",
-    "userIdRequired": "User ID is required",
+    "userIdRequired": "דרוש מזהה המשתמש",
-    "resetFilters": "Clear all filters",
+    "resetFilters": "ניקוי כל הסינונים",
-    "applyFilters": "Apply Filters",
+    "applyFilters": "החלת הסינון",
     "wantToWorkOn": "I want to work on:",
-    "categories": "Categories",
+    "categories": "קטגוריות",
-    "animals": "Animals",
+    "animals": "חיות",
     "exercise": "Exercise",
-    "creativity": "Creativity",
+    "creativity": "יצירתיות",
     "health_wellness": "Health & Wellness",
     "self_care": "Self-Care",
     "habitica_official": "Habitica Official",
     "academics": "Academics",
     "advocacy_causes": "Advocacy + Causes",
-    "entertainment": "Entertainment",
+    "entertainment": "בידור",
     "finance": "Finance",
-    "health_fitness": "Health + Fitness",
+    "health_fitness": "בריאות + כושר",
     "hobbies_occupations": "Hobbies + Occupations",
-    "location_based": "Location-based",
+    "location_based": "על סמך מיקום",
     "mental_health": "Mental Health + Self-Care",
     "getting_organized": "Getting Organized",
     "self_improvement": "Self-Improvement",
@@ -192,10 +192,10 @@
     "emptyMessagesLine1": "You don't have any messages",
     "emptyMessagesLine2": "Send a message to start a conversation!",
     "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> sent you a message",
-    "letsgo": "Let's Go!",
+    "letsgo": "קדימה!",
-    "selected": "Selected",
+    "selected": "נבחרו",
     "howManyToBuy": "כמה ברצונך לקנות?",
-    "contactForm": "Contact the Moderation Team",
+    "contactForm": "יצירת קשר עם צוות המנהלים",
     "onboardingAchievs": "הישגי הסתגלות",
     "options": "אפשרויות",
     "finish": "לסיים",

website/common/locales/he/groups.json

@@ -14,7 +14,7 @@
     "contributing": "Contributing",
     "faq": "שאלות נפוצות",
     "tutorial": "הדרכה",
-    "glossary": "<a target='_blank' href='http://habitica.fandom.com/wiki/Glossary'>מונחון</a>",
+    "glossary": "<a target='_blank' href='https://habitica.fandom.com/wiki/Glossary'>מונחון</a>",
     "wiki": "ויקי",
     "requestAF": "בקשת תכונה",
     "dataTool": "כלי הצגת נתונים",
@@ -104,11 +104,11 @@
     "whyReportingPostPlaceholder": "Please help our moderators by letting us know why you are reporting this post for a violation, e.g., spam, swearing, religious oaths, bigotry, slurs, adult topics, violence.",
     "optional": "Optional",
     "needsTextPlaceholder": "הקלד את ההודעה שלך כאן.",
-    "copyMessageAsToDo": "העתק הודעה כמשימה.",
+    "copyMessageAsToDo": "העתקת ההודעה בתור משימה לביצוע",
     "copyAsTodo": "העתקה בתור משימה לביצוע",
-    "messageAddedAsToDo": "הודעה הועתקה כמשימה.",
+    "messageAddedAsToDo": "ההודעה הועתקה בתור משימה לביצוע.",
     "leaderOnlyChallenges": "רק מנהיג חבורה יכול לייצר אתגרים",
-    "sendGift": "שלח מתנה",
+    "sendGift": "הענקת מתנה",
     "inviteFriends": "הזמנת חברים",
     "inviteByEmail": "הזמנה בדוא״ל",
     "inviteMembersHowTo": "Invite people via a valid email or 36-digit User ID. If an email isn't registered yet, we'll invite them to join Habitica.",
@@ -141,7 +141,7 @@
     "memberCannotRemoveYourself": "אינכם יכולים להסיר את עצמכם!",
     "groupMemberNotFound": "המשתמשים לא נמצאו מבין חברי הקבוצה",
     "mustBeGroupMember": "חייבים להיות חברים בקבוצה.",
-    "canOnlyInviteEmailUuid": "Can only invite using user IDs, emails, or usernames.",
+    "canOnlyInviteEmailUuid": "אפשר להזמין רק לפי מזהה משתמש, כתובת דוא״ל ושם משתמש.",
     "inviteMissingEmail": "חסרה כתובת אימייל בהזמנה.",
     "inviteMustNotBeEmpty": "Invite must not be empty.",
     "partyMustbePrivate": "חבורות חייבות להיות חסויות",
@@ -162,11 +162,11 @@
     "onlyCreatorOrAdminCanDeleteChat": "אין לך הרשאה למחוק את ההודעה הזאת!",
     "onlyGroupLeaderCanEditTasks": "Not authorized to manage tasks!",
     "onlyGroupTasksCanBeAssigned": "Only group tasks can be assigned",
-    "assignedTo": "Assigned To",
+    "assignedTo": "שיוך אל",
     "assignedToUser": "Assigned to <%- userName %>",
     "assignedToMembers": "Assigned to <%= userCount %> members",
     "assignedToYouAndMembers": "Assigned to you and <%= userCount %> members",
-    "youAreAssigned": "You are assigned to this task",
+    "youAreAssigned": "שויך לך",
     "taskIsUnassigned": "This task is unassigned",
     "confirmUnClaim": "Are you sure you want to unclaim this task?",
     "confirmNeedsWork": "Are you sure you want to mark this task as needing work?",
@@ -269,7 +269,7 @@
     "removeMember": "Remove Member",
     "sendMessage": "Send Message",
     "promoteToLeader": "Transfer Ownership",
-    "inviteFriendsParty": "Inviting friends to your Party will grant you an exclusive <br/> Quest Scroll to battle the Basi-List together!",
+    "inviteFriendsParty": "מזמינים חברים להצטרף לחבורה ומקבלים מגילת הרפתקה <br/> נדירה למלחמה נגד רשימת המלטלות!",
     "createParty": "Create a Party",
     "inviteMembersNow": "Would you like to invite members now?",
     "playInPartyTitle": "Play Habitica in a Party!",
@@ -343,5 +343,20 @@
     "joinGuild": "הצטרפות לגילדה",
     "editGuild": "עריכת הגילדה",
     "editParty": "עריכת החבורה",
-    "leaveGuild": "עזיבת הגילדה"
+    "leaveGuild": "עזיבת הגילדה",
+    "invitedToThisQuest": "הוזמנת להרפתקה!",
+    "unassigned": "לא משויך",
+    "selectGift": "בחירת מתנה",
+    "blockYourself": "לא ניתן לחסום את עצמך",
+    "features": "תכונות",
+    "thisTaskApproved": "המשימה הזאת אושרה",
+    "PMDisabled": "השבתת הודעות פרטיות",
+    "languageSettings": "הגדרות שפה",
+    "joinParty": "הצטרפות לחבורה",
+    "PMCanNotReply": "לא ניתן להגיב לשיחה זו",
+    "newPartyPlaceholder": "נא לציין את שם החבורה שלך.",
+    "sendGiftToWhom": "למי היית רוצה להעניק את המתנה?",
+    "userWithUsernameOrUserIdNotFound": "לא נמצא שם משתמש או מזהה משתמש.",
+    "selectSubscription": "בחירת מינוי",
+    "usernameOrUserId": "נא לציין @שם_משתמש או מזהה משתמש"
 }

website/common/locales/he/inventory.json

@@ -1,6 +1,6 @@
 {
     "noItemsAvailableForType": "אין לך <%= type %>",
-    "foodItemType": "אוכל",
+    "foodItemType": "מזון לחיות מחמד",
     "eggsItemType": "ביצים",
     "hatchingPotionsItemType": "שיקוי בקיעה",
     "specialItemType": "פריטים מיוחדים",

website/common/locales/he/limited.json

@@ -11,9 +11,9 @@
     "valentineCardExplanation": "על עמידתכם בשיר כל כך מתקתק, שניכם מקבלים תג של ״חברים מעריצים״!",
     "valentineCardNotes": "שלח כרטיס יום אהבה לשחקנים בחבורה.",
     "valentine0": "\"הוורדים אדומים\n\nמטלות הן כחולות\n\nנפלא שאנחנו מסיימים\n\nבחבורתך משימות!\"",
-    "valentine1": "״ורדים אדומות\n\nסיגליות נחמדות\n\nבואו ביחד\n\nנלחם בעצלות!״",
+    "valentine1": "\"הוורדים אדומים\n\nהסיגליות נחמדות\n\nבואו ביחד\n\nונילחם בָּעצלנות!\"",
-    "valentine2": "״ורדים אדומות\n\nוהסגנון כבר צהבהב\n\nמקווים שאהבתם\n\nכי השיר עלה 10 מטבעות זהב.״",
+    "valentine2": "\"הוורדים אדומים\n\nוהסגנון כבר צהבהב\n\nמקווה שאהבת\n\nהשיר עולה עשרה מטבעות זהב.\"",
-    "valentine3": "״ורדים אדומות\n\nנטיפי קרח כחולים\n\nאין אוצר טוב\n\nמבילוי עם אהובים!״",
+    "valentine3": "\"הוורדים אדומים\n\nנטיפי הקרח כחולים\n\nאף אוצר לא טוב יותר\n\nמבילוי עם אהובים!\"",
     "valentineCardAchievementTitle": "חברים מעריצים",
     "valentineCardAchievementText": "Aww, you and your friend must really care about each other! Sent or received <%= count %> Valentine's Day cards.",
     "polarBear": "דוב קוטב",

website/common/locales/he/loginincentives.json

@@ -1,25 +1,25 @@
 {
     "unlockedReward": "קיבלת <%= reward %>",
-    "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
+    "earnedRewardForDevotion": "",
-    "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
+    "nextRewardUnlocksIn": "",
-    "awesome": "מגניב!",
+    "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.",
+    "incentivesDescription": "",
-    "checkinEarned": "Your Check-In Counter went up!",
+    "checkinEarned": "",
-    "unlockedCheckInReward": "You unlocked a Check-In Prize!",
+    "unlockedCheckInReward": "",
-    "checkinProgressTitle": "Progress until next",
+    "checkinProgressTitle": "",
-    "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
+    "incentiveBackgroundsUnlockedWithCheckins": "",
-    "oneOfAllPetEggs": "one of each standard Pet Egg",
+    "oneOfAllPetEggs": "",
-    "twoOfAllPetEggs": "two of each standard Pet Egg",
+    "twoOfAllPetEggs": "",
-    "threeOfAllPetEggs": "three of each standard Pet Egg",
+    "threeOfAllPetEggs": "",
-    "oneOfAllHatchingPotions": "one of each standard Hatching Potion",
+    "oneOfAllHatchingPotions": "",
-    "threeOfEachFood": "three of each standard Pet Food",
+    "threeOfEachFood": "",
-    "fourOfEachFood": "four of each standard Pet Food",
+    "fourOfEachFood": "",
-    "twoSaddles": "two Saddles",
+    "twoSaddles": "שני אוכפים",
-    "threeSaddles": "three Saddles",
+    "threeSaddles": "שלושה אוכפים",
-    "incentiveAchievement": "the Royally Loyal achievement",
+    "incentiveAchievement": "",
-    "royallyLoyal": "Royally Loyal",
+    "royallyLoyal": "",
-    "royallyLoyalText": "This user has checked in over 500 times, and has earned every Check-In Prize!",
+    "royallyLoyalText": "",
-    "checkInRewards": "Check-In Rewards",
+    "checkInRewards": "",
-    "backloggedCheckInRewards": "You received Check-In Prizes! Visit your Inventory and Equipment to see what's new."
+    "backloggedCheckInRewards": ""
 }

website/common/locales/he/messages.json

@@ -8,8 +8,8 @@
     "messageCannotFeedPet": "לא ניתן להאכיל חיית מחמד זו.",
     "messageAlreadyMount": "כבר השגת את חיית הרכיבה הזו. נסה להאכיל חיה אחרת.",
     "messageEvolve": "הצלחתם לאלף <%= egg %>, בואו נצא לרכיבה!",
-    "messageLikesFood": "<%= egg %> really likes <%= foodText %>!",
+    "messageLikesFood": "<%= egg %> ממש אוהב את <%= foodText %>!",
-    "messageDontEnjoyFood": "<%= egg %> eats <%= foodText %> but doesn't seem to enjoy it.",
+    "messageDontEnjoyFood": "<%= egg %> אוכל את <%= foodText %> אבל לא ממש נהנה.",
     "messageBought": "קנית <%= itemText %>",
     "messageUnEquipped": "<%= itemText %> לא מצויד.",
     "messageMissingEggPotion": "חסרה לך הביצה או התרופה הזו",
@@ -19,16 +19,16 @@
     "messageNotEnoughGold": "אין מספיק מטבעות",
     "messageTwoHandedEquip": "אחיזה ב<%= twoHandedText %> דורשת שתי ידיים, ולכן הורדתם את <%= offHandedText %>.",
     "messageTwoHandedUnequip": "אחיזה ב<%= twoHandedText %> דורשת שתי ידיים, ולכן הורדתם את הציוד הזה כשהתחמשתם ב<%= offHandedText %>.",
-    "messageDropFood": "You've found <%= dropText %>!",
+    "messageDropFood": "מצאת <%= dropText %>!",
-    "messageDropEgg": "You've found a <%= dropText %> Egg!",
+    "messageDropEgg": "מצאת ביצת <%= dropText %>!",
     "messageDropPotion": "You've found a <%= dropText %> Hatching Potion!",
     "messageDropMysteryItem": "אתם פותחים קופסה ומוצאים <%= dropText %>!",
     "messageAlreadyOwnGear": "כבר יש לך את הפריט הזה. אפשר להצטייד בו מדף הציוד.",
-    "previousGearNotOwned": "You need to purchase a lower level gear before this one.",
+    "previousGearNotOwned": "",
     "messageHealthAlreadyMax": "כבר יש לכם את הבריאות המקסימלית.",
     "messageHealthAlreadyMin": "אוי לא! כבר אזלו לך נקודות הבריאות אז מאוחר מכדי לקנות שיקוי בריאות, אבל לא לדאוג - אפשר לחזור לתחייה!",
     "armoireEquipment": "<%= image %> מצאתם ציוד נדיר בארמואר: <%= dropText %>! מגניב!",
-    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropText %>. What's that doing in here?",
+    "armoireFood": "",
     "armoireExp": "אתם נאבקים בארמואר ומרוויחים ניסיון. קבלו!",
     "messageInsufficientGems": "אין מספיק יהלומים!",
     "messageGroupAlreadyInParty": "כבר בחבורה, נסו לרענן.",
@@ -41,16 +41,16 @@
     "messageGroupChatNotFound": "הודעה לא נמצאה!",
     "messageGroupChatAdminClearFlagCount": "רק מנהל מערכת יכול לאפס את ספירת הדגלים!",
     "messageCannotFlagSystemMessages": "You cannot flag a system message. If you need to report a violation of the Community Guidelines related to this message, please email a screenshot and explanation to Lemoness at <%= communityManagerEmail %>.",
-    "messageGroupChatSpam": "Whoops, looks like you're posting too many messages! Please wait a minute and try again. The Tavern chat only holds 200 messages at a time, so Habitica encourages posting longer, more thoughtful messages and consolidating replies. Can't wait to hear what you have to say. :)",
+    "messageGroupChatSpam": "",
-    "messageCannotLeaveWhileQuesting": "You cannot accept this party invitation while you are in a quest. If you'd like to join this party, you must first abort your quest, which you can do from your party screen. You will be given back the quest scroll.",
+    "messageCannotLeaveWhileQuesting": "",
     "messageUserOperationProtected": "הנתיב `<%= operation %>` לא נשמר, כיוון שהוא מוגן.",
     "messageNotificationNotFound": "התראה לא נמצאה.",
-    "messageNotAbleToBuyInBulk": "This item cannot be purchased in quantities above 1.",
+    "messageNotAbleToBuyInBulk": "",
-    "notificationsRequired": "Notification ids are required.",
+    "notificationsRequired": "",
-    "unallocatedStatsPoints": "You have <span class=\"notification-bold-blue\"><%= points %> unallocated Stat Points</span>",
+    "unallocatedStatsPoints": "",
     "beginningOfConversation": "This is the beginning of your conversation with <%= userName %>. Remember to be kind, respectful, and follow the Community Guidelines!",
-    "messageDeletedUser": "Sorry, this user has deleted their account.",
+    "messageDeletedUser": "המשתמש הזה מחק את חשבונו, עמך הסליחה.",
-    "messageMissingDisplayName": "Missing display name.",
+    "messageMissingDisplayName": "חסר שם תצוגה.",
     "reportedMessage": "דיווחת על ההודעה הזו למנהלים.",
     "canDeleteNow": "אם ברצונך למחוק את ההודעה, ניתן לעשות זאת עכשיו."
 }

website/common/locales/he/pets.json

@@ -1,8 +1,8 @@
 {
     "stable": "אורווה",
     "pets": "חיות מחמד",
-    "activePet": "Active Pet",
+    "activePet": "",
-    "noActivePet": "No Active Pet",
+    "noActivePet": "",
     "petsFound": "חיות מחמד שנאספו",
     "magicPets": "חיות מחמד קסומות",
     "questPets": "חיות הרפתקה",
@@ -26,9 +26,9 @@
     "royalPurpleGryphon": "גריפון סגול מלכותי",
     "phoenix": "עוף חול",
     "magicalBee": "דבורה קסומה",
-    "hopefulHippogriffPet": "Hopeful Hippogriff",
+    "hopefulHippogriffPet": "",
-    "hopefulHippogriffMount": "Hopeful Hippogriff",
+    "hopefulHippogriffMount": "",
-    "royalPurpleJackalope": "Royal Purple Jackalope",
+    "royalPurpleJackalope": "",
     "invisibleAether": "אתר בלתי נראה",
     "potion": "שיקוי <%= potionType %>",
     "egg": "ביצת <%= eggType %>",
@@ -40,7 +40,7 @@
     "haveHatchablePet": "You have a <%= potion %> hatching potion and <%= egg %> egg to hatch this pet! <b>Click</b> the paw print to hatch.",
     "quickInventory": "ציוד מהיר",
     "foodText": "אוכל",
-    "food": "אוכל ואוכפים",
+    "food": "מזון לחיות מחמד ואוכפים",
     "noFoodAvailable": "אין לך אוכל.",
     "noSaddlesAvailable": "אין לך אוכפים.",
     "noFood": "אין לך אוכל או אוכפים",
@@ -51,39 +51,39 @@
     "beastAchievement": "הרווחת את הישג \"אדון החיות\" על איסוף כל חיות המחמד!",
     "beastMasterName": "אלוף החיות",
     "beastMasterText": "מצא את כל 90 חיות המחמד (ממש קשה, ברכו את המשתמש הזה!)",
-    "beastMasterText2": " and has released their pets a total of <%= count %> time(s)",
+    "beastMasterText2": "",
     "mountMasterProgress": "התקדמות אלוף הרוכבים",
     "mountAchievement": "הרווחת את הישג \"אלוף הרוכבים\" מאילוף כל חיות הרכיבה!",
     "mountMasterName": "אלוף הרוכבים",
     "mountMasterText": "אילפו את כל 90 חיות הרכיבה (אפילו יותר קשה, בחאייכם, פרגנו!)",
-    "mountMasterText2": " and has released all 90 of their mounts a total of <%= count %> time(s)",
+    "mountMasterText2": "",
     "triadBingoName": "בינגו משולש",
     "triadBingoText": "מצאו את כל 90 חיות המחמד, אילפו אותן ל 90 חיות רכיבה, ואז מצאה את 90 חיות המחמד הללו שוב! (זה טירוף חושים!!!)",
-    "triadBingoText2": " and has released a full stable a total of <%= count %> time(s)",
+    "triadBingoText2": "",
     "triadBingoAchievement": "הרווחת את הישג ה\"בינגו משולש\" על מציאת כל חיות המחמד, אילוף כולן לחיות רכיבה, ומציאת כולן שוב!",
     "dropsEnabled": "ניתן לבזוז!",
     "firstDrop": "הרווחת את מערכת הביזה! מעתה, בכל פעם שתשלימ/י משימה, יהיה לך סיכוי קטן למצוא חפץ בעל ערך כולל ביצים, שיקויים ואוכל. הרגע מצאת <strong><%= eggText %> ביצה</strong>! <%= eggNotes %>",
-    "hatchedPet": "You hatched a new <%= potion %> <%= egg %>!",
+    "hatchedPet": "",
-    "hatchedPetGeneric": "You hatched a new pet!",
+    "hatchedPetGeneric": "",
-    "hatchedPetHowToUse": "Visit the [Stable](<%= stableUrl %>) to feed and equip your newest pet!",
+    "hatchedPetHowToUse": "",
     "petNotOwned": "חיית המחמד הזו אינה בבעלותך.",
-    "mountNotOwned": "You do not own this mount.",
+    "mountNotOwned": "",
-    "feedPet": "Feed <%= text %> to your <%= name %>?",
+    "feedPet": "",
-    "raisedPet": "You grew your <%= pet %>!",
+    "raisedPet": "",
-    "petName": "<%= potion(locale) %> <%= egg(locale) %>",
+    "petName": "",
-    "mountName": "<%= potion(locale) %> <%= mount(locale) %>",
+    "mountName": "",
-    "keyToPets": "Key to the Pet Kennels",
+    "keyToPets": "",
-    "keyToPetsDesc": "Release all standard Pets so you can collect them again. (Quest Pets and rare Pets are not affected.)",
+    "keyToPetsDesc": "",
-    "keyToMounts": "Key to the Mount Kennels",
+    "keyToMounts": "",
-    "keyToMountsDesc": "Release all standard Mounts so you can collect them again. (Quest Mounts and rare Mounts are not affected.)",
+    "keyToMountsDesc": "",
-    "keyToBoth": "Master Keys to the Kennels",
+    "keyToBoth": "",
-    "keyToBothDesc": "Release all standard Pets and Mounts so you can collect them again. (Quest Pets/Mounts and rare Pets/Mounts are not affected.)",
+    "keyToBothDesc": "",
-    "releasePetsConfirm": "Are you sure you want to release your standard Pets?",
+    "releasePetsConfirm": "",
-    "releasePetsSuccess": "Your standard Pets have been released!",
+    "releasePetsSuccess": "",
-    "releaseMountsConfirm": "Are you sure you want to release your standard Mounts?",
+    "releaseMountsConfirm": "",
-    "releaseMountsSuccess": "Your standard Mounts have been released!",
+    "releaseMountsSuccess": "",
-    "releaseBothConfirm": "Are you sure you want to release your standard Pets and Mounts?",
+    "releaseBothConfirm": "",
-    "releaseBothSuccess": "Your standard Pets and Mounts have been released!",
+    "releaseBothSuccess": "",
     "petsReleased": "חיות המחמד שוחררו.",
     "mountsAndPetsReleased": "חיות המחמד וחיות הרכיבה שוחררו",
     "mountsReleased": "חיות הרכיבה שוחררו",
@@ -96,18 +96,18 @@
     "filterByQuest": "הרפתקה",
     "standard": "‫בסיסי",
     "sortByColor": "צבע",
-    "sortByHatchable": "Hatchable",
+    "sortByHatchable": "",
     "hatch": "לבקוע!",
     "foodTitle": "אוכל",
-    "dragThisFood": "Drag this <%= foodName %> to a Pet and watch it grow!",
+    "dragThisFood": "",
-    "clickOnPetToFeed": "Click on a Pet to feed <%= foodName %> and watch it grow!",
+    "clickOnPetToFeed": "",
-    "dragThisPotion": "Drag this <%= potionName %> to an Egg and hatch a new pet!",
+    "dragThisPotion": "",
-    "clickOnEggToHatch": "Click on an Egg to use your <%= potionName %> hatching potion and hatch a new pet!",
+    "clickOnEggToHatch": "",
-    "hatchDialogText": "Pour your <%= potionName %> hatching potion on your <%= eggName %> egg, and it will hatch into a <%= petName %>.",
+    "hatchDialogText": "",
-    "clickOnPotionToHatch": "Click on a hatching potion to use it on your <%= eggName %> and hatch a new pet!",
+    "clickOnPotionToHatch": "",
-    "notEnoughPets": "You have not collected enough pets",
+    "notEnoughPets": "",
-    "notEnoughMounts": "You have not collected enough mounts",
+    "notEnoughMounts": "",
-    "notEnoughPetsMounts": "You have not collected enough pets and mounts",
+    "notEnoughPetsMounts": "",
     "wackyPets": "חיות מטורפות",
     "filterByWacky": "מטורפים"
 }

website/common/locales/he/quests.json

@@ -3,38 +3,38 @@
     "quest": "הרפתקה",
     "petQuests": "הרפתקאות של חיות מחמד וחיות רכיבה",
     "unlockableQuests": "הרפתקאות שאינן ניתנות לפתיחה",
-    "goldQuests": "Masterclasser Quest Lines",
+    "goldQuests": "",
     "questDetails": "פרטי הרפתקה",
-    "questDetailsTitle": "Quest Details",
+    "questDetailsTitle": "פרטי ההרפתקה",
-    "questDescription": "Quests allow players to focus on long-term, in-game goals with the members of their party.",
+    "questDescription": "",
     "invitations": "הזמנות",
     "completed": "הושלם!",
-    "rewardsAllParticipants": "Rewards for all Quest Participants",
+    "rewardsAllParticipants": "",
-    "rewardsQuestOwner": "Additional Rewards for Quest Owner",
+    "rewardsQuestOwner": "",
     "inviteParty": "הזמינו את החבורה להרפתקה",
     "questInvitation": "הזמנה להרפתקה:",
     "questInvitationInfo": "הזמנה להרפתקה <%= quest %> ",
-    "invitedToQuest": "You were invited to the Quest <span class=\"notification-bold-blue\"><%= quest %></span>",
+    "invitedToQuest": "",
     "askLater": "שאלו אחר כך",
     "buyQuest": "קנו הרפתקה",
     "accepted": "מוסכם",
-    "declined": "Declined",
+    "declined": "",
     "rejected": "נדחה",
     "pending": "ממתין לתשובה",
-    "questCollection": "+ <%= val %> quest item(s) found",
+    "questCollection": "",
     "questDamage": "+ <%= val %> damage to boss",
     "begin": "התחל",
-    "bossHP": "Boss HP",
+    "bossHP": "",
     "bossStrength": "עוצמת האויב",
     "rage": "זעם",
     "collect": "לאסוף",
     "collected": "נאסף",
     "abort": "בטל",
     "leaveQuest": "עיזבו את ההרפתקה",
-    "sureLeave": "האם אתם בטוחים שאתם מעוניינים לעזוב את ההרפתקה הפעילה? כל ההתקדמות בהרפתקה תאבד.",
+    "sureLeave": "לעזוב את ההרפתקה? כל ההתקדמות תרד לטמיון.",
     "mustComplete": "קודם עליך להשלים את <%= quest %>",
     "mustLvlQuest": "עליכם להיות בדרגה <%= level %> כדי לקנות את ההרפתקה הזו!",
-    "unlockByQuesting": "To unlock this quest, complete <%= title %>.",
+    "unlockByQuesting": "",
     "questConfirm": "Are you sure? Only <%= questmembers %> of your <%= totalmembers %> party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation.",
     "sureCancel": "האם אתם בטוחים שברצונכם לבטל את ההרפתקה? כל ההסכמות להשתתפות יאבדו, ובעלי ההרפתקה ישמרו בעלות על המגילה.",
     "sureAbort": "האם אתם בטוחים שברצונכם לבטל את ההרפתקה הזו? היא תבוטל עבור כל החבורה שלכם, וההתקדמות שלכם תאבד. המגילה תוחזר לבעלי ההרפתקה.",
@@ -48,13 +48,13 @@
     "guildQuestsNotSupported": "לא ניתן להזמין גילדות להרפתקה.",
     "questNotOwned": "אין ברשותכם את המגילה הזו.",
     "questNotGoldPurchasable": "לא ניתן לרכוש את ההרפתקה \"<%= key %>\" עם מטבעות זהב.",
-    "questNotGemPurchasable": "Quest \"<%= key %>\" is not a Gem-purchasable quest.",
+    "questNotGemPurchasable": "",
     "questAlreadyUnderway": "החבורה שלכם נמצאת כבר במהלכה של הרפתקה. נסו שוב כשזו תסתיים.",
     "questAlreadyAccepted": "כבר הסכמתם להזמנה להרפתקה.",
     "noActiveQuestToLeave": "אין הרפתקה לעזוב",
     "questLeaderCannotLeaveQuest": "מנהיג ההרפתקה לא יכול לעזוב אותה",
     "notPartOfQuest": "אינכם חלק מההרפתקה.",
-    "youAreNotOnQuest": "You're not on a quest",
+    "youAreNotOnQuest": "",
     "noActiveQuestToAbort": "אין כרגע הרפתקה פעילה כדי לבטל אותה.",
     "onlyLeaderAbortQuest": "רק מנהיג החבורה או ההרפתקה יכולים לבטל הרפתקה.",
     "questAlreadyRejected": "כבר דחיתם את ההזמנה להרפתקה.",
@@ -62,14 +62,15 @@
     "onlyLeaderCancelQuest": "רק מנהיגי החבורה או מובילי ההרפתקה יכולים לבטל אותה.",
     "questNotPending": "אין הרפתקאות זמינות.",
     "questOrGroupLeaderOnlyStartQuest": "רק מנהיג החבורה או מי שהזמין להרפתקה יכולים להכריח את כולם לצאת לדרך.",
-    "loginIncentiveQuest": "To unlock this quest, check in to Habitica on <%= count %> different days!",
+    "loginIncentiveQuest": "",
-    "loginReward": "<%= count %> Check-ins",
+    "loginReward": "",
-    "questBundles": "Discounted Quest Bundles",
+    "questBundles": "",
     "noQuestToStart": "Can’t find a quest to start? Try checking out the Quest Shop in the Market for new releases!",
-    "pendingDamage": "<%= damage %> pending damage",
+    "pendingDamage": "",
-    "pendingDamageLabel": "pending damage",
+    "pendingDamageLabel": "",
-    "bossHealth": "<%= currentHealth %> / <%= maxHealth %> Health",
+    "bossHealth": "",
-    "rageAttack": "Rage Attack:",
+    "rageAttack": "",
-    "bossRage": "<%= currentRage %> / <%= maxRage %> Rage",
+    "bossRage": "",
-    "rageStrikes": "Rage Strikes"
+    "rageStrikes": "",
+    "questAlreadyStarted": "ההרפתקה כבר החלה."
 }

website/common/locales/he/questscontent.json

@@ -1,7 +1,7 @@
 {
     "questEvilSantaText": "סנטה הסוהר",
     "questEvilSantaNotes": "שאגה מיוסרת נשמעת הרחק בשדות הקרח. אתם עוקבים אחר הנהמות והשאגות - המלוות בקול צחקוק משונה - לקרחת יער בה נמצאת דובת קוטב בוגרת. היא כלואה ואזוקה, נלחמת על חייה. מעל הכלוב שלה מרקד שדון קטן ומרושע, לבוש בתחפושת חג מולד בלויה. חסל את סנטה הסוהר ושחרר את הדובה!",
-    "questEvilSantaCompletion": "סנטה הסוהר צווח בכעס, ונס אל הלילה. הדובה אסירת התודה, דרך נהמות ושאגות, מנסה לספר לך משהו. לאחר מסע לאורווה, אדון החיות - מאט בוך מקשיב לסיפורה ומזדעק באימה. יש לה גור! הוא רץ לשדות הקרח כשאמו נכלאה.",
+    "questEvilSantaCompletion": "סנטה הסוהר צווח בכעס, ובורח לתוך הלילה. הדובה אסירת התודה, דרך נהמות ושאגות, מנסה לספר לך משהו. לאחר מסע לאורווה, אדון החיות - מאט בוך מקשיב לסיפורה ומזדעק באימה. יש לה גור! הוא רץ לשדות הקרח כשאמו נכלאה.",
     "questEvilSantaBoss": "סנטה הסוהר",
     "questEvilSantaDropBearCubPolarMount": "דוב קוטב (חיית רכיבה)",
     "questEvilSanta2Text": "מצאו את הגור",