4.228.2

Merge branch 'develop' into release
fix(settings): don't show email change without email, refresh page
2026-05-10 19:20:21 -05:00 · 2022-04-14 15:28:51 -05:00 · 2022-04-14 15:28:47 -05:00 · 2022-04-14 14:51:11 -05:00 · 2022-04-14 14:21:39 -05:00 · 2022-04-14 13:35:30 -05:00
139 changed files with 2980 additions and 2026 deletions
@@ -1,3 +1,7 @@
 # Files not included in deployments to Heroku, to save on file size.

 /habitica-images
+/test
+/migrations
+/scripts
+/database_reports
@@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.227.0",
+  "version": "4.228.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -26,24 +26,24 @@
      "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="
    },
    "@babel/core": {
-      "version": "7.17.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz",
-      "integrity": "sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==",
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
+      "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
      "requires": {
        "@ampproject/remapping": "^2.1.0",
        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.7",
+        "@babel/generator": "^7.17.9",
        "@babel/helper-compilation-targets": "^7.17.7",
        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helpers": "^7.17.8",
-        "@babel/parser": "^7.17.8",
+        "@babel/helpers": "^7.17.9",
+        "@babel/parser": "^7.17.9",
        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
+        "@babel/traverse": "^7.17.9",
        "@babel/types": "^7.17.0",
        "convert-source-map": "^1.7.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
+        "json5": "^2.2.1",
        "semver": "^6.3.0"
      },
      "dependencies": {
@@ -61,9 +61,9 @@
          "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="
        },
        "@babel/generator": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
-          "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
+          "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
          "requires": {
            "@babel/types": "^7.17.0",
            "jsesc": "^2.5.1",
@@ -81,6 +81,15 @@
            "semver": "^6.3.0"
          }
        },
+        "@babel/helper-function-name": {
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+          "requires": {
+            "@babel/template": "^7.16.7",
+            "@babel/types": "^7.17.0"
+          }
+        },
        "@babel/helper-module-transforms": {
          "version": "7.17.7",
          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
@@ -110,9 +119,9 @@
          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
        },
        "@babel/highlight": {
-          "version": "7.16.10",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-          "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
+          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
          "requires": {
            "@babel/helper-validator-identifier": "^7.16.7",
            "chalk": "^2.0.0",
@@ -120,22 +129,22 @@
          }
        },
        "@babel/parser": {
-          "version": "7.17.8",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz",
-          "integrity": "sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
+          "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg=="
        },
        "@babel/traverse": {
-          "version": "7.17.3",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
-          "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
+          "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
          "requires": {
            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.3",
+            "@babel/generator": "^7.17.9",
            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.16.7",
+            "@babel/helper-function-name": "^7.17.9",
            "@babel/helper-hoist-variables": "^7.16.7",
            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.3",
+            "@babel/parser": "^7.17.9",
            "@babel/types": "^7.17.0",
            "debug": "^4.1.0",
            "globals": "^11.1.0"
@@ -160,6 +169,11 @@
            "supports-color": "^5.3.0"
          }
        },
+        "json5": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+        },
        "semver": {
          "version": "6.3.0",
          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -418,12 +432,12 @@
      }
    },
    "@babel/helpers": {
-      "version": "7.17.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz",
-      "integrity": "sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==",
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
+      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
      "requires": {
        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
+        "@babel/traverse": "^7.17.9",
        "@babel/types": "^7.17.0"
      },
      "dependencies": {
@@ -436,24 +450,33 @@
          }
        },
        "@babel/generator": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
-          "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
+          "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
          "requires": {
            "@babel/types": "^7.17.0",
            "jsesc": "^2.5.1",
            "source-map": "^0.5.0"
          }
        },
+        "@babel/helper-function-name": {
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+          "requires": {
+            "@babel/template": "^7.16.7",
+            "@babel/types": "^7.17.0"
+          }
+        },
        "@babel/helper-validator-identifier": {
          "version": "7.16.7",
          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
        },
        "@babel/highlight": {
-          "version": "7.16.10",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-          "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
+          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
          "requires": {
            "@babel/helper-validator-identifier": "^7.16.7",
            "chalk": "^2.0.0",
@@ -461,22 +484,22 @@
          }
        },
        "@babel/parser": {
-          "version": "7.17.8",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz",
-          "integrity": "sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
+          "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg=="
        },
        "@babel/traverse": {
-          "version": "7.17.3",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
-          "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
+          "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
          "requires": {
            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.3",
+            "@babel/generator": "^7.17.9",
            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.16.7",
+            "@babel/helper-function-name": "^7.17.9",
            "@babel/helper-hoist-variables": "^7.16.7",
            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.3",
+            "@babel/parser": "^7.17.9",
            "@babel/types": "^7.17.0",
            "debug": "^4.1.0",
            "globals": "^11.1.0"
@@ -10794,9 +10817,9 @@
      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
    },
    "nconf": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.11.3.tgz",
-      "integrity": "sha512-iYsAuDS9pzjVMGIzJrGE0Vk3Eh8r/suJanRAnWGBd29rVS2XtSgzcAo5l6asV3e4hH2idVONHirg1efoBOslBg==",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.11.4.tgz",
+      "integrity": "sha512-YaDR846q11JnG1vTrhJ0QIlhiGY6+W1bgWtReG9SS3vkTl3AoNwFvUItdhG6/ZjGCfWpUVuRTNEBTDAQ3nWhGw==",
      "requires": {
        "async": "^1.4.0",
        "ini": "^2.0.0",
@@ -10805,9 +10828,9 @@
      },
      "dependencies": {
        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
        },
        "ansi-styles": {
          "version": "4.3.0",
@@ -10856,11 +10879,11 @@
          "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="
        },
        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
          "requires": {
-            "ansi-regex": "^5.0.0"
+            "ansi-regex": "^5.0.1"
          }
        },
        "wrap-ansi": {
@@ -13779,12 +13802,12 @@
      }
    },
    "stripe": {
-      "version": "8.212.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.212.0.tgz",
-      "integrity": "sha512-xQ2uPMRAmRyOiMZktw3hY8jZ8LFR9lEQRPEaQ5WcDcn51kMyn46GeikOikxiFTHEN8PeKRdwtpz4yNArAvu/Kg==",
+      "version": "8.216.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.216.0.tgz",
+      "integrity": "sha512-LY8cNGizEnklIa4T82l6mZW0HS4cfzo1hNuhT+ZR9PBkmYcSUbg3ilUBVF0FCd4RP+NA44VEVfoSTTZ1Gg5+rQ==",
      "requires": {
        "@types/node": ">=8.1.0",
-        "qs": "^6.6.0"
+        "qs": "^6.10.3"
      },
      "dependencies": {
        "qs": {
@@ -15490,9 +15513,9 @@
      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="
    },
    "winston": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz",
-      "integrity": "sha512-9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz",
+      "integrity": "sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==",
      "requires": {
        "@dabh/diagnostics": "^2.0.2",
        "async": "^3.2.3",
@@ -1,10 +1,10 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.227.0",
+  "version": "4.228.2",
  "main": "./website/server/index.js",
  "dependencies": {
-    "@babel/core": "^7.17.8",
+    "@babel/core": "^7.17.9",
    "@babel/preset-env": "^7.16.11",
    "@babel/register": "^7.17.7",
    "@google-cloud/trace-agent": "^5.1.6",
@@ -51,7 +51,7 @@
    "moment-recur": "^1.0.7",
    "mongoose": "^5.13.7",
    "morgan": "^1.10.0",
-    "nconf": "^0.11.3",
+    "nconf": "^0.11.4",
    "node-gcm": "^1.0.5",
    "on-headers": "^1.0.2",
    "passport": "^0.5.0",
@@ -67,14 +67,14 @@
    "remove-markdown": "^0.3.0",
    "rimraf": "^3.0.2",
    "short-uuid": "^4.2.0",
-    "stripe": "^8.212.0",
+    "stripe": "^8.216.0",
    "superagent": "^7.1.2",
    "universal-analytics": "^0.5.3",
    "useragent": "^2.1.9",
    "uuid": "^8.3.2",
    "validator": "^13.7.0",
    "vinyl-buffer": "^1.0.1",
-    "winston": "^3.6.0",
+    "winston": "^3.7.2",
    "winston-loggly-bulk": "^3.2.1",
    "xml2js": "^0.4.23"
  },
@@ -1,3 +1,4 @@
+import { v4 as generateUUID } from 'uuid';
 import {
  generateUser,
  requester,
@@ -9,15 +10,18 @@ describe('GET /user/auth/apple', () => {
  let api;
  let user;
  const appleEndpoint = '/user/auth/apple';
-
-  before(async () => {
-    const expectedResult = { id: 'appleId', name: 'an apple user' };
-    sandbox.stub(appleAuth, 'appleProfile').returns(Promise.resolve(expectedResult));
-  });
+  let randomAppleId = '123456';

  beforeEach(async () => {
    api = requester();
    user = await generateUser();
+    randomAppleId = generateUUID();
+    const expectedResult = { id: randomAppleId, name: 'an apple user' };
+    sandbox.stub(appleAuth, 'appleProfile').returns(Promise.resolve(expectedResult));
+  });
+
+  afterEach(async () => {
+    appleAuth.appleProfile.restore();
  });

  it('registers a new user', async () => {
@@ -26,7 +30,7 @@ describe('GET /user/auth/apple', () => {
    expect(response.apiToken).to.exist;
    expect(response.id).to.exist;
    expect(response.newUser).to.be.true;
-    await expect(getProperty('users', response.id, 'auth.apple.id')).to.eventually.equal('appleId');
+    await expect(getProperty('users', response.id, 'auth.apple.id')).to.eventually.equal(randomAppleId);
    await expect(getProperty('users', response.id, 'profile.name')).to.eventually.equal('an apple user');
  });

@@ -1,4 +1,5 @@
 import passport from 'passport';
+import { v4 as generateUUID } from 'uuid';
 import {
  generateUser,
  requester,
@@ -10,14 +11,15 @@ describe('POST /user/auth/social', () => {
  let api;
  let user;
  const endpoint = '/user/auth/social';
-  const randomAccessToken = '123456';
-  const facebookId = 'facebookId';
-  const googleId = 'googleId';
+  let randomAccessToken = '123456';
+  let randomFacebookId = 'facebookId';
+  let randomGoogleId = 'googleId';
  let network = 'NoNetwork';

  beforeEach(async () => {
    api = requester();
    user = await generateUser();
+    randomAccessToken = generateUUID();
  });

  it('fails if network is not supported', async () => {
@@ -32,12 +34,23 @@ describe('POST /user/auth/social', () => {
  });

  describe('facebook', () => {
-    before(async () => {
-      const expectedResult = { id: facebookId, displayName: 'a facebook user' };
+    beforeEach(async () => {
+      randomFacebookId = generateUUID();
+      const expectedResult = {
+        id: randomFacebookId,
+        displayName: 'a facebook user',
+        emails: [
+          { value: `${user.auth.local.username}+facebook@example.com` },
+        ],
+      };
      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
      network = 'facebook';
    });

+    afterEach(async () => {
+      passport._strategies.facebook.userProfile.restore();
+    });
+
    it('registers a new user', async () => {
      const response = await api.post(endpoint, {
        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
@@ -51,7 +64,8 @@ describe('POST /user/auth/social', () => {

      await expect(getProperty('users', response.id, 'profile.name')).to.eventually.equal('a facebook user');
      await expect(getProperty('users', response.id, 'auth.local.lowerCaseUsername')).to.exist;
-      await expect(getProperty('users', response.id, 'auth.facebook.id')).to.eventually.equal(facebookId);
+      await expect(getProperty('users', response.id, 'auth.local.email')).to.eventually.equal(`${user.auth.local.username}+facebook@example.com`);
+      await expect(getProperty('users', response.id, 'auth.facebook.id')).to.eventually.equal(randomFacebookId);
    });

    it('logs an existing user in', async () => {
@@ -68,6 +82,57 @@ describe('POST /user/auth/social', () => {
      expect(response.apiToken).to.eql(registerResponse.apiToken);
      expect(response.id).to.eql(registerResponse.id);
      expect(response.newUser).to.be.false;
+      expect(registerResponse.newUser).to.be.true;
+    });
+
+    it('logs an existing user in if they have local auth with matching email', async () => {
+      passport._strategies.facebook.userProfile.restore();
+      const expectedResult = {
+        id: randomFacebookId,
+        displayName: 'a facebook user',
+        emails: [
+          { value: user.auth.local.email },
+        ],
+      };
+      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
+
+      const response = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.eql(user.apiToken);
+      expect(response.id).to.eql(user._id);
+      expect(response.newUser).to.be.false;
+    });
+
+    it('logs an existing user into their social account if they have local auth with matching email', async () => {
+      const registerResponse = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+      expect(registerResponse.newUser).to.be.true;
+      // This is important for existing accounts before the new social handling
+      passport._strategies.facebook.userProfile.restore();
+      const expectedResult = {
+        id: randomFacebookId,
+        displayName: 'a facebook user',
+        emails: [
+          { value: user.auth.local.email },
+        ],
+      };
+      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
+
+      const response = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.eql(registerResponse.apiToken);
+      expect(response.id).to.eql(registerResponse.id);
+      expect(response.apiToken).not.to.eql(user.apiToken);
+      expect(response.id).not.to.eql(user._id);
+      expect(response.newUser).to.be.false;
    });

    it('add social auth to an existing user', async () => {
@@ -76,11 +141,28 @@ describe('POST /user/auth/social', () => {
        network,
      });

-      expect(response.apiToken).to.exist;
-      expect(response.id).to.exist;
+      expect(response.apiToken).to.eql(user.apiToken);
+      expect(response.id).to.eql(user._id);
      expect(response.newUser).to.be.false;
    });

+    it('does not log into other account if social auth already exists', async () => {
+      const registerResponse = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+      expect(registerResponse.newUser).to.be.true;
+
+      await expect(user.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      })).to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('socialAlreadyExists'),
+      });
+    });
+
    xit('enrolls a new user in an A/B test', async () => {
      await api.post(endpoint, {
        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
@@ -92,12 +174,23 @@ describe('POST /user/auth/social', () => {
  });

  describe('google', () => {
-    before(async () => {
-      const expectedResult = { id: googleId, displayName: 'a google user' };
+    beforeEach(async () => {
+      randomGoogleId = generateUUID();
+      const expectedResult = {
+        id: randomGoogleId,
+        displayName: 'a google user',
+        emails: [
+          { value: `${user.auth.local.username}+google@example.com` },
+        ],
+      };
      sandbox.stub(passport._strategies.google, 'userProfile').yields(null, expectedResult);
      network = 'google';
    });

+    afterEach(async () => {
+      passport._strategies.google.userProfile.restore();
+    });
+
    it('registers a new user', async () => {
      const response = await api.post(endpoint, {
        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
@@ -107,7 +200,8 @@ describe('POST /user/auth/social', () => {
      expect(response.apiToken).to.exist;
      expect(response.id).to.exist;
      expect(response.newUser).to.be.true;
-      await expect(getProperty('users', response.id, 'auth.google.id')).to.eventually.equal(googleId);
+      await expect(getProperty('users', response.id, 'auth.google.id')).to.eventually.equal(randomGoogleId);
+      await expect(getProperty('users', response.id, 'auth.local.email')).to.eventually.equal(`${user.auth.local.username}+google@example.com`);
      await expect(getProperty('users', response.id, 'profile.name')).to.eventually.equal('a google user');
    });

@@ -125,6 +219,57 @@ describe('POST /user/auth/social', () => {
      expect(response.apiToken).to.eql(registerResponse.apiToken);
      expect(response.id).to.eql(registerResponse.id);
      expect(response.newUser).to.be.false;
+      expect(registerResponse.newUser).to.be.true;
+    });
+
+    it('logs an existing user in if they have local auth with matching email', async () => {
+      passport._strategies.google.userProfile.restore();
+      const expectedResult = {
+        id: randomGoogleId,
+        displayName: 'a google user',
+        emails: [
+          { value: user.auth.local.email },
+        ],
+      };
+      sandbox.stub(passport._strategies.google, 'userProfile').yields(null, expectedResult);
+
+      const response = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.eql(user.apiToken);
+      expect(response.id).to.eql(user._id);
+      expect(response.newUser).to.be.false;
+    });
+
+    it('logs an existing user into their social account if they have local auth with matching email', async () => {
+      const registerResponse = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+      expect(registerResponse.newUser).to.be.true;
+      // This is important for existing accounts before the new social handling
+      passport._strategies.google.userProfile.restore();
+      const expectedResult = {
+        id: randomGoogleId,
+        displayName: 'a google user',
+        emails: [
+          { value: user.auth.local.email },
+        ],
+      };
+      sandbox.stub(passport._strategies.google, 'userProfile').yields(null, expectedResult);
+
+      const response = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+
+      expect(response.apiToken).to.eql(registerResponse.apiToken);
+      expect(response.id).to.eql(registerResponse.id);
+      expect(response.apiToken).not.to.eql(user.apiToken);
+      expect(response.id).not.to.eql(user._id);
+      expect(response.newUser).to.be.false;
    });

    it('add social auth to an existing user', async () => {
@@ -133,11 +278,28 @@ describe('POST /user/auth/social', () => {
        network,
      });

-      expect(response.apiToken).to.exist;
-      expect(response.id).to.exist;
+      expect(response.apiToken).to.eql(user.apiToken);
+      expect(response.id).to.eql(user._id);
      expect(response.newUser).to.be.false;
    });

+    it('does not log into other account if social auth already exists', async () => {
+      const registerResponse = await api.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      });
+      expect(registerResponse.newUser).to.be.true;
+
+      await expect(user.post(endpoint, {
+        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
+        network,
+      })).to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('socialAlreadyExists'),
+      });
+    });
+
    xit('enrolls a new user in an A/B test', async () => {
      await api.post(endpoint, {
        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
@@ -1,6 +1,6 @@
 import moment from 'moment';

-import { startOfDay, daysSince } from '../../../website/common/script/cron';
+import { startOfDay, daysSince, getPlanContext } from '../../../website/common/script/cron';

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

 export const userStyles = {
  contributor: {
@@ -82,3 +83,25 @@ export const userStyles = {
    classSelected: true,
  },
 };
+
+
+export function mockStore ({
+  userData,
+  ...state
+}) {
+  return {
+    getters,
+    dispatch: () => {
+    },
+    watch: () => {
+    },
+    state: {
+      user: {
+        data: {
+          ...userData,
+        },
+      },
+      ...state,
+    },
+  };
+}
@@ -1,36 +1,46 @@
 .quest_lostMasterclasser4 {
-  background: url("~@/assets/images/animated/quest_lostMasterclasser4.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_lostMasterclasser4.gif") no-repeat;
  width: 219px;
  height: 219px;
 }

 .quest_windup {
-  background: url("~@/assets/images/animated/quest_windup.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_windup.gif") no-repeat;
  width: 219px;
  height: 219px;
 }

 .quest_solarSystem {
-  background: url("~@/assets/images/animated/quest_solarSystem.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_solarSystem.gif") no-repeat;
  width: 219px;
  height: 219px;
 }

-.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup {
+.quest_virtualpet {
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_virtualpet.gif") no-repeat;
+  width: 219px;
+  height: 219px;
+}
+
+.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet {
  width: 68px;
  height: 68px;
 }

 .Pet_HatchingPotion_Dessert {
-  background: url("~@/assets/images/animated/Pet_HatchingPotion_Dessert.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Dessert.gif") no-repeat;
 }

 .Pet_HatchingPotion_Veggie {
-  background: url("~@/assets/images/animated/Pet_HatchingPotion_Veggie.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Veggie.gif") no-repeat;
 }

 .Pet_HatchingPotion_Windup {
-  background: url("~@/assets/images/animated/Pet_HatchingPotion_Windup.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Windup.gif") no-repeat;
+}
+
+.Pet_HatchingPotion_VirtualPet {
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_VirtualPet.gif") no-repeat;
 }

 .Gems {
@@ -68,7 +78,7 @@

 /* Critical */
 .weapon_special_critical {
-  background: url("~@/assets/images/animated/weapon_special_critical.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_critical.gif") no-repeat;
  width: 90px;
  height: 90px;
  margin-left:-12px;
@@ -85,32 +95,32 @@
 }

 .head_special_0 {
-  background: url("~@/assets/images/animated/BackerOnly-Equip-ShadeHelmet.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-ShadeHelmet.gif") no-repeat;
 }
 .head_special_1 {
-  background: url("~@/assets/images/animated/ContributorOnly-Equip-CrystalHelmet.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/ContributorOnly-Equip-CrystalHelmet.gif") no-repeat;
  margin-top: 3px;
 }

 .broad_armor_special_0,.slim_armor_special_0 {
-  background: url("~@/assets/images/animated/BackerOnly-Equip-ShadeArmor.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-ShadeArmor.gif") no-repeat;
 }
 .broad_armor_special_1,.slim_armor_special_1 {
-  background: url("~@/assets/images/animated/ContributorOnly-Equip-CrystalArmor.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/ContributorOnly-Equip-CrystalArmor.gif") no-repeat;
 }

 .shield_special_0 {
-  background: url("~@/assets/images/animated/BackerOnly-Shield-TormentedSkull.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Shield-TormentedSkull.gif") no-repeat;
 }

 .weapon_special_0 {
-  background: url("~@/assets/images/animated/BackerOnly-Weapon-DarkSoulsBlade.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Weapon-DarkSoulsBlade.gif") no-repeat;
 }

 .Pet-Wolf-Cerberus {
  width: 105px;
  height: 72px;
-  background: url("~@/assets/images/animated/BackerOnly-Pet-CerberusPup.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Pet-CerberusPup.gif") no-repeat;
 }

 .broad_armor_special_ks2019, .slim_armor_special_ks2019, .eyewear_special_ks2019, .head_special_ks2019, .shield_special_ks2019 {
@@ -119,29 +129,29 @@
 }

 .broad_armor_special_ks2019, .slim_armor_special_ks2019 {
-  background: url("~@/assets/images/animated/BackerOnly-Equip-MythicGryphonArmor.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonArmor.gif") no-repeat;
 }

 .eyewear_special_ks2019 {
-  background: url("~@/assets/images/animated/BackerOnly-Equip-MythicGryphonVisor.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonVisor.gif") no-repeat;
 }

 .head_special_ks2019 {
-  background: url("~@/assets/images/animated/BackerOnly-Equip-MythicGryphonHelm.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonHelm.gif") no-repeat;
 }

 .shield_special_ks2019 {
-  background: url("~@/assets/images/animated/BackerOnly-Equip-MythicGryphonShield.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonShield.gif") no-repeat;
 }

 .weapon_special_ks2019 {
-  background: url("~@/assets/images/animated/BackerOnly-Equip-MythicGryphonGlaive.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Equip-MythicGryphonGlaive.gif") no-repeat;
  width: 120px;
  height: 120px;
 }

 .Pet-Gryphon-Gryphatrice {
-  background: url("~@/assets/images/animated/BackerOnly-Pet-Gryphatrice.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Pet-Gryphatrice.gif") no-repeat;
  width: 81px;
  height: 99px;
 }
@@ -152,11 +162,11 @@
 }

 .Mount_Head_Gryphon-Gryphatrice {
-  background: url("~@/assets/images/animated/BackerOnly-Mount-Head-Gryphatrice.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Mount-Head-Gryphatrice.gif") no-repeat;
 }

 .Mount_Body_Gryphon-Gryphatrice {
-  background: url("~@/assets/images/animated/BackerOnly-Mount-Body-Gryphatrice.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/BackerOnly-Mount-Body-Gryphatrice.gif") no-repeat;
 }

 .background_airship, .background_clocktower, .background_steamworks {
@@ -165,15 +175,15 @@
 }

 .background_airship {
-  background: url("~@/assets/images/animated/background_airship.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_airship.gif") no-repeat;
 }

 .background_clocktower {
-  background: url("~@/assets/images/animated/background_clocktower.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_clocktower.gif") no-repeat;
 }

 .background_steamworks {
-  background: url("~@/assets/images/animated/background_steamworks.gif") no-repeat;
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_steamworks.gif") no-repeat;
 }

 /* FIXME figure out how to handle customize menu!!
@@ -33648,6 +33648,11 @@
  width: 68px;
  height: 68px;
 }
+.inventory_quest_scroll_virtualpet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_virtualpet.png');
+  width: 68px;
+  height: 68px;
+}
 .inventory_quest_scroll_waffle {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_waffle.png');
  width: 68px;
@@ -50113,8 +50118,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-BearCub-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Virtual.png');
+.Pet-BearCub-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -50543,8 +50548,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-Cactus-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Virtual.png');
+.Pet-Cactus-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -51078,8 +51083,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-Dragon-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Virtual.png');
+.Pet-Dragon-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -51508,8 +51513,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-FlyingPig-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Virtual.png');
+.Pet-FlyingPig-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -51793,8 +51798,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-Fox-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Virtual.png');
+.Pet-Fox-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -52463,8 +52468,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-LionCub-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Virtual.png');
+.Pet-LionCub-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -52963,8 +52968,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-PandaCub-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Virtual.png');
+.Pet-PandaCub-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -54208,8 +54213,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-TigerCub-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Virtual.png');
+.Pet-TigerCub-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -54808,8 +54813,8 @@
  width: 81px;
  height: 99px;
 }
-.Pet-Wolf-Virtual {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Virtual.png');
+.Pet-Wolf-VirtualPet {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-VirtualPet.png');
  width: 81px;
  height: 99px;
 }
@@ -19,7 +19,7 @@
  top: -16px !important;
 }

-.Pet.Pet-FlyingPig-Veggie, .Pet.Pet-FlyingPig-Dessert, .Pet.Pet-FlyingPig-Virtual {
+.Pet.Pet-FlyingPig-Veggie, .Pet.Pet-FlyingPig-Dessert, .Pet.Pet-FlyingPig-VirtualPet {
  top: -28px !important;
 }

@@ -7,7 +7,7 @@ import { setup as setupPayments } from '@/libs/payments';

 setupPayments();

-storiesOf('Payments Buttons', module)
+storiesOf('Subscriptions/Payments Buttons', module)
  .add('simple', () => ({
    components: { PaymentsButtonsList },
    template: `
@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <div>
+      <h5>{{ $t('dayStartAdjustment') }}</h5>
+      <div class="mb-4">
+        {{ $t('customDayStartInfo1') }}
+      </div>
+      <h3 v-once>{{ $t('adjustment') }}</h3>
+      <div class="form-horizontal">
+        <div class="form-group">
+          <div class="">
+            <select
+              v-model="newDayStart"
+              class="form-control"
+            >
+              <option
+                v-for="option in dayStartOptions"
+                :key="option.value"
+                :value="option.value"
+              >
+                {{ option.name }}
+              </option>
+            </select>
+          </div>
+          <div>
+            <button
+              class="btn btn-primary full-width mt-3"
+              :disabled="newDayStart === user.preferences.dayStart"
+              @click="openDayStartModal()"
+            >
+              {{ $t('save') }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-horizontal">
+      <div class="form-group">
+        <small>
+          <p v-html="$t('timezoneUTC', {utc: timezoneOffsetToUtc})"></p>
+          <p v-html="$t('timezoneInfo')"></p>
+        </small>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios';
+import moment from 'moment';
+import getUtcOffset from '../../../../common/script/fns/getUtcOffset';
+import { mapState } from '@/libs/store';
+
+export default {
+  name: 'dayStartAdjustment',
+  data () {
+    const dayStartOptions = [];
+    for (let number = 0; number <= 12; number += 1) {
+      const meridian = number < 12 ? 'AM' : 'PM';
+      const hour = number % 12;
+      const timeWithMeridian = `(${hour || 12}:00 ${meridian})`;
+      const option = {
+        value: number,
+        name: `+${number} hours ${timeWithMeridian}`,
+      };
+
+      if (number === 0) {
+        option.name = `Default ${timeWithMeridian}`;
+      }
+
+      dayStartOptions.push(option);
+    }
+
+    return {
+      newDayStart: 0,
+      dayStartOptions,
+    };
+  },
+  mounted () {
+    this.newDayStart = this.user.preferences.dayStart;
+  },
+  computed: {
+    ...mapState({
+      user: 'user.data',
+    }),
+    timezoneOffsetToUtc () {
+      const offsetString = moment().utcOffset(getUtcOffset(this.user)).format('Z');
+      return `UTC${offsetString}`;
+    },
+    dayStart () {
+      return this.user.preferences.dayStart;
+    },
+  },
+  methods: {
+    async saveDayStart () {
+      this.user.preferences.dayStart = this.newDayStart;
+      await axios.post('/api/v4/user/custom-day-start', {
+        dayStart: this.newDayStart,
+      });
+      // @TODO
+      // Notification.text(response.data.data.message);
+    },
+    openDayStartModal () {
+      const nextCron = this.calculateNextCron();
+      // @TODO: Add generic modal
+      if (!window.confirm(this.$t('sureChangeCustomDayStartTime', { time: nextCron }))) return; // eslint-disable-line no-alert
+      this.saveDayStart();
+      // $rootScope.openModal('change-day-start', { scope: $scope });
+    },
+    calculateNextCron () {
+      let nextCron = moment()
+        .hours(this.newDayStart)
+        .minutes(0)
+        .seconds(0)
+        .milliseconds(0);
+
+      const currentHour = moment().format('H');
+      if (currentHour >= this.newDayStart) {
+        nextCron = nextCron.add(1, 'day');
+      }
+
+      return nextCron.format(`${this.user.preferences.dateFormat.toUpperCase()} @ h:mm a`);
+    },
+  },
+};
+</script>
+
+<style scoped>
+  .full-width {
+    width: 100%;
+  }
+</style>
@@ -213,49 +213,7 @@
          {{ $t('enableClass') }}
        </button>
        <hr>
-        <div>
-          <h5>{{ $t('customDayStart') }}</h5>
-          <div class="alert alert-warning">
-            {{ $t('customDayStartInfo1') }}
-          </div>
-          <div class="form-horizontal">
-            <div class="form-group">
-              <div class="col-7">
-                <select
-                  v-model="newDayStart"
-                  class="form-control"
-                >
-                  <option
-                    v-for="option in dayStartOptions"
-                    :key="option.value"
-                    :value="option.value"
-                  >
-                    {{ option.name }}
-                  </option>
-                </select>
-              </div>
-              <div class="col-5">
-                <button
-                  class="btn btn-block btn-primary mt-1"
-                  :disabled="newDayStart === user.preferences.dayStart"
-                  @click="openDayStartModal()"
-                >
-                  {{ $t('saveCustomDayStart') }}
-                </button>
-              </div>
-            </div>
-          </div>
-          <hr>
-        </div>
-        <h5>{{ $t('timezone') }}</h5>
-        <div class="form-horizontal">
-          <div class="form-group">
-            <div class="col-12">
-              <p v-html="$t('timezoneUTC', {utc: timezoneOffsetToUtc})"></p>
-              <p v-html="$t('timezoneInfo')"></p>
-            </div>
-          </div>
-        </div>
+        <day-start-adjustment />
      </div>
    </div>
    <div class="col-sm-6">
@@ -268,7 +226,7 @@
              :key="network.key"
            >
              <button
-                v-if="!user.auth[network.key].id"
+                v-if="!user.auth[network.key].id && network.key !== 'facebook'"
                class="btn btn-primary mb-2"
                @click="socialAuth(network.key, user)"
              >
@@ -429,7 +387,9 @@
              {{ $t('saveAndConfirm') }}
            </button>
          </div>
-          <h5>
+          <h5
+            v-if="user.auth.local.email"
+          >
            {{ $t('changeEmail') }}
          </h5>
          <div
@@ -539,25 +499,20 @@

 <style lang="scss" scoped>
  @import '~@/assets/scss/colors.scss';
-
  input {
    color: $gray-50;
  }
-
  .usersettings h5 {
    margin-top: 1em;
  }
-
  .iconalert > div > span {
    line-height: 25px;
  }
-
  .iconalert > div:after {
    clear: both;
    content: '';
    display: table;
  }
-
  .input-error {
    color: $red-50;
    font-size: 90%;
@@ -568,16 +523,15 @@

 <script>
 import hello from 'hellojs';
-import moment from 'moment';
 import axios from 'axios';
 import debounce from 'lodash/debounce';
 import { mapState } from '@/libs/store';
 import restoreModal from './restoreModal';
 import resetModal from './resetModal';
 import deleteModal from './deleteModal';
+import dayStartAdjustment from './dayStartAdjustment';
 import { SUPPORTED_SOCIAL_NETWORKS } from '@/../../common/script/constants';
 import changeClass from '@/../../common/script/ops/changeClass';
-import getUtcOffset from '@/../../common/script/fns/getUtcOffset';
 import notificationsMixin from '../../mixins/notifications';
 import sounds from '../../libs/sounds';
 import { buildAppleAuthUrl } from '../../libs/auth';
@@ -590,27 +544,15 @@ export default {
    restoreModal,
    resetModal,
    deleteModal,
+    dayStartAdjustment,
  },
  mixins: [notificationsMixin],
  data () {
-    const dayStartOptions = [];
-    for (let number = 0; number < 24; number += 1) {
-      const meridian = number < 12 ? 'AM' : 'PM';
-      const hour = number % 12;
-      const option = {
-        value: number,
-        name: `${hour || 12}:00 ${meridian}`,
-      };
-      dayStartOptions.push(option);
-    }
-
    return {
      SOCIAL_AUTH_NETWORKS: [],
      party: {},
      // Made available by the server as a script
      availableFormats: ['MM/dd/yyyy', 'dd/MM/yyyy', 'yyyy/MM/dd'],
-      dayStartOptions,
-      newDayStart: 0,
      temporaryDisplayName: '',
      usernameUpdates: { username: '' },
      emailUpdates: {},
@@ -634,13 +576,6 @@ export default {
    availableAudioThemes () {
      return ['off', ...this.content.audioThemes];
    },
-    timezoneOffsetToUtc () {
-      const offsetString = moment().utcOffset(getUtcOffset(this.user)).format('Z');
-      return `UTC${offsetString}`;
-    },
-    dayStart () {
-      return this.user.preferences.dayStart;
-    },
    hasClass () {
      return this.$store.getters['members:hasClass'](this.user);
    },
@@ -690,7 +625,6 @@ export default {
    this.SOCIAL_AUTH_NETWORKS = SUPPORTED_SOCIAL_NETWORKS;
    // @TODO: We may need to request the party here
    this.party = this.$store.state.party;
-    this.newDayStart = this.user.preferences.dayStart;
    this.usernameUpdates.username = this.user.auth.local.username || null;
    this.temporaryDisplayName = this.user.profile.name;
    this.emailUpdates.newEmail = this.user.auth.local.email || null;
@@ -790,32 +724,6 @@ export default {
        return false;
      });
    },
-    calculateNextCron () {
-      let nextCron = moment().hours(this.newDayStart).minutes(0).seconds(0)
-        .milliseconds(0);
-
-      const currentHour = moment().format('H');
-      if (currentHour >= this.newDayStart) {
-        nextCron = nextCron.add(1, 'day');
-      }
-
-      return nextCron.format(`${this.user.preferences.dateFormat.toUpperCase()} @ h:mm a`);
-    },
-    openDayStartModal () {
-      const nextCron = this.calculateNextCron();
-      // @TODO: Add generic modal
-      if (!window.confirm(this.$t('sureChangeCustomDayStartTime', { time: nextCron }))) return; // eslint-disable-line no-alert
-      this.saveDayStart();
-      // $rootScope.openModal('change-day-start', { scope: $scope });
-    },
-    async saveDayStart () {
-      this.user.preferences.dayStart = this.newDayStart;
-      await axios.post('/api/v4/user/custom-day-start', {
-        dayStart: this.newDayStart,
-      });
-      // @TODO
-      // Notification.text(response.data.data.message);
-    },
    async changeLanguage (e) {
      const newLang = e.target.value;
      this.user.preferences.language = newLang;
@@ -857,12 +765,10 @@ export default {
      if (network === 'apple') {
        window.location.href = buildAppleAuthUrl();
      } else {
-        const auth = await hello(network).login({ scope: 'email', options: { force: true } });
-
+        const auth = await hello(network).login({ scope: 'email' });
        await this.$store.dispatch('auth:socialAuth', {
          auth,
        });
-
        window.location.href = '/';
      }
    },
@@ -880,8 +786,7 @@ export default {
        this.localAuth.email = this.user.auth.local.email;
      }
      await axios.post('/api/v4/user/auth/local/register', this.localAuth);
-      window.alert(this.$t('addedLocalAuth')); // eslint-disable-line no-alert
-      window.location.href = '/';
+      window.location.href = '/user/settings/site';
    },
    restoreEmptyUsername () {
      if (this.usernameUpdates.username.length < 1) {
@@ -0,0 +1,37 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { storiesOf } from '@storybook/vue';
+
+import Subscription from './subscription.vue';
+import { mockStore } from '../../../config/storybook/mock.data';
+
+storiesOf('Subscriptions/Detail Page', module)
+  .add('subscribed', () => ({
+    components: { Subscription },
+    template: `
+      <div style="position: absolute; margin: 20px">
+        <subscription ></subscription>
+      </div>
+    `,
+    data () {
+      return {
+      };
+    },
+    store: mockStore({
+      userData: {
+        purchased: {
+          plan: {
+            customerId: 'customer-id',
+            planId: 'plan-id',
+            subscriptionId: 'sub-id',
+            gemsBought: 22,
+            dateUpdated: new Date(2021, 0, 15),
+            consecutive: {
+              count: 2,
+              gemCapExtra: 4,
+              offset: 2,
+            },
+          },
+        },
+      },
+    }),
+  }));
@@ -93,7 +93,7 @@
      <div class="subscribe-card mx-auto">
        <div
          v-if="hasSubscription && !hasCanceledSubscription"
-          class="d-flex flex-column align-items-center my-4"
+          class="d-flex flex-column align-items-center"
        >
          <div class="round-container bg-green-10 d-flex align-items-center justify-content-center">
            <div
@@ -102,7 +102,7 @@
              v-html="icons.checkmarkIcon"
            ></div>
          </div>
-          <h2 class="green-10 mx-auto">
+          <h2 class="green-10 mx-auto mb-75">
            {{ $t('youAreSubscribed') }}
          </h2>
          <div
@@ -180,17 +180,17 @@
        </div>
        <div
          v-if="hasSubscription"
-          class="bg-gray-700 p-2 text-center"
+          class="bg-gray-700 py-3 mt-4 mb-3 text-center"
        >
          <div class="header-mini mb-3">
            {{ $t('subscriptionStats') }}
          </div>
-          <div class="d-flex justify-content-around">
-            <div class="ml-4 mr-3">
+          <div class="d-flex">
+            <div class="stat-column">
              <div class="d-flex justify-content-center align-items-center">
                <div
                  v-once
-                  class="svg-icon svg-calendar mr-2"
+                  class="svg-icon svg-calendar mr-1"
                  v-html="icons.calendarIcon"
                >
                </div>
@@ -204,49 +204,53 @@
              </div>
            </div>
            <div class="stats-spacer"></div>
-            <div>
+            <div class="stat-column">
              <div class="d-flex justify-content-center align-items-center">
                <div
                  v-once
-                  class="svg-icon svg-gem mr-2"
+                  class="svg-icon svg-gem mr-1"
                  v-html="icons.gemIcon"
                >
                </div>
                <div class="number-heavy">
-                  {{ user.purchased.plan.consecutive.gemCapExtra }}
+                  {{ gemCap }}
                </div>
              </div>
              <div class="stats-label">
-                {{ $t('gemCapExtra') }}
+                {{ $t('gemCap') }}
              </div>
            </div>
            <div class="stats-spacer"></div>
-            <div>
+            <div class="stat-column">
              <div class="d-flex justify-content-center align-items-center">
                <div
                  v-once
-                  class="svg-icon svg-hourglass mt-1 mr-2"
+                  class="svg-icon svg-hourglass mt-1 mr-1"
                  v-html="icons.hourglassIcon"
                >
                </div>
                <div class="number-heavy">
-                  {{ user.purchased.plan.consecutive.trinkets }}
+                  {{ nextHourGlass }}
                </div>
              </div>
              <div class="stats-label">
-                {{ $t('mysticHourglassesTooltip') }}
+                {{ $t('nextHourglass') }}*
              </div>
            </div>
          </div>
+
+          <div class="mt-4 nextHourglassDescription" v-once>
+            *{{ $t('nextHourglassDescription') }}
+          </div>
        </div>
-        <div class="d-flex flex-column justify-content-center align-items-center mt-4 mb-3">
+        <div class="d-flex flex-column justify-content-center align-items-center mb-3">
          <div
            v-once
-            class="svg-icon svg-heart mb-1"
+            class="svg-icon svg-heart mb-2"
            v-html="icons.heartIcon"
          >
          </div>
-          <div class="stats-label">
+          <div class="thanks-for-support">
            {{ $t('giftSubscriptionText4') }}
          </div>
        </div>
@@ -350,7 +354,7 @@
  .cancel-card {
    width: 28rem;
    border: 2px solid $gray-500;
-    border-radius: 4px;
+    border-radius: 8px;
  }

  .disabled {
@@ -405,7 +409,10 @@
  }

  .number-heavy {
-    font-size: 24px;
+    font-size: 20px;
+    font-weight: bold;
+    line-height: 1.4;
+    color: $gray-50;
  }

  .Pet-Jackalope-RoyalPurple {
@@ -423,7 +430,10 @@

  .stats-label {
    font-size: 12px;
-    color: $gray-200;
+    color: $gray-100;
+    margin-top: 6px;
+    font-weight: bold;
+    line-height: 1.33;
  }

  .stats-spacer {
@@ -433,8 +443,9 @@
  }

  .subscribe-card {
+    padding-top: 2rem;
    width: 28rem;
-    border-radius: 4px;
+    border-radius: 8px;
    box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
    background-color: $white;
  }
@@ -452,7 +463,14 @@
    height: 40px;
  }

-  .svg-calendar, .svg-heart {
+  .svg-calendar {
+    width: 24px;
+    height: 24px;
+
+    margin-right: 2px;
+  }
+
+  .svg-heart {
    width: 24px;
    height: 24px;
  }
@@ -479,8 +497,10 @@
  }

  .svg-gem {
-    width: 32px;
-    height: 28px;
+    width: 24px;
+    height: 24px;
+
+    margin-right: 2px;
  }

  .svg-gems {
@@ -494,8 +514,10 @@
  }

  .svg-hourglass {
-    width: 28px;
-    height: 28px;
+    width: 24px;
+    height: 24px;
+
+    margin-right: 2px;
  }

  .svg-gift-box {
@@ -521,11 +543,34 @@
  .w-55 {
    width: 55%;
  }
+
+  .nextHourglassDescription {
+    font-size: 12px;
+    font-style: italic;
+    line-height: 1.33;
+    color: $gray-100;
+    margin-left: 100px;
+    margin-right: 100px;
+  }
+
+  .justify-content-evenly {
+    justify-content: space-evenly;
+  }
+
+  .thanks-for-support {
+    font-size: 12px;
+    line-height: 1.33;
+    text-align: center;
+    color: $gray-100;
+  }
+
+  .stat-column {
+    width: 33%;
+  }
 </style>

 <script>
 import axios from 'axios';
-import min from 'lodash/min';
 import moment from 'moment';
 import { mapState } from '@/libs/store';

@@ -551,6 +596,7 @@ import logo from '@/assets/svg/habitica-logo-purple.svg';
 import paypalLogo from '@/assets/svg/paypal-logo.svg';
 import subscriberGems from '@/assets/svg/subscriber-gems.svg';
 import subscriberHourglasses from '@/assets/svg/subscriber-hourglasses.svg';
+import { getPlanContext } from '@/../../common/script/cron';

 export default {
  components: {
@@ -649,23 +695,9 @@ export default {
        months: parseFloat(this.user.purchased.plan.extraMonths).toFixed(2),
      };
    },
-    buyGemsGoldCap () {
-      return {
-        amount: min(this.gemGoldCap),
-      };
-    },
-    gemGoldCap () {
-      const baseCap = 25;
-      const gemCapIncrement = 5;
-      const capIncrementThreshold = 3;
-      const { gemCapExtra } = this.user.purchased.plan.consecutive;
-      const blocks = subscriptionBlocks[this.subscription.key].months / capIncrementThreshold;
-      const flooredBlocks = Math.floor(blocks);
-
-      const userTotalDropCap = baseCap + gemCapExtra + flooredBlocks * gemCapIncrement;
-      const maxDropCap = 50;
-
-      return [userTotalDropCap, maxDropCap];
+    gemCap () {
+      return planGemLimits.convCap
+          + this.user.purchased.plan.consecutive.gemCapExtra;
    },
    numberOfMysticHourglasses () {
      const numberOfHourglasses = subscriptionBlocks[this.subscription.key].months / 3;
@@ -719,6 +751,16 @@ export default {
    subscriptionEndDate () {
      return moment(this.user.purchased.plan.dateTerminated).format('MM/DD/YYYY');
    },
+    nextHourGlassDate () {
+      const currentPlanContext = getPlanContext(this.user, new Date());
+
+      return currentPlanContext.nextHourglassDate;
+    },
+    nextHourGlass () {
+      const nextHourglassMonth = this.nextHourGlassDate.format('MMM');
+
+      return nextHourglassMonth;
+    },
  },
  mounted () {
    this.$store.dispatch('common:setTitle', {
@@ -117,5 +117,7 @@
    "achievementKickstarter2019Text": "من مساهمي حملة كيك-ستارتر للدبابيس",
    "achievementDomesticatedModalText": "لقد جمعت كل الحيوانات الأليفة المستأنسة!",
    "achievementDomesticatedText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة المستأنسة: النمس ، وخنزير غينيا ، والديك ، والخنزير الطائر ، والجرذ ، والأرنب ، والحصان ، والبقر!",
-    "achievementDomesticated": "ا-يا-ا-يا-يو"
+    "achievementDomesticated": "ا-يا-ا-يا-يو",
+    "achievementBirdsOfAFeatherModalText": "تقوم بجمع كل الحيوانات الأليفة الطائرة!",
+    "achievementZodiacZookeeperText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة في الأبراج: الجرذ ، البقرة ، الأرنب ، الأفعى ، الحصان ، الأغنام ، القرد ، الديك ، الذئب ، النمر ، الخنزير الطائر ، والتنين!"
 }
@@ -408,5 +408,6 @@
    "backgroundArchaeologicalDigText": "Archaeological Dig",
    "backgroundArchaeologicalDigNotes": "Unearth secrets of the ancient past at an Archaeological Dig.",
    "backgroundScribesWorkshopText": "Scribe's Workshop",
-    "backgroundScribesWorkshopNotes": "Write your next great scroll in a Scribe's Workshop."
+    "backgroundScribesWorkshopNotes": "Write your next great scroll in a Scribe's Workshop.",
+    "backgrounds022019": "مجموعة 57: تم إصدارها في فبراير 2019"
 }
@@ -118,5 +118,8 @@
    "welcome3": "تقدم في الحياة واللعبة!",
    "welcome3notes": "As you improve your life, your avatar will level up and unlock pets, quests, equipment, and more!",
    "imReady": "ادخل Habitica",
-    "limitedOffer": "Available until <%= date %>"
+    "limitedOffer": "Available until <%= date %>",
+    "nGemsGift": "<%= nGems %> الماس (هدية)",
+    "amountExp": "<%= amount %> خبرة",
+    "nGems": "<%= nGems %> الماس"
 }
@@ -68,5 +68,13 @@
    "petsFound": "إنشاء حيوانات أليفة",
    "keyToPets": "مفتاح بيوت الحيوانات",
    "noActiveMount": "لا يوجد تثبيت نشط",
-    "questPets": "بحث الحيوانات"
+    "questPets": "بحث الحيوانات",
+    "releasePetsConfirm": "هل أنت متأكد أنك تريد إطلاق سراح حيوانك الأليف القياسي؟",
+    "keyToMounts": "مفتاح بيت الحيوان",
+    "petsReleased": "أفرج عن الحيوانات الأليفة",
+    "keyToPetsDesc": "حرر جميع الحيوانات المسموح بها حتى تتمكن من جمعها مرة أخرى. (لا تتأثر بالحيوانات الأليفة والحيوانات الأليفة الغريبة.)",
+    "petName": "<%= potion(locale) %> <%= egg(locale) %>",
+    "keyToMountsDesc": "حرر جميع العينات القياسية حتى تتمكن من جمعها مرة أخرى. (لا تتأثر عمليات تثبيت المهام وعمليات التثبيت النادرة.)",
+    "keyToBoth": "مفاتيح رئيسية لبيوت الكلاب",
+    "releasePetsSuccess": "تم إطلاق حيوانك الأليف القياسي!"
 }
@@ -125,9 +125,9 @@
    "achievementShadyCustomerText": "Hat alle Schatten-Haustiere gesammelt.",
    "achievementShadyCustomer": "Der Schatten in Dir",
    "achievementZodiacZookeeper": "Tierkreiszeichen-Pfleger",
-    "achievementZodiacZookeeperText": "Hat alle Tierkreiszeichen-Tiere ausgebrütet: Ratte, Kalb, Kaninchen, Schlange, Fohlen, Schaf, Affe, Hahn, Wolf, Tiger, Fliegendes Ferkel, und Drache!",
+    "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 fliegenden Haustiere ausgebrütet: Fliegendes Ferkel, Eule, Papagei, Pterodactylus, Greif, Falke, Pfau, und Hahn.",
+    "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!"
 }
@@ -77,7 +77,7 @@
    "commGuideList09C": "Der Aufstieg in höhere Mitwirkendenstufen kann dauerhaft verwehrt (\"eingefroren\") werden",
    "commGuideHeadingModerateConsequences": "Beispiele für mittlere Konsequenzen",
    "commGuideList10A": "Beschränkte öffentliche und/oder private Chat-Berechtigungen",
-    "commGuideList10A1": "Führen Deine Handlungen zur Aufhebung Deiner Chatrechte, wird Dich ein Moderator oder Mitarbeiter per PN und/oder in dem Forum, in dem Du stummgeschaltet wurdest, über die Dauer und Gründe für das Stummschalten und/oder die Handlung, die für die Wiederherstellung Deiner Chatrechte notwendig ist, informieren. Deine Chatrechte werden wieder hergestellt, wenn Du höflich mit den erforderlichen Handlungen übereinstimmst und zustimmst, Dich fortan an die Community-Richtlinien und Nutzungsbediengungen zu halten.",
+    "commGuideList10A1": "Führen Deine Handlungen zur Aufhebung Deiner Chatrechte, wird Dich ein Moderator oder Mitarbeiter per PN und/oder in dem Forum, in dem Du stummgeschaltet wurdest, über die Dauer und Gründe für das Stummschalten und/oder die Handlung, die für die Wiederherstellung Deiner Chatrechte notwendig ist, informieren. Deine Chatrechte werden wiederhergestellt, wenn Du höflich mit den erforderlichen Handlungen übereinstimmst und zustimmst, Dich fortan an die Community-Richtlinien und Nutzungsbedingungen zu halten.",
    "commGuideList10C": "Beschränkte Berechtigung, Gilden/Herausforderungen zu gründen",
    "commGuideList10D": "Der Aufstieg in höhere Mitwirkendenstufen kann temporär verwehrt (\"eingefroren\") werden",
    "commGuideList10E": "Herabstufung von Mitwirkenden",
@@ -13,7 +13,7 @@
    "companyDonate": "Spenden",
    "forgotPassword": "Passwort vergessen?",
    "emailNewPass": "Einen Link per E-Mail senden, um das Passwort zurückzusetzen",
-    "forgotPasswordSteps": "Trage die E-Mail-Adresse ein, mit der Du Deinen Habitica-Account aktiviert hast.",
+    "forgotPasswordSteps": "Trage deinen Benutzernamen oder die E-Mail-Adresse ein, mit der Du Deinen Habitica-Account aktiviert hast.",
    "sendLink": "Link senden",
    "featuredIn": "Vorgestellt in",
    "footerDevs": "Entwickler",
@@ -129,7 +129,7 @@
    "passwordConfirmationMatch": "Die Passwörter stimmen nicht überein.",
    "invalidLoginCredentials": "Falscher Benutzername und/oder E-Mail und/oder Passwort.",
    "passwordResetPage": "Passwort zurücksetzen",
-    "passwordReset": "Wenn wir Deine E-Mail-Adresse kennen, wurden Anweisungen zum Passwort-Zurücksetzen dorthin verschickt.",
+    "passwordReset": "Wenn wir Deine E-Mail-Adresse oder Deinen Benutzernamen kennen, wurden Anweisungen zum Passwort-Zurücksetzen dorthin verschickt.",
    "passwordResetEmailSubject": "Passwort-Reset für Habitica",
    "passwordResetEmailText": "Wenn Du das Passwort für <%= username %> zurücksetzen möchtest, folge bitte dem Link <%= passwordResetLink %>, um ein neues zu setzen. Dieser Link wird in 24 Stunden ungültig. Wenn Du keinen Passwort-Reset angefordert hast, kannst Du diese E-Mail ignorieren.",
    "passwordResetEmailHtml": "Wenn Du das Passwort für <strong><%= username %></strong> auf Habitica zurücksetzen möchtest, folge bitte <a href=\"<%= passwordResetLink %>\">diesem Link </a>, um ein neues zu setzen. Dieser Link wird in 24 Stunden ungültig.<br/><br>Wenn Du keinen Passwort-Reset angefordert hast, kannst Du diese E-Mail ignorieren.",
@@ -150,7 +150,7 @@
    "confirmPassword": "Passwort bestätigen",
    "usernameLimitations": "Der Benutzername muss zwischen 1 und 20 Buchstaben lang sein und darf nur die Buchstaben von A bis Z, Nummern von 0 bis 9, Bindestriche und Unterstriche beinhalten und darf keine unangemessenen Begriffe enthalten.",
    "usernamePlaceholder": "z.B., HabitRabbit",
-    "emailPlaceholder": "z.B., rabbit@beispiel.com",
+    "emailPlaceholder": "z.B., gryphon@beispiel.com",
    "passwordPlaceholder": "z.B., ******************",
    "confirmPasswordPlaceholder": "Stelle sicher, dass es das gleiche Passwort ist!",
    "joinHabitica": "Habitica beitreten",
@@ -186,5 +186,6 @@
    "communityInstagram": "Instagram",
    "minPasswordLength": "Das Passwort muss mindestens 8 Zeichen haben.",
    "enterHabitica": "Tritt ein in Habitica",
-    "socialAlreadyExists": "Diese Social-Media-Zugangsdaten sind bereits mit einem schon bestehenden Habitica-Konto verknüpft."
+    "socialAlreadyExists": "Diese Social-Media-Zugangsdaten sind bereits mit einem schon bestehenden Habitica-Konto verknüpft.",
+    "emailUsernamePlaceholder": "z.B., habitrabbit oder gryphon@beispiel.com"
 }
@@ -2588,7 +2588,7 @@
    "headSpecialSpring2022RogueText": "Elster-Maske",
    "headSpecialSpring2022RogueNotes": "Wenn Du diese Maske trägst wirst Du so einfallsreich wie eine Elster erscheinen. Vielleicht kannst Du dann sogar ähnlich gut pfeifen, tirilieren, und imitieren. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
    "weaponSpecialSpring2022WarriorText": "Umgestülpter Regenschirm",
-    "weaponSpecialSpring2022WarriorNotes": "Uff! Es sieht so aus als wäre der Wind doch stärker als gedacht. Erhöht Stärke um <%= str %>, Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "weaponSpecialSpring2022WarriorNotes": "Uff! Es sieht so aus als wäre der Wind doch stärker als gedacht. Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
    "armorSpecialSpring2022WarriorText": "Regenmantel",
    "armorSpecialSpring2022WarriorNotes": "Diese Regenausrüstung ist so beeindruckend, Du kannst im Regen singen und in jede Pfütze springen, und bleibst trotzdem warm und trocken! Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
    "headSpecialSpring2022WarriorText": "Regenmantelkapuze",
@@ -2600,13 +2600,20 @@
    "armorSpecialSpring2022MageText": "Forsythienrobe",
    "headSpecialSpring2022MageText": "Forsythienhelm",
    "headSpecialSpring2022MageNotes": "Mithilfe dieses Helms aus umgedrehten Blüten bleibst Du bei jedem Frühlingsgewitter trocken. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
-    "armorSpecialSpring2022MageNotes": "Diese mit Forsythienblüten geschmückte Robe zeigt allen, dass Du bereit bist, flink und federleicht in den Frühling zu fliegen. Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "armorSpecialSpring2022MageNotes": "Diese mit Forsythienblüten geschmückte Robe zeigt allen, dass Du bereit bist, flink und federleicht in den Frühling zu fliegen. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
    "weaponSpecialSpring2022HealerText": "Abendsmaragd-Zauberstab",
    "weaponSpecialSpring2022HealerNotes": "Benutze diesen Zauberstab, um die Heilkräfte des Abendsmaragds zu entfalten – mögen sie Dir Ruhe, Zufriedenheit und Güte bringen. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
    "armorSpecialSpring2022HealerText": "Abendsmaragd-Rüstung",
-    "armorSpecialSpring2022HealerNotes": " Vertreibe Angst und Alpträume mit diesem grünen Edelstein-Gewand. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "armorSpecialSpring2022HealerNotes": "Vertreibe Angst und Alpträume mit diesem grünen Edelstein-Gewand. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
    "headSpecialSpring2022HealerText": "Abendsmaragd-Helm",
    "headSpecialSpring2022HealerNotes": "Dieser geheimnisvolle Helm bewahrt Deine Privatsphäre während Du diverse Aufgaben anpackst. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
    "shieldSpecialSpring2022HealerText": "Abendsmaragd-Schild",
-    "shieldSpecialSpring2022HealerNotes": "Aus geschmolzenem Stein aus der Erdkruste geformt, kann dieses Schild jedem noch so harten Schlag widerstehen, der ihm in den Weg kommt. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung."
+    "shieldSpecialSpring2022HealerNotes": "Aus geschmolzenem Stein aus der Erdkruste geformt, kann dieses Schild jedem noch so harten Schlag widerstehen, der ihm in den Weg kommt. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2022 Frühlingsausrüstung.",
+    "armorMystery202204Text": "Virtuelle Abenteurer Kapsel",
+    "armorMystery202204Notes": "Es sieht so aus, als müsstest Du, um Deine Aufgaben zu erledigen, nun diese mysteriösen Knöpfe drücken! Was sie wohl machen? Gewährt keinen Attributbonus. April 2022 Abonnentengegenstand.",
+    "eyewearMystery202204AText": "Virtuelles Gesicht",
+    "headArmoireStrawRainHatNotes": "Du wirst jedes Hindernis auf Deinem Weg erkennen können, wenn Du diesen wasserfesten, kegelförmigen Hut trägst. Erhöht Wahrnehmung um <%= per %>. Verzauberter Schrank: Stroh Regenmantel Set (Gegenstand 2 von 2).",
+    "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."
 }
@@ -42,7 +42,7 @@
    "sureChangeCustomDayStartTime": "Bist Du sicher, dass Du Deinen individuellen Tageswechsel umstellen willst? Deine Tagesaufgaben werden das nächste Mal zurückgesetzt, wenn Du Habitica nach <%= time %> verwendest. Stelle sicher, dass Du bis dahin Deine Aufgaben erledigt hast!",
    "customDayStartHasChanged": "Dein persönlicher Tagesstart wurde geändert.",
    "nextCron": "Deine Tagesaufgaben werden das nächste Mal überprüft und zurückgesetzt, wenn Du Habitica das erste Mal nach <%= time %> nutzt. Stelle sicher, dass Du Deine Tagesaufgaben vor diesem Zeitpunkt erledigt hast!",
-    "customDayStartInfo1": "Normalerweise werden Deine Tagesaufgaben jeden Tag um Mitternacht Deiner Ortszeit von Habitica überprüft und zurückgesetzt. Du kannst diesen Zeitpunkt hier ändern.",
+    "customDayStartInfo1": "Deine Tagesaufgaben werden jeden Tag um Mitternacht Deiner Ortszeit von Habitica überprüft und zurückgesetzt. Du kannst hier ändern, wenn das zu einem anderen Zeitpunkt geschehen soll.",
    "misc": "Verschiedenes",
    "showHeader": "Header anzeigen",
    "changePass": "Passwort ändern",
@@ -159,7 +159,7 @@
    "amazonPayments": "Amazon-Zahlungen",
    "amazonPaymentsRecurring": "Die untenstehende Checkbox muss abgehakt werden, um Dein Abo zu erstellen. Dies ermöglicht, Deinen Amazon-Account für wiederkehrende Zahlungen für <strong>dieses</strong> Abo zu benutzen. Es führt nicht dazu, dass Dein Amazon-Account automatisch auch für zukünftige Einkäufe benutzt wird.",
    "timezone": "Zeitzone",
-    "timezoneUTC": "Habitica verwendet die Zeitzone, welche an Deinem PC eingestellt ist: <strong><%= utc %></strong>",
+    "timezoneUTC": "Deine Zeitzone wird von Deinem PC festgelegt, und ist: <strong><%= utc %></strong>",
    "timezoneInfo": "Wenn diese Zeitzone falsch ist, lade die Seite mit Hilfe Deines Browsers erneut, um sicherzustellen, dass Habitica die aktuellen Informationen darstellt. Ist diese immer noch falsch, passe die Zeitzone Deines PCs an und lade die Seite erneut.<br><br> <strong>Wenn Du Habitica auf anderen PCs oder Mobilgeräten verwendest, muss die Zeitzone auf allen übereinstimmen.</strong> Wenn Deine Tagesaufgaben zur falschen Zeit zurückgesetzt werden, wiederhole diese Prüfung auf allen anderen PCs und in einem Browser Deiner Mobilgeräte.",
    "push": "Push",
    "about": "Über",
@@ -209,5 +209,11 @@
    "transaction_debug": "Debug-Aktion",
    "transaction_contribution": "Durch Beiträge",
    "transaction_release_pets": "Haustiere freigelassen",
-    "transaction_release_mounts": "Reittiere freigelassen"
+    "transaction_release_mounts": "Reittiere freigelassen",
+    "addPasswordAuth": "Passwort hinzufügen",
+    "nextHourglassDescription": "Abonnierende erhalten Mystische Sanduhren\ninnerhalb der ersten drei Tages des Monats.",
+    "gemCap": "Edelsteinobergrenze",
+    "nextHourglass": "Nächste Sanduhr",
+    "adjustment": "Änderung",
+    "dayStartAdjustment": "Änderung des Tageswechsel"
 }
@@ -202,5 +202,6 @@
    "mysterySet202112": "Antarktisches Undinen Set",
    "mysterySet202201": "Mitternächtliches Spaßvogel Set",
    "mysterySet202202": "Türkises Rattenschwänzchen Set",
-    "mysterySet202203": "Furchtlose Libelle-Set"
+    "mysterySet202203": "Furchtlose Libelle-Set",
+    "mysterySet202204": "Virtuelles Abenteurer Set"
 }
@@ -308,6 +308,7 @@
  "hatchingPotionMoonglow": "Moonglow",
  "hatchingPotionSolarSystem": "Solar System",
  "hatchingPotionOnyx": "Onyx",
+  "hatchingPotionVirtualPet": "Virtual Pet",

  "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
  "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",
@@ -133,6 +133,7 @@
  "unsupportedNetwork": "This network is not currently supported.",
  "cantDetachSocial": "Account lacks another authentication method; can't detach this authentication method.",
  "onlySocialAttachLocal": "Local authentication can be added to only a social account.",
+  "socialAlreadyExists": "This social login is already linked to an existing Habitica account.",
  "invalidReqParams": "Invalid request parameters.",
  "memberIdRequired": "\"member\" must be a valid UUID.",
  "heroIdRequired": "\"heroId\" must be a valid UUID.",
@@ -193,6 +193,7 @@
  "septemberYYYY": "September <%= year %>",
  "decemberYYYY": "December <%= year %>",
  "marchYYYY": "March <%= year %>",
+  "aprilYYYY": "April <%= year %>",
  "mayYYYY": "May <%= year %>",
  "juneYYYY": "June <%= year %>",
  "novemberYYYY": "November <%= year %>",
@@ -867,5 +867,15 @@
  "questOnyxCollectLeoRunes": "Leo Runes",
  "questOnyxCollectOnyxStones": "Onyx Stones",
  "questOnyxDropOnyxPotion": "Onyx Hatching Potion",
-  "questOnyxUnlockText": "Unlocks Onyx Hatching Potions for purchase in the Market"
+  "questOnyxUnlockText": "Unlocks Onyx Hatching Potions for purchase in the Market",
+
+  "questVirtualPetText": "Virtual Mayhem with the April Fool: The Beepening",
+  "questVirtualPetNotes": "It’s a quiet and pleasant spring morning in Habitica, a week past a memorable April Fool’s Day. You and @Beffymaroo are at the stables tending to your pets (who are still a bit confused from their time spent virtually!).<br><br>In the distance you hear a rumble and a beeping noise, soft at first but increasing in volume as if it’s getting closer. An egg-shape appears on the horizon and as it nears, beeping ever louder, you see that it is a gigantic virtual pet!<br><br>“Oh no,” @Beffymaroo exclaims, “I think the April Fool left some unfinished business with this big fella here, he seems to want attention!”<br><br>The virtual pet beeps angrily, throwing a virtual tantrum and whomping ever closer.",
+  "questVirtualPetCompletion": "Some careful button pushing seems to have fulfilled the virtual pet’s mysterious needs, and finally it has quieted down and appears content.<br><br>Suddenly in a burst of confetti, the April Fool appears with a basket full of strange potions emitting soft beeps.<br><br>“What timing, April Fool,” @Beffymaroo says with a wry smile. “I suspect this large beeping fellow is an acquaintance of yours.”<br><br>“Uh, yes,” the Fool says, sheepishly. “So sorry about that, and thank you both for taking care of Wotchimon! Take these potions in the way of thanks, they can bring your Virtual pets back anytime you like!”<br><br>You’re not 100% sure you’re on board with all the beeping, but they’re sure cute so it’s worth a shot!",
+  "questVirtualPetBoss": "Wotchimon",
+  "questVirtualPetRageTitle": "The Beepening",
+  "questVirtualPetRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Wotchiman will heal 30% of its remaining health!",
+  "questVirtualPetRageEffect": "`Wotchimon uses Bothersome Beep!` Wotchimon sounds a bothersome beep, and its happiness bar suddenly disappears! Pending damage reduced.",
+  "questVirtualPetDropVirtualPetPotion": "Virtual Pet Hatching Potion",
+  "questVirtualPetUnlockText": "Unlocks Virtual Pet Hatching Potion for purchase in the Market"
 }
@@ -40,10 +40,12 @@
    "xml": "(XML)",
    "json": "(JSON)",
    "customDayStart": "Custom Day Start",
+    "adjustment": "Adjustment",
+    "dayStartAdjustment": "Day Start Adjustment",
    "sureChangeCustomDayStartTime": "Are you sure you want to change your Custom Day Start time? Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before then!",
    "customDayStartHasChanged": "Your custom day start has changed.",
    "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
-    "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
+    "customDayStartInfo1": "Habitica checks and resets your Dailies at midnight in your own time zone each day. You can adjust when that happens past the default time here.",
    "misc": "Misc",
    "showHeader": "Show Header",
    "changePass": "Change Password",
@@ -156,14 +158,17 @@
    "purchasedPlanExtraMonths": "You have <strong><%= months %> months</strong> of extra subscription credit.",
    "consecutiveSubscription": "Consecutive Subscription",
    "consecutiveMonths": "Consecutive Months:",
+    "gemCap": "Gem Cap",
    "gemCapExtra": "Gem Cap Bonus",
    "mysticHourglasses": "Mystic Hourglasses:",
    "mysticHourglassesTooltip": "Mystic Hourglasses",
+    "nextHourglass": "Next Hourglass",
+    "nextHourglassDescription": "Subscribers receive Mystic Hourglasses within\nthe first three days of the month.",
    "paypal": "PayPal",
    "amazonPayments": "Amazon Payments",
    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
    "timezone": "Time Zone",
-    "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <strong><%= utc %></strong>",
+    "timezoneUTC": "Your time zone is set by your computer, which is: <strong><%= utc %></strong>",
    "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.<br><br> <strong>If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all.</strong> If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices.",
    "push": "Push",
    "about": "About",
@@ -125,9 +125,9 @@
    "achievementShadyCustomerText": "Ha conseguido todas las mascotas sombrías.",
    "achievementShadyCustomer": "Cliente sombrío",
    "achievementZodiacZookeeper": "Cuidador del Zodiaco",
-    "achievementZodiacZookeeperText": "¡Has eclosionado todas las mascotas del zodíaco: Rata, Vaca, Conejo, Serpiente, Caballo, Oveja, Mono, Gallo, Lobo, Tigre, Cerdo Volador y Dragón!",
+    "achievementZodiacZookeeperText": "¡Ha eclosionado todas las mascotas del zodíaco de color básico: Rata, Vaca, Conejo, Serpiente, Caballo, Oveja, Mono, Gallo, Lobo, Tigre, Cerdo Volador y Dragón!",
    "achievementZodiacZookeeperModalText": "¡Has conseguido todas las mascotas del zodíaco!",
-    "achievementBirdsOfAFeatherText": "Has eclosionado todas las mascotas voladoras: Cerdo Volador, Búho, Loro, Pterodáctilo, Grifo, Halcón, Pavo Real y Gallo.",
+    "achievementBirdsOfAFeatherText": "Ha eclosionado todas las mascotas voladoras de color básico: Cerdo Volador, Búho, Loro, Pterodáctilo, Grifo, Halcón, Pavo Real y Gallo.",
    "achievementBirdsOfAFeatherModalText": "¡Has conseguido todas las mascotas voladoras!",
    "achievementBirdsOfAFeather": "Aves de Pluma"
 }
@@ -677,5 +677,12 @@
    "backgrounds022022": "93.ª serie: publicada en febrero de 2022",
    "backgrounds032022": "94.ª serie: publiccada en marzo de 2022",
    "backgroundBrickWallWithIvyText": "Pared de Ladrillo con Hiedra",
-    "backgroundBrickWallWithIvyNotes": "Admira una Pared de Ladrillo con Hiedra."
+    "backgroundBrickWallWithIvyNotes": "Admira una Pared de Ladrillo con Hiedra.",
+    "backgrounds042022": "95ª. serie: publicada en abril de 2022",
+    "backgroundBlossomingTreesText": "Árboles Florecidos",
+    "backgroundFlowerShopText": "Tienda de Flores",
+    "backgroundFlowerShopNotes": "Disfruta el suave aroma de una Tienda de Flores.",
+    "backgroundBlossomingTreesNotes": "Entretente bajo Árboles Florecidos.",
+    "backgroundAnimalsDenText": "Cubil de una Criatura del Bosque",
+    "backgroundAnimalsDenNotes": "Ponte Cómodo en el Cubil de una Criatura del Bosque."
 }
@@ -13,7 +13,7 @@
    "companyDonate": "Donar",
    "forgotPassword": "¿Has olvidado la contraseña?",
    "emailNewPass": "Enviar un link de cambio de contraseña",
-    "forgotPasswordSteps": "Introduce la dirección de correo electrónico que utilizaste para registrarte en Habitica.",
+    "forgotPasswordSteps": "Introduce tu nombre de usuario o la dirección de correo electrónico que utilizaste para registrarte en Habitica.",
    "sendLink": "Enviar link",
    "featuredIn": "Hablan de nosotros en",
    "footerDevs": "Desarrolladores",
@@ -129,7 +129,7 @@
    "passwordConfirmationMatch": "Las contraseñas no coinciden.",
    "invalidLoginCredentials": "El nombre de usuario y/o correo electrónico y/o conseña no son correctos.",
    "passwordResetPage": "Restablecer Contraseña",
-    "passwordReset": "Si tenemos constancia de tu correo electrónico, te hemos enviado un mensaje con las instrucciones a seguir para establecer una nueva contraseña.",
+    "passwordReset": "Si tenemos constancia de tu correo electrónico o nombre de usuario, te hemos enviado un mensaje con las instrucciones a seguir para establecer una nueva contraseña.",
    "passwordResetEmailSubject": "Restablecer contraseña para Habitica",
    "passwordResetEmailText": "Si has solicitado restablecer la contraseña del usuario <%= username %> en Habitica, entra en <%= passwordResetLink %> para establecer una nueva. El enlace expira tras 24 horas. Si no has solicitado restablecer una contraseña, por favor ignora este mensaje.",
    "passwordResetEmailHtml": "Si has solicitado restablecer la contraseña del usuario <strong><%= username %></strong> en Habitica, <a href=\"<%= passwordResetLink %>\">haz clic aquí</a> para establecer una nueva. El enlace expira tras 24 horas.<br/><br>Si no has solicitado restablecer una contraseña, por favor ignora este mensaje.",
@@ -150,7 +150,7 @@
    "confirmPassword": "Confirmar contraseña",
    "usernameLimitations": "El nombre de usuario debe tener entre 1 y 20 caracteres, que tengan solo letras entre la a y la z, números del 0 al 9, guiones o barras bajas, y no pueden incluir términos inapropiados.",
    "usernamePlaceholder": "p.e., HabitRabbit",
-    "emailPlaceholder": "p.e., rabbit@example.com",
+    "emailPlaceholder": "p.e., gryphon@example.com",
    "passwordPlaceholder": "p.e., ******************",
    "confirmPasswordPlaceholder": "¡Asegúrate de que es la misma contraseña!",
    "joinHabitica": "Únete a Habitica",
@@ -185,5 +185,6 @@
    "learnMore": "Saber más",
    "communityInstagram": "Instagram",
    "minPasswordLength": "La contraseña debe contener 8 caracteres o más.",
-    "enterHabitica": "Adéntrate en Habitica"
+    "enterHabitica": "Adéntrate en Habitica",
+    "emailUsernamePlaceholder": "p.e., habitrabbit o gryphon@example.com"
 }
@@ -2572,5 +2572,25 @@
    "backMystery202203Notes": "Gana la carrera a todas las demás criaturas del cielo gracias a estas alas brillantes. No otorga ningún beneficio. Artículo de suscriptor de marzo 2022.",
    "headAccessoryMystery202203Text": "Diadema de Libélula Intrépida",
    "armorArmoireSoftVioletSuitNotes": "El morado es un color de lujo. Relájate con clase después de terminar tus tareas diarias. Aumenta la Constitución y la Fuerza en <%= attrs %> . Armario encantado: Conjunto Ropa de casa violeta (Artículo 2 de 3).",
-    "headAccessoryMystery202203Notes": "¿Necesitas un impulso de velocidad?¡Las alitas decorativas de esta diadema son más poderosas de lo que parecen! No otorga ningún beneficio. Artículo de suscriptor de marzo 2022."
+    "headAccessoryMystery202203Notes": "¿Necesitas un impulso de velocidad?¡Las alitas decorativas de esta diadema son más poderosas de lo que parecen! No otorga ningún beneficio. Artículo de suscriptor de marzo 2022.",
+    "weaponSpecialSpring2022WarriorText": "Paraguas del Revés",
+    "weaponSpecialSpring2022WarriorNotes": "¡Ostras! Supongo que ese viento era un poco más fuerte de lo que pensabas, ¿eh? Aumenta la fuerza en <%= str %>. Equipamiento de Edición Limitada de Primavera 2022.",
+    "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).",
+    "armorSpecialSpring2022RogueText": "Disfraz de Urraca",
+    "armorSpecialSpring2022RogueNotes": "¡Con un azul grisáceo iridiscente y manchas más claras en tus plumas, serás el mejor amigo volador en la fiesta de la primavera! Aumenta la percepción en <%= per %>. Equipamiento de Edición Limitada de Primavera 2022.",
+    "headSpecialSpring2022RogueText": "Máscara de Urraca",
+    "headSpecialSpring2022RogueNotes": "Sé tan inteligente como una urraca cuando lleves esta máscara. Quizá incluso podrás silbar, trinar e imitar tan bien como una, también. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2022.",
+    "armorMystery202204Text": "Cápsula de Aventurero Virtual",
+    "armorMystery202204Notes": "¡Parece que hacer tus tareas ahora requiere pulsar estos botones misteriosos! ¿Qué podrían hacer? No otorga ninún beneficio. Artículo de suscriptor de abril 2021.",
+    "weaponArmoireGardenersWateringCanText": "Regadera",
+    "armorArmoireStrawRaincoatText": "Chubasquero de Paja",
+    "weaponSpecialSpring2022MageText": "Bastón de Forsitia",
+    "weaponSpecialSpring2022MageNotes": "Estas campanillas amarillas brillantes son listas para canalizar tu magia poderosa primaveral. Aumenta la Inteligencia en <%= int %> y la Percepción en <%= per %>. Equipamento de edición limitada de primavera.",
+    "armorSpecialSpring2022MageText": "Túnica de Forsitia",
+    "armorSpecialSpring2022MageNotes": "Muestra que estás preparado para entrar en la temporada de primavera con esta túnica adornada con pétalos de flor de forsitia. Aumenta la Inteligencia en <%= int %>. Equipamiento de Edición Limitada de Primavera 2022.",
+    "armorSpecialSpring2022HealerText": "Armadura de Peridoto",
+    "armorSpecialSpring2022HealerNotes": "Ahuyenta los miedos y pesadillas simplemente llevando esta prenda de gema verde.Aumenta la constitución en <%= con %>.Aumenta la constitución en <%= con %>. Equipamiento de Edición Limitada de Primavera 2022.",
+    "armorArmoireGardenersOverallsText": "Mono de Jardinero",
+    "armorArmoireGardenersOverallsNotes": "No tengas miedo de trabajar en la tierra cuando estés llevando estos monos duraderos. Aumenta la constitución en <%= con %>. Armario Encantado: Conjunto de Jardinería (Artículo 1 de 4).",
+    "weaponSpecialSpring2022RogueText": "Pendiente de Botón Gigante"
 }
@@ -602,7 +602,7 @@
    "questSquirrelDropSquirrelEgg": "Ardilla (huevo)",
    "questSquirrelUnlockText": "Desbloquea la compra de huevos de ardilla en el Mercado",
    "cuddleBuddiesText": "Lote de Misiones Compañeros Abrazados",
-    "cuddleBuddiesNotes": "Contiene \"El Conejito Asesino\", \"El Hurón Malvado\", y \"La Pandilla de Cobayas\". Disponible hasta el 31 de mayo.",
+    "cuddleBuddiesNotes": "Contiene \"El Conejito Asesino\", \"El Hurón Malvado\", y \"La Pandilla de Cobayas\". Disponible hasta el 31 de marzo.",
    "aquaticAmigosText": "Lote de Misiones de Amigos Acuáticos",
    "aquaticAmigosNotes": "Contiene 'El ajolote mágico', 'El Kraken del Inkompleto' y 'La llamada de Octothulu'. Disponible hasta el 31 de agosto.",
    "questSeaSerpentText": "Peligro en las profundidades: ¡Ataque de la serpiente marina!",
@@ -209,5 +209,8 @@
    "transaction_contribution": "A través de contribuciones",
    "transaction_spend": "Gastado en",
    "transaction_release_mounts": "Monturas sueltas",
-    "transaction_subscription_perks": "Beneficio de la suscripción"
+    "transaction_subscription_perks": "Beneficio de la suscripción",
+    "addPasswordAuth": "Añadir contraseña",
+    "gemCap": "Límite de Gemas",
+    "nextHourglass": "Siguiente Reloj de Arena"
 }
@@ -200,5 +200,6 @@
    "mysterySet202112": "Conjunto de Ondina Antártica",
    "mysterySet202201": "Conjunto de Juerguista de Medianoche",
    "mysterySet202202": "Conjunto de Coletas Turquesas",
-    "mysterySet202203": "Conjunto de Libélula Intrépida"
+    "mysterySet202203": "Conjunto de Libélula Intrépida",
+    "mysterySet202204": "Conjunto de Aventurero Virtual"
 }
@@ -116,5 +116,18 @@
    "achievementVioletsAreBlueModalText": "¡Lograste obtener todas las mascotas de algodón de azúcar azul!",
    "achievementVioletsAreBlueText": "Ha obtenido todas las mascotas de algodón de azúcar azul.",
    "achievementDomesticatedText": "¡Has eclosionado todos los colores base de mascotas domesticas: hurón, cobaya, gallo, cerdo volador, ratón, conejo, caballo y vaca!",
-    "achievementDomesticatedModalText": "¡Has eclosionado todas las mascotas domésticas!"
+    "achievementDomesticatedModalText": "¡Has eclosionado todas las mascotas domésticas!",
+    "achievementDomesticated": "I-A-I-A-O",
+    "achievementBirdsOfAFeather": "Aves de Pluma",
+    "achievementBirdsOfAFeatherText": "Has eclosionado todas las mascotas voladoras: Cerdo Volador, Búho, Loro, Pterodáctilo, Grifo, Halcón, Pavo Real y Gallo.",
+    "achievementZodiacZookeeper": "Cuidador del Zodíaco",
+    "achievementZodiacZookeeperModalText": "¡Has conseguido todas las mascotas del zodíaco!",
+    "achievementBirdsOfAFeatherModalText": "¡Has conseguido todas las mascotas voladoras!",
+    "achievementShadeOfItAll": "La sombra de todo ello",
+    "achievementShadeOfItAllText": "Ha domado todas las monturas sombrías.",
+    "achievementShadyCustomer": "Cliente sombrío",
+    "achievementShadyCustomerText": "Ha conseguido todas las mascotas sombrías.",
+    "achievementShadyCustomerModalText": "¡Has conseguido todas las mascotas sombrías!",
+    "achievementShadeOfItAllModalText": "¡Has domado todas las monturas sombrías!",
+    "achievementZodiacZookeeperText": "¡Has eclosionado todas las mascotas del zodíaco de color básico: Rata, Vaca, Conejo, Serpiente, Caballo, Oveja, Mono, Gallo, Lobo, Tigre, Cerdo Volador y Dragón!"
 }
@@ -497,8 +497,8 @@
    "backgroundPotionShopText": "Tienda de Pociones",
    "backgroundFlyingInAThunderstormNotes": "Persigue una Tormenta Tumultuosa tan cerca como te atrevas.",
    "backgroundFlyingInAThunderstormText": "Tormenta Tumultuosa",
-    "backgroundFarmersMarketNotes": "Compra los víveres más frescos en el Mercado del Granjero.",
-    "backgroundFarmersMarketText": "Mercado del Granjero",
+    "backgroundFarmersMarketNotes": "Compra los víveres más frescos en el Mercado Agrícola.",
+    "backgroundFarmersMarketText": "Mercado Agrícola",
    "backgrounds112019": "CONJUNTO 66: Lanzado en Noviembre 2019",
    "backgroundTeaPartyNotes": "Participa en una sofisticada Fiesta de Té.",
    "backgroundHallOfHeroesNotes": "Acércate al salón de los héroes con apreciación y veneración.",
@@ -625,5 +625,19 @@
    "backgroundGhostShipText": "Barco Fantasma",
    "backgroundUnderwaterAmongKoiNotes": "Deslumbra y deslúmbrate por las carpas brillantes, Bajo el Agua Entre Kois.",
    "backgroundUnderwaterAmongKoiText": "Bajo el Agua Entre Kois",
-    "backgrounds072021": "CONJUNTO 86: Lanzado en Julio 2021"
+    "backgrounds072021": "CONJUNTO 86: Lanzado en Julio 2021",
+    "backgroundRopeBridgeNotes": "Demuestra a los escépticos que este Puente de Cuerda es perfectamente seguro.",
+    "backgrounds092021": "CONJUNTO 88: Publicado en septiembre de 2021",
+    "backgrounds082021": "CONJUNTO 87: Publicado en agosto de 2021",
+    "backgroundDaytimeMistyForestText": "Bosque Brumoso",
+    "backgroundVineyardText": "Viñedo",
+    "backgroundDaytimeMistyForestNotes": "Bañate en el resplandor del la luz del día que fluye a través del Bosque Brumoso.",
+    "backgroundStoneTowerNotes": "Mira desde los parapetos de una Torre de Piedra a otra.",
+    "backgroundStoneTowerText": "Torre de Piedra",
+    "backgroundRopeBridgeText": "Puente de Cuerda",
+    "backgroundVineyardNotes": "Explora la extensión de un fértil viñedo.",
+    "backgroundAutumnPoplarsText": "Bosque de álamos otoñales",
+    "backgroundAutumnLakeshoreText": "Orilla de lago otoñal",
+    "backgroundAutumnLakeshoreNotes": "Párate un momento en la orilla de un lago otoñal para apreciar el reflejo del bosque en sus aguas.",
+    "backgroundAutumnPoplarsNotes": "Regocíjate en los brillantes tonos marrones y dorados de un bosque de álamos otoñales."
 }
@@ -103,5 +103,6 @@
    "selectParticipant": "Seleccionar un Participante",
    "filters": "filtros",
    "wonChallengeDesc": "¡<%= challengeName %> te seleccionó como el ganador! Tu victoria ha sido registrada en tus Logros.",
-    "yourReward": "Tu Recompensa"
+    "yourReward": "Tu Recompensa",
+    "removeTasks": "Eliminar Tareas"
 }
@@ -369,5 +369,6 @@
    "hatchingPotionMossyStone": "Piedra Musgosa",
    "hatchingPotionSunset": "Atardecer",
    "hatchingPotionSolarSystem": "Sistema Solar",
-    "hatchingPotionMoonglow": "Brillo de Luna"
+    "hatchingPotionMoonglow": "Brillo de Luna",
+    "hatchingPotionOnyx": "Ónice"
 }
@@ -25,9 +25,9 @@
    "androidFaqAnswer5": "¡La mejor manera es invitarlos a un Equipo contigo! Los Equipos pueden realizar misiones, luchar contra monstruos y lanzar habilidades para ayudarse mutuamente. Ve la [página](https://habitica.com/) para crear un Equipo si no lo tienes ya. También pueden unirse juntos a un gremio (Social > Gremios). Los Gremios son salas de chat que se centran en intereses o metas compartidos, y pueden ser públicos o privados. Puedes unirte a todos los gremios que quieras, pero solo a uno equipo.\n\n Para información más detallada, revisa las páginas de la wiki sobre [Equipos](https://habitica.fandom.com/es/wiki/Equipo) y [Gremios](https://habitica.fandom.com/es/wiki/Gremios).",
    "webFaqAnswer5": "¡La mejor forma es invitarlos a un Equipo contigo haciendo click en \"Equipo\" en la barra de navegación! Los Equipos pueden ir a misiones, luchar contra monstruos y lanzar habilidades para ayudarse unos a otros. También pueden unirse a un Gremio juntos (haciendo click en \"Gremios\" en la barra de navegación). Los Gremios son salas de chat que se centran en un interés compartido o en alcanzar un objetivo común, y pueden ser públicos o privados. Puedes unirte a todos los Gremios que quieras, pero solo a un Equipo. Para más detalles, echa un vistazo a las páginas de wiki de [Equipos](https://habitica.fandom.com/es/wiki/Equipo) y [Gremios](https://habitica.fandom.com/es/wiki/Gremios).",
    "faqQuestion6": "¿Cómo consigo una mascota o una montura?",
-    "iosFaqAnswer6": "Cada vez que completes una tarea, tendrás una oportunidad aleatoria de recibir un Huevo, una Poción de Eclosión o Comida para Mascotas. Éstos serán guardados en Menú > Ítems.\n\nPara obtener una Mascota necesitarás un Huevo y una Poción de Eclosión. Haz clic en el Huevo para determinar la especie que quieres obtener, y selecciona \"Eclosionar Huevo\". ¡Luego elige una Poción de Eclosión para definir su color! Ve a Menú > Mascotas y haz clic en tu nueva Mascota para equiparla a tu Personaje.\n\n También puedes hacer que tus Mascotas crezcan hasta convertirse en Monturas alimentándolas desde Menú > Mascotas. ¡Haz clic en una Mascota y luego selecciona \"Alimentar Mascota\"! Tendrás que alimentar a una Mascota muchas veces para que pueda convertirse en Montura, pero si descubres cuál es su comida favorita, crecerá más rápido. Utiliza el método de ensayo y error, o [ve los spoilers aquí](http://habitica.fandom.com/wiki/Food#Food_Preferences). Una vez tengas una Montura, ve a Menú > Monturas y haz clic en ella para equiparla a tu Personaje.\n\nAdemás puedes obtener Huevos de Mascotas de Misión al completar ciertas Misiones. (Para saber más sobre Misiones, lee [Cómo peleo con monstruos y voy a Misiones](https://habitica.com/static/faq/9)).",
-    "androidFaqAnswer6": "Cada vez que completes una tarea, tendrás una oportunidad aleatoria de recibir un Huevo, una Poción de Eclosión o un trozo de Comida para Mascotas. Serán almacenados en Menú > Artículos.\n\nPara eclosionar una Mascota, necesitarás un Huevo y una Poción de Eclosión. Haz clic en el Huevo para determinar la especie que quieres eclosionar y luego selecciona \"Eclosionar con Poción\". ¡Luego selecciona una Poción de Eclosión para determinar su color! Para equipar tu nueva Mascota, ve a Menú > Establo > Mascotas, selecciona una especie, haz clic en la Mascota deseada, y selecciona \"Usar\" (Tu Personaje no se actualiza para reflejar el cambio).\n\n También puedes hacer crecer tus Mascotas hasta Monturas alimentándolas en Menú > Establo [ > Mascotas ]. ¡Haz clic en una Mascota y selecciona \"Alimentar\"! Tendrás que alimentar una Mascota muchas veces antes de que se transforme en una Montura, pero si logras identificar su comida favorita, crecerá más rápido. Utiliza ensayo y error o [encuentra los spoilers acá](http://habitica.fandom.com/wiki/Food#Food_Preferences). Para equipar tu Montura, ve a Menú > Establo > Monturas, selecciona una especie, haz clic en la Montura deseada y selecciona \"Usar\"(Tu Personaje no se actualiza para reflejar el cambio).\n\n También puedes obtener Huevos de Mascotas de Misión completando algunas Misiones. (Mira abajo para aprender más sobre Misiones.)",
-    "webFaqAnswer6": "Cada vez que completas una tarea, tendrás una oportunidad aleatoria de recibir un huevo, una poción de eclosión o un trozo de comida. Serán almacenados en Inventario > Artículos. Para eclosionar una Mascota, necesitarás un huevo y una poción de eclosión. Una vez tengas un huevo y una poción, ve al Inventario > Establo para eclosionar tu mascota haciendo clic en su imagen. Una vez hayas eclosionado una mascota, puedes equiparla haciendo clic en ella. También puedes hacer que tus Mascotas crezcan hasta ser Monturas alimentándolas en tu Inventario > Establo. ¡Arrastra un trozo de comida de la barra de acción en la parte inferior de la pantalla y déjala caer en una mascota para alimentarla! Tendrás que alimentar una mascota muchas veces antes de que se vuelva una Montura, pero si puedes identificar su comida favorita, crecerá más rápido. Utiliza ensayo y error, o [encuentra los spoilers acá](http://habitica.fandom.com/wiki/Food#Food_Preferences). Cuando tengas una montura, haz clic en ella para equiparla a tu personaje. También puedes obtener huevos de Mascotas de Misión completando algunas Misiones. (Mira abajo para aprender más sobre Misiones.)",
+    "iosFaqAnswer6": "Cada vez que completes una tarea, tendrás una oportunidad aleatoria de recibir un Huevo, una Poción de Eclosión o Comida para Mascotas. Éstos serán guardados en Menú > Ítems.\n\nPara obtener una Mascota necesitarás un Huevo y una Poción de Eclosión. Haz clic en el Huevo para determinar la especie que quieres obtener, y selecciona \"Eclosionar Huevo\". ¡Luego elige una Poción de Eclosión para definir su color! Ve a Menú > Mascotas y haz clic en tu nueva Mascota para equiparla a tu Personaje.\n\n También puedes hacer que tus Mascotas crezcan hasta convertirse en Monturas alimentándolas desde Menú > Mascotas. ¡Haz clic en una Mascota y luego selecciona \"Alimentar Mascota\"! Tendrás que alimentar a una Mascota muchas veces para que pueda convertirse en Montura, pero si descubres cuál es su comida favorita, crecerá más rápido. Utiliza el método de ensayo y error, o [ve los spoilers aquí](https://habitica.fandom.com/wiki/Food#Food_Preferences). Una vez tengas una Montura, ve a Menú > Monturas y haz clic en ella para equiparla a tu Personaje.\n\nAdemás puedes obtener Huevos de Mascotas de Misión al completar ciertas Misiones. (Para saber más sobre Misiones, lee [Cómo peleo con monstruos y voy a Misiones](https://habitica.com/static/faq/9)).",
+    "androidFaqAnswer6": "Cada vez que completes una tarea, tendrás una oportunidad aleatoria de recibir un Huevo, una Poción de Eclosión o un trozo de Comida para Mascotas. Serán almacenados en Menú > Artículos.\n\nPara eclosionar una Mascota, necesitarás un Huevo y una Poción de Eclosión. Haz clic en el Huevo para determinar la especie que quieres eclosionar y luego selecciona \"Eclosionar con Poción\". ¡Luego selecciona una Poción de Eclosión para determinar su color! Para equipar tu nueva Mascota, ve a Menú > Establo > Mascotas, selecciona una especie, haz clic en la Mascota deseada, y selecciona \"Usar\" (Tu Personaje no se actualiza para reflejar el cambio).\n\n También puedes hacer crecer tus Mascotas hasta Monturas alimentándolas en Menú > Establo [ > Mascotas ]. ¡Haz clic en una Mascota y selecciona \"Alimentar\"! Tendrás que alimentar una Mascota muchas veces antes de que se transforme en una Montura, pero si logras identificar su comida favorita, crecerá más rápido. Utiliza ensayo y error o [encuentra los spoilers acá](https://habitica.fandom.com/es/wiki/Preferencias_de_Comida). Para equipar tu Montura, ve a Menú > Establo > Monturas, selecciona una especie, haz clic en la Montura deseada y selecciona \"Usar\"(Tu Personaje no se actualiza para reflejar el cambio).\n\n También puedes obtener Huevos de Mascotas de Misión completando algunas Misiones. (Mira abajo para aprender más sobre Misiones.)",
+    "webFaqAnswer6": "Cada vez que completas una tarea, tendrás una oportunidad aleatoria de recibir un huevo, una poción de eclosión o un trozo de comida. Serán almacenados en Inventario > Artículos. Para eclosionar una Mascota, necesitarás un huevo y una poción de eclosión. Una vez tengas un huevo y una poción, ve al Inventario > Establo para eclosionar tu mascota haciendo clic en su imagen. Una vez hayas eclosionado una mascota, puedes equiparla haciendo clic en ella. También puedes hacer que tus Mascotas crezcan hasta ser Monturas alimentándolas en tu Inventario > Establo. ¡Arrastra un trozo de comida de la barra de acción en la parte inferior de la pantalla y déjala caer en una mascota para alimentarla! Tendrás que alimentar una mascota muchas veces antes de que se vuelva una Montura, pero si puedes identificar su comida favorita, crecerá más rápido. Utiliza ensayo y error, o [encuentra los spoilers acá](https://habitica.fandom.com/es/wiki/Preferencias_de_Comida). Cuando tengas una montura, haz clic en ella para equiparla a tu personaje. También puedes obtener huevos de Mascotas de Misión completando algunas Misiones. (Mira abajo para aprender más sobre Misiones.)",
    "faqQuestion7": "¿Cómo me convierto en Guerrero, Mago, Pícaro o Sanador?",
    "iosFaqAnswer7": "En el nivel 10, puedes elegir convertirte en Guerrero, Mago, Pícaro o Sanador. (Todos los jugadores comienzan como Guerreros por defecto.) Cada Clase tiene distintas opciones de equipamiento, distintas habilidades que pueden usar a partir del nivel 11, y distintas ventajas. Los Guerreros pueden hacer daño fácilmente a los Jefes, resistir más daño de sus tareas y ayudar a que su Equipo sea más fuerte. Los Magos también pueden hacer daño a los Jefes con facilidad, además de subir rápidamente de nivel y restaurar la Maná de su Equipo. Los Pícaros son los que más oro obtienen y más botines encuentran, y pueden ayudar a que su Equipo también lo haga. Finalmente, los Sanadores pueden curarse a ellos mismos y a los miembros de su Equipo.\n\nSi no quieres elegir una Clase inmediatamente -- por ejemplo, si todavía estás trabajando para comprar todo el equipamiento de tu clase actual -- puedes hacer clic en \"Cancelar\" y elegir más tarde abriendo el Menú, haciendo clic en el ícono de Ajustes y luego haciendo clic en \"Activar Sistema de Clases\".",
    "androidFaqAnswer7": "En nivel 10, puedes elegir convertirte en Guerrero, Mago, Pícaro o Sanador. (Todos los jugadores comienzan como Guerreros por defecto). Cada Clase tiene distintas opciones de equipamiento, distintas Habilidades que pueden usar a partir del nivel 11, y distintas ventajas. Los Guerreros pueden hacerle daño fácilmente a los Jefes, resistir más daño de sus tareas, y ayudar a que su Equipo se haga más fuerte. Los Magos también pueden hacerle mucho daño a los Jefes, y subir rápidamente de nivel y restaurar la Mana de su equipo. Los Pícaros son los que más oro ganan y más botines encuentran, y pueden ayudar a que su equipo también lo haga. Finalmente, los Sanadores pueden curarse a ellos mismos y a su equipo. \n\nSi no quieres elegir una Clase inmediatamente -- por ejemplo, si todavía estás tratando de comprar todo el equipamiento de tu clase actual -- puedes seleccionar \"No Usar\" y elegir más tarde abriendo el Menú, seleccionando el ícono de Ajustes, y seleccionando \"Activar el Sistema de Clases\".",
@@ -41,18 +41,18 @@
    "androidFaqAnswer9": "Primero, necesitas unirte o empezar un Equipo (mira arriba). Aunque puedes luchar contra monstruos solo, te recomendamos que juegues en grupo, porque esto hará las Misiones mucho más fáciles. ¡Además, tener un amigo que te anime a completar tus tareas es muy motivante!\n\n Además, necesitas un Pergamino de Misión. Estos se almacenan en Menú > Items. Hay tres formas de conseguir un pergamino:\n\n -En el nivel 15, consigues una línea de Misión, es decir: tres misiones relacionadas. Más líneas de misión se desbloquean en los niveles 30, 40 y 60 respectivamente.\n -¡Cuando invites a gente a tu Equipo, serás recompensado con el pergamino de la Basi-lista!\n -Puedes comprar Misiones de la Tienda de Misiones usando Oro y Gemas.\n\n Para luchar contra los Jefes o recolectar objetos para una Misión de Recolección, simplemente completa tus tareas normalmente, y se añadirán al daño durante la noche. (A veces será necesario volver a cargar la página para ver bajar la barra de salud del Jefe.) Si estás luchando contra un Jefe y te perdiste alguna Tarea Diaria, el Jefe hará daño a todo tu Equipo al mismo tiempo que tú haces daño al Jefe. \n\n A partir del nivel 11, los Magos y Guerreros ganarán Habilidades que les permiten hacer daño extra al Jefe, así que son excelentes clases que elegir en el nivel 10 si quieres ser un peso pesado.",
    "webFaqAnswer9": "Primero, necesitas unirte o empezar un Equipo haciendo click en \"Equipo\" en la barra de navegación. Aunque puedes luchar contra monstruos solo, te recomendamos que juegues en un grupo, porque eso hará que las misiones sean más fáciles. ¡Además, tener un amigo que te anime mientras completas tus tareas es muy motivador! A continuación, necesitas un Pergamino de Misión, que se almacena en Inventario > Misiones. Hay cuatro maneras de conseguir un Pergamino de Misión:\n * ¡Cuando invitas a gente a tu Equipo, eres recompensado con el Pergamino de la Basi-Lista!\n * En el nivel 15, consigues una Línea de Misión, es decir: tres misiones conectadas. Más Líneas de Misión se desbloquean en los niveles 30, 40 y 60 respectivamente.\n * Puedes comprar Misiones de la Tienda de Misiones (Tienda > Misiones) con Oro y Gemas.\n * Cuando entras en Habitica un número determinado de días, eres recompensado con Pergaminos de Misión. Ganas un Pergamino en la 1ª, 7ª, 22ª y 40ª vez que entras.\nPara luchar contra Jefes y recolectar items para una Misión de Recolección, simplemente completa tus tareas de forma normal, y serán añadidas al daño por la noche. (Es posible que tengas que volver a cargar la página para ver la barra de Salud del Jefe bajar). Si estás luchando contra un Jefe y te saltaste alguna tarea Diaria, el Jefe hará daño a tu Equipo al mismo tiempo que tú haces daño al Jefe. A partir del nivel 11, los Magos y los Guerreros ganarán Habilidades que les permitirán hacer daño adicional al Jefe, así que son excelentes clases para elegir en el nivel 10 si quieres dar golpes fuertes.",
    "faqQuestion10": "¿Qué son las gemas y cómo las obtengo?",
-    "iosFaqAnswer10": "Las Gemas se compran con dinero real en Menú > Comprar Gemas. Cuando compras Gemas, nos estás ayudando a mantener Habitica en funcionamiento. ¡Estamos agradecidos por todo el soporte!\n\n Además de comprar Gemas directamente, hay otras maneras en que los jugadores pueden obtener Gemas:\n\n * Ganar un Desafío creado por otro jugador. Ve a Menú > Desafíos para unirte a alguno.\n * Suscribirse y desbloquear la habilidad de comprar cierto número de Gemas por mes.\n * Contribuir sus habilidades al proyecto de Habitica. Visita esta página de la wiki para más detalles: [Contribuir a Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Ten en cuenta que los artículos comprados con Gemas no ofrecen ventajas estadísticas, así que ¡los jugadores pueden usar la aplicación sin ellas!",
-    "androidFaqAnswer10": "Las Gemas se compran con dinero real en Menú > Comprar Gemas. Cuando compras Gemas, nos estás ayudando a mantener Habeitica en funcionamiento. ¡Estamos muy agradecidos por todo el apoyo!\n\n Además de comprar Gemas directamente, hay tres otras formas en las que los jugadores pueden obtener Gemas:\n\n * Gana un Desafío creado por otro jugador. Ve a Menú > Desafíos para unirte a alguno.\n * Suscríbete y desbloquea la habilidad para comprar un número determinado de Gemas al mes.\n * Contribuye tus habilidades al proyecto de Habitica. Mira esta página de la wiki para más detalles: [Contribuyendo a Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Ten en cuenta que los Artículos comprados con Gemas no ofrecen ventajas estadísticas, así que ¡los jugadores pueden usar la aplicación incluso sin ellas!",
+    "iosFaqAnswer10": "Las Gemas se compran con dinero real en Menú > Comprar Gemas. Cuando compras Gemas, nos estás ayudando a mantener Habitica en funcionamiento. ¡Estamos agradecidos por todo el soporte!\n\n Además de comprar Gemas directamente, hay otras maneras en que los jugadores pueden obtener Gemas:\n\n * Ganar un Desafío creado por otro jugador. Ve a Menú > Desafíos para unirte a alguno.\n * Suscribirse y desbloquear la habilidad de comprar cierto número de Gemas por mes.\n * Contribuir sus habilidades al proyecto de Habitica. Visita esta página de la wiki para más detalles: [Contribuir a Habitica](https://habitica.fandom.com/es/wiki/Contribuir_a_Habitica).\n\n Ten en cuenta que los artículos comprados con Gemas no ofrecen ventajas estadísticas, así que ¡los jugadores pueden usar la aplicación sin ellas!",
+    "androidFaqAnswer10": "Las Gemas se compran con dinero real en Menú > Comprar Gemas. Cuando compras Gemas, nos estás ayudando a mantener Habeitica en funcionamiento. ¡Estamos muy agradecidos por todo el apoyo!\n\n Además de comprar Gemas directamente, hay tres otras formas en las que los jugadores pueden obtener Gemas:\n\n * Gana un Desafío creado por otro jugador. Ve a Menú > Desafíos para unirte a alguno.\n * Suscríbete y desbloquea la habilidad para comprar un número determinado de Gemas al mes.\n * Contribuye tus habilidades al proyecto de Habitica. Mira esta página de la wiki para más detalles: [Contribuyendo a Habitica](https://habitica.fandom.com/es/wiki/Contribuir_a_Habitica).\n\n Ten en cuenta que los Artículos comprados con Gemas no ofrecen ventajas estadísticas, así que ¡los jugadores pueden usar la aplicación incluso sin ellas!",
    "webFaqAnswer10": "Las Gemas se compran con dinero real, aunque los [suscriptores](https://habitica.com/user/settings/subscription) pueden comprarlas con Oro. Cuando la gente se suscribe o compra Gemas, ayudan a mantener la página web. ¡Estamos muy agradecidos por el apoyo! Además de comprar Gemas directamente o convertirte en un suscriptor, hay otras dos maneras de ganar Gemas:\n* Gana un Desafío que haya creado otro jugador. Ve a Desafíos > Descubrir Desafíos para unirte a alguno.\n * Contribuye con tus habilidades al proyecto Habitica. Echa un vistazo a esta página de la wiki para más detalles: [Contribuir a Habitica](https://habitica.fandom.com/es/wiki/Contribuir_a_Habitica). ¡Ten en cuenta que los objetos comprados con Gemas no ofrecen ninguna ventaja estadística, así que los jugadores pueden usar el sitio sin ellas!",
    "faqQuestion11": "¿Cómo reporto un error o solicito una nueva función?",
    "iosFaqAnswer11": "Si crees que encontraste un error, ve a Menú > Ayuda > Conseguir Ayuda para buscar soluciones rápidas, problemas conocidos, o para reportar el error a nosotros. Haremos todo lo que podamos para ayudarte.\n\n Para enviar retroalimentación o solicitar una función, puedes acceder a nuestro formulario de contacto desde Menu > Ayuda > Formulario de Contacto. Si tenemos alguna pregunta, ¡te contactaremos para más información!",
    "androidFaqAnswer11": "Si crees que encontraste un error, ve a Menú > Ayuda & FAQ > Conseguir Ayuda para buscar soluciones rápidas, problemas conocidos, o para reportar el error a nosotros. Haremos todo lo que podamos para ayudarte.\n\n Para enviar comentarios o solicitar una función, puedes acceder a nuestro formulario de contacto desde Menu > Ayuda > Formulario de Contacto. Si tenemos alguna pregunta, ¡te contactaremos para más información!",
    "webFaqAnswer11": "Para reportar un error, ve a [Ayuda > Reportar un Error](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) y lee los puntos arriba de la caja de chat. Si no puedes entrar a Habitica, manda tus detalles de acceso (¡no tu contraseña!) a [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). ¡No te preocupes, lo arreglaremos pronto! Las solicitudes de función son colectadas mediante un formulario de Google. Ve a [Ayuda > Solicitar una Función](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) y sigue las instrucciones. ¡Tarán!",
    "faqQuestion12": "¿Cómo peleo contra un Jefe Global?",
-    "iosFaqAnswer12": "Los Jefes Mundiales son monstruos especiales que aparecen en la Taberna. Todos los usuarios activos empiezan a luchar con el Jefe automáticamente y sus tareas y Habilidades harán daño al Jefe como habitualmente.\n\n Puedes estar en una Misión normal al mismo tiempo. Tus tareas y Habilidades contarán tanto para el Jefe Mundial como para las Misiones de Jefe/Recolección de tu Equipo.\n\n Un Jefe Mundial nunca te hará daño en tu cuenta. En vez de eso, tiene una Barra de Ira que se llena cuando los usuarios se saltan tareas Diarias. Si la Barra de Ira se llena, atacará a uno de los Personajes No-Jugadores del sitio, y su imagen cambiará.\n\nPuedes leer más sobre [anteriores Jefes Mundiales](http://habitica.fandom.com/wiki/World_Bosses) en la wiki.",
-    "androidFaqAnswer12": "Los Jefes Mundiales son monstruos especiales que aparecen en la Taberna. Todos los usuarios activos están automáticamente luchando contra el Jefe en el momento de su aparición, y sus tareas y Habilidades le harán daño como siempre.\n\n Puedes estar al mismo tiempo en una Misión normal al mismo tiempo. Tus tareas y Habilidades contarán tanto para el Jefe Mundial como para la Misión de Jefe/Recolección de tu Equipo.\n\n Un Jefe Mundial nunca va a hacer daño a tu cuenta de ninguna manera. En vez de eso, tiene una Barra de Ira que se llena cuando los usuarios se saltan tareas Diarias. Si esta Barra de Ira se llena, el Jefe atacará a uno de los Personajes No Jugadores de Habitica, y su imagen cambiará.\n\n Puedes leer más acerca de [Jefes Mundiales anteriores](http://habitica.fandom.com/wiki/World_Bosses) en la wiki.",
-    "webFaqAnswer12": "Los Jefes Mundiales son monstruos especiales que aparecen en la Taberna. Todos los usuarios activos pasan automáticamente a luchar contra el Monstruo, y sus tareas y Habilidades harán daño al Monstruo, como es habitual. Puedes estar al mismo tiempo en una Misión normal. Tus tareas y Habilidades contarán tanto para el Monstruo Mundial como para la Misión de Jefe/Recolección en tu equipo. Un Monstruo Mundial nunca te hará daño en tu cuenta. En vez de eso, tiene una Barra de Ira que se llena cuando los usuarios se saltan tareas Diarias. Si esta barra se llena, atacará a uno de los Personajes No Jugadores de la web, y su imagen cambiará. Puedes leer más sobre [anteriores Jefes de Mundo](http://habitica.fandom.com/wiki/World_Bosses) en la wiki.",
-    "iosFaqStillNeedHelp": "Si tienes una pregunta que no se encuentra en la lista o en las [Preguntas Frecuentes de la Wiki](http://habitica.fandom.com/wiki/FAQ), ¡pregúntanos en el chat de la Taberna en Menú > Taberna! Estaremos encantados de ayudarte.",
-    "androidFaqStillNeedHelp": "Si tienes alguna pregunta que no esté en la lista o en las [preguntas frecuentes de la Wiki](http://habitica.fandom.com/wiki/FAQ), ¡ven a preguntar al chat de la Taberna, bajo el Menú > Taberna! Estaremos encantados de ayudar.",
-    "webFaqStillNeedHelp": "Si tienes una pregunta que no está en esta lista o en [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), ¡ven y pregunta en el [gremio Habitica Help](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Estamos felices de ayudar."
+    "iosFaqAnswer12": "Los Jefes Mundiales son monstruos especiales que aparecen en la Taberna. Todos los usuarios activos empiezan a luchar con el Jefe automáticamente y sus tareas y Habilidades harán daño al Jefe como habitualmente.\n\n Puedes estar en una Misión normal al mismo tiempo. Tus tareas y Habilidades contarán tanto para el Jefe Mundial como para las Misiones de Jefe/Recolección de tu Equipo.\n\n Un Jefe Mundial nunca te hará daño en tu cuenta. En vez de eso, tiene una Barra de Ira que se llena cuando los usuarios se saltan tareas Diarias. Si la Barra de Ira se llena, atacará a uno de los Personajes No-Jugadores del sitio, y su imagen cambiará.\n\nPuedes leer más sobre [anteriores Jefes Mundiales](https://habitica.fandom.com/wiki/World_Bosses) en la wiki.",
+    "androidFaqAnswer12": "Los Jefes Mundiales son monstruos especiales que aparecen en la Taberna. Todos los usuarios activos están automáticamente luchando contra el Jefe en el momento de su aparición, y sus tareas y Habilidades le harán daño como siempre.\n\n Puedes estar al mismo tiempo en una Misión normal al mismo tiempo. Tus tareas y Habilidades contarán tanto para el Jefe Mundial como para la Misión de Jefe/Recolección de tu Equipo.\n\n Un Jefe Mundial nunca va a hacer daño a tu cuenta de ninguna manera. En vez de eso, tiene una Barra de Ira que se llena cuando los usuarios se saltan tareas Diarias. Si esta Barra de Ira se llena, el Jefe atacará a uno de los Personajes No Jugadores de Habitica, y su imagen cambiará.\n\n Puedes leer más acerca de [Jefes Mundiales anteriores](https://habitica.fandom.com/wiki/World_Bosses) en la wiki.",
+    "webFaqAnswer12": "Los Jefes Mundiales son monstruos especiales que aparecen en la Taberna. Todos los usuarios activos pasan automáticamente a luchar contra el Monstruo, y sus tareas y Habilidades harán daño al Monstruo, como es habitual. Puedes estar al mismo tiempo en una Misión normal. Tus tareas y Habilidades contarán tanto para el Monstruo Mundial como para la Misión de Jefe/Recolección en tu equipo. Un Monstruo Mundial nunca te hará daño en tu cuenta. En vez de eso, tiene una Barra de Ira que se llena cuando los usuarios se saltan tareas Diarias. Si esta barra se llena, atacará a uno de los Personajes No Jugadores de la web, y su imagen cambiará. Puedes leer más sobre [anteriores Jefes de Mundo](https://habitica.fandom.com/wiki/World_Bosses) en la wiki.",
+    "iosFaqStillNeedHelp": "Si tienes una pregunta que no se encuentra en la lista o en las [Preguntas Frecuentes de la Wiki](https://habitica.fandom.com/wiki/FAQ), ¡pregúntanos en el chat de la Taberna en Menú > Taberna! Estaremos encantados de ayudarte.",
+    "androidFaqStillNeedHelp": "Si tienes alguna pregunta que no esté en la lista o en las [preguntas frecuentes de la Wiki](https://habitica.fandom.com/wiki/FAQ), ¡ven a preguntar al chat de la Taberna, bajo el Menú > Taberna! Estaremos encantados de ayudar.",
+    "webFaqStillNeedHelp": "Si tienes una pregunta que no está en esta lista o en [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), ¡ven y pregunta en el [gremio Habitica Help](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Estamos felices de ayudar."
 }
@@ -2433,5 +2433,24 @@
    "weaponSpecialFall2021RogueText": "Baba Escurridiza",
    "weaponSpecialFall2021RogueNotes": "¿En qué desastre te has metido? Cuando la gente dice que los pícaros tienen dedos pegajosos, ¡no se refieren a esto! Incrementa la fuerza en <%= str %>. Equipamiento de Edición Limitada de Otoño 2021.",
    "weaponSpecialFall2021MageNotes": "El conocimiento busca conocimiento. Formada a partir de memorias y deseos, esta temible mano desea aún más. Aumenta la Inteligencia en <%= int %> y la Percepción en <%= per %>. Equipamiento de Edición Limitada de Otoño 2021.",
-    "weaponSpecialFall2021HealerNotes": "Usa esta varita para invocar llamas sanadoras y una criatura fantasmal para ayudarte. Aumenta la Inteligencia en <%= int %>. Equipamiento de Edición Limitada de Otoño 2021."
+    "weaponSpecialFall2021HealerNotes": "Usa esta varita para invocar llamas sanadoras y una criatura fantasmal para ayudarte. Aumenta la Inteligencia en <%= int %>. Equipamiento de Edición Limitada de Otoño 2021.",
+    "weaponSpecialSpring2022RogueText": "Pendiente de Botón Gigante",
+    "weaponSpecialSpring2022RogueNotes": "¡Qué brillante! Es tan brillante y resplandeciente y bonito y lindo y todo tuyo. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2022.",
+    "weaponSpecialSpring2022WarriorText": "Paraguas del Revés",
+    "weaponSpecialSpring2022WarriorNotes": "¡Ay! Supongo que ese viento era un poco más fuerte de lo que pensabas, ¿eh? Aumenta la Fuerza en <%= str %>. Equipamiento de Edición Limitada de Primavera 2022.",
+    "weaponSpecialSpring2022MageText": "Bastón de Forsitia",
+    "weaponSpecialSpring2022MageNotes": "Estas campanillas amarillas brillantes son listas para canalizar tu magia poderosa primaveral. Aumenta la Inteligencia en <%= int %> y la Percepción en <%= per %>. Equipamento de edición limitada de primavera 2022.",
+    "weaponSpecialWinter2022RogueText": "Fuego Artificial de Estrella Fugaz",
+    "weaponSpecialWinter2022RogueNotes": "Los Pícaros adoran la plata y el oro, ¿no? Estos les pegan un montón. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de invierno 2021-2022.",
+    "weaponSpecialWinter2022WarriorText": "Espada Bastón de Caramelo",
+    "weaponSpecialWinter2022WarriorNotes": "¿Con cuántos lametazos se puede afilar este bastón de caramelo para convertirlo en la espada perfecta? Aumenta la fuerza en <%= str %>. Equipamiento de edición limitada de invierno 2021-2022.",
+    "weaponSpecialWinter2022MageText": "Bastón de Granada",
+    "weaponSpecialWinter2022MageNotes": "Los granos de este bastón contienen una magia antigua que puede esgrimirse en invierno. Aumenta la Inteligencia en <%= int %> y la Percepción en <%= per %>. Equipamiento de edición limitada de invierno de 2021-2022.",
+    "weaponSpecialWinter2022HealerText": "Vara de Hielo Cristalino",
+    "weaponSpecialWinter2022HealerNotes": "Si tocas el cuello de un amigo con este artefacto de agua sólida, ¡dará un respingo que se caerá de la silla! Pero luego se sentirán mejor. Esperemos. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2020-2021.",
+    "headSpecialNye2021Text": "Gorro de Fiesta Ridículo",
+    "headSpecialNye2021Notes": "¡Has recibido un Gorro de Fiesta Ridículo! ¡Llévalo con orgullo para dar la bienvenida al Año Nuevo! No otorga ningún beneficio.",
+    "weaponSpecialSpring2022HealerText": "Vara de peridoto",
+    "weaponSpecialSpring2022HealerNotes": "Utiliza esta vara para acceder a las propiedades curativas del peridoto, ya sea para llevar la calma, la positividad, o la bondad. Aumenta la Inteligencia en <%= int %>. Equipamiento de Edición Limitada de Primavera 2022.",
+    "weaponMystery202111Text": "Bastón de Cronomante"
 }
@@ -201,5 +201,17 @@
    "congratulations": "¡Felicitaciones!",
    "onboardingAchievs": "Logros de Integración",
    "options": "Opciones",
-    "finish": "Terminar"
+    "finish": "Terminar",
+    "askQuestion": "Haz una pregunta",
+    "emptyReportBugMessage": "No se ha encontrado mensaje de informe de errores",
+    "reportEmailText": "Esto solo se utilizará para contactar contigo en relación con el informe de error.",
+    "reportBugHeaderDescribe": "Por favor, describe el error que estás experimentando y nuestro equipo se pondrá en contacto contigo.",
+    "reportEmailPlaceholder": "Tu correo electrónico",
+    "reportEmailError": "Por favor, introduzca un correo electrónico válido",
+    "reportDescription": "Descripción",
+    "reportDescriptionText": "Si lo crees conveniente, incluye capturas de pantalla o errores de la consola de Javascript.",
+    "reportDescriptionPlaceholder": "Describe el error detalladamente aquí",
+    "submitBugReport": "Enviar informe de error",
+    "reportSent": "¡Informe de errores enviado!",
+    "reportSentDescription": "Nos pondremos en contacto contigo en cuanto nuestro equipo haya podido estudiarlo. Gracias por informarnos del problema."
 }
@@ -3,8 +3,8 @@
    "step1": "Paso 1: Añade Tareas",
    "webStep1Text": "Habitica no es nada sin objetivos del mundo real, así que ingresa algunas tareas. ¡Puedes agregar más después, a medida que se te ocurran! Todas las tareas se pueden agregar haciendo clic en el botón verde \"Crear\".\n* **Crea [Tareas Pendientes](https://habitica.fandom.com/es/wiki/Pendientes):** Ingresa tareas que realizas una o rara vez en la columna de tareas Pendientes, una a la vez. ¡Puedes hacer clic en las tareas para editarlas y agregar listas, fechas de vencimiento y más!\n* **Crea [Tareas Diarias](https://habitica.fandom.com/es/wiki/Diarias):** Ingresa las actividades que necesitas hacer a diario o en un día determinado de la semana, mes o año en la columna Diarias . Haz clic en la tarea para editar una fecha límite y/o una fecha de inicio. También puedes hacer que sea periódica, por ejemplo, cada 3 días.\n* **Crea [Hábitos](https://habitica.fandom.com/es/wiki/H%C3%A1bitos):** Ingresa los hábitos que deseas establecer en la columna Hábitos. Puedes editar el hábito para convertirlo en un buen hábito :heavy_plus_sign: o un mal hábito :heavy_minus_sign:\n* **Crea [Recompensas](https://habitica.fandom.com/es/wiki/Recompensas):** Además de las Recompensas ofrecidas en el juego, agrega actividades o invitaciones que quieras usar como motivación en la Columna de recompensas ¡Es importante darte un descanso o permitirte cierta indulgencia con moderación!\n* Si necesitas inspiración para crear tareas, puedes mirar las páginas de la wiki en [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies), [Ejemplos de Pendientes](https://habitica.fandom.com/es/wiki/Ejemplos_de_Pendientes), and [Sample Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards).",
    "step2": "Paso 2: Gana Puntos Haciendo Cosas en la Vida Real",
-    "webStep2Text": "Ahora, ¡empieza a trabajar en las metas de tu lista! A medida de que vayas completando tareas marcándolas en Habitica, ganarás [Experiencia](http://habitica.fandom.com/wiki/Experience_Points), que te ayudará a subir de nivel, y [Oro](http://habitica.fandom.com/wiki/Gold_Points), que te permitirá adquirir Recompensas. Si caes en malos hábitos u olvidas tus Tareas Diarias, perderás [Salud](http://habitica.fandom.com/wiki/Health_Points). De esta forma, las barras de Experiencia y Salud de Habitica sirven como divertidos indicadores de progreso hacia tus metas. Empezarás a ver como tu vida real mejora a medida que tu personaje avanza en el juego.",
+    "webStep2Text": "Ahora, ¡empieza a trabajar en las metas de tu lista! A medida de que vayas completando tareas marcándolas en Habitica, ganarás [Experiencia](https://habitica.fandom.com/es/wiki/Puntos_de_Experiencia), que te ayudará a subir de nivel, y [Oro](https://habitica.fandom.com/es/wiki/Oro), que te permitirá adquirir Recompensas. Si caes en malos hábitos u olvidas tus Tareas Diarias, perderás [Salud](https://habitica.fandom.com/wiki/Health_Points). De esta forma, las barras de Experiencia y Salud de Habitica sirven como divertidos indicadores de progreso hacia tus metas. Empezarás a ver como tu vida real mejora a medida que tu personaje avanza en el juego.",
    "step3": "Paso 3: Personaliza y Explora Habitica",
-    "webStep3Text": "Una vez te hayas familiarizado con lo básico, puedes obtener aún más de Habitica con estas ingeniosas funciones:\n * Organiza tus tareas con [etiquetas](http://habitica.fandom.com/wiki/Tags) (edita una Tarea para añadirlas).\n * Personaliza tu [Avatar](http://habitica.fandom.com/wiki/Avatar) haciendo click en el ícono de usuario en la esquina superior derecha.\n * Compra tu [Equipamiento](http://habitica.fandom.com/wiki/Equipment) en Recompensas o en las [Tiendas](<%= shopUrl %>), y cámbialo en [Inventario > Equipamiento](<%= equipUrl %>).\n * Conecta con otros usuarios en la [Taberna](http://habitica.fandom.com/wiki/Tavern).\n * Eclosiona [Mascotas](http://habitica.fandom.com/wiki/Pets) coleccionando [Huevos](http://habitica.fandom.com/wiki/Eggs) y [Pociones de Eclosión](http://habitica.fandom.com/wiki/Hatching_Potions). [Aliméntalas](http://habitica.fandom.com/wiki/Food) para crear [Monturas](http://habitica.fandom.com/wiki/Mounts).\n * En el nivel 10: Elige una [Clase](http://habitica.fandom.com/wiki/Class_System) particular y luego usa [Habilidades](http://habitica.fandom.com/wiki/Skills) específicas de cada una (niveles del 11 al 14).\n * Forma un Equipo con tus amigos (haciendo click en [Equipo](<%= partyUrl %>) en la barra de navegación) para mantenerse responsables y obtén un pergamino de Misión.\n * Derrota monstruos y colecciona objetos en [Misiones](http://habitica.fandom.com/wiki/Quests) (recibirás una misión en el nivel 15).",
+    "webStep3Text": "Una vez te hayas familiarizado con lo básico, puedes obtener aún más de Habitica con estas ingeniosas funciones:\n * Organiza tus tareas con [etiquetas](https://habitica.fandom.com/es/wiki/Etiquetas) (edita una Tarea para añadirlas).\n * Personaliza tu [Avatar](https://habitica.fandom.com/wiki/Avatar) haciendo click en el ícono de usuario en la esquina superior derecha.\n * Compra tu [Equipamiento](https://habitica.fandom.com/wiki/Equipment) en Recompensas o en las [Tiendas](<%= shopUrl %>), y cámbialo en [Inventario > Equipamiento](<%= equipUrl %>).\n * Conecta con otros usuarios en la [Taberna](https://habitica.fandom.com/wiki/Tavern).\n * Eclosiona [Mascotas](https://habitica.fandom.com/es/wiki/Mascotas) coleccionando [Huevos](https://habitica.fandom.com/es/wiki/Huevos) y [Pociones de Eclosión](https://habitica.fandom.com/es/wiki/Pociones_de_Eclosi%C3%B3n). [Aliméntalas](https://habitica.fandom.com/es/wiki/Comida) para crear [Monturas](https://habitica.fandom.com/es/wiki/Monturas).\n * En el nivel 10: Elige una [Clase](https://habitica.fandom.com/wiki/Class_System) particular y luego usa [Habilidades](https://habitica.fandom.com/wiki/Skills) específicas de cada una (niveles del 11 al 14).\n * Forma un Equipo con tus amigos (haciendo click en [Equipo](<%= partyUrl %>) en la barra de navegación) para mantenerse responsables y obtén un pergamino de Misión.\n * Derrota monstruos y colecciona objetos en [Misiones](https://habitica.fandom.com/wiki/Quests) (recibirás una misión en el nivel 15).",
    "overviewQuestions": "¿Tienes preguntas? ¡Revisa las [FAQ](<%= faqUrl %>)! Si tu duda no aparece allí, puedes pedir ayuda en el [Habitica Help guild](<%= helpGuildUrl %>).\n\n¡Buena suerte con tus tareas!"
 }
@@ -39,7 +39,7 @@
    "xml": "(XML)",
    "json": "(JSON)",
    "customDayStart": "Comienzo de día personalizado",
-    "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!",
+    "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í.",
@@ -126,8 +126,8 @@
    "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 : Rat, Vache, Lapin, Serpent, Cheval, Mouton, Singe, Coq, Loup, Tigre, Cochon volant et Dragon !",
-    "achievementBirdsOfAFeatherText": "A collecté tous les familiers volants : Cochon volant, Hibou, Perroquet, Pterodactyle, Griffon, Faucon, Paon et Coq.",
+    "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 !"
 }
@@ -13,7 +13,7 @@
    "companyDonate": "Faire un don",
    "forgotPassword": "Mot de passe oublié ?",
    "emailNewPass": "Envoyer un lien de réinitialisation par courriel",
-    "forgotPasswordSteps": "Entrez l'adresse courriel que vous avez utilisée pour créer votre compte Habitica.",
+    "forgotPasswordSteps": "Entrez votre identifiant ou l'adresse courriel que vous avez utilisée pour créer votre compte Habitica.",
    "sendLink": "Envoyer le lien",
    "featuredIn": "Présenté dans",
    "footerDevs": "Développeurs",
@@ -129,7 +129,7 @@
    "passwordConfirmationMatch": "La confirmation du mot de passe ne correspond pas au mot de passe.",
    "invalidLoginCredentials": "Identifiant, courriel ou mot de passe incorrect.",
    "passwordResetPage": "Réinitialiser le mot de passe",
-    "passwordReset": "Si nous avons votre courriel dans nos fichiers, un nouveau mot de passe vous a été envoyé.",
+    "passwordReset": "Si nous avons votre courriel ou votre identifiant dans nos fichiers, un nouveau mot de passe vous a été envoyé.",
    "passwordResetEmailSubject": "Mot de passe réinitialisé pour Habitica",
    "passwordResetEmailText": "Si vous avez demandé une réinitialisation de mot de passe pour <%= username %> sur Habitica, rendez-vous sur <%= passwordResetLink %> pour en définir un nouveau. Le lien expirera après 24 heures. Si vous n'avez pas demandé de réinitialisation, vous pouvez ignorer ce courriel.",
    "passwordResetEmailHtml": "Si vous avez demandé une réinitialisation de mot de passe pour <strong><%= username %></strong> sur Habitica, rendez-vous sur <a href=\"<%= passwordResetLink %>\"> ce lien</a> pour en définir un nouveau. Le lien expirera après 24 heures.<br/><br>Si vous n'avez pas demandé de réinitialisation, vous pouvez ignorer ce courriel.",
@@ -150,7 +150,7 @@
    "confirmPassword": "Confirmer le mot de passe",
    "usernameLimitations": "L'identifiant doit faire de 1 à 20 caractères, contenir des lettres de a à z, des chiffres de 0 à 9, des traits d'union et/ou des tirets bas, et ne peut contenir de mot grossier.",
    "usernamePlaceholder": "par exemple Wasabitica",
-    "emailPlaceholder": "par exemple wasabi@exemple.com",
+    "emailPlaceholder": "par exemple gryphon@exemple.com",
    "passwordPlaceholder": "par exemple ******************",
    "confirmPasswordPlaceholder": "Assurez-vous qu'il s'agit du même mot de passe !",
    "joinHabitica": "Rejoindre Habitica",
@@ -186,5 +186,6 @@
    "communityInstagram": "Instagram",
    "minPasswordLength": "Le mot de passe doit faire au moins 8 caractères.",
    "enterHabitica": "Entrez dans Habitica",
-    "socialAlreadyExists": "Cet identifiant social est déjà lié à un compte Habitica existant."
+    "socialAlreadyExists": "Cet identifiant social est déjà lié à un compte Habitica existant.",
+    "emailUsernamePlaceholder": "par exemple habitrabbit ou gryphon@example.com"
 }
@@ -2603,7 +2603,7 @@
    "weaponSpecialSpring2022HealerNotes": "Utilisez cette baguette pour profiter des propriétés régénérantes du péridot, que ce soit pour apporter du calme, de la positivité ou de la gaieté de cœur. Augmente l'intelligence de <%= int %>. Équipement en édition limitée du printemps 2022.",
    "armorSpecialSpring2022RogueNotes": "Avec des taches iridescentes bleu-gris métallique et des taches plus claires sur vos plumes, vous serez le meilleur ami volant à la fête du printemps ! Augmente la perception de <%= per %>. Équipement en édition limitée du printemps 2022.",
    "armorSpecialSpring2022MageNotes": "Montrez que vous vous apprêtez à sauter dans cette nouvelle saison avec cette robe ornée de pétales de forsythia. Augmente l'intelligence de <%= int %>. Équipement en édition limitée du printemps 2022.",
-    "armorSpecialSpring2022HealerNotes": " Faites fuir les peurs et les cauchemars en portant ces vêtement de gemme verte. Augmente la constitution de <%= con %>. Équipement en édition limitée du printemps 2022.",
+    "armorSpecialSpring2022HealerNotes": "Faites fuir les peurs et les cauchemars en portant ces vêtement de gemme verte. Augmente la constitution de <%= con %>. Équipement en édition limitée du printemps 2022.",
    "armorSpecialSpring2022RogueText": "Costume de pie",
    "headSpecialSpring2022RogueNotes": "Faites preuve d'autant d'intelligence qu'une pie en portant ce masque. Peut-être serez vous également capable de siffler, de triller et d'imitée comme l'une d'elles, aussi. Augmente la perception de <%= per %>. Équipement en édition limitée du printemps 2022.",
    "headSpecialSpring2022MageNotes": "Restez au sec pendant les pluies diluviennes avec ce casque protecteur avec des rebords à pétales. Augmente la perception de <%= per %>. Équipement en édition limitée du printemps 2022.",
@@ -42,7 +42,7 @@
    "sureChangeCustomDayStartTime": "Voulez-vous vraiment changer l'heure personnalisée de début de journée ? Vos quotidiennes seront réinitialisées la prochaine fois que vous utiliserez Habitica après <%= time %>. Faites attention à les avoir complétées d'ici là !",
    "customDayStartHasChanged": "Votre heure personnalisée de début de journée a été changée.",
    "nextCron": "Vos tâches quotidiennes seront réinitialisées la prochaine fois que vous utiliserez Habitica après <%= time %>. Faites attention à compléter vos tâches quotidiennes avant cette heure !",
-    "customDayStartInfo1": "Par défaut, Habitica vérifie et réinitialise vos tâches quotidiennes à minuit dans votre fuseau horaire. Vous pouvez personnaliser cette heure ici.",
+    "customDayStartInfo1": "Habitica vérifie et réinitialise vos tâches quotidiennes à minuit dans votre fuseau horaire. Vous pouvez ajuster cette heure ici.",
    "misc": "Divers",
    "showHeader": "Montrer le bandeau",
    "changePass": "Changer le mot de passe",
@@ -159,7 +159,7 @@
    "amazonPayments": "Paiments Amazon",
    "amazonPaymentsRecurring": "Cocher la case ci-dessous est nécessaire pour créer votre abonnement. Cela permet à votre compte Amazon d'être utilisé pour les paiements en cours de <strong>cet</strong> abonnement. Cela n'utilisera pas automatiquement votre compte Amazon pour de futurs achats.",
    "timezone": "Fuseau horaire",
-    "timezoneUTC": "Habitica utilise le fuseau horaire réglé sur votre PC, qui est le suivant : <strong><%= utc %></strong>",
+    "timezoneUTC": "Votre fuseau horaire est défini par votre ordinateur, avec la valeur suivante : <strong><%= utc %></strong>",
    "timezoneInfo": "Si ce n'est pas le bon fuseau horaire, commencez par actualiser la page en utilisant le bouton Actualiser de votre navigateur, pour vous assurer qu'Habitica est à jour. Si ce n'est toujours pas le bon, réglez le fuseau horaire sur votre PC et actualisez cette page à nouveau. <br><br><strong>Si vous utilisez Habitica sur d'autres PC ou appareils mobiles, le fuseau horaire doit être le même sur tous.</strong> Si vos quotidiennes continuent d'être réinitialisées à la mauvaise heure, répétez cette vérification sur tous les PCs que vous utilisez et sur le navigateur de vos appareils mobiles.",
    "push": "Notification push",
    "about": "À propos",
@@ -209,5 +209,11 @@
    "transaction_create_challenge": "Créé un défi",
    "transaction_change_class": "Changé de classe",
    "transaction_rebirth": "Utilisé l'orbe de résurrection",
-    "transaction_release_pets": "Libéré les familiers"
+    "transaction_release_pets": "Libéré les familiers",
+    "addPasswordAuth": "Ajouter le mot de passe",
+    "gemCap": "Limite de gemmes",
+    "nextHourglass": "Prochain sablier",
+    "nextHourglassDescription": "Les abonnés reçoivent des sabliers mystiques\nlors des trois premiers jours de chaque mois.",
+    "dayStartAdjustment": "Ajustement de début de journée",
+    "adjustment": "Ajustement"
 }
@@ -3,8 +3,8 @@
    "onwards": "הלאה!",
    "levelup": "על ידי ביצוע משימות מחייך האמיתיים, עלית רמה והחיים שלך עכשיו מלאים!",
    "reachedLevel": "הגעת לשלב <%= level %>",
-    "achievementLostMasterclasser": "Quest Completionist: Masterclasser Series",
-    "achievementLostMasterclasserText": "Completed all sixteen quests in the Masterclasser Quest Series and solved the mystery of the Lost Masterclasser!",
+    "achievementLostMasterclasser": "",
+    "achievementLostMasterclasserText": "",
    "viewAchievements": "הצגת ההישגים",
    "letsGetStarted": "בואו נתחיל!",
    "yourProgress": "ההתקדמות שלך",
@@ -78,5 +78,16 @@
    "achievementGoodAsGoldText": "אסף את כל החיות הזהב",
    "achievementSeasonalSpecialistModalText": "השלמת את כל המשימות העונתיות!",
    "achievementShadyCustomer": "לקוח חשוד",
-    "achievementShadeOfItAll": "הצל של הכל"
+    "achievementShadeOfItAll": "הצל של הכל",
+    "achievementSeeingRedModalText": "אספת את כל חיות המחמד האדומות!",
+    "achievementGoodAsGoldModalText": "אספת את כל חיות המחמד המוזהבות!",
+    "achievementRedLetterDayText": "אולפו כל חיות הרכיבה האדומות.",
+    "achievementAllThatGlittersText": "אולפו כל חיות הרכיבה המוזהבות.",
+    "achievementBoneCollectorModalText": "אספת את כל חיות המחמד מסוג שלד!",
+    "achievementSeeingRedText": "נאספו כל חיות המחמד האדומות.",
+    "achievementAllThatGlittersModalText": "אילפת את כל חיות הרכיבה המוזהבות!",
+    "achievementSkeletonCrewModalText": "אילפת את כל חיות הרכיבה מסוג שלד!",
+    "achievementBoneCollectorText": "נאספו כל חיות המחמד מסוג שלד.",
+    "achievementRedLetterDayModalText": "אילפת את כל חיות הרכיבה האדומות!",
+    "achievementSkeletonCrewText": "אולפו כל חיות הרכיבה מסוג שלד."
 }
@@ -202,145 +202,145 @@
    "backgroundOrchardNotes": "קטפו פירות טריים בפרדס.",
    "backgrounds102016": "סט 29: פורסם באוקטובר 2016",
    "backgroundSpiderWebText": "קורי עכביש",
-    "backgroundSpiderWebNotes": "Get snagged in a Spider Web.",
+    "backgroundSpiderWebNotes": "",
    "backgroundStrangeSewersText": "ביובים משונים",
    "backgroundStrangeSewersNotes": "זחול דרך ביובים משונים",
    "backgroundRainyCityText": "עיר גשומה",
-    "backgroundRainyCityNotes": "Splash through a Rainy City.",
-    "backgrounds112016": "SET 30: Released November 2016",
+    "backgroundRainyCityNotes": "",
+    "backgrounds112016": "",
    "backgroundMidnightCloudsText": "ענני חצות הלילה",
    "backgroundMidnightCloudsNotes": "עוף דרך ענני חצות הלילה",
    "backgroundStormyRooftopsText": "גגות סוערות",
-    "backgroundStormyRooftopsNotes": "Creep across Stormy Rooftops.",
-    "backgroundWindyAutumnText": "Windy Autumn",
-    "backgroundWindyAutumnNotes": "Chase leaves during a Windy Autumn.",
-    "incentiveBackgrounds": "Plain Background Set",
+    "backgroundStormyRooftopsNotes": "",
+    "backgroundWindyAutumnText": "",
+    "backgroundWindyAutumnNotes": "",
+    "incentiveBackgrounds": "",
    "backgroundVioletText": "סגול בהיר",
-    "backgroundVioletNotes": "A vibrant violet backdrop.",
+    "backgroundVioletNotes": "",
    "backgroundBlueText": "כחול",
    "backgroundBlueNotes": "רקע כחול בסיסי.",
    "backgroundGreenText": "ירוק",
-    "backgroundGreenNotes": "A great green backdrop.",
+    "backgroundGreenNotes": "",
    "backgroundPurpleText": "סגול",
-    "backgroundPurpleNotes": "A pleasant purple backdrop.",
+    "backgroundPurpleNotes": "",
    "backgroundRedText": "אדום",
-    "backgroundRedNotes": "A rad red backdrop.",
+    "backgroundRedNotes": "",
    "backgroundYellowText": "צהוב",
    "backgroundYellowNotes": "A yummy yellow backdrop.",
    "backgrounds122016": "סט 31: פורסם בדצמבר 2016",
-    "backgroundShimmeringIcePrismText": "Shimmering Ice Prisms",
-    "backgroundShimmeringIcePrismNotes": "Dance through the Shimmering Ice Prisms.",
+    "backgroundShimmeringIcePrismText": "",
+    "backgroundShimmeringIcePrismNotes": "",
    "backgroundWinterFireworksText": "זיקוקי חורף",
-    "backgroundWinterFireworksNotes": "Set off Winter Fireworks.",
+    "backgroundWinterFireworksNotes": "",
    "backgroundWinterStorefrontText": "חנות חורף",
-    "backgroundWinterStorefrontNotes": "Purchase presents from a Winter Shop.",
-    "backgrounds012017": "SET 32: Released January 2017",
+    "backgroundWinterStorefrontNotes": "",
+    "backgrounds012017": "",
    "backgroundBlizzardText": "סופה",
-    "backgroundBlizzardNotes": "Brave a fierce Blizzard.",
-    "backgroundSparklingSnowflakeText": "Sparkling Snowflake",
-    "backgroundSparklingSnowflakeNotes": "Glide on a Sparkling Snowflake.",
-    "backgroundStoikalmVolcanoesText": "Stoïkalm Volcanoes",
-    "backgroundStoikalmVolcanoesNotes": "Explore the Stoïkalm Volcanoes.",
-    "backgrounds022017": "SET 33: Released February 2017",
-    "backgroundBellTowerText": "Bell Tower",
-    "backgroundBellTowerNotes": "Climb to the Bell Tower.",
+    "backgroundBlizzardNotes": "",
+    "backgroundSparklingSnowflakeText": "",
+    "backgroundSparklingSnowflakeNotes": "",
+    "backgroundStoikalmVolcanoesText": "",
+    "backgroundStoikalmVolcanoesNotes": "",
+    "backgrounds022017": "",
+    "backgroundBellTowerText": "",
+    "backgroundBellTowerNotes": "",
    "backgroundTreasureRoomText": "חדר האוצרות",
-    "backgroundTreasureRoomNotes": "Bask in the wealth of a Treasure Room.",
-    "backgroundWeddingArchText": "Wedding Arch",
-    "backgroundWeddingArchNotes": "Pose under the Wedding Arch.",
-    "backgrounds032017": "SET 34: Released March 2017",
-    "backgroundMagicBeanstalkText": "Magic Beanstalk",
-    "backgroundMagicBeanstalkNotes": "Ascend a Magic Beanstalk.",
-    "backgroundMeanderingCaveText": "Meandering Cave",
-    "backgroundMeanderingCaveNotes": "Explore the Meandering Cave.",
-    "backgroundMistiflyingCircusText": "Mistiflying Circus",
-    "backgroundMistiflyingCircusNotes": "Carouse in the Mistiflying Circus.",
-    "backgrounds042017": "SET 35: Released April 2017",
-    "backgroundBugCoveredLogText": "Bug-Covered Log",
-    "backgroundBugCoveredLogNotes": "Investigate a Bug-Covered Log.",
-    "backgroundGiantBirdhouseText": "Giant Birdhouse",
-    "backgroundGiantBirdhouseNotes": "Perch in a Giant Birdhouse.",
-    "backgroundMistShroudedMountainText": "Mist-Shrouded Mountain",
-    "backgroundMistShroudedMountainNotes": "Summit a Mist-Shrouded Mountain.",
-    "backgrounds052017": "SET 36: Released May 2017",
-    "backgroundGuardianStatuesText": "Guardian Statues",
-    "backgroundGuardianStatuesNotes": "Stand vigil in front of Guardian Statues.",
-    "backgroundHabitCityStreetsText": "Habit City Streets",
-    "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
-    "backgroundOnATreeBranchText": "On a Tree Branch",
-    "backgroundOnATreeBranchNotes": "Perch On a Tree Branch.",
-    "backgrounds062017": "SET 37: Released June 2017",
+    "backgroundTreasureRoomNotes": "",
+    "backgroundWeddingArchText": "",
+    "backgroundWeddingArchNotes": "",
+    "backgrounds032017": "",
+    "backgroundMagicBeanstalkText": "",
+    "backgroundMagicBeanstalkNotes": "",
+    "backgroundMeanderingCaveText": "",
+    "backgroundMeanderingCaveNotes": "",
+    "backgroundMistiflyingCircusText": "",
+    "backgroundMistiflyingCircusNotes": "",
+    "backgrounds042017": "",
+    "backgroundBugCoveredLogText": "",
+    "backgroundBugCoveredLogNotes": "",
+    "backgroundGiantBirdhouseText": "",
+    "backgroundGiantBirdhouseNotes": "",
+    "backgroundMistShroudedMountainText": "",
+    "backgroundMistShroudedMountainNotes": "",
+    "backgrounds052017": "",
+    "backgroundGuardianStatuesText": "",
+    "backgroundGuardianStatuesNotes": "",
+    "backgroundHabitCityStreetsText": "",
+    "backgroundHabitCityStreetsNotes": "",
+    "backgroundOnATreeBranchText": "",
+    "backgroundOnATreeBranchNotes": "",
+    "backgrounds062017": "",
    "backgroundBuriedTreasureText": "אוצר קבור",
-    "backgroundBuriedTreasureNotes": "Unearth Buried Treasure.",
-    "backgroundOceanSunriseText": "Ocean Sunrise",
-    "backgroundOceanSunriseNotes": "Admire an Ocean Sunrise.",
+    "backgroundBuriedTreasureNotes": "",
+    "backgroundOceanSunriseText": "",
+    "backgroundOceanSunriseNotes": "",
    "backgroundSandcastleText": "ארמון חול",
-    "backgroundSandcastleNotes": "Rule over a Sandcastle.",
+    "backgroundSandcastleNotes": "",
    "backgrounds072017": "SET 38: Released July 2017",
-    "backgroundGiantSeashellText": "Giant Seashell",
-    "backgroundGiantSeashellNotes": "Lounge in a Giant Seashell.",
-    "backgroundKelpForestText": "Kelp Forest",
-    "backgroundKelpForestNotes": "Swim through a Kelp Forest.",
-    "backgroundMidnightLakeText": "Midnight Lake",
-    "backgroundMidnightLakeNotes": "Rest by a Midnight Lake.",
-    "backgrounds082017": "SET 39: Released August 2017",
-    "backgroundBackOfGiantBeastText": "Back of a Giant Beast",
-    "backgroundBackOfGiantBeastNotes": "Ride on the Back of a Giant Beast.",
+    "backgroundGiantSeashellText": "",
+    "backgroundGiantSeashellNotes": "",
+    "backgroundKelpForestText": "יער האצות",
+    "backgroundKelpForestNotes": "שחייה ביער האצות.",
+    "backgroundMidnightLakeText": "",
+    "backgroundMidnightLakeNotes": "",
+    "backgrounds082017": "",
+    "backgroundBackOfGiantBeastText": "",
+    "backgroundBackOfGiantBeastNotes": "",
    "backgroundDesertDunesText": "דיונות מדבר",
-    "backgroundDesertDunesNotes": "Boldly explore the Desert Dunes.",
+    "backgroundDesertDunesNotes": "",
    "backgroundSummerFireworksText": "זיקוקי קיץ",
-    "backgroundSummerFireworksNotes": "Celebrate Habitica's Naming Day with Summer Fireworks!",
-    "backgrounds092017": "SET 40: Released September 2017",
-    "backgroundBesideWellText": "Beside a Well",
-    "backgroundBesideWellNotes": "Stroll Beside a Well.",
-    "backgroundGardenShedText": "Garden Shed",
-    "backgroundGardenShedNotes": "Work in a Garden Shed.",
-    "backgroundPixelistsWorkshopText": "Pixelist's Workshop",
-    "backgroundPixelistsWorkshopNotes": "Create masterpieces in the Pixelist's Workshop.",
-    "backgrounds102017": "SET 41: Released October 2017",
-    "backgroundMagicalCandlesText": "Magical Candles",
+    "backgroundSummerFireworksNotes": "",
+    "backgrounds092017": "",
+    "backgroundBesideWellText": "",
+    "backgroundBesideWellNotes": "",
+    "backgroundGardenShedText": "",
+    "backgroundGardenShedNotes": "",
+    "backgroundPixelistsWorkshopText": "",
+    "backgroundPixelistsWorkshopNotes": "",
+    "backgrounds102017": "",
+    "backgroundMagicalCandlesText": "נרות קסומים",
    "backgroundMagicalCandlesNotes": "Bask in the glow of Magical Candles.",
-    "backgroundSpookyHotelText": "Spooky Hotel",
+    "backgroundSpookyHotelText": "מלון מפחיד",
    "backgroundSpookyHotelNotes": "Sneak down the hall of a Spooky Hotel.",
-    "backgroundTarPitsText": "Tar Pits",
-    "backgroundTarPitsNotes": "Tiptoe through the Tar Pits.",
-    "backgrounds112017": "SET 42: Released November 2017",
-    "backgroundFiberArtsRoomText": "Fiber Arts Room",
-    "backgroundFiberArtsRoomNotes": "Spin thread in a Fiber Arts Room.",
-    "backgroundMidnightCastleText": "Midnight Castle",
-    "backgroundMidnightCastleNotes": "Stroll by the Midnight Castle.",
+    "backgroundTarPitsText": "",
+    "backgroundTarPitsNotes": "",
+    "backgrounds112017": "",
+    "backgroundFiberArtsRoomText": "",
+    "backgroundFiberArtsRoomNotes": "",
+    "backgroundMidnightCastleText": "",
+    "backgroundMidnightCastleNotes": "",
    "backgroundTornadoText": "טורנדו",
    "backgroundTornadoNotes": "עוף דרך טורנדו.",
    "backgrounds122017": "סט 43: שוחרר בדצמבר 2017",
-    "backgroundCrosscountrySkiTrailText": "Cross-Country Ski Trail",
-    "backgroundCrosscountrySkiTrailNotes": "Glide along a Cross-Country Ski Trail.",
-    "backgroundStarryWinterNightText": "Starry Winter Night",
-    "backgroundStarryWinterNightNotes": "Admire a Starry Winter Night.",
-    "backgroundToymakersWorkshopText": "Toymaker's Workshop",
-    "backgroundToymakersWorkshopNotes": "Bask in the wonder of a Toymaker's Workshop.",
+    "backgroundCrosscountrySkiTrailText": "",
+    "backgroundCrosscountrySkiTrailNotes": "",
+    "backgroundStarryWinterNightText": "",
+    "backgroundStarryWinterNightNotes": "",
+    "backgroundToymakersWorkshopText": "",
+    "backgroundToymakersWorkshopNotes": "",
    "backgrounds012018": "סט 44: שוחרר בינואר 2018",
    "backgroundAuroraText": "Aurora",
-    "backgroundAuroraNotes": "Bask in the wintry glow of an Aurora.",
-    "backgroundDrivingASleighText": "Sleigh",
-    "backgroundDrivingASleighNotes": "Drive a Sleigh over snow-covered fields.",
-    "backgroundFlyingOverIcySteppesText": "Icy Steppes",
-    "backgroundFlyingOverIcySteppesNotes": "Fly over Icy Steppes.",
+    "backgroundAuroraNotes": "",
+    "backgroundDrivingASleighText": "",
+    "backgroundDrivingASleighNotes": "",
+    "backgroundFlyingOverIcySteppesText": "",
+    "backgroundFlyingOverIcySteppesNotes": "",
    "backgrounds022018": "סט 45: שוחרר בפברואר 2018",
-    "backgroundChessboardLandText": "Chessboard Land",
-    "backgroundChessboardLandNotes": "Play a game in Chessboard Land.",
+    "backgroundChessboardLandText": "",
+    "backgroundChessboardLandNotes": "",
    "backgroundMagicalMuseumText": "מוזיאן קסום",
-    "backgroundMagicalMuseumNotes": "Tour a Magical Museum.",
-    "backgroundRoseGardenText": "Rose Garden",
-    "backgroundRoseGardenNotes": "Dally in a fragrant Rose Garden.",
-    "backgrounds032018": "SET 46: Released March 2018",
-    "backgroundGorgeousGreenhouseText": "Gorgeous Greenhouse",
+    "backgroundMagicalMuseumNotes": "",
+    "backgroundRoseGardenText": "גן הוורדים",
+    "backgroundRoseGardenNotes": "",
+    "backgrounds032018": "",
+    "backgroundGorgeousGreenhouseText": "",
    "backgroundGorgeousGreenhouseNotes": "Walk among the flora kept in a Gorgeous Greenhouse.",
-    "backgroundElegantBalconyText": "Elegant Balcony",
-    "backgroundElegantBalconyNotes": "Look out over the landscape from an Elegant Balcony.",
+    "backgroundElegantBalconyText": "",
+    "backgroundElegantBalconyNotes": "",
    "backgroundDrivingACoachText": "Driving a Coach",
-    "backgroundDrivingACoachNotes": "Enjoy Driving a Coach past fields of flowers.",
-    "backgrounds042018": "SET 47: Released April 2018",
-    "backgroundTulipGardenText": "Tulip Garden",
+    "backgroundDrivingACoachNotes": "",
+    "backgrounds042018": "",
+    "backgroundTulipGardenText": "גן הצבעונים",
    "backgroundTulipGardenNotes": "Tiptoe through a Tulip Garden.",
    "backgroundFlyingOverWildflowerFieldText": "Field of Wildflowers",
    "backgroundFlyingOverWildflowerFieldNotes": "Soar above a Field of Wildflowers.",
@@ -349,66 +349,66 @@
    "backgrounds052018": "SET 48: Released May 2018",
    "backgroundTerracedRiceFieldText": "Terraced Rice Field",
    "backgroundTerracedRiceFieldNotes": "Enjoy a Terraced Rice Field in the growing season.",
-    "backgroundFantasticalShoeStoreText": "Fantastical Shoe Store",
-    "backgroundFantasticalShoeStoreNotes": "Look for fun new footwear in the Fantastical Shoe Store.",
-    "backgroundChampionsColosseumText": "Champions' Colosseum",
-    "backgroundChampionsColosseumNotes": "Bask in the glory of the Champions' Colosseum.",
-    "backgrounds062018": "SET 49: Released June 2018",
-    "backgroundDocksText": "Docks",
-    "backgroundDocksNotes": "Fish from atop the Docks.",
-    "backgroundRowboatText": "Rowboat",
-    "backgroundRowboatNotes": "Sing rounds in a Rowboat.",
+    "backgroundFantasticalShoeStoreText": "",
+    "backgroundFantasticalShoeStoreNotes": "",
+    "backgroundChampionsColosseumText": "",
+    "backgroundChampionsColosseumNotes": "",
+    "backgrounds062018": "",
+    "backgroundDocksText": "",
+    "backgroundDocksNotes": "",
+    "backgroundRowboatText": "",
+    "backgroundRowboatNotes": "",
    "backgroundPirateFlagText": "דגל שודדי ים",
-    "backgroundPirateFlagNotes": "Fly a fearsome Pirate Flag.",
-    "backgrounds072018": "SET 50: Released July 2018",
-    "backgroundDarkDeepText": "Dark Deep",
-    "backgroundDarkDeepNotes": "Swim in the Dark Deep among bioluminescent critters.",
-    "backgroundDilatoryCityText": "City of Dilatory",
-    "backgroundDilatoryCityNotes": "Meander through the undersea City of Dilatory.",
-    "backgroundTidePoolText": "Tide Pool",
+    "backgroundPirateFlagNotes": "",
+    "backgrounds072018": "",
+    "backgroundDarkDeepText": "עמוק בחשכה",
+    "backgroundDarkDeepNotes": "",
+    "backgroundDilatoryCityText": "",
+    "backgroundDilatoryCityNotes": "",
+    "backgroundTidePoolText": "",
    "backgroundTidePoolNotes": "Observe the ocean life near a Tide Pool.",
    "backgrounds082018": "SET 51: Released August 2018",
-    "backgroundTrainingGroundsText": "Training Grounds",
-    "backgroundTrainingGroundsNotes": "Spar on the Training Grounds.",
+    "backgroundTrainingGroundsText": "",
+    "backgroundTrainingGroundsNotes": "",
    "backgroundFlyingOverRockyCanyonText": "Rocky Canyon",
-    "backgroundFlyingOverRockyCanyonNotes": "Look down into a breathtaking scene as you fly over a Rocky Canyon.",
-    "backgroundBridgeText": "Bridge",
-    "backgroundBridgeNotes": "Cross a charming Bridge.",
-    "backgrounds092018": "SET 52: Released September 2018",
+    "backgroundFlyingOverRockyCanyonNotes": "",
+    "backgroundBridgeText": "גשר",
+    "backgroundBridgeNotes": "",
+    "backgrounds092018": "",
    "backgroundApplePickingText": "Apple Picking",
-    "backgroundApplePickingNotes": "Go Apple Picking and bring home a bushel.",
-    "backgroundGiantBookText": "Giant Book",
-    "backgroundGiantBookNotes": "Read as you walk through the pages of a Giant Book.",
-    "backgroundCozyBarnText": "Cozy Barn",
+    "backgroundApplePickingNotes": "",
+    "backgroundGiantBookText": "",
+    "backgroundGiantBookNotes": "",
+    "backgroundCozyBarnText": "",
    "backgroundCozyBarnNotes": "Relax with your pets and mounts in their Cozy Barn.",
    "backgrounds102018": "SET 53: Released October 2018",
    "backgroundBayouText": "Bayou",
    "backgroundBayouNotes": "Bask in the fireflies' glow on the misty Bayou.",
    "backgroundCreepyCastleText": "Creepy Castle",
    "backgroundCreepyCastleNotes": "Dare to approach a Creepy Castle.",
-    "backgroundDungeonText": "Dungeon",
+    "backgroundDungeonText": "מבוך",
    "backgroundDungeonNotes": "Rescue the prisoners of a spooky Dungeon.",
    "backgrounds112018": "SET 54: Released November 2018",
-    "backgroundBackAlleyText": "Back Alley",
-    "backgroundBackAlleyNotes": "Look shady loitering in a Back Alley.",
+    "backgroundBackAlleyText": "",
+    "backgroundBackAlleyNotes": "",
    "backgroundGlowingMushroomCaveText": "Glowing Mushroom Cave",
-    "backgroundGlowingMushroomCaveNotes": "Stare in awe at a Glowing Mushroom Cave.",
-    "backgroundCozyBedroomText": "Cozy Bedroom",
-    "backgroundCozyBedroomNotes": "Curl up in a Cozy Bedroom.",
+    "backgroundGlowingMushroomCaveNotes": "",
+    "backgroundCozyBedroomText": "",
+    "backgroundCozyBedroomNotes": "",
    "backgrounds122018": "SET 55: Released December 2018",
-    "backgroundFlyingOverSnowyMountainsText": "Snowy Mountains",
-    "backgroundFlyingOverSnowyMountainsNotes": "Soar over Snowy Mountains at night.",
-    "backgroundFrostyForestText": "Frosty Forest",
-    "backgroundFrostyForestNotes": "Bundle up to hike through a Frosty Forest.",
-    "backgroundSnowyDayFireplaceText": "Snowy Day Fireplace",
-    "backgroundSnowyDayFireplaceNotes": "Snuggle up next to a Fireplace on a Snowy Day.",
-    "backgrounds012019": "SET 56: Released January 2019",
-    "backgroundAvalancheText": "Avalanche",
-    "backgroundAvalancheNotes": "Flee the thundering might of an Avalanche.",
-    "backgroundArchaeologicalDigText": "Archaeological Dig",
-    "backgroundArchaeologicalDigNotes": "Unearth secrets of the ancient past at an Archaeological Dig.",
-    "backgroundScribesWorkshopText": "Scribe's Workshop",
-    "backgroundScribesWorkshopNotes": "Write your next great scroll in a Scribe's Workshop.",
+    "backgroundFlyingOverSnowyMountainsText": "הרים מושלגים",
+    "backgroundFlyingOverSnowyMountainsNotes": "",
+    "backgroundFrostyForestText": "",
+    "backgroundFrostyForestNotes": "",
+    "backgroundSnowyDayFireplaceText": "",
+    "backgroundSnowyDayFireplaceNotes": "",
+    "backgrounds012019": "",
+    "backgroundAvalancheText": "",
+    "backgroundAvalancheNotes": "",
+    "backgroundArchaeologicalDigText": "",
+    "backgroundArchaeologicalDigNotes": "",
+    "backgroundScribesWorkshopText": "",
+    "backgroundScribesWorkshopNotes": "",
    "backgrounds022019": "סט 57: שוחרר בפבואר 2019",
    "backgroundMedievalKitchenText": "מטבח ימי הבניים",
    "backgroundMedievalKitchenNotes": "מבשלים סערה במטבח מימי הביניים.",
@@ -64,12 +64,12 @@
    "noChallengeTitle": "אין לך שום אתגרים.",
    "challengeDescription1": "אתגרים הם אירועים של הקהילה בהם שחקנים מתחרים וזוכים בפרסים על ידי השלמת קבוצה של מטלות הקשורות זו לזו.",
    "challengeDescription2": "מצא אתגרים מומלצים לך לפי תחומי העניין שלך, חפש אתגרים פומביים של הביטיקה, או תיצור אתגרים משלך.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "",
    "createdBy": "נוצר על ידי",
    "joinChallenge": "הצטרף לאתגר",
-    "leaveChallenge": "עזוב את האתגר",
+    "leaveChallenge": "עזיבת האתגר",
    "addTask": "הוסף משימה",
-    "editChallenge": "ערוך אתגר",
+    "editChallenge": "עריכת אתגר",
    "challengeDescription": "תיאור האתגר",
    "selectChallengeWinnersDescription": "בחר מנצח ממשתתפי האתגר",
    "awardWinners": "זוכה הפרס",
@@ -88,7 +88,7 @@
    "haveNoChallenges": "לקבוצה זו אין אתגרים",
    "loadMore": "טען עוד",
    "exportChallengeCsv": "ייצא אתגר",
-    "editingChallenge": "Editing Challenge",
+    "editingChallenge": "עריכת האתגר",
    "nameRequired": "שם דרוש",
    "tagTooShort": "תג השם קצר מדי",
    "summaryRequired": "סיכום דרוש",
@@ -100,5 +100,9 @@
    "viewProgress": "ראה התקדמות",
    "selectMember": "בחר משתתף",
    "confirmKeepChallengeTasks": "לשמור את מטלות האתגר?",
-    "selectParticipant": "בחר משתתף"
+    "selectParticipant": "בחר משתתף",
+    "yourReward": "הפרס שלך",
+    "filters": "סינון",
+    "wonChallengeDesc": "ניצחת באתגר \"<%= challengeName %>\"! הניצחון שלך נרשם בהישגים שלך.",
+    "removeTasks": "הסרת המשימות"
 }
@@ -1,5 +1,5 @@
 {
-    "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the <a href='https://habitica.com/static/community-guidelines' target='_blank'>Community Guidelines</a> (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email <%= hrefBlankCommunityManagerEmail %>!",
+    "communityGuidelinesWarning": "",
    "profile": "פרופיל",
    "avatar": "התאמת הדמות",
    "editAvatar": "עריכת הדמות",
@@ -31,13 +31,13 @@
    "glasses": "משקפיים",
    "hairSet1": "סדרת תסרוקות 1",
    "hairSet2": "סדרת תסרוקות 2",
-    "hairSet3": "Hairstyle Set 3",
+    "hairSet3": "",
    "bodyFacialHair": "שיער פנים",
    "beard": "זקן",
    "mustache": "שפם",
    "flower": "פרח",
-    "accent": "Accent",
-    "headband": "Headband",
+    "accent": "",
+    "headband": "",
    "wheelchair": "כיסא גלגלים",
    "extra": "אקסטרה",
    "rainbowSkins": "עורות בצבעי הקשת",
@@ -45,7 +45,7 @@
    "spookySkins": "עורות מפחידים",
    "supernaturalSkins": "צבעי עור על-טבעיים",
    "splashySkins": "עורות ימיים",
-    "winterySkins": "Wintery Skins",
+    "winterySkins": "",
    "rainbowColors": "צבעי הקשת",
    "shimmerColors": "צבעים מנצנצים",
    "hauntedColors": "צבעים רדופי-רוחות",
@@ -58,7 +58,7 @@
    "autoEquipBattleGear": "הצטייד בציוד חדש אוטומטית",
    "costume": "תחפושת",
    "useCostume": "שימוש בתחפושת",
-    "costumePopoverText": "Select \"Use Costume\" to equip items to your avatar without affecting the Stats from your Battle Gear! This means that you can dress up your avatar in whatever outfit you like while still having your best Battle Gear equipped.",
+    "costumePopoverText": "",
    "autoEquipPopoverText": "בחרו באופציה זו על מנת ללבוש באופן אוטומטי ציוד ברגע שאתם קונים אותו.",
    "costumeDisabled": "הסרת את התחפושת שלך.",
    "gearAchievement": "הרווחת את תג ״הציוד המקסימלי״ על השגת הציוד הטוב ביותר למקצועות הבאים:",
@@ -89,7 +89,7 @@
    "stats": "נתונים",
    "achievs": "הישגים",
    "strength": "כוח",
-    "strText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",
+    "strText": "",
    "constitution": "חוסן",
    "conText": "חוסן מקטין את כמות הנזק שאתה חוטף מהרגלים רעים או מטלות יומיות שהזנחת.",
    "perception": "תפיסה",
@@ -107,79 +107,81 @@
    "healer": "מרפא",
    "rogue": "נוכל",
    "mage": "מכשף",
-    "wizard": "Mage",
+    "wizard": "",
    "mystery": "מסתורין",
-    "changeClass": "Change Class, Refund Stat Points",
+    "changeClass": "",
    "lvl10ChangeClass": "כדי לשנות מקצוע עליכם להיות לפחות בדרגה 10.",
-    "changeClassConfirmCost": "Are you sure you want to change your class for 3 Gems?",
-    "invalidClass": "Invalid class. Please specify 'warrior', 'rogue', 'wizard', or 'healer'.",
-    "levelPopover": "Each level earns you one Point to assign to a Stat of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options.",
-    "unallocated": "Unallocated Stat Points",
+    "changeClassConfirmCost": "",
+    "invalidClass": "",
+    "levelPopover": "",
+    "unallocated": "",
    "autoAllocation": "הקצאה אוטומטית",
-    "autoAllocationPop": "Places Points into Stats according to your preferences, when you level up.",
-    "evenAllocation": "Distribute Stat Points evenly",
-    "evenAllocationPop": "Assigns the same number of Points to each Stat.",
-    "classAllocation": "Distribute Points based on Class",
-    "classAllocationPop": "Assigns more Points to the Stats important to your Class.",
-    "taskAllocation": "Distribute Points based on task activity",
-    "taskAllocationPop": "Assigns Points based on the Strength, Intelligence, Constitution, and Perception categories associated with the tasks you complete.",
+    "autoAllocationPop": "",
+    "evenAllocation": "",
+    "evenAllocationPop": "",
+    "classAllocation": "",
+    "classAllocationPop": "",
+    "taskAllocation": "",
+    "taskAllocationPop": "",
    "distributePoints": "הקצה נקודות שעדיין לא נוצלו",
-    "distributePointsPop": "Assigns all unallocated Stat Points according to the selected allocation scheme.",
+    "distributePointsPop": "",
    "warriorText": "לוחמים גורמים ליותר \"פגיעות חמורות\", שנותנות בונוס אקראי של מטבעות זהב, ניסיון או סיכוי למציאת פריט כשמשלימים משימה. הם גם גורמים נזק רב למפלצות האויב. שחק כלוחם אם אתה אוהב למצוא פרסים גדולים ומפתיעים, או אם אתה רוצה לקרוע את אויביך לגזרים ולנגב את הרצפה עם הגופות המרוטשות שלהם!",
-    "wizardText": "Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habitica, or if you are strongly motivated by leveling up and unlocking advanced features!",
-    "mageText": "Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habitica, or if you are strongly motivated by leveling up and unlocking advanced features!",
+    "wizardText": "",
+    "mageText": "",
    "rogueText": "נוכלים אוהבים לצבור עושר, הם משיגים יותר מטבעות זהב מכל אחד אחר והם מוכשרים במציאת פריטים אקראיים. יכולת החשאיות המפורסמת שלהם מאפשרת להם להתחמק מהתוצאות של מטלות יומיות שפוספסו. כשרוצים להשיג פרסים, הישגים, שלל ותגים - כל מה שצריך זה לשחק אותה נוכלים!",
    "healerText": "מרפאים הם חסינים לכל פגע, והם מציעים את ההגנה הזו גם לחבריהם. מטלות יומיות והרגלים רעים לא ממש מזיזים להם, ויש להם דרכים לרפא את הבריאות שלהם לאחר כישלון. שחק מרפא אם אתה נהנה לעזור לחברים שלך במשחק, או אם הרעיון לרמות את המוות דרך עבודה קשה קוסם לך!",
    "optOutOfClasses": "וותר",
-    "chooseClass": "Choose your Class",
+    "chooseClass": "",
    "chooseClassLearnMarkdown": "[Learn more about Habitica's class system](http://habitica.fandom.com/wiki/Class_System)",
-    "optOutOfClassesText": "Can't be bothered with classes? Want to choose later? Opt out - you'll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time under User Icon > Settings.",
-    "selectClass": "Select <%= heroClass %>",
+    "optOutOfClassesText": "",
+    "selectClass": "",
    "select": "בחר",
    "stealth": "חשאיות",
    "stealthNewDay": "בתחילתו של יום חדש, הימנע מלחטוף נזק ממטלות יומיות שלא ביצעת.",
    "streaksFrozen": "רצפים קפואים",
    "streaksFrozenText": "הרצפים של המטלות היומיות שלא ביצעת לא יתאפסו בסוף היום",
    "purchaseFor": "לרכוש בתמורה ל־<%= cost %> יהלומים?",
-    "purchaseForHourglasses": "Purchase for <%= cost %> Hourglasses?",
+    "purchaseForHourglasses": "",
    "notEnoughMana": "אין לך מספיק מאנה.",
-    "invalidTarget": "You can't cast a skill on that.",
+    "invalidTarget": "",
    "youCast": "הטלת <%= spell %>.",
    "youCastTarget": "הטלת <%= spell %> על <%= target %>.",
    "youCastParty": "הטלת <%= spell %> בשביל החבר'ה שלך. כל הכבוד!",
    "critBonus": "פגיעה חמורה! בונוס:",
-    "gainedGold": "You gained some Gold",
-    "gainedMana": "You gained some Mana",
-    "gainedHealth": "You gained some Health",
-    "gainedExperience": "You gained some Experience",
-    "lostGold": "You spent some Gold",
+    "gainedGold": "",
+    "gainedMana": "",
+    "gainedHealth": "",
+    "gainedExperience": "",
+    "lostGold": "",
    "lostMana": "You used some Mana",
-    "lostHealth": "You lost some Health",
-    "lostExperience": "You lost some Experience",
-    "equip": "Equip",
-    "unequip": "Unequip",
+    "lostHealth": "",
+    "lostExperience": "",
+    "equip": "",
+    "unequip": "",
    "animalSkins": "עורות דמוי בע״ח",
    "str": "כוח",
    "con": "חוסן",
    "per": "תפיסה",
    "int": "תבונה",
-    "notEnoughAttrPoints": "You don't have enough Stat Points.",
-    "classNotSelected": "You must select Class before you can assign Stat Points.",
+    "notEnoughAttrPoints": "",
+    "classNotSelected": "",
    "style": "Style",
-    "facialhair": "Facial",
-    "photo": "Photo",
+    "facialhair": "",
+    "photo": "תמונה",
    "info": "Info",
-    "joined": "Joined",
-    "totalLogins": "Total Check Ins",
-    "latestCheckin": "Latest Check In",
-    "editProfile": "Edit Profile",
-    "challengesWon": "Challenges Won",
-    "questsCompleted": "Quests Completed",
-    "headAccess": "Head Access.",
-    "backAccess": "Back Access.",
-    "bodyAccess": "Body Access.",
-    "mainHand": "Main-Hand",
-    "offHand": "Off-Hand",
+    "joined": "הצטרפות",
+    "totalLogins": "",
+    "latestCheckin": "",
+    "editProfile": "עריכת הפרופיל",
+    "challengesWon": "אתגרים שנוצחו",
+    "questsCompleted": "הרפתקאות שהושלמו",
+    "headAccess": "",
+    "backAccess": "",
+    "bodyAccess": "",
+    "mainHand": "",
+    "offHand": "",
    "statPoints": "Stat Points",
-    "pts": "pts"
+    "pts": "נק׳",
+    "notEnoughGold": "אין מספיק זהב.",
+    "purchaseForGold": "לרכוש בתמורת <%= cost %> מטבעות זהב?"
 }
@@ -16,29 +16,29 @@
    "commGuideList02F": "<strong>Avoid extended discussions of divisive topics in the Tavern and where it would be off-topic</strong>. If you feel that someone has said something rude or hurtful, do not engage them. If someone mentions something that is allowed by the guidelines but which is hurtful to you, it’s okay to politely let someone know that. If it is against the guidelines or the Terms of Service, you should flag it and let a mod respond. When in doubt, flag the post.",
    "commGuideList02G": "<strong>Comply immediately with any Mod request</strong>. This could include, but is not limited to, requesting you limit your posts in a particular space, editing your profile to remove unsuitable content, asking you to move your discussion to a more suitable space, etc.",
    "commGuideList02J": "<strong>Do not spam</strong>. Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, posting multiple promotional messages about a Guild, Party or Challenge, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming. If people clicking on a link will result in any benefit to you, you need to disclose that in the text of your message or that will also be considered spam.<br/><br/>It is up to the mods to decide if something constitutes spam or might lead to spam, even if you don’t feel that you have been spamming. For example, advertising a Guild is acceptable once or twice, but multiple posts in one day would probably constitute spam, no matter how useful the Guild is!",
-    "commGuideList02K": "<strong>Avoid posting large header text in the public chat spaces, particularly the Tavern</strong>. Much like ALL CAPS, it reads as if you were yelling, and interferes with the comfortable atmosphere.",
+    "commGuideList02K": "",
    "commGuideList02L": "<strong>We highly discourage the exchange of personal information -- particularly information that can be used to identify you -- in public chat spaces</strong>. Identifying information can include but is not limited to: your address, your email address, and your API token/password. This is for your safety! Staff or moderators may remove such posts at their discretion. If you are asked for personal information in a private Guild, Party, or PM, we highly recommend that you politely refuse and alert the staff and moderators by either 1) flagging the message if it is in a Party or private Guild, or 2) filling out the <a href='http://contact.habitica.com/' target='_blank'>Moderator Contact Form</a> and including screenshots.",
-    "commGuidePara019": "<strong>In private spaces</strong>, users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting slurs or any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
+    "commGuidePara019": "",
    "commGuidePara020": "<strong>Private Messages (PMs)</strong> have some additional guidelines. If someone has blocked you, do not contact them elsewhere to ask them to unblock you. Additionally, you should not send PMs to someone asking for support (since public answers to support questions are helpful to the community). Finally, do not send anyone PMs begging for a gift of gems or a subscription, as this can be considered spamming.",
    "commGuidePara020A": "<strong>If you see a post that you believe is in violation of the public space guidelines outlined above, or if you see a post that concerns you or makes you uncomfortable, you can bring it to the attention of Moderators and Staff by clicking the flag icon to report it</strong>. A Staff member or Moderator will respond to the situation as soon as possible. Please note that intentionally reporting innocent posts is an infraction of these Guidelines (see below in “Infractions”). PMs cannot be flagged at this time, so if you need to report a PM, please contact the Mods via the form on the “Contact Us” page, which you can also access via the help menu by clicking “<a href='http://contact.habitica.com/' target='_blank'>Contact the Moderation Team</a>.” You may want to do this if there are multiple problematic posts by the same person in different Guilds, or if the situation requires some explanation. You may contact us in your native language if that is easier for you: we may have to use Google Translate, but we want you to feel comfortable about contacting us if you have a problem.",
    "commGuidePara021": "בנוסף לכך, לאזורים פרטיים מסוימים בהביטיקה יש כללים נוספים.",
    "commGuideHeadingTavern": "הפונדק",
-    "commGuidePara022": "The Tavern is the main spot for Habiticans to mingle. Daniel the Innkeeper keeps the place spic-and-span, and Lemoness will happily conjure up some lemonade while you sit and chat. Just keep in mind…",
-    "commGuidePara023": "<strong>Conversation tends to revolve around casual chatting and productivity or life improvement tips</strong>. Because the Tavern chat can only hold 200 messages, <strong>it isn't a good place for prolonged conversations on topics, especially sensitive ones</strong> (ex. politics, religion, depression, whether or not goblin-hunting should be banned, etc.). These conversations should be taken to an applicable Guild.  A Mod may direct you to a suitable Guild, but it is ultimately your responsibility to find and post in the appropriate place.",
-    "commGuidePara024": "<strong>Don't discuss anything addictive in the Tavern</strong>. Many people use Habitica to try to quit their bad Habits. Hearing people talk about addictive/illegal substances may make this much harder for them! Respect your fellow Tavern-goers and take this into consideration. This includes, but is not exclusive to: smoking, alcohol, pornography, gambling, and drug use/abuse.",
+    "commGuidePara022": "",
+    "commGuidePara023": "",
+    "commGuidePara024": "",
    "commGuidePara027": "<strong>When a moderator directs you to take a conversation elsewhere, if there is no relevant Guild, they may suggest you use the Back Corner</strong>. The Back Corner Guild is a free public space to discuss potentially sensitive subjects that should only be used when directed there by a moderator. It is carefully monitored by the moderation team. It is not a place for general discussions or conversations, and you will be directed there by a mod only when it is appropriate.",
    "commGuideHeadingPublicGuilds": "גילדות ציבוריות",
-    "commGuidePara029": "<strong>Public Guilds are much like the Tavern, except that instead of being centered around general conversation, they have a focused theme</strong>. Public Guild chat should focus on this theme. For example, members of the Wordsmiths Guild might be cross if the conversation is suddenly focusing on gardening instead of writing, and a Dragon-Fanciers Guild might not have any interest in deciphering ancient runes. Some Guilds are more lax about this than others, but in general, <strong>try to stay on topic</strong>!",
-    "commGuidePara031": "Some public Guilds will contain sensitive topics such as depression, religion, politics, etc. This is fine as long as the conversations therein do not violate any of the Terms and Conditions or Public Space Rules, and as long as they stay on topic.",
-    "commGuidePara033": "<strong>Public Guilds may NOT contain 18+ content. If they plan to regularly discuss sensitive content, they should say so in the Guild description</strong>. This is to keep Habitica safe and comfortable for everyone.",
+    "commGuidePara029": "",
+    "commGuidePara031": "",
+    "commGuidePara033": "",
    "commGuidePara035": "<strong>If the Guild in question has different kinds of sensitive issues, it is respectful to your fellow Habiticans to place your comment behind a warning (ex. \"Warning: references self-harm\")</strong>. These may be characterized as trigger warnings and/or content notes, and Guilds may have their own rules in addition to those given here. If possible, please use <a href='http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a> to hide the potentially sensitive content below line breaks so that those who may wish to avoid reading it can scroll past it without seeing the content. Habitica staff and moderators may still remove this material at their discretion.",
    "commGuidePara036": "Additionally, the sensitive material should be topical -- bringing up self-harm in a Guild focused on fighting depression may make sense, but is probably less appropriate in a music Guild. If you see someone who is repeatedly violating this guideline, especially after several requests, please flag the posts and notify the moderators via the <a href='http://contact.habitica.com/' target='_blank'>Moderator Contact Form</a>.",
-    "commGuidePara037": "<strong>No Guilds, Public or Private, should be created for the purpose of attacking any group or individual</strong>. Creating such a Guild is grounds for an instant ban. Fight bad habits, not your fellow adventurers!",
-    "commGuidePara038": "<strong>All Tavern Challenges and Public Guild Challenges must comply with these rules as well</strong>.",
+    "commGuidePara037": "",
+    "commGuidePara038": "",
    "commGuideHeadingInfractionsEtc": "עבירות, השלכות ותיקונן",
    "commGuideHeadingInfractions": "עבירות",
    "commGuidePara050": "באופן כללי, ההביטיקנים עוזרים זה לזה, מכבדים אחד את השני, ופועלים יחד כדי להפוך את הקהילה כולה לנעימה וחברותית. אולם, לעיתים רחוקות מאוד, מעשהו של הביטיקן עשוי להפר את אחד מהחוקים הנ\"ל. כאשר זה קורה, המנהלים ינקטו בכל פעולה שנראית להם הכרחית כדי להשאיר את הביטיקה בטוחה ונוחה עבור כולם.",
-    "commGuidePara051": "<strong>There are a variety of infractions, and they are dealt with depending on their severity</strong>. These are not comprehensive lists, and the Mods can make decisions on topics not covered here at their own discretion. The Mods will take context into account when evaluating infractions.",
+    "commGuidePara051": "",
    "commGuideHeadingSevereInfractions": "עבירות חמורות",
    "commGuidePara052": "עבירות חמורות הן אלו שפוגעות פגיעה אנושה בביטחון קהילת הביטיקה ומשתמשיה, וכתוצאה מכך יש להן גם השלכות חמורות.",
    "commGuidePara053": "להלן רשימת דוגמאות לעבירות חמורות, זו איננה רשימה כוללת.",
@@ -47,38 +47,38 @@
    "commGuideList05C": "הפרה של תנאי תקופת מבחן",
    "commGuideList05D": "Impersonation of Staff or Moderators",
    "commGuideList05E": "ביצוע עבירות בינוניות בצורה חוזרת ונשנית",
-    "commGuideList05F": "Creation of a duplicate account to avoid consequences (for example, making a new account to chat after having chat privileges revoked)",
-    "commGuideList05G": "Intentional deception of Staff or Moderators in order to avoid consequences or to get another user in trouble",
+    "commGuideList05F": "",
+    "commGuideList05G": "",
    "commGuideHeadingModerateInfractions": "עבירות בדרגת חומרה בינונית",
    "commGuidePara054": "עבירות בינוניות אינן פוגעות בביטחון הקהילה, אך הן יוצרות חוויה לא נעימה. לעבירות כאלו יהיו השלכות מתונות. אם ייעשו עבירות נוספות, ייתכן ויהיו לכך השלכות חמורות יותר.",
    "commGuidePara055": "להלן רשימת דוגמאות לעבירות בינוניות. זו איננה רשימה כוללת.",
-    "commGuideList06A": "Ignoring, disrespecting or arguing with a Mod. This includes publicly complaining about moderators or other users, publicly glorifying or defending banned users, or debating whether or not a moderator action was appropriate. If you are concerned about one of the rules or the behaviour of the Mods, please contact the staff via email (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
-    "commGuideList06B": "Backseat Modding. To quickly clarify a relevant point: A friendly mention of the rules is fine. Backseat modding consists of telling, demanding, and/or strongly implying that someone must take an action that you describe to correct a mistake. You can alert someone to the fact that they have committed a transgression, but please do not demand an action -- for example, saying, \"Just so you know, profanity is discouraged in the Tavern, so you may want to delete that,\" would be better than saying, \"I'm going to have to ask you to delete that post.\"",
-    "commGuideList06C": "Intentionally flagging innocent posts.",
-    "commGuideList06D": "Repeatedly Violating Public Space Guidelines",
-    "commGuideList06E": "Repeatedly Committing Minor Infractions",
+    "commGuideList06A": "",
+    "commGuideList06B": "",
+    "commGuideList06C": "",
+    "commGuideList06D": "",
+    "commGuideList06E": "",
    "commGuideHeadingMinorInfractions": "עבירות משניות",
    "commGuidePara056": "עבירות משניות, למרות שאינן רצויות, מובילות רק להשלכות משניות. אם ביצוע העבירות ממשיך לחזור, הן עשויות להוביל להשלכות חמורות יותר.",
    "commGuidePara057": "להלן רשימת דוגמאות לעבירות משניות. זו איננה רשימה כוללת.",
    "commGuideList07A": "הפרה ראשונה של חוקי המרחבים הציבוריים",
    "commGuideList07B": "Any statements or actions that trigger a \"Please Don't\". When a Mod has to say \"Please don't do this\" to a user, it can count as a very minor infraction for that user. An example might be \"Please don't keep arguing in favor of this feature idea after we've told you several times that it isn't feasible.\" In many cases, the Please Don't will be the minor consequence as well, but if Mods have to say \"Please Don't\" to the same user enough times, the triggering Minor Infractions will start to count as Moderate Infractions.",
-    "commGuidePara057A": "Some posts may be hidden because they contain sensitive information or might give people the wrong idea. Typically this does not count as an infraction, particularly not the first time it happens!",
+    "commGuidePara057A": "",
    "commGuideHeadingConsequences": "השלכות",
    "commGuidePara058": "במשחק, כמו בחיים האמיתיים, לכל פעולה יש תוצאה. בין אם זה להיכנס לכושר כתוצאה מאימונים וריצה, הופעת חורים בשיניים כתוצאה מאכילה מרובה מידי של מתוקים, או הצלחה בקורס כתוצאה מהשקעה בלימודים.",
    "commGuidePara059": "<strong> בדומה לכך, לכל עבירה יש השלכה ישירה. </strong> דוגמאות להשלכות אפשריות רשומות מטה.",
-    "commGuidePara060": "<strong>If your infraction has a moderate or severe consequence, there will be a post from a staff member or moderator in the forum in which the infraction occurred explaining</strong>:",
+    "commGuidePara060": "",
    "commGuideList08A": "מה הייתה העבירה שלך",
    "commGuideList08B": "מהן ההשלכות",
    "commGuideList08C": "מה לעשות כדי לתקן ולשחזר את המצב לקדמותו, אם ניתן.",
-    "commGuidePara060A": "If the situation calls for it, you may receive a PM or email as well as a post in the forum in which the infraction occurred. In some cases you may not be reprimanded in public at all.",
+    "commGuidePara060A": "",
    "commGuidePara060B": "If your account is banned (a severe consequence), you will not be able to log into Habitica and will receive an error message upon attempting to log in. <strong>If you wish to apologize or make a plea for reinstatement, please email the staff at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> with your UUID</strong> (which will be given in the error message). It is <strong>your</strong> responsibility to reach out if you desire reconsideration or reinstatement.",
    "commGuideHeadingSevereConsequences": "דוגמאות להשלכות חמורות",
-    "commGuideList09A": "Account bans (see above)",
+    "commGuideList09A": "",
    "commGuideList09C": "מניעת (״הקפאת״) ההתקדמות ברמות תורם לצמיתות",
    "commGuideHeadingModerateConsequences": "דוגמאות להשלכות מתונות",
-    "commGuideList10A": "Restricted public and/or private chat privileges",
+    "commGuideList10A": "",
    "commGuideList10A1": "If your actions result in revocation of your chat privileges, a Moderator or Staff member will PM you and/or post in the forum in which you were muted to notify you of the reason for your muting and the length of time for which you will be muted. At the end of that period, you will receive your chat privileges back, provided you are willing to correct the behavior for which you were muted and comply with the Community Guidelines.",
-    "commGuideList10C": "Restricted Guild/Challenge creation privileges",
+    "commGuideList10C": "",
    "commGuideList10D": "מניעת (״הקפאת״) ההתקדמות ברמות תורם באופן זמני",
    "commGuideList10E": "הורדה בדרגות תורם",
    "commGuideList10F": "המשך שימוש ״על תנאי״",
@@ -89,35 +89,38 @@
    "commGuideList11D": "מחיקה (עורכים / חברי הצוות יכולים למחוק תוכן בעייתי)",
    "commGuideList11E": "עריכה (עורכים / חברי הצוות יכולים לערוך תוכן בעייתי)",
    "commGuideHeadingRestoration": "שחזור",
-    "commGuidePara061": "Habitica is a land devoted to self-improvement, and we believe in second chances. <strong>If you commit an infraction and receive a consequence, view it as a chance to evaluate your actions and strive to be a better member of the community</strong>.",
-    "commGuidePara062": "The announcement, message, and/or email that you receive explaining the consequences of your actions is a good source of information. Cooperate with any restrictions which have been imposed, and endeavor to meet the requirements to have any penalties lifted.",
-    "commGuidePara063": "If you do not understand your consequences, or the nature of your infraction, ask the Staff/Moderators for help so you can avoid committing infractions in the future. If you feel a particular decision was unfair, you can contact the staff to discuss it at <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
-    "commGuideHeadingMeet": "Meet the Staff and Mods!",
-    "commGuidePara006": "Habitica has some tireless knights-errant who join forces with the staff members to keep the community calm, contented, and free of trolls. Each has a specific domain, but will sometimes be called to serve in other social spheres.",
+    "commGuidePara061": "",
+    "commGuidePara062": "",
+    "commGuidePara063": "",
+    "commGuideHeadingMeet": "",
+    "commGuidePara006": "",
    "commGuidePara007": "לצוות יש תגיות סגולות המסומנות בכתרים. התואר שלהם הוא \"הירואי\".",
    "commGuidePara008": "לעורכים יש תגיות כחולות כהות המסומנות בכוכב. התואר שלהם הוא \"שומר\". יוצאת מן הכלל היא באיילי. בתור דב\"שית, באיילי בעלת תגית שחורה וירוקה המסומנת בכוכב.",
    "commGuidePara009": "חברי הצוות הנוכחיים הם (משמאל לימין):",
-    "commGuideAKA": "<%= habitName %> aka <%= realName %>",
+    "commGuideAKA": "",
    "commGuideOnTrello": "<%= trelloName %> on Trello",
-    "commGuideOnGitHub": "<%= gitHubName %> on GitHub",
+    "commGuideOnGitHub": "‏<%= gitHubName %> ב־GitHub",
    "commGuidePara010": "ישנם גם מספר עורכים המסייעים לחברי הצוות. הם נבחרו בקפידה, לכן אנא כבדו אותם ושמעו בעצתם.",
    "commGuidePara011": "העורכים הנוכחיים הם (משמאל לימין):",
-    "commGuidePara011b": "בתוך Github/ויקיא",
-    "commGuidePara011c": "בוויקיא",
+    "commGuidePara011b": "בתוך Github‏/Fandom",
+    "commGuidePara011c": "בוויקי",
    "commGuidePara011d": "ב־GitHub",
-    "commGuidePara012": "If you have an issue or concern about a particular Mod, please send an email to our Staff (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
-    "commGuidePara013": "In a community as big as Habitica, users come and go, and sometimes a staff member or moderator needs to lay down their noble mantle and relax. The following are Staff and Moderators Emeritus. They no longer act with the power of a Staff member or Moderator, but we would still like to honor their work!",
-    "commGuidePara014": "Staff and Moderators Emeritus:",
+    "commGuidePara012": "",
+    "commGuidePara013": "",
+    "commGuidePara014": "",
    "commGuideHeadingFinal": "הפסקה האחרונה",
    "commGuidePara067": "So there you have it, brave Habitican -- the Community Guidelines! Wipe that sweat off of your brow and give yourself some XP for reading it all. If you have any questions or concerns about these Community Guidelines, please reach out to us via the <a href='http://contact.habitica.com/' target='_blank'>Moderator Contact Form</a> and we will be happy to help clarify things.",
    "commGuidePara068": "עכשיו התקדמו לכם, הרפתקנים אמיצים, והרגו כמה מטלות יומיומיות!",
    "commGuideHeadingLinks": "קישורים שימושיים",
-    "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>: a Guild for users to ask questions!",
+    "commGuideLink01": "",
    "commGuideLink02": "<a href='http://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>The Wiki</a>: the biggest collection of information about Habitica.",
    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: for bug reports or helping with code!",
    "commGuideLink04": "<a href='https://trello.com/b/EpoYEYod/' target='_blank'>The Main Trello</a>: for site feature requests.",
    "commGuideLink05": "<a href='https://trello.com/b/mXK3Eavg/' target='_blank'>The Mobile Trello</a>: for mobile feature requests.",
-    "commGuideLink06": "<a href='https://trello.com/b/vwuE9fbO/' target='_blank'>The Art Trello</a>: for submitting pixel art.",
-    "commGuideLink07": "<a href='https://trello.com/b/nnv4QIRX/' target='_blank'>The Quest Trello</a>: for submitting quest writing.",
-    "commGuidePara069": "האמנים המוכשרים הבאים תרמו ליצירת איורים אלו:"
+    "commGuideLink06": "",
+    "commGuideLink07": "",
+    "commGuidePara069": "האמנים המוכשרים הבאים תרמו ליצירת איורים אלו:",
+    "commGuideList01A": "התנאים וההתניות חלים על כל המרחבים, לרבות גילדות פרטיות, צ׳אט חבורה, והודעות.",
+    "commGuidePara017": "הינה הגרסה המקוצרת, אבל היינו ממליצים לך לקרוא גם את הפרטים הקטנים שלמטה:",
+    "commGuideList01C": "על כל הדיונים להיות הולמים לכל הגילאים ובשפה הולמת."
 }
@@ -2,7 +2,7 @@
    "potionText": "שיקוי ריפוי",
    "potionNotes": "מרפא 15 נק\"פ (שימוש מיידי)",
    "armoireText": "ציוד קסום",
-    "armoireNotesFull": "פתח את תיבת הציוד הקסום ע״מ לקבל ציוד מיוחד, ניסיון או מזון! יחידות ציוד שנותרו:",
+    "armoireNotesFull": "אפשר לפתוח את תיבת הציוד הקסום ולקבל ציוד מיוחד, ניסיון או מזון! יחידות ציוד שנותרו:",
    "armoireLastItem": "מצאת את פריט הציוד הקסום האחרון",
    "armoireNotesEmpty": "״הציוד הקסום״ יציע ציוד חדש בשבוע הראשון של כל חודש. עד אז, ניתן להמשיך לקבל ניסיון ומזון!",
    "dropEggWolfText": "זאב",
@@ -61,7 +61,7 @@
    "questEggRoosterAdjective": "מתגנדר",
    "questEggSpiderText": "עכביש",
    "questEggSpiderMountText": "עכביש",
-    "questEggSpiderAdjective": "an artistic",
+    "questEggSpiderAdjective": "",
    "questEggOwlText": "ינשוף",
    "questEggOwlMountText": "ינשוף",
    "questEggOwlAdjective": "חכם",
@@ -130,58 +130,58 @@
    "questEggArmadilloAdjective": "משוריינת",
    "questEggCowText": "פרה",
    "questEggCowMountText": "פרה",
-    "questEggCowAdjective": "a mooing",
-    "questEggBeetleText": "Beetle",
-    "questEggBeetleMountText": "Beetle",
-    "questEggBeetleAdjective": "an unbeatable",
-    "questEggFerretText": "Ferret",
-    "questEggFerretMountText": "Ferret",
-    "questEggFerretAdjective": "a furry",
-    "questEggSlothText": "Sloth",
-    "questEggSlothMountText": "Sloth",
-    "questEggSlothAdjective": "a speedy",
-    "questEggTriceratopsText": "Triceratops",
-    "questEggTriceratopsMountText": "Triceratops",
-    "questEggTriceratopsAdjective": "a tricky",
-    "questEggGuineaPigText": "Guinea Pig",
-    "questEggGuineaPigMountText": "Guinea Pig",
-    "questEggGuineaPigAdjective": "a giddy",
-    "questEggPeacockText": "Peacock",
-    "questEggPeacockMountText": "Peacock",
-    "questEggPeacockAdjective": "a prancing",
-    "questEggButterflyText": "Caterpillar",
-    "questEggButterflyMountText": "Butterfly",
-    "questEggButterflyAdjective": "a cute",
-    "questEggNudibranchText": "Nudibranch",
-    "questEggNudibranchMountText": "Nudibranch",
-    "questEggNudibranchAdjective": "a nifty",
-    "questEggHippoText": "Hippo",
-    "questEggHippoMountText": "Hippo",
-    "questEggHippoAdjective": "a happy",
-    "questEggYarnText": "Yarn",
-    "questEggYarnMountText": "Flying Carpet",
-    "questEggYarnAdjective": "woolen",
-    "questEggPterodactylText": "Pterodactyl",
-    "questEggPterodactylMountText": "Pterodactyl",
-    "questEggPterodactylAdjective": "a trusting",
-    "questEggBadgerText": "Badger",
-    "questEggBadgerMountText": "Badger",
-    "questEggBadgerAdjective": "a bustling",
-    "questEggSquirrelText": "Squirrel",
-    "questEggSquirrelMountText": "Squirrel",
-    "questEggSquirrelAdjective": "a bushy-tailed",
-    "questEggSeaSerpentText": "Sea Serpent",
-    "questEggSeaSerpentMountText": "Sea Serpent",
-    "questEggSeaSerpentAdjective": "a shimmering",
-    "questEggKangarooText": "Kangaroo",
-    "questEggKangarooMountText": "Kangaroo",
-    "questEggKangarooAdjective": "a keen",
-    "questEggAlligatorText": "Alligator",
-    "questEggAlligatorMountText": "Alligator",
-    "questEggAlligatorAdjective": "a cunning",
-    "questEggVelociraptorText": "Velociraptor",
-    "questEggVelociraptorMountText": "Velociraptor",
-    "questEggVelociraptorAdjective": "a clever",
+    "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": "",
+    "questEggHippoText": "היפופוטם",
+    "questEggHippoMountText": "היפופוטם",
+    "questEggHippoAdjective": "",
+    "questEggYarnText": "",
+    "questEggYarnMountText": "שטיח מעופף",
+    "questEggYarnAdjective": "",
+    "questEggPterodactylText": "",
+    "questEggPterodactylMountText": "",
+    "questEggPterodactylAdjective": "",
+    "questEggBadgerText": "",
+    "questEggBadgerMountText": "",
+    "questEggBadgerAdjective": "",
+    "questEggSquirrelText": "",
+    "questEggSquirrelMountText": "סנאי",
+    "questEggSquirrelAdjective": "",
+    "questEggSeaSerpentText": "",
+    "questEggSeaSerpentMountText": "",
+    "questEggSeaSerpentAdjective": "",
+    "questEggKangarooText": "קנגרו",
+    "questEggKangarooMountText": "קנגרו",
+    "questEggKangarooAdjective": "",
+    "questEggAlligatorText": "תנין",
+    "questEggAlligatorMountText": "תנין",
+    "questEggAlligatorAdjective": "",
+    "questEggVelociraptorText": "",
+    "questEggVelociraptorMountText": "",
+    "questEggVelociraptorAdjective": "",
    "eggNotes": "מצא שיקוי הבקעה לשפוך על ביצה זו, והיא תהפוך ל<%= eggText(locale) %> <%= eggAdjective(locale) %>.",
    "hatchingPotionBase": "רגיל",
    "hatchingPotionWhite": "לבן",
@@ -196,83 +196,83 @@
    "hatchingPotionSpooky": "מפחיד",
    "hatchingPotionPeppermint": "מנטה",
    "hatchingPotionFloral": "פרחוני",
-    "hatchingPotionAquatic": "Aquatic",
-    "hatchingPotionEmber": "Ember",
+    "hatchingPotionAquatic": "",
+    "hatchingPotionEmber": "",
    "hatchingPotionThunderstorm": "סופת ברקים",
    "hatchingPotionGhost": "רוח רפאים",
-    "hatchingPotionRoyalPurple": "Royal Purple",
-    "hatchingPotionHolly": "Holly",
-    "hatchingPotionCupid": "Cupid",
-    "hatchingPotionShimmer": "Shimmer",
-    "hatchingPotionFairy": "Fairy",
-    "hatchingPotionStarryNight": "Starry Night",
-    "hatchingPotionRainbow": "Rainbow",
-    "hatchingPotionGlass": "Glass",
-    "hatchingPotionGlow": "Glow-in-the-Dark",
-    "hatchingPotionFrost": "Frost",
-    "hatchingPotionIcySnow": "Icy Snow",
+    "hatchingPotionRoyalPurple": "",
+    "hatchingPotionHolly": "",
+    "hatchingPotionCupid": "",
+    "hatchingPotionShimmer": "",
+    "hatchingPotionFairy": "",
+    "hatchingPotionStarryNight": "",
+    "hatchingPotionRainbow": "קשת",
+    "hatchingPotionGlass": "",
+    "hatchingPotionGlow": "",
+    "hatchingPotionFrost": "",
+    "hatchingPotionIcySnow": "",
    "hatchingPotionNotes": "מזוג שיקוי זה על ביצה, והיא תבקע כ: <%= potText(locale) %>.",
    "premiumPotionAddlNotes": "לא ניתן לשימוש על ביצי הרפתקאות.",
    "foodMeat": "בשר",
-    "foodMeatThe": "the Meat",
-    "foodMeatA": "Meat",
+    "foodMeatThe": "",
+    "foodMeatA": "בשר",
    "foodMilk": "חלב",
-    "foodMilkThe": "the Milk",
-    "foodMilkA": "Milk",
+    "foodMilkThe": "החלב",
+    "foodMilkA": "חלב",
    "foodPotatoe": "תפוח אדמה",
-    "foodPotatoeThe": "the Potato",
-    "foodPotatoeA": "a Potato",
+    "foodPotatoeThe": "תפוח האדמה",
+    "foodPotatoeA": "תפוח אדמה",
    "foodStrawberry": "תות",
-    "foodStrawberryThe": "the Strawberry",
-    "foodStrawberryA": "a Strawberry",
+    "foodStrawberryThe": "התות",
+    "foodStrawberryA": "תות",
    "foodChocolate": "שוקולד",
-    "foodChocolateThe": "the Chocolate",
-    "foodChocolateA": "Chocolate",
+    "foodChocolateThe": "השוקולד",
+    "foodChocolateA": "שוקולד",
    "foodFish": "דג",
-    "foodFishThe": "the Fish",
-    "foodFishA": "a Fish",
+    "foodFishThe": "הדג",
+    "foodFishA": "דג",
    "foodRottenMeat": "בשר רקוב",
-    "foodRottenMeatThe": "the Rotten Meat",
-    "foodRottenMeatA": "Rotten Meat",
+    "foodRottenMeatThe": "הבשר הרקוב",
+    "foodRottenMeatA": "בשר רקוב",
    "foodCottonCandyPink": "סוכר שמבלולו ורוד",
-    "foodCottonCandyPinkThe": "the Pink Cotton Candy",
-    "foodCottonCandyPinkA": "Pink Cotton Candy",
+    "foodCottonCandyPinkThe": "",
+    "foodCottonCandyPinkA": "",
    "foodCottonCandyBlue": "סוכר שמבלולו כחול",
-    "foodCottonCandyBlueThe": "the Blue Cotton Candy",
-    "foodCottonCandyBlueA": "Blue Cotton Candy",
+    "foodCottonCandyBlueThe": "",
+    "foodCottonCandyBlueA": "",
    "foodHoney": "דבש",
-    "foodHoneyThe": "the Honey",
-    "foodHoneyA": "Honey",
+    "foodHoneyThe": "הדבש",
+    "foodHoneyA": "דבש",
    "foodCakeSkeleton": "עוגת עצמות",
-    "foodCakeSkeletonThe": "the Bare Bones Cake",
-    "foodCakeSkeletonA": "a Bare Bones Cake",
+    "foodCakeSkeletonThe": "",
+    "foodCakeSkeletonA": "",
    "foodCakeBase": "עוגה רגילה",
-    "foodCakeBaseThe": "the Basic Cake",
-    "foodCakeBaseA": "a Basic Cake",
+    "foodCakeBaseThe": "העוגה הפשוטה",
+    "foodCakeBaseA": "עוגה פשוטה",
    "foodCakeCottonCandyBlue": "עוגת ממתקים כחולה",
-    "foodCakeCottonCandyBlueThe": "the Candy Blue Cake",
-    "foodCakeCottonCandyBlueA": "a Candy Blue Cake",
+    "foodCakeCottonCandyBlueThe": "עוגת הממתקים הכחולה",
+    "foodCakeCottonCandyBlueA": "עוגת ממתקים כחולה",
    "foodCakeCottonCandyPink": "עוגת ממתקים ורודה",
-    "foodCakeCottonCandyPinkThe": "the Candy Pink Cake",
-    "foodCakeCottonCandyPinkA": "a Candy Pink Cake",
+    "foodCakeCottonCandyPinkThe": "עוגת הממתקים הוורודה",
+    "foodCakeCottonCandyPinkA": "עוגת ממתקים ורודה",
    "foodCakeShade": "עוגת שוקולד",
-    "foodCakeShadeThe": "the Chocolate Cake",
-    "foodCakeShadeA": "a Chocolate Cake",
+    "foodCakeShadeThe": "עוגת השוקולד",
+    "foodCakeShadeA": "עוגת שוקולד",
    "foodCakeWhite": "עוגת קצפת",
-    "foodCakeWhiteThe": "the Cream Cake",
-    "foodCakeWhiteA": "a Cream Cake",
+    "foodCakeWhiteThe": "עוגת הקרם",
+    "foodCakeWhiteA": "עוגת קרם",
    "foodCakeGolden": "עוגת דבש",
-    "foodCakeGoldenThe": "the Honey Cake",
-    "foodCakeGoldenA": "a Honey Cake",
+    "foodCakeGoldenThe": "עוגת הדבש",
+    "foodCakeGoldenA": "עוגת דבש",
    "foodCakeZombie": "עוגה רקובה",
-    "foodCakeZombieThe": "the Rotten Cake",
-    "foodCakeZombieA": "a Rotten Cake",
+    "foodCakeZombieThe": "העוגה הרקובה",
+    "foodCakeZombieA": "עוגה רקובה",
    "foodCakeDesert": "עוגת חול",
-    "foodCakeDesertThe": "the Sand Cake",
-    "foodCakeDesertA": "a Sand Cake",
+    "foodCakeDesertThe": "עוגת החול",
+    "foodCakeDesertA": "עוגת חול",
    "foodCakeRed": "עוגת תותים",
-    "foodCakeRedThe": "the Strawberry Cake",
-    "foodCakeRedA": "a Strawberry Cake",
+    "foodCakeRedThe": "עוגת התות",
+    "foodCakeRedA": "עוגת תות",
    "foodCandySkeleton": "סוכריית עצמות חשופות",
    "foodCandySkeletonThe": "the Bare Bones Candy",
    "foodCandySkeletonA": "Bare Bones Candy",
@@ -286,26 +286,26 @@
    "foodCandyCottonCandyPinkThe": "the Sour Pink Candy",
    "foodCandyCottonCandyPinkA": "Sour Pink Candy",
    "foodCandyShade": "סוכריית שוקולד",
-    "foodCandyShadeThe": "the Chocolate Candy",
-    "foodCandyShadeA": "Chocolate Candy",
+    "foodCandyShadeThe": "ממתק השוקולד",
+    "foodCandyShadeA": "ממתק שוקולד",
    "foodCandyWhite": "סוכריית וניל",
-    "foodCandyWhiteThe": "the Vanilla Candy",
-    "foodCandyWhiteA": "Vanilla Candy",
+    "foodCandyWhiteThe": "ממתק הווניל",
+    "foodCandyWhiteA": "ממתק וניל",
    "foodCandyGolden": "סוכריית דבש",
-    "foodCandyGoldenThe": "the Honey Candy",
-    "foodCandyGoldenA": "Honey Candy",
+    "foodCandyGoldenThe": "ממתק הדבש",
+    "foodCandyGoldenA": "ממתק דבש",
    "foodCandyZombie": "סוכריה רקובה",
-    "foodCandyZombieThe": "the Rotten Candy",
-    "foodCandyZombieA": "Rotten Candy",
+    "foodCandyZombieThe": "הממתק הרקוב",
+    "foodCandyZombieA": "ממתק רקוב",
    "foodCandyDesert": "סוכריית חול",
-    "foodCandyDesertThe": "the Sand Candy",
-    "foodCandyDesertA": "Sand Candy",
+    "foodCandyDesertThe": "ממתק החול",
+    "foodCandyDesertA": "ממתק חול",
    "foodCandyRed": "סוכריית קינמון",
-    "foodCandyRedThe": "the Cinnamon Candy",
-    "foodCandyRedA": "Cinnamon Candy",
+    "foodCandyRedThe": "ממתק הקינמון",
+    "foodCandyRedA": "ממתק קינמון",
    "foodSaddleText": "אוכף",
    "foodSaddleNotes": "הופך חיית מחמד לחיית רכיבה בין רגע!",
-    "foodSaddleSellWarningNote": "Hey! This is a pretty useful item! Are you familiar with how to use a Saddle with your Pets?",
+    "foodSaddleSellWarningNote": "אהלן! איזה פריט שימושי! האם יש לך מושג כיצד להשתמש באוכפים עם חיות המחמד שלך?",
    "foodNotes": "האכל בזה את חיות המחמד שלך והן יגדלו לחיות רכיבה חסונות.",
    "hatchingPotionRoseQuartz": "קוורץ ורדרד",
    "hatchingPotionCelestial": "",
@@ -38,5 +38,9 @@
    "healthDailyNotes": "יש ללחוץ כדי לעשות שינויים כלשהם!",
    "exerciseTodoNotes": "יש ללחוץ כדי להוסיף רשימה!",
    "exerciseTodoText": "קביעת זמני אימון",
-    "selfCareDailyNotes": "יש ללחוץ כדי לשנות את לוח הזמנים!"
+    "selfCareDailyNotes": "יש ללחוץ כדי לשנות את לוח הזמנים!",
+    "defaultHabitText": "לחיצה כאן תהפוך את סוג ההרגל להרגל רע שהיית רוצה להפסיק",
+    "creativityTodoNotes": "אפשר ללחוץ כאן כדי לציין את שם המיזם שלך",
+    "schoolDailyNotes": "אפשר ללחוץ כאן ולשנות את שעת שיעורי הבית שלך!",
+    "creativityTodoText": "השלמת מיזם יצירתי"
 }
@@ -13,7 +13,7 @@
    "companyDonate": "תרומה",
    "forgotPassword": "שכחת את הסיסמה?",
    "emailNewPass": "שליחת דוא״ל עם קישור לאיפוס הסיסמה",
-    "forgotPasswordSteps": "נא למלא את כתובת הדוא״ל בה השתמשת כדי להירשם לחשבון הביטיקה שלך.",
+    "forgotPasswordSteps": "נא לציין את שם המשתמש שלך או את כתובת הדוא״ל איתה נרשמת לחשבון הביטיקה שלך.",
    "sendLink": "שליחת קישור",
    "featuredIn": "מוצגים נוספים",
    "footerDevs": "מפתחים",
@@ -24,7 +24,7 @@
    "help": "עזרה",
    "user": "משתמש",
    "market": "שוק",
-    "newSubscriberItem": "You have new <span class=\"notification-bold-blue\">Mystery Items</span>",
+    "newSubscriberItem": "",
    "subscriberItemText": "בכל חודש, מנויים יקבלו פריט מסתורי. הוא הופך לזמין בתחילת החודש. ראו בוויקי את הדף 'Mystery Item' למידע נוסף.",
    "all": "הכול",
    "none": "כלום",
@@ -48,28 +48,28 @@
    "gemsPopoverTitle": "אבני חן",
    "gems": "יהלומים",
    "needMoreGems": "יש לך צורך בעוד יהלומים?",
-    "needMoreGemsInfo": "Purchase Gems now, or become a subscriber to buy Gems with Gold, get monthly mystery items, enjoy increased drop caps and more!",
+    "needMoreGemsInfo": "",
    "veteran": "ותיקים",
-    "veteranText": "סבל את ההאביט האפור (האתר הישן שלנו), וצבר אינספור צלקות קרב מהבאגים שלו",
+    "veteranText": "",
    "originalUser": "משתמש מקורי!",
-    "originalUserText": "אחד מהנרשמים <em>הממש</em> מוקדמים. מישהו אמר בודק אלפא?",
+    "originalUserText": "",
    "habitBirthday": "מסיבת יום ההולדת של Habitica",
    "habitBirthdayText": "חגגו את יום ההולדת של הביטיקה!",
-    "habitBirthdayPluralText": "Celebrated <%= count %> Habitica Birthday Bashes!",
+    "habitBirthdayPluralText": "",
    "habiticaDay": "יום קריאת Habitica בשמה",
-    "habiticaDaySingularText": "חגג את יום קריאת Habitica בשמה! תודה על היותך שחקן נהדר!",
-    "habiticaDayPluralText": "Celebrated <%= count %> Naming Days! Thanks for being a fantastic user.",
+    "habiticaDaySingularText": "",
+    "habiticaDayPluralText": "",
    "achievementDilatory": "המושיעים של עצלניה",
    "achievementDilatoryText": "סייעו להביס את הדרעקון האיום של עצלניה באירוע \"שפריץ הקיץ\" של 2014!",
    "costumeContest": "מתחרה מחופש",
-    "costumeContestText": "Participated in the Habitoween Costume Contest. See some of the awesome entries at blog.habitrpg.com!",
-    "costumeContestTextPlural": "Participated in <%= count %> Habitoween Costume Contests. See some of the awesome entries at blog.habitrpg.com!",
-    "newPassSent": "If we have your email on file, instructions for setting a new password have been sent to your email.",
+    "costumeContestText": "",
+    "costumeContestTextPlural": "",
+    "newPassSent": "",
    "error": "שגיאה",
    "menu": "תפריט",
    "notifications": "התראות",
-    "noNotifications": "You're all caught up!",
-    "noNotificationsText": "The notification fairies give you a raucous round of applause! Well done!",
+    "noNotifications": "",
+    "noNotificationsText": "",
    "clear": "ניקוי",
    "audioTheme": "ערכת מנגינות",
    "audioTheme_off": "כבויה",
@@ -80,14 +80,14 @@
    "audioTheme_rosstavoTheme": "ערכת הנושא של Russtavo",
    "audioTheme_dewinTheme": "ערכת הנושא של Dewin",
    "audioTheme_airuTheme": "ערכת הנושא של Airu",
-    "audioTheme_beatscribeNesTheme": "Beatscribe's NES Theme",
-    "audioTheme_arashiTheme": "Arashi's Theme",
-    "audioTheme_triumphTheme": "Triumph Theme",
-    "audioTheme_lunasolTheme": "Lunasol Theme",
-    "audioTheme_spacePenguinTheme": "SpacePenguin's Theme",
-    "audioTheme_maflTheme": "MAFL Theme",
-    "audioTheme_pizildenTheme": "Pizilden's Theme",
-    "audioTheme_farvoidTheme": "Farvoid Theme",
+    "audioTheme_beatscribeNesTheme": "",
+    "audioTheme_arashiTheme": "",
+    "audioTheme_triumphTheme": "",
+    "audioTheme_lunasolTheme": "",
+    "audioTheme_spacePenguinTheme": "",
+    "audioTheme_maflTheme": "",
+    "audioTheme_pizildenTheme": "",
+    "audioTheme_farvoidTheme": "",
    "reportBug": "דיווח על תקלה",
    "overview": "סיור למשתמשים חדשים",
    "dateFormat": "פורמט תאריך",
@@ -97,11 +97,11 @@
    "achievementBurnoutText": "סייע להביס ״שחיקה״ ולהשיב את ״הרוחות המותשות״ במהלך אירוע פסטיבל השלכת 2015!",
    "achievementBewilder": "מציל של מיסטי",
    "achievementBewilderText": "עזרת להביס את המתפרע במהלך אירוע הפלינג האביבי 2016!",
-    "achievementDysheartener": "Savior of the Shattered",
-    "achievementDysheartenerText": "Helped defeat the Dysheartener during the 2018 Valentine's Event!",
+    "achievementDysheartener": "",
+    "achievementDysheartenerText": "",
    "cards": "כרטיסים",
    "sentCardToUser": "שלחת כרטיס אל <%= profileName %>",
-    "cardReceived": "You received a <span class=\"notification-bold-blue\"><%= card %></span>",
+    "cardReceived": "",
    "greetingCard": "כרטיס ברכה",
    "greetingCardExplanation": "שניכם קיבלתם את הישג החבר העליז!",
    "greetingCardNotes": "שלחו כרטיס ברכה לחבר חבורה.",
@@ -110,7 +110,7 @@
    "greeting2": "׳מנפנף בטירוף׳",
    "greeting3": "הי את/ה!",
    "greetingCardAchievementTitle": "חבר עליז",
-    "greetingCardAchievementText": "Hey! Hi! Hello! Sent or received <%= count %> greeting cards.",
+    "greetingCardAchievementText": "",
    "thankyouCard": "כרטיס תודה",
    "thankyouCardExplanation": "שניכם מקבלים הישג של מודה מאוד!",
    "thankyouCardNotes": "שלח כרטיס תודה לחבר חבורה.",
@@ -119,40 +119,40 @@
    "thankyou2": "שולחים לכם אלפי תודות.",
    "thankyou3": "אני מודה לך מאוד - תודה!",
    "thankyouCardAchievementTitle": "מודה מאוד",
-    "thankyouCardAchievementText": "Thanks for being thankful! Sent or received <%= count %> Thank-You cards.",
+    "thankyouCardAchievementText": "",
    "birthdayCard": "כרטיס יום הולדת",
    "birthdayCardExplanation": "שניכם קיבלתם את הישג בוננזת יום ההולדת!",
    "birthdayCardNotes": "שילחו כרטיס יום הולדת לחבר חבורה.",
    "birthday0": "יום הולדת שמח!",
    "birthdayCardAchievementTitle": "בוננזת יום ההולדת",
-    "birthdayCardAchievementText": "Many happy returns! Sent or received <%= count %> birthday cards.",
+    "birthdayCardAchievementText": "",
    "congratsCard": "כרטיס ברכה",
-    "congratsCardExplanation": "You both receive the Congratulatory Companion achievement!",
-    "congratsCardNotes": "Send a Congratulations card to a party member.",
-    "congrats0": "Congratulations on your success!",
-    "congrats1": "I'm so proud of you!",
-    "congrats2": "Well done!",
-    "congrats3": "A round of applause for you!",
-    "congrats4": "Bask in your well-deserved success!",
-    "congratsCardAchievementTitle": "Congratulatory Companion",
-    "congratsCardAchievementText": "It's great to celebrate your friends' achievements! Sent or received <%= count %> congratulations cards.",
-    "getwellCard": "Get Well Card",
-    "getwellCardExplanation": "You both receive the Caring Confidant achievement!",
-    "getwellCardNotes": "Send a Get Well card to a party member.",
-    "getwell0": "Hope you feel better soon!",
-    "getwell1": "Take care! <3",
-    "getwell2": "You're in my thoughts!",
-    "getwell3": "Sorry you're not feeling your best!",
-    "getwellCardAchievementTitle": "Caring Confidant",
-    "getwellCardAchievementText": "Well-wishes are always appreciated. Sent or received <%= count %> get well cards.",
-    "goodluckCard": "Good Luck Card",
-    "goodluckCardExplanation": "You both receive the Lucky Letter achievement!",
-    "goodluckCardNotes": "Send a good luck card to a party member.",
-    "goodluck0": "May luck always follow you!",
-    "goodluck1": "Wishing you lots of luck!",
-    "goodluck2": "I hope luck is on your side today and always!!",
-    "goodluckCardAchievementTitle": "Lucky Letter",
-    "goodluckCardAchievementText": "Wishes for good luck are great encouragement! Sent or received <%= count %> good luck cards.",
+    "congratsCardExplanation": "",
+    "congratsCardNotes": "",
+    "congrats0": "",
+    "congrats1": "אני כל כך גאה בך!",
+    "congrats2": "כל הכבוד!",
+    "congrats3": "",
+    "congrats4": "",
+    "congratsCardAchievementTitle": "",
+    "congratsCardAchievementText": "",
+    "getwellCard": "",
+    "getwellCardExplanation": "",
+    "getwellCardNotes": "",
+    "getwell0": "",
+    "getwell1": "",
+    "getwell2": "",
+    "getwell3": "",
+    "getwellCardAchievementTitle": "",
+    "getwellCardAchievementText": "",
+    "goodluckCard": "",
+    "goodluckCardExplanation": "",
+    "goodluckCardNotes": "",
+    "goodluck0": "",
+    "goodluck1": "",
+    "goodluck2": "",
+    "goodluckCardAchievementTitle": "",
+    "goodluckCardAchievementText": "",
    "streakAchievement": "הרווחת הישג רצף!",
    "firstStreakAchievement": "רצף של 21 יום",
    "streakAchievementCount": "<%= streaks %> 21-ימי רצף",
@@ -162,25 +162,25 @@
    "wonChallengeShare": "סיימתי אתגר בהביטיקה!",
    "orderBy": "סדר לפי <%= item %>",
    "you": "(אתם)",
-    "loading": "Loading...",
-    "userIdRequired": "User ID is required",
-    "resetFilters": "Clear all filters",
-    "applyFilters": "Apply Filters",
+    "loading": "מתבצעת טעינה...",
+    "userIdRequired": "דרוש מזהה המשתמש",
+    "resetFilters": "ניקוי כל הסינונים",
+    "applyFilters": "החלת הסינון",
    "wantToWorkOn": "I want to work on:",
-    "categories": "Categories",
-    "animals": "Animals",
+    "categories": "קטגוריות",
+    "animals": "חיות",
    "exercise": "Exercise",
-    "creativity": "Creativity",
+    "creativity": "יצירתיות",
    "health_wellness": "Health & Wellness",
    "self_care": "Self-Care",
    "habitica_official": "Habitica Official",
    "academics": "Academics",
    "advocacy_causes": "Advocacy + Causes",
-    "entertainment": "Entertainment",
+    "entertainment": "בידור",
    "finance": "Finance",
-    "health_fitness": "Health + Fitness",
+    "health_fitness": "בריאות + כושר",
    "hobbies_occupations": "Hobbies + Occupations",
-    "location_based": "Location-based",
+    "location_based": "על סמך מיקום",
    "mental_health": "Mental Health + Self-Care",
    "getting_organized": "Getting Organized",
    "self_improvement": "Self-Improvement",
@@ -192,10 +192,10 @@
    "emptyMessagesLine1": "You don't have any messages",
    "emptyMessagesLine2": "Send a message to start a conversation!",
    "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> sent you a message",
-    "letsgo": "Let's Go!",
-    "selected": "Selected",
+    "letsgo": "קדימה!",
+    "selected": "נבחרו",
    "howManyToBuy": "כמה ברצונך לקנות?",
-    "contactForm": "Contact the Moderation Team",
+    "contactForm": "יצירת קשר עם צוות המנהלים",
    "onboardingAchievs": "הישגי הסתגלות",
    "options": "אפשרויות",
    "finish": "לסיים",
@@ -14,7 +14,7 @@
    "contributing": "Contributing",
    "faq": "שאלות נפוצות",
    "tutorial": "הדרכה",
-    "glossary": "<a target='_blank' href='http://habitica.fandom.com/wiki/Glossary'>מונחון</a>",
+    "glossary": "<a target='_blank' href='https://habitica.fandom.com/wiki/Glossary'>מונחון</a>",
    "wiki": "ויקי",
    "requestAF": "בקשת תכונה",
    "dataTool": "כלי הצגת נתונים",
@@ -104,11 +104,11 @@
    "whyReportingPostPlaceholder": "Please help our moderators by letting us know why you are reporting this post for a violation, e.g., spam, swearing, religious oaths, bigotry, slurs, adult topics, violence.",
    "optional": "Optional",
    "needsTextPlaceholder": "הקלד את ההודעה שלך כאן.",
-    "copyMessageAsToDo": "העתק הודעה כמשימה.",
+    "copyMessageAsToDo": "העתקת ההודעה בתור משימה לביצוע",
    "copyAsTodo": "העתקה בתור משימה לביצוע",
-    "messageAddedAsToDo": "הודעה הועתקה כמשימה.",
+    "messageAddedAsToDo": "ההודעה הועתקה בתור משימה לביצוע.",
    "leaderOnlyChallenges": "רק מנהיג חבורה יכול לייצר אתגרים",
-    "sendGift": "שלח מתנה",
+    "sendGift": "הענקת מתנה",
    "inviteFriends": "הזמנת חברים",
    "inviteByEmail": "הזמנה בדוא״ל",
    "inviteMembersHowTo": "Invite people via a valid email or 36-digit User ID. If an email isn't registered yet, we'll invite them to join Habitica.",
@@ -141,7 +141,7 @@
    "memberCannotRemoveYourself": "אינכם יכולים להסיר את עצמכם!",
    "groupMemberNotFound": "המשתמשים לא נמצאו מבין חברי הקבוצה",
    "mustBeGroupMember": "חייבים להיות חברים בקבוצה.",
-    "canOnlyInviteEmailUuid": "Can only invite using user IDs, emails, or usernames.",
+    "canOnlyInviteEmailUuid": "אפשר להזמין רק לפי מזהה משתמש, כתובת דוא״ל ושם משתמש.",
    "inviteMissingEmail": "חסרה כתובת אימייל בהזמנה.",
    "inviteMustNotBeEmpty": "Invite must not be empty.",
    "partyMustbePrivate": "חבורות חייבות להיות חסויות",
@@ -162,11 +162,11 @@
    "onlyCreatorOrAdminCanDeleteChat": "אין לך הרשאה למחוק את ההודעה הזאת!",
    "onlyGroupLeaderCanEditTasks": "Not authorized to manage tasks!",
    "onlyGroupTasksCanBeAssigned": "Only group tasks can be assigned",
-    "assignedTo": "Assigned To",
+    "assignedTo": "שיוך אל",
    "assignedToUser": "Assigned to <%- userName %>",
    "assignedToMembers": "Assigned to <%= userCount %> members",
    "assignedToYouAndMembers": "Assigned to you and <%= userCount %> members",
-    "youAreAssigned": "You are assigned to this task",
+    "youAreAssigned": "שויך לך",
    "taskIsUnassigned": "This task is unassigned",
    "confirmUnClaim": "Are you sure you want to unclaim this task?",
    "confirmNeedsWork": "Are you sure you want to mark this task as needing work?",
@@ -343,5 +343,20 @@
    "joinGuild": "הצטרפות לגילדה",
    "editGuild": "עריכת הגילדה",
    "editParty": "עריכת החבורה",
-    "leaveGuild": "עזיבת הגילדה"
+    "leaveGuild": "עזיבת הגילדה",
+    "invitedToThisQuest": "הוזמנת להרפתקה!",
+    "unassigned": "לא משויך",
+    "selectGift": "בחירת מתנה",
+    "blockYourself": "לא ניתן לחסום את עצמך",
+    "features": "תכונות",
+    "thisTaskApproved": "המשימה הזאת אושרה",
+    "PMDisabled": "השבתת הודעות פרטיות",
+    "languageSettings": "הגדרות שפה",
+    "joinParty": "הצטרפות לחבורה",
+    "PMCanNotReply": "לא ניתן להגיב לשיחה זו",
+    "newPartyPlaceholder": "נא לציין את שם החבורה שלך.",
+    "sendGiftToWhom": "למי היית רוצה להעניק את המתנה?",
+    "userWithUsernameOrUserIdNotFound": "לא נמצא שם משתמש או מזהה משתמש.",
+    "selectSubscription": "בחירת מינוי",
+    "usernameOrUserId": "נא לציין @שם_משתמש או מזהה משתמש"
 }
@@ -1,6 +1,6 @@
 {
    "noItemsAvailableForType": "אין לך <%= type %>",
-    "foodItemType": "אוכל",
+    "foodItemType": "מזון לחיות מחמד",
    "eggsItemType": "ביצים",
    "hatchingPotionsItemType": "שיקוי בקיעה",
    "specialItemType": "פריטים מיוחדים",
@@ -1,25 +1,25 @@
 {
    "unlockedReward": "קיבלת <%= reward %>",
-    "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
-    "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
-    "awesome": "מגניב!",
+    "earnedRewardForDevotion": "",
+    "nextRewardUnlocksIn": "",
+    "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."
+    "incentivesDescription": "",
+    "checkinEarned": "",
+    "unlockedCheckInReward": "",
+    "checkinProgressTitle": "",
+    "incentiveBackgroundsUnlockedWithCheckins": "",
+    "oneOfAllPetEggs": "",
+    "twoOfAllPetEggs": "",
+    "threeOfAllPetEggs": "",
+    "oneOfAllHatchingPotions": "",
+    "threeOfEachFood": "",
+    "fourOfEachFood": "",
+    "twoSaddles": "שני אוכפים",
+    "threeSaddles": "שלושה אוכפים",
+    "incentiveAchievement": "",
+    "royallyLoyal": "",
+    "royallyLoyalText": "",
+    "checkInRewards": "",
+    "backloggedCheckInRewards": ""
 }
@@ -8,8 +8,8 @@
    "messageCannotFeedPet": "לא ניתן להאכיל חיית מחמד זו.",
    "messageAlreadyMount": "כבר השגת את חיית הרכיבה הזו. נסה להאכיל חיה אחרת.",
    "messageEvolve": "הצלחתם לאלף <%= egg %>, בואו נצא לרכיבה!",
-    "messageLikesFood": "<%= egg %> really likes <%= foodText %>!",
-    "messageDontEnjoyFood": "<%= egg %> eats <%= foodText %> but doesn't seem to enjoy it.",
+    "messageLikesFood": "<%= egg %> ממש אוהב את <%= foodText %>!",
+    "messageDontEnjoyFood": "<%= egg %> אוכל את <%= foodText %> אבל לא ממש נהנה.",
    "messageBought": "קנית <%= itemText %>",
    "messageUnEquipped": "<%= itemText %> לא מצויד.",
    "messageMissingEggPotion": "חסרה לך הביצה או התרופה הזו",
@@ -19,16 +19,16 @@
    "messageNotEnoughGold": "אין מספיק מטבעות",
    "messageTwoHandedEquip": "אחיזה ב<%= twoHandedText %> דורשת שתי ידיים, ולכן הורדתם את <%= offHandedText %>.",
    "messageTwoHandedUnequip": "אחיזה ב<%= twoHandedText %> דורשת שתי ידיים, ולכן הורדתם את הציוד הזה כשהתחמשתם ב<%= offHandedText %>.",
-    "messageDropFood": "You've found <%= dropText %>!",
-    "messageDropEgg": "You've found a <%= dropText %> Egg!",
+    "messageDropFood": "מצאת <%= dropText %>!",
+    "messageDropEgg": "מצאת ביצת <%= dropText %>!",
    "messageDropPotion": "You've found a <%= dropText %> Hatching Potion!",
    "messageDropMysteryItem": "אתם פותחים קופסה ומוצאים <%= dropText %>!",
    "messageAlreadyOwnGear": "כבר יש לך את הפריט הזה. אפשר להצטייד בו מדף הציוד.",
-    "previousGearNotOwned": "You need to purchase a lower level gear before this one.",
+    "previousGearNotOwned": "",
    "messageHealthAlreadyMax": "כבר יש לכם את הבריאות המקסימלית.",
    "messageHealthAlreadyMin": "אוי לא! כבר אזלו לך נקודות הבריאות אז מאוחר מכדי לקנות שיקוי בריאות, אבל לא לדאוג - אפשר לחזור לתחייה!",
    "armoireEquipment": "<%= image %> מצאתם ציוד נדיר בארמואר: <%= dropText %>! מגניב!",
-    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropText %>. What's that doing in here?",
+    "armoireFood": "",
    "armoireExp": "אתם נאבקים בארמואר ומרוויחים ניסיון. קבלו!",
    "messageInsufficientGems": "אין מספיק יהלומים!",
    "messageGroupAlreadyInParty": "כבר בחבורה, נסו לרענן.",
@@ -41,16 +41,16 @@
    "messageGroupChatNotFound": "הודעה לא נמצאה!",
    "messageGroupChatAdminClearFlagCount": "רק מנהל מערכת יכול לאפס את ספירת הדגלים!",
    "messageCannotFlagSystemMessages": "You cannot flag a system message. If you need to report a violation of the Community Guidelines related to this message, please email a screenshot and explanation to Lemoness at <%= communityManagerEmail %>.",
-    "messageGroupChatSpam": "Whoops, looks like you're posting too many messages! Please wait a minute and try again. The Tavern chat only holds 200 messages at a time, so Habitica encourages posting longer, more thoughtful messages and consolidating replies. Can't wait to hear what you have to say. :)",
-    "messageCannotLeaveWhileQuesting": "You cannot accept this party invitation while you are in a quest. If you'd like to join this party, you must first abort your quest, which you can do from your party screen. You will be given back the quest scroll.",
+    "messageGroupChatSpam": "",
+    "messageCannotLeaveWhileQuesting": "",
    "messageUserOperationProtected": "הנתיב `<%= operation %>` לא נשמר, כיוון שהוא מוגן.",
    "messageNotificationNotFound": "התראה לא נמצאה.",
-    "messageNotAbleToBuyInBulk": "This item cannot be purchased in quantities above 1.",
-    "notificationsRequired": "Notification ids are required.",
-    "unallocatedStatsPoints": "You have <span class=\"notification-bold-blue\"><%= points %> unallocated Stat Points</span>",
+    "messageNotAbleToBuyInBulk": "",
+    "notificationsRequired": "",
+    "unallocatedStatsPoints": "",
    "beginningOfConversation": "This is the beginning of your conversation with <%= userName %>. Remember to be kind, respectful, and follow the Community Guidelines!",
-    "messageDeletedUser": "Sorry, this user has deleted their account.",
-    "messageMissingDisplayName": "Missing display name.",
+    "messageDeletedUser": "המשתמש הזה מחק את חשבונו, עמך הסליחה.",
+    "messageMissingDisplayName": "חסר שם תצוגה.",
    "reportedMessage": "דיווחת על ההודעה הזו למנהלים.",
    "canDeleteNow": "אם ברצונך למחוק את ההודעה, ניתן לעשות זאת עכשיו."
 }
@@ -1,8 +1,8 @@
 {
    "stable": "אורווה",
    "pets": "חיות מחמד",
-    "activePet": "Active Pet",
-    "noActivePet": "No Active Pet",
+    "activePet": "",
+    "noActivePet": "",
    "petsFound": "חיות מחמד שנאספו",
    "magicPets": "חיות מחמד קסומות",
    "questPets": "חיות הרפתקה",
@@ -26,9 +26,9 @@
    "royalPurpleGryphon": "גריפון סגול מלכותי",
    "phoenix": "עוף חול",
    "magicalBee": "דבורה קסומה",
-    "hopefulHippogriffPet": "Hopeful Hippogriff",
-    "hopefulHippogriffMount": "Hopeful Hippogriff",
-    "royalPurpleJackalope": "Royal Purple Jackalope",
+    "hopefulHippogriffPet": "",
+    "hopefulHippogriffMount": "",
+    "royalPurpleJackalope": "",
    "invisibleAether": "אתר בלתי נראה",
    "potion": "שיקוי <%= potionType %>",
    "egg": "ביצת <%= eggType %>",
@@ -40,7 +40,7 @@
    "haveHatchablePet": "You have a <%= potion %> hatching potion and <%= egg %> egg to hatch this pet! <b>Click</b> the paw print to hatch.",
    "quickInventory": "ציוד מהיר",
    "foodText": "אוכל",
-    "food": "אוכל ואוכפים",
+    "food": "מזון לחיות מחמד ואוכפים",
    "noFoodAvailable": "אין לך אוכל.",
    "noSaddlesAvailable": "אין לך אוכפים.",
    "noFood": "אין לך אוכל או אוכפים",
@@ -51,39 +51,39 @@
    "beastAchievement": "הרווחת את הישג \"אדון החיות\" על איסוף כל חיות המחמד!",
    "beastMasterName": "אלוף החיות",
    "beastMasterText": "מצא את כל 90 חיות המחמד (ממש קשה, ברכו את המשתמש הזה!)",
-    "beastMasterText2": " and has released their pets a total of <%= count %> time(s)",
+    "beastMasterText2": "",
    "mountMasterProgress": "התקדמות אלוף הרוכבים",
    "mountAchievement": "הרווחת את הישג \"אלוף הרוכבים\" מאילוף כל חיות הרכיבה!",
    "mountMasterName": "אלוף הרוכבים",
    "mountMasterText": "אילפו את כל 90 חיות הרכיבה (אפילו יותר קשה, בחאייכם, פרגנו!)",
-    "mountMasterText2": " and has released all 90 of their mounts a total of <%= count %> time(s)",
+    "mountMasterText2": "",
    "triadBingoName": "בינגו משולש",
    "triadBingoText": "מצאו את כל 90 חיות המחמד, אילפו אותן ל 90 חיות רכיבה, ואז מצאה את 90 חיות המחמד הללו שוב! (זה טירוף חושים!!!)",
-    "triadBingoText2": " and has released a full stable a total of <%= count %> time(s)",
+    "triadBingoText2": "",
    "triadBingoAchievement": "הרווחת את הישג ה\"בינגו משולש\" על מציאת כל חיות המחמד, אילוף כולן לחיות רכיבה, ומציאת כולן שוב!",
    "dropsEnabled": "ניתן לבזוז!",
    "firstDrop": "הרווחת את מערכת הביזה! מעתה, בכל פעם שתשלימ/י משימה, יהיה לך סיכוי קטן למצוא חפץ בעל ערך כולל ביצים, שיקויים ואוכל. הרגע מצאת <strong><%= eggText %> ביצה</strong>! <%= eggNotes %>",
-    "hatchedPet": "You hatched a new <%= potion %> <%= egg %>!",
-    "hatchedPetGeneric": "You hatched a new pet!",
-    "hatchedPetHowToUse": "Visit the [Stable](<%= stableUrl %>) to feed and equip your newest pet!",
+    "hatchedPet": "",
+    "hatchedPetGeneric": "",
+    "hatchedPetHowToUse": "",
    "petNotOwned": "חיית המחמד הזו אינה בבעלותך.",
-    "mountNotOwned": "You do not own this mount.",
-    "feedPet": "Feed <%= text %> to your <%= name %>?",
-    "raisedPet": "You grew your <%= pet %>!",
-    "petName": "<%= potion(locale) %> <%= egg(locale) %>",
-    "mountName": "<%= potion(locale) %> <%= mount(locale) %>",
-    "keyToPets": "Key to the Pet Kennels",
-    "keyToPetsDesc": "Release all standard Pets so you can collect them again. (Quest Pets and rare Pets are not affected.)",
-    "keyToMounts": "Key to the Mount Kennels",
-    "keyToMountsDesc": "Release all standard Mounts so you can collect them again. (Quest Mounts and rare Mounts are not affected.)",
-    "keyToBoth": "Master Keys to the Kennels",
-    "keyToBothDesc": "Release all standard Pets and Mounts so you can collect them again. (Quest Pets/Mounts and rare Pets/Mounts are not affected.)",
-    "releasePetsConfirm": "Are you sure you want to release your standard Pets?",
-    "releasePetsSuccess": "Your standard Pets have been released!",
-    "releaseMountsConfirm": "Are you sure you want to release your standard Mounts?",
-    "releaseMountsSuccess": "Your standard Mounts have been released!",
-    "releaseBothConfirm": "Are you sure you want to release your standard Pets and Mounts?",
-    "releaseBothSuccess": "Your standard Pets and Mounts have been released!",
+    "mountNotOwned": "",
+    "feedPet": "",
+    "raisedPet": "",
+    "petName": "",
+    "mountName": "",
+    "keyToPets": "",
+    "keyToPetsDesc": "",
+    "keyToMounts": "",
+    "keyToMountsDesc": "",
+    "keyToBoth": "",
+    "keyToBothDesc": "",
+    "releasePetsConfirm": "",
+    "releasePetsSuccess": "",
+    "releaseMountsConfirm": "",
+    "releaseMountsSuccess": "",
+    "releaseBothConfirm": "",
+    "releaseBothSuccess": "",
    "petsReleased": "חיות המחמד שוחררו.",
    "mountsAndPetsReleased": "חיות המחמד וחיות הרכיבה שוחררו",
    "mountsReleased": "חיות הרכיבה שוחררו",
@@ -96,18 +96,18 @@
    "filterByQuest": "הרפתקה",
    "standard": "‫בסיסי",
    "sortByColor": "צבע",
-    "sortByHatchable": "Hatchable",
+    "sortByHatchable": "",
    "hatch": "לבקוע!",
    "foodTitle": "אוכל",
-    "dragThisFood": "Drag this <%= foodName %> to a Pet and watch it grow!",
-    "clickOnPetToFeed": "Click on a Pet to feed <%= foodName %> and watch it grow!",
-    "dragThisPotion": "Drag this <%= potionName %> to an Egg and hatch a new pet!",
-    "clickOnEggToHatch": "Click on an Egg to use your <%= potionName %> hatching potion and hatch a new pet!",
-    "hatchDialogText": "Pour your <%= potionName %> hatching potion on your <%= eggName %> egg, and it will hatch into a <%= petName %>.",
-    "clickOnPotionToHatch": "Click on a hatching potion to use it on your <%= eggName %> and hatch a new pet!",
-    "notEnoughPets": "You have not collected enough pets",
-    "notEnoughMounts": "You have not collected enough mounts",
-    "notEnoughPetsMounts": "You have not collected enough pets and mounts",
+    "dragThisFood": "",
+    "clickOnPetToFeed": "",
+    "dragThisPotion": "",
+    "clickOnEggToHatch": "",
+    "hatchDialogText": "",
+    "clickOnPotionToHatch": "",
+    "notEnoughPets": "",
+    "notEnoughMounts": "",
+    "notEnoughPetsMounts": "",
    "wackyPets": "חיות מטורפות",
    "filterByWacky": "מטורפים"
 }
@@ -3,38 +3,38 @@
    "quest": "הרפתקה",
    "petQuests": "הרפתקאות של חיות מחמד וחיות רכיבה",
    "unlockableQuests": "הרפתקאות שאינן ניתנות לפתיחה",
-    "goldQuests": "Masterclasser Quest Lines",
+    "goldQuests": "",
    "questDetails": "פרטי הרפתקה",
-    "questDetailsTitle": "Quest Details",
-    "questDescription": "Quests allow players to focus on long-term, in-game goals with the members of their party.",
+    "questDetailsTitle": "פרטי ההרפתקה",
+    "questDescription": "",
    "invitations": "הזמנות",
    "completed": "הושלם!",
-    "rewardsAllParticipants": "Rewards for all Quest Participants",
-    "rewardsQuestOwner": "Additional Rewards for Quest Owner",
+    "rewardsAllParticipants": "",
+    "rewardsQuestOwner": "",
    "inviteParty": "הזמינו את החבורה להרפתקה",
    "questInvitation": "הזמנה להרפתקה:",
    "questInvitationInfo": "הזמנה להרפתקה <%= quest %> ",
-    "invitedToQuest": "You were invited to the Quest <span class=\"notification-bold-blue\"><%= quest %></span>",
+    "invitedToQuest": "",
    "askLater": "שאלו אחר כך",
    "buyQuest": "קנו הרפתקה",
    "accepted": "מוסכם",
-    "declined": "Declined",
+    "declined": "",
    "rejected": "נדחה",
    "pending": "ממתין לתשובה",
-    "questCollection": "+ <%= val %> quest item(s) found",
+    "questCollection": "",
    "questDamage": "+ <%= val %> damage to boss",
    "begin": "התחל",
-    "bossHP": "Boss HP",
+    "bossHP": "",
    "bossStrength": "עוצמת האויב",
    "rage": "זעם",
    "collect": "לאסוף",
    "collected": "נאסף",
    "abort": "בטל",
    "leaveQuest": "עיזבו את ההרפתקה",
-    "sureLeave": "האם אתם בטוחים שאתם מעוניינים לעזוב את ההרפתקה הפעילה? כל ההתקדמות בהרפתקה תאבד.",
+    "sureLeave": "לעזוב את ההרפתקה? כל ההתקדמות תרד לטמיון.",
    "mustComplete": "קודם עליך להשלים את <%= quest %>",
    "mustLvlQuest": "עליכם להיות בדרגה <%= level %> כדי לקנות את ההרפתקה הזו!",
-    "unlockByQuesting": "To unlock this quest, complete <%= title %>.",
+    "unlockByQuesting": "",
    "questConfirm": "Are you sure? Only <%= questmembers %> of your <%= totalmembers %> party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation.",
    "sureCancel": "האם אתם בטוחים שברצונכם לבטל את ההרפתקה? כל ההסכמות להשתתפות יאבדו, ובעלי ההרפתקה ישמרו בעלות על המגילה.",
    "sureAbort": "האם אתם בטוחים שברצונכם לבטל את ההרפתקה הזו? היא תבוטל עבור כל החבורה שלכם, וההתקדמות שלכם תאבד. המגילה תוחזר לבעלי ההרפתקה.",
@@ -48,13 +48,13 @@
    "guildQuestsNotSupported": "לא ניתן להזמין גילדות להרפתקה.",
    "questNotOwned": "אין ברשותכם את המגילה הזו.",
    "questNotGoldPurchasable": "לא ניתן לרכוש את ההרפתקה \"<%= key %>\" עם מטבעות זהב.",
-    "questNotGemPurchasable": "Quest \"<%= key %>\" is not a Gem-purchasable quest.",
+    "questNotGemPurchasable": "",
    "questAlreadyUnderway": "החבורה שלכם נמצאת כבר במהלכה של הרפתקה. נסו שוב כשזו תסתיים.",
    "questAlreadyAccepted": "כבר הסכמתם להזמנה להרפתקה.",
    "noActiveQuestToLeave": "אין הרפתקה לעזוב",
    "questLeaderCannotLeaveQuest": "מנהיג ההרפתקה לא יכול לעזוב אותה",
    "notPartOfQuest": "אינכם חלק מההרפתקה.",
-    "youAreNotOnQuest": "You're not on a quest",
+    "youAreNotOnQuest": "",
    "noActiveQuestToAbort": "אין כרגע הרפתקה פעילה כדי לבטל אותה.",
    "onlyLeaderAbortQuest": "רק מנהיג החבורה או ההרפתקה יכולים לבטל הרפתקה.",
    "questAlreadyRejected": "כבר דחיתם את ההזמנה להרפתקה.",
@@ -62,14 +62,15 @@
    "onlyLeaderCancelQuest": "רק מנהיגי החבורה או מובילי ההרפתקה יכולים לבטל אותה.",
    "questNotPending": "אין הרפתקאות זמינות.",
    "questOrGroupLeaderOnlyStartQuest": "רק מנהיג החבורה או מי שהזמין להרפתקה יכולים להכריח את כולם לצאת לדרך.",
-    "loginIncentiveQuest": "To unlock this quest, check in to Habitica on <%= count %> different days!",
-    "loginReward": "<%= count %> Check-ins",
-    "questBundles": "Discounted Quest Bundles",
+    "loginIncentiveQuest": "",
+    "loginReward": "",
+    "questBundles": "",
    "noQuestToStart": "Can’t find a quest to start? Try checking out the Quest Shop in the Market for new releases!",
-    "pendingDamage": "<%= damage %> pending damage",
-    "pendingDamageLabel": "pending damage",
-    "bossHealth": "<%= currentHealth %> / <%= maxHealth %> Health",
-    "rageAttack": "Rage Attack:",
-    "bossRage": "<%= currentRage %> / <%= maxRage %> Rage",
-    "rageStrikes": "Rage Strikes"
+    "pendingDamage": "",
+    "pendingDamageLabel": "",
+    "bossHealth": "",
+    "rageAttack": "",
+    "bossRage": "",
+    "rageStrikes": "",
+    "questAlreadyStarted": "ההרפתקה כבר החלה."
 }
@@ -1,7 +1,7 @@
 {
    "questEvilSantaText": "סנטה הסוהר",
    "questEvilSantaNotes": "שאגה מיוסרת נשמעת הרחק בשדות הקרח. אתם עוקבים אחר הנהמות והשאגות - המלוות בקול צחקוק משונה - לקרחת יער בה נמצאת דובת קוטב בוגרת. היא כלואה ואזוקה, נלחמת על חייה. מעל הכלוב שלה מרקד שדון קטן ומרושע, לבוש בתחפושת חג מולד בלויה. חסל את סנטה הסוהר ושחרר את הדובה!",
-    "questEvilSantaCompletion": "סנטה הסוהר צווח בכעס, ונס אל הלילה. הדובה אסירת התודה, דרך נהמות ושאגות, מנסה לספר לך משהו. לאחר מסע לאורווה, אדון החיות - מאט בוך מקשיב לסיפורה ומזדעק באימה. יש לה גור! הוא רץ לשדות הקרח כשאמו נכלאה.",
+    "questEvilSantaCompletion": "סנטה הסוהר צווח בכעס, ובורח לתוך הלילה. הדובה אסירת התודה, דרך נהמות ושאגות, מנסה לספר לך משהו. לאחר מסע לאורווה, אדון החיות - מאט בוך מקשיב לסיפורה ומזדעק באימה. יש לה גור! הוא רץ לשדות הקרח כשאמו נכלאה.",
    "questEvilSantaBoss": "סנטה הסוהר",
    "questEvilSantaDropBearCubPolarMount": "דוב קוטב (חיית רכיבה)",
    "questEvilSanta2Text": "מצאו את הגור",
@@ -8,7 +8,7 @@
    "rebirthOrb": "Used an Orb of Rebirth to start over after attaining Level <%= level %>.",
    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher.",
    "rebirthOrbNoLevel": "Used an Orb of Rebirth to start over.",
-    "rebirthPop": "Instantly restart your character as a Level 1 Warrior while retaining achievements, collectibles, and equipment. Your tasks and their history will remain but they will be reset to yellow. Your streaks will be removed except from challenge tasks. Your Gold, Experience, Mana, and the effects of all Skills will be removed. All of this will take effect immediately. For more information, see the wiki's <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> page.",
+    "rebirthPop": "",
    "rebirthName": "כדור הלידה מחדש",
    "rebirthComplete": "נולדת מחדש!"
 }
@@ -8,8 +8,8 @@
    "dailyDueDefaultView": "הגדירו את לשונית המטלות ל\"עכשווי\"",
    "dailyDueDefaultViewPop": "אם הגדרתם אפשרות זו, המטלות שלכם ייפתחו בלשונית \"עכשווי\" בתור ברירת מחדל במקום \"כולם\".",
    "reverseChatOrder": "הצג הודעות שיחה בסדר הפוך",
-    "startAdvCollapsed": "Advanced Settings in tasks start collapsed",
-    "startAdvCollapsedPop": "With this option set, Advanced Settings will be hidden when you first open a task for editing.",
+    "startAdvCollapsed": "",
+    "startAdvCollapsedPop": "",
    "dontShowAgain": "לא להציג זאת שוב",
    "suppressLevelUpModal": "לא להציג הודעה קופצת בעליית דרגה",
    "suppressHatchPetModal": "לא להציג הודעה קופצת בבקיעה של חיית מחמד",
@@ -20,7 +20,7 @@
    "showBaileyPop": "הוציאו את באיילי, המבשרת של העיירה, מהמחבוא, כדי שתבשר לכם על חדשות העבר.",
    "fixVal": "תקן ערכי דמות",
    "fixValPop": "אפשר לקבוע ערכים כמו בריאות, שלב, ומטבעות.",
-    "invalidLevel": "Invalid value: Level must be 1 or greater.",
+    "invalidLevel": "",
    "enableClass": "אפשרו את מערכת המקצועות",
    "enableClassPop": "לפני כן החלטתם לא לבחור במקצוע. האם הייתם רוצים לבחור מקצוע עכשיו?",
    "resetAccPop": "התחלה מחדש, תוך הסרת כל המטבעות, הרמות, הציוד, ההיסטוריה, והמשימות.",
@@ -31,7 +31,7 @@
    "dataExport": "ייצוא נתונים",
    "saveData": "הינה כמה אפשרויות לשמירת הנתונים שלך.",
    "habitHistory": "היסטוריית הרגלים",
-    "exportHistory": "ייצוא היסטוריה",
+    "exportHistory": "ייצוא היסטוריה:",
    "csv": "(CSV)",
    "userData": "נתוני משתמש",
    "exportUserData": "ייצוא נתוני משתמש:",
@@ -39,81 +39,81 @@
    "xml": "(XML)",
    "json": "(JSON)",
    "customDayStart": "התחלת יום מותאמת אישית",
-    "sureChangeCustomDayStartTime": "Are you sure you want to change your Custom Day Start time? Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before then!",
+    "sureChangeCustomDayStartTime": "",
    "customDayStartHasChanged": "מועד תחילת היום המותאם אישית שהגדרתם שונה.",
    "nextCron": "המטלות היומיות שלכם יאופסו בפעם הראשונה שתשתמשו בהביטיקה אחרי <%= time %>. יש לוודא שהשלמתם את המטלות היומיות שלכם לפני כן!",
    "customDayStartInfo1": "הביטיקה מכוונת לבדוק ולאפס את המטלות היומיות בחצות של אזור הזמן שלכם, מידי יום. אפשר לשנות זאת כאן.",
    "misc": "שונות",
    "showHeader": "הראה כותרת",
    "changePass": "שנו סיסמה",
-    "changeUsername": "Change Username",
+    "changeUsername": "שינוי שם משתמש",
    "changeEmail": "שנו כתובת דוא\"ל",
    "newEmail": "כתובת דוא\"ל חדשה",
    "oldPass": "סיסמה ישנה",
    "newPass": "סיסמה חדשה",
    "confirmPass": "וודאו סיסמה חדשה",
-    "newUsername": "New Username",
+    "newUsername": "שם משתמש חדש",
    "dangerZone": "אזור מסוכן",
    "resetText1": "אזהרה! פעולה זו תמחק חלקים רבים מהמשתמש שלך. זה ממש לא מומלץ, כי יאבד מידע היסטורי, השימושי למעקב אחר התקדמותך לאורך זמן, אם כי, ישנם אנשים שהדבר שימושי עבורם אחרי שהם משחקים בהביטיקה מזה זמן.",
-    "resetText2": "You will lose all your levels, Gold, and Experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.",
+    "resetText2": "",
    "deleteLocalAccountText": "האם אתם בטוחים? פעולה זו תמחק את החשבון שלכם לצמיתות, ולא ניתן יהיה לשחזרו! עליכה יהיה ליצור חשבון חדש על מנת להשתמש בHabitica שוב. לא יתקבל החזר כספי עבור אבני-חן. אם אתם בטוחים לחלוטין, הקלידו את הסיסמה שלכם בתיבת הטקסט.",
-    "deleteSocialAccountText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type \"<%= magicWord %>\" into the text box below.",
+    "deleteSocialAccountText": "",
    "API": "ממשק",
    "APIv3": "API גרסה 3",
    "APIText": "אפשר להעתיק את השדות הללו לשימוש ביישומים חיצוניים. עם זאת, יש לחשוב על אסימון הממשק כעל סיסמה, ואין לחלוק אותו בציבור. ייתכן שיבקשו ממך את מזהה המשתמש שלך במקום ציבורי, אבל לעולם לא את אסימון הממשק, גם לא ב־Github.",
    "APIToken": "אסימון ממשק (זוהי סיסמה של ממש - כדאי לעיין באזהרה למעלה!)",
-    "showAPIToken": "Show API Token",
-    "hideAPIToken": "Hide API Token",
-    "APITokenWarning": "If you need a new API Token (e.g., if you accidentally shared it), email <%= hrefTechAssistanceEmail %> with your User ID and current Token. Once it is reset you will need to re-authorize everything by logging out of the website and mobile app and by providing the new Token to any other Habitica tools that you use.",
+    "showAPIToken": "הצגת אסימון API",
+    "hideAPIToken": "הסתרת אסימון API",
+    "APITokenWarning": "",
    "thirdPartyApps": "אפליקציות צד שלישי",
    "dataToolDesc": "דף אינטרנט שמראה לכם מידע מסוים מחשבון הביטיקה שלך, כגון סטטיסטיקות לגבי המשימות שלך, ציוד, ותכונות.",
    "beeminder": "Beeminder",
    "beeminderDesc": "להרשות ל־Beeminder לנטר את המשימות שלך בהביטיקה. אפשר להתחייב לסיים מספר מסוים של משימות ביום או בשבוע, או שאפשר להתחייב להוריד בהדרגה את מספר המשימות שנותרו לך. (על ידי \"התחייבות\", בימיינדר מתכוונת לאיום בתשלום של כסף אמיתי! אך אתם יכולים גם ״סתם״ לאהוב את הגרפים המיופיפים של בימיינדר).",
    "chromeChatExtension": "תוסף שיחה לכרום",
    "chromeChatExtensionDesc": "תוסף השיחה של כרום להאביטיקה מוסיף חלון שיחה אינטואיטיבי לכל habitica.com. הוא מאפשר למשתמשים לשוחח בפונדק, בחבורה שלכם, ובכל גילדה אליה הם רשומים.",
-    "otherExtensions": "<a target='blank' href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations'>תוספים אחרים</a>",
+    "otherExtensions": "<a target='blank' href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations'>הרחבות אחרות</a>",
    "otherDesc": "מצאו אפליקציות, הרחבות, וכלים נוספים בוויקי של הביטיקה.",
    "resetDo": "כן, ברצוני לאפס את חשבוני!",
    "resetComplete": "האיפוס הושלם!",
    "fixValues": "תקן ערכים",
    "fixValuesText1": "אם נתקלת בתקלה או עשית טעות ששינתה את דמותך באופן לא הוגן (נזק שחטפת ללא הצדקה או מטבעות שלא באמת הרווחת וכו׳) ניתן לתקן את המספרים הללו באופן ידני כאן. כן, זה אומר שאפשר לרמות: יש להשתמש בתכונה הזו בחוכמה או שתיפגע בניית ההרגלים של עצמך!",
-    "fixValuesText2": "Note that you cannot restore Streaks on individual tasks here. To do that, edit the Daily and go to Advanced Settings, where you will find a Restore Streak field.",
+    "fixValuesText2": "",
    "fix21Streaks": "רצפי 21-יום",
    "discardChanges": "ביטול השינויים",
    "deleteDo": "עשה זאת, מחק את המשתמש שלי!",
-    "invalidPasswordResetCode": "The supplied password reset code is invalid or has expired.",
-    "passwordChangeSuccess": "Your password was successfully changed to the one you just chose. You can now use it to access your account.",
-    "displayNameSuccess": "Display name successfully changed",
+    "invalidPasswordResetCode": "",
+    "passwordChangeSuccess": "",
+    "displayNameSuccess": "שם התצוגה השתנה בהצלחה",
    "emailSuccess": "כתובת הדוא\"ל שונתה בהצלחה",
-    "detachSocial": "De-register <%= network %>",
-    "detachedSocial": "Successfully removed <%= network %> authentication from your account",
+    "detachSocial": "",
+    "detachedSocial": "",
    "addedLocalAuth": "אימות מקומי נוסף בהצלחה",
    "data": "נתונים",
    "email": "דוא״ל",
    "registerWithSocial": "הרשמה באמצעות <%= network %>",
-    "registeredWithSocial": "Registered with <%= network %>",
+    "registeredWithSocial": "",
    "emailNotifications": "הודעות",
    "wonChallenge": "זכית באתגר!",
    "newPM": "קיבלת הודעה פרטית חדשה",
    "newPMInfo": "הודעה חדשה מאת <%= name %>: <%= message %>",
    "giftedGems": "יהלומים שזכית בהם",
    "giftedGemsInfo": "קיבלתם <%= amount %> אבני-חן כמתנה מ<%= name %>",
-    "giftedGemsFull": "Hello <%= username %>, <%= sender %> has sent you <%= gemAmount %> gems!",
+    "giftedGemsFull": "",
    "giftedSubscription": "מנוי שניתן במתנה",
-    "giftedSubscriptionInfo": "<%= name %> gifted you a <%= months %> month subscription",
-    "giftedSubscriptionFull": "Hello <%= username %>, <%= sender %> has sent you <%= monthCount %> months of subscription!",
+    "giftedSubscriptionInfo": "",
+    "giftedSubscriptionFull": "",
    "invitedParty": "הוזמנת לחבורה",
    "invitedGuild": "הוזמנת לגילדה",
-    "importantAnnouncements": "Reminders to check in to complete tasks and receive prizes",
+    "importantAnnouncements": "",
    "weeklyRecaps": "סיכומים של פעילות החשבון שלכם בשבוע האחרון (שימו לב: כרגע אינו מאופשר בעקבות בעיות ביצועים, אך בכוונתנו להחזיר מיילים אלו בקרוב!)",
-    "onboarding": "Guidance with setting up your Habitica account",
-    "majorUpdates": "Important announcements",
+    "onboarding": "",
+    "majorUpdates": "הודעות חשובות",
    "questStarted": "ההרפתקה שלך החלה",
    "invitedQuest": "הוזמנת להרפתקה",
    "kickedGroup": "סולקת מהקבוצה",
    "remindersToLogin": "תזכורות לחזור להביטיקה",
    "unsubscribedSuccessfully": "הרישום בוטל בהצלחה!",
-    "unsubscribedTextUsers": "You have successfully unsubscribed from all Habitica emails. You can enable only the emails you want to receive from <a href=\"/user/settings/notifications\">Settings > &gt; Notifications</a> (requires login).",
+    "unsubscribedTextUsers": "",
    "unsubscribedTextOthers": "לא יישלח דואר אלקטרוני מהביטיקה יותר.",
    "unsubscribeAllEmails": "יש לסמן כדי לבטל את הרישום לדואר האלקטרוני",
    "unsubscribeAllEmailsText": "סימון תיבה זו מצהיר שהבנתי שביטול הרישום לכל הדואר האלקטרוני יגרום לכך שהביטיקה לעולם לא תוכל להודיע לי באמצעות דוא״ל על שינויים חשובים שנעשו לאתר או לחשבון שלי.",
@@ -130,53 +130,53 @@
    "displayInviteToPartyWhenPartyIs1": "הצג כפתור ״הזמן לחבורה״ כאשר בחבורה יש חבר 1.",
    "saveCustomDayStart": "שמור את מועד תחילת היום",
    "registration": "הרשמה",
-    "addLocalAuth": "Add Email and Password Login",
+    "addLocalAuth": "",
    "generateCodes": "ייצר קודים",
    "generate": "ייצר",
    "getCodes": "קבלו קודים",
-    "webhooks": "Webhooks",
-    "webhooksInfo": "Habitica provides webhooks so that when certain actions occur in your account, information can be sent to a script on another website. You can specify those scripts here. Be careful with this feature because specifying an incorrect URL can cause errors or slowness in Habitica. For more information, see the wiki's <a target=\"_blank\" href=\"https://habitica.fandom.com/wiki/Webhooks\">Webhooks</a> page.",
+    "webhooks": "",
+    "webhooksInfo": "",
    "enabled": "מאופשר",
-    "webhookURL": "Webhook URL",
+    "webhookURL": "",
    "invalidUrl": "URL לא תקין",
    "invalidWebhookId": "הפרמטר ״id, אמור להיות UUID תקין.",
-    "webhookBooleanOption": "\"<%= option %>\" must be a Boolean value.",
-    "webhookIdAlreadyTaken": "A webhook with the id <%= id %> already exists.",
-    "noWebhookWithId": "There is no webhook with the id <%= id %>.",
+    "webhookBooleanOption": "",
+    "webhookIdAlreadyTaken": "",
+    "noWebhookWithId": "",
    "regIdRequired": "נדרשת זהות הרישום - RegId",
-    "pushDeviceAdded": "push device הוסף בהצלחה",
+    "pushDeviceAdded": "מכשיר שמקבל הודעות בדחיפה הוסר בהצלחה",
    "pushDeviceNotFound": "למשתמש אין מכשיר שיכול לקבל הודעות בדחיפה עם מזהה משתמש זה.",
    "pushDeviceRemoved": "מכשיר שמקבל הודעות בדחיפה הוסר בהצלחה.",
-    "buyGemsGoldCap": "סף הועלה ל<%= amount %>",
+    "buyGemsGoldCap": "מכסת היהלומים הועלתה ל־<%= amount %>",
    "mysticHourglass": "<%= amount %> שעוני-חול מיסטיים",
-    "purchasedPlanExtraMonths": "יש לכם <%= months %> חודשים של ייתרת מנוי נוספת. ",
+    "purchasedPlanExtraMonths": "יש לך <strong><%= months %> חודשים</strong> נוספים ליתרת המינוי.",
    "consecutiveSubscription": "מנוי רצוף",
    "consecutiveMonths": "חודשים רצופים:",
    "gemCapExtra": "סף אבני-חן נוספות:",
    "mysticHourglasses": "שעוני-חול מיסטיים:",
-    "mysticHourglassesTooltip": "Mystic Hourglasses",
+    "mysticHourglassesTooltip": "",
    "paypal": "פיי-פאל",
-    "amazonPayments": "Amazon Payments",
-    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
+    "amazonPayments": "",
+    "amazonPaymentsRecurring": "",
    "timezone": "אזור זמן",
    "timezoneUTC": "הביטיקה משתמשת באזור הזמן של המחשב שלכם, שהוא: <strong><%= utc %></strong>",
    "timezoneInfo": "אם אזור הזמן הזה שגוי, קודם יש לנסות לטעון מחדש את העמוד באמצעות לחיצה על מקש הרענן או הטעינה מחדש של הדפדפן שלך, כדי לוודא שלHabitica יש את המידע העדכני ביותר. אם זה עדיין לא נכון, יש לכוון את אזור הזמן במחשב שלך, ואז לטעון מחדש את העמוד הזה. <br><br> <strong>אם עשית שימוש בHabitica על מחשבים או מכשירים ניידים אחרים, אזור הזמן חייב להיות זהה בכולם.</strong> אם המטלות היומיות שלך אופסו בזמן הלא נכון, יש לחזור על הבדיקה הזו בכל המחשבים האחרים, ובדפדפן שבמכשירים הניידים שלך.",
    "push": "דחיפה",
    "about": "מידע כללי",
-    "setUsernameNotificationTitle": "Confirm your username!",
+    "setUsernameNotificationTitle": "נא לוודא את שם המשתמש!",
    "setUsernameNotificationBody": "We will be transitioning login names to unique, public usernames soon. This username will be used for invitations, @mentions in chat, and messaging.",
-    "usernameIssueSlur": "Usernames may not contain inappropriate language.",
-    "usernameIssueForbidden": "Usernames may not contain restricted words.",
-    "usernameIssueLength": "Usernames must be between 1 and 20 characters.",
-    "usernameIssueInvalidCharacters": "Usernames can only contain letters a to z, numbers 0 to 9, hyphens, or underscores.",
-    "currentUsername": "Current username:",
-    "displaynameIssueLength": "Display Names must be between 1 and 30 characters.",
+    "usernameIssueSlur": "על שמות משתמשים להיות בשפה הולמת.",
+    "usernameIssueForbidden": "",
+    "usernameIssueLength": "",
+    "usernameIssueInvalidCharacters": "",
+    "currentUsername": "שם המשתמש הנוכחי:",
+    "displaynameIssueLength": "",
    "displaynameIssueSlur": "Display Names may not contain inappropriate language.",
    "goToSettings": "Go to Settings",
-    "usernameVerifiedConfirmation": "Your username, <%= username %>, is confirmed!",
-    "usernameNotVerified": "Please confirm your username.",
-    "changeUsernameDisclaimer": "We will be transitioning login names to unique, public usernames soon. This username will be used for invitations, @mentions in chat, and messaging.",
-    "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!",
+    "usernameVerifiedConfirmation": "אוּשר שם המשתמש שלך, <%= username %>!",
+    "usernameNotVerified": "נא לאשר את שם המשתמש שלך.",
+    "changeUsernameDisclaimer": "",
+    "verifyUsernameVeteranPet": "",
    "resetAccount": "איפוס החשבון",
    "newPMNotificationTitle": "הודעה חדשה מאת <%= name %>",
    "mentioning": "אזכור",
@@ -184,5 +184,13 @@
    "bannedWordUsedInProfile": "שם התצוגה או מלל המידע הכללי שלך מכיל שפה בלתי־הולמת.",
    "bannedSlurUsedInProfile": "שם התצוגה או מלל המידע הכללי שלך הכיל דברי השמצה, והרשאות הצ׳אט נשללו ממך.",
    "everywhere": "בכל מקום",
-    "transactions": "העברות"
+    "transactions": "העברות",
+    "suggestMyUsername": "הצעת שם המשתמש",
+    "onlyPrivateSpaces": "במרחבים פרטיים בלבד",
+    "giftedSubscriptionWinterPromo": "שלום <%= username %>, קיבלת <%= monthCount %> חודשי מינוי כחלק מתוכנית הקידום עם מתנות החג שלנו!",
+    "gemTransactions": "העברות יהלומים",
+    "transaction_buy_money": "נקנה בכסף",
+    "transaction_buy_gold": "נקנה במטבעות זהב",
+    "transaction_contribution": "דרך תרומה",
+    "addPasswordAuth": "הוספת סיסמה"
 }
@@ -1,59 +1,60 @@
 {
    "spellWizardFireballText": "פרץ להבות",
-    "spellWizardFireballNotes": "You summon XP and deal fiery damage to Bosses! (Based on: INT)",
+    "spellWizardFireballNotes": "",
    "spellWizardMPHealText": "פרץ אתרי",
-    "spellWizardMPHealNotes": "You sacrifice Mana so the rest of your Party, except Mages, gains MP! (Based on: INT)",
+    "spellWizardMPHealNotes": "",
    "spellWizardEarthText": "רעידת אדמה",
-    "spellWizardEarthNotes": "Your mental power shakes the earth and buffs your Party's Intelligence! (Based on: Unbuffed INT)",
+    "spellWizardEarthNotes": "",
    "spellWizardFrostText": "קור מקפיא",
-    "spellWizardFrostNotes": "With one cast, ice freezes all your streaks so they won't reset to zero tomorrow!",
+    "spellWizardFrostNotes": "",
    "spellWizardFrostAlreadyCast": "כבר השתמשתם ביכולת זו היום. הרצפים שלכם הוקפאו, ואין צורך להשתמש ביכולת זו שוב.",
    "spellWarriorSmashText": "חבטה אכזרית",
-    "spellWarriorSmashNotes": "You make a task more blue/less red and deal extra damage to Bosses! (Based on: STR)",
+    "spellWarriorSmashNotes": "",
    "spellWarriorDefensiveStanceText": "עמדה הגנתית",
-    "spellWarriorDefensiveStanceNotes": "You crouch low and gain a buff to Constitution! (Based on: Unbuffed CON)",
+    "spellWarriorDefensiveStanceNotes": "",
    "spellWarriorValorousPresenceText": "נוכחות אמיצה",
-    "spellWarriorValorousPresenceNotes": "Your boldness buffs your whole Party's Strength! (Based on: Unbuffed STR)",
+    "spellWarriorValorousPresenceNotes": "",
    "spellWarriorIntimidateText": "מבט מאיים",
-    "spellWarriorIntimidateNotes": "Your fierce stare buffs your whole Party's Constitution! (Based on: Unbuffed CON)",
+    "spellWarriorIntimidateNotes": "",
    "spellRoguePickPocketText": "כיוס",
-    "spellRoguePickPocketNotes": "You rob a nearby task and gain gold! (Based on: PER)",
+    "spellRoguePickPocketNotes": "",
    "spellRogueBackStabText": "דקירה בגב",
-    "spellRogueBackStabNotes": "You betray a foolish task and gain gold and XP! (Based on: STR)",
+    "spellRogueBackStabNotes": "",
    "spellRogueToolsOfTradeText": "כלי המקצוע",
-    "spellRogueToolsOfTradeNotes": "Your tricky talents buff your whole Party's Perception! (Based on: Unbuffed PER)",
+    "spellRogueToolsOfTradeNotes": "",
    "spellRogueStealthText": "חשאיות",
-    "spellRogueStealthNotes": "With each cast, a few of your undone Dailies won't cause damage tonight. Their streaks and colors won't change. (Based on: PER)",
-    "spellRogueStealthDaliesAvoided": "<%= originalText %> מספר המטלות היומיות שהתחמקתם: <%= number %>.",
+    "spellRogueStealthNotes": "",
+    "spellRogueStealthDaliesAvoided": "<%= originalText %> מספר המטלות היומיות שתהיה התחמקות מהן: <%= number %>.",
    "spellRogueStealthMaxedOut": "כבר התחמקתם מכל המטלות היומיות שלכם; אין צורך להשתמש ביכולת זו שוב.",
    "spellHealerHealText": "אור מרפא",
-    "spellHealerHealNotes": "Shining light restores your health! (Based on: CON and INT)",
+    "spellHealerHealNotes": "",
    "spellHealerBrightnessText": "בוהק מסמא",
-    "spellHealerBrightnessNotes": "A burst of light makes your tasks more blue/less red! (Based on: INT)",
+    "spellHealerBrightnessNotes": "",
    "spellHealerProtectAuraText": "הילה מגוננת",
-    "spellHealerProtectAuraNotes": "You shield your Party by buffing their Constitution! (Based on: Unbuffed CON)",
+    "spellHealerProtectAuraNotes": "",
    "spellHealerHealAllText": "ברכה",
-    "spellHealerHealAllNotes": "Your soothing spell restores your whole Party's health! (Based on: CON and INT)",
+    "spellHealerHealAllNotes": "",
    "spellSpecialSnowballAuraText": "כדור שלג",
-    "spellSpecialSnowballAuraNotes": "Turn a friend into a frosty snowman!",
+    "spellSpecialSnowballAuraNotes": "",
    "spellSpecialSaltText": "מלח",
-    "spellSpecialSaltNotes": "Reverse the spell that made you a snowman.",
+    "spellSpecialSaltNotes": "",
    "spellSpecialSpookySparklesText": "נצנצים מלחיצים",
-    "spellSpecialSpookySparklesNotes": "Turn your friend into a transparent pal!",
+    "spellSpecialSpookySparklesNotes": "",
    "spellSpecialOpaquePotionText": "שיקוי עכור",
-    "spellSpecialOpaquePotionNotes": "Reverse the spell that made you transparent.",
+    "spellSpecialOpaquePotionNotes": "",
    "spellSpecialShinySeedText": "זרע מנצנץ",
    "spellSpecialShinySeedNotes": "הפכו חברים לפרחים מאושרים!",
    "spellSpecialPetalFreePotionText": "שיקוי ללא עלי כותרת",
-    "spellSpecialPetalFreePotionNotes": "Reverse the spell that made you a flower.",
+    "spellSpecialPetalFreePotionNotes": "",
    "spellSpecialSeafoamText": "קצף ים",
    "spellSpecialSeafoamNotes": "הפוך חבר ליצור ים!",
    "spellSpecialSandText": "חול",
-    "spellSpecialSandNotes": "Reverse the spell that made you a sea star.",
+    "spellSpecialSandNotes": "",
    "partyNotFound": "חבורה לא נמצאה",
    "targetIdUUID": "\"targetId\" חייב להיות מזהה משתמש תקין.",
    "challengeTasksNoCast": "לא ניתן להשתמש ביכולות מיוחדות על משימות של אתגרים.",
-    "groupTasksNoCast": "Casting a skill on group tasks is not allowed.",
+    "groupTasksNoCast": "",
    "spellNotOwned": "אין לכם את היכולת הזו.",
-    "spellLevelTooHigh": "עליכם להיות בדרגה <%= level %> כדי להשתמש ביכולת מיוחדת."
-}
+    "spellLevelTooHigh": "עליכם להיות בדרגה <%= level %> כדי להשתמש ביכולת מיוחדת.",
+    "spellAlreadyCast": "שימוש ביכולת זו לא תגביר את ההשפעה כלל."
+}
--- a/Show More
+++ b/Show More