4.179.1

fix(lint): puppy pressed the spacebar
fix(event): Cake in shops and drops
2025-12-15 21:57:22 +01:00 · 2021-01-28 17:03:08 -06:00 · 2021-01-28 17:02:44 -06:00 · 2021-01-28 16:59:43 -06:00 · 2021-01-28 16:56:22 -06:00 · 2021-01-28 16:56:01 -06:00
253 changed files with 13418 additions and 7719 deletions
--- a/migrations/archive/2021/20210129_habit_birthday.js
+++ b/migrations/archive/2021/20210129_habit_birthday.js
@@ -0,0 +1,94 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20210129_habit_birthday';
+import { v4 as uuid } from 'uuid';
+
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const inc = {
+    'items.food.Cake_Skeleton': 1,
+    'items.food.Cake_Base': 1,
+    'items.food.Cake_CottonCandyBlue': 1,
+    'items.food.Cake_CottonCandyPink': 1,
+    'items.food.Cake_Shade': 1,
+    'items.food.Cake_White': 1,
+    'items.food.Cake_Golden': 1,
+    'items.food.Cake_Zombie': 1,
+    'items.food.Cake_Desert': 1,
+    'items.food.Cake_Red': 1,
+    'achievements.habitBirthdays': 1,
+  };
+  const set = {};
+  let push;
+
+  set.migration = MIGRATION_NAME;
+
+  if (typeof user.items.gear.owned.armor_special_birthday2020 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2021'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2021', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2019 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2020'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2020', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2018 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2019'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2019', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2017 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2018'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2018', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2016 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2017'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2017', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday2015 !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2016'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2016', _id: uuid()}};
+  } else if (typeof user.items.gear.owned.armor_special_birthday !== 'undefined') {
+    set['items.gear.owned.armor_special_birthday2015'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday2015', _id: uuid()}};
+  } else {
+    set['items.gear.owned.armor_special_birthday'] = false;
+    push = {pinnedItems: {type: 'marketGear', path: 'gear.flat.armor_special_birthday', _id: uuid()}};
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({_id: user._id}, {$inc: inc, $set: set, $push: push}).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    // migration: {$ne: MIGRATION_NAME},
+    'auth.timestamps.loggedin': {$gt: new Date('2021-01-01')},
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1],
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};
--- a/migrations/migration-runner.js
+++ b/migrations/migration-runner.js
@@ -18,7 +18,7 @@ function setUpServer () {
 setUpServer();

 // Replace this with your migration
-const processUsers = require().default;
+const processUsers = require('./archive/2021/20210129_habit_birthday').default;

 processUsers()
  .then(() => {
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.178.3",
+  "version": "4.179.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1365,9 +1365,9 @@
      "integrity": "sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ=="
    },
    "@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
+      "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
      "dev": true,
      "requires": {
        "type-detect": "4.0.8"
@@ -1383,9 +1383,9 @@
      }
    },
    "@sinonjs/samsam": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.0.tgz",
-      "integrity": "sha512-hXpcfx3aq+ETVBwPlRFICld5EnrkexXuXDwqUNhDdr5L8VjvMeSRwyOa0qL7XFmR+jVWR4rUZtnxlG7RX72sBg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz",
+      "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==",
      "dev": true,
      "requires": {
        "@sinonjs/commons": "^1.6.0",
@@ -4005,9 +4005,9 @@
      }
    },
    "csv-stringify": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.6.0.tgz",
-      "integrity": "sha512-E0LNLevBrwaJ1WKsl4HUPOmK96WyhizTfY79mJgfr2dsIb6zyJd3B9+lToO7gSkTaKi8CIo0Pd0vDGfa0whozg=="
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.6.1.tgz",
+      "integrity": "sha512-JlQlNZMiuRGSFbLXFNGoBtsORXlkqf4Dfq8Ee0Jo4RVJj3YAUzevagUx24mDrQJLDF7aYz6Ne8kqA8WWBaYt2A=="
    },
    "currently-unhandled": {
      "version": "0.4.1",
@@ -5872,29 +5872,6 @@
      "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
    },
-    "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-      "requires": {
-        "debug": "=3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
    "for-in": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -7195,9 +7172,9 @@
      "dev": true
    },
    "helmet": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.3.1.tgz",
-      "integrity": "sha512-WsafDyKsIexB0+pUNkq3rL1rB5GVAghR68TP8ssM9DPEMzfBiluEQlVzJ/FEj6Vq2Ag3CNuxf7aYMjXrN0X49Q=="
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.4.1.tgz",
+      "integrity": "sha512-G8tp0wUMI7i8wkMk2xLcEvESg5PiCitFMYgGRc/PwULB0RVhTP5GFdxOwvJwp9XVha8CuS8mnhmE8I/8dx/pbw=="
    },
    "hex2dec": {
      "version": "1.1.2",
@@ -9331,9 +9308,9 @@
      }
    },
    "mongoose": {
-      "version": "5.11.11",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.11.tgz",
-      "integrity": "sha512-JgKKAosJf6medPOZi2LmO7sMz7Sg00mgjyPAKari3alzL+R/n8D+zKK29iGtJpNNtv9IKy14H37CWuiaZ7016w==",
+      "version": "5.11.13",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.13.tgz",
+      "integrity": "sha512-rXbaxSJfLnKKO2RTm8MKt65glrtfKDc4ATEb6vEbbzsVGCiLut753K5axdpyvE7KeTH7GOh4LzmuQLOvaaWOmA==",
      "requires": {
        "@types/mongodb": "^3.5.27",
        "bson": "^1.1.4",
@@ -11669,9 +11646,9 @@
      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
    },
    "run-rs": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/run-rs/-/run-rs-0.7.3.tgz",
-      "integrity": "sha512-/JmHX4rhHNeLn+F/RqhPwYUmcnbX2Qjm8g77flhKbL6Ak9wpyq+d/a87qb1nBR72r15LT0IRf87sbLWZ/x39QA==",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/run-rs/-/run-rs-0.7.4.tgz",
+      "integrity": "sha512-6VP6zOPvl6uiC+Qe+yXY0G5BbLcelO6lhkMlAuM+syOSUIsiI2mQB2NBhqv1g1I0k8bPQ2KgIa4qe6nTuXYU+g==",
      "dev": true,
      "requires": {
        "chalk": "2.4.1",
@@ -12001,14 +11978,14 @@
      }
    },
    "sinon": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.3.tgz",
-      "integrity": "sha512-m+DyAWvqVHZtjnjX/nuShasykFeiZ+nPuEfD4G3gpvKGkXRhkF/6NSt2qN2FjZhfrcHXFzUzI+NLnk+42fnLEw==",
+      "version": "9.2.4",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz",
+      "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==",
      "dev": true,
      "requires": {
        "@sinonjs/commons": "^1.8.1",
        "@sinonjs/fake-timers": "^6.0.1",
-        "@sinonjs/samsam": "^5.3.0",
+        "@sinonjs/samsam": "^5.3.1",
        "diff": "^4.0.2",
        "nise": "^4.0.4",
        "supports-color": "^7.1.0"
@@ -12693,18 +12670,18 @@
      }
    },
    "stripe": {
-      "version": "8.130.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.130.0.tgz",
-      "integrity": "sha512-9e283EFhxDz7SUcgNiUFRdTZ/kS2IkoT0KBMOJHdf3vY+mvURq355s2E0Zyy9rtNmt+CEZ0nCMiZ3PqIqpp6Pg==",
+      "version": "8.132.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.132.0.tgz",
+      "integrity": "sha512-VFKQJWgPt2X0r/jh4wS6Kgx6/VH1IHw1466wIwahgWzgSANme5iNaJ+1AW45hvRUZJ+T15f2hTfQkQGyP73ZCg==",
      "requires": {
        "@types/node": ">=8.1.0",
        "qs": "^6.6.0"
      },
      "dependencies": {
        "qs": {
-          "version": "6.9.4",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
-          "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
+          "version": "6.9.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
+          "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="
        }
      }
    },
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.178.3",
+  "version": "4.179.1",
  "main": "./website/server/index.js",
  "dependencies": {
    "@babel/core": "^7.12.10",
@@ -20,7 +20,7 @@
    "compression": "^1.7.4",
    "cookie-session": "^1.4.0",
    "coupon-code": "^0.4.5",
-    "csv-stringify": "^5.6.0",
+    "csv-stringify": "^5.6.1",
    "cwait": "^1.1.1",
    "domain-middleware": "~0.1.0",
    "eslint": "^6.8.0",
@@ -37,7 +37,7 @@
    "gulp-nodemon": "^2.5.0",
    "gulp.spritesmith": "^6.9.0",
    "habitica-markdown": "^3.0.0",
-    "helmet": "^4.3.1",
+    "helmet": "^4.4.1",
    "image-size": "^0.9.3",
    "in-app-purchase": "^1.11.3",
    "js2xmlparser": "^4.0.1",
@@ -48,7 +48,7 @@
    "method-override": "^3.0.0",
    "moment": "^2.29.1",
    "moment-recur": "^1.0.7",
-    "mongoose": "^5.11.11",
+    "mongoose": "^5.11.13",
    "morgan": "^1.10.0",
    "nconf": "^0.11.1",
    "node-gcm": "^1.0.3",
@@ -66,7 +66,7 @@
    "remove-markdown": "^0.3.0",
    "rimraf": "^3.0.2",
    "short-uuid": "^4.1.0",
-    "stripe": "^8.130.0",
+    "stripe": "^8.132.0",
    "superagent": "^6.1.0",
    "universal-analytics": "^0.4.23",
    "useragent": "^2.1.9",
@@ -120,8 +120,8 @@
    "mocha": "^5.1.1",
    "monk": "^7.3.2",
    "require-again": "^2.0.0",
-    "run-rs": "^0.7.3",
-    "sinon": "^9.2.3",
+    "run-rs": "^0.7.4",
+    "sinon": "^9.2.4",
    "sinon-chai": "^3.5.0",
    "sinon-stub-promise": "^4.0.0"
  },
--- a/test/api/v3/integration/user/POST-move-pinned-item.js
+++ b/test/api/v3/integration/user/POST-move-pinned-item.js
@@ -3,15 +3,15 @@ import {
 } from '../../../../helpers/api-integration/v3';

 import getOfficialPinnedItems from '../../../../../website/common/script/libs/getOfficialPinnedItems';
+import content from '../../../../../website/common/script/content';

 describe('POST /user/move-pinned-item/:path/move/to/:position', () => {
  let user;
-  let officialPinnedItems;
  let officialPinnedItemPaths;

  beforeEach(async () => {
    user = await generateUser();
-    officialPinnedItems = getOfficialPinnedItems(user);
+    const officialPinnedItems = getOfficialPinnedItems(user);

    officialPinnedItemPaths = [];
    // officialPinnedItems are returned in { type: ..., path:... } format
@@ -83,7 +83,7 @@ describe('POST /user/move-pinned-item/:path/move/to/:position', () => {
    expect(res).to.eql(expectedResponse);
  });

-  it('adjusts the order of pinned items with order mismatch', async () => {
+  it('adjusts the order of pinned items with order mismatch - existing item in order', async () => {
    const testPinnedItems = [
      { type: 'card', path: 'cardTypes.thankyou' },
      { type: 'card', path: 'cardTypes.greeting' },
@@ -125,6 +125,95 @@ describe('POST /user/move-pinned-item/:path/move/to/:position', () => {
    expect(res).to.eql(expectedResponse);
  });

+  it('adjusts the order of pinned items with order mismatch - not existing in order', async () => {
+    const testPinnedItems = [
+      { type: 'card', path: 'cardTypes.thankyou' },
+      { type: 'card', path: 'cardTypes.greeting' },
+      { type: 'potion', path: 'potion' },
+      { type: 'armoire', path: 'armoire' },
+    ];
+
+    const testPinnedItemsOrder = [
+      'armoire',
+      'potion',
+    ];
+
+    await user.update({
+      pinnedItems: testPinnedItems,
+      pinnedItemsOrder: testPinnedItemsOrder,
+    });
+    await user.sync();
+
+    await user.post('/user/move-pinned-item/cardTypes.greeting/move/to/2');
+    await user.sync();
+
+    // The basic test
+    expect(user.pinnedItemsOrder[2]).to.equal('cardTypes.greeting');
+
+    // potion is now the last item because the 2 unacounted for cards show up
+    // at the beginning of the order
+    expect(user.pinnedItemsOrder[user.pinnedItemsOrder.length - 1]).to.equal('potion');
+  });
+
+  it('adjusts the order of official pinned items with order mismatch - not existing in order', async () => {
+    const testPinnedItems = [
+      { type: 'card', path: 'cardTypes.thankyou' },
+      { type: 'card', path: 'cardTypes.greeting' },
+      { type: 'potion', path: 'potion' },
+    ];
+
+    const testPinnedItemsOrder = [
+      'potion',
+    ];
+
+    const { officialPinnedItems } = content;
+
+    // add item to pinned
+    officialPinnedItems.push({ type: 'armoire', path: 'armoire' });
+
+    await user.update({
+      pinnedItems: testPinnedItems,
+      pinnedItemsOrder: testPinnedItemsOrder,
+    });
+    await user.sync();
+
+    await user.post('/user/move-pinned-item/armoire/move/to/2');
+    await user.sync();
+
+    // The basic test
+    expect(user.pinnedItemsOrder[2]).to.equal('armoire');
+
+    // potion is now the last item because the 2 unacounted for cards show up
+    // at the beginning of the order
+    expect(user.pinnedItemsOrder[user.pinnedItemsOrder.length - 1]).to.equal('potion');
+  });
+
+  it('adjusts the order of pinned items with order mismatch - not existing - out of length', async () => {
+    const testPinnedItems = [
+      { type: 'card', path: 'cardTypes.thankyou' },
+      { type: 'card', path: 'cardTypes.greeting' },
+      { type: 'potion', path: 'potion' },
+      { type: 'armoire', path: 'armoire' },
+    ];
+
+    const testPinnedItemsOrder = [
+      'armoire',
+      'potion',
+    ];
+
+    await user.update({
+      pinnedItems: testPinnedItems,
+      pinnedItemsOrder: testPinnedItemsOrder,
+    });
+    await user.sync();
+
+    await user.post('/user/move-pinned-item/cardTypes.greeting/move/to/33');
+    await user.sync();
+
+    // since the target was out of bounce it added it to the last item
+    expect(user.pinnedItemsOrder[user.pinnedItemsOrder.length - 1]).to.equal('cardTypes.greeting');
+  });
+
  it('cannot move pinned item that you do not have pinned', async () => {
    const testPinnedItems = [
      { type: 'potion', path: 'potion' },
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -13,38 +13,38 @@
    "storybook:serve": "vue-cli-service storybook:serve -p 6006 -c config/storybook"
  },
  "dependencies": {
-    "@storybook/addon-actions": "^5.3.19",
-    "@storybook/addon-knobs": "^5.3.19",
-    "@storybook/addon-links": "^5.3.19",
+    "@storybook/addon-actions": "^6.1.15",
+    "@storybook/addon-knobs": "^6.1.15",
+    "@storybook/addon-links": "^6.1.15",
    "@storybook/addon-notes": "^5.3.21",
-    "@storybook/vue": "^5.3.19",
-    "@vue/cli-plugin-babel": "^4.5.10",
-    "@vue/cli-plugin-eslint": "^4.5.10",
-    "@vue/cli-plugin-router": "^4.5.10",
-    "@vue/cli-plugin-unit-mocha": "^4.5.10",
-    "@vue/cli-service": "^4.5.10",
+    "@storybook/vue": "^6.1.15",
+    "@vue/cli-plugin-babel": "^4.5.11",
+    "@vue/cli-plugin-eslint": "^4.5.11",
+    "@vue/cli-plugin-router": "^4.5.11",
+    "@vue/cli-plugin-unit-mocha": "^4.5.11",
+    "@vue/cli-service": "^4.5.11",
    "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^7.4.0",
+    "amplitude-js": "^7.4.1",
    "axios": "^0.21.1",
    "axios-progress-bar": "^1.2.0",
    "babel-eslint": "^10.1.0",
    "bootstrap": "^4.5.3",
    "bootstrap-vue": "^2.21.2",
    "chai": "^4.1.2",
-    "core-js": "^3.8.2",
+    "core-js": "^3.8.3",
    "eslint": "^6.8.0",
    "eslint-config-habitrpg": "^6.2.0",
    "eslint-plugin-mocha": "^5.3.0",
    "eslint-plugin-vue": "^6.2.2",
    "habitica-markdown": "^3.0.0",
    "hellojs": "^1.18.6",
-    "inspectpack": "^4.5.2",
+    "inspectpack": "^4.6.1",
    "intro.js": "^2.9.3",
    "jquery": "^3.5.1",
    "lodash": "^4.17.20",
    "moment": "^2.29.1",
    "nconf": "^0.11.1",
-    "sass": "^1.32.2",
+    "sass": "^1.32.5",
    "sass-loader": "^8.0.2",
    "smartbanner.js": "^1.16.0",
    "svg-inline-loader": "^0.8.2",
@@ -54,12 +54,12 @@
    "uuid": "^8.3.2",
    "validator": "^13.5.2",
    "vue": "^2.6.12",
-    "vue-cli-plugin-storybook": "^0.6.1",
+    "vue-cli-plugin-storybook": "^2.0.0",
    "vue-mugen-scroll": "^0.2.6",
    "vue-router": "^3.4.9",
    "vue-template-compiler": "^2.6.12",
    "vuedraggable": "^2.24.3",
    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
-    "webpack": "^4.45.0"
+    "webpack": "^4.46.0"
  }
 }
--- a/website/client/src/assets/css/sprites/spritesmith-main-10.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main-10.css
--- a/website/client/src/assets/css/sprites/spritesmith-main-11.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main-11.css
@@ -1,45 +1,57 @@
-.slim_armor_special_spring2018Rogue {
+.slim_armor_special_spring2018Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
  background-position: 0px -828px;
  width: 114px;
  height: 90px;
 }
-.slim_armor_special_spring2018Warrior {
+.slim_armor_special_spring2018Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
  background-position: -115px -828px;
  width: 114px;
  height: 90px;
 }
-.slim_armor_special_spring2019Healer {
+.slim_armor_special_spring2018Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
  background-position: -230px -828px;
  width: 114px;
  height: 90px;
 }
-.slim_armor_special_spring2019Mage {
+.slim_armor_special_spring2018Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
  background-position: -345px -828px;
  width: 114px;
  height: 90px;
 }
-.slim_armor_special_spring2019Rogue {
+.slim_armor_special_spring2019Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
  background-position: -460px -828px;
  width: 114px;
  height: 90px;
 }
-.slim_armor_special_spring2019Warrior {
+.slim_armor_special_spring2019Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
  background-position: -575px -828px;
  width: 114px;
  height: 90px;
 }
-.slim_armor_special_spring2020Healer {
+.slim_armor_special_spring2019Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
  background-position: -690px -828px;
  width: 114px;
  height: 90px;
 }
+.slim_armor_special_spring2019Warrior {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
+  background-position: -805px -828px;
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_spring2020Healer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
+  background-position: -932px 0px;
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_special_spring2020Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
  background-position: 0px 0px;
@@ -48,13 +60,13 @@
 }
 .slim_armor_special_spring2020Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -805px -828px;
+  background-position: -932px -91px;
  width: 114px;
  height: 90px;
 }
 .slim_armor_special_spring2020Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px 0px;
+  background-position: -932px -182px;
  width: 114px;
  height: 90px;
 }
@@ -156,55 +168,55 @@
 }
 .weapon_special_spring2018Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -91px;
+  background-position: -932px -273px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2018Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -182px;
+  background-position: -932px -364px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2018Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -273px;
+  background-position: -932px -455px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2018Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -364px;
+  background-position: -932px -546px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2019Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -455px;
+  background-position: -932px -637px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2019Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -546px;
+  background-position: -932px -728px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2019Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -637px;
+  background-position: -932px -819px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2019Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -728px;
+  background-position: 0px -919px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2020Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -932px -819px;
+  background-position: -115px -919px;
  width: 114px;
  height: 90px;
 }
@@ -216,13 +228,13 @@
 }
 .weapon_special_spring2020Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -919px;
+  background-position: -230px -919px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_spring2020Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -115px -919px;
+  background-position: -345px -919px;
  width: 114px;
  height: 90px;
 }
@@ -354,7 +366,7 @@
 }
 .broad_armor_special_summer2017Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -230px -919px;
+  background-position: -460px -919px;
  width: 114px;
  height: 90px;
 }
@@ -372,7 +384,7 @@
 }
 .broad_armor_special_summer2018Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -345px -919px;
+  background-position: -575px -919px;
  width: 114px;
  height: 90px;
 }
@@ -390,7 +402,7 @@
 }
 .broad_armor_special_summer2019Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -460px -919px;
+  background-position: -690px -919px;
  width: 114px;
  height: 90px;
 }
@@ -402,13 +414,13 @@
 }
 .broad_armor_special_summer2019Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -575px -919px;
+  background-position: -805px -919px;
  width: 114px;
  height: 90px;
 }
 .broad_armor_special_summer2020Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -690px -919px;
+  background-position: -920px -919px;
  width: 114px;
  height: 90px;
 }
@@ -420,7 +432,7 @@
 }
 .broad_armor_special_summer2020Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -805px -919px;
+  background-position: -1047px 0px;
  width: 114px;
  height: 90px;
 }
@@ -534,7 +546,7 @@
 }
 .head_special_summer2017Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -920px -919px;
+  background-position: -1047px -91px;
  width: 114px;
  height: 90px;
 }
@@ -552,7 +564,7 @@
 }
 .head_special_summer2018Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px 0px;
+  background-position: -1047px -182px;
  width: 114px;
  height: 90px;
 }
@@ -570,7 +582,7 @@
 }
 .head_special_summer2019Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -91px;
+  background-position: -1047px -273px;
  width: 114px;
  height: 90px;
 }
@@ -582,13 +594,13 @@
 }
 .head_special_summer2019Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -182px;
+  background-position: -1047px -364px;
  width: 114px;
  height: 90px;
 }
 .head_special_summer2020Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -273px;
+  background-position: -1047px -455px;
  width: 114px;
  height: 90px;
 }
@@ -600,7 +612,7 @@
 }
 .head_special_summer2020Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -364px;
+  background-position: -1047px -546px;
  width: 114px;
  height: 90px;
 }
@@ -684,7 +696,7 @@
 }
 .shield_special_summer2017Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -455px;
+  background-position: -1047px -637px;
  width: 114px;
  height: 90px;
 }
@@ -696,7 +708,7 @@
 }
 .shield_special_summer2018Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -546px;
+  background-position: -1047px -728px;
  width: 114px;
  height: 90px;
 }
@@ -714,7 +726,7 @@
 }
 .shield_special_summer2019Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -637px;
+  background-position: -1047px -819px;
  width: 114px;
  height: 90px;
 }
@@ -726,19 +738,19 @@
 }
 .shield_special_summer2019Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -728px;
+  background-position: -1047px -910px;
  width: 114px;
  height: 90px;
 }
 .shield_special_summer2020Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -819px;
+  background-position: 0px -1010px;
  width: 114px;
  height: 90px;
 }
 .shield_special_summer2020Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1047px -910px;
+  background-position: -115px -1010px;
  width: 114px;
  height: 90px;
 }
@@ -1518,7 +1530,7 @@
 }
 .slim_armor_special_summer2017Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -1010px;
+  background-position: -230px -1010px;
  width: 114px;
  height: 90px;
 }
@@ -1536,7 +1548,7 @@
 }
 .slim_armor_special_summer2018Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -115px -1010px;
+  background-position: -345px -1010px;
  width: 114px;
  height: 90px;
 }
@@ -1554,7 +1566,7 @@
 }
 .slim_armor_special_summer2019Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -230px -1010px;
+  background-position: -460px -1010px;
  width: 114px;
  height: 90px;
 }
@@ -1566,13 +1578,13 @@
 }
 .slim_armor_special_summer2019Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -345px -1010px;
+  background-position: -575px -1010px;
  width: 114px;
  height: 90px;
 }
 .slim_armor_special_summer2020Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -460px -1010px;
+  background-position: -690px -1010px;
  width: 114px;
  height: 90px;
 }
@@ -1584,7 +1596,7 @@
 }
 .slim_armor_special_summer2020Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -575px -1010px;
+  background-position: -805px -1010px;
  width: 114px;
  height: 90px;
 }
@@ -1686,7 +1698,7 @@
 }
 .weapon_special_summer2017Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -690px -1010px;
+  background-position: -920px -1010px;
  width: 114px;
  height: 90px;
 }
@@ -1704,7 +1716,7 @@
 }
 .weapon_special_summer2018Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -805px -1010px;
+  background-position: -1035px -1010px;
  width: 114px;
  height: 90px;
 }
@@ -1722,7 +1734,7 @@
 }
 .weapon_special_summer2019Mage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -920px -1010px;
+  background-position: -1162px 0px;
  width: 114px;
  height: 90px;
 }
@@ -1734,13 +1746,13 @@
 }
 .weapon_special_summer2019Warrior {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1035px -1010px;
+  background-position: -1162px -91px;
  width: 114px;
  height: 90px;
 }
 .weapon_special_summer2020Healer {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1162px 0px;
+  background-position: -1162px -182px;
  width: 114px;
  height: 90px;
 }
@@ -1752,7 +1764,7 @@
 }
 .weapon_special_summer2020Rogue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1162px -91px;
+  background-position: -1162px -273px;
  width: 114px;
  height: 90px;
 }
@@ -1954,15 +1966,3 @@
  width: 90px;
  height: 90px;
 }
-.broad_armor_special_winter2018Healer {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1162px -182px;
-  width: 114px;
-  height: 90px;
-}
-.broad_armor_special_winter2018Mage {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1162px -273px;
-  width: 114px;
-  height: 90px;
-}
--- a/website/client/src/assets/css/sprites/spritesmith-main-12.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main-12.css
--- a/website/client/src/assets/css/sprites/spritesmith-main-13.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main-13.css
--- a/website/client/src/assets/css/sprites/spritesmith-main-8.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main-8.css
--- a/website/client/src/assets/css/sprites/spritesmith-main-9.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main-9.css
--- a/website/client/src/assets/images/sprites/spritesmith-main-10.png
+++ b/website/client/src/assets/images/sprites/spritesmith-main-10.png
--- a/website/client/src/assets/images/sprites/spritesmith-main-11.png
+++ b/website/client/src/assets/images/sprites/spritesmith-main-11.png
--- a/website/client/src/assets/images/sprites/spritesmith-main-12.png
+++ b/website/client/src/assets/images/sprites/spritesmith-main-12.png
--- a/website/client/src/assets/images/sprites/spritesmith-main-13.png
+++ b/website/client/src/assets/images/sprites/spritesmith-main-13.png
--- a/website/client/src/assets/images/sprites/spritesmith-main-8.png
+++ b/website/client/src/assets/images/sprites/spritesmith-main-8.png
--- a/website/client/src/assets/images/sprites/spritesmith-main-9.png
+++ b/website/client/src/assets/images/sprites/spritesmith-main-9.png
--- a/website/client/src/components/groups/groupFormModal.vue
+++ b/website/client/src/components/groups/groupFormModal.vue
@@ -608,22 +608,21 @@ export default {
      };

      const categoryKeys = this.workingGroup.categories;
-      const serverCategories = [];
+      const categories = [];
      categoryKeys.forEach(key => {
        const catName = this.categoriesHashByKey[key];
-        serverCategories.push({
+        categories.push({
          slug: key,
          name: catName,
        });
      });
-      this.workingGroup.categories = serverCategories;

-      const groupData = { ...this.workingGroup };
+      const groupData = { ...this.workingGroup, categories };

      let newgroup;
      if (groupData.id) {
        await this.$store.dispatch('guilds:update', { group: groupData });
-        this.$root.$emit('updatedGroup', this.workingGroup);
+        this.$root.$emit('updatedGroup', groupData);
        // @TODO: this doesn't work because of the async resource
        // if (updatedGroup.type === 'party') this.$store.state.party = {data: updatedGroup};
      } else {
--- a/website/client/tests/unit/components/challenges/challengeDetail.spec.js
+++ b/website/client/tests/unit/components/challenges/challengeDetail.spec.js
@@ -42,6 +42,7 @@ describe('Challenge Detail', () => {
          { _id: '3', type: 'reward' },
          { _id: '4', type: 'todo' },
        ],
+        'common:setTitle': () => {},
      },
      getters: {
      },
--- a/website/client/tests/unit/components/groups/myGuilds.spec.js
+++ b/website/client/tests/unit/components/groups/myGuilds.spec.js
@@ -49,6 +49,7 @@ describe('myGuilds component', () => {
    getters: {},
    actions: {
      'guilds:getMyGuilds': () => guilds,
+      'common:setTitle': () => {},
    },
  });

--- a/website/client/tests/unit/components/home.spec.js
+++ b/website/client/tests/unit/components/home.spec.js
@@ -39,7 +39,8 @@ describe('Home', () => {
      actions: {
        'auth:register': registerStub,
        'auth:socialAuth': socialAuthStub,
-        'auth:verifyUsername': () => Promise.resolve({}),
+        'auth:verifyUsername': () => async () => ({}),
+        'common:setTitle': () => {},
      },
    });

--- a/website/client/tests/unit/components/static/home.spec.js
+++ b/website/client/tests/unit/components/static/home.spec.js
@@ -1,108 +0,0 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils';
-
-import Home from '@/components/static/home.vue';
-import Store from '@/libs/store';
-import * as Analytics from '@/libs/analytics';
-
-const localVue = createLocalVue();
-localVue.use(Store);
-
-describe('Home', () => {
-  let registerStub;
-  let socialAuthStub;
-  let store;
-  let wrapper;
-
-  function mountWrapper (query) {
-    return shallowMount(Home, {
-      store,
-      localVue,
-      mocks: {
-        $t: string => string,
-        $route: { query: query || {} },
-      },
-    });
-  }
-
-  async function fillOutUserForm (username, email, password) {
-    await wrapper.find('#usernameInput').setValue(username);
-    await wrapper.find('input[type=email]').setValue(email);
-    await wrapper.findAll('input[type=password]').setValue(password);
-  }
-
-  beforeEach(() => {
-    registerStub = sinon.stub();
-    socialAuthStub = sinon.stub();
-    store = new Store({
-      state: {},
-      getters: {},
-      actions: {
-        'auth:register': registerStub,
-        'auth:socialAuth': socialAuthStub,
-      },
-    });
-
-    sinon.stub(Analytics, 'track');
-
-    wrapper = mountWrapper();
-  });
-
-  afterEach(sinon.restore);
-
-  it('has a visible title', () => {
-    expect(wrapper.find('h1').text()).to.equal('motivateYourself');
-  });
-
-  describe('signup form', () => {
-    it('registers a user from the form', async () => {
-      const username = 'newUser';
-      const email = 'rookie@habitica.com';
-      const password = 'ImmaG3tProductive!';
-      await fillOutUserForm(username, email, password);
-
-      await wrapper.find('form').trigger('submit');
-
-      expect(registerStub.calledOnce).to.be.true;
-      expect(registerStub.getCall(0).args[1]).to.deep.equal({
-        username,
-        email,
-        password,
-        passwordConfirm: password,
-        groupInvite: '',
-      });
-    });
-
-    it('registers a user with group invite if groupInvite in the query', async () => {
-      const groupInvite = 'TheBestGroup';
-      wrapper = mountWrapper({ groupInvite });
-      await fillOutUserForm('invitedUser', 'invited@habitica.com', '1veGotFri3ndsHooray!');
-
-      await wrapper.find('form').trigger('submit');
-
-      expect(registerStub.calledOnce).to.be.true;
-      expect(registerStub.getCall(0).args[1].groupInvite).to.equal(groupInvite);
-    });
-
-    it('registers a user with group invite if p in the query', async () => {
-      const p = 'ThePiGroup';
-      wrapper = mountWrapper({ p });
-      await fillOutUserForm('alsoInvitedUser', 'invited2@habitica.com', '1veGotFri3nds2!');
-
-      await wrapper.find('form').trigger('submit');
-
-      expect(registerStub.calledOnce).to.be.true;
-      expect(registerStub.getCall(0).args[1].groupInvite).to.equal(p);
-    });
-
-    it('registers a user with group invite invite if both p and groupInvite are in the query', async () => {
-      const groupInvite = 'StillTheBestGroup';
-      wrapper = mountWrapper({ p: 'LesserGroup', groupInvite });
-      await fillOutUserForm('doublyInvitedUser', 'invited3@habitica.com', '1veGotSm4rtFri3nds!');
-
-      await wrapper.find('form').trigger('submit');
-
-      expect(registerStub.calledOnce).to.be.true;
-      expect(registerStub.getCall(0).args[1].groupInvite).to.equal(groupInvite);
-    });
-  });
-});
--- a/website/client/tests/unit/components/tasks/user.spec.js
+++ b/website/client/tests/unit/components/tasks/user.spec.js
@@ -10,6 +10,7 @@ describe('Tasks User', () => {
    const store = new Store({
      state: { user: { data: { tags: [challengeTag] } } },
      getters: {},
+      actions: { 'common:setTitle': () => {} },
    });
    return shallowMount(User, {
      store,
--- a/website/common/locales/ach/limited.json
+++ b/website/common/locales/ach/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }
--- a/website/common/locales/af/limited.json
+++ b/website/common/locales/af/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }
--- a/website/common/locales/ar/challenge.json
+++ b/website/common/locales/ar/challenge.json
@@ -96,9 +96,12 @@
    "descriptionRequired": "Description is required",
    "locationRequired": "Location of challenge is required ('Add to')",
    "categoiresRequired": "One or more categories must be selected",
-    "viewProgressOf": "View Progress Of",
-    "viewProgress": "عرض التقدم",
+    "viewProgressOf": "مشاهدة ملف",
+    "viewProgress": "عرض التقد",
    "selectMember": "اختر عضو",
    "confirmKeepChallengeTasks": "هل تريد إبقاء مهمة التحدي؟",
-    "selectParticipant": "اختر مشارك"
+    "selectParticipant": "اختر مشارك",
+    "wonChallengeDesc": "<%= إسم التحدي %> إخترتك لتكون الفائز!تم تسجيل فوزك في \"إنجازاتك\".",
+    "yourReward": "مكافئاتك",
+    "filters": "فلاتر"
 }
--- a/website/common/locales/ar/content.json
+++ b/website/common/locales/ar/content.json
@@ -4,7 +4,7 @@
    "armoireText": "الصندوق السحري",
    "armoireNotesFull": "افتح الدولاب لتحصل بشكل عشوائي على معدات خاصة،على خبرة أو على طعام. قطع المعدات المتبقية :",
    "armoireLastItem": "لقد وجدت آخر قطعة من المعدات النادرة في الصندوق السحري.",
-    "armoireNotesEmpty": "الصندوق سيحتوي على معدات جديدة في الأسبوع الأول من كل شهر. حتى ذلك الوقت، اضغط عليه باستمرار للحصول على الخبرة والطعام!",
+    "armoireNotesEmpty": "الصندوق سيحتوي على معدات جديدة في الأسبوع الأول من كل شهر. حتى ذلك الوقت، إضغط عليه باستمرار للحصول على الخبرة والطعام!",
    "dropEggWolfText": "ذئب",
    "dropEggWolfMountText": "ذئب",
    "dropEggWolfAdjective": "وفي",
--- a/website/common/locales/ar/gear.json
+++ b/website/common/locales/ar/gear.json
@@ -1743,5 +1743,5 @@
    "eyewearArmoireGoofyGlassesNotes": "Perfect for going incognito or just making your partymates giggle. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
    "twoHandedItem": "Two-handed item.",
    "weaponSpecialKS2019Notes": "",
-    "weaponSpecialKS2019Text": ""
+    "weaponSpecialKS2019Text": "سيف جريفون الأسطوري"
 }
--- a/website/common/locales/ar/limited.json
+++ b/website/common/locales/ar/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }
--- a/website/common/locales/ar/npc.json
+++ b/website/common/locales/ar/npc.json
@@ -14,11 +14,11 @@
    "next": "Next",
    "randomize": "Randomize",
    "mattBoch": "ماتّ بوتش",
-    "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. Starting at level 3, you will find eggs and potions to hatch pets with. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 3, and they'll grow into hardy mounts.",
+    "mattBochText1": "مرحبا بكم في الاسطبل!أنا مات ، صاحب الوحش.  في كل مرة تكمل فيها مهمة ، سيكون لديك فرصة عشوائية لتلقي بيضة أو جرعة تفريخ لتفريخ الحيوانات الأليفة.  عندما تفقس حيوانًا أليفًا ، سيظهر هنا!  انقر فوق صورة حيوان أليف لإضافتها إلى صورتك الرمزية.  أطعمهم بأطعمة الحيوانات الأليفة التي تجدها ، وسوف ينموون ليصبحوا جبالًا صلبة.",
    "welcomeToTavern": "Welcome to The Tavern!",
    "sleepDescription": "Need a break? Check into Daniel's Inn to pause some of Habitica's more difficult game mechanics:",
    "sleepBullet1": "Missed Dailies won't damage you",
-    "sleepBullet2": "Tasks won't lose streaks or decay in color",
+    "sleepBullet2": "لن تفقد المهام الخطوط",
    "sleepBullet3": "Bosses won't do damage for your missed Dailies",
    "sleepBullet4": "Your boss damage or collection Quest items will stay pending until check-out",
    "pauseDailies": "Pause Damage",
--- a/website/common/locales/ar/pets.json
+++ b/website/common/locales/ar/pets.json
@@ -1,4 +1,72 @@
 {
    "pets": "الحيوانات الأليفة",
-    "stable": "مستقر"
+    "stable": "مستقر",
+    "noActivePet": "لا يوجد حيوان أليف نشط",
+    "activePet": "أنشطة الحيوانات الأليفة",
+    "raisedPet": "لقد نمت <٪ = حيوان أليف٪>!",
+    "feedPet": "تغذية <٪ = text٪> إلى <٪ = name٪>؟",
+    "mountNotOwned": "أنت لاتملك هذه الكمية.",
+    "petNotOwned": "أنت لاتملك هذا الحيوان الأليف.",
+    "hatchedPetHowToUse": "قم بزيارة [Stable](<%= stableUrl %>)لإطعام وتجهيز أحدث حيوان أليف!",
+    "hatchedPetGeneric": "لقد فقس حيوان أليف جديد!",
+    "hatchedPet": "لقد فقست جديدة <٪ = جرعة٪> <٪ =بيضة٪>!",
+    "triadBingoAchievement": "لقد ربحت إنجاز \"ثلاثية البانغوا\" للعثور على جميع الحيوانات الأليفة ، وترويض كل الحيوانات الأليفة ، والعثور على جميع الحيوانات الأليفة مرة أخرى!",
+    "triadBingoText2": " وأصدر مجموعة ثابتة كاملة بإجمالي <٪ = عدد٪> مرة (مرات)",
+    "triadBingoText": "تم العثور على جميع الحيوانات الأليفة البالغ عددها 90 ، وكلها 90 حيوانًا ، وجدت جميع الحيوانات الأليفة ال 90 مرة أخرى (كيف فعلت ذلك!)",
+    "mountMasterText": "‫قام بترويض جميع المتصاعدين ال 90 (حتى أكثرهم صعوبة ، مبروك لهذا المستخدم!)",
+    "triadBingoName": "ثلاثي البنغوا",
+    "mountMasterText2": " أطلق سراح جميع ال90من المتصاعدين إجمالي <٪ = عدد٪> مرة (مرات)",
+    "mountMasterName": "وحش رئيسي",
+    "mountAchievement": "لقد حصلت على\"وحش رئيسي\"إنجاز لرويض جميع المتصاعدين!",
+    "mountMasterProgress": "‫تصاعد الوحش الرئيسي",
+    "beastMasterText2": " وأطلقوا سراح حيواناتهم الأليفة بإجمالي <٪ = عدد٪> مرة(مرات)",
+    "beastMasterText": "تم العثور على جميع الحيوانات الأليفة البالغ عددها 90(إنها مهمة صعبة للغاية,مبرووك لهذا المستخدم!)",
+    "beastMasterName": "وحش رئيسي",
+    "beastAchievement": "لقد ربحت \"وحش رئيسي \" إنجاز جمع كل الحيوانات الأليفة!",
+    "beastMasterProgress": "تقدم الوحش الرئيسي",
+    "premiumPotionNoDropExplanation": "لا يمكن استخدام جرعات التفقيس السحرية على البيض المستلم من المهام.الطريقة الوحيدة للحصول على جرعات التفقيس السحرية هي عن طريق شراؤهم بالأسفل.ليس من المقطورات العشوائية.",
+    "dropsExplanationEggs": "أنفق الجواهر لتحصل على المزيد من البيض بسرهة,إذا كنت لاتريد أن تنتظر البيض الأساسي أسقطه, أو كررالتنقيب لإدخارالبيض المنقب <a href=\"http://habitica.fandom.com/wiki/Drops\">Learn more about the drop system.</a>",
+    "dropsExplanation": "احصل على هذه العناصر بشكل أسرع مع الجواهر إذا كنت لا ترغب في انتظار إسقاطها عند إكمال مهمة. <a href=\"http://habitica.fandom.com/wiki/Drops\"> تعرف على المزيد حول نظام الإفلات. </a>",
+    "veteranTiger": "النمر المحارب",
+    "veteranWolf": "الذئب المحارب",
+    "etherealLion": "الأسد السماوي",
+    "magicMounts": "جرعة سحرية متصاعدة",
+    "questMounts": "تنقيب جبال",
+    "mountsTamed": "ترويض الجبل",
+    "noSaddlesAvailable": "أنت لاتملك أي سروج.",
+    "noFoodAvailable": "أنت لاتملك أي أغذية للحيوانات الأليفة.",
+    "food": "أغذية الحيوانات الأليفة والسروج",
+    "quickInventory": "جرد سريع",
+    "haveHatchablePet": "لديك <%= جرعة %> جرعة تفقيس و <%= بيضة %> تفقيس بيضة هذا الحيوان الأليف! <b>Click</b> يفقس!",
+    "hatchingPotion": "جرعة تفقيس",
+    "magicHatchingPotions": "جرعات التفقيس السحرية",
+    "hatchingPotions": "جرعات التفقيس",
+    "eggSingular": "بيضةٌ",
+    "eggs": "بيض",
+    "egg": "<%= نوع البيض %>البيض",
+    "potion": "<%= نوع الجرعة السحرية %> جرعة سحرية",
+    "gryphatrice": "التنين النسري",
+    "invisibleAether": "الأثير غير المرئي",
+    "royalPurpleJackalope": "الأرنب ذو القرنين الإرجواني الملكي",
+    "hopefulHippogriffMount": "أمل الفرس النسر",
+    "hopefulHippogriffPet": "أمل الفرس النسر",
+    "magicalBee": "النحلة السحرية",
+    "phoenix": "طائر العنقاء",
+    "royalPurpleGryphon": "الأسد النسر الإرجواني الملكي",
+    "orca": "الحوت القاتل",
+    "mammoth": "ماموث صوفي",
+    "mantisShrimp": "السرعوف الروبياني",
+    "hydra": "هيدرا",
+    "cerberusPup": "جرو سيربيروسي",
+    "veteranFox": "الثعلب المخضرم",
+    "veteranBear": "الدب المخضرم",
+    "veteranLion": "الأسد المخضرم",
+    "activeMount": "جبل نشط",
+    "mounts": "يتصاعد",
+    "wackyPets": "حيوانات أليف مضحكة",
+    "magicPets": "دواء سحري للحيوانات الأليفة",
+    "petsFound": "إنشاء حيوانات أليفة",
+    "keyToPets": "مفتاح بيوت الحيوانات",
+    "noActiveMount": "لا يوجد تثبيت نشط",
+    "questPets": "بحث الحيوانات"
 }
--- a/website/common/locales/ar/subscriber.json
+++ b/website/common/locales/ar/subscriber.json
@@ -1,27 +1,27 @@
 {
-    "subscription": "الاشتراك",
-    "subscriptions": "الاشتراكات",
-    "sendGems": "Send Gems",
+    "subscription": "الإشتراك",
+    "subscriptions": "الإشتراكات",
+    "sendGems": "إرسال جواهر",
    "buyGemsGold": "شراء الجواهر بالذهب",
-    "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP",
+    "mustSubscribeToPurchaseGems": "يجب الإشتراك لشراء الجواهر مع (GP).",
    "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap resets within the first three days of each month.",
-    "reachedGoldToGemCapQuantity": "Your requested amount <%= quantity %> exceeds the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap resets within the first three days of each month.",
+    "reachedGoldToGemCapQuantity": "المبلغ المطلوب  <%= quantity %> يتجاوز المبلغ الذي يمكن شراؤه لهذا الشهر (<%= convCap %>). يصبح المبلغ الكامل متاحًا خلال الأيام الثلاثة الأولى من كل شهر  . شكرا على الإشتراك!",
    "mysteryItem": "أغراض شهرية حصرية",
-    "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
-    "exclusiveJackalopePet": "Exclusive pet",
-    "giftSubscription": "Want to gift a subscription to someone?",
-    "giftSubscriptionText4": "Thanks for supporting Habitica!",
-    "groupPlans": "Group Plans",
+    "mysteryItemText": "ستتلقى كل شهر عنصر تجميلي فريد من نوعه للأفاتار الخاص بك! بالإضافة إلى ذلك ، مقابل كل ثلاثة أشهر من الإشتراك المتتالي ، سيمنحك المسافرون عبر الزمن الغامض الوصول إلى عناصر التجميل التاريخية (والمستقبلية!).",
+    "exclusiveJackalopePet": "حيوان أليف حصري",
+    "giftSubscription": "هل تريد إهداء مزايا الاشتراك لشخص آخر؟",
+    "giftSubscriptionText4": "شكراً لدعمك هابيتيكا !",
+    "groupPlans": "خطط المجموعة",
    "subscribe": "اشتراك",
-    "nowSubscribed": "You are now subscribed to Habitica!",
+    "nowSubscribed": "أنت الآن مشترك في هابيتيكا!",
    "cancelSub": "إلغاء الإشتراك",
    "cancelSubInfoGroupPlan": "Because you have a free subscription from a Group Plan, you cannot cancel it. It will end when you are no longer in the Group. If you are the Group leader and want to cancel the entire Group Plan, you can do that from the group's \"Payment Details\" tab.",
-    "cancelingSubscription": "Canceling the subscription",
+    "cancelingSubscription": "الغاء الإشتراك",
    "contactUs": "اتصل بنا",
    "checkout": "الدفع",
    "sureCancelSub": "تأكيد إلغاء الاشتراك؟",
-    "subGemPop": "Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.",
-    "subGemName": "جواهر مشترك",
+    "subGemPop": "لأنك إشتركت في هابيتيكا,يمكنك شراء عدد من الجواهر كل شهر باستخدام الذهب.",
+    "subGemName": "جواهر المشترك",
    "maxBuyGems": "You have bought all the Gems you can this month. More become available within the first three days of each month. Thanks for subscribing!",
    "timeTravelers": "مسافرين عبر الزمن",
    "timeTravelersPopoverNoSubMobile": "Looks like you’ll need a Mystic Hourglass to open the time portal and summon the Mysterious Time Travelers.",
@@ -132,5 +132,9 @@
    "subscriptionBenefit6": "Earn Mystic Hourglasses for use in the Time Travelers' Shop!",
    "purchaseAll": "Purchase Set",
    "gemsRemaining": "gems remaining",
-    "notEnoughGemsToBuy": "You are unable to buy that amount of gems"
+    "notEnoughGemsToBuy": "You are unable to buy that amount of gems",
+    "cancelSubInfoGoogle": "الرجاء الانتقال إلى \"الحساب\"> قسم \"الاشتراكات\" في متجر Google Play لإلغاء اشتراكك أو لمعرفة تاريخ انتهاء إشتراكك إذا كنت قد ألغيته بالفعل. هذه الشاشة غير قادرة على إظهار ما إذا كان قد تم إلغاء اشتراكك.",
+    "organization": "منظمة",
+    "giftASubscription": "إهداء إشتراك",
+    "viewSubscriptions": "عرض الإشتراكات"
 }
--- a/website/common/locales/be/limited.json
+++ b/website/common/locales/be/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }
--- a/website/common/locales/bg/achievements.json
+++ b/website/common/locales/bg/achievements.json
@@ -89,7 +89,7 @@
    "achievementGoodAsGoldModalText": "Събрахте всички Златни домашни любимци!",
    "achievementGoodAsGoldText": "Събрали сте всички Златни домашни любимци.",
    "achievementGoodAsGold": "Златно сърце",
-    "achievementFreshwaterFriendsModalText": "Завършихте  мисиите за аксолотъла, жабата и хипопотама!",
+    "achievementFreshwaterFriendsModalText": "Завършихте мисиите за аксолотъла, жабата и хипопотама!",
    "achievementFreshwaterFriendsText": "Завършили сте мисиите за домашни любимци за аксолотъла, жабата и хипопотама.",
    "achievementFreshwaterFriends": "Сладководни приятели",
    "yourRewards": "Вашите възнаграждения"
--- a/website/common/locales/bn/character.json
+++ b/website/common/locales/bn/character.json
@@ -147,7 +147,7 @@
    "youCast": "You cast <%= spell %>.",
    "youCastTarget": "You cast <%= spell %> on <%= target %>.",
    "youCastParty": "You cast <%= spell %> for the party.",
-    "critBonus": "Critical Hit! Bonus:",
+    "critBonus": "Critical Hit! Bonus: ",
    "gainedGold": "You gained some Gold",
    "gainedMana": "You gained some Mana",
    "gainedHealth": "You gained some Health",
--- a/website/common/locales/bn/limited.json
+++ b/website/common/locales/bn/limited.json
@@ -146,7 +146,7 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!",
    "spring2019RobinHealerSet": "রবিন (চিকিৎসক)",
    "spring2019AmberMageSet": "অ্যাম্বার (জাদুকর)",
--- a/website/common/locales/bs/achievements.json
+++ b/website/common/locales/bs/achievements.json
@@ -30,10 +30,10 @@
    "achievementFreshwaterFriends": "Freshwater prijatelji",
    "achievementBareNecessitiesModalText": "Prikupili ste majmuna, ljenjivca i treling u potrazi za ljubimcima!",
    "achievementBareNecessitiesText": "Prikupljeni su majmun, ljenjivac i treling u potrazi za ljubimcima.",
-    "achievementBareNecessities": "Bare Necessities",
+    "achievementBareNecessities": "Gole potrebe",
    "achievementBugBonanzaModalText": "Prikupili ste bubu, leptira, puža i pauka u potrazi za ljubimcima!",
    "achievementBugBonanzaText": "Prikupljeni su buba, leptir, puž i pauk u potrazi za ljubimcima.",
-    "achievementBugBonanza": "Bug Bonanza",
+    "achievementBugBonanza": "Buba Bonanza",
    "achievementRosyOutlookModalText": "Ukrotili ste sve pamučne slatke ružičaste jahalice!",
    "achievementRosyOutlookText": "Ukroćene su sve pamučni slatke ružičaste jahalice.",
    "achievementRosyOutlook": "Ružičasti izgled",
--- a/website/common/locales/bs/communityguidelines.json
+++ b/website/common/locales/bs/communityguidelines.json
@@ -11,117 +11,117 @@
    "commGuidePara016": "Kada se krećete javnim prostorima u Habitici, postoje neka opšta pravila kako bi svi bili sigurni i sretni. Ovo bi trebalo biti lahko avanturistima poput vas!",
    "commGuideList02A": "<strong>Uvažavajte jedni druge</strong>. Budite uljudni, ljubazni, prijateljski i uslužni. Zapamtite: Habitičanci dolaze iz svih sredina i imali su raznolika iskustva. Ovo je dio onoga što Habiticu čini tako cool! Izgradnja zajednice znači poštivanje i uvažavanje naših razlika kao i naših sličnosti. Evo nekoliko jednostavnih načina da se poštujete:",
    "commGuideList02B": "<strong>Poštujte sve <a href='/static/terms' target='_blank'>Uslove i odredbe</a></strong>.",
-    "commGuideList02C": "<strong>Do not post images or text that are violent, threatening, or sexually explicit/suggestive, or that promote discrimination, bigotry, racism, sexism, hatred, harassment or harm against any individual or group</strong>. Not even as a joke. This includes slurs as well as statements. Not everyone has the same sense of humor, and so something that you consider a joke may be hurtful to another. Attack your Dailies, not each other.",
-    "commGuideList02D": "<strong>Keep discussions appropriate for all ages</strong>. We have many young Habiticans who use the site! Let's not tarnish any innocents or hinder any Habiticans in their goals.",
-    "commGuideList02E": "<strong>Avoid profanity. This includes milder, religious-based oaths that may be acceptable elsewhere</strong>. We have people from all religious and cultural backgrounds, and we want to make sure that all of them feel comfortable in public spaces. <strong>If a moderator or staff member tells you that a term is disallowed on Habitica, even if it is a term that you did not realize was problematic, that decision is final</strong>. Additionally, slurs will be dealt with very severely, as they are also a violation of the Terms of Service.",
-    "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.",
-    "commGuideList02H": "<strong>Take time to reflect instead of responding in anger</strong> if someone tells you that something you said or did made them uncomfortable. There is great strength in being able to sincerely apologize to someone. If you feel that the way they responded to you was inappropriate, contact a mod rather than calling them out on it publicly.",
-    "commGuideList02I": "<strong>Divisive/contentious conversations should be reported to mods</strong> by flagging the messages involved or using the <a href='http://contact.habitica.com/' target='_blank'>Moderator Contact Form</a>. If you feel that a conversation is getting heated, overly emotional, or hurtful, cease to engage. Instead, report the posts to let us know about it. Moderators will respond as quickly as possible. It's our job to keep you safe. If you feel that more context is required, you can report the problem using the <a href='http://contact.habitica.com/' target='_blank'>Moderator Contact Form</a>.",
-    "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.",
-    "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.",
-    "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": "Furthermore, some public spaces in Habitica have additional guidelines.",
-    "commGuideHeadingTavern": "The Tavern",
-    "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.",
-    "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": "Public Guilds",
-    "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.",
-    "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.wikia.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>.",
-    "commGuideHeadingInfractionsEtc": "Infractions, Consequences, and Restoration",
-    "commGuideHeadingInfractions": "Infractions",
-    "commGuidePara050": "Overwhelmingly, Habiticans assist each other, are respectful, and work to make the whole community fun and friendly. However, once in a blue moon, something that a Habitican does may violate one of the above guidelines. When this happens, the Mods will take whatever actions they deem necessary to keep Habitica safe and comfortable for everyone.",
-    "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.",
-    "commGuideHeadingSevereInfractions": "Severe Infractions",
-    "commGuidePara052": "Severe infractions greatly harm the safety of Habitica's community and users, and therefore have severe consequences as a result.",
-    "commGuidePara053": "The following are examples of some severe infractions. This is not a comprehensive list.",
-    "commGuideList05A": "Violation of Terms and Conditions",
-    "commGuideList05B": "Hate Speech/Images, Harassment/Stalking, Cyber-Bullying, Flaming, and Trolling",
-    "commGuideList05C": "Violation of Probation",
-    "commGuideList05D": "Impersonation of Staff or Moderators",
-    "commGuideList05E": "Repeated Moderate Infractions",
-    "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",
-    "commGuideHeadingModerateInfractions": "Moderate Infractions",
-    "commGuidePara054": "Moderate infractions do not make our community unsafe, but they do make it unpleasant. These infractions will have moderate consequences. When in conjunction with multiple infractions, the consequences may grow more severe.",
-    "commGuidePara055": "The following are some examples of Moderate Infractions. This is not a comprehensive list.",
-    "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",
-    "commGuideHeadingMinorInfractions": "Minor Infractions",
-    "commGuidePara056": "Minor Infractions, while discouraged, still have minor consequences. If they continue to occur, they can lead to more severe consequences over time.",
-    "commGuidePara057": "The following are some examples of Minor Infractions. This is not a comprehensive list.",
-    "commGuideList07A": "First-time violation of Public Space Guidelines",
-    "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!",
-    "commGuideHeadingConsequences": "Consequences",
-    "commGuidePara058": "In Habitica -- as in real life -- every action has a consequence, whether it is getting fit because you've been running, getting cavities because you've been eating too much sugar, or passing a class because you've been studying.",
-    "commGuidePara059": "<strong>Similarly, all infractions have direct consequences.</strong> Some sample consequences are outlined below.",
-    "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>:",
-    "commGuideList08A": "what your infraction was",
-    "commGuideList08B": "what the consequence is",
-    "commGuideList08C": "what to do to correct the situation and restore your status, if possible.",
-    "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.",
-    "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": "Examples of Severe Consequences",
-    "commGuideList09A": "Account bans (see above)",
-    "commGuideList09C": "Permanently disabling (\"freezing\") progression through Contributor Tiers",
-    "commGuideHeadingModerateConsequences": "Examples of Moderate Consequences",
-    "commGuideList10A": "Restricted public and/or private chat privileges",
-    "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",
-    "commGuideList10D": "Temporarily disabling (\"freezing\") progression through Contributor Tiers",
-    "commGuideList10E": "Demotion of Contributor Tiers",
-    "commGuideList10F": "Putting users on \"Probation\"",
-    "commGuideHeadingMinorConsequences": "Examples of Minor Consequences",
-    "commGuideList11A": "Reminders of Public Space Guidelines",
-    "commGuideList11B": "Warnings",
-    "commGuideList11C": "Requests",
-    "commGuideList11D": "Deletions (Mods/Staff may delete problematic content)",
-    "commGuideList11E": "Edits (Mods/Staff may edit problematic content)",
-    "commGuideHeadingRestoration": "Restoration",
-    "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.",
-    "commGuidePara007": "Staff have purple tags marked with crowns. Their title is \"Heroic\".",
-    "commGuidePara008": "Mods have dark blue tags marked with stars. Their title is \"Guardian\". The only exception is Bailey, who, as an NPC, has a black and green tag marked with a star.",
-    "commGuidePara009": "The current Staff Members are (from left to right):",
-    "commGuideAKA": "<%= habitName %> aka <%= realName %>",
+    "commGuideList02C": "<strong>Nemojte objavljivati slike ili tekst koji su nasilni, prijeteći ili seksualno eksplicitni/sugestivni ili koji promovišu diskriminaciju, zadrtost, rasizam, seksizam, mržnju, uznemiravanje ili nanošenje štete bilo kojoj osobi ili grupi </strong>. Čak ni u šali. To uključuje i klevete kao i izjave. Nemaju svi isti smisao za humor, pa bi nešto što smatrate šalom moglo naštetiti drugom. Napadajte svoje dnevne zadatke, a ne jedni druge.",
+    "commGuideList02D": "<strong>Neka rasprave budu prikladne za sve uzraste</strong>. Imamo mnogo mladih Habitičana koji koriste stranicu! Nemojmo ocrniti nevine ili ometati bilo koje Habitičane u njihovim ciljevima.",
+    "commGuideList02E": "<strong>Izbjegavajte psovke. To uključuje blaže zakletve na vjerskoj osnovi koje mogu biti negdje prihvatljive prihvatljive </strong>. Imamo ljude iz svih vjerskih i kulturnih sredina i želimo biti sigurni da se svi osjećaju ugodno u javnim prostorima. <strong> Ako vam moderator ili član osoblja kaže da je pojam zabranjen na Habitici, čak i ako je riječ o terminu za koji niste shvatili da je problematičan, ta je odluka konačna </strong>. Uz to, s psovkama će se postupati vrlo ozbiljno, jer one takođe predstavljaju kršenje Uslova usluge.",
+    "commGuideList02F": "<strong>Izbjegavajte proširene rasprave o temama podjele u Aščinici i tamo gdje je to izvan tematike</strong>. Ako osjećate da je neko rekao nešto nepristojno ili povrjedljivo, nemojte se uključivati u daljnje rasprišivanje. Ako netko spomene nešto što smjernice dopuštaju, a što šteti vama, u redu je da to pristojno javite nekome. Ako je to protiv smjernica ili Uslova usluge, trebali biste to označiti i pustiti moderatoru da odgovori. Ako sumnjate, označite objavu zastavicom.",
+    "commGuideList02G": "<strong>Odmah se pridržavajte bilo kojeg zahtjeva od moderatora</strong>. To može uključivati, ali nije ograničeno na, zahtjev za ograničavanjem vaših postova u određenom prostoru, uređivanje vašeg profila radi uklanjanja neprikladnog sadržaja, traženje od vas da premjestite svoju raspravu u prikladniji prostor itd.",
+    "commGuideList02H": "<strong>Odvojite vrijeme za razmišljanje, umjesto da odgovorite u ljutnji</strong> ako vam neko kaže da mu je nešto što ste rekli ili učinili neugodno. Velika je snaga u mogućnosti da se nekome iskreno izvinite. Ako smatrate da je način na koji su vam odgovorili neprimjeren, obratite se moderatoru umjesto da ih javno prozivate.",
+    "commGuideList02I": "<strong>Svađe/prepirke treba prijaviti moderatorima</strong> označavanjem zastavicom uključenih poruka ili upotrebom <a href='https://contact.habitica.com/' target='_blank'>Obrasca za kontakt moderatora</a> . Ako osjećate da razgovor postaje žestok, previše emotivan ili štetan, napustite ga. Svakako, prijavite postove kako biste nas obavijestili o tome. Moderatori će odgovoriti što je brže moguće. Naš posao je da vas čuvamo. Ako smatrate da je potrebno više konteksta, možete prijaviti problem pomoću <a href='https://contact.habitica.com/' target='_blank'>Obrasca za kontakt moderatora</a>.",
+    "commGuideList02J": "<strong>Ne šaljite neželjenu poštu</strong>. Neželjena pošta može uključivati, ali nije ograničena na: objavljivanje istog komentara ili upita na više mjesta, objavljivanje veza (linkova) bez objašnjenja ili konteksta, objavljivanje besmislenih poruka, objavljivanje više promotivnih poruka o esnafu, zabavi ili izazovu ili objavljivanje mnogih poruka u nizu . Traženje dragulja ili pretplate u bilo kojem od prostora za razgovor ili putem privatne poruke takođe se smatra neželjenim sadržajem. Ako će ljudi koji kliknu na vezu (link) donijeti bilo kakvu korist za vas, to morate otkriti u tekstu poruke ili će se to također smatrati neželjenom poštom. <br/><br/> Na moderatorima je da odluče da li nešto predstavlja neželjenu poštu ili može dovesti do neželjene pošte, čak i ako ne smatrate da ste poslali neželjenu poštu. Na primjer, oglašavanje esnafa prihvatljivo je jednom ili dva puta, ali više postova u jednom danu vjerovatno bi predstavljalo neželjenu poštu, bez obzira na to koliko je esnaf koristan!",
+    "commGuideList02K": "<strong>Izbjegavajte objavljivanje velikog teksta zaglavlja u javnim prostorima za razgovor, posebno u Aščinici</strong>. Slično kao i SVA VELIKA SLOVA, koja se čitaju kao da vičete i ometa ugodnu atmosferu.",
+    "commGuideList02L": "<strong>Izuzetno obeshrabrujemo razmjenu ličnih podataka - posebno podataka koji se mogu koristiti za vašu identifikaciju - u javnim prostorima za čavrljanje</strong>. Podaci za identifikaciju mogu uključivati, ali nisu ograničeni na: vašu adresu, vašu adresu e-pošte i vaš API žeton/šifru. Ovo je za vašu sigurnost! Osoblje ili moderatori mogu ukloniti takve objave po svom nahođenju. Ako se od vas zatraže lični podaci u privatnom esnafu, zabavi ili privatnim porukama, toplo preporučujemo da ljubazno odbijete i upozorite osoblje i moderatore tako što ćete 1) označiti poruku ako je u čatu za zabavu ili privatnom esnafu ili 2) popunjavanjem <a href='https://contact.habitica.com/' target='_blank'> Obrasca za kontakt moderatora </a> uključujući snimke i slike (screenshot) zaslona.",
+    "commGuidePara019": "<strong>U privatnim prostorima</strong>, korisnici imaju više slobode razgovarati o bilo kojoj temi koju bi željeli, ali svejedno ne smiju kršiti Uslove i odredbe, uključujući objavljivanje nepristojnih riječi ili bilo kojeg diskriminatornog, nasilnog ili prijetećeg sadržaja. Imajte na umu da, jer se nazivi izazova pojavljuju na javnom profilu pobjednika, SVI nazivi izazova moraju poštivati smjernice javnog prostora, čak i ako se pojavljuju u privatnom prostoru.",
+    "commGuidePara020": "<strong>Privatne poruke (PP)</strong> imaju neke dodatne smjernice. Ako vas je netko blokirao, nemojte ga kontaktirati negdje drugdje i tražiti da vas odblokira. Pored toga, ne biste trebali slati privatne poruke (PP) nekome ko traži podršku (jer su javni odgovori na pitanja podrške korisni zajednici). I na kraju, nemojte nikome slati PP moleći za poklon dragulja ili pretplatu, jer se to može smatrati neželjenom poštom.",
+    "commGuidePara020A": "<strong>Ako vidite poruku ili privatnu poruku za koju smatrate da krši gore navedene smjernice za javni prostor ili ako vidite poruku ili privatnu poruku koja se tiče vas ili vam stvara nelagodu, možete na to skrenuti pažnju moderatoru i osoblju klikom na ikonu zastavice da to prijavite</strong>. Član osoblja ili moderator će odgovoriti na situaciju što je prije moguće. Imajte na umu da je namjerno prijavljivanje nevinih postova kršenje ovih Smjernica (vidi dolje u dijelu „Prekršaji“). Moderatore možete kontaktirati i putem obrasca na stranici „Kontaktirajte nas“, kojem takođe možete pristupiti putem menija pomoći klikom na „<a href = 'https: //contact.habitica.com/' target = '_ blank'>Kontaktirajte tim za moderiranje</a>.” Možda ćete to htjeti učiniti ako postoji više problematičnih postova iste osobe u različitim esnafima ili ako situacija zahtijeva neko objašnjenje. Možete nam se obratiti na svom materinjem jeziku ako vam je to lakše: možda ćemo morati koristiti Google Translate, ali želimo da se osjećate ugodno kad nas kontaktirate ako imate problema.",
+    "commGuidePara021": "Nadalje, neki javni prostori na Habitici imaju dodatne smjernice.",
+    "commGuideHeadingTavern": "Aščinica",
+    "commGuidePara022": "Aščinica je glavno mjesto za druženje Habitičana. Aščija Daniel brine da je sve čisto i da miriše, a Lemoness će vam rado dočarati malo limunade dok sjedite i čavrljate. Samo imajte na umu …",
+    "commGuidePara023": "<strong>Razgovori se uglavnom vrte oko neobaveznog čavrljanja i savjeta o produktivnosti ili poboljšanju života</strong>. Budući da aščijsko čavrljanje može sadržavati samo 200 poruka, <strong>nije dobro mjesto za duže razgovore o temama, posebno osjetljivim</strong> (npr. Politika, religija, depresija, treba li loviti gobline ili ne, treba li nekome zabraniti pristup, itd.). Ove razgovore treba prenijeti u odgovarajući esnaf. Moderator vas može uputiti u odgovarajući esnaf, ali na kraju je vaša odgovornost da pronađete i objavite na odgovarajućem mjestu.",
+    "commGuidePara024": "<strong>U aščinici ne razgovarajte o bilo čemu što izaziva ovisnost</strong>. Mnogi ljudi koriste Habiticu kako bi pokušali napustiti svoje loše navike. Ljudi koji budu slušali kako se govori o supstancama koje izazivaju zavisnost može im mnogo otežati situaciju! Poštujte svoje kolege aščije i uzmite ovo u obzir. To uključuje, ali nije isključivo: pušenje, alkohol, pornografiju, kockanje i upotrebu/zloupotrebu droga.",
+    "commGuidePara027": "<strong>Kad vas moderator uputi da razgovor vodite negdje drugdje, ako ne postoji odgovarajući esnaf, možda će vam predložiti upotrebu Stražnjeg ćoška</strong>. Esnaf Stražnjeg ćoška je besplatan javni prostor za raspravu o potencijalno osjetljivim temama koji bi se trebao koristiti samo ako ih moderator tamo uputi. To pažljivo nadgleda moderirajući tim. To nije mjesto za opšte rasprave ili razgovore i moderator će vas tamo uputiti samo kada je to prikladno.",
+    "commGuideHeadingPublicGuilds": "Javni esnafi",
+    "commGuidePara029": "<strong>Javni esnafi slični su aščinici, osim što umjesto da se vrte oko opštenih tema, imaju fokusiranu temu</strong>. Čavrljanje u javnom esnafu trebalo bi da se fokusira na temu. Na primjer, članovi esnafa pisaca (Wordsmithsa) mogu biti naljućeni ako se razgovor iznenada usredotoči na vrtlarenje umjesto na pisanje, a esnaf odgajivača zmajeva možda neće biti zainteresiran za dešifriranje drevnih runa. Neki su esnafi opušteniji u ovome od drugih, ali uopšteno, <strong>pokušajte ostati na temi</strong>!",
+    "commGuidePara031": "Neki javni esnafi sadržavat će osjetljive teme poput depresije, religije, politike itd. To je u redu sve dok razgovori u njima ne krše nijedan Uslov i odredbe ili Pravila javnog prostora i dok ostanu da se drže teme.",
+    "commGuidePara033": "<strong>Javni esnafi NE SMIJU sadržavati sadržaj za 18+ godina. Ako se planira redovno razgovarati o osjetljivom sadržaju, trebali bi to reći u opisu esnafa</strong>. Ovo je zbog toga da bi Habitica bila sigurna i ugodna za sve.",
+    "commGuidePara035": "<strong>Ako dotični esnaf ima različite vrste osjetljivih pitanja, s poštovanjem ćete obratiti svojim kolegama Habitičanima da vaš komentar stave iza upozorenja (npr. \\\"Upozorenje: moguće na samoozljeđivanje\\\") </strong>. Oni se mogu okarakterisati kao upozorenja o pokretaču i/ili bilješke o sadržaju, a esnafi mogu imati svoja pravila uz ovdje navedena. Ako je moguće, upotrijebite <a href='http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>Markdown jezik </a> kako biste sakrili potencijalno osjetljivi sadržaj ispod tako da oni koji ne žele da čitaju takve sadržaje mogu čitati sve ostalo bez problema. Osoblje i moderatori Habitice i dalje mogu ukloniti taj materijal po svom nahođenju.",
+    "commGuidePara036": "Također, i osjetljivi materijali trebaju biti aktuelni -- uvođenje tema o samoozljeđivanju u esnaf usmjerenom na borbu protiv depresije može imati smisla, ali je vjerojatno manje prikladno u muzičkom esnafu. Ako vidite nekoga ko više puta krši ove smjernice, posebno nakon nekoliko zahtjeva, označite postove i obavijestite moderatore putem <a href='https://contact.habitica.com/' target='_blank'>Obrazac za kontakt moderatora</a>.",
+    "commGuidePara037": "<strong>Ne smiju se stvarati esnafi, javni ili privatni, u svrhu napada na bilo koju grupu ili pojedinca</strong>. Stvaranje takvog esnafa osnova je trenutne zabrane. Borite se protiv loših navika, a ne protiv kolega avanturista!",
+    "commGuidePara038": "<strong>Svi izazovi u aščinici i u javnim esnafima moraju se također pridržavati ovih pravila</strong>.",
+    "commGuideHeadingInfractionsEtc": "Prekršaji, posljedice i rehabilitacija",
+    "commGuideHeadingInfractions": "Prekršaji",
+    "commGuidePara050": "Pretežno, Habitičani pomažu jedni drugima, uvažavaju i rade na tome da cijelu zajednicu učine zabavnom i prijateljskom. Međutim, za vrijeme punog mjeseca, nešto što Habitičanin učini može prekršiti jednu od navedenih smjernica. Kada se to dogodi, moderatori će poduzeti sve radnje koje smatraju potrebnim kako bi Habitica bila sigurna i ugodna za sve.",
+    "commGuidePara051": "<strong>Postoje razni prekršaji i rješavaju se u zavinosti od njihove ozbiljnosti</strong>. Ovo nisu sveobuhvatni popisi i moderatori mogu donositi odluke o temama koje ovdje nisu obrađene po vlastitom nahođenju. Moderatori će uzeti u obzir kontekst prilikom procjene prekršaja.",
+    "commGuideHeadingSevereInfractions": "Ozbiljni prekršaji",
+    "commGuidePara052": "Ozbiljni prekršaji u velikoj mjeri štete sigurnosti zajednice i korisnika Habitice, pa stoga imaju ozbiljne posljedice.",
+    "commGuidePara053": "Slijede primjeri nekih teških prekršaja. Ovo nije sveobuhvatan spisak.",
+    "commGuideList05A": "Kršenje uslova i odredbi",
+    "commGuideList05B": "Govor ili slike mržnje, uznemiravanje/uhođenje, virtuelni mobing, vrijeđanje i trolanje",
+    "commGuideList05C": "Kršenje uslovne kazne",
+    "commGuideList05D": "Lažno predstavljanje kao osoblje ili moderator",
+    "commGuideList05E": "Ponavljanje umjerenih prekršaja",
+    "commGuideList05F": "Stvaranje duplih računa kako bi se izbjegle posljedice (na primjer, stvaranje novog računa za čavrljanje nakon ukidanja privilegija čavrljanja)",
+    "commGuideList05G": "Namjerna obmana osoblja ili moderatora kako bi se izbjegle posljedice ili drugi korisnik doveo u nevolju",
+    "commGuideHeadingModerateInfractions": "Umjereni prekršaji",
+    "commGuidePara054": "Umjereni prekršaji ne čine našu zajednicu nesigurnom, ali je čine neprijatnom. Ova kršenja imat će umjerene posljedice. U kombinaciji s višestrukim prekršajima, posljedice mogu postati ozbiljnije.",
+    "commGuidePara055": "Slijedi nekoliko primjera umjerenih povreda. Ovo nije sveobuhvatan spisak.",
+    "commGuideList06A": "Zanemarivanje, nepoštovanje ili prepirka sa moderatorom. To uključuje javno prigovaranje moderatorima ili drugim korisnicima, javno veličanje ili odbranu zabranjenih korisnika ili raspravu je li moderatorska akcija prikladna. Ako ste zabrinuti zbog jednog od pravila ili ponašanja moderatora, kontaktirajte osoblje putem e-pošte (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
+    "commGuideList06B": "Sugerisanje moderatorima. Da biste brzo pojasnili relevantnu stvar: Prijatno spominjanje pravila je u redu. Sugerisanje moderatorima sastoji se od kazivanja, zahtijevanja i/ili snažnog impliciranja da neko mora poduzeti radnju koju opisujete kako bi ispravili grešku. Možete nekoga upozoriti na činjenicu da je počinio prijestup, ali molim vas, nemojte zahtijevati radnju - na primjer, govoreći: \"Samo da znate, u kafani se obeshrabruje vulgarnost, pa biste to možda htjeli izbrisati,\\\" bilo bi bolje nego reći, \\\"morat ću vas zamoliti da izbrišete taj post.\"",
+    "commGuideList06C": "Namjerno označavanje nevinih postova.",
+    "commGuideList06D": "Neprestano kršenje smjernica javnog prostora",
+    "commGuideList06E": "Neprestana počinjenja manjih prekršaja",
+    "commGuideHeadingMinorInfractions": "Manji prekršaji",
+    "commGuidePara056": "Manji prekršaji, iako obeshrabrujući i dalje imaju manje posljedice. Ako se nastave javljati, s vremenom mogu dovesti do ozbiljnijih posljedica.",
+    "commGuidePara057": "Slijedi nekoliko primjera manjih povreda. Ovo nije sveobuhvatan spisak.",
+    "commGuideList07A": "Prvo kršenje smjernica javnog prostora",
+    "commGuideList07B": "Sve izjave ili radnje koje pokreću \"Molim te nemoj\". Kada moderator mora korisniku reći \"Molim vas, nemojte to raditi\", to se može računati kao vrlo mali prekršaj za tog korisnika. Primjer bi mogao biti \"Molim vas, nemojte se dalje svađati u korist ove ideje o funkciji nakon što smo vam nekoliko puta rekli da to nije izvedivo.\" U mnogim slučajevima, Molim vas nemojte, može biti manja posljedica, ali ako moderatori moraju dovoljno puta reći \"Molimo nemojte\" istom korisniku, pokretački Manji prekršaji počet će se računati kao Umjereni prekršaji.",
+    "commGuidePara057A": "Neke objave mogu biti skrivene jer sadrže osjetljive informacije ili mogu ljudima dati pogrešnu ideju. To se obično ne računa kao prekršaj, pogotovo ne prvi put!",
+    "commGuideHeadingConsequences": "Posljedice",
+    "commGuidePara058": "U Habitici -- kao i u stvarnom životu -- svaka akcija ima posljedicu, bilo da se želi smršati pa se trči, dobija se karijes jer se jede previše šećera ili se imaju dobre ocjene jer se marljivo učilo.",
+    "commGuidePara059": "<strong>Slično tome, svi prekršaji imaju direktne posljedice.</strong> Neki uzorci posljedica navedeni su u nastavku.",
+    "commGuidePara060": "<strong>Ako vaše kršenje ima umjerenu ili ozbiljnu posljedicu, postojat će post člana osoblja ili moderatora na forumu u kojem se pojavilo kršenje zakona</strong>:",
+    "commGuideList08A": "koja je vaša povreda bila",
+    "commGuideList08B": "kakve su posljedice",
+    "commGuideList08C": "šta učiniti da ispravite situaciju i vratite svoj status, ako je moguće.",
+    "commGuidePara060A": "Ako situacija zahtijeva, možda ćete dobiti PP ili e-poštu, kao i post na forumu u kojem je došlo do prekršaja. U nekim slučajevima možda vam se neće uopšte javno zamjerati.",
+    "commGuidePara060B": "Ako je vaš račun zabranjen (ozbiljna posljedica), nećete se moći prijaviti na Habitica i primit ćete poruku o grešci nakon pokušaja prijave. <strong>Ako se želite izviniti ili moliti za vraćanje, pošaljite e-poštu na osoblje na <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> sa svojim UUID </strong> (koji će biti naveden u poruci o grešci).<strong> Vaša je</strong> odgovornost odgovoriti ako želite preispitivanje ili vraćanje računa.",
+    "commGuideHeadingSevereConsequences": "Primjeri ozbiljnih posljedica",
+    "commGuideList09A": "Zabrane računa (vidi gore)",
+    "commGuideList09C": "Trajno onemogućavanje (\"zamrzavanje\") napredovanja kroz nivoe saradnika",
+    "commGuideHeadingModerateConsequences": "Primjeri umjerenih posljedica",
+    "commGuideList10A": "Ograničene privilegije javnog i/ili privatnog čata",
+    "commGuideList10A1": "Ako vaše radnje rezultiraju ukidanjem vaših privilegija čavrljanja, moderator ili član osoblja poslat će vam PP i/ili objaviti na forumu u kojem ste isključeni da bi vas obavijestio o razlogu za utišavanje i dužini vremena za koje ćete biti prigušeni. Na kraju tog razdoblja dobit ćete povlastice čavrljanja pod uslovom da ste spremni ispraviti ponašanje zbog kojeg ste prigušeni i u skladu sa Smjernicama zajednice.",
+    "commGuideList10C": "Ograničene povlastice za stvaranje esnafa/izazova",
+    "commGuideList10D": "Privremeno onemogućavanje (\"zamrzavanje\") napredovanja kroz nivoa saradnika",
+    "commGuideList10E": "Snižavanje nivoa za rad sa saradnicima",
+    "commGuideList10F": "Stavljanje korisnika na \"Uslovnu kaznu\"",
+    "commGuideHeadingMinorConsequences": "Primjeri manjih posljedica",
+    "commGuideList11A": "Podsjetnici na smjernice javnog prostora",
+    "commGuideList11B": "Upozorenja",
+    "commGuideList11C": "Zahtjevi",
+    "commGuideList11D": "Brisanja (Moderatori/Osoblje mogu izbrisati problematičan sadržaj)",
+    "commGuideList11E": "Uređivanja (Moderatori/Osoblje mogu uređivati problematični sadržaj)",
+    "commGuideHeadingRestoration": "Rehabilitacija",
+    "commGuidePara061": "Habitica je zemlja posvećena samopoboljšanju, a mi vjerujemo u druge šanse.<strong> Ako počinite prekršaj i pretrpite posljedicu, smatrajte to šansom da procijenite svoje postupke i nastojite biti bolji član zajednice</strong>.",
+    "commGuidePara062": "Obavijest, poruka i/ili e-pošta koju primate s objašnjenjem posljedica svojih postupaka dobar je izvor informacija. Sarađujte sa svim nametnutim ograničenjima i nastojte ispuniti zahtjeve za ukidanje bilo kakvih kazni.",
+    "commGuidePara063": "Ako ne razumijete posljedice ili prirodu vaših prekršaja, zatražite pomoć od osoblja/moderatora kako biste izbjegli činjenje prekršaja u budućnosti. Ako smatrate da je određena odluka nepravedna, možete kontaktirati osoblje da biste o tome razgovarali na <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
+    "commGuideHeadingMeet": "Upoznajte osoblje i moderatore!",
+    "commGuidePara006": "Habitica ima nekoliko neumornih vitezova-lutalica koji udružuju snage sa članovima osoblja kako bi zajednica bila mirna, zadovoljna i bez trolova. Svaka ima određenu domenu, ali ponekad će biti pozvana da služi u drugim društvenim sferama.",
+    "commGuidePara007": "Osoblje ima ljubičaste oznake i krune. Njihova titula je \"Herojski\".",
+    "commGuidePara008": "Moderatori imaju tamnoplave oznake sa zvjezdicama. Njihova titula je \"Čuvar\". Jedini izuzetak je Bailey, koji kao NPC ima crno-zelenu oznaku sa zvijezdom.",
+    "commGuidePara009": "Trenutni članovi osoblja (slijeva nadesno):",
+    "commGuideAKA": "<%= habitName %> kao <%= realName %>",
    "commGuideOnTrello": "<%= trelloName %> on Trello",
-    "commGuideOnGitHub": "<%= gitHubName %> on GitHub",
-    "commGuidePara010": "There are also several Moderators who assist the staff members. They were selected carefully, so please give them your respect and listen to their suggestions.",
-    "commGuidePara011": "The current Moderators are (from left to right):",
-    "commGuidePara011a": "in Tavern chat",
-    "commGuidePara011b": "on GitHub/Wikia",
-    "commGuidePara011c": "on Wikia",
-    "commGuidePara011d": "on 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:",
-    "commGuideHeadingFinal": "The Final Section",
-    "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": "Now go forth, brave adventurer, and slay some Dailies!",
-    "commGuideHeadingLinks": "Useful Links",
-    "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!",
-    "commGuideLink02": "<a href='http://habitica.wikia.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.",
+    "commGuideOnGitHub": "<%= gitHubName %> na GitHub-u",
+    "commGuidePara010": "Postoji i nekoliko moderatora koji pomažu članovima osoblja. Birani su pažljivo, pa vas molimo da im ukažete svoje poštovanje i uvažavate njihove prijedloge.",
+    "commGuidePara011": "Trenutni moderatori su (slijeva udesno):",
+    "commGuidePara011a": "u aščijskim muhabetima",
+    "commGuidePara011b": "na GitHub/Wikia",
+    "commGuidePara011c": "na Wikia",
+    "commGuidePara011d": "na GitHub-u",
+    "commGuidePara012": "Ako imate problem ili nedoumicu u vezi sa određenim moderatorom, pošaljite e-poštu našem osoblju (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
+    "commGuidePara013": "U zajednici velikoj poput Habitice korisnici dolaze i odlaze, a ponekad zaposlenici ili moderatori trebaju odložiti svoj plemeniti plašt i opustiti se. Slijede emeritus osoblje i moderatori. Oni više ne djeluju snagom osoblja ili moderatora, ali svejedno bismo željeli spomenuti njihov rad!",
+    "commGuidePara014": "Emeritus osoblja i moderatori:",
+    "commGuideHeadingFinal": "Završni odjeljak",
+    "commGuidePara067": "Evo ih, hrabri Habitičane -- smjernice zajednice! Obrišite znoj s čela i dodijelite sebi XP za čitanje svega. Ako imate bilo kakvih pitanja ili nedoumica u vezi sa ovim Smjernicama zajednice, obratite nam se putem <a href='https://contact.habitica.com/' target='_blank'>Obrasca za kontakt moderatora</a> a mi ćemo vam rado pomoći i razjasniti stvari.",
+    "commGuidePara068": "A sad, hrabri avanturisto, navali i pošamaraj neke dnevne zadatke!",
+    "commGuideHeadingLinks": "Korisne veze",
+    "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Pomoć Habitice: Postavi pitanje</a>: Ceh u kojem korisnici mogu postavljati pitanja!",
+    "commGuideLink02": "<a href='http://habitica.wikia.com/wiki/Habitica_Wiki' target='_blank'>Wiki stranica</a>: najveća kolekcija informacija o Habitici.",
+    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: za prijavljivanje grešaka ili pomaganje u kodiranju!",
+    "commGuideLink04": "<a href='https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link' target='_blank'>Obrazac za povratne informacije</a>: za mogućnosti i funkcionalnosti na sajtu i u aplikaciji.",
    "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": "The following talented artists contributed to these illustrations:"
+    "commGuideLink06": "<a href='https://trello.com/b/vwuE9fbO/' target='_blank'>Umjetnički Trello</a>: za izlaganje piksel (pixel) umjetnosti.",
+    "commGuideLink07": "<a href='https://trello.com/b/nnv4QIRX/' target='_blank'>Trello za Pustolovine</a>: za podnošenje tekstova uz Pustolovine.",
+    "commGuidePara069": "Sljedeći nadareni umjetnici dali su svoj doprinos ovim ilustracijama:"
 }
--- a/website/common/locales/bs/contrib.json
+++ b/website/common/locales/bs/contrib.json
@@ -1,57 +1,57 @@
 {
-    "playerTiersDesc": "The colored usernames you see in chat represent a person's contributor tier. The higher the tier, the more the person has contributed to habitica through art, code, the community, or more!",
-    "tier1": "Tier 1 (Friend)",
-    "tier2": "Tier 2 (Friend)",
-    "tier3": "Tier 3 (Elite)",
-    "tier4": "Tier 4 (Elite)",
-    "tier5": "Tier 5 (Champion)",
-    "tier6": "Tier 6 (Champion)",
-    "tier7": "Tier 7 (Legendary)",
-    "tierModerator": "Moderator (Guardian)",
-    "tierStaff": "Staff (Heroic)",
+    "playerTiersDesc": "Obojena korisnička imena koja vidite u čatu predstavljaju nivo doprinosa osobe. Što je viši nivo, to je više osoba doprinijela Habitici putem umjetnosti, koda, u zajednici ili na neki drugi način!",
+    "tier1": "Nivo 1 (Prijatelj)",
+    "tier2": "Nivo 2 (Prijatelj)",
+    "tier3": "Nivo 3 (Elita)",
+    "tier4": "Nivo 4 (Elita)",
+    "tier5": "Nivo 5 (Šampion)",
+    "tier6": "Nivo 6 (Šampion)",
+    "tier7": "Nivo 7 (Legendaran)",
+    "tierModerator": "Moderator (Čuvar)",
+    "tierStaff": "Osoblje (Heroj)",
    "tierNPC": "NPC",
-    "friend": "Friend",
-    "elite": "Elite",
-    "champion": "Champion",
-    "legendary": "Legendary",
+    "friend": "Prijatelj",
+    "elite": "Elita",
+    "champion": "Šampion",
+    "legendary": "Legendarni",
    "moderator": "Moderator",
-    "guardian": "Guardian",
-    "staff": "Staff",
-    "heroic": "Heroic",
-    "modalContribAchievement": "Contributor Achievement!",
-    "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping Habitica.",
-    "contribLink": "See what prizes you've earned for your contribution!",
-    "contribName": "Contributor",
-    "contribText": "Has contributed to Habitica, whether via code, art, music, writing, or other methods. To learn more, join the Aspiring Legends Guild!",
-    "kickstartName": "Kickstarter Backer - $<%= key %> Tier",
-    "kickstartText": "Backed the Kickstarter Project",
-    "helped": "Helped Habitica Grow",
-    "hall": "Hall of Heroes",
+    "guardian": "Čuvar",
+    "staff": "Osoblje",
+    "heroic": "Heroj",
+    "modalContribAchievement": "Postignuća doprinosioca",
+    "contribModal": "<%= name %>, vi ste fakat odlična osoba! Postigli ste <%= level %>  nivo doprinosioca za Habiticu.",
+    "contribLink": "Pogledajte koje ste nagrade zaslužili za svoj doprinos!",
+    "contribName": "Doprinosioc",
+    "contribText": "Doprininijelo je Habitici, bilo kodiranjem, dizajnom (umjetnošću), muzikom, pisanja ili na neke druge načine. Da biste saznali više, pridružite se esnafu ambicioznih legendi (Aspiring Legends)!",
+    "kickstartName": "Kickstarter sponzor - $<%= key %> nivoa",
+    "kickstartText": "Sponzor projekta na Kickstarter-u",
+    "helped": "Pomoglo se rastu Habitice",
+    "hall": "Dvorana Heroja",
    "contribTitle": "Contributor Title (eg, \"Blacksmith\")",
-    "contribLevel": "Contrib Tier",
+    "contribLevel": "Nivo doprinosioca",
    "contribHallText": "1-7 for normal contributors, 8 for moderators, 9 for staff. This determines which items, pets, and mounts are available. Also determines name-tag coloring. Tiers 8 and 9 are automatically given admin status.",
-    "hallContributors": "Hall of Contributors",
-    "hallPatrons": "Hall of Patrons",
+    "hallContributors": "Dvorana doprinosioca",
+    "hallPatrons": "Dvorana pokrovitelja",
    "rewardUser": "Reward User",
-    "UUID": "User ID",
+    "UUID": "Korisnikov ID",
    "loadUser": "Load User",
-    "noAdminAccess": "You don't have admin access.",
-    "userNotFound": "User not found.",
-    "invalidUUID": "UUID must be valid",
-    "title": "Title",
+    "noAdminAccess": "Nemate administratorski pristup.",
+    "userNotFound": "Korisnik nije pronađen.",
+    "invalidUUID": "UUID mora biti važeći",
+    "title": "Titula",
    "moreDetails": "More details (1-7)",
    "moreDetails2": "more details (8-9)",
-    "contributions": "Contributions",
+    "contributions": "Doprinosioci",
    "admin": "Admin",
    "notGems": "is in USD, <em>not</em> in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.",
-    "gamemaster": "Game Master (staff/moderator)",
-    "backerTier": "Backer Tier",
+    "gamemaster": "Organizator igre (osoblje/moderator)",
+    "backerTier": "Nivo sponzora",
    "balance": "Balance",
-    "playerTiers": "Player Tiers",
-    "tier": "Tier",
-    "conRewardsURL": "http://habitica.wikia.com/wiki/Contributor_Rewards",
-    "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!",
-    "surveysMultiple": "Helped Habitica grow on <%= count %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!",
-    "blurbHallPatrons": "This is the Hall of Patrons, where we honor the noble adventurers who backed Habitica's original Kickstarter. We thank them for helping us bring Habitica to life!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "playerTiers": "Nivoi igrača",
+    "tier": "Nivo",
+    "conRewardsURL": "http://habitica.fandom.com/wiki/Contributor_Rewards",
+    "surveysSingle": "Pomogli ste da Habitica raste, bilo popunjavanjem ankete ili pomaganjem tokom testiranja. Hvala vam!",
+    "surveysMultiple": "Pomogli ste Habitici da raste u <% = count%> prilika, bilo popunjavanjem ankete ili pomaganjem tokom testiranja. Hvala vam!",
+    "blurbHallPatrons": "Ovo je dvorana pokrovitelja, u kojoj odajemo počast plemenitim avanturistima koji su podržali Habiticu na Kickstarter-u. Zahvaljujemo im što su nam pomogli da oživimo Habiticu!",
+    "blurbHallContributors": "Ovo je dvorana saradnika, u kojoj se odaje počast saradnicima kroz princip otvorenog koda za Habiticu. Bilo kôdom, umjetnošću, muzikom, pisanjem ili čak samo uslužnošću, zaradili su <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> dragulje, ekskluzivnu opremu </a> i <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestižne titule</a>. I vi možete doprinijeti Habitici! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'>Ovjde saznajte više.</a>"
 }
--- a/website/common/locales/bs/death.json
+++ b/website/common/locales/bs/death.json
@@ -1,17 +1,17 @@
 {
-    "lostAllHealth": "You ran out of Health!",
-    "dontDespair": "Don't despair!",
-    "deathPenaltyDetails": "You lost a Level, your Gold, and a piece of Equipment, but you can get them all back with hard work! Good luck--you'll do great.",
-    "refillHealthTryAgain": "Refill Health & Try Again",
-    "dyingOftenTips": "Is this happening often? <a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Here are some tips!</a>",
-    "losingHealthWarning": "Careful - You're Losing Health!",
-    "losingHealthWarning2": "Don't let your Health drop to zero! If you do, you'll lose a level, your Gold, and a piece of equipment.",
-    "toRegainHealth": "To regain Health:",
-    "lowHealthTips1": "Level up to fully heal!",
-    "lowHealthTips2": "Buy a Health Potion from the Rewards column to restore 15 Health Points.",
-    "losingHealthQuickly": "Losing Health quickly?",
-    "lowHealthTips3": "Incomplete Dailies hurt you overnight, so be careful not to add too many at first!",
-    "lowHealthTips4": "If a Daily isn't due on a certain day, you can disable it by clicking the pencil icon.",
-    "goodLuck": "Good luck!",
-    "cannotRevive": "Cannot revive if not dead"
-}
+    "lostAllHealth": "Ostali ste bez zdravlja!",
+    "dontDespair": "Ne očajavajte!",
+    "deathPenaltyDetails": "Izgubili ste nivo, zlatnike i nešto opreme, ali ih možete sve dobiti nazad upornim radom! Možete vi to--sretno.",
+    "refillHealthTryAgain": "Popravite zdravlje i pokušajte ponovo.",
+    "dyingOftenTips": "Događa li se ovo često? <a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Evo nekoliko savjeta!</a>",
+    "losingHealthWarning": "Pažljivo - Gubite zdravlje!",
+    "losingHealthWarning2": "Nemojte dopustiti da u potpunosti izgubite zdravlje! Ako se dogodi, izgubićete nivo, zlatnike i nešto opreme.",
+    "toRegainHealth": "Da biste povratili zdravlje:",
+    "lowHealthTips1": "S dosezanjem slijedećeg nivoa u potpunosti ćete se izliječiti!",
+    "lowHealthTips2": "Kupite čarobni napitak za zdravlje iz kolone nagrade da biste vratili 15 bodova zdravlja.",
+    "losingHealthQuickly": "Prebrzo gubite zdravlje?",
+    "lowHealthTips3": "Nekompletirani dnevni zadaci nanose bol preko preko noći, pa pripazite da ih ne dodate previše na početku!",
+    "lowHealthTips4": "Ako dnevni zadatak nije vidljiv za određeni dan, možete ga isključiti klikom na sličicu olovke.",
+    "goodLuck": "Sretno!",
+    "cannotRevive": "Nemožete oživljavati žive, samo mrtve"
+}
--- a/website/common/locales/bs/defaulttasks.json
+++ b/website/common/locales/bs/defaulttasks.json
@@ -1,19 +1,56 @@
 {
-    "defaultHabit1Text": "Productive Work (Click the pencil to edit)",
-    "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)",
-    "defaultHabit3Text": "Take the Stairs/Elevator (Click the pencil to edit)",
-    "defaultHabit4Text": "Add a task to Habitica",
-    "defaultHabit4Notes": "Either a Habit, a Daily, or a To-Do",
-    "defaultTodo1Text": "Join Habitica (Check me off!)",
-    "defaultTodoNotes": "You can either complete this To-Do, edit it, or remove it.",
-    "defaultReward1Text": "15 minute break",
-    "defaultReward2Text": "Reward yourself",
-    "defaultReward2Notes": "Watch TV, play a game, eat a treat, it's up to you!",
-    "defaultTag1": "Work",
-    "defaultTag2": "Exercise",
-    "defaultTag3": "Health + Wellness",
-    "defaultTag4": "School",
-    "defaultTag5": "Teams",
-    "defaultTag6": "Chores",
-    "defaultTag7": "Creativity"
+    "defaultHabit1Text": "Produktivan rad (Klikni na olovku za uređivanje)",
+    "defaultHabit2Text": "Jedenje nezdrave hrane (Kliknite na olovku za uređivanje)",
+    "defaultHabit3Text": "Korištenje stepenica ili lifta (Kliknite na olovku za uređivanje)",
+    "defaultHabit4Text": "Dodajte zadatak u Habitica",
+    "defaultHabit4Notes": "Ili pak naviku, dnevni zadatak ili za-uraditi",
+    "defaultTodo1Text": "Pridruži se Habitici (Prekriži me!)",
+    "defaultTodoNotes": "Možete također dovršiti ovaj za-uraditi, urediti ili ukloniti.",
+    "defaultReward1Text": "15 minuta pauze",
+    "defaultReward2Text": "Nagradi se",
+    "defaultReward2Notes": "Gledaj TV, igraj igru ili pojedi slatkiš, na tebi je!",
+    "defaultTag1": "Posao",
+    "defaultTag2": "Vježba",
+    "defaultTag3": "Zdravlje + Wellness",
+    "defaultTag4": "Škola",
+    "defaultTag5": "Timovi",
+    "defaultTag6": "Sitni poslići",
+    "defaultTag7": "Kreativnost",
+    "defaultHabitNotes": "Ili izbrišite sa ekrana za uređivanje",
+    "defaultHabitText": "Kliknite ovdje da biste ovo preuredili u lošu naviku koju želite napustiti",
+    "creativityTodoNotes": "Dodirnite da odredite naziv vašeg projekta",
+    "creativityTodoText": "Završite kreativni projekat",
+    "creativityDailyNotes": "Dodirnite da odredite ime vašeg trenutnog projekta + postavite raspored!",
+    "creativityDailyText": "Rad na kreativnom projektu",
+    "creativityHabit": "Studirajte za majstora zanata >> + Vježbala se nova kreativna tehnika",
+    "choresTodoNotes": "Dodirnite da odredite pretrpano područje!",
+    "choresTodoText": "Organizacija ormara >> Umanjivanje nereda",
+    "choresDailyNotes": "Dodirnite da odaberete svoj raspored!",
+    "choresDailyText": "Pranje sudova",
+    "choresHabit": "10 minuta čišćenja",
+    "selfCareTodoNotes": "Dodirnite da odredite šta planirate učiniti!",
+    "selfCareTodoText": "Uključite se u zabavnu aktivnost",
+    "selfCareDailyNotes": "Dodirnite da odaberete svoj raspored!",
+    "selfCareDailyText": "5 minuta mirnog disanja",
+    "selfCareHabit": "Napravite kratku pauzu",
+    "schoolTodoNotes": "Dodirnite za imenovanje zadatka i odaberite rok!",
+    "schoolTodoText": "Završite zadatak za predmet",
+    "schoolDailyNotes": "Dodirnite za odabir rasporeda domaćih zadaća!",
+    "schoolDailyText": "Završite zadaću",
+    "schoolHabit": "Učenje/Izbjegavanje",
+    "healthTodoNotes": "Dodirnite za dodavanje kontrolnih lista!",
+    "healthTodoText": "Zakažite pregled >> Promišljajte o zdravim promjenama",
+    "healthDailyNotes": "Dodirnite za bilo kakve promjene!",
+    "healthDailyText": "Zubni konac",
+    "healthHabit": "Jedenje zdrave/nezdrave hrane",
+    "exerciseTodoNotes": "Dodirnite za dodavanje kontrolne liste!",
+    "exerciseTodoText": "Postavite raspored vježbanja",
+    "exerciseDailyNotes": "Dodirnite da namjestite svoj raspored i odredite vježbe!",
+    "exerciseDailyText": "Istezanje >> Svakodnevna rutina vježbanja",
+    "exerciseHabit": "10 min kardio >> + 10 minuta kardio",
+    "workTodoProjectNotes": "Dodirnite da odredite ime vašeg trenutnog projekta + odredite datum završetka!",
+    "workTodoProject": "Radni projekt >> Završen radni projekat",
+    "workDailyImportantTaskNotes": "Dodirnite da odredite svoj najvažniji zadatak",
+    "workDailyImportantTask": "Najvažniji zadatak >> Rađeno na najvažnijem današnjem zadatku",
+    "workHabitMail": "Obrada e-pošte"
 }
--- a/website/common/locales/bs/faq.json
+++ b/website/common/locales/bs/faq.json
@@ -1,12 +1,12 @@
 {
-    "frequentlyAskedQuestions": "Frequently Asked Questions",
-    "faqQuestion0": "I'm confused. Where do I get an overview?",
-    "iosFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn experience and gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as Pets, Skills, and Quests! You can customize your character under Menu > Customize Avatar.\n\n Some basic ways to interact: click the (+) in the upper-right-hand corner to add a new task. Tap on an existing task to edit it, and swipe left on a task to delete it. You can sort tasks using Tags in the upper-left-hand corner, and expand and contract checklists by clicking on the checklist bubble.",
-    "androidFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn experience and gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as Pets, Skills, and Quests! You can customize your character under Menu > [Inventory >] Avatar.\n\n Some basic ways to interact: click the (+) in the lower-right-hand corner to add a new task. Tap on an existing task to edit it, and swipe left on a task to delete it. You can sort tasks using Tags in the upper-right-hand corner, and expand and contract checklists by clicking on the checklist count box.",
-    "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).",
-    "faqQuestion1": "How do I set up my tasks?",
-    "iosFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.",
-    "androidFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your character will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.",
+    "frequentlyAskedQuestions": "Često postavljena pitanja",
+    "faqQuestion0": "Zbunjen/a sam. Gdje mogu vidjeti kratko objašnjenje?",
+    "iosFaqAnswer0": "Prvo ćete postaviti zadatke koje želite raditi u svom svakodnevnom životu. Tada, dok izvršavate zadatke u stvarnom životu i odjavljujete ih, zaradit ćete iskustvo i zlatnike. Zlatnici se koriste za kupovinu opreme i nekih predmeta, kao i za posebne nagrade. Iskustvo dovodi do toga da vaš lik prelazi na viši nivo i otključava sadržaj poput ljubimaca, vještina i zadataka! Možete prilagoditi svoj lik u Izbornik > Prilagodi avatar.\n\nNeka osnovna uputstva za rad: kliknite (+) u gornjem desnom ćošku da biste dodali novi zadatak. Dodirnite postojeći zadatak da biste ga uredili i prijeđite prstom ulijevo da biste ga izbrisali. Možete sortirati zadatke pomoću Oznaka u gornjem lijevom ćošku i proširiti i ugovoriti kontrolne liste klikom na balončić kontrolne liste.",
+    "androidFaqAnswer0": "Prvo ćete postaviti zadatke koje želite raditi u svom svakodnevnom životu. Tada, dok izvršavate zadatke u stvarnom životu i odjavljujete ih, zaradit ćete iskustvo i zlatnike. Zlatnici se koriste za kupovinu opreme i nekih predmeta, kao i za posebne nagrade. Iskustvo dovodi do toga da vaš lik prelazi na viši nivo i otključava sadržaj poput ljubimaca, vještina i zadataka! Možete prilagoditi svoj lik u Izbornik > [Inventar>] Avatar.\n\nNeka osnovna uputstva za rad: kliknite (+) u donjem desnom ćošku da biste dodali novi zadatak. Dodirnite postojeći zadatak da biste ga uredili i prijeđite prstom ulijevo da biste ga izbrisali. Možete sortirati zadatke pomoću Oznaka u gornjem desnom ćošku i proširiti i ugovoriti kontrolne liste klikom na okvir za brojanje kontrolne liste.",
+    "webFaqAnswer0": "Prvo ćete postaviti zadatke koje želite raditi u svom svakodnevnom životu. Tada, dok izvršavate zadatke u stvarnom životu i odjavljujete ih, zaradit ćete iskustvo i zlatnike. Zlatnici se koristie za kupovinu opreme i nekih predmeta, kao i za posebne nagrade. Iskustvo dovodi do toga da vaš lik prelazi na viši nivo i otključava sadržaj poput ljubimaca, vještina i zadataka! Za više detalja, pogledajte detaljni pregled igre na [Pomoć -> Pregled za nove korisnike] (https://habitica.com/static/overview).",
+    "faqQuestion1": "Kako da namjestim svoje zadatke?",
+    "iosFaqAnswer1": "Dobre navike (one sa +) zadaci su koje možete raditi mnogo puta dnevno, poput jedenja povrća. Loše navike (one koje imaju -) zadaci su koje trebate izbjegavati, poput grickanja noktiju. Navike sa + i - imaju dobar i loš izbor, poput korištenja stepenica u odnosu na lift. Dobre navike daju iskustvo i zlatnike. Loše navike oduzimaju zdravlje.\n\nDnevni zadaci su zadaci koje morate obavljati svakodnevno, poput pranja zubi ili provjere e-pošte. Dnevne zadatke možete prilagoditi dodirom da biste uredili. Ako preskočite rok za dnevni zadatak koji treba dospjeti, vaš će se avatar oštetiti preko noći. Pazite da ne dodate previše dnevnih listova odjednom!\n\nZa-uraditi su vaša lista obaveza. Dovršavanjem obaveza dobijate zlatnike i iskustvo. Nikada ne gubite zdravlje zbog za-uraditi obaveza. Moguće je dodati i krajnji datum kroz uređivanje na dodir.",
+    "androidFaqAnswer1": "Dobre navike (one sa +) zadaci su koje možete raditi mnogo puta dnevno, poput jedenja povrća. Loše navike (one koje imaju -) zadaci su koje trebate izbjegavati, poput grickanja noktiju. Navike sa + i - imaju dobar i loš izbor, poput korištenja stepenica u odnosu na lift. Dobre navike daju iskustvo i zlatnike. Loše navike oduzimaju zdravlje.\n\nDnevni zadaci su zadaci koje morate obavljati svakodnevno, poput pranja zubi ili provjere e-pošte. Dnevne zadatke možete prilagoditi dodirom da biste uredili. Ako preskočite rok za dnevni zadatak koji treba dospjeti, vaš će se avatar oštetiti preko noći. Pazite da ne dodate previše dnevnih listova odjednom!\n\nZa-uraditi su vaša lista obaveza. Dovršavanjem obaveza dobijate zlatnike i iskustvo. Nikada ne gubite zdravlje zbog za-uraditi obaveza. Moguće je dodati i krajnji datum kroz uređivanje na dodir.",
    "webFaqAnswer1": "* Good Habits (the ones with a :heavy_plus_sign:) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a :heavy_minus_sign:) are tasks that you should avoid, like biting nails. Habits with a :heavy_plus_sign: and a :heavy_minus_sign: have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n* Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n* To-Dos are your To-Do list. Completing a To-Do earns you Gold and Experience. You never lose Health from To-Dos. You can add a due date to a To-Do by clicking the pencil icon to edit.",
    "faqQuestion2": "What are some sample tasks?",
    "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
@@ -55,4 +55,4 @@
    "iosFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",
    "androidFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",
    "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! We're happy to help."
-}
+}
--- a/website/common/locales/bs/generic.json
+++ b/website/common/locales/bs/generic.json
@@ -1,99 +1,99 @@
 {
-    "languageName": "English",
-    "stringNotFound": "String '<%= string %>' not found.",
+    "languageName": "Bosanski",
+    "stringNotFound": "Niz '<%= string %>' nije pronađen.",
    "habitica": "Habitica",
-    "onward": "Onward!",
-    "done": "Done",
-    "gotIt": "Got it!",
-    "titleTimeTravelers": "Time Travelers",
-    "titleSeasonalShop": "Seasonal Shop",
-    "saveEdits": "Save Edits",
-    "showMore": "Show More",
-    "showLess": "Show Less",
-    "markdownHelpLink": "Markdown formatting help",
-    "bold": "**Bold**",
-    "markdownImageEx": "![mandatory alt text](https://habitica.com/cake.png \"optional mouseover title\")",
-    "code": "`code`",
-    "achievements": "Achievements",
-    "basicAchievs": "Basic Achievements",
-    "seasonalAchievs": "Seasonal Achievements",
-    "specialAchievs": "Special Achievements",
-    "modalAchievement": "Achievement!",
-    "special": "Special",
-    "site": "Site",
-    "help": "Help",
-    "user": "User",
-    "market": "Market",
-    "newSubscriberItem": "You have new <span class=\"notification-bold-blue\">Mystery Items</span>",
-    "subscriberItemText": "Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month. See the wiki's 'Mystery Item' page for more information.",
-    "all": "All",
-    "none": "None",
-    "more": "<%= count %> more",
-    "and": "and",
-    "submit": "Submit",
-    "close": "Close",
-    "saveAndClose": "Save & Close",
-    "saveAndConfirm": "Save & Confirm",
-    "cancel": "Cancel",
-    "ok": "OK",
-    "add": "Add",
-    "undo": "Undo",
-    "continue": "Continue",
-    "accept": "Accept",
-    "reject": "Reject",
-    "neverMind": "Never mind",
-    "notEnoughGems": "Not enough Gems",
-    "alreadyHave": "Whoops! You already have this item. No need to buy it again!",
-    "delete": "Delete",
-    "gemsPopoverTitle": "Gems",
-    "gems": "Gems",
-    "needMoreGems": "Need More Gems?",
-    "needMoreGemsInfo": "Purchase Gems now, or become a subscriber to buy Gems with Gold, get monthly mystery items, enjoy increased drop caps and more!",
+    "onward": "Naprijed!",
+    "done": "Gotovo",
+    "gotIt": "Shvatam!",
+    "titleTimeTravelers": "Putnici kroz vrijeme",
+    "titleSeasonalShop": "Sezonska prodavnica",
+    "saveEdits": "Sačuvaj izmjene",
+    "showMore": "Prikaži više",
+    "showLess": "Skupi pregled",
+    "markdownHelpLink": "Pomoć s markdown uobličavanjem",
+    "bold": "**Masno**",
+    "markdownImageEx": "![obavezan alternativni tekst](https://habitica.com/cake.png \"neobavezni naslov na prelaz miša\")",
+    "code": "`programski kod`",
+    "achievements": "Dostignuća",
+    "basicAchievs": "Osnovna dostignuća",
+    "seasonalAchievs": "Sezonska dostignuća",
+    "specialAchievs": "Posebna dostignuća",
+    "modalAchievement": "Dostignuće!",
+    "special": "Posebno",
+    "site": "Stranica",
+    "help": "Pomoć",
+    "user": "Korisnik",
+    "market": "Pijaca",
+    "newSubscriberItem": "Imate nove <span class=\"notification-bold-blue\">Misteriozne artikle</span>",
+    "subscriberItemText": "Svakog mjeseca pretplatnici će dobiti misteriozni predmet. Ovo se obično izdaje otprilike nedelju dana prije kraja mjeseca. Pogledajte wiki stranicu 'Tajanstveni predmet' za više informacija.",
+    "all": "Sve",
+    "none": "Ništa",
+    "more": "<%= count %> više",
+    "and": "i",
+    "submit": "Pošalji",
+    "close": "Zatvori",
+    "saveAndClose": "Sačuvaj i zatvori",
+    "saveAndConfirm": "Sačuvaj i potvrdi",
+    "cancel": "Otkaži",
+    "ok": "Ok",
+    "add": "Dodaj",
+    "undo": "Natrag",
+    "continue": "Nastavi",
+    "accept": "Prihvati",
+    "reject": "Odbij",
+    "neverMind": "Nevažno",
+    "notEnoughGems": "Nema dovoljno dragulja",
+    "alreadyHave": "Ups! Već imate ovaj artikal. Nema potrebe kupovati ga ponovo!",
+    "delete": "Izbriši",
+    "gemsPopoverTitle": "Dragulji",
+    "gems": "Dragulji",
+    "needMoreGems": "Treba više dragulja?",
+    "needMoreGemsInfo": "Kupite dragulje odmah ili postanite pretplatnik da biste kupili dragulje sa zlatnicima, dobili mjesečne misteriozne predmete, uživali u povećanim kapicama i još mnogo toga više!",
    "veteran": "Veteran",
-    "veteranText": "Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs.",
-    "originalUser": "Original User!",
-    "originalUserText": "One of the <em>very</em> original early adopters. Talk about alpha tester!",
-    "habitBirthday": "Habitica Birthday Bash",
-    "habitBirthdayText": "Celebrated the Habitica Birthday Bash!",
-    "habitBirthdayPluralText": "Celebrated <%= count %> Habitica Birthday Bashes!",
-    "habiticaDay": "Habitica Naming Day",
-    "habiticaDaySingularText": "Celebrated Habitica's Naming Day! Thanks for being a fantastic user.",
-    "habiticaDayPluralText": "Celebrated <%= count %> Naming Days! Thanks for being a fantastic user.",
-    "achievementDilatory": "Savior of Dilatory",
-    "achievementDilatoryText": "Helped defeat the Dread Drag'on of Dilatory during the 2014 Summer Splash Event!",
-    "costumeContest": "Costume Contestant",
-    "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.",
-    "error": "Error",
-    "menu": "Menu",
-    "notifications": "Notifications",
-    "noNotifications": "You're all caught up!",
-    "noNotificationsText": "The notification fairies give you a raucous round of applause! Well done!",
-    "clear": "Clear",
-    "audioTheme": "Audio Theme",
-    "audioTheme_off": "Off",
-    "audioTheme_danielTheBard": "Daniel The Bard",
-    "audioTheme_wattsTheme": "Watts' Theme",
-    "audioTheme_gokulTheme": "Gokul Theme",
-    "audioTheme_luneFoxTheme": "LuneFox's Theme",
-    "audioTheme_rosstavoTheme": "Rosstavo's Theme",
-    "audioTheme_dewinTheme": "Dewin's Theme",
-    "audioTheme_airuTheme": "Airu's Theme",
-    "audioTheme_beatscribeNesTheme": "Beatscribe's NES Theme",
-    "audioTheme_arashiTheme": "Arashi's Theme",
-    "audioTheme_triumphTheme": "Triumph Theme",
-    "audioTheme_lunasolTheme": "Lunasol Theme",
-    "audioTheme_spacePenguinTheme": "SpacePenguin's Theme",
-    "audioTheme_maflTheme": "MAFL Theme",
-    "audioTheme_pizildenTheme": "Pizilden's Theme",
-    "audioTheme_farvoidTheme": "Farvoid Theme",
-    "reportBug": "Report a Bug",
-    "overview": "Overview for New Users",
-    "dateFormat": "Date Format",
-    "achievementStressbeast": "Savior of Stoïkalm",
-    "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2014 Winter Wonderland Event!",
-    "achievementBurnout": "Savior of the Flourishing Fields",
+    "veteranText": "Korisnik je pokazao veliku istrajnost u borbi na Habit The Gray (naša web stranica prije Angular-a) i primio mnogo ožiljaka od grešaka.",
+    "originalUser": "Pionir!",
+    "originalUserText": "Jedan od <em>najranijih</em> pionira. Prilčamo o alfa testeru!",
+    "habitBirthday": "Proslava Habitica rođendana",
+    "habitBirthdayText": "Učestvovanje u proslavi Habitica rođendana!",
+    "habitBirthdayPluralText": "<%= count %> je proslavilo Habitica rođendan!",
+    "habiticaDay": "Habitica imendan",
+    "habiticaDaySingularText": "Proslavljen Habitica imendan! Hvala što ste fantastičan korisnik.",
+    "habiticaDayPluralText": "<%= count %> je proslavilo imendan! Hvala što ste fantastičan korisnik.",
+    "achievementDilatory": "Spasitelj odlagača",
+    "achievementDilatoryText": "Pomogao je poraziti Stravičnog zmaja odgađanja tokom Ljetnjeg festivala 2014!",
+    "costumeContest": "Kostimirani takmičar",
+    "costumeContestText": "Učestvovao u takmičenju kostima za Noć vještica. Pogledajte neke od sjajnih objava na blog.habitrpg.com!",
+    "costumeContestTextPlural": "Učestvovalo u <% = count%> takmičenjima kostima za Noć vještica. Pogledajte neke od sjajnih objava na blog.habitrpg.com!",
+    "newPassSent": "Ako imamo vašu e-poštu u evidenciji, poslana su vam uputstva za postavljanje nove šifre.",
+    "error": "Greška",
+    "menu": "Izbornik",
+    "notifications": "Obavještenja",
+    "noNotifications": "Uhvatili ste ih sve!",
+    "noNotificationsText": "Vile obavijesti daju vam gromoglasan aplauz! Odlično napravljeno!",
+    "clear": "Očisti",
+    "audioTheme": "Zvučna tema",
+    "audioTheme_off": "Isključi",
+    "audioTheme_danielTheBard": "Danijel pripovjedač",
+    "audioTheme_wattsTheme": "Vatova tema",
+    "audioTheme_gokulTheme": "Gokul tema",
+    "audioTheme_luneFoxTheme": "LuneFox-ina tema",
+    "audioTheme_rosstavoTheme": "Rosstavo-va tema",
+    "audioTheme_dewinTheme": "Dewin-ova tema",
+    "audioTheme_airuTheme": "Airu-sova tema",
+    "audioTheme_beatscribeNesTheme": "Beatscribe-sova NES tema",
+    "audioTheme_arashiTheme": "Arashi-ova tema",
+    "audioTheme_triumphTheme": "Triumph tema",
+    "audioTheme_lunasolTheme": "Lunasol tema",
+    "audioTheme_spacePenguinTheme": "SpacePenguin-ova tema",
+    "audioTheme_maflTheme": "MAFL tema",
+    "audioTheme_pizildenTheme": "Pizilden-ova tema",
+    "audioTheme_farvoidTheme": "Farvoid tema",
+    "reportBug": "Prijavite grešku",
+    "overview": "Pregled za nove korisnike",
+    "dateFormat": "Format datuma",
+    "achievementStressbeast": "Spasioc Stoïkalm-a",
+    "achievementStressbeastText": "Pomogao poraziti odvratnu stresnu zvijer tokom događaja na Zimskoj zemlji čuda 2014!",
+    "achievementBurnout": "Spasioc Procvjetalih polja",
    "achievementBurnoutText": "Helped defeat Burnout and restore the Exhaust Spirits during the 2015 Fall Festival Event!",
    "achievementBewilder": "Savior of Mistiflying",
    "achievementBewilderText": "Helped defeat the Be-Wilder during the 2016 Spring Fling Event!",
@@ -190,10 +190,16 @@
    "dismissAll": "Dismiss All",
    "messages": "Messages",
    "emptyMessagesLine1": "You don't have any messages",
-    "emptyMessagesLine2": "Send a message to start a conversation!",
+    "emptyMessagesLine2": "Korisniku možete poslati novu poruku tako što ćete posjetiti njegov profil i kliknuti dugme \"Poruka\".",
    "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> sent you a message",
    "letsgo": "Let's Go!",
    "selected": "Selected",
    "howManyToBuy": "How many would you like to buy?",
-    "contactForm": "Contact the Moderation Team"
+    "contactForm": "Contact the Moderation Team",
+    "onboardingAchievs": "Dostignuća pristupa",
+    "options": "Opcije",
+    "finish": "Završeno",
+    "demo": "Demo",
+    "congratulations": "Čestitke!",
+    "loadEarlierMessages": "Učitaj prethodne poruke"
 }
--- a/website/common/locales/bs/inventory.json
+++ b/website/common/locales/bs/inventory.json
@@ -1,8 +1,10 @@
 {
-  "noItemsAvailableForType": "You have no <%= type %>.",
-  "foodItemType": "Food",
-  "eggsItemType": "Eggs",
-  "hatchingPotionsItemType": "Hatching Potions",
-  "specialItemType": "Special items",
-  "lockedItem": "Locked Item"
+    "noItemsAvailableForType": "Nemate <%= type %>.",
+    "foodItemType": "Hrana za ljubimce",
+    "eggsItemType": "Jaja",
+    "hatchingPotionsItemType": "Napitci za izlijeganje",
+    "specialItemType": "Posebni predmeti",
+    "lockedItem": "Zaključani predmeti",
+    "allItems": "Svi predmeti",
+    "petAndMount": "Ljubimci i jahalice"
 }
--- a/website/common/locales/bs/limited.json
+++ b/website/common/locales/bs/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }
--- a/website/common/locales/bs/loginincentives.json
+++ b/website/common/locales/bs/loginincentives.json
@@ -1,25 +1,25 @@
 {
-  "unlockedReward": "You have received <%= reward %>",
-  "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
-  "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
-  "awesome": "Awesome!",
-  "countLeft": "Check-ins until next reward: <%= count %>",
-  "incentivesDescription": "When it comes to building habits, consistency is key. Each day you check-in you get closer to a prize.",
-  "checkinEarned": "Your Check-In Counter went up!",
-  "unlockedCheckInReward": "You unlocked a Check-In Prize!",
-  "checkinProgressTitle": "Progress until next",
-  "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
-  "oneOfAllPetEggs": "one of each standard Pet Egg",
-  "twoOfAllPetEggs": "two of each standard Pet Egg",
-  "threeOfAllPetEggs": "three of each standard Pet Egg",
-  "oneOfAllHatchingPotions": "one of each standard Hatching Potion",
-  "threeOfEachFood": "three of each standard Pet Food",
-  "fourOfEachFood": "four of each standard Pet Food",
-  "twoSaddles": "two Saddles",
-  "threeSaddles": "three Saddles",
-  "incentiveAchievement": "the Royally Loyal achievement",
-  "royallyLoyal": "Royally Loyal",
-  "royallyLoyalText": "This user has checked in over 500 times, and has earned every Check-In Prize!",
-  "checkInRewards": "Check-In Rewards",
-  "backloggedCheckInRewards": "You received Check-In Prizes! Visit your Inventory and Equipment to see what's new."
+    "unlockedReward": "Dobili ste <%= reward %>",
+    "earnedRewardForDevotion": "Zaradili ste <%= reward %> zbog doprinosa za svoj vlastiti život.",
+    "nextRewardUnlocksIn": "Broj prijava do vaše slijedeće nagrade: <%= numberOfCheckinsLeft %>",
+    "awesome": "Fenomenalno!",
+    "countLeft": "Broj prijava do vaše slijedeće nagrade: <%= count %>",
+    "incentivesDescription": "Dosljednost je ključna kod izgradnje navika. Za svaki dan u kome se prijavite, bliži ste jednoj nagradi.",
+    "checkinEarned": "Broj tvojih prijava se povećao!",
+    "unlockedCheckInReward": "Otključali ste nagradu zbog prijava!",
+    "checkinProgressTitle": "Napredak do sljedećeg",
+    "incentiveBackgroundsUnlockedWithCheckins": "Zaključane obične pozadine otključat će se svakodnevnim prijavama.",
+    "oneOfAllPetEggs": "jedno od svakog standardnog jajeta ljubimaca",
+    "twoOfAllPetEggs": "dvoje od svakog standardnog jajeta ljubimaca",
+    "threeOfAllPetEggs": "troje od svakog standardnog jajeta ljubimaca",
+    "oneOfAllHatchingPotions": "jedno od svakog standardnog čarobnog napitka za izlijeganje",
+    "threeOfEachFood": "troje od svakog standardnog komada hrane za ljubimce",
+    "fourOfEachFood": "četvero od svakog standardnog komada hrane za ljubimce",
+    "twoSaddles": "dva sedla",
+    "threeSaddles": "tri sedla",
+    "incentiveAchievement": "Postignuće kraljevke odanosti",
+    "royallyLoyal": "Kraljevska odanost",
+    "royallyLoyalText": "Ovaj korisnik se prijavio/la više od 500 puta i zaradio/la je sve nagrade za prijavu!",
+    "checkInRewards": "Nagrade za prijave",
+    "backloggedCheckInRewards": "Dobili ste nagrade zbog prijava! Posjetite svoj inventar i opremu da vidite što je novo."
 }
--- a/website/common/locales/bs/merch.json
+++ b/website/common/locales/bs/merch.json
@@ -1,3 +1,3 @@
 {
-  "merch" : "Merchandise"
+    "merch": "Trgovačka roba"
 }
--- a/website/common/locales/bs/messages.json
+++ b/website/common/locales/bs/messages.json
@@ -1,54 +1,63 @@
 {
-    "messageLostItem": "Your <%= itemText %> broke.",
-    "messageTaskNotFound": "Task not found.",
-    "messageTagNotFound": "Tag not found.",
-    "messagePetNotFound": ":pet not found in user.items.pets",
-    "messageFoodNotFound": ":food not found in user.items.food",
-    "messageNotAvailable": "This item is not currently available for purchase.",
-    "messageCannotFeedPet": "Can't feed this pet.",
-    "messageAlreadyMount": "You already have that mount. Try feeding another pet.",
-    "messageEvolve": "You have tamed <%= egg %>, let's go for a ride!",
-    "messageLikesFood": "<%= egg %> really likes <%= foodText %>!",
-    "messageDontEnjoyFood": "<%= egg %> eats <%= foodText %> but doesn't seem to enjoy it.",
-    "messageBought": "Bought <%= itemText %>",
-    "messageUnEquipped": "<%= itemText %> unequipped.",
-    "messageMissingEggPotion": "You're missing either that egg or that potion",
-    "messageInvalidEggPotionCombo": "You can't hatch Quest Pet Eggs with Magic Hatching Potions! Try a different egg.",
-    "messageAlreadyPet": "You already have that pet. Try hatching a different combination!",
-    "messageHatched": "Your egg hatched! Visit your stable to equip your pet.",
-    "messageNotEnoughGold": "Not Enough Gold",
-    "messageTwoHandedEquip": "Wielding <%= twoHandedText %> takes two hands, so <%= offHandedText %> has been unequipped.",
-    "messageTwoHandedUnequip": "Wielding <%= twoHandedText %> takes two hands, so it was unequipped when you armed yourself with <%= offHandedText %>.",
-    "messageDropFood": "You've found <%= dropText %>!",
-    "messageDropEgg": "You've found a <%= dropText %> Egg!",
-    "messageDropPotion": "You've found a <%= dropText %> Hatching Potion!",
-    "messageDropMysteryItem": "You open the box and find <%= dropText %>!",
-    "messageAlreadyOwnGear": "You already own this item. Equip it by going to the equipment page.",
-    "previousGearNotOwned": "You need to purchase a lower level gear before this one.",
-    "messageHealthAlreadyMax": "You already have maximum health.",
-    "messageHealthAlreadyMin": "Oh no! You have already run out of health so it's too late to buy a health potion, but don't worry - you can revive!",
-    "armoireEquipment": "<%= image %> You found a piece of rare Equipment in the Armoire: <%= dropText %>! Awesome!",
-    "armoireFood": "<%= image %> You rummage in the Armoire and find <%= dropText %>. What's that doing in here?",
-    "armoireExp": "You wrestle with the Armoire and gain Experience. Take that!",
-    "messageInsufficientGems": "Not enough gems!",
-    "messageGroupAlreadyInParty": "Already in a party, try refreshing.",
-    "messageGroupOnlyLeaderCanUpdate": "Only the group leader can update the group!",
-    "messageGroupRequiresInvite": "Can't join a group you're not invited to.",
-    "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
-    "messageGroupChatBlankMessage": "You cannot send a blank message",
-    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
-    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
-    "messageGroupChatNotFound": "Message not found!",
-    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
-    "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.",
-    "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
-    "messageNotificationNotFound": "Notification not found.",
-    "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>",
-    "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."
+    "messageLostItem": "Vaš <%= itemText %> se razbio.",
+    "messageTaskNotFound": "Zadatak nije pronađen.",
+    "messageTagNotFound": "Oznaka nije pronađena.",
+    "messagePetNotFound": ":pet nije pronađen među user.items.pets",
+    "messageFoodNotFound": ":food nije pronađena među user.items.food",
+    "messageNotAvailable": "Ovaj predmet trenutno nije u prodaji.",
+    "messageCannotFeedPet": "Ne možete nahraniti ovog ljubimca.",
+    "messageAlreadyMount": "Već imate ovu jahalicu. Pokušajte nahraniti drugog ljubimca.",
+    "messageEvolve": "Pripitomili ste <%= egg %>, idemo na jahanje!",
+    "messageLikesFood": "<%= egg %> jako voli <%= foodText %>!",
+    "messageDontEnjoyFood": "<%= egg %> jede <%= foodText %>, ali nije baš da uživa.",
+    "messageBought": "Kupili ste <%= itemText %>",
+    "messageUnEquipped": "<%= itemText %> je uklonjen.",
+    "messageMissingEggPotion": "Nedostaje vam ili to jaje ili taj napitak",
+    "messageInvalidEggPotionCombo": "Ne možete izleći Quest Pet jaja s čarobnim napitcima za izlijeganje! Probajte drugo jaje.",
+    "messageAlreadyPet": "Već imate tog ljubimca. Pokušajte s nekom drugom kombinacijom!",
+    "messageHatched": "Vaše jaje se izleglo! Posjetite štalu da biste opremili ljubimca.",
+    "messageNotEnoughGold": "Nemate dovoljno zlatnika",
+    "messageTwoHandedEquip": "Za rukovanje <%= twoHandedText %> su potrebne dvije ruke pa je <%= offHandedText %> uklonjen.",
+    "messageTwoHandedUnequip": "Za rukovanje <%= twoHandedText %> su potrebne dvije ruke pa je uklonjen iz upotrebe kad ste naoružani <%= offHandedText %>.",
+    "messageDropFood": "Našli ste <%= dropText %>!",
+    "messageDropEgg": "Našli ste <%= dropText %> jaje!",
+    "messageDropPotion": "Našli ste <%= dropText %> napitah za izlijeganje!",
+    "messageDropMysteryItem": "Otvorite kutiju i nađete <%= dropText %>!",
+    "messageAlreadyOwnGear": "Već ste vlasnik ovog artikla. Opremite ga odlaskom na stranicu opreme.",
+    "previousGearNotOwned": "Prije ovog morate kupiti opremu nižeg nivoa.",
+    "messageHealthAlreadyMax": "Već imate najbolje zdravlje.",
+    "messageHealthAlreadyMin": "O ne! Već ste ostali bez zdravlja pa je kasno za kupnju zdravstvenog napitka, ali ne brinite - možete oživjeti!",
+    "armoireEquipment": "<%= image %> Pronašli ste u Armoireu rijetku opremu: <%= dropText %>! Fenomenalno!",
+    "armoireFood": "<%= image %> Preturajući po Armoireu nađoste <%= dropText %>. Šta ovo radi tu?",
+    "armoireExp": "Borite se sa Armoireom i stječete iskustvo. Uzmi to!",
+    "messageInsufficientGems": "Nemate dovoljno dragulja!",
+    "messageGroupAlreadyInParty": "Već ste član partije, pokušajte osvježiti.",
+    "messageGroupOnlyLeaderCanUpdate": "Samo vođa grupe može ažurirati grupu!",
+    "messageGroupRequiresInvite": "Ne možete se pridružiti grupi u koju niste pozvani.",
+    "messageGroupCannotRemoveSelf": "Ne možete ukloniti sami sebe!",
+    "messageGroupChatBlankMessage": "Ne možete poslati praznu poruku",
+    "messageGroupChatLikeOwnMessage": "Ne možete vlastitu poruku označiti da vam se sviđa. Ne budite takva osoba.",
+    "messageGroupChatFlagAlreadyReported": "Već ste prijavili ovu poruku",
+    "messageGroupChatNotFound": "Poruka nije pronađena!",
+    "messageGroupChatAdminClearFlagCount": "Samo administrator može izbrisati broj zastavica!",
+    "messageCannotFlagSystemMessages": "Ne možete prijaviti sistemsku poruku. Ako trebate prijaviti kršenje Smjernica zajednice u vezi s ovom porukom, pošaljite e-poštu i objašnjenje našem Menadžeru zajednice  na <%= communityManagerEmail %>.",
+    "messageGroupChatSpam": "Ups, izgleda da objavljujete previše poruka! Pričekajte minutu i pokušajte ponovo. Čat u aščinici istovremeno sadrži samo 200 poruka, pa Habitica potiče objavljivanje dužih, promišljenijih poruka i objedinjavanje odgovora. Jedva čekam da čujem šta imate da kažete. :)",
+    "messageCannotLeaveWhileQuesting": "Ne možete prihvatiti ovaj poziv za partiju dok ste u potrazi. Ako se želite pridružiti ovoj partiji, prvo morate prekinuti svoju potragu, što možete učiniti sa zaslona svoje partije. Vratit će vam se svitak potrage.",
+    "messageUserOperationProtected": "putanja `<%= operation %>` nije sačuvana, zato što je zaštićena.",
+    "messageNotificationNotFound": "Obavještenje nije pronađeno.",
+    "messageNotAbleToBuyInBulk": "Ovaj predmet se ne može kupiti u količinama većim od 1.",
+    "notificationsRequired": "Potrebni su ID-ovi obavijesti.",
+    "unallocatedStatsPoints": "Imate <span class=\"notification-bold-blue\"><%= points %> neraspodijeljenih Statusnih bodova</span>",
+    "beginningOfConversation": "Ovo je početak vašeg razgovora sa <%= userName %>.",
+    "messageDeletedUser": "Žao nam je, ovaj korisnik je izbrisao svoj račun.",
+    "messageMissingDisplayName": "Nedostaje ime za prikaz.",
+    "newsPostNotFound": "Vijest nije pronađena ili nemate pristup.",
+    "canDeleteNow": "Sada možete izbrisati poruku ako želite.",
+    "reportedMessage": "Prijavili ste ovu poruku moderatorima.",
+    "beginningOfConversationReminder": "Ne zaboravite biti ljubazni, s poštovanjem i slijedite Smjernice zajednice!",
+    "messageAllUnEquipped": "Sve uklonjeno.",
+    "messageBackgroundUnEquipped": "Pozadina uklonjena.",
+    "messagePetMountUnEquipped": "Ljubimac i jahalica uklonjeni.",
+    "messageCostumeUnEquipped": "Kostim uklonjen.",
+    "messageBattleGearUnEquipped": "Battle Gear neopremljen."
 }
--- a/website/common/locales/bs/noscript.json
+++ b/website/common/locales/bs/noscript.json
@@ -1,6 +1,4 @@
 {
-   
-    "jsDisabledHeadingFull": "Alas! Your browser doesn't have JavaScript enabled and without it, Habitica can't work properly",
-   
-    "jsDisabledLink": "Please enable JavaScript to continue!"
-}
+    "jsDisabledHeadingFull": "A joj! Vaš preglednik nema omogućen JavaScript a bez njega Habitica ne može ispravno raditi",
+    "jsDisabledLink": "Molimo vas da omogućite JavaScript za nastavak!"
+}
--- a/website/common/locales/bs/overview.json
+++ b/website/common/locales/bs/overview.json
@@ -1,14 +1,10 @@
 {
-  "needTips": "Need some tips on how to begin? Here's a straightforward guide!",
-
-  "step1": "Step 1: Enter Tasks",
-  "webStep1Text": "Habitica is nothing without real-world goals, so enter a few tasks. You can add more later as you think of them! All tasks can be added by clicking the green \"Create\" button.\n* **Set up [To-Dos](http://habitica.wikia.com/wiki/To-Dos):** Enter tasks you do once or rarely in the To-Dos column, one at a time. You can click on the tasks to edit them and add checklists, due dates, and more!\n* **Set up [Dailies](http://habitica.wikia.com/wiki/Dailies):** Enter activities you need to do daily or on a particular day of the week, month, or year in the Dailies column. Click task to edit when it will be due and/or set a start date. You can also make it due on a repeating basis, for example, every 3 days.\n* **Set up [Habits](http://habitica.wikia.com/wiki/Habits):** Enter habits you want to establish in the Habits column. You can edit the Habit to change it to just a good habit :heavy_plus_sign: or a bad habit :heavy_minus_sign:\n* **Set up [Rewards](http://habitica.wikia.com/wiki/Rewards):** In addition to the in-game Rewards offered, add activities or treats which you want to use as a motivation to the Rewards column. It's important to give yourself a break or allow some indulgence in moderation!\n* If you need inspiration for which tasks to add, you can look at the wiki's pages on [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies), [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos), and [Sample Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
-
-  "step2": "Step 2: Gain Points by Doing Things in Real Life",
-  "webStep2Text": "Now, start tackling your goals from the list! As you complete tasks and check them off in Habitica, you will gain [Experience](http://habitica.wikia.com/wiki/Experience_Points), which helps you level up, and [Gold](http://habitica.wikia.com/wiki/Gold_Points), which allows you to purchase Rewards. If you fall into bad habits or miss your Dailies, you will lose [Health](http://habitica.wikia.com/wiki/Health_Points). In that way, the Habitica Experience and Health bars serve as a fun indicator of your progress toward your goals. You'll start seeing your real life improve as your character advances in the game.",
-
-  "step3": "Step 3: Customize and Explore Habitica",
-  "webStep3Text": "Once you're familiar with the basics, you can get even more out of Habitica with these nifty features:\n * Organize your tasks with [tags](http://habitica.wikia.com/wiki/Tags) (edit a task to add them).\n * Customize your [avatar](http://habitica.wikia.com/wiki/Avatar) by clicking the user icon in the upper-right corner.\n * Buy your [Equipment](http://habitica.wikia.com/wiki/Equipment) under Rewards or from the [Shops](<%= shopUrl %>), and change it under [Inventory > Equipment](<%= equipUrl %>).\n * Connect with other users via the [Tavern](http://habitica.wikia.com/wiki/Tavern).\n * Starting at Level 3, hatch [Pets](http://habitica.wikia.com/wiki/Pets) by collecting [eggs](http://habitica.wikia.com/wiki/Eggs) and [hatching potions](http://habitica.wikia.com/wiki/Hatching_Potions). [Feed](http://habitica.wikia.com/wiki/Food) them to create [Mounts](http://habitica.wikia.com/wiki/Mounts).\n * At level 10: Choose a particular [class](http://habitica.wikia.com/wiki/Class_System) and then use class-specific [skills](http://habitica.wikia.com/wiki/Skills) (levels 11 to 14).\n * Form a party with your friends (by clicking [Party](<%= partyUrl %>) in the navigation bar) to stay accountable and earn a Quest scroll.\n * Defeat monsters and collect objects on [quests](http://habitica.wikia.com/wiki/Quests) (you will be given a quest at level 15).",
-
-  "overviewQuestions": "Have questions? Check out the [FAQ](<%= faqUrl %>)! If your question isn't mentioned there, you can ask for further help in the [Habitica Help guild](<%= helpGuildUrl %>).\n\nGood luck with your tasks!"
+    "needTips": "Potrebni su vam savjeti za početak? Evo jedan Ovaj vodič direktan vodič!",
+    "step1": "Korak 1: Unesite Zadatke",
+    "webStep1Text": "Habitica nije ništa bez stvarnih ciljeva, zato unesite nekoliko zadataka. Možete ih dodati kasnije kad razmislite o njima ili vam padnu na pamet! Svi se zadaci mogu dodati klikom na zeleno dugme \"Napravi\".\n* ** Postavke [Za uraditi](http://habitica.wikia.com/wiki/To-Dos): ** Unesite zadatke koje radite jednom ili rijetko u kolonu Za uraditi, jedan po jedan. Možete kliknuti na zadatke da biste ih uredili i dodali kontrolne liste, rokove i još mnogo toga!\n* ** Postavke [Dnevne zadatke](http://habitica.wikia.com/wiki/Dailies): ** U kolonu Dnevni zadaci unesite aktivnosti koje trebate raditi svakodnevno ili određenog dana u sedmici, mjesecu ili godini. Kliknite zadatak da biste uredili kada će se dogoditi i/ili odrediti datum početka. Možete ga napraviti ponavljajućim, na primjer, svaka 3 dana.\n* ** Postavke [Navike](http://habitica.wikia.com/wiki/Habits): ** U kolonu Navike unesite navike koje želite uspostaviti. Možete urediti Naviku da biste je promijenili u samo dobru naviku :heavy_plus_sign: ili lošu naviku :heavy_minus_sign:\n* ** Postavke [Nagrade](http://habitica.wikia.com/wiki/Rewards): ** Pored ponuđenih nagrada u igri, dodajte aktivnosti ili poslastice koje želite koristiti kao motivaciju u kolonu nagrada. Važno je da imate i predah ili da sebi dozvolite umjerenost!\n* Ako vam je potrebna inspiracija koje zadatke želite dodati, možete pogledati wiki stranice na [Primjeri navika](http://habitica.wikia.com/wiki/Sample_Habits), [Primjeri zadataka](http: // habitica. wikia.com/wiki/Sample_Dailies), [Primjeri Za uraditi](http://habitica.wikia.com/wiki/Sample_To-Dos) i [Primjeri nagrada](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
+    "step2": "Korak 2: Skupljajte bodove tako što radite stvari u stvarnom životu",
+    "webStep2Text": "Sada počnite rješavati svoje ciljeve sa liste! Dok dovršavate zadatke i potvrđujete ih na Habitici, steći ćete [Iskustvo](http://habitica.wikia.com/wiki/Experience_Points), koje vam pomaže da pređete na viši nivo, i [Zlatnike](http: // habitica. wikia.com/wiki/Gold_Points), koji vam omogućavaju da kupite nagrade. Ako padnete u loše navike ili propustite svoje dnevne zadatke, izgubit ćete [Zdravlje](http://habitica.wikia.com/wiki/Health_Points). Na taj način, Habitica iskustvo i zdravlje trake služe kao zabavni pokazatelj vašeg napretka prema zadatim ciljevima. Počet ćete viđati kako se vaš stvarni život poboljšava kako vaš lik napreduje u igri.",
+    "step3": "Korak 3: Prilagodite i istražite Habitiku",
+    "webStep3Text": "Nakon što se upoznate s osnovama, možete još više iskoristiti Habiticu pomoću ovih sjajnih karakteristika:\n * Organizirajte svoje zadatke pomoću [Oznaka](http://habitica.wikia.com/wiki/Tags) (uredite zadatak da biste ih dodali).\n * Prilagodite svoj [Avatar](http://habitica.wikia.com/wiki/Avatar) klikom na ikonu korisnika u gornjem desnom uglu.\n * Kupite svoju [Opremu](http://habitica.wikia.com/wiki/Equipment) u okviru Nagrade ili u [Prodavnici](<% = shopUrl%>) i promijenite je u [Inventar > Oprema] (<% = equipUrl%>).\n * Povežite se s drugim korisnicima putem [Aščinice](http://habitica.wikia.com/wiki/Tavern).\n * Počevši od 3. nivoa, izlegnite [Ljubimce](http://habitica.wikia.com/wiki/Pets) sakupljanjem [Jaja](http://habitica.wikia.com/wiki/Eggs) i [Napitaka za izlijeganje] (http://habitica.wikia.com/wiki/Hatching_Potions). [Hranite](http://habitica.wikia.com/wiki/Food) ih da postanu [Jahalice](http://habitica.wikia.com/wiki/Mounts).\n * Na nivou 10: odaberite određeni [Razred](http://habitica.wikia.com/wiki/Class_System), a zatim koristite [Vještine](http://habitica.wikia.com/wiki/Skills) specifične za razred (nivoi 11 do 14).\n * Napravite partiju sa svojim prijateljima (klikom na [Partija](<% = partyUrl%>) na navigacijskoj traci) kako biste ostali odgovorni i zaradite ponešto iz potrage.\n * Porazite čudovišta i sakupljajte predmete na [Potragama](http://habitica.wikia.com/wiki/Quests) (zadatak će vam biti postavljen na nivou 15).",
+    "overviewQuestions": "Imate pitanja? Pogledajte [ČPP](<% = faqUrl%>)! Ako se vaše pitanje tamo ne spominje, možete zatražiti dodatnu pomoć u [Esnafu za pomoć na Habitica](<% = helpGuildUrl%>).\n\nSretno sa zadacima!"
 }
--- a/website/common/locales/bs/pets.json
+++ b/website/common/locales/bs/pets.json
@@ -1 +1,61 @@
-{}
+{
+    "orca": "Orka",
+    "mammoth": "Vuneni mamut",
+    "mantisShrimp": "Ustonožac",
+    "hydra": "Hidra",
+    "cerberusPup": "Serberovo štene",
+    "veteranFox": "Lisica veteran",
+    "veteranBear": "Medvjed veteran",
+    "veteranLion": "Lav veteran",
+    "veteranTiger": "Tigar veteran",
+    "veteranWolf": "Vuk veteran",
+    "etherealLion": "Eterični lav",
+    "magicMounts": "Čarobni napitci jahalica",
+    "questMounts": "Jahalice iz akcija",
+    "mountsTamed": "Pripitomljene jahalice",
+    "noActiveMount": "Nema aktivne jahalice",
+    "activeMount": "Aktivna jahalica",
+    "mounts": "Jahalice",
+    "wackyPets": "Otkačeni ljubimci",
+    "questPets": "Ljubimci iz potraga",
+    "magicPets": "Čarobni napici ljubimaca",
+    "petsFound": "Pronađeno ljubimaca",
+    "noActivePet": "Nema aktivnog ljubimca",
+    "activePet": "Aktivni ljubimac",
+    "pets": "Ljubimci",
+    "stable": "Štala",
+    "triadBingoName": "Trostruki bingo",
+    "mountMasterText2": " i oslobođeno je svih 90 jahalica u zbiru <%= count %> puta",
+    "mountMasterText": "Ukroćeno je svih 90 jahalica (još teže, čestitke ovom korisniku!)",
+    "mountMasterName": "Majstor jahanja",
+    "mountAchievement": "Zaslužili ste postignuće \"Majstor jahanja\" jer ste prikupili sve ljubimce za jahanje!",
+    "mountMasterProgress": "Napredak majstorstva u jahanju",
+    "beastMasterText2": " i oslobođeno je vlastitih ljubimaca u zbiru <%= count %> puta",
+    "beastMasterText": "Nađeno je svih 90 ljubimaca (nevjerovatno teško, čestitke ovom korisniku!)",
+    "beastMasterName": "Majstor zvijeri",
+    "beastAchievement": "Zaslužili ste postignuće \"Majstor zvijeri\" jer ste prikupili sve ljubimce!",
+    "beastMasterProgress": "Napredak majstorstva kroćenja zvijeri",
+    "dropsExplanationEggs": "Potrošite dragulje da biste brže dolazili do jaja, ako ne želite čekati da standardna jaja kapnu, ili ponoviti potrage da zaradite jaja iz potraga. <a href=\"http://habitica.fandom.com/wiki/Drops\">Saznajte više o sistemu kapanja.</a>",
+    "premiumPotionNoDropExplanation": "Čarobni napitci za izlijeganje ne mogu se koristiti na jajima dobijenim iz potraga. Jedini način da dobijete čarobne napitke za kukuruz je kupnja ispod, a ne slučajnim kapljanjem.",
+    "dropsExplanation": "Nabavite ove predmete brže s draguljima ako ne želite čekati da kapnu prilikom izvršavanja zadatka. <a href=\"http://habitica.fandom.com/wiki/Drops\">Saznajte više o sistemu kapanja </a>",
+    "noSaddlesAvailable": "Nemate sedla.",
+    "noFoodAvailable": "Nemate hrane za ljubimce.",
+    "food": "Hrana za ljubimce i sedla",
+    "quickInventory": "Brzi inventar",
+    "haveHatchablePet": "Imate <% = potion %> napitak za izlijeganje i <% = egg %> jaje za izlijeganje ovog ljubimca! <b>Kliknite</b> da biste se izlegli!",
+    "hatchingPotion": "napitak za izlijeganje",
+    "magicHatchingPotions": "Magični napitci za izlijeganje",
+    "hatchingPotions": "Napitci za izlijeganje",
+    "eggSingular": "jaje",
+    "eggs": "Jaja",
+    "egg": "<%= eggType %> jaje",
+    "potion": "<%= potionType %> napitak",
+    "gryphatrice": "Gryphatrice",
+    "invisibleAether": "Nevidljivi eter",
+    "royalPurpleJackalope": "Kraljevski ljubičasti Jackalope",
+    "hopefulHippogriffMount": "Hopeful Hippogriff",
+    "hopefulHippogriffPet": "Hopeful Hippogriff",
+    "magicalBee": "Magična pčela",
+    "phoenix": "Feniks",
+    "royalPurpleGryphon": "Kraljevski Ljubičasti Grifon"
+}
--- a/website/common/locales/bs/rebirth.json
+++ b/website/common/locales/bs/rebirth.json
@@ -1,14 +1,15 @@
 {
-    "rebirthNew": "Rebirth: New Adventure Available!",
-    "rebirthUnlock": "You've unlocked Rebirth! This special Market item allows you to begin a new game at level 1 while keeping your tasks, achievements, pets, and more. Use it to breathe new life into Habitica if you feel you've achieved it all, or to experience new features with the fresh eyes of a beginning character!",
-    "rebirthAchievement": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is <%= level %>. To stack this Achievement, begin your next new adventure when you've reached an even higher Level!",
-    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
-    "rebirthBegan": "Began a New Adventure",
-    "rebirthText": "Began <%= rebirths %> New Adventures",
-    "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.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> page.",
-    "rebirthName": "Orb of Rebirth",
-    "rebirthComplete": "You have been reborn!"
+    "rebirthNew": "Preporod: Nova avantura dostupna!",
+    "rebirthUnlock": "Otključali ste preporod! Ova posebna stavka na pijaci omogućava vam da započnete novu igru sa 1. nivoa, zadržavajući zadatke, dostignuća, kućne ljubimce i još mnogo toga, kao da ste ponovo rođeni. Koristite ga da udahnete novi život Habitici ako smatrate da ste sve postigli ili da iskusite nove karakteristike svježim očima početnika!",
+    "rebirthAchievement": "Započeli ste novu avanturu! Ovo vam je <% = number%> preporod, a najviši nivo koji ste postigli je <% = level%>. Da biste nizali ova dostignuća, započnite svoju sljedeću novu avanturu kada dosegnete još viši nivo!",
+    "rebirthAchievement100": "Započeli ste novu avanturu! Ovo je vaš <% = number%> preporod, a najviši nivo koji ste postigli je 100 ili veći. Da biste nizali ova dostignuća, započnite svoju sljedeću novu avanturu kada dostignete najmanje 100!",
+    "rebirthBegan": "Nova avantura je počela",
+    "rebirthText": "Nova avantura je početa <%= rebirths %> put",
+    "rebirthOrb": "Korištena je Kugla preporoda da se krene ispočetka nakon dostizanja <%= level %> nivoa.",
+    "rebirthOrb100": "Korištena je Kugla preporoda da se počne ispočetka nakon dostizanja 100-tog ili većeg nivoa.",
+    "rebirthOrbNoLevel": "Korištena je Kugla preporoda da se počne iznova.",
+    "rebirthPop": "Odmah pokrenite svog lika kao ratnika 1. nivoa, zadržavajući dostignuća, kolekcionarstvo i opremu. Vaši zadaci i njihova historija ostat će, ali će se vratiti na žuto. Vaše crte će se ukloniti, osim iz zadataka koji pripadaju aktivnim izazovima i grupnim planovima. Uklonit će se vaši zlatnici, iskustvo, mana i efekti svih vještina. Sve ovo stupa na snagu odmah. Za više informacija pogledajte wiki stranicu <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a>.",
+    "rebirthName": "Kugla preporoda",
+    "rebirthComplete": "Proporođeni ste!",
+    "nextFreeRebirth": "<strong><%= days %> dana</strong> do <strong>SLOBODNE</strong> Kugle preporoda"
 }
--- a/website/common/locales/bs/spells.json
+++ b/website/common/locales/bs/spells.json
@@ -1,59 +1,60 @@
 {
-    "spellWizardFireballText": "Burst of Flames",
-    "spellWizardFireballNotes": "You summon XP and deal fiery damage to Bosses! (Based on: INT)",
-    "spellWizardMPHealText": "Ethereal Surge",
-    "spellWizardMPHealNotes": "You sacrifice Mana so the rest of your Party, except Mages, gains MP! (Based on: INT)",
-    "spellWizardEarthText": "Earthquake",
-    "spellWizardEarthNotes": "Your mental power shakes the earth and buffs your Party's Intelligence! (Based on: Unbuffed INT)",
-    "spellWizardFrostText": "Chilling Frost",
-    "spellWizardFrostNotes": "With one cast, ice freezes all your streaks so they won't reset to zero tomorrow!",
+    "spellWizardFireballText": "Rafalni plamen",
+    "spellWizardFireballNotes": "Skljupljate XP i nanosite šefovima vatrenu štetu! (Na osnovu: INT)",
+    "spellWizardMPHealText": "Električni udar",
+    "spellWizardMPHealNotes": "Žrtvujete Mana tako da ostatak vaše partije, osim Magesa, dobije Mana bodove! (Na osnovu: INT)",
+    "spellWizardEarthText": "Zemljotres",
+    "spellWizardEarthNotes": "Vaša mentalna snaga trese zemlju i jača inteligenciju vaše partije! (Na osnovu: neojačane INT)",
+    "spellWizardFrostText": "Hladan mraz",
+    "spellWizardFrostNotes": "S jednom bačenom čarolijom, led zamrzava sve vaše linije, tako da se sutra neće vratiti na nulu! ",
    "spellWizardFrostAlreadyCast": "You have already cast this today. Your streaks are frozen, and there's no need to cast this again.",
-    "spellWarriorSmashText": "Brutal Smash",
-    "spellWarriorSmashNotes": "You make a task more blue/less red and deal extra damage to Bosses! (Based on: STR)",
-    "spellWarriorDefensiveStanceText": "Defensive Stance",
-    "spellWarriorDefensiveStanceNotes": "You crouch low and gain a buff to Constitution! (Based on: Unbuffed CON)",
-    "spellWarriorValorousPresenceText": "Valorous Presence",
-    "spellWarriorValorousPresenceNotes": "Your boldness buffs your whole Party's Strength! (Based on: Unbuffed STR)",
-    "spellWarriorIntimidateText": "Intimidating Gaze",
-    "spellWarriorIntimidateNotes": "Your fierce stare buffs your whole Party's Constitution! (Based on: Unbuffed CON)",
-    "spellRoguePickPocketText": "Pickpocket",
-    "spellRoguePickPocketNotes": "You rob a nearby task and gain gold! (Based on: PER)",
-    "spellRogueBackStabText": "Backstab",
-    "spellRogueBackStabNotes": "You betray a foolish task and gain gold and XP! (Based on: STR)",
-    "spellRogueToolsOfTradeText": "Tools of the Trade",
-    "spellRogueToolsOfTradeNotes": "Your tricky talents buff your whole Party's Perception! (Based on: Unbuffed PER)",
-    "spellRogueStealthText": "Stealth",
-    "spellRogueStealthNotes": "With each cast, a few of your undone Dailies won't cause damage tonight. Their streaks and colors won't change. (Based on: PER)",
-    "spellRogueStealthDaliesAvoided": "<%= originalText %> Number of dailies avoided: <%= number %>.",
+    "spellWarriorSmashText": "Brutalno razbijanje",
+    "spellWarriorSmashNotes": "Pravite zadatak  plavljim/manje crvenim i nanosite dodatnu štetu šefovima! (Na osnovu: STR)",
+    "spellWarriorDefensiveStanceText": "Odbrambeni stav",
+    "spellWarriorDefensiveStanceNotes": "Nisko se sagnite i steknete ojačanje za vitkost! (Na osnovu: neojačane CON)",
+    "spellWarriorValorousPresenceText": "Hrabro prisustvo",
+    "spellWarriorValorousPresenceNotes": "Vaša smjelost uništava snagu cijele vaše partije! (Na osnovu: neojačane STR)",
+    "spellWarriorIntimidateText": "Zastrašujući pogled",
+    "spellWarriorIntimidateNotes": "Vaš žestoki pogled narušava vitkost cijele vaše partije! (Na osnovu: neojačane CON)",
+    "spellRoguePickPocketText": "Džeparoš",
+    "spellRoguePickPocketNotes": "Opljačkajte obližnji zadatak i osvojite zlatnike! (Na osnovu: PER)",
+    "spellRogueBackStabText": "Nož u leđa",
+    "spellRogueBackStabNotes": "Iznevjerite glup zadatak i osvojite zlatnike i XP! (Na osnovu: STR)",
+    "spellRogueToolsOfTradeText": "Alati zanatstva",
+    "spellRogueToolsOfTradeNotes": "Vaši lukavi talenti podržavaju opažanje cijele vaše partije! (Zasnovano na: neojačanom PER)",
+    "spellRogueStealthText": "Nevidljivost",
+    "spellRogueStealthNotes": "Sa svakom bačenom čarolijom, nekoliko vaših neodrađenih dnevnih zadataka večeras ti neće nanijeti štetu. Njihovi nizovi i boje se neće promijeniti. (Na osnovu: PER)",
+    "spellRogueStealthDaliesAvoided": "<%= originalText %> Broj dnevnih zadataka koji će se izbjegavati: <%= number %>.",
    "spellRogueStealthMaxedOut": "You have already avoided all your dailies; there's no need to cast this again.",
-    "spellHealerHealText": "Healing Light",
-    "spellHealerHealNotes": "Shining light restores your health! (Based on: CON and INT)",
-    "spellHealerBrightnessText": "Searing Brightness",
-    "spellHealerBrightnessNotes": "A burst of light makes your tasks more blue/less red! (Based on: INT)",
-    "spellHealerProtectAuraText": "Protective Aura",
-    "spellHealerProtectAuraNotes": "You shield your Party by buffing their Constitution! (Based on: Unbuffed CON)",
-    "spellHealerHealAllText": "Blessing",
-    "spellHealerHealAllNotes": "Your soothing spell restores your whole Party's health! (Based on: CON and INT)",
-    "spellSpecialSnowballAuraText": "Snowball",
-    "spellSpecialSnowballAuraNotes": "Turn a friend into a frosty snowman!",
-    "spellSpecialSaltText": "Salt",
-    "spellSpecialSaltNotes": "Reverse the spell that made you a snowman.",
-    "spellSpecialSpookySparklesText": "Spooky Sparkles",
-    "spellSpecialSpookySparklesNotes": "Turn your friend into a transparent pal!",
-    "spellSpecialOpaquePotionText": "Opaque Potion",
-    "spellSpecialOpaquePotionNotes": "Reverse the spell that made you transparent.",
-    "spellSpecialShinySeedText": "Shiny Seed",
-    "spellSpecialShinySeedNotes": "Turn a friend into a joyous flower!",
-    "spellSpecialPetalFreePotionText": "Petal-Free Potion",
-    "spellSpecialPetalFreePotionNotes": "Reverse the spell that made you a flower.",
-    "spellSpecialSeafoamText": "Seafoam",
-    "spellSpecialSeafoamNotes": "Turn a friend into a sea creature!",
-    "spellSpecialSandText": "Sand",
-    "spellSpecialSandNotes": "Reverse the spell that made you a sea star.",
-    "partyNotFound": "Party not found",
-    "targetIdUUID": "\"targetId\" must be a valid User ID.",
-    "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.",
-    "groupTasksNoCast": "Casting a skill on group tasks is not allowed.",
-    "spellNotOwned": "You don't own this skill.",
-    "spellLevelTooHigh": "You must be level <%= level %> to use this skill."
-}
+    "spellHealerHealText": "Ljekovito svjetlo",
+    "spellHealerHealNotes": "Blistava svjetlost vraća vam zdravlje! (Na osnovu: CON i INT)",
+    "spellHealerBrightnessText": "Zasljepljujuće blještavo",
+    "spellHealerBrightnessNotes": "Prasak svjetla čini vaše zadatke plavljim/manje crvenim! (Na osnovu: INT)",
+    "spellHealerProtectAuraText": "Zaštitna aura",
+    "spellHealerProtectAuraNotes": "Štitite svoju partiju pobijajući njihov ustav! (Na osnovu: Unbuffed CON)",
+    "spellHealerHealAllText": "Blagoslov",
+    "spellHealerHealAllNotes": "Vaša umirujuća čarolija vraća zdravlje cijeloj vašoj partiji! (Na osnovu: CON i INT)",
+    "spellSpecialSnowballAuraText": "Snježna grudva",
+    "spellSpecialSnowballAuraNotes": "Pretvorite prijatelja u ledenog snješka bijelića!",
+    "spellSpecialSaltText": "So",
+    "spellSpecialSaltNotes": "Obrnite čaroliju koja vas je pretvorila u snješka bijelića.",
+    "spellSpecialSpookySparklesText": "Sablasne iskrice",
+    "spellSpecialSpookySparklesNotes": "Pretvorite prijatelja u prozirnog druga!",
+    "spellSpecialOpaquePotionText": "Napitak neprozirnosti",
+    "spellSpecialOpaquePotionNotes": "Obrnite čaroliju koja vas je učinila prozirnim.",
+    "spellSpecialShinySeedText": "Svjetlucava sjemenka",
+    "spellSpecialShinySeedNotes": "Pretvorite prijatelja u radostan cvijet!",
+    "spellSpecialPetalFreePotionText": "Napitak za gubitak latica",
+    "spellSpecialPetalFreePotionNotes": "Obrnite čaroliju koja vas je pretvorila u cvijet.",
+    "spellSpecialSeafoamText": "Morska pjena",
+    "spellSpecialSeafoamNotes": "Pretvorite prijatelja u morsko biće!",
+    "spellSpecialSandText": "Pijesak",
+    "spellSpecialSandNotes": "Obrnite čaroliju koja vas je pretvorila u morsku zvijezdu.",
+    "partyNotFound": "Partija nije pronađena",
+    "targetIdUUID": "\"targetId\" mora biti važeći ID korisnika.",
+    "challengeTasksNoCast": "Bacanje čarolija na zadatke izazova nije dozvoljeno.",
+    "groupTasksNoCast": "Bacanje čarolija na grupne zadatke nije dozvoljeno.",
+    "spellNotOwned": "Vi ne posjedujete ovu vještinu.",
+    "spellLevelTooHigh": "Morate biti nivo <%= level %> da biste mogli koristiti ovu vještinu.",
+    "spellAlreadyCast": "Korištenje ove vještine neće imati dodatni efekat."
+}
--- a/website/common/locales/ca/limited.json
+++ b/website/common/locales/ca/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }
--- a/website/common/locales/cs/achievements.json
+++ b/website/common/locales/cs/achievements.json
@@ -61,7 +61,7 @@
    "hideAchievements": "Schovat <%= kategorie %>",
    "onboardingCompleteDesc": "Získáváš <strong>5 úspěchů</strong> a <strong class=\"gold-amount\">100 zlaťáků</strong> za dokončení seznamu.",
    "onboardingProgress": "<%= percentage %>% postup",
-    "gettingStartedDesc": "Vytvoř si úkol, splň jej a pak se podívej na své odměny. Dostaneš <strong>5 ocenění</strong> a <strong class=\"gold-amount\">100 zlaťáků</strong>, jakmile budeš hotový!",
+    "gettingStartedDesc": "Splň tyto základní úkoly a získej <strong>5 úspěchů</strong> a <strong class=\"gold-amount\">100 zlaťáků</strong>, jakmile budeš hotový/á!",
    "showAllAchievements": "Zobrazit všechny <%= kategorie %>",
    "yourProgress": "Tvůj postup",
    "achievementBareNecessitiesModalText": "Splnil/a jsi výpravy za opicí, lenochodem a stromečkem!",
@@ -90,5 +90,17 @@
    "achievementAllThatGlitters": "Všechno, co se třpytí",
    "achievementGoodAsGoldModalText": "Posbíral/a jsi všechny zlaté mazlíčky!",
    "achievementGoodAsGoldText": "Posbíral/a všechny zlaté mazlíčky.",
-    "achievementGoodAsGold": "Jako zlato"
+    "achievementGoodAsGold": "Jako zlato",
+    "achievementBoneCollector": "Sběratel kostí",
+    "achievementBoneCollectorText": "Posbíral/a všechny kostnaté mazlíčky.",
+    "achievementSeeingRed": "Vidět rudě",
+    "achievementSkeletonCrew": "Banda kostlivců",
+    "achievementBoneCollectorModalText": "Posbíral/a jsi všechny kostnaté mazlíčky!",
+    "achievementRedLetterDay": "Důležitý den",
+    "achievementRedLetterDayModalText": "Posbíral/a jsi všechna červená zvířata!",
+    "achievementRedLetterDayText": "Posbíral/a všechna červená zvířata.",
+    "achievementSeeingRedModalText": "Posbíral/a jsi všechna červená zvířata!",
+    "achievementSeeingRedText": "Posbíral/a všechny červené mazlíčky.",
+    "achievementSkeletonCrewModalText": "Posbíral/a jsi všechna kostnatá zvířata!",
+    "achievementSkeletonCrewText": "Posbíral/a všechna kostnatá zvířata."
 }
--- a/website/common/locales/cs/backgrounds.json
+++ b/website/common/locales/cs/backgrounds.json
@@ -4,49 +4,49 @@
    "backgroundShop": "Obchod s pozadími",
    "backgroundShopText": "Obchod s pozadími",
    "noBackground": "Nezvoleno žádné pozadí",
-    "backgrounds062014": "Sada 1: Vydána v červnu 2014",
+    "backgrounds062014": "Sada 1: zveřejněna v červnu 2014",
    "backgroundBeachText": "Pláž",
-    "backgroundBeachNotes": "Veranda na teplé pláži.",
+    "backgroundBeachNotes": "Vyhřívej se na teplé pláži.",
    "backgroundFairyRingText": "Kruh víl",
    "backgroundFairyRingNotes": "Tanči v kruhu víl.",
    "backgroundForestText": "Les",
-    "backgroundForestNotes": "Projdi se v létě lesem.",
-    "backgrounds072014": "Sada 2: Vydána v červenci 2014",
+    "backgroundForestNotes": "Projdi se letním lesem.",
+    "backgrounds072014": "Sada 2: zveřejněna v červenci 2014",
    "backgroundCoralReefText": "Korálový útes",
    "backgroundCoralReefNotes": "Zaplav si v korálovém útesu.",
    "backgroundOpenWatersText": "Volné vody",
    "backgroundOpenWatersNotes": "Užij si volné vody.",
    "backgroundSeafarerShipText": "Mořeplavcova loď",
    "backgroundSeafarerShipNotes": "Plav se na mořeplavcově lodi.",
-    "backgrounds082014": "Sada 3: Vydána v srpnu 2014",
+    "backgrounds082014": "Sada 3: zveřejněna v srpnu 2014",
    "backgroundCloudsText": "Mraky",
    "backgroundCloudsNotes": "Plachti mezi mraky.",
    "backgroundDustyCanyonsText": "Prašný kaňon",
    "backgroundDustyCanyonsNotes": "Toulej se prašným kaňonem.",
    "backgroundVolcanoText": "Sopka",
    "backgroundVolcanoNotes": "Rozpal se uvnitř sopky.",
-    "backgrounds092014": "Sada 4: Vydána v září 2014",
+    "backgrounds092014": "Sada 4: zveřejněna v září 2014",
    "backgroundThunderstormText": "Hromobití",
    "backgroundThunderstormNotes": "Vypusť hromy v bouři.",
    "backgroundAutumnForestText": "Podzimní les",
    "backgroundAutumnForestNotes": "Projdi se podzimním lesem.",
    "backgroundHarvestFieldsText": "Úrodná pole",
    "backgroundHarvestFieldsNotes": "Osázej svá úrodná pole.",
-    "backgrounds102014": "Sada 5: Vydána v říjnu 2014",
+    "backgrounds102014": "Sada 5: zveřejněna v říjnu 2014",
    "backgroundGraveyardText": "Hřbitov",
    "backgroundGraveyardNotes": "Navštiv strašidelný hřbitov.",
    "backgroundHauntedHouseText": "Strašidelný dům",
    "backgroundHauntedHouseNotes": "Propliž se strašidelným domem.",
    "backgroundPumpkinPatchText": "Dýňové pole",
    "backgroundPumpkinPatchNotes": "Vyřež strašidelné dýně na políčku dýní.",
-    "backgrounds112014": "Sada 6: Vydána v listopadu 2014",
+    "backgrounds112014": "Sada 6: zveřejněna v listopadu 2014",
    "backgroundHarvestFeastText": "Oslava sklizně",
    "backgroundHarvestFeastNotes": "Užij si slavnost sklizně.",
    "backgroundStarrySkiesText": "Hvězdná obloha",
    "backgroundStarrySkiesNotes": "Pozoruj hvězdnou oblohu.",
    "backgroundSunsetMeadowText": "Louka při soumraku",
    "backgroundSunsetMeadowNotes": "Obdivuj louku při soumraku.",
-    "backgrounds122014": "Sada 7: Vydána v prosinci 2014",
+    "backgrounds122014": "Sada 7: zveřejněna v prosinci 2014",
    "backgroundIcebergText": "Ledovec",
    "backgroundIcebergNotes": "Klouzej se po ledovci.",
    "backgroundTwinklyLightsText": "Třpytivá zimní světla",
@@ -570,5 +570,18 @@
    "backgroundRestingInTheInnText": "Odpočinek v hostinci",
    "backgroundMysticalObservatoryNotes": "Vyčti svůj osud ze hvězd, které spatříš z mystické observatoře.",
    "backgroundMysticalObservatoryText": "Mystická observatoř",
-    "backgrounds112020": "Sada 78: Zveřejněna v listopadu 2020"
+    "backgrounds112020": "Sada 78: Zveřejněna v listopadu 2020",
+    "backgroundHotSpringNotes": "Zbav se všech svých starostí namočením v horkých pramenech.",
+    "backgroundHolidayHearthText": "Slavnostní ohniště",
+    "backgroundRiverOfLavaNotes": "Vzdoruj proudu při procházce po lávě.",
+    "backgroundWintryCastleNotes": "Zažij zimní zámek zahalený v chladných mlhách.",
+    "backgroundWintryCastleText": "Zimní zámek",
+    "backgroundIcicleBridgeNotes": "Překroč rampouchový most s nejvyšší opatrností.",
+    "backgroundIcicleBridgeText": "Rampouchový most",
+    "backgroundHotSpringText": "Horké prameny",
+    "backgrounds012021": "Sada 80: zveřejněna v lednu 2021",
+    "backgroundInsideAnOrnamentNotes": "Vyzařuj svou slavnostní náladu z vnitřku ozdoby.",
+    "backgroundInsideAnOrnamentText": "Uvnitř ozdoby",
+    "backgroundHolidayHearthNotes": "Uvolni se, zahřej se a usuš se u slavnostního ohně.",
+    "backgroundGingerbreadHouseNotes": "Užij si výhledy, vůně a (pokud si to troufáš) chuť perníkové chaloupky."
 }
--- a/website/common/locales/cs/challenge.json
+++ b/website/common/locales/cs/challenge.json
@@ -101,5 +101,7 @@
    "selectMember": "Vyber člena",
    "confirmKeepChallengeTasks": "Chceš ponechat úkoly z výzvy?",
    "selectParticipant": "Zvol účastníka",
-    "filters": "Filtry"
+    "filters": "Filtry",
+    "wonChallengeDesc": "Vyhrál/a jsi výzvu <%= challengeName %>! Tvá výhra je zaznamenána ve tvých úspěších.",
+    "yourReward": "Tvá odměna"
 }
--- a/website/common/locales/cs/content.json
+++ b/website/common/locales/cs/content.json
@@ -339,27 +339,30 @@
    "foodPieSkeleton": "Koláč z Kostní Dřeně",
    "hatchingPotionSilver": "Stříbrný",
    "hatchingPotionWatery": "Vodní",
-    "hatchingPotionBronze": "Bronz",
-    "hatchingPotionSunshine": "Sluneční svit",
-    "hatchingPotionVeggie": "záhradní",
+    "hatchingPotionBronze": "Bronzový",
+    "hatchingPotionSunshine": "Sluneční",
+    "hatchingPotionVeggie": "Zahradní",
    "hatchingPotionCelestial": "Nebeský",
-    "hatchingPotionRoseQuartz": "Růženín",
+    "hatchingPotionRoseQuartz": "Růženínový",
    "questEggRobotAdjective": "futuristický",
    "questEggRobotMountText": "Robot",
    "questEggRobotText": "Robot",
    "questEggDolphinAdjective": "radostný",
    "questEggDolphinMountText": "Delfín",
    "questEggDolphinText": "Delfín",
-    "hatchingPotionShadow": "Stín",
+    "hatchingPotionShadow": "Stínový",
    "premiumPotionUnlimitedNotes": "Nepoužitelné na vejce z výprav.",
-    "hatchingPotionAurora": "Polární záře",
-    "hatchingPotionAmber": "Jantar",
+    "hatchingPotionAurora": "Polárně zářivý",
+    "hatchingPotionAmber": "Jantarový",
    "hatchingPotionFluorite": "Kazivcový",
-    "hatchingPotionSandSculpture": "Písková socha",
-    "hatchingPotionBirchBark": "Březová kůra",
-    "hatchingPotionRuby": "Rubín",
+    "hatchingPotionSandSculpture": "Pískovcový",
+    "hatchingPotionBirchBark": "Březovo-kůrový",
+    "hatchingPotionRuby": "Rubínový",
    "hatchingPotionDessert": "Cukroví",
-    "hatchingPotionVampire": "Upír",
-    "hatchingPotionTurquoise": "Tyrkys",
-    "hatchingPotionWindup": "Natahovací"
+    "hatchingPotionVampire": "Upíří",
+    "hatchingPotionTurquoise": "Tyrkysový",
+    "hatchingPotionWindup": "Natahovací",
+    "hatchingPotionBlackPearl": "Perlově černý",
+    "hatchingPotionAutumnLeaf": "Podzimně listnatý",
+    "hatchingPotionStainedGlass": "Vitrážový"
 }
--- a/website/common/locales/cs/messages.json
+++ b/website/common/locales/cs/messages.json
@@ -8,10 +8,10 @@
    "messageCannotFeedPet": "Tohoto mazlíčka nemůžeš nakrmit.",
    "messageAlreadyMount": "Toto zvíře už ve stáji máš. Zkus nakrmit jiného mazlíčka.",
    "messageEvolve": "<%= egg %> už má na sobě sedlo, pojďme si zajezdit!",
-    "messageLikesFood": "<%= egg %>má opravdu rád <%= foodText %>!",
-    "messageDontEnjoyFood": "<%= egg %>snědl <%= foodText %>, ale nevypadá, že by mu to chutnalo.",
+    "messageLikesFood": "<%= egg %> má opravdu rád <%= foodText %>!",
+    "messageDontEnjoyFood": "<%= egg %> snědl <%= foodText %>, ale nevypadá, že by mu to chutnalo.",
    "messageBought": "<%= itemText %>, koupeno",
-    "messageUnEquipped": "<%= itemText %> byl odebrán.",
+    "messageUnEquipped": "<%= itemText %> byl odložen.",
    "messageMissingEggPotion": "Chybí ti buď to vejce nebo ten lektvar",
    "messageInvalidEggPotionCombo": "Nemůžeš vylíhnout vejce mazlíčků z výprav pomocí kouzelných líhnoucích lektvarů! Zkus jiné vejce.",
    "messageAlreadyPet": "Tohoto mazlíčka už máš. Zkus vylíhnout jinou kombinaci!",
@@ -53,5 +53,10 @@
    "messageMissingDisplayName": "Chybí zobrazované jméno.",
    "canDeleteNow": "Nyní můžete zprávu smazat.",
    "reportedMessage": "Tuto zprávu jste nahlásili moderátorům.",
-    "beginningOfConversationReminder": "Nezapomeňte být milí, taktní a respektujte Zásady komunity!"
+    "beginningOfConversationReminder": "Nezapomeňte být milí, taktní a respektujte Zásady komunity!",
+    "messageAllUnEquipped": "Vše odloženo.",
+    "messageBackgroundUnEquipped": "Pozadí odloženo.",
+    "messagePetMountUnEquipped": "Mazlíček a zvíře odloženi.",
+    "messageCostumeUnEquipped": "Kostým odložen.",
+    "messageBattleGearUnEquipped": "Bojová výstroj odložena."
 }
--- a/website/common/locales/da/limited.json
+++ b/website/common/locales/da/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Til og med 15. januar vil du få det samme abonnement med til dig selv, når du køber et abonnement til nogen i gave!",
    "winterPromoGiftDetails2": "Bemærk venligst, at hvis du eller modtageren af din gave allerede har et tilbagevendende abonnement, vil gave-abonnementet kun starte efter det tilbagevendende er blevet opsagt eller er udløbet. Tusind tak for din støtte! <3",
    "discountBundle": "pakke",
-    "g1g1Announcement": "Giv et abonnement, få et abonnement gratis! Tilbuddet gælder lige nu!",
+    "g1g1Announcement": "<strong>Giv et abonnement, få et abonnement gratis!</strong> Tilbuddet gælder lige nu!",
    "g1g1Details": "Send et gave-abonnement til en ven fra deres profil, og du vil få det samme abonnement til dig selv gratis!"
 }
--- a/website/common/locales/de/backgrounds.json
+++ b/website/common/locales/de/backgrounds.json
@@ -576,5 +576,12 @@
    "backgroundInsideAnOrnamentText": "Im Baumschmuck",
    "backgroundGingerbreadHouseNotes": "Genieße die Aussicht, den Geruch und (wenn Du dich traust) den Geschmack eines riesigen Pfefferkuchenhauses.",
    "backgroundGingerbreadHouseText": "Pfefferkuchenhaus",
-    "backgrounds122020": "SET 79: Veröffentlicht im Dezember 2020"
+    "backgrounds122020": "SET 79: Veröffentlicht im Dezember 2020",
+    "backgroundWintryCastleNotes": "Sei zeuge eines Winterlichen Schlosses im kalten Nebel.",
+    "backgroundWintryCastleText": "Winterliches Schloss",
+    "backgroundIcicleBridgeNotes": "Überqueren der Eiszapfenbrücke auf eigene Gefahr.",
+    "backgroundIcicleBridgeText": "Eiszapfenbrücke",
+    "backgroundHotSpringNotes": "Genieße die heiße Quelle und lasse seine Sorgen schmelzen.",
+    "backgroundHotSpringText": "Heiße Quelle",
+    "backgrounds012021": "SET 80: Veröffentlicht im Januar 2021"
 }
--- a/website/common/locales/de/challenge.json
+++ b/website/common/locales/de/challenge.json
@@ -5,7 +5,7 @@
    "brokenTask": "Toter Herausforderungs-Link: Diese Aufgabe war Teil einer Herausforderung, aber ist mittlerweile entfernt worden. Was möchtest Du tun?",
    "keepIt": "Behalten",
    "removeIt": "Entfernen",
-    "brokenChallenge": "Toter Herausforderungs-Link: Diese Aufgabe war Teil einer Herausforderung, aber der Herausforderung (oder die Gruppe) wurde gelöscht. Was möchtest Du mit den verwaisten Aufgaben tun?",
+    "brokenChallenge": "Toter Herausforderungs-Link: Diese Aufgabe war Teil einer Herausforderung, aber die Herausforderung (oder Gruppe) wurde gelöscht. Was möchtest Du mit den verwaisten Aufgaben tun?",
    "keepThem": "Aufgaben behalten",
    "removeThem": "Aufgaben entfernen",
    "challengeCompleted": "Diese Herausforderung ist beendet, und gewonnen hat <span class=\"badge\"><%- user %></span>! Was soll mit den verwaisten Aufgaben geschehen?",
--- a/website/common/locales/de/gear.json
+++ b/website/common/locales/de/gear.json
@@ -2003,7 +2003,7 @@
    "shieldSpecialWinter2020HealerNotes": "Hast Du das Gefühl, Du seist zu gut für diese Welt, zu unverfälscht? Nur diese Schönheit unter den Gewürzen ist Deiner würdig. Erhöht Ausdauer um <%= con %>. Limitierte Ausgabe 2019-2020 Winterausrüstung.",
    "headSpecialWinter2020HealerNotes": "Bitte nimm es ab, bevor Du versuchst damit einen Chai oder Kaffee aufzubrühen. Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2019-2020 Winterausrüstung.",
    "headSpecialWinter2020MageNotes": "Oh! Süßer die Glocken nie klingen / als zu der Weihnachtszeit, / ’s ist, als ob Engelein singen, / \"Wende 'Flammenstoß' an\". Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2019-2020 Winterausrüstung.",
-    "headSpecialWinter2020WarriorNotes": "Ein stacheliges Gefühl auf Deinem Kopf ist ein kleiner Preis für saisonale Pracht. Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2019-202 Winterausrüstung.",
+    "headSpecialWinter2020WarriorNotes": "Ein stachliges Gefühl auf Deinem Kopf ist ein kleiner Preis für saisonale Pracht. Erhöht Stärke um <%= str %>. Limitierte Ausgabe 2019-202 Winterausrüstung.",
    "headSpecialWinter2020WarriorText": "Schneegekrönter Kopfschmuck",
    "headSpecialWinter2020RogueNotes": "Geht ein Schurke in dieser Mütze die Straße entlang, so wissen die Leute, so jemand fürchtet nichts. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2019-2020 Winterausrüstung.",
    "headSpecialWinter2020RogueText": "Flauschige Bommelmütze",
@@ -2261,5 +2261,19 @@
    "weaponSpecialWinter2021RogueText": "Ilex-Beeren Morgenstern",
    "headSpecialWinter2021HealerNotes": "Ein überraschend großer Teil unserer Körperwärme wird über den Kopf abgegeben! Nicht jedoch, wenn du diese dicke Mütze mit Wind-schützender Sturmbrille trägst. Auf DEINEN Wimpern werden sicher keine Eiszapfen entstehen! Erhöht Intelligenz um <%= int %>. Limitierte Ausgabe 2020-2021 Winterausrüstung.",
    "headSpecialWinter2021HealerText": "Arktischer Entdecker Kopfschutz",
-    "headSpecialWinter2021MageNotes": "Lasse deine Gedanken frei, während Deine physische Gestalt sicher und warm unter dieser kolossalen Kapuze jedem Winterwind standhältst. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2020-2021 Winterausrüstung."
+    "headSpecialWinter2021MageNotes": "Lasse Deine Gedanken frei, während Deine physische Gestalt sicher und warm unter dieser kolossalen Kapuze jedem Winterwind standhält. Erhöht Wahrnehmung um <%= per %>. Limitierte Ausgabe 2020-2021 Winterausrüstung.",
+    "weaponArmoireBlueMoonSaiText": "Mondschatten Sai",
+    "headSpecialNye2020Notes": "Du hast einen Extravaganten Partyhut erhalten! Trage ihn mit Stolz während du das neue Jahr einläutest! Gewährt keinen Attributbonus.",
+    "headSpecialNye2020Text": "Extravaganter Partyhut",
+    "headMystery202101Text": "Stylischer Schneeleopardenhelm",
+    "armorMystery202101Text": "Stylischer Schneeleopardenanzug",
+    "shieldArmoireBlueMoonSaiNotes": "Dieses Sai ist eine traditionelle Waffe, durchtränkt mit den Kräften der hellen Seite des Mondes. Erhöht Wahrnehmung um <%= per %>. Verzauberter Schrank: Schattenmond Schurke-Set (Gegenstand 3 von 4).",
+    "shieldArmoireBlueMoonSaiText": "Mondlicht Sai",
+    "headArmoireBlueMoonHelmNotes": "Dieser Helm bietet den Tragenden verblüffendes Glück und bemerkenswerte Ereignisse folgen jedem Gebrauch. Erhöht Intelligenz um <%= int %>. Verzauberter Schrank: Schattenmond Schurke-Set (Gegenstand 3 von 4).",
+    "headArmoireBlueMoonHelmText": "Schattenmond Helm",
+    "headMystery202101Notes": "Die eisblauen Augen an diesem katzenhaften Helm werden selbst die bedrohlichsten Aufgaben auf Deiner Liste zum Erstarren bringen. Januar 2021 Abonnentengegenstand.",
+    "armorArmoireBlueMoonShozokuNotes": "Eine wunderliche Gelassenheit umgibt wer diese Rüstung trägt.Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Schattenmond Schurke-Set (Gegenstand 4 von 4).",
+    "armorArmoireBlueMoonShozokuText": "Schattenmond Rüstung",
+    "armorMystery202101Notes": "Wickle dich in deinen warmen Pelz und erlebe beinahe endlosen Fluff! Gewährt keinen Attributbonus. Januar 2021 Abonnentengegenstand.",
+    "weaponArmoireBlueMoonSaiNotes": "Dieses Sai ist eine traditionelle Waffe, durchtränkt mit den Kräften der dunklen Seite des Mondes. Erhöht Stärke um <%= str %>. Verzauberter Schrank: Schattenmond Schurke-Set (Gegenstand 1 von 4)."
 }
--- a/website/common/locales/de/settings.json
+++ b/website/common/locales/de/settings.json
@@ -110,7 +110,7 @@
    "majorUpdates": "Wichtige Ankündigungen",
    "questStarted": "Dein Quest hat begonnen",
    "invitedQuest": "Zu einem Quest eingeladen",
-    "kickedGroup": "Aus Gruppe geworfen",
+    "kickedGroup": "Aus der Gruppe rausgeworfen",
    "remindersToLogin": "Erinnerungen, bei Habitica reinzuschauen",
    "unsubscribedSuccessfully": "Erfolgreich abgemeldet!",
    "unsubscribedTextUsers": "Du hast Dich erfolgreich von allen Habitica Emails abgemeldet. Du kannst die Emails, die Du erhalten möchtest, unter <a href=\"/user/settings/notifications\">Einstellungen>&gt; Mitteilungen</a> freischalten (erfordert Anmeldung).",
@@ -183,5 +183,5 @@
    "chatExtension": "<a target='blank' href='https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb'>Chrome Chat Erweiterung</a> und <a target='blank' href='https://addons.mozilla.org/de/firefox/addon/habitica-chat-client-2/'>Firefox Chat Erweiterung</a>",
    "displaynameIssueNewline": "Anzeigenamen dürfen keinen Backslash gefolgt von einem Buchstaben N enthalten.",
    "resetAccount": "Konto zurücksetzen",
-    "giftedSubscriptionWinterPromo": "Hallo <%= username %>, Du hast, im Zuge unserer Feiertags-Geschenke-Schenk-Aktion, ein Abonnoment für <%= monthCount %> Monate geschenkt bekommen!"
+    "giftedSubscriptionWinterPromo": "Hallo <%= username %>, Du hast, im Zuge unserer Feiertags-Geschenke-Schenk-Aktion, ein Abonnement für <%= monthCount %> Monate geschenkt bekommen!"
 }
--- a/website/common/locales/de/subscriber.json
+++ b/website/common/locales/de/subscriber.json
@@ -187,5 +187,6 @@
    "dropCapLearnMore": "Lerne mehr über Habiticas Beute-System",
    "dropCapReached": "Du hast für heute alle Gegenstände gefunden!",
    "mysterySet202011": "Belaubtes Magier-Set",
-    "mysterySet202012": "Frostfeuer Phönix-Set"
+    "mysterySet202012": "Frostfeuer Phönix-Set",
+    "mysterySet202101": "Schickes Schneeleopard-Set"
 }
--- a/website/common/locales/el/achievements.json
+++ b/website/common/locales/el/achievements.json
@@ -66,7 +66,41 @@
    "achievementPrimedForPaintingModalText": "Έχεις συλλέξει όλα τα Λευκά Κατοικίδια!",
    "achievementPrimedForPaintingText": "Έχει συλλέξει όλα τα Λευκά Κατοικίδια.",
    "achievementPurchasedEquipmentModalText": "Ο Εξοπλισμός είναι ένας τρόπος να εξατομικεύσεις το είδωλό σου και να βελτιώσεις τα Στατιστικά σου",
-    "achievementHatchedPetModalText": "",
+    "achievementHatchedPetModalText": "Πήγαινε στον κατάλογο εξοπλισμού σου και προσπάθησε να συνδυάσεις ένα Φίλτρο εκκόλαψης και ένα Αυγό",
    "achievementAllThatGlitters": "Όσα Λαμπιρίζουν",
-    "achievementPrimedForPainting": "Έτοιμος για Ζωγραφική"
+    "achievementPrimedForPainting": "Έτοιμος για Ζωγραφική",
+    "achievementRosyOutlook": "Ρόδινες Προοπτικές",
+    "achievementPearlyProModalText": "Έχεις εξημερώσει όλα τα Λευκά Θηρία!",
+    "achievementBareNecessities": "Βασικές Ανάγκες",
+    "achievementBugBonanza": "Τζάκποτ Εντόμων",
+    "achievementTickledPinkText": "Έχει συλλέξει όλα τα Ροζ Μαλλιού της Γριάς Κατοικίδια.",
+    "achievementFreshwaterFriends": "Φίλοι του Γλυκού Νερού",
+    "achievementTickledPink": "Διασκεδαστικό Ροζ",
+    "achievementKickstarter2019Text": "Υποστήριξε το Εγχείρημα Kickstarter Κονκάρδες 2019",
+    "achievementGoodAsGoldText": "Έχει συλλέξει όλα τα Χρυσά Κατοικίδια.",
+    "achievementGoodAsGoldModalText": "Έχεις συλλέξει όλα τα Χρυσά Κατοικίδια!",
+    "achievementAllThatGlittersText": "Έχει εξημερώσει όλα τα Χρυσά Κτήνη.",
+    "achievementAllThatGlittersModalText": "Έχεις εξημερώσει όλα τα Χρυσά Κτήνη!",
+    "achievementBoneCollector": "Συλλέκτης Οστών",
+    "achievementRedLetterDayModalText": "Έχεις εξημερώσει όλα τα Κόκκινα Θηρία!",
+    "achievementRedLetterDayText": "Έχει εξημερώσει όλα τα Κόκκινα Θηρία.",
+    "achievementRedLetterDay": "Ημέρα Κόκκινου Γράμματος",
+    "achievementSeeingRedModalText": "Έχεις συλλέξει όλα τα Κόκκινα κατοικίδια!",
+    "achievementSeeingRedText": "Έχει συλλέξει όλα τα Κόκκινα κατοικίδια.",
+    "achievementSeeingRed": "Βλέποντάς τα Κόκκινα",
+    "achievementSkeletonCrew": "Πλήρωμα Σκελετών",
+    "achievementBoneCollectorModalText": "Έχεις συλλέξει όλα τα κατοικίδια Σκελετούς!",
+    "achievementBoneCollectorText": "Έχει συλλέξει όλα τα κατοικίδια Σκελετούς.",
+    "achievementGoodAsGold": "Καλό σαν Χρυσό",
+    "achievementTickledPinkModalText": "Έχεις συλλέξει όλα τα Ροζ Μαλλιού της Γριάς Κατοικίδια!",
+    "achievementBugBonanzaModalText": "Ολοκλήρωσες όλες τις περιπέτειες κατοικιδίων Σκαθάρι, Πεταλούδα, Σαλιγκάρι και Αράχνη!",
+    "achievementBugBonanzaText": "Έχει ολοκληρώσει όλες τις περιπέτειες κατοικιδίων Σκαθάρι, Πεταλούδα, Σαλιγκάρι και Αράχνη.",
+    "achievementRosyOutlookModalText": "Έχεις εξημερώσει όλα τα Θηρία με χρώμα Ροζ Μαλλιού της Γριάς!",
+    "achievementRosyOutlookText": "Έχει εξημερώσει όλα τα Θηρία με χρώμα Ροζ Μαλλιού της Γριάς.",
+    "achievementBareNecessitiesModalText": "Ολοκλήρωσες τις περιπέτειες κατοικιδίων Μαϊμού, Βραδύποδα και Δενδρίδιο!",
+    "achievementBareNecessitiesText": "Έχει ολοκληρώσει τις περιπέτειες κατοικιδίων Μαϊμού, Βραδύποδα και Δενδρίδιο.",
+    "achievementFreshwaterFriendsModalText": "Ολοκλήρωσες τις αποστολές κατοικιδίων Μεξικανική Σαλαμάνδρα, Βατράχι και Ιπποπόταμος!",
+    "achievementFreshwaterFriendsText": "Έχει ολοκληρώσει τις αποστολές κατοικιδίων Μεξικανική Σαλαμάνδρα, Βατράχι και Ιπποπόταμος.",
+    "achievementSkeletonCrewModalText": "Έχεις δαμάσει όλα τα Θηρία Σκελετούς!",
+    "achievementSkeletonCrewText": "Έχει δαμάσει όλα τα Θηρία Σκελετούς."
 }
--- a/website/common/locales/el/backgrounds.json
+++ b/website/common/locales/el/backgrounds.json
@@ -408,5 +408,28 @@
    "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.",
+    "backgroundOldFashionedBakeryNotes": "Απόλαυσε λαχταριστές μυρωδιές έξω από ένα Παλιομοδίτικο Αρτοποιείο.",
+    "backgroundOldFashionedBakeryText": "Παλιομοδίτικο Αρτοποιείο",
+    "backgroundMedievalKitchenText": "Μεσαιωνική Κουζίνα",
+    "backgroundDuckPondNotes": "Τάισε υδρόβια πουλιά στην Λιμνούλα με τις Πάπιες.",
+    "backgroundDuckPondText": "Λιμνούλα με Πάπιες",
+    "backgroundFlowerMarketNotes": "Βρες τα τέλεια χρώματα για να φτιάξεις ένα μπουκέτο ή έναν κήπο σε μία Αγορά Λουλουδιών.",
+    "backgroundFlowerMarketText": "Αγορά Λουλουδιών",
+    "backgroundFieldWithColoredEggsNotes": "Κυνήγησε τον ανοιξιάτικο θυσαυρό σε ένα Λιβάδι με Χρωματιστά Αυγά.",
+    "backgroundFieldWithColoredEggsText": "Λιβάδι με Χρωματιστά Αυγά",
+    "backgroundDojoNotes": "Μάθε νέες κινήσεις σε ένα Ντότζο.",
+    "backgroundDojoText": "Ντότζο",
+    "backgroundParkWithStatueNotes": "Ακολούθησε ένα μονοπάτι γεμάτο λουλούδια μέσα από ένα Πάρκο με Άγαλμα.",
+    "backgroundParkWithStatueText": "Πάρκο με Άγαλμα",
+    "backgroundSchoolOfFishNotes": "Κολύμπησε ανάμεσα σε ένα Σχολείο Ψαριών.",
+    "backgroundSchoolOfFishText": "Σχολείο Ψαριών",
+    "backgroundUnderwaterVentsNotes": "Κάνε μια βαθιά βουτιά, κάτω στις Υποθαλάσειες Οπές.",
+    "backgroundUnderwaterVentsText": "Υποθαλάσειες Οπές",
+    "backgroundLakeWithFloatingLanternsNotes": "Δες τα αστέρια από την ατμόσφαιρα του φεστιβάλ μιας Λίμνης με Φανάρια που Επιπλέουν.",
+    "backgroundLakeWithFloatingLanternsText": "Λίμνη με Φανάρια που Επιπλέουν",
+    "backgroundFlyingOverTropicalIslandsNotes": "Άσε τη θέα να σου κόψει την ανάσα όσο Πετάς πάνω από Τροπικά Νησιά.",
+    "backgroundFlyingOverTropicalIslandsText": "Πετώντας πάνω από Τροπικά Νησιά",
+    "backgroundBlossomingDesertNotes": "Δες  μια σπάνια υπεράνθηση στην Ανθισμένη Έρημο.",
+    "backgroundBlossomingDesertText": "Ανθισμένη Έρημος"
 }
--- a/website/common/locales/el/challenge.json
+++ b/website/common/locales/el/challenge.json
@@ -100,5 +100,8 @@
    "viewProgress": "Δες την Πρόοδο",
    "selectMember": "Επίλεξε Μέλος",
    "confirmKeepChallengeTasks": "Θέλεις να διατηρήσεις τις υποχρεώσεις της Πρόκλησης;",
-    "selectParticipant": "Επίλεξε έναν Συμμετέχοντα"
+    "selectParticipant": "Επίλεξε έναν Συμμετέχοντα",
+    "wonChallengeDesc": "Η πρόκληση <%= challengeName %> σε επέλεξε ως νικητή! Η νίκη σου έχει καταγραφεί στις Επιτυχίες σου.",
+    "yourReward": "Η Ανταμοιβή Σου",
+    "filters": "Φίλτρα"
 }
--- a/website/common/locales/el/character.json
+++ b/website/common/locales/el/character.json
@@ -182,7 +182,7 @@
    "offHand": "Άλλο Χέρι",
    "statPoints": "Πόντοι Στατιστικών",
    "pts": "Πόντοι",
-    "chatCastSpellUser": "<%= username %> ρίχνει το ξόρκι <%= spell %> στον  <%= target %>.",
+    "chatCastSpellUser": "<%= username %> ρίχνει το ξόρκι <%= spell %> στον <%= target %>.",
    "chatCastSpellParty": "<%= username %> ρίχνει το ξόρκι <%= spell %> για την ομάδα.",
    "purchasePetItemConfirm": "Αυτή η αγορά υπερβαίνει τον αριθμό αντικειμένων που χρειάζεσαι για να εκκολάψεις όλα τα δυνατά <%= itemText %> κατοικίδια. Είσαι σίγουρος;",
    "purchaseForGold": "Αγορά για <%= cost %> Χρυσό;"
--- a/website/common/locales/el/limited.json
+++ b/website/common/locales/el/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "πακέτο",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }
--- a/website/common/locales/el/pets.json
+++ b/website/common/locales/el/pets.json
@@ -1 +1,5 @@
-{}
+{
+    "activePet": "Ενεργό Κατοικίδιο",
+    "pets": "Κατοικίδια",
+    "stable": "Στάβλος"
+}
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -646,6 +646,8 @@
  "armorSpecialBirthday2019Notes": "Happy Birthday, Habitica! Wear these Outlandish Party Robes to celebrate this wonderful day. Confers no benefit.",
  "armorSpecialBirthday2020Text": "Outrageous Party Robes",
  "armorSpecialBirthday2020Notes": "Happy Birthday, Habitica! Wear these Outrageous Party Robes to celebrate this wonderful day. Confers no benefit.",
+  "armorSpecialBirthday2021Text": "Extravagant Party Robes",
+  "armorSpecialBirthday2021Notes": "Happy Birthday, Habitica! Wear these Extravagant Party Robes to celebrate this wonderful day. Confers no benefit.",

  "armorSpecialGaymerxText": "Rainbow Warrior Armor",
  "armorSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
--- a/website/common/locales/en@lolcat/backgrounds.json
+++ b/website/common/locales/en@lolcat/backgrounds.json
@@ -1,5 +1,7 @@
 {
    "backgroundShop": "Bakground Shop",
    "background": "Bakground",
-    "backgrounds": "Baekgroundz"
+    "backgrounds": "Baekgroundz",
+    "noBackground": "U has no choosd bakgrownd!1!",
+    "backgroundShopText": "Bakgrownd Shop"
 }
--- a/website/common/locales/en@lolcat/challenge.json
+++ b/website/common/locales/en@lolcat/challenge.json
@@ -100,5 +100,8 @@
    "viewProgress": "View Progress",
    "selectMember": "CHOOZE member",
    "confirmKeepChallengeTasks": "Do u want to kep challenge tasks?",
-    "selectParticipant": "CHOOZE partizipent"
+    "selectParticipant": "CHOOZE partizipent",
+    "wonChallengeDesc": "<%= challengeName %> choosd u as teh winr!!!!!!111! U can has win listd n ur acheevmntz.",
+    "yourReward": "Ur rewared",
+    "filters": "Filturz"
 }
--- a/website/common/locales/en@lolcat/content.json
+++ b/website/common/locales/en@lolcat/content.json
@@ -363,5 +363,6 @@
    "hatchingPotionBronze": "Bronz",
    "hatchingPotionVeggie": "Guarden",
    "hatchingPotionCelestial": "Celest",
-    "foodPieCottonCandyBlueThe": "the Bluebewy Piez"
+    "foodPieCottonCandyBlueThe": "the Bluebewy Piez",
+    "hatchingPotionStainedGlass": "Staend Glas"
 }
--- a/website/common/locales/en@lolcat/faq.json
+++ b/website/common/locales/en@lolcat/faq.json
@@ -6,12 +6,12 @@
    "webFaqAnswer0": "1st ull maek taskz u wanna do everydai! Den wen u do teh taskz in real lief an chek them off, u can has Experianz an Gold!! U can use Gold 2 bai ekwipment an sum ietmz, an custum rewardz!! Experianz maeks ur char lvl up an den u can has new content! Liek petz an skilz an kwestz! 4 moar deetz, chek out a step-by-step luk of teh gaem at [HALP!!! -> NEW USERS CLIK HEAR 2 LERN MOAR KOOL STUF](https://habitica.com/static/overview).",
    "faqQuestion1": "How 2 set up taskz?",
    "iosFaqAnswer1": "Gud Habitz (teh 1s wif +) r taskz u can do many tiemz eech dai liek eetin vegetablz. Bad Habitz (teh 1s wif -) r taskz u should avoid liek bitin nailz. Habitz wif + an - can haz gud choiec an bad choiec liek tak teh stairs vs. tak teh elevator. Gud Habitz give experianz an gold. Bad Habitz tak helf.\n\n Dailyz r taskz u have to do eech dai liek brushin ur teef or chekin ur email. U can chaeng teh daiz Dailyz iz due bai tapin 2 edit it. If u skip Dailyz that iz due, ur avatar will tak damig overnight. B careful not 2 ad 2 meny Dailyz at once!\n\n ToDoz r ur ToDo list. Compleetin ToDoz earnz u gold an experianz. U never loose helf frum ToDoz. U can add due daet 2 ToDoz bai tapin 2 edit.",
-    "androidFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your character will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.",
-    "webFaqAnswer1": "* Good Habits (the ones with a :heavy_plus_sign:) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a :heavy_minus_sign:) are tasks that you should avoid, like biting nails. Habits with a :heavy_plus_sign: and a :heavy_minus_sign: have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n* Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n* To-Dos are your To-Do list. Completing a To-Do earns you Gold and Experience. You never lose Health from To-Dos. You can add a due date to a To-Do by clicking the pencil icon to edit.",
+    "androidFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your character will take damage overnight. Be careful not to add too many Dailies at once!\n\n To Do's are your To Do list. Completing a To Do earns you gold and experience. You never lose health from To Do's. You can add a due date to a To Do by tapping to edit.",
+    "webFaqAnswer1": "* Good Habits (the ones with a :heavy_plus_sign:) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a :heavy_minus_sign:) are tasks that you should avoid, like biting nails. Habits with a :heavy_plus_sign: and a :heavy_minus_sign: have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n* Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n* To Do's are your To Do list. Completing a To Do earns you Gold and Experience. You never lose Health from To Do's. You can add a due date to a To Do by clicking the pencil icon to edit.",
    "faqQuestion2": "I NEED EXAMPLEZ????",
-    "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
-    "androidFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
-    "webFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)",
+    "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "androidFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "webFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
    "faqQuestion3": "Y iz tazks chege color?",
    "iosFaqAnswer3": "Ur taskz chaeng color bai how gud ur doin on em!! Eech new wun starts wif a yelow 4 da midle. Do ur dailyz or postiv habitz moar tiems an u can maek dem blu!!! If ur dailyz no can has chekmrk or u clik a bad habit den ur task can bcum red!! oh noes!! Red taskz giv moar rewardz but red dailyz an bad habitz can hurt u moar!!!! OUCH! Dis maeks u wan 2 do taskz dat giv u trubl.",
    "androidFaqAnswer3": "Ur taskz chaeng color bai how gud ur doin on em!! Eech new wun starts wif a yelow 4 da midle. Do ur dailyz or postiv habitz moar tiems an u can maek dem blu!!! If ur dailyz no can has chekmrk or u clik a bad habit den ur task can bcum red!! oh noes!! Red taskz giv moar rewardz but red dailyz an bad habitz can hurt u moar!!!! OUCH! Dis maeks u wan 2 do taskz dat giv u trubl.",
@@ -21,32 +21,32 @@
    "androidFaqAnswer4": "Meny stufs can damig u. FIRST!!! If u didnt do al ur dailyz yesterdai an u didnt chek dem off in da popup da next mornin, ur dailyz u didnt do can hurt u! ALSO if u tap a bad habit, it wil damig u. ONE MOAR THING! If ur fitin a boss wif ur partie an one of ur partie maetz didnt do al ther dailyz, den the bos wil atak u!\n\n Teh main way u can has heel is to get new lvl--ur helf wil b restord!!! U can has helf poshun wif gold frum rewardz tab on da taskz paeg 2! And if ur lvl 10 or moar, u can has choiec 2 bcum heeler! Heelers can has heelin skilz!!!!! If ur partie has heelr, den u can has heelz from dem 2.",
    "webFaqAnswer4": "Meny stufs can damig u. FIRST!!! If u didnt do al ur dailyz yesterdai an u didnt chek dem off in da popup da next mornin, ur dailyz u didnt do can hurt u! ALSO if u tap a bad habit, it wil damig u. ONE MOAR THING! If ur fitin a boss wif ur partie an one of ur partie maetz didnt do al ther dailyz, den the bos wil atak u! Teh main way u can has heel is to get new lvl--ur helf wil b restord!!! U can has helf poshun wif gold frum rewardz colum 2! And if ur lvl 10 or moar, u can has choiec 2 bcum heeler! Heelers can has heelin skilz!!!!! If ur partie has heelr, den u can has heelz from dem 2!! Lern moar by clikin \"Pawty\" in teh navigashun bar.",
    "faqQuestion5": "HOW 2 PLAY WIF FRIENDZ?",
-    "iosFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on quests, battle monsters, and cast skills to support each other. Go to Menu > Party and click \"Create New Party\" if you don't already have a Party. Then tap on the Members list, and tap Invite in the upper right-hand corner to invite your friends by entering their User ID (a string of numbers and letters that they can find under Settings > Account Details on the app, and Settings > API on the website). On the website, you can also invite friends via email, which we will add to the app in a future update.\n\nOn the website, you and your friends can also join Guilds, which are public chat rooms. Guilds will be added to the app in a future update!",
+    "iosFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on Quests, battle monsters, and cast skills to support each other.\n\nIf you want to start your own Party, go to Menu > [Party](https://habitica.com/party) and tap \"Create New Party\". Then scroll down and tap \"Invite a Member\" to invite your friends by entering their @username. If you want to join someone else’s Party, just give them your @username and they can invite you!\n\nYou and your friends can also join Guilds, which are public chat rooms that bring people together based on shared interests! There are a lot of helpful and fun communities, be sure to check them out.\n\nIf you’re feeling more competitive, you and your friends can create or join Challenges to take on a set of tasks. There are all sorts of public Challenges available that span a wide array of interests and goals. Some public Challenges will even award Gem prizes if you’re selected as the winner.",
    "androidFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on quests, battle monsters, and cast skills to support each other. Go to the [website](https://habitica.com/) to create one if you don't already have a Party. You can also join guilds together (Social > Guilds). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many guilds as you'd like, but only one party.\n\n For more detailed info, check out the wiki pages on [Parties](http://habitica.wikia.com/wiki/Party) and [Guilds](http://habitica.wikia.com/wiki/Guilds).",
    "webFaqAnswer5": "The best way is to invite them to a Party with you by clicking \"Party\" in the navigation bar! Parties can go on quests, battle monsters, and cast skills to support each other. You can also join Guilds together (click on \"Guilds\" in the navigation bar). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many Guilds as you'd like, but only one Party. For more detailed info, check out the wiki pages on [Parties](http://habitica.wikia.com/wiki/Party) and [Guilds](http://habitica.wikia.com/wiki/Guilds).",
    "faqQuestion6": "Haw meh git mownt or pet?",
-    "iosFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored in Menu > Items.\n\n To hatch a Pet, you'll need an egg and a hatching potion. Tap on the egg to determine the species you want to hatch, and select \"Hatch Egg.\" Then choose a hatching potion to determine its color! Go to Menu > Pets to equip your new Pet to your avatar by clicking on it. \n\n You can also grow your Pets into Mounts by feeding them under Menu > Pets. Tap on a Pet, and then select \"Feed Pet\"! You'll have to feed a pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.wikia.com/wiki/Food#Food_Preferences). Once you have a Mount, go to Menu > Mounts and tap on it to equip it to your avatar.\n\n You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
-    "androidFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored in Menu > Items.\n\n To hatch a Pet, you'll need an egg and a hatching potion. Tap on the egg to determine the species you want to hatch, and select \"Hatch with potion.\" Then choose a hatching potion to determine its color! To equip your new Pet, go to Menu > Stable > Pets, select a species, click on the desired Pet, and select \"Use\"(Your avatar doesn't update to reflect the change). \n\n You can also grow your Pets into Mounts by feeding them under Menu > Stable [ > Pets ]. Tap on a Pet, and then select \"Feed\"! You'll have to feed a pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.wikia.com/wiki/Food#Food_Preferences). To equip your Mount, go to Menu > Stable > Mounts, select a species, click on the desired Mount, and select \"Use\"(Your avatar doesn't update to reflect the change).\n\n You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
-    "webFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored under Inventory > Items. To hatch a Pet, you'll need an egg and a hatching potion. Once you have both an egg and a potion, go to Inventory > Stable to hatch your pet by clicking on its image. Once you've hatched a pet, you can equip it by clicking on it. You can also grow your Pets into Mounts by feeding them under Inventory > Stable. Drag a piece of food from the action bar at the bottom of the screen and drop it on a pet to feed it! You'll have to feed a Pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.wikia.com/wiki/Food#Food_Preferences). Once you have a Mount, click on it to equip it to your avatar. You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
+    "iosFaqAnswer6": "Every time you complete a task, you'll have a random chance at receiving an Egg, a Hatching Potion, or a piece of Pet Food. They will be stored in Menu > Items.\n\nTo hatch a Pet, you'll need an Egg and a Hatching Potion. Tap on the Egg to determine the species you want to hatch, and select \"Hatch Egg.\" Then choose a Hatching Potion to determine its color! Go to Menu > Pets and click your new Pet to equip it to your Avatar. \n\n You can also grow your Pets into Mounts by feeding them under Menu > Pets. Tap on a Pet, and select \"Feed Pet\"! You'll have to feed a Pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.fandom.com/wiki/Food#Food_Preferences). Once you have a Mount, go to Menu > Mounts and tap on it to equip it to your Avatar.\n\nYou can also get Eggs for Quest Pets by completing certain Quests (to learn more about Quests, see [How do I fight monsters and go on Quests](https://habitica.com/static/faq/#monsters-quests)).",
+    "androidFaqAnswer6": "Every time you complete a task, you'll have a random chance at receiving an Egg, a Hatching Potion, or a piece of Pet Food. They will be stored in Menu > Items.\n\nTo hatch a Pet, you'll need an Egg and a Hatching Potion. Tap on the Egg to determine the species you want to hatch, and select \"Hatch with Potion.\" Then choose a Hatching Potion to determine its color! To equip your new Pet, go to Menu > Stable > Pets, select a species, click on the desired Pet, and select \"Use\"(Your Avatar doesn't update to reflect the change). \n\n You can also grow your Pets into Mounts by feeding them under Menu > Stable [ > Pets ]. Tap on a Pet, and then select \"Feed\"! You'll have to feed a Pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.fandom.com/wiki/Food#Food_Preferences). To equip your Mount, go to Menu > Stable > Mounts, select a species, click on the desired Mount, and select \"Use\" (Your Avatar doesn't update to reflect the change).\n\n You can also get Eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
+    "webFaqAnswer6": "Every time you complete a task, you'll have a random chance at receiving an Egg, a Hatching Potion, or a piece of Pet Food. They will be stored under Inventory > Items. To hatch a Pet, you'll need an Egg and a Hatching Potion. Once you have both an Egg and a Hatching Potion, go to Inventory > Stable, and click on the image to hatch your Pet. Once you've hatched a Pet, you can equip it by clicking on it. You can also grow your Pets into Mounts by feeding them under Inventory > Stable. Drag a piece of Pet Food from the action bar at the bottom of the screen and drop it on a Pet to feed it! You'll have to feed a Pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.fandom.com/wiki/Food#Food_Preferences). Once you have a Mount, click on it to equip it to your Avatar. You can also get Eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)",
    "faqQuestion7": "HOW I CAN HAS WARRIOR KITTEH, WIZZARD, NINJA KITTEH OR DR TINYCAT CLAS??1!?!!?",
-    "iosFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click “Decide Later” and choose later under Menu > Choose Class.",
-    "androidFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click “Opt Out” and choose later under Menu > Choose Class.",
+    "iosFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can tap “Cancel” and choose later by opening the Menu, tapping the Settings icon, then tapping “Enable Class System”.",
+    "androidFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can tap “Opt Out” and choose later by opening the Menu, tapping the Settings icon, then tapping “Enable Class System”.",
    "webFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most Gold and find the most item drops, and they can help their party do the same. Finally, Healers can heal themselves and their party members. If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click \"Opt Out\" and re-enable it later under Settings.",
    "faqQuestion8": "What is the blue Stat bar that appears in the Header after level 10?",
-    "iosFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Use Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
-    "androidFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
-    "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in the action bar at the bottom of the screen. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
+    "iosFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Use Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To Do's, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
+    "androidFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To Do's, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
+    "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in the action bar at the bottom of the screen. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete good Habits, Dailies, and To Do's, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
    "faqQuestion9": "HOW TO FIGHT MONSTERZ N GO ON QWESTS?",
-    "iosFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
+    "iosFaqAnswer9": "First, you need to join or start a Party (see [How to play Habitica with my friends](https://habitica.com/static/faq#party-with-friends)). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
    "androidFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
    "webFaqAnswer9": "First, you need to join or start a Party by clicking \"Party\" in the navigation bar. Although you can battle monsters alone, we recommend playing in a group, because this will make quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating! Next, you need a Quest Scroll, which are stored under Inventory > Quests. There are four ways to get a scroll:\n * When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n * At level 15, you get a Quest-line, i.e., three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively.\n * You can buy Quests from the Quests Shop (Shops > Quests) for Gold and Gems.\n * When you check in to Habitica a certain number of times, you'll be rewarded with Quest Scrolls. You earn a Scroll during your 1st, 7th, 22nd, and 40th check-ins.\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading may be required to see the Boss's Health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
    "faqQuestion10": "HOW TO GET SPARKLY GEMZ? WUT R THEY?",
-    "iosFaqAnswer10": "Gems are purchased with real money by tapping on the Gem icon in the header. When people buy Gems, they are helping us to keep the site running. We're very grateful for their support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Social > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
-    "androidFaqAnswer10": "Gems are purchased with real money by tapping on the Gem icon in the header. When people buy Gems, they are helping us to keep the site running. We're very grateful for their support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Social > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
+    "iosFaqAnswer10": "Gems are purchased with real money from Menu > Purchase Gems. When you buy Gems, you are helping us to keep Habitica running. We’re very grateful for every bit of support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Menu > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
+    "androidFaqAnswer10": "Gems are purchased with real money from Menu > Purchase Gems. When you buy Gems, you are helping us to keep Habitica running. We’re very grateful for every bit of support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Menu > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
    "webFaqAnswer10": "Gems are purchased with real money, although [subscribers](https://habitica.com/user/settings/subscription) can purchase them with Gold. When people subscribe or buy Gems, they are helping us to keep the site running. We're very grateful for their support! In addition to buying Gems directly or becoming a subscriber, there are two other ways players can gain Gems:\n* Win a Challenge that has been set up by another player. Go to Challenges > Discover Challenges to join some.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica). Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the site without them!",
    "faqQuestion11": "How do I report a bug or request a feature?",
-    "iosFaqAnswer11": "You can report a bug, request a feature, or send feedback under Menu > About > Report a Bug and Menu > About > Send Feedback! We'll do everything we can to assist you.",
-    "androidFaqAnswer11": "You can report a bug, request a feature, or send feedback under About > Report a Bug and About > Send us Feedback! We'll do everything we can to assist you.",
+    "iosFaqAnswer11": "If you think you’ve encountered a bug, go to Menu > Support > Get Help to look for quick fixes, known issues, or to report the bug to us. We’ll do everything we can to assist you.\n\n To send feedback or request a feature, you can access our feedback form from Menu > Support > Submit Feedback. If we have any questions, we’ll reach out to you for more information!",
+    "androidFaqAnswer11": "If you think you’ve encountered a bug, go to Menu > Help & FAQ > Get Help to look for quick fixes, known issues, or to report the bug to us. We’ll do everything we can to assist you.\n\n To send feedback or request a feature, you can access our feedback form from Menu > Help & FAQ > Submit Feedback. If we have any questions, we’ll reach out to you for more information!",
    "webFaqAnswer11": "2 report a bug, go 2 [Help > Report a Bug](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) an reed teh pointz on top of teh chat box. If u cant log in 2 Habitica, send ur login deetz (not ur passwerd!! no!!!!) 2 [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Dun worrie, ull b al fixed up soon! Feechur rekwestz r colectd thru a Google form. Go to [Help > Request a Feature](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) and follow teh instrukshunz. WOOT!",
    "faqQuestion12": "How do I battle a World Boss?",
    "iosFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.",
--- a/website/common/locales/en@lolcat/limited.json
+++ b/website/common/locales/en@lolcat/limited.json
@@ -146,6 +146,6 @@
    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
    "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
    "discountBundle": "bundle",
-    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Announcement": "<strong>Gift a subscription and get a subscription free</strong> event going on now!",
    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }
--- a/website/common/locales/en@lolcat/subscriber.json
+++ b/website/common/locales/en@lolcat/subscriber.json
@@ -120,7 +120,7 @@
    "choosePaymentMethod": "Choose your payment method",
    "buyGemsSupportsDevs": "Purchasing Gems supports the developers and helps keep Habitica running",
    "support": "SUPPORT",
-    "gemBenefitLeadin": "Gems allow you to buy fun extras for your account, including:",
+    "gemBenefitLeadin": "What can you buy with gems?",
    "gemBenefit1": "Unique and fashionable costumes for your avatar.",
    "gemBenefit2": "Backgrounds to immerse your avatar in the world of Habitica!",
    "gemBenefit3": "Exciting Quest chains that drop pet eggs.",
--- a/website/common/locales/en@pirate/achievements.json
+++ b/website/common/locales/en@pirate/achievements.json
@@ -97,7 +97,7 @@
    "achievementSkeletonCrewText": "'As tamed all Skelet'n Steeds.",
    "achievementSkeletonCrew": "Skelet'n Crew",
    "achievementBoneCollectorText": "'As collected all Skelet'n Critters.",
-    "achievementSeeingRedText": "Has collected all o' dem scarlet fiends.",
+    "achievementSeeingRedText": "'as collected all Scarlet Critters.",
    "achievementRedLetterDayText": "Has tamed all scarlet steeds.",
    "achievementRedLetterDayModalText": "Yer tam'd all dem red steeds!",
    "achievementRedLetterDay": "Scarlet lett'r day",
--- a/website/common/locales/en@pirate/backgrounds.json
+++ b/website/common/locales/en@pirate/backgrounds.json
@@ -10,10 +10,10 @@
    "backgroundFairyRingText": "Faerie Ring",
    "backgroundFairyRingNotes": "Dance a jig in a Faerie Ring.",
    "backgroundForestText": "Forest",
-    "backgroundForestNotes": "Ya get t' stroll through a summer forest.",
+    "backgroundForestNotes": "Ye get t' stroll through a summer forest.",
    "backgrounds072014": "SET 2: Releas'd July 2014",
    "backgroundCoralReefText": "Coral Reef",
-    "backgroundCoralReefNotes": "Ya get t' swim in a coral reef.",
+    "backgroundCoralReefNotes": "Ye get t' swim in a coral reef.",
    "backgroundOpenWatersText": "Open Waters",
    "backgroundOpenWatersNotes": "Enjoy t' open waters.",
    "backgroundSeafarerShipText": "Ya prob'ly want this Seafarer Ship",
@@ -485,7 +485,7 @@
    "backgroundDesertWithSnowText": "Yon Snowy Desert",
    "backgroundBirthdayPartyNotes": "Celebrate th' Birfday Parrrty o' yer fav'rite Habitican.",
    "backgroundBirthdayPartyText": "Birfday Parrrty",
-    "backgrounds012020": "SET 68: Releas'd January o'2020",
+    "backgrounds012020": "SET 68: Releas'd January 2020",
    "backgroundWinterNocturneNotes": "Bask in th' starlight o' a Winter Night Scene.",
    "backgroundWinterNocturneText": "Winter Night's Scene",
    "backgroundHolidayWreathNotes": "Festoon yer avatar wiv a sweet-smellin' 'Oliday Wreath.",
@@ -576,5 +576,12 @@
    "backgroundHolidayHearthNotes": "Relax, warm up, an' dry off beside a Holiday Hearth.",
    "backgroundHolidayHearthText": "Holiday Hearth",
    "backgroundGingerbreadHouseNotes": "Take in th' sights, scents, an' (if ye dare) flavors o' a Gingerbread House.",
-    "backgroundGingerbreadHouseText": "Ging'rbread House"
+    "backgroundGingerbreadHouseText": "Ging'rbread House",
+    "backgroundWintryCastleText": "Wintry Castle",
+    "backgroundIcicleBridgeText": "Icicle Bridge",
+    "backgroundHotSpringNotes": "Melt away ye worries with a dip in a Hot Spring.",
+    "backgroundHotSpringText": "Hot Spring",
+    "backgrounds012021": "SET 80: Releas'd January 2021",
+    "backgroundWintryCastleNotes": "Witness a Wintry Castle through th' chilly mists.",
+    "backgroundIcicleBridgeNotes": "Cross yon Icicle Bridge with care."
 }
--- a/website/common/locales/en@pirate/challenge.json
+++ b/website/common/locales/en@pirate/challenge.json
@@ -44,7 +44,7 @@
    "congratulations": "Congratulations!",
    "hurray": "Hurray!",
    "noChallengeOwner": "no owner",
-    "challengeMemberNotFound": "User not found among challenge's members",
+    "challengeMemberNotFound": "Pirate not found among challenge's members",
    "onlyGroupLeaderChal": "Only the crew captain can create challenges",
    "tavChalsMinPrize": "Prize must be at least 1 Gem fer Public Challenges.",
    "cantAfford": "Ye can't afford this prize. Purchase more sapphires or lower the prize amount.",
@@ -55,7 +55,7 @@
    "onlyLeaderUpdateChal": "Only th' challenge leader can update it.",
    "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part o' th' challenge.",
    "onlyChalLeaderEditTasks": "Tasks belonging t' a challenge can only be edited by th' captain.",
-    "userAlreadyInChallenge": "User is already participatin' in this challenge.",
+    "userAlreadyInChallenge": "Pirate already be participatin' in this challenge.",
    "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked.",
    "joinedChallenge": "Join'd a Challenge",
    "joinedChallengeText": "T'is user put themself to th' test by joinin' a Challenge!",
--- a/website/common/locales/en@pirate/communityguidelines.json
+++ b/website/common/locales/en@pirate/communityguidelines.json
@@ -1,19 +1,19 @@
 {
-    "tavernCommunityGuidelinesPlaceholder": "Friendly reminder: this be an all-ages chat, so please keep content an' language appropriate! Consult th' Rules o' th' Sea in th' sidebar if ye have questions.",
-    "lastUpdated": "Last updated:",
+    "tavernCommunityGuidelinesPlaceholder": "Friendly reminder: this be an all-ages chat, so please keep content an' language appropriate! Consult th' Code o' Conduct in th' sidebar if ye 'ave questions.",
+    "lastUpdated": "Last updat'd:",
    "commGuideHeadingWelcome": "Welcome t' Habitica!",
-    "commGuidePara001": "Greetings, me adventurin' lad! Welcome t' Habitica, the land of productivity, healthy living, and yer occasional rampaging gryphon. We've a cheerful community full o' helpful people supporting each o'er on 'eir way t' self-improvement. T' fit in, all it takes is a positive attitude, a respectful manner, and the understanding that ev'ryone has diff'rent skills and limitations -- including you! Habiticans are patient with one another and try t' help whenever they can.",
-    "commGuidePara002": "T' help keep ev'ryone safe, happy, and productive in the community, we do have some guidelines. We've carefully crafted 'em t' make 'em as friendly and easy-t'-read as possible. Please take yer time t' read 'em before ya start chattin'.",
+    "commGuidePara001": "Greetin's, me adventurin' lad! Welcome t' Habitica, th' land o' productivity, healthy livin', an' yer occasional rampagin' gryphon. We've a cheerful community full o' helpful people supportin' each oth'r on their way t' self-improvem'nt. T' fit in, all it takes be a positive attitude, a respectful mann'r, an' th' understanding that ev'ryone has diff'rent skills an' limitations -- including ye! Habiticans be patient wit' one anoth'r an' try t' help whenev'r they can.",
+    "commGuidePara002": "T' help keep ev'ryone safe, happy, an' productive in th' community, we do 'ave some guidelines. We've carefully craft'd 'em t' make 'em as friendly an' easy-t'-read as possible. Please take yer time t' read 'em before ye start chattin'.",
    "commGuidePara003": "These rules be applyin' t' all o' our hideouts: Trello, GitHub, Weblate, th' Wikia (wiki) an' any others ye may come across. Sometimes, unforeseen situations may arise, like storms erupt or the sailin' bein' rough. When this happens, th' mods may respond by editin' th' guidelines t' keep ye and yer crew safe from new threats. Be not afraid, me hearties, ye'll be told by Cap'n Bailey if the guidelines be changin'.",
    "commGuidePara004": "Now hoist the sails and keep yer eyes peeled fer treasure; we're settin' sail!",
    "commGuideHeadingInteractions": "Int'ractions in Habitica",
    "commGuidePara015": "Habitica has two kinds o' social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, Party chat, and Private Messages. All Displayed Pirate Names must comply with the public space guidelines. T' change yer Display Name, go on yer website to User > Profile and click on the \"Edit\" button.",
    "commGuidePara016": "When navigating ther' rough seas in Habitica, some landlubber guidelines to seek out ye shold abide by so yer don't go gettin' sea sick on me boat. These be adventures ye will fancy!",
-    "commGuideList02A": "<strong>Ay you thar! Respect ye fellow pirates</strong>. Be courteous, kind, friendly, and helpful. Remember: Habiticans come from many diff'rent seas and have had many diff'rent journeys. This be a part o' what makes Habitica so cool! Building a community means respecting and celebrating our diff'rences as well as our similarities. Here be some easy ways to respect your fellow pirates:",
-    "commGuideList02B": "<strong>Ya landlubber! Beware the <a href='/static/terms' target='_blank'>Terms and Conditions</a></strong> ya must follow 'em.",
-    "commGuideList02C": "<strong>Don't post images or text that's violent, threatening, or sexually explicit/suggestive, or that promote discrimination, bigotry, racism, sexism, hatred, harassment or harm against any other pirate or pirate band</strong>. Not even as a joke. This here includes slurs as well as statements. Not ev'ry pirate has the same sense o' humor, and so somethin' that ye consider a joke may be hurtful to another pirate. Attack your Dailies (and other sea monsters), not other pirates.",
+    "commGuideList02A": "<strong>Respect ye fellow pirates</strong>. Be courteous, kind, friendly, an' helpful. Rememb'r: Habiticans come from many diff'rent seas an' 'ave had many diff'rent journeys. This be a part o' what makes Habitica so cool! Buildin' a community means respectin' an' celebratin' our diff'rences as well as our similarities. Here be some easy ways t' respect yer fellow pirates:",
+    "commGuideList02B": "<strong>Ye landlubber! Beware th' <a href='/static/terms' target='_blank'>Terms an' Conditions</a></strong>.",
+    "commGuideList02C": "<strong>Don't post images or text that be violent, threatenin', or sexually explicit/suggestive, or that promote discrimination, bigotry, racism, sexism, hatred, harassment or harm against any other pirate or pirate band</strong>. Not even as a joke. This here includes slurs as well as statements. Not ev'ry pirate has th' same sense o' humor, an' so somethin' that ye consider a joke may be hurtful t' anoth'r pirate. Attack yer Dailies (an' other sea monsters), not other pirates.",
    "commGuideList02D": "<strong>Keep yer discussions appropriate for all ages</strong>. There be many young Habiticans who ride the boat of Habitica! Let's not tarnish them innocent pirates or hinder any Habiticans in their goals.",
-    "commGuideList02E": "<strong>Avoid profanity. This be including milder, religious-based oaths that may be acceptable in other seas</strong>. We have people from all religious, cultural backgrounds, and pirate bands, and we want t' make sure that all o' 'em feel comfortable on public decks. <strong>If there be a moderator or staff member that tells ya that a term is disallowed on Habitica, even if it's a term that ya did'nt realize was problematic, that decision is final</strong>. Additionally, slurs'll be dealt with very severely, as they also be a violation o' the Terms of Service.",
+    "commGuideList02E": "<strong>Avoid profanity. This be including milder, religious-based oaths that may be acceptable in oth'r seas</strong>. We 'ave people from all religious, cultural ba'groun's, an' we want t' make sure that all o' 'em feel comfortable on public decks. <strong>If there be a moderator or staff member that tells ye that a term is disallow'd on Habitica, even if it's a term that ye did not realize was problematic, that decision is final</strong>. Additionally, slurs'll be dealt wit' very severely, as they also be a violation o' th' Terms of Service.",
    "commGuideList02F": "<strong>Avoid them long, extended discussions of divisive topics in yer Tavern and where it'd be off-topic</strong>. If ya feel tha' someone's said somethin' rude or hurtful, don't engage 'em. If someone mentions somethin' that's allowed by the guidelines but which's hurtful t' ya, it’s okay t' politely let someone know tha'. If it's against them guidelines or those Terms o' Service, ya should flag it and let yer fellow mod respond. When in doubt, flag the post.",
    "commGuideList02G": "<strong>Comply immediately with any of them Mod requests</strong>. This could include, but's no' limited ter, requesting ya limit yer posts in a particular ocean, editing yer profile t' remove unsuitable content, asking ya t' move yer discussion t' a more suitable space, etc.",
    "commGuideList02H": "<strong>Take some o' yer time t' reflect instead o' respondin' in anger</strong> if someone tells ya that somethin' ya said or did made 'em be uncomfortable. There's great pirate strength in bein' able t' sincerely apologize t' someone. If ya feel that the way they responded t' ya was inappropriate, contact a mod rather than callin' 'em out on it publicly.",
@@ -22,7 +22,7 @@
    "commGuideList02K": "<strong>Avoid postin' large header text in them public chat spaces, particularly in yer Tavern</strong>. Much like ALL CAPS, it reads as 'ough ya were yellin', and interferes with the comfortable atmosphere.",
    "commGuideList02L": "<strong>We 'ighly discourage the exchange of pers'nal info -- particularly info tha' can be used t' identify ya -- in public chat spaces</strong>. Identifyin' info can include but's no' lim'ted ter: yer address, yer email address, and yer API token/password. This be fer yer safety! Staff or moderators may remove such posts at their discretion. If ye be asked fer personal info in a private Guild, Party, or PM, we 'ighly recommend tha' ya politely refuse and alert the staff and moderators by either 1) flagging the message if it's in a Party or private Guild, or 2) filling ou' the <a href='https://contact.habitica.com/' target='_blank'>Moderator Contact Form</a> and includin' screenshots.",
    "commGuidePara019": "<strong>In private spaces</strong>, users've more freedom t' discuss whatev'r topics they'd like, but they still may not vi'late them Terms an' Conditions, includin' postin' slurs or any of that discriminatory, violent, or threatenin' 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.",
-    "commGuidePara020": "<strong>Private Mess'ges (PMs)</strong> have some additional guidelines. If someone's blocked ya, don't contact 'em elsewhere t' ask 'em t' unblock ya. Additionally, ya shouldn't send PMs t' someone askin' fer support (since public answers t' support questions are helpful t' the community). Fin'lly, don't send anyone PMs beggin' fer a gift o' gems or a subscription, as this can be considered spammin'.",
+    "commGuidePara020": "<strong>Private Messages (PMs)</strong> 'ave some additional guidelines. If someone's blocked ye, don't contact 'em elsewhere t' ask 'em t' unblock ye. Additionally, ye shouldn't send PMs t' someone askin' fer support (since public answers t' support questions be helpful t' th' community). Finally, don't send anyone PMs beggin' fer a gift o' gems or a subscr'ption, as this can be considered spammin'.",
    "commGuidePara020A": "<strong>If ye see a post or private message that ye believe be in violation o' th' public space guidelines outlin'd above, or if ye see a post or private message that concerns ye or makes ye uncomfortable, ye can brin' it t' th' attention o' Moderators an' Staff by clickin' th' flag icon t' report it</strong>. A Staff member or Moderator will respond t' th' situation as soon as possible. Please note that intentionally reportin' innocent posts be an infraction o' these Guidelines (see below in “Infractions”). Ye can also contact th' Mods via th' form on th' “Contact Us” page, which ye can also access via th' help menu by clickin' “<a href='https://contact.habitica.com/' target='_blank'>Contact th' Moderation Team</a>.” Ye may want t' do this if there are multiple problematic posts by th' same person in different Guilds, or if th' situation requires some explanation. Ye may contact us in yer native language if that be easier fer ye: we may have t' use Google Translate, but we want ye t' feel comfortable about contactin' us if ye have a problem.",
    "commGuidePara021": "Some gatherin' places in Habitica abide by more guideline scrolls.",
    "commGuideHeadingTavern": "Yer Tavern",
--- a/website/common/locales/en@pirate/content.json
+++ b/website/common/locales/en@pirate/content.json
@@ -4,7 +4,7 @@
    "armoireText": "Enchanted Chest",
    "armoireNotesFull": "Open th' Chest t' randomly receive special Equipment, Experience, or food! Wardrobe pieces remaining:",
    "armoireLastItem": "Ye've found th' last piece o' rare Equipment in th' Enchanted Chest.",
-    "armoireNotesEmpty": "Th' Chest 'll have new Equipment in th' first week o' ev'ry month. 'Til then, keep clickin' for Experience an' Critter Vittles!",
+    "armoireNotesEmpty": "Th' Chest will 'ave new Equipment in th' first week o' ev'ry month. 'Til then, keep clickin' fer Experience an' Critter Vittles!",
    "dropEggWolfText": "Wolf",
    "dropEggWolfMountText": "Wolf",
    "dropEggWolfAdjective": "a loyal",
--- a/website/common/locales/en@pirate/contrib.json
+++ b/website/common/locales/en@pirate/contrib.json
@@ -35,8 +35,8 @@
    "rewardUser": "Reward User",
    "UUID": "User ID",
    "loadUser": "Load User",
-    "noAdminAccess": "Ye don't have admin access.",
-    "userNotFound": "User not found.",
+    "noAdminAccess": "Ye don't 'ave admin access.",
+    "userNotFound": "Pirate not found.",
    "invalidUUID": "UUID must be valid",
    "title": "Title",
    "moreDetails": "More details (1-7)",
--- a/website/common/locales/en@pirate/front.json
+++ b/website/common/locales/en@pirate/front.json
@@ -73,7 +73,7 @@
    "pkAnswer4": "If ye skip one o' yer daily goals, yer avatar will lose health th' followin' day. This serves as an important motivatin' factor t' encourage people t' follow through wit' their goals because people  really hate hurtin' their little avatar! Plus, th' social accountability be critical fer a lot o' people: if ye’re fightin' a monster wit' yer friends, skippin' yer tasks hurts their avatars, too.",
    "pkQuestion5": "What distinguishes Habitica from other gamification programs?",
    "pkAnswer5": "One o' th' ways that Habitica has been most successful at usin' gamification be that we've put a lot o' effort into thinkin' about th' game aspects t' ensure that they actually be fun. We've also includ'd many social components, because we feel that some o' th' most motivatin' games let ye play wit' friends, an' because research has shown that it's easier t' form habits when ye have accountability t' other people.",
-    "pkQuestion6": "Who be th' typical user o' Habitica?",
+    "pkQuestion6": "Who be th' typical pirate o' Habitica?",
    "pkAnswer6": "Lots o' different people use Habitica! More than half o' our users be ages 18 t' 34, but we have grandparents usin' th' site wit' their young grandkids an' ev'ry age in-between. Often families will join a party an' battle monsters together. <br /> Many o' our users have a background in games, but surprisin'ly, when we ran a survey a while back, 40% o' our users identifi'd as non-gamers! So it looks like our method can be effective fer anyone who wants productivity an' wellness t' feel more fun.",
    "pkQuestion7": "Why does Habitica use pixel art?",
    "pkAnswer7": "Habitica uses pixel art fer several reasons. In addition t' th' fun nostalgia factor, pixel art be very approachable t' our volunteer artists who want t' chip in. 'Tis much easier t' keep our pixel art consistent even when lots o' different artists contribute, an' it lets us quickly generate a ton o' new content!",
--- a/website/common/locales/en@pirate/gear.json
+++ b/website/common/locales/en@pirate/gear.json
@@ -9,9 +9,9 @@
    "mysterySets": "Hidd'n Treasure Sets",
    "gearNotOwned": "Ye do not own this item.",
    "noGearItemsOfType": "Ye don't own any o' these.",
-    "noGearItemsOfClass": "Ye already 'ave all yer class equipment! More will be released during th' Grand Galas, near th' solstices n' equinoxes.",
-    "classLockedItem": "This item be only available t' a specific type o' deckhand. Once ye be 10'r more, ye can change yer type under th' User icon > Settin's > Character Build!",
-    "tierLockedItem": "This item be only available once ye've purchased th' previous items in sequence. Keep workin' yer way up!",
+    "noGearItemsOfClass": "Ye already 'ave all yer class equipment! More will be releas'd durin' th' Grand Galas, near th' solstices an' equinoxes.",
+    "classLockedItem": "This item only be available t' a specific type o' class. Once ye be 10 or above, ye can change yer type under th' User icon > Settin's > Character Build!",
+    "tierLockedItem": "This item only be available once ye've purchased th' previous items in sequence. Keep workin' yer way up!",
    "sortByType": "Type",
    "sortByPrice": "Pieces o' eight needed",
    "sortByCon": "CON",
@@ -279,7 +279,7 @@
    "weaponSpecialWinter2019WarriorText": "Snowflake Halberd",
    "weaponSpecialWinter2019WarriorNotes": "This snowflake was grown, ice crystal by ice crystal, into a diamond-hard blade! Increases Strength by <%= str %>. Limited Edition 2018-2019 Winter Gear.",
    "weaponSpecialWinter2019MageText": "Fiery Dragon Staff",
-    "weaponSpecialWinter2019MageNotes": "Watch out! This explosive staff be ready t' 'elp you take on anyone. Raises yer Intelligence by <%= int %> an' Perception by <%= per %>. Limited Edition 2018-2019 Winter Gear",
+    "weaponSpecialWinter2019MageNotes": "Watch out! This explosive staff be ready t' help ye take on anyone. Raises yer Intelligence by <%= int %> an' Perception by <%= per %>. Limited Edition 2018-2019 Wint'r Gear.",
    "weaponSpecialWinter2019HealerText": "Wand of Winter",
    "weaponSpecialWinter2019HealerNotes": "Winter can be a time of rest and healing, and so this wand of winter magic can help to soothe the most grievous hurts. Increases Intelligence by <%= int %>. Limited Edition 2018-2019 Winter Gear.",
    "weaponMystery201411Text": "Pitchfork o' Feasting",
@@ -353,7 +353,7 @@
    "weaponArmoireWeaversCombText": "Weaver's Comb",
    "weaponArmoireWeaversCombNotes": "Use this comb to pack your weft threads together to make a tightly woven fabric. Increases Perception by <%= per %> and Strength by <%= str %>. Enchanted Armoire: Weaver Set (Item 2 of 3).",
    "weaponArmoireLamplighterText": "Lamplighter",
-    "weaponArmoireLamplighterNotes": "This long pole has a wick on one end fer lightin' lamps, an' a hook on th' other end fer puttin' 'em out. Increases Constitution by <%= con %> an' Perception by <%= per %>. Enchanted Armoire: Lamplighter's Set (Item 1 o' 4)",
+    "weaponArmoireLamplighterNotes": "This long pole has a wick on one end fer lightin' lamps, an' a hook on th' other end fer puttin' 'em out. Increases Constitution by <%= con %> an' Perception by <%= per %>. Enchanted Armoire: Lamplighter's Set (Item 1 o' 4).",
    "weaponArmoireCoachDriversWhipText": "Coach Driver's Whip",
    "weaponArmoireCoachDriversWhipNotes": "Your steeds know what they're doing, so this whip is just for show (and the neat snapping sound!). Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Coach Driver Set (Item 3 of 3).",
    "weaponArmoireScepterOfDiamondsText": "Scepter of Diamonds",
@@ -893,7 +893,7 @@
    "headSpecialKabutoText": "Kabuto",
    "headSpecialKabutoNotes": "This helm is functional and beautiful! Your enemies will become distracted admiring it. Increases Intelligence by <%= int %>.",
    "headSpecialNamingDay2017Text": "Royal Purple Gryphon Helm",
-    "headSpecialNamingDay2017Notes": "Happy Naming Day! Wear this fierce n' feathery helm as ye celebrate Habitica. It don't benefit ye.",
+    "headSpecialNamingDay2017Notes": "Happy Namin' Day! Wear this fierce an' feathery helm as ye celebrate Habitica. It don't benefit ye.",
    "headSpecialTurkeyHelmBaseText": "Turkey Helm",
    "headSpecialTurkeyHelmBaseNotes": "Yer Turkey Day look will be complete when ye don this beaked helm! It don't benefit ye.",
    "headSpecialTurkeyHelmGildedText": "Gilded Turkey Helm",
@@ -1600,9 +1600,9 @@
    "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
    "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! It don't benefit ye. Limited Edition 2015 Summer Gear.",
    "bodySpecialNamingDay2018Text": "Royal Purple Gryphon Cloak",
-    "bodySpecialNamingDay2018Notes": "Happy Naming Day! Wear this fancy n' feathery cloak as ye celebrate Habitica. It don't benefit ye.",
-    "bodyMystery201705Text": "Folded Feathered Fighter Wings",
-    "bodyMystery201705Notes": "These folded win's don't jus' look smart: they will give ye th' speed 'n agility o' a gryphon! It don't benefit ye. May 2017 Subscriber Item.",
+    "bodySpecialNamingDay2018Notes": "Happy Namin' Day! Wear this fancy an' feath'ry cloak as ye celebrate Habitica. It don't benefit ye.",
+    "bodyMystery201705Text": "Fold'd Feather'd Fighter Wings",
+    "bodyMystery201705Notes": "These fold'd wings don't jus' look smart: they will give ye th' speed an' agility o' a gryphon! It don't benefit ye. May 2017 Subscriber Item.",
    "bodyMystery201706Text": "Ragged Corsair's Cloak",
    "bodyMystery201706Notes": "This cloak has secret pockets t' hide all th' Gold ye loot from yer Tasks. It don't benefit ye. June 2017 Subscriber Item.",
    "bodyMystery201711Text": "Carpet Rider Scarf",
@@ -2261,5 +2261,19 @@
    "weaponSpecialWinter2021WarriorNotes": "Ye can reel in th' big one usin' this! Increases Strength by <%= str %>. Limited Edition 2020-2021 Wint'r Gear.",
    "weaponSpecialWinter2021RogueNotes": "Both disguise an' weap'n, this holly flail will help ye handle th' tough'st tasks. Increases Strength by <%= str %>. Limited Edition 2020-2021 Winter Gear.",
    "weaponSpecialWinter2021WarriorText": "Mighty Fishin' Rod",
-    "weaponSpecialWinter2021RogueText": "Holly Berry Flail"
+    "weaponSpecialWinter2021RogueText": "Holly Berry Flail",
+    "weaponArmoireBlueMoonSaiNotes": "This sai be a traditional weapon, imbued with th' powers o' the dark side o' th' moon. Increases Strength by <%= str %>. Enchanted Armoire: Blue Moon Scalawag Set (item 1 of 4).",
+    "shieldArmoireBlueMoonSaiNotes": "This sai be a traditional weapon, imbued with th' powers o' the light side o' the moon. Increases Perception by <%= per %>. Enchanted Armoire: Blue Moon Scalawag Set (item 3 of 4).",
+    "shieldArmoireBlueMoonSaiText": "Light Lunar Sai",
+    "headArmoireBlueMoonHelmNotes": "This helm be offerin' an astonishing amount o' luck to its wearer, and exceptional events be followin' its use. Increases Intelligence by <%= int %>. Enchanted Armoire: Blue Moon Scalawag Set (item 3 of 4).",
+    "headArmoireBlueMoonHelmText": "Blue Moon Helm",
+    "headMystery202101Notes": "The icy blue eyes on this feline helm will freeze even the most intimidatin' task on yer list. It don't benefit ye. January 2021 Subscriber Item.",
+    "headMystery202101Text": "Snazzy Snow Leopard Helm",
+    "armorArmoireBlueMoonShozokuNotes": "A strange serenity be surroundin' the wearer of this armor. Increases Constitution by <%= con %>. Enchanted Armoire: Blue Moon Scalawag Set (item 4 of 4).",
+    "armorArmoireBlueMoonShozokuText": "Blue Moon Armor",
+    "armorMystery202101Notes": "Wrap yerself in warm fur and nearly endless tail floof! It don't benefit ye. January 2021 Subscriber Item.",
+    "armorMystery202101Text": "Snazzy Snow Leopard Suit",
+    "weaponArmoireBlueMoonSaiText": "Dark Lunar Sai",
+    "headSpecialNye2020Notes": "Ye've receiv'd an Extravagant Party Hat! Wear it with pride while ye be ringing in the New Year! It don't benefit ye.",
+    "headSpecialNye2020Text": "Extravagant Party Hat"
 }
--- a/website/common/locales/en@pirate/groups.json
+++ b/website/common/locales/en@pirate/groups.json
@@ -20,9 +20,9 @@
    "requestAF": "Request a Feature",
    "dataTool": "Data Display Tool",
    "resources": "Resources",
-    "communityGuidelines": "Rules o' th' Sea",
+    "communityGuidelines": "Code o' Conduct",
    "bannedWordUsed": "Avast! Looks like this post contains a curse word, religious oath, or reference to somethin’ like rum or adult topic (<%= swearWordsUsed %>). Habitica has users from all backgrounds, so we keep our chat very clean. Feel free t’ edit yer message so ye can post it!",
-    "bannedSlurUsed": "Yer post contained inappropriate language, and yer chat privileges have been revoked.",
+    "bannedSlurUsed": "Yer post contain'd inappropriate language, an' yer chat priv'leges 'ave been revok'd.",
    "party": "Crew",
    "usernameCopied": "Seaname copied t' clipboard.",
    "createGroupPlan": "Create",
@@ -99,8 +99,8 @@
    "badAmountOfGemsToSend": "Amount must be within 1 'n yer current number o' sapphires.",
    "report": "Report",
    "abuseFlagModalHeading": "Report a Violation",
-    "abuseFlagModalBody": "Are ye sure ye wants t' report this post? Ye should <strong>only</strong> report a post tha' violates th' <%= firstLinkStart %>Community Guidelines<%= linkEnd %> 'n/or <%= secondLinkStart %>Terms o' Service<%= linkEnd %>. Inappropriately reportin' a post be a violation o' th' Rules o' th' Sea 'n may give ye an infraction.",
-    "abuseReported": "Thank ye for reportin' this violation. Th' moderators have been notified.",
+    "abuseFlagModalBody": "Are ye sure ye wants t' report this post? Ye should <strong>only</strong> report a post tha' violates th' <%= firstLinkStart %>Community Guidelines<%= linkEnd %> an'/or <%= secondLinkStart %>Terms o' Service<%= linkEnd %>. Inappropriately reportin' a post be a violation o' th' Code o' Conduct an' may give ye an infraction.",
+    "abuseReported": "Thank ye fer reportin' this violation. Th' moderators have been notified.",
    "whyReportingPost": "Why are ye reportin' this post?",
    "whyReportingPostPlaceholder": "Help our moderators by lettin' us know why ye be reportin' this post fer a violation, e.g., spam, swearin', religious oaths, bigotry, slurs, adult topics, violence.",
    "optional": "Optional",
@@ -126,7 +126,7 @@
    "sendGiftPurchase": "Purchase",
    "sendGiftMessagePlaceholder": "Personal message (optional)",
    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD",
-    "gemGiftsAreOptional": "Note that Habitica will ne'er require ye t' gift sapphires t' other pirates. Beggin' pirates fer sapphires be a <strong>violation o' th' Rules o' th' Sea</strong>, 'n all such instances best be reported t' <%= hrefTechAssistanceEmail %>.",
+    "gemGiftsAreOptional": "Note that Habitica will ne'er require ye t' gift sapphires t' other pirates. Beggin' pirates fer sapphires be a <strong>violation o' th' Code o' Conduct</strong>, an' all such instances best be reported t' <%= hrefTechAssistanceEmail %>.",
    "battleWithFriends": "Battle Beasts Wit' Mates",
    "startAParty": "Form a Crew",
    "partyUpName": "Crew Aloft",
@@ -232,7 +232,7 @@
    "inviteToGuild": "Invite t' Fleet",
    "inviteToParty": "Invite to Party",
    "inviteEmailUsername": "Invite via Email or Username",
-    "inviteEmailUsernameInfo": "Invite users via a valid email or username. If an email isn't registered yet, we'll invite them to join.",
+    "inviteEmailUsernameInfo": "Recruit pirates via a valid email or username. If an email isn't registered yet, we'll invite 'em t' join.",
    "emailOrUsernameInvite": "Email address or username",
    "messageGuildLeader": "Message Fleet Leader",
    "donateGems": "Donate Gems",
@@ -324,7 +324,7 @@
    "thisGroupInviteOnly": "This group is invitation only.",
    "gettingStarted": "Getting Started",
    "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
-    "whatsIncludedGroup": "What's included in the subscription",
+    "whatsIncludedGroup": "What's includ'd in th' subscr'ption",
    "whatsIncludedGroupDesc": "All members of the Group receive full subscription benefits, including the monthly subscriber items, the ability to buy Gems with Gold, and the Royal Purple Jackalope mount, which is exclusive to users with a Group Plan membership.",
    "howDoesBillingWork": "How does billing work?",
    "howDoesBillingWorkDesc": "Group Leaders are billed based on group member count on a monthly basis. This charge includes the $9 (USD) price for the Group Leader subscription, plus $3 USD for each additional group member. For example: A group of four users will cost $18 USD/month, as the group consists of 1 Group Leader + 3 group members.",
--- a/website/common/locales/en@pirate/limited.json
+++ b/website/common/locales/en@pirate/limited.json
@@ -11,7 +11,7 @@
    "valentineCardExplanation": "For endurin' such a saccharine poem, ye both receive th' \"Adorin' Friends\" badge!",
    "valentineCardNotes": "Send a Valentine's Day card to a crew mate.",
    "valentine0": "\"Roses be red\n\nMe Dailies be blue\n\n'Tis happy I be \n\nT'a be in yer Crew!\"",
-    "valentine1": "\"Roses be red\n\nViolets be nice\n\nLet's get together\n\nAn' fight against Vice!\"",
+    "valentine1": "\"Roses be red\n\nViolets be nice\n\nLet's get togeth'r\n\nAn' fight against Vice!\"",
    "valentine2": "\"Roses be red\n\nThis poem style be old\n\nI hope that ye like this\n\n'Cause it cost ten Gold.\"",
    "valentine3": "\"Roses be red\n\nSome Drakes be icy\n\nNo treasure be better\n\nThan time spent wit' ye!\"",
    "valentineCardAchievementTitle": "Adorin' Friends",
--- a/website/common/locales/en@pirate/messages.json
+++ b/website/common/locales/en@pirate/messages.json
@@ -49,7 +49,7 @@
    "notificationsRequired": "Notification ids are required.",
    "unallocatedStatsPoints": "Ye've <span class=\"notification-bold-blue\"><%= points %> unallocated Stat Points</span>",
    "beginningOfConversation": "This is th' beginning o' yer conversation with <%= userName %>.",
-    "messageDeletedUser": "Sorry, this user has deleted their account.",
+    "messageDeletedUser": "Sorry, this pirate has deleted their account.",
    "messageMissingDisplayName": "Missin' display name.",
    "reportedMessage": "Ye 'ave reported this message t' fleet captains.",
    "canDeleteNow": "Ye can now scuttle th' message if ye wish.",
--- a/website/common/locales/en@pirate/noscript.json
+++ b/website/common/locales/en@pirate/noscript.json
@@ -1,6 +1,4 @@
 {
-   
-    "jsDisabledHeadingFull": "Alas! Yer browser don't have JavaScript enabled an' wi'out it, Habitica can't be workin' properly",
-   
+    "jsDisabledHeadingFull": "Alas! Yer browser don't 'ave JavaScript enabled an' wit'out it, Habitica can't be workin' prop'rly",
    "jsDisabledLink": "Please enable JavaScript t' continue!"
-}
+}
--- a/website/common/locales/en@pirate/npc.json
+++ b/website/common/locales/en@pirate/npc.json
@@ -14,8 +14,8 @@
    "next": "Next",
    "randomize": "Randomize",
    "mattBoch": "Matt Boch",
-    "mattBochText1": "Welcome t' th' Stable! I’m Matt, th' beastmaster. Ev'ry time you complete a task, ye'll have a random chance at receiving an Egg or a Hatching Potion to hatch Pets. When ye hatch a Pet, it will appear 'ere! Click a Pet's image t' add it t' yer Avatar. Feed 'em with th' Pet Food ye find, and they'll grow into hardy Mounts.",
-    "welcomeToTavern": "Welcome t' The Tavern!",
+    "mattBochText1": "Welcome t' th' Stable! I’m Matt, th' beastmaster. Ev'ry time you complete a task, ye'll have a random chance at receiving an Egg or a Hatchin' Potion t' hatch Critters. When ye hatch a Pet, it will appear 'ere! Click a Critter's image t' add it t' yer Avatar. Feed 'em wit' th' Critter Vittle ye find, an' they'll grow into hardy Steeds.",
+    "welcomeToTavern": "Welcome t' Th' Tavern!",
    "sleepDescription": "Need a break? Check into Daniel's Inn t' pause some o' Habitica's more diff'cult game mechanics:",
    "sleepBullet1": "Missed Dailies won't damage ye",
    "sleepBullet2": "Tasks will no' be losin' streaks",
@@ -87,8 +87,8 @@
    "paymentSuccessful": "Yer payment was successful!",
    "paymentYouReceived": "Ye received:",
    "paymentYouSentGems": "Ye sent <strong><%- name %></strong>:",
-    "paymentYouSentSubscription": "Ye sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
-    "paymentSubBilling": "Yer subscription'll be billed <strong>$<%= amount %></strong> ev'ry <strong><%= months %> months</strong>.",
+    "paymentYouSentSubscription": "Ye sent <strong><%- name %></strong> a <%= months %>-months Habitica subscr'ption.",
+    "paymentSubBilling": "Yer subscr'ption will be bill'd <strong>$<%= amount %></strong> ev'ry <strong><%= months %> months</strong>.",
    "success": "Success!",
    "classGear": "Class Gear",
    "classGearText": "Congratulations on choosing a class! I've added yer new basic weapon t' yer inventory. Take a look below t' equip it!",
--- a/website/common/locales/en@pirate/pets.json
+++ b/website/common/locales/en@pirate/pets.json
@@ -51,21 +51,21 @@
    "beastAchievement": "Ye've earned th' \"Beast Master\" Achievement fer collectin' all th' pets!",
    "beastMasterName": "Beast Master",
    "beastMasterText": "Has found all 90 pets (incredibly difficult, congratulate this pirate!)",
-    "beastMasterText2": " and has released their pets a total o' <%= count %> time(s)",
+    "beastMasterText2": " an' has releas'd their pets a total o' <%= count %> time(s)",
    "mountMasterProgress": "Mount Master Progress",
    "mountAchievement": "Ye've earned the \"Mount Master\" achievement fer tamin;  all ther mounts!",
    "mountMasterName": "Mount Master",
    "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
-    "mountMasterText2": " and has released all 90 o' their mounts a total o' <%= count %> time(s)",
+    "mountMasterText2": " an' has releas'd all 90 o' their mounts a total o' <%= count %> time(s)",
    "triadBingoName": "Triad Bingo",
    "triadBingoText": "Has found all 90 pets, all 90 mounts, an' found all 90 pets AGAIN (HOW DID YE DO THAT!)",
-    "triadBingoText2": " and has released a full stable a total o' <%= count %> time(s)",
-    "triadBingoAchievement": "Ye've earned th' \"Triad Bingo\" achievement fer findin' all th' pets, taming all th' mounts, an' finding all th' pets again!",
+    "triadBingoText2": " an' has releas'd a full stable a total o' <%= count %> time(s)",
+    "triadBingoAchievement": "Ye've earned th' \"Triad Bingo\" medal fer findin' all th' pets, tamin' all th' mounts, an' findin' all th' pets again!",
    "dropsEnabled": "Loot Enabled!",
    "firstDrop": "Ye've unlocked th' Drop System! Now when ye complete tasks, ye have a small chance o' findin' an item, includin' eggs, potions, an' food! Ye just found a <strong><%= eggText %> Egg</strong>! <%= eggNotes %>",
-    "hatchedPet": "Ye hatched a new <%= potion %> <%= egg %>!",
-    "hatchedPetGeneric": "Ye hatched a new pet!",
-    "hatchedPetHowToUse": "Visit the [Stable](<%= stableUrl %>) t' feed an' equip yer newest pet!",
+    "hatchedPet": "Ye hatch'd a new <%= potion %> <%= egg %>!",
+    "hatchedPetGeneric": "Ye hatch'd a new pet!",
+    "hatchedPetHowToUse": "Visit th' [Stable](<%= stableUrl %>) t' feed an' equip yer newest pet!",
    "petNotOwned": "Ye don't own this pet.",
    "mountNotOwned": "Ye don't own this mount.",
    "feedPet": "Feed <%= text %> t' yer <%= name %>?",
@@ -79,14 +79,14 @@
    "keyToBoth": "Master Keys t' th' Kennels",
    "keyToBothDesc": "Release all standard Pets an' Mounts so tha' ye can collect 'em again. (Quest Pets/Mounts an' rare Pets/Mounts aren't affected.)",
    "releasePetsConfirm": "Are ye sure ye wanna release yer standard Pets?",
-    "releasePetsSuccess": "Yer standard Pets 'ave been released!",
-    "releaseMountsConfirm": "Are ye sure ye wanna release yer standard Mounts?",
-    "releaseMountsSuccess": "Yer standard Mounts 'ave been released!",
-    "releaseBothConfirm": "Are ye sure ye wanna release yer standard Pets an' Mounts?",
-    "releaseBothSuccess": "Yer standard Pets an' Mounts 'ave been released!",
-    "petsReleased": "Pets released.",
-    "mountsAndPetsReleased": "Mounts an' pets released",
-    "mountsReleased": "Mounts released",
+    "releasePetsSuccess": "Yer standard Critters 'ave been releas'd!",
+    "releaseMountsConfirm": "Are ye sure ye wanna release yer standard Steeds?",
+    "releaseMountsSuccess": "Yer standard Steeds 'ave been releas'd!",
+    "releaseBothConfirm": "Are ye sure ye wanna release yer standard Critters an' Steeds?",
+    "releaseBothSuccess": "Yer standard Critters an' Steeds 'ave been releas'd!",
+    "petsReleased": "Critters releas'd.",
+    "mountsAndPetsReleased": "Steeds an' critters releas'd",
+    "mountsReleased": "Steeds releas'd",
    "welcomeStable": "Welcome t' th' Stable!",
    "welcomeStableText": "Welcome t' th' Stable! I be Matt, th' master o' th' beasts. Ever' time ye kermplete a task, ye'll 'ave a random chance t' receieve an Egg or an 'Atchin' Potion to 'atch Critters. When ye hatch a Critter, it'll appear here! Click a Critter's image t' add it t' yer Avatar. Feed 'em with th' Critter Vittles ye find an' they'll grow into hardy Mounts.",
    "petLikeToEat": "What does my pet like t' eat?",
--- a/website/common/locales/en@pirate/quests.json
+++ b/website/common/locales/en@pirate/quests.json
@@ -1,7 +1,7 @@
 {
    "quests": "Adventures",
    "quest": "adventure",
-    "petQuests": "Pet an' Mount Adventures",
+    "petQuests": "Critter an' Steed Adventures",
    "unlockableQuests": "Unlockable Adventures",
    "goldQuests": "Masterclasser Adventure Lines",
    "questDetails": "Adventure Details",
--- a/website/common/locales/en@pirate/questscontent.json
+++ b/website/common/locales/en@pirate/questscontent.json
@@ -3,7 +3,7 @@
    "questEvilSantaNotes": "Ye hear bemoaned roars deep in th' icefields. ye follow th' roars an' growls - punctuated by another voice's cacklin' - to a clearin' in th' woods whar ye spy wit' ye eye a fully-grown polar bear. She's caged an' shackled, roarin' fer life. Dancin' atop th' cage be a malicious wee imp wearin' castaway Christmas costumes. Vanquish Trapper Santa, 'n save th' beast!<br><br><strong>Note</strong>: “Trapper Santa” awards a stackable quest achievement but gives a rare mount that can only be added to yer stable once.",
    "questEvilSantaCompletion": "Trapper Santa squeals in wrath, 'n bounces off into th' night. Th' grateful she-bear, through roars 'n growls, tries t' tell ye somethin'. Ye loot her back t' th' stables, where Matt Boch th' Beast Master listens t' her tale wit' a gasp o' horror. She has a cub! He ran off into th' icefields when mama bear was captured.",
    "questEvilSantaBoss": "Trapp'r Santa",
-    "questEvilSantaDropBearCubPolarMount": "Polar Bear (Mount)",
+    "questEvilSantaDropBearCubPolarMount": "Polar Bear (Steed)",
    "questEvilSanta2Text": "Find Th' Cub",
    "questEvilSanta2Notes": "Mama bear's cub had run off into th' icefields when she was captured by th' trapper Santa. At th' edge o' th' woods, she sniffs th' air. Ye hear twig-snaps an' snow crunch through th' crystaline sound of th' forest. Paw prints! Ye both start racin' to follow th' trail. Find all th' prints an' broken twigs, an' retrieve her cub!!<br><br><strong>Note</strong>: “Find the Cub” awards a stackable quest achievement but gives a rare pet that can only be added to yer stable once.",
    "questEvilSanta2Completion": "Ye found the cub! Mama 'n baby bear couldn't be more grateful. As a token, they've decided to keep ye company till th' end 'o days.",
@@ -12,7 +12,7 @@
    "questEvilSanta2DropBearCubPolarPet": "Polar Bear (Pet)",
    "questGryphonText": "Th' Fiery Gryphon",
    "questGryphonNotes": "Th' grand beast master, <strong>baconsaur</strong>, has come t' yer party seekin' help. \", adventurers, ye must help me! Me prized gryphon has broken free 'n be terrorizin' Habit City! If ye can stop her, I could reward ye wit' some o' her eggs!\"",
-    "questGryphonCompletion": "Defeated, th' mighty beast ashamedly slinks back t' its master. \"My word! Well done, adventurers!\" <strong>baconsaur</strong> exclaims, \"Please, have some of the gryphon's eggs. I am sure you will raise these young ones well!\"",
+    "questGryphonCompletion": "Defeat'd, th' mighty beast ashamedly slinks back t' its master. \"My word! Well done, adventurers!\" <strong>baconsaur</strong> exclaims, \"Please, 'ave some o' th' gryphon's eggs. I am sure ye will raise these young ones well!\"",
    "questGryphonBoss": "Fiery Gryphon",
    "questGryphonDropGryphonEgg": "Gryphon (Egg)",
    "questGryphonUnlockText": "Unlocks yon Gryphon Eggs ye kin purchase in th' Market",
@@ -283,7 +283,7 @@
    "questFrogDropFrogEgg": "Frog (Egg)",
    "questFrogUnlockText": "Unlocks Frog Eggs ye kin purchase in t' Market",
    "questSnakeText": "Th' Serpent o' Distraction",
-    "questSnakeNotes": "It loots a hardy soul t' live in th' Sand Dunes o' Distraction. Th' arid desert be hardly a productive ship, 'n th' shimmerin' dunes 'ave led many a traveler astray. However, somethin' has even th' locals spooked. Th' sands 'ave been shiftin' 'n upturnin' entire villages. Residents claim a monster wit' an enormous serpentine body lies in wait under th' sands, 'n they 'ave all pooled together a reward fer whomever will help them find 'n stop it. Th' much-lauded snake charmers @EmeraldOx 'n @PainterProphet 'ave agreed t' help ye summon th' beast. Can ye stop th' Serp'nt o' Distraction?",
+    "questSnakeNotes": "It loots a hardy soul t' live in th' Sand Dunes o' Distraction. Th' arid desert hardly be a productive ship, an' th' shimmerin' dunes 'ave led many a traveler astray. However, somethin' has even th' locals spook'd. Th' sands 'ave been shiftin' an' upturnin' entire villages. Residents claim a monster wit' an enormous serpentine body lies in wait under th' sands, an' they 'ave all pool'd togeth'r a reward fer whomever will help them find an' stop it. Th' much-lauded snake charm'rs @EmeraldOx an' @PainterProphet 'ave agreed t' help ye summon th' beast. Can ye stop th' Serp'nt o' Distraction?",
    "questSnakeCompletion": "Wit' assistance from th' charmers, ye banish th' Serp'nt o' Distraction. Though ye were happy t' help th' inhabitants o' th' Dunes, ye can nah help but feel a wee sad fer yer fallen foe. While ye contemplate th' sights, @LordDarkly approaches ye. \"Thank ye! 'tis nah much, but I hope this can express our gratitude properly.\" He hands ye some Gold 'n... some Snake eggs! Ye will see that majestic animal again aft all.",
    "questSnakeBoss": "Serpent o' Distraction",
    "questSnakeDropSnakeEgg": "Snake (Egg)",
@@ -544,7 +544,7 @@
    "questLostMasterclasser3DropZombiePotion": "Zombie Hatching Potion",
    "questLostMasterclasser4Text": "The Mystery of the Masterclassers, Part 4: The Lost Masterclasser",
    "questLostMasterclasser4Notes": "You surface from the portal, but you’re still suspended in a strange, shifting netherworld. “That was bold,” says a cold voice. “I have to admit, I hadn’t planned for a direct confrontation yet.” A woman rises from the churning whirlpool of darkness. “Welcome to the Realm of Void.”<br><br>You try to fight back your rising nausea. “Are you Zinnya?” you ask.<br><br>“That old name for a young idealist,” she says, mouth twisting, and the world writhes beneath you. “No. If anything, you should call me the Anti’zinnya now, given all that I have done and undone.”<br><br>Suddenly, the portal reopens behind you, and as the four Masterclassers burst out, bolting towards you, Anti’zinnya’s eyes flash with hatred. “I see that my pathetic replacements have managed to follow you.”<br><br>You stare. “Replacements?”<br><br>“As the Master Aethermancer, I was the first Masterclasser — the only Masterclasser. These four are a mockery, each possessing only a fragment of what I once had! I commanded every spell and learned every skill. I shaped your very world to my whim — until the traitorous aether itself collapsed under the weight of my talents and my perfectly reasonable expectations. I have been trapped for millennia in this resulting void, recuperating. Imagine my disgust when I learned how my legacy had been corrupted.” She lets out a low, echoing laugh. “My plan was to destroy their domains before destroying them, but I suppose the order is irrelevant.” With a burst of uncanny strength, she charges forward, and the Realm of Void explodes into chaos.",
-    "questLostMasterclasser4Completion": "Under the onslaught of your final attack, the Lost Masterclasser screams in frustration, her body flickering into translucence. The thrashing void stills around her as she slumps forward, and for a moment, she seems to change, becoming younger, calmer, with an expression of peace upon her face… but then everything melts away with scarcely a whisper, and you’re kneeling once more in the desert sand.<br><br>“It seems that we have much to learn about our own history,” King Manta says, staring at the broken ruins. “After the Master Aethermancer grew overwhelmed and lost control of her abilities, the outpouring of void must have leached the life from the entire land. Everything probably became deserts like this.”<br><br>“No wonder the ancients who founded Habitica stressed a balance of productivity and wellness,” the Joyful Reaper murmurs. “Rebuilding their world would have been a daunting task requiring considerable hard work, but they would have wanted to prevent such a catastrophe from happening again.”<br><br>“Oho, look at those formerly possessed items!” says the April Fool. Sure enough, all of them shimmer with a pale, glimmering translucence from the final burst of aether released when you laid Anti’zinnya’s spirit to rest. “What a dazzling effect. I must take notes.”<br><br>“The concentrated remnants of aether in this area probably caused these animals to go invisible, too,” says Lady Glaciate, scratching a patch of emptiness behind the ears. You feel an unseen fluffy head nudge your hand, and suspect that you’ll have to do some explaining at the Stables back home. As you look at the ruins one last time, you spot all that remains of the first Masterclasser: her shimmering cloak. Lifting it onto your shoulders, you head back to Habit City, pondering everything that you have learned.<br><br>",
+    "questLostMasterclasser4Completion": "Under th' onslaught o' yer final attack, th' Lost Masterclasser screams in frustration, her body flickerin' into translucence. Th' thrashin' void stills around her as she slumps forward, an' fer a moment, she seems t' change, becomin' younger, calmer, wit' an expression o' peace upon her face… but then ev'rythin' melts away wit' scarcely a whisper, an' ye’re kneelin' once more in th' desert sand.<br><br>“It seems that we have much t' learn about our own history,” King Manta says, starin' at th' broken ruins. “After th' Master Aethermancer grew o'erwhelm'd an' lost control o' her abilities, th' outpourin' o' void must have leach'd th' life from th' entire land. Ev'rythin' probably became deserts like this.”<br><br>“No wonder th' ancients who found'd Habitica stress'd a balance o' productivity an' wellness,” th' Joyful Reaper murmurs. “Rebuildin' their world would have been a dauntin' task requirin' considerable hard work, but they would have want'd t' prevent such a catastrophe from happenin' again.”<br><br>“Oho, look at those formerly possess'd items!” says th' April Fool. Sure enough, all o' 'em shimmer wit' a pale, glimmerin' translucence from th' final burst o' aether releas'd when ye laid Anti’zinnya’s spirit t' rest. “What a dazzlin' effect. I must take notes.”<br><br>“Th' concentrat'd remnants o' aether in this area probably caus'd these animals t' go invisible, too,” says Lady Glaciate, scratchin' a patch o' emptiness behind th' ears. Ye feel an unseen fluffy head nudge yer hand, an' suspect that ye’ll have t' do some explainin' at th' Stables back home. As ye look at th' ruins one last time, ye spot all that remains o' th' firs' Masterclasser: her shimmerin' cloak. Liftin' it onto yer shoulders, ye head back t' Habit City, ponderin' ev'rythin' that ye have learn'd.<br><br>",
    "questLostMasterclasser4Boss": "Anti'zinnya",
    "questLostMasterclasser4RageTitle": "Siphoning Void",
    "questLostMasterclasser4RageDescription": "Siphoning Void: This bar fills when you don't complete your Dailies. When it is full, Anti'zinnya will remove the party's Mana!",
--- a/website/common/locales/en@pirate/rebirth.json
+++ b/website/common/locales/en@pirate/rebirth.json
@@ -1,6 +1,6 @@
 {
    "rebirthNew": "Rebirth: New Nautical Adventure Available!",
-    "rebirthUnlock": "Ye've unlocked Rebirth! 'tis special Market item allows ye t' begin a new game at level 1 while keepin' ye tasks, achievements, pets, 'n more. Use it t' breathe new life into Habitica if ye feel ye've achieved it all, or t' experience new weapons wit' th' fresh eyes 'o a beginnin' character!",
+    "rebirthUnlock": "Ye've unlocked Rebirth! 'tis special Market item allows ye t' begin a new game at level 1 while keepin' ye tasks, achievements, pets, an' more. Use it t' breathe new life into Habitica if ye feel ye've achieved it all, or t' experience new weapons wit' th' fresh eyes o' a beginnin' character!",
    "rebirthAchievement": "Ye've begun a new adventure! 'tis be Rebirth <%= number %> fer ye, 'n th' highest Level ye've attained be <%= level %>. To stack 'tis Achievement, begin ye next new adventure when ye've reached an even higher Level!",
    "rebirthAchievement100": "Ye've begun a new voyage! This be Rebirth <%= number %> fer ye, an' th' highest Level ye've attained be 100 or higher. T' stack this Achievement, begin yer nex' new voyage when ye've reached at least 100!",
    "rebirthBegan": "Embarked on a New Adventure",
--- a/website/common/locales/en@pirate/settings.json
+++ b/website/common/locales/en@pirate/settings.json
@@ -8,8 +8,8 @@
    "dailyDueDefaultView": "Set ye Dailies default t' 'due' tab",
    "dailyDueDefaultViewPop": "Wit' 'tis option set, th' Dailies tasks gunna default to 'due' instead 'o 'all'",
    "reverseChatOrder": "Show yer chat messages in reverse ord'r",
-    "startAdvCollapsed": "Advanced Settings in ye tasks start collapsed",
-    "startAdvCollapsedPop": "With this option set, Advanced Settings'll be hidden when ya first open a task fer editing.",
+    "startAdvCollapsed": "Advanced Settin's in ye tasks start collapsed",
+    "startAdvCollapsedPop": "Wit' this option set, Advanced Settin's will be hidd'n when ye firs' open a task fer editin'.",
    "dontShowAgain": "Don't show this agin",
    "suppressLevelUpModal": "Don't show popup when gainin' a level",
    "suppressHatchPetModal": "Don't show popup when hatchin' a pet",
--- a/website/common/locales/en@pirate/subscriber.json
+++ b/website/common/locales/en@pirate/subscriber.json
@@ -7,16 +7,16 @@
    "reachedGoldToGemCap": "Ye've reached th' Gold=>Sapphires conversion cap <%= convCap %> fer this month. We 'ave this t' prevent abuse / farmin'. Th' cap resets within th' first three days o' each month.",
    "reachedGoldToGemCapQuantity": "Yer requested amount <%= quantity %> exceeds th' amount ye can buy fer this month (<%= convCap %>). Th' full amount becomes available within th' first three days o' each month. Thanks fer subscribin'!",
    "mysteryItem": "Exclusive items per moon",
-    "mysteryItemText": "Each month ye 'll receive a unique cosmetic item for yer avatar! Plus, for every three months o' consecutive subscription, the Mysterious Time Travelers 'll grant you access t' historic (an' futuristic!) cosmetic items.",
+    "mysteryItemText": "Each month ye'll receive a unique cosmetic item fer yer avatar! Plus, fer ev'ry three months o' consecutive subscr'ption, th' Mysterious Time Travelers will grant ye access t' historic (an' futuristic!) cosmetic items.",
    "exclusiveJackalopePet": "Exclus've pet",
-    "giftSubscription": "Want t' gift th' benefits of a subscription t' someone else?",
-    "giftSubscriptionText4": "Thanks fer supporting Habitica!",
+    "giftSubscription": "Want t' gift th' benefits o' a subscr'ption t' someone else?",
+    "giftSubscriptionText4": "Thanks fer supportin' Habitica!",
    "groupPlans": "Ship Plans",
    "subscribe": "Subscr'be",
    "nowSubscribed": "Ye are now subscribed t' Habitica!",
    "cancelSub": "Cancel Subscr'ption",
-    "cancelSubInfoGroupPlan": "'Cause ye have a free subscription from a Group Plan, ye cannot cancel it. It will end when ye be no longer a crewmate o' th' Group Plan. If ye be th' Group leader an' want t' cancel th' Group Plan, ye can do that from th' Group Plan’s “Group Billin'” tab.",
-    "cancelingSubscription": "Canceling th' subscription",
+    "cancelSubInfoGroupPlan": "'Cause ye have a free subscr'ption from a Group Plan, ye cannot cancel it. It will end when ye no longer be a crewmate o' th' Group Plan. If ye be th' Group leader an' want t' cancel th' Group Plan, ye can do that from th' Group Plan’s “Group Billin'” tab.",
+    "cancelingSubscription": "Cancelin' th' subscr'ption",
    "contactUs": "Contact Us",
    "checkout": "Checkout",
    "sureCancelSub": "Arrr ye sure ye want t' cancel yer subscription?",
@@ -104,10 +104,10 @@
    "hourglassPurchase": "Ye purchased an item using a Mystic Hourglass!",
    "hourglassPurchaseSet": "Ye purchased an item set using a Mystic Hourglass!",
    "missingUnsubscriptionCode": "Missin' unsubscription code.",
-    "missingSubscription": "User does nah 'ave a plan subscription",
+    "missingSubscription": "Pirate does nah 'ave a plan subscription",
    "missingSubscriptionCode": "Missin' subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.",
    "missingReceipt": "Missin' Receipt.",
-    "cannotDeleteActiveAccount": "Ye have an active subscription, cancel yer plan before deleting yer account.",
+    "cannotDeleteActiveAccount": "Ye have an active subscr'ption, cancel yer plan before deletin' yer account.",
    "paymentNotSuccessful": "Th' payment was nah successful",
    "planNotActive": "Th' plan hasn't activated yet (due t' a PayPal bug). It'll begin <%= nextBillingDate %>, after which ye can cancel t' retain yer full benefits",
    "notAllowedHourglass": "Pet/Mount nah available fer purchase wit' Mystic Hourglass.",
@@ -129,7 +129,7 @@
    "subscriptionBenefit1": "Alexander th' Merchant will sell ye Sapphires from th' Market fer 20 Gold each!",
    "subscriptionBenefit3": "Discover ev'n more items in Habitica wit' a 2x daily drop-cap.",
    "subscriptionBenefit4": "Unique cosmetic item fer ye t' decorate yer avatar each month.",
-    "subscriptionBenefit5": "Receive th' Royal Purple Jackalope critter when ye become a new subscrib'r!",
+    "subscriptionBenefit5": "Receive th' Royal Purple Jackalope critter when ye become a new subscrib'r.",
    "subscriptionBenefit6": "Earn Mystic Hourglasses t' purchase items in th' Time Travelers' Shop!",
    "purchaseAll": "Purchase Set",
    "gemsRemaining": "Sapphires remaining",
@@ -148,11 +148,11 @@
    "mysterySet201909": "Affable Acorn Set",
    "mysterySet201908": "Footloose Faun Set",
    "mysticHourglassNeededNoSub": "This item requires a Mystic Hourglass. Ye earn Mystic Hourglasses by bein' a Habitica subscriber.",
-    "cancelSubInfoApple": "Please follow <a href=\"https://support.apple.com/en-us/HT202039\">Apple's official instructions</a> t' cancel yer subscription or t' see yer subscription's termination date if ye have already cancell'd it. This screen be not able t' show ye whether yer subscription has been cancelled.",
-    "cancelSubInfoGoogle": "Please go t' th' \"Account\" > \"Subscriptions\" section o' th' Google Play Store app t' cancel yer subscription or t' see yer subscription's termination date if ye have already cancelled it. This screen be not able t' show ye whether yer subscription has been cancelled.",
+    "cancelSubInfoApple": "Please follow <a href=\"https://support.apple.com/en-us/HT202039\">Apple's official instructions</a> t' cancel yer subscr'ption or t' see yer subscr'ption's termination date if ye 'ave already cancell'd it. This screen not be able t' show ye wheth'r yer subscription has been cancell'd.",
+    "cancelSubInfoGoogle": "Please go t' th' \"Account\" > \"Subscr'ptions\" section o' th' Google Play Store app t' cancel yer subscription or t' see yer subscr'ption's termination date if ye 'ave already cancell'd it. This screen not be able t' show ye wheth'r yer subscription has been cancell'd.",
    "organization": "Organization",
-    "giftASubscription": "Gift a Subscription",
-    "viewSubscriptions": "View Subscriptions",
+    "giftASubscription": "Gift a Subscr'ption",
+    "viewSubscriptions": "View Subscr'ptions",
    "mysterySet202011": "Foliated Magus Set",
    "mysterySet202010": "Beguilingly Batty Set",
    "mysterySet202009": "Marvelous Moth Set",
@@ -185,5 +185,6 @@
    "mysterySet202012": "Frostfire Phoenix Set",
    "mysterySet202007": "Outstandin' Orca Set",
    "mysterySet202003": "Barb'd Battl'r Set",
-    "mysterySet202001": "Fabl'd Fox Set"
+    "mysterySet202001": "Fabl'd Fox Set",
+    "mysterySet202101": "Snazzy Snow Leopard Set"
 }
--- a/website/common/locales/en@pirate/tasks.json
+++ b/website/common/locales/en@pirate/tasks.json
@@ -2,13 +2,13 @@
    "clearCompleted": "Be Rid o' What's Done",
    "clearCompletedDescription": "Completed T' Do's are scuttled aft 30 days fer non-subscribers an' 90 days fer subscribers.",
    "clearCompletedConfirm": "Are ye sure ye wants t' scuttle yer completed T'-Do's?",
-    "addMultipleTip": "<strong>Tip:</strong> T' add multiple <%= taskType %>, separate each one usin' a line break (Shift + Enter) 'n then press \"Enter.\"",
+    "addMultipleTip": "<strong>Tip:</strong> T' add multiple <%= taskType %>, separate each one usin' a line break (Shift + Enter) an' then press \"Enter.\"",
    "addATask": "Add a <%= type %>",
    "editATask": "Edit <%= type %>",
    "createTask": "Create <%= type %>",
    "addTaskToUser": "Add Task",
    "scheduled": "Planned",
-    "theseAreYourTasks": "These are yer <%= taskType %>",
+    "theseAreYourTasks": "These be yer <%= taskType %>",
    "habit": "Habit",
    "habits": "Habits",
    "habitsDesc": "Habits don' 'ave a rigid ske-jewel. Ye kin check 'em off multiple times per day.",
--- a/Show More
+++ b/Show More