Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.75.5",
+  "version": "4.76.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.75.5",
+  "version": "4.76.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

test/api/unit/libs/payments/payments.test.js

@@ -209,7 +209,7 @@ describe('payments/index', () => {
         await api.createSubscription(data);
         let msg = '\`Hello recipient, sender has sent you 3 months of subscription!\`';
 
-        expect(user.sendMessage).to.be.calledOnce;
+        expect(user.sendMessage).to.be.calledTwice;
         expect(user.sendMessage).to.be.calledWith(recipient, { receiverMsg: msg, senderMsg: msg, save: false });
       });
 
@@ -247,6 +247,77 @@ describe('payments/index', () => {
           },
         });
       });
+
+      context('Winter 2018-19 Gift-1-Get-1 Promotion', async () => {
+        it('creates a gift subscription for purchaser and recipient if none exist', async () => {
+          await api.createSubscription(data);
+
+          expect(user.items.pets['Jackalope-RoyalPurple']).to.eql(5);
+          expect(user.purchased.plan.customerId).to.eql('Gift');
+          expect(user.purchased.plan.dateTerminated).to.exist;
+          expect(user.purchased.plan.dateUpdated).to.exist;
+          expect(user.purchased.plan.dateCreated).to.exist;
+
+          expect(recipient.items.pets['Jackalope-RoyalPurple']).to.eql(5);
+          expect(recipient.purchased.plan.customerId).to.eql('Gift');
+          expect(recipient.purchased.plan.dateTerminated).to.exist;
+          expect(recipient.purchased.plan.dateUpdated).to.exist;
+          expect(recipient.purchased.plan.dateCreated).to.exist;
+        });
+
+        it('adds extraMonths to existing subscription for purchaser and creates a gift subscription for recipient without sub', async () => {
+          user.purchased.plan = plan;
+
+          expect(user.purchased.plan.extraMonths).to.eql(0);
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.extraMonths).to.eql(3);
+
+          expect(recipient.items.pets['Jackalope-RoyalPurple']).to.eql(5);
+          expect(recipient.purchased.plan.customerId).to.eql('Gift');
+          expect(recipient.purchased.plan.dateTerminated).to.exist;
+          expect(recipient.purchased.plan.dateUpdated).to.exist;
+          expect(recipient.purchased.plan.dateCreated).to.exist;
+        });
+
+        it('adds extraMonths to existing subscription for recipient and creates a gift subscription for purchaser without sub', async () => {
+          recipient.purchased.plan = plan;
+
+          expect(recipient.purchased.plan.extraMonths).to.eql(0);
+
+          await api.createSubscription(data);
+
+          expect(recipient.purchased.plan.extraMonths).to.eql(3);
+
+          expect(user.items.pets['Jackalope-RoyalPurple']).to.eql(5);
+          expect(user.purchased.plan.customerId).to.eql('Gift');
+          expect(user.purchased.plan.dateTerminated).to.exist;
+          expect(user.purchased.plan.dateUpdated).to.exist;
+          expect(user.purchased.plan.dateCreated).to.exist;
+        });
+
+        it('adds extraMonths to existing subscriptions for purchaser and recipient', async () => {
+          user.purchased.plan = plan;
+          recipient.purchased.plan = plan;
+
+          expect(user.purchased.plan.extraMonths).to.eql(0);
+          expect(recipient.purchased.plan.extraMonths).to.eql(0);
+
+          await api.createSubscription(data);
+
+          expect(user.purchased.plan.extraMonths).to.eql(3);
+          expect(recipient.purchased.plan.extraMonths).to.eql(3);
+        });
+
+        it('sends a private message about the promotion', async () => {
+          await api.createSubscription(data);
+          let msg = '\`Hello sender, you received 3 months of subscription as part of our holiday gift-giving promotion!\`';
+
+          expect(user.sendMessage).to.be.calledTwice;
+          expect(user.sendMessage).to.be.calledWith(user, { senderMsg: msg });
+        });
+      });
     });
 
     context('Purchasing a subscription for self', () => {

website/client/app.vue

@@ -16,18 +16,24 @@ div
     router-view(v-if="!isUserLoggedIn || isStaticPage")
     template(v-else)
       template(v-if="isUserLoaded")
-        div.resting-banner(v-show="showRestingBanner", ref="restingBanner")
+        .resting-banner(v-show="showRestingBanner", ref="restingBanner")
           span.content
             span.label.d-inline.d-sm-none {{ $t('innCheckOutBannerShort') }}
             span.label.d-none.d-sm-inline {{ $t('innCheckOutBanner') }}
             span.separator  |
             span.resume(@click="resumeDamage()") {{ $t('resumeDamage') }}
-          div.closepadding(@click="hideBanner()")
+          .closepadding(@click="hideBanner()")
+            span.svg-icon.inline.icon-10(aria-hidden="true", v-html="icons.close")
+        .g1g1-banner.d-flex.justify-content-center.align-items-center(v-if="!giftingHidden")
+          .svg-icon.svg-gifts.left-gift(v-html="icons.gifts")
+          router-link(:to="{name: 'subscription'}") {{ $t('g1g1Announcement') }}
+          .svg-icon.svg-gifts.right-gift(v-html="icons.gifts")
+          .closepadding(@click="hideGiftingBanner()")
             span.svg-icon.inline.icon-10(aria-hidden="true", v-html="icons.close")
         notifications-display
-        app-menu(:class='{"restingInn": showRestingBanner}' :style="{ marginTop: bannerHeight + 'px' }")
+        app-menu
         .container-fluid
-          app-header(:class='{"restingInn": showRestingBanner}')
+          app-header
           buyModal(
             :item="selectedItemToBuy || {}",
             :withPin="true",
@@ -50,6 +56,13 @@ div
 <style lang='scss' scoped>
   @import '~client/assets/scss/colors.scss';
 
+  #app {
+    height: calc(100% - 56px); /* 56px is the menu */
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+  }
+
   #loading-screen-inapp {
     #melior {
       margin: 0 auto;
@@ -79,6 +92,46 @@ div
     cursor: crosshair;
   }
 
+  .container-fluid {
+    overflow-x: hidden;
+    flex: 1 0 auto;
+  }
+
+  .g1g1-banner {
+    width: 100%;
+    min-height: 2.5rem;
+    background-color: #34b5c1;
+
+    a {
+      color: $white;
+      text-decoration: none;
+      font-weight: bold;
+    }
+
+    .closepadding {
+      margin: 11px 24px;
+      display: inline-block;
+      position: relative;
+      right: 0;
+      top: 0;
+      cursor: pointer;
+    }
+
+    .left-gift {
+      margin: auto 1rem auto auto;
+    }
+
+    .right-gift {
+      margin: auto auto auto 1rem;
+      filter: FlipH;
+      transform: scaleX(-1);
+    }
+
+    .svg-gifts {
+      width: 4.6rem;
+    }
+  }
+
   .notification {
     border-radius: 1000px;
     background-color: $green-10;
@@ -89,42 +142,10 @@ div
     margin-bottom: .5em;
   }
 
-  .container-fluid {
-    overflow-x: hidden;
-    flex: 1 0 auto;
-  }
-
-  #app {
-    height: calc(100% - 56px); /* 56px is the menu */
-    display: flex;
-    flex-direction: column;
-    min-height: 100vh;
-  }
-</style>
-
-<style lang='scss'>
-  @import '~client/assets/scss/colors.scss';
-
-  /* @TODO: The modal-open class is not being removed. Let's try this for now */
-  .modal {
-    overflow-y: scroll !important;
-  }
-
-  .modal-backdrop.show {
-    opacity: .9 !important;
-    background-color: $purple-100 !important;
-  }
-
-  /* Push progress bar above modals */
-  #nprogress .bar {
-    z-index: 1600 !important; /* Must stay above nav bar */
-  }
-
   .resting-banner {
     width: 100%;
     min-height: 40px;
     background-color: $blue-10;
-    position: fixed;
     top: 0;
     z-index: 1300;
     display: flex;
@@ -140,14 +161,10 @@ div
     .closepadding {
       margin: 11px 24px;
       display: inline-block;
-      position: absolute;
+      position: relative;
       right: 0;
       top: 0;
       cursor: pointer;
-
-      span svg path {
-        stroke: $blue-500;
-      }
     }
 
     @media only screen and (max-width: 768px) {
@@ -170,6 +187,25 @@ div
   }
 </style>
 
+<style lang='scss'>
+  @import '~client/assets/scss/colors.scss';
+
+  /* @TODO: The modal-open class is not being removed. Let's try this for now */
+  .modal {
+    overflow-y: scroll !important;
+  }
+
+  .modal-backdrop.show {
+    opacity: .9 !important;
+    background-color: $purple-100 !important;
+  }
+
+  /* Push progress bar above modals */
+  #nprogress .bar {
+    z-index: 1600 !important; /* Must stay above nav bar */
+  }
+</style>
+
 <script>
 import axios from 'axios';
 import { loadProgressBar } from 'axios-progress-bar';
@@ -189,8 +225,9 @@ import amazonPaymentsModal from 'client/components/payments/amazonModal';
 import paymentsSuccessModal from 'client/components/payments/successModal';
 
 import spellsMixin from 'client/mixins/spells';
-import { CONSTANTS, getLocalSetting, removeLocalSetting } from 'client/libs/userlocalManager';
+import { CONSTANTS, getLocalSetting, removeLocalSetting, setLocalSetting } from 'client/libs/userlocalManager';
 
+import gifts from 'assets/svg/gifts.svg';
 import svgClose from 'assets/svg/close.svg';
 import bannedAccountModal from 'client/components/bannedAccountModal';
 
@@ -215,6 +252,7 @@ export default {
     return {
       icons: Object.freeze({
         close: svgClose,
+        gifts,
       }),
       selectedItemToBuy: null,
       selectedSpellToBuy: null,
@@ -226,6 +264,7 @@ export default {
       currentTipNumber: 0,
       bannerHidden: false,
       bannerHeight: 0,
+      giftingHidden: getLocalSetting(CONSTANTS.keyConstants.GIFTING_BANNER_DISPLAY) === 'dismissed',
     };
   },
   computed: {
@@ -423,14 +462,6 @@ export default {
 
         this.hideLoadingScreen();
 
-        window.addEventListener('resize', this.setBannerOffset);
-        // Adjust the positioning of the header banners
-        this.$watch('showRestingBanner', () => {
-          this.$nextTick(() => {
-            this.setBannerOffset();
-          });
-        }, {immediate: true});
-
         // Adjust the timezone offset
         if (this.user.preferences.timezoneOffset !== this.browserTimezoneOffset) {
           this.$store.dispatch('user:set', {
@@ -465,7 +496,6 @@ export default {
     this.$root.$off('bv::show::modal');
     this.$root.$off('buyModal::showItem');
     this.$root.$off('selectMembersModal::showItem');
-    window.removeEventListener('resize', this.setBannerOffset);
   },
   mounted () {
     // Remove the index.html loading screen and now show the inapp loading
@@ -624,22 +654,14 @@ export default {
     },
     hideBanner () {
       this.bannerHidden = true;
-      this.setBannerOffset();
+    },
+    hideGiftingBanner () {
+      setLocalSetting(CONSTANTS.keyConstants.GIFTING_BANNER_DISPLAY, 'dismissed');
+      this.giftingHidden = true;
     },
     resumeDamage () {
       this.$store.dispatch('user:sleep');
     },
-    setBannerOffset () {
-      let contentPlacement = 0;
-      if (this.showRestingBanner && this.$refs.restingBanner !== undefined) {
-        contentPlacement = this.$refs.restingBanner.clientHeight;
-      }
-      this.bannerHeight = contentPlacement;
-      let smartBanner = document.getElementsByClassName('smartbanner')[0];
-      if (smartBanner !== undefined) {
-        smartBanner.style.top = `${contentPlacement}px`;
-      }
-    },
   },
 };
 </script>

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

@@ -1,6 +1,6 @@
 .achievement-costumeContest6x {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1136px -438px;
+  background-position: -740px -420px;
   width: 144px;
   height: 156px;
 }
@@ -34,6 +34,12 @@
   width: 417px;
   height: 147px;
 }
+.promo_g1g1 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -1136px -867px;
+  width: 237px;
+  height: 150px;
+}
 .promo_ios {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px -361px;
@@ -42,22 +48,34 @@
 }
 .promo_mystery_201811 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1136px -142px;
+  background-position: -1136px -571px;
   width: 282px;
   height: 147px;
 }
 .promo_piyo {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1136px -290px;
+  background-position: -1136px -719px;
   width: 279px;
   height: 147px;
 }
+.promo_studying {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -1136px -142px;
+  width: 220px;
+  height: 232px;
+}
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1281px -438px;
+  background-position: -1357px -142px;
   width: 96px;
   height: 69px;
 }
+.promo_todos {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -1136px -375px;
+  width: 240px;
+  height: 195px;
+}
 .promo_turkey_day_2018 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px -871px;
@@ -90,7 +108,7 @@
 }
 .scene_veteran_pets {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1136px -595px;
+  background-position: -740px -577px;
   width: 242px;
   height: 62px;
 }

website/client/assets/svg/close.svg

@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
-    <g fill="none" fill-rule="evenodd" stroke="#A5A1AC" stroke-width="2">
+    <g fill="none" fill-rule="evenodd" stroke="#FFF" stroke-width="2" opacity=".48">
         <path d="M1 11L11 1M11 11L1 1"/>
     </g>
 </svg>

website/client/assets/svg/gifts.svg

@@ -0,0 +1,44 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="73" height="27" viewBox="0 0 73 27">
+    <g fill="none" fill-rule="evenodd">
+        <path fill="#8EEDF6" d="M4.333 9.757l2.166-.554-1.742-1.401-.554-2.166-1.401 1.742-2.166.554 1.742 1.4.554 2.167zM70.333 5.757l2.166-.554-1.742-1.401-.554-2.166-1.401 1.742-2.166.554 1.742 1.4.554 2.167zM37.147 5.518l2.573.428-1.202-2.315.428-2.574-2.315 1.202-2.574-.427 1.202 2.315-.427 2.573zM68.735 22.132l2.367 1.812.03-2.981 1.812-2.368-2.981-.03-2.368-1.812-.03 2.982-1.812 2.367zM33.676 23.656l1.839.305-.859-1.653.305-1.839-1.653.859-1.839-.305.859 1.653-.305 1.839zM10.695 25.362l.805 1.68.862-1.651 1.68-.804-1.651-.862-.804-1.681-.862 1.652-1.681.804z"/>
+        <path fill="#F8F9F9" d="M21.862 9.542l5.914-1.585 2.219 8.28-5.914 1.584z"/>
+        <path fill="#DDF3F3" d="M15.949 11.126l5.913-1.584 2.219 8.28-5.914 1.584z"/>
+        <path fill="#FFA624" d="M20.68 9.859l1.182-.317 2.219 8.28-1.183.316z"/>
+        <path fill="#FFBE5D" d="M21.862 9.542l1.183-.317 2.219 8.28-1.183.316z"/>
+        <path fill="#EE9109" d="M22.581 16.955l1.183-.317.317 1.183-1.183.317zM20.68 9.859l1.182-.317.317 1.183-1.182.317z"/>
+        <path fill="#C1E9E9" d="M15.949 11.126l4.73-1.267.318 1.183-4.732 1.267zM17.85 18.223l4.731-1.268.317 1.183-4.731 1.268z"/>
+        <path fill="#DDF3F3" d="M23.045 9.225l4.731-1.268.317 1.183-4.73 1.268zM24.947 16.322l4.73-1.268.318 1.183-4.731 1.267z"/>
+        <path fill="#FFA624" d="M23.764 16.638l1.183-.316.317 1.182-1.183.317zM21.862 9.542l1.183-.317.317 1.183-1.183.317z"/>
+        <g>
+            <path stroke="#FFA624" stroke-width="1.5" d="M21.737 3.348c-.295-1.038-1.009-2.02-2.008-2.204-1-.184-1.69.542-1.495 1.297.195.755.88.984 3.075 1.916.623.264.723.03.428-1.009z"/>
+            <path stroke="#FFBE5D" stroke-width="1.5" d="M24.307 3.71c.57-.918 1.527-1.664 2.538-1.565 1.012.098 1.475.986 1.08 1.658-.396.671-1.117.703-3.484.994-.672.083-.703-.17-.134-1.088z"/>
+            <path fill="#EE9109" d="M23.129 2.769c-1.968-.277-1.106 2.141-.317 2.252.79.111 2.285-1.976.317-2.252z"/>
+            <path fill="#F8F9F9" d="M22.862 4.665l7.276 1.022-.511 3.638-7.276-1.022z"/>
+            <path fill="#DDF3F3" d="M15.587 3.642l7.275 1.023-.51 3.638-7.276-1.023z"/>
+            <path fill="#FFBE5D" d="M20.437 4.324l4.85.682-.51 3.638-4.85-.682z"/>
+            <path fill="#FFA624" d="M20.437 4.324l2.425.341-.51 3.638-2.426-.341z"/>
+            <path fill="#FFA624" d="M22.862 4.665l2.426.34-.17 1.213-2.426-.34z"/>
+            <path fill="#EE9109" d="M20.437 4.324l2.425.341-.17 1.213-2.425-.341z"/>
+            <path fill="#C1E9E9" d="M15.246 6.068l4.85.681-.17 1.213-4.85-.682z"/>
+            <path fill="#DDF3F3" d="M24.947 7.431l4.85.682-.17 1.212-4.85-.681z"/>
+        </g>
+        <g>
+            <path stroke="#FFA624" stroke-width="1.5" d="M49.696 7.04c-.549-1.24-1.609-2.337-2.885-2.391-1.276-.054-2.007.969-1.632 1.874.374.905 1.266 1.071 4.16 1.847.822.22.905-.09.357-1.33z"/>
+            <path stroke="#FFBE5D" stroke-width="1.5" d="M52.956 7.04c.548-1.24 1.609-2.337 2.885-2.391 1.276-.054 2.007.969 1.632 1.874-.374.905-1.266 1.071-4.16 1.847-.822.22-.905-.09-.357-1.33z"/>
+            <path fill="#EE9109" d="M51.326 6.075c-2.497 0-1.002 2.858 0 2.858s2.497-2.858 0-2.858z"/>
+            <path fill="#F8F9F9" d="M51.326 8.481h9.23v4.616h-9.23z"/>
+            <path fill="#DDF3F3" d="M42.095 8.481h9.23v4.616h-9.23z"/>
+            <path fill="#FFBE5D" d="M48.249 8.481h6.154v4.616h-6.154z"/>
+            <path fill="#FFA624" d="M48.249 8.481h3.077v4.616h-3.077zM51.326 8.481h3.077v1.539h-3.077z"/>
+            <path fill="#EE9109" d="M48.249 8.481h3.077v1.539h-3.077z"/>
+            <path fill="#F8F9F9" d="M51.326 13.097h7.692v10.769h-7.692z"/>
+            <path fill="#DDF3F3" d="M43.634 13.097h7.692v10.769h-7.692z"/>
+            <path fill="#FFA624" d="M49.787 13.097h1.538v10.769h-1.538z"/>
+            <path fill="#FFBE5D" d="M51.326 13.097h1.538v10.769h-1.538z"/>
+            <path fill="#EE9109" d="M49.787 22.327h1.539v1.539h-1.539zM49.787 13.097h1.539v1.538h-1.539z"/>
+            <path fill="#C1E9E9" d="M43.634 13.097h6.153v1.538h-6.153zM42.095 11.558h6.154v1.539h-6.154zM43.634 22.327h6.153v1.539h-6.153z"/>
+            <path fill="#DDF3F3" d="M52.864 13.097h6.154v1.538h-6.154zM54.403 11.558h6.154v1.539h-6.154zM52.864 22.327h6.154v1.539h-6.154z"/>
+            <path fill="#FFA624" d="M51.326 22.327h1.538v1.539h-1.538zM51.326 13.097h1.538v1.538h-1.538z"/>
+        </g>
+    </g>
+</svg>

website/client/components/payments/buyGemsModal.vue

@@ -2,23 +2,21 @@
   mixin featureBullet (text)
     .row
       .col-md-2.offset-1
-        .bubble.mx-auto
+        .d-flex.bubble.justify-content-center.align-items-center
-          .svg-icon.check(v-html='icons.check')
+          .svg-icon.check.mx-auto(v-html='icons.check')
       .col-md-8.align-self-center
         p=text
   div(v-if='user')
-    b-modal(:hide-footer='true', :hide-header='true', :id='"buy-gems"', size='lg')
+    b-modal#buy-gems(:hide-footer='true', :id='"buy-gems"', size='lg')
-      .container-fluid.purple-gradient
+      .header-wrap(slot='modal-header')
-        .gemfall
+        .image-gemfall
           .row
-            h2.text-invert.mx-auto {{ $t('support') }}
+            h2.header-invert.mx-auto {{ $t('support') }}
           .row
             .logo.svg-icon.mx-auto(v-html="icons.logo")
-      .container-fluid
+      .d-flex.nav.justify-content-center
-        .row
+        .nav-item.text-center(@click='selectedPage = "subscribe"', :class="{active: selectedPage === 'subscribe'}") {{ $t('subscribe') }}
-          .col-6.offset-3.nav
+        .nav-item.text-center(@click='selectedPage = "gems"', :class="{active: selectedPage === 'gems'}") {{ $t('buyGems') }}
-            .nav-item(@click='selectedPage = "subscribe"', :class="{active: selectedPage === 'subscribe'}") {{ $t('subscribe') }}
-            .nav-item(@click='selectedPage = "gems"', :class="{active: selectedPage === 'gems'}") {{ $t('buyGems') }}
       div(v-show='selectedPage === "gems"')
         div(v-if='hasSubscription')
           .row.text-center
@@ -36,14 +34,6 @@
             +featureBullet("{{ $t('gemBenefit3') }}")
             +featureBullet("{{ $t('gemBenefit4') }}")
         .card-deck.gem-deck
-            //.card.text-center(:class="{active: gemAmount === 4}")
-              .card-img-top
-                .mx-auto(v-html='icons.fourGems', style='"height: 53px; width: 49.5px; margin-top: 2em;"')
-              .card-body
-                .gem-count 4
-                .gem-text {{ $t('gems') }}
-                .divider
-                button.btn.btn-primary(@click='gemAmount = 4') {{gemAmount === 4 ? $t('selected') : '$1.00'}}
           .card.text-center.col-3(:class="{active: gemAmount === 20 }")
             .card-img-top
               .mx-auto(v-html='icons.twentyOneGems', style='"height: 55px; width: 47.5px; margin-top: 1.85em;"')
@@ -52,22 +42,6 @@
               .gem-text {{ $t('gems') }}
               .divider
               button.btn.btn-primary(@click='gemAmount === 20 ? gemAmount = 0 : gemAmount = 20') {{gemAmount === 20 ? $t('selected') : '$5.00'}}
-            //.card.text-center(:class="{active: gemAmount === 42}")
-              .card-img-top
-                .mx-auto(v-html='icons.fortyTwoGems', style='"height: 49.5px; width: 51px; margin-top: 1.9em;"')
-              .card-body
-                .gem-count 42
-                .gem-text {{ $t('gems') }}
-                .divider
-                button.btn.btn-primary(@click='gemAmount = 42') {{gemAmount === 42 ? $t('selected') : '$10.00'}}
-            //.card.text-center(:class="{active: gemAmount === 84}")
-              .card-img-top
-                .mx-auto(v-html='icons.eightyFourGems', style='"height: 65px; width: 67px; margin-top: 1em;"')
-              .card-body
-                .gem-count 84
-                .gem-text {{ $t('gems') }}
-                .divider
-                button.btn.btn-primary(@click='gemAmount = 84') {{gemAmount === 84 ? $t('selected') : '$20.00'}}
         .row.text-center
           h2.mx-auto.text-payment {{ $t('choosePaymentMethod') }}
         .card-deck
@@ -86,11 +60,17 @@
           .col-6.offset-3 {{ $t('buyGemsSupportsDevs') }}
 
       div(v-show='selectedPage === "subscribe"')
+        .g1g1-promo.d-flex.justify-content-center.align-items-center
+          .svg-icon.svg-gifts.left-gift(v-html="icons.gifts")
+          .text-center
+            strong.gift-text {{ $t('g1g1Announcement') }}
+            .gift-text {{ $t('g1g1Details') }}
+          .svg-icon.svg-gifts.right-gift(v-html="icons.gifts")
         div(v-if='hasSubscription')
           .row.text-center
             h2.mx-auto.text-leadin {{ $t('subscriptionAlreadySubscribedLeadIn') }}
           .row.text-center
-              .col
+            .col-10.offset-1
               p(v-html='$t("subscriptionAlreadySubscribed1")')
         div(v-if='!hasSubscription')
           .row.text-center
@@ -170,12 +150,24 @@
 </template>
 
 <style lang="scss">
-  #buy-gems__BV_body_ {
+  #buy-gems .modal-body {
     padding: 0;
   }
+
+  #buy-gems .modal-content {
+    border-radius: 8px;
+    width: 824px;
+  }
+
+  #buy-gems .modal-header {
+    padding: 0;
+    border-bottom: 0px;
+  }
 </style>
 
 <style lang="scss" scoped>
+  @import '~client/assets/scss/colors.scss';
+
   a.mx-auto {
     color: #2995cd;
   }
@@ -228,6 +220,11 @@
     margin: 1em auto;
   }
 
+  .g1g1-promo {
+    background-color: #34b5c1;
+    height: 3.75rem;
+  }
+
   .gem-count {
 		font-family: Roboto;
 		font-size: 40px;
@@ -242,11 +239,40 @@
     margin-bottom: 1em;
   }
 
-  .gemfall {
+  .gift-text {
+    color: $white;
+    font-size: 14px;
+  }
+
+  .image-gemfall {
     background: url(~assets/images/gemfall.png) center repeat-y;
     height: 14em;
   }
 
+  .svg-gifts {
+    width: 4.6rem;
+  }
+
+  .left-gift {
+    margin: auto 1rem auto 4.8rem;
+  }
+
+  .right-gift {
+    margin: auto 4.8rem auto 1rem;
+    filter: FlipH;
+    transform: scaleX(-1);
+  }
+
+  .header-wrap {
+    background-image: linear-gradient(74deg, #4f2a93, #6133b4);
+    height: 14em;
+    width: 100%;
+    color: #4e4a57;
+    padding: 0;
+    border-top-left-radius: 7px;
+    border-top-right-radius: 7px;
+  }
+
   .logo {
     width: 256px;
     height: 56px;
@@ -258,19 +284,21 @@
 
   .nav {
     font-weight: bold;
-    height: 40px;
+    background-color: $gray-600;
   }
 
   .nav-item {
+    box-sizing: border-box;
     display: inline-block;
     font-size: 16px;
-    margin: 0 auto;
+    margin: 0rem;
-    padding: 1.5em;
+    padding: 1rem;
+    width: 7.5rem;
   }
 
   .nav-item:hover, .nav-item.active {
     color: #4f2a93;
-    border-bottom: 2px solid #4f2a93;
+    border-bottom: 4px solid $purple-300;
     cursor: pointer;
   }
 
@@ -286,11 +314,6 @@
     padding-top: 1.3em;
   }
 
-  .purple-gradient {
-    background-image: linear-gradient(74deg, #4f2a93, #6133b4);
-    height: 14em;
-  }
-
   .spacer {
     height: 4em;
   }
@@ -309,10 +332,11 @@
 
   .svg-icon.check {
     color: #bda8ff;
+    width: 1rem;
   }
 
-  .text-invert {
+  .header-invert {
-    margin: 1.6em;
+    margin: 3rem auto 1.5rem;
     color: #FFFFFF;
     font-family: Roboto;
     font-weight: normal;
@@ -320,9 +344,9 @@
   }
 
   .text-leadin {
-    margin: 1.6em;
+    margin: 1rem;
-    font-weight: normal;
+    font-weight: bold;
-    color: #4f2a93;
+    color: $purple-200;
   }
 
   .text-outtro {
@@ -346,6 +370,7 @@
 
   import checkIcon from 'assets/svg/check.svg';
   import creditCard from 'assets/svg/credit-card.svg';
+  import gifts from 'assets/svg/gifts.svg';
   import heart from 'assets/svg/health.svg';
   import logo from 'assets/svg/habitica-logo.svg';
 
@@ -381,6 +406,7 @@
           check: checkIcon,
           creditCard,
           fourGems,
+          gifts,
           heart,
           twentyOneGems,
           fortyTwoGems,

website/client/components/payments/sendGemsModal.vue

@@ -31,11 +31,17 @@ b-modal#send-gems(:title="title", :hide-footer="true", size='lg', @hide='onHide(
     )
       h3.panel-heading {{ $t('subscription') }}
       .panel-body
+        .row
+          .col-md-4
             .form-group
               .radio(v-for='block in subscriptionBlocks', v-if="block.target !== 'group' && block.canSubscribe === true")
                 label
                   input(type="radio", name="subRadio", :value="block.key", v-model='gift.subscription.key')
                   | {{ $t('sendGiftSubscription', {price: block.price, months: block.months}) }}
+          .col-md-8
+            h4 {{ $t('winterPromoGiftHeader') }}
+            p {{ $t('winterPromoGiftDetails1') }}
+            p {{ $t('winterPromoGiftDetails2') }}
 
     textarea.form-control(rows='3', v-model='gift.message', :placeholder="$t('sendGiftMessagePlaceholder')")
     //include ../formatting-help

website/client/components/settings/subscription.vue

@@ -90,6 +90,10 @@
           li(v-once) {{ $t('giftSubscriptionText2') }}
           li(v-once) {{ $t('giftSubscriptionText3') }}
         h4(v-once) {{ $t('giftSubscriptionText4') }}
+      .col-6
+        h2 {{ $t('winterPromoGiftHeader') }}
+        p {{ $t('winterPromoGiftDetails1') }}
+        p {{ $t('winterPromoGiftDetails2') }}
 </template>
 
 <style scoped>

website/client/components/snackbars/notifications.vue

@@ -12,6 +12,10 @@
     z-index: 1400; // 1400 is above modal backgrounds
 
     &-top-pos {
+      &-double {
+        top: 145px;
+      }
+
       &-normal {
         top: 65px;
       }
@@ -26,6 +30,7 @@
 <script>
 import { mapState } from 'client/libs/store';
 import notification from './notification';
+import { CONSTANTS, getLocalSetting } from 'client/libs/userlocalManager';
 
 export default {
   components: {
@@ -39,7 +44,9 @@ export default {
     notificationsTopPos () {
       const base = 'notifications-top-pos-';
       let modifier = '';
-      if (this.userSleeping) {
+      if (this.userSleeping && this.giftingShown) {
+        modifier = 'double';
+      } else if (this.userSleeping || this.giftingShown) {
         modifier = 'sleeping';
       } else {
         modifier = 'normal';
@@ -47,5 +54,10 @@ export default {
       return `${base}${modifier}`;
     },
   },
+  data () {
+    return {
+      giftingShown: getLocalSetting(CONSTANTS.keyConstants.GIFTING_BANNER_DISPLAY) !== 'dismissed',
+    };
+  },
 };
 </script>

website/client/libs/userlocalManager.js

@@ -5,6 +5,7 @@ const CONSTANTS = {
     EQUIPMENT_DRAWER_STATE: 'equipment-drawer-state',
     CURRENT_EQUIPMENT_DRAWER_TAB: 'current-equipment-drawer-tab',
     STABLE_SORT_STATE: 'stable-sort-state',
+    GIFTING_BANNER_DISPLAY: 'gifting-banner-display',
   },
   drawerStateValues: {
     DRAWER_CLOSED: 'drawer-closed',

website/common/locales/bg/groups.json

@@ -45,7 +45,7 @@
     "LFG": "За да рекламирате новата си група или да потърсите такава, към която да се присъедините, посетете гилдията <%= linkStart %>„Търсене на група“ (Looking for Group)<%= linkEnd %>.",
     "wantExistingParty": "Искате да се присъедините към съществуваща група? Посетете <%= linkStart %>гилдията „Търсене на група“ (Party Wanted Guild)<%= linkEnd %> и публикувайте потребителския си идентификатор:",
     "joinExistingParty": "Присъединете се към нечия друга група",
-    "usernameCopied": "Username copied to clipboard.",
+    "usernameCopied": "Потребителското име е копирано в буфера.",
     "needPartyToStartQuest": "Опа! Трябва да <a href='http://habitica.wikia.com/wiki/Party' target='_blank'>създадете група или да се присъедините към такава</a>, преди да можете да започнете мисия!",
     "createGroupPlan": "Създаване",
     "create": "Създаване",
@@ -332,8 +332,8 @@
     "claimedBy": "Поета от: <%= claimingUsers %>",
     "cantDeleteAssignedGroupTasks": "Не можете да изтриете груповите задачи, които са Ви разпределени.",
     "confirmGuildPlanCreation": "Създаване на тази група?",
-    "groupPlanUpgraded": "<strong><%= groupName %></strong> was upgraded to a Group Plan!",
+    "groupPlanUpgraded": "<strong><%= groupName %></strong> премина към групов план!",
-    "groupPlanCreated": "<strong><%= groupName %></strong> was created!",
+    "groupPlanCreated": "Групата <strong><%= groupName %></strong> беше създадена!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Само водачът на групата може да кани хора в група с абонамент.",
     "paymentDetails": "Подробности за разплащането",
     "aboutToJoinCancelledGroupPlan": "На път сте да се присъедините към група, чийто план е прекратен. НЯМА да получите безплатен абонамент.",
@@ -416,7 +416,7 @@
     "startYourOwnPartyTitle": "Създайте своя група",
     "startYourOwnPartyDescription": "Бийте се с чудовища самостоятелно, или поканете колкото искате приятели!",
     "wantToJoinPartyTitle": "Искате да се присъедините към група?",
-    "wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> to meet potential comrades!",
+    "wantToJoinPartyDescription": "Дайте потребителското си име на приятел, който вече има група, или се отправете към гилдията <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>„Търсене на група“ (Party Wanted)</a>, за да се срещнете с потенциални другари!",
     "copy": "Копиране",
     "inviteToPartyOrQuest": "Канене на групата за мисия",
     "inviteInformation": "Ако натиснете „Поканване“, ще изпратите покани до всички членове на групата. Мисията започва, когато всички приемат или отхвърлят поканата си.",

website/common/locales/bg/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 януари",
     "dateEndFebruary": "28 февруари",
     "winterPromoGiftHeader": "ПОДАРЕТЕ АБОНАМЕНТ И ЩЕ ПОЛУЧИТЕ ОЩЕ ЕДИН БЕЗПЛАТНО!",
-    "winterPromoGiftDetails1": "Само до 12 януари, ако подарите абонамент на някого, ще получите същия и за себе си безплатно!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Моля, имайте предвид, че ако Вие или получателят на подаръка Ви вече имате повтарящ се абонамент, подареният ще започне след като текущият бъде прекратен или изтече. Благодарим Ви за подкрепата! <3",
-    "discountBundle": "пакет"
+    "discountBundle": "пакет",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/bg/npc.json

@@ -107,11 +107,11 @@
     "amazonInstructions": "Натиснете бутона, за да платите чрез „Amazon Payments“",
     "paymentMethods": "Купуване чрез",
     "paymentSuccessful": "Плащането Ви беше успешно!",
-    "paymentYouReceived": "You received:",
+    "paymentYouReceived": "Получихте:",
-    "paymentYouSentGems": "You sent <strong><%= name %></strong>:",
+    "paymentYouSentGems": "Изпратихте на <strong><%= name %></strong>:",
-    "paymentYouSentSubscription": "You sent <strong><%= name %></strong> a <%= months %>-months Habitica subscription.",
+    "paymentYouSentSubscription": "Изпратихте на <strong><%= name %></strong> <%= months %>-месечен абонамент за Хабитика.",
-    "paymentSubBilling": "Your subscription will be billed <strong><%= amount %></strong>$ every <strong><%= months %></strong> months.",
+    "paymentSubBilling": "Абонаментът Ви ще бъде таксуван с <strong><%= amount %></strong>$ всеки <strong><%= months %></strong> месеца.",
-    "success": "Success!",
+    "success": "Готово!",
     "classGear": "Снаряжение за класа",
     "classGearText": "Поздравления за избора на клас! Добавих новата Ви основна екипировка в инвентара Ви. Погледнете по-долу, за да я екипирате!",
     "classStats": "Това са показателите на класа Ви. Те оказват влияние върху играта Ви. Всеки път, когато качите ниво, получавате една точка, която може да приложите към избран показател. Посочете всеки от показателите с мишката за повече информация.",

website/common/locales/cs/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "Leden 31",
     "dateEndFebruary": "Únor 28",
     "winterPromoGiftHeader": "DARUJ PŘEDPLATNÉ A ZÍSKEJ JEDNO ZDARMA!",
-    "winterPromoGiftDetails1": "Pouze do 12. ledna, když někomu daruješ předplatné, dostaneš to samé předplatné pro sebe zdarma!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Prosím, mějte však na paměti, že pokud ty nebo příjemce tvého dárku již máte probíhající předplatné, pak darované předplatné odstartuje až poté, co je stávající zrušeno, nebo až vyprší jeho platnost. Děkujeme ti moc za tvojí podporu! <3",
-    "discountBundle": "balíček"
+    "discountBundle": "balíček",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/da/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "pakke"
+    "discountBundle": "pakke",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/de/groups.json

@@ -45,7 +45,7 @@
     "LFG": "Um Deine Gruppe bekannt zu machen oder um eine zu finden, der Du beitreten kannst, gehe zur <%= linkStart %>Gruppe gesucht (Suche Gruppe)<%= linkEnd %>-Gilde.",
     "wantExistingParty": "Willst Du Dich bestehenden Gruppen anschließen? Besuche die <%= linkStart %>Gruppe gesucht-Gilde<%= linkEnd %> und poste diese Benutzer-ID:",
     "joinExistingParty": "Tritt der Gruppe eines anderen bei",
-    "usernameCopied": "Username copied to clipboard.",
+    "usernameCopied": "Benutzername in die Zwischenablage kopiert.",
     "needPartyToStartQuest": "Hoppla! Du musst <a href='http://habitica.wikia.com/wiki/Party' target='_blank'>eine Gruppe gründen oder einer beitreten</a>, bevor Du eine Quest starten kannst.",
     "createGroupPlan": "Erstellen",
     "create": "Erstellen",
@@ -332,8 +332,8 @@
     "claimedBy": "Eingefordert von: <%= claimingUsers %>",
     "cantDeleteAssignedGroupTasks": "Du kannst Gruppen-Aufgaben, die Dir zugewiesen wurden, nicht löschen.",
     "confirmGuildPlanCreation": "Diese Gruppe erstellen?",
-    "groupPlanUpgraded": "<strong><%= groupName %></strong> was upgraded to a Group Plan!",
+    "groupPlanUpgraded": "<strong><%= groupName %></strong> wurde auf einen Gruppenplan hochgestuft!",
-    "groupPlanCreated": "<strong><%= groupName %></strong> was created!",
+    "groupPlanCreated": "<strong><%= groupName %></strong> wurde erstellt!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Nur der Gruppenleiter kann Nutzer zu einer Gruppe mit einem Abonnement hinzufügen.",
     "paymentDetails": "Zahlungsinformationen",
     "aboutToJoinCancelledGroupPlan": "Du bist dabei einer Gruppe mit gekündigtem Plan beizutreten. Du erhältst KEIN freies Abonnement.",
@@ -416,7 +416,7 @@
     "startYourOwnPartyTitle": "Starte Deine eigene Gruppe",
     "startYourOwnPartyDescription": "Bezwinge Monster allein oder lade so viele Deiner Freunde ein, wie Du möchtest!",
     "wantToJoinPartyTitle": "Möchtest Du einer Gruppe beitreten?",
-    "wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> to meet potential comrades!",
+    "wantToJoinPartyDescription": "Gib Deinen Benutzernamen einem Freund an, der bereits eine Party hat, oder gehe zur <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Gilde \"Party wanted\"</a>, um potenzielle Verbündete zu finden!",
     "copy": "Kopieren",
     "inviteToPartyOrQuest": "Gruppe zur Quest einladen",
     "inviteInformation": "Indem Du auf \"Einladen\" klickst, sendest Du eine Einladung an Deine Gruppenmitglieder. Sobald alle Mitglieder diese angenommen oder abgelehnt haben, beginnt die Quest.",

website/common/locales/de/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31. Januar",
     "dateEndFebruary": "28. Februar",
     "winterPromoGiftHeader": "Verschenke ein Abonnement und bekomme eins umsonst! ",
-    "winterPromoGiftDetails1": "Wenn Du bis 12. Januar jemandem ein Abonnement schenkst, bekommst Du das geiche Abonnement für Dich selbst umsonst!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Bitte bedenke, dass das geschenkte Abonnement, falls Du oder Deine beschenkte Person bereits über ein sich wiederholendes Abonnement verfügen, erst dann startet, wenn das alte Abonnement gekündigt wird oder ausläuft. Herzlichen Dank für Deine Unterstützung! <3",
-    "discountBundle": "Paket"
+    "discountBundle": "Paket",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/de/npc.json

@@ -107,11 +107,11 @@
     "amazonInstructions": "Klicke hier um über Amazon Payments zu zahlen.",
     "paymentMethods": "Kauf mit",
     "paymentSuccessful": "Die Zahlung war erfolgreich!",
-    "paymentYouReceived": "You received:",
+    "paymentYouReceived": "Du hast erhalten:",
-    "paymentYouSentGems": "You sent <strong><%= name %></strong>:",
+    "paymentYouSentGems": "Du hast <strong><%= name %></strong> geschickt:",
-    "paymentYouSentSubscription": "You sent <strong><%= name %></strong> a <%= months %>-months Habitica subscription.",
+    "paymentYouSentSubscription": "Du hast <strong><%= name %></strong> ein <%= months %>-Monate-Abo für Habitica geschickt.",
-    "paymentSubBilling": "Your subscription will be billed <strong><%= amount %></strong>$ every <strong><%= months %></strong> months.",
+    "paymentSubBilling": "Für Dein Abo wird alle <strong><%= months %></strong> Monate <strong><%= amount %></strong>$ verrechnet.",
-    "success": "Success!",
+    "success": "Erfolg!",
     "classGear": "Klassenausrüstung",
     "classGearText": "Glückwunsch zur Wahl Deiner Klasse! Ich habe deine neue Basiswaffe dem Inventar hinzugefügt. Schaue sie dir unten an, um sie auszurüsten!",
     "classStats": "Dies sind die Statuswerte Deiner Klasse; sie beeinflussen das Spiel. Jedes Mal, wenn Du einen Level aufsteigst, erhältst Du einen Punkt, den Du einem Statuswert zuordnen kannst. Bewege die Maus über jeden der Statuswerte für weitere Informationen.",

website/common/locales/de/subscriber.json

@@ -37,7 +37,7 @@
     "individualSub": "Einzelne Abonnements",
     "subscribe": "Abonnieren",
     "subscribed": "Abonniert",
-    "nowSubscribed": "You are now subscribed to Habitica!",
+    "nowSubscribed": "Du hast jetzt ein Abo bei Habitica!",
     "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. Diese Seite kann nicht anzeigen, ob Dein Abonnement gekündigt wurde.",

website/common/locales/en/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

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

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/en_GB/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/es/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 de enero",
     "dateEndFebruary": "28 de febrero",
     "winterPromoGiftHeader": "¡REGALA UNA SUSCRIPCIÓN Y RECIBE OTRA GRATIS!",
-    "winterPromoGiftDetails1": "Solo hasta el 12 de enero, cuando des una suscripción a alguien, ¡obtienes la misma suscripción gratis!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Por favor, ten en cuenta que si tú o la persona que recibe el regalo ya tenéis una suscripción recurrente, la suscripción regalada solo empezará después de que esa suscripción sea cancelada o haya expirado. ¡Muchas gracias por tu apoyo!",
-    "discountBundle": "Lote"
+    "discountBundle": "Lote",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/es_419/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 de enero",
     "dateEndFebruary": "28 de febrero",
     "winterPromoGiftHeader": "Regala una suscripción y obtén una gratis!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "paquete"
+    "discountBundle": "paquete",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/fr/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 janvier",
     "dateEndFebruary": "28 février",
     "winterPromoGiftHeader": "OFFREZ UN ABONNEMENT ET OBTENEZ-EN UN GRATUIT !",
-    "winterPromoGiftDetails1": "Jusqu'au 12 janvier seulement, quand vous offrez un abonnement à quelqu'un, vous obtenez le même abonnement, pour vous, gratuitement !",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Merci de noter que si vous, ou la personne à qui vous faites ce cadeau, détenez un abonnement récurrent, l'abonnement offert ne commencera qu'après que cet abonnement sera annulé ou expirera. Merci infiniment pour votre soutien <3",
-    "discountBundle": "lot"
+    "discountBundle": "lot",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/he/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/hu/gear.json

@@ -268,12 +268,12 @@
     "weaponSpecialSummer2018HealerNotes": "Egy jóságos mozdulattal megparancsolod a gyógyító víznek hogy az uralmad alatt lévő területeken kersztülfolyjon.  Növeli az intelligenciádat <%= int %> ponttal. Limitált kiadású 2018-as nyári felszerelés.",
     "weaponSpecialFall2018RogueText": "Vial of Clarity",
     "weaponSpecialFall2018RogueNotes": "When you need to come back to your senses, when you need a little boost to make the right decision, take a deep breath and a sip. It'll be OK! Increases Strength by <%= str %>. Limited Edition 2018 Autumn Gear.",
-    "weaponSpecialFall2018WarriorText": "Whip of Minos",
+    "weaponSpecialFall2018WarriorText": "Minósz korbácsa",
-    "weaponSpecialFall2018WarriorNotes": "Not quite long enough to unwind behind you for keeping your bearings in a maze. Well, maybe a very small maze. Increases Strength by <%= str %>. Limited Edition 2018 Autumn Gear.",
+    "weaponSpecialFall2018WarriorNotes": "Ahhoz nem elég hosszú hogy egy útvesztőben visszatalálj a bejárathoz. Talán, egy nagyon kicsi útvesztőben. Növeli az erődet <%= str %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
-    "weaponSpecialFall2018MageText": "Staff of Sweetness",
+    "weaponSpecialFall2018MageText": "Az édesség varázsbotja",
-    "weaponSpecialFall2018MageNotes": "This is no ordinary lollipop! The glowing orb of magic sugar atop this staff has the power to make good habits stick to you. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2018 Autumn Gear. Two-handed item.",
+    "weaponSpecialFall2018MageNotes": "Ez nem egy közönséges nyalóka! A tetején található varázscukorból álló világító gömb segít, hogy a jó szokások rádragadjanak. Növeli az intelligenciádat <%= int %> ponttal és az észlelésedet <%= per %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
-    "weaponSpecialFall2018HealerText": "Starving Staff",
+    "weaponSpecialFall2018HealerText": "Éhező varázsbot",
-    "weaponSpecialFall2018HealerNotes": "Just keep this staff fed, and it will bestow Blessings. If you forget to feed it, keep your fingers out of reach. Increases Intelligence by <%= int %>. Limited Edition 2018 Autumn Gear.",
+    "weaponSpecialFall2018HealerNotes": "Ne felejtsd el ezt a varázsbotot mindig megetetni, hogy különböző áldásokkal ruházzon fel. Ha mégis elfelejted, vigyázz hogy el ne vezsítsd az ujjaidat. Növeli az intelligenciádat <%= int %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
     "weaponMystery201411Text": "A lakmározás vasvillája",
     "weaponMystery201411Notes": "Szúrd le az ellenségeidet vagy túrj bele kedvenc eledeleidbe - ezzel a sokoldalú vasvillával mindent megtehetsz! Nem változtat a tulajdonságaidon. 2014 novemberi előfizetői tárgy.",
     "weaponMystery201502Text": "A szeretet csillogó szárnyas botja és az igazságé is",
@@ -442,8 +442,8 @@
     "armorSpecialSamuraiArmorNotes": "Ezt az erős pikkelypáncélt elegáns selyem fonal tartja össze. Növeli az észlelésedet <%= per %> ponttal.",
     "armorSpecialTurkeyArmorBaseText": "Pulyka páncél",
     "armorSpecialTurkeyArmorBaseNotes": "Tartsd a csülkeidet melegen és kényelmesen ebben a tollas páncélban! Nem változtat a tulajdonságaidon.",
-    "armorSpecialTurkeyArmorGildedText": "Gilded Turkey Armor",
+    "armorSpecialTurkeyArmorGildedText": "Aranyozott pulyka páncél",
-    "armorSpecialTurkeyArmorGildedNotes": "Strut your stuff in this seasonally shiny armor! Confers no benefit.",
+    "armorSpecialTurkeyArmorGildedNotes": "Mutasd meg magad ebben a csillogó páncélban! Nem változtat a tulajdonságaidon.",
     "armorSpecialYetiText": "Jetiszelídítő köpeny",
     "armorSpecialYetiNotes": "Bolyhos és vad. Növeli a szívósságodat <%= con %> ponttal. Limitált kiadású 2013-2014-es téli felszerelés.",
     "armorSpecialSkiText": "Sí-gyilkos anorák",
@@ -610,12 +610,12 @@
     "armorSpecialSummer2018HealerNotes": "Ez az égszínkék öltözék felfedi hogy lábaid vannak... Még egy uralkodó sem lehet tökéletes. Növeli a szívósságodat <%= con %> ponttal. Limitált kiadású 2018-as nyári felszerelés.",
     "armorSpecialFall2018RogueText": "Alter Ego Frock Coat",
     "armorSpecialFall2018RogueNotes": "Style for the day. Comfort and protection for the night. Increases Perception by <%= per %>. Limited Edition 2018 Autumn Gear.",
-    "armorSpecialFall2018WarriorText": "Minotaur Platemail",
+    "armorSpecialFall2018WarriorText": "Minotaurusz páncél",
-    "armorSpecialFall2018WarriorNotes": "Complete with hooves to drum a soothing cadence as you walk your meditative labyrinth. Increases Constitution by <%= con %>. Limited Edition 2018 Autumn Gear.",
+    "armorSpecialFall2018WarriorNotes": "Patával kiegészítve, hogy miközben labiritusodban elmélkedsz, lépteid megnyugtató dobogását hallgasd. Növeli a szívósságodat <%= con %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
-    "armorSpecialFall2018MageText": "Candymancer's Robes",
+    "armorSpecialFall2018MageText": "A cukorkaidéző köpenye",
-    "armorSpecialFall2018MageNotes": "The fabric of these robes has magic candy woven right in! However, we recommend you not attempt to eat them. Increases Intelligence by <%= int %>. Limited Edition 2018 Autumn Gear.",
+    "armorSpecialFall2018MageNotes": "Ennek a köpenynek az anyagába varázserejű cukorkák vannak szőve! Azonban, jobb ha nem próbálod megenni. Növeli az intelligenciádat <%= int %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
-    "armorSpecialFall2018HealerText": "Robes of Carnivory",
+    "armorSpecialFall2018HealerText": "A húsevés köpenye",
-    "armorSpecialFall2018HealerNotes": "It's made from plants, but that doesn't mean it's vegetarian. Bad habits are afraid to come within miles of these robes. Increases Constitution by <%= con %>. Limited Edition 2018 Autumn Gear.",
+    "armorSpecialFall2018HealerNotes": "Növényekből készült, de ez nem jelenti azt hogy vegetáriánus. A rossz szokások mérföldekre elkerülik ezt a köpenyt. Növeli a szívósságodat <%= con %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
     "armorMystery201402Text": "Hírvivő köpeny",
     "armorMystery201402Notes": "Csillámlóak és erősek, ezeknek a köpenyeknek sok zsebük van levelek hordásához. Nem változtat a tulajdonságaidon. 2014 februári előfizetői tárgy.",
     "armorMystery201403Text": "Erdőjáró páncél",
@@ -874,8 +874,8 @@
     "headSpecialNamingDay2017Notes": "Boldog névnapot! Viseld ezt az erős és tollas sisakot miközben a Habiticát ünnepled. Nem változtat a tulajdonságaidon.",
     "headSpecialTurkeyHelmBaseText": "Pulyka sisak",
     "headSpecialTurkeyHelmBaseNotes": "A Pulyka napi kinézetet teljes lesz, ha ezt a csőrös sisakot hordod! Nem változtat a tulajdonságaidon.",
-    "headSpecialTurkeyHelmGildedText": "Gilded Turkey Helm",
+    "headSpecialTurkeyHelmGildedText": "Aranyozott pulyka sisak",
-    "headSpecialTurkeyHelmGildedNotes": "Gobble gobble! Bling bling! Confers no benefit.",
+    "headSpecialTurkeyHelmGildedNotes": "Huruk huruk! Csilivili! Nem változtat a tulajdonságaidon.",
     "headSpecialNyeText": "Abszurd party süveg",
     "headSpecialNyeNotes": "Megkaptad az abszurd party süveget! Viseld büszkén, miközben átlépsz az újévbe! Nem változtat a tulajdonságaidon.",
     "headSpecialYetiText": "Jetiszelídítő sisak",
@@ -1040,12 +1040,12 @@
     "headSpecialSummer2018HealerNotes": "Ez az akvamarinnal díszített uszonyos fejdísz megmutatja ki a vezére embereknek és halaknak, valamint azoknak akik mindkét csoportba tartoznak. Növeli az intelligenciádat <%= int %> ponttal. Limitált kiadású 2018-as nyári felszerelés.",
     "headSpecialFall2018RogueText": "Alter Ego Face",
     "headSpecialFall2018RogueNotes": "Most of us hide away our inward struggles. This mask shows that we all experience tension between our good and bad impulses. Plus it comes with a sweet hat! Increases Perception by <%= per %>. Limited Edition 2018 Autumn Gear.",
-    "headSpecialFall2018WarriorText": "Minotaur Visage",
+    "headSpecialFall2018WarriorText": "Minotaurusz álarc",
-    "headSpecialFall2018WarriorNotes": "This fearsome mask shows you can really take your tasks by the horns! Increases Strength by <%= str %>. Limited Edition 2018 Autumn Gear.",
+    "headSpecialFall2018WarriorNotes": "Ez a félelmetes álarc megmutatja hogy fel tudod szarvazni a feladataidat! Növeli az erődet <%= str %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
-    "headSpecialFall2018MageText": "Candymancer's Hat",
+    "headSpecialFall2018MageText": "A cukorkaidéző süvege",
-    "headSpecialFall2018MageNotes": "This pointy hat is imbued with powerful spells of sweetness. Careful, if it gets wet it may become sticky! Increases Perception by <%= per %>. Limited Edition 2018 Autumn Gear.",
+    "headSpecialFall2018MageNotes": "Ez a csúcsos süveg át van itatva az édesség hatalmas varázslataival! De vigyázz, ha víz éri ragadóssá válhat! Növeli az észlelésedet <%= per %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
-    "headSpecialFall2018HealerText": "Ravenous Helm",
+    "headSpecialFall2018HealerText": "Falánk sisak",
-    "headSpecialFall2018HealerNotes": "This helm is fashioned from a carnivorous plant renowned for its ability to dispatch zombies and other inconveniences. Just watch out that it doesn't chew on your head. Increases Intelligence by <%= int %>. Limited Edition 2018 Autumn Gear.",
+    "headSpecialFall2018HealerNotes": "Ezt a sisakot egy olyan húsevő növényből készítették, amely arról a képességéről volt híres hogy zombiktól és más kellemetlenségektől tudott megszabadulni. Csak arra vigyázz hogy ne harapja le a fejedet. Növeli az intelligenciádat <%= int %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
     "headSpecialGaymerxText": "Szívárványos harci sisak",
     "headSpecialGaymerxNotes": "A GaymerX Konferencia ünnepléseként ez a különleges sisak a szívárvány minden színében pompázik! A GaymerX egy játék konferencia, ami az LGBTQ közösséget ünnepli a játékvilágban, valamint elérhető mindenki számára.",
     "headMystery201402Text": "Szárnyas sisak",
@@ -1390,10 +1390,10 @@
     "shieldSpecialSummer2018HealerNotes": "Ez a pajzs képes levegővel töltött búrát létrehozni azoknak a látogatóknak akik a szárazföldről érkeznek víz alatti birodalmadba. Növeli a szívósságodat <%= con %> ponttal. Limitált kiadású 2018-as nyári felszerelés.",
     "shieldSpecialFall2018RogueText": "Vial of Temptation",
     "shieldSpecialFall2018RogueNotes": "This bottle represents all the distractions and troubles that keep you from being your best self. Resist! We're cheering for you! Increases Strength by <%= str %>. Limited Edition 2018 Autumn Gear.",
-    "shieldSpecialFall2018WarriorText": "Brilliant Shield",
+    "shieldSpecialFall2018WarriorText": "Pompás pajzs",
-    "shieldSpecialFall2018WarriorNotes": "Super shiny to dissuade any troublesome Gorgons from playing peek-a-boo around the corners! Increases Constitution by <%= con %>. Limited Edition 2018 Autumn Gear.",
+    "shieldSpecialFall2018WarriorNotes": "Ez a fantasztikusan csillogó pajzs megakadályozza hogy bármilyen bajkeverő gorgó rád lesből támadjon! Növeli a szívósságodat <%= con %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
-    "shieldSpecialFall2018HealerText": "Hungry Shield",
+    "shieldSpecialFall2018HealerText": "Éhes pajzs",
-    "shieldSpecialFall2018HealerNotes": "With its wide-open maw, this shield will absorb all your enemies' blows. Increases Constitution by <%= con %>. Limited Edition 2018 Autumn Gear.",
+    "shieldSpecialFall2018HealerNotes": "A szélesre tátott szájával ez a pajzs képes elnyelni az ellenfeleid minden csapását. Növeli a szívósságodat <%= con %> ponttal. Limitált kiadású 2018-as őszi felszerelés.",
     "shieldMystery201601Text": "Eskü pusztító",
     "shieldMystery201601Notes": "Ez a penge arra használható hogy minden figyelemeleterlést elhárítson. Nem változtat a tulajdonságaidon. 2016 januári előfizetői tárgy.",
     "shieldMystery201701Text": "Idő megállító pajzs",
@@ -1513,8 +1513,8 @@
     "backSpecialAetherCloakNotes": "Ez a palást egyszer az elveszett kasztmester birtokában volt. Növeli az észlelésedet <%= per %> ponttal.",
     "backSpecialTurkeyTailBaseText": "Pulyka farok",
     "backSpecialTurkeyTailBaseNotes": "Viseld büszkén ezt a nemes pulyka farkat amíg ünnepelsz! Nem változtat a tulajdonságaidon.",
-    "backSpecialTurkeyTailGildedText": "Gilded Turkey Tail",
+    "backSpecialTurkeyTailGildedText": "Aranyozott pulyka farok",
-    "backSpecialTurkeyTailGildedNotes": "Plumage fit for a parade! Confers no benefit.",
+    "backSpecialTurkeyTailGildedNotes": "Egy parádéhoz illő tollazat! Nem változtat a tulajdonságaidon.",
     "backBearTailText": "Medve farok",
     "backBearTailNotes": "Ettől a faroktól úgy nézel ki, mint egy bátor medve! Nem változtat a tulajdonságaidon.",
     "backCactusTailText": "Kaktusz farok",
@@ -1557,8 +1557,8 @@
     "bodySpecialSummer2015MageNotes": "Ebben a csatban semmilyen erő nem rejtőzik, csak fényesnek néz ki. Limitált kiadású 2015-ös nyári felszerelés.",
     "bodySpecialSummer2015HealerText": "Tengerész sál",
     "bodySpecialSummer2015HealerNotes": "Ho ho hó? Ne, ne, ne! Nem változtat a tulajdonságaidon. Limitált kiadású 2015-ös nyári felszerelés.",
-    "bodySpecialNamingDay2018Text": "Royal Purple Gryphon Cloak",
+    "bodySpecialNamingDay2018Text": "Fejedelmi lila griff köpeny",
-    "bodySpecialNamingDay2018Notes": "Happy Naming Day! Wear this fancy and feathery cloak as you celebrate Habitica. Confers no benefit.",
+    "bodySpecialNamingDay2018Notes": "Boldog névnapot! Viseld ezt az tarka és tollas köpenyt miközben a Habiticát ünnepled. Nem változtat a tulajdonságaidon.",
     "bodyMystery201705Text": "Redős tollas harci szárnyak",
     "bodyMystery201705Notes": "Ezek a redős szárnyak nemcsak divatosak, de a felruháznak a griffmadár gyorsaságával és mozgékonyságával! Nem változtat a tulajdonságaidon. 2017 májusi előfizetői tárgy.",
     "bodyMystery201706Text": "Rongyos kalóz köpeny",

website/common/locales/hu/groups.json

@@ -45,7 +45,7 @@
     "LFG": "Új csapatod hirdetéséhez vagy hogy új csapatot találj, menj a <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> nevű céhbe. ",
     "wantExistingParty": "Szeretnél egy meglévő csapathoz csatlakozni? Menj a <%= linkStart %>Party Wanted Guild<%= linkEnd %> nevű céhbe és posztold el ezt a felhasználói azonosítót:",
     "joinExistingParty": "Csatlakozz valaki más csapatához",
-    "usernameCopied": "Username copied to clipboard.",
+    "usernameCopied": "Felhasználónév a vágólapra másolva.",
     "needPartyToStartQuest": "Hoppá! <a href='http://habitica.wikia.com/wiki/Party' target='_blank'>Létre kell hoznod vagy csatlakoznod kell egy meglévő csapathoz</a> mielőtt el tudsz kezdeni egy küldetést!",
     "createGroupPlan": "Létrehozás",
     "create": "Létrehozás",
@@ -332,8 +332,8 @@
     "claimedBy": "Igényelve: <%= claimingUsers %>",
     "cantDeleteAssignedGroupTasks": "Nem törölhetsz olyan feladatokat amikhez hozzá vagy rendelve",
     "confirmGuildPlanCreation": "Létrehozod ezt a csoportot?",
-    "groupPlanUpgraded": "<strong><%= groupName %></strong> was upgraded to a Group Plan!",
+    "groupPlanUpgraded": "<strong><%= groupName %></strong> nevű csoport csoportos tervvel lett bővítve!",
-    "groupPlanCreated": "<strong><%= groupName %></strong> was created!",
+    "groupPlanCreated": "<strong><%= groupName %></strong> nevű csoport létrehozva!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Csak a csoport vezetője hívhat meg felhasználókat előfizetéssel rendelkező csoportokhoz",
     "paymentDetails": "Fizetési információk",
     "aboutToJoinCancelledGroupPlan": "Egy olyan csoporthoz készülsz csatlakozni ami nem rendelkezik akítv előfizetéssel. Ezért NEM fogsz ingyen előfizetést kapni.",
@@ -416,7 +416,7 @@
     "startYourOwnPartyTitle": "Hozd létre a saját csapatodat",
     "startYourOwnPartyDescription": "Harcolj egyedül szörnyek ellen vagy hívj meg annyi embert amennyit szeretnél!",
     "wantToJoinPartyTitle": "Szeretnél csatlakozni egy csapathoz?",
-    "wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> to meet potential comrades!",
+    "wantToJoinPartyDescription": "Add meg a felhasználói azonosítódat egy barátodnak akinek már van csapata, vagy a <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> nevű céhben oszd meg hogy potenciális csapattagokkal találkozhass!",
     "copy": "Másolás",
     "inviteToPartyOrQuest": "Csapat meghívása egy küldetéshez",
     "inviteInformation": "A \"meghívás\" gombra kattintva a csapatod tagjai egy meghívót kapnak. Ha az összes tag elfogadta vagy elutasította a meghívást, a küldetés kezdetét veszi.",

website/common/locales/hu/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "január 31",
     "dateEndFebruary": "február 28",
     "winterPromoGiftHeader": "AJÁNDÉKOZZ ELŐFIZETÉST ÉS KAPJ EGYET INGYEN!",
-    "winterPromoGiftDetails1": "Ha január 12-ig ajándékozol valakinek előfizetést, ugyanazt az előfizetést megkapod ingyen!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Kérjük vedd figyelembe hogyha te, vagy a megajándékozott felhasználó már rendelkezik előfizetéssel, az ajándékba adott előfizetés csak azután lép érvénybe hogy a jelenlegi előfizetés megszüntetik vagy lejár. Nagyon köszönjük a támogatásodat! <3",
-    "discountBundle": "csomag"
+    "discountBundle": "csomag",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/id/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 Januari",
     "dateEndFebruary": "28 Februari",
     "winterPromoGiftHeader": "HADIAHKAN LANGGANAN DAN DAPATKAN GRATIS SATU!",
-    "winterPromoGiftDetails1": "Hanya hingga 12 Januari, sewaktu kamu menghadiahkan orang lain dengan langganan, kamu akan mendapatkan paket langganan yang sama, gratis untuk dirimu sendiri!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Ingat saja kalau kamu atau penerima hadiah itu sudah mempunyai paket langganan yang berulang, hadiah langganan itu baru akan mulai setelah yang sekarang telah dibatalkan atau telah habis. Terima kasih untuk semua dukungan kalian! <3",
-    "discountBundle": "bundel"
+    "discountBundle": "bundel",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/it/backgrounds.json

@@ -395,11 +395,11 @@
     "backgroundGlowingMushroomCaveNotes": "Rimira con ammirazione una Grotta Funghesca Lucente.",
     "backgroundCozyBedroomText": "Stanza Da Letto Accogliente",
     "backgroundCozyBedroomNotes": "Accoccolati in una Stanza Da Letto Accogliente.",
-    "backgrounds122018": "SET 55: Released December 2018",
+    "backgrounds122018": "SERIE 55: Dicembre 2018",
-    "backgroundFlyingOverSnowyMountainsText": "Snowy Mountains",
+    "backgroundFlyingOverSnowyMountainsText": "Montagne Innevate",
-    "backgroundFlyingOverSnowyMountainsNotes": "Soar over Snowy Mountains at night.",
+    "backgroundFlyingOverSnowyMountainsNotes": "Librati sopra le Montagne Innevate di notte.",
-    "backgroundFrostyForestText": "Frosty Forest",
+    "backgroundFrostyForestText": "Foresta Ghiacciata",
-    "backgroundFrostyForestNotes": "Bundle up to hike through a Frosty Forest.",
+    "backgroundFrostyForestNotes": "Copriti bene per fare un'escursione nella Foresta Ghiacciata.",
-    "backgroundSnowyDayFireplaceText": "Snowy Day Fireplace",
+    "backgroundSnowyDayFireplaceText": "Camino in un Giorno Nevoso.",
-    "backgroundSnowyDayFireplaceNotes": "Snuggle up next to a Fireplace on a Snowy Day."
+    "backgroundSnowyDayFireplaceNotes": "Coccolati accanto ad un Camino in un Giorno Nevoso."
 }

website/common/locales/it/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 gennaio",
     "dateEndFebruary": "28 febbraio",
     "winterPromoGiftHeader": "REGALA UN ABBONAMENTO E NE OTTIENI UNO GRATIS!",
-    "winterPromoGiftDetails1": "Solo fino al 12 Gennaio, quando regali un abbonamento a qualcuno, ricevi lo stesso abbonamento per te gratis!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Per favore nota che se tu o la persona a cui stai facendo il regalo avete già un abbonamento che si rinnova automaticamente, l'abbonamento regalato inizierà solo che l'abbonamento sarà cancellato o finirà. Grazie infinite per il supporto! <3",
-    "discountBundle": "pacchetto"
+    "discountBundle": "pacchetto",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/it/subscriber.json

@@ -37,7 +37,7 @@
     "individualSub": "Abbonamento individuale",
     "subscribe": "Abbonati",
     "subscribed": "Abbonato",
-    "nowSubscribed": "You are now subscribed to Habitica!",
+    "nowSubscribed": "Ora sei iscritto ad Habitica!",
     "manageSub": "Clicca per gestire l'abbonamento",
     "cancelSub": "Annulla abbonamento",
     "cancelSubInfoGoogle": "Vai nella sezione \"Account\" > \"Abbonamenti\" dell'app Google Play Store per annullare il tuo abbonamento, o per vedere la data di termine del tuo abbonamento se lo hai già annullato. Questa schermata non è in grado di mostrarti se il tuo abbonamento è stato annullato.",
@@ -150,7 +150,7 @@
     "mysterySet201808": "Set Drago di Lava",
     "mysterySet201809": "Set Armatura Autunnale",
     "mysterySet201810": "Set Foresta Oscura",
-    "mysterySet201811": "Splendid Sorcerer Set",
+    "mysterySet201811": "Set Stregone Splendido",
     "mysterySet301404": "Set steampunk standard",
     "mysterySet301405": "Set accessori steampunk",
     "mysterySet301703": "Set Pavone Steampunk",
@@ -209,7 +209,7 @@
     "haveCouponCode": "Hai un codice coupon?",
     "subscriptionAlreadySubscribedLeadIn": "Grazie per esserti abbonato/a!",
     "subscriptionAlreadySubscribed1": "Per vedere i dettagli del tuo abbonamento e cancellarlo, rinnovarlo o cambiarlo, vai a <a href='/user/settings/subscription'>User icon &gt; Settings &gt; Subscription</a>",
-    "purchaseAll": "Purchase Set",
+    "purchaseAll": "Acquista Set",
     "gemsPurchaseNote": "Gli abbonati possono comprare gemme con oro nel Mercato! Per facile accesso ad esse, puoi anche fissare la Gemma alla tua colonna delle Ricompense.",
     "gemsRemaining": "gemme rimanenti",
     "notEnoughGemsToBuy": "Non puoi comprare quella quantità di gemme."

website/common/locales/ja/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "1月31日",
     "dateEndFebruary": "2月28日",
     "winterPromoGiftHeader": "寄付を誰かに贈って、無料で寄付会員になろう！",
-    "winterPromoGiftDetails1": "1月12日までの間に限り、誰かに寄付会員の権利を贈ると、同じだけの期間分、無料で寄付会員になれます！",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "もしあなたやギフトの相手がすでに寄付会員の権利を持っている場合、ギフトによる寄付権は、既存の寄付の期限が切れるかキャンセルされた後に有効になります。ご注意ください。皆様のサポートに感謝します！ <3",
-    "discountBundle": "パック"
+    "discountBundle": "パック",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/nl/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 januari",
     "dateEndFebruary": "28 februari",
     "winterPromoGiftHeader": "GEEF EEN ABONNEMENT EN KRIJG ER ZELF OOK EEN!",
-    "winterPromoGiftDetails1": "Alleen tot 12 januari, wanneer je iemand een abonnement schenkt, krijg je hetzelfde abonnenemt gratis voor jezelf!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Denk eraan dat als jij of je geschenk ontvanger al een terugkerend abonnenemt bevat, het geschonken abonnement pas start nadat dat abonnement is afgezegd of afgelopen is. Hartelijk dank voor je steun! <3",
-    "discountBundle": "bundel"
+    "discountBundle": "bundel",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/pl/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 stycznia",
     "dateEndFebruary": "28 Luty",
     "winterPromoGiftHeader": "DAJ KOMUŚ ABONAMENT W PREZENCIE I ODBIERZ TAKI SAM DLA SIEBIE!",
-    "winterPromoGiftDetails1": "Tylko do 12 stycznia, gdy podarujesz komuś subskrypcję, otrzymasz za darmo taką samą subskrypcję!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Zauważ, że w przypadku gdy Ty, lub osoba dla której wykupujesz subskrypcję posiada już podobny abonament, subskrypcja wykupiona jako prezent rozpocznie się dopiero po anulowaniu subskrypcji lub jej wygaśnięciu. Dziękujemy bardzo za wsparcie! <3",
-    "discountBundle": "pakiet"
+    "discountBundle": "pakiet",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/pt/gear.json

@@ -284,8 +284,8 @@
     "weaponMystery201611Notes": "Todo o tipo de comida deliciosa e satisfatória transbordam desta concha. Aprecie o festim! Não confere benefícios. Item de Assinante de Novembro de 2016.",
     "weaponMystery201708Text": "Espada de Lava",
     "weaponMystery201708Notes": "O brilho ardente desta espada vai fazer o trabalho rápido até de tarefas vermelho escuro. Não confere benefícios. Item de Assinante de Agosto de 2017.",
-    "weaponMystery201811Text": "Splendid Sorcerer's Staff",
+    "weaponMystery201811Text": "Bordão Esplêndido de Feiticeiro",
-    "weaponMystery201811Notes": "This magical stave is as powerful as it is elegant. Confers no benefit. November 2018 Subscriber Item.",
+    "weaponMystery201811Notes": "Este bordão mágico é tão poderoso como elegante. Não concede benefícios. Item de Subscritor de Novembro de 2018.",
     "weaponMystery301404Text": "Bengala Steampunk",
     "weaponMystery301404Notes": "Excelente para dar uma volta pela cidade. Item de Assinante de Março 3015. Não concede benefícios.",
     "weaponArmoireBasicCrossbowText": "Besta Básica",
@@ -687,7 +687,7 @@
     "armorMystery201808Text": "Armadura de Dragão de Lava",
     "armorMystery201808Notes": "Esta armadura é feita das escamas soltas do elusivo (e extremamente quente) Dragão de Lava. Não concede benefícios. Item de Subscritor de Agosto de 2018.",
     "armorMystery201809Text": "Armadura de Folhas de Outono",
-    "armorMystery201809Notes": "You are not only a small and fearsome leaf puff, you are sporting the most beautiful colors of the season! Confers no benefit. September 2018 Subscriber Item.",
+    "armorMystery201809Notes": "Não é apenas uma pequena e feroz bola de folhas, apresenta também as cores mais bonitas da estação! Não concede benefícios. Item de Subscritor de Setembro de 2018.",
     "armorMystery201810Text": "Manto da Floresta Negra",
     "armorMystery201810Notes": "Este manto é extra quente para o proteger do frio medonho dos reinos assombrados. Não confere benefícios. Item de Subscritor de Outobro de 2018.",
     "armorMystery301404Text": "Fantasia Steampunk",
@@ -767,9 +767,9 @@
     "armorArmoireWovenRobesText": "Túnicas Tecidas",
     "armorArmoireWovenRobesNotes": "Exponha o seu trabalho de tecelagem usando esta túnica colorida com orgulho! Aumenta Constituição em <%= con %> e Inteligência em <%= int %>. Armário Encantado: Conjunto de Tecelão (Item 1 de 3).",
     "armorArmoireLamplightersGreatcoatText": "Gabardine do Acendedor de Lampiões",
-    "armorArmoireLamplightersGreatcoatNotes": "This heavy woolen coat can stand up to the harshest wintry night! Increases Perception by <%= per %>. Enchanted Armoire: Lamplighter's Set (Item 2 of 4).",
+    "armorArmoireLamplightersGreatcoatNotes": "Este casaco de lã pesado pode suportar a noite de Inverno mais dura! Aumenta Percepção em <%= per %>. Armário Encantado: Conjunto do Acendedor de Lâmpadas (Item 2 de 4).",
     "armorArmoireCoachDriverLiveryText": "Uniforme de Cocheiro",
-    "armorArmoireCoachDriverLiveryNotes": "This heavy overcoat will protect you from the weather as you drive. Plus it looks pretty snazzy, too! Increases Strength by <%= str %>. Enchanted Armoire: Coach Driver Set (Item 1 of 3).",
+    "armorArmoireCoachDriverLiveryNotes": "Este casaco pesado protegê-lo-á do tempo enquanto conduz. Mais, também o faz parecer janota! Aumenta Força em <%= str %>. Armário Encantado: Conjunto de Condutor de Carruagem (Item 1 de 3).",
     "armorArmoireRobeOfDiamondsText": "Manto de Diamantes",
     "armorArmoireRobeOfDiamondsNotes": "These royal robes not only make you appear noble, they allow you to see the nobility within others. Increases Perception by <%= per %>. Enchanted Armoire: King of Diamonds Set (Item 1 of 4).",
     "armorArmoireFlutteryFrockText": "Fluttery Frock",

website/common/locales/pt/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/pt_BR/groups.json

@@ -45,7 +45,7 @@
     "LFG": "Para anunciar seu novo grupo ou achar um para se juntar, vá para a Guilda <%= linkStart %>Procurando Grupo Brasil (Pedir Convite)<%= linkEnd %>.",
     "wantExistingParty": "Quer se juntar à um grupo já existente? Vá até as Guildas<a href='https://habitica.com/#/options/groups/guilds/46bc163e-f34e-4216-b916-9062d30a141f'> Procurando Grupo Brasil</a> ou <%= linkStart %>Internacional<%= linkEnd %>, deixe um Oi que te chamarão para o melhor grupo. Se preferir, fale um pouco sobre você.",
     "joinExistingParty": "Entrar no grupo de outra pessoa",
-    "usernameCopied": "Username copied to clipboard.",
+    "usernameCopied": "Nome de usuário copiado para a área de transferência",
     "needPartyToStartQuest": "Ops! Você precisa <a href='http://habitica.wikia.com/wiki/Party' target='_blank'>criar ou entrar em um grupo</a> antes de poder iniciar uma missão!",
     "createGroupPlan": "Criar",
     "create": "Criar",
@@ -332,8 +332,8 @@
     "claimedBy": "Assumida por: <%= claimingUsers %>",
     "cantDeleteAssignedGroupTasks": "Não pode apagar tarefas de grupo que estão atribuídas a você.",
     "confirmGuildPlanCreation": "Criar esse grupo?",
-    "groupPlanUpgraded": "<strong><%= groupName %></strong> was upgraded to a Group Plan!",
+    "groupPlanUpgraded": "<strong><%= groupName %></strong>foi atualizado para um Plano de Time!",
-    "groupPlanCreated": "<strong><%= groupName %></strong> was created!",
+    "groupPlanCreated": "<strong><%= groupName %></strong> foi criado!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Apenas o líder do grupo pode convidar usuários para um grupo com assinatura.",
     "paymentDetails": "Detalhes do Pagamento",
     "aboutToJoinCancelledGroupPlan": "Você está preste a se juntar a um grupo com um plano cancelado. Você NÃO receberá uma assinatura gratuita.",
@@ -416,7 +416,7 @@
     "startYourOwnPartyTitle": "Comece seu próprio Grupo",
     "startYourOwnPartyDescription": "Lute contra monstros só ou convide tantos amigos quanto você quiser!",
     "wantToJoinPartyTitle": "Quer entrar em um Grupo?",
-    "wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> to meet potential comrades!",
+    "wantToJoinPartyDescription": "Dê seu nome de usuário a um amigo que já tenha um Grupo, ou dirija-se à <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a>para encontrar possíveis companheiros!",
     "copy": "Copiar",
     "inviteToPartyOrQuest": "Convidar Grupo à Missão",
     "inviteInformation": "Clicar em \"Convidar\" enviará um convite para os membros de seu grupo. Quando todos os membros tiverem aceitado ou negado, a Missão irá começar.",

website/common/locales/pt_BR/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 de Janeiro",
     "dateEndFebruary": "28 de fevereiro",
     "winterPromoGiftHeader": "Presenteie alguém com uma assinatura e ganhe outra grátis !",
-    "winterPromoGiftDetails1": "Somente até o dia 12 de Janeiro, ao presentear alguém com uma assinatura, você ganhará a mesma assinatura para você de graça!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Por favornote que se você ou que será presenteado já tiver uma assinatura recorrente, a assinatura presenteada somente iniciará depois que a outra assinatura seja cancelada ou expire. Obrigado pelo seu apoio! <3",
-    "discountBundle": "pacote"
+    "discountBundle": "pacote",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/pt_BR/npc.json

@@ -107,11 +107,11 @@
     "amazonInstructions": "Aperte no botão para pagar usando Amazon Payments",
     "paymentMethods": "Comprar usando",
     "paymentSuccessful": "Seu pagamento foi efetuado com sucesso! ",
-    "paymentYouReceived": "You received:",
+    "paymentYouReceived": "Você recebeu:",
-    "paymentYouSentGems": "You sent <strong><%= name %></strong>:",
+    "paymentYouSentGems": "Você enviou <strong><%= name %></strong>:",
-    "paymentYouSentSubscription": "You sent <strong><%= name %></strong> a <%= months %>-months Habitica subscription.",
+    "paymentYouSentSubscription": "Você enviou para <strong><%= name %></strong>uma assinatura de Habitica por <%= months %>.",
-    "paymentSubBilling": "Your subscription will be billed <strong><%= amount %></strong>$ every <strong><%= months %></strong> months.",
+    "paymentSubBilling": "Sua assinatura será faturada <strong><%= amount %></strong>$ a cada <strong><%= months %></strong>meses.",
-    "success": "Success!",
+    "success": "Sucesso!",
     "classGear": "Equipamento da Classe",
     "classGearText": "Parabéns por ter escolhido uma classe! Eu adicionei sua nova arma básica no seu inventário. Dê uma olhada abaixo para equipá-lo!",
     "classStats": "Estes são seus Atributos de Classe; eles afetam o modo de jogar. Cada vez que você sobe um nível você ganha um Ponto para distribuir para uma Atributo em particular. Passe o mouse sobre um Atributo para mais informações.",

website/common/locales/pt_BR/subscriber.json

@@ -37,7 +37,7 @@
     "individualSub": "Assinatura Individual",
     "subscribe": "Assinar",
     "subscribed": "Assinante",
-    "nowSubscribed": "You are now subscribed to Habitica!",
+    "nowSubscribed": "Agora você é um assinante no Habitica!",
     "manageSub": "Clique para gerenciar assinatura",
     "cancelSub": "Cancelar Assinatura",
     "cancelSubInfoGoogle": "Por favor vá até \"Conta\" > \"Assinaturas\" no aplicativo da Play Store para cancelar sua assinatura ou ver o período em que sua assinatura irá ser encerrada se você já tiver cancelado. Essa seção não consegue mostrar se sua assinatura já foi cancelada.",

website/common/locales/ro/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/ru/groups.json

@@ -45,7 +45,7 @@
     "LFG": "Объявить о создании новой команды или найти подходящую и присоединиться к ней можно в гильдии <%= linkStart %>Требуется команда (поиск команды)<%= linkEnd %>.",
     "wantExistingParty": "Хотите присоединиться к уже существующей команде? Перейдите в <%= linkStart %>гильдию по поиску команды<%= linkEnd %> и оставьте там свой ID пользователя.",
     "joinExistingParty": "Присоединиться к чьей-либо команде",
-    "usernameCopied": "Username copied to clipboard.",
+    "usernameCopied": "Имя пользователя скопировано в буфер обмена.",
     "needPartyToStartQuest": "Ой! Вам нужно <a href='http://ru.habitica.wikia.com/wiki/Команда' target='_blank'>создать или вступить в команду</a> перед тем, что бы начать задание!",
     "createGroupPlan": "Создать",
     "create": "Создать",
@@ -333,7 +333,7 @@
     "cantDeleteAssignedGroupTasks": "Нельзя удалить групповые задачи, назначенные вам.",
     "confirmGuildPlanCreation": "Создать группу?",
     "groupPlanUpgraded": "<strong><%= groupName %></strong> was upgraded to a Group Plan!",
-    "groupPlanCreated": "<strong><%= groupName %></strong> was created!",
+    "groupPlanCreated": "<strong><%= groupName %></strong> создана!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Только лидер группы может приглашать пользователей в группу с общей подпиской.",
     "paymentDetails": "Детали платежа",
     "aboutToJoinCancelledGroupPlan": "Вы собираетесь присоединиться к группе с отмененным групповым тарифом. Вы НЕ получите бесплатную подписку.",
@@ -416,7 +416,7 @@
     "startYourOwnPartyTitle": "Создайте свою собственную команду",
     "startYourOwnPartyDescription": "Сражайтесь с монстрами в одиночку или пригласите столько друзей, сколько вы пожелаете!",
     "wantToJoinPartyTitle": "Хотите присоединиться к команде?",
-    "wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> to meet potential comrades!",
+    "wantToJoinPartyDescription": "Дайте ваше имя пользователя другу, у которого уже есть команда, или зайдите в <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>гильдию поиска команды</a>, чтобы найти достойных товарищей!",
     "copy": "Скопировать",
     "inviteToPartyOrQuest": "Пригласить команду в квест",
     "inviteInformation": "После нажатия «Пригласить» членам вашей команды будет отправлено приглашение. Квест начнется, когда все члены команды примут или отклонят приглашение.",

website/common/locales/ru/limited.json

@@ -66,10 +66,10 @@
     "magicMouseSet": "Волшебная Мышь (Маг)",
     "lovingPupSet": "Любящий Щенок (Целитель)",
     "stealthyKittySet": "Скрытная Киса (Разбойник)",
-    "daringSwashbucklerSet": "Дерзкий Головорез (Воин)",
+    "daringSwashbucklerSet": "Дерзкий головорез (Воин)",
     "emeraldMermageSet": "Изумрудный Русалколдун (Маг)",
     "reefSeahealerSet": "Рифовый Морской Целитель (Целитель)",
-    "roguishPirateSet": "Коварный Пират (Разбойник)",
+    "roguishPirateSet": "Коварный пират (Разбойник)",
     "monsterOfScienceSet": "Монстр науки (воин)",
     "witchyWizardSet": "Ведь-маг (маг)",
     "mummyMedicSet": "Мумифицированный доктор (целитель)",
@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 января",
     "dateEndFebruary": "Февраль 28",
     "winterPromoGiftHeader": "ПОДАРИТЕ ПОДПИСКУ И ПОЛУЧИТЕ ОДНУ БЕСПЛАТНО!",
-    "winterPromoGiftDetails1": "Только до 12 января, когда вы дарите кому-то подписку, вы получаете такую же подписку для себя бесплатно!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Обратите внимание, что если у вас или вашего получателя подарка уже есть повторяющаяся Подписка, одаренная Подписка начнется только после того, как эта Подписка будет отменена или истечет срок ее действия. Большое спасибо за вашу поддержку! <3",
-    "discountBundle": "комплект"
+    "discountBundle": "комплект",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/ru/npc.json

@@ -107,11 +107,11 @@
     "amazonInstructions": "Нажмите для оплаты с помощью Amazon Payments",
     "paymentMethods": "Приобрести с использованием",
     "paymentSuccessful": "Платеж прошел успешно!",
-    "paymentYouReceived": "You received:",
+    "paymentYouReceived": "Вы получили:",
     "paymentYouSentGems": "You sent <strong><%= name %></strong>:",
-    "paymentYouSentSubscription": "You sent <strong><%= name %></strong> a <%= months %>-months Habitica subscription.",
+    "paymentYouSentSubscription": "Вы отправили <strong><%= name %></strong> <%= months %>-мес. подписку на Habitica.",
     "paymentSubBilling": "Your subscription will be billed <strong><%= amount %></strong>$ every <strong><%= months %></strong> months.",
-    "success": "Success!",
+    "success": "Успех!",
     "classGear": "Экипировка класса",
     "classGearText": "Поздравляем с выбором класса! В вашем инвентаре ожидает новое базовое оружие. Посмотрите ниже - там вы сможете им вооружиться!",
     "classStats": "Здесь перечислены характеристики вашего класса: они отражаются на игровом процессе. Каждый раз, при наборе нового уровня вы получите один пункт для увеличения характеристик. Наведите курсор на характеристику для подробного описания.",

website/common/locales/ru/questscontent.json

@@ -336,8 +336,8 @@
     "questTreelingDropTreelingEgg": "Кустик (Яйцо)",
     "questTreelingUnlockText": "Позволяет покупать на рынке кустик в яйце.",
     "questAxolotlText": "Магический аксолотль",
-    "questAxolotlNotes": "Вы видите, как из глубин Разбитого Озера поднимаются пузырьки и... огонь? Маленький аксолотль поднимается из мутной воды, извергая струи цвета. Внезапно он начинает открывать свой рот и @streak кричит \"Берегись!\", в то время как Волшебный Аксолотль принимается заглатывать вашу силу воли!<br><br>Волшебный аксолотль, раздувающийся от заклинаний, насмехается над вами. \"Слышали ли вы о моей способности к регенерации? Вы устанете раньше меня!\"<br><br>\"Нам удастся победить тебя с помощью полезных привычек, которые мы выработали!\" -- уверенно выкрикивает @PainterProphet. Закалив себя, став продуктивным, вы сможете победить Волшебного Аксолотля и вернуть себе укренную силу воли!",
+    "questAxolotlNotes": "Вы видите, как из глубин Разбитого озера поднимаются пузырьки и... огонь? Маленький аксолотль поднимается из мутной воды, извергая струи цвета. Внезапно он начинает открывать свой рот и @streak кричит \"Берегись!\", в то время как Магический аксолотль принимается заглатывать вашу силу воли!<br><br>Магический аксолотль, раздувающийся от заклинаний, насмехается над вами. \"Слышали ли вы о моей способности к регенерации? Вы устанете раньше меня!\"<br><br>\"Нам удастся победить тебя с помощью полезных привычек, которые мы выработали!\" -- уверенно выкрикивает @PainterProphet. Закалив себя, став продуктивным, вы сможете победить Магического аксолотля и вернуть себе украденную силу воли!",
-    "questAxolotlCompletion": "После того, как вы победили Волшебного Аксолотля, вы понимаете, что восстановили вашу силу воли сами по себе. <br><br>\"Сила воли? Регенерация? Это была просто иллюзия? @Kiwibot спрашивает. <br><br>\"Как и большая часть магии.\" - отвечает Волшебный Аксолотль. \"Прошу прощения за то, что обманул вас. Пожалуйста, примите эти яйца в качестве извинений. Я доверяю вам вырастить их и использовать их магию для полезных привычек, а не вредных!\"<br><br>Вы и @hazel40 сжимаите ваши новые яйца в одной руке и машите другой на прощание Волшебному Аксолотлю, пока он возвращается в озеро.",
+    "questAxolotlCompletion": "После того, как вы победили Магического аксолотля, вы понимаете, что восстановили вашу силу воли сами по себе. <br><br>\"Сила воли? Регенерация? Это была просто иллюзия? @Kiwibot спрашивает. <br><br>\"Как и большая часть магии.\" - отвечает Магический аксолотль. \"Прошу прощения за то, что обманул вас. Пожалуйста, примите эти яйца в качестве извинений. Я доверяю вам вырастить их и использовать их магию для полезных привычек, а не вредных!\"<br><br>Вы и @hazel40 сжимаете ваши новые яйца в одной руке и машете другой на прощание Магическому аксолотлю, пока он возвращается в озеро.",
     "questAxolotlBoss": "Магический аксолотль",
     "questAxolotlDropAxolotlEgg": "Аксолотль (яйцо)",
     "questAxolotlUnlockText": "Позволяет покупать на рынке аксолотля в яйце.",

website/common/locales/ru/subscriber.json

@@ -37,7 +37,7 @@
     "individualSub": "Индивидуальная подписка",
     "subscribe": "Подписка",
     "subscribed": "Оформлено",
-    "nowSubscribed": "You are now subscribed to Habitica!",
+    "nowSubscribed": "Вы оформили подписку на Habitica!",
     "manageSub": "Нажмите для управления подпиской",
     "cancelSub": "Отмена подписки",
     "cancelSubInfoGoogle": "Пожалуйста, зайдите в раздел \"Аккаунт\" > \"Подписки\" приложения Google Play Маркет, чтобы отменить свою подписку или увидеть дату завершения подписки, если вы уже отменили её. Этот экран не может показать вам, отменили ли вы свою подписку.",
@@ -145,7 +145,7 @@
     "mysterySet201803": "Набор отважной Стрекозы",
     "mysterySet201804": "Набор Нарядной белки",
     "mysterySet201805": "Восхитительный Набор Павлина",
-    "mysterySet201806": "Притигающий набор удильщика",
+    "mysterySet201806": "Набор Притягательного удильщика",
     "mysterySet201807": "Набор морского змея",
     "mysterySet201808": "Набор Лавового дракона",
     "mysterySet201809": "Осенний набор защиты",

website/common/locales/sk/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31. január",
     "dateEndFebruary": "28. február",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/sr/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/sv/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31:a Januari",
     "dateEndFebruary": "Den 28 Februari",
     "winterPromoGiftHeader": "GE BORT EN PRENUMERATION OCH FÅ EN GRATIS!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bunt"
+    "discountBundle": "bunt",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/tr/groups.json

@@ -45,7 +45,7 @@
     "LFG": "Yeni takımını tanıtmak veya katılabileceğin bir takım bulmak istiyorsan, <%= linkStart %>Takım Aranıyor Loncasını(Takım gönderilerinin olduğu)<%= linkEnd %> ziyaret et.",
     "wantExistingParty": "Var olan bir takıma mı katılmak istiyorsun? <%= linkStart %>Takım Aranıyor Loncası<%= linkEnd %>'nı ziyaret et ve bu Kullanıcı ID numarasını loncada paylaş:",
     "joinExistingParty": "Başkasının Takımına Katıl",
-    "usernameCopied": "Username copied to clipboard.",
+    "usernameCopied": "Kullanıcı adı panoya kopyalandı.",
     "needPartyToStartQuest": "Hoppala! Görev başlatabilmen için önce <a href='http://tr.habitica.wikia.com/wiki/Grup' target='_blank'>bir takım kurmalı veya bir takıma katılmalısın</a>!",
     "createGroupPlan": "Oluştur",
     "create": "Oluştur",
@@ -332,8 +332,8 @@
     "claimedBy": "Üzerinde çalışanlar: <%= claimingUsers %>",
     "cantDeleteAssignedGroupTasks": "Sana atanmış grup işlerini silemezsin.",
     "confirmGuildPlanCreation": "Bu grubu oluşturmak istiyor musun?",
-    "groupPlanUpgraded": "<strong><%= groupName %></strong> was upgraded to a Group Plan!",
+    "groupPlanUpgraded": "<strong><%= groupName %></strong> Grup Planı'na yükseltildi!",
-    "groupPlanCreated": "<strong><%= groupName %></strong> was created!",
+    "groupPlanCreated": "<strong><%= groupName %></strong> oluşturuldu!",
     "onlyGroupLeaderCanInviteToGroupPlan": "Yalnızca grup lideri, kullanıcıları bir aboneliğe sahip olan bir gruba davet edebilir.",
     "paymentDetails": "Ödeme Detayları",
     "aboutToJoinCancelledGroupPlan": "İptal edilmiş bir pakete sahip olan bir gruba katılmak üzeresin. Bedava aboneliğe sahip OLMAYACAKSIN. ",
@@ -416,7 +416,7 @@
     "startYourOwnPartyTitle": "Kendi Takımını oluştur",
     "startYourOwnPartyDescription": "Canavarlarla tek başına savaş ya da istediğin kadar arkadaşını davet et!",
     "wantToJoinPartyTitle": "Bir Takıma katılmak ister misin?",
-    "wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> to meet potential comrades!",
+    "wantToJoinPartyDescription": "Halihazırda Takımı olan bir arkadaşına kullanıcı adını ver veya potansiyel yoldaşlarla tanışmak için <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Takım Arayanlar Loncası</a>'nın yolunu tut!",
     "copy": "Kopyala",
     "inviteToPartyOrQuest": "Takımı Göreve Davet Et",
     "inviteInformation": "\"Davet Et\" butonuna tıklamak, Takımının üyelerine birer davetiye gönderecektir. Tüm üyeler kabul veya reddettiklerinde Görev başlar.",

website/common/locales/tr/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "31 Ocak",
     "dateEndFebruary": "28 Şubat",
     "winterPromoGiftHeader": "ABONELİK HEDİYE EDENE AYNISI HEDİYE!",
-    "winterPromoGiftDetails1": "Sadece 12 Ocak'a kadar, birine bir abonelik hediye ettiğinde, kendin için aynı aboneliği ücretsiz olarak alırsın!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Lütfen eğer senin veya hediyeyi göndereceğin kişinin halihazırda devam eden bir aboneliği bulunuyorsa, hediye edilen aboneliğin bu abonelik iptal edildikten veya geçerliliğini yitirdikten sonra başlayacağını unutma. Desteğin için çok teşekkür ederiz! <3",
-    "discountBundle": "paket"
+    "discountBundle": "paket",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/tr/npc.json

@@ -107,11 +107,11 @@
     "amazonInstructions": "Amazon Payments ile ödeme yapmak için butona tıkla",
     "paymentMethods": "Şu yöntemi kullanarak satın al:",
     "paymentSuccessful": "Ödemen başarıyla gerçekleşti!",
-    "paymentYouReceived": "You received:",
+    "paymentYouReceived": "Ganimetin:",
-    "paymentYouSentGems": "You sent <strong><%= name %></strong>:",
+    "paymentYouSentGems": "<strong><%= name %></strong> adlı kişiye gönderilen:",
-    "paymentYouSentSubscription": "You sent <strong><%= name %></strong> a <%= months %>-months Habitica subscription.",
+    "paymentYouSentSubscription": "<strong><%= name %></strong> adlı kişiye <%= months %> aylık Habitica aboneliği gönderdin.",
-    "paymentSubBilling": "Your subscription will be billed <strong><%= amount %></strong>$ every <strong><%= months %></strong> months.",
+    "paymentSubBilling": "Aboneliğin için her <strong><%= months %></strong> ayda bir <strong><%= amount %></strong>$ ücretlendirileceksin.",
-    "success": "Success!",
+    "success": "Başarılı!",
     "classGear": "Sınıf Ekipmanı",
     "classGearText": "Bir sınıf seçtiğin için tebrikler! Yeni sıradan silahını envanterine koydum. Giymek için aşağıya göz at!",
     "classStats": "Bunlar senin sınıfının karakter Nitelikleridir ve oynanışı etkilerler. Her seviye atladığında, belirli bir Niteliğe harcaman için bir Puan kazanırsın. Daha fazla bilgi için her bir Niteliğin üzerine gel.",

website/common/locales/tr/subscriber.json

@@ -37,7 +37,7 @@
     "individualSub": "Bireysel Abonelik",
     "subscribe": "Abone Ol",
     "subscribed": "Abone Olundu",
-    "nowSubscribed": "You are now subscribed to Habitica!",
+    "nowSubscribed": "Artık Habitica abonesisin!",
     "manageSub": "Aboneliği yönetmek için tıkla",
     "cancelSub": "Aboneliği İptal Et",
     "cancelSubInfoGoogle": "Aboneliğini iptal etmek için veya daha önce iptal ettiysen aboneliğinin sonlandırma tarihini görmek için lütfen Google Play Store uygulamasının \"Hesap\"> \"Abonelikler\" bölümüne git. Bu ekran, aboneliğinin iptal edilip edilmediğini sana gösteremiyor.",

website/common/locales/uk/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "January 31",
     "dateEndFebruary": "February 28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/zh/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "1月31日",
     "dateEndFebruary": "2月28日",
     "winterPromoGiftHeader": "送訂閱的同時自己也能免費得到一個!",
-    "winterPromoGiftDetails1": "直到1月12日，当你给某人订阅时，你可以免费得到相同的订阅！",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "请注意，如果您或您的礼物收件人已经有一个订阅了，作为礼物的订阅只会在原来的订阅取消后或者过期后。非常感谢你的支持！ლ(°◕‵ƹ′◕ლ)",
-    "discountBundle": "一批"
+    "discountBundle": "一批",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }

website/common/locales/zh_TW/limited.json

@@ -143,7 +143,9 @@
     "dateEndJanuary": "一月31",
     "dateEndFebruary": "二月28",
     "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Until January 12th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
+    "winterPromoGiftDetails1": "Until January 15th only, when you gift somebody a subscription, you get the same subscription for yourself for free!",
     "winterPromoGiftDetails2": "Please note that if you or your gift recipient already have a recurring subscription, the gifted subscription will only start after that subscription is cancelled or has expired. Thanks so much for your support! <3",
-    "discountBundle": "bundle"
+    "discountBundle": "bundle",
+    "g1g1Announcement": "Gift a Subscription, Get a Subscription Free event going on now!",
+    "g1g1Details": "Gift a sub to a friend from their profile and you’ll receive the same sub for free!"
 }