4.232.2

chore(packages): update locks
Merge branch 'origin/develop' into Weblate.
2026-05-21 11:50:06 -05:00 · 2022-06-03 14:04:49 -05:00 · 2022-06-03 14:04:45 -05:00 · 2022-06-03 20:54:11 +02:00 · 2022-06-03 20:53:57 +02:00 · 2022-06-03 14:34:35 -04:00
185 changed files with 4707 additions and 3847 deletions
@@ -0,0 +1,128 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20220524_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['Alligator-Base']
+      && pets['Alligator-CottonCandyBlue']
+      && pets['Alligator-CottonCandyPink']
+      && pets['Alligator-Desert']
+      && pets['Alligator-Golden']
+      && pets['Alligator-Red']
+      && pets['Alligator-Shade']
+      && pets['Alligator-Skeleton']
+      && pets['Alligator-White']
+      && pets['Alligator-Zombie']
+      && pets['Snake-Base']
+      && pets['Snake-CottonCandyBlue']
+      && pets['Snake-CottonCandyPink']
+      && pets['Snake-Desert']
+      && pets['Snake-Golden']
+      && pets['Snake-Red']
+      && pets['Snake-Shade']
+      && pets['Snake-Skeleton']
+      && pets['Snake-White']
+      && pets['Snake-Zombie']
+      && pets['Triceratops-Base']
+      && pets['Triceratops-CottonCandyBlue']
+      && pets['Triceratops-CottonCandyPink']
+      && pets['Triceratops-Desert']
+      && pets['Triceratops-Golden']
+      && pets['Triceratops-Red']
+      && pets['Triceratops-Shade']
+      && pets['Triceratops-Skeleton']
+      && pets['Triceratops-White']
+      && pets['Triceratops-Zombie']
+      && pets['TRex-Base']
+      && pets['TRex-CottonCandyBlue']
+      && pets['TRex-CottonCandyPink']
+      && pets['TRex-Desert']
+      && pets['TRex-Golden']
+      && pets['TRex-Red']
+      && pets['TRex-Shade']
+      && pets['TRex-Skeleton']
+      && pets['TRex-White']
+      && pets['TRex-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['Turtle-Base']
+      && pets['Turtle-CottonCandyBlue']
+      && pets['Turtle-CottonCandyPink']
+      && pets['Turtle-Desert']
+      && pets['Turtle-Golden']
+      && pets['Turtle-Red']
+      && pets['Turtle-Shade']
+      && pets['Turtle-Skeleton']
+      && pets['Turtle-White']
+      && pets['Turtle-Zombie']
+      && pets['Velociraptor-Base']
+      && pets['Velociraptor-CottonCandyBlue']
+      && pets['Velociraptor-CottonCandyPink']
+      && pets['Velociraptor-Desert']
+      && pets['Velociraptor-Golden']
+      && pets['Velociraptor-Red']
+      && pets['Velociraptor-Shade']
+      && pets['Velociraptor-Skeleton']
+      && pets['Velociraptor-White']
+      && pets['Velociraptor-Zombie']) {
+        set['achievements.reptacularRumble'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    // migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2022-01-01') },
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1]._id,
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};
@@ -1,11 +1,11 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.230.0",
+  "version": "4.232.2",
  "main": "./website/server/index.js",
  "dependencies": {
    "@babel/core": "^7.17.10",
-    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-env": "^7.18.2",
    "@babel/register": "^7.17.7",
    "@google-cloud/trace-agent": "^5.1.6",
    "@parse/node-apn": "^5.1.3",
@@ -27,10 +27,10 @@
    "eslint": "^6.8.0",
    "eslint-config-habitrpg": "^6.2.0",
    "eslint-plugin-mocha": "^5.0.0",
-    "express": "^4.17.3",
+    "express": "^4.18.1",
    "express-basic-auth": "^1.2.1",
    "express-validator": "^5.2.0",
-    "glob": "^8.0.1",
+    "glob": "^8.0.3",
    "got": "^11.8.3",
    "gulp": "^4.0.0",
    "gulp-babel": "^8.0.0",
@@ -43,7 +43,7 @@
    "in-app-purchase": "^1.11.3",
    "js2xmlparser": "^4.0.2",
    "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^2.1.0",
+    "jwks-rsa": "^2.1.3",
    "lodash": "^4.17.21",
    "merge-stream": "^2.0.0",
    "method-override": "^3.0.0",
@@ -54,7 +54,7 @@
    "nconf": "^0.12.0",
    "node-gcm": "^1.0.5",
    "on-headers": "^1.0.2",
-    "passport": "^0.5.0",
+    "passport": "^0.6.0",
    "passport-facebook": "^3.0.0",
    "passport-google-oauth2": "^0.2.0",
    "passport-google-oauth20": "2.0.0",
@@ -64,10 +64,10 @@
    "rate-limiter-flexible": "^2.3.7",
    "redis": "^3.1.2",
    "regenerator-runtime": "^0.13.9",
-    "remove-markdown": "^0.3.0",
+    "remove-markdown": "^0.5.0",
    "rimraf": "^3.0.2",
    "short-uuid": "^4.2.0",
-    "stripe": "^8.219.0",
+    "stripe": "^8.222.0",
    "superagent": "^7.1.3",
    "universal-analytics": "^0.5.3",
    "useragent": "^2.1.9",
@@ -110,7 +110,7 @@
    "apidoc": "gulp apidoc"
  },
  "devDependencies": {
-    "axios": "^0.26.1",
+    "axios": "^0.27.2",
    "chai": "^4.3.6",
    "chai-as-promised": "^7.1.1",
    "chai-moment": "^0.1.0",
@@ -42,3 +42,109 @@ describe('xml marshaller marshalls user data', () => {
 </user>`);
  });
 });
+
+describe('xml marshaller marshalls user data (with purchases)', () => {
+  const minimumUser = {
+    pinnedItems: [],
+    unpinnedItems: [],
+    inbox: {},
+  };
+
+  function userDataWith (fields) {
+    return { ...minimumUser, ...fields };
+  }
+
+  it('maps the purchases field with data that begins with a number', () => {
+    const userData = userDataWith({
+      purchased: {
+        ads: false,
+        txnCount: 0,
+        skin: {
+          eb052b: true,
+          '0ff591': true,
+          '2b43f6': true,
+          d7a9f7: true,
+          '800ed0': true,
+          rainbow: true,
+        },
+      },
+    });
+
+    const xml = xmlMarshaller.marshallUserData(userData);
+
+    expect(xml).to.equal(`<user>
+    <inbox/>
+    <purchased>
+        <ads>false</ads>
+        <txnCount>0</txnCount>
+        <skin>eb052b</skin>
+        <skin>0ff591</skin>
+        <skin>2b43f6</skin>
+        <skin>d7a9f7</skin>
+        <skin>800ed0</skin>
+        <skin>rainbow</skin>
+    </purchased>
+</user>`);
+  });
+});
+
+describe('xml marshaller marshalls user data (with purchases nested)', () => {
+  const minimumUser = {
+    pinnedItems: [],
+    unpinnedItems: [],
+    inbox: {},
+  };
+
+  function userDataWith (fields) {
+    return { ...minimumUser, ...fields };
+  }
+
+  it('maps the purchases field with data that begins with a number and nested objects', () => {
+    const userData = userDataWith({
+      purchased: {
+        ads: false,
+        txnCount: 0,
+        skin: {
+          eb052b: true,
+          '0ff591': true,
+          '2b43f6': true,
+          d7a9f7: true,
+          '800ed0': true,
+          rainbow: true,
+        },
+        plan: {
+          consecutive: {
+            count: 0,
+            offset: 0,
+            gemCapExtra: 0,
+            trinkets: 0,
+          },
+        },
+      },
+    });
+
+    const xml = xmlMarshaller.marshallUserData(userData);
+
+    expect(xml).to.equal(`<user>
+    <inbox/>
+    <purchased>
+        <ads>false</ads>
+        <txnCount>0</txnCount>
+        <skin>eb052b</skin>
+        <skin>0ff591</skin>
+        <skin>2b43f6</skin>
+        <skin>d7a9f7</skin>
+        <skin>800ed0</skin>
+        <skin>rainbow</skin>
+        <plan>
+            <item>
+                <count>0</count>
+                <offset>0</offset>
+                <gemCapExtra>0</gemCapExtra>
+                <trinkets>0</trinkets>
+            </item>
+        </plan>
+    </purchased>
+</user>`);
+  });
+});
@@ -634,7 +634,7 @@ describe('User Model', () => {
      user = await user.save();
      // verify that it's been awarded
      expect(user.achievements.beastMaster).to.equal(true);
-      expect(user.notifications.find(notification => notification.type === 'ACHIEVEMENT_BEAST_MASTER')).to.exist;
+      expect(user.notifications.find(notification => notification.type === 'ACHIEVEMENT_STABLE')).to.exist;

      // reset the user
      user.achievements.beastMasterCount = 0;
@@ -683,9 +683,9 @@ describe('User Model', () => {

      user = await user.save();
      // verify that it's been awarded
-      expect(user.notifications.find(notification => notification.type === 'ACHIEVEMENT_BEAST_MASTER')).to.exist;
-      expect(user.notifications.find(notification => notification.type === 'ACHIEVEMENT_MOUNT_MASTER')).to.exist;
-      expect(user.notifications.find(notification => notification.type === 'ACHIEVEMENT_TRIAD_BINGO')).to.exist;
+      expect(user.notifications.find(
+        notification => notification.type === 'ACHIEVEMENT_STABLE',
+      )).to.exist;
    });

    context('manage unallocated stats points notifications', () => {
@@ -13,26 +13,26 @@
    "storybook:serve": "vue-cli-service storybook:serve -p 6006 -c config/storybook"
  },
  "dependencies": {
-    "@storybook/addon-actions": "6.4.19",
+    "@storybook/addon-actions": "6.5.6",
    "@storybook/addon-knobs": "6.2.9",
-    "@storybook/addon-links": "6.4.18",
+    "@storybook/addon-links": "6.5.6",
    "@storybook/addon-notes": "5.3.21",
    "@storybook/addons": "6.4.19",
    "@storybook/vue": "6.3.13",
    "@vue/cli-plugin-babel": "^4.5.15",
-    "@vue/cli-plugin-eslint": "^4.5.15",
+    "@vue/cli-plugin-eslint": "^4.5.17",
    "@vue/cli-plugin-router": "^4.5.15",
    "@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.17.0",
+    "amplitude-js": "^8.18.4",
    "axios": "^0.25.0",
    "axios-progress-bar": "^1.2.0",
    "babel-eslint": "^10.1.0",
    "bootstrap": "^4.6.0",
-    "bootstrap-vue": "^2.21.2",
+    "bootstrap-vue": "^2.22.0",
    "chai": "^4.3.6",
-    "core-js": "^3.21.0",
+    "core-js": "^3.22.7",
    "eslint": "^6.8.0",
    "eslint-config-habitrpg": "^6.2.0",
    "eslint-plugin-mocha": "^5.3.0",
@@ -40,14 +40,14 @@
    "habitica-markdown": "^3.0.0",
    "hellojs": "^1.19.5",
    "inspectpack": "^4.7.1",
-    "intro.js": "^5.0.0",
+    "intro.js": "^5.1.0",
    "jquery": "^3.6.0",
    "lodash": "^4.17.21",
-    "moment": "^2.29.1",
+    "moment": "^2.29.3",
    "nconf": "^0.11.3",
    "sass": "^1.34.0",
    "sass-loader": "^8.0.2",
-    "smartbanner.js": "^1.17.0",
+    "smartbanner.js": "^1.19.0",
    "svg-inline-loader": "^0.8.2",
    "svg-url-loader": "^7.1.1",
    "svgo": "^1.3.2",
@@ -57,13 +57,13 @@
    "vue": "^2.6.14",
    "vue-cli-plugin-storybook": "2.1.0",
    "vue-mugen-scroll": "^0.2.6",
-    "vue-router": "^3.5.3",
+    "vue-router": "^3.5.4",
    "vue-template-compiler": "^2.6.14",
    "vuedraggable": "^2.24.3",
    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
    "webpack": "^4.46.0"
  },
  "devDependencies": {
-    "@babel/plugin-proposal-optional-chaining": "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining": "^7.17.12"
  }
 }
@@ -183,6 +183,11 @@
  width: 48px;
  height: 52px;
 }
+.achievement-groupsBeta20222x {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-groupsBeta20222x.png');
+  width: 67px;
+  height: 67px;
+}
 .achievement-guild2x {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-guild2x.png');
  width: 48px;
@@ -303,6 +308,11 @@
  width: 64px;
  height: 56px;
 }
+.achievement-reptacularRumble2x {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-reptacularRumble2x.png');
+  width: 60px;
+  height: 64px;
+}
 .achievement-rosyOutlook2x {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-rosyOutlook2x.png');
  width: 64px;
@@ -26715,6 +26725,31 @@
  width: 68px;
  height: 68px;
 }
+.back_mystery_202206 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202206.png');
+  width: 114px;
+  height: 90px;
+}
+.head_mystery_202206 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202206.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_back_mystery_202206 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_back_mystery_202206.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_mystery_202206 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202206.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202206 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202206.png');
+  width: 68px;
+  height: 68px;
+}
 .broad_armor_mystery_301404 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
  width: 90px;
@@ -32039,204 +32074,6 @@
  width: 68px;
  height: 68px;
 }
-.headAccessory_special_bearEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_bearEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_blackHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blackHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_blueHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blueHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_cactusEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_cactusEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_foxEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_foxEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_greenHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_greenHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_lionEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_lionEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pandaEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_pandaEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pigEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_pigEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pinkHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pinkHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_redHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_redHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_tigerEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_tigerEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_whiteHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_whiteHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_wolfEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png');
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_wolfEars {
-  background-position: -25px -15px;
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png');
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_yellowHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_yellowHeadband.png');
-  width: 114px;
-  height: 90px;
-}
-.shop_headAccessory_special_bearEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_bearEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_blackHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blackHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_blueHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blueHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_cactusEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_cactusEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_foxEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_foxEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_greenHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_greenHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_lionEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_lionEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_pandaEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pandaEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_pigEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pigEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_pinkHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pinkHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_redHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_redHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_tigerEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_tigerEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_whiteHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_whiteHeadband.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_wolfEars {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_wolfEars.png');
-  width: 68px;
-  height: 68px;
-}
-.shop_headAccessory_special_yellowHeadband {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_yellowHeadband.png');
-  width: 68px;
-  height: 68px;
-}
 .head_0 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_0.png');
  width: 90px;
@@ -32618,6 +32455,204 @@
  width: 68px;
  height: 68px;
 }
+.headAccessory_special_bearEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_bearEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_bearEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_blackHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blackHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_blueHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_blueHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_cactusEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_cactusEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_cactusEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_foxEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_foxEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_foxEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_greenHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_greenHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_lionEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_lionEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_lionEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pandaEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_pandaEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pandaEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pigEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_pigEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pigEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pinkHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_pinkHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_redHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_redHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_tigerEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_tigerEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_tigerEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_whiteHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_whiteHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_wolfEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png');
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_wolfEars {
+  background-position: -25px -15px;
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_wolfEars.png');
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_yellowHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_special_yellowHeadband.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_headAccessory_special_bearEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_bearEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_blackHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blackHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_blueHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_blueHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_cactusEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_cactusEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_foxEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_foxEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_greenHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_greenHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_lionEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_lionEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_pandaEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pandaEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_pigEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pigEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_pinkHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_pinkHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_redHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_redHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_tigerEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_tigerEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_whiteHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_whiteHeadband.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_wolfEars {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_wolfEars.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_special_yellowHeadband {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_special_yellowHeadband.png');
+  width: 68px;
+  height: 68px;
+}
 .shield_healer_1 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_healer_1.png');
  width: 90px;
@@ -1,60 +0,0 @@
-<template>
-  <b-modal
-    id="just-add-water"
-    :title="title"
-    size="md"
-    :hide-footer="true"
-  >
-    <div class="modal-body">
-      <div class="col-12">
-        <achievement-avatar class="avatar" />
-      </div>
-      <div class="col-6 offset-3 text-center">
-        <p>{{ $t('achievementJustAddWaterModalText') }}</p>
-        <button
-          class="btn btn-primary"
-          @click="close()"
-        >
-          {{ $t('huzzah') }}
-        </button>
-      </div>
-    </div>
-    <achievement-footer />
-  </b-modal>
-</template>
-
-<style scoped>
-  .avatar {
-    width: 140px;
-    margin: 0 auto;
-    margin-bottom: 1.5em;
-    margin-top: 1.5em;
-  }
-</style>
-
-<script>
-import achievementFooter from './achievementFooter';
-import achievementAvatar from './achievementAvatar';
-
-import { mapState } from '@/libs/store';
-
-export default {
-  components: {
-    achievementFooter,
-    achievementAvatar,
-  },
-  data () {
-    return {
-      title: `${this.$t('modalAchievement')} ${this.$t('achievementJustAddWater')}`,
-    };
-  },
-  computed: {
-    ...mapState({ user: 'user.data' }),
-  },
-  methods: {
-    close () {
-      this.$root.$emit('bv::hide::modal', 'just-add-water');
-    },
-  },
-};
-</script>
@@ -1,60 +0,0 @@
-<template>
-  <b-modal
-    id="lost-masterclasser"
-    :title="title"
-    size="md"
-    :hide-footer="true"
-  >
-    <div class="modal-body">
-      <div class="col-12">
-        <achievement-avatar class="avatar" />
-      </div>
-      <div class="col-6 offset-3 text-center">
-        <p>{{ $t('achievementLostMasterclasserModalText') }}</p>
-        <button
-          class="btn btn-primary"
-          @click="close()"
-        >
-          {{ $t('huzzah') }}
-        </button>
-      </div>
-    </div>
-    <achievement-footer />
-  </b-modal>
-</template>
-
-<style scoped>
-  .avatar {
-    width: 140px;
-    margin: 0 auto;
-    margin-bottom: 1.5em;
-    margin-top: 1.5em;
-  }
-</style>
-
-<script>
-import achievementFooter from './achievementFooter';
-import achievementAvatar from './achievementAvatar';
-
-import { mapState } from '@/libs/store';
-
-export default {
-  components: {
-    achievementFooter,
-    achievementAvatar,
-  },
-  data () {
-    return {
-      title: `${this.$t('modalAchievement')} ${this.$t('achievementLostMasterclasser')}`,
-    };
-  },
-  computed: {
-    ...mapState({ user: 'user.data' }),
-  },
-  methods: {
-    close () {
-      this.$root.$emit('bv::hide::modal', 'lost-masterclasser');
-    },
-  },
-};
-</script>
@@ -1,60 +0,0 @@
-<template>
-  <b-modal
-    id="mind-over-matter"
-    :title="title"
-    size="md"
-    :hide-footer="true"
-  >
-    <div class="modal-body">
-      <div class="col-12">
-        <achievement-avatar class="avatar" />
-      </div>
-      <div class="col-6 offset-3 text-center">
-        <p>{{ $t('achievementMindOverMatterModalText') }}</p>
-        <button
-          class="btn btn-primary"
-          @click="close()"
-        >
-          {{ $t('huzzah') }}
-        </button>
-      </div>
-    </div>
-    <achievement-footer />
-  </b-modal>
-</template>
-
-<style scoped>
-  .avatar {
-    width: 140px;
-    margin: 0 auto;
-    margin-bottom: 1.5em;
-    margin-top: 1.5em;
-  }
-</style>
-
-<script>
-import achievementFooter from './achievementFooter';
-import achievementAvatar from './achievementAvatar';
-
-import { mapState } from '@/libs/store';
-
-export default {
-  components: {
-    achievementFooter,
-    achievementAvatar,
-  },
-  data () {
-    return {
-      title: `${this.$t('modalAchievement')} ${this.$t('achievementMindOverMatter')}`,
-    };
-  },
-  computed: {
-    ...mapState({ user: 'user.data' }),
-  },
-  methods: {
-    close () {
-      this.$root.$emit('bv::hide::modal', 'mind-over-matter');
-    },
-  },
-};
-</script>
@@ -1,34 +0,0 @@
-<template>
-  <base-notification
-    :can-remove="canRemove"
-    :notification="notification"
-    :read-after-click="true"
-    @click="action"
-  >
-    <div
-      slot="content"
-      v-html="achievementString"
-    ></div>
-  </base-notification>
-</template>
-
-<script>
-import BaseNotification from './base';
-
-export default {
-  components: {
-    BaseNotification,
-  },
-  props: ['notification', 'canRemove'],
-  computed: {
-    achievementString () {
-      return `<strong>${this.$t('achievement')}</strong>: ${this.$t('achievementJustAddWater')}`;
-    },
-  },
-  methods: {
-    action () {
-      this.$root.$emit('bv::show::modal', 'just-add-water');
-    },
-  },
-};
-</script>
@@ -1,34 +0,0 @@
-<template>
-  <base-notification
-    :can-remove="canRemove"
-    :notification="notification"
-    :read-after-click="true"
-    @click="action"
-  >
-    <div
-      slot="content"
-      v-html="achievementString"
-    ></div>
-  </base-notification>
-</template>
-
-<script>
-import BaseNotification from './base';
-
-export default {
-  components: {
-    BaseNotification,
-  },
-  props: ['notification', 'canRemove'],
-  computed: {
-    achievementString () {
-      return `<strong>${this.$t('achievement')}</strong>: ${this.$t('achievementLostMasterclasser')}`;
-    },
-  },
-  methods: {
-    action () {
-      this.$root.$emit('bv::show::modal', 'lost-masterclasser');
-    },
-  },
-};
-</script>
@@ -1,34 +0,0 @@
-<template>
-  <base-notification
-    :can-remove="canRemove"
-    :notification="notification"
-    :read-after-click="true"
-    @click="action"
-  >
-    <div
-      slot="content"
-      v-html="achievementString"
-    ></div>
-  </base-notification>
-</template>
-
-<script>
-import BaseNotification from './base';
-
-export default {
-  components: {
-    BaseNotification,
-  },
-  props: ['notification', 'canRemove'],
-  computed: {
-    achievementString () {
-      return `<strong>${this.$t('achievement')}</strong>: ${this.$t('achievementMindOverMatter')}`;
-    },
-  },
-  methods: {
-    action () {
-      this.$root.$emit('bv::show::modal', 'mind-over-matter');
-    },
-  },
-};
-</script>
@@ -140,9 +140,6 @@ import NEW_INBOX_MESSAGE from './notifications/newPrivateMessage';
 import NEW_CHAT_MESSAGE from './notifications/newChatMessage';
 import WORLD_BOSS from './notifications/worldBoss';
 import VERIFY_USERNAME from './notifications/verifyUsername';
-import ACHIEVEMENT_JUST_ADD_WATER from './notifications/justAddWater';
-import ACHIEVEMENT_LOST_MASTERCLASSER from './notifications/lostMasterclasser';
-import ACHIEVEMENT_MIND_OVER_MATTER from './notifications/mindOverMatter';
 import ONBOARDING_COMPLETE from './notifications/onboardingComplete';
 import GIFT_ONE_GET_ONE from './notifications/g1g1';
 import OnboardingGuide from './onboardingGuide';
@@ -167,9 +164,6 @@ export default {
    CARD_RECEIVED,
    NEW_INBOX_MESSAGE,
    NEW_CHAT_MESSAGE,
-    ACHIEVEMENT_JUST_ADD_WATER,
-    ACHIEVEMENT_LOST_MASTERCLASSER,
-    ACHIEVEMENT_MIND_OVER_MATTER,
    WorldBoss: WORLD_BOSS,
    VERIFY_USERNAME,
    OnboardingGuide,
@@ -194,13 +188,24 @@ export default {
      // listed in the order they should appear in the notifications panel.
      // NOTE: Those not listed here won't be shown in the notification panel!
      handledNotifications: [
-        'NEW_STUFF', 'GIFT_ONE_GET_ONE', 'GROUP_TASK_NEEDS_WORK',
-        'GUILD_INVITATION', 'PARTY_INVITATION', 'CHALLENGE_INVITATION',
-        'QUEST_INVITATION', 'GROUP_TASK_ASSIGNED', 'GROUP_TASK_APPROVAL', 'GROUP_TASK_APPROVED',
-        'GROUP_TASK_CLAIMED', 'NEW_MYSTERY_ITEMS', 'CARD_RECEIVED',
-        'NEW_INBOX_MESSAGE', 'NEW_CHAT_MESSAGE', 'UNALLOCATED_STATS_POINTS',
-        'ACHIEVEMENT_JUST_ADD_WATER', 'ACHIEVEMENT_LOST_MASTERCLASSER', 'ACHIEVEMENT_MIND_OVER_MATTER',
-        'VERIFY_USERNAME', 'ONBOARDING_COMPLETE',
+        'NEW_STUFF',
+        'GIFT_ONE_GET_ONE',
+        'GROUP_TASK_NEEDS_WORK',
+        'GUILD_INVITATION',
+        'PARTY_INVITATION',
+        'CHALLENGE_INVITATION',
+        'QUEST_INVITATION',
+        'GROUP_TASK_ASSIGNED',
+        'GROUP_TASK_APPROVAL',
+        'GROUP_TASK_APPROVED',
+        'GROUP_TASK_CLAIMED',
+        'NEW_MYSTERY_ITEMS',
+        'CARD_RECEIVED',
+        'NEW_INBOX_MESSAGE',
+        'NEW_CHAT_MESSAGE',
+        'UNALLOCATED_STATS_POINTS',
+        'VERIFY_USERNAME',
+        'ONBOARDING_COMPLETE',
      ],
    };
  },
@@ -30,9 +30,6 @@
      v-if="notificationData && notificationData.achievement"
      :data="notificationData"
    />
-    <just-add-water />
-    <lost-masterclasser />
-    <mind-over-matter />
    <onboarding-complete />
    <first-drops />
  </div>
@@ -141,25 +138,34 @@ import streak from './achievements/streak';
 import ultimateGear from './achievements/ultimateGear';
 import wonChallenge from './achievements/wonChallenge';
 import genericAchievement from './achievements/genericAchievement';
-import justAddWater from './achievements/justAddWater';
-import lostMasterclasser from './achievements/lostMasterclasser';
-import mindOverMatter from './achievements/mindOverMatter';
 import loginIncentives from './achievements/login-incentives';
 import onboardingComplete from './achievements/onboardingComplete';
 import verifyUsername from './settings/verifyUsername';
 import firstDrops from './achievements/firstDrops';

 const NOTIFICATIONS = {
+  // general notifications
+  NEW_CONTRIBUTOR_LEVEL: {
+    achievement: true,
+    label: $t => $t('modalContribAchievement'),
+    modalId: 'contributor',
+    sticky: true,
+  },
+  // achievement notifications
+  ACHIEVEMENT: { // null data filled in handleUserNotifications
+    achievement: true,
+    modalId: 'generic-achievement',
+    label: null,
+    data: {
+      message: $t => $t('achievement'),
+      modalText: null,
+    },
+  },
  CHALLENGE_JOINED_ACHIEVEMENT: {
    achievement: true,
    label: $t => `${$t('achievement')}: ${$t('joinedChallenge')}`,
    modalId: 'joined-challenge',
  },
-  ULTIMATE_GEAR_ACHIEVEMENT: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('gearAchievementNotification')}`,
-    modalId: 'ultimate-gear',
-  },
  GUILD_JOINED_ACHIEVEMENT: {
    label: $t => `${$t('achievement')}: ${$t('joinedGuild')}`,
    achievement: true,
@@ -170,42 +176,14 @@ const NOTIFICATIONS = {
    label: $t => `${$t('achievement')}: ${$t('invitedFriend')}`,
    modalId: 'invited-friend',
  },
-  NEW_CONTRIBUTOR_LEVEL: {
+  ACHIEVEMENT_PARTY_ON: {
    achievement: true,
-    label: $t => $t('modalContribAchievement'),
-    modalId: 'contributor',
-    sticky: true,
-  },
-  ACHIEVEMENT_ALL_YOUR_BASE: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementAllYourBase')}`,
+    label: $t => `${$t('achievement')}: ${$t('achievementPartyOn')}`,
    modalId: 'generic-achievement',
    data: {
-      achievement: 'allYourBase', // defined manually until the server sends all the necessary data
-    },
-  },
-  ACHIEVEMENT_BACK_TO_BASICS: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementBackToBasics')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'backToBasics',
-    },
-  },
-  ACHIEVEMENT_DUST_DEVIL: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementDustDevil')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'dustDevil',
-    },
-  },
-  ACHIEVEMENT_ARID_AUTHORITY: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementAridAuthority')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'aridAuthority',
+      message: $t => $t('achievement'),
+      modalText: $t => $t('achievementPartyOn'),
+      achievement: 'partyOn',
    },
  },
  ACHIEVEMENT_PARTY_UP: {
@@ -218,245 +196,47 @@ const NOTIFICATIONS = {
      achievement: 'partyUp',
    },
  },
-  ACHIEVEMENT_PARTY_ON: {
+  ULTIMATE_GEAR_ACHIEVEMENT: {
+    achievement: true,
+    label: $t => `${$t('achievement')}: ${$t('gearAchievementNotification')}`,
+    modalId: 'ultimate-gear',
+  },
+  ACHIEVEMENT_STABLE: {
    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementPartyOn')}`,
    modalId: 'generic-achievement',
    data: {
-      message: $t => $t('achievement'),
-      modalText: $t => $t('achievementPartyOn'),
-      achievement: 'partyOn',
+      achievement: 'stableAchievs',
    },
  },
-  ACHIEVEMENT_BEAST_MASTER: {
+  ACHIEVEMENT_QUESTS: {
    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('beastAchievement')}`,
    modalId: 'generic-achievement',
    data: {
-      message: $t => $t('achievement'),
-      modalText: $t => $t('beastAchievement'),
-      achievement: 'beastMaster',
+      achievement: 'questSeriesAchievs',
    },
  },
-  ACHIEVEMENT_MOUNT_MASTER: {
+  ACHIEVEMENT_ANIMAL_SET: {
    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('mountAchievement')}`,
+    label: $t => `${$t('achievement')}: ${$t('achievementAnimalSet')}`,
    modalId: 'generic-achievement',
    data: {
-      message: $t => $t('achievement'),
-      modalText: $t => $t('mountAchievement'),
-      achievement: 'mountMaster',
+      achievement: 'animalSetAchievs',
    },
  },
-  ACHIEVEMENT_TRIAD_BINGO: {
+  ACHIEVEMENT_PET_COLOR: {
    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('triadBingoAchievement')}`,
+    label: $t => `${$t('achievement')}: ${$t('achievementPetColor')}`,
    modalId: 'generic-achievement',
    data: {
-      message: $t => $t('achievement'),
-      modalText: $t => $t('triadBingoAchievement'),
-      achievement: 'triadBingo',
+      achievement: 'petColorAchievs',
    },
  },
-  ACHIEVEMENT_MONSTER_MAGUS: {
+  ACHIEVEMENT_MOUNT_COLOR: {
    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementMonsterMagus')}`,
+    label: $t => `${$t('achievement')}: ${$t('achievementMountColor')}`,
    modalId: 'generic-achievement',
    data: {
-      achievement: 'monsterMagus',
-    },
-  },
-  ACHIEVEMENT_UNDEAD_UNDERTAKER: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementUndeadUndertaker')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'undeadUndertaker',
-    },
-  },
-  ACHIEVEMENT: { // data filled in handleUserNotifications
-    achievement: true,
-    modalId: 'generic-achievement',
-    label: null, // data filled in handleUserNotifications
-    data: {
-      message: $t => $t('achievement'),
-      modalText: null, // data filled in handleUserNotifications
-    },
-  },
-  ACHIEVEMENT_PRIMED_FOR_PAINTING: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementPrimedForPainting')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'primedForPainting',
-    },
-  },
-  ACHIEVEMENT_PEARLY_PRO: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementPearlyPro')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'pearlyPro',
-    },
-  },
-  ACHIEVEMENT_TICKLED_PINK: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementTickledPink')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'tickledPink',
-    },
-  },
-  ACHIEVEMENT_ROSY_OUTLOOK: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementRosyOutlook')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'rosyOutlook',
-    },
-  },
-  ACHIEVEMENT_BUG_BONANZA: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementBugBonanza')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'bugBonanza',
-    },
-  },
-  ACHIEVEMENT_BARE_NECESSITIES: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementBareNecessities')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'bareNecessities',
-    },
-  },
-  ACHIEVEMENT_FRESHWATER_FRIENDS: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementFreshwaterFriends')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'freshwaterFriends',
-    },
-  },
-  ACHIEVEMENT_GOOD_AS_GOLD: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementGoodAsGold')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'goodAsGold',
-    },
-  },
-  ACHIEVEMENT_ALL_THAT_GLITTERS: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementAllThatGlitters')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'allThatGlitters',
-    },
-  },
-  ACHIEVEMENT_BONE_COLLECTOR: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementBoneCollector')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'boneCollector',
-    },
-  },
-  ACHIEVEMENT_SKELETON_CREW: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementSkeletonCrew')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'skeletonCrew',
-    },
-  },
-  ACHIEVEMENT_SEEING_RED: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementSeeingRed')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'seeingRed',
-    },
-  },
-  ACHIEVEMENT_RED_LETTER_DAY: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementRedLetterDay')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'redLetterDay',
-    },
-  },
-  ACHIEVEMENT_LEGENDARY_BESTIARY: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementLegendaryBestiary')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'legendaryBestiary',
-    },
-  },
-  ACHIEVEMENT_SEASONAL_SPECIALIST: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementSeasonalSpecialist')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'seasonalSpecialist',
-    },
-  },
-  ACHIEVEMENT_VIOLETS_ARE_BLUE: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementVioletsAreBlue')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'violetsAreBlue',
-    },
-  },
-  ACHIEVEMENT_WILD_BLUE_YONDER: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementWildBlueYonder')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'wildBlueYonder',
-    },
-  },
-  ACHIEVEMENT_DOMESTICATED: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementDomesticated')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'domesticated',
-    },
-  },
-  ACHIEVEMENT_SHADY_CUSTOMER: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementShadyCustomer')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'shadyCustomer',
-    },
-  },
-  ACHIEVEMENT_SHADE_OF_IT_ALL: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementShadeOfItAll')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'shadeOfItAll',
-    },
-  },
-  ACHIEVEMENT_ZODIAC_ZOOKEEPER: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementZodiacZookeeper')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'zodiacZookeeper',
-    },
-  },
-  ACHIEVEMENT_BIRDS_OF_A_FEATHER: {
-    achievement: true,
-    label: $t => `${$t('achievement')}: ${$t('achievementBirdsOfAFeather')}`,
-    modalId: 'generic-achievement',
-    data: {
-      achievement: 'birdsOfAFeather',
+      achievement: 'mountColorAchievs',
    },
  },
 };
@@ -486,9 +266,6 @@ export default {
    loginIncentives,
    verifyUsername,
    genericAchievement,
-    lostMasterclasser,
-    mindOverMatter,
-    justAddWater,
    onboardingComplete,
    firstDrops,
  },
@@ -509,21 +286,30 @@ export default {
    const handledNotifications = {};

    [
-      'GUILD_PROMPT', 'REBIRTH_ENABLED', 'WON_CHALLENGE', 'STREAK_ACHIEVEMENT',
-      'ULTIMATE_GEAR_ACHIEVEMENT', 'REBIRTH_ACHIEVEMENT', 'GUILD_JOINED_ACHIEVEMENT',
-      'CHALLENGE_JOINED_ACHIEVEMENT', 'INVITED_FRIEND_ACHIEVEMENT', 'NEW_CONTRIBUTOR_LEVEL',
-      'CRON', 'LOGIN_INCENTIVE', 'ACHIEVEMENT_ALL_YOUR_BASE', 'ACHIEVEMENT_BACK_TO_BASICS',
-      'GENERIC_ACHIEVEMENT', 'ACHIEVEMENT_PARTY_UP', 'ACHIEVEMENT_PARTY_ON', 'ACHIEVEMENT_BEAST_MASTER',
-      'ACHIEVEMENT_MOUNT_MASTER', 'ACHIEVEMENT_TRIAD_BINGO', 'ACHIEVEMENT_DUST_DEVIL', 'ACHIEVEMENT_ARID_AUTHORITY',
-      'ACHIEVEMENT_MONSTER_MAGUS', 'ACHIEVEMENT_UNDEAD_UNDERTAKER', 'ACHIEVEMENT_PRIMED_FOR_PAINTING',
-      'ACHIEVEMENT_PEARLY_PRO', 'ACHIEVEMENT_TICKLED_PINK', 'ACHIEVEMENT_ROSY_OUTLOOK', 'ACHIEVEMENT',
-      'ONBOARDING_COMPLETE', 'FIRST_DROPS', 'ACHIEVEMENT_BUG_BONANZA', 'ACHIEVEMENT_BARE_NECESSITIES',
-      'ACHIEVEMENT_FRESHWATER_FRIENDS', 'ACHIEVEMENT_GOOD_AS_GOLD', 'ACHIEVEMENT_ALL_THAT_GLITTERS',
-      'ACHIEVEMENT_BONE_COLLECTOR', 'ACHIEVEMENT_SKELETON_CREW', 'ACHIEVEMENT_SEEING_RED',
-      'ACHIEVEMENT_RED_LETTER_DAY', 'ACHIEVEMENT_LEGENDARY_BESTIARY', 'ACHIEVEMENT_SEASONAL_SPECIALIST',
-      'ACHIEVEMENT_VIOLETS_ARE_BLUE', 'ACHIEVEMENT_WILD_BLUE_YONDER', 'ACHIEVEMENT_DOMESTICATED',
-      'ACHIEVEMENT_SHADY_CUSTOMER', 'ACHIEVEMENT_SHADE_OF_IT_ALL', 'ACHIEVEMENT_ZODIAC_ZOOKEEPER',
-      'ACHIEVEMENT_BIRDS_OF_A_FEATHER',
+      // general notifications
+      'CRON',
+      'FIRST_DROPS',
+      'GUILD_PROMPT',
+      'LOGIN_INCENTIVE',
+      'NEW_CONTRIBUTOR_LEVEL',
+      'ONBOARDING_COMPLETE',
+      'REBIRTH_ENABLED',
+      'WON_CHALLENGE',
+      // achievement notifications
+      'ACHIEVEMENT',
+      'CHALLENGE_JOINED_ACHIEVEMENT',
+      'GUILD_JOINED_ACHIEVEMENT',
+      'INVITED_FRIEND_ACHIEVEMENT',
+      'ACHIEVEMENT_PARTY_ON',
+      'ACHIEVEMENT_PARTY_UP',
+      'REBIRTH_ACHIEVEMENT',
+      'STREAK_ACHIEVEMENT',
+      'ULTIMATE_GEAR_ACHIEVEMENT',
+      'ACHIEVEMENT_STABLE',
+      'ACHIEVEMENT_QUESTS',
+      'ACHIEVEMENT_ANIMAL_SET',
+      'ACHIEVEMENT_PET_COLOR',
+      'ACHIEVEMENT_MOUNT_COLOR',
    ].forEach(type => {
      handledNotifications[type] = true;
    });
@@ -921,57 +707,68 @@ export default {
          case 'WON_CHALLENGE':
            this.$root.$emit('habitica:won-challenge', notification);
            break;
+          case 'REBIRTH_ACHIEVEMENT':
+            this.playSound('Achievement_Unlocked');
+            this.$root.$emit('bv::show::modal', 'rebirth');
+            break;
          case 'STREAK_ACHIEVEMENT':
            this.text(`${this.$t('streaks')}: ${this.user.achievements.streak}`, () => {
              this.$root.$emit('bv::show::modal', 'streak');
            }, this.user.preferences.suppressModals.streak);
            this.playSound('Achievement_Unlocked');
            break;
-          case 'REBIRTH_ACHIEVEMENT':
-            this.playSound('Achievement_Unlocked');
-            this.$root.$emit('bv::show::modal', 'rebirth');
-            break;
-          case 'ULTIMATE_GEAR_ACHIEVEMENT':
-          case 'GUILD_JOINED_ACHIEVEMENT':
-          case 'CHALLENGE_JOINED_ACHIEVEMENT':
-          case 'INVITED_FRIEND_ACHIEVEMENT':
          case 'NEW_CONTRIBUTOR_LEVEL':
-          case 'ACHIEVEMENT_ALL_YOUR_BASE':
-          case 'ACHIEVEMENT_BACK_TO_BASICS':
-          case 'ACHIEVEMENT_DUST_DEVIL':
-          case 'ACHIEVEMENT_ARID_AUTHORITY':
-          case 'ACHIEVEMENT_PARTY_UP':
+          case 'CHALLENGE_JOINED_ACHIEVEMENT':
+          case 'GUILD_JOINED_ACHIEVEMENT':
+          case 'INVITED_FRIEND_ACHIEVEMENT':
          case 'ACHIEVEMENT_PARTY_ON':
-          case 'ACHIEVEMENT_BEAST_MASTER':
-          case 'ACHIEVEMENT_MOUNT_MASTER':
-          case 'ACHIEVEMENT_TRIAD_BINGO':
-          case 'ACHIEVEMENT_MONSTER_MAGUS':
-          case 'ACHIEVEMENT_UNDEAD_UNDERTAKER':
-          case 'ACHIEVEMENT_PRIMED_FOR_PAINTING':
-          case 'ACHIEVEMENT_PEARLY_PRO':
-          case 'ACHIEVEMENT_TICKLED_PINK':
-          case 'ACHIEVEMENT_ROSY_OUTLOOK':
-          case 'ACHIEVEMENT_BUG_BONANZA':
-          case 'ACHIEVEMENT_BARE_NECESSITIES':
-          case 'ACHIEVEMENT_FRESHWATER_FRIENDS':
-          case 'ACHIEVEMENT_GOOD_AS_GOLD':
-          case 'ACHIEVEMENT_ALL_THAT_GLITTERS':
-          case 'ACHIEVEMENT_BONE_COLLECTOR':
-          case 'ACHIEVEMENT_SKELETON_CREW':
-          case 'ACHIEVEMENT_SEEING_RED':
-          case 'ACHIEVEMENT_RED_LETTER_DAY':
-          case 'ACHIEVEMENT_LEGENDARY_BESTIARY':
-          case 'ACHIEVEMENT_SEASONAL_SPECIALIST':
-          case 'ACHIEVEMENT_VIOLETS_ARE_BLUE':
-          case 'ACHIEVEMENT_WILD_BLUE_YONDER':
-          case 'ACHIEVEMENT_DOMESTICATED':
-          case 'ACHIEVEMENT_SHADY_CUSTOMER':
-          case 'ACHIEVEMENT_SHADE_OF_IT_ALL':
-          case 'ACHIEVEMENT_ZODIAC_ZOOKEEPER':
-          case 'ACHIEVEMENT_BIRDS_OF_A_FEATHER':
-          case 'GENERIC_ACHIEVEMENT':
+          case 'ACHIEVEMENT_PARTY_UP':
+          case 'ULTIMATE_GEAR_ACHIEVEMENT':
            this.showNotificationWithModal(notification);
            break;
+          case 'ACHIEVEMENT_QUESTS': {
+            const { achievement } = notification.data;
+            const upperCaseAchievement = achievement.charAt(0).toUpperCase() + achievement.slice(1);
+            const achievementTitleKey = `achievement${upperCaseAchievement}`;
+            NOTIFICATIONS.ACHIEVEMENT_QUESTS.label = $t => `${$t('achievement')}: ${$t(achievementTitleKey)}`;
+            this.showNotificationWithModal(notification);
+            Vue.set(this.user.achievements, achievement, true);
+            break;
+          }
+          case 'ACHIEVEMENT_STABLE': {
+            const { achievement, achievementNotification } = notification.data;
+            NOTIFICATIONS.ACHIEVEMENT_STABLE.label = $t => `${$t('achievement')}: ${$t(achievementNotification)}`;
+            this.showNotificationWithModal(notification);
+            Vue.set(this.user.achievements, achievement, true);
+            break;
+          }
+          case 'ACHIEVEMENT_ANIMAL_SET': {
+            const { achievement } = notification.data;
+            const upperCaseAchievement = achievement.charAt(0).toUpperCase() + achievement.slice(1);
+            const achievementTitleKey = `achievement${upperCaseAchievement}`;
+            NOTIFICATIONS.ACHIEVEMENT_ANIMAL_SET.label = $t => `${$t('achievement')}: ${$t(achievementTitleKey)}`;
+            this.showNotificationWithModal(notification);
+            Vue.set(this.user.achievements, achievement, true);
+            break;
+          }
+          case 'ACHIEVEMENT_PET_COLOR': {
+            const { achievement } = notification.data;
+            const upperCaseAchievement = achievement.charAt(0).toUpperCase() + achievement.slice(1);
+            const achievementTitleKey = `achievement${upperCaseAchievement}`;
+            NOTIFICATIONS.ACHIEVEMENT_PET_COLOR.label = $t => `${$t('achievement')}: ${$t(achievementTitleKey)}`;
+            this.showNotificationWithModal(notification);
+            Vue.set(this.user.achievements, achievement, true);
+            break;
+          }
+          case 'ACHIEVEMENT_MOUNT_COLOR': {
+            const { achievement } = notification.data;
+            const upperCaseAchievement = achievement.charAt(0).toUpperCase() + achievement.slice(1);
+            const achievementTitleKey = `achievement${upperCaseAchievement}`;
+            NOTIFICATIONS.ACHIEVEMENT_MOUNT_COLOR.label = $t => `${$t('achievement')}: ${$t(achievementTitleKey)}`;
+            this.showNotificationWithModal(notification);
+            Vue.set(this.user.achievements, achievement, true);
+            break;
+          }
          case 'ACHIEVEMENT': { // generic achievement
            const { achievement } = notification.data;
            const upperCaseAchievement = achievement.charAt(0).toUpperCase() + achievement.slice(1);
@@ -984,10 +781,6 @@ export default {
            Vue.set(this.user.achievements, achievement, true);
            break;
          }
-          case 'CRON':
-            // Not needed because it's shown already by the userHp and userMp watchers
-            // Keeping an empty block so that it gets read
-            break;
          case 'LOGIN_INCENTIVE':
            if (this.user.flags.tour.intro === this.TOUR_END && this.user.flags.welcomed) {
              this.notificationData = notification.data;
@@ -89,9 +89,6 @@ export default {
          try {
            this.$store.dispatch('shops:releasePets', { user: this.user });
            this.text(this.$t('releasePetsSuccess'));
-            // this.$router.push({name: 'stable'});
-            // Reload because achievement is set in user.save instead of common
-            window.location.reload(true);
          } catch (err) {
            window.alert(err.message); // eslint-disable-line no-alert
          }
@@ -112,9 +109,6 @@ export default {
          try {
            this.$store.dispatch('shops:releaseMounts', { user: this.user });
            this.text(this.$t('releaseMountsSuccess'));
-            // this.$router.push({name: 'stable'});
-            // Reload because achievement is set in user.save instead of common
-            window.location.reload(true);
          } catch (err) {
            window.alert(err.message); // eslint-disable-line no-alert
          }
@@ -135,9 +129,6 @@ export default {
          try {
            this.$store.dispatch('shops:releaseBoth', { user: this.user });
            this.text(this.$t('releaseBothSuccess'));
-            // this.$router.push({name: 'stable'});
-            // Reload because achievement is set in user.save instead of common
-            window.location.reload(true);
          } catch (err) {
            window.alert(err.message); // eslint-disable-line no-alert
          }
@@ -560,14 +560,8 @@ export default {
        this.selectedItemToBuy = null;
      }
    },
-    isGearLocked (gear) {
-      if (gear.value > this.userStats.gp) {
-        return true;
-      }
-
-      return false;
-    },
    selectItem (item) {
+      if (item.locked) return;
      this.selectedItemToBuy = item;

      this.$root.$emit('bv::show::modal', 'buy-quest-modal');
@@ -27,7 +27,7 @@
    position: fixed;
    right: 10px;
    width: 350px;
-    z-index: 999;
+    z-index: 9999; // to keep it above modal overlays

    top: var(--current-scrollY);

@@ -268,17 +268,33 @@
                <span v-if="task.type === 'daily'">{{ task.streak }}</span>
                <span v-if="task.type === 'habit'">
                  <span
-                    v-if="task.up"
+                    v-if="task.up && task.counterUp != 0 && task.down"
                    class="m-0"
                  >+{{ task.counterUp }}</span>
+                  <span
+                    v-else-if=" task.counterUp !=0 && task.counterDown ==0"
+                    class="m-0"
+                  >{{ task.counterUp }}</span>
+                  <span
+                    v-else-if="task.up"
+                    class="m-0"
+                  >0</span>
                  <span
                    v-if="task.up && task.down"
                    class="m-0"
                  >&nbsp;|&nbsp;</span>
                  <span
-                    v-if="task.down"
+                    v-if="task.down && task.counterDown != 0 && task.up"
                    class="m-0"
                  >-{{ task.counterDown }}</span>
+                  <span
+                    v-else-if="task.counterDown !=0 && task.counterUp ==0"
+                    class="m-0"
+                  >{{ task.counterDown }}</span>
+                  <span
+                    v-else-if="task.down"
+                    class="m-0"
+                  >0</span>
                </span>
              </div>
              <div
@@ -178,10 +178,10 @@
    "advocacy_causes": "Advocacy + Causes",
    "entertainment": "Entertainment",
    "finance": "Finance",
-    "health_fitness": "Health + Fitness",
-    "hobbies_occupations": "Hobbies + Occupations",
+    "health_fitness": "الصحة واللياقة البدنية",
+    "hobbies_occupations": "الهوايات والمهن",
    "location_based": "Location-based",
-    "mental_health": "Mental Health + Self-Care",
+    "mental_health": "الصحة العقلية + العناية الذاتية",
    "getting_organized": "Getting Organized",
    "self_improvement": "Self-Improvement",
    "spirituality": "Spirituality",
@@ -192,7 +192,7 @@
    "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",
    "howManyToBuy": "How many would you like to buy?",
    "contactForm": "Contact the Moderation Team"
@@ -1,25 +1,25 @@
 {
-  "unlockedReward": "You have received <%= reward %>",
-  "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
-  "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
-  "awesome": "Awesome!",
-  "countLeft": "Check-ins until next reward: <%= count %>",
-  "incentivesDescription": "When it comes to building habits, consistency is key. Each day you check-in you get closer to a prize.",
-  "checkinEarned": "Your Check-In Counter went up!",
-  "unlockedCheckInReward": "You unlocked a Check-In Prize!",
-  "checkinProgressTitle": "Progress until next",
-  "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
-  "oneOfAllPetEggs": "one of each standard Pet Egg",
-  "twoOfAllPetEggs": "two of each standard Pet Egg",
-  "threeOfAllPetEggs": "three of each standard Pet Egg",
-  "oneOfAllHatchingPotions": "one of each standard Hatching Potion",
-  "threeOfEachFood": "three of each standard Pet Food",
-  "fourOfEachFood": "four of each standard Pet Food",
-  "twoSaddles": "two Saddles",
-  "threeSaddles": "three Saddles",
-  "incentiveAchievement": "the Royally Loyal achievement",
-  "royallyLoyal": "Royally Loyal",
-  "royallyLoyalText": "This user has checked in over 500 times, and has earned every Check-In Prize!",
-  "checkInRewards": "Check-In Rewards",
-  "backloggedCheckInRewards": "You received Check-In Prizes! Visit your Inventory and Equipment to see what's new."
+    "unlockedReward": "You have received <%= reward %>",
+    "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
+    "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
+    "awesome": "Awesome!",
+    "countLeft": "Check-ins until next reward: <%= count %>",
+    "incentivesDescription": "When it comes to building habits, consistency is key. Each day you check-in you get closer to a prize.",
+    "checkinEarned": "Your Check-In Counter went up!",
+    "unlockedCheckInReward": "You unlocked a Check-In Prize!",
+    "checkinProgressTitle": "Progress until next",
+    "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
+    "oneOfAllPetEggs": "one of each standard Pet Egg",
+    "twoOfAllPetEggs": "two of each standard Pet Egg",
+    "threeOfAllPetEggs": "three of each standard Pet Egg",
+    "oneOfAllHatchingPotions": "one of each standard Hatching Potion",
+    "threeOfEachFood": "three of each standard Pet Food",
+    "fourOfEachFood": "four of each standard Pet Food",
+    "twoSaddles": "two Saddles",
+    "threeSaddles": "ثلاثة سروج",
+    "incentiveAchievement": "the Royally Loyal achievement",
+    "royallyLoyal": "Royally Loyal",
+    "royallyLoyalText": "This user has checked in over 500 times, and has earned every Check-In Prize!",
+    "checkInRewards": "Check-In Rewards",
+    "backloggedCheckInRewards": "You received Check-In Prizes! Visit your Inventory and Equipment to see what's new."
 }
@@ -1,8 +1,8 @@
 {
    "pets": "الحيوانات الأليفة",
-    "stable": "مستقر",
+    "stable": "الإسطبل",
    "noActivePet": "لا يوجد حيوان أليف نشط",
-    "activePet": "أنشطة الحيوانات الأليفة",
+    "activePet": "الحيوان الأليف النشط",
    "raisedPet": "لقد نمت <٪ = حيوان أليف٪>!",
    "feedPet": "تغذية <٪ = text٪> إلى <٪ = name٪>؟",
    "mountNotOwned": "أنت لاتملك هذه الكمية.",
@@ -32,7 +32,7 @@
    "etherealLion": "الأسد السماوي",
    "magicMounts": "جرعة سحرية متصاعدة",
    "questMounts": "تنقيب جبال",
-    "mountsTamed": "ترويض الجبل",
+    "mountsTamed": "المراكيب المروضة",
    "noSaddlesAvailable": "أنت لاتملك أي سروج.",
    "noFoodAvailable": "أنت لاتملك أي أغذية للحيوانات الأليفة.",
    "food": "أغذية الحيوانات الأليفة والسروج",
@@ -61,20 +61,21 @@
    "veteranFox": "الثعلب المخضرم",
    "veteranBear": "الدب المخضرم",
    "veteranLion": "الأسد المخضرم",
-    "activeMount": "جبل نشط",
-    "mounts": "يتصاعد",
+    "activeMount": "مركوب نشط",
+    "mounts": "مركوب",
    "wackyPets": "حيوانات أليف مضحكة",
    "magicPets": "دواء سحري للحيوانات الأليفة",
    "petsFound": "إنشاء حيوانات أليفة",
    "keyToPets": "مفتاح بيوت الحيوانات",
-    "noActiveMount": "لا يوجد تثبيت نشط",
+    "noActiveMount": "لا يوجد مركوب نشط",
    "questPets": "بحث الحيوانات",
    "releasePetsConfirm": "هل أنت متأكد أنك تريد إطلاق سراح حيوانك الأليف القياسي؟",
    "keyToMounts": "مفتاح بيت الحيوان",
    "petsReleased": "أفرج عن الحيوانات الأليفة",
-    "keyToPetsDesc": "حرر جميع الحيوانات المسموح بها حتى تتمكن من جمعها مرة أخرى. (لا تتأثر بالحيوانات الأليفة والحيوانات الأليفة الغريبة.)",
-    "petName": "<%= potion(locale) %> <%= egg(locale) %>",
+    "keyToPetsDesc": "حرر جميع الحيوانات الأليفة القياسية حتى تتمكن من جمعها مرة أخرى. (لا تتأثر بالحيوانات الأليفة من المهام والحيوانات الأليفة الغريبة.)",
+    "petName": "<%= egg(locale) %> <%= potion(locale) %>",
    "keyToMountsDesc": "حرر جميع العينات القياسية حتى تتمكن من جمعها مرة أخرى. (لا تتأثر عمليات تثبيت المهام وعمليات التثبيت النادرة.)",
    "keyToBoth": "مفاتيح رئيسية لبيوت الكلاب",
-    "releasePetsSuccess": "تم إطلاق حيوانك الأليف القياسي!"
+    "releasePetsSuccess": "تم إطلاق حيوانك الأليف القياسي!",
+    "mountName": "<%= mount(locale) %> <%= potion(locale) %>"
 }
@@ -22,7 +22,7 @@
    "checklist": "القائمة",
    "newChecklistItem": "عنصر قائمة مراجعة جديد",
    "expandChecklist": "Expand Checklist",
-    "collapseChecklist": "Collapse Checklist",
+    "collapseChecklist": "أغلق القائمة",
    "text": "العنوان",
    "notes": "الملاحظات",
    "advancedSettings": "إعدادات متقدمة",
@@ -46,7 +46,7 @@
    "days": "أيام",
    "restoreStreak": "Adjust Streak",
    "resetStreak": "Reset Streak",
-    "todo": "مهمة",
+    "todo": "المهمة",
    "todos": "المهام",
    "todosDesc": "تُنجَز المهام مرة واحدة فقط. أضف قوائم إلى المهام الخصة بك لتزيد قيمتها.",
    "dueDate": "تاريخ الاستحقاق",
@@ -83,18 +83,18 @@
    "fortifyName": "جرعة تحصين",
    "fortifyPop": "إرجاع جميع المهام إلى القيمة المحايدة (اللون الأصفر)، وإسترجاع جميع نقاط الصحة المفقودة.",
    "fortify": "تحصين",
-    "fortifyComplete": "Fortify complete!",
+    "fortifyComplete": "اكتمل التحصين!",
    "deleteTask": "احذف هذه المهمة",
    "sureDelete": "هل أنت متأكد من أنك تريد حذف هذه المهامة؟",
    "streakCoins": "إضافي شرائطي!",
    "taskToTop": "إلى الأعلى",
    "taskToBottom": "إلى الأسفل",
-    "taskAliasAlreadyUsed": "Task alias already used on another task.",
+    "taskAliasAlreadyUsed": "تم استخدام الاسم المستعار لهذه المهمة بالفعل في مهمة أخرى.",
    "taskNotFound": "Task not found.",
-    "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".",
-    "invalidTasksType": "Task type must be one of \"habits\", \"dailys\", \"todos\", \"rewards\".",
+    "invalidTaskType": "يجب أن يكون نوع المهمة واحدًا من \"العادة\" أو \"اليومية\" أو \"المهمة\" أو \"المكافأة\".",
+    "invalidTasksType": "يجب أن يكون نوع المهمة واحدًا من \"العادات\" أو \"اليوميات\" أو \"المهام\" أو \"المكافآت\".",
    "invalidTasksTypeExtra": "يجب أن يكون نوع المهمة واحدًا من \"العادات\" أو \"اليوميات\" أو \"المهام\" أو \"المكافآت\" أو \"المهام التي تم إكمالها\".",
-    "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.",
+    "cantDeleteChallengeTasks": "لا يمكن حذف المهمة التي تنتمي إلى التحدي.",
    "checklistOnlyDailyTodo": "Checklists are supported only on Dailies and To-Dos",
    "checklistItemNotFound": "No checklist item was found with given id.",
    "itemIdRequired": "\"itemId\" must be a valid UUID.",
@@ -127,5 +127,7 @@
    "checkOffYesterDailies": "Check off any Dailies you did yesterday:",
    "yesterDailiesCallToAction": "ابدأ يومي الجديد!",
    "sessionOutdated": "Your session is outdated. Please refresh or sync.",
-    "errorTemporaryItem": "This item is temporary and cannot be pinned."
+    "errorTemporaryItem": "This item is temporary and cannot be pinned.",
+    "deleteTaskType": "احذف هذا/هذه <%= type %>",
+    "sureDeleteType": "هل انت متأكد انك تريد حذف هذا/هذه <%= type %> ؟"
 }
@@ -128,6 +128,8 @@
    "achievementZodiacZookeeperText": "Hat alle Standardfarben der Tierkreiszeichen-Tiere ausgebrütet: Ratte, Kalb, Kaninchen, Schlange, Fohlen, Schaf, Affe, Hahn, Wolf, Tiger, Fliegendes Ferkel, und Drache!",
    "achievementZodiacZookeeperModalText": "Du hast alle Tierkreiszeichen-Tiere gesammelt!",
    "achievementBirdsOfAFeather": "Fliegende Freunde",
-    "achievementBirdsOfAFeatherText": "Hat alle Standardfarben der fliegenden Haustiere ausgebrütet: Fliegendes Ferkel, Eule, Papagei, Pterodactylus, Greif, Falke, Pfau, und Hahn.",
-    "achievementBirdsOfAFeatherModalText": "Du hast alle fliegenden Haustiere gesammelt!"
+    "achievementBirdsOfAFeatherText": "Hat alle Standardfarben der fliegenden Haustiere ausgebrütet: Fliegendes Ferkel, Eule, Papagei, Pterodactylus, Greif, Falke, Pfau, und Hahn!",
+    "achievementBirdsOfAFeatherModalText": "Du hast alle fliegenden Haustiere gesammelt!",
+    "achievementReptacularRumbleModalText": "Du hast alle Reptilien-Haustiere gesammelt!",
+    "achievementReptacularRumbleText": "Hat alle Standardfarben der Reptilien-Haustiere ausgebrütet: Alligator, Pterodaktylus, Schlange, Triceratops, Schildkröte, Tyrannosaurus Rex, und Velociraptor!"
 }
@@ -692,5 +692,13 @@
    "backgroundFlowerShopText": "Blumenladen",
    "backgroundFlowerShopNotes": "Genieße den süßen Duft eines Blumenladens.",
    "backgroundSpringtimeLakeText": "Frühlingssee",
-    "backgroundSpringtimeLakeNotes": "Genieße die Aussicht an den Ufern eines Frühlingssees."
+    "backgroundSpringtimeLakeNotes": "Genieße die Aussicht an den Ufern eines Frühlingssees.",
+    "hideLockedBackgrounds": "Verstecke nicht erworbene Hintergründe",
+    "backgrounds052022": "SET 96: Veröffentlicht im Mai 2022",
+    "backgroundOnACastleWallText": "Auf einer Burgmauer",
+    "backgroundOnACastleWallNotes": "Aussicht von oben auf einer Burgmauer.",
+    "backgroundCastleGateText": "Burgtor",
+    "backgroundEnchantedMusicRoomText": "Verwunschenes Musikzimmer",
+    "backgroundEnchantedMusicRoomNotes": "Spiele in einem verwunschenen Musikzimmer.",
+    "backgroundCastleGateNotes": "Steh Wache am Burgtor."
 }
@@ -53,5 +53,6 @@
    "surveysSingle": "Half Habitica zu wachsen, entweder durch das Ausfüllen einer Umfrage oder durch große Hilfe beim Testen. Danke!",
    "surveysMultiple": "Hat Habitica an <%= count %> Gelegenheiten geholfen zu wachsen, entweder durch Ausfüllen eines Fragebogens oder durch große Hilfe beim Testen. Danke!",
    "blurbHallPatrons": "Dies ist die Halle der Schirmherren, in der wir die edlen Abenteurer ehren, die Habiticas ursprüngliche Kickstarter-Kampagne unterstützt haben. Wir danken ihnen für die Hilfe Habitica zum Leben zu erwecken!",
-    "blurbHallContributors": "Dies ist die Halle der Mitwirkenden, in der Open-Source-Unterstützer von Habitica geehrt werden. Durch Code, Kunst, Musik, Schreiben, oder auch nur Hilfsbereitschaft haben sie <a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> Edelsteine, exklusive Ausrüstung</a> und <a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>angesehene Titel</a> verdient. Auch Du kannst Habitica unterstützen! <a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Hier erfährst Du mehr dazu.</a>"
+    "blurbHallContributors": "Dies ist die Halle der Mitwirkenden, in der Open-Source-Unterstützer von Habitica geehrt werden. Durch Code, Kunst, Musik, Schreiben, oder auch nur Hilfsbereitschaft haben sie <a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> Edelsteine, exklusive Ausrüstung</a> und <a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>angesehene Titel</a> verdient. Auch Du kannst Habitica unterstützen! <a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Hier erfährst Du mehr dazu.</a>",
+    "noPrivAccess": "Du besitzt nicht die erforderlichen Berechtigungen."
 }
@@ -2616,5 +2616,17 @@
    "eyewearMystery202204BText": "Virtuelles Gesicht",
    "eyewearMystery202204ANotes": "Wie fühlst Du Dich heute? Drücke Deine Stimmung mit diesen lustigen Bildschirmen aus. Gewährt keinen Attributbonus. April 2022 Abonnentengegenstand.",
    "eyewearMystery202204BNotes": "Wie fühlst Du Dich heute? Drücke Deine Stimmung mit diesen lustigen Bildschirmen aus. Gewährt keinen Attributbonus. April 2022 Abonnentengegenstand.",
-    "armorArmoireStrawRaincoatText": "Stroh-Regenmantel"
+    "armorArmoireStrawRaincoatText": "Stroh-Regenmantel",
+    "backMystery202205Text": "Dämmerungs-Flügel",
+    "headAccessoryMystery202205Notes": "Diese glänzenden Hörner sind so hell wie ein Sonnenuntergang in der Wüste. Gewährt keinen Attributbonus. Mai 2022 Abonnentengegenstand.",
+    "backMystery202205Notes": "Das mächtige Schlagen dieser gewaltigen Flügel hallt von den Dünen wider. Gewährt keinen Attributbonus. Mai 2022 Abonnentengegenstand.",
+    "headAccessoryMystery202205Text": "Dämmerungsschwingen Drachen Hörner",
+    "weaponArmoireHuntingHornText": "Jagdhorn",
+    "weaponArmoireHuntingHornNotes": "Tuuut! Tuut! Tuut! Rufe deine Party für ein Abenteuer oder eine Quest zusammen, indem Du auf diesem Horn spielst. Erhöht Stärke um <%= str %> und Intelligenz um <%= int %>. Verzauberter Schrank: Musikinstrument Set 1 (Gegenstand 1 von 3)",
+    "headArmoireStrawRainHatText": "Stroh-Regenhut",
+    "shieldArmoireSnareDrumText": "Kleine Trommel",
+    "shieldArmoireSnareDrumNotes": "Rat-a-tat-ta! Rufe Deine Party für eine Parade oder einen Marsch zusammen, indem Du auf deiser Trommel spielst. Erhöht Ausdauer um <%= con %> und Intelligenz um <%= int %>. Musikinstrument Set 1 (Gegenstand 3 von 3)",
+    "shieldArmoireSpanishGuitarNotes": "Kling! Kling! Klooong! Rufe Deine Party für ein Konzert oder eine Feierlichkeit zusammen, indem Du auf dieser Gitarre spielst. Erhöht Wahrnehmung um <%= per %> und Intelligenz um <%= int %>. Verzauberter Schrank: Musikinstrument Set 1 (Gegenstand 2 von 3)",
+    "shieldArmoireSpanishGuitarText": "Spanische Gitarre",
+    "armorArmoireStrawRaincoatNotes": "Dieser gewebte Strohumhang wird Dich während Deiner Quest trocken halten und Deine Rüstung vor dem Rosten bewahren. Wage Dich jedoch nicht zu nah an Kerzen heran. Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Stroh Regenmantel Set (Gegenstand 1 von 2)."
 }
@@ -378,5 +378,6 @@
    "editParty": "Party bearbeiten",
    "leaveGuild": "Gilde verlassen",
    "viewDetails": "Details ansehen",
-    "upgradeToGroup": "Auf Gruppenplan upgraden"
+    "upgradeToGroup": "Auf Gruppenplan upgraden",
+    "sendGiftTotal": "Insgesamt:"
 }
@@ -667,7 +667,7 @@
    "questRobotCollectGears": "Zahnräder",
    "questRobotCollectBolts": "Schrauben",
    "questRobotText": "Mysteriöse Mechanische Merkwürdigkeiten!",
-    "delightfulDinosNotes": "Enthält den \"Pterror-dactyl\", \"Trampelnden Triceratops\" und \"Ausgegrabenen Dinosaurier\". Verfügbar bis zum 30. November.",
+    "delightfulDinosNotes": "Enthält den \"Pterror-dactyl\", \"Trampelnden Triceratops\" und \"Ausgegrabenen Dinosaurier\". Verfügbar bis zum 31. Mai.",
    "delightfulDinosText": "\"Dufte Dinos\" Quest-Paket",
    "questAmberCompletion": "\"Trerezin?\" sagt @-Tyr- mit ruhiger Stimme. \"Würdest Du @Vikte loslassen? Ich glaube nicht, dass es ihm so hoch oben wohl ist.\"<br><br>Trerezins Haut wird hochrot und sie setzt @Vikte sanft auf dem Boden ab. \"Bitte entschuldigt! Es ist schon so lange her, dass ich Gäste hatte. Dabei habe ich meine guten Manieren vergessen!\" Sie gleitet vorwärts um euch standesgemäss zu begrüssen, bevor sie in ihrem Baumhaus verschwindet. Gleich darauf kehrt Sie zurück mit einem Arm voll Bernsteinfarbener Schlüpfelixiere als Dankeschön!<br><br>\"Magische Tränke!\" haucht @Vikte.<br><br>\"Ach, diese alten Dinger?\" Trerezins Zunge zittert während sie nachdenkt. \"Wie wär's damit: Ich gebe euch den ganzen Stapel, wenn ihr versprecht, mich ab und zu besuchen zu kommen...\"<br><br>So lasst ihr die Aufgabenwälder hinter euch, um allen über die neuen Schlüpfelixieren zu berichten – und natürlich über eure neue Freundin!",
    "questAmberNotes": "Du sitzt mit @beffymaroo und @-Tyr- in der Taverne als @Vikte zur Tür hereinplatzt und aufgeregt von Gerüchten über eine neue Art von Magischem Schlüpfelixier erzählt, die in den Aufgabenwälder versteckt seien. Da Deine Tagesaufgaben bereits erledigt sind, beschliesst ihr drei ohne zu zögern, @Vikte bei der Suche zu helfen. Was kann ein kleines Abenteuer schon schaden?<br><br>Nach stundenlangem Marsch durch die Aufgabenwälder fängst Du an, den spontanen Aufbruch zur Jagd zu bereuen. Ihr seid gerade am umkehren als ihr einen überraschten Ausruf hört. Ihr dreht euch um und erblickt eine riesige Echse mit glänzenden, bernsteinfarbenen Schuppen, die sich um einen Baum windet, @Vikte in ihren Krallen haltend. @beffymaroo greift nach ihrem Schwert.<br><br>\"Wartet!\" ruft @-Tyr-. \"Das ist Trerezin! Sie ist nicht gefährlich, nur gefährlich anhänglich!\"",
@@ -747,7 +747,7 @@
    "questOnyxUnlockText": "Schaltet das Onyx Schlüpfelixier zum Kauf auf dem Marktplatz frei",
    "questVirtualPetBoss": "Wotchimon",
    "questVirtualPetRageTitle": "Das Piepen",
-    "questVirtualPetRageDescription": "Dieser Balken füllt sich, wenn Du Deine Tagesaufgaben nicht abschließt. Ist er vollständig gefüllt, wird Wotchimon sich um 30% seiner verbleibenden Gesundheit heilen!",
+    "questVirtualPetRageDescription": "Dieser Balken füllt sich, wenn Du Deine Tagesaufgaben nicht abschließt. Ist er vollständig gefüllt, wird Wotchimon einen Teil des ausstehenden Schadens deiner Party entfernen!",
    "questVirtualPetRageEffect": "`Wotchimon setzt lästiges Piepen ein!` Wotchimon lässt ein lästiges Piepen ertönen, und seine Zufriedenheitsanzeige verschwindet plötzlich! Ausstehender Schaden reduziert.",
    "questVirtualPetDropVirtualPetPotion": "Virtuelles Haustier Schlüpfelixier",
    "questVirtualPetUnlockText": "Schaltet das Virtuelles Haustier Schlüpfelixier zum Kauf auf dem Marktplatz frei",
@@ -203,5 +203,9 @@
    "mysterySet202201": "Mitternächtliches Spaßvogel Set",
    "mysterySet202202": "Türkises Rattenschwänzchen Set",
    "mysterySet202203": "Furchtlose Libelle-Set",
-    "mysterySet202204": "Virtuelles Abenteurer Set"
+    "mysterySet202204": "Virtuelles Abenteurer Set",
+    "mysterySet202205": "Dämmerungsschwingen Drachen Set",
+    "howManyGemsSend": "Wie viele Edelsteine möchtest Du verschicken?",
+    "sendAGift": "Geschenk verschicken",
+    "howManyGemsPurchase": "Wie viele Edelsteine möchtest Du kaufen?"
 }
@@ -128,6 +128,9 @@
  "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 standard colors of flying pets: Flying Pig, Owl, Parrot, Pterodactyl, Gryphon, Falcon, Peacock, and Rooster.",
-  "achievementBirdsOfAFeatherModalText":"You collected all the flying pets!"
+  "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!",
+  "achievementReptacularRumble": "Reptacular Rumble",
+  "achievementReptacularRumbleText": "Has hatched all the standard colors of reptile pets: Alligator, Pterodactyl, Snake, Triceratops, Turtle, Tyrannosaurus Rex, and Velociraptor!",
+  "achievementReptacularRumbleModalText": "You collected all the reptile pets!"
 }
@@ -1154,8 +1154,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.",
+  "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",
@@ -1330,7 +1330,7 @@
  "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).",
+  "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",
@@ -1876,8 +1876,10 @@
  "headMystery202111Notes": "A fine and fancy hat, with goggles that let you see through time. Pretty cool, right? Confers no benefit. November 2021 Subscriber Item.",
  "headMystery202112Text": "Antarctic Undine Crown",
  "headMystery202112Notes": "This frozen crown shimmers like the hidden depths of an iceberg. Confers no benefit. December 2021 Subscriber Item.",
-  "headMystery202202Text":"Turquoise Twintails",
-  "headMystery202202Notes":"You gotta have blue hair! Confers no benefit. February 2022 Subscriber Item.",
+  "headMystery202202Text": "Turquoise Twintails",
+  "headMystery202202Notes": "You gotta have blue hair! Confers no benefit. February 2022 Subscriber Item.",
+  "headMystery202206Text": "Sea Sprite Circlet",
+  "headMystery202206Notes": "The blue pearl in this circlet grants you waterbending powers. Use them wisely! Confers no benefit. June 2022 Subscriber Item.",
  "headMystery301404Text": "Fancy Top Hat",
  "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
  "headMystery301405Text": "Basic Top Hat",
@@ -2496,6 +2498,8 @@
  "backMystery202203Notes": "Outrace all the other creatures of the sky with these shimmering wings. Confers no benefit. March 2022 Subscriber Item.",
  "backMystery202205Text": "Dusk Wings",
  "backMystery202205Notes": "The mighty flap of these vast wings can be heard echoing among the dunes. Confers no benefit. May 2022 Subscriber Item.",
+  "backMystery202206Text": "Sea Sprite Wings",
+  "backMystery202206Notes": "Whimsical wings made of water and waves! Confers no benefit. June 2022 Subscriber Item.",

  "backSpecialWonderconRedText": "Mighty Cape",
  "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
@@ -2776,12 +2780,12 @@
  "eyewearMystery202108Notes": "Stare down your enemies (or your biggest tasks!) with these and they don't stand a chance. Confers no benefit. August 2021 Subscriber Item.",
  "eyewearMystery202201Text": "Midnight Merrymaker's Mask",
  "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.",
+  "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",
@@ -780,7 +780,7 @@
  "rockingReptilesNotes": "Contains 'The Insta-Gator,' 'The Serpent of Distraction,' and 'The Veloci-Rapper.' Available until September 30.",

  "delightfulDinosText": "Delightful Dinos Quest Bundle",
-  "delightfulDinosNotes": "Contains 'The Pterror-dactyl,' 'The Trampling Triceratops,' and 'The Dinosaur Unearthed.' Available until November 30.",
+  "delightfulDinosNotes": "Contains 'The Pterror-dactyl,' 'The Trampling Triceratops,' and 'The Dinosaur Unearthed.' Available until May 31.",

  "questAmberText": "The Amber Alliance",
  "questAmberNotes": "You’re sitting in the Tavern with @beffymaroo and @-Tyr- when @Vikte bursts through the door and excitedly tells you about the rumors of another type of Magic Hatching Potion hidden in the Taskwoods. Having completed your Dailies, the three of you immediately agree to help @Vikte on their search. After all, what’s the harm in a little adventure?<br><br>After walking through the Taskwoods for hours, you’re beginning to regret joining such a wild chase. You’re about to head home, when you hear a surprised yelp and turn to see a huge lizard with shiny amber scales coiled around a tree, clutching @Vikte in her claws. @beffymaroo reaches for her sword.<br><br>“Wait!” cries @-Tyr-. “It’s the Trerezin! She’s not dangerous, just dangerously clingy!”",
@@ -134,6 +134,7 @@
    "mysterySet202203": "Dauntless Dragonfly Set",
    "mysterySet202204": "Virtual Adventurer Set",
    "mysterySet202205": "Dusk-Winged Dragon Set",
+    "mysterySet202206": "Sea Sprite Set",
    "mysterySet301404": "Steampunk Standard Set",
    "mysterySet301405": "Steampunk Accessories Set",
    "mysterySet301703": "Peacock Steampunk Set",
@@ -104,9 +104,27 @@
    "achievementSeeingRedText": "Has collected all Red Pets.",
    "achievementSeeingRed": "Seeing Red",
    "achievementLegendaryBestiaryModalText": "You collected all the mythical pets!",
-    "achievementLegendaryBestiaryText": "Has hatched all the mythical pets: Dragon, Flying Pig, Gryphon, Sea Serpent, and Unicorn!",
+    "achievementLegendaryBestiaryText": "Has hatched all standard colours of mythical pets: Dragon, Flying Pig, Gryphon, Sea Serpent, and Unicorn!",
    "achievementLegendaryBestiary": "Legendary Bestiary",
    "achievementSeasonalSpecialistModalText": "You completed all the seasonal quests!",
    "achievementSeasonalSpecialistText": "Has completed all the Spring and Winter seasonal quests: Egg Hunt, Trapper Santa, and Find the Cub!",
-    "achievementSeasonalSpecialist": "Seasonal Specialist"
+    "achievementSeasonalSpecialist": "Seasonal Specialist",
+    "achievementVioletsAreBlueText": "Has collected all Cotton Candy Blue Pets.",
+    "achievementVioletsAreBlueModalText": "You collected all the Cotton Candy Blue Pets!",
+    "achievementWildBlueYonderModalText": "You tamed all the Cotton Candy Blue Mounts!",
+    "achievementDomesticated": "E-I-E-I-O",
+    "achievementWildBlueYonderText": "Has tamed all Cotton Candy Blue Mounts.",
+    "achievementVioletsAreBlue": "Violets are Blue",
+    "achievementWildBlueYonder": "Wild Blue Yonder",
+    "achievementDomesticatedModalText": "You collected all the domesticated pets!",
+    "achievementDomesticatedText": "Has hatched all standard colours of domesticated pets: Ferret, Guinea Pig, Rooster, Flying Pig, Rat, Bunny, Horse and Cow!",
+    "achievementZodiacZookeeper": "Zodiac Zookeeper",
+    "achievementZodiacZookeeperModalText": "You collected all the zodiac pets!",
+    "achievementZodiacZookeeperText": "Has hatched all standard colours of zodiac pets: Rat, Cow, Bunny, Snake, Horse, Sheep, Monkey, Rooster, Wolf, Tiger, Flying Pig, and Dragon!",
+    "achievementShadyCustomer": "Shady Customer",
+    "achievementShadyCustomerText": "Has collected all Shade Pets.",
+    "achievementShadyCustomerModalText": "You colleted all the Shade Pets!",
+    "achievementShadeOfItAll": "The Shade of It All",
+    "achievementShadeOfItAllText": "Has tamed all Shade Mounts.",
+    "achievementShadeOfItAllModalText": "You tamed all the Shade Mounts!"
 }
@@ -32,7 +32,7 @@
    "commGuidePara031": "Algunos Gremios Públicos pueden contener temas sensibles, como depresión, religión, política, etc. Esto es permitido, siempre que las conversaciones allí contenidas no violen los Términos y Condiciones o Reglas de Espacios Públicos, y en tanto y en cuanto se mantengan en tema.",
    "commGuidePara033": "<strong>Los Gremios Públicos NO pueden alojar contenido apropiado únicamente para miembros mayores de 18 años. Si se planea discutir contenido sensible permanentemente, deben indicarlo en la descripción del Gremio</strong>. Esto es para hacer de Habitica un espacio cómodo para todos.",
    "commGuidePara035": "<strong>Si el Gremio en cuestión trata diferentes temas sensibles, es una cuestión de respeto a tus compañeros Habiticanos el publicar tu comentario luego de una advertencia (por ejemplo, \"Advertencia: referencias a autolesiones\" )</strong>. Estas pueden tomarse como advertencias a situaciones detonantes y/o notas de contenido, y los Gremios pueden tener reglas propias en adición a las aquí descritas. En lo posible, por favor utiliza <a href='https://habitica.fandom.com/es/wiki/Gu%C3%ADa_de_Markdown' target='_blank'>markdown</a> para esconder contenido potencialmente sensible bajo saltos de línea para que aquellos que deseen evitar leerlo puedan simplemente navegar hacia adelante sin ver el contenido. El Personal de Habitica y los moderadores mantienen su derecho a remover el contenido a su discreción.",
-    "commGuidePara036": "Adicionalmente, el material sensible deberá mantenerse en el tema -- mencionar autolesiones en un Gremio que se especializa en combatir la depresión puede tener sentido, pero puede ser menos apropiado en un Gremio de música. Si ves a alguien que repetidamente viola esta Regla, especialmente luego de varias solicitudes, por favor reporta las publicaciones y notifica al administrador de la comunidad via <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
+    "commGuidePara036": "Adicionalmente, el material sensible deberá mantenerse en el tema -- mencionar autolesiones en un Gremio que se especializa en combatir la depresión puede tener sentido, pero puede ser menos apropiado en un Gremio de música. Si ves a alguien que repetidamente viola esta Regla, especialmente luego de varias solicitudes, por favor, reporta las publicaciones y notifica al administrador de la comunidad vía <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
    "commGuidePara037": "<strong>Está prohibida la creación de Gremios, Públicos o Privados, que tengan el propósito de atacar a un grupo o individuo</strong>. La creación de tal Gremio es base para un ban inmediato. Pelea contra los malos Hábitos, no tus compañeros de aventuras!",
    "commGuidePara038": "<strong>Todos los Retos de Taberna y los Retos de los Gremios Públicos deben cumplir estas reglas también</strong>.",
    "commGuideHeadingInfractionsEtc": "Infracciones, Consecuencias y Restauración",
@@ -2469,5 +2469,39 @@
    "weaponArmoirePotionRedNotes": "¡No te pongas colorado hoy, porque esta poción de eclosión no te dejará en números rojos! Aumenta la Fuerza y la Constitución en <%= attrs %>. Armario Encantado: Conjunto de Pociones (Artículo 4 de 10)",
    "weaponArmoirePotionShadeText": "Poción de Sombra Decorativa",
    "weaponArmoirePotionShadeNotes": "Como dice el refrán, a la sombra del favor, crecen vicios. ¡Y, a la sombra de esta poción, una mascota (a)sombrosa! Aumenta la Inteligencia en <%= int %> y la Percepción en <%= per %>. Armario Encantado: Conjunto de Pociones (Artículo 5 de 10)",
-    "weaponArmoirePotionSkeletonNotes": "¿Te sientes productivo hoy? ¡Pues a mover el esqueleto! ¡No te olvides de llevarte esta poción de eclosión de esqueleto contigo! Aumenta la Fuerza en <%= str %> y la Inteligencia en <%= int %>. Armario Encantado: Conjunto de Pociones (Artículo 6 de 10)"
+    "weaponArmoirePotionSkeletonNotes": "¿Te sientes productivo hoy? ¡Pues a mover el esqueleto! ¡No te olvides de llevarte esta poción de eclosión de esqueleto contigo! Aumenta la Fuerza en <%= str %> y la Inteligencia en <%= int %>. Armario Encantado: Conjunto de Pociones (Artículo 6 de 10)",
+    "weaponArmoirePotionBlueNotes": "¡La vida es algo más esponjosa y mucho más azulada con esta poción que crea bestias de algodón de azúcar azul! Aumenta la Inteligencia en <%= int %> y la Constitución en <%= con %>. Armario Encantado: Conjunto de Pociones (Artículo 9 de 10)",
+    "weaponArmoirePotionGoldenText": "Poción Dorada Decorativa",
+    "weaponArmoirePotionGoldenNotes": "Con esta poción tu mascota tendrá un corazón de oro... y orejas de oro... y una cola de oro... Aumenta la Fuerza y la Inteligencia en <%= attrs %>. Armario Encantado: Conjunto de Pociones (Artículo 10 de 10)",
+    "weaponArmoirePotionZombieText": "Poción de Zombie Decorativa",
+    "weaponArmoirePotionZombieNotes": "Úsala para eclosionar una mascota zombie, pero ¡ten cuidado, no te vaya a morder! Aumenta la Constitución en <%= con %> y la Percepción en <%= per %>. Armario Encantado: Conjunto de Pociones (Artículo 7 de 10)",
+    "weaponArmoirePotionPinkText": "Poción de Algodón de Azúcar Rosa Decorativa",
+    "weaponArmoirePotionPinkNotes": "Con esta poción de mascotas de algodón de azúcar rosa, la vida es un poco más dulce y muchísimo más rosa. Aumenta la Inteligencia en <%= int %> y la Constitución en <%= con %>. Armario Encantado: Conjunto de Pociones (Artículo 8 de 10)",
+    "weaponArmoirePotionBlueText": "Poción de Algodón de Azúcar Azul Decorativa",
+    "weaponArmoireShootingStarSpellText": "Destellos de Polvo Estelar",
+    "weaponArmoireRegalSceptreText": "Cetro Real",
+    "weaponArmoireRegalSceptreNotes": "Muestra tu autoridad real con este cetro enjoyado. Aumenta la Percepción en <%= per %>. Armario Encantado: Conjunto Real (Artículo 2 de 2).",
+    "weaponArmoireShootingStarSpellNotes": "Rodéate de un hechizo de polvo estelar que te ayudará a hacer tus deseos realidad. Aumenta la Fuerza y la Inteligencia en <%= attrs %>. Armario Encantado: Conjunto de Polvo Estelar (Artículo 3 de 3).",
+    "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.",
+    "weaponArmoireGardenersWateringCanText": "Regadera",
+    "weaponArmoireGardenersWateringCanNotes": "¡No puedes llegar lejos sin agua! Ten un suministro infinto a mano con esta regadera mágica que se rellena. Aumenta la Inteligencia por <%= int %>. Armario encantado: Conjunto de Jardinería (Artículo 4 de 4).",
+    "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.",
+    "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.",
+    "armorSpecialFall2021RogueNotes": "¡Tiene un gorrito, una túnica de cuero y remaches de metal! ¡Es genial! ¡Pero no ofrece impermeabilidad contra bichos pegajosos! Aumenta la percepción en <%= per %>. Equipamiento de edición limitada de otoño 2021.",
+    "armorSpecialFall2021WarriorNotes": "Un traje espectacular 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",
+    "armorSpecialWinter2022HealerNotes": "Deslizante como si esquiara, justo sobre el suelo, una figura etérea brillante viene a traer frescura y calma. Incrementa la Constitución en <%= con %>. Edición Limitada del Equipamiento de Invierno 2021-2022.",
+    "armorSpecialSpring2022RogueText": "Disfraz de Urraca",
+    "armorSpecialWinter2022HealerText": "Armadura de Hielo Cristalina",
+    "armorSpecialWinter2022RogueNotes": "¡Si están viendo estrellas, no podrán verte a ti! Así es, aprovechemos eso. Incrementa la Percepción en <%= per %>. Edición Limitada de Equipamiento de Invierno 2021-2022.",
+    "armorSpecialWinter2022WarriorText": "Pantys de felpa",
+    "armorSpecialWinter2022WarriorNotes": "¿Quién dice que no puedes estar cómodo y abrigadito durante la batalla diaria? Incrementa la Constitución en <%= con %>. Edición Limitada de Equipamiento de Invierno 2021-2022.",
+    "armorSpecialFall2021HealerNotes": "Hecho de tela duradera, resistente al fuego, estos mantos son perfectos para vestirse al conjurar fuegos de curación. Incrementa la Constitución en <%= con %>. Edición Limitada de Equipamiento de Otoño 2021.",
+    "armorSpecialWinter2022MageText": "Protección de la Granada",
+    "armorSpecialWinter2022RogueText": "Explosión deslumbrante",
+    "armorSpecialFall2021HealerText": "Manto del Invocador",
+    "armorSpecialWinter2022MageNotes": "¡Los enemigos deben cuidarse del jugo de frutas cuando se acerquen a ti! Incrementa la Inteligencia en <%= int %>. Edición Limitada del Equipamiento de Invierno 2021-2022.",
+    "armorSpecialSpring2022WarriorText": "Impermeable"
 }
@@ -602,7 +602,7 @@
    "questSquirrelDropSquirrelEgg": "Ardilla (Huevo)",
    "questSquirrelUnlockText": "Desbloquea Huevos de Ardilla para comprar en el Mercado",
    "cuddleBuddiesText": "Paquete de Misión Compañeros Mimosos",
-    "cuddleBuddiesNotes": "Contiene 'El Conejito Asesino', 'El Hurrón Nefario', y 'La Pandilla de Conejillos de Indias'. Disponible hasta el 31 de Mayo.",
+    "cuddleBuddiesNotes": "Contiene 'El Conejito Asesino', 'El Hurrón Nefario', y 'La Pandilla de Conejillos de Indias'. Disponible hasta el 31 de Marzo.",
    "aquaticAmigosText": "Paquete de Misión Amigos Acuáticos",
    "aquaticAmigosNotes": "Contiene 'El Ajolote Mágico', 'El Kraken de Inkompleta' y 'La Llamada de Octothulu'. Disponible hasta el 31 de Agosto.",
    "questSeaSerpentText": "Peligro en las Profundidades: ¡Ataque de la Serpiente Marina!",
@@ -628,7 +628,7 @@
    "oddballsText": "Paquete de Misión de Raritos",
    "oddballsNotes": "Contiene 'La Jalea Regente', 'Escapa de la Criatura de las Cuevas', y 'Un Hilo Enredado'. Disponible hasta el 30 de Abril.",
    "birdBuddiesText": "Paquete de Misión Aves Amigables",
-    "birdBuddiesNotes": "Contiene 'Un Ave Álgida,' 'Alboroto del Gallo,' y 'El Pavo Real del Tira y Afloja.' Disponible hasta el 31 de Diciembre.",
+    "birdBuddiesNotes": "Contiene 'Un Ave Álgida,' 'Alboroto del Gallo,' y 'El Pavo Real del Tira y Afloja.' Disponible hasta el 30 de Septiembre.",
    "questVelociraptorText": "El Veloci-Rapero",
    "questVelociraptorNotes": "Estás compartiendo pasteles de miel con @*~Seraphina~*, @Procyon P, y @Lilith of Alfheim junto a un lago en las estepas de Stoïkalm. De repente, una lúgubre voz interrumpe tu pícnic.<br><br><em>Mis Hábitos se han visto afectados, he perdido mis Tareas Diarias,<br>Estoy perdiendo la cabeza, hundiendome en las dudas y en los tal vez,<br>En la cima de mi juego yo era tan productivo,<br>Pero ahora dejo pasar mis fechas de vencimiento.</em><br><br>@*~Seraphina~* se asoma destrás de un matorral de hierba. “Es el Veloci-Rapero. Parece... ¿disgustado?”<br><br>Levantas un puño con determinación. “Solo hay una cosa que hacer. ¡Tiempo de Batalla de Rap!”",
    "questVelociraptorCompletion": "Irrumpes a través de la hierba, confrontando al Veloci-Rapero.<br><br><em>Mira aquí, rapero, no eres un desertor,<br>¡De los Malos Hábitos eres el más duro bateador!<br>Marca tus Tareas Pendientes como un jefe,<br>¡Por un día perdido no lamentes!</em><br><br>Lleno de confianza renovada, saltará al estilo libre otro día, dejando atrás tres huevos donde se sentó.",
@@ -730,5 +730,11 @@
    "questStoneCollectCapricornRunes": "Runas de Capricornio",
    "questStoneCollectMarsRunes": "Runas de Marte",
    "questStoneCompletion": "El trabajo de quitar la maleza y mover las piedras sueltas es pesado al límite de tus fuerzas. Pero divides el trabajo entre el equipo y ubicas piedras en los caminos detrás tuyo para ayudarte a encontrar el camino de vuelta a los demás. Las runas que encuentras también refuerzan tu fuerza y determinación, y al final el jardín no se ve tan descuidado. <br><br>Se reúnen en la Biblioteca como sugirió @starsystemic, y encuentran una fórmula de Poción Mágica que utiliza las runas que recogieron. \"Esta es una recompensa inesperada por hacer nuestras tareas descuidadas\", dice @jjgame83.<br><br>@QuartzFox está de acuerdo, \"Y eso es además de tener un hermoso jardín para disfrutar con nuestras mascotas\".<br><br>\"¡Empecemos a hacer Pociones de Eclosión Mágicas de Piedra Musgosa!\" dice @starsystemic, y todos se unen con alegría.",
-    "questStoneNotes": "Abres las puertas de la Fortaleza del Abandono sólo para ser sorprendendido por el musgo que ha crecido sobre todas las estatuas, rocas y superficies del jardín. \"¡Oh, no, el jardín ha pasado demasiado tiempo descuidado!\", dice @jjgame83.<br><br>\"Bueno, nunca es tarde para empezar a cuidar el jardín\", dice @PixelStormArt con entusiasmo, \"pero ¿por dónde empezamos a ocuparnos del laberinto de musgo? \"<br><br>\"Podemos hacer y seguir un plan para no perdernos\", dice @QuartzFox.<br><br>Mientras quita las rocas llenas de musgo, @starsystemic descubre runas de Marte y Capricornio escondidas debajo. \"¿Para qué son? Llevémoslas a la Biblioteca de la Ciudad Hábito para buscarlas cuando hayamos terminado\". <br><br>Eso suponiendo que encuentren la forma de salir de aquí, piensas, pero no lo dices en voz alta."
+    "questStoneNotes": "Abres las puertas de la Fortaleza del Abandono sólo para ser sorprendendido por el musgo que ha crecido sobre todas las estatuas, rocas y superficies del jardín. \"¡Oh, no, el jardín ha pasado demasiado tiempo descuidado!\", dice @jjgame83.<br><br>\"Bueno, nunca es tarde para empezar a cuidar el jardín\", dice @PixelStormArt con entusiasmo, \"pero ¿por dónde empezamos a ocuparnos del laberinto de musgo? \"<br><br>\"Podemos hacer y seguir un plan para no perdernos\", dice @QuartzFox.<br><br>Mientras quita las rocas llenas de musgo, @starsystemic descubre runas de Marte y Capricornio escondidas debajo. \"¿Para qué son? Llevémoslas a la Biblioteca de la Ciudad Hábito para buscarlas cuando hayamos terminado\". <br><br>Eso suponiendo que encuentren la forma de salir de aquí, piensas, pero no lo dices en voz alta.",
+    "questSolarSystemText": "Un viaje de concentración cósmica",
+    "questSolarSystemBoss": "Diversinoides",
+    "questSolarSystemNotes": "Tu equipo está viajando por el cosmos, disfrutando del paisaje desde una fantástica aeronave diseñada por el virtuoso ingeniero espacial @gawrone. Su propulsión meditativa se basa en la capacidad de vuestro grupo de permanecer concentrados. <br><br> Delante de las brillantes nubes galácticas, detectas una estrella de ominoso brillo pulsante. \"Mantén tu concentración\", te advierte @beffymaroo. \"¡Si nos distraemos demasiado mientras atravesamos esa supernova, ¡la atracción gravitatoria de la estrella podría desviarnos del camino!\" <br><br> Mientras sobrepasáis la estrella, unos extraños pulsos de energía vienen comienzan a azotar la nave. <br><br> \"Son diversinoides, criaturas pensadas para intentar despistarnos\", dice @SabreCat. \"Si podemos dejar que fluyan sin llevarnos atraer por ellas, ¡deberíamos poder ser capaces de alcanzar nuestro objetivo!\"",
+    "questSolarSystemCompletion": "Con cuidadosa ejecución, la tripulación y tú lográis navegar a través de la bandada de diversionoides, contemplándolos sin dejar que os hipnoticen con sus seductores cantos de procastinación. A medida que sobrepasáis de forma segura la estrella pulsante, @gawrone se percata de un grupúsculo de botes flotando junto a la nave y los sube a bordo. Cada uno parece contener un sistema solar en miniatura!<br><br> \"Bueno, parece que nuestro duro trabajo ha traído consigo una excelente recompensa\". dice @beffymaroo. \"Veamos qué maravillas celestiales obtenemos si eclosionamos huevos de mascota con estas nuevas pociones.\"",
+    "questSolarSystemDropSolarSystemPotion": "Poción de eclosión sistema solar",
+    "questSolarSystemUnlockText": "Desbloquea las pociones de eclosión sistema solar para su compra en el mercado"
 }
@@ -42,7 +42,7 @@
    "sureChangeCustomDayStartTime": "¿Estas seguro de que quieres cambiar tu Inicio de Día Personalizado? Tus diarias se resetearan la primera vez que uses Habitica después de <%= time %>. ¡Asegúrate de haber completado tus diarias antes de eso!",
    "customDayStartHasChanged": "Tu inicio de dia personalizado a cambiado.",
    "nextCron": "Tus Diarias se reiniciarán la primera vez que uses Habitica después de <%= time %>. ¡Asegúrate de haber completado tus Diarias antes de esa hora!",
-    "customDayStartInfo1": "Habitica por defecto chequea y reinicia tus Diarias a la medianoche en tu propia zona horaria cada día. Puedes personalizar ese horario aquí.",
+    "customDayStartInfo1": "Habitica revisa y reinicia tus tareas Diarias cada día a la medianoche, en tu propia zona horaria. Puedes reajustar aquí cuánto retrasar el horario por defecto.",
    "misc": "Varios",
    "showHeader": "Mostrar cabecera",
    "changePass": "Cambiar contraseña",
@@ -55,7 +55,7 @@
    "newUsername": "Nuevo Nombre de Usuario",
    "dangerZone": "Zona peligrosa",
    "resetText1": "¡AVISO! Esto reinicia muchas partes de tu cuenta. Esto no es recomendable, pero ha resultado útil para algunas personas al principio después de jugar con el sitio web por un corto tiempo.",
-    "resetText2": "Perderás todos tus niveles, Oro, y puntos de experiencia. Todas tus tareas (Excepto aquellas de Desafío) y tu historial serán borrados permanentemente. Perderás todo tu equipamiento pero podrás comprarlo de nuevo en el futuro, incluyendo todo el equipamiento de edición limitada o Artículos Misteriosos de suscriptor que ya posees (tendrás que estar en la clase correcta para poder volver a comprar equipamiento limitado a cierta clases). Te quedarás con tu clase actual, tus mascotas y monturas. Quiza prefieras usar un Orbe de Renacimiento en su lugar, el cual es una opción mucho mas seguta, la cual preservará tus tareas.",
+    "resetText2": "Perderás todos tus niveles, Oro, y puntos de experiencia. Todas tus tareas (Excepto aquellas de Desafío) y tu historial serán borrados permanentemente. Perderás todo tu equipamiento (excepto los Objetos de Suscriptor y objetos gratis conmemorativos), pero podrás comprarlo de nuevo en el futuro, incluyendo todo el equipamiento de edición limitada (tendrás que estar en la clase correcta para poder volver a comprar equipamiento limitado a cierta clases). Te quedarás con tu clase actual, logros, mascotas y monturas. Quizá prefieras usar un Orbe de Renacimiento en su lugar, el cual es una opción mucho mas segura, la cual preservará tus tareas.",
    "deleteLocalAccountText": "¿Estás seguro? ¡Esto borrará tu cuenta para siempre, y no podrá ser recuperada! Necesitarás registrar una cuenta nueva para volver a usar Habitica. Las Gemas no serán reembolsadas. Si estás absolutamente seguro escribe tu contraseña en la caja de texto de abajo.",
    "deleteSocialAccountText": "¿Estás seguro? ¡Esto borrará tu cuenta para siempre, y no podrá ser recuperada! Necesitarás registrar una cuenta nueva para volver a usar Habitica. Las Gemas no serán reembolsadas. Si estás absolutamente seguro escribe \"<%= magicWord %>\" en la caja de texto de abajo.",
    "API": "API",
@@ -159,7 +159,7 @@
    "amazonPayments": "Pagos con Amazon",
    "amazonPaymentsRecurring": "Marcar la siguiente casilla es necesario para crear tu suscripción. Permite usar tu cuenta de Amazon para pagos actuales para <strong>esta</strong> suscripción. No causará que tu cuenta de Amazon sea usada automáticamente para ninguna compra en el futuro.",
    "timezone": "Zona horaria",
-    "timezoneUTC": "Habitica utiliza la zona horaria de tu PC, la cual es <strong><%= utc %></strong>",
+    "timezoneUTC": "Habitica utiliza la zona horaria configurada en tu dispositivo, la cual es: <strong><%= utc %></strong>",
    "timezoneInfo": "Si esa zona horaria es incorrecta, primero vuelve a cargar esta página usando el botón de recarga o actualización de tu navegador para asegurarte de que Habitica tenga la información más reciente. Si todavía está mal, ajusta la zona horaria en su PC y luego vuelva a cargar esta página.<br><br><strong> Si usa Habitica en otras PC o dispositivos móviles, la zona horaria debe ser la misma para todos. Si tus Diarias se han reiniciado en el momento equivocado, repite este control en todas las otras PC y en un navegador en tus dispositivos móviles.",
    "push": "Notificación",
    "about": "Acerca de",
@@ -190,5 +190,24 @@
    "suggestMyUsername": "Sugerir mi nombre de usuario",
    "mentioning": "Menciones",
    "bannedWordUsedInProfile": "Tu Nombre para Mostrar o el texto Acerca de contenía lenguaje inapropiado.",
-    "giftedSubscriptionWinterPromo": "¡Hola <%= username %>, recibiste <%= monthCount %> meses de suscripción como parte de nuestra promoción de entrega de regalos!"
+    "giftedSubscriptionWinterPromo": "¡Hola <%= username %>, recibiste <%= monthCount %> meses de suscripción como parte de nuestra promoción de entrega de regalos!",
+    "transaction_gift_receive": "Recibido de",
+    "transaction_create_challenge": "Reto creado",
+    "transactions": "Transacciones",
+    "gemTransactions": "Transacción de Gemas",
+    "hourglassTransactions": "Transacción de Reloj de Arena",
+    "noGemTransactions": "No tienes transacciones de gemas todavía.",
+    "noHourglassTransactions": "No tienes ninguna transacción de gemas todavía.",
+    "transaction_debug": "Depuración de bugs",
+    "transaction_buy_money": "Comprado con dinero",
+    "transaction_buy_gold": "Comprado con Oro",
+    "transaction_contribution": "Mediante contribuciones",
+    "transaction_spend": "Gastado en",
+    "transaction_gift_send": "Regalado a",
+    "addPasswordAuth": "Añadir Contraseña",
+    "gemCap": "Límite de Gemas",
+    "nextHourglass": "Siguiente Reloj de Arena",
+    "nextHourglassDescription": "Los Suscriptores reciben un Reloj de Arena Místico dentro de\nlos tres primeros días del mes.",
+    "dayStartAdjustment": "Elegir Día de Inicio",
+    "adjustment": "Ajuste"
 }
@@ -135,5 +135,9 @@
    "deleteTaskType": "Eliminar <%= type %>",
    "tomorrow": "Mañana",
    "addNotes": "Añadir notas",
-    "addATitle": "Añadir un título"
+    "addATitle": "Añadir un título",
+    "counter": "Contador",
+    "editTagsText": "Editar Etiquetas",
+    "adjustCounter": "Ajustar Contador",
+    "resetCounter": "Reiniciar Contador"
 }
@@ -116,5 +116,18 @@
    "achievementKickstarter2019": "Pin Kickstarter Backer",
    "achievementAridAuthorityModalText": "Napaamo mo ang lahat ng Desert Mounts!",
    "achievementDomesticated": "E-I-E-I-O",
-    "achievementDomesticatedText": "Napisâ ang lahát ng karaniwang kulay ng mga alagang hayop: Ferret, Guinea Pig, Rooster, Flying Pig, Daga, Bunny, Kabayo, at Baka!"
+    "achievementDomesticatedText": "Napisâ ang lahát ng karaniwang kulay ng mga alagang hayop: Ferret, Guinea Pig, Rooster, Flying Pig, Daga, Bunny, Kabayo, at Baka!",
+    "achievementDomesticatedModalText": "Nalikom mo lahát ng mga naaamong alágà.",
+    "achievementBirdsOfAFeather": "Mga Ibong Magkabalahibo",
+    "achievementShadyCustomerText": "Naipon lahát ng Makulimlím na Alagà.",
+    "achievementShadyCustomerModalText": "Naipon mo lahát ng Makulimlím na Alagà!",
+    "achievementShadeOfItAll": "Ang Kakulimlimán ng Lahát",
+    "achievementShadyCustomer": "Malilim na Mamimimili",
+    "achievementShadeOfItAllText": "Naipon lahát ng Makulimlím na Lulaníng Alagà.",
+    "achievementShadeOfItAllModalText": "Naipon mo ang lahát ng Makulimlím na Lulaníng Alagà!",
+    "achievementBirdsOfAFeatherModalText": "Nalikom mo lahát ng mga lumilipád na alágà!",
+    "achievementBirdsOfAFeatherText": "Nakapisâ ng lahat ng karaniwang kulay ng mga lumilipád na alagà: Lumilipád na Baboy, Kwago, Periko, Terodaktil, Gripon, Limbás, Pabo Real, at Tandáng.",
+    "achievementZodiacZookeeperModalText": "Nalikom mo lahát ng mga tahakláw na alágà!",
+    "achievementZodiacZookeeper": "Tahakláw na Tagapangalagà",
+    "achievementZodiacZookeeperText": "Nakapisâ ng lahat ng karaniwang kulay ng mga tahakláw na alagà: Dagâ, Baka, Kuneho, Ahas, Kabayò, Tupà, Unggóy, Tandáng, Lobo, Tigre, Lumilipád na Baboy, at Dragón!"
 }
@@ -3,7 +3,7 @@
    "dontDespair": "Don't despair!",
    "deathPenaltyDetails": "You lost a Level, your Gold, and a piece of Equipment, but you can get them all back with hard work! Good luck--you'll do great.",
    "refillHealthTryAgain": "Refill Health & Try Again",
-    "dyingOftenTips": "Is this happening often? <a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Here are some tips!</a>",
+    "dyingOftenTips": "Madalás ba itóng nangyayarì?<a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Naritó ang íiláng mga payò!</a>",
    "losingHealthWarning": "Careful - You're Losing Health!",
    "losingHealthWarning2": "Don't let your Health drop to zero! If you do, you'll lose a level, your Gold, and a piece of equipment.",
    "toRegainHealth": "To regain Health:",
@@ -14,4 +14,4 @@
    "lowHealthTips4": "If a Daily isn't due on a certain day, you can disable it by clicking the pencil icon.",
    "goodLuck": "Good luck!",
    "cannotRevive": "Cannot revive if not dead"
-}
+}
@@ -29,7 +29,7 @@
    "hopefulHippogriffPet": "Umaasang Hippogriff",
    "magicalBee": "Mahiwagang Bubuyog",
    "phoenix": "Fenix",
-    "royalPurpleGryphon": "Kulay Ubeng Maharliká na Griffin",
+    "royalPurpleGryphon": "Kulay Ubeng Maharliká na Gripon",
    "orca": "Orca",
    "mammoth": "Mabalahibong Mammoth",
    "mantisShrimp": "Tatampál",
@@ -51,5 +51,51 @@
    "dropsExplanationEggs": "Magwaldas ng mga Hiyas upang mas mabilis na makakuha ng mga itlog, kung ayaw mong hintaying ma-drop ang mga standard na itlog, o ulitin ang mga Quest upang makakuha ng Quest eggs. <a href=\"http://habitica.fandom.com/wiki/Drops\">Matuto pa tungkol sa drop system.</a>",
    "dropsExplanation": "Mas mabilis na makakuha ng ganitong mga gamit sa pamamagitan ng mga Hiyas kung ayaw mong hintayin ang pag-drop pagtapos ng kada gawain. <a href=\"http://habitica.fandom.com/wiki/Drops\">Matuto pa tungkol sa drop system.</a>",
    "noSaddlesAvailable": "Wala kang Saddle.",
-    "noFoodAvailable": "Wala kang Pagkaing Pang-Alaga."
+    "noFoodAvailable": "Wala kang Pagkaing Pang-Alaga.",
+    "petNotOwned": "Hindí mo pag-aari ang alagang itó.",
+    "keyToPets": "Susì sa Kanlungan ng mga Alagà",
+    "mountNotOwned": "Hindí mo pag-aari ang lulaning alagang itó.",
+    "mountsReleased": "Napakawalán na ang mga Lulaníng Alagà",
+    "filterByStandard": "Pangkaraniwan",
+    "welcomeStable": "Maligayang pagdatíng sa Kanlungan ng mga Alagà!",
+    "raisedPet": "Napalakí mo ang iyóng <%= pet %>!",
+    "keyToBoth": "Susì sa Kanlungan ng mga Lulaníng Alagà",
+    "keyToMountsDesc": "Pakawalán ang lahat ng mga pangkaraniwang Lulaníng Alagà upang maipong mulì. (Ang mga Lulaníng Alagang Nakamít sa Pakikipagságupaán at bihirang Lulaníng Alagà ay hindi mapipinsalà.)",
+    "hatchedPetGeneric": "Nakapisá ka ng bagong alagà!",
+    "welcomeStableText": "Maligayang pagdatíng sa Kanlungan ng mga Alagà! Akó si Matt, ang",
+    "feedPet": "Ipakain ang <%= text %> sa iyóng <%= name %>?",
+    "petsReleased": "Napakawalán na ang mga Alagà.",
+    "releasePetsSuccess": "Napakawalán na ang iyóng mga pangkaraniwang Alagà!",
+    "releaseMountsConfirm": "Nakakatiyák ka bang pakawalán ang iyóng mga pangkaraniwang Lulaníng Alagà?",
+    "hatchedPetHowToUse": "Dalawin ang [Silungan ng mga Alagà](<%= stableUrl %>) upang magpakain at ipalamutí ang pinakabago mong alagà.",
+    "keyToPetsDesc": "Pakawalán ang lahat ng mga pangkaraniwang Alagà upang maipong mulì. (Ang mga Alagang Nakamít sa Pakikipagságupaán at bihirang Alagà ay hindi mapipinsalà.)",
+    "keyToMounts": "Susì sa Kanlungan ng mga Lulaníng Alagà",
+    "keyToBothDesc": "Pakawalán ang lahat ng mga pangkaraniwang Alagà at mga Lulaníng Alagà upang maipong mulì. (Ang mga Alagà/Lulaníng Alagang Nakamít sa Pakikipagságupaán at bihirang Alagà/Lulaníng Alagà ay hindi mapipinsalà.)",
+    "releaseMountsSuccess": "Napakawalán na ang iyóng mga pangkaraniwang Lulaníng Alagà!",
+    "mountsAndPetsReleased": "Napakawalán na ang mga Lulaníng Alagà at mga alagà",
+    "releasePetsConfirm": "Nakakatiyák ka bang pakawalán ang iyóng mga pangkaraniwang Alagà?",
+    "releaseBothSuccess": "Napakawalán na ang iyóng mga pangkaraniwang Alagà at mga Lulaníng Alagà!",
+    "petLikeToEat": "Anó ang ibig kainin ng aking alagà?",
+    "releaseBothConfirm": "Nakakatiyák ka bang pakawalán ang iyóng mga pangkaraniwang Alagà at mga Lulaníng Alagà?",
+    "petLikeToEatText": "Lálakí ang iyóng mga alagà kahit anó pa ang ipakain mo sa kanilá, ngunit mas mabilis silang lálakí kung papakainin mo silá ng isáng Pagkaing Pang-alagà na pinakagusto nilá. Sumubok upang malaman ang <i>pattern</i>, o tingnán ang mga sagót dito: <br/> <a href=\"https://habitica.fandom.com/wiki/Food_Preferences\" target=\"_blank\">https://habitica.fandom. com/wiki/Food_Preferences</a>",
+    "notEnoughFood": "Walá kang sapát na pagkain",
+    "notEnoughPets": "Kulang pa ang bilang ng iyóng mga alagà",
+    "clickOnPotionToHatch": "Pumindót ng isáng mahiwagang langís na pampápapisâ upang magamit itó sa iyóng <%= eggName %> at makapapisâ ng panibagong alagà!",
+    "notEnoughMounts": "Kulang pa ang bilang ng iyóng mga lulaníng alagà",
+    "invalidAmount": "Hindí wastó ang dami ng pagkain; buombilang na positibo dapat",
+    "tooMuchFood": "Labis ang nagíng pagpapakain sa iyong alagà; iniurong ang kilos na itó",
+    "notEnoughPetsMounts": "Kulang pa ang bilang ng iyóng mga alagà at mga lulaníng alagà",
+    "hatchDialogText": "Ibuhos ang iyóng <%= potionName %> na mahiwagang langís na pampápapisâ sa iyong <%= eggName %> na itlóg, at itó ay mapípisâ bilang isang <%= petName %>.",
+    "foodTitle": "Pagkaing Pang-alagà",
+    "sortByColor": "Kulay",
+    "filterByMagicPotion": "Mahiwagang Langís",
+    "hatch": "Pisaín!",
+    "sortByHatchable": "Maaaring ng Mapisâ",
+    "filterByWacky": "Katawá-tawá",
+    "standard": "Pangkaraniwan",
+    "filterByQuest": "Pakikipagságupaán",
+    "clickOnPetToFeed": "Pindutín ang isáng Alagà upáng ipakain ang <%= foodName %>, at panoorin itóng lumakí!",
+    "clickOnEggToHatch": "Pumindót ng isáng itlóg upang magamit itó sa iyóng <%= potionName %> na mahiwagang langís na pampápapisâ at makapapisâ ng panibagong alagà!",
+    "dragThisPotion": "Hilain ang <%= potionName %> sa isá sa mga Itlóg upang makapisâ ng panibagong alagà!",
+    "dragThisFood": "Hilain ang <%= foodName %> sa isáng Alagà, at panoorin itóng lumakí!"
 }
@@ -126,8 +126,11 @@
    "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 !"
+    "achievementZodiacZookeeperText": "A fait éclore tous les familiers du zodiaque de couleur basique : Rat, Vache, Lapin, Serpent, Cheval, Mouton, Singe, Coq, Loup, Tigre, Cochon volant et Dragon !",
+    "achievementBirdsOfAFeatherText": "A fait éclore tous les familiers volants de couleur basique : Cochon volant, Hibou, Perroquet, Pterodactyle, Griffon, Faucon, Paon et Coq !",
+    "achievementBirdsOfAFeather": "Oiseaux à plume",
+    "achievementBirdsOfAFeatherModalText": "Vous avez collecté tous les familiers volants !",
+    "achievementReptacularRumble": "Étreinte reptilienne",
+    "achievementReptacularRumbleText": "A fait éclore toutes les couleurs standard de familiers reptiles : Alligator, Ptérodactyle, Serpent, Tricératops, Tortue, Tyrannosaure et Vélociraptor !",
+    "achievementReptacularRumbleModalText": "Vous avez collecté tous les familiers reptiles !"
 }
@@ -693,5 +693,12 @@
    "backgroundFlowerShopText": "Boutique de fleurs",
    "backgroundSpringtimeLakeNotes": "Profitez de la vue sur les rives d'un lac printanier.",
    "backgroundFlowerShopNotes": "Profitez de la douce senteur d'une boutique de fleurs.",
-    "backgroundSpringtimeLakeText": "Lac printanier"
+    "backgroundSpringtimeLakeText": "Lac printanier",
+    "backgroundOnACastleWallNotes": "Observez depuis le mur d'un château.",
+    "backgroundCastleGateText": "Entrée du château",
+    "backgroundCastleGateNotes": "Montez la garde à l'entrée du château.",
+    "backgroundEnchantedMusicRoomText": "Salle de musique enchantée",
+    "backgrounds052022": "Ensemble 96 : sorti en mai 2022",
+    "backgroundOnACastleWallText": "Sur le mur d'un château",
+    "backgroundEnchantedMusicRoomNotes": "Jouez dans une salle de musique enchantée."
 }
@@ -53,5 +53,6 @@
    "surveysSingle": "A aidé à faire progresser Habitica, en participant à une enquête ou à une phase de test importante. Merci !",
    "surveysMultiple": "A aidé à faire progresser Habitica à <%= count %> reprises, que ce soit en participant à une enquête ou en contribuant à une phase de test importante. Merci !",
    "blurbHallPatrons": "Voici le Panthéon des Sponsors, où nous rendons hommage aux nobles aventuriers qui ont soutenu le Kickstarter original de Habitica. Nous les remercions de nous avoir aidés à donner la vie à Habitica !",
-    "blurbHallContributors": "Voici le Panthéon des contributeurs, où sont honorés tous les contributeurs et toutes les contributrices \"open-source\" d'Habitica. Que ce soit grâce à du code, de l'art, de la musique, de l'écriture ou même simplement de l'aide, ils ont gagné <a href='https://habitica.fandom.com/fr/wiki/R%C3%A9compenses_de_Contribution' target='_blank'>des gemmes, de l'équipement exclusif</a>, et <a href='https://habitica.fandom.com/fr/wiki/Titres_de_Contribution' target='_blank'>des titres prestigieux</a>. Vous pouvez, vous aussi, contribuer à Habitica ! <a href='https://habitica.fandom.com/fr/wiki/Contribuer_à_Habitica' target='_blank'>Apprenez-en plus ici.</a>"
+    "blurbHallContributors": "Voici le Panthéon des contributeurs, où sont honorés tous les contributeurs et toutes les contributrices \"open-source\" d'Habitica. Que ce soit grâce à du code, de l'art, de la musique, de l'écriture ou même simplement de l'aide, ils ont gagné <a href='https://habitica.fandom.com/fr/wiki/R%C3%A9compenses_de_Contribution' target='_blank'>des gemmes, de l'équipement exclusif</a>, et <a href='https://habitica.fandom.com/fr/wiki/Titres_de_Contribution' target='_blank'>des titres prestigieux</a>. Vous pouvez, vous aussi, contribuer à Habitica ! <a href='https://habitica.fandom.com/fr/wiki/Contribuer_à_Habitica' target='_blank'>Apprenez-en plus ici.</a>",
+    "noPrivAccess": "Vous n'avez pas les privilèges requis."
 }
@@ -2618,5 +2618,15 @@
    "armorArmoireStrawRaincoatText": "Ciret de paille",
    "armorArmoireStrawRaincoatNotes": "Cette cape en paille tressée vous gardera au sec et évitera à votre armure de rouiller pendant les quêtes. Mais ne vous aventurez pas trop près des bougies ! Augmente la constitution de <%= con %>. Armoire enchantée : ensemble de pluie en paille (objet 1 de 2).",
    "headArmoireStrawRainHatText": "Chapeau de pluie en paille",
-    "headArmoireStrawRainHatNotes": "Vous pourrez détecter tous les obstacles sur votre chemin en portant ce chapeau imperméable et canonique. Augmente la perception de <%= per %>. Armoire enchantée : ensemble de pluie en paille (objet 2 de 2)."
+    "headArmoireStrawRainHatNotes": "Vous pourrez détecter tous les obstacles sur votre chemin en portant ce chapeau imperméable et canonique. Augmente la perception de <%= per %>. Armoire enchantée : ensemble de pluie en paille (objet 2 de 2).",
+    "backMystery202205Text": "Ailes crépusculaires",
+    "backMystery202205Notes": "Le puissant battement de ces vastes ailes résonne dans les dunes. Ne confère aucun bonus. Équipement d'abonnement de mai 2022.",
+    "headAccessoryMystery202205Text": "Cornes de dragon aux ailes crépusculaires",
+    "headAccessoryMystery202205Notes": "Ces cornes éblouissantes sont aussi brillantes qu'un coucher de soleil dans le désert. Ne confère aucun bonus. Équipement d'abonnement de mai 2022.",
+    "weaponArmoireHuntingHornText": "Corne de chasse",
+    "weaponArmoireHuntingHornNotes": "Taïaut ! Taïaut ! Rassemblez votre équipe pour une aventure ou une quête en soufflant dans cette corne. Augmente la force de <%= str %> et l'intelligence de <%= int %>. Armoire enchantée : ensemble d'instruments de musique 1 (objet 1 de 3)",
+    "shieldArmoireSpanishGuitarText": "Guitare espagnole",
+    "shieldArmoireSpanishGuitarNotes": "Dzing ! Dzing ! Rassemblez votre équipe pour un concert ou un fête en jouant de cette guitare. Augmente la perception de <%= per %> et l'intelligence de <%= int %>. Armoire enchantée : ensemble d'instruments de musique 1 ((objet 2 de 3)",
+    "shieldArmoireSnareDrumText": "Caisse-claire",
+    "shieldArmoireSnareDrumNotes": "Rat-a-tat-tat ! Rassemblez votre équipe pour une parade ou un défilé en jouant de ce tambour. Augmente la constitution de <%= con %> et l'intelligence de <%= int %>. Armoire enchantée : ensemble d'instruments de musique 1 (objet 3 de 3)"
 }
@@ -378,5 +378,6 @@
    "joinParty": "Rejoindre l'équipe",
    "editGuild": "Modifier la guilde",
    "editParty": "Modifier l'équipe",
-    "leaveGuild": "Quitter la guilde"
+    "leaveGuild": "Quitter la guilde",
+    "sendGiftTotal": "Total :"
 }
@@ -188,7 +188,7 @@
    "questTRexUndeadCompletion": "Les yeux brillants du tyrannosaure virent au noir, et il reprend sa place sur son piédestal. Tout le monde pousse un soupir de soulagement. \"Regardez !\" s'exclame @Baconsaur. \"Certains des œufs fossilisés paraissent luisants et comme neufs ! Peut-être pourrez-vous les faire éclore ?\"",
    "questTRexUndeadBoss": "Tyrannosaure squelettique",
    "questTRexUndeadRageTitle": "Soin squelettique",
-    "questTRexUndeadRageDescription": "Cette barre se remplit lorsque vous ne complétez pas vos tâches Quotidiennes. Lorsqu'elle est pleine, le tyrannosaure squelettique se soigne à hauteur de 30% de sa santé restante !",
+    "questTRexUndeadRageDescription": "Cette barre se remplit lorsque vous ne complétez pas vos tâches quotidiennes. Lorsqu'elle est pleine, le tyrannosaure squelettique se soigne à hauteur de 30% de sa santé restante !",
    "questTRexUndeadRageEffect": "Le tyrannosaure squelette utilise SOIN SQUELETTIQUE !\n\nLe monstre laisse échapper un rugissement surnaturel, et certains de ses os brisés se ressoudent !",
    "questTRexDropTRexEgg": "Tyrannosaure (œuf)",
    "questTRexUnlockText": "Déverrouille l'achat d’œufs de tyrannosaure au marché",
@@ -667,7 +667,7 @@
    "questRobotCompletion": "Alors que @Rev et le compagnon responsable robot mettent le dernier boulon en place, la machine à remonter le temps bourdonne de vie. @FolleMente et @McCoyly montent à bord. \"Merci pour l'aide ! On se reverra dans le futur ! Au fait, ça devrait vous aider pour votre prochaine invention !\" Avec cela, les voyageurs du temps disparaissent, mais laissent dans l'épave de l'ancien stabilisateur de productivité trois œufs au mouvement d'horloge. Ce seront peut-être là les éléments cruciaux d'une nouvelle chaîne de production de compagnons responsables !",
    "questRobotNotes": "Dans les laboratoire Capacité Max, @Rev met la dernière touche à sa toute dernière invention, un compagnon responsable robot, lorsqu'un étrange véhicule métallique apparaît soudainement dans un panache de fumée, à quelques centimètres du détecteur de fluctuation du robot ! Ses occupants, deux étranges personnages vêtus d'argent, émergent et enlèvent leurs casques spatiaux, se révélant comme @FolleMente et @McCoyly.<br><br>\"Je suppose qu'il y avait une anomalie dans notre mise en œuvre de la productivité,\" @FolleMente dit simplement.<br><br>@McCoyly croise ses bras. \"Cela signifie qu'ils ont négligé de terminer leurs quotidiennes, ce qui, selon moi, a entraîné la désintégration de notre stabilisateur de productivité. C'est une composante essentielle du voyage dans le temps qui a besoin de cohérence pour fonctionner correctement. Nos réalisations font avancer notre mouvement à travers le temps et l'espace ! Je n'ai pas le temps de vous expliquer plus en détail, @Rev, vous le découvrirez dans 37 ans, ou peut-être vos alliés les Mystérieux Voyageurs du Temps pourront vous renseigner. Pour l'instant, pouvez-vous nous aider à réparer notre machine à remonter le temps ?\"",
    "questRobotText": "Merveilles mécaniques mystérieuses !",
-    "delightfulDinosNotes": "Contient \"Le Pterreur-datcyle\", \"Le tricératops trépignant\", et \"Le dinosaure exhumé\". Disponible jusqu'au 30 novembre.",
+    "delightfulDinosNotes": "Contient \"Le Pterreur-datcyle\", \"Le tricératops trépignant\", et \"Le dinosaure exhumé\". Disponible jusqu'au 31 mai.",
    "delightfulDinosText": "Ensemble de quêtes des dinosaures délirants",
    "questAmberNotes": "Vous êtes assis dans la Taverne avec @beffymaroo et @-Tyr- quand @Vikte surgit et vous parle avec enthousiasme des rumeurs d'un autre type de potion magique d'éclosion cachée dans le bois des tâches. Ayant terminé vos tâches quotidiennes, vous trois acceptez immédiatement d'aider @Vikte dans sa recherche. Après tout, quel mal à une petite aventure ? <br><br>Après avoir marché pendant des heures dans le bois des tâches, vous commencez à regretter d'avoir participé à une poursuite aussi sauvage. Vous êtes sur le point de rentrer chez vous, quand vous entendez un gémissement surpris et vous tournez pour voir un énorme lézard aux écailles d'ambre brillantes enroulées autour d'un arbre, serrant @Vikte dans ses griffes. @beffymaroo attrape son épée.<br><br>\"Attendez !\" crie @-Tyr-. \"C'est l'Arbrésine ! Elle n'est pas dangereuse, juste dangereusement collante !\"",
    "questAmberText": "L'alliance de l'ambre",
@@ -744,5 +744,14 @@
    "questOnyxCollectLeoRunes": "Runes du lion",
    "questOnyxCollectOnyxStones": "Pierres d'onyx",
    "questOnyxDropOnyxPotion": "Potion d'éclosion onyx",
-    "questOnyxUnlockText": "Déverrouille l'achat de potions d'éclosion onyx au marché"
+    "questOnyxUnlockText": "Déverrouille l'achat de potions d'éclosion onyx au marché",
+    "questVirtualPetText": "Pagaille virtuelle avec le poisson d'avril : L'événe-biiip",
+    "questVirtualPetNotes": "C'est un matin de printemps calme et agréable à Habitica, une semaine après un mémorable premier avril. Vous et @Beffymaroo êtes à l'écurie en train de vous occuper de vos animaux de compagnie (qui sont encore un peu désorientés par le temps qu'ils ont passé virtuellement !)<br><br>Au loin, vous entendez un grondement et un bip, d'abord faible mais dont le volume augmente comme s'il se rapprochait. Une forme d'œuf apparaît à l'horizon et à mesure qu'elle s'approche, en émettant des bips de plus en plus forts, vous voyez qu'il s'agit d'un gigantesque animal de compagnie virtuel !<br><br>\"Oh non\", s'exclame @Beffymaroo, \"Je pense que le poisson d'avril n'a pas terminé son travail avec ce grand gaillard, il semble vouloir attirer l'attention !\".<br><br>L'animal virtuel émet un bip furieux, fait une crise de colère virtuelle et se rapproche de plus en plus.",
+    "questVirtualPetBoss": "Wotchimon",
+    "questVirtualPetRageTitle": "L'événe-biiip",
+    "questVirtualPetRageEffect": "`Wotchimon utilise Bip énervant !` Wotchimon fait un bip énervant, et sa barre de joie disparaît soudain ! Les dégâts en cours sont réduits.",
+    "questVirtualPetDropVirtualPetPotion": "Potion d'éclosion de familier virtuel",
+    "questVirtualPetUnlockText": "Déverrouille l'achat de potions d'éclosion de familier virtuel au marché",
+    "questVirtualPetRageDescription": "Cette barre se remplit quand vous n'effectuez pas vos quotidiennes. Quand elle sera pleine, le Wotchimon fera disparaître une partie des dégâts en cours de votre équipe !",
+    "questVirtualPetCompletion": "Quelques pressions sur des boutons semblent avoir satisfait les besoins mystérieux de l'animal virtuel, qui s'est finalement calmé et semble content.<br><br>Soudain, dans une explosion de confettis, le poisson d'avril apparaît avec un panier rempli d'étranges potions émettant de doux bips.<br><br>\"Quel timing, poisson d'avril\", dit @Beffymaroo avec un sourire en coin. \"Je soupçonne que ce grand gaillard qui émet des bips est une de vos connaissances.\"<br><br>\"Euh, oui,\" dit-il, penaud. \"Je suis vraiment désolé, et je vous remercie tous les deux d'avoir pris soin de Wotchimon ! Prenez ces potions en guise de remerciement, elles peuvent faire retransformer vos animaux de façon virtuelle quand vous le souhaitez !\".<br><br>Vous doutez d'être 100% d'accord avec tous ces bips, mais comme ils sont mignons, ça vaut le coup d'essayer !"
 }
@@ -203,5 +203,11 @@
    "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"
+    "mysterySet202204": "Ensemble d'aventure virtuelle",
+    "mysterySet202205": "Ensemble de dragon crépusculaire",
+    "howManyGemsSend": "Combien de gemmes souhaitez-vous envoyer ?",
+    "needToPurchaseGems": "Vous voulez acheter des gemmes pour offrir ?",
+    "wantToSendOwnGems": "Vous voulez envoyer vos propres gemmes ?",
+    "sendAGift": "Envoyer un cadeau",
+    "howManyGemsPurchase": "Combien de gemmes souhaitez-vous acheter ?"
 }
@@ -3,8 +3,8 @@
    "onwards": "הלאה!",
    "levelup": "על ידי ביצוע משימות מחייך האמיתיים, עלית רמה והחיים שלך עכשיו מלאים!",
    "reachedLevel": "הגעת לשלב <%= level %>",
-    "achievementLostMasterclasser": "",
-    "achievementLostMasterclasserText": "",
+    "achievementLostMasterclasser": "משלים ההרפתקאות: סדרת הרב-אמן",
+    "achievementLostMasterclasserText": "השלימו את כל שש-עשר המשימות בסדרת הרפתקאות של הרב-אמנים ופתרו את תעלומת הרב-אמן האבוד!",
    "viewAchievements": "הצגת ההישגים",
    "letsGetStarted": "בואו נתחיל!",
    "yourProgress": "ההתקדמות שלך",
@@ -75,7 +75,7 @@
    "onboardingCompleteDescSmall": "אם ברצונך להשיג אפילו עוד, אפשר לבדוק את ההישגים שלנו!",
    "achievementVioletsAreBlue": "הסיגליות כחולות",
    "achievementBugBonanzaText": "השלים את משימת חיות המחמד של החיפושית, הפרפר, החילזון והעכביש",
-    "achievementGoodAsGoldText": "אסף את כל החיות הזהב",
+    "achievementGoodAsGoldText": "אסף את כל החיות המוזהבות.",
    "achievementSeasonalSpecialistModalText": "השלמת את כל המשימות העונתיות!",
    "achievementShadyCustomer": "לקוח חשוד",
    "achievementShadeOfItAll": "הצל של הכל",
@@ -89,5 +89,10 @@
    "achievementSkeletonCrewModalText": "אילפת את כל חיות הרכיבה מסוג שלד!",
    "achievementBoneCollectorText": "נאספו כל חיות המחמד מסוג שלד.",
    "achievementRedLetterDayModalText": "אילפת את כל חיות הרכיבה האדומות!",
-    "achievementSkeletonCrewText": "אולפו כל חיות הרכיבה מסוג שלד."
+    "achievementSkeletonCrewText": "אולפו כל חיות הרכיבה מסוג שלד.",
+    "achievementAllThatGlitters": "כל הנוצץ",
+    "achievementLostMasterclasserModalText": "השלמת את כל שש-עשר המשימות בסדרת הרפתקאות של הרב-אמנים ופתרת את תעלומת הרב-אמן האבוד!",
+    "achievementGoodAsGold": "זהוב וטוב",
+    "achievementBugBonanzaModalText": "השלמת את משימת חיות המחמד של החיפושית, הפרפר, החילזון והעכביש",
+    "achievementBareNecessities": "רק את הטוב"
 }
@@ -64,7 +64,7 @@
    "noChallengeTitle": "אין לך שום אתגרים.",
    "challengeDescription1": "אתגרים הם אירועים של הקהילה בהם שחקנים מתחרים וזוכים בפרסים על ידי השלמת קבוצה של מטלות הקשורות זו לזו.",
    "challengeDescription2": "מצא אתגרים מומלצים לך לפי תחומי העניין שלך, חפש אתגרים פומביים של הביטיקה, או תיצור אתגרים משלך.",
-    "noChallengeMatchFilters": "",
+    "noChallengeMatchFilters": "לא הצלחנו למצוא אתגרים מתאימים.",
    "createdBy": "נוצר על ידי",
    "joinChallenge": "הצטרף לאתגר",
    "leaveChallenge": "עזיבת האתגר",
@@ -102,7 +102,7 @@
    "confirmKeepChallengeTasks": "לשמור את מטלות האתגר?",
    "selectParticipant": "בחר משתתף",
    "yourReward": "הפרס שלך",
-    "filters": "סינון",
+    "filters": "מסננים",
    "wonChallengeDesc": "ניצחת באתגר \"<%= challengeName %>\"! הניצחון שלך נרשם בהישגים שלך.",
    "removeTasks": "הסרת המשימות"
 }
@@ -1,5 +1,5 @@
 {
-    "communityGuidelinesWarning": "",
+    "communityGuidelinesWarning": "אנא זכרו ששם התצוגה שלכם, תמונת הפרופיל והתיאור חייבים לעמוד בתנאי <a href='https://habitica.com/static/community-guidelines' target='_blank'>תקנון הקהילה</a> (למשל ללא מילים גסות, תכנים בוטים, עלבונות וכו'). אם אינכם בטוחים אם דבר מסוים עומד בתנאי התקנון או לא, אנא הרגישו חופשיים לשלוח מייל ל-<%= hrefBlankCommunityManagerEmail %>!",
    "profile": "פרופיל",
    "avatar": "התאמת הדמות",
    "editAvatar": "עריכת הדמות",
@@ -37,7 +37,7 @@
    "mustache": "שפם",
    "flower": "פרח",
    "accent": "",
-    "headband": "",
+    "headband": "רצועת ראש",
    "wheelchair": "כיסא גלגלים",
    "extra": "אקסטרה",
    "rainbowSkins": "עורות בצבעי הקשת",
@@ -58,7 +58,7 @@
    "autoEquipBattleGear": "הצטייד בציוד חדש אוטומטית",
    "costume": "תחפושת",
    "useCostume": "שימוש בתחפושת",
-    "costumePopoverText": "",
+    "costumePopoverText": "בחר \"לבש תחפושת\" כדי להוסיף ציוד לדמות שלך מבלי להשפיע על המדדים שלך מציוד הלחימה שלך. זה אומר שתוכל ללבוש איזו תלבושת שתבחר כאשר אתה ממשיך להשתמש בציוד הלחימה הטוב ביותר שיש לך.",
    "autoEquipPopoverText": "בחרו באופציה זו על מנת ללבוש באופן אוטומטי ציוד ברגע שאתם קונים אותו.",
    "costumeDisabled": "הסרת את התחפושת שלך.",
    "gearAchievement": "הרווחת את תג ״הציוד המקסימלי״ על השגת הציוד הטוב ביותר למקצועות הבאים:",
@@ -112,7 +112,7 @@
    "changeClass": "",
    "lvl10ChangeClass": "כדי לשנות מקצוע עליכם להיות לפחות בדרגה 10.",
    "changeClassConfirmCost": "",
-    "invalidClass": "",
+    "invalidClass": "מקצוע שגוי. נא לציין 'warrior', 'rogue', 'wizard', או 'healer'.",
    "levelPopover": "",
    "unallocated": "",
    "autoAllocation": "הקצאה אוטומטית",
@@ -4,7 +4,7 @@
    "armoireText": "ציוד קסום",
    "armoireNotesFull": "אפשר לפתוח את תיבת הציוד הקסום ולקבל ציוד מיוחד, ניסיון או מזון! יחידות ציוד שנותרו:",
    "armoireLastItem": "מצאת את פריט הציוד הקסום האחרון",
-    "armoireNotesEmpty": "״הציוד הקסום״ יציע ציוד חדש בשבוע הראשון של כל חודש. עד אז, ניתן להמשיך לקבל ניסיון ומזון!",
+    "armoireNotesEmpty": "לנשקייה יתווסף ציוד חדש בשבוע הראשון של כל חודש. עד אז, ניתן להמשיך וללחוץ עבור נקודות ניסיון ומזון לחיות מחמד!",
    "dropEggWolfText": "זאב",
    "dropEggWolfMountText": "זאב",
    "dropEggWolfAdjective": "נאמן",
@@ -61,7 +61,7 @@
    "questEggRoosterAdjective": "מתגנדר",
    "questEggSpiderText": "עכביש",
    "questEggSpiderMountText": "עכביש",
-    "questEggSpiderAdjective": "",
+    "questEggSpiderAdjective": "אמנותי",
    "questEggOwlText": "ינשוף",
    "questEggOwlMountText": "ינשוף",
    "questEggOwlAdjective": "חכם",
@@ -130,58 +130,58 @@
    "questEggArmadilloAdjective": "משוריינת",
    "questEggCowText": "פרה",
    "questEggCowMountText": "פרה",
-    "questEggCowAdjective": "",
-    "questEggBeetleText": "",
-    "questEggBeetleMountText": "",
-    "questEggBeetleAdjective": "",
-    "questEggFerretText": "",
-    "questEggFerretMountText": "",
-    "questEggFerretAdjective": "",
-    "questEggSlothText": "",
-    "questEggSlothMountText": "",
-    "questEggSlothAdjective": "",
-    "questEggTriceratopsText": "",
-    "questEggTriceratopsMountText": "",
-    "questEggTriceratopsAdjective": "",
-    "questEggGuineaPigText": "",
-    "questEggGuineaPigMountText": "",
-    "questEggGuineaPigAdjective": "",
-    "questEggPeacockText": "",
-    "questEggPeacockMountText": "",
-    "questEggPeacockAdjective": "",
-    "questEggButterflyText": "",
+    "questEggCowAdjective": "גועה",
+    "questEggBeetleText": "חיפושית",
+    "questEggBeetleMountText": "חיפושית",
+    "questEggBeetleAdjective": "בלתי מנוצחת",
+    "questEggFerretText": "חמוס",
+    "questEggFerretMountText": "חמוס",
+    "questEggFerretAdjective": "פרוותי",
+    "questEggSlothText": "עצלן",
+    "questEggSlothMountText": "עצלן",
+    "questEggSlothAdjective": "זריז",
+    "questEggTriceratopsText": "טריצרטופס",
+    "questEggTriceratopsMountText": "טריצרטופסים",
+    "questEggTriceratopsAdjective": "טריקי",
+    "questEggGuineaPigText": "שרקן",
+    "questEggGuineaPigMountText": "שרקן",
+    "questEggGuineaPigAdjective": "מסוחרר",
+    "questEggPeacockText": "טווס",
+    "questEggPeacockMountText": "טווס",
+    "questEggPeacockAdjective": "יהיר",
+    "questEggButterflyText": "זחל",
    "questEggButterflyMountText": "פרפר",
-    "questEggButterflyAdjective": "",
-    "questEggNudibranchText": "",
-    "questEggNudibranchMountText": "",
-    "questEggNudibranchAdjective": "",
+    "questEggButterflyAdjective": "חמוד",
+    "questEggNudibranchText": "חשופית ים",
+    "questEggNudibranchMountText": "חשופית ים",
+    "questEggNudibranchAdjective": "זריזה",
    "questEggHippoText": "היפופוטם",
    "questEggHippoMountText": "היפופוטם",
-    "questEggHippoAdjective": "",
-    "questEggYarnText": "",
+    "questEggHippoAdjective": "שמח",
+    "questEggYarnText": "חוט",
    "questEggYarnMountText": "שטיח מעופף",
-    "questEggYarnAdjective": "",
-    "questEggPterodactylText": "",
-    "questEggPterodactylMountText": "",
-    "questEggPterodactylAdjective": "",
-    "questEggBadgerText": "",
-    "questEggBadgerMountText": "",
-    "questEggBadgerAdjective": "",
-    "questEggSquirrelText": "",
+    "questEggYarnAdjective": "צמר",
+    "questEggPterodactylText": "פטרודקטיל",
+    "questEggPterodactylMountText": "פטרודקטיל",
+    "questEggPterodactylAdjective": "בוטח",
+    "questEggBadgerText": "גירית",
+    "questEggBadgerMountText": "גירית",
+    "questEggBadgerAdjective": "רועשת",
+    "questEggSquirrelText": "סנאי",
    "questEggSquirrelMountText": "סנאי",
-    "questEggSquirrelAdjective": "",
-    "questEggSeaSerpentText": "",
-    "questEggSeaSerpentMountText": "",
-    "questEggSeaSerpentAdjective": "",
+    "questEggSquirrelAdjective": "עם זנב-פראי",
+    "questEggSeaSerpentText": "נחש ים",
+    "questEggSeaSerpentMountText": "נחש ים",
+    "questEggSeaSerpentAdjective": "מנצנץ",
    "questEggKangarooText": "קנגרו",
    "questEggKangarooMountText": "קנגרו",
-    "questEggKangarooAdjective": "",
+    "questEggKangarooAdjective": "נבון",
    "questEggAlligatorText": "תנין",
    "questEggAlligatorMountText": "תנין",
-    "questEggAlligatorAdjective": "",
-    "questEggVelociraptorText": "",
-    "questEggVelociraptorMountText": "",
-    "questEggVelociraptorAdjective": "",
+    "questEggAlligatorAdjective": "ערמומי",
+    "questEggVelociraptorText": "ולוצירפטור",
+    "questEggVelociraptorMountText": "ולוצירפטור",
+    "questEggVelociraptorAdjective": "פיקח",
    "eggNotes": "מצא שיקוי הבקעה לשפוך על ביצה זו, והיא תהפוך ל<%= eggText(locale) %> <%= eggAdjective(locale) %>.",
    "hatchingPotionBase": "רגיל",
    "hatchingPotionWhite": "לבן",
@@ -196,21 +196,21 @@
    "hatchingPotionSpooky": "מפחיד",
    "hatchingPotionPeppermint": "מנטה",
    "hatchingPotionFloral": "פרחוני",
-    "hatchingPotionAquatic": "",
-    "hatchingPotionEmber": "",
+    "hatchingPotionAquatic": "ימי",
+    "hatchingPotionEmber": "גחלת",
    "hatchingPotionThunderstorm": "סופת ברקים",
    "hatchingPotionGhost": "רוח רפאים",
-    "hatchingPotionRoyalPurple": "",
+    "hatchingPotionRoyalPurple": "סגול מלכותי",
    "hatchingPotionHolly": "",
-    "hatchingPotionCupid": "",
-    "hatchingPotionShimmer": "",
-    "hatchingPotionFairy": "",
-    "hatchingPotionStarryNight": "",
+    "hatchingPotionCupid": "קופידון",
+    "hatchingPotionShimmer": "נצנוץ",
+    "hatchingPotionFairy": "פיות",
+    "hatchingPotionStarryNight": "לילה זרוע-כוכבים",
    "hatchingPotionRainbow": "קשת",
-    "hatchingPotionGlass": "",
-    "hatchingPotionGlow": "",
-    "hatchingPotionFrost": "",
-    "hatchingPotionIcySnow": "",
+    "hatchingPotionGlass": "זכוכית",
+    "hatchingPotionGlow": "זוהר-בחושך",
+    "hatchingPotionFrost": "כפור",
+    "hatchingPotionIcySnow": "שלג קרחי",
    "hatchingPotionNotes": "מזוג שיקוי זה על ביצה, והיא תבקע כ: <%= potText(locale) %>.",
    "premiumPotionAddlNotes": "לא ניתן לשימוש על ביצי הרפתקאות.",
    "foodMeat": "בשר",
@@ -308,7 +308,7 @@
    "foodSaddleSellWarningNote": "אהלן! איזה פריט שימושי! האם יש לך מושג כיצד להשתמש באוכפים עם חיות המחמד שלך?",
    "foodNotes": "האכל בזה את חיות המחמד שלך והן יגדלו לחיות רכיבה חסונות.",
    "hatchingPotionRoseQuartz": "קוורץ ורדרד",
-    "hatchingPotionCelestial": "",
+    "hatchingPotionCelestial": "שמימי",
    "foodPieSkeleton": "",
    "foodPieSkeletonThe": "",
    "foodPieSkeletonA": "",
@@ -323,5 +323,20 @@
    "foodPieWhiteThe": "פאי פודינג הווניל",
    "foodPieWhite": "פאי פודינג וניל",
    "foodPieZombieThe": "הפאי הרקוב",
-    "foodPieZombie": "פאי רקוב"
+    "foodPieZombie": "פאי רקוב",
+    "hatchingPotionVeggie": "גינה",
+    "hatchingPotionAmber": "גחלת",
+    "hatchingPotionSunshine": "קרן אור",
+    "hatchingPotionWatery": "מימי",
+    "hatchingPotionBronze": "ארד",
+    "questEggDolphinAdjective": "מלא חיים",
+    "questEggRobotAdjective": "עתידני",
+    "hatchingPotionRuby": "אודם",
+    "hatchingPotionSilver": "כסף",
+    "hatchingPotionAurora": "זוהר הקוטב",
+    "hatchingPotionShadow": "צל",
+    "questEggRobotMountText": "רובוט",
+    "questEggDolphinText": "דולפין",
+    "questEggRobotText": "רובוט",
+    "questEggDolphinMountText": "דולפין"
 }
@@ -13,5 +13,5 @@
    "lowHealthTips3": "מטלות יומיומיות שלא הושלמו יפגעו בך במשך הלילה, יש להיזהר שלא להתחיל עם יותר מדי!",
    "lowHealthTips4": "אם משימה יומיומית לא בתוקף ביום מסוים, אפשר להשביתה בעזרת לחיצה על העיפרון.",
    "goodLuck": "בהצלחה!",
-    "cannotRevive": "לא ניתן לחזור לתחייה אם לא מתים"
+    "cannotRevive": "לא ניתן לקום לתחייה אם לא מתים"
 }
@@ -1,6 +1,6 @@
 {
    "unlockedReward": "קיבלת <%= reward %>",
-    "earnedRewardForDevotion": "",
+    "earnedRewardForDevotion": "זכית ב<%= reward %> עבור המחוייבות שלך לשפר את חייך.",
    "nextRewardUnlocksIn": "",
    "awesome": "אחלה!",
    "countLeft": "Check-ins until next reward: <%= count %>",
@@ -36,41 +36,62 @@
    "mustLvlQuest": "עליכם להיות בדרגה <%= level %> כדי לקנות את ההרפתקה הזו!",
    "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": "האם אתם בטוחים שברצונכם לבטל את ההרפתקה הזו? היא תבוטל עבור כל החבורה שלכם, וההתקדמות שלכם תאבד. המגילה תוחזר לבעלי ההרפתקה.",
+    "sureCancel": "האם אתם בטוחים שברצונכם לבטל את ההרפתקה? ביטול ההרפתקה תבטל את כל ההזמנות שנשלחו, גם עבור אלה שהסכימו כבר להשתתף, והמגילה תחזור לרשותכם.",
+    "sureAbort": "האם אתם בטוחים שברצונכם לבטל את ההרפתקה הזו? כל ההתקדמות שלכם תאבד. המגילה תשוב לידי בעליה.",
    "doubleSureAbort": "האם אתם באמת באמת בטוחים? כל החבורה שלכם עלולה לשנוא אתכם לנצח!",
    "bossRageTitle": "זעם",
-    "bossRageDescription": "כאשר יתמלא הבאר הזה, הבוס ישחרר התקפה מיוחדת!",
+    "bossRageDescription": "כאשר המד הזה יתמלא, הבוס יבצע התקפה מיוחדת!",
    "startAQuest": "התחילו הרפתקה",
-    "startQuest": "התחילו הרפתקה",
+    "startQuest": "התחל הרפתקה",
    "questInvitationDoesNotExist": "לא נשלחה עדיין הזמנה להרפתקה.",
    "questInviteNotFound": "לא נמצאה הזמנה להרפתקה.",
    "guildQuestsNotSupported": "לא ניתן להזמין גילדות להרפתקה.",
-    "questNotOwned": "אין ברשותכם את המגילה הזו.",
-    "questNotGoldPurchasable": "לא ניתן לרכוש את ההרפתקה \"<%= key %>\" עם מטבעות זהב.",
-    "questNotGemPurchasable": "",
-    "questAlreadyUnderway": "החבורה שלכם נמצאת כבר במהלכה של הרפתקה. נסו שוב כשזו תסתיים.",
-    "questAlreadyAccepted": "כבר הסכמתם להזמנה להרפתקה.",
+    "questNotOwned": "המגילה הזאת לא נמצאת ברשותך.",
+    "questNotGoldPurchasable": "לא ניתן לרכוש את ההרפתקה \"<%= key %>\" באמצעות זהב.",
+    "questNotGemPurchasable": "לא ניתן לרכוש את ההרפתקה \"<%= key %>\" עם אבני חן.",
+    "questAlreadyUnderway": "החבורה שלך נמצאת כבר במהלכה של הרפתקה. נסו שוב כשזו תסתיים.",
+    "questAlreadyAccepted": "כבר הסכמת להצטרף להרפתקה.",
    "noActiveQuestToLeave": "אין הרפתקה לעזוב",
-    "questLeaderCannotLeaveQuest": "מנהיג ההרפתקה לא יכול לעזוב אותה",
-    "notPartOfQuest": "אינכם חלק מההרפתקה.",
-    "youAreNotOnQuest": "",
-    "noActiveQuestToAbort": "אין כרגע הרפתקה פעילה כדי לבטל אותה.",
-    "onlyLeaderAbortQuest": "רק מנהיג החבורה או ההרפתקה יכולים לבטל הרפתקה.",
+    "questLeaderCannotLeaveQuest": "מנהיג ההרפתקה לא רשאי לעזוב אותה",
+    "notPartOfQuest": "אינך חלק מההרפתקה",
+    "youAreNotOnQuest": "אינך משתתף בהרפתקה",
+    "noActiveQuestToAbort": "אין כרגע הרפתקה פעילה שניתן לבטל.",
+    "onlyLeaderAbortQuest": "רק מנהיג החבורה או ההרפתקה יכולים לבטל הרפתקה לאחר שהתחילה.",
    "questAlreadyRejected": "כבר דחיתם את ההזמנה להרפתקה.",
    "cantCancelActiveQuest": "אתם לא יכולים להפסיק הרפתקה שכבר החלה, השתמשו באפשרות הביטול.",
-    "onlyLeaderCancelQuest": "רק מנהיגי החבורה או מובילי ההרפתקה יכולים לבטל אותה.",
+    "onlyLeaderCancelQuest": "רק מנהיג החבורה או מוביל ההרפתקה יכולים לבטל את ההרפתקה.",
    "questNotPending": "אין הרפתקאות זמינות.",
-    "questOrGroupLeaderOnlyStartQuest": "רק מנהיג החבורה או מי שהזמין להרפתקה יכולים להכריח את כולם לצאת לדרך.",
-    "loginIncentiveQuest": "",
-    "loginReward": "",
-    "questBundles": "",
-    "noQuestToStart": "Can’t find a quest to start? Try checking out the Quest Shop in the Market for new releases!",
-    "pendingDamage": "",
-    "pendingDamageLabel": "",
-    "bossHealth": "",
-    "rageAttack": "",
-    "bossRage": "",
-    "rageStrikes": "",
-    "questAlreadyStarted": "ההרפתקה כבר החלה."
+    "questOrGroupLeaderOnlyStartQuest": "רק מוביל ההרפתקה או מנהיג החבורה יכולים להכריח את התחלת ההרפתקה",
+    "loginIncentiveQuest": "כדי להפוך את ההרפתקה הזו לזמינה, עליך להתחבר להאביטיקה ב-<%= count %> ימים שונים!",
+    "loginReward": "<%= count %> כניסות",
+    "questBundles": "אגד הרפתקאות בהנחה",
+    "noQuestToStart": "נסו לבקר את <a href=\"<%= questShop %>\">חנות ההרפתקאות</a> בשביל תכנים חדשים!",
+    "pendingDamage": "<%= damage %> נזק ממתין",
+    "pendingDamageLabel": "נזק ממתין",
+    "bossHealth": "<%= currentHealth %> / <%= maxHealth %> בריאות",
+    "rageAttack": "התקפת זעם:",
+    "bossRage": "<%= currentRage %> / <%= maxRage %> זעם",
+    "rageStrikes": "התקפות זעם",
+    "questAlreadyStarted": "ההרפתקה כבר החלה.",
+    "chatItemQuestFinish": "כל הפריטים נמצאו! החבורה קיבלה את התגמול שלה.",
+    "ownerOnly": "בעלים בלבד",
+    "selectQuest": "נא לבחור הרפתקה",
+    "chatQuestStarted": "ההרפתקה שלך, <%= questName %>, החלה.",
+    "chatBossDamage": "<%= username %> תוקף את <%= bossName %> וגורם ל-<%= userDamage %> נזק. <%= bossName %> תוקף את הקבוצה וגורם לה <%= bossDamage %> נזק.",
+    "chatBossDontAttack": "<%= username %> תוקף את <%= bossName %> וגורם ל-<%= userDamage %> נזק. <%= bossName %> לא תוקף בחזרה, מכיוון שהוא מכבד את העובדה שיש מספר באגים במערכת, והוא לא רוצה לפגוע במישהו בצורה לא הוגנת. הוא ימשיך בהשתוללות שלו בקרוב!",
+    "chatFindItems": "<%= username %> מצא <%= items %>.",
+    "tavernBossTired": "<%= bossName %> מנסה לשחרר את <%= rageName %> אבל הוא עייף מדי.",
+    "questOwner": "בעל ההרפתקה",
+    "backToSelection": "בחזרה לבחירת הרפתקה",
+    "noQuestToStartTitle": "לא מצאת הרפתקה להתחיל?",
+    "chatBossDefeated": "הבסתם את <%= bossName %>! החברים לקבוצה שהשתתפו בהרפתקה מקבלים את שלל הניצחון.",
+    "chatQuestCancelled": "<%= username %> ביטל את ההרפתקה <%= questName %>.",
+    "yourPartyIsNotOnQuest": "הקבוצה שלך אינה משתתפת בהרפתקה",
+    "newItem": "פריט חדש",
+    "yourQuests": "ההרפתקאות שלך",
+    "cancelQuest": "ביטול הרפתקה",
+    "selectQuestModal": "נא לבחור הרפתקה",
+    "questAlreadyStartedFriendly": "ההרפתקה כבר החלה, אבל תמיד ניתן להצטרף לבאה אחריה!",
+    "membersParticipating": "<%= accepted %> / <%= invited %> חברים משתתפים",
+    "chatQuestAborted": "<%= username %> הפסיק את ההרפתקה <%= questName %>."
 }
@@ -1,6 +1,6 @@
 {
    "questEvilSantaText": "סנטה הסוהר",
-    "questEvilSantaNotes": "שאגה מיוסרת נשמעת הרחק בשדות הקרח. אתם עוקבים אחר הנהמות והשאגות - המלוות בקול צחקוק משונה - לקרחת יער בה נמצאת דובת קוטב בוגרת. היא כלואה ואזוקה, נלחמת על חייה. מעל הכלוב שלה מרקד שדון קטן ומרושע, לבוש בתחפושת חג מולד בלויה. חסל את סנטה הסוהר ושחרר את הדובה!",
+    "questEvilSantaNotes": "שאגה מיוסרת נשמעת הרחק בשדות הקרח. אתם עוקבים אחר הנהמות והשאגות - המלוות בקול צחקוק משונה - לקרחת יער בה נמצאת דובת קוטב בוגרת. היא כלואה ואזוקה, נלחמת על חייה. מעל הכלוב שלה מרקד שדון קטן ומרושע, לבוש בתחפושת חג מולד בלויה. חסל את סנטה הסוהר ושחרר את הדובה!<br><br><strong>הערה</strong>: \"סנטה הסוהר\" מזכה בכל פעם בתג הרפתקה, אבל מעניק בהמת רכיבה נדירה שניתן להוסיף לאורווה שלך רק פעם אחת.",
    "questEvilSantaCompletion": "סנטה הסוהר צווח בכעס, ובורח לתוך הלילה. הדובה אסירת התודה, דרך נהמות ושאגות, מנסה לספר לך משהו. לאחר מסע לאורווה, אדון החיות - מאט בוך מקשיב לסיפורה ומזדעק באימה. יש לה גור! הוא רץ לשדות הקרח כשאמו נכלאה.",
    "questEvilSantaBoss": "סנטה הסוהר",
    "questEvilSantaDropBearCubPolarMount": "דוב קוטב (חיית רכיבה)",
@@ -55,7 +55,7 @@
    "complete2": "הושלמו",
    "today": "היום",
    "dueIn": "תאריך יעד <%= dueIn %>",
-    "due": "פעיל",
+    "due": "טרם הושלמו",
    "notDue": "לא פעילוֹת",
    "grey": "אפור",
    "score": "ניקוד",
@@ -12,5 +12,25 @@
    "viewAchievements": "Pogledaj postignuća",
    "letsGetStarted": "Krenimo!",
    "yourProgress": "Tvoj napredak",
-    "yourRewards": "Tvoje nagrade"
+    "yourRewards": "Tvoje nagrade",
+    "onboardingCompleteDescSmall": "Ako želiš još više, pogledaj Postignuća i počni skupljati!",
+    "achievementAridAuthorityText": "Pripitomljene su sve pustinjske jahače životinje.",
+    "onboardingProgress": "<%= percentage %>% napredak",
+    "achievementAridAuthorityModalText": "Pripitomio/la si sve pustinjske jahače životinje!",
+    "earnedAchievement": "Zaslužio/la si postignuće!",
+    "gettingStartedDesc": "Završi ove zadatke i zaradi 5 postignuća</strong> i <strong class=\"gold-amount\">100 zlatnika</strong> kada si gotov/a!",
+    "achievementLostMasterclasserModalText": "Završio/la si svih šesnaest pustolovina iz serije Masterclasser Quest i riješio/la misterij Lost Masterclasser-a!",
+    "achievementAllYourBaseModalText": "Pripitomio/la si sve osnovne jahače životinje!",
+    "achievementBackToBasicsModalText": "Skupio/la si sve osnovne ljubimce!",
+    "achievementDustDevilText": "Skupljeni su svi pustinjski ljubimci.",
+    "achievementBackToBasicsText": "Skupljeni su svi osnovni ljubimci.",
+    "achievementMindOverMatter": "Um prije stvari",
+    "achievementAllYourBaseText": "Pripitomljene su sve jahače životinje.",
+    "achievementDustDevilModalText": "Skupio/la si sve pustinjske ljubimce!",
+    "achievementJustAddWater": "Samo dodaj vodu",
+    "onboardingComplete": "Završio/la si zadate zadatke!",
+    "foundNewItemsExplanation": "Završavanje zadataka ti daje priliku da nađeš predmete poput jaja, napitaka za izlijeganje, i hrane za kućne ljubimce.",
+    "achievementDustDevil": "Pustinjski vrag",
+    "onboardingCompleteDesc": "Zaslužio/la si <strong>5 postignuća</strong> i <strong class=\"gold-amount\">100 zlatnika </strong> za završene zadatke s liste.",
+    "achievementAridAuthority": "Osušeni autoritet"
 }
@@ -3,7 +3,7 @@
    "defaultHabit2Text": "Jedi nezdravu hranu (Klikni na olovku za uređivanje)",
    "defaultHabit3Text": "Popni se uz stube/Upotrijebi dizalo (Klikni na olovku za uređivanje)",
    "defaultHabit4Text": "Dodaj zadatak na Habiticu",
-    "defaultHabit4Notes": "Ili Navika, Svakodnevni zadatak ili Zadatak",
+    "defaultHabit4Notes": "Ili Naviku, Svakodnevni zadatak ili Zadatak",
    "defaultTodo1Text": "Postani član Habitice (Prekriži me!)",
    "defaultTodoNotes": "Možeš ili obaviti ovaj Zadatak, urediti ga, ili ga ukloniti.",
    "defaultReward1Text": "15 minuta pauze",
@@ -15,5 +15,35 @@
    "defaultTag4": "Škola",
    "defaultTag5": "Timovi",
    "defaultTag6": "Sitni zadaci",
-    "defaultTag7": "Kreativnost"
+    "defaultTag7": "Kreativnost",
+    "healthDailyNotes": "Dotakni da išta promijeniš!",
+    "workHabitMail": "Obrada e-pošte",
+    "healthHabit": "Jedenje zdrave/nezdrave hrane",
+    "exerciseTodoText": "Postavi raspored vježbanja",
+    "workTodoProjectNotes": "Dotakni da odrediš ime svojeg trenutnog projekta + odredi krajnji rok!",
+    "workDailyImportantTaskNotes": "Dotakni da odrediš svoj najvažniji zadatak",
+    "exerciseDailyNotes": "Dotakni da odrediš svoj raspored i nabroji vježbe!",
+    "healthDailyText": "Koristi zubni konac",
+    "defaultHabitText": "Pritisni ovdje da ovo preurediš u lošu naviku koje se želiš riješiti",
+    "choresDailyNotes": "Dotakni da odrediš svoj raspored!",
+    "schoolTodoText": "Završi zadatak za nastavu",
+    "defaultHabitNotes": "Ili izbriši s ekrana za uređivanje",
+    "creativityTodoNotes": "Dotakni da odrediš naziv svog projekta",
+    "selfCareDailyText": "5 minuta mirnog disanja",
+    "selfCareTodoNotes": "Dotakni da odrediš što planiraš učiniti!",
+    "choresTodoText": "Organiziraj ormar >> Smanji nered",
+    "choresTodoNotes": "Dotakni da odrediš neuredan prostor!",
+    "creativityDailyNotes": "Dotakni da odabereš ime svog trenutnog projekta + postavi raspored!",
+    "selfCareHabit": "Kratko se odmori",
+    "schoolDailyNotes": "Dotakni za odabir rasporeda domaćih zadaća!",
+    "choresHabit": "10 minuta čišćenja",
+    "schoolHabit": "Učenje/Odugovlačenje",
+    "creativityHabit": "Prouči majstora zanata >> + Vježbao/la si novu kreativnu tehniku",
+    "choresDailyText": "Operi posuđe",
+    "creativityTodoText": "Završi kreativni projekt",
+    "schoolTodoNotes": "Dotakni za imenovanje zadatka i odaberi krajnji rok!",
+    "selfCareDailyNotes": "Dotakni za odabir svog rasporeda!",
+    "selfCareTodoText": "Uključi se u zabavnu aktivnost",
+    "creativityDailyText": "Radi na kreativnom projektu",
+    "schoolDailyText": "Završi domaću zadaću"
 }
@@ -1 +1,16 @@
-{}
+{
+    "magicPets": "Ljubimci čarobnih napitaka",
+    "noActivePet": "Nema trenutnog ljubimca",
+    "activeMount": "Trenutna jahaća životinja",
+    "questPets": "Pustolovni ljubimci",
+    "mounts": "Jahaće životinje",
+    "wackyPets": "Šašavi ljubimci",
+    "petsFound": "Pronađeni ljubimci",
+    "activePet": "Trenutni ljubimac",
+    "noActiveMount": "Nema jahaće životinje",
+    "stable": "Štala",
+    "mountsTamed": "Pripitomljene jahaće životinje",
+    "questMounts": "Pustolovne jahaće životinje",
+    "magicMounts": "Jahaće životinje čarobnih napitaka",
+    "pets": "Ljubimci"
+}
@@ -59,5 +59,16 @@
    "achievementCreatedTaskModalText": "Hozz létre egy feladatot, amit szeretnél ezen a héten teljesíteni",
    "achievementMonsterMagus": "Szörnymágus",
    "achievementCompletedTaskModalText": "Pipáld ki valamelyik feladatodat hogy jutalmakat kapj",
-    "achievementPartyOn": "A csapatod 4 főre nőtt!"
+    "achievementPartyOn": "A csapatod 4 főre nőtt!",
+    "achievementPrimedForPaintingModalText": "Összegyűjtötted az összes Fehér Állatokat!",
+    "achievementPearlyProText": "Megszelidítette az összes fehér hátast.",
+    "achievementTickledPinkText": "Összegyűjtötte az összes Rózsaszín Vattacukor Állatokat.",
+    "achievementTickledPinkModalText": "Összegyűjtötted az összes Rózsaszínű Vattacukor Állatokat!",
+    "achievementPearlyProModalText": "Megszelidítetted az összes fehér hátast!",
+    "achievementBugBonanzaText": "Befejezte a Bogár, Pillangó, Csiga és Pók kisállat küldetéseket.",
+    "achievementBugBonanzaModalText": "Befejezted a Bogár, Pillangó, Csiga és Pók kisállat küldetéseket!",
+    "achievementGoodAsGoldModalText": "Összegyűjtötted az összes Arany Állatokat!",
+    "achievementGoodAsGold": "Jó mint a arany",
+    "achievementGoodAsGoldText": "Összegyűjtötte az összes Arany Állatokat.",
+    "achievementPrimedForPaintingText": "Összegyűjtötte az összes Fehér Állatokat."
 }
@@ -3,7 +3,7 @@
    "dontDespair": "Jangan bersedih!",
    "deathPenaltyDetails": "Kamu kehilangan satu level, seluruh Koin Emas, dan satu buah perlengkapan, tapi kamu bisa mendapatkan semuanya lagi dengan kerja keras! Semangat--kamu pasti bisa.",
    "refillHealthTryAgain": "Isi kembali nyawa & coba lagi",
-    "dyingOftenTips": "Apakah ini sering terjadi? <a href='http://habitica.fandom.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Berikut beberapa tips!</a>",
+    "dyingOftenTips": "Apakah ini sering terjadi? <a href='https://habitica.fandom.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Berikut beberapa tips!</a>",
    "losingHealthWarning": "Hati-hati - Kamu Kehilangan Nyawa!",
    "losingHealthWarning2": "Jangan biarkan Nyawamu habis! Jika kamu membiarkannya, kamu akan kehilangan satu level, seluruh Koin Emas, dan sebuah perlengkapan.",
    "toRegainHealth": "Untuk mendapatkan Nyawa kembali:",
@@ -14,4 +14,4 @@
    "lowHealthTips4": "Jika sebuah kegiatan harian tidak memiliki batas waktu pada hari tertentu, kamu dapat menonaktifkannya dengan klik ikon pensil.",
    "goodLuck": "Semoga beruntung!",
    "cannotRevive": "Tidak dapat lahir kembali jika belum mati"
-}
+}
@@ -5,7 +5,7 @@
    "buyGemsGold": "Beli Permata dengan Koin Emas",
    "mustSubscribeToPurchaseGems": "Harus berlangganan untuk membeli permata menggunakan Koin Emas",
    "reachedGoldToGemCap": "Kamu telah mencapai batas konversi Emas=>Permata <%= convCap %> untuk bulan ini. Kami menerapkan ini untuk mencegah penyalahgunaan. Batas akan direset pada 3 hari pertama dari setiap bulan.",
-    "reachedGoldToGemCapQuantity": "Permintaan anda sejumlah <%= quantity %> melampaui batas konversi Emas=>Permata <%= convCap %> untuk bulan ini. Kami mempunyai ini untuk mencegah penyalahgunaan. Batas ini akan direset pada 3 hari pertama dari setiap bulan.",
+    "reachedGoldToGemCapQuantity": "Permintaan anda sejumlah <%= quantity %> melampaui batas konversi untuk bulan ini <%= convCap %> . Jumlah penuh akan tersedia setiap tiga hari pertama di setiap bulan. Terima kasih telah berlangganan!",
    "mysteryItem": "Item unik langganan bulanan",
    "mysteryItemText": "Setiap bulan kamu akan mendapatkan item unik untuk memperkeren avatarmu! Ditambah lagi, setiap tiga bulan langganan berurutan, para Penjelajah Waktu Misterius akan memberikanmu akses untuk item unik yang antik (atau futuristik!).",
    "exclusiveJackalopePet": "Peliharaan eksklusif",
@@ -15,7 +15,7 @@
    "subscribe": "Berlangganan",
    "nowSubscribed": "Kamu sekarang sudah berlangganan dengan Habitica!",
    "cancelSub": "Batalkan Langganan",
-    "cancelSubInfoGroupPlan": "Karena kamu berlangganan gratis dari Rencana Grup, kamu tidak bisa membatalkannya. Ini akan berakhir sewaktu kamu sudah tidak di dalam grup itu. Jika kamu adalah pemimpin Grup dan mau membatalkan seluruh Rencana Grup, kamu dapat melakukannya dari tab \"Detil Pembayaran\" grup.",
+    "cancelSubInfoGroupPlan": "Karena kamu berlangganan gratis dari Rencana Grup, kamu tidak bisa membatalkannya. Ini akan berakhir sewaktu kamu tidak menjadi member di dalam grup itu. Jika kamu adalah pemimpin Grup dan mau membatalkan Rencana Grup, kamu dapat melakukannya dari tab \"Detil Pembayaran\" grup.",
    "cancelingSubscription": "Membatalkan langganan",
    "contactUs": "Hubungi Kami",
    "checkout": "Keluar",
@@ -133,5 +133,16 @@
    "subscriptionBenefit6": "Dapatkan Jam Pasir Mistis untuk digunakan di Toko Penjelajah Waktu!",
    "purchaseAll": "Beli Set",
    "gemsRemaining": "permata tersisa",
-    "notEnoughGemsToBuy": "Kamu tidak dapat membeli permata sebanyak itu"
+    "notEnoughGemsToBuy": "Kamu tidak dapat membeli permata sebanyak itu",
+    "needToPurchaseGems": "Ingin membeli permata sebagai hadiah?",
+    "wantToSendOwnGems": "Ingin memberi permatamu sendiri?",
+    "howManyGemsPurchase": "Berapa banyak Permata yang ingin kamu beli?",
+    "howManyGemsSend": "Berapa banyak permata yang ingin kamu kirim?",
+    "subWillBecomeInactive": "Akan menjadi tidak aktif",
+    "confirmCancelSub": "Apakah kamu yakin ingin membatalkan langgananmu? Kamu akan kehilangan segala keuntungan berlangganan.",
+    "organization": "Organisasi",
+    "viewSubscriptions": "Lihat langganan",
+    "giftASubscription": "Hadiahkan fitur langganan",
+    "mysticHourglassNeededNoSub": "Barang ini membutuhkan Jam pasir mistis. Kamu bisa mendapatkannya dengan berlangganan di Habitica.",
+    "cancelSubInfoApple": "Silahkan Ikuti <a href=\"https://support.apple.com/en-us/HT202039\">Instruksi resmi Apple</a> untuk berhenti berlangganan atau untuk melihat tanggal langganan berakhir jika kamu telah membatalkan langgananmu. Layar ini tidak ditampilkan ke kamu jika langgananmu telah berhenti."
 }
@@ -126,8 +126,11 @@
    "achievementShadeOfItAllModalText": "Hai domato tutte le cavalcature oscure!",
    "achievementBirdsOfAFeather": "Pennuti che si somigliano",
    "achievementBirdsOfAFeatherModalText": "Hai collezionato tutti gli animali volanti!",
-    "achievementBirdsOfAFeatherText": "Ha schiuso i volatili: Maiale Volante, Gufo, Pappagallo, Pterodattilo, Grifone, Falcóne, Pavone e Gallo, in tutte le colorazioni standard.",
+    "achievementBirdsOfAFeatherText": "Ha schiuso i volatili: Maiale Volante, Gufo, Pappagallo, Pterodattilo, Grifone, Falcóne, Pavone e Gallo, in tutte le colorazioni standard!",
    "achievementZodiacZookeeper": "Custode dello Zoodiaco",
    "achievementZodiacZookeeperModalText": "Hai collezionato tutti gli animali dello zodiaco!",
-    "achievementZodiacZookeeperText": "Ha schiuso gli animali zodiacali: Ratto, Mucca, Coniglietto, Serpente, Cavallo, Pecora, Scimmia, Gallo, Lupo, Tigre, Maiale Volante e Drago, in tutte le colorazioni standard!"
+    "achievementZodiacZookeeperText": "Ha schiuso gli animali zodiacali: Ratto, Mucca, Coniglietto, Serpente, Cavallo, Pecora, Scimmia, Gallo, Lupo, Tigre, Maiale Volante e Drago, in tutte le colorazioni standard!",
+    "achievementReptacularRumbleModalText": "Hai collezionato tutti i rettili!",
+    "achievementReptacularRumble": "Baccano Rettiliano",
+    "achievementReptacularRumbleText": "Ha schiuso tutti i rettili: Alligatore, Pterodattilo, Serpente, Triceratopo, Tartaruga, Tyrannosaurus Rex e Velociraptor, in tutte le colorazioni standard!"
 }
@@ -673,8 +673,8 @@
    "backgroundPalmTreeWithFairyLightsNotes": "Posa vicino a una palma ornata di luci decorative.",
    "backgroundSnowyFarmText": "Fattoria Innevata",
    "backgrounds022022": "SET 93: Rilasciato a febbraio 2022",
-    "backgroundWinterWaterfallText": "Cascata d'Inverno",
-    "backgroundWinterWaterfallNotes": "Stupisciti di fronte ad una Cascata d'Inverno.",
+    "backgroundWinterWaterfallText": "Cascata Invernale",
+    "backgroundWinterWaterfallNotes": "Stupisciti di fronte ad una Cascata Invernale.",
    "backgroundOrangeGroveText": "Aranceto",
    "backgroundOrangeGroveNotes": "Passeggia attraverso un profumato Aranceto.",
    "backgroundIridescentCloudsText": "Nubi Iridescenti",
@@ -693,5 +693,12 @@
    "backgrounds042022": "SET 95: Rilasciato ad aprile 2022",
    "backgroundBlossomingTreesNotes": "Tergiversa sotto gli alberi in fiore.",
    "backgroundSpringtimeLakeNotes": "Ammira i panorami lungo le rive di un laghetto primaverile.",
-    "hideLockedBackgrounds": "Nascondi sfondi bloccati"
+    "hideLockedBackgrounds": "Nascondi sfondi bloccati",
+    "backgrounds052022": "SET 96: Rilasciato a maggio 2022",
+    "backgroundEnchantedMusicRoomText": "Studio Musicale Incantato",
+    "backgroundOnACastleWallText": "Sulle Mura Di Un Castello",
+    "backgroundEnchantedMusicRoomNotes": "Suona in uno Studio Musicale Incantato.",
+    "backgroundOnACastleWallNotes": "Guarda oltre le Mura di un Castello.",
+    "backgroundCastleGateText": "Porta Di Un Castello",
+    "backgroundCastleGateNotes": "Stai di guardia presso la Porta di un Castello."
 }
@@ -53,5 +53,6 @@
    "surveysSingle": "Ha aiutato Habitica a crescere, compilando un questionario o aiutando in un test. Grazie!",
    "surveysMultiple": "Ha aiutato Habitica a crescere in <%= count %> occasioni, compilando un questionario o aiutando in una fase di test importante. Grazie!",
    "blurbHallPatrons": "Questo è il salone dei Mecenati, nel quale vengono onorati i nobili avventurieri che hanno sostenuto la nostra campagna su Kickstarter. Li ringraziamo per aver aiutato a far nascere Habitica!",
-    "blurbHallContributors": "Questo è il Salone dei Collaboratori, dove coloro che hanno contribuito ad Habitica sono onorati. Che sia attraverso programmazione, arte, musica, scrittura, o anche solo disponibilità, hanno guadagnato <a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> gemme, equipaggiamento esclusivo</a>, e <a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>titoli prestigiosi</a>. Anche tu puoi contribuire ad Habitica! <a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Scopri di più qui. </a>"
+    "blurbHallContributors": "Questo è il Salone dei Collaboratori, dove coloro che hanno contribuito ad Habitica sono onorati. Che sia attraverso programmazione, arte, musica, scrittura, o anche solo disponibilità, hanno guadagnato <a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> gemme, equipaggiamento esclusivo</a>, e <a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>titoli prestigiosi</a>. Anche tu puoi contribuire ad Habitica! <a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Scopri di più qui. </a>",
+    "noPrivAccess": "Non disponi dei privilegi richiesti."
 }
@@ -2618,5 +2618,19 @@
    "headArmoireStrawRainHatNotes": "Sarai in grado di individuare ogni ostacolo sul tuo cammino quando indossi questo cappello conico resistente all'acqua. Aumenta la percezione di <%= per %>. Scrigno incantato: Set impermeabile di paglia (oggetto 2 di 2).",
    "armorArmoireSoftVioletSuitText": "Morbido vestito viola",
    "backMystery202203Notes": "Supera tutte le altre creature del cielo con queste ali scintillanti. Non conferisce alcun bonus. Oggetto abbonati aprile 2022.",
-    "backMystery202203Text": "Ali di libellula impavida"
+    "backMystery202203Text": "Ali di libellula impavida",
+    "backMystery202205Text": "Ali del Crepuscolo",
+    "headAccessoryMystery202205Text": "Corna di Drago Alate Crepuscolari",
+    "backMystery202205Notes": "Il potente battito di queste vaste ali può essere sentito echeggiare tra le dune. Non conferisce alcun bonus. Oggetto Abbonati maggio 2022.",
+    "headAccessoryMystery202205Notes": "Queste corna smaglianti brillano come un tramonto nel deserto. Non conferiscono alcun beneficio. Oggetto Abbonati maggio 2022.",
+    "weaponArmoireHuntingHornText": "Corno da Caccia",
+    "weaponArmoireHuntingHornNotes": "Tuuuuuu! Tuuu! Tuuu! Raduna la tua squadra per un'avventura o una missione suonando questo corno. Aumenta la Forza di <%= str %> e l'Intelligenza di <%= int %>. Scrigno Incantato: Set Strumento Musicale 1 (Oggetto 1 di 3)",
+    "shieldArmoireSnareDrumText": "Tamburo Rullante",
+    "shieldArmoireSnareDrumNotes": "Ra-ta-ta-ta! Raduna la tua squadra per una parata o per una marcia in battaglia suonando questo tamburo. Aumenta la Costituzione di <%= con %> e l'Intelligenza di <%= int %>. Scrigno Incantato: Set Strumento Musicale 1 (Oggetto 3 di 3)",
+    "shieldArmoireSpanishGuitarText": "Chitarra Spagnola",
+    "shieldArmoireSpanishGuitarNotes": "Tin! Tin! Trummm! Raduna la tua squadra per un concerto o per una festa, suonando questa chitarra. Aumenta la Percezione di <%= per %> e l'Intelligenza di <%= int %>. Scrigno Incantato: Set Strumento Musicale 1 (Oggetto 2 di 3)",
+    "headMystery202206Text": "Diadema degli Spiriti del Mare",
+    "backMystery202206Text": "Ali degli Spiriti del Mare",
+    "backMystery202206Notes": "Ali stravaganti fatte di acqua e onde! Non conferiscono alcun bonus. Oggetto abbonati giugno 2022.",
+    "headMystery202206Notes": "La perla azzurra di questo diadema conferisce poteri di dominio sull'acqua. Usali con saggezza! Non conferisce alcun bonus. Oggetto abbonati giugno 2022."
 }
@@ -378,5 +378,6 @@
    "joinParty": "Unisciti alla squadra",
    "editGuild": "Modifica gilda",
    "editParty": "Modifica squadra",
-    "leaveGuild": "Lascia la gilda"
+    "leaveGuild": "Lascia la gilda",
+    "sendGiftTotal": "Totale:"
 }
@@ -644,7 +644,7 @@
    "questBronzeCompletion": "\"Ben fatto, guerriero!\" dice lo scarafaggio appena si accascia sul terreno. Sta ridendo? È difficile dirlo dalle sue mandibole. \"Voi vi siete veramente guadagnati queste pozioni!\"<br><br>\"Oh, wow, non abbiamo mai ricevuto una ricompensa come questa dopo aver vinto una battaglia fino ad ora!\" dice @UncommonCriminal, tenendo in mano una luccicante bottiglia. \"Andiamo a far schiudere i nostri nuovi animali!\"",
    "questBronzeText": "Battaglia dello Scarabeo Impertinente",
    "mythicalMarvelsNotes": "Contiene 'Convincendo la Regina Unicorno', 'Il Fiero Grifone' e 'Pericoli nelle Profondità: Attacco del Serpente Marino!' Disponibili fino al 28 Febbraio.",
-    "mythicalMarvelsText": "Pacchetto Missione Meraviglia Mitica",
+    "mythicalMarvelsText": "Pacchetto Missioni Meraviglie Mitiche",
    "questFluoriteUnlockText": "Sblocca Pozione di Schiusa di Fluorite, acquistabile nel Mercato",
    "questRobotText": "Misteriose Meraviglie Meccaniche!",
    "questSilverUnlockText": "Sblocca Pozione di Schiusa d'Argento, acquistabile nel Mercato",
@@ -668,7 +668,7 @@
    "questAmberNotes": "Sei seduto nella Taverna con @beffymaroo e @-Tyr- quando @Vikte irrompe dalla porta e ti racconta eccitato delle voci di un altro tipo di Pozione di Schiusa magica nascosta nella Foresta delle Attività. Dopo aver completato le tue Attività Giornaliere, tutti e tre accettate immediatamente di aiutare @Vikte nella sua ricerca. Dopotutto, quali sono i svantaggi in una piccola avventura?<br><br>Dopo aver camminato per ore nella Foresta delle Attività, inizi a pentirti di aver partecipato a una ricerca così vana. Stai per tornare a casa, quando senti un guaito sorpreso e girandoti vedi un'enorme lucertola con squame di ambra lucente arrotolata attorno a un albero, che stringe @Vikte nei suoi artigli. @beffymaroo impugna la sua spada.<br><br> “Aspetta!” grida @-Tyr-. \"È la Trerezin! Non è pericolosa, solo pericolosamente appiccicosa! \"",
    "questAmberCompletion": "“Trerezin?” dice con calma -@Tyr-. “Potresti lasciare andare @Vikte? Non credo che si stiano divertendo a restare appesi così in alto.\"<br><br>La pelle ambrata arrossisce e i Trerezin abbassa delicatamente @Vikte a terra. \"Le mie più profonde scuse! È passato così tanto tempo da quando ho avuto degli ospiti che ho dimenticato le buone maniere!\" Si trascina in avanti per salutarti adeguatamente prima di scomparire nella sua casa sull'albero e tornare con una manciata di Pozioni di Schiusa d'Ambra come doni di ringraziamento! <br><br> \"Pozioni magiche!\" @Vikte sussulta. <br><br> \"Oh, queste cose vecchie?\" La lingua di Trerezin lampeggia mentre pensa. \"Cosa ne pensi di quest'idea? Te ne darò un'intero mucchio se prometti di venirmi a trovare ogni tanto...\"<br><br> E così lasci la Foresta delle Attività, eccitato di poter raccontare a tutti delle nuove pozioni - e della tua nuova amica!",
    "questAmberText": "L'Alleanza d'Ambra",
-    "delightfulDinosText": "Set Missione Dinosauri Deliziosi",
+    "delightfulDinosText": "Set Missione Dinosauri Incantevoli",
    "rockingReptilesText": "Set Missione Rettili Rollanti",
    "questRobotUnlockText": "Sblocca l'acquisto di Uova di Robot nel Mercato",
    "questRobotDropRobotEgg": "Robot (Uovo)",
@@ -694,7 +694,7 @@
    "questRubyCollectVenusRunes": "Rune di Venere",
    "questRubyCollectAquariusRunes": "Rune Zodiacali dell'Acquario",
    "questAmberUnlockText": "Sblocca le Pozioni di Schiusa Ambrate nel Mercato",
-    "delightfulDinosNotes": "Contiene \"Lo Ptero-dactilo\", \"I Travolgenti Triceratopi\" e \"Il Dinosauro Dissotterrato.\" Disponibile fino al 30 novembre.",
+    "delightfulDinosNotes": "Contiene \"Lo Ptero-dactilo\", \"I Travolgenti Triceratopi\" e \"Il Dinosauro Dissotterrato.\" Disponibile fino al 31 maggio.",
    "rockingReptilesNotes": "Contiene \"L'Isti-Gator\", \"Il Serpente della Distrazione\" e \"Il Veloci-Rapper\". Disponibile fino al 30 settembre.",
    "questFluoriteText": "Una Fluorite Fifosa e Brillante",
    "questFluoriteCompletion": "Mentre combatti, la creatura di cristallo sembra essere sempre più distratta dalle luci che crei. \"Così luccicante...\" borbotta.<br><br>\"Certo!\" esclama @nirbhao. \"Dev'essere un elementale di fluorite. Tutto ciò che vogliono è della luce con cui risplendere. Aiutiamolo a splendere.\"<br><br>L'elementale ride allegramente e risplende come se avessi acceso torce e scintille di magia. È così onorato di poter splendente di nuovo che ti porta ad un ricco deposito di cristalli di Fluorite.<br><br>\"È l'ingrediente perfetto per una nuova Pozione di Schiusa\", dice @nirbhao.\"Una che renderà i nostri animali luminosi come il nostro nuovo amico fluorescente.\"",
@@ -201,5 +201,12 @@
    "mysterySet202201": "Set del Festaiolo di Mezzanotte",
    "mysterySet202203": "Set Libellula Impavida",
    "mysterySet202204": "Set Avventuriero Virtuale",
-    "mysterySet202202": "Set Trecce Turchesi"
+    "mysterySet202202": "Set Trecce Turchesi",
+    "mysterySet202205": "Set Drago Alato Crepuscolare",
+    "howManyGemsSend": "Quante Gemme vorresti inviare?",
+    "wantToSendOwnGems": "Vuoi inviare le tue Gemme?",
+    "howManyGemsPurchase": "Quante Gemme vorresti comprare?",
+    "needToPurchaseGems": "Vuoi acquistare Gemme come regalo?",
+    "sendAGift": "Invia regalo",
+    "mysterySet202206": "Set Spiriti del Mare"
 }
@@ -693,5 +693,12 @@
    "backgroundFlowerShopNotes": "お花屋さんで良い香りを楽しみましょう。",
    "backgroundSpringtimeLakeText": "春の湖",
    "backgroundSpringtimeLakeNotes": "春の湖のほとりに沿って観光しましょう。",
-    "hideLockedBackgrounds": "ロックされた背景を表示しない"
+    "hideLockedBackgrounds": "ロックされた背景を表示しない",
+    "backgroundOnACastleWallNotes": "城郭の上で見張りをしましょう。",
+    "backgroundCastleGateText": "お城の門",
+    "backgroundCastleGateNotes": "お城の門番になりましょう。",
+    "backgrounds052022": "セット96：2022年5月リリース",
+    "backgroundOnACastleWallText": "城郭の上",
+    "backgroundEnchantedMusicRoomNotes": "魔法の音楽室で楽器を演奏しましょう。",
+    "backgroundEnchantedMusicRoomText": "魔法の音楽室"
 }
@@ -13,7 +13,7 @@
    "commGuideList02C": "<strong>暴力的、脅迫的、または露骨であれ暗示的であれ性的、またはいかなる個人またはグループに対する差別・偏見・人種主義・性差別・憎悪・いやがらせまたは危害を助長する画像や文章を投稿してはいけません。</strong>たとえ冗談やミーム（流行語）だとしてもです。これは、口述された中傷も含みます。だれもが同じユーモアの感性ではなく、あなたが冗談だと思ったことが他人を傷つけるかもしれません。",
    "commGuideList02D": "<strong>すべての年齢の人に適切なやりとりをしましょう。</strong>つまり、公共のスペースではアダルトな話題は避けて下さい。このサイトを使う若いHabiticaユーザーはたくさんいて、あらゆる職業・立場の人がHabiticaに来ています。私たちは、コミュニティが快適で、いろいろな人が訪れることができる場所であって欲しいと思っています。",
    "commGuideList02E": "<strong>冒涜的な表現は避けましょう。 他の場所では許されるかもしれない、ちょっとした宗教的な悪口や、冒涜的な表現の隠語、略語もこれに含まれます。</strong>ここにはすべての宗教的・文化的な背景を持った人々がいます。私たちは公共の場ですべての人々が気持ち良く過ごせるようにしたいと考えています。<strong>モデレーターやスタッフの一員が「その言葉はHabiticaで禁止されています」と言った場合は、例えあなたがその言葉について問題意識を持っていなかったとしても、その判断は最終的なものです。</strong>さらに、中傷は利用規約違反であり、きわめて厳格に対処されます。",
-    "commGuideList02F": "キャンプ場やその話題がふさわしくない場所での、不和を引き起こす長い議論は避けましょう。誰かの発言がガイドラインに従ってはいるけれどもあなたにとって不快と感じる場合、それを丁寧に伝えるのは構いません。もし誰かから、あなたの発言が他者を不快にしたと指摘されたら、怒りにまかせてレスをしないで、落ち着く時間をとりましょう。でも、その会話があなたをムキにさせたり、ひどく感情的にさせたり、有害だと感じさせるならば、<strong>関わるのをやめましょう。そして、その投稿のことを運営までお知らせ下さい。</strong>モデレーターができるだけ早く対応するでしょう。もしくは<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>へメールをしてください。その際、役に立つのであればスクリーンショットを添付して下さい。",
+    "commGuideList02F": "キャンプ場やその話題がふさわしくない場所での、不和を引き起こす長い議論は避けましょう。誰かの発言がガイドラインに従ってはいるけれどもあなたにとって不快と感じる場合、それを丁寧に伝えるのは構いません。もし誰かから、あなたの発言が他者を不快にしたと指摘されたら、怒りにまかせて返信をしないで、落ち着く時間をとりましょう。でも、その会話があなたをムキにさせたり、ひどく感情的にさせたり、有害だと感じさせるならば、<strong>関わるのをやめましょう。代わりに、その投稿のことを運営までお知らせください。</strong>モデレーターができるだけ早く対応するでしょう。もしくは<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>へメールを送ってください。その際、役に立ちそうならスクリーンショットを添付してください。",
    "commGuideList02G": "<strong>モデレーターからの要請にはすぐに従ってください。</strong>これには、以下に限ったことではありませんが、特定の場所での投稿を控えることや、不適切なコンテンツをプロフィールから削除すること、議論を続けるためによりふさわしい場所に移動することなどが含まれます。モデレーターと議論しないで下さい。モデレーションにコメントや懸念がある場合はコミュニティマネージャーまでメール（<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> ）をお願いします。",
    "commGuideList02J": "<strong>スパム禁止 </strong>。スパム行為には以下の行為が含まれ、かつまたそれらに限定するものではありません : 同じコメントや質問を複数の場所に投稿すること、説明なしまたは話の流れと<strong>無関係にリンクを投稿すること</strong>、無意味なメッセージを投稿すること、ギルドやパーティ、チャレンジの宣伝を複数の場所に投稿すること、大量のメッセージを連続的に投稿すること。もしリンクがクリックされてあなたに何らかの利益が生じる場合、あなたはその旨をメッセージ内で開示しなければなりません。そうでなければ、これもまたスパム行為とみなされるでしょう。モデレーターは独自の裁量で何がスパムかを決定するでしょう。",
    "commGuideList02K": "<strong>公共のチャットスペースでは大きなヘッダーテキストを投稿するのは避けてください、特にキャンプ場においては。</strong>すべて大文字を使った投稿のように、あなたが叫んでいるような印象を与え、居心地のいい雰囲気を壊してしまいます。",
@@ -53,5 +53,6 @@
    "surveysSingle": "アンケートへの回答、または大きなテストに努力していただき、Habitica の成長を手伝っていただきました。ありがとうございます!",
    "surveysMultiple": "<%= count %> 回にわたって、アンケートへの回答、または大きなテストに努力していただき、Habitica の成長を手伝っていただきました。ありがとうございます!",
    "blurbHallPatrons": "こちらは、資金協力で後援いただいた方々の記念館です。Habitica の源流となった Kickstarter で資金協力してくださった気高い冒険者のみなさんを誇りに思っています。Habitica に命を吹き込むことに手を貸してくれた彼らに感謝をささげましょう!",
-    "blurbHallContributors": "こちらは Habitica のオープンソースの貢献者を称える貢献者記念館です。コード、画像、音楽、文章、または親切に助言することによって、彼らは<a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'>ジェム、特別な装備</a>、<a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>名誉ある肩書き</a>を手にしました。あなたも Habitica に貢献できます！ <a href='https://habitica.fandom.com/ja/wiki/Habiticaへの貢献' target='_blank'> 詳しくはこちらをご覧ください。</a>"
+    "blurbHallContributors": "こちらは Habitica のオープンソースの貢献者を称える貢献者記念館です。コード、画像、音楽、文章、または親切に助言することによって、彼らは<a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'>ジェム、特別な装備</a>、<a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>名誉ある肩書き</a>を手にしました。あなたも Habitica に貢献できます！ <a href='https://habitica.fandom.com/ja/wiki/Habiticaへの貢献' target='_blank'> 詳しくはこちらをご覧ください。</a>",
+    "noPrivAccess": "必要な権限を持っていません。"
 }
@@ -22,8 +22,8 @@
    "webFaqAnswer4": "ダメージを受け、体力が減るのにはいくつかの原因があります。1 つ目、日課をやらないまま夜を明かし、翌日の朝に表示される確認画面でもチェックをしなければダメージを受けます。2 つ目、悪い習慣をチェックすれば、ダメージを受けます。最後に、パーティーでのボス戦の途中で、パーティーの仲間のだれかが日課をやり残した場合、ボスがあなたを攻撃します。主な回復方法はレベルを上げることで、レベルが上がると体力は全回復します。また、「ごほうび」欄の「体力回復の薬」をゴールドで買っても回復できます。そして、レベル10以上になると、治療師になることができ、回復のスキルを覚えます。もしパーティーの仲間に治療師がいれば、回復してもらうことができます。詳しくはナビゲーションバーのパーティーをクリックしてください。",
    "faqQuestion5": "友達といっしょに Habitica を遊ぶには？",
    "iosFaqAnswer5": "あなたといっしょのパーティーに友達を誘いましょう！ パーティーではクエストに参加したり、モンスターと戦ったり、スキルをかけたりしてお互いに助け合うことができます。\n\n自分のパーティーを作りたいなら、メニューから[パーティー](https://habitica.com/party)を選び、「新しいパーティーを作成する」をタップしてください。画面をスクロールして、「メンバーを招待する」をタップして、友達のユーザー名を入力して招待しましょう。誰かのパーティーに参加したいなら、自分のユーザー名を相手に伝えればあなたを招待できます！\n\nあなたと友達はギルドに参加することもできます。ギルドとは、共通の趣味を持つ人々が集まる公共チャットルームです。有益で楽しいコミュニティがたくさんあるので、ぜひチェックしてください。\n\nもっと競い合いたいなら、あなたと友達でチャレンジを作成したり参加したりして、タスクのセットに取り組むのもいいでしょう。さまざまな趣味や目標にまつわるたくさんのチャレンジが公開されています。公共チャレンジの中には、優勝者に選ばれると賞品のジェムをもらえるものもあります。",
-    "androidFaqAnswer5": "最も良い方法は、ナビゲーションバーの「パーティー」をクリックして、あなたと一緒のパーティーに友達を誘うことです！ パーティーでは、クエストを行ったり、モンスターと戦ったり、スキルを使ったりしてお互いを助け合うことができます。一緒のギルドに参加することもできます（ソーシャル > ギルド）。ギルドは興味のあることを話し合ったり、共通のゴールを目指したりするためのチャットルームで、公開・非公開の設定ができます。ギルドはいくつでも参加できますが、パーティーは１つだけしか参加できません。\n\nより詳しい情報については[パーティー](https://habitica.fandom.com/ja/wiki/パーティー) や[ギルド](https://habitica.fandom.com/wiki/Guilds) のWikiページをご覧ください。",
-    "webFaqAnswer5": "最も良い方法は、ナビゲーションバーの「パーティー」をクリックして、あなたと一緒のパーティーに友達を誘うことです！ パーティーでは、クエストを行ったり、モンスターと戦ったり、スキルを使ったりしてお互いを助け合うことができます。一緒のギルドに参加することもできます（ナビゲーションバーの「ギルド」をクリックしてください）。ギルドは興味のあることを話し合ったり、共通のゴールを目指したりするためのチャットルームで、公開・非公開の設定ができます。ギルドはいくつでも参加できますが、パーティーは１つだけしか参加できません。より詳しい情報については[パーティー](https://habitica.fandom.com/ja/wiki/パーティー) や[ギルド](https://habitica.fandom.com/wiki/Guilds) のWikiページをご覧ください。",
+    "androidFaqAnswer5": "最も良い方法は、ナビゲーションバーの「パーティー」をクリックして、あなたと一緒のパーティーに友達を誘うことです！ パーティーでは、クエストを行ったり、モンスターと戦ったり、スキルを使ったりしてお互いを助け合うことができます。一緒のギルドに参加することもできます（ソーシャル > ギルド）。ギルドは興味のあることを話し合ったり、共通のゴールを目指したりするためのチャットルームで、公開・非公開の設定ができます。ギルドはいくつでも参加できますが、パーティーは１つだけしか参加できません。\n\nより詳しい情報については[パーティー](https://habitica.fandom.com/ja/wiki/パーティー) や[ギルド](https://habitica.fandom.com/ja/wiki/ギルド) のWikiページをご覧ください。",
+    "webFaqAnswer5": "最も良い方法は、ナビゲーションバーの「パーティー」をクリックして、あなたと一緒のパーティーに友達を誘うことです！ パーティーでは、クエストを行ったり、モンスターと戦ったり、スキルを使ったりしてお互いを助け合うことができます。一緒のギルドに参加することもできます（ナビゲーションバーの「ギルド」をクリックしてください）。ギルドは興味のあることを話し合ったり、共通のゴールを目指したりするためのチャットルームで、公開・非公開の設定ができます。ギルドはいくつでも参加できますが、パーティーは１つだけしか参加できません。より詳しい情報については[パーティー](https://habitica.fandom.com/ja/wiki/パーティー) や[ギルド](https://habitica.fandom.com/ja/wiki/ギルド) のWikiページをご覧ください。",
    "faqQuestion6": "ペットや乗騎はどうやって手に入れるの?",
    "iosFaqAnswer6": "あなたがタスクを達成するたびに、ランダムに「たまご」や「たまごがえしの薬」や「ペットのえさ」を手に入れるチャンスが得られます。手に入れたアイテムはメニュー > 所持品 に保存されています。\n\nペットをかえすには「たまご」と「たまごがえしの薬」が必要です。かえしたいペットの種類を決めて「たまご」を押して、「かえすたまご」として選択します。次にペットの色を決めて「たまごがえしの薬」を選びましょう！ メニュー > ペットでペットを選ぶと、アバターのそばにペットが表示されます。\n\nペットを育てて乗騎にすることもできます。メニュー > ペット でえさをやりましょう。ペットを押して「えさをやるペット」として選択します！ ペットを乗騎にするにはたくさんのえさが必要ですが、お気に入りのえさを見つけ出して与えれば、より早く成長します。いろいろ試してみてください。もしくは[ここでネタバレを見ましょう](https://habitica.fandom.com/ja/wiki/えさの好み)。乗騎を手に入れたら、メニュー > 乗騎 に行って押すことで、あなたのアバターに乗騎を表示できます。\n\nクエストによっては、達成することでクエストペットのたまごが手に入ります。（クエストについて詳しく知りたい方は「[モンスターと戦ったり、クエストを始めるにはどうしたらいいですか?](https://habitica.com/static/faq/#monsters-quests)」の項目をご覧ください）。",
    "androidFaqAnswer6": "あなたがタスクを達成するたびに、ランダムに「たまご」や「たまごがえしの薬」や「ペットのえさ」を手に入れるチャンスが得られます。手に入れたアイテムはメニュー > 所持品 に保存されています。\n\nペットをかえすには「たまご」と「たまごがえしの薬」が必要です。かえしたいペットの種類を決めて「たまご」を押して、「たまごがえしの薬でかえす」として選択します。次にペットの色を決めて「たまごがえしの薬」を選びましょう！ 新しいペットを連れる（アバターのそばに表示する）には、メニュー > 動物小屋 > ペット に行って種類を選び、希望するペットを押して「連れていく」を選択します（アバターは変更を反映して更新されません）。\n\nペットを育てて乗騎にすることもできます。メニュー > 動物小屋 [ > ペット] でえさをやりましょう。ペットを押して、次に「えさ」を選びます！ ペットを乗騎にするにはたくさんのえさが必要ですが、お気に入りのえさを見つけ出して与えれば、より早く成長します。いろいろ試してみてください。もしくは[ここでネタバレを見ましょう](https://habitica.fandom.com/ja/wiki/えさの好み)。乗騎に乗るには、メニュー > 動物小屋 > 乗騎 へ行って種類を選んで、希望する乗騎を押してから「連れていく」を選択してください（アバターは変更を反映して更新されません）。\n\nクエストによっては、達成することでクエストペットのたまごが手に入ります。(クエストについて詳しく知りたい方は以下をご覧ください)",
@@ -52,7 +52,7 @@
    "iosFaqAnswer12": "ワールドボスはキャンプ場に現れる特別なモンスターです。すべてのユーザーは自動的にこのボスと戦うことになっており、すべてのユーザーが達成した日課やスキルで、常にボスにダメージを与えます。\n\n通常のクエストに参加しながらでもワールドボスと戦うことができます。あなたのタスクやスキルの効果は、ワールドボスと、ボスまたはコレクション クエストとの両方にカウントされます。\n\nワールドボスは、あなたにもあなたのアカウントにも一切ダメージを与えません。その代わり、ユーザーたちが消化しそこねた日課に応じて怒りゲージがたまっていきます。このゲージがいっぱいになると、ワールドボスはサイト内のNPCのうち一人に攻撃を加え、そのキャラクターの姿が変わってしまいます。\n\n詳しくは [過去のワールドボス](https://habitica.fandom.com/ja/wiki/ワールドボス) をお読みください。",
    "androidFaqAnswer12": "ワールドボスはキャンプ場に現れる特別なモンスターです。すべてのユーザーは自動的にこのボスと戦うことになっており、すべてのユーザーが達成した日課やスキルで、常にボスにダメージを与えます。\n\n通常のクエストに参加しながらでもワールドボスと戦うことができます。あなたのタスクやスキルの効果は、ワールドボスと、ボスまたはコレクション クエストとの両方にカウントされます。\n\nワールドボスは、あなたにもあなたのアカウントにも一切ダメージを与えません。その代わり、ユーザーたちが消化しそこねた日課に応じて怒りゲージがたまっていきます。このゲージがいっぱいになると、ワールドボスはサイト内のNPCのうち一人に攻撃を加え、そのキャラクターの姿が変わってしまいます。\n\n詳しくは [過去のワールドボス](https://habitica.fandom.com/ja/wiki/ワールドボス) をお読みください。",
    "webFaqAnswer12": "ワールドボスはキャンプ場に現れる特別なモンスターです。すべてのユーザーは自動的にこのボスと戦うことになっており、すべてのユーザーが達成した日課やスキルで、常にボスにダメージを与えます。通常のクエストに参加しながらでもワールドボスと戦うことができます。あなたのタスクやスキルの効果は、ワールドボスと、ボスまたはコレクション クエストとの両方にカウントされます。ワールドボスは、あなたにもあなたのアカウントにも一切ダメージを与えません。その代わり、ユーザーたちが消化しそこねた日課に応じて怒りゲージがたまっていきます。この怒りゲージがいっぱいになると、ワールドボスはサイト内のNPCのうち一人に攻撃を加え、そのキャラクターの姿が変わってしまいます。詳しくは [過去のワールドボス](https://habitica.fandom.com/ja/wiki/ワールドボス) をお読みください。",
-    "iosFaqStillNeedHelp": "このリストや [Wiki FAQ](https://habitica.fandom.com/ja/wiki/FAQ) にはない質問がある場合は、メニュー > キャンプ場 もしくは[日本語話者の集会所](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)にあるチャットで聞いてみましょう！ 喜んで手助けします。",
-    "androidFaqStillNeedHelp": "このリストや [Wiki FAQ](https://habitica.fandom.com/ja/wiki/FAQ) にはない質問がある場合は、メニュー > キャンプ場 もしくは[日本語話者の集会所](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)にあるチャットで聞いてみましょう！ 喜んで手助けします。",
-    "webFaqStillNeedHelp": "このリストや [Wiki FAQ](https://habitica.fandom.com/ja/wiki/FAQ) にはない質問がある場合は、[Habitica Help ギルド](https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a)もしくは[日本語話者の集会所](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)で聞いてみましょう！ 喜んで手助けします。"
+    "iosFaqStillNeedHelp": "このリストや [Wiki FAQ](https://habitica.fandom.com/ja/wiki/FAQ) にはない質問がある場合は、メニュー > キャンプ場 もしくは[日本語話者ギルド](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)にあるチャットで聞いてみましょう！ 喜んで手助けします。",
+    "androidFaqStillNeedHelp": "このリストや [Wiki FAQ](https://habitica.fandom.com/ja/wiki/FAQ) にはない質問がある場合は、メニュー > キャンプ場 もしくは[日本語話者ギルド](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)にあるチャットで聞いてみましょう！ 喜んで手助けします。",
+    "webFaqStillNeedHelp": "このリストや [Wiki FAQ](https://habitica.fandom.com/ja/wiki/FAQ) にはない質問がある場合は、[Habitica Help ギルド](https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a)もしくは[日本語話者ギルド](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)で聞いてみましょう！ 喜んで手助けします。"
 }
@@ -61,7 +61,7 @@
    "password": "パスワード",
    "playButton": "遊ぶ",
    "playButtonFull": "Habitica をプレー",
-    "presskit": "記事向けの素材・資料",
+    "presskit": "プレスキット",
    "presskitText": "Habitica に興味をもっていただき、ありがとうございます！以下の画像データは、Habitica に関する記事や動画でお使いいただけます。詳しくは <%= pressEnquiryEmail %> までご連絡ください。",
    "pkQuestion1": "Habiticaを作ることになったきっかけは何でしょうか。最初はどんな風に始まりましたか？",
    "pkAnswer1": "あなたがゲームでキャラクターのレベル上げに時間を注いだことがあるなら、こんなことを思わずにはいられないでしょう。「もしもゲームのアバターに代わって現実の自分自身を向上させるために全ての時間を注ぐことができたら、どんなに生活が素晴らしくなるだろう？」と。私たちはそんな課題に取り組むために、Habiticaの設立を始めました。<br />Habiticaは2013年にKickstarterを使って本格的に始動しました。そしてそのアイデアは実際に好評を博するようになったのです。それ以来、プロジェクトは大きく成長し、素晴らしいオープンソースのボランティアたちや、たくさんのユーザーたちによって支えられています。",
@@ -597,7 +597,7 @@
    "armorSpecialFall2017HealerText": "幽霊屋敷のよろい",
    "armorSpecialFall2017HealerNotes": "あなたの心は開いたドア、肩は屋根瓦です！　体質が<%= con %>上がります。2017年秋の限定装備。",
    "armorSpecialWinter2018RogueText": "トナカイのコスチューム",
-    "armorSpecialWinter2018RogueNotes": "あなたは柔らかな毛で覆われてとっても可愛く見えますよ。誰があなたを祝祭明けの盗品だなんて疑うでしょう？ 知覚が<%= per %>上がります。2017年-2018年冬の限定装備。",
+    "armorSpecialWinter2018RogueNotes": "あなたは柔らかい毛で覆われてとっても可愛く見えますよ。誰があなたを祝祭明けの盗品だなんて疑うでしょう？ 知覚が<%= per %>上がります。2017年-2018年冬の限定装備。",
    "armorSpecialWinter2018WarriorText": "ラッピングペーパーのよろい",
    "armorSpecialWinter2018WarriorNotes": "このよろいの薄い手触りにだまされないで。引き裂くのはほぼ不可能です！体質が<%= con %>上がります。2017-2018年冬の限定装備。",
    "armorSpecialWinter2018MageText": "きらびやかなタキシード",
@@ -808,11 +808,11 @@
    "armorArmoireCoverallsOfBookbindingNotes": "カバーオールのセットには、あなたが必要なものが全部あります。ゴーグル、小銭、黄金のリング… 全てを入れるポケットも含めてね。体質が<%= con %> 、知覚が<%= per %>上がります。ラッキー宝箱：製本屋さんセット(4個中2個目のアイテム)。",
    "armorArmoireRobeOfSpadesText": "スペードのローブ",
    "armorArmoireRobeOfSpadesNotes": "この豪華なローブには、秘密のポケットが隠れています。財宝でも武器でも――あなたのお好みで隠せますよ！力が<%= str %>上がります。ラッキー宝箱：スペードのエースセット(2個中3個目のアイテム)。",
-    "armorArmoireSoftBlueSuitText": "柔らかな青いスーツ",
-    "armorArmoireSoftBlueSuitNotes": "青は心を穏やかにする色です。本当に穏やかで、寝るときにこの柔らかな服を着る人さえいます…すやすや…。知能が<%= int %>、知覚が<%= per %>上がります。ラッキー宝箱：青い部屋着セット(3個中2個目のアイテム)。",
-    "armorArmoireSoftGreenSuitText": "柔らかな緑のスーツ",
+    "armorArmoireSoftBlueSuitText": "柔らかい青いスーツ",
+    "armorArmoireSoftBlueSuitNotes": "青は心を穏やかにする色です。本当に穏やかで、寝るときにこの柔らかい服を着る人さえいます…すやすや…。知能が<%= int %>、知覚が<%= per %>上がります。ラッキー宝箱：青い部屋着セット(3個中2個目のアイテム)。",
+    "armorArmoireSoftGreenSuitText": "柔らかい緑のスーツ",
    "armorArmoireSoftGreenSuitNotes": "緑は最も爽やかな色です！疲れた目を休ませるのに理想的で…うーん、あるいはお昼寝にさえ…。体質と知能がそれぞれ<%= attrs %>上がります。ラッキー宝箱：緑の部屋着セット(3個中2個目のアイテム)。",
-    "armorArmoireSoftRedSuitText": "柔らかな赤いスーツ",
+    "armorArmoireSoftRedSuitText": "柔らかい赤いスーツ",
    "armorArmoireSoftRedSuitNotes": "赤はとても元気になる色です。もしあなたが朝早く起きる必要があるなら、このスーツは完璧なパジャマとなるでしょう…。知能が<%= int %> 、力が<%= str %>上がります。ラッキー宝箱：赤い部屋着セット(3個中2個目のアイテム)。",
    "armorArmoireScribesRobeText": "書記官のローブ",
    "armorArmoireScribesRobeNotes": "この滑らかなローブは、インスピレーションとモチベーションを与える魔法が編まれています。知覚と知能が<%= attrs %>ずつ上がります。ラッキー宝箱：書記官セット(3個中1個目のアイテム)。",
@@ -1133,7 +1133,7 @@
    "headMystery201702Text": "恋盗人のフード",
    "headMystery201702Notes": "このフード。顔は隠しますが、あなたの魅力は増すばかりです！効果なし。2017年2月有料会員アイテム。",
    "headMystery201703Text": "きらきらの兜",
-    "headMystery201703Notes": "この角つきの兜から反射する柔らかな光は、最も激しく怒れる敵をもなだめます。効果なし。2017年5月有料会員アイテム。",
+    "headMystery201703Notes": "この角つきの兜から反射する柔らかい光は、最も激しく怒れる敵をもなだめます。効果なし。2017年5月有料会員アイテム。",
    "headMystery201705Text": "有翼の戦士の兜",
    "headMystery201705Notes": "Habiticaはその勇猛で生産的なグリフォン戦士で知られています！　この羽根付き兜をかぶり、あなたも栄えある彼らの列に参加しましょう！　効果なし。2017年5月有料会員アイテム。",
    "headMystery201707Text": "クラゲ術士のヘルメット",
@@ -1496,11 +1496,11 @@
    "shieldArmoirePiraticalSkullShieldNotes": "この魅惑の盾は、敵の財宝がある秘密の場所をささやくでしょう。――よく聞きなさい！知覚と知能が<%= attrs %>ずつ上がります。ラッキー宝箱：海賊姫セット(4個中4個目のアイテム)。",
    "shieldArmoireUnfinishedTomeText": "未完成の本",
    "shieldArmoireUnfinishedTomeNotes": "あなたはこれを持っているとき、簡単には先延ばしができません！人々がその本を読むためには、製本を終わらせる必要があるのですから！知能が<%= int %>上がります。ラッキー宝箱：製本屋さんセット(4個中4個目のアイテム ) 。",
-    "shieldArmoireSoftBluePillowText": "柔らかな青いまくら",
+    "shieldArmoireSoftBluePillowText": "柔らかい青いまくら",
    "shieldArmoireSoftBluePillowNotes": "賢明な戦士は、どんな冒険にもまくらを持っていきます。厳しいタスクからあなた自身を守るのです… うたた寝しているときでさえ。体質が<%= con %>上がります。ラッキー宝箱：青い部屋着セット(3個中3個目のアイテム)。",
-    "shieldArmoireSoftRedPillowText": "柔らかな赤いまくら",
+    "shieldArmoireSoftRedPillowText": "柔らかい赤いまくら",
    "shieldArmoireSoftRedPillowNotes": "準備万端な戦士は、どんな冒険にもまくらを持っていきます。困難なタスクからあなた自身を守るのです… うたた寝しているときでさえ。体質と力がそれぞれ<%= attrs %>上がります。ラッキー宝箱：赤い部屋着セット(3個中3個目のアイテム)。",
-    "shieldArmoireSoftGreenPillowText": "柔らかな緑のまくら",
+    "shieldArmoireSoftGreenPillowText": "柔らかい緑のまくら",
    "shieldArmoireSoftGreenPillowNotes": "実践的な戦士は、どんな冒険にもまくらを持っていきます。苛立たしい課題を撃退するのです……うたた寝しているときでさえ。体質が<%= con %>、知能が<%= int %>上がります。ラッキー宝箱：緑の部屋着セット(3個中3個目のアイテム)。",
    "shieldArmoireMightyQuillText": "力強い羽ペン",
    "shieldArmoireMightyQuillNotes": "剣より強し、と言われています！知覚が<%= per %>上がります。ラッキー宝箱：書記官セット(3個中2個目のアイテム)。",
@@ -2172,7 +2172,7 @@
    "eyewearSpecialGreenHalfMoonText": "緑のアンダーリムのメガネ",
    "eyewearSpecialBlueHalfMoonNotes": "半月状のレンズと青いフレームのメガネです。効果なし。",
    "eyewearSpecialBlueHalfMoonText": "青いアンダーリムのメガネ",
-    "armorSpecialWinter2021WarriorNotes": "もしあなたがこの天気で外に出かけるのなら、暖かい格好を方がいいですよ。体質が<%= con %>上がります。2020-2021年冬の限定装備。",
+    "armorSpecialWinter2021WarriorNotes": "もしあなたがこの天気で外に出かけるのなら、暖かい格好の方がいいですよ。体質が<%= con %>上がります。2020-2021年冬の限定装備。",
    "armorSpecialWinter2021WarriorText": "防寒ジャケット",
    "armorSpecialWinter2021RogueNotes": "常緑の木の影に溶け込みましょう！知覚が<%= per %>上がります。2020-2021年冬の限定装備。",
    "armorSpecialWinter2021RogueText": "アイビーグリーンの衣装",
@@ -2187,7 +2187,7 @@
    "armorSpecialWinter2021HealerNotes": "北極圏で利用できる最強の守りで冷たい風に抵抗しましょう！体質が<%= con %>上がります。2020-2021年冬の限定装備。",
    "armorSpecialWinter2021HealerText": "北極のジャケット",
    "armorSpecialWinter2021MageText": "月明かりの長いローブ",
-    "armorSpecialWinter2021MageNotes": "この暖かい冬用ローブいちねんの寒い時期を快適にしてくれます。上等ななめらかな生地の外側は銀の月明かりを反射し、あなたをなめらかに集中に導きます。知能が<%= int %>上がります。2020-2021年冬の限定装備。",
+    "armorSpecialWinter2021MageNotes": "この暖かい冬用ローブはいちねんの寒い時期を快適にしてくれます。上等でなめらかな生地の外側は銀の月明かりを反射し、あなたをなめらかに集中に導きます。知能が<%= int %>上がります。2020-2021年冬の限定装備。",
    "headSpecialWinter2021WarriorNotes": "寒い天気に備えて快適なフードに包まれましょう。力が<%= str %>上がります。2020-2021年冬の限定装備。",
    "headSpecialWinter2021WarriorText": "防寒フード",
    "headSpecialWinter2021RogueNotes": "盗賊はこういったマスクをつけて森の中で姿をくらますことができるのです。知覚が<%= per %>上がります。2020-2021年冬の限定装備。",
@@ -2293,9 +2293,9 @@
    "armorArmoireJadeArmorNotes": "この翡翠のよろいは美しくて機能的です。あなたを守り――そして、ファビュラスに見せます！知覚が<%= per %>上がります。ラッキー宝箱：翡翠の戦士セット（2個中3個目のアイテム）。",
    "armorArmoireJadeArmorText": "翡翠のよろい",
    "shieldArmoireSoftPinkPillowNotes": "賢明な戦士は、どんな冒険にもまくらを持っていきます。人生の打撃を和らげるために… うたた寝しているときでさえ。力と体質がそれぞれ<%= attrs %>上がります。ラッキー宝箱：ピンクの部屋着セット(3個中3個目のアイテム)。",
-    "shieldArmoireSoftPinkPillowText": "柔らかなピンクのまくら",
+    "shieldArmoireSoftPinkPillowText": "柔らかいピンクのまくら",
    "armorArmoireSoftPinkSuitNotes": "ピンクは癒やしの色です。日々の嫌な仕事の間のわずかな平和のために、この部屋着のセットを着ましょう。知覚が<%= per %>上がります。ラッキー宝箱：ピンクの部屋着セット(2個中3個目のアイテム)。",
-    "armorArmoireSoftPinkSuitText": "柔らかなピンクのスーツ",
+    "armorArmoireSoftPinkSuitText": "柔らかいピンクのスーツ",
    "headArmoirePinkFloppyHatNotes": "このシンプルな帽子にはたくさんの呪文が縫い込まれており、それがこの完璧なピンク色をもたらしているのです。知能が<%= int %>上がります。ラッキー宝箱：ピンクの部屋着セット(3個中1個目のアイテム)。",
    "headArmoirePinkFloppyHatText": "ピンクのチューリップハット",
    "headMystery202103Notes": "最初に咲いた花の枝で作られたこの冠で春をオシャレにお迎えしましょう。効果なし。2021年3月の有料会員アイテム。",
@@ -2482,7 +2482,7 @@
    "headArmoireBlackFloppyHatText": "黒いチューリップハット",
    "armorArmoireSoftBlackSuitNotes": "黒はミステリアスな色です。とても興味深い夢を見せてくれるに違いありません。体質と知覚がそれぞれ<%= attrs %>上がります。ラッキー宝箱：黒い部屋着セット(3個中2個目のアイテム)。",
    "headArmoireBlackFloppyHatNotes": "このシンプルな帽子にはたくさんの呪文が縫い込まれており、それがこの漆黒をもたらしているのです。体質と知覚、力がそれぞれ<%= attrs %>上がります。ラッキー宝箱：黒い部屋着セット(3個中1個目のアイテム)。",
-    "shieldArmoireSoftBlackPillowText": "柔らかな黒いまくら",
+    "shieldArmoireSoftBlackPillowText": "柔らかい黒いまくら",
    "shieldArmoireSoftBlackPillowNotes": "勇敢な戦士は、どんな冒険にもまくらを持っていきます。やっかいなタスクから身を守ります… うたた寝しているときでさえ。力と体質がそれぞれ<%= attrs %>上がります。ラッキー宝箱：黒い部屋着セット(3個中3個目のアイテム)。",
    "headMystery202111Text": "時視の帽子",
    "headMystery202111Notes": "飾りのついた見事なゴーグルつきの帽子です。過ぎた時間を見ることが出来ます。かっこいいでしょ？効果なし。2021年11月の有料会員アイテム。",
@@ -2535,7 +2535,7 @@
    "armorSpecialWinter2022HealerNotes": "スケートのように地面の上を滑ると、きらめく空気のような姿が、涼しさと落ち着きをもたらします。体質が<%= con %>上がります。2021年-2022年冬の限定装備。",
    "headSpecialWinter2022WarriorText": "けばけばの靴下の帽子",
    "headSpecialWinter2022RogueText": "雷のように轟くフィナーレ",
-    "headSpecialWinter2022WarriorNotes": "めでたい緑色をベースに柔らかな赤色で縁取られたこの帽子は、この冬じゅうの暖かさを保証してくれるでしょう！力が<%= str %>上がります。2021年-2022年冬の限定装備。",
+    "headSpecialWinter2022WarriorNotes": "めでたい緑色をベースに柔らかい赤色で縁取られたこの帽子は、この冬じゅうの暖かさを保証してくれるでしょう！力が<%= str %>上がります。2021年-2022年冬の限定装備。",
    "headSpecialWinter2022RogueNotes": "え？なに？どこかに盗賊がいるって？ごめん、花火で何も聞こえない！知覚が<%= per %>上がります。2021年-2022年冬の限定装備。",
    "headSpecialWinter2022MageText": "ザクロのかぶと",
    "headSpecialWinter2022MageNotes": "厚い殻のおかげで、このお祝いのフルーティーなかぶとは、\"ベリー\"ストロングです。知覚が<%= per %>上がります。2021年-2022年冬の限定装備。",
@@ -2614,5 +2614,19 @@
    "eyewearMystery202204AText": "バーチャルフェイス",
    "eyewearMystery202204BText": "バーチャルフェイス",
    "eyewearMystery202204BNotes": "今日の気分は？この愉快な画面で自分を表現してみましょう。効果なし。2021年4月の有料会員アイテム。",
-    "eyewearMystery202204ANotes": "今日の気分は？この愉快な画面で自分を表現してみましょう。効果なし。2021年4月の有料会員アイテム。"
+    "eyewearMystery202204ANotes": "今日の気分は？この愉快な画面で自分を表現してみましょう。効果なし。2021年4月の有料会員アイテム。",
+    "backMystery202205Text": "黄昏の翼",
+    "backMystery202205Notes": "雄大な翼の力強いはばたきが砂丘にこだまします。効果なし。2021年5月の有料会員アイテム。",
+    "headAccessoryMystery202205Text": "黄昏の翼をもつドラゴンの角",
+    "headAccessoryMystery202205Notes": "砂漠の日の入りのようにまばゆい角です。効果なし。2021年5月の有料会員アイテム。",
+    "weaponArmoireHuntingHornText": "狩猟用ホルン",
+    "weaponArmoireHuntingHornNotes": "プオーーー！プオー！プオー！この角笛を吹いて冒険やクエストにパーティーを集めましょう。力が<%= str %>、知能が<%= int %>上がります。ラッキー宝箱：楽器セット（3個中1つ目のアイテム）",
+    "headArmoireStrawRainHatNotes": "この耐水の円錐形の帽子をかぶれば、あなたのゆく道の途上にある障害物を一目で見つけることができるようになるでしょう。知覚が<%= per %>上がります。ラッキー宝箱：蓑セット（2個中2個目のアイテム）。",
+    "armorArmoireStrawRaincoatText": "蓑",
+    "armorArmoireStrawRaincoatNotes": "このわらを編んで作られたケープは、クエスト中にあなたを濡れさせず、よろいをさび付かせません。ろうそくの近くには近づかないように！体質が<%= con %>上がります。ラッキー宝箱：蓑セット（2個中1個目のアイテム）。",
+    "headArmoireStrawRainHatText": "笠",
+    "shieldArmoireSpanishGuitarText": "クラシックギター",
+    "shieldArmoireSnareDrumText": "スネアドラム",
+    "shieldArmoireSpanishGuitarNotes": "ジャン！ジャン！ジャカジャーン！このギターを弾いてコンサートやお祝いのためにパーティーを集めましょう。知覚が<%= per %>、知能が<%= int %>上がります。ラッキー宝箱：楽器セット（3個中2つ目のアイテム）",
+    "shieldArmoireSnareDrumNotes": "ラッタタッタタ！このドラムを演奏して、バトルに続くパレードや行進のためにパーティーを集めましょう。体質が <%= con %>、知能が <%= int %>上がります。ラッキー宝箱：楽器セット（3個中3つ目のアイテム）"
 }
@@ -273,7 +273,7 @@
    "createParty": "パーティーを作成する",
    "inviteMembersNow": "すぐにメンバーを招待したいですか？",
    "playInPartyTitle": "パーティーに参加してHabiticaをプレイしましょう！",
-    "playInPartyDescription": "仲間たちと一緒に、または一人で、素晴らしいクエストに挑戦しましょう。モンスターと戦ったり、チャレンジを作ったり…… そして、パーティーを通じてあなた自身を責任ある状態にし続けてみましょう。",
+    "playInPartyDescription": "ひとりで、あるいは仲間と一緒にクエストに挑戦しましょう。モンスターと戦い、チャレンジを作り、パーティーによって自分の責任感を維持することができます。",
    "wantToJoinPartyTitle": "パーティーに参加したいですか？",
    "wantToJoinPartyDescription": "すでにパーティーを持っている友達にあなたのユーザー名を知らせるか、<a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted [英語] </a>ギルド、もしくは<a href='/groups/guild/4f969d70-0765-4284-b192-b89a9b2ef333'>パーティー募集 [日本語] </a>ギルドに行って、未来の仲間に出会いましょう！",
    "copy": "コピー",
@@ -378,5 +378,6 @@
    "joinParty": "パーティーに参加する",
    "editGuild": "ギルドを編集",
    "editParty": "パーティーを編集",
-    "leaveGuild": "ギルドを脱退する"
+    "leaveGuild": "ギルドを脱退する",
+    "sendGiftTotal": "トータル："
 }
@@ -6,5 +6,5 @@
    "webStep2Text": "さあ、リストの中の目標に取り組みはじめましょう！　あなたがタスクを完了してHabiticaでチェックを入れるごとに、あなたはレベルアップに必要な[経験値](https://habitica.fandom.com/ja/wiki/経験値)と、ごほうびを購入できる[ゴールド](https://habitica.fandom.com/ja/wiki/ゴールド)を獲得します。あなたが悪い習慣を行ってしまったり、日課をやりそびれてしまったりすると、あなたは[体力](https://habitica.fandom.com/ja/wiki/体力)を失います。このように、Habiticaでの経験と体力のバーはあなたが目標に向かって進むうえでの楽しい指標になります。あなたのキャラクターがゲーム中で成長するにつれて、現実世界でのあなたの生活にも改善がみられることでしょう。",
    "step3": "ステップ 3：カスタマイズして、Habiticaの冒険に出かけよう",
    "webStep3Text": "基本の操作を覚えたら、以下のすばらしい機能でHabiticaをよりいっそう楽しめます：\n* タスクを[タグ](https://habitica.fandom.com/ja/wiki/タグ)で整理しましょう（タグを追加するにはタスクを編集してください）。\n* 右上のユーザーアイコンを押して、あなたの[アバター](https://habitica.fandom.com/ja/wiki/アバター)をカスタマイズしましょう。\n* ごほうび欄や [ショップ](<%= shopUrl %>)から[装備](https://habitica.fandom.com/ja/wiki/装備)を買って、[所持品 > 装備](<%= equipUrl %>)で変更しましょう。\n* [キャンプ場](https://habitica.fandom.com/ja/wiki/キャンプ場)でほかのユーザーと交流しましょう。日本語で話したい場合は[日本語話者の集会所](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)ギルドもおすすめです。\n* [たまご](https://habitica.fandom.com/ja/wiki/たまご)と[たまごがえしの薬](https://habitica.fandom.com/ja/wiki/たまごがえしの薬)を集めて、[ペット](https://habitica.fandom.com/ja/wiki/ペット)をかえしましょう。[えさ](https://habitica.fandom.com/ja/wiki/えさ)をやって[乗騎](https://habitica.fandom.com/ja/wiki/乗騎)に育てましょう。\n* レベル10になったら：任意の[クラス](https://habitica.fandom.com/ja/wiki/クラス・システム)を選んで、クラス固有の[スキル](https://habitica.fandom.com/ja/wiki/スキル)を使用しましょう（レベル11～14）。\n* （ナビゲーションバーの[パーティー](<%= partyUrl %>)を押して）友達とパーティーを組むことで、責任感を持ち、クエストの巻物を手に入れましょう。\n* [クエスト](https://habitica.fandom.com/ja/wiki/クエスト)でモンスターを倒したり、指定された物を集めたりしましょう（レベル15でクエストの巻物をもらえます）。",
-    "overviewQuestions": "質問がありますか？ [よくある質問](<%= faqUrl %>) を見てみてください！ もしあなたの知りたいことがそこに書かれていないようなら、[Habitica Help ギルド](<%= helpGuildUrl %>) もしくは[日本語話者の集会所](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)でさらなる助けを求めることができます。\n\nあなたのタスクが順調に進みますように！"
+    "overviewQuestions": "質問がありますか？ [よくある質問](<%= faqUrl %>) を見てみてください！ もしあなたの知りたいことがそこに書かれていないようなら、[Habitica Help ギルド](<%= helpGuildUrl %>) もしくは[日本語話者ギルド](https://habitica.com/groups/guild/1f99d3df-bb93-4505-bf3b-6f348e1896f3)でさらなる助けを求めることができます。\n\nあなたのタスクが順調に進みますように！"
 }
@@ -677,7 +677,7 @@
    "questFluoriteUnlockText": "市場で蛍石のたまごがえしの薬を買えるようになります",
    "evilSantaAddlNotes": "「猟師のサンタ」と「子グマの捜索」のクエストは何回でも挑戦できますが、クエスト報酬の特別なペットと乗騎が手に入るのは最初の一回だけです。ご注意ください。",
    "delightfulDinosText": "「愉快な恐竜」クエストセット",
-    "delightfulDinosNotes": "「テラー・ダクティル」「トリケラ・ステップス」「発掘された恐竜」のセット。11月30日まで購入できます。",
+    "delightfulDinosNotes": "「テラー・ダクティル」「トリケラ・ステップス」「発掘された恐竜」のセット。5月31日まで購入できます。",
    "questRubyCollectRubyGems": "ルビー",
    "questRubyCollectVenusRunes": "金星のルーン",
    "questRubyCollectAquariusRunes": "みずがめ座のルーン",
@@ -201,5 +201,10 @@
    "mysterySet202201": "夜中にはしゃぐセット",
    "mysterySet202202": "ターコイズツインテールセット",
    "mysterySet202203": "不屈のトンボセット",
-    "mysterySet202204": "バーチャルアドベンチャーセット"
+    "mysterySet202204": "バーチャルアドベンチャーセット",
+    "mysterySet202205": "黄昏の翼のドラゴンセット",
+    "howManyGemsSend": "いくつのジェムを贈りますか？",
+    "howManyGemsPurchase": "ジェムをいくつ購入しますか?",
+    "sendAGift": "プレゼントを贈る",
+    "needToPurchaseGems": "ジェムを贈り物として購入する必要がありますか?"
 }
@@ -7,7 +7,7 @@
    "noPhoto": "이 해비티칸은 사진을 추가하지 않았습니다.",
    "other": "그 외",
    "fullName": "이름",
-    "displayName": "타인에게 보여질 이름",
+    "displayName": "별명",
    "changeDisplayName": "타인에게 보여지는 이름 바꾸기",
    "newDisplayName": "타인에게 보여질 새로운 이름",
    "displayBlurbPlaceholder": "자신을 소개해주세요",
@@ -2,7 +2,7 @@
    "termsAndAgreement": "아래에 있는 버튼을 클릭함으로써, 당신은 <a href='/static/terms'>서비스 약관</a> 과 <a href='/static/privacy'> 개인정보 정책</a>을 읽었고 이에 동의했음을 표시합니다.",
    "FAQ": "자주 하는 질문",
    "sendLink": "링크 보내기",
-    "forgotPasswordSteps": "Habitica 계정으로 등록할 메일 주소를 입력하세요.",
+    "forgotPasswordSteps": "Habitica 계정등록에 사용한 아이디•이메일 주소를 입력하세요.",
    "emailNewPass": "메일로 비밀번호 재설정 링크 보내기",
    "forgotPassword": "비밀번호를 잊으셨습니까?",
    "companyDonate": "기부하기",
@@ -1,7 +1,7 @@
 {
    "languageName": "영어",
    "stringNotFound": "'<%= string %>' 스트링을 찾을 수 없습니다.",
-    "habitica": "해비티카",
+    "habitica": "Habitica",
    "onward": "Onward!",
    "done": "완료",
    "gotIt": "알겠어요!",
@@ -173,8 +173,8 @@
    "creativity": "Creativity",
    "health_wellness": "Health & Wellness",
    "self_care": "Self-Care",
-    "habitica_official": "해비티카 공식",
-    "academics": "Academics",
+    "habitica_official": "Habitica 공식",
+    "academics": "학문",
    "advocacy_causes": "Advocacy + Causes",
    "entertainment": "Entertainment",
    "finance": "Finance",
@@ -14,7 +14,7 @@
    "contributing": "Contributing",
    "faq": "FAQ",
    "tutorial": "튜토리얼",
-    "glossary": "<a target='_blank' href='http://habitica.wikia.com/wiki/Glossary'>용어</a>",
+    "glossary": "<a target='_blank' href='https://habitica.wikia.com/wiki/Glossary'>용어</a>",
    "wiki": "위키",
    "requestAF": "새로운 기능 요청",
    "dataTool": "데이터 표시 도구",
@@ -73,7 +73,7 @@
    "confirmGuild": "길드를 4Gems 로 생성하시겠습니까?",
    "confirm": "확인함",
    "leaveGroup": "Leave Guild",
-    "leaveParty": "Leave Party",
+    "leaveParty": "파티 탈퇴",
    "send": "보내기",
    "pmsMarkedRead": "Your Private Messages have been marked as read",
    "possessiveParty": "<%= name %>의 파티",
@@ -341,5 +341,11 @@
    "allAssignedCompletion": "All - Completes when all assigned users finish",
    "pmReported": "이 메시지를 신고해주셔서 감사합니다.",
    "blockedToSendToThisUser": "당신은 이 유저을 차단했기에 이 유저에게 메시지를 보낼 수 없습니다.",
-    "PMDisabled": "개인적인 메시지를 해제"
+    "PMDisabled": "개인적인 메시지를 해제",
+    "features": "기능",
+    "joinParty": "파티 가입",
+    "joinGuild": "길드 가입",
+    "editGuild": "길드 수정",
+    "leaveGuild": "길드 탈퇴",
+    "editParty": "파티 수정"
 }
@@ -29,7 +29,7 @@
    "veteranBear": "베테랑 곰",
    "veteranLion": "베테랑 사자",
    "veteranTiger": "베테랑 호랑이",
-    "veteranWolf": "노련한 늑대",
+    "veteranWolf": "베테랑 늑대",
    "etherealLion": "우아한 사자",
    "magicMounts": "마법 포션 탑승펫",
    "questMounts": "퀘스트 탑승펫",
@@ -58,10 +58,10 @@
    "noActiveQuestToAbort": "중단 시킬 수 있는 퀘스트가 없습니다.",
    "onlyLeaderAbortQuest": "그룹 또는 퀘스트 리더가 퀘스트를 중단 시킬 수 있습니다.",
    "questAlreadyRejected": "당신은 이미 퀘스트 요청을 거부 하셨습니다.",
-    "cantCancelActiveQuest": "당신은 활성화된 퀘스트를 취소및 중단 기능을 사용 할 수 없습니다.",
-    "onlyLeaderCancelQuest": "그룹 또는 퀘스트 리더가 퀘스트를 취소 할 수 있습니다.",
-    "questNotPending": "시작한 퀘스트가 없습니다.",
-    "questOrGroupLeaderOnlyStartQuest": "퀘스트 리더 또는 그룹의 리더가 퀘스트를 시작 하도록 할 수 있습니다.",
+    "cantCancelActiveQuest": "진행 중인 퀘스트는 취소할 수 없습니다, 중단 기능을 사용하시기 바랍니다.",
+    "onlyLeaderCancelQuest": "그룹 또는 퀘스트 리더만이 퀘스트를 취소 할 수 있습니다.",
+    "questNotPending": "시작할 퀘스트가 없습니다.",
+    "questOrGroupLeaderOnlyStartQuest": "퀘스트 리더 또는 그룹 리더만이 퀘스트를 강제 시작할 수 있습니다",
    "loginIncentiveQuest": "To unlock this quest, check in to Habitica on <%= count %> different days!",
    "loginReward": "<%= count %>번 출석",
    "questBundles": "Discounted Quest Bundles",
@@ -81,5 +81,6 @@
    "questItemsPending": "대기 중인 <%= amount %> 개의 아이템이 있습니다",
    "sureLeaveInactive": "정말로 퀘스트를 중단하시겠습니까? 중단한 퀘스트에는 참여하지 못하게 됩니다.",
    "chatQuestStarted": "당신의 퀘스트인 <%= questName %> 이/가 시작되었습니다.",
-    "chatBossDamage": "<%= username %> 이/가 <%= bossName %> 을/를 <%= userDamage %> 만큼 공격합니다. <%= bossName %> 이/가 <%= bossDamage %> 만큼 공격합니다."
+    "chatBossDamage": "<%= username %> 이/가 <%= bossName %> 을/를 <%= userDamage %> 만큼 공격합니다. <%= bossName %> 이/가 <%= bossDamage %> 만큼 공격합니다.",
+    "membersParticipating": "참가인원 수: <%= accepted %> / <%= invited %>"
 }
@@ -1,5 +1,5 @@
 {
-    "subscription": "정기 후원",
+    "subscription": "정기 구독",
    "subscriptions": "정기 후원",
    "sendGems": "Send Gems",
    "buyGemsGold": "골드로 보석을 구입하세요",
@@ -133,5 +133,6 @@
    "purchaseAll": "Purchase Set",
    "gemsRemaining": "gems remaining",
    "notEnoughGemsToBuy": "You are unable to buy that amount of gems",
-    "mysterySet202011": "잎 장식 마법사 세트"
+    "mysterySet202011": "잎 장식 마법사 세트",
+    "viewSubscriptions": "구독 관리"
 }
@@ -120,7 +120,7 @@
    "achievementDomesticatedModalText": "Omnia animalia domestica collegisti!",
    "achievementShadyCustomer": "Umbra et Imago",
    "achievementShadyCustomerText": "Omnia animalia umbrae coloris collegit.",
-    "achievementZodiacZookeeperText": "Omnia animalia Zodiaci incubuit: Ratum, Bovem, Cuniculum, Serpentem, Equum, Ovem, Simiam, Gallum, Lupum, Tigrem, Suem Volantem, Draconem!",
+    "achievementZodiacZookeeperText": "Omnes colores animalium Zodiaci incubuit: Ratum, Bovem, Cuniculum, Serpentem, Equum, Ovem, Simiam, Gallum, Lupum, Tigrem, Suem Volantem, et Draconem!",
    "achievementZodiacZookeeper": "Zodiaci Custos",
    "achievementZodiacZookeeperModalText": "Omnia animalia Zodiaci collegisti!",
    "achievementShadyCustomerModalText": "Omnia animalia umbrae coloris collegisti!",
@@ -129,5 +129,5 @@
    "achievementShadeOfItAllModalText": "Omnia iumenta umbrae coloris domuisti!",
    "achievementBirdsOfAFeather": "Volucres volare solent",
    "achievementBirdsOfAFeatherModalText": "Omnia animalia volantia collegisti!",
-    "achievementBirdsOfAFeatherText": "Omnia animalia volantia incubuit: Suem Volantem, Strigem, Psittacum, Pterodactylum, Gryphus, Falconem."
+    "achievementBirdsOfAFeatherText": "Omnes colores animalium volantium incubuit: Suem Volantem, Strigem, Psittacum, Pterodactylum, Gryphus, Falconem, Pavonem et Gallum."
 }
@@ -6,12 +6,12 @@
    "communityInstagram": "Instagramma",
    "chores": "Negotia",
    "communityFacebook": "Faciesliber",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Addenda et extentiones</a>",
+    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Addenda et extentiones</a>",
    "clearBrowserData": "Exime argumenta Navigatro",
    "emailNewPass": "Mitte littera electronica ligamen Passusverbum revertens",
    "forgotPassword": "Passusverbum de memoria animo exciditne?",
    "companyDonate": "Pecuniam dona",
-    "companyContribute": "Operam da",
+    "companyContribute": "Contribue",
    "companyBlog": "Blogulum",
    "companyAbout": "Quomodo agit",
    "footerCompany": "Compages",
@@ -22,5 +22,20 @@
    "logout": "Exitus",
    "history": "Historia",
    "free": "Associa te gratis",
-    "footerSocial": "Congregatio"
+    "footerSocial": "Congregatio",
+    "marketing1Lead3Title": "Inveni Praemia Fortuita",
+    "marketing1Lead2Title": "Cape Armamenta Dulces",
+    "guidanceForBlacksmiths": "Moderatio Fabris",
+    "marketing2Lead1Title": "Feracitas Socialis",
+    "marketing4Header": "Usus Ordinationis",
+    "marketing2Lead3Title": "Provocate Alter Alterum",
+    "marketing1Lead2": "Emeda habitos tuos ad aedificandam personam tuam. Monstra armamenta dulces quae adeptus es!",
+    "marketing1Lead1Title": "Vita Tua, Ludus Personarum",
+    "marketing3Header": "Programmulae et Extensiones",
+    "invalidEmail": "Littera electronica rata requiritur ad revertere passusverbum.",
+    "marketing3Lead2Title": "Integraziones",
+    "footerMobile": "Mobilis",
+    "marketing2Header": "Colluctare Cum Amicis, Te Associa In Gregibus Studii",
+    "marketing2Lead2Title": "Pugna Monstra",
+    "marketing2Lead1": "Etiamsi solus ludere Habitica potes, melius advenit cum tu collaborare, contendere atque manere fidelitatem alterum alterum incohas. Efficacissima pars aliqui profecti ipsius est fidelitas socialis, et quid est locum melius ad manendam fidelitatem et competendum quam ludum televisificum?"
 }
@@ -4,5 +4,7 @@
    "eggsItemType": "Ova",
    "hatchingPotionsItemType": "Potiones Incubantes",
    "specialItemType": "Res Propriae",
-    "lockedItem": "Res Obserata"
+    "lockedItem": "Res Obserata",
+    "petAndMount": "Animalia Domestica et Iumenta",
+    "allItems": "Totae Res"
 }
@@ -27,10 +27,10 @@
    "seasonalShopClosedTitle": "<%= linkStart %>Leslie<%= linkEnd %>",
    "seasonalShopTitle": "<%= linkStart %>Maga Tempestiva<%= linkEnd %>",
    "seasonalShopClosedText": "The Seasonal Shop is currently closed!! It’s only open during Habitica’s four Grand Galas.",
-    "seasonalShopSummerText": "Happy Summer Splash!! Would you like to buy some rare items? They’ll only be available until July 31st!",
-    "seasonalShopFallText": "Happy Fall Festival!! Would you like to buy some rare items? They’ll only be available until October 31st!",
-    "seasonalShopWinterText": "Happy Winter Wonderland!! Would you like to buy some rare items? They’ll only be available until January 31st!",
-    "seasonalShopSpringText": "Happy Spring Fling!! Would you like to buy some rare items? They’ll only be available until April 30th!",
+    "seasonalShopSummerText": "Felix Aspersionos Aestivae!! Vis emere aliquas res egregias? Certus sis ut illos capias antea Gala finit!",
+    "seasonalShopFallText": "Felix Festivi Autumni!! Vis emere aliquas res egregias? Certus sis ut illos capias antea Gala finit!",
+    "seasonalShopWinterText": "Felix Terrae Miraculorum Hiemis!! Vis emere aliquas res egregias? Certus sis ut illos capias antea Gala finit!",
+    "seasonalShopSpringText": "Felix Iacti Veris!! Vis emere aliquas res egregias? Certus sis ut illos capias antea Gala finit!",
    "seasonalShopFallTextBroken": "O... Salve ad Tabernam Tempestivam... Bona ex Editionibus Tempestivis autumni aut aliquae vendimus... Haec omnia intra Festivum Autumnum quotannis emerentur, sed usque ad 31 Octobrem negotiamus... Propterea opinor ut nunc haec emere debes quoniam tibi expectavi... expectavique... expectavique necesse est... <strong>*suspiro*</strong>",
    "seasonalShopBrokenText": "Meus papilio!!!!!!! Meae decorationes!!!! Vae, Dyscordatrix omnia interfecit :( Quaeso, ut Dyscordatricem in Caupona vincas et reficiam!",
    "seasonalShopRebirth": "If you bought any of this equipment in the past but don't currently own it, you can repurchase it in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",
@@ -41,8 +41,8 @@
    "northMageSet": "Magus Boreae (Magus)",
    "icicleDrakeSet": "Draco Glacialis (Fur)",
    "soothingSkaterSet": "Patinator Leniens (Sanator)",
-    "gingerbreadSet": "Bellator Panis Zingiberici (Bellator)",
-    "snowDaySet": "Bellator Diei Nivalis (Bellator)",
+    "gingerbreadSet": "Panis Zingiberici (Bellator)",
+    "snowDaySet": "Dies Nivalis (Bellator)",
    "snowboardingSet": "Veneficus Fluctivagans Nivalis (Magus)",
    "festiveFairySet": "Festive Fairy (Healer)",
    "cocoaSet": "Fur Potui Socolatae (Fur)",
@@ -74,7 +74,7 @@
    "magicianBunnySet": "Cuniculus Magi (Magus)",
    "comfortingKittySet": "Cattulus Consolans (Sanator)",
    "sneakySqueakerSet": "Mintriator Furtivus (Fur)",
-    "sunfishWarriorSet": "Bellator Mola Mola (Bellator)",
+    "sunfishWarriorSet": "Mola Mola (Bellator)",
    "shipSoothsayerSet": "Augur Navalis (Magus)",
    "strappingSailorSet": "Nauta Valens (Sanator)",
    "reefRenegadeSet": "Reef Renegade (Rogue)",
@@ -149,5 +149,6 @@
    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!",
    "summer2019ConchHealerSet": "Concha (Sanator)",
-    "spring2019AmberMageSet": "Succinum (Magus)"
+    "spring2019AmberMageSet": "Succinum (Magus)",
+    "royalPurpleJackolantern": "Cucurbita Caelata Ignifera Purpura Regia"
 }
@@ -8,22 +8,22 @@
    "messageCannotFeedPet": "Hoc animal domesticum non pascas.",
    "messageAlreadyMount": "Iam iumentum tibi est. Conare alere aliud animal domesticum.",
    "messageEvolve": "<%= egg %>mansuevisti. Equitate!",
-    "messageLikesFood": "<%= egg %> really likes <%= foodText %>!",
-    "messageDontEnjoyFood": "<%= egg %> eats <%= foodText %> but doesn't seem to enjoy it.",
+    "messageLikesFood": "<%= egg %> sane  amat <%= foodText %>!",
+    "messageDontEnjoyFood": "<%= egg %> edit <%= foodText %> sed videtur id frui.",
    "messageBought": "Emitur <%= itemText %>",
    "messageUnEquipped": "<%= itemText %> inarmatur.",
    "messageMissingEggPotion": "Aut ovo aut potioni dees",
    "messageInvalidEggPotionCombo": "Ova Animaliorum Domesticorum ex Investigatione incubare Potione Magica Incubante non potest. Conare alio ovo.",
    "messageAlreadyPet": "Iam animal domesticum tibi est. Conare incubare aliam combīnātiōnem!",
-    "messageHatched": "Your egg hatched! Visit your stable to equip your pet.",
+    "messageHatched": "Ovum tuum incubatum est! Adeas stabulum tuum ad armandum animalem domesticum.",
    "messageNotEnoughGold": "Aurum Non Satis Est",
-    "messageTwoHandedEquip": "Wielding <%= twoHandedText %> takes two hands, so <%= offHandedText %> has been unequipped.",
-    "messageTwoHandedUnequip": "Wielding <%= twoHandedText %> takes two hands, so it was unequipped when you armed yourself with <%= offHandedText %>.",
-    "messageDropFood": "You've found <%= dropText %>!",
+    "messageTwoHandedEquip": "Ut feras <%= twoHandedText %> duo manibus egeres, igitur <%= offHandedText %> exarmatum est.",
+    "messageTwoHandedUnequip": "Wielding <%= twoHandedText %> takes two hands, so it was unequipped when you armed yourself with <%= offHandedText %>.\nUt feras <%= twoHandedText %> duo manibus egeres, igitur illum exarmatum est cum aggingat <%= offHandedText %> armis.",
+    "messageDropFood": "Invenisti <%= dropText %>!",
    "messageDropEgg": "You've found a <%= dropText %> Egg!",
    "messageDropPotion": "You've found a <%= dropText %> Hatching Potion!",
    "messageDropMysteryItem": "Aperis arcam et <%= dropText %> invenis!",
-    "messageAlreadyOwnGear": "You already own this item. Equip it by going to the equipment page.",
+    "messageAlreadyOwnGear": "Iam haec armamenta tibi sunt. Id arma eundo ad paginam armamentorum.",
    "previousGearNotOwned": "You need to purchase a lower level gear before this one.",
    "messageHealthAlreadyMax": "Valitudo maxima tibi iam est.",
    "messageHealthAlreadyMin": "Oh no! You have already run out of health so it's too late to buy a health potion, but don't worry - you can revive!",
@@ -48,7 +48,15 @@
    "messageNotAbleToBuyInBulk": "This item cannot be purchased in quantities above 1.",
    "notificationsRequired": "Notificationes ID requiruntur.",
    "unallocatedStatsPoints": "You have <span class=\"notification-bold-blue\"><%= points %> unallocated Stat Points</span>",
-    "beginningOfConversation": "This is the beginning of your conversation with <%= userName %>. Remember to be kind, respectful, and follow the Community Guidelines!",
+    "beginningOfConversation": "Hic est exordium sermonis tui cum <%= userName %>.",
    "messageDeletedUser": "Sorry, this user has deleted their account.",
-    "messageMissingDisplayName": "Missing display name."
+    "messageMissingDisplayName": "Missing display name.",
+    "reportedMessage": "Nuntiavisti hoc nuntium arbitris.",
+    "messageBattleGearUnEquipped": "Armamenta Pugnae exarmata.",
+    "messagePetMountUnEquipped": "Animalem Domesticum Iumentumque exarmata.",
+    "messageBackgroundUnEquipped": "Scaena exarmata.",
+    "canDeleteNow": "Hunc nuntium delere posse si velis.",
+    "newsPostNotFound": "Aut notitia non inventa est aut tu aditum ad videndum non habes.",
+    "messageCostumeUnEquipped": "Habitum exarmatum.",
+    "messageAllUnEquipped": "Omnia exarmata."
 }
@@ -22,7 +22,7 @@
    "magicPets": "Animalia Magica",
    "petsFound": "Animalia Inventa",
    "activePet": "Animal Electum",
-    "pets": "Animalia",
+    "pets": "Animalia Domestica",
    "stable": "Stabulum",
    "noActiveMount": "Nullus Iumentum Electus",
    "noActivePet": "Nullus Animal Electum",
@@ -39,5 +39,11 @@
    "petName": "<%= egg(locale) %> <%= potion(locale) %>",
    "hatchedPet": "Incubuisti novum animal nominatum <%= potion %> <%= egg %>!",
    "hopefulHippogriffMount": "Hopeful Hippogriff (Pet)",
-    "hopefulHippogriffPet": "Hopeful Hippogriff (Pet)"
+    "hopefulHippogriffPet": "Hopeful Hippogriff (Pet)",
+    "invisibleAether": "Aether Caecus",
+    "quickInventory": "Citum Index Bonorum",
+    "noSaddlesAvailable": "Non est tibi ullum Stratum.",
+    "food": "Cibus et Strata",
+    "haveHatchablePet": "Habes potionem incubantem <%= potion %> atque ovum %= egg %> ad incubandum hoc animalem domesticum! <b>Deprime</b> ad incubandum!",
+    "noFoodAvailable": "Non est tibi ullus Cibus."
 }
@@ -1,8 +1,11 @@
 {
-  "achievement": "Achievement",
-  "onwards": "Pirmyn!",
-  "levelup": "Įgyvendindamas savo realaus gyvenimo tikslus, tu pasiekei aukštesnį lygį ir visiškai pasveikai!",
-  "reachedLevel": "Tu pasiekei lygį <%= level %>",
-  "achievementLostMasterclasser": "Misijos įvykdytojas: Klasių globėjų serija",
-  "achievementLostMasterclasserText": "Įvykdytos visos šešiolika „Klasių globėjų„ serijos misijos ir išaiškinta „Dingusios klasių globėjos“ paslaptis!"
+    "achievement": "Achievement",
+    "onwards": "Pirmyn!",
+    "levelup": "Įgyvendindamas savo realaus gyvenimo tikslus, tu pasiekei aukštesnį lygį ir visiškai pasveikai!",
+    "reachedLevel": "Tu pasiekei lygį <%= level %>",
+    "achievementLostMasterclasser": "Misijos įvykdytojas: Klasių globėjų serija",
+    "achievementLostMasterclasserText": "Įvykdytos visos šešiolika „Klasių globėjų„ serijos misijos ir išaiškinta „Dingusios klasių globėjos“ paslaptis!",
+    "foundNewItems": "Tu radai naujų daiktų!",
+    "yourProgress": "Tavo procesas",
+    "letsGetStarted": "Pradėkime!"
 }
--- a/Show More
+++ b/Show More