Merge branch 'release' into develop

2025-12-18 15:17:25 +01:00 · 2018-06-29 00:22:18 +00:00
parent d9b573b430 217c16988b
commit d8925a8811
25 changed files with 124 additions and 112 deletions
--- a/2
+++ b/2
@@ -17,7 +17,7 @@ RUN npm install -g gulp-cli mocha
 # Clone Habitica repo and install dependencies
 RUN mkdir -p /usr/src/habitrpg
 WORKDIR /usr/src/habitrpg
-RUN git clone --branch v4.49.1 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN git clone --branch v4.50.1 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
 RUN npm install
 RUN gulp build:prod --force

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.50.1",
+  "version": "4.50.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.50.1",
+  "version": "4.50.2",
  "main": "./website/server/index.js",
  "dependencies": {
    "@slack/client": "^3.8.1",
--- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
+++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,66 +1,72 @@
 .promo_aquatic_glass_potions {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -627px 0px;
+  background-position: -1168px 0px;
  width: 141px;
  height: 441px;
 }
 .promo_armoire_backgrounds_201806 {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -627px -442px;
+  background-position: -1026px 0px;
  width: 141px;
  height: 441px;
 }
 .promo_bundle_aquaticAmigos {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -142px -533px;
+  background-position: -346px -664px;
  width: 423px;
  height: 147px;
 }
 .promo_ios {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px 0px;
+  background-position: 0px -327px;
  width: 325px;
  height: 336px;
 }
 .promo_mystery_201806 {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -769px -442px;
+  background-position: -1168px -442px;
  width: 121px;
  height: 114px;
 }
 .promo_seafoam {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -769px 0px;
+  background-position: -884px 0px;
  width: 141px;
  height: 441px;
 }
 .promo_seasonal_shop_summer {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -142px -681px;
+  background-position: -441px -301px;
  width: 162px;
  height: 138px;
 }
 .promo_summer_splash_2018 {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -337px;
+  background-position: -742px 0px;
  width: 141px;
  height: 588px;
 }
 .promo_take_this {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -769px -557px;
+  background-position: -1168px -557px;
  width: 96px;
  height: 69px;
 }
 .scene_families {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -142px -337px;
+  background-position: 0px -664px;
  width: 345px;
  height: 195px;
 }
 .scene_moderators {
  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -326px 0px;
+  background-position: -441px 0px;
  width: 300px;
  height: 300px;
 }
+.scene_tavern {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px 0px;
+  width: 440px;
+  height: 326px;
+}
--- a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png
+++ b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png
--- a/website/common/locales/bg/content.json
+++ b/website/common/locales/bg/content.json
@@ -195,7 +195,7 @@
    "hatchingPotionFairy": "Фейски цвят",
    "hatchingPotionStarryNight": "Звездна нощ",
    "hatchingPotionRainbow": "Дъга",
-    "hatchingPotionGlass": "Glass",
+    "hatchingPotionGlass": "Стъкло",
    "hatchingPotionNotes": "Излейте това върху яйце и от него ще се излюпи любимец с(ъс) <%= potText(locale) %>.",
    "premiumPotionAddlNotes": "Не може да се използва върху яйца за любимци от мисии.",
    "foodMeat": "Месо",
--- a/website/common/locales/bg/gear.json
+++ b/website/common/locales/bg/gear.json
@@ -258,8 +258,8 @@
    "weaponSpecialSpring2018MageNotes": "Това вълшебно цвете никога няма да увехне. Увеличава интелигентността с <%= int %> и усета с <%= per %>. Ограничена серия: Пролетна екипировка 2018 г.",
    "weaponSpecialSpring2018HealerText": "Гранатен прът",
    "weaponSpecialSpring2018HealerNotes": "Камъните в този жезъл ще концентрира силите Ви, когато изпълнявате лечебни заклинания! Увеличава интелигентността с <%= int %>. Ограничена серия: Пролетна екипировка 2018 г.",
-    "weaponSpecialSummer2018RogueText": "Fishing Rod",
-    "weaponSpecialSummer2018RogueNotes": "This lightweight, practically unbreakable rod and reel can be dual-wielded to maximize your DPS (Dragonfish Per Summer). Increases Strength by <%= str %>. Limited Edition 2018 Summer Gear.",
+    "weaponSpecialSummer2018RogueText": "Въдица",
+    "weaponSpecialSummer2018RogueNotes": "Можете да държите по две от тези леки и практически неразрушими въдици, за да удвоите улова си. Увеличава силата с <%= str %>. Ограничена серия: Лятна екипировка 2018 г.",
    "weaponSpecialSummer2018WarriorText": "Betta Fish Spear",
    "weaponSpecialSummer2018WarriorNotes": "Mighty enough for battle, elegant enough for ceremony, this exquisitely crafted spear shows you will protect your home surf no matter what! Increases Strength by <%= str %>. Limited Edition 2018 Summer Gear.",
    "weaponSpecialSummer2018MageText": "Lionfish Fin Rays",
--- a/website/common/locales/bg/questscontent.json
+++ b/website/common/locales/bg/questscontent.json
@@ -603,6 +603,6 @@
    "questSquirrelUnlockText": "Отключва възможността за купуване на яйца на катерица от пазара.",
    "cuddleBuddiesText": "Пакет мисии „Пухкави приятелчета“",
    "cuddleBuddiesNotes": "Съдържа: „Зайчето-убиец“, „Нечестивият пор“ и „Бандата на морските свинчета“. Наличен до 31 май.",
-    "aquaticAmigosText": "Aquatic Amigos Quest Bundle",
-    "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'. Available until June 30."
+    "aquaticAmigosText": "Пакет мисии „Водни дружки“",
+    "aquaticAmigosNotes": "Съдържа: „Вълшебният саламандър“, „Кракенът на незавършеността“ и „Зовът на Октотулу“. Наличен до 30 юни."
 }
--- a/website/common/locales/es_419/challenge.json
+++ b/website/common/locales/es_419/challenge.json
@@ -14,7 +14,7 @@
    "challenges": "Desafíos",
    "challengesLink": "<a href='http://habitica.wikia.com/wiki/Challenges' target='_blank'>Desafíos</a>",
    "challengePrize": "Challenge Prize",
-    "endDate": "Ends",
+    "endDate": "Termina",
    "noChallenges": "Ningún desafío todavía, visita",
    "toCreate": "para crear uno.",
    "selectWinner": "Seleccionar un ganador y cerrar el desafío:",
@@ -25,7 +25,7 @@
    "filter": "Filtrar",
    "groups": "Grupos",
    "noNone": "Ninguno",
-    "category": "Category",
+    "category": "Categoría",
    "membership": "Membresía",
    "ownership": "Ownership",
    "participating": "Participando",
--- a/website/common/locales/es_419/loadingscreentips.json
+++ b/website/common/locales/es_419/loadingscreentips.json
@@ -18,14 +18,14 @@
  "tip16": "Haga clic en el enlace a la herramienta de visualización de datos en el pie de página para obtener información valiosa sobre su progreso",
  "tip17": "Use las aplicaciones móviles para configurar recordatorios para sus tareas.",
  "tip18": "Habitos  que son solo positivo o negativo gradualmente \"desapareciendo\" y regresa a amarillo.",
-  "tip19": "Boost your Intelligence Stat to gain more experience when you complete a task.",
+  "tip19": "Aumenta tu estadística de inteligencia para ganar más experiencia cuando completas una tarea.",
  "tip20": "Aumenta tu estadistica de percepcion para obtener mas gotas y oro.",
  "tip21": "Aumenta tu estadistica de fuerza para hacer mas daño a tu enemigo u obtener golpe critico.",
  "tip22": "Aumenta tu estadistica de constitución para disminuir el daño recibido por las diarias incompletas.",
  "tip23": "Alcanza el nivel 100 y desbloquea el Orbe de Renacimiento gratis, y comienza una nueva aventura!",
  "tip24": "¿Tienes una pregunta? ¡Hazla en el Gremio de Ayuda de Habitica!",
  "tip25": "Las cuatro galas estacionales empiezan cerca de los solsticios y equinoxios.",
-  "tip26": "You can look for a Party or find Party members in the Party Wanted Guild!",
+  "tip26": "¡Puedes buscar un Grupo nuevo o encontrar miembros para tu Grupo en el Gremio de Party Wanted!",
  "tip27": "¿Hiciste una Tarea Diaria ayer pero olvidaste marcarla como hecha? ¡No te preocupes! Con Registrar la Actividad de Ayer, tendrás una oportunidad de marcar lo que hiciste antes de comenzar tu nuevo día.",
  "tip28": "Set a Custom Day Start under User Icon > Settings to control when your day restarts.",
  "tip29": "Complete all your Dailies to get a Perfect Day Buff that increases your Stats!",
--- a/website/common/locales/es_419/pets.json
+++ b/website/common/locales/es_419/pets.json
@@ -48,7 +48,7 @@
    "foodText": "comida",
    "food": "Comida y Monturas",
    "noFoodAvailable": "No tienes comida.",
-    "noSaddlesAvailable": "You don't have any Saddles.",
+    "noSaddlesAvailable": "No tienes monturas.",
    "noFood": "No tienes ni comida ni monturas.",
    "dropsExplanation": "Consigue estos objetos más rápido con Gemas si no quieres esperar a que aparezcan cuando completes una tarea. <a href=\"http://habitica.wikia.com/wiki/Drops\">Lee más acerca del sistema de botines.</a>",
    "dropsExplanationEggs": "Usa gemas para conseguir huevos más rápido, si no quieres esperar que los huevos estándar te salgan en el botín ni repetir Misiones para ganar huevos de misión. <a href=\"http://es.habitica.wikia.com/wiki/Botín\">Lee más sobre el sistema de botín.</a>",
@@ -139,7 +139,7 @@
    "clickOnEggToHatch": "Click on an Egg to use your <%= potionName %> hatching potion and hatch a new pet!",
    "hatchDialogText": "Pour your <%= potionName %> hatching potion on your <%= eggName %> egg, and it will hatch into a <%= petName %>.",
    "clickOnPotionToHatch": "Click on a hatching potion to use it on your <%= eggName %> and hatch a new pet!",
-    "notEnoughPets": "You have not collected enough pets",
+    "notEnoughPets": "No has collectado suficientes mascotas ",
    "notEnoughMounts": "You have not collected enough mounts",
    "notEnoughPetsMounts": "You have not collected enough pets and mounts"
 }
--- a/website/common/locales/es_419/subscriber.json
+++ b/website/common/locales/es_419/subscriber.json
@@ -143,7 +143,7 @@
    "mysterySet201802": "Love Bug Set",
    "mysterySet201803": "Daring Dragonfly Set",
    "mysterySet201804": "Spiffy Squirrel Set",
-    "mysterySet201805": "Phenomenal Peacock Set",
+    "mysterySet201805": "Conjunto del Pavo Real",
    "mysterySet201806": "Alluring Anglerfish Set",
    "mysterySet301404": "Conjunto Steampunk Estándar ",
    "mysterySet301405": "Conjunto de Accesorios Steampunk",
@@ -206,5 +206,5 @@
    "purchaseAll": "Cómpralo todo",
    "gemsPurchaseNote": "Subscribers can buy gems for gold in the Market! For easy access, you can also pin the gem to your Rewards column.",
    "gemsRemaining": "Gemas restantes",
-    "notEnoughGemsToBuy": "You are unable to buy that amount of gems"
+    "notEnoughGemsToBuy": "No puedes comprar ese número de gemas."
 }
--- a/website/common/locales/hu/front.json
+++ b/website/common/locales/hu/front.json
@@ -85,7 +85,7 @@
    "landingend": "Még nem győztünk meg?",
    "landingend2": "Lásd részletsebb listánkat az [oldal funkcióiról](/static/overview). Privátabb megközelítést keresel? Nézd meg az [adminisztratív csomagjainkat](/static/plans), ami tökéletes családok, tanárok, támogató csoportok, és vállalatok számára.",
    "landingp1": "A probléma a legtöbbb produktivitást segítő alkalmazással, hogy nem ösztönöznek, hogy folyamatosan használd őket. A Habitica úgy oldja ezt meg, hogy szokásaid felépítését szórakozássá teszi! Sikereid megjutalmazásával és ballépéseid büntetésével a Habitica külső motivációt biztosít mindennapi feladataid elvégzéséhez.",
-    "landingp2": "Amikor megerősítesz egy pozitív szokást, vagy befejezel egy napi feladatot, esetleg elkészülsz egy régi tennivalóval, a Habitica rögtön megjutalmaz tapasztalati pontokkal és arannyal. Tapasztalati pontok szerzésével szintet lépsz, amely növeli a tulajdonságaidat és új funkciókat tesz elérhetővé, pl. kasztok és háziállatok. \nAz aranyat játékbeli tárgyakra költheted, amik megváltoztatják a játékélményed, vagy testre szabott jutalmakat vásárolhatsz, amik motiválnak. Ha a legkisebb siker is jutalommal kecsegtet, akkor kisebb eséllyel fogod a feladataidat halogatni.",
+    "landingp2": "Amikor megerősítesz egy pozitív szokást, vagy befejezel egy napi feladatot, esetleg elkészülsz egy régi tennivalóval, a Habitica rögtön megjutalmaz tapasztalati pontokkal és arannyal. Tapasztalati pontok szerzésével szintet lépsz, amely növeli a tulajdonságaidat és új funkciókat tesz elérhetővé, pl. kasztok és háziállatok. Az aranyat játékbeli tárgyakra költheted, amik megváltoztatják a játékélményed, vagy testre szabott jutalmakat vásárolhatsz, amik motiválnak. Ha a legkisebb siker is jutalommal kecsegtet, akkor kisebb eséllyel fogod a feladataidat halogatni.",
    "landingp2header": "Azonnali jutalom",
    "landingp3": "Amikor engedsz egy rossz szokásnak, vagy nem végzed el a napi feladataidat, életerőt veszítesz. Ha az életerőd elfogy, elveszíted a megszerzett dolgaid egy részét. Az azonnali következmények miatt, a Habitica segít leszokni a rossz szokásokról és a halogatásról, mielőtt problémákat okoznának a való életben.",
    "landingp3header": "Következmények",
@@ -123,7 +123,7 @@
    "marketing4Lead3-1": "Szeretnéd játékká tenni az életed?",
    "marketing4Lead3-2": "Szeretnél egy csoportot vezetni oktatás, wellness, vagy egyéb témában?",
    "marketing4Lead3-3": "Szeretnél többet tudni?",
-    "marketing4Lead3Title": "Játékosíts mindent",
+    "marketing4Lead3Title": "Tegyél mindent játékká",
    "mobileAndroid": "Android",
    "mobileIOS": "iOS",
    "motivate": "Motiváld magad és a csapatod!",
@@ -189,7 +189,7 @@
    "schoolSample5": "1 fejezetet elolvasni",
    "sixteenBitFilQuote": "A megbízásaimmal és feladataimmal rekordidő alatt végzek, hála a [Habiticának]! Mindig vágyom rá, hogy elérhessem a következő szintet!",
    "skysailorQuote": "A csapatom és a küldetéseink segít abban hogy foglalkozzak a játékkal, ami motivál a feladataim elvégzésében és pozitív irányba tereli az életem",
-    "socialTitle": "Habitica - Játékosítsd az életed",
+    "socialTitle": "Habitica - Tedd játékká az életed",
    "supermouse35Quote": "Többet edzek és már hónapok óta nem felejtettem el bevenni a gyógyszereimet! Köszi, Habit. :D",
    "sync": "Szinkronizálás",
    "tasks": "Feladatok",
--- a/website/common/locales/hu/groups.json
+++ b/website/common/locales/hu/groups.json
@@ -351,7 +351,7 @@
    "joinedGuild": "Csatlakoztál egy céhhez",
    "joinedGuildText": "Bemerészkedtél a Habitica közösségi oldalára egy céhhez való csatlakozással!",
    "badAmountOfGemsToPurchase": "Az értéknek legalább 1-nek kell lennie",
-    "groupPolicyCannotGetGems": "The policy of one group you're part of prevents its members from obtaining gems.",
+    "groupPolicyCannotGetGems": "Egy olyan csoporthoz tartozol, aminek az egyik szabálya megakadályozza hogy tagjai drágaköveket szerezzenek.",
    "viewParty": "Csapat megtekintése",
    "newGuildPlaceholder": "Céh nevének megadása",
    "guildMembers": "Céh tagok",
@@ -432,41 +432,41 @@
    "managerRemoved": "Menedzser eltávolítása sikeres",
    "leaderChanged": "Vezető megváltoztatva",
    "groupNoNotifications": "Ez a céh nemrendelkezik értesítésekkel a létszám nagysága miatt. Ne felejtsd el gyakran megnézni hogy az üzeneteidre érkezett-e válasz!",
-    "whatIsWorldBoss": "What is a World Boss?",
-    "worldBossDesc": "A World Boss is a special event that brings the Habitica community together to take down a powerful monster with their tasks! All Habitica users are rewarded upon its defeat, even those who have been resting in the Inn or have not used Habitica for the entirety of the quest.",
-    "worldBossLink": "Read more about the previous World Bosses of Habitica on the Wiki.",
-    "worldBossBullet1": "Complete tasks to damage the World Boss",
-    "worldBossBullet2": "The World Boss won’t damage you for missed tasks, but its Rage meter will go up. If the bar fills up, the Boss will attack one of Habitica’s shopkeepers!",
-    "worldBossBullet3": "You can continue with normal Quest Bosses, damage will apply to both",
-    "worldBossBullet4": "Check the Tavern regularly to see World Boss progress and Rage attacks",
-    "worldBoss": "World Boss",
+    "whatIsWorldBoss": "Mi az a világellenség?",
+    "worldBossDesc": "A világellenség egy különleges esemény ami összehozza a Habitica lakóit hogy feladataink elvégzésével közösen legyőzzünk egy hatalmas szörnyet! A szörny legyőzése után a Habitica összes lakója jutalmat kap, még azok is akik a fogadóban pihentek vagy nem használták a Habitica-t a küldetés alatt.",
+    "worldBossLink": "Tudj meg többet korábbi világellenségekről a Habitica wiki oldalán.",
+    "worldBossBullet1": "Teljesítsd feladataid a világellenség megsebzéséhez",
+    "worldBossBullet2": "A világellenség nem okoz sebzést az el nem végzett feladatok után, de a őrjöngés mérője növekedni fog. Ha a sáv betelik a főellenség megtámadja a Habitica egyik kereskedőjét!",
+    "worldBossBullet3": "Rendes küldetésekben is részt vehetsz, a sebzés mindkét ellenségre vonatkozni fog.",
+    "worldBossBullet4": "Rendszeresen látogasd meg a fogadót hogy megtudd a világellenség jelenlegi állapotát valamint őrjöngés mérőjét.",
+    "worldBoss": "Világellenség",
    "groupPlanTitle": "Több tagra van szükséged?",
-    "groupPlanDesc": "Managing a small team or organizing household chores? Our group plans grant you exclusive access to a private task board and chat area dedicated to you and your group members!",
+    "groupPlanDesc": "Egy kisebb csapatot vagy háztartást vezetsz? Csoportos terveink exkluzív hozzáférést biztosítanak privát feladatlistákhoz és üzenőfalhoz, amelyek csak neked valamint csoportod tagjainak elérhetőek!",
    "billedMonthly": "*havi előfizetésként van számlázva",
-    "teamBasedTasksList": "Team-Based Task List",
-    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
-    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
-    "inGameBenefits": "In-Game Benefits",
-    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
-    "inspireYourParty": "Inspire your party, gamify life together.",
-    "letsMakeAccount": "First, let’s make you an account",
-    "nameYourGroup": "Next, Name Your Group",
-    "exampleGroupName": "Example: Avengers Academy",
-    "exampleGroupDesc": "For those selected to join the training academy for The Avengers Superhero Initiative",
-    "thisGroupInviteOnly": "This group is invitation only.",
-    "gettingStarted": "Getting Started",
-    "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
-    "whatsIncludedGroup": "What's included in the subscription",
+    "teamBasedTasksList": "Csoporthoz tartozó feladatlista",
+    "teamBasedTasksListDesc": "Állíts fel egy könnyen böngészhető feladatlistát csoportod számára. Csoportod tagjait rendeld hozzá feladatokhoz, vagy hagyd hogy ezeket ők válasszák ki ezzel nyilvánvalóvá téve hogy melyik tag melyik feladaton dolgozik.",
+    "groupManagementControls": "Csoport menedzsment irányítás",
+    "groupManagementControlsDesc": "Használd a jóváhagyás funkciót hogy igazold hogy ezt a feladatot tényleg elvégezték, adj a csoporthoz csoportmenedzsereket felelősség megosztásához, és élvezd a privát üzenőfalat a csoport többi tagjával való csevegéshez.",
+    "inGameBenefits": "Játékbeli előnyök",
+    "inGameBenefitsDesc": "A csoport tagjai kapnak egy exkluzív szarvasnyúl hátast, valamint az előfizetés összes előnyét, beleértve különleges havi tárgyak valamint a képességet hogy aranyért drágakövet vásárolhatnak.",
+    "inspireYourParty": "Inspiráld a csapatodat, tegyétek az életeteket közösen játékká.",
+    "letsMakeAccount": "Először, hozz létre egy fiókot",
+    "nameYourGroup": "Következő, nevezd el a csoportot",
+    "exampleGroupName": "Példa: Bosszúállók akadémia",
+    "exampleGroupDesc": "Azoknak akiket kiválasztottak hogy a Bosszúállók csapatához tartozzanak.",
+    "thisGroupInviteOnly": "A csoporthoz meghívás szükséges.",
+    "gettingStarted": "Kezdés",
+    "congratsOnGroupPlan": "Gratulálunk új csoportod létrehozásához! Íme néhány válasz a leggyakroribb kérdésekre. ",
+    "whatsIncludedGroup": "Mit tartalmaz az előfizetés",
    "whatsIncludedGroupDesc": "All members of the Group receive full subscription benefits, including the monthly subscriber items, the ability to buy Gems with Gold, and the Royal Purple Jackalope mount, which is exclusive to users with a Group Plan membership.",
-    "howDoesBillingWork": "How does billing work?",
+    "howDoesBillingWork": "Hogyan történi a számlázás?",
    "howDoesBillingWorkDesc": "Group Leaders are billed based on group member count on a monthly basis. This charge includes the $9 (USD) price for the Group Leader subscription, plus $3 USD for each additional group member. For example: A group of four users will cost $18 USD/month, as the group consists of 1 Group Leader + 3 group members.",
-    "howToAssignTask": "How do you assign a Task?",
+    "howToAssignTask": "Hogyan tudsz feladatokat valakihez hozzárendelni?",
    "howToAssignTaskDesc": "Assign any Task to one or more Group members (including the Group Leader or Managers themselves) by entering their usernames in the \"Assign To\" field within the Create Task modal. You can also decide to assign a Task after creating it, by editing the Task and adding the user in the \"Assign To\" field!",
    "howToRequireApproval": "How do you mark a Task as requiring approval?",
    "howToRequireApprovalDesc": "Toggle the \"Requires Approval\" setting to mark a specific task as requiring Group Leader or Manager confirmation. The user who checked off the task won't get their rewards for completing it until it has been approved.",
    "howToRequireApprovalDesc2": "Group Leaders and Managers can approve completed Tasks directly from the Task Board or from the Notifications panel.",
-    "whatIsGroupManager": "What is a Group Manager?",
+    "whatIsGroupManager": "Mi az a csoportmenedzser?",
    "whatIsGroupManagerDesc": "A Group Manager is a user role that do not have access to the group's billing details, but can create, assign, and approve shared Tasks for the Group's members. Promote Group Managers from the Group’s member list.",
    "goToTaskBoard": "Go to Task Board"
 }
--- a/website/common/locales/hu/quests.json
+++ b/website/common/locales/hu/quests.json
@@ -40,7 +40,7 @@
    "begin": "Indít",
    "bossHP": "Boss HP",
    "bossStrength": "Főellenség ereje",
-    "rage": "Harag",
+    "rage": "Őrjöngés",
    "collect": "Gyűjts be",
    "collected": "Begyűjtve",
    "collectionItems": "<%= number %> <%= items %>",
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -580,12 +580,12 @@
    "armorSpecialSpring2018MageNotes": "Suas habilidades mágicas serão ampliadas enquanto envolto nestas macias e sedosas pétalas. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2018.",
    "armorSpecialSpring2018HealerText": "Armadura Escarlate",
    "armorSpecialSpring2018HealerNotes": "Deixe esta reluzente armadura aquecer seu coração com poder de cura. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2018.",
-    "armorSpecialSummer2018RogueText": "Colete de pesca (com bolsos!)",
+    "armorSpecialSummer2018RogueText": "Colete de Pesca (com bolsos!)",
    "armorSpecialSummer2018RogueNotes": "Boias guias? Caixas de anzóis? Linha de reposição? Gazuas? Bombas de fumaça? Tudo o que você precisar para a sua fuga de verão, esse colete tem um bolso para isso! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada.Verão de 2018.",
    "armorSpecialSummer2018WarriorText": "Armadura Cauda Betta",
    "armorSpecialSummer2018WarriorNotes": "Encante com espirais de cores magníficas aqueles que lhe ver nadar e tornear. Como alguém ousará atacar algo tão glorioso? Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Verão de 2018.",
-    "armorSpecialSummer2018MageText": "Lionfish Scale Hauberk",
-    "armorSpecialSummer2018MageNotes": "Venom magic has a reputation for subtlety. Not so this colorful armor, whose message is clear to beast and task alike: watch out! Increases Intelligence by <%= int %>. Limited Edition 2018 Summer Gear.",
+    "armorSpecialSummer2018MageText": "Armadura de Escamas de Leão-Maguinho",
+    "armorSpecialSummer2018MageNotes": "Magia venenosa é famosa pela sua sutiliza. Esta armadura não só tem uma cor vibrante, como também passa uma mensagem bem clara para as tarefas e inimigos: Se cuidem! Aumenta Inteligência em <%= int %> Equipamento de Edição Limitada. Verão de 2018.",
    "armorSpecialSummer2018HealerText": "Robes do Monarca Atlântico",
    "armorSpecialSummer2018HealerNotes": "Estas vestes cerúleas revelam ... seus pés de anfíbios ... Bem, nem mesmo um monarca pode ser perfeito. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Verão de 2018.",
    "armorMystery201402Text": "Túnica do Mensageiro",
@@ -652,8 +652,8 @@
    "armorMystery201712Notes": "O calor e luz gerador por esta armadura mágica irão aquecer seu coração, mas nunca queimar sua pele! Não concede benefícios. Item de assinante, Setembro de 2017.",
    "armorMystery201802Text": "Armadura Bug do Amor",
    "armorMystery201802Notes": "Esta armadura brilhante reflete a força do seu coração e a infunde em qualquer Habiticano próximo que possa precisar de encorajamento! Não concede benefícios. Item de Assinante, Fevereiro de 2018.",
-    "armorMystery201806Text": "Alluring Anglerfish Tail",
-    "armorMystery201806Notes": "This sinuous tail features glowing spots to light your way through the deep. Confers no benefit. June 2018 Subscriber Item.",
+    "armorMystery201806Text": "Cauda do Peixe-Pescador Atraente",
+    "armorMystery201806Notes": " Esta cauda sinuante apresenta pontos cintilantes para iluminar o seu caminho em meio às profundezas.Item de Assinante, Junho de 2018.",
    "armorMystery301404Text": "Traje da Revolução Industrial",
    "armorMystery301404Notes": "Elegante e distinto! Não concede benefícios. Item de Assinante, Fevereiro de 3015.",
    "armorMystery301703Text": "Vestido de Pavão da Revolução Industrial",
@@ -978,12 +978,12 @@
    "headSpecialSpring2018MageNotes": "As pétalas elegantes desse elmo te abençoarão com a magia da primavera. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2018.",
    "headSpecialSpring2018HealerText": "Tiara Escarlate",
    "headSpecialSpring2018HealerNotes": "As gemas polidas dessa tiara potencializarão sua energia mental. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2018.",
-    "headSpecialSummer2018RogueText": "Fishing Sun Hat",
-    "headSpecialSummer2018RogueNotes": "Provides comfort and protection from the harsh glare of the summer sun over the water. Especially important if you're more accustomed to staying stealthy in the shadows! Increases Perception by <%= per %>. Limited Edition 2018 Summer Gear.",
-    "headSpecialSummer2018WarriorText": "Betta Fish Barbute",
-    "headSpecialSummer2018WarriorNotes": "Show everyone you're the alpha betta with this flamboyant helm! Increases Strength by <%= str %>. Limited Edition 2018 Summer Gear.",
-    "headSpecialSummer2018MageText": "Lionfish Crest",
-    "headSpecialSummer2018MageNotes": "Glare dolorously upon anyone who dares say you look like a “tastyfish”. Increases Perception by <%= per %>. Limited Edition 2018 Summer Gear.",
+    "headSpecialSummer2018RogueText": "Chapéu de Pesca",
+    "headSpecialSummer2018RogueNotes": "Proporciona conforto e proteção contra o brilho intenso do sol sobre a água. Especialmente importante para quem só fica nas sombras de modo furtivo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão de 2018.",
+    "headSpecialSummer2018WarriorText": "Barbatana Betta",
+    "headSpecialSummer2018WarriorNotes": "Mostre para todo mundo que você é o Alpha entre os bettas com este extravagante capacete! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2018.",
+    "headSpecialSummer2018MageText": "Crista do Leão-Maguinho",
+    "headSpecialSummer2018MageNotes": "O brilho afiado relembra o gosto da dor para aqueles que lhe acharem apetitoso. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão de 2018.",
    "headSpecialSummer2018HealerText": "Coroa do Monarca Atlântico",
    "headSpecialSummer2018HealerNotes": "Adornado com água-marinha, este refinado diadema marca a liderança dos atlantes, peixes e aqueles que são um pouco dos dois! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Verão de 2018.",
    "headSpecialGaymerxText": "Elmo dos Guerreiros Arco-Íris",
@@ -1056,8 +1056,8 @@
    "headMystery201803Notes": "Apesar de sua aparência decorativa, você pode abanar as asas desta tiara para facilitar seu movimento. Não concede benefícios. Item de Assinante, Março de 2018.",
    "headMystery201805Text": "Elmo do Pavão Fenomenal",
    "headMystery201805Notes": "Esse elmo te tornará o mais orgulhoso e belo (possivelmente também o mais chato) pássaro da cidade. Não concede benefícios. Item de Assinante, Maio de 2018.",
-    "headMystery201806Text": "Alluring Anglerfish Helm",
-    "headMystery201806Notes": "The mesmerizing light atop this helm will call all the creatures of the sea to your side. We urge you to use your glowy powers of attraction for good! Confers no benefit. June 2018 Subscriber Item.",
+    "headMystery201806Text": "Elmo do Peixe-Pescador Atraente",
+    "headMystery201806Notes": "A luz hipnotizante deste elmo chamará todas as criaturas do mar para perto de você. Nós pedimos que você use seu cintilante poder de atração para o  bem! Não confere nenhum benefício. Item de Assinante, Junho de 2018.",
    "headMystery301404Text": "Cartola Chique",
    "headMystery301404Notes": "Uma cartola chique para os mais finos cavalheiros e damas! Não concede benefícios. Item de Assinante, Janeiro de 3015.",
    "headMystery301405Text": "Cartola Básica",
@@ -1308,8 +1308,8 @@
    "shieldSpecialSpring2018WarriorNotes": "Esse escudo resistente brilha com a glória do amanhecer. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2018.",
    "shieldSpecialSpring2018HealerText": "Escudo Escarlate",
    "shieldSpecialSpring2018HealerNotes": "Apesar de sua aparência elegante, este escudo escarlate é bem resistente. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2018.",
-    "shieldSpecialSummer2018WarriorText": "Betta Skull Shield",
-    "shieldSpecialSummer2018WarriorNotes": "Fashioned from stone, this fearsome skull-styled shield strikes fear into fish foes while rallying your Skeleton pets and mounts. Increases Constitution by <%= con %>. Limited Edition 2018 Summer Gear.",
+    "shieldSpecialSummer2018WarriorText": "Escudo Carcaça Betta",
+    "shieldSpecialSummer2018WarriorNotes": "Talhado em pedra, este temível escudo em forma de crânio enche os peixefóbicos de medo ao lhe ver trotando com sua montaria e mascote de ossos. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Verão de 2018.",
    "shieldSpecialSummer2018HealerText": "Brasão do Monarca Atlântico",
    "shieldSpecialSummer2018HealerNotes": "Este escudo produz um domo de ar para graça dos visitantes terrestres em seu reino aquático. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Verão de 2018.",
    "shieldMystery201601Text": "Destruidora de Resoluções",
--- a/website/common/locales/ru/gear.json
+++ b/website/common/locales/ru/gear.json
@@ -585,7 +585,7 @@
    "armorSpecialSummer2018WarriorText": "Хвостовые доспехи бойцовской рыбы",
    "armorSpecialSummer2018WarriorNotes": "Ослепите зрителей головокружительными яркими кружевами, и скорее ныряйте в воду. Как смел злодей даже напасть на эту красоту? Увеличивает телосложение на <%= con %>. Ограниченный выпуск лета 2018.",
    "armorSpecialSummer2018MageText": "Крылатковый панцирь",
-    "armorSpecialSummer2018MageNotes": "Venom magic has a reputation for subtlety. Not so this colorful armor, whose message is clear to beast and task alike: watch out! Increases Intelligence by <%= int %>. Limited Edition 2018 Summer Gear.",
+    "armorSpecialSummer2018MageNotes": "Магия ядов относится к навыкам хитрости. Но броня ярких оттенков, давая ясно понять хищнику: я ядовитый! Увеличивает интеллект на <%= int %>. Ограниченный выпуск лета 2018.",
    "armorSpecialSummer2018HealerText": "Роба Амфибии",
    "armorSpecialSummer2018HealerNotes": "Эти лазурные облачения приоткрывают тайну, что у вас есть ноги для ходьбы по суше. Ну... Даже монарх не настолько идеальный. Увеличивает телосложение на <%= con %>. Ограниченный выпуск лета 2018.",
    "armorMystery201402Text": "Облачение посланника",
--- a/website/common/locales/tr/character.json
+++ b/website/common/locales/tr/character.json
@@ -164,7 +164,7 @@
    "respawn": "Yeniden Diril!",
    "youDied": "Öldün!",
    "dieText": "Bir Seviyeni, bütün Altınını ve rastgele bir ekipmanını kaybettin. Yüksel, Habiticalı, ve tekrar dene! Kötü alışkanlıklarını frenle, Günlük İşlerin tamamlanmasında uyanık ol ve eğer sendelersen bir Sağlık İksiri ile ölümü kendinden uzak tut!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated Stat Points (you'll get them all back to re-allocate), and costs 3 Gems.",
+    "sureReset": "Emin misin? Bu adım karakterinin sınıfını ve dağıtılmış tüm puanlarını silecek (tekrar dağıtmak için puanları geri alacaksın) ve 3 elmasa mal olacak.",
    "purchaseFor": "<%= cost %> Elmas karşılığında satın alınsın mı?",
    "purchaseForHourglasses": "Purchase for <%= cost %> Hourglasses?",
    "notEnoughMana": "Yetersiz mana.",
--- a/website/common/locales/tr/messages.json
+++ b/website/common/locales/tr/messages.json
@@ -61,6 +61,6 @@
    "messageNotificationNotFound": "Bildirim bulunamadı.",
    "messageNotAbleToBuyInBulk": "Bu eşya 1 taneden fazla alınamaz.",
    "notificationsRequired": "Bildirm ID'leri gerekmektedir.",
-    "unallocatedStatsPoints": "You have <span class=\"notification-bold-blue\"><%= points %> unallocated Stat Points</span>",
+    "unallocatedStatsPoints": "<span class=\"notification-bold-blue\"><%= points %> adet dağıtılmamış Nitelik Puanın var.</span>",
    "beginningOfConversation": "Bu <%= userName %> ile konuşmanın başlangıcıdır.Kibar ve saygılı olmayı ve Topluluk Kurallarına uymayı unutma."
 }
--- a/website/common/locales/tr/overview.json
+++ b/website/common/locales/tr/overview.json
@@ -2,7 +2,7 @@
  "needTips": "Nasıl başlayacağın ile ilgili ip uçlarına mı ihtiyacın var? İşte basit bir rehber!",

  "step1": "Adım 1: İşleri Gir",
-  "webStep1Text": "Habitica is nothing without real-world goals, so enter a few tasks. You can add more later as you think of them! All tasks can be added by clicking the green \"Create\" button.\n* **Set up [To-Dos](http://habitica.wikia.com/wiki/To-Dos):** Enter tasks you do once or rarely in the To-Dos column, one at a time. You can click on the tasks to edit them and add checklists, due dates, and more!\n* **Set up [Dailies](http://habitica.wikia.com/wiki/Dailies):** Enter activities you need to do daily or on a particular day of the week, month, or year in the Dailies column. Click task to edit when it will be due and/or set a start date. You can also make it due on a repeating basis, for example, every 3 days.\n* **Set up [Habits](http://habitica.wikia.com/wiki/Habits):** Enter habits you want to establish in the Habits column. You can edit the Habit to change it to just a good habit :heavy_plus_sign: or a bad habit :heavy_minus_sign:\n* **Set up [Rewards](http://habitica.wikia.com/wiki/Rewards):** In addition to the in-game Rewards offered, add activities or treats which you want to use as a motivation to the Rewards column. It's important to give yourself a break or allow some indulgence in moderation!\n* If you need inspiration for which tasks to add, you can look at the wiki's pages on [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies), [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos), and [Sample Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards).",
+  "webStep1Text": "Habitica gerçek dünya hedefi olmadan hiçbirşeydir, bu nedenle birkaç görev gir. Sonra onlardan düşündükçe daha fazla ekleyebilirsin!* **[Yapılacaklar](http://habitica.wikia.com/wiki/To-Dos) kurmak:**Tek tek, Yapılacaklar sütununa bir kez veya nadiren yaptığın görevleri gir. Onları düzenlemek ve kontrol listeleri, bitirme tarihi, ve daha fazlasını eklemek için göreve tıklayabilirsin!* **[Günlük İşler](http://habitica.wikia.com/wiki/Dailies) kurmak:**Günlük İşler sütununa günlük veya haftanın belirli bir günlerinde yapman gereken faaliyetleri gir. Günlük işleri tekrar üzerine de, Örneğin 3 günde 1,  kurabilirsin. Günleri düzenlemek' için göreve tıkla. * **[Alışkanlıklar](http://habitica.wikia.com/wiki/Habits) kurmak:**Alışkanlıklar sütununa kurmak istediğin alışkanlıkları gir. Alışkanlığı sadece iyi bir alışkanlık haline veya kötü bir alışkanlık haline getirmek için düzenleyebilirsin.* **[Ödüller](http://habitica.wikia.com/wiki/Rewards) kurmak:**Sunulan oyun içi Ödüllere ek olarak, Ödüller sütununa bir motivasyon olarak kullanmak istediğin aktiviteleri veya muameleleri ekle. Kendine bir mola vermen veya ılımlılık içinde biraz hoşgörüyle izin vermen önemlidir! Eklenmesi gereken görevler için ilham almaya ihtiyaç duyarsan, [Örnek Alışkanlıklar](http://habitica.wikia.com/wiki/Sample_Habits), [Örnek Günlük İşler](http://habitica.wikia.com/wiki/Sample_Dailies), [Örnek Yapılacaklar](http://habitica.wikia.com/wiki/Sample_To-Dos), ve [Örnek Ödüller](http://habitica.wikia.com/wiki/Sample_Custom_Rewards) wiki sayfalarına bakabilirsiniz.",

  "step2": "Adım 2: Gerçek Hayatta Bir Şeyler Yaparak Puan Kazan",
  "webStep2Text": "Şimdi, hedeflerini listeden çözmeye başla! Görevleri Habitica'da kontrol ederek tamamlarken, seviye atlamana yardım edecek [Tecrübe](http://tr.habitica.wikia.com/wiki/Tecr%C3%BCbe_Puan%C4%B1), ve Ödul satın almanı sağlayacak [Altın](http://tr.habitica.wikia.com/wiki/Alt%C4%B1n) kazanacaksın. Kötü alışkanlıklara düşersen veya Günlük İşler'ini kaçırırsan, [Sağlık](http://tr.habitica.wikia.com/wiki/Sa%C4%9Fl%C4%B1k) kaybedersin. Bu şekilde, Habitica Tecrübe ve Sağlık çubukları, hedeflerine doğru ilerlemenin eğlenceli bir göstergesi olarak hizmet eder. Oyundaki karakter ilerlemelerinde gerçek hayatının geliştiğini görmeye başlayacaksın.",
--- a/website/common/locales/uk/groups.json
+++ b/website/common/locales/uk/groups.json
@@ -192,16 +192,16 @@
    "sendGiftHeading": "Надіслати подарунок для <%= name %>",
    "sendGiftGemsBalance": "Від <%= number %> Самоцвітів",
    "sendGiftCost": "Total: $<%= cost %> USD",
-    "sendGiftFromBalance": "From Balance",
-    "sendGiftPurchase": "Purchase",
-    "sendGiftMessagePlaceholder": "Personal message (optional)",
+    "sendGiftFromBalance": "З балансу",
+    "sendGiftPurchase": "Придбати",
+    "sendGiftMessagePlaceholder": "Персональне повідомлення(опціонально)",
    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD",
    "gemGiftsAreOptional": "Please note that Habitica will never require you to gift gems to other players. Begging people for gems is a <strong>violation of the Community Guidelines</strong>, and all such instances should be reported to <%= hrefTechAssistanceEmail %>.",
    "battleWithFriends": "Battle Monsters With Friends",
-    "startPartyWithFriends": "Start a Party with your friends!",
-    "startAParty": "Start a Party",
-    "addToParty": "Add someone to your Party",
-    "likePost": "Click if you like this post!",
+    "startPartyWithFriends": "Створіть Гурт з вашими друзями!",
+    "startAParty": "Створити гурт",
+    "addToParty": "Додати когось до свого Гурту",
+    "likePost": "Натисніть якщо вам сподобався цей пост!",
    "partyExplanation1": "Play Habitica with friends to stay accountable!",
    "partyExplanation2": "Battle monsters and create Challenges!",
    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
@@ -216,7 +216,7 @@
    "partyOnName": "Party On",
    "partyUpText": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
    "partyOnText": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!",
-    "groupNotFound": "Group not found or you don't have access.",
+    "groupNotFound": "Гурт не знайдений або у вас немає доступу.",
    "groupTypesRequired": "You must supply a valid \"type\" query string.",
    "questLeaderCannotLeaveGroup": "You cannot leave your Party when you have started a quest. Abort the quest first.",
    "cannotLeaveWhileActiveQuest": "You cannot leave Party during an active quest. Please leave the quest first.",
--- a/website/common/locales/zh_TW/groups.json
+++ b/website/common/locales/zh_TW/groups.json
@@ -152,7 +152,7 @@
    "privateMessageGiftSubscriptionMessage": "已訂閱<%= numberOfMonths %>月！",
    "cannotSendGemsToYourself": "無法寄寶石給你自己。請嘗試訂閱我們。",
    "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.",
-    "report": "Report",
+    "report": "檢舉",
    "abuseFlag": "舉報社群規範違規事件",
    "abuseFlagModalHeading": "Report a Violation",
    "abuseFlagModalBody": "Are you sure you want to report this post? You should <strong>only</strong> report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction.",
@@ -354,13 +354,13 @@
    "groupPolicyCannotGetGems": "The policy of one group you're part of prevents its members from obtaining gems.",
    "viewParty": "View Party",
    "newGuildPlaceholder": "Enter your guild's name.",
-    "guildMembers": "Guild Members",
-    "guildBank": "Guild Bank",
+    "guildMembers": "公會成員",
+    "guildBank": "公會銀行",
    "chatPlaceholder": "Type your message to Guild members here",
    "partyChatPlaceholder": "Type your message to Party members here",
    "fetchRecentMessages": "Fetch Recent Messages",
-    "like": "Like",
-    "liked": "Liked",
+    "like": "讚",
+    "liked": "已按讚",
    "joinGuild": "Join Guild",
    "inviteToGuild": "Invite to Guild",
    "messageGuildLeader": "Message Guild Leader",
@@ -371,14 +371,14 @@
    "recentActivity": "Recent Activity",
    "myGuilds": "我的公會",
    "guildsDiscovery": "探索公會",
-    "role": "Role",
-    "guildOrPartyLeader": "Leader",
-    "guildLeader": "Guild Leader",
-    "member": "Member",
-    "guildSize": "Guild Size",
-    "goldTier": "Gold Tier",
-    "silverTier": "Silver Tier",
-    "bronzeTier": "Bronze Tier",
+    "role": "職位",
+    "guildOrPartyLeader": "會長",
+    "guildLeader": "公會會長",
+    "member": "成員",
+    "guildSize": "公會規模",
+    "goldTier": "黃金層級",
+    "silverTier": "白銀層級",
+    "bronzeTier": "青銅層級",
    "privacySettings": "Privacy Settings",
    "onlyLeaderCreatesChallenges": "Only the Leader can create Challenges",
    "privateGuild": "Private Guild",
--- a/website/raw_sprites/spritesmith_large/scene_tavern.png
+++ b/website/raw_sprites/spritesmith_large/scene_tavern.png
--- a/website/server/controllers/api-v3/groups.js
+++ b/website/server/controllers/api-v3/groups.js
@@ -588,7 +588,8 @@ api.joinGroup = {
    }
    if (!isUserInvited) throw new NotAuthorized(res.t('messageGroupRequiresInvite'));

-    if (group.memberCount === 0) group.leader = user._id; // If new user is only member -> set as leader
+    // @TODO: Review the need for this and if still needed, don't base this on memberCount
+    if (!group.hasNotCancelled() && group.memberCount === 0) group.leader = user._id; // If new user is only member -> set as leader

    if (group.hasNotCancelled())  {
      await payments.addSubToGroupUser(user, group);
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth';
 let api = {};

 // @TODO export this const, cannot export it from here because only routes are exported from controllers
-const LAST_ANNOUNCEMENT_TITLE = 'NEW GLASS HATCHING POTIONS, AQUATIC HATCHING POTIONS, AND SEAFOAM!';
+const LAST_ANNOUNCEMENT_TITLE = 'LAST CHANCE FOR ALLURING ANGLERFISH SET AND AQUATIC AMIGOS QUEST BUNDLE; FEATURED WIKI ON GUILD CREATION';
 const worldDmg = { // @TODO
  bailey: false,
 };
@@ -35,20 +35,25 @@ api.getNews = {
        </div>
        <hr/>
        <div class="media align-items-center">
-          <div class="promo_aquatic_glass_potions mr-3"></div>
          <div class="media-body">
-            <h3>New Glass Magic Hatching Potions and the Return of Aquatic Potions!</h3>
-            <p>There's a new pet breed in town! Between now and July 31, you can buy Glass and Aquatic Hatching Potions from <a href='/shops/market' target='_blank'>the Market</a> and use them to hatch any standard pet egg. (Magic Hatching Potions do not work on Quest Pet eggs.) Magic Potion Pets aren't picky, so they'll happily eat any kind of food that you feed them!</p>
-            <p>After they're gone, it will be at least a year before the Glass and Aquatic Hatching Potions are available again, so be sure to get them now!</p>
-            <div class="small mb-3">by stefalupagus, Beffymaroo, Mako413, Willow The Witty, and SabreCat</div>
-            <h3>Seafoam!</h3>
-            <p>Throw some Seafoam at your friends and they will turn into a cheerful sea star until their next cron! You can buy the Seafoam in the <a href='/shops/seasonal' target='_blank'>Seasonal Shop</a> for Gold. Plus, if you get splashed by Seafoam, you'll receive the Aquatic Friends badge!</p>
+            <h3>Last Chance for Alluring Anglerfish Set</h3>
+            <p>Reminder: this weekend is your last chance to <a href='/user/settings/subscription' target='_blank'>subscribe</a> and receive the Alluring Anglerfish Set! Subscribing also lets you buy Gems for Gold. The longer your subscription, the more Gems you get!</p>
+            <p>Thanks so much for your support! You help keep Habitica running.</p>
+            <div class="small mb-3">by Beffymaroo</div>
          </div>
-          <div class="promo_seafoam ml-3"></div>
+          <div class="promo_mystery_201806"></div>
+        </div>
+        <div class="promo_bundle_aquaticAmigos center-block mb-3"></div>
+        <h3>Last Chance for Aquatic Amigos Pet Quest Bundle</h3>
+        <p>This is also the final weekend to buy the discounted Aquatic Amigos Pet Quest Bundle, featuring the Axolotl, Cuttlefish, and Octopus quests all for seven Gems! Be sure to check it out in the <a href='/shops/quests' target='_blank'>Quest Shop</a> before it floats away!</p>
+        <div class="media align-items-center">
+          <div class="media-body">
+            <h3>Blog Post: Guild Creation and Maintenance Tips</h3>
+            <p>This month's <a href='https://habitica.wordpress.com/2018/06/27/guild-creation-and-maintenance-tips/' target='_blank'>featured Wiki article</a> is about Guild Creation and Maintenance! We hope that it will help you as explore Habitica's social spaces. Be sure to check it out, and let us know what you think by reaching out on <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a href='http://blog.habitrpg.com' target='_blank'>Tumblr</a>, and <a href='https://facebook.com/habitica' target='_blank'>Facebook</a>.</p>
+            <div class="small mb-3">by shanaqui and the Wiki Wizards</div>
+          </div>
+          <div class="scene_tavern"></div>
        </div>
-        <p>Don't want to be a sea star? Just buy some Sand from your Rewards column to reverse it.</p>
-        <p>Seafoam will be available until July 31st!</p>
-        <div class="small mb-3">by Lemoness</div>
      </div>
      `,
    });