Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/modal-notifications

# Conflicts:
#	website/client/components/notifications.vue

migrations/users/mystery-items.js

@@ -1,14 +1,14 @@
 import monk from 'monk';
 import nconf from 'nconf';
 
-const migrationName = 'mystery-items-201806.js'; // Update per month
+const migrationName = 'mystery-items-201807.js'; // Update per month
 const authorName = 'Sabe'; // in case script author needs to know when their ...
 const authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
 
 /*
  * Award this month's mystery items to subscribers
  */
-const MYSTERY_ITEMS = ['armor_mystery_201806', 'head_mystery_201806'];
+const MYSTERY_ITEMS = ['armor_mystery_201807', 'head_mystery_201807'];
 const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
 
 let dbUsers = monk(CONNECTION_STRING).get('users', { castIds: false });

migrations/users/summer-splash-orcas.js

@@ -0,0 +1,99 @@
+let migrationName = '20180724_summer-splash-orcas.js'; // Update per month
+let authorName = 'Sabe'; // in case script author needs to know when their ...
+let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done
+
+/*
+ * Award ladder items to participants in this year's Summer Splash festivities
+ */
+
+import monk from 'monk';
+import nconf from 'nconf';
+const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING');
+let dbUsers = monk(CONNECTION_STRING).get('users', { castIds: false });
+
+function processUsers (lastId) {
+  // specify a query to limit the affected users (empty for all users):
+  let query = {
+    migration: {$ne: migrationName},
+    'auth.timestamps.loggedin': {$gt: new Date('2018-07-01')}, // rerun without date restriction after initial run
+  };
+
+  if (lastId) {
+    query._id = {
+      $gt: lastId,
+    };
+  }
+
+  dbUsers.find(query, {
+    sort: {_id: 1},
+    limit: 250,
+    fields: [
+      'items.mounts',
+    ], // specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+  })
+    .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 = {};
+
+  if (user && user.items && user.items.pets && typeof user.items.pets['Orca-Base'] !== 'undefined') {
+    set = {migration: migrationName};
+  } else if (user && user.items && user.items.mounts && typeof user.items.mounts['Orca-Base'] !== 'undefined') {
+    set = {migration: migrationName, 'items.pets.Orca-Base': 5};
+  } else {
+    set = {migration: migrationName, 'items.mounts.Orca-Base': true};
+  }
+
+  dbUsers.update({_id: user._id}, {$set: set});
+
+  if (count % progressCount === 0) console.warn(`${count  } ${  user._id}`);
+  if (user._id === authorUuid) console.warn(`${authorName  } processed`);
+}
+
+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.52.2",
+  "version": "4.54.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.52.2",
+  "version": "4.54.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

website/client/app.vue

@@ -105,7 +105,7 @@ div
   @import '~client/assets/scss/colors.scss';
 
   /* @TODO: The modal-open class is not being removed. Let's try this for now */
-  .modal, .modal-open {
+  .modal {
     overflow-y: scroll !important;
   }
 
@@ -499,8 +499,16 @@ export default {
       });
 
       this.$root.$on('bv::modal::hidden', (bvEvent) => {
-        const modalId = bvEvent.target && bvEvent.target.id;
-        if (!modalId) return;
+        let modalId = bvEvent.target && bvEvent.target.id;
+
+        // sometimes the target isn't passed to the hidden event, fallback is the vueTarget
+        if (!modalId) {
+          modalId = bvEvent.vueTarget && bvEvent.vueTarget.id;
+        }
+
+        if (!modalId) {
+          return;
+        }
 
         const modalStack = this.$store.state.modalStack;
 
@@ -517,6 +525,7 @@ export default {
 
         // Get previous modal
         const modalBefore = modalOnTop ? modalOnTop.prev : undefined;
+
         if (modalBefore) this.$root.$emit('bv::show::modal', modalBefore, {fromRoot: true});
       });
     },

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

@@ -6,7 +6,7 @@
 }
 .promo_armoire_backgrounds_201807 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -853px -442px;
+  background-position: -995px 0px;
   width: 141px;
   height: 441px;
 }
@@ -16,15 +16,21 @@
   width: 375px;
   height: 361px;
 }
-.promo_mystery_201806 {
+.promo_mystery_201807 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -995px -442px;
-  width: 121px;
-  height: 114px;
+  width: 114px;
+  height: 120px;
+}
+.promo_orcas {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -954px;
+  width: 219px;
+  height: 147px;
 }
 .promo_seafoam {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -995px 0px;
+  background-position: -853px -442px;
   width: 141px;
   height: 441px;
 }
@@ -36,7 +42,7 @@
 }
 .promo_seasonal_shop_summer {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -401px -552px;
+  background-position: -642px -552px;
   width: 162px;
   height: 138px;
 }
@@ -60,7 +66,7 @@
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -995px -557px;
+  background-position: -995px -563px;
   width: 96px;
   height: 69px;
 }
@@ -76,3 +82,9 @@
   width: 258px;
   height: 258px;
 }
+.scene_todos {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -401px -552px;
+  width: 240px;
+  height: 195px;
+}

website/client/assets/scss/markdown.scss

@@ -1,13 +1,22 @@
 .markdown {
-  > p {
-    margin-bottom: 0px;
+  p {
+    margin-bottom: 8px;
   }
 
   h1 {
+    margin-bottom: 10px;
+    margin-top: 14px;
     line-height: 1.17;
   }
 
+  h2 {
+    margin-bottom: 6px;
+    margin-top: 10px;
+  }
+
   h3 {
+    margin-bottom: 4px;
+    margin-top: 6px;
     color: $gray-10;
   }
 

website/client/components/chat/chatCard.vue

@@ -11,7 +11,7 @@ div
       )
         | {{msg.user}}
         .svg-icon(v-html="tierIcon", v-if='showShowTierStyle')
-      p.time {{msg.timestamp | timeAgo}}
+      p.time(v-b-tooltip="", :title="msg.timestamp | date") {{msg.timestamp | timeAgo}}
       .text(v-markdown='msg.text')
       hr
       .action(@click='like()', v-if='!inbox && msg.likes', :class='{active: msg.likes[user._id]}')
@@ -72,6 +72,7 @@ div
     .time {
       font-size: 12px;
       color: #878190;
+      width: 150px;
     }
 
     .text {
@@ -165,7 +166,7 @@ export default {
       return moment(value).fromNow();
     },
     date (value) {
-      // @TODO: Add user preference
+      // @TODO: Vue doesn't support this so we cant user preference
       return moment(value).toDate();
     },
   },

website/client/components/groups/createPartyModal.vue

@@ -19,19 +19,20 @@ b-modal#create-party-modal(title="Empty", size='lg', hide-footer=true)
         p(v-once) {{$t('wantToJoinPartyDescription')}}
         button.btn.btn-primary(v-once, @click='shareUserId()') {{$t('shartUserId')}}
       .share-userid-options(v-if="shareUserIdShown")
-        .option-item(v-once)
+        .option-item(@click='copyUserId()')
           .svg-icon(v-html="icons.copy")
+          input(type="text", v-model="user._id", id="userIdInput")
           | Copy User ID
-        .option-item(v-once)
+        //.option-item(v-once)
           .svg-icon(v-html="icons.greyBadge")
           | {{$t('lookingForGroup')}}
-        .option-item(v-once)
+        //.option-item(v-once)
           .svg-icon(v-html="icons.qrCode")
           | {{$t('qrCode')}}
-        .option-item(v-once)
+        //.option-item(v-once)
           .svg-icon.facebook(v-html="icons.facebook")
           | Facebook
-        .option-item(v-once)
+        //.option-item(v-once)
           .svg-icon(v-html="icons.twitter")
           | Twitter
 </template>
@@ -108,10 +109,15 @@ b-modal#create-party-modal(title="Empty", size='lg', hide-footer=true)
     border-radius: 2px;
     width: 220px;
     position: absolute;
-    top: -8em;
+    top: 9em;
     left: 4.8em;
     box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
 
+    #userIdInput {
+      position: absolute;
+      left: 1000rem;
+    }
+
     .option-item {
       padding: 1em;
 
@@ -183,6 +189,12 @@ export default {
       this.$root.$emit('bv::hide::modal', 'create-party-modal');
       this.$router.push('/party');
     },
+    copyUserId () {
+      const copyText = document.getElementById('userIdInput');
+      copyText.select();
+      document.execCommand('copy');
+      alert('User ID has been copied');
+    },
   },
 };
 </script>

website/client/components/groups/publicGuildItem.vue

@@ -76,10 +76,18 @@ router-link.card-link(:to="{ name: 'guild', params: { groupId: guild._id } }")
 
     .gold {
       color: #fdbb5a;
+
+      .member-count {
+        color: #fdbb5a;
+      }
     }
 
     .silver {
       color: #c2c2c2;
+
+      .member-count {
+        color: #c2c2c2;
+      }
     }
 
     .badge-column {

website/client/components/header/userDropdown.vue

@@ -8,8 +8,8 @@ menu-dropdown.item-user(:right="true")
     a.dropdown-item.edit-avatar.dropdown-separated(@click='showAvatar()')
       h3 {{ user.profile.name }}
       span.small-text {{ $t('editAvatar') }}
-    a.nav-link.dropdown-item.dropdown-separated(@click.prevent='showInbox()')
-      | {{ $t('messages') }}
+    a.nav-link.dropdown-item.dropdown-separated.d-flex.justify-content-between.align-items-center(@click.prevent='showInbox()')
+      div {{ $t('messages') }}
       message-count(v-if='user.inbox.newMessages > 0', :count="user.inbox.newMessages")
     a.dropdown-item(@click='showAvatar("backgrounds", "2018")') {{ $t('backgrounds') }}
     a.dropdown-item(@click='showProfile("stats")') {{ $t('stats') }}

website/client/components/notifications.vue

@@ -544,7 +544,7 @@ export default {
             this.$root.$emit('bv::show::modal', 'won-challenge');
             break;
           case 'STREAK_ACHIEVEMENT':
-            this.streak(this.user.achievements.streak, () => {
+            this.text(this.user.achievements.streak, () => {
               if (!this.user.preferences.suppressModals.streak) {
                 this.$root.$emit('bv::show::modal', 'streak');
               }

website/client/components/payments/amazonModal.vue

@@ -3,8 +3,10 @@
     h2.text-center Continue with Amazon
     #AmazonPayButton
     #AmazonPayWallet(v-if="amazonPayments.loggedIn", style="width: 400px; height: 228px;")
-    #AmazonPayRecurring(v-if="amazonPayments.loggedIn && amazonPayments.type === 'subscription'",
-                        style="width: 400px; height: 140px;")
+    template(v-if="amazonPayments.loggedIn && amazonPayments.type === 'subscription'")
+      br
+      p(v-html="$t('amazonPaymentsRecurring')")
+      #AmazonPayRecurring(style="width: 400px; height: 140px;")
     .modal-footer
       .text-center
         button.btn.btn-primary(v-if="amazonPaymentsCanCheckout",

website/client/components/payments/sendGemsModal.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-b-modal#send-gems(:title="title", :hide-footer="true", size='lg')
+b-modal#send-gems(:title="title", :hide-footer="true", size='lg', @hide='onHide()')
   .modal-body(v-if='userReceivingGems')
     .panel.panel-default(
       :class="gift.type === 'gems' ? 'panel-primary' : 'transparent'",
@@ -138,6 +138,9 @@ export default {
       this.text(this.$t('sentGems'));
       this.close();
     },
+    onHide () {
+      this.gift.message = '';
+    },
     close () {
       this.$root.$emit('bv::hide::modal', 'send-gems');
     },

website/client/components/snackbars/notification.vue

@@ -146,6 +146,15 @@ export default {
   beforeDestroy () {
     clearTimeout(this.timer);
   },
+  methods: {
+    handleOnClick () {
+      if (typeof this.notification.onClick === 'function') {
+        this.notification.onClick();
+      }
+
+      this.show = false;
+    },
+  },
   watch: {
     show () {
       this.$store.dispatch('snackbars:remove', this.notification);

website/client/components/userMenu/profile.vue

@@ -8,7 +8,7 @@ div
         button.btn.btn-secondary.gift-icon(@click='openSendGemsModal()', v-b-tooltip.hover.bottom="$t('sendGems')")
           .svg-icon.gift-icon(v-html="icons.gift")
         button.btn.btn-secondary.remove-icon(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) === -1',
-          @click="blockUser()", v-b-tooltip.hover.right="$t('block')")
+          @click="blockUser()", v-b-tooltip.hover.right="$t('blockWarning')")
           .svg-icon.remove-icon(v-html="icons.remove")
         button.btn.btn-secondary.positive-icon(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) !== -1',
           @click="unblockUser()", v-b-tooltip.hover.right="$t('unblock')")

website/client/components/userMenu/profileStats.vue

@@ -122,7 +122,7 @@
         .col-12.col-md-6
           h3(v-if='userLevel100Plus', v-once, v-html="$t('noMoreAllocate')")
           h3
-            | {{$t('pointsAvailable')}}
+            | {{$t('statPoints')}}
             .counter.badge(v-if='user.stats.points || userLevel100Plus')
               | {{user.stats.points}} 
         .col-12.col-md-6
@@ -135,15 +135,15 @@
       .row
         .col-12.col-md-3(v-for='(statInfo, stat) in allocateStatsList')
           .box.white.row.col-12
-            .col-12.col-md-9
+            .col-9
               div(:class='stat') {{ $t(stats[stat].title) }}
               .number {{ user.stats[stat] }}
               .points {{$t('pts')}}
-            .col-12.col-md-3
+            .col-3
               div
-                .up(v-if='user.stats.points', @click='allocate(stat)')
+                .up(v-if='showStatsSave', @click='allocate(stat)')
               div
-                .down(@click='deallocate(stat)', v-if='user.stats.points')
+                .down(v-if='showStatsSave', @click='deallocate(stat)')
       .row.save-row(v-if='showStatsSave')
         .col-12.col-md-6.offset-md-3.text-center
           button.btn.btn-primary(@click='saveAttributes()', :disabled='loading') {{ this.loading ?  $t('loading') : $t('save') }}

website/client/mixins/buy.js

@@ -1,13 +1,27 @@
 export default {
   methods: {
-    makeGenericPurchase (item, type = 'buyModal', quantity = 1) {
-      this.$store.dispatch('shops:genericPurchase', {
-        pinType: item.pinType,
-        type: item.purchaseType,
-        key: item.key,
-        currency: item.currency,
-        quantity,
-      });
+    async makeGenericPurchase (item, type = 'buyModal', quantity = 1) {
+      try {
+        await this.$store.dispatch('shops:genericPurchase', {
+          pinType: item.pinType,
+          type: item.purchaseType,
+          key: item.key,
+          currency: item.currency,
+          quantity,
+        });
+      } catch (e) {
+        if (!e.request) {
+          // axios request errors already handled by app.vue
+          this.$store.dispatch('snackbars:add', {
+            title: '',
+            text: e.message,
+            type: 'error',
+          });
+          return;
+        } else {
+          throw e;
+        }
+      }
 
       this.$root.$emit('playSound', 'Reward');
 

website/common/locales/bg/achievements.json

@@ -1,4 +1,5 @@
 {
+  "achievement": "Achievement",
   "share": "Споделяне",
   "onwards": "Напред!",
   "levelup": "Изпълнявайки целите си в истинския живот, Вие качихте ниво и здравето Ви беше запълнено!",

website/common/locales/bg/challenge.json

@@ -131,7 +131,7 @@
     "locationRequired": "Мястото на предизвикателството е задължително („Добавяне в“)",
     "categoiresRequired": "Задължително е да бъде избрана поне една категория",
     "viewProgressOf": "Преглед на напредъка на",
-    "viewProgress": "View Progress",
+    "viewProgress": "Преглед на напредъка",
     "selectMember": "Изберете член",
     "confirmKeepChallengeTasks": "Искате ли да задържите задачите от предизвикателството?",
     "selectParticipant": "Изберете участник"

website/common/locales/bg/character.json

@@ -219,6 +219,6 @@
     "bodyAccess": "Аксесоар за тяло",
     "mainHand": "Основна ръка",
     "offHand": "Страничен",
-    "pointsAvailable": "Налични точки",
+    "statPoints": "Stat Points",
     "pts": "точки"
 }

website/common/locales/bg/gear.json

@@ -656,6 +656,8 @@
     "armorMystery201802Notes": "Тази лъскава броня отразява силата на сърцето Ви и я разпръсква към хабитиканците наоколо, които имат нужда от окуражаване! Не променя показателите. Предмет за абонати: февруари 2018 г.",
     "armorMystery201806Text": "Опашка на морски дявол",
     "armorMystery201806Notes": "По тази игрива опашка има светещи петна, които ще осветят пътя Ви в дълбините. Не променя показателите. Предмет за абонати: юни 2018 г.",
+    "armorMystery201807Text": "Опашка на морски змей",
+    "armorMystery201807Notes": "Тази могъща опашка ще Ви изстреля с невероятна скорост през морските дълбини! Не променя показателите. Предмет за абонати: юли 2018 г.",
     "armorMystery301404Text": "Изтънчен костюм",
     "armorMystery301404Notes": "Спретнат и елегантен! Не променя показателите. Предмет за абонати: февруари 3015 г.",
     "armorMystery301703Text": "Изтънчена паунова рокля",
@@ -1062,6 +1064,8 @@
     "headMystery201805Notes": "С този шлем ще се превърнете в най-гордата и най-красивата (а сигурно и най-шумната) птица наоколо. Не променя показателите. Предмет за абонати: май 2018 г.",
     "headMystery201806Text": "Шлем на морски дявол",
     "headMystery201806Notes": "Хипнотизиращата светлина, закачена отгоре на този шлем, ще привика всички морски същества на Ваша страна. Не променя показателите. Предмет за абонати: февруари 2018 г.",
+    "headMystery201807Text": "Шлем на морски змей",
+    "headMystery201807Notes": "Здравите люспи на този шлем ще Ви защитят от всеки морски враг. Не променя показателите. Предмет за абонати: юли 2018 г.",
     "headMystery301404Text": "Украсен цилиндър",
     "headMystery301404Notes": "Украсен цилиндър за най-изтънчените и високопоставени членове на обществото. Не променя показателите. Предмет за абонати: януари 3015 г.",
     "headMystery301405Text": "Обикновен цилиндър",

website/common/locales/bg/groups.json

@@ -141,6 +141,7 @@
     "PMDisabledCaptionText": "Вие можете да изпращате съобщения, но никой няма да може да изпраща на Вас.",
     "block": "Блокиране",
     "unblock": "Отблокиране",
+    "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
     "pm-reply": "Изпращане на отговор",
     "inbox": "Входяща поща",
     "messageRequired": "Нужно е съобщение.",
@@ -468,5 +469,9 @@
     "howToRequireApprovalDesc2": "Водачите и управителите на групата могат да одобряват завършените задачи направо от дъската със задачи или от областта за известия.",
     "whatIsGroupManager": "Какво е „управител на групата“?",
     "whatIsGroupManagerDesc": "Управител на групата е такъв потребител, който няма достъп до информацията за таксуването на групата, но може да създава, назначава и одобрява споделени задачи за членовете на групата. Можете да определите кои са управителите на групата от списъка с членовете.",
-    "goToTaskBoard": "Към дъската със задачи"
+    "goToTaskBoard": "Към дъската със задачи",
+    "sharedCompletion": "Shared Completion",
+    "recurringCompletion": "None - Group task does not complete",
+    "singleCompletion": "Single - Completes when any assigned user finishes",
+    "allAssignedCompletion": "All - Completes when all assigned users finish"
 }

website/common/locales/bg/settings.json

@@ -183,6 +183,7 @@
     "mysticHourglassesTooltip": "Тайнствени пясъчни часовници",
     "paypal": "PayPal",
     "amazonPayments": "Плащания през Amazon",
+    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Часови пояс",
     "timezoneUTC": "Хабитика използва часовия пояс, зададен на Вашия компютър, който е: <strong><%= utc %></strong>",
     "timezoneInfo": "Ако този часови пояс е грешен, първо, презаредете страницата чрез бутона за презареждане или опресняване на браузъра си, за да е сигурно, че Хабитика разполага с най-актуалните данни. Ако все още има грешка, настройте часовия пояс на компютъра си и след това презаредете тази страница отново.<br><br> <strong>Ако използвате Хабитика на други компютри или мобилни устройства, часовият пояс трябва да бъде еднакъв на всички тях.</strong> Ако ежедневните Ви задачи се подновяват в грешно време, повторете тази проверка на всичките си останали компютри и чрез браузъра на всички свои мобилни устройства.",

website/common/locales/bg/subscriber.json

@@ -145,6 +145,7 @@
     "mysterySet201804": "Комплект на изтупаната катерица",
     "mysterySet201805": "Феноменален паунов комплект",
     "mysterySet201806": "Комплект на морския дявол",
+    "mysterySet201807": "Sea Serpent Set",
     "mysterySet301404": "Стандартен изтънчен комплект",
     "mysterySet301405": "Комплект изтънчени принадлежности",
     "mysterySet301703": "Изтънчен паунов комплект",

website/common/locales/cs/achievements.json

@@ -1,4 +1,5 @@
 {
+  "achievement": "Achievement",
   "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!",

website/common/locales/cs/character.json

@@ -219,6 +219,6 @@
     "bodyAccess": "Příslušenství na tělo",
     "mainHand": "Hlavní ruka",
     "offHand": "Druhá ruka",
-    "pointsAvailable": "Dostupné body",
+    "statPoints": "Stat Points",
     "pts": "Body"
 }

website/common/locales/cs/gear.json

@@ -656,6 +656,8 @@
     "armorMystery201802Notes": "This shiny armor reflects your strength of heart and infuses it into any Habiticans nearby who may need encouragement! Confers no benefit. February 2018 Subscriber Item.",
     "armorMystery201806Text": "Alluring Anglerfish Tail",
     "armorMystery201806Notes": "This sinuous tail features glowing spots to light your way through the deep. Confers no benefit. June 2018 Subscriber Item.",
+    "armorMystery201807Text": "Sea Serpent Tail",
+    "armorMystery201807Notes": "This powerful tail will propel you through the sea at incredible speeds! Confers no benefit. July 2018 Subscriber Item.",
     "armorMystery301404Text": "Steampunk oblek",
     "armorMystery301404Notes": "Elegantní a fešácký, joj!  Nepřináší žádný benefit. Předmět pro předplatitele únor 3015.",
     "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1062,6 +1064,8 @@
     "headMystery201805Notes": "This helm will make you the proudest and prettiest (possibly also the loudest) bird in town. Confers no benefit. May 2018 Subscriber Item.",
     "headMystery201806Text": "Alluring Anglerfish Helm",
     "headMystery201806Notes": "The mesmerizing light atop this helm will call all the creatures of the sea to your side. We urge you to use your glowy powers of attraction for good! Confers no benefit. June 2018 Subscriber Item.",
+    "headMystery201807Text": "Sea Serpent Helm",
+    "headMystery201807Notes": "The strong scales on this helm will protect you from any manner of oceanic foe. Confers no benefit. July 2018 Subscriber Item.",
     "headMystery301404Text": "Fešný cylindr",
     "headMystery301404Notes": "Fešný cylindr pro ty největší džentlmeny.  Předmět pro předplatitele leden 2015. Nepřináší žádný benefit.",
     "headMystery301405Text": "Obyčejný cylindr",

website/common/locales/cs/groups.json

@@ -141,6 +141,7 @@
     "PMDisabledCaptionText": "You can still send messages, but no one can send them to you.",
     "block": "Blokovat",
     "unblock": "Odblokovat",
+    "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
     "pm-reply": "Poslat odpověď",
     "inbox": "Příchozí zprávy",
     "messageRequired": "Je požadována zpráva.",
@@ -468,5 +469,9 @@
     "howToRequireApprovalDesc2": "Group Leaders and Managers can approve completed Tasks directly from the Task Board or from the Notifications panel.",
     "whatIsGroupManager": "What is a Group Manager?",
     "whatIsGroupManagerDesc": "A Group Manager is a user role that do not have access to the group's billing details, but can create, assign, and approve shared Tasks for the Group's members. Promote Group Managers from the Group’s member list.",
-    "goToTaskBoard": "Go to Task Board"
+    "goToTaskBoard": "Go to Task Board",
+    "sharedCompletion": "Shared Completion",
+    "recurringCompletion": "None - Group task does not complete",
+    "singleCompletion": "Single - Completes when any assigned user finishes",
+    "allAssignedCompletion": "All - Completes when all assigned users finish"
 }

website/common/locales/cs/settings.json

@@ -183,6 +183,7 @@
     "mysticHourglassesTooltip": "Mystic Hourglasses",
     "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.",
     "timezone": "Časové pásmo",
     "timezoneUTC": "Habitica používá časové pásmo nastavené na tvém PC, což je : <strong><%= utc %></strong>",
     "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.<br><br> <strong>If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all.</strong> If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices.",

website/common/locales/cs/subscriber.json

@@ -145,6 +145,7 @@
     "mysterySet201804": "Spiffy Squirrel Set",
     "mysterySet201805": "Phenomenal Peacock Set",
     "mysterySet201806": "Alluring Anglerfish Set",
+    "mysterySet201807": "Sea Serpent Set",
     "mysterySet301404": "Standardní steampunkový set",
     "mysterySet301405": "Set steampunkových doplňků",
     "mysterySet301703": "Peacock Steampunk Set",

website/common/locales/da/achievements.json

@@ -1,4 +1,5 @@
 {
+  "achievement": "Achievement",
   "share": "Del",
   "onwards": "Fremad!",
   "levelup": "By accomplishing your real life goals, you leveled up and are now fully healed!",

website/common/locales/da/character.json

@@ -219,6 +219,6 @@
     "bodyAccess": "Body Access.",
     "mainHand": "Main-Hand",
     "offHand": "Off-Hand",
-    "pointsAvailable": "Points Available",
+    "statPoints": "Stat Points",
     "pts": "pts"
 }

website/common/locales/da/gear.json

@@ -656,6 +656,8 @@
     "armorMystery201802Notes": "This shiny armor reflects your strength of heart and infuses it into any Habiticans nearby who may need encouragement! Confers no benefit. February 2018 Subscriber Item.",
     "armorMystery201806Text": "Alluring Anglerfish Tail",
     "armorMystery201806Notes": "This sinuous tail features glowing spots to light your way through the deep. Confers no benefit. June 2018 Subscriber Item.",
+    "armorMystery201807Text": "Sea Serpent Tail",
+    "armorMystery201807Notes": "This powerful tail will propel you through the sea at incredible speeds! Confers no benefit. July 2018 Subscriber Item.",
     "armorMystery301404Text": "Steampunk-dragt",
     "armorMystery301404Notes": "Nydelig og elegant, selvfølgelig! Giver ingen bonusser. Februar 3015 Abonnentting.",
     "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1062,6 +1064,8 @@
     "headMystery201805Notes": "This helm will make you the proudest and prettiest (possibly also the loudest) bird in town. Confers no benefit. May 2018 Subscriber Item.",
     "headMystery201806Text": "Alluring Anglerfish Helm",
     "headMystery201806Notes": "The mesmerizing light atop this helm will call all the creatures of the sea to your side. We urge you to use your glowy powers of attraction for good! Confers no benefit. June 2018 Subscriber Item.",
+    "headMystery201807Text": "Sea Serpent Helm",
+    "headMystery201807Notes": "The strong scales on this helm will protect you from any manner of oceanic foe. Confers no benefit. July 2018 Subscriber Item.",
     "headMystery301404Text": "Smart Tophat",
     "headMystery301404Notes": "En smart tophat for de fineste folk! Giver ingen bonusser. Januar 3015 Abonnentting.",
     "headMystery301405Text": "Simpel Tophat",

website/common/locales/da/groups.json

@@ -141,6 +141,7 @@
     "PMDisabledCaptionText": "You can still send messages, but no one can send them to you.",
     "block": "Blokér",
     "unblock": "Fjern blokering",
+    "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
     "pm-reply": "Send svar",
     "inbox": "Indbakke",
     "messageRequired": "En besked er påkrævet.",
@@ -468,5 +469,9 @@
     "howToRequireApprovalDesc2": "Group Leaders and Managers can approve completed Tasks directly from the Task Board or from the Notifications panel.",
     "whatIsGroupManager": "What is a Group Manager?",
     "whatIsGroupManagerDesc": "A Group Manager is a user role that do not have access to the group's billing details, but can create, assign, and approve shared Tasks for the Group's members. Promote Group Managers from the Group’s member list.",
-    "goToTaskBoard": "Go to Task Board"
+    "goToTaskBoard": "Go to Task Board",
+    "sharedCompletion": "Shared Completion",
+    "recurringCompletion": "None - Group task does not complete",
+    "singleCompletion": "Single - Completes when any assigned user finishes",
+    "allAssignedCompletion": "All - Completes when all assigned users finish"
 }

website/common/locales/da/settings.json

@@ -183,6 +183,7 @@
     "mysticHourglassesTooltip": "Mystic Hourglasses",
     "paypal": "PayPal",
     "amazonPayments": "Amazon Payments",
+    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Tidszone",
     "timezoneUTC": "Habitica bruger tidszonen sat på din PC, som er: <strong><%= utc %></strong>",
     "timezoneInfo": "Hvis tidszonen er forkert, kan du først genindlæse denne side ved hjælp af din browsers knap til genindlæsning for at give Habitica de mest opdaterede informationer. Hvis den stadig er forkert, kan du justere din tidszone på din PC og derefter genindlæse siden igen.<br><br> <strong>Hvis du bruger Habitica på andre PC'er eller mobile enheder, skal tidszonen være den samme på dem alle.</strong> Hvis dine Daglige er blevet nulstellet på det forkerte tidspunkt. kan du gentage denne gennemgang på alle andre PC'er og i en browser på dine mobile enheder.",

website/common/locales/da/subscriber.json

@@ -145,6 +145,7 @@
     "mysterySet201804": "Spiffy Squirrel Set",
     "mysterySet201805": "Phenomenal Peacock Set",
     "mysterySet201806": "Alluring Anglerfish Set",
+    "mysterySet201807": "Sea Serpent Set",
     "mysterySet301404": "Steampunk Standardsæt",
     "mysterySet301405": "Steampunk Tilbehørssæt",
     "mysterySet301703": "Påfugle-Steampunk-sæt",

website/common/locales/de/achievements.json

@@ -1,4 +1,5 @@
 {
+  "achievement": "Achievement",
   "share": "Teilen",
   "onwards": "Auf geht's!",
   "levelup": "Durch das Erfüllen Deiner Lebensziele bist Du ein Level aufgestiegen und wurdest vollständig geheilt!",

website/common/locales/de/character.json

@@ -219,6 +219,6 @@
     "bodyAccess": "Körper",
     "mainHand": "Haupthand",
     "offHand": "Schildhand",
-    "pointsAvailable": "Verfügbare Punkte",
+    "statPoints": "Stat Points",
     "pts": "Pkte"
 }

website/common/locales/de/gear.json

@@ -656,6 +656,8 @@
     "armorMystery201802Notes": "Diese glänzende Rüstung reflektiert die Stärke Deines Herzens und leitet sie an alle Habiticaner in der Nähe weiter, die etwas Ermutigung brauchen! Gewährt keinen Attributbonus. Abonnentengegenstand, Februar 2018.",
     "armorMystery201806Text": "Alluring Anglerfish Tail",
     "armorMystery201806Notes": "This sinuous tail features glowing spots to light your way through the deep. Confers no benefit. June 2018 Subscriber Item.",
+    "armorMystery201807Text": "Sea Serpent Tail",
+    "armorMystery201807Notes": "This powerful tail will propel you through the sea at incredible speeds! Confers no benefit. July 2018 Subscriber Item.",
     "armorMystery301404Text": "Steampunkanzug",
     "armorMystery301404Notes": "Adrett und schneidig, hoho! Gewährt keinen Attributbonus. Abonnentengegenstand, Februar 3015.",
     "armorMystery301703Text": "Steampunk-Pfauen-Robe",
@@ -1062,6 +1064,8 @@
     "headMystery201805Notes": "This helm will make you the proudest and prettiest (possibly also the loudest) bird in town. Confers no benefit. May 2018 Subscriber Item.",
     "headMystery201806Text": "Alluring Anglerfish Helm",
     "headMystery201806Notes": "The mesmerizing light atop this helm will call all the creatures of the sea to your side. We urge you to use your glowy powers of attraction for good! Confers no benefit. June 2018 Subscriber Item.",
+    "headMystery201807Text": "Sea Serpent Helm",
+    "headMystery201807Notes": "The strong scales on this helm will protect you from any manner of oceanic foe. Confers no benefit. July 2018 Subscriber Item.",
     "headMystery301404Text": "Schicker Zylinder",
     "headMystery301404Notes": "Ein schicker Zylinder für die feinsten Ehrenleute! Gewährt keinen Attributbonus. Abonnentengegenstand, Januar 3015.",
     "headMystery301405Text": "Einfacher Zylinder",

website/common/locales/de/groups.json

@@ -141,6 +141,7 @@
     "PMDisabledCaptionText": "You can still send messages, but no one can send them to you.",
     "block": "Sperren",
     "unblock": "Entsperren",
+    "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
     "pm-reply": "Eine Antwort schicken",
     "inbox": "Postfach",
     "messageRequired": "Eine Nachricht wird benötigt.",
@@ -468,5 +469,9 @@
     "howToRequireApprovalDesc2": "Group Leaders and Managers can approve completed Tasks directly from the Task Board or from the Notifications panel.",
     "whatIsGroupManager": "Was ist ein Gruppen Manager? ",
     "whatIsGroupManagerDesc": "A Group Manager is a user role that do not have access to the group's billing details, but can create, assign, and approve shared Tasks for the Group's members. Promote Group Managers from the Group’s member list.",
-    "goToTaskBoard": "Gehe zum Aufgabenbrett"
+    "goToTaskBoard": "Gehe zum Aufgabenbrett",
+    "sharedCompletion": "Shared Completion",
+    "recurringCompletion": "None - Group task does not complete",
+    "singleCompletion": "Single - Completes when any assigned user finishes",
+    "allAssignedCompletion": "All - Completes when all assigned users finish"
 }

website/common/locales/de/settings.json

@@ -183,6 +183,7 @@
     "mysticHourglassesTooltip": "Mystische Sanduhren",
     "paypal": "PayPal",
     "amazonPayments": "Amazon-Zahlungen",
+    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Zeitzone",
     "timezoneUTC": "Habitica verwendet die Zeitzone, welche an Deinem PC eingestellt ist: <strong><%= utc %></strong>",
     "timezoneInfo": "Wenn diese Zeitzone falsch ist, lade die Seite mit Hilfe Deines Browsers erneut, um sicherzustellen, dass Habitica die aktuellen Informationen darstellt. Ist diese immernoch falsch, passe die Zeitzone Deines PCs an und lade die Seite erneut.<br><br> <strong>Wenn Du Habitica auf anderen PCs oder Mobilgeräten verwendest, muss die Zeitzone auf allen übereinstimmen.</strong> Wenn Deine täglichen Aufgaben zur falschen Zeit zurückgesetzt werden, wiederhole diese Prüfung auf allen anderen PCs und in einem Browser Deiner Mobilgeräte.",

website/common/locales/de/subscriber.json

@@ -145,6 +145,7 @@
     "mysterySet201804": "Schickes Eichörnchen Set",
     "mysterySet201805": "Set des Phänomenalen Pfaus",
     "mysterySet201806": "Verführerisches Anglerfisch Set",
+    "mysterySet201807": "Sea Serpent Set",
     "mysterySet301404": "Steampunk-Standard-Set",
     "mysterySet301405": "Steampunk-Zubehör-Set",
     "mysterySet301703": "Pfauen-Steampunk-Set",

website/common/locales/en/character.json

@@ -224,6 +224,6 @@
   "level": "Level",
   "allocated": "Allocated",
   "buffs": "Buffs",
-  "pointsAvailable": "Points Available",
+  "statPoints": "Stat Points",
   "pts": "pts"
 }

website/common/locales/en/gear.json

@@ -713,6 +713,8 @@
   "armorMystery201802Notes": "This shiny armor reflects your strength of heart and infuses it into any Habiticans nearby who may need encouragement! Confers no benefit. February 2018 Subscriber Item.",
   "armorMystery201806Text": "Alluring Anglerfish Tail",
   "armorMystery201806Notes": "This sinuous tail features glowing spots to light your way through the deep. Confers no benefit. June 2018 Subscriber Item.",
+  "armorMystery201807Text": "Sea Serpent Tail",
+  "armorMystery201807Notes": "This powerful tail will propel you through the sea at incredible speeds! Confers no benefit. July 2018 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1148,6 +1150,8 @@
   "headMystery201805Notes": "This helm will make you the proudest and prettiest (possibly also the loudest) bird in town. Confers no benefit. May 2018 Subscriber Item.",
   "headMystery201806Text": "Alluring Anglerfish Helm",
   "headMystery201806Notes": "The mesmerizing light atop this helm will call all the creatures of the sea to your side. We urge you to use your glowy powers of attraction for good! Confers no benefit. June 2018 Subscriber Item.",
+  "headMystery201807Text": "Sea Serpent Helm",
+  "headMystery201807Notes": "The strong scales on this helm will protect you from any manner of oceanic foe. Confers no benefit. July 2018 Subscriber Item.",
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",

website/common/locales/en/groups.json

@@ -143,6 +143,7 @@
   "PMDisabledCaptionText": "You can still send messages, but no one can send them to you.",
   "block": "Block",
   "unblock": "Un-block",
+  "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
   "pm-reply": "Send a reply",
   "inbox": "Inbox",
   "messageRequired": "A message is required.",

website/common/locales/en/settings.json

@@ -184,6 +184,7 @@
     "mysticHourglassesTooltip": "Mystic Hourglasses",
     "paypal": "PayPal",
     "amazonPayments": "Amazon Payments",
+    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Time Zone",
     "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <strong><%= utc %></strong>",
     "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.<br><br> <strong>If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all.</strong> If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices.",

website/common/locales/en/subscriber.json

@@ -146,6 +146,7 @@
     "mysterySet201804": "Spiffy Squirrel Set",
     "mysterySet201805": "Phenomenal Peacock Set",
     "mysterySet201806": "Alluring Anglerfish Set",
+    "mysterySet201807": "Sea Serpent Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

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

@@ -1,4 +1,5 @@
 {
+  "achievement": "Achievement",
   "share": "Share",
   "onwards": "Onwards!",
   "levelup": "By accomplishing your real life goals, you leveled up and are now fully healed!",

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

@@ -219,6 +219,6 @@
     "bodyAccess": "Body Access.",
     "mainHand": "Main-Hand",
     "offHand": "Off-Hand",
-    "pointsAvailable": "Points Available",
+    "statPoints": "Stat Points",
     "pts": "pts"
 }

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

@@ -656,6 +656,8 @@
     "armorMystery201802Notes": "This shiny armor reflects your strength of heart and infuses it into any Habiticans nearby who may need encouragement! Confers no benefit. February 2018 Subscriber Item.",
     "armorMystery201806Text": "Alluring Anglerfish Tail",
     "armorMystery201806Notes": "This sinuous tail features glowing spots to light your way through the deep. Confers no benefit. June 2018 Subscriber Item.",
+    "armorMystery201807Text": "Sea Serpent Tail",
+    "armorMystery201807Notes": "This powerful tail will propel you through the sea at incredible speeds! Confers no benefit. July 2018 Subscriber Item.",
     "armorMystery301404Text": "Steampunk Suit",
     "armorMystery301404Notes": "Dapper an' dashing, wot! Don't benefit ye. February 3015 Subscriber Item.",
     "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1062,6 +1064,8 @@
     "headMystery201805Notes": "This helm will make you the proudest and prettiest (possibly also the loudest) bird in town. Confers no benefit. May 2018 Subscriber Item.",
     "headMystery201806Text": "Alluring Anglerfish Helm",
     "headMystery201806Notes": "The mesmerizing light atop this helm will call all the creatures of the sea to your side. We urge you to use your glowy powers of attraction for good! Confers no benefit. June 2018 Subscriber Item.",
+    "headMystery201807Text": "Sea Serpent Helm",
+    "headMystery201807Notes": "The strong scales on this helm will protect you from any manner of oceanic foe. Confers no benefit. July 2018 Subscriber Item.",
     "headMystery301404Text": "Fancy Top Hat",
     "headMystery301404Notes": "A fancy top hat fer th' finest o' gentlefolk! January 3015 Subscriber Item. Don't benefit ye.",
     "headMystery301405Text": "Basic Top Hat",

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

@@ -141,6 +141,7 @@
     "PMDisabledCaptionText": "You can still send messages, but no one can send them to you.",
     "block": "Block",
     "unblock": "Un-block",
+    "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
     "pm-reply": "Send a reply",
     "inbox": "Inbox",
     "messageRequired": "A message is required.",
@@ -468,5 +469,9 @@
     "howToRequireApprovalDesc2": "Group Leaders and Managers can approve completed Tasks directly from the Task Board or from the Notifications panel.",
     "whatIsGroupManager": "What is a Group Manager?",
     "whatIsGroupManagerDesc": "A Group Manager is a user role that do not have access to the group's billing details, but can create, assign, and approve shared Tasks for the Group's members. Promote Group Managers from the Group’s member list.",
-    "goToTaskBoard": "Go to Task Board"
+    "goToTaskBoard": "Go to Task Board",
+    "sharedCompletion": "Shared Completion",
+    "recurringCompletion": "None - Group task does not complete",
+    "singleCompletion": "Single - Completes when any assigned user finishes",
+    "allAssignedCompletion": "All - Completes when all assigned users finish"
 }

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

@@ -183,6 +183,7 @@
     "mysticHourglassesTooltip": "Mystic Hourglasses",
     "paypal": "PayPal",
     "amazonPayments": "Amazon Payments",
+    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Time Zone",
     "timezoneUTC": "Habitica uses the time zone set on yer PC, which is: <strong><%= utc %></strong>",
     "timezoneInfo": "If that time zone is wrong, first reload this page using yer browser's reload or refresh button t' ensure that Habitica has th' most recent information. If it is still wrong, adjust th' time zone on yer PC an' then reload this page again.<br><br> <strong>If ye use Habitica on other PCs or mobile devices, th' time zone must be the same on them all.</strong> If yer Dailies have been resetting at th' wrong time, repeat this check on all other PCs an' on a browser on your mobile devices.",

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

@@ -145,6 +145,7 @@
     "mysterySet201804": "Spiffy Squirrel Set",
     "mysterySet201805": "Phenomenal Peacock Set",
     "mysterySet201806": "Alluring Anglerfish Set",
+    "mysterySet201807": "Sea Serpent Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

website/common/locales/en_GB/achievements.json

@@ -1,4 +1,5 @@
 {
+  "achievement": "Achievement",
   "share": "Share",
   "onwards": "Onwards!",
   "levelup": "By accomplishing your real life goals, you leveled up and are now fully healed!",

website/common/locales/en_GB/character.json

@@ -219,6 +219,6 @@
     "bodyAccess": "Body Access.",
     "mainHand": "Main-Hand",
     "offHand": "Off-Hand",
-    "pointsAvailable": "Points Available",
+    "statPoints": "Stat Points",
     "pts": "pts"
 }

website/common/locales/en_GB/gear.json

@@ -656,6 +656,8 @@
     "armorMystery201802Notes": "This shiny armor reflects your strength of heart and infuses it into any Habiticans nearby who may need encouragement! Confers no benefit. February 2018 Subscriber Item.",
     "armorMystery201806Text": "Alluring Anglerfish Tail",
     "armorMystery201806Notes": "This sinuous tail features glowing spots to light your way through the deep. Confers no benefit. June 2018 Subscriber Item.",
+    "armorMystery201807Text": "Sea Serpent Tail",
+    "armorMystery201807Notes": "This powerful tail will propel you through the sea at incredible speeds! Confers no benefit. July 2018 Subscriber Item.",
     "armorMystery301404Text": "Steampunk Suit",
     "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
     "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1062,6 +1064,8 @@
     "headMystery201805Notes": "This helm will make you the proudest and prettiest (possibly also the loudest) bird in town. Confers no benefit. May 2018 Subscriber Item.",
     "headMystery201806Text": "Alluring Anglerfish Helm",
     "headMystery201806Notes": "The mesmerizing light atop this helm will call all the creatures of the sea to your side. We urge you to use your glowy powers of attraction for good! Confers no benefit. June 2018 Subscriber Item.",
+    "headMystery201807Text": "Sea Serpent Helm",
+    "headMystery201807Notes": "The strong scales on this helm will protect you from any manner of oceanic foe. Confers no benefit. July 2018 Subscriber Item.",
     "headMystery301404Text": "Fancy Top Hat",
     "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
     "headMystery301405Text": "Basic Top Hat",

website/common/locales/en_GB/groups.json

@@ -141,6 +141,7 @@
     "PMDisabledCaptionText": "You can still send messages, but no one can send them to you.",
     "block": "Block",
     "unblock": "Un-block",
+    "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
     "pm-reply": "Send a reply",
     "inbox": "Inbox",
     "messageRequired": "A message is required.",
@@ -468,5 +469,9 @@
     "howToRequireApprovalDesc2": "Group Leaders and Managers can approve completed Tasks directly from the Task Board or from the Notifications panel.",
     "whatIsGroupManager": "What is a Group Manager?",
     "whatIsGroupManagerDesc": "A Group Manager is a user role that do not have access to the group's billing details, but can create, assign, and approve shared Tasks for the Group's members. Promote Group Managers from the Group’s member list.",
-    "goToTaskBoard": "Go to Task Board"
+    "goToTaskBoard": "Go to Task Board",
+    "sharedCompletion": "Shared Completion",
+    "recurringCompletion": "None - Group task does not complete",
+    "singleCompletion": "Single - Completes when any assigned user finishes",
+    "allAssignedCompletion": "All - Completes when all assigned users finish"
 }

website/common/locales/en_GB/settings.json

@@ -183,6 +183,7 @@
     "mysticHourglassesTooltip": "Mystic Hourglasses",
     "paypal": "PayPal",
     "amazonPayments": "Amazon Payments",
+    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Time Zone",
     "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <strong><%= utc %></strong>",
     "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.<br><br> <strong>If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all.</strong> If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices.",

website/common/locales/en_GB/subscriber.json

@@ -145,6 +145,7 @@
     "mysterySet201804": "Spiffy Squirrel Set",
     "mysterySet201805": "Phenomenal Peacock Set",
     "mysterySet201806": "Alluring Anglerfish Set",
+    "mysterySet201807": "Sea Serpent Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

website/common/locales/es/achievements.json

@@ -1,4 +1,5 @@
 {
+  "achievement": "Achievement",
   "share": "Comparte",
   "onwards": "¡Adelante!",
   "levelup": "Al cumplir tus objetivos de la vida real, ¡subes de nivel y recuperas la salud!",

website/common/locales/es/character.json

@@ -219,6 +219,6 @@
     "bodyAccess": "Accesorio para el Cuerpo",
     "mainHand": "Mano dominante",
     "offHand": "Mano secundaria",
-    "pointsAvailable": "Puntos disponibles",
+    "statPoints": "Stat Points",
     "pts": "puntos"
 }

website/common/locales/es/gear.json

@@ -656,6 +656,8 @@
     "armorMystery201802Notes": "¡Esta brillante armadura reflecta la fuerza de tu corazón y la infunde en cualquier Habiticano cercano que pueda necesitar apoyo! Sin beneficios. Artículo del Subscriptor de febrero del 2018.",
     "armorMystery201806Text": "Cola de rape seductor",
     "armorMystery201806Notes": "Esta cola sinuosa presenta puntos brillantes que iluminan tu camino a través de las profundidades. Sin beneficios. Artículo del suscriptor de junio del 2018.",
+    "armorMystery201807Text": "Sea Serpent Tail",
+    "armorMystery201807Notes": "This powerful tail will propel you through the sea at incredible speeds! Confers no benefit. July 2018 Subscriber Item.",
     "armorMystery301404Text": "Traje Steampunk",
     "armorMystery301404Notes": "¡Sofisticado y elegante! No otorga ningún beneficio. Artículo de suscriptor de febrero 3015.",
     "armorMystery301703Text": "Traje de Pavo Real Steampunk",
@@ -1062,6 +1064,8 @@
     "headMystery201805Notes": "Este casco te hará el ave más orgullosa y más bonita (posiblemente también la más ruidosa) de la ciudad. Sin beneficios. Artículo del suscriptor de mayo del 2018.",
     "headMystery201806Text": "Casco de rape seductor",
     "headMystery201806Notes": "La luz hipnótica colocada sobre este casco llamará a todas las criaturas del mar a tu lado. ¡Te instamos definitivamente a usar tus poderes de atracción luminosos! Sin beneficios. Artículo del suscriptor de junio 2018.",
+    "headMystery201807Text": "Sea Serpent Helm",
+    "headMystery201807Notes": "The strong scales on this helm will protect you from any manner of oceanic foe. Confers no benefit. July 2018 Subscriber Item.",
     "headMystery301404Text": "Sombrero de copa sofisticado",
     "headMystery301404Notes": "¡Un sofisticado sombrero de copa solo para los más refinados caballeros! No otorga ningún beneficio. Artículo de Suscriptor de Enero del 3015",
     "headMystery301405Text": "Sombrero de copa básico",

website/common/locales/es/groups.json

@@ -141,6 +141,7 @@
     "PMDisabledCaptionText": "Aún puedes enviar mensajes, pero nadie puede enviártelos.",
     "block": "Bloquear",
     "unblock": "Desbloquear",
+    "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
     "pm-reply": "Enviar una respuesta",
     "inbox": "Bandeja de entrada",
     "messageRequired": "Es necesario un mensaje.",
@@ -468,5 +469,9 @@
     "howToRequireApprovalDesc2": "Los líderes y Administradores del grupo pueden aprobar las tareas completadas directamente desde el panel de tareas o desde el panel de notificaciones.",
     "whatIsGroupManager": "¿Qué es un Administrador de Grupo?",
     "whatIsGroupManagerDesc": "Un administrador de grupo es una función para los usuarios que no da acceso a los detalles de facturación del grupo, pero le capacita para crear, asignar y aprobar tareas compartidas para los miembros del grupo. Asciende a los administradores de grupo desde la lista de miembros.",
-    "goToTaskBoard": "Ir al Tablón de Tareas"
+    "goToTaskBoard": "Ir al Tablón de Tareas",
+    "sharedCompletion": "Shared Completion",
+    "recurringCompletion": "None - Group task does not complete",
+    "singleCompletion": "Single - Completes when any assigned user finishes",
+    "allAssignedCompletion": "All - Completes when all assigned users finish"
 }

website/common/locales/es/settings.json

@@ -183,6 +183,7 @@
     "mysticHourglassesTooltip": "Relojes de Arena Místicos",
     "paypal": "PayPal",
     "amazonPayments": "Pagos con Amazon",
+    "amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
     "timezone": "Zona horaria",
     "timezoneUTC": "Habitica usa la zona horaria de tu PC, que es: <strong><%= utc %></strong>",
     "timezoneInfo": "Si esa zona horaria es incorrecta, antes que nada, vuelve a cargar esta página con el botón de actualizar del navegador para asegurarte de que Habitica disponga de la información más reciente. Si sigue siendo errónea, configura la zona horaria en tu PC y, luego, vuelve a cargar esta página una vez más.<br><br> <strong>Si usas Habitica en otros ordenadores o dispositivos móviles, la zona horaria debe ser la misma en todos ellos.</strong> Si tus tareas diarias se restablecen a una hora incorrecta, vuelve a comprobar esto en todos los demás ordenadores y en un navegador de tus dispositivos móviles.",

website/common/locales/es/subscriber.json

@@ -145,6 +145,7 @@
     "mysterySet201804": "Conjunto de ardilla elegante",
     "mysterySet201805": "Conjunto de pavo real fenómeno",
     "mysterySet201806": "Conjunto de rape seductor",
+    "mysterySet201807": "Sea Serpent Set",
     "mysterySet301404": "El Conjunto Steampunk",
     "mysterySet301405": "Accesorios Steampunk",
     "mysterySet301703": "Conjunto de Pavo real Steampunk",

website/common/locales/es_419/achievements.json

@@ -1,4 +1,5 @@
 {
+  "achievement": "Achievement",
   "share": "Comparte!",
   "onwards": "¡Adelante!",
   "levelup": "¡Por realizar tus metas de la vida real, has subido de nivel y te has curado por completo!",