Merge branch 'release' into develop

migrations/users/20181023_veteran_pet_ladder.js

@@ -0,0 +1,93 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20181023_veteran_pet_ladder';
+import { model as User } from '../../website/server/models/user';
+
+function processUsers (lastId) {
+  let query = {
+    migration: {$ne: MIGRATION_NAME},
+    'flags.verifiedUsername': true,
+  };
+
+  let fields = {
+    'items.pets': 1,
+  };
+
+  if (lastId) {
+    query._id = {
+      $gt: lastId,
+    };
+  }
+
+  return User.find(query)
+    .limit(250)
+    .sort({_id: 1})
+    .select(fields)
+    .then(updateUsers)
+    .catch((err) => {
+      console.log(err);
+      return exiting(1, `ERROR! ${err}`);
+    });
+}
+
+let progressCount = 1000;
+let count = 0;
+
+function updateUsers (users) {
+  if (!users || users.length === 0) {
+    console.warn('All appropriate users found and modified.');
+    displayData();
+    return;
+  }
+
+  let userPromises = users.map(updateUser);
+  let lastUser = users[users.length - 1];
+
+  return Promise.all(userPromises)
+    .then(() => {
+      processUsers(lastUser._id);
+    });
+}
+
+function updateUser (user) {
+  count++;
+
+  let set = {migration: MIGRATION_NAME};
+
+  if (user.items.pets['Bear-Veteran']) {
+    set['items.pets.Fox-Veteran'] = 5;
+  } else if (user.items.pets['Lion-Veteran']) {
+    set['items.pets.Bear-Veteran'] = 5;
+  } else if (user.items.pets['Tiger-Veteran']) {
+    set['items.pets.Lion-Veteran'] = 5;
+  } else if (user.items.pets['Wolf-Veteran']) {
+    set['items.pets.Tiger-Veteran'] = 5;
+  } else {
+    set['items.pets.Wolf-Veteran'] = 5;
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return user.update({_id: user._id}, {$set: set}).exec();
+}
+
+function displayData () {
+  console.warn(`\n${count} users processed\n`);
+  return exiting(0);
+}
+
+function exiting (code, msg) {
+  code = code || 0; // 0 = success
+  if (code && !msg) {
+    msg = 'ERROR!';
+  }
+  if (msg) {
+    if (code) {
+      console.error(msg);
+    } else {
+      console.log(msg);
+    }
+  }
+  process.exit(code);
+}
+
+module.exports = processUsers;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.65.6",
+  "version": "4.66.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.65.6",
+  "version": "4.66.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

test/api/v3/integration/user/POST-user_push_device.test.js

@@ -39,14 +39,16 @@ describe('POST /user/push-devices', () => {
       });
   });
 
-  it('returns an error if user already has the push device', async () => {
+  it('fails silently if user already has the push device', async () => {
     await user.post('/user/push-devices', {type, regId});
-    await expect(user.post('/user/push-devices', {type, regId}))
-      .to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('pushDeviceAlreadyAdded'),
-      });
+    const response = await user.post('/user/push-devices', {type, regId});
+    await user.sync();
+
+    expect(response.message).to.equal(t('pushDeviceAdded'));
+    expect(response.data[0].type).to.equal(type);
+    expect(response.data[0].regId).to.equal(regId);
+    expect(user.pushDevices[0].type).to.equal(type);
+    expect(user.pushDevices[0].regId).to.equal(regId);
   });
 
   it('adds a push device to the user', async () => {

website/client/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -42,13 +42,13 @@
 }
 .promo_forest_friends_bundle {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -1009px;
+  background-position: 0px -1009px;
   width: 423px;
   height: 147px;
 }
 .promo_ghost_potions {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -1009px;
+  background-position: -424px -1009px;
   width: 423px;
   height: 147px;
 }
@@ -82,6 +82,12 @@
   width: 96px;
   height: 69px;
 }
+.promo_veteran_pets {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -1157px;
+  width: 363px;
+  height: 141px;
+}
 .scene_nametag {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -481px -244px;

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

@@ -1468,523 +1468,523 @@
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-White {
+.Pet-Fox-Veteran {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -902px -1303px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Zombie {
+.Pet-Fox-White {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -984px -1303px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Base {
+.Pet-Fox-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1066px -1303px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-CottonCandyBlue {
+.Pet-Frog-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1148px -1303px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-CottonCandyPink {
+.Pet-Frog-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1230px -1303px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Desert {
+.Pet-Frog-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1312px -1303px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Golden {
+.Pet-Frog-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1394px -1303px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Red {
+.Pet-Frog-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Shade {
+.Pet-Frog-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Skeleton {
+.Pet-Frog-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-White {
+.Pet-Frog-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Zombie {
+.Pet-Frog-White {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Base {
+.Pet-Frog-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-CottonCandyBlue {
+.Pet-Gryphon-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-CottonCandyPink {
+.Pet-Gryphon-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Desert {
+.Pet-Gryphon-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Golden {
+.Pet-Gryphon-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Red {
+.Pet-Gryphon-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-RoyalPurple {
+.Pet-Gryphon-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Shade {
+.Pet-Gryphon-RoyalPurple {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Skeleton {
+.Pet-Gryphon-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-White {
+.Pet-Gryphon-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: 0px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Zombie {
+.Pet-Gryphon-White {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -82px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-Base {
+.Pet-Gryphon-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -164px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-CottonCandyBlue {
+.Pet-GuineaPig-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -246px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-CottonCandyPink {
+.Pet-GuineaPig-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -328px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-Desert {
+.Pet-GuineaPig-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -410px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-Golden {
+.Pet-GuineaPig-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -492px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-Red {
+.Pet-GuineaPig-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -574px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-Shade {
+.Pet-GuineaPig-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -656px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-Skeleton {
+.Pet-GuineaPig-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -738px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-White {
+.Pet-GuineaPig-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -820px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-GuineaPig-Zombie {
+.Pet-GuineaPig-White {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -902px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Base {
+.Pet-GuineaPig-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -984px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-CottonCandyBlue {
+.Pet-Hedgehog-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1066px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-CottonCandyPink {
+.Pet-Hedgehog-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1148px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Desert {
+.Pet-Hedgehog-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1230px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Golden {
+.Pet-Hedgehog-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1312px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Red {
+.Pet-Hedgehog-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1394px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Shade {
+.Pet-Hedgehog-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -1403px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Skeleton {
+.Pet-Hedgehog-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-White {
+.Pet-Hedgehog-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Zombie {
+.Pet-Hedgehog-White {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-Base {
+.Pet-Hedgehog-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-CottonCandyBlue {
+.Pet-Hippo-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-CottonCandyPink {
+.Pet-Hippo-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-Desert {
+.Pet-Hippo-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-Golden {
+.Pet-Hippo-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-Red {
+.Pet-Hippo-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-Shade {
+.Pet-Hippo-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-Skeleton {
+.Pet-Hippo-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-White {
+.Pet-Hippo-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippo-Zombie {
+.Pet-Hippo-White {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hippogriff-Hopeful {
+.Pet-Hippo-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Base {
+.Pet-Hippogriff-Hopeful {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-CottonCandyBlue {
+.Pet-Horse-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: 0px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-CottonCandyPink {
+.Pet-Horse-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -82px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Desert {
+.Pet-Horse-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -164px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Golden {
+.Pet-Horse-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -246px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Red {
+.Pet-Horse-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -328px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Shade {
+.Pet-Horse-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -410px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Skeleton {
+.Pet-Horse-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -492px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-White {
+.Pet-Horse-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -574px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Zombie {
+.Pet-Horse-White {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -656px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-JackOLantern-Base {
-  background-image: url('~assets/images/sprites/spritesmith-main-21.png');
-  background-position: -820px -1503px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-JackOLantern-Ghost {
-  background-image: url('~assets/images/sprites/spritesmith-main-21.png');
-  background-position: -902px -1503px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Jackalope-RoyalPurple {
+.Pet-Horse-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -738px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-Base {
+.Pet-JackOLantern-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-21.png');
+  background-position: -902px -1503px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-JackOLantern-Ghost {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -984px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-CottonCandyBlue {
+.Pet-Jackalope-RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-21.png');
+  background-position: -820px -1503px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Kangaroo-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1066px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-CottonCandyPink {
+.Pet-Kangaroo-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1148px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-Desert {
+.Pet-Kangaroo-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1230px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-Golden {
+.Pet-Kangaroo-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1312px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-Red {
+.Pet-Kangaroo-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1394px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-Shade {
+.Pet-Kangaroo-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1476px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-Skeleton {
+.Pet-Kangaroo-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1558px -1503px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-White {
+.Pet-Kangaroo-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Kangaroo-Zombie {
+.Pet-Kangaroo-White {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Lion-Veteran {
+.Pet-Kangaroo-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Aquatic {
+.Pet-Lion-Veteran {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Base {
+.Pet-LionCub-Aquatic {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-CottonCandyBlue {
+.Pet-LionCub-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-CottonCandyPink {
+.Pet-LionCub-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Cupid {
+.Pet-LionCub-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Desert {
+.Pet-LionCub-Cupid {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Ember {
+.Pet-LionCub-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Fairy {
+.Pet-LionCub-Ember {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Floral {
+.Pet-LionCub-Fairy {
   background-image: url('~assets/images/sprites/spritesmith-main-21.png');
   background-position: -1640px -1100px;
   width: 81px;

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

@@ -1,237 +1,243 @@
-.Pet-Unicorn-Red {
+.Pet-Unicorn-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-Shade {
+.Pet-Unicorn-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -574px -400px;
+  background-position: 0px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-Skeleton {
+.Pet-Unicorn-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -164px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-White {
+.Pet-Unicorn-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: 0px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-Zombie {
+.Pet-Unicorn-White {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -82px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Base {
+.Pet-Unicorn-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -164px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-CottonCandyBlue {
+.Pet-Whale-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -246px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-CottonCandyPink {
+.Pet-Whale-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -246px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Desert {
+.Pet-Whale-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: 0px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Golden {
+.Pet-Whale-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -82px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Red {
+.Pet-Whale-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -164px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Shade {
+.Pet-Whale-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -246px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Skeleton {
+.Pet-Whale-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -328px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-White {
+.Pet-Whale-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -328px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Zombie {
+.Pet-Whale-White {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -328px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Aquatic {
+.Pet-Whale-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: 0px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Base {
+.Pet-Wolf-Aquatic {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -82px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-CottonCandyBlue {
+.Pet-Wolf-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -164px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-CottonCandyPink {
+.Pet-Wolf-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -246px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Cupid {
+.Pet-Wolf-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -328px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Desert {
+.Pet-Wolf-Cupid {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -410px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Ember {
+.Pet-Wolf-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -410px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Fairy {
+.Pet-Wolf-Ember {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -410px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Floral {
+.Pet-Wolf-Fairy {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -410px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Ghost {
+.Pet-Wolf-Floral {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -492px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Glass {
+.Pet-Wolf-Ghost {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -492px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Glow {
+.Pet-Wolf-Glass {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -492px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Golden {
+.Pet-Wolf-Glow {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -492px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Holly {
+.Pet-Wolf-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: 0px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Peppermint {
+.Pet-Wolf-Holly {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -82px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Rainbow {
+.Pet-Wolf-Peppermint {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -164px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Red {
+.Pet-Wolf-Rainbow {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -246px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-RoyalPurple {
+.Pet-Wolf-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -328px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shade {
+.Pet-Wolf-RoyalPurple {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -410px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shimmer {
+.Pet-Wolf-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -492px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Skeleton {
+.Pet-Wolf-Shimmer {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -574px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Spooky {
+.Pet-Wolf-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -574px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-StarryNight {
+.Pet-Wolf-Spooky {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -574px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Thunderstorm {
+.Pet-Wolf-StarryNight {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: -574px -300px;
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-23.png');
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
 .Pet-Wolf-Veteran {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
   background-position: 0px 0px;
@@ -240,235 +246,235 @@
 }
 .Pet-Wolf-White {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: 0px -500px;
+  background-position: -82px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-Wolf-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -82px -500px;
+  background-position: -164px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -164px -500px;
+  background-position: -246px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -246px -500px;
+  background-position: -328px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -328px -500px;
+  background-position: -410px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -410px -500px;
+  background-position: -492px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -492px -500px;
+  background-position: -574px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -574px -500px;
+  background-position: -656px 0px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -656px 0px;
+  background-position: -656px -100px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -656px -100px;
+  background-position: -656px -200px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-White {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -656px -200px;
+  background-position: -656px -300px;
   width: 81px;
   height: 99px;
 }
 .Pet-Yarn-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -656px -300px;
+  background-position: -656px -400px;
   width: 81px;
   height: 99px;
 }
 .Pet_HatchingPotion_Aquatic {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -656px -469px;
+  background-position: 0px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Base {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -69px -669px;
+  background-position: -138px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: 0px -600px;
+  background-position: -69px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -69px -600px;
+  background-position: -138px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Cupid {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -138px -600px;
+  background-position: -207px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -207px -600px;
+  background-position: -276px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Ember {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -276px -600px;
+  background-position: -345px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Fairy {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -345px -600px;
+  background-position: -414px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Floral {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -414px -600px;
+  background-position: -483px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Ghost {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -483px -600px;
+  background-position: -552px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Glass {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -552px -600px;
+  background-position: -621px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Glow {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -621px -600px;
+  background-position: 0px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: 0px -669px;
+  background-position: -69px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Holly {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -656px -400px;
+  background-position: -656px -500px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Peppermint {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -138px -669px;
+  background-position: -207px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Purple {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -207px -669px;
+  background-position: -276px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Rainbow {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -276px -669px;
+  background-position: -345px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Red {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -345px -669px;
+  background-position: -414px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_RoyalPurple {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -414px -669px;
+  background-position: -483px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -483px -669px;
+  background-position: -552px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Shimmer {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -552px -669px;
+  background-position: -621px -669px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -621px -669px;
+  background-position: -738px 0px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Spooky {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -738px 0px;
+  background-position: -738px -69px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_StarryNight {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -738px -69px;
+  background-position: -738px -138px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Thunderstorm {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -738px -138px;
+  background-position: -738px -207px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_White {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -738px -207px;
+  background-position: -738px -276px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-23.png');
-  background-position: -738px -276px;
+  background-position: -738px -345px;
   width: 68px;
   height: 68px;
 }

website/client/libs/staffList.js

@@ -1,44 +1,44 @@
 export default [
-  {
-    name: 'beffymaroo',
-    type: 'Staff',
-    uuid: '9fe7183a-4b79-4c15-9629-a1aee3873390',
-  },
-  // {
-  //   name: 'lefnire',
-  //   type: 'Staff',
-  //   uuid: '00000000-0000-4000-9000-000000000000',
-  // },
   {
     name: 'Lemoness',
     type: 'Staff',
     uuid: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0',
   },
-  {
-    name: 'paglias',
-    type: 'Staff',
-    uuid: 'ed4c688c-6652-4a92-9d03-a5a79844174a',
-  },
   {
     name: 'redphoenix',
     type: 'Staff',
     uuid: 'cb46ad54-8c78-4dbc-a8ed-4e3185b2b3ff',
   },
+  {
+    name: 'paglias',
+    type: 'Staff',
+    uuid: 'ed4c688c-6652-4a92-9d03-a5a79844174a',
+  },
   {
     name: 'SabreCat',
     type: 'Staff',
     uuid: '7f14ed62-5408-4e1b-be83-ada62d504931',
   },
-  {
-    name: 'TheHollidayInn',
-    type: 'Staff',
-    uuid: '206039c6-24e4-4b9f-8a31-61cbb9aa3f66',
-  },
   {
     name: 'viirus',
     type: 'Staff',
     uuid: 'a327d7e0-1c2e-41be-9193-7b30b484413f',
   },
+  {
+    name: 'beffymaroo',
+    type: 'Staff',
+    uuid: '9fe7183a-4b79-4c15-9629-a1aee3873390',
+  },
+  {
+    name: 'Apollo',
+    type: 'Staff',
+    uuid: '9b2f4123-f749-4f74-85e2-ce31ce778435',
+  },
+  {
+    name: 'Piyo',
+    type: 'Staff',
+    uuid: '61b2c855-0a30-444c-bcc6-1cac876460b0',
+  },
   {
     name: 'It\'s Bailey',
     type: 'Moderator',
@@ -64,11 +64,6 @@ export default [
     type: 'Moderator',
     uuid: '28771972-ca6d-4c03-8261-e1734aa7d21d',
   },
-  // {
-  //   name: 'Daniel the Bard',
-  //   type: 'Moderator',
-  //   uuid: '1f7c4a74-03a3-4b2c-b015-112d0acbd593',
-  // },
   {
     name: 'deilann 5.0.5b',
     type: 'Moderator',

website/common/locales/bg/challenge.json

@@ -99,7 +99,7 @@
     "noChallengeTitle": "Нямате никакви предизвикателства.",
     "challengeDescription1": "Предизвикателствата са обществени събития, в които играчите се състезават и печелят награди като изпълняват няколко свързани по някакъв начин задачи.",
     "challengeDescription2": "Открийте препоръчани за Вас предизвикателства според интересите Ви, разгледайте обществените предизвикателства на Хабитика, или създайте свои собствени предизвикателства.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "Не можем да открием съответстващи предизвикателства.",
     "createdBy": "Създадено от",
     "joinChallenge": "Присъединяване към предизвикателството",
     "leaveChallenge": "Напускане на предизвикателството",

website/common/locales/bg/character.json

@@ -80,7 +80,7 @@
     "autoEquipPopoverText": "Изберете това, за да екипирате всеки предмет в момента, когато го купите.",
     "costumeDisabled": "Вие изключихте костюма си.",
     "gearAchievement": "Вие спечелихте постижението „Последното снаряжение“ заради това, че достигнахте максималното снаряжение за класа си! Получавате следните пълни комплекти:",
-    "gearAchievementNotification": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class!",
+    "gearAchievementNotification": "Вие спечелихте постижението „Последното снаряжение“ заради това, че достигнахте максималното снаряжение за класа си!",
     "moreGearAchievements": "За да получите още значки „Последното снаряжение“, променете класа си в <a href='/user/settings/site' target='_blank'>страницата „Настройки &gt; Уеб сайт</a> и купете екипировката на новия си клас!",
     "armoireUnlocked": "За още екипировка, прегледайте <strong>Омагьосания гардероб!</strong> Щракнете наградата на Омагьосания гардероб и ще имате шанс да получите специална екипировка! Той може да Ви даде също опит или храна.",
     "ultimGearName": "Последното снаряжение — <%= ultClass %>",

website/common/locales/bg/groups.json

@@ -340,8 +340,8 @@
     "canceledGroupPlan": "Груповият план е прекратен",
     "groupPlanCanceled": "Груповият план ще стане неактивен на",
     "purchasedGroupPlanPlanExtraMonths": "Имате оставащи средства за <%= months %> месеца от груповия план.",
-    "addManager": "Assign Manager",
-    "removeManager2": "Unassign Manager",
+    "addManager": "Назначаване на управител",
+    "removeManager2": "Премахване на ролята на управител",
     "userMustBeMember": "Потребителят трябва да бъде член",
     "userIsNotManager": "Потребителят не е управител",
     "canOnlyApproveTaskOnce": "Тази задача е вече одобрена.",
@@ -392,12 +392,12 @@
     "noGuildsTitle": "Не членувате в нито една гилдия.",
     "noGuildsParagraph1": "Гилдиите са обществени групи създадени от другите играчи, които могат да Ви помогнат, да поддържат отговорността Ви, както и да бъдат място за насърчаващи разговори.",
     "noGuildsParagraph2": "Отворете раздела за разглеждане, за да открите препоръчани за Вас гилдии според интересите Ви, разгледайте обществените гилдии на Хабитика, или създайте своя собствена гилдия.",
-    "noGuildsMatchFilters": "We couldn't find any matching Guilds.",
+    "noGuildsMatchFilters": "Не можем да открием съответстващи гилдии.",
     "privateDescription": "Частните гилдии не се показват в списъка с гилдии на Хабитика. Нови членове могат да бъдат добавени само чрез покана.",
     "removeInvite": "Премахване на поканата",
     "removeMember": "Премахване на члена",
     "sendMessage": "Изпращане на съобщение",
-    "promoteToLeader": "Transfer Ownership",
+    "promoteToLeader": "Прехвърляне на притежанието",
     "inviteFriendsParty": "Ако поканите приятели в групата си, ще получите изключителния <br/> свитък с мисията да се биете заедно срещу Василисъка!",
     "upgradeParty": "Надграждане на групата",
     "createParty": "Създаване на група",

website/common/locales/bg/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Тигър ветеран",
     "veteranLion": "Лъв ветеран",
     "veteranBear": "Мечка ветеран",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Кученце цербер",
     "hydra": "Хидра",
     "mantisShrimp": "Скарида-богомолка",

website/common/locales/cs/achievements.json

@@ -2,7 +2,7 @@
   "achievement": "Úspěch",
   "share": "Sdílet",
   "onwards": "Kupředu!",
-  "levelup": "Díky dosažení tvých cílů v reálném životě jsi se dostal na vyšší úroveň, a jsi díky tomu plně uzdraven!",
+  "levelup": "Dosáhl jsi svých cílů v reálném životě, a proto jsi postoupil na vyšší úroveň a jsi plně uzdraven!",
   "reachedLevel": "Dosáhl jsi úrovně <%= level %>",
   "achievementLostMasterclasser": "Dokončení výprav: Série Mistra třídy",
   "achievementLostMasterclasserText": "Splnil všech šestnáct výprav v sérii výprav Mistra třídy a vyřešil záhadu Ztraceného Mistra!"

website/common/locales/cs/challenge.json

@@ -99,7 +99,7 @@
     "noChallengeTitle": "Nemáš žádné výzvy",
     "challengeDescription1": "Výzvy jsou komunitní události, ve kterých hráči soutěží a získávají odměny za plnění několika příbuzných úkolů.",
     "challengeDescription2": "Vyhledej doporučené Výzvy podle tvých zálib, procházej veřejné výzvy a nebo vytvoř svoji vlastní.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "Nenalezli jsme žádné odpovídající výzvy.",
     "createdBy": "Vytvořil",
     "joinChallenge": "Připojit se k výzvě",
     "leaveChallenge": "Opustit výzvu",

website/common/locales/cs/character.json

@@ -80,7 +80,7 @@
     "autoEquipPopoverText": "Zvol tuto možnost pro automatické nasazení koupeného vybavení.",
     "costumeDisabled": "Vypnul jsi svůj kostým",
     "gearAchievement": "Získal jsi Ocenění \"Maximální Vybavení\" za vylepšení výbavy na maximální set vybavení pro povolání! Získal jsi následující kompletní sety:",
-    "gearAchievementNotification": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class!",
+    "gearAchievementNotification": "Získal jsi ocenění \"Ultimátní výbava\" za vylepšení vybavení daného povolání na maximální úroveň!",
     "moreGearAchievements": "Abys získal více ocenění Ultimátního Vybavení, změň své povolání v <a href='/user/settings/site' target='_blank'>Nastavení - Stránka</a>, a nakup si vybavení pro své nové povolání!",
     "armoireUnlocked": "Také jsi odemkl <strong>Začarovanou almaru!</strong> Klikni na Odměnu začarované almary a náhodně získej speciální Vybavení! Také ti může náhodně dát Zkušenostní body nebo jídlo.",
     "ultimGearName": "Ultimátní výbava - <%= ultClass %>",

website/common/locales/cs/gear.json

@@ -783,7 +783,7 @@
     "armorArmoireRobeOfSpadesText": "Robe of Spades",
     "armorArmoireRobeOfSpadesNotes": "These luxuriant robes conceal hidden pockets for treasures or weapons--your choice! Increases Strength by <%= str %>. Enchanted Armoire: Ace of Spades Set (Item 2 of 3).",
     "headgear": "helm",
-    "headgearCapitalized": "Headgear",
+    "headgearCapitalized": "Pokrývka hlavy",
     "headBase0Text": "No Headgear",
     "headBase0Notes": "Žádná pokrývka hlavy",
     "headWarrior1Text": "Kožená helma",
@@ -1216,7 +1216,7 @@
     "headArmoireJeweledArcherHelmNotes": "This helm may look ornate, but it's also exceedingly light and strong. Increases Intelligence by <%= int %>. Enchanted Armoire: Jeweled Archer Set (Item 1 of 3).",
     "headArmoireVeilOfSpadesText": "Veil of Spades",
     "headArmoireVeilOfSpadesNotes": "A shadowy and mysterious veil that will boost your stealth. Increases Perception by <%= per %>. Enchanted Armoire: Ace of Spades Set (Item 1 of 3).",
-    "offhand": "off-hand item",
+    "offhand": "Předmět v druhé ruce",
     "offhandCapitalized": "Off-Hand Item",
     "shieldBase0Text": "No Off-Hand Equipment",
     "shieldBase0Notes": "No shield or other off-hand item.",
@@ -1542,7 +1542,7 @@
     "bodyArmoireCozyScarfText": "Cozy Scarf",
     "bodyArmoireCozyScarfNotes": "This fine scarf will keep you warm as you go about your wintry business. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Lamplighter's Set (Item 4 of 4).",
     "headAccessory": "doplňky na hlavu",
-    "headAccessoryCapitalized": "Head Accessory",
+    "headAccessoryCapitalized": "Doplňky na hlavu",
     "accessories": "Doplňky",
     "animalEars": "Zvířecí uši",
     "headAccessoryBase0Text": "Bez příslušenství na hlavě",

website/common/locales/cs/generic.json

@@ -219,7 +219,7 @@
     "getwell3": "Je mi líto, že se necítíš nejlépe!",
     "getwellCardAchievementTitle": "Pečující důvěrník",
     "getwellCardAchievementText": "Dobrá přání jsou vždy oceňovány. Pošli nebo obdrž <%= count %> kartu \"uzdrav se\".",
-    "goodluckCard": "Karta \"Hodně štěstí!\"",
+    "goodluckCard": "Hodně štěstí",
     "goodluckCardExplanation": "Oba obdržíte ocenění Šťastný dopis!!",
     "goodluckCardNotes": "Pošli kartu \"hodně štěstí\" někomu z družiny.",
     "goodluck0": "Nechť tě vždy provází štěstěna!",

website/common/locales/cs/groups.json

@@ -5,9 +5,9 @@
     "innCheckIn": "Odpočívat v hostinci",
     "innText": "Odpočíváš v Hostinci! Zatímco tu budeš, tvé Denní úkoly ti na konci dne nijak neublíží, ale vždy se resetují. Ale pozor: pokud jsi v boji s příšerou, ublíží ti nesplněné úkoly tvých přátel v družině, pokud také nejsou v Hostinci! Navíc, jakákoliv újma, kterou uštědříš příšeře (nebo nasbírané předměty) se ti nepřipíšou dokud se z Hostince neodhlásíš.",
     "innTextBroken": "Odpočíváš v Hostinci, asi... Zatímco tu budeš, tvé Denní úkoly ti na konci dne nijak neublíží, ale vždy se resetují... Pokud jsi v boji s příšerou, ublíží ti nesplněné úkoly tvých přátel v družině... Pokud také nejsou v Hostinci... Navíc, jakákoliv újma, kterou uštědříš příšeře (nebo nasbírané předměty) se ti nepřipíšou dokud se z Hostince neodhlásíš... Jsem tak unavený...",
-    "innCheckOutBanner": "You are currently checked into the Inn. Your Dailies won't damage you and you won't make progress towards Quests.",
-    "innCheckOutBannerShort": "You are checked into the Inn.",
-    "resumeDamage": "Resume Damage",
+    "innCheckOutBanner": "Aktuálně odpočíváš v krčmě. Nesplněné denní úkoly ti nezpůsobí žádné poškození, ale ani nepřispěješ k pokroku v aktivní výpravě.",
+    "innCheckOutBannerShort": "Odpočíváš v krčmě.",
+    "resumeDamage": "Obnovit poškození",
     "helpfulLinks": "Pomocné odkazy",
     "communityGuidelinesLink": "Zásady komunity",
     "lookingForGroup": "Hledá se skupina (družina) příspěvky",
@@ -30,12 +30,12 @@
     "resources": "Zdroje",
     "askQuestionNewbiesGuild": "Zeptat se na otázku (Habitica Help guild)",
     "tavernAlert1": "Chcete-li oznámit chybu, vstupte",
-    "tavernAlert2": "the Report a Bug Guild",
+    "tavernAlert2": "cech 'Report a Bug'",
     "moderatorIntro1": "Moderátoři krčmy a cechu jsou:",
     "communityGuidelines": "zásady komunity",
     "communityGuidelinesRead1": "Prosíme, přečti si naše",
     "communityGuidelinesRead2": "než začneš chatovat.",
-    "bannedWordUsed": "Oops! Looks like this post contains a swearword, religious oath, or reference to an addictive substance or adult topic (<%= swearWordsUsed %>). Habitica has users from all backgrounds, so we keep our chat very clean. Feel free to edit your message so you can post it!",
+    "bannedWordUsed": "Ups! Vypadá to, že tento příspěvek obsahuje vulgarismus, náboženskou přísahu, nebo odkaz na návykovou látku či jiné dospělácké téma (<%= swearWordsUsed %>). Habiticu používají uživatelé z různých prostředí a věkových skupin, takže se snažíme držet náš chat co nejpřístupnější. Upravte tedy, prosíme, svou zprávu, abyste ji mohli zveřejnit.",
     "bannedSlurUsed": "Tvůj příspěvek obsahoval nevhodný jazyk, takže ti byl zrušen přístup na chat.",
     "party": "Družina",
     "createAParty": "Vytvořit družinu",
@@ -122,7 +122,7 @@
     "confirm": "Potvrdit",
     "leaveGroup": "Leave Guild",
     "leavePartyCha": "Leave Party challenges and...",
-    "leaveParty": "Leave Party",
+    "leaveParty": "Opustit družinu",
     "sendPM": "Poslat soukromou zprávu",
     "send": "Poslat",
     "messageSentAlert": "Zpráva odeslána",
@@ -320,7 +320,7 @@
     "cannotDeleteActiveGroup": "You cannot remove a group with an active subscription",
     "groupTasksTitle": "Group Tasks List",
     "approvalsTitle": "Tasks Awaiting Approval",
-    "upgradeTitle": "Upgrade",
+    "upgradeTitle": "Vylepšit",
     "blankApprovalsDescription": "When your group completes tasks that need your approval, they'll appear here! Adjust approval requirement settings under task editing.",
     "userIsClamingTask": "`<%= username %> has claimed:` <%= task %>",
     "approvalRequested": "Approval Requested",
@@ -350,7 +350,7 @@
     "joinedGuildText": "Ventured into the social side of Habitica by joining a Guild!",
     "badAmountOfGemsToPurchase": "Amount must be at least 1.",
     "groupPolicyCannotGetGems": "The policy of one group you're part of prevents its members from obtaining gems.",
-    "viewParty": "View Party",
+    "viewParty": "Zobrazit družinu",
     "newGuildPlaceholder": "Enter your guild's name.",
     "guildMembers": "Guild Members",
     "guildBank": "Guild Bank",
@@ -384,7 +384,7 @@
     "charactersRemaining": "<%= characters %> characters remaining",
     "guildSummary": "Summary",
     "guildSummaryPlaceholder": "Write a short description advertising your Guild to other Habiticans. What is the main purpose of your Guild and why should people join it? Try to include useful keywords in the summary so that Habiticans can easily find it when they search!",
-    "groupDescription": "Description",
+    "groupDescription": "Popis",
     "guildDescriptionPlaceholder": "Use this section to go into more detail about everything that Guild members should know about your Guild. Useful tips, helpful links, and encouraging statements all go here!",
     "markdownFormattingHelp": "[Markdown formatting help](http://habitica.wikia.com/wiki/Markdown_Cheat_Sheet)",
     "partyDescriptionPlaceholder": "This is our Party's description. It describes what we do in this Party. If you want to learn more about what we do in this Party, read the description. Party on.",
@@ -399,7 +399,7 @@
     "sendMessage": "Send Message",
     "promoteToLeader": "Transfer Ownership",
     "inviteFriendsParty": "Inviting friends to your Party will grant you an exclusive <br/> Quest Scroll to battle the Basi-List together!",
-    "upgradeParty": "Upgrade Party",
+    "upgradeParty": "Vlepšit družinu",
     "createParty": "Create a Party",
     "inviteMembersNow": "Would you like to invite members now?",
     "playInPartyTitle": "Play Habitica in a Party!",
@@ -414,7 +414,7 @@
     "inviteInformation": "Clicking \"Invite\" will send an invitation to your Party members. When all members have accepted or denied, the Quest begins.",
     "questOwnerRewards": "Quest Owner Rewards",
     "updateParty": "Update Party",
-    "upgrade": "Upgrade",
+    "upgrade": "Vylepšit",
     "selectPartyMember": "Select a Party Member",
     "areYouSureDeleteMessage": "Are you sure you want to delete this message?",
     "reverseChat": "Reverse Chat",

website/common/locales/cs/overview.json

@@ -2,13 +2,13 @@
   "needTips": "Potřebujete nějaké tipy jak začít? Zde je poctivý průvodce!",
 
   "step1": "Krok 1: Napiš svoje úkoly",
-  "webStep1Text": "denní úkolyHabitica je založená na plnění úkolů v reálném životě, tak si přidej nějaký nový. Až tě napadnou další, můžeš je kdykoliv přidat! Všechny úkoly se dají vytvořit kliknutím a zelené tlačítko \"Přidat úkol\".\n* **Nastav si [Úkolníček](http://habitica.wikia.com/wiki/To-Dos):** Přidej úkoly, které potřebuješ splnit pouze jednou, nebo nepravidelně, do sloupce Úkolníček. Na vytvořené úkoly můžeš kliknout a přidat do nich pod-úkoly, termín splnění, a další!\n* **Nastav si [Denní úkoly](http://habitica.wikia.com/wiki/Dailies):** Přidej aktivity, které potřebuješ plnit denně, případně pravidelně v určité dny každý týden, měsíc, nebo rok. Klikni na vytvořené úkoly a zadej, v jakém období a v jaké dny bude úkol aktivní, například každý třetí den.\n* **Nastav si [Návyky](http://habitica.wikia.com/wiki/Habits):** Sem můžeš zadat návyky, které si chceš budovat. Po kliknutí můžeš v případě potřeby určit, že se bude jednat pouze o pozitivní :heavy_plus_sign: nebo negativní :heavy_minus_sign: návyk.\n* **Nastav si [Odměny](http://habitica.wikia.com/wiki/Rewards):** Do odměn si kromě těch připravených můžeš přidat i vlastní motivaci v podobě oblíbených činností nebo třeba sladkostí. Je třeba si dát občas pauzu a dopřát si něco příjemného!\n* Pokud se chceš nechat inspirovat ohledně toho, jaké úkoly bys mohl přidat, podívej se na wiki stránku [Ukázky návyků](http://habitica.wikia.com/wiki/Sample_Habits), [Ukázky denních úkolů](http://habitica.wikia.com/wiki/Sample_Dailies), [Ukázky úkolníčku](http://habitica.wikia.com/wiki/Sample_To-Dos), and [Sample Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
+  "webStep1Text": "Habitica je založená na plnění úkolů v reálném životě, tak si přidej nějaký nový. Až tě napadnou další, můžeš je kdykoliv přidat! Všechny úkoly se dají vytvořit kliknutím a zelené tlačítko \"Přidat úkol\".\n* **Nastav si [Úkolníček](http://habitica.wikia.com/wiki/To-Dos):** Přidej úkoly, které potřebuješ splnit pouze jednou, nebo nepravidelně, do sloupce Úkolníček. Na vytvořené úkoly můžeš kliknout a přidat do nich pod-úkoly, termín splnění, a další!\n* **Nastav si [Denní úkoly](http://habitica.wikia.com/wiki/Dailies):** Přidej aktivity, které potřebuješ plnit denně, případně pravidelně v určité dny každý týden, měsíc, nebo rok. Klikni na vytvořené úkoly a zadej, v jakém období a v jaké dny bude úkol aktivní, například každý 3 den.\n* **Nastav si [Návyky](http://habitica.wikia.com/wiki/Habits):** Sem můžeš zadat návyky, které si chceš budovat. Po kliknutí můžeš v případě potřeby určit, že se bude jednat pouze o pozitivní :heavy_plus_sign: nebo negativní :heavy_minus_sign: návyk.\n* **Nastav si [Odměny](http://habitica.wikia.com/wiki/Rewards):** Do odměn si kromě těch připravených můžeš přidat i vlastní motivaci v podobě oblíbených činností nebo třeba sladkostí. Je třeba si dát občas pauzu a dopřát si něco příjemného!\n* Pokud se chceš nechat inspirovat ohledně toho, jaké úkoly bys mohl přidat, podívej se na wiki stránku [Ukázky návyků](http://habitica.wikia.com/wiki/Sample_Habits), [Ukázky denních úkolů](http://habitica.wikia.com/wiki/Sample_Dailies), [Ukázky úkolníčku](http://habitica.wikia.com/wiki/Sample_To-Dos), a [Ukázky odměn](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
 
   "step2": "Krok 2: Získej body za dělání věcí ve skutečném životě",
-  "webStep2Text": "Tak, teď začni plnit úkoly ze seznamu! Jak budeš dokončovat úkoly a odškrtávat si je v Habitice, budeš dostávat [zkušenosti](http://habitica.wikia.com/wiki/Experience_Points), které ti pomůžou ve zvyšování tvé úrovně, a  [zlato] http://habitica.wikia.com/wiki/Gold_Points), které ti umožní koupit si Odměny. Jestli ale budeš mít špatné zvyky a nebudeš plnit své denní úkoly tak budeš ztrácet [životy](http://habitica.wikia.com/wiki/Health_Points). Takže zkušenosti a životy slouží v Habitice jako zábavný indikátor tvého postupu k tvým cílům. Začneš pozorovat zlepšení v tvém životě jak tvoje postava bude postupovat ve hře.",
+  "webStep2Text": "Tak, teď začni plnit úkoly ze seznamu! Jak budeš dokončovat úkoly a odškrtávat si je v Habitice, budeš dostávat [zkušenosti](http://habitica.wikia.com/wiki/Experience_Points), které ti pomůžou ve zvyšování tvé úrovně, a  [zlato](http://habitica.wikia.com/wiki/Gold_Points), které ti umožní koupit si Odměny. Jestli ale budeš mít špatné zvyky a nebudeš plnit své denní úkoly tak budeš ztrácet [životy](http://habitica.wikia.com/wiki/Health_Points). Takže zkušenosti a životy slouží v Habitice jako zábavný indikátor tvého postupu k tvým cílům. Začneš pozorovat zlepšení v tvém životě jak tvoje postava bude postupovat ve hře.",
 
   "step3": "Krok 3: Uprav a prozkoumej zemi 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](/shops/market), and change it under [Inventory > Equipment](/inventory/equipment).\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](/party) 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).",
+  "webStep3Text": "Jakmile se zorientuješ v základech, můžeš z Habiticy vytěžit ještě více s pomocí těchto šikovných funkcí:\n* Zorganizuj si úkoly pomocí [štítků](http://habitica.wikia.com/wiki/Tags) (přidat je můžeš při úpravě úkolu).\n* Uprav si svou [postavu](http://habitica.wikia.com/wiki/Avatar) kliknutím na ikonu uživatele v pravém horním rohu.\n* Nakup si [vybavení](http://habitica.wikia.com/wiki/Equipment) pomocí sloupce odměn, případně přímo z [obchodů](/shops/market), a obleč si ho pod záložkou [Inventář > Vybavení](/inventory/equipment).\n* Spoj se s ostatními uživately v [krčmě](http://habitica.wikia.com/wiki/Tavern).\n* Počínaje 3 úrovní chovej [mazlíčky](http://habitica.wikia.com/wiki/Pets), pomocí sběru [vajíček](http://habitica.wikia.com/wiki/Eggs) a [líhnoucích lektvarů](http://habitica.wikia.com/wiki/Hatching_Potions). [Nakrm je](http://habitica.wikia.com/wiki/Food), aby vyrostli a stalo se z nich [jezdecké zvíře](http://habitica.wikia.com/wiki/Mounts).\n* Na 10 úrovni si můžeš vybrat [povolání](http://habitica.wikia.com/wiki/Class_System) a poté používat specifické [schopnosti](http://habitica.wikia.com/wiki/Skills) (postupně se odemknou mezi 11 až 14 úrovní).\n* Vytvoř družinu se svými přáteli (kliknutím na [Družina](/party) v navigačním menu) pro zvýšenou odpovědnost a získej svitek výpravy.\n* Porážej příšery a sbírej předměty během [výprav](http://habitica.wikia.com/wiki/Quests) (na 15 úrovni obdržíš svitek výpravy).",
 
   "overviewQuestions": "Máš otázky? Podívej se na [FAQ](/static/faq/) (časté dotazy)! Jestliže tam tvá otázka není zmíněna, můžeš se zeptat na další pomoc v [Habitica Help guild](/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a), což je cech stvořený na zodpovídání otázek ohledně Habiticy.\n\nHodně štěstí s úkoly!"
 }

website/common/locales/cs/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tygr veterán",
     "veteranLion": "Lev veterán",
     "veteranBear": "Medvěd Veterán",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Štěně Kerbera",
     "hydra": "Hydra",
     "mantisShrimp": "Strašek paví",

website/common/locales/cs/settings.json

@@ -181,7 +181,7 @@
     "consecutiveMonths": "Počet po sobě jdoucích měsíců:",
     "gemCapExtra": "Strop drahokamů extra:",
     "mysticHourglasses": "Mystické přesýpací hodiny:",
-    "mysticHourglassesTooltip": "Mystic Hourglasses",
+    "mysticHourglassesTooltip": "Mystické přesýpací hodiny",
     "paypal": "PayPal",
     "amazonPayments": "Amazon platby",
     "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",

website/common/locales/da/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Veterantiger",
     "veteranLion": "Veteranløve",
     "veteranBear": "Veteran Bear",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Kerberoshvalp",
     "hydra": "Hydra",
     "mantisShrimp": "Knælerreje",

website/common/locales/de/challenge.json

@@ -99,7 +99,7 @@
     "noChallengeTitle": "Du hast keine Wettbewerbe",
     "challengeDescription1": "Wettbewerbe sind Gemeinschaftsereignisse, an denen Spieler teilnehmen und Preise gewinnen können, indem sie die dazugehörigen Aufgaben erledigen.",
     "challengeDescription2": "Erhalte Empfehlungen für Wettbewerbe, basierend auf Deinen Interessen, durchstöbere Habitica's öffentliche Wettbewerbe oder erstelle Deine eigenen Wettbewerbe.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "Wir haben keine passende Wettbewerbe gefunden.",
     "createdBy": "Erstellt von",
     "joinChallenge": "Wettbewerb beitreten",
     "leaveChallenge": "Wettbewerb verlassen",

website/common/locales/de/faq.json

@@ -22,12 +22,12 @@
     "webFaqAnswer4": "Verschiedene Dinge können Dir Schaden zufügen. Erstens, Tagesaufgaben, die Du über Nacht unerledigt lässt, werden Dir schaden. Zweitens, eine schlechte Gewohnheit die Du anklickst, fügt Dir ebenfalls Schaden zu. Zuletzt, wenn Du mit Deiner Gruppe in einem Bosskampf bist und eines der Gruppenmitglieder seine Tagesaufgaben nicht erledigt hat, wird Dich der Boss angreifen. Der gewöhnliche Weg zu heilen, ist im Level aufzusteigen, was Deine komplette Gesundheit wiederherstellt. Du kannst auch mit Gold einen Heiltrank in der Belohnungsspalte erwerben. Zudem kannst Du, ab Level 10 oder höher, wählen, ein Heiler zu werden, wodurch Du Heilfähigkeiten erlernst. Auch andere Heiler, die mit Dir in einer Gruppe sind können Dich heilen. Erfahre mehr, indem Du \"Gruppe\" im Navigationsbalken klickst.",
     "faqQuestion5": "Wie spiele ich Habitica mit meinen Freunden?",
     "iosFaqAnswer5": "Am Besten lädst Du sie in eine Gruppe mit Dir ein! Gruppen können zusammen Quests bestreiten, Monster bekämpfen und sich gegenseitig mit Zaubern unterstützen. Geh auf Menü > Gruppe und klicke auf \"Neue Gruppe erstellen\" wenn Du noch keine Gruppe hast. Dann klicke auf die Mitgliederliste und lade sie ein indem Du oben rechts auf einladen klickst und ihre Benutzer-ID (die aus einer langen Zahlen-, Buchstabenkombination besteht, welche sie unter Einstellungen > Konto Details bei der App und unter Einstellungen > API auf der Webseite finden können) eingibst. Außerdem kannst Du auf der Webseite Freunde auch per E-Mail einladen, was für die App auch noch folgen wird.\n\nAuf der Webseite können Du und Deine Freunde auch Gilden beitreten, welche öffentliche Chat-Räume sind. Gilden werden der App auch noch hinzugefügt werden.",
-    "androidFaqAnswer5": "Am besten lädst Du sie in eine Gruppe mit Dir ein! Gruppen können zusammen Quests bestreiten, Monster bekämpfen und Fähigkeiten benutzen um einander zu unterstützen. Besuche die [Webseite](https://habitica.com/), um eine Gruppe zu erstellen, wenn Du bisher keiner angehörst. Ihr könnt außerdem gemeinsam einer Gilde beitreten (unter Soziales > Gilden). Gilden sind Chat-Räume, deren Mitglieder gemeinsame Ziele verfolgen, und können privat oder öffentlich sein. Du kannst in so vielen Gilden sein, wie Du möchtest, aber nur in einer Gruppe.\n\nGenauere Informationen findest Du auf den Wiki-Seiten für [Parties](http://habitrpg.wikia.com/wiki/Party) und [Guilds](http://habitrpg.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).",
+    "androidFaqAnswer5": "Am besten lädst Du sie in eine Gruppe mit Dir ein! Gruppen können zusammen Quests bestreiten, Monster bekämpfen und Fähigkeiten benutzen um einander zu unterstützen. Besuche die [Webseite](https://habitica.com/), um eine Gruppe zu erstellen, wenn Du bisher keiner angehörst. Ihr könnt außerdem gemeinsam einer Gilde beitreten (unter Soziales > Gilden). Gilden sind Chat-Räume, deren Mitglieder gemeinsame Ziele verfolgen und können privat oder öffentlich sein. Du kannst in so vielen Gilden sein, wie Du möchtest, aber nur in einer Gruppe.\n\nGenauere Informationen findest Du auf den Wiki-Seiten für [Parties](http://habitica.wikia.com/wiki/Party) und [Guilds](http://habitica.wikia.com/wiki/Guilds).",
+    "webFaqAnswer5": "Am besten lädst Du sie in eine Gruppe mit Dir ein, indem Du im Navigationsbalken auf \"Gruppe\" klickst! Gruppen können zusammen Quests bestreiten, Monster bekämpfen und Fähigkeiten benutzen um einander zu unterstützen. Ihr könnt außerdem gemeinsam einer Gilde beitreten (unter Soziales > Gilden). Gilden sind Chat-Räume, deren Mitglieder gemeinsame Ziele verfolgen und können privat oder öffentlich sein. Du kannst in so vielen Gilden sein, wie Du möchtest, aber nur in einer Gruppe. Genauere Informationen findest Du auf den Wiki-Seiten für [Parties](http://habitica.wikia.com/wiki/Party) und [Guilds](http://habitica.wikia.com/wiki/Guilds).",
     "faqQuestion6": "Woher bekomme ich Haustiere oder Reittiere?",
     "iosFaqAnswer6": "Wenn Du Level 3 erreichst, wirst Du das Beutesystem freischalten. Jedes Mal wenn Du eine Aufgabe erledigst, hast Du eine zufällige Chance ein Ei, einen Schlüpftrank oder Futter zu erhalten. Diese werden unter Inventar > Marktplatz gespeichert. \n\nUm ein Haustier auszubrüten benötigst Du ein Ei und einen Schlüpftrank. Klicke auf das Ei, um die Spezies auszuwählen, welche Du schlüpfen lassen möchtest, und klicke anschließend auf den Schlüpftrank, um die Farbe zu bestimmen! Um es Deinem Avatar hinzuzufügen, gehe zu Inventar > Haustiere und klicke auf das gewünschte Tier.\n\nDu kannst Deine Haustiere unter Inventar > Haustiere auch füttern, sodass sie zu Reittieren heranwachsen. Klicke auf ein Haustier und dann auf das Futter aus dem Menü auf der rechten Seite, um es zu füttern! Damit es zu einem Reittier heranwächst, musst Du Dein Haustier mehrmals füttern, wenn Du jedoch sein bevorzugtes Futter herausfindest, wächst es schneller. Dies kannst Du entweder durch ausprobieren selbst herausfinden oder [im Wiki nachschauen - Vorsicht: Spoiler!](http://de.habitica.wikia.com/wiki/Futter#Bevorzugtes_Futter). Wenn Du ein Reittier erhalten hast, gehe zu Inventar > Reittiere und klicke das Tier an, um es Deinem Avatar hinzuzufügen.\n\nDu kannst auch Eier für Quest-Haustiere erhalten, indem Du bestimmte Quests abschließt. (Siehe weiter unten, um mehr über Quests zu erfahren.)",
     "androidFaqAnswer6": "Wenn Du Level 3 erreichst, wirst Du das Beutesystem freischalten. Jedes Mal wenn Du eine Aufgabe erledigst, hast Du eine zufällige Chance ein Ei, einen Schlüpftrank oder Futter zu erhalten. Diese werden unter Inventar > Marktplatz gespeichert. \n\nUm ein Haustier auszubrüten benötigst Du ein Ei und einen Schlüpftrank. Klicke auf das Ei, um die Spezies auszuwählen, welche Du schlüpfen lassen möchtest, und klicke anschließend auf den Schlüpftrank, um die Farbe zu bestimmen! Um es Deinem Avatar hinzuzufügen, gehe zu Inventar > Haustiere und klicke auf das gewünschte Tier.\n\nDu kannst Deine Haustiere unter Inventar > Haustiere auch füttern, sodass sie zu Reittieren heranwachsen. Klicke auf ein Haustier und dann auf das Futter aus dem Menü auf der rechten Seite, um es zu füttern! Damit es zu einem Reittier heranwächst, musst Du Dein Haustier mehrmals füttern, wenn Du jedoch sein bevorzugtes Futter herausfindest, wächst es schneller. Dies kannst Du entweder durch ausprobieren selbst herausfinden oder [im Wiki nachschauen - Vorsicht: Spoiler!](http://de.habitica.wikia.com/wiki/Futter#Bevorzugtes_Futter). Wenn Du ein Reittier erhalten hast, gehe zu Inventar > Reittiere und klicke das Tier an, um es Deinem Avatar hinzuzufügen.\n\nDu kannst auch Eier für Quest-Haustiere erhalten, indem Du bestimmte Quests abschließt. (Siehe weiter unten, um mehr über Quests zu erfahren.)",
-    "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.)",
+    "webFaqAnswer6": "Wenn Du Level 3 erreichst, wirst Du das Beutesystem freischalten. Jedes Mal wenn Du eine Aufgabe erledigst, hast Du eine zufällige Chance ein Ei, einen Schlüpftrank oder Futter zu erhalten. Diese werden unter Inventar > Marktplatz gespeichert. Um ein Haustier auszubrüten benötigst Du ein Ei und einen Schlüpftrank. Wenn Du beides hast, gehe zu Inventar > Haustiere um Dein Haustier mit einem Klick darauf schlüpfen zu lassen. Um ein geschlüpftes Haustier Deinem Avatar hinzuzufügen, klicke auf das gewünschte Tier. Du kannst Deine Haustiere unter Inventar > Haustiere auch füttern, sodass sie zu Reittieren heranwachsen. Ziehe dazu Futter aus dem Aktionsbalken am unteren Bildschirmrand auf ein Haustier. Damit es zu einem Reittier heranwächst, musst Du Dein Haustier mehrmals füttern. Wenn Du jedoch sein bevorzugtes Futter herausfindest, wächst es schneller. Dies kannst Du entweder durch ausprobieren selbst herausfinden oder [im Wiki nachschauen - Vorsicht: Spoiler!](http://de.habitica.wikia.com/wiki/Futter#Bevorzugtes_Futter). Wenn Du ein Reittier erhalten hast, klicke das Tier an, um es Deinem Avatar hinzuzufügen. Du kannst auch Eier für Quest-Haustiere erhalten, indem Du bestimmte Quests abschließt. (Siehe weiter unten, um mehr über Quests zu erfahren.)",
     "faqQuestion7": "Wie werde ich ein Krieger, Magier, Schurke oder Heiler?",
     "iosFaqAnswer7": "Wenn Du Level 10 erreichst, kannst Du wählen, ob Du Krieger, Magier, Schurke oder Heiler werden möchtest. (Alle Spieler beginnen standardmäßig als Krieger.) Jede Klasse hat unterschiedliche Ausrüstungsoptionen, unterschiedliche Fähigkeiten, die sie ab Level 11 verwenden können, und unterschiedliche Vorteile. Krieger fügen Bossen leicht Schaden zu, halten mehr Schaden von ihren Aufgaben aus und helfen ihrer Gruppe widerstandsfähiger zu werden. Magier schaden Bossen ebenfalls leicht, steigen schnell Level auf und können Mana für ihre Gruppe wiederherstellen. Schurken erhalten das meiste Geld, finden die meiste Beute und können ihrer Gruppe helfen, dies ebenfalls zu tun. Zum Schluss können Heiler sich selbst und ihre Gruppe heilen. \n\nWenn Du nicht direkt eine Klasse auswählen möchtest -- zum Beispiel, wenn Du gerade dabei bist die gesamte Ausrüstung für Deine aktuelle Klasse zu kaufen -- kannst Du \"Später auswählen\" klicken und die Klasse unter Benutzer > Werte später auswählen.",
     "androidFaqAnswer7": "Wenn Du Level 10 erreichst, kannst Du wählen, ob Du Krieger, Magier, Schurke oder Heiler werden möchtest. (Alle Spieler beginnen standardmäßig als Krieger.) Jede Klasse hat unterschiedliche Ausrüstungsoptionen, unterschiedliche Fähigkeiten, die sie ab Level 11 verwenden können, und unterschiedliche Vorteile. Krieger fügen Bossen leicht Schaden zu, halten mehr Schaden von ihren Aufgaben aus und helfen ihrer Gruppe widerstandsfähiger zu werden. Magier schaden Bossen ebenfalls leicht, steigen schnell Level auf und können Mana für ihre Gruppe wiederherstellen. Schurken erhalten das meiste Geld, finden die meiste Beute und können ihrer Gruppe helfen, dies ebenfalls zu tun. Zum Schluss können Heiler sich selbst und ihre Gruppe heilen. \n\nWenn Du nicht direkt eine Klasse auswählen möchtest -- zum Beispiel, wenn Du gerade dabei bist die gesamte Ausrüstung für Deine aktuelle Klasse zu kaufen -- kannst Du \"Später auswählen\" klicken und die Klasse unter Benutzer > Werte später auswählen.",

website/common/locales/de/merch.json

@@ -5,16 +5,16 @@
   "merch-teespring-summary" : "Teespring ist eine Plattform, die es jedem ermöglicht, hochwertige Produkte zu erstellen und zu verkaufen - ohne Kosten und Risiken.",
   "merch-teespring-goto" : "Schnapp' Dir ein Habitica T-Shirt",
 
-  "merch-teespring-mug-summary" : "Teespring ist eine Plattform die es jedem ermöglicht, ohne Kosten oder Risiken allseits beliebte Produkte in hoher Qualität herzustellen und zu verkaufen.",
+  "merch-teespring-mug-summary" : "Teespring ist eine Plattform, die es jedem ermöglicht, hochwertige Produkte zu erstellen und zu verkaufen - ohne Kosten und Risiken.",
   "merch-teespring-mug-goto" : "Hol Dir eine Habitica Tasse",
 
-  "merch-teespring-eu-summary" : "EUROPÄISCHE VERSION: Teespring ist eine Plattform, die es jedem erleichtert, qualitative Produkte zu erstellen und zu verkaufen - ohne Kosten und Risiko. Die Menschen werden es lieben!",
+  "merch-teespring-eu-summary" : "EUROPÄISCHE VERSION: Teespring ist eine Plattform, die es jedem ermöglicht, hochwertige Produkte zu erstellen und zu verkaufen - ohne Kosten und Risiko.",
   "merch-teespring-eu-goto" : "Schnapp' dir ein Habitica T-Shirt (EU)",
 
-  "merch-teespring-mug-eu-summary" : "EUROPÄISCHE VERSION: Teespring ist eine Plattform, die es jedem erlaubt beliebte, hochwertige Produkte einfach zu erstellen und zu verkaufen, ganz ohne Kosten oder Risiken.",
+  "merch-teespring-mug-eu-summary" : "EUROPÄISCHE VERSION: Teespring ist eine Plattform, die es jedem ermöglicht, hochwertige Produkte zu erstellen und zu verkaufen - ohne Kosten und Risiko.",
   "merch-teespring-mug-eu-goto" : "Hol' Dir eine Habitica Tasse (EU)",
 
-  "merch-stickermule-summary" : "Klebe den stolzen Melior dorthin, wo du (oder jemand anders) eine Erinnerung an aktuelle und zukünftige Leistungen brauchst! ",
+  "merch-stickermule-summary" : "Klebe den stolzen Melior dorthin, wo Du (oder jemand anders) eine Erinnerung an aktuelle und zukünftige Leistungen brauchst! ",
   "merch-stickermule-goto" : "Schnapp' Dir Habitica Aufkleber"
 
 }

website/common/locales/de/messages.json

@@ -51,8 +51,8 @@
     "messageGroupChatFlagAlreadyReported": "Du hast diese Nachricht bereits gemeldet",
     "messageGroupChatNotFound": "Nachricht wurde nicht gefunden!",
     "messageGroupChatAdminClearFlagCount": "Nur Admins können den Zählmarker zurücksetzen!",
-    "messageCannotFlagSystemMessages": "Du kannst eine Systemmeldungen nicht als unangemessen melden. Falls Du bezüglich dieser Meldung eine Verletzung der Community-Richtlinien melden willst, sende bitte eine E-Mail mit einem Screenshot und einer Erklärung an Lemoness unter <%= communityManagerEmail %>.",
-    "messageGroupChatSpam": "Ups, es sieht so aus als ob du zu viele Nachrichten schreibst! Bitte warte eine Minute und versuche es erneut. Das Gasthaus kann nur 200 Nachrichten gleichzeitig beinhalten und deshalb ermutigt Habitica längere, mehr durchdachte Nachrichten und hilfreiche Antworten zu schreiben. Wir können es kaum erwarten zu hören, was du zu sagen hast. :)",
+    "messageCannotFlagSystemMessages": "Du kannst eine Systemmeldung nicht als unangemessen melden. Falls Du bezüglich dieser Meldung eine Verletzung der Community-Richtlinien melden willst, sende bitte eine E-Mail mit einem Screenshot und einer Erklärung an Lemoness unter <%= communityManagerEmail %>.",
+    "messageGroupChatSpam": "Ups, es sieht so aus als ob Du zu viele Nachrichten schreibst! Bitte warte eine Minute und versuche es erneut. Das Gasthaus kann nur 200 Nachrichten gleichzeitig beinhalten und deshalb ermutigt Habitica längere, durchdachte Nachrichten und hilfreiche Antworten zu schreiben. Wir können es kaum erwarten zu hören, was Du zu sagen hast. :)",
     "messageCannotLeaveWhileQuesting": "Du kannst diese Gruppeneinladung nicht annehmen, während Du mit einer Quest beschäftigt bist. Wenn Du dieser Gruppe beitreten möchtest, musst Du zuerst die Quest über Deine Gruppenanzeige abbrechen. Du erhältst die Questschriftrolle zurück.",
     "messageUserOperationProtected": "Pfad `<%= operation %>` wurde nicht gespeichert, da dieser geschützt ist.",
     "messageUserOperationNotFound": "<%= operation %> Operation nicht gefunden",
@@ -61,5 +61,5 @@
     "notificationsRequired": "Mitteilungs-IDs werden benötigt.",
     "unallocatedStatsPoints": "Du kannst <span class=\"notification-bold-blue\"><%= points %> Attributpunkt(e)</span> verteilen",
     "beginningOfConversation": "Dies ist der Anfang Deiner Unterhaltung mit<%= userName %>. Denke an einen freundlichen und respektvollen Umgang und halte Dich an die Community-Richtlinien!",
-    "messageDeletedUser": "Sorry, this user has deleted their account."
+    "messageDeletedUser": "Tut uns leid, dieser Benutzer hat sein Konto gelöscht."
 }

website/common/locales/de/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Veterantiger",
     "veteranLion": "Veteranlöwe",
     "veteranBear": "Veteran Bärenjunges",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Zerberuswelpe",
     "hydra": "Hydra",
     "mantisShrimp": "Fangschreckenkrebs",

website/common/locales/de/rebirth.json

@@ -21,7 +21,7 @@
     "rebirthOrb": "Hat eine Sphäre der Wiedergeburt verwendet um noch einmal von vorne zu beginnen, nachdem Level <%= level %> erreicht wurde.",
     "rebirthOrb100": "Hat eine Sphäre der Wiedergeburt verwendet um noch mal von vorne zu beginnen, nachdem Level 100 oder höher erreicht wurde.",
     "rebirthOrbNoLevel": "Hat eine Sphäre der Wiedergeburt verwendet um noch mal von vorne zu beginnen.",
-    "rebirthPop": "Beginne sofort von vorn mit einem Charakter auf Level 1, aber behalte Erfolge, Sammelgegenstände und Ausrüstung. Deine Aufgaben und ihre Verläufe bleiben erhalten, werden aber auf gelb zurückgesetzt. Deine Strähnen verfallen, ausser für Wettwerbs-Aufgaben. Gold, Erfahrung, Mana und alle Effekte von Fähigkeiten werden entfernt. Das wird sofort in Kraft treten. Für mehr Informationen schau im Wiki auf Seite <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> nach.",
+    "rebirthPop": "Beginne sofort von vorn mit einem Charakter auf Level 1, aber behalte Erfolge, Sammelgegenstände und Ausrüstung. Deine Aufgaben und ihre Verläufe bleiben erhalten, werden aber auf gelb zurückgesetzt. Deine Strähnen verfallen, ausser für Wettwerbs-Aufgaben. Gold, Erfahrung, Mana und alle Effekte von Fähigkeiten werden entfernt. All das wird sofort in Kraft treten. Für mehr Informationen schau im Wiki auf Seite <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> nach.",
     "rebirthName": "Sphäre der Wiedergeburt",
     "reborn": "Wiedergeboren, max. Level <%= reLevel %>",
     "confirmReborn": "Bist Du sicher?",

website/common/locales/de/subscriber.json

@@ -7,7 +7,7 @@
     "buyGemsGoldText": "Alexander der Händler verkauft Dir Edelsteine zum Preis von 20 Goldstücken pro Edelstein. Seine Lieferungen sind anfänglich auf 25 Edelsteine pro Monat beschränkt, aber dieses Limit erhöht sich um 5 Edelsteine für alle 3 aufeinanderfolgenden Monate, in denen du ein Abo hast, bis zu einem Maximum von 50 Edelsteinen pro Monat!",
     "mustSubscribeToPurchaseGems": "Du musst ein Abonnement abschließen, um Edelsteine mit Gold zu kaufen",
     "reachedGoldToGemCap": "Du hast das Limit für die Umwandlung von Gold in Edelsteine (<%= convCap %>) für diesen Monat erreicht. Die Limits existieren zur Vermeidung von Missbrauch / Farmen. Sie werden innerhalb der ersten drei Tage jedes Monats zurückgesetzt.",
-    "reachedGoldToGemCapQuantity": "Deine angeforderte Menge von <%= quantity %> übersteigt das Gold=>Edelstein Umwandlungslimit in Höhe von <%= convCap %> für diesen Monat. Dieses haben wir, damit Missbrauch und Farming verhindert werden kann. Das Limit wird innerhalb der ersten drei Tage eines Monats zurückgesetzt.",
+    "reachedGoldToGemCapQuantity": "Deine angeforderte Menge von <%= quantity %> übersteigt das Gold=>Edelstein Umwandlungslimit in Höhe von <%= convCap %> für diesen Monat. Die Limits haben wir um Missbrauch und Farming zu verhindern. Das Limit wird innerhalb der ersten drei Tage eines Monats zurückgesetzt.",
     "retainHistory": "Behalte zusätzliche Verlaufeinträge",
     "retainHistoryText": "Macht abgeschlossene To-Dos und den Aufgabenverlauf länger verfügbar.",
     "doubleDrops": "Doppelte Beutelimite pro Tag",
@@ -39,7 +39,7 @@
     "subscribed": "Abonniert",
     "manageSub": "Klicke um Abonnements zu verwalten",
     "cancelSub": "Abonnement beenden",
-    "cancelSubInfoGoogle": "Bitte schaue in \"Konto\" > \"Abos\" im Google Play Store App nach, um Dein Abonnement zu kündigen oder um zu sehen, wann Dein Abonnement endet, wenn Du es bereits gekündigt hast. Du kannst dort aber nicht sehen, ob dein Abonnement ausgelaufen ist. ",
+    "cancelSubInfoGoogle": "Bitte schaue in \"Konto\" > \"Abos\" im Google Play Store App nach, um Dein Abonnement zu kündigen oder um zu sehen, wann Dein Abonnement endet, wenn Du es bereits gekündigt hast. Diese Seite kann nicht anzeigen, ob Dein Abonnement gekündigt wurde.",
     "cancelSubInfoApple": "Bitte befolge <a href=\"https://support.apple.com/en-us/HT202039\">Apple's offizielle Hinweise</a> um Dein Abonnement zu kündigen oder das Ablaufdatum Deines Abonnements zu sehen, wenn Du es bereits gekündigt hast. Diese Seite kann nicht anzeigen, ob Dein Abonnement gekündigt wurde.",
     "cancelSubInfoGroupPlan": "Weil Du ein kostenloses Abonnement von einem Gruppentarif hast, kannst Du es nicht beenden. Es endet, wenn Du nicht länger in der Gruppe bist. Falls Du Gruppenleiter bist und den gesamten Gruppentarif widerrufen möchtest, kannst Du das im \"Zahlungsdetails\" Tab der Gruppe tun.",
     "canceledSubscription": "Abonnement storniert",
@@ -72,21 +72,21 @@
     "subCanceled": "Das Abonnement wird auslaufen zum",
     "buyGemsGoldTitle": "Kaufe Edelsteine mit Gold",
     "becomeSubscriber": "Abonnent werden",
-    "subGemPop": "Als Abonnent von Habitica kannst Du pro Monat eine bestimmte Anzahl von Edelsteinen mit Gold kaufen.",
+    "subGemPop": "Weil Du Abonnent von Habitica bist, kannst Du pro Monat eine bestimmte Anzahl von Edelsteinen mit Gold kaufen.",
     "subGemName": "Abonnenten-Edelsteine",
     "freeGemsTitle": "Erhalte kostenlose Edelsteine",
     "maxBuyGems": "Du hast diesen Monat schon die erlaubte Menge Edelsteine gekauft. Innert der ersten drei Tage des folgenden Monats werden sie wieder verfügbar. Danke für Dein Abonnement!",
     "buyGemsAllow1": "Du kannst noch",
     "buyGemsAllow2": "weitere Edelsteine in diesem Monat erwerben",
     "purchaseGemsSeparately": "Zusätzliche Edelsteine kaufen",
-    "subFreeGemsHow": "Habitica Spieler können Edelsteine verdienen, indem sie  <a href=\"/challenges/findChallenges\">Wettbewerbe</a> gewinnen, die Edelsteine als Preise vergeben oder als <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">Belohnung für Mitwirkende indem sie zur Entwicklung von Habitica beitragen.</a>",
-    "seeSubscriptionDetails": "Gehe zu <a href='/user/settings/subscription'>Einstellungen;Abonnement</a> um die Details Deines Abonnements zu sehen!",
+    "subFreeGemsHow": "Habitica Spieler können Edelsteine verdienen, indem sie  <a href=\"/challenges/findChallenges\">Wettbewerbe</a> gewinnen die Edelsteine als Preise vergeben oder als <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">Belohnung für Mitwirkende indem sie zur Entwicklung von Habitica beitragen.</a>",
+    "seeSubscriptionDetails": "Gehe zu <a href='/user/settings/subscription'>Einstellungen &gt; Abonnement</a> um die Details Deines Abonnements zu sehen!",
     "timeTravelers": "Mysteriöse Zeitreisende",
     "timeTravelersTitleNoSub": "<%= linkStartTyler %>Tyler<%= linkEnd %> und <%= linkStartVicky %>Vicky<%= linkEnd %>",
     "timeTravelersTitle": "Mysteriöse Zeitreisende",
     "timeTravelersPopoverNoSub": "Du brauchst eine mystische Sanduhr um die mysteriösen Zeitreisenden herbeizurufen! <%= linkStart %>Abonnenten<%= linkEnd %> verdienen eine mystische Sanduhr für je drei Monate durchgehendes Abonnement. Komm zurück, wenn Du eine mystische Sanduhr hast und die Zeitreisenden werden Dir ein seltenes Haustier, Reittier oder Abonnentengegenstandsset aus der Vergangenheit holen ... oder vielleicht sogar aus der Zukunft.",
-    "timeTravelersPopoverNoSubMobile": "Sieht aus als bräuchtest du die mystische Sanduhr um das Zeitportal zu öffnen und die mysteriösen Zeitreisenden herbei zu rufen.",
-    "timeTravelersPopover": "Deine mystische Sanduhr hat unser Zeitportal geöffnet! Wähle etwas aus, was du uns für dich aus der Vergangenheit oder Zukunft holen möchtest.",
+    "timeTravelersPopoverNoSubMobile": "Sieht aus als bräuchtest Du eine Mystische Sanduhr um das Zeitportal zu öffnen und die Mysteriösen Zeitreisenden herbei zu rufen.",
+    "timeTravelersPopover": "Deine Mystische Sanduhr hat unser Zeitportal geöffnet! Wähle etwas aus, was wir für Dich aus der Vergangenheit oder Zukunft holen sollen.",
     "timeTravelersAlreadyOwned": "Herzlichen Glückwunsch! Du besitzt bereits alles, was die Zeitreisenden gerade anbieten können. Danke, dass Du die Seite unterstützt!",
     "mysticHourglassPopover": "Eine mystische Sanduhr erlaubt Dir Gegenstände zu kaufen, welche in der Vergangenheit nur zeitlich begrenzt zur Verfügung standen. Dies sind beispielsweise die Überraschungs-Abonnenten-Sets und Belohnungen ehemaliger Weltbosse.",
     "mysterySetNotFound": "Überraschungsset nicht gefunden, oder Set wurde bereits erworben.",
@@ -132,7 +132,7 @@
     "mysterySet201703": "Schimmer-Set",
     "mysterySet201704": "Feen-Set",
     "mysterySet201705": "Gefiederter- Kämpfer-Set",
-    "mysterySet201706": "Piraten-Pionier Set",
+    "mysterySet201706": "Piraten-Pionier-Set",
     "mysterySet201707": "Quallenzauberer-Set",
     "mysterySet201708": "Lavakrieger-Set",
     "mysterySet201709": "Zauberschüler-Set",
@@ -141,13 +141,13 @@
     "mysterySet201712": "Kerzenzauberer-Set",
     "mysterySet201801": "Frostkobold-Set",
     "mysterySet201802": "Liebeskäfer-Set",
-    "mysterySet201803": "Wagemutige-Libelle-Set",
+    "mysterySet201803": "Wagemutige Libelle-Set",
     "mysterySet201804": "Elegantes Eichhörnchen-Set",
     "mysterySet201805": "Phänomenales Pfauen-Set",
     "mysterySet201806": "Anziehendes Anglerfisch-Set",
     "mysterySet201807": "Seeschlangen-Set",
-    "mysterySet201808": "Lavadrachen Set",
-    "mysterySet201809": "Autumnal Armor Set",
+    "mysterySet201808": "Lavadrachen-Set",
+    "mysterySet201809": "Herbstliches Rüstungs-Set",
     "mysterySet301404": "Steampunk-Standard-Set",
     "mysterySet301405": "Steampunk-Zubehör-Set",
     "mysterySet301703": "Pfauen-Steampunk-Set",
@@ -199,15 +199,15 @@
     "subscriptionBenefitLeadin": "Unterstütze Habitica, indem Du Abonnent wirst, und Du erhältst all diese nützlichen Vorteile!",
     "subscriptionBenefit1": "Alexander der Händler wird Dir Edelsteine für 20 Goldmünzen das Stück verkaufen!",
     "subscriptionBenefit2": "Erledigte To-Do's und der Aufgabenverlauf sind länger verfügbar.",
-    "subscriptionBenefit3": "Finde mehr Gegenstände in Habitica mit der zweifachen Obergrenze für Beutefunde.",
+    "subscriptionBenefit3": "Finde mehr Gegenstände in Habitica mit der verdoppelten Obergrenze für Beutefunde.",
     "subscriptionBenefit4": "Einzigartige Verkleidungsgegenstände für Deinen Avatar jeden Monat.",
     "subscriptionBenefit5": "Erhalte das exklusive Königlich purpurfarbene Wolpertinger Haustier!",
     "subscriptionBenefit6": "Verdiene Dir Mystische Sanduhren, um sie im Laden der Myteriösen Zeitreisenden einzusetzen!",
     "haveCouponCode": "Hast Du einen Rabatt-Code?",
     "subscriptionAlreadySubscribedLeadIn": "Danke für's abonnieren!",
-    "subscriptionAlreadySubscribed1": "Um die Details Deines Abonnements zu sehen und es zu widerrufen, erneuern oder zu ändern, gehe bitte zu <a href='/user/settings/subscription'>Benutzer; Einstellungen;Abonnement</a>.",
+    "subscriptionAlreadySubscribed1": "Um die Details Deines Abonnements zu sehen und es zu widerrufen, erneuern oder zu ändern, gehe bitte zu <a href='/user/settings/subscription'>Benutzer &gt; Einstellungen &gt; Abonnement</a>.",
     "purchaseAll": "Alles Kaufen",
     "gemsPurchaseNote": "Abonnenten können im Markt Edelsteine mit Gold kaufen! Für schnellen Zugriff kannst Du den Edelstein in Deiner Belohnungsspalte anheften.",
     "gemsRemaining": "verbleibende Edelsteine",
-    "notEnoughGemsToBuy": "Du kannst den gewünschten Betrag an Edelsteinen nicht kaufen"
+    "notEnoughGemsToBuy": "Du kannst die gewünschte Anzahl Edelsteine nicht kaufen"
 }

website/common/locales/en/pets.json

@@ -19,6 +19,7 @@
   "veteranTiger": "Veteran Tiger",
   "veteranLion": "Veteran Lion",
   "veteranBear": "Veteran Bear",
+  "veteranFox": "Veteran Fox",
   "cerberusPup": "Cerberus Pup",
   "hydra": "Hydra",
   "mantisShrimp": "Mantis Shrimp",

website/common/locales/en@pirate/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Veteran Tiger",
     "veteranLion": "Veteran Lion",
     "veteranBear": "Veteran Bear",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cerberus Pup",
     "hydra": "Hydra",
     "mantisShrimp": "Mantis Shrimp",

website/common/locales/en_GB/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Veteran Tiger",
     "veteranLion": "Veteran Lion",
     "veteranBear": "Veteran Bear",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cerberus Pup",
     "hydra": "Hydra",
     "mantisShrimp": "Mantis Shrimp",

website/common/locales/es/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tigre veterano",
     "veteranLion": "León veterano",
     "veteranBear": "Oso Veterano",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cachorro de Cerbero",
     "hydra": "Hidra",
     "mantisShrimp": "Mantis marina",

website/common/locales/es_419/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tigre Veterano ",
     "veteranLion": "Leon Veterano",
     "veteranBear": "Oso veterano",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cachorro Cerbero",
     "hydra": "Hidra",
     "mantisShrimp": "Mantis Marina",

website/common/locales/fr/challenge.json

@@ -99,7 +99,7 @@
     "noChallengeTitle": "Vous n'avez aucun défi.",
     "challengeDescription1": "Les défis sont des événements communautaires dans lesquels les joueurs s'affrontent et gagnent des prix en complétant une série de tâches spécifiques.",
     "challengeDescription2": "Trouvez des défis recommandés sur la base de vos centres d'intérêt, parcourez la liste des défis publics d'Habitica, ou créez vos propres défis.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "Nous n'avons trouvé aucun défi correspondant.",
     "createdBy": "Créé par",
     "joinChallenge": "Rejoindre le défi",
     "leaveChallenge": "Quitter le défi",

website/common/locales/fr/character.json

@@ -80,7 +80,7 @@
     "autoEquipPopoverText": "Sélectionnez cette option pour vous équiper automatiquement d'une tenue dès que vous l'achetez.",
     "costumeDisabled": "Vous avez désactivé l'utilisation du costume.",
     "gearAchievement": "Vous avez gagné le succès \"Armé jusqu'aux dents\" pour avoir atteint le niveau maximal de l'ensemble d'équipement de votre classe ! Vous avez acquis les ensembles complets suivants:",
-    "gearAchievementNotification": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class!",
+    "gearAchievementNotification": "Vous avez obtenu le succès \"Armé jusqu'aux dents\" pour avoir utilisé les meilleures armes et armures pour une classe !",
     "moreGearAchievements": "Pour obtenir plus de badges d'équipement ultime, changez de classe sur <a href='/user/settings/site' target='_blank'>Paramètres &gt; Site </a> et achetez l'équipement de votre nouvelle classe !",
     "armoireUnlocked": "Pour plus d'équipement, regardez dans l'<strong>armoire enchantée !</strong>. Cliquez sur la récompense \"Armoire enchantée\" pour une chance aléatoire d'obtenir une pièce d'équipement spéciale ! Cela peut aussi vous donner de l'expérience ou de la nourriture.",
     "ultimGearName": "S'armer jusqu'aux dents – <%= ultClass %>",

website/common/locales/fr/groups.json

@@ -340,8 +340,8 @@
     "canceledGroupPlan": "Offre de groupe annulée",
     "groupPlanCanceled": "L'Offre de groupe sera inactive à partir du",
     "purchasedGroupPlanPlanExtraMonths": "Vous disposez d'un crédit de <%= months %> mois d'inscription supplémentaire.",
-    "addManager": "Assign Manager",
-    "removeManager2": "Unassign Manager",
+    "addManager": "Choisir comme responsable",
+    "removeManager2": "Retirer comme responsable",
     "userMustBeMember": "L'utilisateur doit être un membre",
     "userIsNotManager": "L'utilisateur n'est pas un gestionnaire",
     "canOnlyApproveTaskOnce": "Cette tâche a déjà été approuvée.",
@@ -392,12 +392,12 @@
     "noGuildsTitle": "Vous n'êtes membre d'aucun guilde.",
     "noGuildsParagraph1": "Les guildes sont des groupes sociaux créés par des joueurs qui peuvent vous offrir du soutien, vous responsabilisez et vous encouragez.",
     "noGuildsParagraph2": "Cliquez sur l'onglet Découvrir pour voir les guildes suggérées en fonction de vos intérêts, naviguer dans les guildes publiques d'Habitica, ou créer votre propre guilde.",
-    "noGuildsMatchFilters": "We couldn't find any matching Guilds.",
+    "noGuildsMatchFilters": "Nous n'avons pas trouvé de guilde correspondante.",
     "privateDescription": "Une guilde privée ne seras pas affichée dans le répertoire des guildes d'Habitica. Les nouveaux membres ne peuvent être ajoutés que sur invitation.",
     "removeInvite": "Annuler l'invitation",
     "removeMember": "Retirer le membre",
     "sendMessage": "Envoyer un message",
-    "promoteToLeader": "Transfer Ownership",
+    "promoteToLeader": "Transférer la responsabilité",
     "inviteFriendsParty": "Invitez des amis dans votre équipe et vous recevrez <br/> un parchemin de quête pour combattre le basi-liste ensemble !",
     "upgradeParty": "Mettre à jour l'équipe",
     "createParty": "Créer une équipe",

website/common/locales/fr/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tigre Vétéran",
     "veteranLion": "Lion Vétéran",
     "veteranBear": "Ours vétéran",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Chiot Cerbère",
     "hydra": "Hydre",
     "mantisShrimp": "Crevette-mante",

website/common/locales/he/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "נמר ותיק",
     "veteranLion": "אריה ותיק",
     "veteranBear": "Veteran Bear",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "גור קרברוס",
     "hydra": "הידרה",
     "mantisShrimp": "חסילון-מנטיס",

website/common/locales/hu/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Veterán tigris",
     "veteranLion": "Veterán oroszlán",
     "veteranBear": "Veterán medve",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Kerberosz kölyök",
     "hydra": "Hidra",
     "mantisShrimp": "Sáskarák",

website/common/locales/id/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Harimau Veteran",
     "veteranLion": "Singa Veteran",
     "veteranBear": "Beruang Veteran",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Anak Anjing Cerberus",
     "hydra": "Hydra",
     "mantisShrimp": "Udang Mantis",

website/common/locales/it/backgrounds.json

@@ -347,17 +347,17 @@
     "backgroundFlyingOverAncientForestText": "Antica Foresta",
     "backgroundFlyingOverAncientForestNotes": "Vola sopra le punte di un'Antica Foresta.",
     "backgrounds052018": "SET 48: Rilasciato Maggio 2018",
-    "backgroundTerracedRiceFieldText": "Terraced Rice Field",
-    "backgroundTerracedRiceFieldNotes": "Enjoy a Terraced Rice Field in the growing season.",
+    "backgroundTerracedRiceFieldText": "Risaia Terrazzata",
+    "backgroundTerracedRiceFieldNotes": "Goditi la Risaia Terrazzata nella stagione di coltivazione",
     "backgroundFantasticalShoeStoreText": "Negozio di Scarpe Fantastiche",
     "backgroundFantasticalShoeStoreNotes": "Cerca nuove divertenti calzature nel Negozio di Scarpe Fantastico",
     "backgroundChampionsColosseumText": "Colosseo dei Campioni",
-    "backgroundChampionsColosseumNotes": "Bask in the glory of the Champions' Colosseum.",
+    "backgroundChampionsColosseumNotes": "Scaldati col tepore del Colosseo dei Campioni.",
     "backgrounds062018": "SET 49: Rilasciato Giugno 2018",
     "backgroundDocksText": "Moli",
     "backgroundDocksNotes": "Pesca dalla cima dei Moli",
     "backgroundRowboatText": "Barca a Remi",
-    "backgroundRowboatNotes": "Sing rounds in a Rowboat.",
+    "backgroundRowboatNotes": "Canta le strofe nella Barca a Remi.",
     "backgroundPirateFlagText": "Bandiera Pirata",
     "backgroundPirateFlagNotes": "Fai sventolare una temuta Bandiera Pirata.",
     "backgrounds072018": "SET 50: Rilasciato Luglio 2018",
@@ -365,8 +365,8 @@
     "backgroundDarkDeepNotes": "Nuota nell'Oscura Profondità tra animali bioluminescenti",
     "backgroundDilatoryCityText": "Città di Dilatoria",
     "backgroundDilatoryCityNotes": "Vaga attraverso la Città Sommersa di Dilatoria",
-    "backgroundTidePoolText": "Tide Pool",
-    "backgroundTidePoolNotes": "Observe the ocean life near a Tide Pool.",
+    "backgroundTidePoolText": "Piscina della Marea",
+    "backgroundTidePoolNotes": "Ammira l'oceano vicino a una Piscina della Marea.",
     "backgrounds082018": "SET 51: Rilasciato Agosto 2018",
     "backgroundTrainingGroundsText": "Campo di Addestramento",
     "backgroundTrainingGroundsNotes": "Allenati presso il Campo di Addestramento.",

website/common/locales/it/challenge.json

@@ -99,7 +99,7 @@
     "noChallengeTitle": "Non hai alcuna Sfida.",
     "challengeDescription1": "Le sfide sono eventi della Community nelle quali i giocatori competono per aggiudicarsi dei premi completando un gruppo di attività correlate.",
     "challengeDescription2": "Trova delle Sfide raccomandate secondo i tuoi interessi, consulta le sfide pubbliche di Habitica, o crea le tue proprie sfide.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "Non abbiamo trovato Sfide corrispondenti.",
     "createdBy": "Creata da",
     "joinChallenge": "Unisciti alla sfida",
     "leaveChallenge": "Abbandona sfida",

website/common/locales/it/character.json

@@ -80,7 +80,7 @@
     "autoEquipPopoverText": "Seleziona questa opzione per equipaggiare automaticamente gli oggetti appena li compri.",
     "costumeDisabled": "Hai disabilitato il tuo costume.",
     "gearAchievement": "Hai ottenuto la medaglia \"Armato fino ai denti\" per aver potenziato al massimo livello l'equipaggiamento per una Classe! Hai completato questi set:",
-    "gearAchievementNotification": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class!",
+    "gearAchievementNotification": "Ti sei guadagnato la medaglia \"Armato fino ai denti\" per aver potenziato al massimo livello l'equipaggiamento per una classe!",
     "moreGearAchievements": "Per ottenere più medaglie \"Armato fino ai denti\", cambia classe nella tua <a href='/user/settings/site' target='_blank'>pagina statistiche</a> e compra l'equipaggiamento per la tua nuova classe!",
     "armoireUnlocked": "Per altro equipaggiamento, prova lo <strong>Scrigno Incantato!</strong> Clicca sulla Ricompensa \"Scrigno Incantato\" per avere la possibilità di ricevere casualmente dell'equipaggiamento speciale! Potrebbe anche darti Esperienza o cibo.",
     "ultimGearName": "Armato fino ai denti - <%= ultClass %>",

website/common/locales/it/communityguidelines.json

@@ -19,12 +19,12 @@
     "commGuideList02G": "<strong>Obbedisci immediatamente a qualsiasi richiesta di un Moderatore</strong>. Ciò può includere, ma non si limita a, una richiesta di limitare le tue pubblicazioni in un certo spazio, di modificare il tuo profilo per rimuovere contenuto inadatto, di proseguire la tua discussioni in uno spazio più adatto, ecc.",
     "commGuideList02H": "<strong>Rifletti prima di dare una risposta \"arrabbiata\"</strong> se qualcuno ti dice che qualcosa che hai detto o fatto lo mette a disagio. C'è una grande forza nel sapersi scusare sinceramente con qualcuno. Se senti che il modo in cui ti hanno risposto è inappropriato, contatta un moderatore invece che arrabbiarti e rispondere male pubblicamente.",
     "commGuideList02I": "<strong>Le conversazioni di divisione/contenziose devono essere segnalate ai moderatori</strong> segnalando i messaggi coinvolti o usando il <a href='http://contact.habitica.com/' target='_blank'>Modulo di Contatto Moderatori</a>. Se trovi che una conversazione diventa troppo animata, troppo emotiva o offensiva, non coinvolgerti. Invece, segnala le pubblicazioni in modo che noi lo sappiamo. I Moderatori reagiranno al più presto. È nostro compito tenerti al sicuro. Se trovi che più contesto sia necessario, puoi segnalare il problema tramite il <a href='http://contact.habitica.com/' target='_blank'>Modulo Contatto Moderatori</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!",
+    "commGuideList02J": "<strong>Non inviare spam</strong>. Lo spam può includere, ma non è limitato a: postare lo stesso commento o domanda in posizioni diverse, pubblicare link senza contesto o spiegazione, postare messaggi senza senso, pubblicare messaggi promozionali multipli relativi a una Gilda, Squadra o Sfida, oppure molti messaggi consecutivamente. Anche elemosinare continuamente gemme o abbonamenti nelle chat o via messaggi privati è considerato spam. Se quando le persone cliccano un tuo link ciò ti porta vantaggi, dovrai indicarlo nel testo del tuo messaggio, altrimenti sarà ritenuto spam.<br/><br/>È compito dei moderatori decidere se qualcosa rappresenta spam o potrebbe generarlo, persino se tu non ritieni che lo sia. Ad esempio, la pubblicizzazione di una Gilda è ritenuta accettabile una o due volte, ma postarla più volte in una giornata probabilmente sarebbe ritenuto spam, a prescindere dall'utilità della Gilda.",
     "commGuideList02K": "<strong>Evita di pubblicare grossi titoli negli spazi pubblici di chat, in particolare nella Taverna</strong>. Nella stessa maniera delle MAIUSCOLE, sembra tu stia urlando, e può interferire con l'atmosfera confortevole.",
-    "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.",
+    "commGuideList02L": "<strong>Scoraggiamo fortemente lo scambio di informazioni personali nelle chat degli spazi pubblici, in particolare di quelle che possono essere usate per identificarti.</strong>. Le informazioni di questo tipo possono essere, ma non sono limitate a: il tuo indirizzo, il tuo indirizzo email e la tua Chiave API/password. È per la tua sicurezza! Lo staff e i moderatori potranno rimuovere post di questo tipo quando lo riterranno necessario. Se ti vengono chieste informazioni personali in una Gilda privata, in una Squadra o tramite messaggio privato, ti consigliamo caldamente di rifiutare con gentilezza e informare lo staff e i moderatori 1) segnalando il messaggio con l'apposito bottone a forma di bandiera se si trova in una Squadra o in una Gilda, oppure 2) compilando il <a href='http://contact.habitica.com/' target='_blank'>Modulo di Contatto Moderatori</a> e allegando le screenshot.",
     "commGuidePara019": "<strong>Negli spazi privati</strong>, gli utenti hanno più libertà di discutere di quello che vogliono, ma possono comunque violare i Termini e Condizioni di utilizzo. Ciò include gli insulti e qualsiasi contenuto discriminatorio, violento o minaccioso. Nota che, siccome i nomi delle Sfide appaiono sul profilo pubblico dei vincitori, i nomi di TUTTE le sfide devono rispettare le linee guida per gli spazi pubblici, ciò anche se le sfide appaiono in uno spazio privato.",
     "commGuidePara020": "<strong>I Messaggi Privati (MP)</strong> hanno alcune linee guida aggiuntive. Se qualcuno ti ha bloccato, non contattarlo da qualche altra parte per chiedergli di sbloccarti. Inoltre, non dovresti mandare un MP a qualcuno che richiede assistenza (dato che le risposte pubbliche alle richieste di assistenza sono utili a tutta la community). Infine, non mandare a nessuno un MP pregandolo di regalarti gemme o un abbonamento, in quanto può essere considerato spam.",
-    "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.",
+    "commGuidePara020A": "<strong>Se credi che un post che hai visto violi le linee guida per gli spazi pubblici descritte qua sopra, o se vedi un post che ti preoccupa o ti mette a disagio, puoi portarlo all'attenzione dei Moderatori e dello Staff usando l'icona a forma di bandiera per segnalarlo.</strong>. Un membro dello Staff o un Moderatore si occuperà della faccenda il più presto possibile. Ricorda che segnalare intenzionalmente post innocenti è un'infrazione di queste linee guida (vedi sotto la sezione \"Infrazioni\"). Attualmente non è possibile segnalare i messaggi privati, quindi se ne hai bisogno, contatta i moderatori dal modulo presente nella pagina \"Contattaci\", a cui puoi accedere anche dal menu della guida, cliccando \"<a href='http://contact.habitica.com/' target='_blank'>Contatta il Team dei Moderatori</a>.\" Puoi farlo in presenza di più post problematici della stessa persona all'interno di Gilde diverse, oppure se la situazione richiede spiegazioni. Puoi contattarci nella tua lingua madre se ti è più facile: potremmo dover ricorrere a Google Translate, ma desideriamo che tu sia a tuo agio nel contattarci in caso di problemi.",
     "commGuidePara021": "Inoltre, alcuni spazi pubblici in Habitica hanno delle linee guida specifiche.",
     "commGuideHeadingTavern": "Taverna",
     "commGuidePara022": "La Taverna è il punto di incontro principale degli abitanti di Habitica. Daniel il locandiere mantiene il posto sfavillante, e Lemoness sarà felice di far comparire una limonata mentre ti siedi a discutere. Tieni solo in mente...",

website/common/locales/it/content.json

@@ -176,9 +176,9 @@
     "questEggKangarooText": " Canguro",
     "questEggKangarooMountText": "Canguro",
     "questEggKangarooAdjective": "un acuto",
-    "questEggAlligatorText": "Alligator",
-    "questEggAlligatorMountText": "Alligator",
-    "questEggAlligatorAdjective": "a cunning",
+    "questEggAlligatorText": "Alligatore",
+    "questEggAlligatorMountText": "Alligatore",
+    "questEggAlligatorAdjective": "un astuto",
     "eggNotes": "Trova una pozione per far schiudere questo uovo, e nascerà <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Base",
     "hatchingPotionWhite": "Bianco",

website/common/locales/it/limited.json

@@ -119,16 +119,16 @@
     "winter2018ReindeerSet": "Cervo Assassino (Assassino)",
     "spring2018SunriseWarriorSet": "Guerriero dell'Alba (Guerriero)",
     "spring2018TulipMageSet": "Mago Tulipano (Mago)",
-    "spring2018GarnetHealerSet": "Garnet Healer (Healer)",
+    "spring2018GarnetHealerSet": "Guaritore Granato (Guaritore)",
     "spring2018DucklingRogueSet": "Anatroccolo Assassino (Assassino)",
     "summer2018BettaFishWarriorSet": "Pesce Combattente (Guerriero)",
     "summer2018LionfishMageSet": "Mago Pesce Leone (Mago)",
     "summer2018MerfolkMonarchSet": "Monarca dei Mermeidi (Guaritore)",
-    "summer2018FisherRogueSet": "Fisher-Rogue (Rogue)",
-    "fall2018MinotaurWarriorSet": "Minotaur (Warrior)",
+    "summer2018FisherRogueSet": "Pescatore-Assassino (Assassino)",
+    "fall2018MinotaurWarriorSet": "Minotauro (Guerriero)",
     "fall2018CandymancerMageSet": "Candymancer (Mage)",
-    "fall2018CarnivorousPlantSet": "Carnivorous Plant (Healer)",
-    "fall2018AlterEgoSet": "Alter Ego (Rogue)",
+    "fall2018CarnivorousPlantSet": "Pianta Carnivora (Guaritore)",
+    "fall2018AlterEgoSet": "Alter Ego (Assassino)",
     "eventAvailability": "Disponibile fino al <%= date(locale) %>.",
     "dateEndMarch": "30 aprile",
     "dateEndApril": "19 aprile",

website/common/locales/it/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tigre Veterana",
     "veteranLion": "Leone Veterano",
     "veteranBear": "Orso Veterano",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cucciolo di Cerbero",
     "hydra": "Idra",
     "mantisShrimp": "Canocchia",

website/common/locales/it/questscontent.json

@@ -611,8 +611,8 @@
     "questSeaSerpentBoss": "The Mighty Sea Serpent",
     "questSeaSerpentDropSeaSerpentEgg": "Sea Serpent (Egg)",
     "questSeaSerpentUnlockText": "Unlocks purchasable Sea Serpent eggs in the Market",
-    "questKangarooText": "Kangaroo Catastrophe",
-    "questKangarooNotes": "Maybe you should have finished that last task… you know, the one you keep avoiding, even though it always comes back around? But @Mewrose and @LilithofAlfheim invited you and @stefalupagus to see a rare kangaroo troop hopping through the Sloensteadi Savannah; how could you say no?! As the troop comes into view, something hits you on the back of the head with a mighty <em>whack!</em><br><br>Shaking the stars from your vision, you pick up the responsible object--a dark red boomerang, with the very task you continually push back etched into its surface. A quick glance around confirms the rest of your party met a similar fate. One larger kangaroo looks at you with a smug grin, like she’s daring you to face her and that dreaded task once and for all!",
+    "questKangarooText": "Catastrofe Canguro",
+    "questKangarooNotes": "Forse avresti dovuto finire quell'ultima attività... lo sai, quella che continui ad evitare, anche se continua a tornare. Ma @Mewrose e @LilithofAlfheim invitano te e @stefalupagus a vedere un una rara truppa canguro saltellare nella Savana Sloensteadi; come puoi dire di no?! Mentre la truppa appare alla vista, qualcosa ti colpisce dietro alla la testa con un grosso <em>whack!</em><br><br>Scuotendo le stelle che ti girano in testa, prendi l'oggetto responsabile-- un boomerang rosso scuro, con la stessa attività che continuamente respingi incisa sulla sua superficie. Una rapida occhiata attorno conferma che il resto della squadra ha avuto la stessa esperienza. Un più grosso canguro ti guarda con un sorrisetto compiaciuto, come se ti stesse sfidando ad affrontarlo assieme alla temuta attività una volta per tutte!",
     "questKangarooCompletion": "“NOW!” You signal your party to throw the boomerangs back at the kangaroo. The beast hops further away with each hit until she flees, leaving nothing more than a dark red cloud of dust, a few eggs, and some gold coins.<br><br>@Mewrose walks forward to where the kangaroo once stood. “Hey, where did the boomerangs go?”<br><br>“They probably dissolved into dust, making that dark red cloud, when we finished our respective tasks,” @stefalupagus speculates.<br><br>@LilithofAlfheim squints at the horizon. “Is that another kangaroo troop heading our way?”<br><br>You all break into a run back to Habit City. Better to face your difficult tasks than take another lump to the back of the head!",
     "questKangarooBoss": "Catastrophic Kangaroo",
     "questKangarooDropKangarooEgg": "Kangaroo (Egg)",

website/common/locales/ja/challenge.json

@@ -27,7 +27,7 @@
     "noNone": "なし",
     "category": "カテゴリ",
     "membership": "会員登録状況",
-    "ownership": "所有",
+    "ownership": "オーナー",
     "participating": "参加",
     "notParticipating": "不参加",
     "either": "どちらも",
@@ -58,11 +58,11 @@
     "keepTasks": "タスクを残す",
     "closeCha": "チャレンジを終了して・・・",
     "leaveCha": "チャレンジを出て・・・",
-    "challengedOwnedFilterHeader": "所有",
-    "challengedOwnedFilter": "所有",
-    "owned": "所有",
-    "challengedNotOwnedFilter": "所有していない",
-    "not_owned": "所有していない",
+    "challengedOwnedFilterHeader": "オーナー",
+    "challengedOwnedFilter": "オーナーである",
+    "owned": "オーナーである",
+    "challengedNotOwnedFilter": "オーナーではない",
+    "not_owned": "オーナーではない",
     "not_participating": "不参加",
     "challengedEitherOwnedFilter": "どちらも",
     "backToChallenges": "すべてのチャレンジへ戻る",
@@ -74,8 +74,8 @@
     "noPermissionCloseChallenge": "このチャレンジを閉じる権限がありません。",
     "congratulations": "おめでとう!",
     "hurray": "やった!",
-    "noChallengeOwner": "所有者なし",
-    "noChallengeOwnerPopover": "このチャレンジを作成したメンバーのアカウントが削除されたため、このチャレンジには所有者がいない状態です。",
+    "noChallengeOwner": "オーナーはいません",
+    "noChallengeOwnerPopover": "このチャレンジを作成したメンバーのアカウントが削除されたため、このチャレンジにはオーナーがいない状態です。",
     "challengeMemberNotFound": "チャレンジのメンバーの中にユーザーが見つかりません。",
     "onlyGroupLeaderChal": "グループのリーダーだけが、チャレンジをつくることができます。",
     "tavChalsMinPrize": "公共のチャレンジを開催するには、賞品が少なくとも1ジェム必要です。",
@@ -99,7 +99,7 @@
     "noChallengeTitle": "チャレンジはありません。",
     "challengeDescription1": "チャレンジはプレイヤー同士で競争し、一連の関連したタスクを完了させることによって賞品を獲得するコミュニティのイベントです。",
     "challengeDescription2": "閲覧した公共のチャレンジや自分で作ったチャレンジに基づいた、おすすめのチャレンジを見つけましょう。",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "一致するチャレンジが見つかりませんでした。",
     "createdBy": "作成者",
     "joinChallenge": "チャレンジに参加する",
     "leaveChallenge": "チャレンジをやめる",

website/common/locales/ja/character.json

@@ -79,11 +79,11 @@
     "costumePopoverText": "「衣装を使用する」を選択すると、武装の能力値に影響を与えずに、アイテムをアバターに着せることができます!　つまり、もっとも効果の高いアイテムを装備しながらも、あなたのアバターは自由にオシャレができるということです。",
     "autoEquipPopoverText": "購入した装備を自動的に身につけたい場合は、このオプションを選択してください。",
     "costumeDisabled": "衣装を無効にしました。",
-    "gearAchievement": "もっとも上位のクラス装備セットを入手し、「究極のアイテム」の実績を解除しました!　あなたは以下の完全なセットを手に入れています： ",
-    "gearAchievementNotification": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class!",
-    "moreGearAchievements": "他の「究極のアイテム」のバッジを手にするには、<a href='/user/settings/site' target='_blank'>設定＞サイトのページ</a>でクラスを変えて、新しいクラスのアイテムを買いましょう!",
+    "gearAchievement": "クラスの最上級の装備セットを入手したため、「アルティメット・ギア」の実績を解除しました！ あなたは以下の完全なセットを手に入れています： ",
+    "gearAchievementNotification": "クラスの最上級の装備セットを入手したため、「アルティメット・ギア」の実績を解除しました！ ",
+    "moreGearAchievements": "他の「アルティメット・ギア」のバッジを手にするには、<a href='/user/settings/site' target='_blank'>設定＞サイトのページ</a>でクラスを変えて、新しいクラスの装備を買いましょう！",
     "armoireUnlocked": "もっと装備品がほしい?　<strong>ラッキー宝箱</strong>をチェックしましょう!　ごほうびの「ラッキー宝箱」をクリックすると、ランダムで特別な装備が当たります!　経験値やえさが当たることもあります。",
-    "ultimGearName": "究極のアイテム - <%= ultClass %>",
+    "ultimGearName": "アルティメット・ギア - <%= ultClass %>",
     "ultimGearText": " <%= ultClass %>のクラスにおいて最強の武器防具を揃えました。",
     "level": "レベル",
     "levelUp": "レベルアップ！",

website/common/locales/ja/gear.json

@@ -1518,7 +1518,7 @@
     "bodySpecialTakeThisText": "Take This ショルダーガード",
     "bodySpecialTakeThisNotes": "このショルダーガードは、Take This 提供のチャレンジに参加することで手に入れることができます。おめでとう!　すべての能力値が <%= attrs %> 上がります。",
     "bodySpecialAetherAmuletText": "エーテルのアミュレット",
-    "bodySpecialAetherAmuletNotes": "このアミュレットには謎めいた由来があります。体質と知能が <%= attrs %>ずつ上がります。",
+    "bodySpecialAetherAmuletNotes": "このアミュレットには謎めいた由来があります。体質と力が <%= attrs %>ずつ上がります。",
     "bodySpecialSummerMageText": "輝くケープレット",
     "bodySpecialSummerMageNotes": "塩水でも真水でもこの金属製ケープは錆びません。効果なし。2014年夏の限定装備。",
     "bodySpecialSummerHealerText": "サンゴのえり",

website/common/locales/ja/groups.json

@@ -340,8 +340,8 @@
     "canceledGroupPlan": "キャンセルされたグループプラン",
     "groupPlanCanceled": "グループプランの終了日",
     "purchasedGroupPlanPlanExtraMonths": "あなたは <%= months %> カ月分のグループプラン延長クレジットをもっています。",
-    "addManager": "Assign Manager",
-    "removeManager2": "Unassign Manager",
+    "addManager": "マネージャーを追加",
+    "removeManager2": "マネージャーを解除",
     "userMustBeMember": "ユーザーはメンバーである必要があります",
     "userIsNotManager": "ユーザーはマネージャーではありません",
     "canOnlyApproveTaskOnce": "このタスクはすでに承認されました。",
@@ -392,12 +392,12 @@
     "noGuildsTitle": "あなたはどのギルドにも所属していません。",
     "noGuildsParagraph1": "ギルドはプレイヤー同士で助け合い、責任を共有し、チャットで励まし合うために作られる社交のためのグループです。",
     "noGuildsParagraph2": "ギルドを探すタブをクリックして、あなたの興味にもとづいてお勧めされるギルドを確認したり、一般公開されているギルドを探したり、自分のギルドを作ったりしてみましょう。",
-    "noGuildsMatchFilters": "We couldn't find any matching Guilds.",
+    "noGuildsMatchFilters": "一致するギルドが見つかりませんでした。",
     "privateDescription": "プライベートギルドはHabiticaのギルド名簿には掲載されません。新しいメンバーは招待でのみ追加可能です。",
     "removeInvite": "招待を削除する",
     "removeMember": "メンバーを削除する",
     "sendMessage": "メッセージを送る",
-    "promoteToLeader": "Transfer Ownership",
+    "promoteToLeader": "オーナーの権限を移す",
     "inviteFriendsParty": "パーティーに友達を招待すると、ボスモンスター「バシ・リスト」と戦える<br/>限定クエストの巻物が贈られます！",
     "upgradeParty": "パーティーをアップグレード",
     "createParty": "パーティーを作る",

website/common/locales/ja/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "百戦錬磨のトラ",
     "veteranLion": "百戦錬磨のライオン",
     "veteranBear": "百戦錬磨のくま",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "子ケルベロス",
     "hydra": "ヒドラ",
     "mantisShrimp": "シャコ",

website/common/locales/ja/questscontent.json

@@ -260,7 +260,7 @@
     "questCheetahUnlockText": "市場でチーターのたまごを買えるようにする",
     "questHorseText": "悪夢を乗りこなせ",
     "questHorseNotes": "キャンプ場で@beffymaroo や@JessicaChaseとくつろぎながら、あなた達の話の種は自然と今まで乗り越えてきた冒険の自慢話へと移っていきました。今までやり遂げてきたことへの誇りから…ひょっとしたら多少浮かれて、あなた達はどんなタスクだって手なづけてみせると自慢してみせます。近くに居た旅人がふと、あなた達の方を見て微笑みました。彼は一つ目を輝かせて、自分の馬に乗る事でその主張を証明できると、あなた達を誘います。\n\nあなた達全員が厩舎に向かった後、@UncommonCriminalが囁きます。「君たち、無理な仕事を引き受けてしまったかもしれないねえ。あれは馬じゃないよ。\"ナイトメア\"さ！」踏み鳴らされる蹄を見て、あなた達は自分の言葉を後悔し始めました…",
-    "questHorseCompletion": "持てる技術のすべてを使いました。とうとう、馬は二、三蹄を鳴らし、背に乗ることを許すようにあなたの肩に鼻を擦りつけます。あなたは馬にまたがると、友人たちが喝采する中、少しの間だけ、しかし誇らしげにキャンプ場の広場を乗り回しました。旅人は破願します。\n「あれがただのホラ話でないことを見せてもらったよ！君達の決断力には強い感銘を受けさせてもらった。この卵で、君達自身の馬を育てるといい。またいつかどこかで会うこともあるだろう」あなた達は卵を受け取りました。そして旅人は帽子を軽く傾けると…その場から消えてしまいました。",
+    "questHorseCompletion": "持てる技術のすべてを使いました。とうとう、馬は二、三蹄を鳴らし、背に乗ることを許すようにあなたの肩に鼻を擦りつけます。あなたは馬にまたがると、友人たちが喝采する中、少しの間だけ、しかし誇らしげにキャンプ場の広場を乗り回しました。旅人は破顔します。\n「あれがただのホラ話でないことを見せてもらったよ！君達の決断力に強い感銘を受けた。この卵で、君達自身の馬を育てるといい。またいつかどこかで会うこともあるだろう」あなた達は卵を受け取りました。そして旅人は帽子を軽く傾けると…その場から消えてしまいました。",
     "questHorseBoss": "悪夢の馬 ”ナイトメア”",
     "questHorseDropHorseEgg": "馬（たまご）",
     "questHorseUnlockText": "市場で馬のたまごを買えるようにする",

website/common/locales/nl/generic.json

@@ -33,7 +33,7 @@
     "showLess": "Minder weergeven",
     "expandToolbar": "Werkbalk openen",
     "collapseToolbar": "Werkbalk verkleinen",
-    "markdownHelpLink": "Markdown formatting help",
+    "markdownHelpLink": "Markdown formatting hulp",
     "showFormattingHelp": "Opmaakhulp laten zien",
     "hideFormattingHelp": "Opmaakhulp verbergen",
     "youType": "Je typt:",
@@ -71,7 +71,7 @@
     "submit": "Verzenden",
     "close": "Sluiten",
     "saveAndClose": "Opslaan en sluiten",
-    "saveAndConfirm": "Save & Confirm",
+    "saveAndConfirm": "Opslaan en Bevestigen",
     "cancel": "Annuleren",
     "ok": "Oké",
     "add": "Toevoegen",

website/common/locales/nl/groups.json

@@ -6,8 +6,8 @@
     "innText": "Je bent aan het rusten in de herberg! Tijdens je verblijf zullen je dagelijkse taken je geen schade doen op het einde van de dag, maar ze zullen wel elke dag herladen. Opgelet: Als je in een Baas queeste deelneemt, zal de baas je nog steeds schade aanrichten voor de gemiste dagelijkse taken van je gezelschap leden tenzij ze ook in de herberg zijn! Je eigen schade aan de baas (of gecollecteerde items) zullen ook niet toegepast worden tot je je terug uit checkt.",
     "innTextBroken": "Je bent aan het uitrusten in de herberg, zo blijkt... Zolang je hier verblijft, zullen je dagelijkse taken je geen pijn doen aan het eind van de dag, maar ze zullen wel elke dag verversen... Wees gewaarschuwd: als je meedoet aan een Baas queeste met een Eindbaas, zal de Eindbaas je nog steeds pijn doen voor de dagelijkse taken die je Groepsgenoten missen... tenzij ze ook in de herberg verblijven... Je zult zelf ook geen schade toebrengen aan de Eindbaas (of voorwerpen krijgen) totdat je de herberg verlaat... zo moe...",
     "innCheckOutBanner": "Je bent momenteel in de Herberg. Je dagelijkse taken zullen je niet verwonden en je zal geen vooruitgang maken in Queesten",
-    "innCheckOutBannerShort": "You are checked into the Inn.",
-    "resumeDamage": "Resume Damage",
+    "innCheckOutBannerShort": "Je bent ingecheckt bij de Herberg",
+    "resumeDamage": "Schade Hervatten",
     "helpfulLinks": "Nuttige links",
     "communityGuidelinesLink": "Gemeenschapsrichtlijnen",
     "lookingForGroup": "Berichten: gezelschap gezocht",
@@ -35,15 +35,15 @@
     "communityGuidelines": "Gemeenschapsrichtlijnen",
     "communityGuidelinesRead1": "Lees alsjeblieft onze",
     "communityGuidelinesRead2": "voordat je begint met chatten.",
-    "bannedWordUsed": "Oops! Looks like this post contains a swearword, religious oath, or reference to an addictive substance or adult topic (<%= swearWordsUsed %>). Habitica has users from all backgrounds, so we keep our chat very clean. Feel free to edit your message so you can post it!",
+    "bannedWordUsed": "Oeps! Het lijkt er op dat dit bericht een scheldwoord, religieuze eed, of verwijzing naar een verslavende substantie of volwassen onderwerp bevat (<%= swearWordsUsed %>). Habitica heeft gebruikers van alle achtergronden, dus houden we onze chat heel netjes. Je mag gerust je bericht bewerken zodat je het kan plaatsen!",
     "bannedSlurUsed": "Je bericht bevatte ongepast taalgebruik en je chatprivileges zijn ingetrokken.",
     "party": "Gezelschap",
     "createAParty": "Creëer een gezelschap",
     "updatedParty": "Gezelschaps-instellingen bijgewerkt.",
     "errorNotInParty": "Je zit niet in een gezelschap",
     "noPartyText": "Je bent ofwel nog niet in een Fractie of je Fractie duurt lang om te laden. Je kan er één maken en vrienden uitnodigen, of je kan een bestaande Fractie toetreden, laat ze jouw unieke gebruikers ID onderaan invoeren en kom dan terug hier om de uitnodiging te vinden:",
-    "LFG": "To advertise your new Party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.",
-    "wantExistingParty": "Want to join an existing Party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:",
+    "LFG": "Ga om je nieuwe groep te promoten of om een groep te vinden naar het gilde voor <%= linkStart %>berichten: groep gezocht<%= linkEnd %>.",
+    "wantExistingParty": "Wil je je bij een bestaande groep aansluiten? Ga dan naar de <%= linkStart %>Party Wanted Guild<%= linkEnd %> en post deze Gebruikers ID:",
     "joinExistingParty": "Aansluiten bij het gezelschap van iemand anders",
     "needPartyToStartQuest": "Oeps! Je moet <a href='http://habitica.wikia.com/wiki/Party' target='_blank'>een groep aanmaken of je erbij aansluiten</a> voor je een queeste kan beginnen!",
     "createGroupPlan": "Aanmake",
@@ -51,11 +51,11 @@
     "userId": "Gebruikers-ID",
     "invite": "Uitnodigen",
     "leave": "Verlaten",
-    "invitedToParty": "You were invited to join the Party <span class=\"notification-bold\"><%= party %></span>",
-    "invitedToPrivateGuild": "You were invited to join the private Guild <span class=\"notification-bold\"><%= guild %></span>",
+    "invitedToParty": "Je werd uitgenodigd om je aan te sluiten bij de Groep <span class=\"notification-bold\"><%= party %></span>",
+    "invitedToPrivateGuild": "Je werd uitgenodigd om je aan te sluiten bij het Gilde <span class=\"notification-bold\"><%= guild %></span>",
     "invitedToPublicGuild": "Je werd uitgenodigd om je aan te sluiten bij de Gilde <span class=\"notification-bold-blue\"><%= guild %></span>",
     "partyInvitationsText": "Je hebt <%= numberInvites %> Gezelschap uitnodigingen! Kies verstandig want je kan maar in 1 gezelschap tegelijkertijd. ",
-    "joinPartyConfirmationText": "Are you sure you want to join the Party \"<%= partyName %>\"? You can only be in one Party at a time. If you join, all other Party invitations will be rejected.",
+    "joinPartyConfirmationText": "Weet je zeker dat je lid wil worden van de groep \"<%= partyName %>\"? Je kan slechts in één groep tegelijk zitten. Als je lid wordt, worden alle andere groepsuitnodigingen geweigerd.",
     "invitationAcceptedHeader": "Je uitnodiging is geaccepteerd",
     "invitationAcceptedBody": "<%= username %> heeft je uitnodiging voor <%= groupName %> geaccepteerd!",
     "joinNewParty": "Aansluiten bij nieuw gezelschap",
@@ -121,25 +121,25 @@
     "leaveGroupCha": "Uitdagingen van dit gilde verlaten en...",
     "confirm": "Bevestigen",
     "leaveGroup": "verlaat gilde",
-    "leavePartyCha": "Leave Party challenges and...",
+    "leavePartyCha": "Groepsuitdagingen verlaten en...",
     "leaveParty": "verlaat gezelschap",
     "sendPM": "Privébericht sturen",
     "send": "Verzenden",
     "messageSentAlert": "Bericht verzonden",
     "pmHeading": "Privébericht aan <%= name %>",
-    "pmsMarkedRead": "Your Private Messages have been marked as read",
+    "pmsMarkedRead": "Je Privéberichten zijn gemarkeerd als gelezen.",
     "possessiveParty": "<%= name %>s gezelschap",
     "clearAll": "Alle berichten verwijderen",
     "confirmDeleteAllMessages": "Weet je zeker dat je alle berichten in je inbox wilt verwijderen? Andere gebruikers kunnen de berichten die je ze hebt gestuurd blijven zien.",
     "PMPlaceholderTitle": "Hier is niets te vinden, nog niet",
     "PMPlaceholderDescription": "Selecteer een gesprek aan de linkerkant",
-    "PMPlaceholderTitleRevoked": "Your chat privileges have been revoked",
+    "PMPlaceholderTitleRevoked": "Je chatbevoegdheden zijn ingetrokken",
     "PMPlaceholderDescriptionRevoked": "You are not able to send private messages because your chat privileges have been revoked. If you have questions or concerns about this, please email <a href=\"mailto:admin@habitica.com\">admin@habitica.com</a> to discuss it with the staff.",
-    "PMReceive": "Receive Private Messages",
-    "PMEnabledOptPopoverText": "Private Messages are enabled. Users can contact you via your profile.",
-    "PMDisabledOptPopoverText": "Private Messages are disabled. Enable this option to allow users to contact you via your profile.",
-    "PMDisabledCaptionTitle": "Private Messages are disabled",
-    "PMDisabledCaptionText": "You can still send messages, but no one can send them to you.",
+    "PMReceive": "Ontvang Privéberichten",
+    "PMEnabledOptPopoverText": "Privéberichten zijn ingeschakeld. Gebruikers kunnen via jou profiel contact met je opnemen.",
+    "PMDisabledOptPopoverText": "Privéberichten zijn uitgeschakeld. Schakel deze instelling in zodat Gebruikers via jou profiel contact met je kunnen opnemen.",
+    "PMDisabledCaptionTitle": "Privéberichten zijn uitgeschakeld",
+    "PMDisabledCaptionText": "Je kan nog steeds berichten verzenden, maar niemand kan berichten naar jou toe sturen.",
     "block": "Blokkeren",
     "unblock": "Deblokkeren",
     "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
@@ -156,7 +156,7 @@
     "report": "Melden",
     "abuseFlag": "Overtreding van gemeenschapsrichtlijnen melden",
     "abuseFlagModalHeading": "Meld een overtreding",
-    "abuseFlagModalBody": "Are you sure you want to report this post? You should <strong>only</strong> report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction.",
+    "abuseFlagModalBody": "Weet je zeker dat je dit bericht wil aangeven? Je moet <strong>alleen</strong> berichten aangeven die de  <%= firstLinkStart %>gemeenschapsrichtlijnen<%= linkEnd %> en/of <%= secondLinkStart %>algemene voorwaarden<%= linkEnd %> overtreden. Het onnodig rapporteren van berichten is een overtreding van de gemeenschapsrichtlijnen en kan resulteren in een overtreding.",
     "abuseFlagModalButton": "Overtreding melden",
     "abuseReported": "Dank je voor het melden van deze overtreding. De beheerders zijn op de hoogte gesteld.",
     "abuseAlreadyReported": "Je hebt dit bericht al gemeld.",

website/common/locales/nl/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Veteranentijger",
     "veteranLion": "Veteranenleeuw",
     "veteranBear": "Veteranenbeer",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cerberuspup",
     "hydra": "Hydra",
     "mantisShrimp": "Bidsprinkhaankreeft",

website/common/locales/pl/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tygrys weteran",
     "veteranLion": "Lew weteran",
     "veteranBear": "Niedźwiedź weteran",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Szczenię Cerbera",
     "hydra": "Hydra",
     "mantisShrimp": "Krewetka modliszkowa",

website/common/locales/pt/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tigre Veterano",
     "veteranLion": "Leão Veterano",
     "veteranBear": "Urso Veterano",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cria de Cérbero",
     "hydra": "Hidra",
     "mantisShrimp": "Camarão Mantis",

website/common/locales/pt_BR/challenge.json

@@ -99,7 +99,7 @@
     "noChallengeTitle": "Você não participa de nenhum desafio",
     "challengeDescription1": "Desafios são eventos comunitários em que os jogadores competem e ganham prêmios ao completarem um grupo de tarefas relacionadas a esses desafios.",
     "challengeDescription2": "Encontre Desafios recomendados baseado nos seus interesses. Pesquise nos Desafios Públicos do Habitica ou crie seus próprios Desafios.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "Não foi possível encontrar nenhum Desafio correspondente.",
     "createdBy": "Criado por:",
     "joinChallenge": "Se juntar ao desafio",
     "leaveChallenge": "Deixar o desafio",

website/common/locales/pt_BR/character.json

@@ -80,7 +80,7 @@
     "autoEquipPopoverText": "Selecione esta opção para automáticamente equipar os equipamentos assim que você os comprar.",
     "costumeDisabled": "Você desabilitou a Aparência.",
     "gearAchievement": "Você ganhou a conquista \"Equipamento Supremo\" por chegar ao melhor conjunto de equipamentos da sua classe! Você já conseguiu os seguintes conjuntos completos:",
-    "gearAchievementNotification": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class!",
+    "gearAchievementNotification": "Você ganhou a conquista \"Último Equipamento\" por atualizar ao máximo o conjunto de equipamentos para uma classe!",
     "moreGearAchievements": "Para atingir mais conquistas de Último Equipamento, mude de classe na <a href='/user/settings/site' target='_blank'>página de configurações do site</a> e compre equipamentos para sua nova classe!",
     "armoireUnlocked": "Para mais equipamentos, dê uma olhada no <strong>Armário Encantado!</strong> Clique na Recompensa do Armário Encantado para uma chance aleatória de aquirir um Equipamento especial! Você também pode conseguir EXP ou comida. ",
     "ultimGearName": "Último Equipamento - <%= ultClass %>",

website/common/locales/pt_BR/groups.json

@@ -340,8 +340,8 @@
     "canceledGroupPlan": "Plano de Time cancelado",
     "groupPlanCanceled": "O Plano de Time ficará inativo em",
     "purchasedGroupPlanPlanExtraMonths": "Você tem <%= months %> meses de créditos de plano de time.",
-    "addManager": "Assign Manager",
-    "removeManager2": "Unassign Manager",
+    "addManager": "Atribuir funções de gestor",
+    "removeManager2": "Retirar funções de gestor",
     "userMustBeMember": "O usuário precisa ser um membro",
     "userIsNotManager": "O usuário não é um gestor",
     "canOnlyApproveTaskOnce": "Esta tarefa já foi aprovada.",
@@ -392,12 +392,12 @@
     "noGuildsTitle": "Você não participa de nenhuma Guilda.",
     "noGuildsParagraph1": "Guildas são grupos sociais criados por outros jogadores que podem oferecer ajuda, encorajamento e responsabilidade mútua.",
     "noGuildsParagraph2": "Clique na aba de Descoberta para ver as Guildas recomendadas baseado nos seus interesses, navegue pelas Guildas públicas do Habitica ou crie sua própria Guilda.",
-    "noGuildsMatchFilters": "We couldn't find any matching Guilds.",
+    "noGuildsMatchFilters": "Não conseguimos encontrar nenhuma Guilda correspondente.",
     "privateDescription": "Uma Guilda privada não será exibida no diretório público de Guildas. Novos membros precisarão ser adicionados por convite.",
     "removeInvite": "Remover Convite",
     "removeMember": "Remover Membro",
     "sendMessage": "Enviar Mensagem",
-    "promoteToLeader": "Transfer Ownership",
+    "promoteToLeader": "Transferir propriedade",
     "inviteFriendsParty": "Convidar amigos para seu grupo te dará um exclusivo <br/> Pergaminho de Missão para batalhar a Basi-lista juntos!",
     "upgradeParty": "Aprimorar Grupo",
     "createParty": "Criar um Grupo",

website/common/locales/pt_BR/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tigre Veterano",
     "veteranLion": "Leão Veterano",
     "veteranBear": "Urso Veterano",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cérbero Filhote",
     "hydra": "Hidra",
     "mantisShrimp": "Camarão Gigante",

website/common/locales/ro/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Veteran Tiger",
     "veteranLion": "Veteran Lion",
     "veteranBear": "Veteran Bear",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Pui de Cerber",
     "hydra": "Hidră",
     "mantisShrimp": "Crevete călugăr",

website/common/locales/ru/challenge.json

@@ -99,7 +99,7 @@
     "noChallengeTitle": "У вас нет испытаний.",
     "challengeDescription1": "Испытания это мероприятия сообщества, в которых игроки получают награду за прохождение групповых заданий",
     "challengeDescription2": "Найдите рекомендованные испытания по вашим интересам, посмотрите общедоступные испытания или создайте свое собственное.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
+    "noChallengeMatchFilters": "Не найдены подходящие Испытания.",
     "createdBy": "Создано",
     "joinChallenge": "Присоединиться",
     "leaveChallenge": "Покинуть",

website/common/locales/ru/character.json

@@ -80,7 +80,7 @@
     "autoEquipPopoverText": "Выберите этот вариант для самонадевания новой экипировки, как только вы её приобретаете.",
     "costumeDisabled": "Вы отключили функцию \"костюм\"",
     "gearAchievement": "Вы заработали значок «Превосходная экипировка» за максимальное усовершенствование комплекта экипировки для вашего класса! Вы собрали полные наборы для следующих классов:",
-    "gearAchievementNotification": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class!",
+    "gearAchievementNotification": "Вы заработали достижение «Превосходная экипировка» за максимальное усовершенствование комплекта снаряжения для вашего класса!",
     "moreGearAchievements": "Чтобы заработать больше значков «Первосходная экипировка», меняйте классы на <a href='/user/settings/site' target='_blank'>странице характеристик</a> и покупайте обмундирование для нового класса!",
     "armoireUnlocked": "Теперь у вас есть <strong>Зачарованный сундук!</strong> Активировав награду \"Зачарованный сундук\", вы получаете случайный элемент особого снаряжения! Также вам может достаться опыт или еда.",
     "ultimGearName": "Превосходная экипировка - <%= ultClass %>",

website/common/locales/ru/groups.json

@@ -340,8 +340,8 @@
     "canceledGroupPlan": "Групповой тариф отменен",
     "groupPlanCanceled": "Групповой тариф перестанет действовать",
     "purchasedGroupPlanPlanExtraMonths": "У вас остается <%= months %> мес. оплаченного группового тарифа.",
-    "addManager": "Assign Manager",
-    "removeManager2": "Unassign Manager",
+    "addManager": "Добавить руководителя",
+    "removeManager2": "Удалить руководителя",
     "userMustBeMember": "Пользователь должен быть участником группы",
     "userIsNotManager": "Этот пользователь не является руководителем",
     "canOnlyApproveTaskOnce": "Это задание уже было одобрено.",
@@ -392,12 +392,12 @@
     "noGuildsTitle": "Вы не состоите в гильдиях.",
     "noGuildsParagraph1": "Гильдии — социальные группы, созданные игроками. Здесь вы можете найти поддержку, взаимную отчетность и поощрение к действию.",
     "noGuildsParagraph2": "Нажмите «Найти гильдии», чтобы получить список гильдий на интересные вам темы, вступить в открытые гильдии Habitica или создать собственную.",
-    "noGuildsMatchFilters": "We couldn't find any matching Guilds.",
+    "noGuildsMatchFilters": "Не найдены подходящие Гильдии.",
     "privateDescription": "Закрытая гильдия не отображается в списке гильдий Habitica. Новые участники добавляются только по приглашениям.",
     "removeInvite": "Удалить приглашение",
     "removeMember": "Удалить участника",
     "sendMessage": "Отправить сообщение",
-    "promoteToLeader": "Transfer Ownership",
+    "promoteToLeader": "Назначить нового лидера",
     "inviteFriendsParty": "Пригласив друга в команду, вы получите уникальный <br/> свиток квеста для совместного сражения с Василистом!",
     "upgradeParty": "Улучшить команду",
     "createParty": "Создать команду",

website/common/locales/ru/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Тигр-ветеран",
     "veteranLion": "Лев-ветеран",
     "veteranBear": "Мишка-ветеран",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Щенок цербера",
     "hydra": "Гидра",
     "mantisShrimp": "Рак-богомол",

website/common/locales/ru/settings.json

@@ -54,7 +54,7 @@
     "misc": "Разное",
     "showHeader": "Показывать область персонажа",
     "changePass": "Изменение пароля",
-    "changeUsername": "Сменить Имя Пользователя",
+    "changeUsername": "Изменить имя пользователя",
     "changeEmail": "Сменить адрес электронной почты",
     "newEmail": "Новый адрес электронной почты",
     "oldPass": "Старый пароль",

website/common/locales/sk/loadingscreentips.json

@@ -22,15 +22,15 @@
   "tip20": "Posilni tvoj Postreh, aby si získal viac predmetov a zlata.",
   "tip21": "Posilni tvoju Silu, aby si spôsobil väčšie poškodenie bossovi alebo získal kritické zásahy.",
   "tip22": "Posilni tvoju Odolnosť, aby si znížil poškodenie z nesplnených Denných úloh.",
-  "tip23": "Reach level 100 to unlock the Orb of Rebirth for free and start a new adventure!",
-  "tip24": "Have a question? Ask in the Habitica Help Guild!",
+  "tip23": "Dosiahni level 100, aby si zadarmo odomkol Orb znovuzrodenia a začni nové dobrodružstvo!",
+  "tip24": "Máš otázku? Opýtaj sa ju v cechu: \"Habitica Help Guild!\"",
   "tip25": "The four seasonal Grand Galas start near the solstices and equinoxes.",
   "tip26": "You can look for a Party or find Party members in the Party Wanted Guild!",
   "tip27": "Did a Daily yesterday, but forgot to check it off? Don't worry! With Record Yesterday's Activity, you'll have a chance to record what you did before starting your new day.",
   "tip28": "Set a Custom Day Start under User Icon > Settings to control when your day restarts.",
-  "tip29": "Complete all your Dailies to get a Perfect Day Buff that increases your Stats!",
+  "tip29": "Splň všetky svoje denné úlohy, aby si dostal bonus za perfektný deň, ktorý zvýši tvoje štatistiky!",
   "tip30": "Môžeš pozývať ľudí nielen do družín, ale aj do cechov.",
-  "tip31": "Check out the pre-made lists in the Library of Tasks and Challenges Guild for example tasks.",
+  "tip31": "Pozri si predpripravené zoznamy v cechu: \"Library of Shared Lists Guild\" pre príklady úloh. ",
   "tip32": "Lots of Habitica’s code, art, and writing is made by volunteer contributors! Head to the Aspiring Legends Guild to help.",
   "tip33": "Check out The Bulletin Board Guild for news about Guilds, Challenges, and other player-created events - and announce your own there!",
   "tip34": "Occasionally re-evaluate your tasks to make sure they’re up-to-date!",

website/common/locales/sk/pets.json

@@ -19,6 +19,7 @@
     "veteranTiger": "Tiger Veterán",
     "veteranLion": "Lev Veterán",
     "veteranBear": "Medveď veterán",
+    "veteranFox": "Veteran Fox",
     "cerberusPup": "Cerberusove šteniatko",
     "hydra": "Hydra",
     "mantisShrimp": "Garnát",